From ce98a67771a8aa4f9d704544d14542222dedb573 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Apr 2024 15:26:36 -0500 Subject: [PATCH 1/4] Match filesel.c --- config/GMPE01_00/rels/modeseldll/symbols.txt | 170 ++++----- configure.py | 2 +- include/REL/modeseldll.h | 1 - include/game/saveload.h | 2 +- src/REL/modeseldll/filesel.c | 357 +++++++++---------- src/game/saveload.c | 4 +- 6 files changed, 265 insertions(+), 271 deletions(-) diff --git a/config/GMPE01_00/rels/modeseldll/symbols.txt b/config/GMPE01_00/rels/modeseldll/symbols.txt index 6269393c..a1142f6e 100644 --- a/config/GMPE01_00/rels/modeseldll/symbols.txt +++ b/config/GMPE01_00/rels/modeseldll/symbols.txt @@ -115,67 +115,67 @@ lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float -lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float -lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float -lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float -lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float -lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float -lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float -lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float -lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float -lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float -lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float -lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 data:double -lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:double -lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float -lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x8 data:double -lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 data:float -lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float -lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 data:float -lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double -lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 data:double -lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 data:double -lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float -lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float -lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 data:double -lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 data:double -lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 data:float -lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 data:float -lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 data:double -lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 data:double -lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x8 data:double -lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x8 data:double -lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x8 data:double -lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 data:float -lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x8 data:double -lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 data:float -lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 data:float -lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 data:float -lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 data:float -lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 data:float -lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 data:double -lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 data:double -lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x8 data:double -lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 data:float -lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 data:float -lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x4 data:float -lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 data:double -lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 data:double -lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 data:float -lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 data:float -lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 data:float -lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 data:float -lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 data:float -lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 data:float -lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 data:float -lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 data:float -lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 data:double -lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 data:double -lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 data:double -lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 data:float -lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 data:float -lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 data:byte +lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 scope:local data:float +lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 scope:local data:float +lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x4 scope:local data:float +lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double +lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x8 scope:local data:double +lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:double +lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float +lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x8 scope:local data:double +lbl_1_rodata_238 = .rodata:0x00000238; // type:object size:0x8 scope:local data:double +lbl_1_rodata_240 = .rodata:0x00000240; // type:object size:0x4 scope:local data:float +lbl_1_rodata_244 = .rodata:0x00000244; // type:object size:0x4 scope:local data:float +lbl_1_rodata_248 = .rodata:0x00000248; // type:object size:0x8 scope:local data:double +lbl_1_rodata_250 = .rodata:0x00000250; // type:object size:0x8 scope:local data:double +lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x8 scope:local data:double +lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x8 scope:local data:double +lbl_1_rodata_268 = .rodata:0x00000268; // type:object size:0x8 scope:local data:double +lbl_1_rodata_270 = .rodata:0x00000270; // type:object size:0x4 scope:local data:float +lbl_1_rodata_278 = .rodata:0x00000278; // type:object size:0x8 scope:local data:double +lbl_1_rodata_280 = .rodata:0x00000280; // type:object size:0x4 scope:local data:float +lbl_1_rodata_284 = .rodata:0x00000284; // type:object size:0x4 scope:local data:float +lbl_1_rodata_288 = .rodata:0x00000288; // type:object size:0x4 scope:local data:float +lbl_1_rodata_28C = .rodata:0x0000028C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_290 = .rodata:0x00000290; // type:object size:0x4 scope:local data:float +lbl_1_rodata_298 = .rodata:0x00000298; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2A0 = .rodata:0x000002A0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2B4 = .rodata:0x000002B4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 scope:local data:float +lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x8 scope:local data:double +lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 scope:local data:double +lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x8 scope:local data:double +lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 scope:local data:float +lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 scope:local data:byte lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x4 scope:local data:float lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 scope:local data:double lbl_1_data_0 = .data:0x00000000; // type:object size:0x38 @@ -194,35 +194,35 @@ lbl_1_data_F1 = .data:0x000000F1; // type:object size:0xF lbl_1_data_100 = .data:0x00000100; // type:object size:0x2 data:2byte lbl_1_data_104 = .data:0x00000104; // type:object size:0x118 data:float lbl_1_data_21C = .data:0x0000021C; // type:object size:0x48 data:4byte -lbl_1_data_264 = .data:0x00000264; // type:object size:0x3 -lbl_1_data_267 = .data:0x00000267; // type:object size:0x3 +lbl_1_data_264 = .data:0x00000264; // type:object size:0x3 scope:local +lbl_1_data_267 = .data:0x00000267; // type:object size:0x3 scope:local lbl_1_data_26C = .data:0x0000026C; // type:object size:0x8 -lbl_1_data_274 = .data:0x00000274; // type:object size:0x2 data:string -lbl_1_data_276 = .data:0x00000276; // type:object size:0x2 data:string +lbl_1_data_274 = .data:0x00000274; // type:object size:0x2 scope:local data:string +lbl_1_data_276 = .data:0x00000276; // type:object size:0x2 scope:local data:string lbl_1_data_278 = .data:0x00000278; // type:object size:0x8 -lbl_1_data_280 = .data:0x00000280; // type:object size:0x2 data:string -lbl_1_data_282 = .data:0x00000282; // type:object size:0x2 data:string -lbl_1_data_284 = .data:0x00000284; // type:object size:0x4 +lbl_1_data_280 = .data:0x00000280; // type:object size:0x2 scope:local data:string +lbl_1_data_282 = .data:0x00000282; // type:object size:0x2 scope:local data:string +lbl_1_data_284 = .data:0x00000284; // type:object size:0x4 scope:local lbl_1_data_288 = .data:0x00000288; // type:object size:0xC -lbl_1_data_294 = .data:0x00000294; // type:object size:0x19 data:string -lbl_1_data_2AD = .data:0x000002AD; // type:object size:0x23 data:string -lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x1B data:string -lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x19 data:string -lbl_1_data_304 = .data:0x00000304; // type:object size:0x19 data:string -lbl_1_data_31D = .data:0x0000031D; // type:object size:0x20 data:string -lbl_1_data_33D = .data:0x0000033D; // type:object size:0x1B data:string -lbl_1_data_358 = .data:0x00000358; // type:object size:0x1B data:string -lbl_1_data_373 = .data:0x00000373; // type:object size:0x22 data:string -lbl_1_data_395 = .data:0x00000395; // type:object size:0x5 data:string -lbl_1_data_39A = .data:0x0000039A; // type:object size:0x15 data:string -lbl_1_data_3AF = .data:0x000003AF; // type:object size:0x15 data:string -lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x1F data:string -lbl_1_data_3E3 = .data:0x000003E3; // type:object size:0x10 data:string -lbl_1_data_3F3 = .data:0x000003F3; // type:object size:0xD data:string +lbl_1_data_294 = .data:0x00000294; // type:object size:0x19 scope:local data:string +lbl_1_data_2AD = .data:0x000002AD; // type:object size:0x23 scope:local data:string +lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x1B scope:local data:string +lbl_1_data_2EB = .data:0x000002EB; // type:object size:0x19 scope:local data:string +lbl_1_data_304 = .data:0x00000304; // type:object size:0x19 scope:local data:string +lbl_1_data_31D = .data:0x0000031D; // type:object size:0x20 scope:local data:string +lbl_1_data_33D = .data:0x0000033D; // type:object size:0x1B scope:local data:string +lbl_1_data_358 = .data:0x00000358; // type:object size:0x1B scope:local data:string +lbl_1_data_373 = .data:0x00000373; // type:object size:0x22 scope:local data:string +lbl_1_data_395 = .data:0x00000395; // type:object size:0x5 scope:local data:string +lbl_1_data_39A = .data:0x0000039A; // type:object size:0x15 scope:local data:string +lbl_1_data_3AF = .data:0x000003AF; // type:object size:0x15 scope:local data:string +lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x1F scope:local data:string +lbl_1_data_3E3 = .data:0x000003E3; // type:object size:0x10 scope:local data:string +lbl_1_data_3F3 = .data:0x000003F3; // type:object size:0xD scope:local data:string lbl_1_data_400 = .data:0x00000400; // type:object size:0x16 -lbl_1_data_416 = .data:0x00000416; // type:object size:0x6 data:string +lbl_1_data_416 = .data:0x00000416; // type:object size:0x6 scope:local data:string lbl_1_data_41C = .data:0x0000041C; // type:object size:0x2 data:2byte -lbl_1_data_41E = .data:0x0000041E; // type:object size:0xA +lbl_1_data_41E = .data:0x0000041E; // type:object size:0xA scope:local lbl_1_data_428 = .data:0x00000428; // type:object size:0x514 lbl_1_data_93C = .data:0x0000093C; // type:object size:0xF0 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index b3d0471f..603d7745 100644 --- a/configure.py +++ b/configure.py @@ -1133,7 +1133,7 @@ config.libs = [ Object(Matching, "REL/executor.c"), Object(Matching, "REL/modeseldll/main.c"), Object(NonMatching, "REL/modeseldll/modesel.c"), - Object(NonMatching, "REL/modeseldll/filesel.c"), + Object(Matching, "REL/modeseldll/filesel.c"), Object(Matching, "REL/modeseldll/datalist.c"), } ), diff --git a/include/REL/modeseldll.h b/include/REL/modeseldll.h index d053b97e..db80185b 100644 --- a/include/REL/modeseldll.h +++ b/include/REL/modeseldll.h @@ -27,7 +27,6 @@ typedef struct datalist_sprite { GXColor color; } DataListSprite; -void fn_1_1EC0(s16 view); s32 fn_1_2490(void); s32 fn_1_37DC(void); diff --git a/include/game/saveload.h b/include/game/saveload.h index c9cb4452..d17712a3 100644 --- a/include/game/saveload.h +++ b/include/game/saveload.h @@ -51,7 +51,7 @@ s32 SLLoad(void); void SLLoadGameStat(void); void SLLoadBoard(void); void SLLoadBoardStory(void); -void SLSerialNoGet(void); +s32 SLSerialNoGet(void); BOOL SLSerialNoCheck(void); BOOL SLCheckSumCheck(void); u16 SLCheckSumGet(void); diff --git a/src/REL/modeseldll/filesel.c b/src/REL/modeseldll/filesel.c index 378e4b94..a6396f80 100644 --- a/src/REL/modeseldll/filesel.c +++ b/src/REL/modeseldll/filesel.c @@ -171,8 +171,6 @@ s32 fn_1_5C38(void); void fn_1_B8CC(u32 arg0); void fn_1_BA20(void); -//Various temporary register errors -//Scratch: https://decomp.me/scratch/BDhfa s32 fn_1_3AAC(void) { s16 temp_r31; @@ -197,179 +195,176 @@ s32 fn_1_3AAC(void) lbl_1_bss_146 = HuWinExCreateStyled(-10000.0f, 316.0f, sp8[0], sp8[1], -1, 0); HuWinBGTPLvlSet(lbl_1_bss_146, 0); HuWinMesSpeedSet(lbl_1_bss_146, 0); - while (1) { - repeat: - sp28.x = 188; - sp28.y = 250; - sp28.z = 600; - Hu3D2Dto3D(&sp28, 1, &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[2], &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[4], &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[0], &sp1C); - sp28.x = 388; - Hu3D2Dto3D(&sp28, 1, &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[3], &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[5], &sp1C); - Hu3DModelPosSetV(lbl_1_bss_19A[1], &sp1C); - Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[4], 1); - Hu3DModelAttrReset(lbl_1_bss_19A[3], 1); - Hu3DModelAttrSet(lbl_1_bss_19A[5], 1); - Hu3DModelRotSet(lbl_1_bss_19A[2], 0, 0, 0); - Hu3DModelRotSet(lbl_1_bss_19A[3], 0, 0, 0); - fn_1_57C8(lbl_1_bss_19A[4]); - fn_1_57C8(lbl_1_bss_19A[5]); - lbl_1_bss_12C[0] = lbl_1_bss_12C[1] = 1; - lbl_1_bss_108[0] = lbl_1_bss_108[1] = lbl_1_bss_100[0] = lbl_1_bss_100[1] = 1.0f; - lbl_1_bss_11C = -1; - fn_1_5C38(); - for(temp_r30=0; temp_r30<=20; temp_r30++) { - temp_f31 = temp_r30/20.0; - temp_f31 = sin(M_PI*(90.0f*temp_f31)/180.0); - Hu3DModelScaleSet(lbl_1_bss_19A[0], temp_f31, temp_f31, temp_f31); - Hu3DModelScaleSet(lbl_1_bss_19A[1], temp_f31, temp_f31, temp_f31); - Hu3DModelScaleSet(lbl_1_bss_19A[2], temp_f31, temp_f31, temp_f31); - Hu3DModelScaleSet(lbl_1_bss_19A[3], temp_f31, temp_f31, temp_f31); - Hu3DModelScaleSet(lbl_1_bss_19A[4], temp_f31, temp_f31, temp_f31); - Hu3DModelScaleSet(lbl_1_bss_19A[5], temp_f31, temp_f31, temp_f31); - HuPrcVSleep(); - } - while(1) { - repeat_loop: - HuWinDispOff(lbl_1_bss_146); - temp_r28 = fn_1_562C(); - if(temp_r28 == 0 && fn_1_5C38() == 0) { - if(fn_1_5C38() == 0) { - HuWinMesSet(lbl_1_bss_148, 0x100002); - HuWinMesWait(lbl_1_bss_148); - } - HuWinMesSet(lbl_1_bss_148, 0x10004F); - HuWinAttrSet(lbl_1_bss_148, 0x10); - HuWinMesWait(lbl_1_bss_148); - temp_r27 = HuWinChoiceGet(lbl_1_bss_148, 1); - if(temp_r27 == 0) { - SLSaveFlagSet(0); - temp_r29 = 1; - goto cleanup; - } - HuWinInsertMesSet(lbl_1_bss_148, 0x100052, 0); - HuWinMesSet(lbl_1_bss_148, 0x10004C); - HuWinMesWait(lbl_1_bss_148); - while(!(HuPadBtnDown[0] & PAD_BUTTON_A)) { - HuPrcVSleep(); - } - } - while(!fn_1_5C38()) { - temp_r28 = fn_1_562C(); - HuWinMesSet(lbl_1_bss_148, 0x100002); - HuWinMesWait(lbl_1_bss_148); - if(temp_r23->key_down & PAD_BUTTON_B) { - HuAudFXPlay(3); - return 0; - } - if(fn_1_5C38()) { - break; - } - HuWinMesSet(lbl_1_bss_148, 0x10004B); - HuWinAttrSet(lbl_1_bss_148, 0x10); - HuWinMesWait(lbl_1_bss_148); - temp_r27 = HuWinChoiceGet(lbl_1_bss_148, 1); - if(temp_r27 == 0) { - SLSaveFlagSet(0); - temp_r29 = 1; - goto cleanup; - } - HuWinInsertMesSet(lbl_1_bss_148, 0x100052, 0); - HuWinMesSet(lbl_1_bss_148, 0x10004C); - HuWinMesWait(lbl_1_bss_148); - while(!(HuPadBtnDown[0] & PAD_BUTTON_A)) { - HuPrcVSleep(); - } - } - SLSaveFlagSet(1); - HuWinMesSet(lbl_1_bss_148, 0x100001); - HuWinMesWait(lbl_1_bss_148); - HuWinMesSet(lbl_1_bss_146, 0x10000C); - HuWinDispOn(lbl_1_bss_146); - if(curSlotNo == 0) { - if(lbl_1_bss_14C & 0x1) { - temp_r31 = 0; - } else { - temp_r31 = 1; - } - } else { - if(lbl_1_bss_14C & 0x2) { - temp_r31 = 1; - } else { - temp_r31 = 0; - } - } - fn_1_5BAC(temp_r31, 1); - HuPrcSleep(10); - temp_r24 = temp_r31; - while(1) { - if(!fn_1_5C38()) { - fn_1_5BAC(temp_r31, 0); - HuPrcSleep(10); - goto repeat_loop; - } else { - if((HuPadDStkRep[0] & 0x1) && (lbl_1_bss_14C & 0x1)) { - temp_r31 = 0; - } else if((HuPadDStkRep[0] & 0x2) && (lbl_1_bss_14C & 0x2)) { - temp_r31 = 1; - } else if(!(lbl_1_bss_14C & (1 << temp_r31))) { - if(!(lbl_1_bss_14C & (1 << ((temp_r31+1) & 0x1)))) { - fn_1_5BAC(temp_r31, 0); - HuPrcSleep(10); - goto repeat_loop; - } else { - temp_r31 = (temp_r31+1) & 0x1; - } - } - if(temp_r24 != temp_r31) { - HuAudFXPlay(0); - fn_1_5BAC(temp_r31, 1); - fn_1_5BAC((temp_r31+1) & 0x1, 0); - HuPrcSleep(10); - temp_r24 = temp_r31; - } - if(HuPadBtnDown[0] & PAD_BUTTON_A) { - HuAudFXPlay(2096); - goto loop_exit; - } else if(HuPadBtnDown[0] & PAD_BUTTON_B) { - HuAudFXPlay(3); - return 0; - } - } - HuPrcVSleep(); - } - } - loop_exit: - HuWinHomeClear(lbl_1_bss_148); - temp_r26 = (temp_r31+1)&0x1; - Hu3DMotionSet(lbl_1_bss_19A[temp_r31+4], lbl_1_bss_16A[7]); - Hu3DMotionSpeedSet(lbl_1_bss_19A[temp_r31+4], 2.0f); - lbl_1_bss_12C[0] = lbl_1_bss_12C[1] = 0; - lbl_1_bss_11C = temp_r31; - SLCurSlotNoSet(temp_r31); - temp_r28 = HuCardMount(temp_r31); - if(temp_r28 == 0) { - SLSerialNoGet(); - temp_r28 = HuCardOpen(temp_r31, SaveFileNameTbl[0], &sp34); - if(temp_r28 != 0 && temp_r28 != -4) { - temp_r29 = 1; - } else { - temp_r29 = 0; - } - HuCardClose(&sp34); - break; - } else { - if(temp_r28 != -3) { - temp_r29 = 1; - break; - } - } - } + repeat: + sp28.x = 188; + sp28.y = 250; + sp28.z = 600; + Hu3D2Dto3D(&sp28, 1, &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[2], &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[4], &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[0], &sp1C); + sp28.x = 388; + Hu3D2Dto3D(&sp28, 1, &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[3], &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[5], &sp1C); + Hu3DModelPosSetV(lbl_1_bss_19A[1], &sp1C); + Hu3DModelAttrReset(lbl_1_bss_19A[2], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[4], 1); + Hu3DModelAttrReset(lbl_1_bss_19A[3], 1); + Hu3DModelAttrSet(lbl_1_bss_19A[5], 1); + Hu3DModelRotSet(lbl_1_bss_19A[2], 0, 0, 0); + Hu3DModelRotSet(lbl_1_bss_19A[3], 0, 0, 0); + fn_1_57C8(lbl_1_bss_19A[4]); + fn_1_57C8(lbl_1_bss_19A[5]); + lbl_1_bss_12C[0] = lbl_1_bss_12C[1] = 1; + lbl_1_bss_108[0] = lbl_1_bss_108[1] = lbl_1_bss_100[0] = lbl_1_bss_100[1] = 1.0f; + lbl_1_bss_11C = -1; + fn_1_5C38(); + for(temp_r30=0; temp_r30<=20; temp_r30++) { + temp_f31 = temp_r30/20.0; + temp_f31 = sin(M_PI*(90.0f*temp_f31)/180.0); + Hu3DModelScaleSet(lbl_1_bss_19A[0], temp_f31, temp_f31, temp_f31); + Hu3DModelScaleSet(lbl_1_bss_19A[1], temp_f31, temp_f31, temp_f31); + Hu3DModelScaleSet(lbl_1_bss_19A[2], temp_f31, temp_f31, temp_f31); + Hu3DModelScaleSet(lbl_1_bss_19A[3], temp_f31, temp_f31, temp_f31); + Hu3DModelScaleSet(lbl_1_bss_19A[4], temp_f31, temp_f31, temp_f31); + Hu3DModelScaleSet(lbl_1_bss_19A[5], temp_f31, temp_f31, temp_f31); + HuPrcVSleep(); + } + while(1) { + repeat_loop: + HuWinDispOff(lbl_1_bss_146); + temp_r28 = fn_1_562C(); + if(temp_r28 == 0 && fn_1_5C38() == 0) { + if(fn_1_5C38() == 0) { + HuWinMesSet(lbl_1_bss_148, 0x100002); + HuWinMesWait(lbl_1_bss_148); + } + HuWinMesSet(lbl_1_bss_148, 0x10004F); + HuWinAttrSet(lbl_1_bss_148, 0x10); + HuWinMesWait(lbl_1_bss_148); + temp_r27 = HuWinChoiceGet(lbl_1_bss_148, 1); + if(temp_r27 == 0) { + SLSaveFlagSet(0); + temp_r29 = 1; + goto cleanup; + } + HuWinInsertMesSet(lbl_1_bss_148, 0x100052, 0); + HuWinMesSet(lbl_1_bss_148, 0x10004C); + HuWinMesWait(lbl_1_bss_148); + while(!(HuPadBtnDown[0] & PAD_BUTTON_A)) { + HuPrcVSleep(); + } + } + while(!fn_1_5C38()) { + temp_r28 = fn_1_562C(); + HuWinMesSet(lbl_1_bss_148, 0x100002); + HuWinMesWait(lbl_1_bss_148); + if(temp_r23->key_down & PAD_BUTTON_B) { + HuAudFXPlay(3); + return 0; + } + if(fn_1_5C38()) { + break; + } + HuWinMesSet(lbl_1_bss_148, 0x10004B); + HuWinAttrSet(lbl_1_bss_148, 0x10); + HuWinMesWait(lbl_1_bss_148); + temp_r27 = HuWinChoiceGet(lbl_1_bss_148, 1); + if(temp_r27 == 0) { + SLSaveFlagSet(0); + temp_r29 = 1; + goto cleanup; + } + HuWinInsertMesSet(lbl_1_bss_148, 0x100052, 0); + HuWinMesSet(lbl_1_bss_148, 0x10004C); + HuWinMesWait(lbl_1_bss_148); + while(!(HuPadBtnDown[0] & PAD_BUTTON_A)) { + HuPrcVSleep(); + } + } + SLSaveFlagSet(1); + HuWinMesSet(lbl_1_bss_148, 0x100001); + HuWinMesWait(lbl_1_bss_148); + HuWinMesSet(lbl_1_bss_146, 0x10000C); + HuWinDispOn(lbl_1_bss_146); + if(curSlotNo == 0) { + if(lbl_1_bss_14C & 0x1) { + temp_r31 = 0; + } else { + temp_r31 = 1; + } + } else { + if(lbl_1_bss_14C & 0x2) { + temp_r31 = 1; + } else { + temp_r31 = 0; + } + } + fn_1_5BAC(temp_r31, 1); + HuPrcSleep(10); + temp_r24 = temp_r31; + while(1) { + if(!fn_1_5C38()) { + fn_1_5BAC(temp_r31, 0); + HuPrcSleep(10); + goto repeat_loop; + } else { + if((HuPadDStkRep[0] & 0x1) && (lbl_1_bss_14C & 0x1)) { + temp_r31 = 0; + } else if((HuPadDStkRep[0] & 0x2) && (lbl_1_bss_14C & 0x2)) { + temp_r31 = 1; + } else if(!(lbl_1_bss_14C & (1 << temp_r31))) { + if(!(lbl_1_bss_14C & (1 << ((temp_r31+1) & 0x1)))) { + fn_1_5BAC(temp_r31, 0); + HuPrcSleep(10); + goto repeat_loop; + } else { + temp_r31 = (temp_r31+1) & 0x1; + } + } + if(temp_r24 != temp_r31) { + HuAudFXPlay(0); + fn_1_5BAC(temp_r31, 1); + fn_1_5BAC((temp_r31+1) & 0x1, 0); + HuPrcSleep(10); + temp_r24 = temp_r31; + } + if(HuPadBtnDown[0] & PAD_BUTTON_A) { + HuAudFXPlay(2096); + goto loop_exit; + } else if(HuPadBtnDown[0] & PAD_BUTTON_B) { + HuAudFXPlay(3); + return 0; + } + } + HuPrcVSleep(); + } + } + loop_exit: + HuWinHomeClear(lbl_1_bss_148); + temp_r26 = (temp_r31+1)&0x1; + Hu3DMotionSet(lbl_1_bss_19A[temp_r31+4], lbl_1_bss_16A[7]); + Hu3DMotionSpeedSet(lbl_1_bss_19A[temp_r31+4], 2.0f); + lbl_1_bss_12C[0] = lbl_1_bss_12C[1] = 0; + lbl_1_bss_11C = temp_r31; + SLCurSlotNoSet(temp_r31); + temp_r28 = HuCardMount(temp_r31); + if(temp_r28 == 0) { + SLSerialNoGet(); + temp_r28 = HuCardOpen(temp_r31, SaveFileNameTbl[0], &sp34); + if(temp_r28 != 0 && temp_r28 != -4) { + temp_r29 = 1; + } else { + temp_r29 = 0; + } + HuCardClose(&sp34); + } else { + if(temp_r28 == -3) { + goto repeat; + } + temp_r29 = 1; + } temp_r27 = HuCardSectorSizeGet(curSlotNo); if(temp_r27 > 0 && temp_r27 != 8192) { HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(lbl_1_data_278[curSlotNo]), 0); @@ -425,7 +420,7 @@ s32 fn_1_3AAC(void) Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C); lbl_1_bss_108[temp_r31] *= cos(M_PI*(90.0f*temp_f31)/180.0); lbl_1_bss_100[temp_r31] = 1.0-temp_f31; - temp_f31 = 1.0+(0.3*cos(M_PI*(180.0f*temp_f31)/180.0)); + temp_f31 = 1.0+(0.3*cos(M_PI*(90.0f*temp_f31)/180.0)); Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31); } } @@ -553,7 +548,7 @@ s32 fn_1_3AAC(void) Hu3DModelPosSetV(lbl_1_bss_19A[temp_r31], &sp1C); lbl_1_bss_108[temp_r31] *= cos(M_PI*(90.0f*temp_f31)/180.0); lbl_1_bss_100[temp_r31] = 1.0-temp_f31; - temp_f31 = 1.0+(0.3*cos(M_PI*(180.0f*temp_f31)/180.0)); + temp_f31 = 1.0+(0.5*cos(M_PI*(90.0f*temp_f31)/180.0)); Hu3DModelScaleSet(lbl_1_bss_19A[temp_r31], temp_f31, temp_f31, temp_f31); } HuPrcVSleep(); @@ -2016,9 +2011,9 @@ void fn_1_BA80(s16 boxno) HuWinInsertMesSet(lbl_1_bss_148, 0x100011, 0); HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesDummy), 1); HuWinInsertMesSet(lbl_1_bss_148, 0x100012+lbl_1_bss_9E[boxno], 2); - sprintf(mesMaxTurn, "%d", lbl_1_bss_98[boxno]); + sprintf(mesMaxTurn, "%2d", lbl_1_bss_98[boxno]); HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesMaxTurn), 3); - sprintf(mesTurn, "%d", lbl_1_bss_92[boxno]); + sprintf(mesTurn, "%2d", lbl_1_bss_92[boxno]); HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesTurn), 4); HuWinMesSet(lbl_1_bss_148, 0x100042); } else { @@ -2038,9 +2033,9 @@ void fn_1_BA80(s16 boxno) HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesDummy), 1); } HuWinInsertMesSet(lbl_1_bss_148, 0x100012+lbl_1_bss_9E[boxno], 2); - sprintf(mesMaxTurn, "%d", lbl_1_bss_98[boxno]); + sprintf(mesMaxTurn, "%2d", lbl_1_bss_98[boxno]); HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesMaxTurn), 3); - sprintf(mesTurn, "%d", lbl_1_bss_92[boxno]); + sprintf(mesTurn, "%2d", lbl_1_bss_92[boxno]); HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(mesTurn), 4); HuWinMesSet(lbl_1_bss_148, 0x100042); } diff --git a/src/game/saveload.c b/src/game/saveload.c index bff66ebc..1b717efc 100644 --- a/src/game/saveload.c +++ b/src/game/saveload.c @@ -484,8 +484,8 @@ void SLLoadBoardStory(void) { } } -void SLSerialNoGet(void) { - CARDGetSerialNo(curSlotNo, &SLSerialNo); +s32 SLSerialNoGet(void) { + return CARDGetSerialNo(curSlotNo, &SLSerialNo); } BOOL SLSerialNoCheck(void) { From cffbe86a7f5da172b4452da99756b81ac3de559f Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Apr 2024 18:32:19 -0500 Subject: [PATCH 2/4] Change some splits --- config/GMPE01_00/rels/m435Dll/splits.txt | 10 +++++++++ config/GMPE01_00/rels/m435Dll/symbols.txt | 3 ++- config/GMPE01_00/rels/m436Dll/splits.txt | 10 +++++++++ config/GMPE01_00/rels/m436Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m437Dll/splits.txt | 11 +++++++++ config/GMPE01_00/rels/m438Dll/splits.txt | 20 +++++++++++++++++ config/GMPE01_00/rels/m438Dll/symbols.txt | 6 ++--- config/GMPE01_00/rels/mgmodedll/splits.txt | 3 ++- configure.py | 26 ++++++++++++++++++++++ 9 files changed, 85 insertions(+), 6 deletions(-) diff --git a/config/GMPE01_00/rels/m435Dll/splits.txt b/config/GMPE01_00/rels/m435Dll/splits.txt index 531cd645..00a5b382 100644 --- a/config/GMPE01_00/rels/m435Dll/splits.txt +++ b/config/GMPE01_00/rels/m435Dll/splits.txt @@ -5,3 +5,13 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m435Dll/main.c: + .text start:0x00000000 end:0x0001526C + .rodata start:0x00000000 end:0x000004C0 + .data start:0x00000000 end:0x0000055C + .bss start:0x00000000 end:0x00004F48 + +REL/m435Dll/sequence.c: + .text start:0x0001526C end:0x0001A44C + .rodata start:0x000004C0 end:0x00000530 diff --git a/config/GMPE01_00/rels/m435Dll/symbols.txt b/config/GMPE01_00/rels/m435Dll/symbols.txt index f12299da..6be340bb 100644 --- a/config/GMPE01_00/rels/m435Dll/symbols.txt +++ b/config/GMPE01_00/rels/m435Dll/symbols.txt @@ -391,7 +391,8 @@ lbl_1_rodata_414 = .rodata:0x00000414; // type:object size:0x8 data:4byte lbl_1_rodata_41C = .rodata:0x0000041C; // type:object size:0x8 data:4byte lbl_1_rodata_424 = .rodata:0x00000424; // type:object size:0x8 data:4byte lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x30 data:4byte -lbl_1_rodata_45C = .rodata:0x0000045C; // type:object size:0x64 data:4byte +lbl_1_rodata_45C = .rodata:0x0000045C; // type:object size:0x30 data:4byte +lbl_1_rodata_48C = .rodata:0x0000048C; // type:object size:0x30 data:4byte lbl_1_rodata_4C0 = .rodata:0x000004C0; // type:object size:0x4 data:float lbl_1_rodata_4C8 = .rodata:0x000004C8; // type:object size:0x8 data:double lbl_1_rodata_4D0 = .rodata:0x000004D0; // type:object size:0x4 data:float diff --git a/config/GMPE01_00/rels/m436Dll/splits.txt b/config/GMPE01_00/rels/m436Dll/splits.txt index 531cd645..9c8febcd 100644 --- a/config/GMPE01_00/rels/m436Dll/splits.txt +++ b/config/GMPE01_00/rels/m436Dll/splits.txt @@ -5,3 +5,13 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m436Dll/main.c: + .text start:0x00000000 end:0x000110FC + .rodata start:0x00000000 end:0x00000350 + .data start:0x00000000 end:0x0000036C + .bss start:0x00000000 end:0x000004B4 + +REL/m436Dll/sequence.c: + .text start:0x000110FC end:0x000154B0 + .rodata start:0x00000350 end:0x000003B8 diff --git a/config/GMPE01_00/rels/m436Dll/symbols.txt b/config/GMPE01_00/rels/m436Dll/symbols.txt index 03264278..4e82430a 100644 --- a/config/GMPE01_00/rels/m436Dll/symbols.txt +++ b/config/GMPE01_00/rels/m436Dll/symbols.txt @@ -287,7 +287,7 @@ lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 data:float lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x4 data:float lbl_1_rodata_314 = .rodata:0x00000314; // type:object size:0x4 data:float lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x4 data:float -lbl_1_rodata_31C = .rodata:0x0000031C; // type:object size:0x34 data:4byte +lbl_1_rodata_31C = .rodata:0x0000031C; // type:object size:0x30 data:4byte lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x4 data:float lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x8 data:double lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x4 data:float diff --git a/config/GMPE01_00/rels/m437Dll/splits.txt b/config/GMPE01_00/rels/m437Dll/splits.txt index 531cd645..a7ae55a1 100644 --- a/config/GMPE01_00/rels/m437Dll/splits.txt +++ b/config/GMPE01_00/rels/m437Dll/splits.txt @@ -5,3 +5,14 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m437Dll/main.c: + .text start:0x00000000 end:0x00011348 + .rodata start:0x00000000 end:0x000005D0 + .data start:0x00000000 end:0x00000350 + .bss start:0x00000000 end:0x000009A8 + +REL/m437Dll/sequence.c: + .text start:0x00011348 end:0x0001679C + .rodata start:0x000005D0 end:0x00000640 + .data start:0x00000350 end:0x00000430 diff --git a/config/GMPE01_00/rels/m438Dll/splits.txt b/config/GMPE01_00/rels/m438Dll/splits.txt index 531cd645..9a4176d6 100644 --- a/config/GMPE01_00/rels/m438Dll/splits.txt +++ b/config/GMPE01_00/rels/m438Dll/splits.txt @@ -5,3 +5,23 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m438Dll/main.c: + .text start:0x000000A0 end:0x0000B4D8 + .rodata start:0x00000000 end:0x000002C8 + .data start:0x00000000 end:0x00000750 + .bss start:0x00000000 end:0x00000E28 + +REL/m438Dll/map.c: + .text start:0x0000B4D8 end:0x0000E658 + .rodata start:0x000002C8 end:0x00000450 + .data start:0x00000750 end:0x00000938 + .bss start:0x00000E28 end:0x000010A4 + +REL/m438Dll/fire.c: + .text start:0x0000E658 end:0x00012B98 + .rodata start:0x00000450 end:0x000004B0 + .data start:0x00000938 end:0x00000943 diff --git a/config/GMPE01_00/rels/m438Dll/symbols.txt b/config/GMPE01_00/rels/m438Dll/symbols.txt index 7ea887f2..5d7edf49 100644 --- a/config/GMPE01_00/rels/m438Dll/symbols.txt +++ b/config/GMPE01_00/rels/m438Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x43C +ModuleProlog = .text:0x000000A0; // type:function size:0x43C fn_1_4DC = .text:0x000004DC; // type:function size:0x20 fn_1_4FC = .text:0x000004FC; // type:function size:0x478 fn_1_974 = .text:0x00000974; // type:function size:0x800 @@ -285,7 +285,7 @@ lbl_1_rodata_2A8 = .rodata:0x000002A8; // type:object size:0x4 data:float lbl_1_rodata_2AC = .rodata:0x000002AC; // type:object size:0x4 data:float lbl_1_rodata_2B0 = .rodata:0x000002B0; // type:object size:0x4 data:float lbl_1_rodata_2B8 = .rodata:0x000002B8; // type:object size:0x8 data:double -lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x8 data:float +lbl_1_rodata_2C0 = .rodata:0x000002C0; // type:object size:0x4 data:float lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x4 data:float lbl_1_rodata_2CC = .rodata:0x000002CC; // type:object size:0x4 data:float lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 data:float @@ -455,7 +455,7 @@ lbl_1_bss_DD4 = .bss:0x00000DD4; // type:object size:0x4 data:4byte lbl_1_bss_DD8 = .bss:0x00000DD8; // type:object size:0x4 data:4byte lbl_1_bss_DDC = .bss:0x00000DDC; // type:object size:0x4 data:4byte lbl_1_bss_DE0 = .bss:0x00000DE0; // type:object size:0x4 data:4byte -lbl_1_bss_DE4 = .bss:0x00000DE4; // type:object size:0x48 data:4byte +lbl_1_bss_DE4 = .bss:0x00000DE4; // type:object size:0x44 data:4byte lbl_1_bss_E2C = .bss:0x00000E2C; // type:object size:0x4 data:4byte lbl_1_bss_E30 = .bss:0x00000E30; // type:object size:0x4 data:4byte lbl_1_bss_E34 = .bss:0x00000E34; // type:object size:0x258 data:4byte diff --git a/config/GMPE01_00/rels/mgmodedll/splits.txt b/config/GMPE01_00/rels/mgmodedll/splits.txt index 44d8bd41..b03224af 100644 --- a/config/GMPE01_00/rels/mgmodedll/splits.txt +++ b/config/GMPE01_00/rels/mgmodedll/splits.txt @@ -18,12 +18,13 @@ REL/mgmodedll/mgmode.c: REL/mgmodedll/free_play.c: .text start:0x00006C18 end:0x0000D8D0 .rodata start:0x00000160 end:0x000002F0 - .data start:0x000000A0 end:0x00000148 + .data start:0x000000A0 end:0x00000120 .bss start:0x000002E0 end:0x00000370 REL/mgmodedll/record.c: .text start:0x0000D8D0 end:0x0000E72C .rodata start:0x000002F0 end:0x00000390 + .data start:0x00000120 end:0x00000148 .bss start:0x00000370 end:0x00000388 REL/mgmodedll/battle.c: diff --git a/configure.py b/configure.py index 603d7745..dbde794f 100644 --- a/configure.py +++ b/configure.py @@ -1038,6 +1038,32 @@ config.libs = [ Object(NonMatching, "REL/m434Dll/fish.c"), } ), + Rel('m435Dll', + objects = { + Object(NonMatching, "REL/m435Dll/main.c"), + Object(NonMatching, "REL/m435Dll/sequence.c"), + } + ), + Rel('m436Dll', + objects = { + Object(NonMatching, "REL/m436Dll/main.c"), + Object(NonMatching, "REL/m436Dll/sequence.c"), + } + ), + Rel('m437Dll', + objects = { + Object(NonMatching, "REL/m437Dll/main.c"), + Object(NonMatching, "REL/m437Dll/sequence.c"), + } + ), + Rel('m438Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m438Dll/main.c"), + Object(NonMatching, "REL/m438Dll/map.c"), + Object(NonMatching, "REL/m438Dll/fire.c"), + } + ), Rel('m442Dll', objects = { Object(Matching, "REL/executor.c"), From f430977052bcec28ff055a48ad31da20d1b32734 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Apr 2024 20:50:15 -0500 Subject: [PATCH 3/4] Split some more minigames --- config/GMPE01_00/rels/m439Dll/splits.txt | 9 ++++++ config/GMPE01_00/rels/m439Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m440Dll/splits.txt | 15 ++++++++++ config/GMPE01_00/rels/m440Dll/symbols.txt | 4 +-- config/GMPE01_00/rels/m441Dll/splits.txt | 6 ++++ config/GMPE01_00/rels/m443Dll/splits.txt | 20 +++++++++++++ config/GMPE01_00/rels/m443Dll/symbols.txt | 8 +++--- config/GMPE01_00/rels/m444dll/splits.txt | 25 ++++++++++++++++ config/GMPE01_00/rels/m444dll/symbols.txt | 10 ++++--- configure.py | 35 +++++++++++++++++++++++ 10 files changed, 123 insertions(+), 11 deletions(-) diff --git a/config/GMPE01_00/rels/m439Dll/splits.txt b/config/GMPE01_00/rels/m439Dll/splits.txt index 531cd645..55b19f1f 100644 --- a/config/GMPE01_00/rels/m439Dll/splits.txt +++ b/config/GMPE01_00/rels/m439Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m439Dll/main.c: + .text start:0x000000A0 end:0x0000818C + .rodata start:0x00000000 end:0x00000200 + .data start:0x00000000 end:0x000078F0 + .bss start:0x00000000 end:0x00000174 diff --git a/config/GMPE01_00/rels/m439Dll/symbols.txt b/config/GMPE01_00/rels/m439Dll/symbols.txt index 37fa3fca..4057b911 100644 --- a/config/GMPE01_00/rels/m439Dll/symbols.txt +++ b/config/GMPE01_00/rels/m439Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x2C4 +ModuleProlog = .text:0x000000A0; // type:function size:0x2C4 fn_1_364 = .text:0x00000364; // type:function size:0x10 fn_1_374 = .text:0x00000374; // type:function size:0x10 fn_1_384 = .text:0x00000384; // type:function size:0x84 diff --git a/config/GMPE01_00/rels/m440Dll/splits.txt b/config/GMPE01_00/rels/m440Dll/splits.txt index 531cd645..b9563c9d 100644 --- a/config/GMPE01_00/rels/m440Dll/splits.txt +++ b/config/GMPE01_00/rels/m440Dll/splits.txt @@ -5,3 +5,18 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m440Dll/main.c: + .text start:0x000000A0 end:0x0000AE08 + .rodata start:0x00000000 end:0x00000190 + .data start:0x00000000 end:0x000001D8 + .bss start:0x00000000 end:0x00000070 + +REL/m440Dll/object.c: + .text start:0x0000AE08 end:0x0000F514 + .rodata start:0x00000190 end:0x000002B4 + .data start:0x000001D8 end:0x00000254 + .bss start:0x00000070 end:0x000000D0 diff --git a/config/GMPE01_00/rels/m440Dll/symbols.txt b/config/GMPE01_00/rels/m440Dll/symbols.txt index 562ed3d5..ae880f06 100644 --- a/config/GMPE01_00/rels/m440Dll/symbols.txt +++ b/config/GMPE01_00/rels/m440Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x324 +ModuleProlog = .text:0x000000A0; // type:function size:0x324 fn_1_3C4 = .text:0x000003C4; // type:function size:0x70 fn_1_434 = .text:0x00000434; // type:function size:0x70 fn_1_4A4 = .text:0x000004A4; // type:function size:0x224 @@ -171,7 +171,7 @@ lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0xC data:4byte lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float -lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x8 data:float +lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float diff --git a/config/GMPE01_00/rels/m441Dll/splits.txt b/config/GMPE01_00/rels/m441Dll/splits.txt index 531cd645..060b7bef 100644 --- a/config/GMPE01_00/rels/m441Dll/splits.txt +++ b/config/GMPE01_00/rels/m441Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m441Dll/main.c: + .text start:0x00000000 end:0x0000AB1C + .rodata start:0x00000000 end:0x000001EC + .data start:0x00000000 end:0x000005CC + .bss start:0x00000000 end:0x00000204 diff --git a/config/GMPE01_00/rels/m443Dll/splits.txt b/config/GMPE01_00/rels/m443Dll/splits.txt index 531cd645..ff3f7391 100644 --- a/config/GMPE01_00/rels/m443Dll/splits.txt +++ b/config/GMPE01_00/rels/m443Dll/splits.txt @@ -5,3 +5,23 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m443Dll/main.c: + .text start:0x000000A0 end:0x00004A5C + .rodata start:0x00000000 end:0x000001F0 + .data start:0x00000000 end:0x00000240 + .bss start:0x00000000 end:0x00000078 + +REL/m443Dll/map.c: + .text start:0x00004A5C end:0x00005444 + .rodata start:0x000001F0 end:0x00000278 + .data start:0x00000240 end:0x00000258 + +REL/m443Dll/player.c: + .text start:0x00005444 end:0x00009638 + .rodata start:0x00000278 end:0x000004E0 + .data start:0x00000258 end:0x000004F0 + .bss start:0x00000078 end:0x000000A0 diff --git a/config/GMPE01_00/rels/m443Dll/symbols.txt b/config/GMPE01_00/rels/m443Dll/symbols.txt index b5924ac6..9b4cf5bb 100644 --- a/config/GMPE01_00/rels/m443Dll/symbols.txt +++ b/config/GMPE01_00/rels/m443Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x380 +ModuleProlog = .text:0x000000A0; // type:function size:0x380 fn_1_420 = .text:0x00000420; // type:function size:0xC4 fn_1_4E4 = .text:0x000004E4; // type:function size:0xA0 fn_1_584 = .text:0x00000584; // type:function size:0x14C @@ -288,9 +288,9 @@ lbl_1_data_108 = .data:0x00000108; // type:object size:0x80 lbl_1_data_188 = .data:0x00000188; // type:object size:0x80 lbl_1_data_208 = .data:0x00000208; // type:object size:0x1 data:byte lbl_1_data_20C = .data:0x0000020C; // type:object size:0x1A data:string -lbl_1_data_226 = .data:0x00000226; // type:object size:0x1A -lbl_1_data_240 = .data:0x00000240; // type:object size:0x18 -lbl_1_data_258 = .data:0x00000258; // type:object size:0x2C +lbl_1_data_226 = .data:0x00000226; // type:object size:0x19 data:string +lbl_1_data_240 = .data:0x00000240; // type:object size:0x14 +lbl_1_data_264 = .data:0x00000258; // type:object size:0x20 lbl_1_data_284 = .data:0x00000284; // type:object size:0x40 lbl_1_data_2C4 = .data:0x000002C4; // type:object size:0x10 lbl_1_data_2D4 = .data:0x000002D4; // type:object size:0x50 diff --git a/config/GMPE01_00/rels/m444dll/splits.txt b/config/GMPE01_00/rels/m444dll/splits.txt index 531cd645..e895f3e9 100644 --- a/config/GMPE01_00/rels/m444dll/splits.txt +++ b/config/GMPE01_00/rels/m444dll/splits.txt @@ -5,3 +5,28 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m444dll/main.c: + .text start:0x000000A0 end:0x00008424 + .rodata start:0x00000000 end:0x00000278 + .data start:0x00000000 end:0x00000258 + .bss start:0x00000000 end:0x00000310 + +REL/m444dll/pinball.c: + .text start:0x00008424 end:0x0000D588 + .rodata start:0x00000278 end:0x00000428 + .data start:0x00000258 end:0x00000470 + .bss start:0x00000310 end:0x00019908 + +REL/m444dll/datalist.c: + .text start:0x0000D588 end:0x0000D9C8 + .rodata start:0x00000428 end:0x00000438 + .data start:0x00000470 end:0x000016EC + .bss start:0x00019908 end:0x00019A76 + +REL/m444dll/shadow.c: + .text start:0x0000D9C8 end:0x0000DE20 + .rodata start:0x00000438 end:0x00000474 diff --git a/config/GMPE01_00/rels/m444dll/symbols.txt b/config/GMPE01_00/rels/m444dll/symbols.txt index 2fdb842e..270bf155 100644 --- a/config/GMPE01_00/rels/m444dll/symbols.txt +++ b/config/GMPE01_00/rels/m444dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x3D0 +ModuleProlog = .text:0x000000A0; // type:function size:0x3D0 fn_1_470 = .text:0x00000470; // type:function size:0x370C fn_1_3B7C = .text:0x00003B7C; // type:function size:0x1270 fn_1_4DEC = .text:0x00004DEC; // type:function size:0x7C4 @@ -231,7 +231,8 @@ lbl_1_rodata_468 = .rodata:0x00000468; // type:object size:0x8 data:double lbl_1_rodata_470 = .rodata:0x00000470; // type:object size:0x4 data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x118 lbl_1_data_118 = .data:0x00000118; // type:object size:0x28 -lbl_1_data_140 = .data:0x00000140; // type:object size:0x54 data:float +lbl_1_data_14C = .data:0x00000140; // type:object size:0x3C data:float +lbl_1_data_188 = .data:0x00000188; // type:object size:0xC lbl_1_data_194 = .data:0x00000194; // type:object size:0x20 lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 data:string lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0xA data:string @@ -245,7 +246,7 @@ lbl_1_data_22A = .data:0x0000022A; // type:object size:0xB data:string lbl_1_data_235 = .data:0x00000235; // type:object size:0xB data:string lbl_1_data_240 = .data:0x00000240; // type:object size:0x4 lbl_1_data_244 = .data:0x00000244; // type:object size:0xA data:string -lbl_1_data_24E = .data:0x0000024E; // type:object size:0xA +lbl_1_data_24E = .data:0x0000024E; // type:object size:0x4 data:string lbl_1_data_258 = .data:0x00000258; // type:object size:0xC lbl_1_data_264 = .data:0x00000264; // type:object size:0x3C lbl_1_data_2A0 = .data:0x000002A0; // type:object size:0x28 @@ -314,7 +315,8 @@ lbl_1_bss_18A0 = .bss:0x000018A0; // type:object size:0x14 lbl_1_bss_18B4 = .bss:0x000018B4; // type:object size:0x3C lbl_1_bss_18F0 = .bss:0x000018F0; // type:object size:0xC000 lbl_1_bss_D8F0 = .bss:0x0000D8F0; // type:object size:0xC000 -lbl_1_bss_198F0 = .bss:0x000198F0; // type:object size:0x1A +lbl_1_bss_198F0 = .bss:0x000198F0; // type:object size:0x14 +lbl_1_bss_19908 = .bss:0x00019908; // type:object size:0x2 lbl_1_bss_1990A = .bss:0x0001990A; // type:object size:0x2 data:2byte lbl_1_bss_1990E = .bss:0x0001990E; // type:object size:0xB4 data:2byte lbl_1_bss_199C2 = .bss:0x000199C2; // type:object size:0xB4 data:2byte diff --git a/configure.py b/configure.py index dbde794f..ded50ff9 100644 --- a/configure.py +++ b/configure.py @@ -1064,6 +1064,24 @@ config.libs = [ Object(NonMatching, "REL/m438Dll/fire.c"), } ), + Rel('m439Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m439Dll/main.c"), + } + ), + Rel('m440Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m440Dll/main.c"), + Object(NonMatching, "REL/m440Dll/object.c"), + } + ), + Rel('m441Dll', + objects = { + Object(NonMatching, "REL/m441Dll/main.c"), + } + ), Rel('m442Dll', objects = { Object(Matching, "REL/executor.c"), @@ -1071,6 +1089,23 @@ config.libs = [ Object(NonMatching, "REL/m442Dll/score.c"), } ), + Rel('m443Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m443Dll/main.c"), + Object(NonMatching, "REL/m443Dll/map.c"), + Object(NonMatching, "REL/m443Dll/player.c"), + } + ), + Rel('m444dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m444dll/main.c"), + Object(NonMatching, "REL/m444dll/pinball.c"), + Object(NonMatching, "REL/m444dll/datalist.c"), + Object(NonMatching, "REL/m444dll/shadow.c"), + } + ), Rel('m450Dll', objects = { Object(NonMatching, "REL/m450Dll/main.c"), From 02ed6caefab3095077f38b3cdd91f704e67e96b6 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Apr 2024 23:08:30 -0500 Subject: [PATCH 4/4] Finish splits Except for unused nisdll --- config/GMPE01_00/rels/_minigameDll/splits.txt | 1 + config/GMPE01_00/rels/m445Dll/splits.txt | 9 +++ config/GMPE01_00/rels/m445Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m446dll/splits.txt | 51 ++++++++++++++ config/GMPE01_00/rels/m446dll/symbols.txt | 14 ++-- config/GMPE01_00/rels/m447dll/splits.txt | 36 ++++++++++ config/GMPE01_00/rels/m447dll/symbols.txt | 10 +-- config/GMPE01_00/rels/m448Dll/splits.txt | 9 +++ config/GMPE01_00/rels/m448Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m449Dll/splits.txt | 9 +++ config/GMPE01_00/rels/m449Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m455Dll/splits.txt | 15 ++++ config/GMPE01_00/rels/m455Dll/symbols.txt | 7 +- config/GMPE01_00/rels/m456Dll/splits.txt | 15 ++++ config/GMPE01_00/rels/m456Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m457Dll/splits.txt | 9 +++ config/GMPE01_00/rels/m457Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m458Dll/splits.txt | 9 +++ config/GMPE01_00/rels/m458Dll/symbols.txt | 2 +- config/GMPE01_00/rels/m460Dll/splits.txt | 2 +- config/GMPE01_00/rels/modeltestDll/splits.txt | 3 + .../GMPE01_00/rels/modeltestDll/symbols.txt | 2 +- configure.py | 68 +++++++++++++++++++ src/REL/_minigameDLL/_minigameDLL.c | 1 + src/REL/modeltestDll/main.c | 2 +- 25 files changed, 261 insertions(+), 23 deletions(-) diff --git a/config/GMPE01_00/rels/_minigameDll/splits.txt b/config/GMPE01_00/rels/_minigameDll/splits.txt index 1004129e..7a4d7e18 100644 --- a/config/GMPE01_00/rels/_minigameDll/splits.txt +++ b/config/GMPE01_00/rels/_minigameDll/splits.txt @@ -10,4 +10,5 @@ REL/executor.c: REL/_minigameDLL/_minigameDLL.c: .text start:0x000000A0 end:0x000000F0 + .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000014 diff --git a/config/GMPE01_00/rels/m445Dll/splits.txt b/config/GMPE01_00/rels/m445Dll/splits.txt index 531cd645..3c2a1e75 100644 --- a/config/GMPE01_00/rels/m445Dll/splits.txt +++ b/config/GMPE01_00/rels/m445Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m445Dll/main.c: + .text start:0x000000A0 end:0x00008D54 + .rodata start:0x00000000 end:0x000001D0 + .data start:0x00000000 end:0x0000029A + .bss start:0x00000000 end:0x000006E8 diff --git a/config/GMPE01_00/rels/m445Dll/symbols.txt b/config/GMPE01_00/rels/m445Dll/symbols.txt index 1f0a49de..c24e16eb 100644 --- a/config/GMPE01_00/rels/m445Dll/symbols.txt +++ b/config/GMPE01_00/rels/m445Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x418 +ModuleProlog = .text:0x000000A0; // type:function size:0x418 fn_1_4B8 = .text:0x000004B8; // type:function size:0x54 fn_1_50C = .text:0x0000050C; // type:function size:0x4 fn_1_510 = .text:0x00000510; // type:function size:0x10 diff --git a/config/GMPE01_00/rels/m446dll/splits.txt b/config/GMPE01_00/rels/m446dll/splits.txt index 531cd645..c3840a1a 100644 --- a/config/GMPE01_00/rels/m446dll/splits.txt +++ b/config/GMPE01_00/rels/m446dll/splits.txt @@ -5,3 +5,54 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +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: + .text start:0x00001C64 end:0x00003064 + .rodata start:0x00000058 end:0x000000D0 + .data start:0x00000150 end:0x000001A8 + .bss start:0x00000018 end:0x00000020 + +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: + .text start:0x00003924 end:0x0000480C + .rodata start:0x00000138 end:0x00000170 + .data start:0x000001E8 end:0x00000228 + .bss start:0x00000028 end:0x00000030 + +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: + .text start:0x00006778 end:0x000072E0 + .rodata start:0x00000208 end:0x00000268 + .data start:0x00000370 end:0x000003C8 + .bss start:0x00000038 end:0x00000098 + +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: + .text start:0x00007BF0 end:0x00008618 + .rodata start:0x000002A0 end:0x000002D8 + .data start:0x00000410 end:0x000004F6 + .bss start:0x000000A0 end:0x000000A4 diff --git a/config/GMPE01_00/rels/m446dll/symbols.txt b/config/GMPE01_00/rels/m446dll/symbols.txt index ad45d2b5..88e526ff 100644 --- a/config/GMPE01_00/rels/m446dll/symbols.txt +++ b/config/GMPE01_00/rels/m446dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x9C +ModuleProlog = .text:0x000000A0; // type:function size:0x9C fn_1_13C = .text:0x0000013C; // type:function size:0x168 fn_1_2A4 = .text:0x000002A4; // type:function size:0x158 fn_1_3FC = .text:0x000003FC; // type:function size:0xB8 @@ -160,7 +160,7 @@ lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x8 data:double lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x8 data:double -lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 data:float +lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float @@ -189,7 +189,8 @@ lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float -lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x18 data:double +lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x8 data:double +lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x10 data:4byte lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float @@ -259,7 +260,7 @@ lbl_1_data_150 = .data:0x00000150; // type:object size:0xC lbl_1_data_15C = .data:0x0000015C; // type:object size:0x20 jumptable_1_data_17C = .data:0x0000017C; // type:object size:0x2C scope:local lbl_1_data_1A8 = .data:0x000001A8; // type:object size:0x1F data:string -lbl_1_data_1C7 = .data:0x000001C7; // type:object size:0x21 +lbl_1_data_1C7 = .data:0x000001C7; // type:object size:0x1F lbl_1_data_1E8 = .data:0x000001E8; // type:object size:0x1E data:string lbl_1_data_206 = .data:0x00000206; // type:object size:0x22 lbl_1_data_228 = .data:0x00000228; // type:object size:0x24 @@ -269,6 +270,7 @@ lbl_1_data_2F0 = .data:0x000002F0; // type:object size:0x1F data:string lbl_1_data_30F = .data:0x0000030F; // type:object size:0x1F data:string lbl_1_data_32E = .data:0x0000032E; // type:object size:0x22 jumptable_1_data_350 = .data:0x00000350; // type:object size:0x1C scope:local +lbl_1_data_370 = .data:0x00000370; // type:object size:0xC data:float lbl_1_data_37C = .data:0x0000037C; // type:object size:0x1E data:string lbl_1_data_39A = .data:0x0000039A; // type:object size:0x1E data:string lbl_1_data_3B8 = .data:0x000003B8; // type:object size:0x10 @@ -285,9 +287,9 @@ lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte -lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x8 data:4byte +lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x8 data:4byte -lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x8 data:4byte +lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:4byte lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x8 data:4byte lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:float diff --git a/config/GMPE01_00/rels/m447dll/splits.txt b/config/GMPE01_00/rels/m447dll/splits.txt index 531cd645..c05f4df0 100644 --- a/config/GMPE01_00/rels/m447dll/splits.txt +++ b/config/GMPE01_00/rels/m447dll/splits.txt @@ -5,3 +5,39 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m447dll/main.c: + .text start:0x000000A0 end:0x00001D90 + .rodata start:0x00000000 end:0x00000138 + .data start:0x00000000 end:0x000000A0 + .bss start:0x00000000 end:0x00000018 + +REL/m447dll/stage.c: + .text start:0x00001D90 end:0x00003130 + .rodata start:0x00000138 end:0x00000240 + .data start:0x000000A0 end:0x00000160 + +REL/m447dll/camera.c: + .text start:0x00003130 end:0x00003F84 + .rodata start:0x00000240 end:0x000002A0 + .data start:0x00000160 end:0x000001B0 + .bss start:0x00000018 end:0x00000098 + +REL/m447dll/player.c: + .text start:0x00003F84 end:0x00007B54 + .rodata start:0x000002A0 end:0x000005A0 + .data start:0x000001B0 end:0x00000278 + .bss start:0x00000098 end:0x000000A0 + +REL/m447dll/player_col.c: + .text start:0x00007B54 end:0x00008DF8 + .rodata start:0x000005A0 end:0x000005F8 + +REL/m447dll/block.c: + .text start:0x00008DF8 end:0x0000A274 + .rodata start:0x000005F8 end:0x00000740 + .data start:0x00000278 end:0x000002E3 + .bss start:0x000000A0 end:0x000000BC diff --git a/config/GMPE01_00/rels/m447dll/symbols.txt b/config/GMPE01_00/rels/m447dll/symbols.txt index 2b4f2427..96e6cbe2 100644 --- a/config/GMPE01_00/rels/m447dll/symbols.txt +++ b/config/GMPE01_00/rels/m447dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x8C +ModuleProlog = .text:0x000000A0; // type:function size:0x8C fn_1_12C = .text:0x0000012C; // type:function size:0x8C fn_1_1B8 = .text:0x000001B8; // type:function size:0x284 fn_1_43C = .text:0x0000043C; // type:function size:0x54 @@ -274,7 +274,7 @@ jumptable_1_data_30 = .data:0x00000030; // type:object size:0x28 scope:local jumptable_1_data_58 = .data:0x00000058; // type:object size:0x28 scope:local jumptable_1_data_80 = .data:0x00000080; // type:object size:0x20 scope:local lbl_1_data_A0 = .data:0x000000A0; // type:object size:0xA8 -lbl_1_data_148 = .data:0x00000148; // type:object size:0x18 +lbl_1_data_148 = .data:0x00000148; // type:object size:0x14 lbl_1_data_160 = .data:0x00000160; // type:object size:0x1E data:string lbl_1_data_17E = .data:0x0000017E; // type:object size:0x1E data:string lbl_1_data_19C = .data:0x0000019C; // type:object size:0x14 @@ -282,8 +282,8 @@ lbl_1_data_1B0 = .data:0x000001B0; // type:object size:0x1C lbl_1_data_1CC = .data:0x000001CC; // type:object size:0x2C jumptable_1_data_1F8 = .data:0x000001F8; // type:object size:0x24 scope:local lbl_1_data_21C = .data:0x0000021C; // type:object size:0x40 -lbl_1_data_25C = .data:0x0000025C; // type:object size:0x1C -lbl_1_data_278 = .data:0x00000278; // type:object size:0x1C +lbl_1_data_25C = .data:0x0000025C; // type:object size:0x18 +lbl_1_data_278 = .data:0x00000278; // type:object size:0x1A data:string lbl_1_data_294 = .data:0x00000294; // type:object size:0x18 lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x37 data:string lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte @@ -302,7 +302,7 @@ lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x1C data:4byte lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x1C data:float lbl_1_bss_74 = .bss:0x00000074; // type:object size:0x1C data:float -lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x8 data:4byte +lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x4 data:4byte lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x8 data:4byte lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte lbl_1_bss_A4 = .bss:0x000000A4; // type:object size:0x14 diff --git a/config/GMPE01_00/rels/m448Dll/splits.txt b/config/GMPE01_00/rels/m448Dll/splits.txt index 531cd645..68dc1355 100644 --- a/config/GMPE01_00/rels/m448Dll/splits.txt +++ b/config/GMPE01_00/rels/m448Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m448Dll/main.c: + .text start:0x000000A0 end:0x00009C20 + .rodata start:0x00000000 end:0x000005FC + .data start:0x00000000 end:0x000002F1 + .bss start:0x00000000 end:0x0000043C diff --git a/config/GMPE01_00/rels/m448Dll/symbols.txt b/config/GMPE01_00/rels/m448Dll/symbols.txt index 68a679da..2a23384d 100644 --- a/config/GMPE01_00/rels/m448Dll/symbols.txt +++ b/config/GMPE01_00/rels/m448Dll/symbols.txt @@ -12,7 +12,7 @@ fn_1_7DC4 = .text:0x00007DC4; // type:function size:0x3FC fn_1_81C0 = .text:0x000081C0; // type:function size:0xC10 fn_1_8DD0 = .text:0x00008DD0; // type:function size:0x738 fn_1_9508 = .text:0x00009508; // type:function size:0x154 -fn_1_965C = .text:0x0000965C; // type:function size:0x4A4 +ModuleProlog = .text:0x0000965C; // type:function size:0x4A4 fn_1_9B00 = .text:0x00009B00; // type:function size:0x120 _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte diff --git a/config/GMPE01_00/rels/m449Dll/splits.txt b/config/GMPE01_00/rels/m449Dll/splits.txt index 531cd645..67a682e3 100644 --- a/config/GMPE01_00/rels/m449Dll/splits.txt +++ b/config/GMPE01_00/rels/m449Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m449Dll/main.c: + .text start:0x000000A0 end:0x00009AD4 + .rodata start:0x00000000 end:0x00000738 + .data start:0x00000000 end:0x000002F1 + .bss start:0x00000000 end:0x000000F4 diff --git a/config/GMPE01_00/rels/m449Dll/symbols.txt b/config/GMPE01_00/rels/m449Dll/symbols.txt index d2709158..7a40993d 100644 --- a/config/GMPE01_00/rels/m449Dll/symbols.txt +++ b/config/GMPE01_00/rels/m449Dll/symbols.txt @@ -14,7 +14,7 @@ fn_1_7ECC = .text:0x00007ECC; // type:function size:0xC8 fn_1_7F94 = .text:0x00007F94; // type:function size:0x5A4 fn_1_8538 = .text:0x00008538; // type:function size:0xFC0 fn_1_94F8 = .text:0x000094F8; // type:function size:0xE0 -fn_1_95D8 = .text:0x000095D8; // type:function size:0x460 +ModuleProlog = .text:0x000095D8; // type:function size:0x460 fn_1_9A38 = .text:0x00009A38; // type:function size:0x9C _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte diff --git a/config/GMPE01_00/rels/m455Dll/splits.txt b/config/GMPE01_00/rels/m455Dll/splits.txt index 531cd645..52695679 100644 --- a/config/GMPE01_00/rels/m455Dll/splits.txt +++ b/config/GMPE01_00/rels/m455Dll/splits.txt @@ -5,3 +5,18 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m455Dll/main.c: + .text start:0x000000A0 end:0x000032C4 + .rodata start:0x00000000 end:0x000000F0 + .data start:0x00000000 end:0x000001D8 + .bss start:0x00000000 end:0x00000048 + +REL/m455Dll/stage.c: + .text start:0x000032C4 end:0x0000A168 + .rodata start:0x000000F0 end:0x00000318 + .data start:0x000001D8 end:0x000006C0 + .bss start:0x00000048 end:0x00000074 diff --git a/config/GMPE01_00/rels/m455Dll/symbols.txt b/config/GMPE01_00/rels/m455Dll/symbols.txt index cd750911..0a170a1c 100644 --- a/config/GMPE01_00/rels/m455Dll/symbols.txt +++ b/config/GMPE01_00/rels/m455Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x270 +ModuleProlog = .text:0x000000A0; // type:function size:0x270 fn_1_310 = .text:0x00000310; // type:function size:0x10 fn_1_320 = .text:0x00000320; // type:function size:0x10 fn_1_330 = .text:0x00000330; // type:function size:0x148 @@ -242,7 +242,8 @@ lbl_1_data_170 = .data:0x00000170; // type:object size:0x1 data:byte lbl_1_data_174 = .data:0x00000174; // type:object size:0x5 data:string lbl_1_data_179 = .data:0x00000179; // type:object size:0xB data:string lbl_1_data_184 = .data:0x00000184; // type:object size:0x8 data:float -lbl_1_data_18C = .data:0x0000018C; // type:object size:0x4C +lbl_1_data_18C = .data:0x0000018C; // type:object size:0x10 +lbl_1_data_19C = .data:0x0000019C; // type:object size:0x3C lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x30 lbl_1_data_208 = .data:0x00000208; // type:object size:0x1 data:byte lbl_1_data_20C = .data:0x0000020C; // type:object size:0x50 @@ -279,7 +280,7 @@ lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:4byte lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:4byte lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte -lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x8 data:4byte +lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x10 data:4byte lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x4 data:4byte lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x4 data:4byte diff --git a/config/GMPE01_00/rels/m456Dll/splits.txt b/config/GMPE01_00/rels/m456Dll/splits.txt index 531cd645..139bf5cd 100644 --- a/config/GMPE01_00/rels/m456Dll/splits.txt +++ b/config/GMPE01_00/rels/m456Dll/splits.txt @@ -5,3 +5,18 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m456Dll/main.c: + .text start:0x000000A0 end:0x00002FAC + .rodata start:0x00000000 end:0x000000F0 + .data start:0x00000000 end:0x000002E8 + .bss start:0x00000000 end:0x00000090 + +REL/m456Dll/stage.c: + .text start:0x00002FAC end:0x00009C68 + .rodata start:0x000000F0 end:0x00000318 + .data start:0x000002E8 end:0x000007D0 + .bss start:0x00000090 end:0x000000BC diff --git a/config/GMPE01_00/rels/m456Dll/symbols.txt b/config/GMPE01_00/rels/m456Dll/symbols.txt index fbdbf93f..a59886cd 100644 --- a/config/GMPE01_00/rels/m456Dll/symbols.txt +++ b/config/GMPE01_00/rels/m456Dll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x300 +ModuleProlog = .text:0x000000A0; // type:function size:0x300 fn_1_3A0 = .text:0x000003A0; // type:function size:0x10 fn_1_3B0 = .text:0x000003B0; // type:function size:0x10 fn_1_3C0 = .text:0x000003C0; // type:function size:0xD8 diff --git a/config/GMPE01_00/rels/m457Dll/splits.txt b/config/GMPE01_00/rels/m457Dll/splits.txt index 531cd645..6783990e 100644 --- a/config/GMPE01_00/rels/m457Dll/splits.txt +++ b/config/GMPE01_00/rels/m457Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m457Dll/main.c: + .text start:0x000000A0 end:0x00007B80 + .rodata start:0x00000000 end:0x00000580 + .data start:0x00000000 end:0x000003E7 + .bss start:0x00000000 end:0x000000C8 diff --git a/config/GMPE01_00/rels/m457Dll/symbols.txt b/config/GMPE01_00/rels/m457Dll/symbols.txt index e8f8a683..902702ec 100644 --- a/config/GMPE01_00/rels/m457Dll/symbols.txt +++ b/config/GMPE01_00/rels/m457Dll/symbols.txt @@ -9,7 +9,7 @@ fn_1_59BC = .text:0x000059BC; // type:function size:0xB3C fn_1_64F8 = .text:0x000064F8; // type:function size:0xAB8 fn_1_6FB0 = .text:0x00006FB0; // type:function size:0x5F4 fn_1_75A4 = .text:0x000075A4; // type:function size:0xC0 -fn_1_7664 = .text:0x00007664; // type:function size:0x480 +ModuleProlog = .text:0x00007664; // type:function size:0x480 fn_1_7AE4 = .text:0x00007AE4; // type:function size:0x9C _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte diff --git a/config/GMPE01_00/rels/m458Dll/splits.txt b/config/GMPE01_00/rels/m458Dll/splits.txt index 531cd645..76af682a 100644 --- a/config/GMPE01_00/rels/m458Dll/splits.txt +++ b/config/GMPE01_00/rels/m458Dll/splits.txt @@ -5,3 +5,12 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + +REL/m458Dll/main.c: + .text start:0x000000A0 end:0x00006E6C + .rodata start:0x00000000 end:0x000003EC + .data start:0x00000000 end:0x00000259 + .bss start:0x00000000 end:0x0000031C diff --git a/config/GMPE01_00/rels/m458Dll/symbols.txt b/config/GMPE01_00/rels/m458Dll/symbols.txt index 5c135c78..83e182ec 100644 --- a/config/GMPE01_00/rels/m458Dll/symbols.txt +++ b/config/GMPE01_00/rels/m458Dll/symbols.txt @@ -9,7 +9,7 @@ fn_1_5014 = .text:0x00005014; // type:function size:0x9C8 fn_1_59DC = .text:0x000059DC; // type:function size:0x938 fn_1_6314 = .text:0x00006314; // type:function size:0x548 fn_1_685C = .text:0x0000685C; // type:function size:0xC0 -fn_1_691C = .text:0x0000691C; // type:function size:0x480 +ModuleProlog = .text:0x0000691C; // type:function size:0x480 fn_1_6D9C = .text:0x00006D9C; // type:function size:0xD0 _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte diff --git a/config/GMPE01_00/rels/m460Dll/splits.txt b/config/GMPE01_00/rels/m460Dll/splits.txt index c734d5e8..bd2e9c88 100644 --- a/config/GMPE01_00/rels/m460Dll/splits.txt +++ b/config/GMPE01_00/rels/m460Dll/splits.txt @@ -28,7 +28,7 @@ REL/m460Dll/map.c: .bss start:0x00000048 end:0x00000050 REL/m460Dll/score.c: - .text start:0x00008CAC end:0x00008CAC + .text start:0x00008CAC end:0x000093D4 .rodata start:0x000003B8 end:0x000003E8 .data start:0x00000380 end:0x0000038C .bss start:0x00000050 end:0x00000058 diff --git a/config/GMPE01_00/rels/modeltestDll/splits.txt b/config/GMPE01_00/rels/modeltestDll/splits.txt index 2f84ebd2..f065b13e 100644 --- a/config/GMPE01_00/rels/modeltestDll/splits.txt +++ b/config/GMPE01_00/rels/modeltestDll/splits.txt @@ -6,6 +6,9 @@ Sections: .data type:data align:8 .bss type:bss align:8 +REL/executor.c: + .text start:0x00000000 end:0x000000A0 + REL/modeltestDll/main.c: .text start:0x000000A0 end:0x000034B0 .rodata start:0x00000000 end:0x00000130 diff --git a/config/GMPE01_00/rels/modeltestDll/symbols.txt b/config/GMPE01_00/rels/modeltestDll/symbols.txt index e8215199..52d3b800 100644 --- a/config/GMPE01_00/rels/modeltestDll/symbols.txt +++ b/config/GMPE01_00/rels/modeltestDll/symbols.txt @@ -1,6 +1,6 @@ _prolog = .text:0x00000000; // type:function size:0x54 scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global -fn_1_A0 = .text:0x000000A0; // type:function size:0x1FC +ModuleProlog = .text:0x000000A0; // type:function size:0x1FC fn_1_29C = .text:0x0000029C; // type:function size:0xC9C fn_1_F38 = .text:0x00000F38; // type:function size:0x64 fn_1_F9C = .text:0x00000F9C; // type:function size:0x1158 diff --git a/configure.py b/configure.py index ded50ff9..197f94b6 100644 --- a/configure.py +++ b/configure.py @@ -1106,6 +1106,48 @@ config.libs = [ Object(NonMatching, "REL/m444dll/shadow.c"), } ), + Rel('m445Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m445Dll/main.c"), + } + ), + Rel('m446dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m446dll/main.c"), + Object(NonMatching, "REL/m446dll/card.c"), + Object(NonMatching, "REL/m446dll/deck.c"), + Object(NonMatching, "REL/m446dll/table.c"), + Object(NonMatching, "REL/m446dll/player.c"), + Object(NonMatching, "REL/m446dll/camera.c"), + Object(NonMatching, "REL/m446dll/cursor.c"), + Object(NonMatching, "REL/m446dll/stage.c"), + } + ), + Rel('m447dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m447dll/main.c"), + Object(NonMatching, "REL/m447dll/stage.c"), + Object(NonMatching, "REL/m447dll/camera.c"), + Object(NonMatching, "REL/m447dll/player.c"), + Object(NonMatching, "REL/m447dll/player_col.c"), + Object(NonMatching, "REL/m447dll/block.c"), + } + ), + Rel('m448Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m448Dll/main.c"), + } + ), + Rel('m449Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m449Dll/main.c"), + } + ), Rel('m450Dll', objects = { Object(NonMatching, "REL/m450Dll/main.c"), @@ -1124,6 +1166,32 @@ config.libs = [ Object(NonMatching, "REL/m453Dll/score.c"), } ), + Rel('m455Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m455Dll/main.c"), + Object(NonMatching, "REL/m455Dll/stage.c"), + } + ), + Rel('m456Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m456Dll/main.c"), + Object(NonMatching, "REL/m456Dll/stage.c"), + } + ), + Rel('m457Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m457Dll/main.c"), + } + ), + Rel('m458Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m458Dll/main.c"), + } + ), Rel('m459dll', objects = { Object(Matching, "REL/executor.c"), diff --git a/src/REL/_minigameDLL/_minigameDLL.c b/src/REL/_minigameDLL/_minigameDLL.c index 0100af99..436f2b7b 100644 --- a/src/REL/_minigameDLL/_minigameDLL.c +++ b/src/REL/_minigameDLL/_minigameDLL.c @@ -1,5 +1,6 @@ #include "REL/executor.h" #include "dolphin/os.h" +#include "rel_sqrt_consts.h" void ModuleProlog(void) { OSReport("minigame dll setup\n"); diff --git a/src/REL/modeltestDll/main.c b/src/REL/modeltestDll/main.c index f72c1fc2..e877c495 100644 --- a/src/REL/modeltestDll/main.c +++ b/src/REL/modeltestDll/main.c @@ -34,7 +34,7 @@ omObjData * lbl_1_bss_9A0; // -------------------------------------------------------------------------- // -void fn_1_A0(void) +void ModuleProlog(void) { Process * prc; OSReport("******* MODELTESTObjectSetup *********\n");