diff --git a/config/GMPE01_00/rels/messDll/splits.txt b/config/GMPE01_00/rels/messDll/splits.txt index 531cd645..1f102c76 100644 --- a/config/GMPE01_00/rels/messDll/splits.txt +++ b/config/GMPE01_00/rels/messDll/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/messDll/main.c: + .text start:0x000000A0 end:0x000014A0 + .rodata start:0x00000000 end:0x00000078 + .data start:0x00000000 end:0x00000460 + .bss start:0x00000000 end:0x00000038 diff --git a/config/GMPE01_00/rels/messDll/symbols.txt b/config/GMPE01_00/rels/messDll/symbols.txt index f17a0354..4ff0390b 100644 --- a/config/GMPE01_00/rels/messDll/symbols.txt +++ b/config/GMPE01_00/rels/messDll/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:0x21C +ModuleProlog = .text:0x000000A0; // type:function size:0x21C fn_1_2BC = .text:0x000002BC; // type:function size:0x44 fn_1_300 = .text:0x00000300; // type:function size:0xB88 fn_1_E88 = .text:0x00000E88; // type:function size:0x328 diff --git a/config/GMPE01_00/rels/mstory4Dll/splits.txt b/config/GMPE01_00/rels/mstory4Dll/splits.txt index 531cd645..5789fb59 100644 --- a/config/GMPE01_00/rels/mstory4Dll/splits.txt +++ b/config/GMPE01_00/rels/mstory4Dll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/mstory4Dll/main.c: + .text start:0x00000000 end:0x00001A2C + .rodata start:0x00000000 end:0x00000048 + .data start:0x00000000 end:0x000006F6 + .bss start:0x00000000 end:0x00000018 diff --git a/config/GMPE01_00/rels/safDll/splits.txt b/config/GMPE01_00/rels/safDll/splits.txt index 531cd645..d7dd15cb 100644 --- a/config/GMPE01_00/rels/safDll/splits.txt +++ b/config/GMPE01_00/rels/safDll/splits.txt @@ -5,3 +5,9 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/safDll/main.c: + .text start:0x00000000 end:0x000003AC + .rodata start:0x00000000 end:0x00000024 + .data start:0x00000000 end:0x00000039 + .bss start:0x00000000 end:0x00000300 diff --git a/config/GMPE01_00/rels/selmenuDll/splits.txt b/config/GMPE01_00/rels/selmenuDll/splits.txt index 0c8a822e..39e27b1f 100644 --- a/config/GMPE01_00/rels/selmenuDll/splits.txt +++ b/config/GMPE01_00/rels/selmenuDll/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x000000A0 -REL/selmenuDll/selmenuDll.c: +REL/selmenuDll/main.c: .text start:0x000000A0 end:0x00005198 .rodata start:0x00000000 end:0x00000084 .data start:0x00000000 end:0x00000B3F diff --git a/config/GMPE01_00/rels/staffDll/splits.txt b/config/GMPE01_00/rels/staffDll/splits.txt index 857b9b91..74e73407 100644 --- a/config/GMPE01_00/rels/staffDll/splits.txt +++ b/config/GMPE01_00/rels/staffDll/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x000000A0 -REL/staffDll/staffDll.c: +REL/staffDll/main.c: .text start:0x000000A0 end:0x00001290 .rodata start:0x00000000 end:0x00000094 .data start:0x00000000 end:0x00001178 diff --git a/config/GMPE01_00/rels/subchrselDll/splits.txt b/config/GMPE01_00/rels/subchrselDll/splits.txt index 62fd2695..5fbeced7 100644 --- a/config/GMPE01_00/rels/subchrselDll/splits.txt +++ b/config/GMPE01_00/rels/subchrselDll/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x000000A0 -REL/subchrselDll/subchrselDll.c: +REL/subchrselDll/main.c: .text start:0x000000A0 end:0x000007B8 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x000000E1 diff --git a/config/GMPE01_00/rels/w06Dll/splits.txt b/config/GMPE01_00/rels/w06Dll/splits.txt index 531cd645..31719105 100644 --- a/config/GMPE01_00/rels/w06Dll/splits.txt +++ b/config/GMPE01_00/rels/w06Dll/splits.txt @@ -5,3 +5,42 @@ Sections: .rodata type:rodata align:8 .data type:data align:8 .bss type:bss align:8 + +REL/board_executor.c: + .text start:0x00000000 end:0x000000E0 + +REL/w06Dll/main.c: + .text start:0x000000E0 end:0x00000D70 + .rodata start:0x00000000 end:0x00000040 + .data start:0x00000000 end:0x000001A8 + .bss start:0x00000000 end:0x00000018 + +REL/w06Dll/mg_item.c: + .text start:0x00000D70 end:0x00004878 + .rodata start:0x00000040 end:0x000000F0 + .data start:0x000001A8 end:0x000001D8 + .bss start:0x00000018 end:0x00000048 + +REL/w06Dll/mg_coin.c: + .text start:0x00004878 end:0x00006EF0 + .rodata start:0x000000F0 end:0x000001B0 + .data start:0x000001D8 end:0x00000208 + .bss start:0x00000048 end:0x00000090 + +REL/w06Dll/fire.c: + .text start:0x00006EF0 end:0x00007BB0 + .rodata start:0x000001B0 end:0x000001E8 + .data start:0x00000208 end:0x00000418 + .bss start:0x00000090 end:0x000000C8 + +REL/w06Dll/bridge.c: + .text start:0x00007BB0 end:0x00008F20 + .rodata start:0x000001E8 end:0x00000228 + .data start:0x00000418 end:0x00000498 + .bss start:0x000000C8 end:0x000000E8 + +REL/w06Dll/bowser.c: + .text start:0x00008F20 end:0x0000D0A4 + .rodata start:0x00000228 end:0x000002D8 + .data start:0x00000498 end:0x00000541 + .bss start:0x000000E8 end:0x000000F5 diff --git a/config/GMPE01_00/rels/w06Dll/symbols.txt b/config/GMPE01_00/rels/w06Dll/symbols.txt index 51c6c855..6cea2169 100644 --- a/config/GMPE01_00/rels/w06Dll/symbols.txt +++ b/config/GMPE01_00/rels/w06Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +InitBoard = .text:0x00000000; // type:function size:0x30 scope:local _prolog = .text:0x00000030; // type:function size:0x64 scope:global _epilog = .text:0x00000094; // type:function size:0x4C scope:global -fn_1_E0 = .text:0x000000E0; // type:function size:0x4C4 -fn_1_5A4 = .text:0x000005A4; // type:function size:0x18C +BoardCreate = .text:0x000000E0; // type:function size:0x4C4 +BoardDestroy = .text:0x000005A4; // type:function size:0x18C fn_1_730 = .text:0x00000730; // type:function size:0x6C fn_1_79C = .text:0x0000079C; // type:function size:0x20 fn_1_7BC = .text:0x000007BC; // type:function size:0x144 @@ -145,11 +145,11 @@ lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x8 data:double lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double -lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x1 data:byte +lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x2 data:byte lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float -lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x1 data:byte +lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x3 data:byte lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x6 data:2byte -lbl_1_rodata_9A = .rodata:0x0000009A; // type:object size:0x1 data:byte +lbl_1_rodata_9A = .rodata:0x0000009A; // type:object size:0x3 data:byte lbl_1_rodata_9E = .rodata:0x0000009E; // type:object size:0x6 data:2byte lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float @@ -282,12 +282,12 @@ lbl_1_data_1AD = .data:0x000001AD; // type:object size:0x3 lbl_1_data_1B0 = .data:0x000001B0; // type:object size:0x2 data:2byte lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0xC lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x5 data:string -lbl_1_data_1C5 = .data:0x000001C5; // type:object size:0x13 +lbl_1_data_1C5 = .data:0x000001C5; // type:object size:0xE lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x2 data:2byte lbl_1_data_1DA = .data:0x000001DA; // type:object size:0x2 data:2byte lbl_1_data_1DC = .data:0x000001DC; // type:object size:0x2 data:2byte lbl_1_data_1DE = .data:0x000001DE; // type:object size:0x6 -lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x24 +lbl_1_data_1E4 = .data:0x000001E4; // type:object size:0x20 lbl_1_data_208 = .data:0x00000208; // type:object size:0x20 lbl_1_data_228 = .data:0x00000228; // type:object size:0x1 data:byte lbl_1_data_22A = .data:0x0000022A; // type:object size:0x2 data:2byte @@ -310,7 +310,9 @@ lbl_1_data_335 = .data:0x00000335; // type:object size:0x15 data:string lbl_1_data_34A = .data:0x0000034A; // type:object size:0x10 data:string lbl_1_data_35A = .data:0x0000035A; // type:object size:0x13 data:string lbl_1_data_36D = .data:0x0000036D; // type:object size:0x13 data:string -lbl_1_data_380 = .data:0x00000380; // type:object size:0x98 +lbl_1_data_380 = .data:0x00000380; // type:object size:0x11 data:string +lbl_1_data_394 = .data:0x00000394; // type:object size:0x38 +lbl_1_data_3CC = .data:0x000003CC; // type:object size:0x4C lbl_1_data_418 = .data:0x00000418; // type:object size:0x2 data:2byte lbl_1_data_41C = .data:0x0000041C; // type:object size:0x18 lbl_1_data_434 = .data:0x00000434; // type:object size:0x18 @@ -344,7 +346,7 @@ lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte lbl_1_bss_33 = .bss:0x00000033; // type:object size:0x1 data:byte lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x2 data:2byte lbl_1_bss_36 = .bss:0x00000036; // type:object size:0x6 -lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0xC data:2byte +lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0x6 data:2byte lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index f255e2e3..915c123f 100644 --- a/configure.py +++ b/configure.py @@ -816,6 +816,12 @@ config.libs = [ Object(NonMatching, "REL/mentDll/main.c"), } ), + Rel('messDll', + objects = { + Object(Matching, "REL/executor.c"), + Object(NonMatching, "REL/messDll/main.c"), + } + ), Rel('mgmodedll', objects = { Object(Matching, "REL/executor.c"), @@ -846,6 +852,11 @@ config.libs = [ Object(NonMatching, "REL/mpexDll/mgname.c"), } ), + Rel('mstory4Dll', + objects = { + Object(NonMatching, "REL/mstory4Dll/main.c"), + } + ), Rel('option', objects = { Object(Matching, "REL/executor.c"), @@ -870,22 +881,27 @@ config.libs = [ Object(NonMatching, "REL/present/common.c"), } ), + Rel('safDll', + objects = { + Object(NonMatching, "REL/safDll/main.c"), + } + ), Rel('selmenuDll', objects = { Object(Matching, "REL/executor.c"), - Object(NonMatching, "REL/selmenuDll/selmenuDll.c"), + Object(NonMatching, "REL/selmenuDll/main.c"), } ), Rel('staffDll', objects = { Object(Matching, "REL/executor.c"), - Object(NonMatching, "REL/staffDll/staffDll.c"), + Object(NonMatching, "REL/staffDll/main.c"), } ), Rel('subchrselDll', objects = { Object(Matching, "REL/executor.c"), - Object(NonMatching, "REL/subchrselDll/subchrselDll.c"), + Object(Matching, "REL/subchrselDll/main.c"), } ), Rel('w01Dll', @@ -942,6 +958,17 @@ config.libs = [ Object(NonMatching, "REL/w05Dll/mg_coin.c"), } ), + Rel('w05Dll', + objects = { + Object(Matching, "REL/board_executor.c"), + Object(NonMatching, "REL/w06Dll/main.c"), + Object(NonMatching, "REL/w06Dll/mg_item.c"), + Object(NonMatching, "REL/w06Dll/mg_coin.c"), + Object(NonMatching, "REL/w06Dll/fire.c"), + Object(NonMatching, "REL/w06Dll/bridge.c"), + Object(NonMatching, "REL/w06Dll/bowser.c"), + } + ), Rel('w10Dll', objects = { Object(Matching, "REL/board_executor.c"), diff --git a/src/REL/subchrselDll/subchrselDll.c b/src/REL/subchrselDll/main.c similarity index 99% rename from src/REL/subchrselDll/subchrselDll.c rename to src/REL/subchrselDll/main.c index 843079b4..eda20c61 100644 --- a/src/REL/subchrselDll/subchrselDll.c +++ b/src/REL/subchrselDll/main.c @@ -1,6 +1,6 @@ -#include "common.h" #include "game/audio.h" #include "game/object.h" +#include "game/gamework_data.h" #include "game/printfunc.h" #include "game/pad.h" #include "game/wipe.h"