Split most of the rest of board RELs

w04, w05, w20, and w21 are split
This commit is contained in:
gamemasterplc 2024-01-18 15:30:13 -06:00
parent 270e67e011
commit f3e6d3754e
11 changed files with 171 additions and 39 deletions

View file

@ -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/w04Dll/main.c:
.text start:0x000000E0 end:0x000012FC
.rodata start:0x00000000 end:0x00000040
.data start:0x00000000 end:0x00000298
.bss start:0x00000000 end:0x00000038
REL/w04Dll/bridge.c:
.text start:0x000012FC end:0x00002044
.rodata start:0x00000040 end:0x00000098
.data start:0x00000298 end:0x000002D0
.bss start:0x00000038 end:0x00000048
REL/w04Dll/boo_event.c:
.text start:0x00002044 end:0x00006024
.rodata start:0x00000098 end:0x00000180
.data start:0x000002D0 end:0x000003A8
.bss start:0x00000048 end:0x00000100
REL/w04Dll/big_boo.c:
.text start:0x00006024 end:0x0000A0F8
.rodata start:0x00000180 end:0x000002C0
.data start:0x000003A8 end:0x000004F0
.bss start:0x00000100 end:0x00000288
REL/w04Dll/mg_item.c:
.text start:0x0000A0F8 end:0x0000C7A0
.rodata start:0x000002C0 end:0x000003A0
.data start:0x000004F0 end:0x00000588
.bss start:0x00000288 end:0x000002B0
REL/w04Dll/mg_coin.c:
.text start:0x0000C7A0 end:0x0000EA0C
.rodata start:0x000003A0 end:0x00000428
.data start:0x00000588 end:0x0000063F
.bss start:0x000002B0 end:0x00000328

View file

