From c5605b383480dd4815de15d362358fd8fef47590 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sat, 6 Apr 2024 11:28:13 -0500 Subject: [PATCH] Split 2 vs 2 minigames --- config/GMPE01_00/rels/m425Dll/splits.txt | 15 ++++++ config/GMPE01_00/rels/m425Dll/symbols.txt | 13 ++--- config/GMPE01_00/rels/m426Dll/splits.txt | 9 ++++ config/GMPE01_00/rels/m426Dll/symbols.txt | 9 ++-- config/GMPE01_00/rels/m427Dll/splits.txt | 21 ++++++++ config/GMPE01_00/rels/m427Dll/symbols.txt | 25 ++++----- config/GMPE01_00/rels/m428Dll/splits.txt | 21 ++++++++ config/GMPE01_00/rels/m428Dll/symbols.txt | 9 ++-- config/GMPE01_00/rels/m429Dll/splits.txt | 6 +++ config/GMPE01_00/rels/m429Dll/symbols.txt | 4 +- config/GMPE01_00/rels/m430Dll/splits.txt | 21 ++++++++ config/GMPE01_00/rels/m430Dll/symbols.txt | 10 ++-- config/GMPE01_00/rels/m431Dll/splits.txt | 15 ++++++ config/GMPE01_00/rels/m431Dll/symbols.txt | 8 +-- config/GMPE01_00/rels/m432Dll/splits.txt | 6 +++ config/GMPE01_00/rels/m432Dll/symbols.txt | 4 +- config/GMPE01_00/rels/m434Dll/splits.txt | 27 ++++++++++ config/GMPE01_00/rels/m434Dll/symbols.txt | 26 ++++++---- configure.py | 63 +++++++++++++++++++++++ 19 files changed, 262 insertions(+), 50 deletions(-) diff --git a/config/GMPE01_00/rels/m425Dll/splits.txt b/config/GMPE01_00/rels/m425Dll/splits.txt index 531cd645..59a0607d 100644 --- a/config/GMPE01_00/rels/m425Dll/splits.txt +++ b/config/GMPE01_00/rels/m425Dll/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/m425Dll/main.c: + .text start:0x000000A0 end:0x00006A0C + .rodata start:0x00000000 end:0x000003B0 + .data start:0x00000000 end:0x00000118 + .bss start:0x00000000 end:0x00000670 + +REL/m425Dll/thwomp.c: + .text start:0x00006A0C end:0x00012694 + .rodata start:0x000003B0 end:0x00000500 + .data start:0x00000118 end:0x000001EC + .bss start:0x00000670 end:0x000006F4 diff --git a/config/GMPE01_00/rels/m425Dll/symbols.txt b/config/GMPE01_00/rels/m425Dll/symbols.txt index 05f71975..42f3f3da 100644 --- a/config/GMPE01_00/rels/m425Dll/symbols.txt +++ b/config/GMPE01_00/rels/m425Dll/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:0x3C0 +ModuleProlog = .text:0x000000A0; // type:function size:0x3C0 fn_1_460 = .text:0x00000460; // type:function size:0x20 fn_1_480 = .text:0x00000480; // type:function size:0x464 fn_1_8E4 = .text:0x000008E4; // type:function size:0x664 @@ -253,9 +253,10 @@ lbl_1_rodata_4F8 = .rodata:0x000004F8; // type:object size:0x4 data:float lbl_1_rodata_4FC = .rodata:0x000004FC; // type:object size:0x4 data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x2 data:2byte lbl_1_data_4 = .data:0x00000004; // type:object size:0xC -lbl_1_data_10 = .data:0x00000010; // type:object size:0x30 +lbl_1_data_10 = .data:0x00000010; // type:object size:0xC +lbl_1_data_1C = .data:0x0000001C; // type:object size:0x24 lbl_1_data_40 = .data:0x00000040; // type:object size:0x4 -lbl_1_data_44 = .data:0x00000044; // type:object size:0x24 +lbl_1_data_44 = .data:0x00000044; // type:object size:0x23 data:string lbl_1_data_68 = .data:0x00000068; // type:object size:0x4 data:4byte lbl_1_data_6C = .data:0x0000006C; // type:object size:0x28 lbl_1_data_94 = .data:0x00000094; // type:object size:0x30 @@ -263,9 +264,9 @@ jumptable_1_data_C4 = .data:0x000000C4; // type:object size:0x28 scope:local jumptable_1_data_EC = .data:0x000000EC; // type:object size:0x28 scope:local lbl_1_data_114 = .data:0x00000114; // type:object size:0x4 data:4byte lbl_1_data_118 = .data:0x00000118; // type:object size:0x18 -lbl_1_data_130 = .data:0x00000130; // type:object size:0x20 +lbl_1_data_130 = .data:0x00000130; // type:object size:0x1F data:string lbl_1_data_150 = .data:0x00000150; // type:object size:0x18 -lbl_1_data_168 = .data:0x00000168; // type:object size:0x1 data:byte +lbl_1_data_168 = .data:0x00000168; // type:object size:0x4 data:byte lbl_1_data_16C = .data:0x0000016C; // type:object size:0x30 lbl_1_data_19C = .data:0x0000019C; // type:object size:0x30 lbl_1_data_1CC = .data:0x000001CC; // type:object size:0x20 @@ -282,7 +283,7 @@ lbl_1_bss_64C = .bss:0x0000064C; // type:object size:0x10 lbl_1_bss_65C = .bss:0x0000065C; // type:object size:0x4 data:4byte lbl_1_bss_660 = .bss:0x00000660; // type:object size:0x4 data:4byte lbl_1_bss_664 = .bss:0x00000664; // type:object size:0x4 data:4byte -lbl_1_bss_668 = .bss:0x00000668; // type:object size:0x8 data:4byte +lbl_1_bss_668 = .bss:0x00000668; // type:object size:0x4 data:4byte lbl_1_bss_670 = .bss:0x00000670; // type:object size:0xC data:float lbl_1_bss_67C = .bss:0x0000067C; // type:object size:0xC data:float lbl_1_bss_688 = .bss:0x00000688; // type:object size:0x40 diff --git a/config/GMPE01_00/rels/m426Dll/splits.txt b/config/GMPE01_00/rels/m426Dll/splits.txt index 531cd645..f2fa84c1 100644 --- a/config/GMPE01_00/rels/m426Dll/splits.txt +++ b/config/GMPE01_00/rels/m426Dll/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/m426Dll/main.c: + .text start:0x000000A0 end:0x00009A88 + .rodata start:0x00000000 end:0x000001D4 + .data start:0x00000000 end:0x00000368 + .bss start:0x00000000 end:0x0000009C diff --git a/config/GMPE01_00/rels/m426Dll/symbols.txt b/config/GMPE01_00/rels/m426Dll/symbols.txt index 6fe9d2c0..7c827cfa 100644 --- a/config/GMPE01_00/rels/m426Dll/symbols.txt +++ b/config/GMPE01_00/rels/m426Dll/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:0x16C +ModuleProlog = .text:0x000000A0; // type:function size:0x16C fn_1_20C = .text:0x0000020C; // type:function size:0x124 fn_1_330 = .text:0x00000330; // type:function size:0xA88 fn_1_DB8 = .text:0x00000DB8; // type:function size:0x60 @@ -167,15 +167,16 @@ lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:byte lbl_1_data_0 = .data:0x00000000; // type:object size:0x30 lbl_1_data_30 = .data:0x00000030; // type:object size:0xC lbl_1_data_3C = .data:0x0000003C; // type:object size:0xC -lbl_1_data_48 = .data:0x00000048; // type:object size:0x1 data:byte +lbl_1_data_48 = .data:0x00000048; // type:object size:0x4 data:byte lbl_1_data_4C = .data:0x0000004C; // type:object size:0x54 data:float lbl_1_data_A0 = .data:0x000000A0; // type:object size:0xC lbl_1_data_AC = .data:0x000000AC; // type:object size:0xC lbl_1_data_B8 = .data:0x000000B8; // type:object size:0xC -lbl_1_data_C4 = .data:0x000000C4; // type:object size:0x24 +lbl_1_data_C4 = .data:0x000000C4; // type:object size:0x23 data:string jumptable_1_data_E8 = .data:0x000000E8; // type:object size:0x24 scope:local lbl_1_data_10C = .data:0x0000010C; // type:object size:0x4 -lbl_1_data_110 = .data:0x00000110; // type:object size:0x60 data:4byte +lbl_1_data_110 = .data:0x00000110; // type:object size:0x40 data:4byte +lbl_1_data_150 = .data:0x00000150; // type:object size:0x20 data:4byte lbl_1_data_170 = .data:0x00000170; // type:object size:0x60 lbl_1_data_1D0 = .data:0x000001D0; // type:object size:0x8 jumptable_1_data_1D8 = .data:0x000001D8; // type:object size:0x28 scope:local diff --git a/config/GMPE01_00/rels/m427Dll/splits.txt b/config/GMPE01_00/rels/m427Dll/splits.txt index 531cd645..a25324c8 100644 --- a/config/GMPE01_00/rels/m427Dll/splits.txt +++ b/config/GMPE01_00/rels/m427Dll/splits.txt @@ -5,3 +5,24 @@ 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/m427Dll/main.c: + .text start:0x000000A0 end:0x000032F4 + .rodata start:0x00000000 end:0x000000D8 + .data start:0x00000000 end:0x000000E8 + .bss start:0x00000000 end:0x00000090 + +REL/m427Dll/map.c: + .text start:0x000032F4 end:0x0000E98C + .rodata start:0x000000D8 end:0x00000388 + .data start:0x000000E8 end:0x00000260 + .bss start:0x00000090 end:0x00000550 + +REL/m427Dll/player.c: + .text start:0x0000E98C end:0x000174D4 + .rodata start:0x00000388 end:0x000004A0 + .data start:0x00000260 end:0x00000654 + .bss start:0x00000550 end:0x00000598 diff --git a/config/GMPE01_00/rels/m427Dll/symbols.txt b/config/GMPE01_00/rels/m427Dll/symbols.txt index 0ce6699f..531de390 100644 --- a/config/GMPE01_00/rels/m427Dll/symbols.txt +++ b/config/GMPE01_00/rels/m427Dll/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:0x64 fn_1_300 = .text:0x00000300; // type:function size:0x1364 fn_1_1664 = .text:0x00001664; // type:function size:0x60 @@ -281,15 +281,15 @@ lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x4 data:float lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x4 data:float lbl_1_rodata_364 = .rodata:0x00000364; // type:object size:0x4 data:float lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x4 data:float -lbl_1_rodata_36C = .rodata:0x0000036C; // type:object size:0x1 data:byte -lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x1 data:byte +lbl_1_rodata_36C = .rodata:0x0000036C; // type:object size:0x4 data:byte +lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 data:byte lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 data:float lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 data:float lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x4 data:float lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x4 data:float lbl_1_rodata_384 = .rodata:0x00000384; // type:object size:0x4 data:float -lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x1 data:byte -lbl_1_rodata_38A = .rodata:0x0000038A; // type:object size:0x1 data:byte +lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x2 data:byte +lbl_1_rodata_38A = .rodata:0x0000038A; // type:object size:0x2 data:byte lbl_1_rodata_38C = .rodata:0x0000038C; // type:object size:0x4 data:float lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x4 data:float lbl_1_rodata_394 = .rodata:0x00000394; // type:object size:0x4 data:float @@ -347,13 +347,14 @@ lbl_1_rodata_488 = .rodata:0x00000488; // type:object size:0x8 data:double lbl_1_rodata_490 = .rodata:0x00000490; // type:object size:0x8 data:double lbl_1_rodata_498 = .rodata:0x00000498; // type:object size:0x8 data:double lbl_1_data_0 = .data:0x00000000; // type:object size:0x70 data:float -lbl_1_data_70 = .data:0x00000070; // type:object size:0x24 +lbl_1_data_70 = .data:0x00000070; // type:object size:0x23 data:string jumptable_1_data_94 = .data:0x00000094; // type:object size:0x3C scope:local lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x8 lbl_1_data_D8 = .data:0x000000D8; // type:object size:0x4 lbl_1_data_DC = .data:0x000000DC; // type:object size:0x4 -lbl_1_data_E0 = .data:0x000000E0; // type:object size:0xC data:2byte -lbl_1_data_EC = .data:0x000000EC; // type:object size:0x8 +lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x4 data:2byte +lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:2byte +lbl_1_data_EC = .data:0x000000EC; // type:object size:0x5 data:string lbl_1_data_F4 = .data:0x000000F4; // type:object size:0x4 data:float lbl_1_data_F8 = .data:0x000000F8; // type:object size:0x4 data:float lbl_1_data_FC = .data:0x000000FC; // type:object size:0x30 @@ -367,7 +368,7 @@ lbl_1_data_1EC = .data:0x000001EC; // type:object size:0x4 lbl_1_data_1F0 = .data:0x000001F0; // type:object size:0x13 data:string lbl_1_data_203 = .data:0x00000203; // type:object size:0x10 data:string lbl_1_data_213 = .data:0x00000213; // type:object size:0x26 data:string -lbl_1_data_239 = .data:0x00000239; // type:object size:0x27 +lbl_1_data_239 = .data:0x00000239; // type:object size:0x25 lbl_1_data_260 = .data:0x00000260; // type:object size:0x15C lbl_1_data_3BC = .data:0x000003BC; // type:object size:0x178 lbl_1_data_534 = .data:0x00000534; // type:object size:0x18 @@ -375,7 +376,7 @@ lbl_1_data_54C = .data:0x0000054C; // type:object size:0x18 data:float lbl_1_data_564 = .data:0x00000564; // type:object size:0xC data:float lbl_1_data_570 = .data:0x00000570; // type:object size:0xC data:float lbl_1_data_57C = .data:0x0000057C; // type:object size:0x4 -lbl_1_data_580 = .data:0x00000580; // type:object size:0x10 +lbl_1_data_580 = .data:0x00000580; // type:object size:0xE data:string lbl_1_data_590 = .data:0x00000590; // type:object size:0x1C lbl_1_data_5AC = .data:0x000005AC; // type:object size:0x1C lbl_1_data_5C8 = .data:0x000005C8; // type:object size:0x8 @@ -387,7 +388,7 @@ lbl_1_data_608 = .data:0x00000608; // type:object size:0x10 lbl_1_data_618 = .data:0x00000618; // type:object size:0x10 jumptable_1_data_628 = .data:0x00000628; // type:object size:0x20 scope:local lbl_1_data_648 = .data:0x00000648; // type:object size:0x4 -lbl_1_data_64C = .data:0x0000064C; // type:object size:0x1 data:byte +lbl_1_data_64C = .data:0x0000064C; // type:object size:0x4 data:byte lbl_1_data_650 = .data:0x00000650; // type:object size:0x4 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x40 lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte @@ -420,7 +421,7 @@ lbl_1_bss_F0 = .bss:0x000000F0; // type:object size:0x4 data:4byte lbl_1_bss_F4 = .bss:0x000000F4; // type:object size:0x4 data:4byte lbl_1_bss_F8 = .bss:0x000000F8; // type:object size:0x60 data:2byte lbl_1_bss_158 = .bss:0x00000158; // type:object size:0x3F0 data:byte -lbl_1_bss_548 = .bss:0x00000548; // type:object size:0x8 data:4byte +lbl_1_bss_548 = .bss:0x00000548; // type:object size:0x4 data:4byte lbl_1_bss_550 = .bss:0x00000550; // type:object size:0x4 data:4byte lbl_1_bss_554 = .bss:0x00000554; // type:object size:0x4 data:4byte lbl_1_bss_558 = .bss:0x00000558; // type:object size:0x4 data:4byte diff --git a/config/GMPE01_00/rels/m428Dll/splits.txt b/config/GMPE01_00/rels/m428Dll/splits.txt index 531cd645..03f22ea9 100644 --- a/config/GMPE01_00/rels/m428Dll/splits.txt +++ b/config/GMPE01_00/rels/m428Dll/splits.txt @@ -5,3 +5,24 @@ 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/m428Dll/main.c: + .text start:0x000000A0 end:0x000040A4 + .rodata start:0x00000000 end:0x000000D8 + .data start:0x00000000 end:0x00000130 + .bss start:0x00000000 end:0x00000090 + +REL/m428Dll/map.c: + .text start:0x000040A4 end:0x00009F5C + .rodata start:0x000000D8 end:0x00000228 + .data start:0x00000130 end:0x00000150 + .bss start:0x00000090 end:0x00000130 + +REL/m428Dll/player.c: + .text start:0x00009F5C end:0x00014690 + .rodata start:0x00000228 end:0x00000414 + .data start:0x00000150 end:0x00000712 + .bss start:0x00000130 end:0x000002D4 diff --git a/config/GMPE01_00/rels/m428Dll/symbols.txt b/config/GMPE01_00/rels/m428Dll/symbols.txt index cd8f595d..e40ea36c 100644 --- a/config/GMPE01_00/rels/m428Dll/symbols.txt +++ b/config/GMPE01_00/rels/m428Dll/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:0x218 +ModuleProlog = .text:0x000000A0; // type:function size:0x218 fn_1_2B8 = .text:0x000002B8; // type:function size:0x1C0 fn_1_478 = .text:0x00000478; // type:function size:0x2154 fn_1_25CC = .text:0x000025CC; // type:function size:0x50 @@ -331,12 +331,13 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0x54 data:float lbl_1_data_54 = .data:0x00000054; // type:object size:0xC lbl_1_data_60 = .data:0x00000060; // type:object size:0xC lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC -lbl_1_data_78 = .data:0x00000078; // type:object size:0x24 +lbl_1_data_78 = .data:0x00000078; // type:object size:0x23 data:string lbl_1_data_9C = .data:0x0000009C; // type:object size:0xC lbl_1_data_A8 = .data:0x000000A8; // type:object size:0xC lbl_1_data_B4 = .data:0x000000B4; // type:object size:0x4 jumptable_1_data_B8 = .data:0x000000B8; // type:object size:0x30 scope:local -lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x48 data:byte +lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:byte +lbl_1_data_EC = .data:0x000000EC; // type:object size:0x44 data:byte lbl_1_data_130 = .data:0x00000130; // type:object size:0x14 lbl_1_data_144 = .data:0x00000144; // type:object size:0x8 lbl_1_data_14C = .data:0x0000014C; // type:object size:0x4 data:4byte @@ -384,7 +385,7 @@ lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x4 data:4byte lbl_1_bss_7C = .bss:0x0000007C; // type:object size:0x4 data:4byte lbl_1_bss_80 = .bss:0x00000080; // type:object size:0x4 data:4byte lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x4 data:4byte -lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x8 data:4byte +lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x8 data:4byte lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x8 lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte diff --git a/config/GMPE01_00/rels/m429Dll/splits.txt b/config/GMPE01_00/rels/m429Dll/splits.txt index 531cd645..a2c2add0 100644 --- a/config/GMPE01_00/rels/m429Dll/splits.txt +++ b/config/GMPE01_00/rels/m429Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m429Dll/main.c: + .text start:0x00000000 end:0x0000EA70 + .rodata start:0x00000000 end:0x00000198 + .data start:0x00000000 end:0x00001510 + .bss start:0x00000000 end:0x00000364 diff --git a/config/GMPE01_00/rels/m429Dll/symbols.txt b/config/GMPE01_00/rels/m429Dll/symbols.txt index f2faf4cf..6264ced4 100644 --- a/config/GMPE01_00/rels/m429Dll/symbols.txt +++ b/config/GMPE01_00/rels/m429Dll/symbols.txt @@ -185,7 +185,7 @@ lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0xE data:string lbl_1_data_1F2 = .data:0x000001F2; // type:object size:0xE data:string lbl_1_data_200 = .data:0x00000200; // type:object size:0xE data:string lbl_1_data_20E = .data:0x0000020E; // type:object size:0xE data:string -lbl_1_data_21C = .data:0x0000021C; // type:object size:0x10 +lbl_1_data_21C = .data:0x0000021C; // type:object size:0xE data:string lbl_1_data_22C = .data:0x0000022C; // type:object size:0x57C lbl_1_data_7A8 = .data:0x000007A8; // type:object size:0xD data:string lbl_1_data_7B5 = .data:0x000007B5; // type:object size:0xD data:string @@ -261,7 +261,7 @@ lbl_1_data_13E8 = .data:0x000013E8; // type:object size:0x50 lbl_1_data_1438 = .data:0x00001438; // type:object size:0x21 data:string lbl_1_data_1459 = .data:0x00001459; // type:object size:0x1F jumptable_1_data_1478 = .data:0x00001478; // type:object size:0x24 scope:local -lbl_1_data_149C = .data:0x0000149C; // type:object size:0x1C +lbl_1_data_149C = .data:0x0000149C; // type:object size:0x1B data:string jumptable_1_data_14B8 = .data:0x000014B8; // type:object size:0x34 scope:local lbl_1_data_14EC = .data:0x000014EC; // type:object size:0x24 data:string lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte diff --git a/config/GMPE01_00/rels/m430Dll/splits.txt b/config/GMPE01_00/rels/m430Dll/splits.txt index 531cd645..a17f992d 100644 --- a/config/GMPE01_00/rels/m430Dll/splits.txt +++ b/config/GMPE01_00/rels/m430Dll/splits.txt @@ -5,3 +5,24 @@ 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/m430Dll/main.c: + .text start:0x000000A0 end:0x00004A80 + .rodata start:0x00000000 end:0x000000F0 + .data start:0x00000000 end:0x00000050 + .bss start:0x00000000 end:0x00000040 + +REL/m430Dll/water.c: + .text start:0x00004A80 end:0x0000BBC4 + .rodata start:0x000000F0 end:0x00000488 + .data start:0x00000050 end:0x00000170 + .bss start:0x00000040 end:0x00000158 + +REL/m430Dll/player.c: + .text start:0x0000BBC4 end:0x00013490 + .rodata start:0x00000488 end:0x000006E8 + .data start:0x00000170 end:0x0000030C + .bss start:0x00000158 end:0x00000180 diff --git a/config/GMPE01_00/rels/m430Dll/symbols.txt b/config/GMPE01_00/rels/m430Dll/symbols.txt index 3517ae68..f79d261a 100644 --- a/config/GMPE01_00/rels/m430Dll/symbols.txt +++ b/config/GMPE01_00/rels/m430Dll/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:0x5BC +ModuleProlog = .text:0x000000A0; // type:function size:0x5BC fn_1_65C = .text:0x0000065C; // type:function size:0xC4 fn_1_720 = .text:0x00000720; // type:function size:0x334 fn_1_A54 = .text:0x00000A54; // type:function size:0x144 @@ -428,9 +428,9 @@ lbl_1_data_18 = .data:0x00000018; // type:object size:0xC data:float lbl_1_data_24 = .data:0x00000024; // type:object size:0x4 lbl_1_data_28 = .data:0x00000028; // type:object size:0xC data:float lbl_1_data_34 = .data:0x00000034; // type:object size:0xC data:float -lbl_1_data_40 = .data:0x00000040; // type:object size:0x10 data:float +lbl_1_data_40 = .data:0x00000040; // type:object size:0xC data:float lbl_1_data_50 = .data:0x00000050; // type:object size:0x7 data:string -lbl_1_data_57 = .data:0x00000057; // type:object size:0x9 +lbl_1_data_57 = .data:0x00000057; // type:object size:0x7 data:string lbl_1_data_60 = .data:0x00000060; // type:object size:0x48 lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x18 lbl_1_data_C0 = .data:0x000000C0; // type:object size:0x60 @@ -465,7 +465,7 @@ lbl_1_bss_26 = .bss:0x00000026; // type:object size:0x6 data:2byte lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x2 data:2byte 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:0x8 data:4byte +lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:float @@ -479,7 +479,7 @@ lbl_1_bss_140 = .bss:0x00000140; // type:object size:0x4 data:4byte lbl_1_bss_144 = .bss:0x00000144; // type:object size:0x4 data:4byte lbl_1_bss_148 = .bss:0x00000148; // type:object size:0x4 data:4byte lbl_1_bss_14C = .bss:0x0000014C; // type:object size:0x4 data:4byte -lbl_1_bss_150 = .bss:0x00000150; // type:object size:0x8 data:4byte +lbl_1_bss_150 = .bss:0x00000150; // type:object size:0x4 data:4byte lbl_1_bss_158 = .bss:0x00000158; // type:object size:0x4 data:4byte lbl_1_bss_15C = .bss:0x0000015C; // type:object size:0x4 data:4byte lbl_1_bss_160 = .bss:0x00000160; // type:object size:0x4 data:4byte diff --git a/config/GMPE01_00/rels/m431Dll/splits.txt b/config/GMPE01_00/rels/m431Dll/splits.txt index 531cd645..b8bd1367 100644 --- a/config/GMPE01_00/rels/m431Dll/splits.txt +++ b/config/GMPE01_00/rels/m431Dll/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/m431Dll/main.c: + .text start:0x000000A0 end:0x00007ABC + .rodata start:0x00000000 end:0x00000188 + .data start:0x00000000 end:0x000001D0 + .bss start:0x00000000 end:0x00000098 + +REL/m431Dll/object.c: + .text start:0x00007ABC end:0x0000B558 + .rodata start:0x00000188 end:0x00000234 + .data start:0x000001D0 end:0x0000026C + .bss start:0x00000098 end:0x0000067C diff --git a/config/GMPE01_00/rels/m431Dll/symbols.txt b/config/GMPE01_00/rels/m431Dll/symbols.txt index d0a607fd..24174c15 100644 --- a/config/GMPE01_00/rels/m431Dll/symbols.txt +++ b/config/GMPE01_00/rels/m431Dll/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:0x384 +ModuleProlog = .text:0x000000A0; // type:function size:0x384 fn_1_424 = .text:0x00000424; // type:function size:0x78 fn_1_49C = .text:0x0000049C; // type:function size:0xE0 fn_1_57C = .text:0x0000057C; // type:function size:0x234 @@ -219,11 +219,11 @@ lbl_1_data_162 = .data:0x00000162; // type:object size:0x2 data:2byte lbl_1_data_164 = .data:0x00000164; // type:object size:0x10 data:4byte lbl_1_data_174 = .data:0x00000174; // type:object size:0x10 data:string lbl_1_data_184 = .data:0x00000184; // type:object size:0x26 data:string -lbl_1_data_1AA = .data:0x000001AA; // type:object size:0x26 +lbl_1_data_1AA = .data:0x000001AA; // type:object size:0x24 data:string lbl_1_data_1D0 = .data:0x000001D0; // type:object size:0x4 data:float lbl_1_data_1D4 = .data:0x000001D4; // type:object size:0x20 lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x20 -lbl_1_data_214 = .data:0x00000214; // type:object size:0x1C +lbl_1_data_214 = .data:0x00000214; // type:object size:0x19 data:string lbl_1_data_230 = .data:0x00000230; // type:object size:0x20 lbl_1_data_250 = .data:0x00000250; // type:object size:0x10 lbl_1_data_260 = .data:0x00000260; // type:object size:0x8 @@ -243,7 +243,7 @@ lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x2 data:2byte lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:4byte lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:4byte lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x28 -lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x3C data:2byte +lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x38 data:2byte lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x1 data:byte lbl_1_bss_9C = .bss:0x0000009C; // type:object size:0x10 lbl_1_bss_AC = .bss:0x000000AC; // type:object size:0x80 data:4byte diff --git a/config/GMPE01_00/rels/m432Dll/splits.txt b/config/GMPE01_00/rels/m432Dll/splits.txt index 531cd645..121fa4a6 100644 --- a/config/GMPE01_00/rels/m432Dll/splits.txt +++ b/config/GMPE01_00/rels/m432Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m432Dll/main.c: + .text start:0x00000000 end:0x00016260 + .rodata start:0x00000000 end:0x00000234 + .data start:0x00000000 end:0x000019F8 + .bss start:0x00000000 end:0x000005DC diff --git a/config/GMPE01_00/rels/m432Dll/symbols.txt b/config/GMPE01_00/rels/m432Dll/symbols.txt index 7d4201a9..75ff4704 100644 --- a/config/GMPE01_00/rels/m432Dll/symbols.txt +++ b/config/GMPE01_00/rels/m432Dll/symbols.txt @@ -232,7 +232,7 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0x10 lbl_1_data_10 = .data:0x00000010; // type:object size:0x20 lbl_1_data_30 = .data:0x00000030; // type:object size:0x28 lbl_1_data_58 = .data:0x00000058; // type:object size:0x28 -lbl_1_data_80 = .data:0x00000080; // type:object size:0x20 +lbl_1_data_80 = .data:0x00000080; // type:object size:0x1F data:string lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x8 lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x20 data:float lbl_1_data_C8 = .data:0x000000C8; // type:object size:0xC @@ -296,7 +296,7 @@ lbl_1_data_5B4 = .data:0x000005B4; // type:object size:0xB data:string lbl_1_data_5BF = .data:0x000005BF; // type:object size:0xB data:string lbl_1_data_5CA = .data:0x000005CA; // type:object size:0xB data:string lbl_1_data_5D5 = .data:0x000005D5; // type:object size:0xB data:string -lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xC +lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xB data:string lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x8B8 lbl_1_data_EA4 = .data:0x00000EA4; // type:object size:0xB data:string lbl_1_data_EAF = .data:0x00000EAF; // type:object size:0xB data:string diff --git a/config/GMPE01_00/rels/m434Dll/splits.txt b/config/GMPE01_00/rels/m434Dll/splits.txt index 531cd645..4ba00e1a 100644 --- a/config/GMPE01_00/rels/m434Dll/splits.txt +++ b/config/GMPE01_00/rels/m434Dll/splits.txt @@ -5,3 +5,30 @@ 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/m434Dll/main.c: + .text start:0x000000A0 end:0x00001DB0 + .rodata start:0x00000000 end:0x000000B8 + .data start:0x00000000 end:0x00000100 + .bss start:0x00000000 end:0x000003D8 + +REL/m434Dll/map.c: + .text start:0x00001DB0 end:0x00004854 + .rodata start:0x000000B8 end:0x000001A8 + .data start:0x00000100 end:0x00000180 + .bss start:0x000003D8 end:0x00005870 + +REL/m434Dll/player.c: + .text start:0x00004854 end:0x00006860 + .rodata start:0x000001A8 end:0x000002D0 + .data start:0x00000180 end:0x000002C0 + .bss start:0x00005870 end:0x00005880 + +REL/m434Dll/fish.c: + .text start:0x00006860 end:0x0000918C + .rodata start:0x000002D0 end:0x000004D0 + .data start:0x000002C0 end:0x000002C8 + .bss start:0x00005880 end:0x00007884 diff --git a/config/GMPE01_00/rels/m434Dll/symbols.txt b/config/GMPE01_00/rels/m434Dll/symbols.txt index 6e8050dc..642a9fa9 100644 --- a/config/GMPE01_00/rels/m434Dll/symbols.txt +++ b/config/GMPE01_00/rels/m434Dll/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:0x45C +ModuleProlog = .text:0x000000A0; // type:function size:0x45C fn_1_4FC = .text:0x000004FC; // type:function size:0x5C fn_1_558 = .text:0x00000558; // type:function size:0x70C fn_1_C64 = .text:0x00000C64; // type:function size:0x64 @@ -272,10 +272,10 @@ lbl_1_rodata_488 = .rodata:0x00000488; // type:object size:0x48 lbl_1_data_0 = .data:0x00000000; // type:object size:0xC data:float lbl_1_data_C = .data:0x0000000C; // type:object size:0x18 data:float lbl_1_data_24 = .data:0x00000024; // type:object size:0x28 -lbl_1_data_4C = .data:0x0000004C; // type:object size:0x24 +lbl_1_data_4C = .data:0x0000004C; // type:object size:0x23 data:string lbl_1_data_70 = .data:0x00000070; // type:object size:0x4 data:4byte lbl_1_data_74 = .data:0x00000074; // type:object size:0x12 data:string -lbl_1_data_86 = .data:0x00000086; // type:object size:0x1E +lbl_1_data_86 = .data:0x00000086; // type:object size:0x1C data:string lbl_1_data_A4 = .data:0x000000A4; // type:object size:0x8 lbl_1_data_AC = .data:0x000000AC; // type:object size:0x8 lbl_1_data_B4 = .data:0x000000B4; // type:object size:0xC @@ -283,21 +283,24 @@ lbl_1_data_C0 = .data:0x000000C0; // type:object size:0x30 lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x10 lbl_1_data_100 = .data:0x00000100; // type:object size:0x34 lbl_1_data_134 = .data:0x00000134; // type:object size:0x5 data:string -lbl_1_data_139 = .data:0x00000139; // type:object size:0x7 data:byte +lbl_1_data_139 = .data:0x00000139; // type:object size:0x4 data:byte lbl_1_data_140 = .data:0x00000140; // type:object size:0x18 -lbl_1_data_158 = .data:0x00000158; // type:object size:0x1C -lbl_1_data_174 = .data:0x00000174; // type:object size:0x1 data:byte -lbl_1_data_178 = .data:0x00000178; // type:object size:0x8 data:byte +lbl_1_data_158 = .data:0x00000158; // type:object size:0x18 +lbl_1_data_170 = .data:0x00000170; // type:object size:0x4 +lbl_1_data_174 = .data:0x00000174; // type:object size:0x4 data:byte +lbl_1_data_178 = .data:0x00000178; // type:object size:0x4 data:byte +lbl_1_data_17C = .data:0x0000017C; // type:object size:0x4 data:byte lbl_1_data_180 = .data:0x00000180; // type:object size:0x10 lbl_1_data_190 = .data:0x00000190; // type:object size:0x20 -lbl_1_data_1B0 = .data:0x000001B0; // type:object size:0x2C +lbl_1_data_1B0 = .data:0x000001B0; // type:object size:0xB data:string +lbl_1_data_1BC = .data:0x000001BC; // type:object size:0x20 lbl_1_data_1DC = .data:0x000001DC; // type:object size:0x8 lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x18 lbl_1_data_1FC = .data:0x000001FC; // type:object size:0x28 lbl_1_data_224 = .data:0x00000224; // type:object size:0x90 lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x3 data:string lbl_1_data_2B7 = .data:0x000002B7; // type:object size:0x3 data:string -lbl_1_data_2BA = .data:0x000002BA; // type:object size:0x6 +lbl_1_data_2BA = .data:0x000002BA; // type:object size:0x3 data:string lbl_1_data_2C0 = .data:0x000002C0; // type:object size:0x8 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:float lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte @@ -318,7 +321,8 @@ lbl_1_bss_3C2 = .bss:0x000003C2; // type:object size:0x2 data:2byte lbl_1_bss_3C4 = .bss:0x000003C4; // type:object size:0x8 data:4byte lbl_1_bss_3CC = .bss:0x000003CC; // type:object size:0x4 data:4byte lbl_1_bss_3D0 = .bss:0x000003D0; // type:object size:0x4 data:4byte -lbl_1_bss_3D4 = .bss:0x000003D4; // type:object size:0x1C data:4byte +lbl_1_bss_3D4 = .bss:0x000003D4; // type:object size:0x4 data:4byte +lbl_1_bss_3D8 = .bss:0x000003D8; // type:object size:0x18 data:4byte lbl_1_bss_3F0 = .bss:0x000003F0; // type:object size:0x50 data:4byte lbl_1_bss_440 = .bss:0x00000440; // type:object size:0x10 data:4byte lbl_1_bss_450 = .bss:0x00000450; // type:object size:0x8 data:4byte @@ -328,7 +332,7 @@ lbl_1_bss_464 = .bss:0x00000464; // type:object size:0x2000 data:float lbl_1_bss_2464 = .bss:0x00002464; // type:object size:0x4 data:4byte lbl_1_bss_2468 = .bss:0x00002468; // type:object size:0x400 data:2byte lbl_1_bss_2868 = .bss:0x00002868; // type:object size:0x3000 data:float -lbl_1_bss_5868 = .bss:0x00005868; // type:object size:0x8 data:4byte +lbl_1_bss_5868 = .bss:0x00005868; // type:object size:0x4 data:4byte lbl_1_bss_5870 = .bss:0x00005870; // type:object size:0x10 lbl_1_bss_5880 = .bss:0x00005880; // type:object size:0x800 lbl_1_bss_6080 = .bss:0x00006080; // type:object size:0x400 diff --git a/configure.py b/configure.py index 29d2bbf6..c5870a14 100644 --- a/configure.py +++ b/configure.py @@ -967,6 +967,60 @@ config.libs = [ Object(NonMatching, "REL/m424Dll/claw.c"), } ), + Rel('m425Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m425Dll/main.c"), + Object(NonMatching, "REL/m425Dll/thwomp.c"), + } + ), + Rel('m426Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m426Dll/main.c"), + } + ), + Rel('m427Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m427Dll/main.c"), + Object(NonMatching, "REL/m427Dll/map.c"), + Object(NonMatching, "REL/m427Dll/player.c"), + } + ), + Rel('m428Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m428Dll/main.c"), + Object(NonMatching, "REL/m428Dll/map.c"), + Object(NonMatching, "REL/m428Dll/player.c"), + } + ), + Rel('m429Dll', + objects = { + Object(NonMatching, "REL/m429Dll/main.c"), + } + ), + Rel('m430Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m430Dll/main.c"), + Object(NonMatching, "REL/m430Dll/water.c"), + Object(NonMatching, "REL/m430Dll/player.c"), + } + ), + Rel('m431Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m431Dll/main.c"), + Object(NonMatching, "REL/m431Dll/object.c"), + } + ), + Rel('m432Dll', + objects = { + Object(NonMatching, "REL/m432Dll/main.c"), + } + ), Rel('m433Dll', objects = { Object(Matching, "REL/executor.c"), @@ -975,6 +1029,15 @@ config.libs = [ Object(NonMatching, "REL/m433Dll/player.c"), } ), + Rel('m434Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m434Dll/main.c"), + Object(NonMatching, "REL/m434Dll/map.c"), + Object(NonMatching, "REL/m434Dll/player.c"), + Object(NonMatching, "REL/m434Dll/fish.c"), + } + ), Rel('m442Dll', objects = { Object(Matching, "REL/executor.c"),