From 5305f96957f0ab34bb652ac45b03e94681579a83 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Fri, 24 May 2024 07:11:21 -0500 Subject: [PATCH 1/2] Fix paths to m446dll files --- config/GMPE01_00/rels/m446dll/splits.txt | 16 ++++++++-------- configure.py | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/GMPE01_00/rels/m446dll/splits.txt b/config/GMPE01_00/rels/m446dll/splits.txt index c3840a1a..d9ed569d 100644 --- a/config/GMPE01_00/rels/m446dll/splits.txt +++ b/config/GMPE01_00/rels/m446dll/splits.txt @@ -9,49 +9,49 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x000000A0 -REL/m446dll/main.c: +REL/m446Dll/main.c: .text start:0x000000A0 end:0x00001C64 .rodata start:0x00000000 end:0x00000058 .data start:0x00000000 end:0x00000150 .bss start:0x00000000 end:0x00000018 -REL/m446dll/card.c: +REL/m446Dll/card.c: .text start:0x00001C64 end:0x00003064 .rodata start:0x00000058 end:0x000000D0 .data start:0x00000150 end:0x000001A8 .bss start:0x00000018 end:0x00000020 -REL/m446dll/deck.c: +REL/m446Dll/deck.c: .text start:0x00003064 end:0x00003924 .rodata start:0x000000D0 end:0x00000138 .data start:0x000001A8 end:0x000001E8 .bss start:0x00000020 end:0x00000028 -REL/m446dll/table.c: +REL/m446Dll/table.c: .text start:0x00003924 end:0x0000480C .rodata start:0x00000138 end:0x00000170 .data start:0x000001E8 end:0x00000228 .bss start:0x00000028 end:0x00000030 -REL/m446dll/player.c: +REL/m446Dll/player.c: .text start:0x0000480C end:0x00006778 .rodata start:0x00000170 end:0x00000208 .data start:0x00000228 end:0x00000370 .bss start:0x00000030 end:0x00000038 -REL/m446dll/camera.c: +REL/m446Dll/camera.c: .text start:0x00006778 end:0x000072E0 .rodata start:0x00000208 end:0x00000268 .data start:0x00000370 end:0x000003C8 .bss start:0x00000038 end:0x00000098 -REL/m446dll/cursor.c: +REL/m446Dll/cursor.c: .text start:0x000072E0 end:0x00007BF0 .rodata start:0x00000268 end:0x000002A0 .data start:0x000003C8 end:0x00000410 .bss start:0x00000098 end:0x000000A0 -REL/m446dll/stage.c: +REL/m446Dll/stage.c: .text start:0x00007BF0 end:0x00008618 .rodata start:0x000002A0 end:0x000002D8 .data start:0x00000410 end:0x000004F6 diff --git a/configure.py b/configure.py index 578cdb4d..e8d77548 100644 --- a/configure.py +++ b/configure.py @@ -1188,14 +1188,14 @@ config.libs = [ "m446dll", objects={ Object(Matching, "REL/executor.c"), - Object(NonMatching, "REL/m446dll/main.c"), - Object(Matching, "REL/m446dll/card.c"), - Object(Matching, "REL/m446dll/deck.c"), - Object(Matching, "REL/m446dll/table.c"), - Object(Matching, "REL/m446dll/player.c"), - Object(NonMatching, "REL/m446dll/camera.c"), - Object(NonMatching, "REL/m446dll/cursor.c"), - Object(NonMatching, "REL/m446dll/stage.c"), + Object(NonMatching, "REL/m446Dll/main.c"), + Object(Matching, "REL/m446Dll/card.c"), + Object(Matching, "REL/m446Dll/deck.c"), + Object(Matching, "REL/m446Dll/table.c"), + Object(Matching, "REL/m446Dll/player.c"), + Object(NonMatching, "REL/m446Dll/camera.c"), + Object(NonMatching, "REL/m446Dll/cursor.c"), + Object(NonMatching, "REL/m446Dll/stage.c"), }, ), Rel( From 47c19e459d5aafe8eb61dae2c3391a3f763c0a94 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Fri, 24 May 2024 07:19:18 -0500 Subject: [PATCH 2/2] Build fixes to m446Dll/main.c --- include/REL/m446Dll.h | 1 - src/REL/m446Dll/main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/REL/m446Dll.h b/include/REL/m446Dll.h index fd778597..e6695886 100644 --- a/include/REL/m446Dll.h +++ b/include/REL/m446Dll.h @@ -242,7 +242,6 @@ extern void fn_1_34A0(unkStruct5*, unkStruct4**, s32, s32); extern s32 m446DeckPushCard(unkStruct5*, unkStruct4*, s32); extern s32 m446DeckPopCard(unkStruct2**, unkStruct4**); extern void fn_1_38B0(unkStruct2**); -extern void fn_1_38E0(u32); extern s32 fn_1_38F0(void); // table.c extern s32 fn_1_3924(void); diff --git a/src/REL/m446Dll/main.c b/src/REL/m446Dll/main.c index f06d3efd..2c734ae4 100644 --- a/src/REL/m446Dll/main.c +++ b/src/REL/m446Dll/main.c @@ -70,7 +70,7 @@ void fn_1_13C(omObjData* arg0) { HuWinInit(1); Hu3DLighInit(); frand(); - fn_1_38E0(0); + fn_1_38E0(); fn_1_6778(); fn_1_7BF0(); fn_1_2064(); @@ -388,7 +388,7 @@ void fn_1_C0C(unkStruct* arg0) { void fn_1_CA0(unkStruct* arg0) { s32 var_r29; - unkStruct6 *var_r30; + unkStruct8 *var_r30; var_r30 = arg0->unk2C[arg0->unk1C]; switch (arg0->unk10) { @@ -512,7 +512,7 @@ void fn_1_CA0(unkStruct* arg0) { break; case 15: if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { - fn_1_3EB4(var_r30, arg0->unk34, 4); + fn_1_3EB4((unkStruct6 *)var_r30, arg0->unk34, 4); fn_1_2688(arg0->unk34); for (var_r29 = 0; var_r29 < 3; var_r29++) { fn_1_5648(var_r30, var_r29, &arg0->unk34); @@ -554,7 +554,7 @@ void fn_1_CA0(unkStruct* arg0) { break; case 18: if (arg0->unk14++ >= 60) { - fn_1_31D8(arg0->unk28, &arg0->unk38[0], &arg0->unk94, 1); + fn_1_31D8((unkStruct2 **)arg0->unk28, &arg0->unk38[0], &arg0->unk94, 1); arg0->unk10 = 19; arg0->unk14 = 0; } @@ -569,7 +569,7 @@ void fn_1_CA0(unkStruct* arg0) { case 20: if (arg0->unk14++ >= 120) { for (var_r29 = 0; var_r29 < 3; var_r29++) { - m446DeckPopCard(arg0->unk28, &arg0->unk34); + m446DeckPopCard((unkStruct2 **)arg0->unk28, &arg0->unk34); m446PlayerAppendCard(var_r30, arg0->unk34, 1); fn_1_2EC0(arg0->unk34, 0); } @@ -591,7 +591,7 @@ void fn_1_CA0(unkStruct* arg0) { if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { fn_1_46AC(arg0->unk20); - while (m446DeckPopCard(arg0->unk28, &arg0->unk34)) { + while (m446DeckPopCard((unkStruct2 **)arg0->unk28, &arg0->unk34)) { fn_1_3BF0(arg0->unk20, arg0->unk34, 1); } fn_1_46D0(arg0->unk20); @@ -683,7 +683,7 @@ void fn_1_19D4(void) { } if (var_r30 == 0) { var_r29 = 0; - while (temp_r27 = lbl_1_rodata_18[var_r29++], temp_r27 != 0) { + while ((temp_r27 = lbl_1_rodata_18[var_r29++]) != 0) { HuWinMesColSet(temp_r3, 0); HuWinMesSet(temp_r3, temp_r27); fn_1_18EC(temp_r3, 0x3C);