From b347ee8bd02ede639436f370a873bc8ae2879887 Mon Sep 17 00:00:00 2001 From: mrshigure Date: Sun, 5 Jan 2025 05:59:51 -0800 Subject: [PATCH] Matched last function in m426Dll (#508) --- configure.py | 2 +- src/REL/m426Dll/main.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index 845a2f45..b0884088 100644 --- a/configure.py +++ b/configure.py @@ -1059,7 +1059,7 @@ config.libs = [ Rel( "m426Dll", # Revers-a-Bomb objects={ - Object(NonMatching, "REL/m426Dll/main.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m426Dll/main.c"), }, ), Rel( diff --git a/src/REL/m426Dll/main.c b/src/REL/m426Dll/main.c index 7066b831..e91e3258 100644 --- a/src/REL/m426Dll/main.c +++ b/src/REL/m426Dll/main.c @@ -780,7 +780,6 @@ void fn_1_125C(omObjData *object) object->func = NULL; } -// TODO https://decomp.me/scratch/1aZdv void fn_1_16F8(omObjData *object) { s32 spA8[3]; @@ -813,7 +812,7 @@ void fn_1_16F8(omObjData *object) s32 var_r24; s32 var_r23; s32 var_r22; - s32 var_r21; // this is weird, used as a temporary + s32 var_r21; sp18 = 0; sp14 = 0; @@ -827,7 +826,7 @@ void fn_1_16F8(omObjData *object) } if (var_r31->unk_14) { sp20 = sp1C = 0.0f; - sp10 = 0; + var_r21 = sp10 = 0; fn_1_2F5C(object, &sp20, &sp1C, &sp10); } else { @@ -850,8 +849,7 @@ void fn_1_16F8(omObjData *object) else { if (!lbl_1_bss_40) { sp20 = sp1C = 0.0f; - - sp10 = 0; + var_r21 = sp10 = 0; } if (fabs(sp20) > 8.0) { var_f30 = 0.25f * sp20;