diff --git a/config/GMPE01_00/rels/bootDll/splits.txt b/config/GMPE01_00/rels/bootDll/splits.txt index 1cdd17c0..49f64a4a 100644 --- a/config/GMPE01_00/rels/bootDll/splits.txt +++ b/config/GMPE01_00/rels/bootDll/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x000000A0 -REL/bootDll/bootDll.c: +REL/bootDll/main.c: .text start:0x000000A0 end:0x00002944 .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x000000A0 diff --git a/config/GMPE01_00/rels/resultDll/splits.txt b/config/GMPE01_00/rels/resultDll/splits.txt index 531cd645..e3323be0 100644 --- a/config/GMPE01_00/rels/resultDll/splits.txt +++ b/config/GMPE01_00/rels/resultDll/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/resultDll/main.c: + .text start:0x000000A0 end:0x00006490 + .rodata start:0x00000000 end:0x00000160 + .data start:0x00000000 end:0x000004E8 + .bss start:0x00000000 end:0x00000190 + +REL/resultDll/battle.c: + .text start:0x00006490 end:0x00008FF8 + .rodata start:0x00000160 end:0x00000220 + .data start:0x000004E8 end:0x000008B8 + .bss start:0x00000190 end:0x00001ADC + +REL/resultDll/datalist.c: + .text start:0x00008FF8 end:0x0000942C + .rodata start:0x00000220 end:0x00000230 + .data start:0x000008B8 end:0x00000918 diff --git a/config/GMPE01_00/rels/resultDll/symbols.txt b/config/GMPE01_00/rels/resultDll/symbols.txt index 07d67720..28077d73 100644 --- a/config/GMPE01_00/rels/resultDll/symbols.txt +++ b/config/GMPE01_00/rels/resultDll/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:0x438 +ModuleProlog = .text:0x000000A0; // type:function size:0x438 fn_1_4D8 = .text:0x000004D8; // type:function size:0x3B0 fn_1_888 = .text:0x00000888; // type:function size:0x2F0 fn_1_B78 = .text:0x00000B78; // type:function size:0x13D4 @@ -145,11 +145,12 @@ lbl_1_data_3F8 = .data:0x000003F8; // type:object size:0x10 lbl_1_data_408 = .data:0x00000408; // type:object size:0x30 lbl_1_data_438 = .data:0x00000438; // type:object size:0x10 lbl_1_data_448 = .data:0x00000448; // type:object size:0x8 -lbl_1_data_450 = .data:0x00000450; // type:object size:0x38 +lbl_1_data_450 = .data:0x00000450; // type:object size:0x18 +lbl_1_data_468 = .data:0x00000468; // type:object size:0x20 lbl_1_data_488 = .data:0x00000488; // type:object size:0x30 lbl_1_data_4B8 = .data:0x000004B8; // type:object size:0x11 data:string lbl_1_data_4C9 = .data:0x000004C9; // type:object size:0x11 data:string -lbl_1_data_4DA = .data:0x000004DA; // type:object size:0xE +lbl_1_data_4DA = .data:0x000004DA; // type:object size:0xB data:string lbl_1_data_4E8 = .data:0x000004E8; // type:object size:0x270 lbl_1_data_758 = .data:0x00000758; // type:object size:0x28 lbl_1_data_780 = .data:0x00000780; // type:object size:0x70 @@ -160,7 +161,7 @@ lbl_1_data_860 = .data:0x00000860; // type:object size:0x20 lbl_1_data_880 = .data:0x00000880; // type:object size:0x20 lbl_1_data_8A0 = .data:0x000008A0; // type:object size:0x6 data:2byte lbl_1_data_8A6 = .data:0x000008A6; // type:object size:0x8 data:string -lbl_1_data_8AE = .data:0x000008AE; // type:object size:0xA +lbl_1_data_8AE = .data:0x000008AE; // type:object size:0x8 data:string lbl_1_data_8B8 = .data:0x000008B8; // type:object size:0x60 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte @@ -187,7 +188,7 @@ lbl_1_bss_174 = .bss:0x00000174; // type:object size:0x4 data:4byte lbl_1_bss_178 = .bss:0x00000178; // type:object size:0x4 data:4byte lbl_1_bss_17C = .bss:0x0000017C; // type:object size:0x2 data:2byte lbl_1_bss_180 = .bss:0x00000180; // type:object size:0x4 data:4byte -lbl_1_bss_184 = .bss:0x00000184; // type:object size:0xC data:4byte +lbl_1_bss_184 = .bss:0x00000184; // type:object size:0x8 data:4byte lbl_1_bss_190 = .bss:0x00000190; // type:object size:0x4 data:4byte lbl_1_bss_194 = .bss:0x00000194; // type:object size:0x1680 lbl_1_bss_1814 = .bss:0x00001814; // type:object size:0x14 diff --git a/config/GMPE01_00/rels/ztardll/splits.txt b/config/GMPE01_00/rels/ztardll/splits.txt index 531cd645..3c33f4d7 100644 --- a/config/GMPE01_00/rels/ztardll/splits.txt +++ b/config/GMPE01_00/rels/ztardll/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/ztardll/main.c: + .text start:0x000000A0 end:0x00007754 + .rodata start:0x00000000 end:0x000001B8 + .data start:0x00000000 end:0x000000B0 + .bss start:0x00000000 end:0x00000070 + +REL/ztardll/font.c: + .text start:0x00007754 end:0x00007C00 + .rodata start:0x000001B8 end:0x000001C0 + .data start:0x000000B0 end:0x000003C8 + +REL/ztardll/select.c: + .text start:0x00007C00 end:0x0001236C + .rodata start:0x000001C0 end:0x00000298 + .data start:0x000003C8 end:0x00000674 + .bss start:0x00000070 end:0x000002D8 diff --git a/config/GMPE01_00/rels/ztardll/symbols.txt b/config/GMPE01_00/rels/ztardll/symbols.txt index 10bab33e..2c9ea7ba 100644 --- a/config/GMPE01_00/rels/ztardll/symbols.txt +++ b/config/GMPE01_00/rels/ztardll/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:0x1350 fn_1_1774 = .text:0x00001774; // type:function size:0x57C fn_1_1CF0 = .text:0x00001CF0; // type:function size:0xB0 @@ -201,16 +201,16 @@ lbl_1_rodata_258 = .rodata:0x00000258; // type:object size:0x4 data:float lbl_1_rodata_25C = .rodata:0x0000025C; // type:object size:0x4 data:float lbl_1_rodata_260 = .rodata:0x00000260; // type:object size:0x38 data:4byte lbl_1_data_0 = .data:0x00000000; // type:object size:0x22 data:string -lbl_1_data_22 = .data:0x00000022; // type:object size:0xA +lbl_1_data_22 = .data:0x00000022; // type:object size:0x8 lbl_1_data_2C = .data:0x0000002C; // type:object size:0x18 lbl_1_data_44 = .data:0x00000044; // type:object size:0x6 lbl_1_data_4A = .data:0x0000004A; // type:object size:0xC -lbl_1_data_56 = .data:0x00000056; // type:object size:0xE data:wstring +lbl_1_data_56 = .data:0x00000056; // type:object size:0xE data:2byte lbl_1_data_64 = .data:0x00000064; // type:object size:0x20 lbl_1_data_84 = .data:0x00000084; // type:object size:0x10 lbl_1_data_94 = .data:0x00000094; // type:object size:0xC lbl_1_data_A0 = .data:0x000000A0; // type:object size:0xA data:string -lbl_1_data_AA = .data:0x000000AA; // type:object size:0x6 +lbl_1_data_AA = .data:0x000000AA; // type:object size:0x4 data:string lbl_1_data_B0 = .data:0x000000B0; // type:object size:0x318 lbl_1_data_3C8 = .data:0x000003C8; // type:object size:0x20 lbl_1_data_3E8 = .data:0x000003E8; // type:object size:0x20 diff --git a/configure.py b/configure.py index 7785e244..d80d0952 100644 --- a/configure.py +++ b/configure.py @@ -767,7 +767,7 @@ config.libs = [ Rel('bootDll', objects = { Object(Matching, "REL/executor.c"), - Object(NonMatching, "REL/bootDll/bootDll.c"), + Object(NonMatching, "REL/bootDll/main.c"), Object(Matching, "REL/bootDll/nintendo_data.c"), } ), @@ -911,6 +911,14 @@ config.libs = [ Object(NonMatching, "REL/present/common.c"), } ), + Rel('resultDll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/resultDll/main.c"), + Object(NonMatching, "REL/resultDll/battle.c"), + Object(NonMatching, "REL/resultDll/datalist.c"), + } + ), Rel('safDll', objects = { Object(NonMatching, "REL/safDll/main.c"), @@ -1020,6 +1028,14 @@ config.libs = [ Object(NonMatching, "REL/w21Dll/main.c"), } ), + Rel('ztardll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/ztardll/main.c"), + Object(NonMatching, "REL/ztardll/font.c"), + Object(NonMatching, "REL/ztardll/select.c"), + } + ), ] if args.mode == "configure": diff --git a/src/REL/bootDll/bootDll.c b/src/REL/bootDll/main.c similarity index 99% rename from src/REL/bootDll/bootDll.c rename to src/REL/bootDll/main.c index 237f2d75..29d6b709 100644 --- a/src/REL/bootDll/bootDll.c +++ b/src/REL/bootDll/main.c @@ -1,4 +1,4 @@ -#include "common.h" +#include "game/gamework_data.h" #include "game/process.h" #include "game/data.h" #include "game/sprite.h" diff --git a/src/REL/safDll/safDll.c b/src/REL/safDll/main.c similarity index 100% rename from src/REL/safDll/safDll.c rename to src/REL/safDll/main.c diff --git a/src/game/fault.c b/src/game/fault.c index 5ebd2183..b2e9efa4 100644 --- a/src/game/fault.c +++ b/src/game/fault.c @@ -1,4 +1,4 @@ -#include "common.h" +#include "game/gamework_data.h" #include "stdarg.h" #include "stdio.h"