@ -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:0x514
fn_1_5F4 = .text:0x000005F4; // type:function size:0x15C
BoardCreate = .text:0x000000E0; // type:function size:0x514
BoardDestroy = .text:0x000005F4; // type:function size:0x15C
fn_1_750 = .text:0x00000750; // type:function size:0x44
fn_1_794 = .text:0x00000794; // type:function size:0x4
fn_1_798 = .text:0x00000798; // type:function size:0x64
@ -326,7 +326,7 @@ lbl_1_data_288 = .data:0x00000288; // type:object size:0x8
lbl_1_data_290 = .data:0x00000290; // type:object size:0x8
lbl_1_data_298 = .data:0x00000298; // type:object size:0x8
lbl_1_data_2A0 = .data:0x000002A0; // type:object size:0xC
lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x24
lbl_1_data_2AC = .data:0x000002AC; // type:object size:0x20
lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x20
lbl_1_data_2F0 = .data:0x000002F0; // type:object size:0x4 data:4byte
lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x20
@ -340,12 +340,12 @@ lbl_1_data_358 = .data:0x00000358; // type:object size:0x10
lbl_1_data_368 = .data:0x00000368; // type:object size:0x8 data:string
lbl_1_data_370 = .data:0x00000370; // type:object size:0x12 data:string
lbl_1_data_382 = .data:0x00000382; // type:object size:0x11 data:string
lbl_1_data_393 = .data:0x00000393; // type:object size:0x15
lbl_1_data_393 = .data:0x00000393; // type:object size:0x10
lbl_1_data_3A8 = .data:0x000003A8; // type:object size:0x8 data:string
lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0x9 data:string
lbl_1_data_3B9 = .data:0x000003B9; // type:object size:0x6 data:string
lbl_1_data_3BF = .data:0x000003BF; // type:object size:0x5 data:string
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x8
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x5 data:string
lbl_1_data_3CC = .data:0x000003CC; // type:object size:0x14 data:4byte
lbl_1_data_3E0 = .data:0x000003E0; // type:object size:0x14
lbl_1_data_3F4 = .data:0x000003F4; // type:object size:0x20
@ -356,8 +356,8 @@ lbl_1_data_45F = .data:0x0000045F; // type:object size:0x2 data:string
lbl_1_data_461 = .data:0x00000461; // type:object size:0xC data:string
lbl_1_data_46D = .data:0x0000046D; // type:object size:0x1B
lbl_1_data_488 = .data:0x00000488; // type:object size:0x3 data:string
lbl_1_data_48B = .data:0x0000048B; // type:object size:0x11
lbl_1_data_49C = .data:0x0000049C; // type:object size:0x54
lbl_1_data_48B = .data:0x0000048B; // type:object size:0xF data:string
lbl_1_data_49C = .data:0x0000049C; // type:object size:0x50
lbl_1_data_4F0 = .data:0x000004F0; // type:object size:0x6 data:string
lbl_1_data_4F6 = .data:0x000004F6; // type:object size:0x6 data:string
lbl_1_data_4FC = .data:0x000004FC; // type:object size:0x6 data:string
@ -388,7 +388,7 @@ lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x8 data:2byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x24 data:2byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x20 data:2byte
lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte
lbl_1_bss_3C = .bss:0x0000003C; // type:object size:0xC
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
@ -410,7 +410,7 @@ lbl_1_bss_C4 = .bss:0x000000C4; // type:object size:0x10
lbl_1_bss_D4 = .bss:0x000000D4; // type:object size:0x10
lbl_1_bss_E4 = .bss:0x000000E4; // type:object size:0x10
lbl_1_bss_F4 = .bss:0x000000F4; // type:object size:0x6 data:2byte
lbl_1_bss_FA = .bss:0x000000FA; // type:object size:0x6 data:2byte
lbl_1_bss_FA = .bss:0x000000FA; // type:object size:0x2 data:2byte
lbl_1_bss_100 = .bss:0x00000100; // type:object size:0x4 data:4byte
lbl_1_bss_104 = .bss:0x00000104; // type:object size:0x4 data:4byte
lbl_1_bss_108 = .bss:0x00000108; // type:object size:0xC
@ -427,7 +427,7 @@ lbl_1_bss_278 = .bss:0x00000278; // type:object size:0x4 data:4byte
lbl_1_bss_27C = .bss:0x0000027C; // type:object size:0x2 data:2byte
lbl_1_bss_27E = .bss:0x0000027E; // type:object size:0x2 data:2byte
lbl_1_bss_280 = .bss:0x00000280; // type:object size:0x2 data:2byte
lbl_1_bss_282 = .bss:0x00000282; // type:object size:0x6 data:2byte
lbl_1_bss_282 = .bss:0x00000282; // type:object size:0x2 data:2byte
lbl_1_bss_288 = .bss:0x00000288; // type:object size:0x4 data:4byte
lbl_1_bss_28C = .bss:0x0000028C; // type:object size:0x8 data:4byte
lbl_1_bss_294 = .bss:0x00000294; // type:object size:0x4 data:float

View file

@ -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/w05Dll/main.c:
.text start:0x000000E0 end:0x000013D4
.rodata start:0x00000000 end:0x00000048
.data start:0x00000000 end:0x00000150
.bss start:0x00000000 end:0x00000028
REL/w05Dll/hotel.c:
.text start:0x000013D4 end:0x00002B40
.rodata start:0x00000048 end:0x00000090
.data start:0x00000150 end:0x000001A8
.bss start:0x00000028 end:0x00000030
REL/w05Dll/monkey.c:
.text start:0x00002B40 end:0x00003F74
.rodata start:0x00000090 end:0x000000F8
.data start:0x000001A8 end:0x00000200
.bss start:0x00000030 end:0x00000058
REL/w05Dll/dolphin.c:
.text start:0x00003F74 end:0x00006B28
.rodata start:0x000000F8 end:0x000001A8
.data start:0x00000200 end:0x00000310
.bss start:0x00000058 end:0x00000078
REL/w05Dll/mg_item.c:
.text start:0x00006B28 end:0x00009680
.rodata start:0x000001A8 end:0x00000268
.data start:0x00000310 end:0x00000450
.bss start:0x00000078 end:0x000000B8
REL/w05Dll/mg_coin.c:
.text start:0x00009680 end:0x0000B644
.rodata start:0x00000268 end:0x00000300
.data start:0x00000450 end:0x000004C7
.bss start:0x000000B8 end:0x00000108

