From a6e227c6f3f37ddd8f57d12ac7be2ec962b6ef1d Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Wed, 11 Sep 2024 19:08:06 -0500 Subject: [PATCH] Finish m444dll --- configure.py | 2 +- src/REL/m444dll/main.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.py b/configure.py index 4f226ebb..90602312 100644 --- a/configure.py +++ b/configure.py @@ -1126,7 +1126,7 @@ config.libs = [ Rel( "m444dll", # Reversal of Fortune objects={ - Object(NonMatching, "REL/m444dll/main.c"), + Object(Matching, "REL/m444dll/main.c"), Object(Matching, "REL/m444dll/pinball.c"), Object(Matching, "REL/m444dll/datalist.c"), Object(Matching, "REL/m444dll/shadow.c"), diff --git a/src/REL/m444dll/main.c b/src/REL/m444dll/main.c index 0c11669f..2617028a 100644 --- a/src/REL/m444dll/main.c +++ b/src/REL/m444dll/main.c @@ -88,6 +88,7 @@ Vec lbl_1_bss_290[2]; float lbl_1_bss_288[2]; s16 lbl_1_bss_148[20][8]; s16 lbl_1_bss_8[20][8]; +s16 lbl_1_bss_6; s16 lbl_1_bss_4; s32 lbl_1_bss_0; @@ -656,9 +657,9 @@ void fn_1_470(void) default: break; } - HuWinInsertMesSizeGet((u32)GWPlayerCfg[lbl_1_bss_2D6].character, 0); + HuWinInsertMesSizeGet((8+GWPlayerCfg[lbl_1_bss_2D6].character)-8, 0); HuWinInsertMesSizeGet(temp_r24, 1); - HuWinInsertMesSizeGet((u32)GWPlayerCfg[lbl_1_bss_2D4].character, 2); + HuWinInsertMesSizeGet((8+GWPlayerCfg[lbl_1_bss_2D4].character)-8, 2); HuWinMesMaxSizeGet(1, sp8, temp_r28); temp_r30 = HuWinExCreateStyled(-10000, 340, sp8[0], sp8[1], -1, 1); HuWinExAnimIn(temp_r30); @@ -692,7 +693,7 @@ void fn_1_470(void) } for (temp_r31 = 0; temp_r31 <= 20; temp_r31++) { for (temp_r27 = 0; temp_r27 < 3; temp_r27++) { - lbl_1_bss_34C[temp_r27].y = (180.0 * cosd(4.5 * temp_r29)) - 100.0; + lbl_1_bss_34C[temp_r27].y = (180.0 * cosd(4.5 * temp_r31)) - 100.0; } HuPrcVSleep(); }