diff --git a/config/GMPP01_00/rels/w01Dll/splits.txt b/config/GMPP01_00/rels/w01Dll/splits.txt index 531cd645..7baca9d9 100644 --- a/config/GMPP01_00/rels/w01Dll/splits.txt +++ b/config/GMPP01_00/rels/w01Dll/splits.txt @@ -5,3 +5,25 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w01Dll/main.c: + .text start:0x000000E0 end:0x00009D00 + .rodata start:0x00000010 end:0x00000198 + .data start:0x00000000 end:0x00000658 + .bss start:0x00000000 end:0x00000708 + +REL/w01Dll/mg_coin.c: + .text start:0x00009D00 end:0x0000D740 + .rodata start:0x00000198 end:0x000002C8 + .data start:0x00000658 end:0x00000F08 + .bss start:0x00000708 end:0x000007A0 + +REL/w01Dll/mg_item.c: + .text start:0x0000D740 end:0x000119F0 + .rodata start:0x000002C8 end:0x000003C4 + .data start:0x00000F08 end:0x00000FAC + .bss start:0x000007A0 end:0x0000081C diff --git a/config/GMPP01_00/rels/w01Dll/symbols.txt b/config/GMPP01_00/rels/w01Dll/symbols.txt index 90f53307..94ae2e2e 100644 --- a/config/GMPP01_00/rels/w01Dll/symbols.txt +++ b/config/GMPP01_00/rels/w01Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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:0x4BC -fn_1_59C = .text:0x0000059C; // type:function size:0x194 +BoardCreate = .text:0x000000E0; // type:function size:0x4BC +BoardDestroy = .text:0x0000059C; // type:function size:0x194 fn_1_730 = .text:0x00000730; // type:function size:0x44 fn_1_774 = .text:0x00000774; // type:function size:0x4 fn_1_778 = .text:0x00000778; // type:function size:0x9C diff --git a/config/GMPP01_00/rels/w02Dll/splits.txt b/config/GMPP01_00/rels/w02Dll/splits.txt index 531cd645..a94f9206 100644 --- a/config/GMPP01_00/rels/w02Dll/splits.txt +++ b/config/GMPP01_00/rels/w02Dll/splits.txt @@ -5,3 +5,48 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w02Dll/main.c: + .text start:0x000000E0 end:0x00001254 + .rodata start:0x00000010 end:0x00000038 + .data start:0x00000000 end:0x000002A8 + .bss start:0x00000000 end:0x00000050 + +REL/w02Dll/gendice.c: + .text start:0x00001254 end:0x00002D04 + .rodata start:0x00000038 end:0x00000108 + .data start:0x000002A8 end:0x00000360 + +REL/w02Dll/gamble.c: + .text start:0x00002D04 end:0x000039F4 + .rodata start:0x00000108 end:0x00000178 + .data start:0x00000360 end:0x00000378 + .bss start:0x00000050 end:0x00000058 + +REL/w02Dll/mg_coin.c: + .text start:0x000039F4 end:0x00005CF8 + .rodata start:0x00000178 end:0x00000218 + .data start:0x00000378 end:0x00000428 + .bss start:0x00000058 end:0x000000C8 + +REL/w02Dll/mg_item.c: + .text start:0x00005CF8 end:0x00009250 + .rodata start:0x00000218 end:0x000002F8 + .data start:0x00000428 end:0x00000490 + .bss start:0x000000C8 end:0x000001A0 + +REL/w02Dll/shuffleboard.c: + .text start:0x00009250 end:0x0000BC1C + .rodata start:0x000002F8 end:0x00000410 + .data start:0x00000490 end:0x000004D0 + .bss start:0x000001A0 end:0x00000380 + +REL/w02Dll/roulette.c: + .text start:0x0000BC1C end:0x0000E4D4 + .rodata start:0x00000410 end:0x00000538 + .data start:0x000004D0 end:0x00000524 + .bss start:0x00000380 end:0x00000390 diff --git a/config/GMPP01_00/rels/w02Dll/symbols.txt b/config/GMPP01_00/rels/w02Dll/symbols.txt index c96d468d..0383d0e6 100644 --- a/config/GMPP01_00/rels/w02Dll/symbols.txt +++ b/config/GMPP01_00/rels/w02Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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:0x4F4 -fn_1_5D4 = .text:0x000005D4; // type:function size:0x158 +BoardCreate = .text:0x000000E0; // type:function size:0x4F4 +BoardDestroy = .text:0x000005D4; // type:function size:0x158 fn_1_72C = .text:0x0000072C; // type:function size:0x44 fn_1_770 = .text:0x00000770; // type:function size:0x4 fn_1_774 = .text:0x00000774; // type:function size:0x8C diff --git a/config/GMPP01_00/rels/w03Dll/splits.txt b/config/GMPP01_00/rels/w03Dll/splits.txt index 531cd645..2ba2bee3 100644 --- a/config/GMPP01_00/rels/w03Dll/splits.txt +++ b/config/GMPP01_00/rels/w03Dll/splits.txt @@ -5,3 +5,49 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w03Dll/main.c: + .text start:0x000000E0 end:0x000012C8 + .rodata start:0x00000010 end:0x00000038 + .data start:0x00000000 end:0x00000280 + .bss start:0x00000000 end:0x00000028 + +REL/w03Dll/statue.c: + .text start:0x000012C8 end:0x00003058 + .rodata start:0x00000038 end:0x000000D8 + .data start:0x00000280 end:0x00000310 + .bss start:0x00000028 end:0x00000070 + +REL/w03Dll/condor.c: + .text start:0x00003058 end:0x000063F4 + .rodata start:0x000000D8 end:0x00000218 + .data start:0x00000310 end:0x00000368 + .bss start:0x00000070 end:0x00000120 + +REL/w03Dll/river.c: + .text start:0x000063F4 end:0x0000785C + .rodata start:0x00000218 end:0x000002A8 + .data start:0x00000368 end:0x00000410 + .bss start:0x00000120 end:0x00000138 + +REL/w03Dll/smoke.c: + .text start:0x0000785C end:0x00007ABC + .rodata start:0x000002A8 end:0x000002B0 + .data start:0x00000410 end:0x00000450 + .bss start:0x00000138 end:0x00000140 + +REL/w03Dll/mg_coin.c: + .text start:0x00007ABC end:0x00009A7C + .rodata start:0x000002B0 end:0x00000360 + .data start:0x00000450 end:0x000004D8 + .bss start:0x00000140 end:0x00000180 + +REL/w03Dll/mg_item.c: + .text start:0x00009A7C end:0x0000C248 + .rodata start:0x00000360 end:0x00000418 + .data start:0x000004D8 end:0x0000054C + .bss start:0x00000180 end:0x00000197 diff --git a/config/GMPP01_00/rels/w03Dll/symbols.txt b/config/GMPP01_00/rels/w03Dll/symbols.txt index d0fda24e..cac4adfe 100644 --- a/config/GMPP01_00/rels/w03Dll/symbols.txt +++ b/config/GMPP01_00/rels/w03Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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:0x660 -fn_1_740 = .text:0x00000740; // type:function size:0x144 +BoardCreate = .text:0x000000E0; // type:function size:0x660 +BoardDestroy = .text:0x00000740; // type:function size:0x144 fn_1_884 = .text:0x00000884; // type:function size:0x6C fn_1_8F0 = .text:0x000008F0; // type:function size:0x20 fn_1_910 = .text:0x00000910; // type:function size:0x164 diff --git a/config/GMPP01_00/rels/w04Dll/splits.txt b/config/GMPP01_00/rels/w04Dll/splits.txt index 531cd645..d977e9ab 100644 --- a/config/GMPP01_00/rels/w04Dll/splits.txt +++ b/config/GMPP01_00/rels/w04Dll/splits.txt @@ -5,3 +5,43 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w04Dll/main.c: + .text start:0x000000E0 end:0x000012FC + .rodata start:0x00000010 end:0x00000040 + .data start:0x00000000 end:0x00000298 + .bss start:0x00000000 end:0x00000038 + +REL/w04Dll/bridge.c: + .text start:0x000012FC end:0x000020EC + .rodata start:0x00000040 end:0x00000098 + .data start:0x00000298 end:0x000002D0 + .bss start:0x00000038 end:0x00000048 + +REL/w04Dll/boo_event.c: + .text start:0x000020EC 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:0x0000A0DC + .rodata start:0x00000180 end:0x000002C0 + .data start:0x000003A8 end:0x000004F0 + .bss start:0x00000100 end:0x00000288 + +REL/w04Dll/mg_item.c: + .text start:0x0000A0DC end:0x0000C784 + .rodata start:0x000002C0 end:0x000003A0 + .data start:0x000004F0 end:0x00000588 + .bss start:0x00000288 end:0x000002B0 + +REL/w04Dll/mg_coin.c: + .text start:0x0000C784 end:0x0000E9F0 + .rodata start:0x000003A0 end:0x00000428 + .data start:0x00000588 end:0x0000063F + .bss start:0x000002B0 end:0x00000328 diff --git a/config/GMPP01_00/rels/w04Dll/symbols.txt b/config/GMPP01_00/rels/w04Dll/symbols.txt index 2eb30cd1..44c0c8eb 100644 --- a/config/GMPP01_00/rels/w04Dll/symbols.txt +++ b/config/GMPP01_00/rels/w04Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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 @@ -66,19 +66,19 @@ fn_1_9B18 = .text:0x00009B18; // type:function size:0xA8 fn_1_9BC0 = .text:0x00009BC0; // type:function size:0x3C fn_1_9BFC = .text:0x00009BFC; // type:function size:0x290 fn_1_9E8C = .text:0x00009E8C; // type:function size:0x14 -fn_1_9EA0 = .text:0x00009EA0; // type:function size:0x94 +fn_1_9EBC = .text:0x00009EA0; // type:function size:0x94 fn_1_9F34 = .text:0x00009F34; // type:function size:0x124 fn_1_A058 = .text:0x0000A058; // type:function size:0x84 -fn_1_A0DC = .text:0x0000A0DC; // type:function size:0xF8 -fn_1_A1D4 = .text:0x0000A1D4; // type:function size:0x52C +fn_1_A0F8 = .text:0x0000A0DC; // type:function size:0xF8 +fn_1_A1F0 = .text:0x0000A1D4; // type:function size:0x52C fn_1_A700 = .text:0x0000A700; // type:function size:0xCC fn_1_A7CC = .text:0x0000A7CC; // type:function size:0x1294 -fn_1_BA60 = .text:0x0000BA60; // type:function size:0x84 -fn_1_BAE4 = .text:0x0000BAE4; // type:function size:0x7BC -fn_1_C2A0 = .text:0x0000C2A0; // type:function size:0xCC +fn_1_BA7C = .text:0x0000BA60; // type:function size:0x84 +fn_1_BB00 = .text:0x0000BAE4; // type:function size:0x7BC +fn_1_C2BC = .text:0x0000C2A0; // type:function size:0xCC fn_1_C36C = .text:0x0000C36C; // type:function size:0x418 -fn_1_C784 = .text:0x0000C784; // type:function size:0x34 -fn_1_C7B8 = .text:0x0000C7B8; // type:function size:0x7B8 +fn_1_C7A0 = .text:0x0000C784; // type:function size:0x34 +fn_1_C7D4 = .text:0x0000C7B8; // type:function size:0x7B8 fn_1_CF70 = .text:0x0000CF70; // type:function size:0x120 fn_1_D090 = .text:0x0000D090; // type:function size:0x30 fn_1_D0C0 = .text:0x0000D0C0; // type:function size:0x98 diff --git a/config/GMPP01_00/rels/w05Dll/splits.txt b/config/GMPP01_00/rels/w05Dll/splits.txt index 531cd645..fc4cdcea 100644 --- a/config/GMPP01_00/rels/w05Dll/splits.txt +++ b/config/GMPP01_00/rels/w05Dll/splits.txt @@ -5,3 +5,43 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w05Dll/main.c: + .text start:0x000000E0 end:0x000013D4 + .rodata start:0x00000010 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 diff --git a/config/GMPP01_00/rels/w05Dll/symbols.txt b/config/GMPP01_00/rels/w05Dll/symbols.txt index 03b04aa2..faed8cbe 100644 --- a/config/GMPP01_00/rels/w05Dll/symbols.txt +++ b/config/GMPP01_00/rels/w05Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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 diff --git a/config/GMPP01_00/rels/w06Dll/splits.txt b/config/GMPP01_00/rels/w06Dll/splits.txt index 531cd645..eee27cef 100644 --- a/config/GMPP01_00/rels/w06Dll/splits.txt +++ b/config/GMPP01_00/rels/w06Dll/splits.txt @@ -5,3 +5,43 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w06Dll/main.c: + .text start:0x000000E0 end:0x00000D70 + .rodata start:0x00000010 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:0x00007BD0 + .rodata start:0x000001B0 end:0x000001E8 + .data start:0x00000208 end:0x00000418 + .bss start:0x00000090 end:0x000000C8 + +REL/w06Dll/bridge.c: + .text start:0x00007BD0 end:0x00008F40 + .rodata start:0x000001E8 end:0x00000228 + .data start:0x00000418 end:0x00000498 + .bss start:0x000000C8 end:0x000000E8 + +REL/w06Dll/bowser.c: + .text start:0x00008F40 end:0x0000D0C4 + .rodata start:0x00000228 end:0x000002D8 + .data start:0x00000498 end:0x00000541 + .bss start:0x000000E8 end:0x000000F5 diff --git a/config/GMPP01_00/rels/w06Dll/symbols.txt b/config/GMPP01_00/rels/w06Dll/symbols.txt index 4ddd9137..43936054 100644 --- a/config/GMPP01_00/rels/w06Dll/symbols.txt +++ b/config/GMPP01_00/rels/w06Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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 @@ -86,18 +86,18 @@ fn_1_7574 = .text:0x00007574; // type:function size:0x120 fn_1_7694 = .text:0x00007694; // type:function size:0xEC fn_1_7780 = .text:0x00007780; // type:function size:0x1E4 fn_1_7964 = .text:0x00007964; // type:function size:0x26C -fn_1_7BD0 = .text:0x00007BD0; // type:function size:0x38C -fn_1_7F5C = .text:0x00007F5C; // type:function size:0x68 -fn_1_7FC4 = .text:0x00007FC4; // type:function size:0x2C0 -fn_1_8284 = .text:0x00008284; // type:function size:0xBC +fn_1_7BB0 = .text:0x00007BD0; // type:function size:0x38C +fn_1_7F3C = .text:0x00007F5C; // type:function size:0x68 +fn_1_7FA4 = .text:0x00007FC4; // type:function size:0x2C0 +fn_1_8264 = .text:0x00008284; // type:function size:0xBC fn_1_8340 = .text:0x00008340; // type:function size:0x100 fn_1_8440 = .text:0x00008440; // type:function size:0x70 fn_1_84B0 = .text:0x000084B0; // type:function size:0x5C8 fn_1_8A78 = .text:0x00008A78; // type:function size:0x4C8 -fn_1_8F40 = .text:0x00008F40; // type:function size:0x2B8 -fn_1_91F8 = .text:0x000091F8; // type:function size:0xBC -fn_1_92B4 = .text:0x000092B4; // type:function size:0x44 -fn_1_92F8 = .text:0x000092F8; // type:function size:0xF0 +fn_1_8F20 = .text:0x00008F40; // type:function size:0x2B8 +fn_1_91D8 = .text:0x000091F8; // type:function size:0xBC +fn_1_9294 = .text:0x000092B4; // type:function size:0x44 +fn_1_92D8 = .text:0x000092F8; // type:function size:0xF0 fn_1_93E8 = .text:0x000093E8; // type:function size:0x10C fn_1_94F4 = .text:0x000094F4; // type:function size:0xD8 fn_1_95CC = .text:0x000095CC; // type:function size:0x8B0 @@ -111,14 +111,14 @@ fn_1_BB30 = .text:0x0000BB30; // type:function size:0x1F8 fn_1_BD28 = .text:0x0000BD28; // type:function size:0x3C fn_1_BD64 = .text:0x0000BD64; // type:function size:0x48 fn_1_BDAC = .text:0x0000BDAC; // type:function size:0x37C -fn_1_C128 = .text:0x0000C128; // type:function size:0x1AC -fn_1_C2D4 = .text:0x0000C2D4; // type:function size:0x158 +fn_1_C108 = .text:0x0000C128; // type:function size:0x1AC +fn_1_C2B4 = .text:0x0000C2D4; // type:function size:0x158 fn_1_C42C = .text:0x0000C42C; // type:function size:0x5B0 fn_1_C9DC = .text:0x0000C9DC; // type:function size:0xD0 fn_1_CAAC = .text:0x0000CAAC; // type:function size:0x40 fn_1_CAEC = .text:0x0000CAEC; // type:function size:0x1C4 -fn_1_CCB0 = .text:0x0000CCB0; // type:function size:0x7C -fn_1_CD2C = .text:0x0000CD2C; // type:function size:0x398 +fn_1_CC90 = .text:0x0000CCB0; // type:function size:0x7C +fn_1_CD0C = .text:0x0000CD2C; // type:function size:0x398 _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float diff --git a/config/GMPP01_00/rels/w10Dll/splits.txt b/config/GMPP01_00/rels/w10Dll/splits.txt index 531cd645..c6adc1ab 100644 --- a/config/GMPP01_00/rels/w10Dll/splits.txt +++ b/config/GMPP01_00/rels/w10Dll/splits.txt @@ -5,3 +5,29 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w10Dll/main.c: + .text start:0x000000E0 end:0x00000AEC + .rodata start:0x00000010 end:0x00000038 + .data start:0x00000000 end:0x00000078 + .bss start:0x00000000 end:0x00000018 + +REL/w10Dll/host.c: + .text start:0x00000AEC end:0x00000D2C + .rodata start:0x00000038 end:0x00000048 + .data start:0x00000078 end:0x00000098 + .bss start:0x00000018 end:0x00000020 + +REL/w10Dll/scene.c: + .text start:0x00000D2C end:0x00001984 + .rodata start:0x00000048 end:0x00000058 + +REL/w10Dll/tutorial.c: + .text start:0x00001984 end:0x0000206C + .rodata start:0x00000058 end:0x00000070 + .data start:0x00000098 end:0x000002D4 + .bss start:0x00000020 end:0x00000038 diff --git a/config/GMPP01_00/rels/w10Dll/symbols.txt b/config/GMPP01_00/rels/w10Dll/symbols.txt index c99d83da..f10220e4 100644 --- a/config/GMPP01_00/rels/w10Dll/symbols.txt +++ b/config/GMPP01_00/rels/w10Dll/symbols.txt @@ -1,114 +1,116 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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:0x5F8 -fn_1_6D8 = .text:0x000006D8; // type:function size:0x1E8 -fn_1_8C0 = .text:0x000008C0; // type:function size:0x44 -fn_1_904 = .text:0x00000904; // type:function size:0x4 -fn_1_908 = .text:0x00000908; // type:function size:0x4 -fn_1_90C = .text:0x0000090C; // type:function size:0x8 +BoardCreate = .text:0x000000E0; // type:function size:0x5F8 +BoardDestroy = .text:0x000006D8; // type:function size:0x1E8 +LightSetHook = .text:0x000008C0; // type:function size:0x44 scope:local +LightResetHook = .text:0x00000904; // type:function size:0x4 scope:local +LandEvent = .text:0x00000908; // type:function size:0x4 scope:local +WalkEvent = .text:0x0000090C; // type:function size:0x8 scope:local fn_1_914 = .text:0x00000914; // type:function size:0x4 fn_1_918 = .text:0x00000918; // type:function size:0x4 -fn_1_91C = .text:0x0000091C; // type:function size:0x4 +WalkMiniEvent = .text:0x0000091C; // type:function size:0x4 scope:local fn_1_920 = .text:0x00000920; // type:function size:0x1CC -fn_1_AEC = .text:0x00000AEC; // type:function size:0xB4 -fn_1_BA0 = .text:0x00000BA0; // type:function size:0x70 -fn_1_C10 = .text:0x00000C10; // type:function size:0x10 -fn_1_C20 = .text:0x00000C20; // type:function size:0x10C -fn_1_D2C = .text:0x00000D2C; // type:function size:0x28 -fn_1_D54 = .text:0x00000D54; // type:function size:0x28 -fn_1_D7C = .text:0x00000D7C; // type:function size:0x28 -fn_1_DA4 = .text:0x00000DA4; // type:function size:0x28 -fn_1_DCC = .text:0x00000DCC; // type:function size:0x28 -fn_1_DF4 = .text:0x00000DF4; // type:function size:0x28 -fn_1_E1C = .text:0x00000E1C; // type:function size:0x28 -fn_1_E44 = .text:0x00000E44; // type:function size:0x50 -fn_1_E94 = .text:0x00000E94; // type:function size:0x28 -fn_1_EBC = .text:0x00000EBC; // type:function size:0x28 -fn_1_EE4 = .text:0x00000EE4; // type:function size:0x4 -fn_1_EE8 = .text:0x00000EE8; // type:function size:0x48 -fn_1_F30 = .text:0x00000F30; // type:function size:0x3C -fn_1_F6C = .text:0x00000F6C; // type:function size:0x4C -fn_1_FB8 = .text:0x00000FB8; // type:function size:0x58 -fn_1_1010 = .text:0x00001010; // type:function size:0x4C -fn_1_105C = .text:0x0000105C; // type:function size:0x3C -fn_1_1098 = .text:0x00001098; // type:function size:0x28 -fn_1_10C0 = .text:0x000010C0; // type:function size:0x38 -fn_1_10F8 = .text:0x000010F8; // type:function size:0x3C -fn_1_1134 = .text:0x00001134; // type:function size:0x44 -fn_1_1178 = .text:0x00001178; // type:function size:0x28 -fn_1_11A0 = .text:0x000011A0; // type:function size:0x4C -fn_1_11EC = .text:0x000011EC; // type:function size:0x54 -fn_1_1240 = .text:0x00001240; // type:function size:0x38 -fn_1_1278 = .text:0x00001278; // type:function size:0x28 -fn_1_12A0 = .text:0x000012A0; // type:function size:0x3C -fn_1_12DC = .text:0x000012DC; // type:function size:0x28 -fn_1_1304 = .text:0x00001304; // type:function size:0x28 -fn_1_132C = .text:0x0000132C; // type:function size:0x28 -fn_1_1354 = .text:0x00001354; // type:function size:0x28 -fn_1_137C = .text:0x0000137C; // type:function size:0x28 -fn_1_13A4 = .text:0x000013A4; // type:function size:0x3C8 -fn_1_176C = .text:0x0000176C; // type:function size:0x30 -fn_1_179C = .text:0x0000179C; // type:function size:0x58 -fn_1_17F4 = .text:0x000017F4; // type:function size:0x40 -fn_1_1834 = .text:0x00001834; // type:function size:0x88 -fn_1_18BC = .text:0x000018BC; // type:function size:0x4C -fn_1_1908 = .text:0x00001908; // type:function size:0x28 -fn_1_1930 = .text:0x00001930; // type:function size:0x28 -fn_1_1958 = .text:0x00001958; // type:function size:0x28 -fn_1_1980 = .text:0x00001980; // type:function size:0x4 -fn_1_1984 = .text:0x00001984; // type:function size:0x128 -fn_1_1AAC = .text:0x00001AAC; // type:function size:0x2BC -fn_1_1D68 = .text:0x00001D68; // type:function size:0x84 -fn_1_1DEC = .text:0x00001DEC; // type:function size:0x50 -fn_1_1E3C = .text:0x00001E3C; // type:function size:0x174 -fn_1_1FB0 = .text:0x00001FB0; // type:function size:0xBC +HostCreate = .text:0x00000AEC; // type:function size:0xB4 +HostWinExec = .text:0x00000BA0; // type:function size:0x70 +HostPosSet = .text:0x00000C10; // type:function size:0x10 +UpdateHost = .text:0x00000C20; // type:function size:0x10C scope:local +TutorialStartExec = .text:0x00000D2C; // type:function size:0x28 +TutorialPreRollExec = .text:0x00000D54; // type:function size:0x28 +TutorialOrderExec = .text:0x00000D7C; // type:function size:0x28 +TutorialP1StartExec = .text:0x00000DA4; // type:function size:0x28 +TutorialP2StartExec = .text:0x00000DCC; // type:function size:0x28 +TutorialP3StartExec = .text:0x00000DF4; // type:function size:0x28 +TutorialP4StartExec = .text:0x00000E1C; // type:function size:0x28 +TutorialGameStartExec = .text:0x00000E44; // type:function size:0x50 +TutorialRollExec = .text:0x00000E94; // type:function size:0x28 +TutorialMoveExec = .text:0x00000EBC; // type:function size:0x28 +TutorialLandExec = .text:0x00000EE4; // type:function size:0x4 +TutorialLandBlueExec = .text:0x00000EE8; // type:function size:0x48 +TutorialLandRedExec = .text:0x00000F30; // type:function size:0x3C +TutorialLandHappenExec = .text:0x00000F6C; // type:function size:0x4C +TutorialLandFortuneExec = .text:0x00000FB8; // type:function size:0x58 +TutorialLandBowserExec = .text:0x00001010; // type:function size:0x4C +TutorialLandMushroomExec = .text:0x0000105C; // type:function size:0x3C +TutorialMushroomMegaExec = .text:0x00001098; // type:function size:0x28 +TutorialMushroomMiniExec = .text:0x000010C0; // type:function size:0x38 +TutorialLandBattleExec = .text:0x000010F8; // type:function size:0x3C +TutorialLandWarpExec = .text:0x00001134; // type:function size:0x44 +TutorialWarpDecideExec = .text:0x00001178; // type:function size:0x28 +TutorialBlockStarExec = .text:0x000011A0; // type:function size:0x4C +TutorialBlockCoinExec = .text:0x000011EC; // type:function size:0x54 +TutorialMiniMegaExec = .text:0x00001240; // type:function size:0x38 +TutorialMiniUseExec = .text:0x00001278; // type:function size:0x28 +TutorialMiniStopExec = .text:0x000012A0; // type:function size:0x3C +TutorialMegaUseExec = .text:0x000012DC; // type:function size:0x28 +TutorialMegaDiceExec = .text:0x00001304; // type:function size:0x28 +TutorialMegaStompExec = .text:0x0000132C; // type:function size:0x28 +TutorialMegaEventExec = .text:0x00001354; // type:function size:0x28 +TutorialMegaStopExec = .text:0x0000137C; // type:function size:0x28 +TutorialEndExec = .text:0x000013A4; // type:function size:0x3C8 +TutorialMGStatusExec = .text:0x0000176C; // type:function size:0x30 +TutorialMG4PExec = .text:0x0000179C; // type:function size:0x58 +TutorialMG2Vs2Exec = .text:0x000017F4; // type:function size:0x40 +TutorialMG1Vs3Exec = .text:0x00001834; // type:function size:0x88 +TutorialMG1Vs3AltExec = .text:0x000018BC; // type:function size:0x4C +TutorialShopExec = .text:0x00001908; // type:function size:0x28 +TutorialLotteryExec = .text:0x00001930; // type:function size:0x28 +TutorialBooHouseExec = .text:0x00001958; // type:function size:0x28 +TutorialNullExec = .text:0x00001980; // type:function size:0x4 +CloseTutorial = .text:0x00001984; // type:function size:0x128 scope:local +TutorialHookExec = .text:0x00001AAC; // type:function size:0x2BC +TutorialSprCreate = .text:0x00001D68; // type:function size:0x84 +TutorialSprKill = .text:0x00001DEC; // type:function size:0x50 +TutorialSpaceShow = .text:0x00001E3C; // type:function size:0x174 +TutorialSpaceHide = .text:0x00001FB0; // type:function size:0xBC _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte -lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float -lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float -lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float -lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float -lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float -lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double -lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float -lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float -lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float -lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float -lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:float -lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float -lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float -lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float -lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float -lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float -lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float -lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float -lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 data:double -lbl_1_data_0 = .data:0x00000000; // type:object size:0x28 -lbl_1_data_28 = .data:0x00000028; // type:object size:0x2 data:2byte -lbl_1_data_2A = .data:0x0000002A; // type:object size:0x2 data:2byte -lbl_1_data_2C = .data:0x0000002C; // type:object size:0x2 data:2byte -lbl_1_data_2E = .data:0x0000002E; // type:object size:0x2 data:2byte -lbl_1_data_30 = .data:0x00000030; // type:object size:0x2 data:2byte -lbl_1_data_32 = .data:0x00000032; // type:object size:0x22 data:2byte -lbl_1_data_54 = .data:0x00000054; // type:object size:0x8 -lbl_1_data_5C = .data:0x0000005C; // type:object size:0x8 -lbl_1_data_64 = .data:0x00000064; // type:object size:0x8 -lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC -lbl_1_data_78 = .data:0x00000078; // type:object size:0x8 -lbl_1_data_80 = .data:0x00000080; // type:object size:0x18 -lbl_1_data_98 = .data:0x00000098; // type:object size:0x2E -lbl_1_data_C6 = .data:0x000000C6; // type:object size:0x42 -lbl_1_data_108 = .data:0x00000108; // type:object size:0x150 -lbl_1_data_258 = .data:0x00000258; // type:object size:0x50 data:string -lbl_1_data_2A8 = .data:0x000002A8; // type:object size:0x2C -lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x8 data:4byte -lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte -lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte -lbl_1_bss_E = .bss:0x0000000E; // type:object size:0x2 data:2byte -lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x8 data:2byte -lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte -lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x2 data:2byte -lbl_1_bss_1E = .bss:0x0000001E; // type:object size:0x2 data:2byte -lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x2 data:2byte -lbl_1_bss_22 = .bss:0x00000022; // type:object size:0x16 +lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float +lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float +lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float +lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float +lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double +lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float +lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float +lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 scope:local data:float +lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 scope:local data:float +lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float +lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float +lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float +lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float +lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float +lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 scope:local data:double +mapObjTbl = .data:0x00000000; // type:object size:0x28 scope:local data:float +bgMdl = .data:0x00000028; // type:object size:0x2 scope:local data:2byte +fgMdl = .data:0x0000002A; // type:object size:0x2 scope:local data:2byte +boardStarHostMdl = .data:0x0000002C; // type:object size:0x2 data:2byte +boardShopHostMdl = .data:0x0000002E; // type:object size:0x2 data:2byte +boardLotteryHostMdl = .data:0x00000030; // type:object size:0x2 data:2byte +boardBooHouseHostMdl = .data:0x00000032; // type:object size:0x2 data:2byte +charMotDirTbl = .data:0x00000034; // type:object size:0x20 scope:local data:4byte +starHostMot = .data:0x00000054; // type:object size:0x8 scope:local +shopHostMot = .data:0x0000005C; // type:object size:0x8 scope:local +lotteryHostMot = .data:0x00000064; // type:object size:0x8 scope:local +booHouseHostMot = .data:0x0000006C; // type:object size:0x8 scope:local +hostMot = .data:0x00000078; // type:object size:0x8 scope:local +hostPosTbl = .data:0x00000080; // type:object size:0x18 scope:local data:float +lbl_1_data_98 = .data:0x00000098; // type:object size:0x2D scope:local data:string +rollDataTbl = .data:0x000000C6; // type:object size:0x42 scope:local +sceneTbl = .data:0x00000108; // type:object size:0x150 scope:local +lbl_1_data_258 = .data:0x00000258; // type:object size:0x50 scope:local data:string +tutorialSprTbl = .data:0x000002A8; // type:object size:0x2C scope:local +boardWork = .bss:0x00000000; // type:object size:0x4 data:4byte +lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte +motTbl = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte +tutorialDoneF = .bss:0x0000000C; // type:object size:0x2 data:2byte +tutorialExitWin = .bss:0x0000000E; // type:object size:0x2 data:2byte +boardMapObjMdl = .bss:0x00000010; // type:object size:0x2 data:2byte +hostProc = .bss:0x00000018; // type:object size:0x4 scope:local data:4byte +hostPos = .bss:0x0000001C; // type:object size:0x2 scope:local data:2byte +hostMdl = .bss:0x0000001E; // type:object size:0x2 scope:local data:2byte +sprCurr = .bss:0x00000020; // type:object size:0x2 scope:local data:2byte +sprList = .bss:0x00000022; // type:object size:0x16 scope:local diff --git a/config/GMPP01_00/rels/w20Dll/splits.txt b/config/GMPP01_00/rels/w20Dll/splits.txt index 531cd645..9df8ed45 100644 --- a/config/GMPP01_00/rels/w20Dll/splits.txt +++ b/config/GMPP01_00/rels/w20Dll/splits.txt @@ -5,3 +5,13 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w20Dll/main.c: + .text start:0x000000E0 end:0x00000678 + .rodata start:0x00000010 end:0x00000030 + .data start:0x00000000 end:0x00000034 + .bss start:0x00000000 end:0x0000000E diff --git a/config/GMPP01_00/rels/w20Dll/symbols.txt b/config/GMPP01_00/rels/w20Dll/symbols.txt index 709c60ad..0e84011e 100644 --- a/config/GMPP01_00/rels/w20Dll/symbols.txt +++ b/config/GMPP01_00/rels/w20Dll/symbols.txt @@ -1,8 +1,8 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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 @@ -21,7 +21,13 @@ lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float 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_4 = .data:0x00000004; // 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_2C = .data:0x0000002C; // type:object size:0x8 -lbl_1_bss_0 = .bss:0x00000000; // type:object size:0xE +lbl_1_data_8 = .data:0x00000008; // type:object size:0x2 data:2byte +lbl_1_data_A = .data:0x0000000A; // type:object size:0x2 data:2byte +lbl_1_data_C = .data:0x0000000C; // type:object size:0x20 data:4byte +unkMotTbl = .data:0x0000002C; // type:object size:0x8 +lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 +lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 +lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 +lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x2 diff --git a/config/GMPP01_00/rels/w21Dll/splits.txt b/config/GMPP01_00/rels/w21Dll/splits.txt index be323846..1ab21815 100644 --- a/config/GMPP01_00/rels/w21Dll/splits.txt +++ b/config/GMPP01_00/rels/w21Dll/splits.txt @@ -4,3 +4,12 @@ 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 + .rodata start:0x00000000 end:0x00000010 + +REL/w21Dll/main.c: + .text start:0x000000E0 end:0x000003E0 + .rodata start:0x00000010 end:0x00000018 + .data start:0x00000000 end:0x00000010 diff --git a/config/GMPP01_00/rels/w21Dll/symbols.txt b/config/GMPP01_00/rels/w21Dll/symbols.txt index 1e9f2fcb..708d3b88 100644 --- a/config/GMPP01_00/rels/w21Dll/symbols.txt +++ b/config/GMPP01_00/rels/w21Dll/symbols.txt @@ -1,18 +1,18 @@ -fn_1_0 = .text:0x00000000; // type:function size:0x30 +ObjectSetup = .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 -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 -fn_1_3D8 = .text:0x000003D8; // type:function size:0x4 -fn_1_3DC = .text:0x000003DC; // type:function size:0x4 +BoardCreate = .text:0x000000E0; // type:function size:0x1D4 +BoardDestroy = .text:0x000002B4; // type:function size:0xB8 +LightSetHook = .text:0x0000036C; // type:function size:0x44 scope:local +LightResetHook = .text:0x000003B0; // type:function size:0x20 scope:local +WalkEvent = .text:0x000003D0; // type:function size:0x8 scope:local +WalkMiniEvent = .text:0x000003D8; // type:function size:0x4 scope:local +LandEvent = .text:0x000003DC; // type:function size:0x4 scope:local _ctors = .ctors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte -lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float -lbl_1_rodata_14 = .rodata:0x00000014; // 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_4 = .data:0x00000004; // type:object size:0x2 data:2byte -lbl_1_data_8 = .data:0x00000008; // type:object size:0x8 +lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float +lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float +bgMdl = .data:0x00000000; // type:object size:0x2 scope:local data:2byte +fgMdl = .data:0x00000002; // type:object size:0x2 scope:local data:2byte +hostMdl = .data:0x00000004; // type:object size:0x2 scope:local data:2byte +hostMotTbl = .data:0x00000008; // type:object size:0x8 scope:local diff --git a/configure.py b/configure.py index 3dede393..ba94ebfe 100644 --- a/configure.py +++ b/configure.py @@ -823,7 +823,7 @@ config.libs = [ "objects": [ Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/executor.c"), Object(Matching, "REL/empty.c"), # Must be marked as matching - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/board_executor.c"), + Object(Matching, "REL/board_executor.c"), ], }, Rel( @@ -1453,7 +1453,7 @@ config.libs = [ Rel( "w01Dll", # Toad's Midway Madness objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w01Dll/main.c"), + Object(Matching, "REL/w01Dll/main.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w01Dll/mg_coin.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w01Dll/mg_item.c"), }, @@ -1461,34 +1461,34 @@ config.libs = [ Rel( "w02Dll", # Goomba's Greedy Gala objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/gendice.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/gamble.c"), + Object(Matching, "REL/w02Dll/main.c"), + Object(Matching, "REL/w02Dll/gendice.c"), + Object(Matching, "REL/w02Dll/gamble.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/mg_coin.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/mg_item.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/shuffleboard.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w02Dll/roulette.c"), + Object(Matching, "REL/w02Dll/shuffleboard.c"), + Object(Matching, "REL/w02Dll/roulette.c"), }, ), Rel( "w03Dll", # Shy Guy's Jungle Jam objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/statue.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/condor.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/river.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/smoke.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/mg_coin.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w03Dll/mg_item.c"), + Object(Matching, "REL/w03Dll/main.c"), + Object(Matching, "REL/w03Dll/statue.c"), + Object(Matching, "REL/w03Dll/condor.c"), + Object(Matching, "REL/w03Dll/river.c"), + Object(Matching, "REL/w03Dll/smoke.c"), + Object(Matching, "REL/w03Dll/mg_coin.c"), + Object(Matching, "REL/w03Dll/mg_item.c"), }, ), Rel( "w04Dll", # Boo's Haunted Bash objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/bridge.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/boo_event.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/big_boo.c"), + Object(Matching, "REL/w04Dll/main.c"), + Object(Matching, "REL/w04Dll/bridge.c"), + Object(Matching, "REL/w04Dll/boo_event.c"), + Object(Matching, "REL/w04Dll/big_boo.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/mg_item.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w04Dll/mg_coin.c"), }, @@ -1496,10 +1496,10 @@ config.libs = [ Rel( "w05Dll", # Koopa's Seaside Soiree objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/hotel.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/monkey.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/dolphin.c"), + Object(Matching, "REL/w05Dll/main.c"), + Object(Matching, "REL/w05Dll/hotel.c"), + Object(Matching,"REL/w05Dll/monkey.c"), + Object(Matching, "REL/w05Dll/dolphin.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/mg_item.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w05Dll/mg_coin.c"), }, @@ -1507,33 +1507,33 @@ config.libs = [ Rel( "w06Dll", # Bowser's Gnarly Party objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/mg_item.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/mg_coin.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/fire.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/bridge.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w06Dll/bowser.c"), + Object(Matching, "REL/w06Dll/main.c"), + Object(Matching, "REL/w06Dll/mg_item.c"), + Object(Matching, "REL/w06Dll/mg_coin.c"), + Object(Matching, "REL/w06Dll/fire.c"), + Object(Matching, "REL/w06Dll/bridge.c"), + Object(Matching, "REL/w06Dll/bowser.c"), }, ), Rel( "w10Dll", # Tutorial board objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w10Dll/main.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w10Dll/host.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w10Dll/scene.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w10Dll/tutorial.c"), + Object(Matching, "REL/w10Dll/main.c"), + Object(Matching, "REL/w10Dll/host.c"), + Object(Matching, "REL/w10Dll/scene.c"), + Object(Matching, "REL/w10Dll/tutorial.c"), }, ), Rel( "w20Dll", # Mega Board Mayhem objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w20Dll/main.c"), + Object(Matching, "REL/w20Dll/main.c"), }, ), Rel( "w21Dll", # Mini Board Mad Dash objects={ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/w21Dll/main.c"), + Object(Matching, "REL/w21Dll/main.c"), }, ), Rel( diff --git a/src/REL/w04Dll/big_boo.c b/src/REL/w04Dll/big_boo.c index ddc030bc..b5f6b3cf 100755 --- a/src/REL/w04Dll/big_boo.c +++ b/src/REL/w04Dll/big_boo.c @@ -913,9 +913,13 @@ static void fn_1_8A60(void) { HuPrcVSleep(); } fn_1_7300(); + #if VERSION_NTSC sprintf(sp10, "%d", var_r29); BoardWinCreate(2, MAKE_MESSID(32, 11), 9); BoardWinInsertMesSet(MAKE_MESSID_PTR(sp10), 0); + #else + BoardWinCreate(2, MAKE_MESSID(32, 11), 9); + #endif BoardWinWait(); BoardWinKill(); BoardAudSeqFadeOut(1, 1000); diff --git a/src/REL/w06Dll/fire.c b/src/REL/w06Dll/fire.c index 2fcc6899..f9fb964b 100755 --- a/src/REL/w06Dll/fire.c +++ b/src/REL/w06Dll/fire.c @@ -49,6 +49,24 @@ static s16 lbl_1_data_22A = -1; static s16 lbl_1_data_22C = -1; static s16 lbl_1_data_22E = -1; +#if VERSION_PAL +static s32 lbl_1_data_230[] = { + MAKE_MESSID(8, 0), + MAKE_MESSID(8, 1), + MAKE_MESSID(8, 2), + MAKE_MESSID(8, 3), + MAKE_MESSID(8, 4), + MAKE_MESSID(8, 5), + MAKE_MESSID(8, 6), + MAKE_MESSID(8, 7), + MAKE_MESSID(8, 8), + MAKE_MESSID(8, 9), + MAKE_MESSID(8, 10), + MAKE_MESSID(8, 11), + MAKE_MESSID(8, 12), + MAKE_MESSID(8, 13) +}; +#else static s32 lbl_1_data_230[] = { MAKE_MESSID(8, 14), MAKE_MESSID(8, 15), @@ -65,7 +83,7 @@ static s32 lbl_1_data_230[] = { MAKE_MESSID(8, 26), MAKE_MESSID(8, 27) }; - +#endif void fn_1_6EF0(void) { BoardRollDispSet(0); lbl_1_bss_90 = HuPrcChildCreate(fn_1_6F80, 0x2003, 0x3800, 0, boardMainProc); @@ -203,9 +221,12 @@ static void fn_1_74BC(s32 arg0) { static void fn_1_7574(void) { s32 temp_r3; s32 temp_r29; + #if VERSION_PAL + s32 playerNo = GWSystem.player_curr; + #endif s32 temp_r28; s32 i; - + for (i = 0; i < 4; i++) { if (lbl_1_bss_C2[i] == 0) { continue; @@ -218,11 +239,17 @@ static void fn_1_7574(void) { BoardWinCreate(0, MAKE_MESSID(48, 16), -1); BoardWinInsertMesSet(temp_r28, 0); BoardWinInsertMesSet(lbl_1_data_230[temp_r29], 1); + #if VERSION_PAL + GWSystem.player_curr = i; + #endif BoardWinPlayerSet(i); BoardWinWait(); BoardWinKill(); } } + #if VERSION_PAL + GWSystem.player_curr = playerNo; + #endif } static void fn_1_7674(s32 arg0) {