View file

@ -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:0x4D8
fn_1_5B8 = .text:0x000005B8; // type:function size:0x18C
BoardCreate = .text:0x000000E0; // type:function size:0x4D8
BoardDestroy = .text:0x000005B8; // type:function size:0x18C
fn_1_744 = .text:0x00000744; // type:function size:0x44
fn_1_788 = .text:0x00000788; // type:function size:0x4
fn_1_78C = .text:0x0000078C; // type:function size:0xA0
@ -256,10 +256,10 @@ lbl_1_data_144 = .data:0x00000144; // type:object size:0x8
lbl_1_data_14C = .data:0x0000014C; // type:object size:0x4
lbl_1_data_150 = .data:0x00000150; // type:object size:0x14
lbl_1_data_164 = .data:0x00000164; // type:object size:0x2 data:2byte
lbl_1_data_166 = .data:0x00000166; // type:object size:0xA
lbl_1_data_166 = .data:0x00000166; // type:object size:0x7 data:string
lbl_1_data_170 = .data:0x00000170; // type:object size:0x10
lbl_1_data_180 = .data:0x00000180; // type:object size:0x4 data:4byte
lbl_1_data_184 = .data:0x00000184; // type:object size:0x4
lbl_1_data_184 = .data:0x00000184; // type:object size:0x3 data:string
lbl_1_data_188 = .data:0x00000188; // type:object size:0x10
lbl_1_data_198 = .data:0x00000198; // type:object size:0x8
lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0x8 data:string
@ -271,19 +271,19 @@ lbl_1_data_1CC = .data:0x000001CC; // type:object size:0xC
lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x8 data:string
lbl_1_data_1E0 = .data:0x000001E0; // type:object size:0x8 data:string
lbl_1_data_1E8 = .data:0x000001E8; // type:object size:0xA data:string
lbl_1_data_1F2 = .data:0x000001F2; // type:object size:0xE
lbl_1_data_1F2 = .data:0x000001F2; // type:object size:0xB data:string
lbl_1_data_200 = .data:0x00000200; // type:object size:0x8 data:string
lbl_1_data_208 = .data:0x00000208; // type:object size:0x8 data:string
lbl_1_data_210 = .data:0x00000210; // type:object size:0x6 data:string
lbl_1_data_216 = .data:0x00000216; // type:object size:0x6 data:string
lbl_1_data_21C = .data:0x0000021C; // type:object size:0x7 data:string
lbl_1_data_223 = .data:0x00000223; // type:object size:0x9
lbl_1_data_223 = .data:0x00000223; // type:object size:0x7 data:string
lbl_1_data_22C = .data:0x0000022C; // type:object size:0x18
lbl_1_data_244 = .data:0x00000244; // type:object size:0x18
lbl_1_data_25C = .data:0x0000025C; // type:object size:0x48
lbl_1_data_2A4 = .data:0x000002A4; // type:object size:0x48
lbl_1_data_2EC = .data:0x000002EC; // type:object size:0x8
lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x1C
lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x18
lbl_1_data_310 = .data:0x00000310; // type:object size:0x8
lbl_1_data_318 = .data:0x00000318; // type:object size:0x7 data:string
lbl_1_data_31F = .data:0x0000031F; // type:object size:0x7 data:string
@ -291,8 +291,9 @@ lbl_1_data_326 = .data:0x00000326; // type:object size:0xA
lbl_1_data_330 = .data:0x00000330; // type:object size:0xC
lbl_1_data_33C = .data:0x0000033C; // type:object size:0x7 data:string
lbl_1_data_343 = .data:0x00000343; // type:object size:0xD data:string
lbl_1_data_350 = .data:0x00000350; // type:object size:0xF0
lbl_1_data_440 = .data:0x00000440; // type:object size:0x10
lbl_1_data_350 = .data:0x00000350; // type:object size:0x38
lbl_1_data_388 = .data:0x00000388; // type:object size:0xB8
lbl_1_data_440 = .data:0x00000440; // type:object size:0xC
lbl_1_data_450 = .data:0x00000450; // type:object size:0x6 data:string
lbl_1_data_456 = .data:0x00000456; // type:object size:0x7 data:string
lbl_1_data_45D = .data:0x0000045D; // type:object size:0x7 data:string
@ -312,20 +313,20 @@ lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x8 data:2byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x14 data:2byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x8 data:2byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0xE data:2byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x2 data:2byte
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x8 data:2byte
lbl_1_bss_38 = .bss:0x00000038; // type:object size:0xC data:float
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x2 data:2byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x2 data:2byte
lbl_1_bss_4A = .bss:0x0000004A; // type:object size:0x2 data:2byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x2 data:2byte
lbl_1_bss_4E = .bss:0x0000004E; // type:object size:0xA data:2byte
lbl_1_bss_4E = .bss:0x0000004E; // type:object size:0x4 data:2byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0xC
lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x2 data:2byte
lbl_1_bss_68 = .bss:0x00000068; // type:object size:0x4 data:4byte
lbl_1_bss_6C = .bss:0x0000006C; // type:object size:0x6
lbl_1_bss_72 = .bss:0x00000072; // type:object size:0x6 data:2byte
lbl_1_bss_72 = .bss:0x00000072; // type:object size:0x4 data:2byte
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x4 data:4byte
lbl_1_bss_7C = .bss:0x0000007C; // type:object size:0xC
lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte

