From cffbe86a7f5da172b4452da99756b81ac3de559f Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Sun, 21 Apr 2024 18:32:19 -0500 Subject: [PATCH] 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"),