Skip to content

Match fn_8019A86C and ftCo_800B2AFC #3176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ribbanya merged 4 commits into from
Aug 22, 2026
+78 −48
Merged

Match fn_8019A86C and ftCo_800B2AFC #3176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f73aa
gmtou_1: match fn_8019A86C
MarkMcCaskey Aug 22, 2026
588dc43
ftCo_0A01: match ftCo_800B2AFC
MarkMcCaskey Aug 22, 2026
f1c25ce
Merge branch 'master' into match-close-residuals-0822
ribbanya Aug 22, 2026
944218f
Merge branch 'master' into match-close-residuals-0822
ribbanya Aug 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 73 additions & 42 deletions src/melee/ft/chara/ftCommon/ftCo_0A01.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8149,37 +8149,14 @@ void ftCo_800B2790(Fighter* fp)
}
}

static inline bool ftCo_800B2AFC_CheckFloor(Vec3* pos, int* line, u32* flags,
Vec3* normal, int arg4, int arg5,
int arg6, float x0, float y0,
float x1, float y1,
float tolerance)
{
int result;
*line = -1;
result = mpCheckFloor(x0, y0, x1, y1, tolerance, pos, line, flags, normal,
arg4, arg5, arg6, NULL, NULL);
if (result != 0 && ftCo_800A1B38_noinline(*line) != 0) {
return false;
}
return result;
static inline bool ftCo_800B2AFC_IsIgnoredFloor(int line)
{
return ftCo_IsIgnoredFloor(line);
}

void ftCo_800B2AFC(Fighter* fp)
{
UNUSED u8 pad_high[4];
u32 flags0;
Vec3 floor_pos26;
Vec3 floor_normal0;
Vec3 floor_pos0;
u32 flags1;
Vec3 floor_normal1;
int line1;
int line3;
Vec3 floor_pos1;
Vec3 floor_normal3;
Vec3 floor_pos3;
int line0;
UNUSED u8 pad_high[8];

switch (fp->x1A88.xC) {
case 0: {
Expand All @@ -8203,17 +8180,30 @@ void ftCo_800B2AFC(Fighter* fp)
do_act = 1;
}
if (do_act != 0) {
u32 flags0;
int line0;
Vec3 floor_normal0;
Vec3 floor_pos0;
f32 x = fp->cur_pos.x;
f32 x2 = x;
f32 y = fp->cur_pos.y;
f32 below;
f32 above;
found = 0;
below = y - 1000.0f;
above = 10.0f + y;
result = ftCo_800B2AFC_CheckFloor(&floor_pos0, &line0, &flags0,
&floor_normal0, -1, -1, -1, x2,
above, x, below, 0.0f);
found = result;
line0 = -1;
result = mpCheckFloor(x2, above, x, below, 0.0f, &floor_pos0,
&line0, &flags0, &floor_normal0, -1, -1, -1,
NULL, (Fighter_GObj*) found);
if (result == 0) {
goto assign0;
}
switch (ftCo_800B2AFC_IsIgnoredFloor(line0)) {
case 0:
assign0:
found = result;
}
if (found != 0) {
f32 floor_x;
f32 floor_y;
Expand All @@ -8232,6 +8222,7 @@ void ftCo_800B2AFC(Fighter* fp)
s32 do_act;
s32 x18;

PAD_STACK(4);
data->xF8_b0 = false;
ftCo_CpuClearTargetModes(data);
data->xF9_b1 = false;
Expand All @@ -8246,16 +8237,30 @@ void ftCo_800B2AFC(Fighter* fp)
do_act = 1;
}
if (do_act != 0) {
u32 flags1;
int line1;
Vec3 floor_normal1;
Vec3 floor_pos1;
f32 x = fp->x1A88.x98.x;
f32 x2 = x;
f32 y = fp->x1A88.x98.y;
f32 below;
f32 above;
found = 0;
below = y - 1000.0f;
above = 10.0f + y;
found = ftCo_800B2AFC_CheckFloor(&floor_pos1, &line1, &flags1,
&floor_normal1, -1, -1, -1, x2,
above, x, below, 0.0f);
line1 = -1;
result = mpCheckFloor(x2, above, x, below, 0.0f, &floor_pos1,
&line1, &flags1, &floor_normal1, -1, -1, -1,
NULL, (Fighter_GObj*) found);
if (result == 0) {
goto assign1;
}
switch (ftCo_800B2AFC_IsIgnoredFloor(line1)) {
case 0:
assign1:
found = result;
}
if (found != 0) {
f32 floor_x;
f32 floor_y;
Expand All @@ -8278,8 +8283,8 @@ void ftCo_800B2AFC(Fighter* fp)
return;
case 3: {
struct Fighter_x1A88_t* data = &fp->x1A88;
s32 result;
s32 found;
s32 result;
s32 do_act;
s32 x18;

Expand All @@ -8298,16 +8303,29 @@ void ftCo_800B2AFC(Fighter* fp)
}
if (do_act != 0) {
u32 flags3;
int line3;
Vec3 floor_normal3;
Vec3 floor_pos3;
f32 x = fp->cur_pos.x;
f32 x2 = x;
f32 y = fp->cur_pos.y;
f32 below;
f32 above;
found = 0;
below = y - 1000.0f;
above = 10.0f + y;
found = ftCo_800B2AFC_CheckFloor(&floor_pos3, &line3, &flags3,
&floor_normal3, -1, -1, -1, x2,
above, x, below, 0.0f);
line3 = -1;
result = mpCheckFloor(x2, above, x, below, 0.0f, &floor_pos3,
&line3, &flags3, &floor_normal3, -1, -1, -1,
NULL, (Fighter_GObj*) found);
if (result == 0) {
goto assign3;
}
switch (ftCo_800B2AFC_IsIgnoredFloor(line3)) {
case 0:
assign3:
found = result;
}
if (found != 0) {
f32 floor_x;
f32 floor_y;
Expand Down Expand Up @@ -8419,11 +8437,12 @@ void ftCo_800B2AFC(Fighter* fp)
}
case 26: {
struct Fighter_x1A88_t* data = &fp->x1A88;
s32 result;
s32 found;
s32 result;
s32 do_act;
s32 x18;

PAD_STACK(16);
ftCo_CpuInitEnemyTarget(fp, data);
x18 = data->x18;
if (x18 != data->x20 && x18 != data->x1C) {
Expand All @@ -8439,16 +8458,28 @@ void ftCo_800B2AFC(Fighter* fp)
u32 flags26;
int line26;
Vec3 floor_normal26;
Vec3 floor_pos26;
f32 x = fp->cur_pos.x;
f32 x2 = x;
f32 y = fp->cur_pos.y;
f32 below;
f32 above;
found = 0;
below = y - 1000.0f;
above = 10.0f + y;
found = ftCo_800B2AFC_CheckFloor(&floor_pos26, &line26, &flags26,
&floor_normal26, -1, -1, -1, x2,
above, x, below, 0.0f);
PAD_STACK(4);
line26 = -1;
result = mpCheckFloor(x2, above, x, below, 0.0f, &floor_pos26,
&line26, &flags26, &floor_normal26, -1, -1,
-1, NULL, (Fighter_GObj*) found);
if (result == 0) {
goto assign26;
}
switch (ftCo_800B2AFC_IsIgnoredFloor(line26)) {
case 0:
assign26:
found = result;
}
if (found != 0) {
f32 floor_x;
f32 floor_y;
Expand Down
11 changes: 5 additions & 6 deletions src/melee/gm/gmtou_1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ void fn_8019A86C(TmData* tm, u32 arg1, u32 arg2)
s32 ready_count = 0;
s32 pad_err = 0;
s32 i;
PAD_STACK(0x28);
PAD_STACK(0x20);

switch (tm->cur_option) {
case 0x1B:
Expand Down Expand Up @@ -1953,14 +1953,13 @@ void fn_8019A86C(TmData* tm, u32 arg1, u32 arg2)

{
TmData* t2 = gm_GetTournamentData();
BracketEntry* ent = &lbl_80473AB8[fn_8018F74C()];
s32 bi = fn_8018F74C();
s32 hmn_count = 0;
s32 active_count = 0;

ent->slots[0].x4E = t2->x4B8[0].x0;
ent->slots[1].x4E = t2->x4B8[1].x0;
ent->slots[2].x4E = t2->x4B8[2].x0;
ent->slots[3].x4E = t2->x4B8[3].x0;
for (i = 0; i < 4; i++) {
lbl_80473AB8[bi].slots[i].x4E = t2->x4B8[i].x0;
}

for (i = 0; i < 4; i++) {
u8 st = tm->x4B8[i].x0;
Expand Down
Loading