View file

@ -5,3 +5,12 @@ 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/w21Dll/main.c:
.text start:0x000000E0 end:0x00000678
.rodata start:0x00000000 end:0x00000030
.data start:0x00000000 end:0x00000034
.bss start:0x00000000 end:0x0000000E

View file

@ -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:0x2B0
fn_1_390 = .text:0x00000390; // type:function size:0xBC
BoardCreate = .text:0x000000E0; // type:function size:0x2B0
BoardDestroy = .text:0x00000390; // type:function size:0xBC
fn_1_44C = .text:0x0000044C; // type:function size:0x44
fn_1_490 = .text:0x00000490; // type:function size:0x4
fn_1_494 = .text:0x00000494; // type:function size:0x4
@ -22,6 +22,8 @@ lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x2 data:2byte
lbl_1_data_2 = .data:0x00000002; // type:object size:0x2 data:2byte
lbl_1_data_6 = .data:0x00000006; // type:object size:0x2 data:2byte
lbl_1_data_8 = .data:0x00000008; // type:object size:0x24 data:2byte
lbl_1_data_8 = .data:0x00000008; // type:object size:0x2 data:2byte
lbl_1_data_A = .data:0x0000000A; // type:object size:0x22 data:2byte
lbl_1_data_2C = .data:0x0000002C; // type:object size:0x8
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0xE
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x8
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x6

View file

@ -4,3 +4,11 @@ Sections:
.dtors type:rodata align:4
.rodata type:rodata align:8
.data type:data align:8
REL/board_executor.c:
.text start:0x00000000 end:0x000000E0
REL/w21Dll/main.c:
.text start:0x000000E0 end:0x000003E0
.rodata start:0x00000000 end:0x00000018
.data start:0x00000000 end:0x00000010

View file

