From 99bf495e67be1c1ae162a204673a2d35bf8ae3e6 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Fri, 19 Jan 2024 08:04:10 -0600 Subject: [PATCH] Split m405, m406, and m407 --- config/GMPE01_00/rels/m405Dll/splits.txt | 6 +++ config/GMPE01_00/rels/m406Dll/splits.txt | 21 ++++++++++ config/GMPE01_00/rels/m406Dll/symbols.txt | 12 +++--- config/GMPE01_00/rels/m407dll/splits.txt | 50 +++++++++++++++++++++++ config/GMPE01_00/rels/m407dll/symbols.txt | 26 ++++++------ configure.py | 26 ++++++++++++ 6 files changed, 122 insertions(+), 19 deletions(-) diff --git a/config/GMPE01_00/rels/m405Dll/splits.txt b/config/GMPE01_00/rels/m405Dll/splits.txt index 531cd645..1cdde2c1 100644 --- a/config/GMPE01_00/rels/m405Dll/splits.txt +++ b/config/GMPE01_00/rels/m405Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/m405Dll/main.c: + .text start:0x00000000 end:0x0000B734 + .rodata start:0x00000000 end:0x000001F0 + .data start:0x00000000 end:0x000004B4 + .bss start:0x00000000 end:0x0000079C diff --git a/config/GMPE01_00/rels/m406Dll/splits.txt b/config/GMPE01_00/rels/m406Dll/splits.txt index 531cd645..dfb4354e 100644 --- a/config/GMPE01_00/rels/m406Dll/splits.txt +++ b/config/GMPE01_00/rels/m406Dll/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/m406Dll/main.c: + .text start:0x000000A0 end:0x00002308 + .rodata start:0x00000000 end:0x00000080 + .data start:0x00000000 end:0x000000F0 + .bss start:0x00000000 end:0x00000030 + +REL/m406Dll/map.c: + .text start:0x00002308 end:0x0000D65C + .rodata start:0x00000080 end:0x000002B8 + .data start:0x000000F0 end:0x00000960 + .bss start:0x00000030 end:0x000000D8 + +REL/m406Dll/player.c: + .text start:0x0000D65C end:0x00014724 + .rodata start:0x000002B8 end:0x0000043C + .data start:0x00000960 end:0x00001230 + .bss start:0x000000D8 end:0x000001FC diff --git a/config/GMPE01_00/rels/m406Dll/symbols.txt b/config/GMPE01_00/rels/m406Dll/symbols.txt index 67393891..325549ff 100644 --- a/config/GMPE01_00/rels/m406Dll/symbols.txt +++ b/config/GMPE01_00/rels/m406Dll/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:0x318 +ModuleProlog = .text:0x000000A0; // type:function size:0x318 fn_1_3B8 = .text:0x000003B8; // type:function size:0x54 fn_1_40C = .text:0x0000040C; // type:function size:0xD00 fn_1_110C = .text:0x0000110C; // type:function size:0x5C @@ -357,11 +357,11 @@ lbl_1_data_838 = .data:0x00000838; // type:object size:0xC lbl_1_data_844 = .data:0x00000844; // type:object size:0xC lbl_1_data_850 = .data:0x00000850; // type:object size:0x20 lbl_1_data_870 = .data:0x00000870; // type:object size:0x1F data:string -lbl_1_data_88F = .data:0x0000088F; // type:object size:0x1 data:byte -lbl_1_data_893 = .data:0x00000893; // type:object size:0x1 data:byte -lbl_1_data_897 = .data:0x00000897; // type:object size:0x1 data:byte -lbl_1_data_89B = .data:0x0000089B; // type:object size:0x1 data:byte -lbl_1_data_89F = .data:0x0000089F; // type:object size:0x5 data:byte +lbl_1_data_88F = .data:0x0000088F; // type:object size:0x4 data:byte +lbl_1_data_893 = .data:0x00000893; // type:object size:0x4 data:byte +lbl_1_data_897 = .data:0x00000897; // type:object size:0x4 data:byte +lbl_1_data_89B = .data:0x0000089B; // type:object size:0x4 data:byte +lbl_1_data_89F = .data:0x0000089F; // type:object size:0x4 data:byte lbl_1_data_8A4 = .data:0x000008A4; // type:object size:0x10 lbl_1_data_8B4 = .data:0x000008B4; // type:object size:0x10 lbl_1_data_8C4 = .data:0x000008C4; // type:object size:0xC diff --git a/config/GMPE01_00/rels/m407dll/splits.txt b/config/GMPE01_00/rels/m407dll/splits.txt index 531cd645..273b18ae 100644 --- a/config/GMPE01_00/rels/m407dll/splits.txt +++ b/config/GMPE01_00/rels/m407dll/splits.txt @@ -5,3 +5,53 @@ 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/m407dll/player.c: + .text start:0x000000A0 end:0x000014F0 + .rodata start:0x00000000 end:0x000000B8 + .data start:0x00000000 end:0x00000198 + .bss start:0x00000000 end:0x00000020 + +REL/m407dll/map.c: + .text start:0x000014F0 end:0x00001B1C + .rodata start:0x000000B8 end:0x000000D8 + .data start:0x00000198 end:0x00000228 + .bss start:0x00000020 end:0x00000030 + +REL/m407dll/camera.c: + .text start:0x00001B1C end:0x00002354 + .rodata start:0x000000D8 end:0x00000120 + .bss start:0x00000030 end:0x00000038 + +REL/m407dll/whomp.c: + .text start:0x00002354 end:0x00003AC8 + .rodata start:0x00000120 end:0x00000168 + .data start:0x00000228 end:0x00000278 + .bss start:0x00000038 end:0x000037C8 + +REL/m407dll/whomp_score.c: + .text start:0x00003AC8 end:0x000041CC + .rodata start:0x00000168 end:0x00000188 + .data start:0x00000278 end:0x00000288 + .bss start:0x000037C8 end:0x000037E0 + +REL/m407dll/effect.c: + .text start:0x000041CC end:0x00004980 + .rodata start:0x00000188 end:0x00000190 + .data start:0x00000288 end:0x000002A8 + .bss start:0x000037E0 end:0x00003978 + +REL/m407dll/main.c: + .text start:0x00004980 end:0x00005C5C + .rodata start:0x00000190 end:0x000001F0 + .data start:0x000002A8 end:0x00000360 + .bss start:0x00003978 end:0x00003988 + +REL/m407dll/score.c: + .text start:0x00005C5C end:0x00006404 + .rodata start:0x000001F0 end:0x00000220 + .data start:0x00000360 end:0x0000036C + .bss start:0x00003988 end:0x00003990 diff --git a/config/GMPE01_00/rels/m407dll/symbols.txt b/config/GMPE01_00/rels/m407dll/symbols.txt index 4fb3dbd8..f89ae85a 100644 --- a/config/GMPE01_00/rels/m407dll/symbols.txt +++ b/config/GMPE01_00/rels/m407dll/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:0x54 +ModuleProlog = .text:0x000000A0; // type:function size:0x54 fn_1_F4 = .text:0x000000F4; // type:function size:0xA0 fn_1_194 = .text:0x00000194; // type:function size:0x50 fn_1_1E4 = .text:0x000001E4; // type:function size:0x54 @@ -196,7 +196,7 @@ lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x8 data:double lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0xC data:4byte lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0xC data:4byte -lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x8 data:float +lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float @@ -210,24 +210,24 @@ lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 data:float lbl_1_rodata_21C = .rodata:0x0000021C; // type:object size:0x4 data:float lbl_1_data_0 = .data:0x00000000; // type:object size:0x100 lbl_1_data_100 = .data:0x00000100; // type:object size:0x20 -lbl_1_data_120 = .data:0x00000120; // type:object size:0x1C +lbl_1_data_120 = .data:0x00000120; // type:object size:0x19 data:string lbl_1_data_13C = .data:0x0000013C; // type:object size:0x20 lbl_1_data_15C = .data:0x0000015C; // type:object size:0x28 lbl_1_data_184 = .data:0x00000184; // type:object size:0x8 -lbl_1_data_18C = .data:0x0000018C; // type:object size:0xC +lbl_1_data_18C = .data:0x0000018C; // type:object size:0xB data:string lbl_1_data_198 = .data:0x00000198; // type:object size:0x34 data:4byte lbl_1_data_1CC = .data:0x000001CC; // type:object size:0x30 lbl_1_data_1FC = .data:0x000001FC; // type:object size:0xC data:float lbl_1_data_208 = .data:0x00000208; // type:object size:0xC lbl_1_data_214 = .data:0x00000214; // type:object size:0x4 -lbl_1_data_218 = .data:0x00000218; // type:object size:0x10 +lbl_1_data_218 = .data:0x00000218; // type:object size:0xC lbl_1_data_228 = .data:0x00000228; // type:object size:0x10 data:4byte lbl_1_data_238 = .data:0x00000238; // type:object size:0x20 data:4byte lbl_1_data_258 = .data:0x00000258; // type:object size:0x14 -lbl_1_data_26C = .data:0x0000026C; // type:object size:0xC -lbl_1_data_278 = .data:0x00000278; // type:object size:0x10 +lbl_1_data_26C = .data:0x0000026C; // type:object size:0xB data:string +lbl_1_data_278 = .data:0x00000278; // type:object size:0xC lbl_1_data_288 = .data:0x00000288; // type:object size:0x14 -lbl_1_data_29C = .data:0x0000029C; // type:object size:0xC +lbl_1_data_29C = .data:0x0000029C; // type:object size:0x8 lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x34 lbl_1_data_2DC = .data:0x000002DC; // type:object size:0x10 lbl_1_data_2EC = .data:0x000002EC; // type:object size:0xC @@ -245,7 +245,7 @@ lbl_1_data_358 = .data:0x00000358; // type:object size:0x8 lbl_1_data_360 = .data:0x00000360; // type:object size:0xC lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x8 data:4byte lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x10 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:0x4 data:4byte lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x2 data:2byte lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:4byte @@ -259,13 +259,13 @@ lbl_1_bss_66 = .bss:0x00000066; // type:object size:0x2 data:2byte lbl_1_bss_68 = .bss:0x00000068; // type:object size:0x1E30 data:2byte lbl_1_bss_1E98 = .bss:0x00001E98; // type:object size:0xF18 lbl_1_bss_2DB0 = .bss:0x00002DB0; // type:object size:0xA10 -lbl_1_bss_37C0 = .bss:0x000037C0; // type:object size:0x8 data:4byte +lbl_1_bss_37C0 = .bss:0x000037C0; // type:object size:0x4 data:4byte lbl_1_bss_37C8 = .bss:0x000037C8; // type:object size:0x10 -lbl_1_bss_37D8 = .bss:0x000037D8; // type:object size:0x8 data:4byte +lbl_1_bss_37D8 = .bss:0x000037D8; // type:object size:0x4 data:4byte lbl_1_bss_37E0 = .bss:0x000037E0; // type:object size:0x190 -lbl_1_bss_3970 = .bss:0x00003970; // type:object size:0x8 data:4byte +lbl_1_bss_3970 = .bss:0x00003970; // type:object size:0x4 data:4byte lbl_1_bss_3978 = .bss:0x00003978; // type:object size:0x2 data:2byte lbl_1_bss_397C = .bss:0x0000397C; // type:object size:0x4 data:4byte -lbl_1_bss_3980 = .bss:0x00003980; // type:object size:0x8 data:4byte +lbl_1_bss_3980 = .bss:0x00003980; // type:object size:0x4 data:4byte lbl_1_bss_3988 = .bss:0x00003988; // type:object size:0x4 data:4byte lbl_1_bss_398C = .bss:0x0000398C; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index d80d0952..6fe46b5f 100644 --- a/configure.py +++ b/configure.py @@ -810,6 +810,32 @@ config.libs = [ Object(NonMatching, "REL/m404Dll/main.c"), } ), + Rel('m405Dll', + objects = { + Object(NonMatching, "REL/m405Dll/main.c"), + } + ), + Rel('m406Dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m406Dll/main.c"), + Object(NonMatching, "REL/m406Dll/map.c"), + Object(NonMatching, "REL/m406Dll/player.c"), + } + ), + Rel('m407dll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/m407dll/player.c"), + Object(NonMatching, "REL/m407dll/map.c"), + Object(NonMatching, "REL/m407dll/camera.c"), + Object(NonMatching, "REL/m407dll/whomp.c"), + Object(NonMatching, "REL/m407dll/whomp_score.c"), + Object(NonMatching, "REL/m407dll/effect.c"), + Object(NonMatching, "REL/m407dll/main.c"), + Object(NonMatching, "REL/m407dll/score.c"), + } + ), Rel('mentDll', objects = { Object(NonMatching, "REL/mentDll/common.c"),