@ -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:0x1D4
fn_1_2B4 = .text:0x000002B4; // type:function size:0xB8
BoardCreate = .text:0x000000E0; // type:function size:0x1D4
BoardDestroy = .text:0x000002B4; // type:function size:0xB8
fn_1_36C = .text:0x0000036C; // type:function size:0x44
fn_1_3B0 = .text:0x000003B0; // type:function size:0x20
fn_1_3D0 = .text:0x000003D0; // type:function size:0x8

View file

@ -6327,8 +6327,8 @@ destroyFunc = .sbss:0x801D3EE8; // type:object size:0x4 scope:local data:4byte
boardLightSetHook = .sbss:0x801D3EEC; // type:object size:0x4 data:4byte
boardLightResetHook = .sbss:0x801D3EF0; // type:object size:0x4 data:4byte
boardTurnFunc = .sbss:0x801D3EF4; // type:object size:0x4 data:4byte
lbl_801D3EF8 = .sbss:0x801D3EF8; // type:object size:0x4 data:4byte
lbl_801D3EFC = .sbss:0x801D3EFC; // type:object size:0x4 data:4byte
boardStarGiveHook = .sbss:0x801D3EF8; // type:object size:0x4 data:4byte
boardStarShowNextHook = .sbss:0x801D3EFC; // type:object size:0x4 data:4byte
boardBowserHook = .sbss:0x801D3F00; // type:object size:0x4 data:4byte
boardTurnStartFunc = .sbss:0x801D3F04; // type:object size:0x4 data:4byte
filterObj = .sbss:0x801D3F08; // type:object size:0x4 scope:local data:4byte

View file

@ -920,6 +920,28 @@ config.libs = [
Object(NonMatching, "REL/w03Dll/mg_item.c"),
}
),
Rel('w04Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
Object(NonMatching, "REL/w04Dll/main.c"),
Object(NonMatching, "REL/w04Dll/bridge.c"),
Object(NonMatching, "REL/w04Dll/boo_event.c"),
Object(NonMatching, "REL/w04Dll/big_boo.c"),
Object(NonMatching, "REL/w04Dll/mg_item.c"),
Object(NonMatching, "REL/w04Dll/mg_coin.c"),
}
),
Rel('w05Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
Object(NonMatching, "REL/w05Dll/main.c"),
Object(NonMatching, "REL/w05Dll/hotel.c"),
Object(NonMatching, "REL/w05Dll/monkey.c"),
Object(NonMatching, "REL/w05Dll/dolphin.c"),
Object(NonMatching, "REL/w05Dll/mg_item.c"),
Object(NonMatching, "REL/w05Dll/mg_coin.c"),
}
),
Rel('w10Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
@ -929,6 +951,18 @@ config.libs = [
Object(Matching, "REL/w10Dll/tutorial.c"),
}
),
Rel('w20Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
Object(NonMatching, "REL/w20Dll/main.c"),
}
),
Rel('w21Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
Object(NonMatching, "REL/w21Dll/main.c"),
}
),
]
if args.mode == "configure":

View file

@ -24,8 +24,8 @@ static omObjData *confettiObj;
static omObjData *filterObj;
void *boardTurnStartFunc;
void *boardBowserHook;
u32 lbl_801D3EFC;
u32 lbl_801D3EF8;
void *boardStarShowNextHook;
void *boardStarGiveHook;
BoardFunc boardTurnFunc;
BoardLightHook boardLightSetHook;
BoardLightHook boardLightResetHook;
@ -135,9 +135,9 @@ void BoardCommonInit(BoardFunc create, BoardFunc destroy)
createFunc = create;
destroyFunc = destroy;
boardTurnFunc = NULL;
lbl_801D3EFC = 0;
boardStarShowNextHook = NULL;
boardBowserHook = NULL;
lbl_801D3EF8 = 0;
boardStarGiveHook = NULL;
boardTurnStartFunc = NULL;
boardObjMan = omInitObjMan(64, 8192);
omSystemKeyCheckSetup(boardObjMan);