Merge branch 'main' of https://github.com/abnormalhare/marioparty4

config/GMPE01_00/rels/E3setupDLL/symbols.txt

@@ -131,11 +131,11 @@ lbl_2_data_151 = .data:0x00000151; // type:object size:0x16 data:string
 lbl_2_data_167 = .data:0x00000167; // type:object size:0x16 data:string
 lbl_2_data_17D = .data:0x0000017D; // type:object size:0x16 data:string
 lbl_2_data_193 = .data:0x00000193; // type:object size:0x16 data:string
-lbl_2_data_1A9 = .data:0x000001A9; // type:object size:0x17 data:string
+lbl_2_data_1A9 = .data:0x000001A9; // type:object size:0x16 data:string
 mgNameTestTbl = .data:0x000001C0; // type:object size:0x34 scope:local
 cursorYOfsTbl = .data:0x000001F4; // type:object size:0x14 scope:local data:float
 mgPicTbl = .data:0x00000208; // type:object size:0x34 scope:local
-startText = .data:0x0000023C; // type:object size:0x14 scope:local data:string
+startText = .data:0x0000023C; // type:object size:0x10 scope:local data:string
 shadowPos = .data:0x00000250; // type:object size:0xC scope:local
 shadowTarget = .data:0x0000025C; // type:object size:0xC scope:local
 shadowUp = .data:0x00000268; // type:object size:0xC scope:local
@@ -148,7 +148,7 @@ lbl_2_data_31E = .data:0x0000031E; // type:object size:0x8
 playerCntMessTbl = .data:0x00000328; // type:object size:0x10 scope:local
 charPosTbl = .data:0x00000338; // type:object size:0x40 scope:local data:float
 charComSfxTbl = .data:0x00000378; // type:object size:0x20 scope:local
-lbl_2_data_398 = .data:0x00000398; // type:object size:0x10 scope:local data:string
+lbl_2_data_398 = .data:0x00000398; // type:object size:0xF scope:local data:string
 charSpriteTbl = .data:0x000003A8; // type:object size:0x20 scope:local
 cursorSpriteTbl = .data:0x000003C8; // type:object size:0x14 scope:local
 hiliteSprTbl = .data:0x000003DC; // type:object size:0x14 scope:local

config/GMPE01_00/rels/m404Dll/symbols.txt

@@ -113,7 +113,7 @@ lbl_1_data_77C = .data:0x0000077C; // type:object size:0xC data:float
 lbl_1_data_788 = .data:0x00000788; // type:object size:0x4
 lbl_1_data_78C = .data:0x0000078C; // type:object size:0xC data:float
 lbl_1_data_798 = .data:0x00000798; // type:object size:0xC data:float
-lbl_1_data_7A4 = .data:0x000007A4; // type:object size:0x24 scope:local data:string
+lbl_1_data_7A4 = .data:0x000007A4; // type:object size:0x23 scope:local data:string
 lbl_1_data_7C8 = .data:0x000007C8; // type:object size:0x4 data:4byte
 jumptable_1_data_7CC = .data:0x000007CC; // type:object size:0x28 scope:local
 lbl_1_data_7F4 = .data:0x000007F4; // type:object size:0x1C scope:local data:string
@@ -128,7 +128,7 @@ lbl_1_data_8D8 = .data:0x000008D8; // type:object size:0x10 data:float
 lbl_1_data_8E8 = .data:0x000008E8; // type:object size:0xC
 lbl_1_data_8F4 = .data:0x000008F4; // type:object size:0x8 data:2byte
 lbl_1_data_8FC = .data:0x000008FC; // type:object size:0x18
-lbl_1_data_914 = .data:0x00000914; // type:object size:0x1C scope:local data:string
+lbl_1_data_914 = .data:0x00000914; // type:object size:0x19 scope:local data:string
 lbl_1_data_930 = .data:0x00000930; // type:object size:0x20
 lbl_1_data_950 = .data:0x00000950; // type:object size:0x20
 lbl_1_data_970 = .data:0x00000970; // type:object size:0x7 scope:local data:string

config/GMPE01_00/rels/m406Dll/symbols.txt

@@ -340,7 +340,7 @@ lbl_1_rodata_430 = .rodata:0x00000430; // type:object size:0x4 scope:local data:
 lbl_1_rodata_434 = .rodata:0x00000434; // type:object size:0x4 scope:local data:float
 lbl_1_rodata_438 = .rodata:0x00000438; // type:object size:0x4 scope:local data:float
 lbl_1_data_0 = .data:0x00000000; // type:object size:0x8C data:float
-lbl_1_data_8C = .data:0x0000008C; // type:object size:0x24 scope:local data:string
+lbl_1_data_8C = .data:0x0000008C; // type:object size:0x23 scope:local data:string
 jumptable_1_data_B0 = .data:0x000000B0; // type:object size:0x40 scope:local
 lbl_1_data_F0 = .data:0x000000F0; // type:object size:0x348
 lbl_1_data_438 = .data:0x00000438; // type:object size:0x348
@@ -378,7 +378,7 @@ lbl_1_data_FF0 = .data:0x00000FF0; // type:object size:0x10
 lbl_1_data_1000 = .data:0x00001000; // type:object size:0x19 scope:local data:string
 lbl_1_data_1019 = .data:0x00001019; // type:object size:0x19 scope:local data:string
 lbl_1_data_1032 = .data:0x00001032; // type:object size:0x1A scope:local data:string
-lbl_1_data_104C = .data:0x0000104C; // type:object size:0x1C scope:local data:string
+lbl_1_data_104C = .data:0x0000104C; // type:object size:0x1A scope:local data:string
 lbl_1_data_1068 = .data:0x00001068; // type:object size:0x10
 lbl_1_data_1078 = .data:0x00001078; // type:object size:0x28
 lbl_1_data_10A0 = .data:0x000010A0; // type:object size:0x80 data:4byte

config/GMPE01_00/rels/m410Dll/symbols.txt

@@ -277,13 +277,13 @@ lbl_1_data_88 = .data:0x00000088; // type:object size:0x3C data:float
 lbl_1_data_C4 = .data:0x000000C4; // type:object size:0x14
 lbl_1_data_D8 = .data:0x000000D8; // type:object size:0x2 data:2byte
 lbl_1_data_DC = .data:0x000000DC; // type:object size:0x20
-lbl_1_data_FC = .data:0x000000FC; // type:object size:0x8 scope:local data:string
+lbl_1_data_FC = .data:0x000000FC; // type:object size:0x7 scope:local data:string
 lbl_1_data_104 = .data:0x00000104; // type:object size:0xC
 lbl_1_data_110 = .data:0x00000110; // type:object size:0x4 data:4byte
 lbl_1_data_114 = .data:0x00000114; // type:object size:0x16 scope:local data:string
-lbl_1_data_130 = .data:0x00000130; // type:object size:0x10 scope:local data:string
+lbl_1_data_130 = .data:0x00000130; // type:object size:0xF scope:local data:string
 lbl_1_data_140 = .data:0x00000140; // type:object size:0x20
-lbl_1_data_160 = .data:0x00000160; // type:object size:0xC scope:local data:string
+lbl_1_data_160 = .data:0x00000160; // type:object size:0xB scope:local data:string
 lbl_1_data_16C = .data:0x0000016C; // type:object size:0x20
 lbl_1_data_18C = .data:0x0000018C; // type:object size:0x20
 lbl_1_data_1AC = .data:0x000001AC; // type:object size:0x28

config/GMPE01_00/rels/m412Dll/symbols.txt

@@ -160,7 +160,7 @@ lbl_1_data_284 = .data:0x00000284; // type:object size:0x14 scope:local data:str
 lbl_1_data_298 = .data:0x00000298; // type:object size:0x5C
 lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0xC scope:local data:string
 lbl_1_data_300 = .data:0x00000300; // type:object size:0x7 scope:local data:string
-lbl_1_data_307 = .data:0x00000307; // type:object size:0x6 scope:local data:string
+lbl_1_data_307 = .data:0x00000307; // type:object size:0x7 scope:local data:string
 lbl_1_data_310 = .data:0x00000310; // type:object size:0x30
 lbl_1_data_340 = .data:0x00000340; // type:object size:0x8
 lbl_1_data_348 = .data:0x00000348; // type:object size:0x18

config/GMPE01_00/rels/m420dll/symbols.txt

@@ -205,11 +205,11 @@ lbl_1_rodata_564 = .rodata:0x00000564; // type:object size:0x4 scope:local data:
 lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0x8 scope:local data:float
 lbl_1_data_0 = .data:0x00000000; // type:object size:0x1E scope:local data:string
 lbl_1_data_1E = .data:0x0000001E; // type:object size:0x1E scope:local data:string
-lbl_1_data_3C = .data:0x0000003C; // type:object size:0x11 scope:local data:string
+lbl_1_data_3C = .data:0x0000003C; // type:object size:0x10 scope:local data:string
 lbl_1_data_50 = .data:0x00000050; // type:object size:0x80
-lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x1B data:string
+lbl_1_data_D0 = .data:0x000000D0; // type:object size:0x1B scope:local data:string
 lbl_1_data_EC = .data:0x000000EC; // type:object size:0x30
-lbl_1_data_11C = .data:0x0000011C; // type:object size:0x19 data:string
+lbl_1_data_11C = .data:0x0000011C; // type:object size:0x19 scope:local data:string
 lbl_1_data_135 = .data:0x00000135; // type:object size:0x1
 lbl_1_data_138 = .data:0x00000138; // type:object size:0x1C
 lbl_1_data_154 = .data:0x00000154; // type:object size:0x10 data:4byte

config/GMPE01_00/rels/m426Dll/symbols.txt

@@ -197,7 +197,7 @@ jumptable_1_data_330 = .data:0x00000330; // type:object size:0x1C scope:local
 jumptable_1_data_34C = .data:0x0000034C; // type:object size:0x1C scope:local
 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0xC data:float
 lbl_1_bss_C = .bss:0x0000000C; // type:object size:0xC data:float
-lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x1 data:byte
+lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:byte
 lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x8 data:4byte
 lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte
 lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float

config/GMPE01_00/rels/m432Dll/symbols.txt

@@ -101,138 +101,138 @@ fn_1_128C8 = .text:0x000128C8; // type:function size:0x5E0
 fn_1_12EA8 = .text:0x00012EA8; // type:function size:0x300
 fn_1_131A8 = .text:0x000131A8; // type:function size:0x2178
 fn_1_15320 = .text:0x00015320; // type:function size:0x9C
-fn_1_153BC = .text:0x000153BC; // type:function size:0xDA0
+ObjectSetup = .text:0x000153BC; // type:function size:0xDA0
 fn_1_1615C = .text:0x0001615C; // type:function size:0x104
 _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_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 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:0x8 data:double
+lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
+lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
+lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double
+lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:double
+lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double
+lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double
+lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 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 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 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 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 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 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 data:float
+lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
+lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 data:double
+lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float
+lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float
+lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float
+lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double
+lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 data:double
+lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
+lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
+lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float
+lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float
+lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float
+lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float
+lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float
+lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float
+lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float
+lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float
+lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float
+lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float
+lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float
+lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float
+lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float
+lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float
+lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float
+lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float
+lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float
+lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float
+lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float
+lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float
+lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float
+lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float
+lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float
+lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float
+lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float
+lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float
+lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float
+lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float
+lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float
+lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float
+lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float
+lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float
+lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float
+lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float
+lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float
+lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float
+lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float
+lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float
+lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float
+lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float
+lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float
+lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float
+lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float
+lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float
+lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float
+lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float
+lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 data:float
+lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 data:float
+lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float
+lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float
+lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float
+lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float
+lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float
+lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float
+lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float
+lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float
+lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float
+lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float
+lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float
+lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float
+lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float
+lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float
+lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float
+lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float
+lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float
+lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float
+lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float
+lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float
+lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float
+lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float
+lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float
+lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float
+lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 data:double
+lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float
+lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float
+lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float
+lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float
+lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float
+lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float
+lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float
+lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float
+lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float
+lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float
+lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float
+lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float
+lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 data:float
+lbl_1_rodata_1F0 = .rodata:0x000001F0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 data:float
+lbl_1_rodata_1F4 = .rodata:0x000001F4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 data:float
+lbl_1_rodata_1F8 = .rodata:0x000001F8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 data:float
+lbl_1_rodata_1FC = .rodata:0x000001FC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 data:float
+lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 data:float
+lbl_1_rodata_204 = .rodata:0x00000204; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x8 data:double
+lbl_1_rodata_208 = .rodata:0x00000208; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 data:double
+lbl_1_rodata_210 = .rodata:0x00000210; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 data:float
+lbl_1_rodata_218 = .rodata:0x00000218; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 data:double
+lbl_1_rodata_220 = .rodata:0x00000220; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 data:float
+lbl_1_rodata_228 = .rodata:0x00000228; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 data:float
+lbl_1_rodata_22C = .rodata:0x0000022C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 data:float
+lbl_1_rodata_230 = .rodata:0x00000230; // type:object size:0x4 scope:local data:float
 lbl_1_data_0 = .data:0x00000000; // type:object size:0x10
 lbl_1_data_10 = .data:0x00000010; // type:object size:0x20
 lbl_1_data_30 = .data:0x00000030; // type:object size:0x28
 lbl_1_data_58 = .data:0x00000058; // type:object size:0x28
-lbl_1_data_80 = .data:0x00000080; // type:object size:0x1F data:string
+lbl_1_data_80 = .data:0x00000080; // type:object size:0x1F scope:local data:string
 lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x8
 lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x20 data:float
 lbl_1_data_C8 = .data:0x000000C8; // type:object size:0xC
@@ -250,81 +250,81 @@ lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x24
 lbl_1_data_318 = .data:0x00000318; // type:object size:0x3C
 lbl_1_data_354 = .data:0x00000354; // type:object size:0x18
 lbl_1_data_36C = .data:0x0000036C; // type:object size:0x18
-lbl_1_data_384 = .data:0x00000384; // type:object size:0xB data:string
+lbl_1_data_384 = .data:0x00000384; // type:object size:0xB scope:local data:string
-lbl_1_data_38F = .data:0x0000038F; // type:object size:0xB data:string
+lbl_1_data_38F = .data:0x0000038F; // type:object size:0xB scope:local data:string
-lbl_1_data_39A = .data:0x0000039A; // type:object size:0xB data:string
+lbl_1_data_39A = .data:0x0000039A; // type:object size:0xB scope:local data:string
-lbl_1_data_3A5 = .data:0x000003A5; // type:object size:0xB data:string
+lbl_1_data_3A5 = .data:0x000003A5; // type:object size:0xB scope:local data:string
-lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0xB data:string
+lbl_1_data_3B0 = .data:0x000003B0; // type:object size:0xB scope:local data:string
-lbl_1_data_3BB = .data:0x000003BB; // type:object size:0xB data:string
+lbl_1_data_3BB = .data:0x000003BB; // type:object size:0xB scope:local data:string
-lbl_1_data_3C6 = .data:0x000003C6; // type:object size:0xB data:string
+lbl_1_data_3C6 = .data:0x000003C6; // type:object size:0xB scope:local data:string
-lbl_1_data_3D1 = .data:0x000003D1; // type:object size:0xB data:string
+lbl_1_data_3D1 = .data:0x000003D1; // type:object size:0xB scope:local data:string
 lbl_1_data_3DC = .data:0x000003DC; // type:object size:0x20
-lbl_1_data_3FC = .data:0x000003FC; // type:object size:0xB data:string
+lbl_1_data_3FC = .data:0x000003FC; // type:object size:0xB scope:local data:string
-lbl_1_data_407 = .data:0x00000407; // type:object size:0xB data:string
+lbl_1_data_407 = .data:0x00000407; // type:object size:0xB scope:local data:string
-lbl_1_data_412 = .data:0x00000412; // type:object size:0xB data:string
+lbl_1_data_412 = .data:0x00000412; // type:object size:0xB scope:local data:string
-lbl_1_data_41D = .data:0x0000041D; // type:object size:0xB data:string
+lbl_1_data_41D = .data:0x0000041D; // type:object size:0xB scope:local data:string
-lbl_1_data_428 = .data:0x00000428; // type:object size:0xB data:string
+lbl_1_data_428 = .data:0x00000428; // type:object size:0xB scope:local data:string
-lbl_1_data_433 = .data:0x00000433; // type:object size:0xD
+lbl_1_data_433 = .data:0x00000433; // type:object size:0xB scope:local data:string
 lbl_1_data_440 = .data:0x00000440; // type:object size:0x18 data:4byte
-lbl_1_data_458 = .data:0x00000458; // type:object size:0xB data:string
+lbl_1_data_458 = .data:0x00000458; // type:object size:0xB scope:local data:string
-lbl_1_data_463 = .data:0x00000463; // type:object size:0xB data:string
+lbl_1_data_463 = .data:0x00000463; // type:object size:0xB scope:local data:string
-lbl_1_data_46E = .data:0x0000046E; // type:object size:0xB data:string
+lbl_1_data_46E = .data:0x0000046E; // type:object size:0xB scope:local data:string
-lbl_1_data_479 = .data:0x00000479; // type:object size:0xB data:string
+lbl_1_data_479 = .data:0x00000479; // type:object size:0xB scope:local data:string
-lbl_1_data_484 = .data:0x00000484; // type:object size:0xB data:string
+lbl_1_data_484 = .data:0x00000484; // type:object size:0xB scope:local data:string
-lbl_1_data_48F = .data:0x0000048F; // type:object size:0xB data:string
+lbl_1_data_48F = .data:0x0000048F; // type:object size:0xB scope:local data:string
-lbl_1_data_49A = .data:0x0000049A; // type:object size:0xB data:string
+lbl_1_data_49A = .data:0x0000049A; // type:object size:0xB scope:local data:string
-lbl_1_data_4A5 = .data:0x000004A5; // type:object size:0xB data:string
+lbl_1_data_4A5 = .data:0x000004A5; // type:object size:0xB scope:local data:string
-lbl_1_data_4B0 = .data:0x000004B0; // type:object size:0xB data:string
+lbl_1_data_4B0 = .data:0x000004B0; // type:object size:0xB scope:local data:string
-lbl_1_data_4BB = .data:0x000004BB; // type:object size:0xD
+lbl_1_data_4BB = .data:0x000004BB; // type:object size:0xB scope:local data:string
 lbl_1_data_4C8 = .data:0x000004C8; // type:object size:0x28 data:4byte
-lbl_1_data_4F0 = .data:0x000004F0; // type:object size:0x14
+lbl_1_data_4F0 = .data:0x000004F0; // type:object size:0x14 data:byte
-lbl_1_data_504 = .data:0x00000504; // type:object size:0x24
+lbl_1_data_504 = .data:0x00000504; // type:object size:0x24 data:byte
 lbl_1_data_528 = .data:0x00000528; // type:object size:0x8
-lbl_1_data_530 = .data:0x00000530; // type:object size:0xB data:string
+lbl_1_data_530 = .data:0x00000530; // type:object size:0xB scope:local data:string
-lbl_1_data_53B = .data:0x0000053B; // type:object size:0xB data:string
+lbl_1_data_53B = .data:0x0000053B; // type:object size:0xB scope:local data:string
-lbl_1_data_546 = .data:0x00000546; // type:object size:0xB data:string
+lbl_1_data_546 = .data:0x00000546; // type:object size:0xB scope:local data:string
-lbl_1_data_551 = .data:0x00000551; // type:object size:0xB data:string
+lbl_1_data_551 = .data:0x00000551; // type:object size:0xB scope:local data:string
-lbl_1_data_55C = .data:0x0000055C; // type:object size:0xB data:string
+lbl_1_data_55C = .data:0x0000055C; // type:object size:0xB scope:local data:string
-lbl_1_data_567 = .data:0x00000567; // type:object size:0xB data:string
+lbl_1_data_567 = .data:0x00000567; // type:object size:0xB scope:local data:string
-lbl_1_data_572 = .data:0x00000572; // type:object size:0xB data:string
+lbl_1_data_572 = .data:0x00000572; // type:object size:0xB scope:local data:string
-lbl_1_data_57D = .data:0x0000057D; // type:object size:0xB data:string
+lbl_1_data_57D = .data:0x0000057D; // type:object size:0xB scope:local data:string
-lbl_1_data_588 = .data:0x00000588; // type:object size:0xB data:string
+lbl_1_data_588 = .data:0x00000588; // type:object size:0xB scope:local data:string
-lbl_1_data_593 = .data:0x00000593; // type:object size:0xB data:string
+lbl_1_data_593 = .data:0x00000593; // type:object size:0xB scope:local data:string
-lbl_1_data_59E = .data:0x0000059E; // type:object size:0xB data:string
+lbl_1_data_59E = .data:0x0000059E; // type:object size:0xB scope:local data:string
-lbl_1_data_5A9 = .data:0x000005A9; // type:object size:0xB data:string
+lbl_1_data_5A9 = .data:0x000005A9; // type:object size:0xB scope:local data:string
-lbl_1_data_5B4 = .data:0x000005B4; // type:object size:0xB data:string
+lbl_1_data_5B4 = .data:0x000005B4; // type:object size:0xB scope:local data:string
-lbl_1_data_5BF = .data:0x000005BF; // type:object size:0xB data:string
+lbl_1_data_5BF = .data:0x000005BF; // type:object size:0xB scope:local data:string
-lbl_1_data_5CA = .data:0x000005CA; // type:object size:0xB data:string
+lbl_1_data_5CA = .data:0x000005CA; // type:object size:0xB scope:local data:string
-lbl_1_data_5D5 = .data:0x000005D5; // type:object size:0xB data:string
+lbl_1_data_5D5 = .data:0x000005D5; // type:object size:0xB scope:local data:string
-lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xB data:string
+lbl_1_data_5E0 = .data:0x000005E0; // type:object size:0xB scope:local data:string
 lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x8B8
-lbl_1_data_EA4 = .data:0x00000EA4; // type:object size:0xB data:string
+lbl_1_data_EA4 = .data:0x00000EA4; // type:object size:0xB scope:local data:string
-lbl_1_data_EAF = .data:0x00000EAF; // type:object size:0xB data:string
+lbl_1_data_EAF = .data:0x00000EAF; // type:object size:0xB scope:local data:string
-lbl_1_data_EBA = .data:0x00000EBA; // type:object size:0xB data:string
+lbl_1_data_EBA = .data:0x00000EBA; // type:object size:0xB scope:local data:string
-lbl_1_data_EC5 = .data:0x00000EC5; // type:object size:0xB data:string
+lbl_1_data_EC5 = .data:0x00000EC5; // type:object size:0xB scope:local data:string
-lbl_1_data_ED0 = .data:0x00000ED0; // type:object size:0xC
+lbl_1_data_ED0 = .data:0x00000ED0; // type:object size:0xB scope:local data:string
 lbl_1_data_EDC = .data:0x00000EDC; // type:object size:0x8B8
 lbl_1_data_1794 = .data:0x00001794; // type:object size:0x20
 lbl_1_data_17B4 = .data:0x000017B4; // type:object size:0x20
 lbl_1_data_17D4 = .data:0x000017D4; // type:object size:0x20 data:float
 lbl_1_data_17F4 = .data:0x000017F4; // type:object size:0x20
 lbl_1_data_1814 = .data:0x00001814; // type:object size:0x50
-lbl_1_data_1864 = .data:0x00001864; // type:object size:0x11 data:string
+lbl_1_data_1864 = .data:0x00001864; // type:object size:0x11 scope:local data:string
-lbl_1_data_1875 = .data:0x00001875; // type:object size:0x11 data:string
+lbl_1_data_1875 = .data:0x00001875; // type:object size:0x11 scope:local data:string
-lbl_1_data_1886 = .data:0x00001886; // type:object size:0x11 data:string
+lbl_1_data_1886 = .data:0x00001886; // type:object size:0x11 scope:local data:string
-lbl_1_data_1897 = .data:0x00001897; // type:object size:0x18 data:string
+lbl_1_data_1897 = .data:0x00001897; // type:object size:0x18 scope:local data:string
-lbl_1_data_18AF = .data:0x000018AF; // type:object size:0xB data:string
+lbl_1_data_18AF = .data:0x000018AF; // type:object size:0xB scope:local data:string
-lbl_1_data_18BA = .data:0x000018BA; // type:object size:0x18 data:string
+lbl_1_data_18BA = .data:0x000018BA; // type:object size:0x18 scope:local data:string
-lbl_1_data_18D2 = .data:0x000018D2; // type:object size:0xC data:string
+lbl_1_data_18D2 = .data:0x000018D2; // type:object size:0xC scope:local data:string
-lbl_1_data_18DE = .data:0x000018DE; // type:object size:0x6 data:string
+lbl_1_data_18DE = .data:0x000018DE; // type:object size:0x6 scope:local data:string
-lbl_1_data_18E4 = .data:0x000018E4; // type:object size:0x21 data:string
+lbl_1_data_18E4 = .data:0x000018E4; // type:object size:0x21 scope:local data:string
-lbl_1_data_1905 = .data:0x00001905; // type:object size:0x1F
+lbl_1_data_1905 = .data:0x00001905; // type:object size:0x1D scope:local data:string
 jumptable_1_data_1924 = .data:0x00001924; // type:object size:0x1C scope:local
 jumptable_1_data_1940 = .data:0x00001940; // type:object size:0x44 scope:local
-lbl_1_data_1984 = .data:0x00001984; // type:object size:0xB data:string
+lbl_1_data_1984 = .data:0x00001984; // type:object size:0xB scope:local data:string
-lbl_1_data_198F = .data:0x0000198F; // type:object size:0x1D
+lbl_1_data_198F = .data:0x0000198F; // type:object size:0x1B scope:local data:string
 jumptable_1_data_19AC = .data:0x000019AC; // type:object size:0x28 scope:local
-lbl_1_data_19D4 = .data:0x000019D4; // type:object size:0x24 data:string
+lbl_1_data_19D4 = .data:0x000019D4; // type:object size:0x24 scope:local data:string
 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x3F0 data:float
 lbl_1_bss_3F0 = .bss:0x000003F0; // type:object size:0x4 data:float
 lbl_1_bss_3F4 = .bss:0x000003F4; // type:object size:0x4 data:4byte
@@ -333,7 +333,8 @@ lbl_1_bss_3FC = .bss:0x000003FC; // type:object size:0x4 data:4byte
 lbl_1_bss_400 = .bss:0x00000400; // type:object size:0x2 data:2byte
 lbl_1_bss_402 = .bss:0x00000402; // type:object size:0x2 data:2byte
 lbl_1_bss_404 = .bss:0x00000404; // type:object size:0x2 data:2byte
-lbl_1_bss_408 = .bss:0x00000408; // type:object size:0x8 data:4byte
+lbl_1_bss_408 = .bss:0x00000408; // type:object size:0x4 data:4byte
+lbl_1_bss_40C = .bss:0x0000040C; // type:object size:0x4 data:4byte
 lbl_1_bss_410 = .bss:0x00000410; // type:object size:0x4 data:4byte
 lbl_1_bss_414 = .bss:0x00000414; // type:object size:0x4 data:4byte
 lbl_1_bss_418 = .bss:0x00000418; // type:object size:0x4 data:4byte

config/GMPE01_00/rels/m437Dll/symbols.txt

@@ -214,125 +214,125 @@ fn_1_164B0 = .text:0x000164B0; // type:function size:0x15C
 fn_1_1660C = .text:0x0001660C; // type:function size:0x190
 _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:0x8 data:double
+lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 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 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 data:float
+lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
+lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
+lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
+lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
+lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 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 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 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:0x4 data:float
+lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float
+lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 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 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 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 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 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 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 data:float
+lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
+lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0xC data:float
+lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0xC scope:local data:float
-lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0xC data:float
+lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0xC scope:local data:float
-lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0xC data:float
+lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0xC scope:local data:float
-lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
+lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
+lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
+lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float
+lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float
+lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float
+lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x48
+lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x48 scope:local
-lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float
+lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float
+lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float
+lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float
+lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float
+lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float
+lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float
+lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float
+lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float
+lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x78
+lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x78 scope:local
-lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x78 data:float
+lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x78 scope:local data:float
-lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0xC8
+lbl_1_rodata_200 = .rodata:0x00000200; // type:object size:0xC8 scope:local
-lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x78 data:float
+lbl_1_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x78 scope:local data:float
-lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x4 data:float
+lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_344 = .rodata:0x00000344; // type:object size:0x4 data:float
+lbl_1_rodata_344 = .rodata:0x00000344; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 data:float
+lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_34C = .rodata:0x0000034C; // type:object size:0x4 data:float
+lbl_1_rodata_34C = .rodata:0x0000034C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x4 data:float
+lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_354 = .rodata:0x00000354; // type:object size:0x4 data:float
+lbl_1_rodata_354 = .rodata:0x00000354; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 data:float
+lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x14 data:4byte
+lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x14 scope:local data:4byte
-lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 data:float
+lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 data:float
+lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 data:float
+lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x30 data:float
+lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x30 scope:local data:float
-lbl_1_rodata_3AC = .rodata:0x000003AC; // type:object size:0x4 data:float
+lbl_1_rodata_3AC = .rodata:0x000003AC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x4 data:float
+lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 data:float
+lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 data:float
+lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 data:float
+lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x8 data:double
+lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 data:double
+lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 scope:local data:double
-lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x4 data:float
+lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3D4 = .rodata:0x000003D4; // type:object size:0x4 data:float
+lbl_1_rodata_3D4 = .rodata:0x000003D4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x4 data:float
+lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3DC = .rodata:0x000003DC; // type:object size:0x4 data:float
+lbl_1_rodata_3DC = .rodata:0x000003DC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x4 data:float
+lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3E4 = .rodata:0x000003E4; // type:object size:0x4 data:float
+lbl_1_rodata_3E4 = .rodata:0x000003E4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3E8 = .rodata:0x000003E8; // type:object size:0x4 data:float
+lbl_1_rodata_3E8 = .rodata:0x000003E8; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3EC = .rodata:0x000003EC; // type:object size:0x4 data:float
+lbl_1_rodata_3EC = .rodata:0x000003EC; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3F0 = .rodata:0x000003F0; // type:object size:0x4 data:float
+lbl_1_rodata_3F0 = .rodata:0x000003F0; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3F4 = .rodata:0x000003F4; // type:object size:0x4 data:float
+lbl_1_rodata_3F4 = .rodata:0x000003F4; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x30 data:float
+lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x30 scope:local data:float
-lbl_1_rodata_428 = .rodata:0x00000428; // type:object size:0x4 data:float
+lbl_1_rodata_428 = .rodata:0x00000428; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x4 data:float
+lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_430 = .rodata:0x00000430; // type:object size:0x4 data:float
+lbl_1_rodata_430 = .rodata:0x00000430; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_434 = .rodata:0x00000434; // type:object size:0x4 data:float
+lbl_1_rodata_434 = .rodata:0x00000434; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_438 = .rodata:0x00000438; // type:object size:0x4 data:float
+lbl_1_rodata_438 = .rodata:0x00000438; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_43C = .rodata:0x0000043C; // type:object size:0x4 data:float
+lbl_1_rodata_43C = .rodata:0x0000043C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_440 = .rodata:0x00000440; // type:object size:0x4 data:float
+lbl_1_rodata_440 = .rodata:0x00000440; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_444 = .rodata:0x00000444; // type:object size:0x4 data:float
+lbl_1_rodata_444 = .rodata:0x00000444; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_448 = .rodata:0x00000448; // type:object size:0x4 data:float
+lbl_1_rodata_448 = .rodata:0x00000448; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_44C = .rodata:0x0000044C; // type:object size:0x4 data:float
+lbl_1_rodata_44C = .rodata:0x0000044C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_450 = .rodata:0x00000450; // type:object size:0x4 data:float
+lbl_1_rodata_450 = .rodata:0x00000450; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_454 = .rodata:0x00000454; // type:object size:0x4 data:float
+lbl_1_rodata_454 = .rodata:0x00000454; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_458 = .rodata:0x00000458; // type:object size:0x4 data:float
+lbl_1_rodata_458 = .rodata:0x00000458; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_45C = .rodata:0x0000045C; // type:object size:0x4 data:float
+lbl_1_rodata_45C = .rodata:0x0000045C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_460 = .rodata:0x00000460; // type:object size:0x8 data:4byte
+lbl_1_rodata_460 = .rodata:0x00000460; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_468 = .rodata:0x00000468; // type:object size:0x4 data:float
+lbl_1_rodata_468 = .rodata:0x00000468; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_46C = .rodata:0x0000046C; // type:object size:0x4 data:float
+lbl_1_rodata_46C = .rodata:0x0000046C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_470 = .rodata:0x00000470; // type:object size:0x8 data:4byte
+lbl_1_rodata_470 = .rodata:0x00000470; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_478 = .rodata:0x00000478; // type:object size:0x8 data:4byte
+lbl_1_rodata_478 = .rodata:0x00000478; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_480 = .rodata:0x00000480; // type:object size:0x4 data:float
+lbl_1_rodata_480 = .rodata:0x00000480; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_484 = .rodata:0x00000484; // type:object size:0x4 data:float
+lbl_1_rodata_484 = .rodata:0x00000484; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_488 = .rodata:0x00000488; // type:object size:0x8 data:4byte
+lbl_1_rodata_488 = .rodata:0x00000488; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_490 = .rodata:0x00000490; // type:object size:0x20 data:4byte
+lbl_1_rodata_490 = .rodata:0x00000490; // type:object size:0x20 scope:local data:4byte
-lbl_1_rodata_4B0 = .rodata:0x000004B0; // type:object size:0x8 data:4byte
+lbl_1_rodata_4B0 = .rodata:0x000004B0; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_4B8 = .rodata:0x000004B8; // type:object size:0x20 data:4byte
+lbl_1_rodata_4B8 = .rodata:0x000004B8; // type:object size:0x20 scope:local data:4byte
-lbl_1_rodata_4D8 = .rodata:0x000004D8; // type:object size:0x8 data:4byte
+lbl_1_rodata_4D8 = .rodata:0x000004D8; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x30 data:float
+lbl_1_rodata_4E0 = .rodata:0x000004E0; // type:object size:0x30 scope:local data:float
-lbl_1_rodata_510 = .rodata:0x00000510; // type:object size:0x4 data:float
+lbl_1_rodata_510 = .rodata:0x00000510; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_514 = .rodata:0x00000514; // type:object size:0x4 data:float
+lbl_1_rodata_514 = .rodata:0x00000514; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_518 = .rodata:0x00000518; // type:object size:0x4 data:float
+lbl_1_rodata_518 = .rodata:0x00000518; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 data:float
+lbl_1_rodata_51C = .rodata:0x0000051C; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0x4 data:float
+lbl_1_rodata_520 = .rodata:0x00000520; // type:object size:0x4 scope:local data:float
-lbl_1_rodata_524 = .rodata:0x00000524; // type:object size:0x10 data:4byte
+lbl_1_rodata_524 = .rodata:0x00000524; // type:object size:0x10 scope:local data:4byte
-lbl_1_rodata_534 = .rodata:0x00000534; // type:object size:0x8 data:4byte
+lbl_1_rodata_534 = .rodata:0x00000534; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0xC data:4byte
+lbl_1_rodata_53C = .rodata:0x0000053C; // type:object size:0xC scope:local data:4byte
-lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x8 data:4byte
+lbl_1_rodata_548 = .rodata:0x00000548; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x8 data:4byte
+lbl_1_rodata_550 = .rodata:0x00000550; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x8 data:4byte
+lbl_1_rodata_558 = .rodata:0x00000558; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x8 data:4byte
+lbl_1_rodata_560 = .rodata:0x00000560; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0xC data:4byte
+lbl_1_rodata_568 = .rodata:0x00000568; // type:object size:0xC scope:local data:4byte
-lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x8 data:4byte
+lbl_1_rodata_574 = .rodata:0x00000574; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_57C = .rodata:0x0000057C; // type:object size:0x8 data:4byte
+lbl_1_rodata_57C = .rodata:0x0000057C; // type:object size:0x8 scope:local data:4byte
-lbl_1_rodata_584 = .rodata:0x00000584; // type:object size:0x30 data:float
+lbl_1_rodata_584 = .rodata:0x00000584; // type:object size:0x30 scope:local data:float
-lbl_1_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x18 data:float
+lbl_1_rodata_5B4 = .rodata:0x000005B4; // type:object size:0x18 scope:local data:float
-lbl_1_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 data:float
+lbl_1_rodata_5CC = .rodata:0x000005CC; // type:object size:0x4 scope:local data:float
 lbl_1_rodata_5D0 = .rodata:0x000005D0; // type:object size:0x4 scope:local data:float
 lbl_1_rodata_5D8 = .rodata:0x000005D8; // type:object size:0x8 scope:local data:double
 lbl_1_rodata_5E0 = .rodata:0x000005E0; // type:object size:0x4 scope:local data:float
@@ -354,21 +354,21 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0xA0
 lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x4 data:4byte
 lbl_1_data_A4 = .data:0x000000A4; // type:object size:0x4 data:4byte
 lbl_1_data_A8 = .data:0x000000A8; // type:object size:0x4 data:4byte
-lbl_1_data_AC = .data:0x000000AC; // type:object size:0x1B data:string
+lbl_1_data_AC = .data:0x000000AC; // type:object size:0x1B scope:local data:string
-lbl_1_data_C7 = .data:0x000000C7; // type:object size:0x22 data:string
+lbl_1_data_C7 = .data:0x000000C7; // type:object size:0x22 scope:local data:string
-lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x1A data:string
+lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x1A scope:local data:string
-lbl_1_data_103 = .data:0x00000103; // type:object size:0x1A data:string
+lbl_1_data_103 = .data:0x00000103; // type:object size:0x1A scope:local data:string
-lbl_1_data_11D = .data:0x0000011D; // type:object size:0xE data:string
+lbl_1_data_11D = .data:0x0000011D; // type:object size:0xE scope:local data:string
 lbl_1_data_12C = .data:0x0000012C; // type:object size:0x4 data:4byte
-lbl_1_data_130 = .data:0x00000130; // type:object size:0x16 data:string
+lbl_1_data_130 = .data:0x00000130; // type:object size:0x16 scope:local data:string
-lbl_1_data_146 = .data:0x00000146; // type:object size:0x13 data:string
+lbl_1_data_146 = .data:0x00000146; // type:object size:0x13 scope:local data:string
-lbl_1_data_159 = .data:0x00000159; // type:object size:0xE data:string
+lbl_1_data_159 = .data:0x00000159; // type:object size:0xE scope:local data:string
-lbl_1_data_167 = .data:0x00000167; // type:object size:0xE data:string
+lbl_1_data_167 = .data:0x00000167; // type:object size:0xE scope:local data:string
-lbl_1_data_175 = .data:0x00000175; // type:object size:0x12 data:string
+lbl_1_data_175 = .data:0x00000175; // type:object size:0x12 scope:local data:string
 lbl_1_data_188 = .data:0x00000188; // type:object size:0x4 data:float
-lbl_1_data_18C = .data:0x0000018C; // type:object size:0x14 data:string
+lbl_1_data_18C = .data:0x0000018C; // type:object size:0x14 scope:local data:string
 jumptable_1_data_1A0 = .data:0x000001A0; // type:object size:0x20 scope:local
-lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x12 data:string
+lbl_1_data_1C0 = .data:0x000001C0; // type:object size:0x12 scope:local data:string
 jumptable_1_data_1D4 = .data:0x000001D4; // type:object size:0x30 scope:local
 lbl_1_data_204 = .data:0x00000204; // type:object size:0x78
 lbl_1_data_27C = .data:0x0000027C; // type:object size:0x90

config/GMPE01_00/rels/m438Dll/symbols.txt

@@ -381,7 +381,7 @@ lbl_1_data_18 = .data:0x00000018; // type:object size:0x4
 lbl_1_data_1C = .data:0x0000001C; // type:object size:0xC
 lbl_1_data_28 = .data:0x00000028; // type:object size:0xC
 lbl_1_data_34 = .data:0x00000034; // type:object size:0xC
-lbl_1_data_40 = .data:0x00000040; // type:object size:0x24 data:string
+lbl_1_data_40 = .data:0x00000040; // type:object size:0x23 data:string
 lbl_1_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte
 lbl_1_data_68 = .data:0x00000068; // type:object size:0x420
 lbl_1_data_488 = .data:0x00000488; // type:object size:0x2C

config/GMPE01_00/rels/m440Dll/symbols.txt

@@ -247,7 +247,7 @@ lbl_1_data_104 = .data:0x00000104; // type:object size:0x2 data:2byte
 lbl_1_data_108 = .data:0x00000108; // type:object size:0x2 data:2byte
 lbl_1_data_10C = .data:0x0000010C; // type:object size:0x12
 lbl_1_data_11E = .data:0x0000011E; // type:object size:0x13 scope:local data:string
-lbl_1_data_131 = .data:0x00000131; // type:object size:0x18 scope:local data:string
+lbl_1_data_131 = .data:0x00000131; // type:object size:0x17 scope:local data:string
 lbl_1_data_149 = .data:0x00000149; // type:object size:0x19 scope:local data:string
 lbl_1_data_162 = .data:0x00000162; // type:object size:0x1C scope:local data:string
 lbl_1_data_17E = .data:0x0000017E; // type:object size:0x10 scope:local data:string

config/GMPE01_00/rels/m442Dll/symbols.txt

@@ -167,14 +167,14 @@ lbl_1_data_60 = .data:0x00000060; // type:object size:0xC data:float
 lbl_1_data_6C = .data:0x0000006C; // type:object size:0x4 data:byte
 lbl_1_data_70 = .data:0x00000070; // type:object size:0xC data:float
 lbl_1_data_7C = .data:0x0000007C; // type:object size:0xC data:float
-lbl_1_data_88 = .data:0x00000088; // type:object size:0x24 scope:local data:string
+lbl_1_data_88 = .data:0x00000088; // type:object size:0x23 scope:local data:string
 lbl_1_data_AC = .data:0x000000AC; // type:object size:0x4 data:4byte
 jumptable_1_data_B0 = .data:0x000000B0; // type:object size:0x30 scope:local
 lbl_1_data_E0 = .data:0x000000E0; // type:object size:0x1C scope:local data:string
 lbl_1_data_FC = .data:0x000000FC; // type:object size:0x1C data:4byte
 lbl_1_data_118 = .data:0x00000118; // type:object size:0x8 data:4byte
 lbl_1_data_120 = .data:0x00000120; // type:object size:0x30 data:float
-lbl_1_data_150 = .data:0x00000150; // type:object size:0x1A scope:local data:string
+lbl_1_data_150 = .data:0x00000150; // type:object size:0x19 scope:local data:string
 lbl_1_data_16A = .data:0x0000016A; // type:object size:0x20 data:2byte
 lbl_1_data_18A = .data:0x0000018A; // type:object size:0x14 data:2byte
 lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0xC data:4byte

config/GMPE01_00/rels/m443Dll/symbols.txt

@@ -307,7 +307,7 @@ lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x30
 lbl_1_data_3F4 = .data:0x000003F4; // type:object size:0x5 scope:local data:string
 lbl_1_data_3F9 = .data:0x000003F9; // type:object size:0x7 scope:local data:string
 lbl_1_data_400 = .data:0x00000400; // type:object size:0x7 scope:local data:string
-lbl_1_data_407 = .data:0x00000407; // type:object size:0x9 scope:local data:string
+lbl_1_data_407 = .data:0x00000407; // type:object size:0x7 scope:local data:string
 lbl_1_data_410 = .data:0x00000410; // type:object size:0x58
 lbl_1_data_468 = .data:0x00000468; // type:object size:0x20
 lbl_1_data_488 = .data:0x00000488; // type:object size:0x58

config/GMPE01_00/rels/m446dll/symbols.txt

@@ -260,22 +260,22 @@ lbl_1_data_150 = .data:0x00000150; // type:object size:0xC
 lbl_1_data_15C = .data:0x0000015C; // type:object size:0x20 scope:local
 jumptable_1_data_17C = .data:0x0000017C; // type:object size:0x2C scope:local
 lbl_1_data_1A8 = .data:0x000001A8; // type:object size:0x1F scope:local data:string
-lbl_1_data_1C7 = .data:0x000001C7; // type:object size:0x1F scope:local data:string
+lbl_1_data_1C7 = .data:0x000001C7; // type:object size:0x1E scope:local data:string
 lbl_1_data_1E8 = .data:0x000001E8; // type:object size:0x1E scope:local data:string
-lbl_1_data_206 = .data:0x00000206; // type:object size:0x22 scope:local data:string
+lbl_1_data_206 = .data:0x00000206; // type:object size:0x1E scope:local data:string
 lbl_1_data_228 = .data:0x00000228; // type:object size:0x24
 lbl_1_data_24C = .data:0x0000024C; // type:object size:0x90
 lbl_1_data_2DC = .data:0x000002DC; // type:object size:0x14
 lbl_1_data_2F0 = .data:0x000002F0; // type:object size:0x1F scope:local data:string
 lbl_1_data_30F = .data:0x0000030F; // type:object size:0x1F scope:local data:string
-lbl_1_data_32E = .data:0x0000032E; // type:object size:0x22 scope:local data:string
+lbl_1_data_32E = .data:0x0000032E; // type:object size:0x1F scope:local data:string
 jumptable_1_data_350 = .data:0x00000350; // type:object size:0x1C scope:local
 lbl_1_data_370 = .data:0x00000370; // type:object size:0xC data:float
 lbl_1_data_37C = .data:0x0000037C; // type:object size:0x1E scope:local data:string
 lbl_1_data_39A = .data:0x0000039A; // type:object size:0x1E scope:local data:string
-lbl_1_data_3B8 = .data:0x000003B8; // type:object size:0x10 scope:local data:string
+lbl_1_data_3B8 = .data:0x000003B8; // type:object size:0xE scope:local data:string
 lbl_1_data_3C8 = .data:0x000003C8; // type:object size:0x24
-lbl_1_data_3EC = .data:0x000003EC; // type:object size:0x24 scope:local data:string
+lbl_1_data_3EC = .data:0x000003EC; // type:object size:0x1F scope:local data:string
 lbl_1_data_410 = .data:0x00000410; // type:object size:0x14
 lbl_1_data_424 = .data:0x00000424; // type:object size:0x3C
 lbl_1_data_460 = .data:0x00000460; // type:object size:0x54 data:byte

config/GMPE01_00/rels/m450Dll/symbols.txt

@@ -367,7 +367,7 @@ lbl_1_data_2B6 = .data:0x000002B6; // type:object size:0x13 scope:local data:str
 lbl_1_data_2C9 = .data:0x000002C9; // type:object size:0x14 scope:local data:string
 lbl_1_data_2DD = .data:0x000002DD; // type:object size:0x1C scope:local data:string
 lbl_1_data_2F9 = .data:0x000002F9; // type:object size:0x12 scope:local data:string
-lbl_1_data_30B = .data:0x0000030B; // type:object size:0x11 scope:local data:string
+lbl_1_data_30B = .data:0x0000030B; // type:object size:0xE scope:local data:string
 jumptable_1_data_31C = .data:0x0000031C; // type:object size:0x60 scope:local
 lbl_1_data_37C = .data:0x0000037C; // type:object size:0x12 scope:local data:string
 lbl_1_data_38E = .data:0x0000038E; // type:object size:0x12 scope:local data:string
@@ -375,9 +375,9 @@ lbl_1_data_3A0 = .data:0x000003A0; // type:object size:0x13 scope:local data:str
 lbl_1_data_3B3 = .data:0x000003B3; // type:object size:0x14 scope:local data:string
 lbl_1_data_3C7 = .data:0x000003C7; // type:object size:0x14 scope:local data:string
 lbl_1_data_3DB = .data:0x000003DB; // type:object size:0x13 scope:local data:string
-lbl_1_data_3EE = .data:0x000003EE; // type:object size:0x1E scope:local data:string
+lbl_1_data_3EE = .data:0x000003EE; // type:object size:0x1C scope:local data:string
 jumptable_1_data_40C = .data:0x0000040C; // type:object size:0x44 scope:local
-lbl_1_data_450 = .data:0x00000450; // type:object size:0x14 scope:local data:string
+lbl_1_data_450 = .data:0x00000450; // type:object size:0x12 scope:local data:string
 lbl_1_data_464 = .data:0x00000464; // type:object size:0xC data:4byte
 lbl_1_data_470 = .data:0x00000470; // type:object size:0xC
 lbl_1_data_47C = .data:0x0000047C; // type:object size:0xC data:4byte
@@ -411,7 +411,7 @@ lbl_1_data_9EC = .data:0x000009EC; // type:object size:0x20
 lbl_1_data_A0C = .data:0x00000A0C; // type:object size:0x38 data:4byte
 lbl_1_data_A44 = .data:0x00000A44; // type:object size:0x13 scope:local data:string
 lbl_1_data_A57 = .data:0x00000A57; // type:object size:0x13 scope:local data:string
-lbl_1_data_A6A = .data:0x00000A6A; // type:object size:0x16 scope:local data:string
+lbl_1_data_A6A = .data:0x00000A6A; // type:object size:0x13 scope:local data:string
 lbl_1_data_A80 = .data:0x00000A80; // type:object size:0x18C
 lbl_1_data_C0C = .data:0x00000C0C; // type:object size:0x13 scope:local data:string
 lbl_1_data_C1F = .data:0x00000C1F; // type:object size:0x13 scope:local data:string
@@ -422,7 +422,7 @@ lbl_1_data_E10 = .data:0x00000E10; // type:object size:0x11 scope:local data:str
 lbl_1_data_E21 = .data:0x00000E21; // type:object size:0x11 scope:local data:string
 lbl_1_data_E32 = .data:0x00000E32; // type:object size:0x11 scope:local data:string
 lbl_1_data_E43 = .data:0x00000E43; // type:object size:0x11 scope:local data:string
-lbl_1_data_E54 = .data:0x00000E54; // type:object size:0x14 scope:local data:string
+lbl_1_data_E54 = .data:0x00000E54; // type:object size:0x11 scope:local data:string
 lbl_1_data_E68 = .data:0x00000E68; // type:object size:0x14
 lbl_1_data_E7C = .data:0x00000E7C; // type:object size:0x84
 lbl_1_data_F00 = .data:0x00000F00; // type:object size:0x5C
@@ -466,7 +466,7 @@ lbl_1_data_12FC = .data:0x000012FC; // type:object size:0x13 scope:local data:st
 lbl_1_data_130F = .data:0x0000130F; // type:object size:0x13 scope:local data:string
 lbl_1_data_1322 = .data:0x00001322; // type:object size:0x13 scope:local data:string
 lbl_1_data_1335 = .data:0x00001335; // type:object size:0x13 scope:local data:string
-lbl_1_data_1348 = .data:0x00001348; // type:object size:0x14 scope:local data:string
+lbl_1_data_1348 = .data:0x00001348; // type:object size:0x13 scope:local data:string
 lbl_1_data_135C = .data:0x0000135C; // type:object size:0x24
 lbl_1_data_1380 = .data:0x00001380; // type:object size:0x38 data:4byte
 lbl_1_data_13B8 = .data:0x000013B8; // type:object size:0x38 data:4byte
@@ -474,7 +474,7 @@ lbl_1_data_13F0 = .data:0x000013F0; // type:object size:0x13 scope:local data:st
 lbl_1_data_1403 = .data:0x00001403; // type:object size:0x13 scope:local data:string
 lbl_1_data_1416 = .data:0x00001416; // type:object size:0x13 scope:local data:string
 lbl_1_data_1429 = .data:0x00001429; // type:object size:0x13 scope:local data:string
-lbl_1_data_143C = .data:0x0000143C; // type:object size:0x14 scope:local data:string
+lbl_1_data_143C = .data:0x0000143C; // type:object size:0x13 scope:local data:string
 lbl_1_data_1450 = .data:0x00001450; // type:object size:0xB4
 lbl_1_data_1504 = .data:0x00001504; // type:object size:0x50
 lbl_1_data_1554 = .data:0x00001554; // type:object size:0x13 scope:local data:string
@@ -491,7 +491,7 @@ lbl_1_data_161F = .data:0x0000161F; // type:object size:0xE scope:local data:str
 lbl_1_data_162D = .data:0x0000162D; // type:object size:0x6 scope:local data:string
 lbl_1_data_1633 = .data:0x00001633; // type:object size:0x1D scope:local data:string
 jumptable_1_data_1650 = .data:0x00001650; // type:object size:0x70 scope:local
-lbl_1_data_16C0 = .data:0x000016C0; // type:object size:0x1C scope:local data:string
+lbl_1_data_16C0 = .data:0x000016C0; // type:object size:0x1B scope:local data:string
 jumptable_1_data_16DC = .data:0x000016DC; // type:object size:0xC4 scope:local
 lbl_1_data_17A0 = .data:0x000017A0; // type:object size:0x24 scope:local data:string
 lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte

config/GMPE01_00/rels/m453Dll/symbols.txt

@@ -213,7 +213,7 @@ lbl_1_data_0 = .data:0x00000000; // type:object size:0x2 data:2byte
 lbl_1_data_4 = .data:0x00000004; // type:object size:0xC
 lbl_1_data_10 = .data:0x00000010; // type:object size:0xC
 lbl_1_data_1C = .data:0x0000001C; // type:object size:0x28
-lbl_1_data_44 = .data:0x00000044; // type:object size:0x24 scope:local data:string
+lbl_1_data_44 = .data:0x00000044; // type:object size:0x23 scope:local data:string
 lbl_1_data_68 = .data:0x00000068; // type:object size:0x24 data:4byte
 jumptable_1_data_8C = .data:0x0000008C; // type:object size:0x1C scope:local
 jumptable_1_data_A8 = .data:0x000000A8; // type:object size:0x1C scope:local

config/GMPE01_00/rels/mentDll/symbols.txt

@@ -392,7 +392,7 @@ lbl_1_data_245 = .data:0x00000245; // type:object size:0x1D scope:local data:str
 lbl_1_data_262 = .data:0x00000262; // type:object size:0x14 scope:local data:string
 lbl_1_data_276 = .data:0x00000276; // type:object size:0x15 scope:local data:string
 lbl_1_data_28B = .data:0x0000028B; // type:object size:0x14 scope:local data:string
-lbl_1_data_29F = .data:0x0000029F; // type:object size:0x15 scope:local data:string
+lbl_1_data_29F = .data:0x0000029F; // type:object size:0x14 scope:local data:string
 lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x3C
 lbl_1_data_2F0 = .data:0x000002F0; // type:object size:0x4 data:4byte
 lbl_1_data_2F4 = .data:0x000002F4; // type:object size:0x20 scope:local data:string
@@ -408,7 +408,7 @@ lbl_1_data_413 = .data:0x00000413; // type:object size:0x2B scope:local data:str
 lbl_1_data_43E = .data:0x0000043E; // type:object size:0x29 scope:local data:string
 lbl_1_data_467 = .data:0x00000467; // type:object size:0x2B scope:local data:string
 lbl_1_data_492 = .data:0x00000492; // type:object size:0x20 scope:local data:string
-lbl_1_data_4B2 = .data:0x000004B2; // type:object size:0x22 scope:local data:string
+lbl_1_data_4B2 = .data:0x000004B2; // type:object size:0x20 scope:local data:string
 jumptable_1_data_4D4 = .data:0x000004D4; // type:object size:0x54 scope:local
 lbl_1_data_528 = .data:0x00000528; // type:object size:0x1B scope:local data:string
 lbl_1_data_543 = .data:0x00000543; // type:object size:0x1A scope:local data:string

config/GMPE01_00/rels/mpexDll/symbols.txt

@@ -395,14 +395,14 @@ lbl_1_data_232 = .data:0x00000232; // type:object size:0xE scope:local data:stri
 lbl_1_data_240 = .data:0x00000240; // type:object size:0x54 data:float
 lbl_1_data_294 = .data:0x00000294; // type:object size:0x4 data:4byte
 lbl_1_data_298 = .data:0x00000298; // type:object size:0x4 data:4byte
-lbl_1_data_29C = .data:0x0000029C; // type:object size:0x18 scope:local data:string
+lbl_1_data_29C = .data:0x0000029C; // type:object size:0x15 scope:local data:string
 lbl_1_data_2B4 = .data:0x000002B4; // type:object size:0x10 data:4byte
 lbl_1_data_2C4 = .data:0x000002C4; // type:object size:0x4 data:4byte
 lbl_1_data_2C8 = .data:0x000002C8; // type:object size:0x3 scope:local data:string
 lbl_1_data_2CB = .data:0x000002CB; // type:object size:0x5 scope:local data:string
 lbl_1_data_2D0 = .data:0x000002D0; // type:object size:0x19 scope:local data:string
 lbl_1_data_2E9 = .data:0x000002E9; // type:object size:0x12 scope:local data:string
-lbl_1_data_2FB = .data:0x000002FB; // type:object size:0x29 scope:local data:string
+lbl_1_data_2FB = .data:0x000002FB; // type:object size:0x28 scope:local data:string
 lbl_1_data_324 = .data:0x00000324; // type:object size:0x4 data:4byte
 lbl_1_data_328 = .data:0x00000328; // type:object size:0x4 data:4byte
 lbl_1_data_32C = .data:0x0000032C; // type:object size:0xC data:4byte
@@ -410,7 +410,7 @@ lbl_1_data_338 = .data:0x00000338; // type:object size:0x2B scope:local data:str
 lbl_1_data_363 = .data:0x00000363; // type:object size:0x28 scope:local data:string
 lbl_1_data_38B = .data:0x0000038B; // type:object size:0x5 scope:local data:string
 lbl_1_data_390 = .data:0x00000390; // type:object size:0x4 scope:local data:string
-lbl_1_data_394 = .data:0x00000394; // type:object size:0x4 scope:local data:string
+lbl_1_data_394 = .data:0x00000394; // type:object size:0x3 scope:local data:string
 jumptable_1_data_398 = .data:0x00000398; // type:object size:0x2C scope:local
 lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x3C scope:local data:string
 lbl_1_data_400 = .data:0x00000400; // type:object size:0x16 scope:local data:string
@@ -422,11 +422,11 @@ lbl_1_data_47B = .data:0x0000047B; // type:object size:0x16 scope:local data:str
 lbl_1_data_491 = .data:0x00000491; // type:object size:0x16 scope:local data:string
 lbl_1_data_4A7 = .data:0x000004A7; // type:object size:0x19 scope:local data:string
 lbl_1_data_4C0 = .data:0x000004C0; // type:object size:0x16 scope:local data:string
-lbl_1_data_4D6 = .data:0x000004D6; // type:object size:0x42 scope:local data:string
+lbl_1_data_4D6 = .data:0x000004D6; // type:object size:0x3B scope:local data:string
 lbl_1_data_518 = .data:0x00000518; // type:object size:0x3C scope:local data:string
 lbl_1_data_554 = .data:0x00000554; // type:object size:0x19 scope:local data:string
 lbl_1_data_56D = .data:0x0000056D; // type:object size:0x1A scope:local data:string
-lbl_1_data_587 = .data:0x00000587; // type:object size:0x3D scope:local data:string
+lbl_1_data_587 = .data:0x00000587; // type:object size:0x3A scope:local data:string
 lbl_1_data_5C4 = .data:0x000005C4; // type:object size:0x20 data:4byte
 lbl_1_data_5E4 = .data:0x000005E4; // type:object size:0x40 data:4byte
 lbl_1_data_624 = .data:0x00000624; // type:object size:0x70

config/GMPE01_00/rels/present/symbols.txt

@@ -171,16 +171,16 @@ lbl_1_rodata_C48 = .rodata:0x00000C48; // type:object size:0x4 scope:local data:
 lbl_1_rodata_C4C = .rodata:0x00000C4C; // type:object size:0x4 scope:local data:float
 lbl_1_data_0 = .data:0x00000000; // type:object size:0x1B scope:local data:string
 lbl_1_data_1B = .data:0x0000001B; // type:object size:0x1B scope:local data:string
-lbl_1_data_36 = .data:0x00000036; // type:object size:0x1A scope:local data:string
+lbl_1_data_36 = .data:0x00000036; // type:object size:0x16 scope:local data:string
 lightTbl = .data:0x00000050; // type:object size:0x1C scope:local data:4byte
 execModeTbl = .data:0x0000006C; // type:object size:0x10 scope:local data:4byte
-lbl_1_data_7C = .data:0x0000007C; // type:object size:0x8 scope:local data:string
+lbl_1_data_7C = .data:0x0000007C; // type:object size:0x7 scope:local data:string
 roomIdxTbl2 = .data:0x00000084; // type:object size:0x20
 jumptable_1_data_A4 = .data:0x000000A4; // type:object size:0x2C scope:local
 jumptable_1_data_D0 = .data:0x000000D0; // type:object size:0x1C scope:local
 shadowPosTbl = .data:0x000000F0; // type:object size:0x24 scope:local data:float
 lbl_1_data_114 = .data:0x00000114; // type:object size:0x2A scope:local data:string
-lbl_1_data_13E = .data:0x0000013E; // type:object size:0x2E scope:local data:string
+lbl_1_data_13E = .data:0x0000013E; // type:object size:0x2B scope:local data:string
 jumptable_1_data_16C = .data:0x0000016C; // type:object size:0x34 scope:local
 execModeTbl = .data:0x000001A0; // type:object size:0xC scope:local data:4byte
 scene = .bss:0x00000000; // type:object size:0x4 scope:local data:4byte

config/GMPE01_00/rels/w05Dll/symbols.txt

@@ -287,7 +287,7 @@ 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 scope:local data:string
 lbl_1_data_31F = .data:0x0000031F; // type:object size:0x7 scope:local data:string
-lbl_1_data_326 = .data:0x00000326; // type:object size:0xA scope:local data:string
+lbl_1_data_326 = .data:0x00000326; // type:object size:0x7 scope:local data:string
 lbl_1_data_330 = .data:0x00000330; // type:object size:0xC
 lbl_1_data_33C = .data:0x0000033C; // type:object size:0x7 scope:local data:string
 lbl_1_data_343 = .data:0x00000343; // type:object size:0xD scope:local data:string
@@ -302,7 +302,7 @@ lbl_1_data_470 = .data:0x00000470; // type:object size:0xC
 lbl_1_data_47C = .data:0x0000047C; // type:object size:0xC
 lbl_1_data_488 = .data:0x00000488; // type:object size:0x3 scope:local data:string
 lbl_1_data_48B = .data:0x0000048B; // type:object size:0x4 scope:local data:string
-lbl_1_data_48F = .data:0x0000048F; // type:object size:0x5 scope:local data:string
+lbl_1_data_48F = .data:0x0000048F; // type:object size:0x4 scope:local data:string
 lbl_1_data_494 = .data:0x00000494; // type:object size:0xC
 lbl_1_data_4A0 = .data:0x000004A0; // type:object size:0xD scope:local data:string
 lbl_1_data_4AD = .data:0x000004AD; // type:object size:0x5 scope:local data:string

config/GMPE01_00/rels/w10Dll/symbols.txt

@@ -98,7 +98,7 @@ 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:0x2E scope:local data:string
+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

config/GMPE01_00/rels/ztardll/symbols.txt

@@ -219,7 +219,7 @@ lbl_1_data_3E8 = .data:0x000003E8; // type:object size:0x20
 lbl_1_data_408 = .data:0x00000408; // type:object size:0x3C scope:local data:string
 lbl_1_data_444 = .data:0x00000444; // type:object size:0x19 scope:local data:string
 lbl_1_data_45D = .data:0x0000045D; // type:object size:0x1A scope:local data:string
-lbl_1_data_477 = .data:0x00000477; // type:object size:0x3D scope:local data:string
+lbl_1_data_477 = .data:0x00000477; // type:object size:0x3A scope:local data:string
 lbl_1_data_4B4 = .data:0x000004B4; // type:object size:0x20 data:4byte
 lbl_1_data_4D4 = .data:0x000004D4; // type:object size:0x40 data:4byte
 lbl_1_data_514 = .data:0x00000514; // type:object size:0x70

config/GMPE01_00/splits.txt

@@ -680,12 +680,12 @@ dolphin/mtx/vec.c:
 	.sdata2     start:0x801D6380 end:0x801D6390
 
 dolphin/mtx/quat.c:
-	.text       start:0x800BC2C4 end:0x800BC710
+	.text       start:0x800BC2C4 end:0x800BC884
 	.rodata     start:0x8011E430 end:0x8011E440
 	.sdata2     start:0x801D6390 end:0x801D63B8
 
 dolphin/mtx/psmtx.c:
-	.text       start:0x800BC710 end:0x800BC9E8
+	.text       start:0x800BC884 end:0x800BC9E8
 
 dolphin/dvd/dvdlow.c:
 	.text       start:0x800BC9E8 end:0x800BD83C
@@ -742,7 +742,7 @@ dolphin/demo/DEMOPuts.c:
 
 dolphin/demo/DEMOStats.c:
 	.text       start:0x800C2F84 end:0x800C3CDC
-	.data       start:0x8013D5E0 end:0x8013D748
+	.data       start:0x8013D5E0 end:0x8013D738
 	.sdata      start:0x801D3908 end:0x801D3910
 	.sbss       start:0x801D4488 end:0x801D44E8
 	.sdata2     start:0x801D63D8 end:0x801D63E8
@@ -753,6 +753,7 @@ dolphin/pad/Padclamp.c:
 
 dolphin/pad/Pad.c:
 	.text       start:0x800C3F14 end:0x800C59DC
+	.data       start:0x8013D738 end:0x8013D748
 	.bss        start:0x801A61B0 end:0x801A6200
 	.sdata      start:0x801D3918 end:0x801D3938
 	.sbss       start:0x801D44E8 end:0x801D4510

config/GMPE01_00/symbols.txt

@@ -2102,6 +2102,8 @@ OSSetErrorHandler = .text:0x800B6FC8; // type:function size:0x1C scope:global
 __OSUnhandledException = .text:0x800B6FE4; // type:function size:0x200 scope:global
 OSGetFontEncode = .text:0x800B71E4; // type:function size:0x58
 OSDisableInterrupts = .text:0x800B723C; // type:function size:0x14 scope:global
+__RAS_OSDisableInterrupts_begin = .text:0x800B723C; // type:label scope:global
+__RAS_OSDisableInterrupts_end = .text:0x800B724C; // type:label scope:global
 OSEnableInterrupts = .text:0x800B7250; // type:function size:0x14 scope:global
 OSRestoreInterrupts = .text:0x800B7264; // type:function size:0x24 scope:global
 __OSSetInterruptHandler = .text:0x800B7288; // type:function size:0x1C scope:global
@@ -2192,8 +2194,8 @@ __init_user = .text:0x800BB280; // type:function size:0x20 scope:global
 __init_cpp = .text:0x800BB2A0; // type:function size:0x54 scope:local
 _ExitProcess = .text:0x800BB2F4; // type:function size:0x20 scope:global
 DBInit = .text:0x800BB314; // type:function size:0x28 scope:global
-__DBExceptionDestinationAux = .text:0x800BB33C; // type:function size:0x48 scope:local
+__DBExceptionDestinationAux = .text:0x800BB33C; // type:function size:0x48 scope:global
-__DBExceptionDestination = .text:0x800BB384; // type:function size:0x10 scope:global
+__DBExceptionDestination = .text:0x800BB384; // type:function size:0x10 scope:local
 __DBIsExceptionMarked = .text:0x800BB394; // type:function size:0x1C scope:global
 DBPrintf = .text:0x800BB3B0; // type:function size:0x50 scope:global
 PSMTXIdentity = .text:0x800BB400; // type:function size:0x2C
@@ -2321,7 +2323,7 @@ __fstLoad = .text:0x800C0A04; // type:function size:0x168 scope:global
 __VIRetraceHandler = .text:0x800C0B6C; // type:function size:0x228 scope:local
 VISetPreRetraceCallback = .text:0x800C0D94; // type:function size:0x44
 VISetPostRetraceCallback = .text:0x800C0DD8; // type:function size:0x44
-getTiming = .text:0x800C0E1C; // type:function size:0x90
+getTiming = .text:0x800C0E1C; // type:function size:0x90 scope:local
 __VIInit = .text:0x800C0EAC; // type:function size:0x1F8
 VIInit = .text:0x800C10A4; // type:function size:0x478
 VIWaitForRetrace = .text:0x800C151C; // type:function size:0x54
@@ -3665,7 +3667,7 @@ T = .rodata:0x8011E950; // type:object size:0x68 scope:local data:double
 atanhi = .rodata:0x8011E9B8; // type:object size:0x20 scope:local
 atanlo = .rodata:0x8011E9D8; // type:object size:0x20 scope:local
 aT = .rodata:0x8011E9F8; // type:object size:0x58 scope:local
-@62 = .rodata:0x8011EA50; // type:object size:0x1B scope:local data:string
+@62 = .rodata:0x8011EA50; // type:object size:0x1C scope:local data:string
 lbl_8011EA70 = .rodata:0x8011EA70; // type:object size:0x20
 gTRKMemMap = .rodata:0x8011EA90; // type:object size:0x10 data:4byte
 lbl_8011EAA0 = .rodata:0x8011EAA0; // type:object size:0x28 data:4byte
@@ -3826,7 +3828,8 @@ DataDirStat = .data:0x8011F7C4; // type:object size:0x468 scope:local data:4byte
 lbl_8011FC2C = .data:0x8011FC2C; // type:object size:0x1D data:string
 lbl_8011FC49 = .data:0x8011FC49; // type:object size:0x1F data:string
 lbl_8011FC68 = .data:0x8011FC68; // type:object size:0x1D data:string
-lbl_8011FC85 = .data:0x8011FC85; // type:object size:0x1F data:string
+lbl_8011FC85 = .data:0x8011FC85; // type:object size:0x12 data:string
+lbl_8011FC97 = .data:0x8011FC97; // type:object size:0xD data:string
 lbl_8011FCA4 = .data:0x8011FCA4; // type:object size:0x1A data:string
 lbl_8011FCBE = .data:0x8011FCBE; // type:object size:0x122
 lbl_8011FDE0 = .data:0x8011FDE0; // type:object size:0x20
@@ -3911,7 +3914,7 @@ lbl_8012E70A = .data:0x8012E70A; // type:object size:0xB data:string
 lbl_8012E715 = .data:0x8012E715; // type:object size:0x273
 lbl_8012E988 = .data:0x8012E988; // type:object size:0x12 data:string
 lbl_8012E99A = .data:0x8012E99A; // type:object size:0xD6
-HuSndGrpTbl = .data:0x8012EA70; // type:object size:0x5B0
+sndGrpTable = .data:0x8012EA70; // type:object size:0x5B0
 lbl_8012F020 = .data:0x8012F020; // type:object size:0x94
 lbl_8012F0B4 = .data:0x8012F0B4; // type:object size:0x11 data:string
 lbl_8012F0C5 = .data:0x8012F0C5; // type:object size:0x3A
@@ -4328,27 +4331,100 @@ jumptable_8013B4D4 = .data:0x8013B4D4; // type:object size:0x20 scope:local
 jumptable_8013B4F4 = .data:0x8013B4F4; // type:object size:0x20 scope:local
 lbl_8013B518 = .data:0x8013B518; // type:object size:0x24 data:string
 lbl_8013B53C = .data:0x8013B53C; // type:object size:0x24 data:string
-@84 = .data:0x8013B560; // type:object size:0x1E scope:local data:string
+@82 = .data:0x8013B560; // type:object size:0x1E scope:local data:string
-__OSExceptionLocations = .data:0x8013B648; // type:object size:0x3C
+lbl_8013B580 = .data:0x8013B580; // type:object size:0x16 scope:local data:string
-lbl_8013B720 = .data:0x8013B720; // type:object size:0x398
+lbl_8013B598 = .data:0x8013B598; // type:object size:0xC scope:local data:string
+lbl_8013B5A4 = .data:0x8013B5A4; // type:object size:0x9 scope:local data:string
+lbl_8013B5B4 = .data:0x8013B5B0; // type:object size:0x10 scope:local data:string
+lbl_8013B5C0 = .data:0x8013B5C0; // type:object size:0xB scope:local data:string
+lbl_8013B5CC = .data:0x8013B5CC; // type:object size:0xE scope:local data:string
+lbl_8013B5DC = .data:0x8013B5DC; // type:object size:0xD scope:local data:string
+lbl_8013B5EC = .data:0x8013B5EC; // type:object size:0xD scope:local data:string
+lbl_8013B5FC = .data:0x8013B5FC; // type:object size:0xD scope:local data:string
+lbl_8013B60C = .data:0x8013B60C; // type:object size:0x12 scope:local data:string
+lbl_8013B620 = .data:0x8013B620; // type:object size:0xE scope:local data:string
+lbl_8013B630 = .data:0x8013B630; // type:object size:0x15 scope:local data:string
+__OSExceptionLocations = .data:0x8013B648; // type:object size:0x3C scope:local
+lbl_8013B720 = .data:0x8013B720; // type:object size:0x24 scope:local data:string
+lbl_8013B744 = .data:0x8013B744; // type:object size:0x37 scope:local data:string
+lbl_8013B77C = .data:0x8013B77C; // type:object size:0x28 scope:local data:string
+lbl_8013B7A4 = .data:0x8013B7A4; // type:object size:0x4F scope:local data:string
+lbl_8013B7F4 = .data:0x8013B7F4; // type:object size:0x3E scope:local data:string
+lbl_8013B834 = .data:0x8013B834; // type:object size:0x37 scope:local data:string
+lbl_8013B86C = .data:0x8013B86C; // type:object size:0x49 scope:local data:string
+lbl_8013B8B8 = .data:0x8013B8B8; // type:object size:0x33 scope:local data:string
+lbl_8013B8EC = .data:0x8013B8EC; // type:object size:0x3D scope:local data:string
+lbl_8013B92C = .data:0x8013B92C; // type:object size:0x39 scope:local data:string
+lbl_8013B968 = .data:0x8013B968; // type:object size:0x45 scope:local data:string
+lbl_8013B9B0 = .data:0x8013B9B0; // type:object size:0x5F scope:local data:string
+lbl_8013BA10 = .data:0x8013BA10; // type:object size:0x2C scope:local data:string
+lbl_8013BA3C = .data:0x8013BA3C; // type:object size:0x12 scope:local data:string
+lbl_8013BA50 = .data:0x8013BA50; // type:object size:0x12 scope:local data:string
+lbl_8013BA64 = .data:0x8013BA64; // type:object size:0x1A scope:local data:string
+lbl_8013BA80 = .data:0x8013BA80; // type:object size:0x13 scope:local data:string
+lbl_8013BA94 = .data:0x8013BA94; // type:object size:0x10 scope:local data:string
+lbl_8013BAA4 = .data:0x8013BAA4; // type:object size:0xE scope:local data:string
 DSPInitCode = .data:0x8013BAB8; // type:object size:0x80 scope:local
 @69 = .data:0x8013BB38; // type:object size:0x29 scope:local data:string
-lbl_8013BD68 = .data:0x8013BD68; // type:object size:0x1B4
+lbl_8013BB64 = .data:0x8013BB64; // type:object size:0x18 scope:local data:string
-@74 = .data:0x8013BF1C; // type:object size:0x23 scope:local data:string
+lbl_8013BB7C = .data:0x8013BB7C; // type:object size:0x1B scope:local data:string
+lbl_8013BB98 = .data:0x8013BB98; // type:object size:0x30 scope:local data:string
+lbl_8013BBC8 = .data:0x8013BBC8; // type:object size:0x3C scope:local data:string
+lbl_8013BC04 = .data:0x8013BC04; // type:object size:0x37 scope:local data:string
+lbl_8013BC3D = .data:0x8013BC3D; // type:object size:0x3E scope:local data:string
+lbl_8013BC7C = .data:0x8013BC7C; // type:object size:0x29 scope:local data:string
+lbl_8013BCA8 = .data:0x8013BCA8; // type:object size:0x1D scope:local data:string
+lbl_8013BCC8 = .data:0x8013BCC8; // type:object size:0x19 scope:local data:string
+lbl_8013BCE4 = .data:0x8013BCE4; // type:object size:0x19 scope:local data:string
+lbl_8013BD00 = .data:0x8013BD00; // type:object size:0x19 scope:local data:string
+lbl_8013BD1C = .data:0x8013BD1C; // type:object size:0x16 scope:local data:string
+lbl_8013BD34 = .data:0x8013BD34; // type:object size:0x2E scope:local data:string
+lbl_8013BD68 = .data:0x8013BD68; // type:object size:0x44 scope:local data:string
+lbl_8013BDAC = .data:0x8013BDAC; // type:object size:0x30 scope:local data:string
+lbl_8013BDDC = .data:0x8013BDDC; // type:object size:0x2F scope:local data:string
+lbl_8013BE0C = .data:0x8013BE0C; // type:object size:0x2F scope:local data:string
+lbl_8013BE3C = .data:0x8013BE3C; // type:object size:0x11 scope:local data:string
+lbl_8013BE50 = .data:0x8013BE50; // type:object size:0x21 scope:local data:string
+lbl_8013BE74 = .data:0x8013BE74; // type:object size:0x12 scope:local data:string
+lbl_8013BE88 = .data:0x8013BE88; // type:object size:0x19 scope:local data:string
+lbl_8013BEA4 = .data:0x8013BEA4; // type:object size:0x12 scope:local data:string
+lbl_8013BEB8 = .data:0x8013BEB8; // type:object size:0x1D scope:local data:string
+lbl_8013BED8 = .data:0x8013BED8; // type:object size:0x26 scope:local data:string
+lbl_8013BF00 = .data:0x8013BF00; // type:object size:0x1C scope:local data:string
+@76 = .data:0x8013BF1C; // type:object size:0x23 scope:local data:string
 @10 = .data:0x8013BF40; // type:object size:0x16 scope:local data:string
-@43 = .data:0x8013C21C; // type:object size:0x40 scope:local
+lbl_8013BF58 = .data:0x8013BF58; // type:object size:0x26 scope:local data:string
+lbl_8013BF80 = .data:0x8013BF80; // type:object size:0x1C scope:local data:string
+lbl_8013BF9C = .data:0x8013BF9C; // type:object size:0x1D scope:local data:string
+lbl_8013BFBC = .data:0x8013BFBC; // type:object size:0x17 scope:local data:string
+lbl_8013BFD4 = .data:0x8013BFD4; // type:object size:0x31 scope:local data:string
+lbl_8013C008 = .data:0x8013C008; // type:object size:0x10 scope:local data:string
+lbl_8013C018 = .data:0x8013C018; // type:object size:0x60 scope:local data:string
+lbl_8013C078 = .data:0x8013C078; // type:object size:0x4C scope:local data:string
+lbl_8013C0C4 = .data:0x8013C0C4; // type:object size:0x62 scope:local data:string
+lbl_8013C128 = .data:0x8013C128; // type:object size:0x60 scope:local data:string
+lbl_8013C188 = .data:0x8013C188; // type:object size:0x1F scope:local data:string
+lbl_8013C1A8 = .data:0x8013C1A8; // type:object size:0x1F scope:local data:string
+lbl_8013C1C8 = .data:0x8013C1C8; // type:object size:0x1B scope:local data:string
+lbl_8013C1E4 = .data:0x8013C1E4; // type:object size:0x35 scope:local data:string
+@87 = .data:0x8013C21C; // type:object size:0x40 scope:local
 InterruptPrioTable = .data:0x8013C260; // type:object size:0x2C scope:local data:4byte
-lbl_8013C290 = .data:0x8013C290; // type:object size:0x28
+lbl_8013C290 = .data:0x8013C290; // type:object size:0x25 scope:local data:string
-lbl_8013C2B8 = .data:0x8013C2B8; // type:object size:0x28
+lbl_8013C2B8 = .data:0x8013C2B8; // type:object size:0x27 scope:local data:string
 ResetFunctionInfo = .data:0x8013C2E0; // type:object size:0x10 scope:local
-lbl_8013C2F0 = .data:0x8013C2F0; // type:object size:0x78
+lbl_8013C2F0 = .data:0x8013C2F0; // type:object size:0x12 scope:local data:string
+lbl_8013C304 = .data:0x8013C304; // type:object size:0x11 scope:local data:string
+lbl_8013C318 = .data:0x8013C318; // type:object size:0xD scope:local data:string
+lbl_8013C328 = .data:0x8013C328; // type:object size:0x11 scope:local data:string
+lbl_8013C33C = .data:0x8013C33C; // type:object size:0x11 scope:local data:string
+lbl_8013C350 = .data:0x8013C350; // type:object size:0x11 scope:local data:string
 YearDays = .data:0x8013C368; // type:object size:0x30 scope:local
 LeapYearDays = .data:0x8013C398; // type:object size:0x30 scope:local
-lbl_8013C3C8 = .data:0x8013C3C8; // type:object size:0x18 data:string
+lbl_8013C3C8 = .data:0x8013C3C8; // type:object size:0x18 scope:local data:string
-lbl_8013C3E0 = .data:0x8013C3E0; // type:object size:0xC8 data:string
+lbl_8013C3E0 = .data:0x8013C3E0; // type:object size:0xC8 scope:local data:string
-lbl_8013C4A8 = .data:0x8013C4A8; // type:object size:0x38
+lbl_8013C4A8 = .data:0x8013C4A8; // type:object size:0x38 scope:local
-lbl_8013C4E0 = .data:0x8013C4E0; // type:object size:0x34 data:string
+lbl_8013C4E0 = .data:0x8013C4E0; // type:object size:0x34 scope:local data:string
-lbl_8013C514 = .data:0x8013C514; // type:object size:0x34
+lbl_8013C514 = .data:0x8013C514; // type:object size:0x34 scope:local
 @13 = .data:0x8013C548; // type:object size:0x15 scope:local data:string
 @293 = .data:0x8013C594; // type:object size:0x20 scope:local
 jumptable_8013C5B4 = .data:0x8013C5B4; // type:object size:0x40 scope:local
@@ -4359,23 +4435,31 @@ ErrorTable = .data:0x8013C660; // type:object size:0x48 scope:local data:4byte
 timing = .data:0x8013C718; // type:object size:0x130 scope:local
 taps = .data:0x8013C848; // type:object size:0x32 scope:local
 jumptable_8013C87C = .data:0x8013C87C; // type:object size:0x58 scope:local
-lbl_8013C8D4 = .data:0x8013C8D4; // type:object size:0x29 data:string
+lbl_8013C8D4 = .data:0x8013C8D4; // type:object size:0x29 scope:local data:string
-lbl_8013C900 = .data:0x8013C900; // type:object size:0x29 data:string
+lbl_8013C900 = .data:0x8013C900; // type:object size:0x29 scope:local data:string
-lbl_8013C92C = .data:0x8013C92C; // type:object size:0x29 data:string
+lbl_8013C92C = .data:0x8013C92C; // type:object size:0x29 scope:local data:string
-lbl_8013C958 = .data:0x8013C958; // type:object size:0x29 data:string
+lbl_8013C958 = .data:0x8013C958; // type:object size:0x29 scope:local data:string
-lbl_8013C984 = .data:0x8013C984; // type:object size:0x29 data:string
+lbl_8013C984 = .data:0x8013C984; // type:object size:0x29 scope:local data:string
-lbl_8013C9B0 = .data:0x8013C9B0; // type:object size:0x29 data:string
+lbl_8013C9B0 = .data:0x8013C9B0; // type:object size:0x29 scope:local data:string
 DEMOFontBitmap = .data:0x8013C9E0; // type:object size:0xC00 align:32
-lbl_8013D5E0 = .data:0x8013D5E0; // type:object size:0xC data:string
+lbl_8013D5E0 = .data:0x8013D5E0; // type:object size:0xC scope:local data:string
-lbl_8013D5EC = .data:0x8013D5EC; // type:object size:0x28
+lbl_8013D5EC = .data:0x8013D5EC; // type:object size:0x26 scope:local data:string
 jumptable_8013D614 = .data:0x8013D614; // type:object size:0x28 scope:local
 jumptable_8013D698 = .data:0x8013D698; // type:object size:0x28 scope:local
 jumptable_8013D6C0 = .data:0x8013D6C0; // type:object size:0x28 scope:local
 jumptable_8013D6E8 = .data:0x8013D6E8; // type:object size:0x28 scope:local
 jumptable_8013D710 = .data:0x8013D710; // type:object size:0x28 scope:local
-lbl_8013D738 = .data:0x8013D738; // type:object size:0x10
+ResetFunctionInfo = .data:0x8013D738; // type:object size:0x10
-lbl_8013D748 = .data:0x8013D748; // type:object size:0x38
+lbl_8013D748 = .data:0x8013D748; // type:object size:0x1E scope:local data:string
-lbl_8013D780 = .data:0x8013D780; // type:object size:0x140
+lbl_8013D768 = .data:0x8013D768; // type:object size:0xC scope:local data:string
+lbl_8013D774 = .data:0x8013D774; // type:object size:0x9 scope:local data:string
+lbl_8013D780 = .data:0x8013D780; // type:object size:0x1D scope:local data:string
+lbl_8013D7A0 = .data:0x8013D7A0; // type:object size:0x2D scope:local data:string
+lbl_8013D7D0 = .data:0x8013D7D0; // type:object size:0x2D scope:local data:string
+lbl_8013D800 = .data:0x8013D800; // type:object size:0x2D scope:local data:string
+lbl_8013D830 = .data:0x8013D830; // type:object size:0x2D scope:local data:string
+lbl_8013D860 = .data:0x8013D860; // type:object size:0x2D scope:local data:string
+lbl_8013D890 = .data:0x8013D890; // type:object size:0x2B scope:local data:string
 jumptable_8013D8C0 = .data:0x8013D8C0; // type:object size:0x68 scope:local
 jumptable_8013D928 = .data:0x8013D928; // type:object size:0x44 scope:local
 jumptable_8013D96C = .data:0x8013D96C; // type:object size:0x1C scope:local
@@ -4400,6 +4484,17 @@ SectorSizeTable = .data:0x8013E060; // type:object size:0x20 scope:local
 LatencyTable = .data:0x8013E080; // type:object size:0x20 scope:local
 Si = .data:0x8013E0A0; // type:object size:0x14 scope:local data:4byte
 Type = .data:0x8013E0B4; // type:object size:0x10 scope:local
+@464 = .data:0x8013E0C4; // type:object size:0xC scope:local data:string
+lbl_8013E0D0 = .data:0x8013E0D0; // type:object size:0xF scope:local data:string
+lbl_8013E0E0 = .data:0x8013E0E0; // type:object size:0xF scope:local data:string
+lbl_8013E0F0 = .data:0x8013E0F0; // type:object size:0xD scope:local data:string
+lbl_8013E100 = .data:0x8013E100; // type:object size:0xA scope:local data:string
+lbl_8013E10C = .data:0x8013E10C; // type:object size:0x10 scope:local data:string
+lbl_8013E11C = .data:0x8013E11C; // type:object size:0x14 scope:local data:string
+lbl_8013E130 = .data:0x8013E130; // type:object size:0x12 scope:local data:string
+lbl_8013E144 = .data:0x8013E144; // type:object size:0x14 scope:local data:string
+lbl_8013E158 = .data:0x8013E158; // type:object size:0x9 scope:local data:string
+lbl_8013E164 = .data:0x8013E164; // type:object size:0x9 scope:local data:string
 XYNTSC = .data:0x8013E170; // type:object size:0x30 scope:local
 XYPAL = .data:0x8013E1A0; // type:object size:0x30 scope:local
 __vt__Q23std9exception = .data:0x8013E208; // type:object size:0x10 scope:weak
@@ -4976,13 +5071,13 @@ __OSArenaLo = .sdata:0x801D38C0; // type:object size:0x4 scope:local data:4byte
 @32 = .sdata:0x801D38C8; // type:object size:0x2 scope:local data:string
 fontEncode$80 = .sdata:0x801D38D0; // type:object size:0x8 scope:local data:2byte
 Unit01 = .sdata:0x801D38D8; // type:object size:0x8
-FirstRead = .sdata:0x801D38E0; // type:object size:0x8 scope:local data:4byte
+FirstRead = .sdata:0x801D38E0; // type:object size:0x4 scope:local data:4byte
-lbl_801D38E8 = .sdata:0x801D38E8; // type:object size:0x8 data:string
+lbl_801D38E8 = .sdata:0x801D38E8; // type:object size:0x8 scope:local data:string
 autoInvalidation = .sdata:0x801D38F0; // type:object size:0x4 scope:local data:4byte
 @35 = .sdata:0x801D38F8; // type:object size:0x2 scope:local data:string
 @40 = .sdata:0x801D38FC; // type:object size:0x4 scope:local data:string
 @41 = .sdata:0x801D3900; // type:object size:0x3 scope:local data:string
-lbl_801D3908 = .sdata:0x801D3908; // type:object size:0x8 data:string
+lbl_801D3908 = .sdata:0x801D3908; // type:object size:0x8 scope:local data:string
 ClampRegion = .sdata:0x801D3910; // type:object size:0x8 scope:local data:byte
 ResettingChan = .sdata:0x801D3918; // type:object size:0x4 scope:local data:4byte
 XPatchBits = .sdata:0x801D391C; // type:object size:0x4 scope:local data:4byte
@@ -5627,7 +5722,7 @@ Prepared = .sbss:0x801D4320; // type:object size:0x8 scope:local data:4byte
 ResetFunctionQueue = .sbss:0x801D4328; // type:object size:0x8 scope:local data:4byte
 ResetCallback = .sbss:0x801D4330; // type:object size:0x4 data:4byte
 Down = .sbss:0x801D4334; // type:object size:0x4 data:4byte
-LastState = .sbss:0x801D4338; // type:object size:0x8 data:4byte
+LastState = .sbss:0x801D4338; // type:object size:0x8 scope:local data:4byte
 HoldUp = .sbss:0x801D4340; // type:object size:0x8 align:8 data:4byte
 HoldDown = .sbss:0x801D4348; // type:object size:0x8 align:8 data:4byte
 RunQueueBits = .sbss:0x801D4350; // type:object size:0x4 scope:local data:4byte
@@ -5692,7 +5787,7 @@ shdwChanged = .sbss:0x801D4460; // type:object size:0x8 scope:local align:8 data
 CurrTiming = .sbss:0x801D4468; // type:object size:0x4 scope:local data:4byte
 CurrTvMode = .sbss:0x801D446C; // type:object size:0x4 scope:local data:4byte
 FBSet = .sbss:0x801D4470; // type:object size:0x4 scope:local data:4byte
-message$343 = .sbss:0x801D4474; // type:object size:0x4 scope:local data:4byte
+message$320 = .sbss:0x801D4474; // type:object size:0x4 scope:local data:4byte
 rmode = .sbss:0x801D4478; // type:object size:0x8 scope:local data:4byte
 fontShift = .sbss:0x801D4480; // type:object size:0x8 scope:local data:4byte
 DemoStat = .sbss:0x801D4488; // type:object size:0x4 scope:local data:4byte
@@ -5797,8 +5892,8 @@ Vachuff = .sbss:0x801D46E0; // type:object size:0x4 scope:local align:32 data:4b
 __THPHuffmanBits = .sbss:0x801D46E4; // type:object size:0x4 scope:local data:4byte
 __THPHuffmanSizeTab = .sbss:0x801D46E8; // type:object size:0x4 scope:local data:4byte
 __THPHuffmanCodeTab = .sbss:0x801D46EC; // type:object size:0x4 scope:local data:4byte
-Gbase = .sbss:0x801D4700; // type:object size:0x20 align:32 data:4byte
+Gbase = .sbss:0x801D4700; // type:object size:0x20 scope:local align:32 data:4byte
-Gwid = .sbss:0x801D4720; // type:object size:0x20 align:32 data:4byte
+Gwid = .sbss:0x801D4720; // type:object size:0x20 scope:local align:32 data:4byte
 Gq = .sbss:0x801D4740; // type:object size:0x4 scope:local align:32 data:4byte
 __THPOldGQR5 = .sbss:0x801D4744; // type:object size:0x4 scope:local data:4byte
 __THPOldGQR6 = .sbss:0x801D4748; // type:object size:0x4 scope:local data:4byte
@@ -7284,21 +7379,21 @@ lbl_801D6338 = .sdata2:0x801D6338; // type:object size:0x4 data:float
 lbl_801D633C = .sdata2:0x801D633C; // type:object size:0x4 data:float
 lbl_801D6340 = .sdata2:0x801D6340; // type:object size:0x8 data:double
 lbl_801D6348 = .sdata2:0x801D6348; // type:object size:0x8 data:float
-lbl_801D6350 = .sdata2:0x801D6350; // type:object size:0x4 data:float
+lbl_801D6350 = .sdata2:0x801D6350; // type:object size:0x4 scope:local data:float
-lbl_801D6354 = .sdata2:0x801D6354; // type:object size:0x4 data:float
+lbl_801D6354 = .sdata2:0x801D6354; // type:object size:0x4 scope:local data:float
-lbl_801D6358 = .sdata2:0x801D6358; // type:object size:0x4 data:float
+lbl_801D6358 = .sdata2:0x801D6358; // type:object size:0x4 scope:local data:float
-lbl_801D635C = .sdata2:0x801D635C; // type:object size:0x4 data:float
+lbl_801D635C = .sdata2:0x801D635C; // type:object size:0x4 scope:local data:float
-lbl_801D6360 = .sdata2:0x801D6360; // type:object size:0x8 data:float
+lbl_801D6360 = .sdata2:0x801D6360; // type:object size:0x8 scope:local data:float
-lbl_801D6368 = .sdata2:0x801D6368; // type:object size:0x4 data:float
+lbl_801D6368 = .sdata2:0x801D6368; // type:object size:0x4 scope:local data:float
-lbl_801D636C = .sdata2:0x801D636C; // type:object size:0x4 data:float
+lbl_801D636C = .sdata2:0x801D636C; // type:object size:0x4 scope:local data:float
-lbl_801D6370 = .sdata2:0x801D6370; // type:object size:0x4 data:float
+lbl_801D6370 = .sdata2:0x801D6370; // type:object size:0x4 scope:local data:float
-lbl_801D6374 = .sdata2:0x801D6374; // type:object size:0x4 data:float
+lbl_801D6374 = .sdata2:0x801D6374; // type:object size:0x4 scope:local data:float
-lbl_801D6378 = .sdata2:0x801D6378; // type:object size:0x4 data:float
+lbl_801D6378 = .sdata2:0x801D6378; // type:object size:0x4 scope:local data:float
-lbl_801D637C = .sdata2:0x801D637C; // type:object size:0x4 data:float
+lbl_801D637C = .sdata2:0x801D637C; // type:object size:0x4 scope:local data:float
-lbl_801D6380 = .sdata2:0x801D6380; // type:object size:0x4 data:float
+lbl_801D6380 = .sdata2:0x801D6380; // type:object size:0x4 scope:local data:float
-lbl_801D6384 = .sdata2:0x801D6384; // type:object size:0x4 data:float
+lbl_801D6384 = .sdata2:0x801D6384; // type:object size:0x4 scope:local data:float
-lbl_801D6388 = .sdata2:0x801D6388; // type:object size:0x4 data:float
+lbl_801D6388 = .sdata2:0x801D6388; // type:object size:0x4 scope:local data:float
-lbl_801D638C = .sdata2:0x801D638C; // type:object size:0x4 data:float
+lbl_801D638C = .sdata2:0x801D638C; // type:object size:0x4 scope:local data:float
 lbl_801D6390 = .sdata2:0x801D6390; // type:object size:0x4 data:float
 lbl_801D6394 = .sdata2:0x801D6394; // type:object size:0x4 data:float
 lbl_801D6398 = .sdata2:0x801D6398; // type:object size:0x8 data:double
@@ -7307,13 +7402,13 @@ lbl_801D63A8 = .sdata2:0x801D63A8; // type:object size:0x4 data:float
 lbl_801D63AC = .sdata2:0x801D63AC; // type:object size:0x4 data:float
 lbl_801D63B0 = .sdata2:0x801D63B0; // type:object size:0x4 data:float
 lbl_801D63B4 = .sdata2:0x801D63B4; // type:object size:0x4 data:float
-lbl_801D63B8 = .sdata2:0x801D63B8; // type:object size:0x4 data:float
+lbl_801D63B8 = .sdata2:0x801D63B8; // type:object size:0x4 scope:local data:float
-lbl_801D63BC = .sdata2:0x801D63BC; // type:object size:0x4 data:float
+lbl_801D63BC = .sdata2:0x801D63BC; // type:object size:0x4 scope:local data:float
-lbl_801D63C0 = .sdata2:0x801D63C0; // type:object size:0x8 data:double
+lbl_801D63C0 = .sdata2:0x801D63C0; // type:object size:0x8 scope:local data:double
-lbl_801D63C8 = .sdata2:0x801D63C8; // type:object size:0x8 data:double
+lbl_801D63C8 = .sdata2:0x801D63C8; // type:object size:0x8 scope:local data:double
-lbl_801D63D0 = .sdata2:0x801D63D0; // type:object size:0x8 data:float
+lbl_801D63D0 = .sdata2:0x801D63D0; // type:object size:0x8 scope:local data:float
-lbl_801D63D8 = .sdata2:0x801D63D8; // type:object size:0x4 data:float
+lbl_801D63D8 = .sdata2:0x801D63D8; // type:object size:0x4 scope:local data:float
-lbl_801D63E0 = .sdata2:0x801D63E0; // type:object size:0x8 data:double
+lbl_801D63E0 = .sdata2:0x801D63E0; // type:object size:0x8 scope:local data:double
 lbl_801D63E8 = .sdata2:0x801D63E8; // type:object size:0x4 data:4byte
 lbl_801D63EC = .sdata2:0x801D63EC; // type:object size:0x4 data:4byte
 lbl_801D63F0 = .sdata2:0x801D63F0; // type:object size:0x4 data:4byte

configure.py

@@ -210,6 +210,16 @@ cflags_runtime = [
     "-inline auto,deferred",
 ]
 
+# Dolphin library flags
+cflags_dolphin = [
+    *cflags_base,
+    "-fp_contract off",
+]
+
+cflags_thp = [
+    *cflags_base,
+]
+
 # Metrowerks library flags
 cflags_msl = [
     *cflags_base,
@@ -232,7 +242,7 @@ cflags_trk = [
 
 cflags_odemuexi = [
     *cflags_base,
-    "-inline auto,deferred",
+    # TODO figure out flags
 ]
 
 cflags_amcstub = [
@@ -303,8 +313,8 @@ config.rel_empty_file = "REL/empty.c"
 def DolphinLib(lib_name, objects):
     return {
         "lib": lib_name,
-        "mw_version": "GC/2.6",
+        "mw_version": "GC/1.2.5n",
-        "cflags": cflags_base,
+        "cflags": cflags_dolphin,
         "host": False,
         "objects": objects,
     }
@@ -442,107 +452,107 @@ config.libs = [
     DolphinLib(
         "base",
         [
-            Object(NonMatching, "dolphin/PPCArch.c"),
+            Object(Matching, "dolphin/PPCArch.c"),
         ],
     ),
     DolphinLib(
         "os",
         [
-            Object(NonMatching, "dolphin/os/OS.c"),
+            Object(Matching, "dolphin/os/OS.c"),
-            Object(NonMatching, "dolphin/os/OSAlarm.c"),
+            Object(Matching, "dolphin/os/OSAlarm.c"),
-            Object(NonMatching, "dolphin/os/OSAlloc.c"),
+            Object(Matching, "dolphin/os/OSAlloc.c"),
-            Object(NonMatching, "dolphin/os/OSArena.c"),
+            Object(Matching, "dolphin/os/OSArena.c"),
-            Object(NonMatching, "dolphin/os/OSAudioSystem.c"),
+            Object(Matching, "dolphin/os/OSAudioSystem.c"),
-            Object(NonMatching, "dolphin/os/OSCache.c"),
+            Object(Matching, "dolphin/os/OSCache.c"),
-            Object(NonMatching, "dolphin/os/OSContext.c"),
+            Object(Matching, "dolphin/os/OSContext.c"),
-            Object(NonMatching, "dolphin/os/OSError.c"),
+            Object(Matching, "dolphin/os/OSError.c"),
-            Object(NonMatching, "dolphin/os/OSFont.c"),
+            Object(Matching, "dolphin/os/OSFont.c"),
-            Object(NonMatching, "dolphin/os/OSInterrupt.c"),
+            Object(Matching, "dolphin/os/OSInterrupt.c"),
-            Object(NonMatching, "dolphin/os/OSLink.c"),
+            Object(Matching, "dolphin/os/OSLink.c"),
-            Object(NonMatching, "dolphin/os/OSMessage.c"),
+            Object(Matching, "dolphin/os/OSMessage.c"),
-            Object(NonMatching, "dolphin/os/OSMemory.c"),
+            Object(Matching, "dolphin/os/OSMemory.c"),
-            Object(NonMatching, "dolphin/os/OSMutex.c"),
+            Object(Matching, "dolphin/os/OSMutex.c"),
             Object(NonMatching, "dolphin/os/OSReboot.c"),
-            Object(NonMatching, "dolphin/os/OSReset.c"),
+            Object(Matching, "dolphin/os/OSReset.c"),
-            Object(NonMatching, "dolphin/os/OSResetSW.c"),
+            Object(Matching, "dolphin/os/OSResetSW.c"),
-            Object(NonMatching, "dolphin/os/OSRtc.c"),
+            Object(Matching, "dolphin/os/OSRtc.c"),
-            Object(NonMatching, "dolphin/os/OSStopwatch.c"),
+            Object(Matching, "dolphin/os/OSStopwatch.c"),
-            Object(NonMatching, "dolphin/os/OSSync.c"),
+            Object(Matching, "dolphin/os/OSSync.c"),
-            Object(NonMatching, "dolphin/os/OSThread.c"),
+            Object(Matching, "dolphin/os/OSThread.c"),
-            Object(NonMatching, "dolphin/os/OSTime.c"),
+            Object(Matching, "dolphin/os/OSTime.c"),
-            Object(NonMatching, "dolphin/os/__start.c"),
+            Object(Matching, "dolphin/os/__start.c"),
-            Object(NonMatching, "dolphin/os/__ppc_eabi_init.c"),
+            Object(Matching, "dolphin/os/__ppc_eabi_init.c"),
         ],
     ),
     DolphinLib(
         "db",
         [
-            Object(NonMatching, "dolphin/db.c"),
+            Object(Matching, "dolphin/db.c"),
         ],
     ),
     DolphinLib(
         "mtx",
         [
             Object(NonMatching, "dolphin/mtx/mtx.c"),
-            Object(NonMatching, "dolphin/mtx/mtxvec.c"),
+            Object(Matching, "dolphin/mtx/mtxvec.c"),
-            Object(NonMatching, "dolphin/mtx/mtx44.c"),
+            Object(Matching, "dolphin/mtx/mtx44.c"),
             Object(NonMatching, "dolphin/mtx/vec.c"),
             Object(NonMatching, "dolphin/mtx/quat.c"),
-            Object(NonMatching, "dolphin/mtx/psmtx.c"),
+            Object(Matching, "dolphin/mtx/psmtx.c"),
         ],
     ),
     DolphinLib(
         "dvd",
         [
-            Object(NonMatching, "dolphin/dvd/dvdlow.c"),
+            Object(Matching, "dolphin/dvd/dvdlow.c"),
-            Object(NonMatching, "dolphin/dvd/dvdfs.c"),
+            Object(Matching, "dolphin/dvd/dvdfs.c"),
-            Object(NonMatching, "dolphin/dvd/dvd.c"),
+            Object(Matching, "dolphin/dvd/dvd.c"),
-            Object(NonMatching, "dolphin/dvd/dvdqueue.c"),
+            Object(Matching, "dolphin/dvd/dvdqueue.c"),
-            Object(NonMatching, "dolphin/dvd/dvderror.c"),
+            Object(Matching, "dolphin/dvd/dvderror.c"),
-            Object(NonMatching, "dolphin/dvd/fstload.c"),
+            Object(Matching, "dolphin/dvd/fstload.c"),
         ],
     ),
     DolphinLib(
         "vi",
         [
-            Object(NonMatching, "dolphin/vi.c"),
+            Object(Matching, "dolphin/vi.c"),
         ],
     ),
     DolphinLib(
         "demo",
         [
-            Object(NonMatching, "dolphin/demo/DEMOInit.c"),
+            Object(Matching, "dolphin/demo/DEMOInit.c"),
-            Object(NonMatching, "dolphin/demo/DEMOFont.c"),
+            Object(Matching, "dolphin/demo/DEMOFont.c"),
-            Object(NonMatching, "dolphin/demo/DEMOPuts.c"),
+            Object(Matching, "dolphin/demo/DEMOPuts.c"),
-            Object(NonMatching, "dolphin/demo/DEMOStats.c"),
+            Object(Matching, "dolphin/demo/DEMOStats.c"),
         ],
     ),
     DolphinLib(
         "pad",
         [
             Object(NonMatching, "dolphin/pad/Padclamp.c"),
-            Object(NonMatching, "dolphin/pad/Pad.c"),
+            Object(Matching, "dolphin/pad/Pad.c"),
         ],
     ),
     DolphinLib(
         "ai",
         [
-            Object(NonMatching, "dolphin/ai.c"),
+            Object(Matching, "dolphin/ai.c"),
         ],
     ),
     DolphinLib(
         "ar",
         [
             Object(NonMatching, "dolphin/ar/ar.c"),
-            Object(NonMatching, "dolphin/ar/arq.c"),
+            Object(Matching, "dolphin/ar/arq.c"),
         ],
     ),
     DolphinLib(
         "dsp",
         [
-            Object(NonMatching, "dolphin/dsp/dsp.c"),
+            Object(Matching, "dolphin/dsp/dsp.c"),
-            Object(NonMatching, "dolphin/dsp/dsp_debug.c"),
+            Object(Matching, "dolphin/dsp/dsp_debug.c"),
-            Object(NonMatching, "dolphin/dsp/dsp_task.c"),
+            Object(Matching, "dolphin/dsp/dsp_task.c"),
         ],
     ),
     DolphinLib(
@@ -568,44 +578,47 @@ config.libs = [
     DolphinLib(
         "card",
         [
-            Object(NonMatching, "dolphin/card/CARDBios.c"),
+            Object(Matching, "dolphin/card/CARDBios.c"),
-            Object(NonMatching, "dolphin/card/CARDUnlock.c"),
+            Object(Matching, "dolphin/card/CARDUnlock.c"),
-            Object(NonMatching, "dolphin/card/CARDRdwr.c"),
+            Object(Matching, "dolphin/card/CARDRdwr.c"),
-            Object(NonMatching, "dolphin/card/CARDBlock.c"),
+            Object(Matching, "dolphin/card/CARDBlock.c"),
-            Object(NonMatching, "dolphin/card/CARDDir.c"),
+            Object(Matching, "dolphin/card/CARDDir.c"),
-            Object(NonMatching, "dolphin/card/CARDCheck.c"),
+            Object(Matching, "dolphin/card/CARDCheck.c"),
-            Object(NonMatching, "dolphin/card/CARDMount.c"),
+            Object(Matching, "dolphin/card/CARDMount.c"),
-            Object(NonMatching, "dolphin/card/CARDFormat.c"),
+            Object(Matching, "dolphin/card/CARDFormat.c"),
-            Object(NonMatching, "dolphin/card/CARDOpen.c"),
+            Object(Matching, "dolphin/card/CARDOpen.c"),
-            Object(NonMatching, "dolphin/card/CARDCreate.c"),
+            Object(Matching, "dolphin/card/CARDCreate.c"),
-            Object(NonMatching, "dolphin/card/CARDRead.c"),
+            Object(Matching, "dolphin/card/CARDRead.c"),
-            Object(NonMatching, "dolphin/card/CARDWrite.c"),
+            Object(Matching, "dolphin/card/CARDWrite.c"),
-            Object(NonMatching, "dolphin/card/CARDDelete.c"),
+            Object(Matching, "dolphin/card/CARDDelete.c"),
-            Object(NonMatching, "dolphin/card/CARDStat.c"),
+            Object(Matching, "dolphin/card/CARDStat.c"),
-            Object(NonMatching, "dolphin/card/CARDNet.c"),
+            Object(Matching, "dolphin/card/CARDNet.c"),
         ],
     ),
     DolphinLib(
         "exi",
         [
-            Object(NonMatching, "dolphin/exi/EXIBios.c"),
+            Object(Matching, "dolphin/exi/EXIBios.c"),
-            Object(NonMatching, "dolphin/exi/EXIUart.c"),
+            Object(Matching, "dolphin/exi/EXIUart.c"),
         ],
     ),
     DolphinLib(
         "si",
         [
-            Object(NonMatching, "dolphin/si/SIBios.c"),
+            Object(Matching, "dolphin/si/SIBios.c"),
-            Object(NonMatching, "dolphin/si/SISamplingRate.c"),
+            Object(Matching, "dolphin/si/SISamplingRate.c"),
         ],
     ),
-    DolphinLib(
+    {
-        "thp",
+        "lib": "thp",
-        [
+        "mw_version": "GC/1.2.5",
-            Object(NonMatching, "dolphin/thp/THPDec.c"),
+        "cflags": cflags_thp,
+        "host": False,
+        "objects": [
+            Object(Matching, "dolphin/thp/THPDec.c"),
             Object(NonMatching, "dolphin/thp/THPAudio.c"),
         ],
-    ),
+    },
     {
         "lib": "Runtime.PPCEABI.H",
         "mw_version": config.linker_version,
@@ -747,7 +760,7 @@ config.libs = [
     ),
     {
         "lib": "OdemuExi2",
-        "mw_version": config.linker_version,
+        "mw_version": "GC/1.2.5",
         "cflags": cflags_odemuexi,
         "host": False,
         "objects": [
@@ -760,7 +773,7 @@ config.libs = [
         "cflags": cflags_amcstub,
         "host": False,
         "objects": [
-            Object(NonMatching, "amcstubs/AmcExi2Stubs.c"),
+            Object(Matching, "amcstubs/AmcExi2Stubs.c"),
         ],
     },
     {
@@ -769,7 +782,7 @@ config.libs = [
         "cflags": cflags_odenotstub,
         "host": False,
         "objects": [
-            Object(NonMatching, "odenotstub/odenotstub.c"),
+            Object(Matching, "odenotstub/odenotstub.c"),
         ],
     },
     {
@@ -1065,7 +1078,7 @@ config.libs = [
     Rel(
         "m432Dll",  # Dungeon Duos
         objects={
-            Object(NonMatching, "REL/m432Dll/main.c"),
+            Object(Matching, "REL/m432Dll/main.c"),
         },
     ),
     Rel(
@@ -1089,7 +1102,7 @@ config.libs = [
         "m435Dll",  # Darts of Doom
         objects={
             Object(NonMatching, "REL/m435Dll/main.c"),
-            Object(Matching, "REL/m435Dll/sequence.c"),
+            Object(NonMatching, "REL/m435Dll/sequence.c"),
         },
     ),
     Rel(
@@ -1102,7 +1115,7 @@ config.libs = [
     Rel(
         "m437Dll",  # Balloon of Doom
         objects={
-            Object(NonMatching, "REL/m437Dll/main.c"),
+            Object(Matching, "REL/m437Dll/main.c"),
             Object(Matching, "REL/m437Dll/sequence.c"),
         },
     ),
@@ -1230,7 +1243,7 @@ config.libs = [
         "m456Dll",  # Take a Breather
         objects={
             Object(NonMatching, "REL/m456Dll/main.c"),
-            Object(Matching, "REL/m456Dll/stage.c"),
+            Object(NonMatching, "REL/m456Dll/stage.c"),
         },
     ),
     Rel(

include/__ppc_eabi_linker.h

@@ -0,0 +1,79 @@
+#ifndef __PPC_EABI_LINKER
+#define __PPC_EABI_LINKER
+
+#ifdef __MWERKS__
+#define DECL_SECTION(name) __declspec(section name)
+#else
+#define DECL_SECTION(name)
+#endif
+
+DECL_SECTION(".init") extern char _stack_addr[];
+DECL_SECTION(".init") extern char _stack_end[];
+DECL_SECTION(".init") extern char _heap_addr[];
+DECL_SECTION(".init") extern char _heap_end[];
+DECL_SECTION(".init") extern const char _fextabindex_rom[];
+DECL_SECTION(".init") extern char _fextabindex[];
+DECL_SECTION(".init") extern char _eextabindex[];
+
+DECL_SECTION(".init") extern char _SDA_BASE_[];
+
+DECL_SECTION(".init") extern char _SDA2_BASE_[];
+
+typedef struct __rom_copy_info {
+  char* rom;
+  char* addr;
+  unsigned int size;
+} __rom_copy_info;
+
+DECL_SECTION(".init") extern __rom_copy_info _rom_copy_info[];
+
+typedef struct __bss_init_info {
+  char* addr;
+  unsigned int size;
+} __bss_init_info;
+
+DECL_SECTION(".init") extern __bss_init_info _bss_init_info[];
+
+typedef struct __eti_init_info {
+  void* eti_start;
+  void* eti_end;
+  void* code_start;
+  unsigned long code_size;
+} __eti_init_info;
+
+DECL_SECTION(".init") extern __eti_init_info _eti_init_info[];
+DECL_SECTION(".init") extern const char _f_init_rom[];
+DECL_SECTION(".init") extern char _f_init[];
+DECL_SECTION(".init") extern char _e_init[];
+DECL_SECTION(".init") extern const char _f_text_rom[];
+DECL_SECTION(".init") extern char _f_text[];
+DECL_SECTION(".init") extern char _e_text[];
+DECL_SECTION(".init") extern const char _f_rodata_rom[];
+DECL_SECTION(".init") extern char _f_rodata[];
+DECL_SECTION(".init") extern char _e_rodata[];
+DECL_SECTION(".init") extern const char _fextab_rom[];
+DECL_SECTION(".init") extern char _fextab[];
+DECL_SECTION(".init") extern char _eextab[];
+DECL_SECTION(".init") extern const char _f_data_rom[];
+DECL_SECTION(".init") extern char _f_data[];
+DECL_SECTION(".init") extern char _e_data[];
+DECL_SECTION(".init") extern char _f_bss[];
+DECL_SECTION(".init") extern char _e_bss[];
+DECL_SECTION(".init") extern const char _f_sdata_rom[];
+DECL_SECTION(".init") extern char _f_sdata[];
+DECL_SECTION(".init") extern char _e_sdata[];
+DECL_SECTION(".init") extern char _f_sbss[];
+DECL_SECTION(".init") extern char _e_sbss[];
+DECL_SECTION(".init") extern const char _f_sdata2_rom[];
+DECL_SECTION(".init") extern char _f_sdata2[];
+DECL_SECTION(".init") extern char _e_sdata2[];
+DECL_SECTION(".init") extern char _f_sbss2[];
+DECL_SECTION(".init") extern char _e_sbss2[];
+DECL_SECTION(".init") extern const char _f_PPC_EMB_sdata0_rom[];
+DECL_SECTION(".init") extern char _f_PPC_EMB_sdata0[];
+DECL_SECTION(".init") extern char _e_PPC_EMB_sdata0[];
+DECL_SECTION(".init") extern char _f_PPC_EMB_sbss0[];
+DECL_SECTION(".init") extern char _e_PPC_EMB_sbss0[];
+
+
+#endif // __PPC_EABI_LINKER

include/asm_types.h

@@ -0,0 +1,84 @@
+#ifndef _ASM_TYPES
+#define _ASM_TYPES
+
+// Special Purpose Registers (SPRs)
+#define XER 1
+#define LR 8
+#define CTR 9
+#define DSISR 18
+#define DAR 19
+#define DEC 22
+#define SDR1 25
+#define SRR0 26
+#define SRR1 27
+#define SPRG0 272
+#define SPRG1 273
+#define SPRG2 274
+#define SPRG3 275
+#define EAR 282
+#define PVR 287
+#define IBAT0U 528
+#define IBAT0L 529
+#define IBAT1U 530
+#define IBAT1L 531
+#define IBAT2U 532
+#define IBAT2L 533
+#define IBAT3U 534
+#define IBAT3L 535
+#define DBAT0U 536
+#define DBAT0L 537
+#define DBAT1U 538
+#define DBAT1L 539
+#define DBAT2U 540
+#define DBAT2L 541
+#define DBAT3U 542
+#define DBAT3L 543
+#define GQR0 912
+#define GQR1 913
+#define GQR2 914
+#define GQR3 915
+#define GQR4 916
+#define GQR5 917
+#define GQR6 918
+#define GQR7 919
+#define HID2 920
+#define WPAR 921
+#define DMA_U 922
+#define DMA_L 923
+#define UMMCR0 936
+#define UPMC1 937
+#define UPMC2 938
+#define USIA 939
+#define UMMCR1 940
+#define UPMC3 941
+#define UPMC4 942
+#define USDA 943
+#define MMCR0 952
+#define PMC1 953
+#define PMC2 954
+#define SIA 955
+#define MMCR1 956
+#define PMC3 957
+#define PMC4 958
+#define SDA 959
+#define HID0 1008
+#define HID1 1009
+#define IABR 1010
+#define DABR 1013
+#define L2CR 1017
+#define ICTC 1019
+#define THRM1 1020
+#define THRM2 1021
+#define THRM3 1022
+
+// Condition Registers (CRs)
+#define cr0 0
+#define cr1 1
+#define cr2 2
+#define cr3 3
+#define cr4 4
+#define cr5 5
+#define cr6 6
+#define cr7 7
+
+#endif // _ASM_TYPES

include/dolphin/CARDPriv.h

@@ -63,9 +63,9 @@ typedef struct CARDControl {
     int formatStep;
     u32 scramble;
     DSPTaskInfo task;
-  void* workArea;
+    void *workArea;
-  CARDDir* currentDir;
+    CARDDir *currentDir;
-  u16* currentFat;
+    u16 *currentFat;
     OSThreadQueue threadQueue;
     u8 cmd[9];
     s32 cmdlen;
@@ -73,11 +73,11 @@ typedef struct CARDControl {
     int retry;
     int repeat;
     u32 addr;
-  void* buffer;
+    void *buffer;
     s32 xferred;
     u16 freeNo;
     u16 startBlock;
-  CARDFileInfo* fileInfo;
+    CARDFileInfo *fileInfo;
     CARDCallback extCallback;
     CARDCallback txCallback;
     CARDCallback exiCallback;
@@ -87,7 +87,7 @@ typedef struct CARDControl {
     CARDCallback unlockCallback;
     OSAlarm alarm;
     u32 cid;
-  const DVDDiskID* diskID;
+    const DVDDiskID *diskID;
 } CARDControl;
 
 typedef struct CARDID {
@@ -103,21 +103,67 @@ typedef struct CARDID {
 } CARDID;
 
 void __CARDDefaultApiCallback(s32 chan, s32 result);
+s32 __CARDEraseSector(s32 chan, u32 addr, CARDCallback callback);
+s32 __CARDPutControlBlock(struct CARDControl *card, s32 result);
+void __CARDSyncCallback(s32 chan, s32 result);
+u16 *__CARDGetFatBlock(CARDControl *card);
 
-#define CARDIsValidBlockNo(card, iBlock)                                                           \
+/* CARDBios */
-  (CARD_NUM_SYSTEM_BLOCK <= (iBlock) && (iBlock) < (card)->cBlock)
+void __CARDExtHandler(s32 chan, OSContext *context);
-#define __CARDGetDirCheck(dir) ((CARDDirCheck*)&(dir)[CARD_MAX_FILE])
+void __CARDExiHandler(s32 chan, OSContext *context);
+void __CARDTxHandler(s32 chan, OSContext *context);
+void __CARDUnlockedHandler(s32 chan, OSContext *context);
+s32 __CARDEnableInterrupt(s32 chan, BOOL enable);
+s32 __CARDReadStatus(s32 chan, u8 *status);
+s32 __CARDReadVendorID(s32 chan, u16 *vendorId);
+s32 __CARDClearStatus(s32 chan);
+s32 __CARDStart(s32 chan, CARDCallback txCallback, CARDCallback exiCallback);
+s32 __CARDReadSegment(s32 chan, CARDCallback callback);
+s32 __CARDWritePage(s32 chan, CARDCallback callback);
+u16 __CARDGetFontEncode(void);
+void __CARDSetDiskID(const DVDDiskID *id);
+s32 __CARDGetControlBlock(s32 chan, struct CARDControl **pcard);
+s32 __CARDSync(s32 chan);
 
-CARDDir* __CARDGetDirBlock(CARDControl* card);
+/* CARDBlock */
-u16* __CARDGetFatBlock(CARDControl* card);
+s32 __CARDAllocBlock(s32 chan, u32 cBlock, CARDCallback callback);
-s32 __CARDUpdateFatBlock(s32 chan, u16* fat, CARDCallback callback);
+s32 __CARDFreeBlock(s32 chan, u16 nBlock, CARDCallback callback);
-void __CARDCheckSum(void* ptr, int length, u16* checkSum, u16* checkSumInv);
+s32 __CARDUpdateFatBlock(s32 chan, u16 *fat, CARDCallback callback);
-u16 __CARDGetFontEncode();
+
-void __CARDExiHandler(s32 chan, OSContext* context);
+/* CARDCheck */
-void __CARDExtHandler(s32 chan, OSContext* context);
+void __CARDCheckSum(void *ptr, int length, u16 *checksum, u16 *checksumInv);
-void __CARDUnlockedHandler(s32 chan, OSContext* context);
+s32 __CARDVerify(CARDControl *card);
-s32 __CARDAccess(CARDControl* card, CARDDir* ent);
+
-BOOL __CARDIsWritable(CARDDir* ent);
+/* CARDDir */
+CARDDir *__CARDGetDirBlock(CARDControl *card);
+s32 __CARDUpdateDir(s32 chan, CARDCallback callback);
+
+/* CARDFormat */
+s32 __CARDFormatRegionAsync(s32 chan, u16 encode, CARDCallback callback);
+
+/* CARDMount */
+void __CARDMountCallback(s32 chan, s32 result);
+
+/* CARDOpen */
+BOOL __CARDCompareFileName(CARDDir *ent, const char *fileName);
+s32 __CARDAccess(CARDControl *card, CARDDir *ent);
+BOOL __CARDIsPublic(CARDDir *ent);
+s32 __CARDIsReadable(CARDControl *card, CARDDir *ent);
+s32 __CARDGetFileNo(CARDControl *card, const char *fileName, s32 *pfileNo);
+BOOL __CARDIsOpened(CARDControl *card, s32 fileNo);
+
+/* CARDRdwr */
+s32 __CARDRead(s32 chan, u32 addr, s32 length, void *dst, CARDCallback callback);
+s32 __CARDWrite(s32 chan, u32 addr, s32 length, void *dst, CARDCallback callback);
+
+/* CARDRead */
+s32 __CARDSeek(CARDFileInfo *fileInfo, s32 length, s32 offset, CARDControl **pcard);
+
+/* CARDUnlock */
+s32 __CARDUnlock(s32 chan, u8 flashID[12]);
+
+#define CARDIsValidBlockNo(card, iBlock) (CARD_NUM_SYSTEM_BLOCK <= (iBlock) && (iBlock) < (card)->cBlock)
+#define __CARDGetDirCheck(dir) ((CARDDirCheck *)&(dir)[CARD_MAX_FILE])
 
 #define TRUNC(n, a) (((u32)(n)) & ~((a)-1))
 #define OFFSET(n, a) (((u32)(n)) & ((a)-1))

include/dolphin/OSRtcPriv.h

@@ -26,8 +26,11 @@ typedef struct OSSramEx {
     u8 _padding1[2];
 } OSSramEx;
 
-OSSram* __OSLockSram();
+void __OSInitSram();
-OSSramEx* __OSLockSramEx();
+OSSram *__OSLockSram();
+BOOL __OSSyncSram();
+BOOL __OSUnlockSram(BOOL commit);
+OSSramEx *__OSLockSramEx();
 void OSSetWirelessID(s32 chan, u16 id);
 u16 OSGetWirelessID(s32 chan);
 

include/dolphin/ai.h

@@ -9,6 +9,12 @@ extern "C" {
 typedef void (*AISCallback)(u32 count);
 typedef void (*AIDCallback)();
 
+#define AI_STREAM_START 1
+#define AI_STREAM_STOP 0
+
+#define AI_SAMPLERATE_32KHZ  0
+#define AI_SAMPLERATE_48KHZ  1
+
 AIDCallback AIRegisterDMACallback(AIDCallback callback);
 void AIInitDMA(u32 start_addr, u32 length);
 BOOL AIGetDMAEnableFlag();

include/dolphin/demo.h

@@ -0,0 +1,72 @@
+#ifndef _DOLPHIN_DEMO
+#define _DOLPHIN_DEMO
+
+#include <dolphin/pad.h>
+#include <dolphin/gx.h>
+
+struct STRUCT_MENU_ITEM {
+    /* 0x00 */ char * name;
+    /* 0x04 */ unsigned long flags;
+    /* 0x08 */ void (* function)(struct STRUCT_MENU *, unsigned long, unsigned long *);
+    /* 0x0C */ struct STRUCT_MENU * link;
+};
+
+struct STRUCT_MENU {
+    /* 0x00 */ char * title;
+    /* 0x04 */ struct STRUCT_DEMOWIN * handle;
+    /* 0x08 */ struct STRUCT_MENU_ITEM * items;
+    /* 0x0C */ long max_display_items;
+    /* 0x10 */ unsigned long flags;
+    /* 0x14 */ void (* cb_open)(struct STRUCT_MENU *, unsigned long);
+    /* 0x18 */ void (* cb_move)(struct STRUCT_MENU *, unsigned long);
+    /* 0x1C */ void (* cb_select)(struct STRUCT_MENU *, unsigned long);
+    /* 0x20 */ void (* cb_cancel)(struct STRUCT_MENU *, unsigned long);
+    /* 0x24 */ long num_display_items;
+    /* 0x28 */ long num_items;
+    /* 0x2C */ unsigned long max_str_len;
+    /* 0x30 */ long curr_pos;
+    /* 0x34 */ long display_pos;
+};
+
+typedef struct {
+    /* 0x00 */ struct PADStatus pads[4];
+    /* 0x30 */ unsigned long button[4];
+    /* 0x40 */ unsigned long old_button[4];
+    /* 0x50 */ unsigned long changed_button[4];
+    /* 0x60 */ unsigned long repeat_button[4];
+    /* 0x70 */ unsigned long repeat_ctr[4];
+} DEMOWinPadInfo;
+
+struct STRUCT_LISTBOX_ITEM {
+    /* 0x00 */ char * name; // offset 0x0, size 0x4
+    /* 0x04 */ unsigned long flags; // offset 0x4, size 0x4
+};
+
+struct STRUCT_LISTBOX {
+    /* 0x00 */ char * title; // offset 0x0, size 0x4
+    /* 0x04 */ struct STRUCT_DEMOWIN * handle; // offset 0x4, size 0x4
+    /* 0x08 */ struct STRUCT_LISTBOX_ITEM * items; // offset 0x8, size 0x4
+    /* 0x0C */ long max_display_items; // offset 0xC, size 0x4
+    /* 0x10 */ unsigned long flags; // offset 0x10, size 0x4
+    /* 0x14 */ long num_display_items; // offset 0x14, size 0x4
+    /* 0x18 */ long num_items; // offset 0x18, size 0x4
+    /* 0x1C */ unsigned long max_str_len; // offset 0x1C, size 0x4
+    /* 0x20 */ long curr_pos; // offset 0x20, size 0x4
+    /* 0x24 */ long display_pos; // offset 0x24, size 0x4
+    /* 0x28 */ int cursor_state; // offset 0x28, size 0x4
+};
+
+extern unsigned long DEMOFontBitmap[768];
+
+#include <dolphin/demo/DEMOInit.h>
+#include <dolphin/demo/DEMOPad.h>
+#include <dolphin/demo/DEMOPuts.h>
+#include <dolphin/demo/DEMOStats.h>
+#include <dolphin/demo/DEMOWin.h>
+
+// unsorted externs
+extern void DEMOPrintf(s16 x, s16 y, s16 priority, char *str, ...);
+
+extern struct _GXRenderModeObj *DEMOGetRenderModeObj();
+
+#endif

include/dolphin/demo/DEMOInit.h

@@ -0,0 +1,21 @@
+#ifndef _DOLPHIN_DEMOINIT
+#define _DOLPHIN_DEMOINIT
+
+#include <dolphin/gx.h>
+
+extern void *DemoFrameBuffer1;
+extern void *DemoFrameBuffer2;
+extern void *DemoCurrentBuffer;
+
+void DEMOInit(struct _GXRenderModeObj *mode);
+void DEMOBeforeRender();
+void DEMODoneRender();
+void DEMOSwapBuffers();
+void DEMOSetTevColorIn(enum _GXTevStageID stage, enum _GXTevColorArg a, enum _GXTevColorArg b, enum _GXTevColorArg c, enum _GXTevColorArg d);
+void DEMOSetTevOp(enum _GXTevStageID id, enum _GXTevMode mode);
+struct _GXRenderModeObj *DEMOGetRenderModeObj();
+u32 DEMOGetCurrentBuffer(void);
+void DEMOEnableBypassWorkaround(unsigned long timeoutFrames);
+void DEMOReInit(struct _GXRenderModeObj *mode);
+
+#endif

include/dolphin/demo/DEMOPad.h

@@ -0,0 +1,26 @@
+#ifndef _DOLPHIN_DEMOPAD
+#define _DOLPHIN_DEMOPAD
+
+#include <dolphin/pad.h>
+
+typedef struct {
+    /* 0x00 */ struct PADStatus pst;
+    /* 0x0C */ u16 buttonDown;
+    /* 0x0E */ u16 buttonUp;
+    /* 0x10 */ u16 dirs;
+    /* 0x12 */ u16 dirsNew;
+    /* 0x14 */ u16 dirsReleased;
+    /* 0x16 */ s16 stickDeltaX;
+    /* 0x18 */ s16 stickDeltaY;
+    /* 0x1A */ s16 substickDeltaX;
+    /* 0x1C */ s16 substickDeltaY;
+} DEMODMPad;
+
+extern DEMODMPad DemoPad[4];
+
+extern u32 DemoNumValidPads;
+
+void DEMOPadRead();
+void DEMOPadInit();
+
+#endif

include/dolphin/demo/DEMOPuts.h

@@ -0,0 +1,27 @@
+#ifndef _DOLPHIN_DEMOPUTS
+#define _DOLPHIN_DEMOPUTS
+
+#include <dolphin/gx.h>
+
+typedef enum {
+    DMTF_POINTSAMPLE,
+    DMTF_BILERP,
+} DMTexFlt;
+
+typedef enum { DM_FT_OPQ, DM_FT_RVS, DM_FT_XLU } DMFontType;
+
+void DEMOSetFontType(DMFontType attr);
+void DEMOLoadFont(enum _GXTexMapID texMap, enum _GXTexMtx texMtx, DMTexFlt texFlt);
+void DEMOSetupScrnSpc(long width, long height, float depth);
+void DEMOInitCaption(long font_type, long width, long height);
+void DEMOPuts(s16 x, s16 y, s16 z, char *string);
+void DEMOPrintf(s16 x, s16 y, s16 z, char *fmt, ...);
+struct OSFontHeader *DEMOInitROMFont();
+void DEMOSetROMFontSize(s16 size, s16 space);
+int DEMORFPuts(s16 x, s16 y, s16 z, char *string);
+int DEMORFPutsEx(s16 x, s16 y, s16 z, char *string, s16 maxWidth, int length);
+int DEMORFPrintf(s16 x, s16 y, s16 z, char *fmt, ...);
+char *DEMODumpROMFont(char *string);
+int DEMOGetRFTextWidth(char *string);
+
+#endif

include/dolphin/demo/DEMOStats.h

@@ -0,0 +1,38 @@
+#ifndef _DOLPHIN_DEMOSTATS
+#define _DOLPHIN_DEMOSTATS
+
+typedef enum DEMO_STAT_TYPE {
+    DEMO_STAT_GP0 = 0,
+    DEMO_STAT_GP1 = 1,
+    DEMO_STAT_MEM = 2,
+    DEMO_STAT_PIX = 3,
+    DEMO_STAT_VC = 4,
+    DEMO_STAT_FR = 5,
+    DEMO_STAT_TBW = 6,
+    DEMO_STAT_TBP = 7,
+    DEMO_STAT_MYC = 8,
+    DEMO_STAT_MYR = 9,
+} DEMO_STAT_TYPE;
+
+typedef struct DemoStatData {
+    char text[50];
+    DEMO_STAT_TYPE stat_type;
+    unsigned long stat;
+    unsigned long count;
+} DemoStatData;
+
+typedef enum {
+    DEMO_STAT_TL = 0,
+    DEMO_STAT_BL = 1,
+    DEMO_STAT_TLD = 2,
+    DEMO_STAT_BLD = 3,
+    DEMO_STAT_IO = 4,
+} DEMO_STAT_DISP;
+
+extern unsigned char DemoStatEnable;
+
+void DEMOSetStats(DemoStatData * stat, unsigned long nstats, DEMO_STAT_DISP disp);
+void DEMOUpdateStats(unsigned char inc);
+void DEMOPrintStats(void);
+
+#endif

include/dolphin/demo/DEMOWin.h

@@ -0,0 +1,77 @@
+#ifndef _DOLPHIN_DEMOWIN
+#define _DOLPHIN_DEMOWIN
+
+#include <dolphin/demo.h>
+#include <dolphin/gx.h>
+
+enum DEMOWinItem {
+    DEMOWIN_ITEM_CAP,
+    DEMOWIN_ITEM_BKGND,
+    DEMOWIN_ITEM_BORDER,
+    DEMOWIN_ITEM_DEFAULT
+};
+
+// flags
+#define DEMOWIN_FLAGS_INIT   (1 << 0)
+#define DEMOWIN_FLAGS_OPENED (1 << 1)
+
+struct STRUCT_DEMOWIN {
+    /* 0x00 */ long x1;
+    /* 0x04 */ long y1;
+    /* 0x08 */ long x2;
+    /* 0x0C */ long y2;
+    /* 0x10 */ unsigned long priority;
+    /* 0x14 */ unsigned long flags;
+    /* 0x18 */ unsigned short x_cal;
+    /* 0x1A */ unsigned short y_cal;
+    /* 0x1C */ unsigned short pixel_width;
+    /* 0x1E */ unsigned short pixel_height;
+    /* 0x20 */ unsigned short char_width;
+    /* 0x22 */ unsigned short char_height;
+    /* 0x24 */ unsigned short num_scroll_lines;
+    /* 0x26 */ unsigned short total_lines;
+    /* 0x28 */ unsigned short curr_output_line;
+    /* 0x2A */ unsigned short curr_output_col;
+    /* 0x2C */ unsigned short curr_view_line;
+    /* 0x2E */ signed short cursor_line;
+    /* 0x30 */ char * caption;
+    /* 0x34 */ unsigned char * buffer;
+    /* 0x38 */ GXColor bkgnd;
+    /* 0x3C */ GXColor cap;
+    /* 0x40 */ GXColor border;
+    /* 0x44 */ void (* refresh)(struct STRUCT_DEMOWIN *);
+    /* 0x48 */ struct STRUCT_DEMOWIN * next;
+    /* 0x4C */ struct STRUCT_DEMOWIN * prev;
+    /* 0x50 */ void * parent;
+};
+
+// functions
+void DEMOWinInit();
+struct STRUCT_DEMOWIN * DEMOWinCreateWindow(s32 x1, s32 y1, s32 x2, s32 y2, char * caption, u16 scroll, void * func);
+void DEMOWinDestroyWindow(struct STRUCT_DEMOWIN * handle);
+void DEMOWinOpenWindow(struct STRUCT_DEMOWIN * handle);
+void DEMOWinCloseWindow(struct STRUCT_DEMOWIN * handle);
+void DEMOWinSetWindowColor(struct STRUCT_DEMOWIN * handle, enum DEMOWinItem item, u8 r, u8 g, u8 b, u8 a);
+void DEMOWinLogPrintf(struct STRUCT_DEMOWIN * handle, char * fmt, ...);
+void DEMOWinPrintfXY(struct STRUCT_DEMOWIN * handle, u16 col, u16 row, char * fmt, ...);
+void DEMOWinScrollWindow(struct STRUCT_DEMOWIN * handle, u32 dir);
+void DEMOWinBringToFront(struct STRUCT_DEMOWIN * handle);
+void DEMOWinSendToBack(struct STRUCT_DEMOWIN * handle);
+void DEMOWinClearRow(struct STRUCT_DEMOWIN * handle, u16 row);
+void DEMOWinClearWindow(struct STRUCT_DEMOWIN * handle);
+void DEMOWinClearBuffer(struct STRUCT_DEMOWIN * handle);
+void DEMOWinRefresh();
+struct STRUCT_MENU * DEMOWinCreateMenuWindow(struct STRUCT_MENU * menu, u16 x, u16 y);
+void DEMOWinDestroyMenuWindow(struct STRUCT_MENU * menu);
+u32 DEMOWinMenuChild(struct STRUCT_MENU * menu, int child_flag);
+void DEMOWinPadInit(DEMOWinPadInfo *p);
+void DEMOWinPadRead(DEMOWinPadInfo *p);
+void DEMOWinSetRepeat(unsigned long threshold, unsigned long rate);
+void DEMOWinResetRepeat();
+struct STRUCT_LISTBOX * DEMOWinCreateListWindow(struct STRUCT_LISTBOX * list, unsigned short x, unsigned short y);
+void DEMOWinDestroyListWindow(struct STRUCT_LISTBOX * list);
+void DEMOWinListSetCursor(struct STRUCT_LISTBOX * list, int x);
+long DEMOWinListScrollList(struct STRUCT_LISTBOX * list, unsigned long dir);
+long DEMOWinListMoveCursor(struct STRUCT_LISTBOX * list, unsigned long dir);
+
+#endif

include/dolphin/demoPriv.h

@@ -0,0 +1,11 @@
+#ifndef _DOLPHIN_DEMOPRIV
+#define _DOLPHIN_DEMOPRIV
+
+#include <dolphin/demo.h>
+
+extern struct STRUCT_DEMOWIN * __first_node;
+extern struct STRUCT_DEMOWIN * __last_node;
+extern struct STRUCT_DEMOWIN * __curr_node;
+extern struct _GXRenderModeObj * __rmp;
+
+#endif

include/dolphin/dsp.h

@@ -59,6 +59,7 @@ DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
 
 void __DSP_exec_task(DSPTaskInfo* curr, DSPTaskInfo* next);
 void __DSP_boot_task(DSPTaskInfo* task);
+void __DSP_insert_task(DSPTaskInfo* task);
 void __DSP_remove_task(DSPTaskInfo* task);
 void __DSP_add_task(DSPTaskInfo* task);
 void __DSP_debug_printf(const char* fmt, ...);

include/dolphin/exi.h

@@ -0,0 +1,27 @@
+#ifndef _DOLPHIN_EXI
+#define _DOLPHIN_EXI
+
+#include <dolphin/os/OSContext.h>
+
+typedef void (*EXICallback)(s32 chan, OSContext *context);
+
+EXICallback EXISetExiCallback(s32 channel, EXICallback callback);
+
+void EXIInit(void);
+BOOL EXILock(s32 channel, u32 device, EXICallback callback);
+BOOL EXIUnlock(s32 channel);
+BOOL EXISelect(s32 channel, u32 device, u32 frequency);
+BOOL EXIDeselect(s32 channel);
+BOOL EXIImm(s32 channel, void *buffer, s32 length, u32 type, EXICallback callback);
+BOOL EXIImmEx(s32 channel, void *buffer, s32 length, u32 type);
+BOOL EXIDma(s32 channel, void *buffer, s32 length, u32 type, EXICallback callback);
+BOOL EXISync(s32 channel);
+BOOL EXIProbe(s32 channel);
+s32 EXIProbeEx(s32 channel);
+BOOL EXIAttach(s32 channel, EXICallback callback);
+BOOL EXIDetach(s32 channel);
+u32 EXIGetState(s32 channel);
+s32 EXIGetID(s32 channel, u32 device, u32 *id);
+void EXIProbeReset(void);
+
+#endif

include/dolphin/os.h

@@ -25,24 +25,24 @@ typedef s64 OSTime;
 typedef u32 OSTick;
 u32 __OSBusClock AT_ADDRESS(OS_BASE_CACHED | 0x00F8); // sync with OSLoMem.h
 u32 __OSCoreClock AT_ADDRESS(OS_BASE_CACHED | 0x00FC); // sync with OSLoMem.h
-#define OS_BUS_CLOCK (u32)__OSBusClock
+#define OS_BUS_CLOCK (u32) __OSBusClock
 #define OS_CORE_CLOCK __OSCoreClock
 #define OS_TIMER_CLOCK (OS_BUS_CLOCK / 4)
 
 #ifndef _DEBUG
-#define OSPhysicalToCached(paddr) ((void*)((u32)(paddr) + OS_BASE_CACHED))
+#define OSPhysicalToCached(paddr) ((void *)((u32)(paddr) + OS_BASE_CACHED))
-#define OSPhysicalToUncached(paddr) ((void*)((u32)(paddr) + OS_BASE_UNCACHED))
+#define OSPhysicalToUncached(paddr) ((void *)((u32)(paddr) + OS_BASE_UNCACHED))
-#define OSCachedToPhysical(caddr) ((u32)((u8*)(caddr)-OS_BASE_CACHED))
+#define OSCachedToPhysical(caddr) ((u32)((u8 *)(caddr)-OS_BASE_CACHED))
-#define OSUncachedToPhysical(ucaddr) ((u32)((u8*)(ucaddr)-OS_BASE_UNCACHED))
+#define OSUncachedToPhysical(ucaddr) ((u32)((u8 *)(ucaddr)-OS_BASE_UNCACHED))
-#define OSCachedToUncached(caddr) ((void*)((u8*)(caddr) + (OS_BASE_UNCACHED - OS_BASE_CACHED)))
+#define OSCachedToUncached(caddr) ((void *)((u8 *)(caddr) + (OS_BASE_UNCACHED - OS_BASE_CACHED)))
-#define OSUncachedToCached(ucaddr) ((void*)((u8*)(ucaddr) - (OS_BASE_UNCACHED - OS_BASE_CACHED)))
+#define OSUncachedToCached(ucaddr) ((void *)((u8 *)(ucaddr) - (OS_BASE_UNCACHED - OS_BASE_CACHED)))
 #else
-u32 OSPhysicalToCached(void* paddr);
+u32 OSPhysicalToCached(void *paddr);
-u32 OSPhysicalToUncached(void* paddr);
+u32 OSPhysicalToUncached(void *paddr);
-u32 OSCachedToPhysical(void* caddr);
+u32 OSCachedToPhysical(void *caddr);
-u32 OSUncachedToPhysical(void* ucaddr);
+u32 OSUncachedToPhysical(void *ucaddr);
-u32 OSCachedToUncached(void* caddr);
+u32 OSCachedToUncached(void *caddr);
-u32 OSUncachedToCached(void* ucaddr);
+u32 OSUncachedToCached(void *ucaddr);
 #endif
 
 #define OSTicksToCycles(ticks) (((ticks) * ((OS_CORE_CLOCK * 2) / OS_TIMER_CLOCK)) / 2)
@@ -60,14 +60,6 @@ u32 OSUncachedToCached(void* ucaddr);
 #define OSRoundUp32B(v) (((u32)(v + 31) & ~31))
 #define OSRoundDown32B(x) (((u32)(x)) & ~31)
 
-void* OSGetArenaHi(void);
-void* OSGetArenaLo(void);
-void OSSetArenaHi(void* newHi);
-void OSSetArenaLo(void* newLo);
-
-void* OSAllocFromArenaLo(u32 size, u32 align);
-void* OSAllocFromArenaHi(u32 size, u32 align);
-
 void OSInit();
 
 OSTime OSGetTime();
@@ -87,11 +79,11 @@ typedef struct OSCalendarTime {
     int usec; // microseconds after the millisecond [0,999]
 } OSCalendarTime;
 
-OSTime OSCalendarTimeToTicks(OSCalendarTime* td);
+OSTime OSCalendarTimeToTicks(OSCalendarTime *td);
-void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* td);
+void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime *td);
 
 typedef struct OSStopwatch {
-	char* name;
+    char *name;
     OSTime total;
     u32 hits;
     OSTime min;
@@ -100,12 +92,12 @@ typedef struct OSStopwatch {
     BOOL running;
 } OSStopwatch;
 
-void OSInitStopwatch(OSStopwatch* sw, char* name);
+void OSInitStopwatch(OSStopwatch *sw, char *name);
-void OSStartStopwatch(OSStopwatch* sw);
+void OSStartStopwatch(OSStopwatch *sw);
-void OSStopStopwatch(OSStopwatch* sw);
+void OSStopStopwatch(OSStopwatch *sw);
-OSTime OSCheckStopwatch(OSStopwatch* sw);
+OSTime OSCheckStopwatch(OSStopwatch *sw);
-void OSResetStopwatch(OSStopwatch* sw);
+void OSResetStopwatch(OSStopwatch *sw);
-void OSDumpStopwatch(OSStopwatch* sw);
+void OSDumpStopwatch(OSStopwatch *sw);
 
 #define OS_CONSOLE_MASK 0xf0000000
 #define OS_CONSOLE_RETAIL 0x00000000
@@ -159,7 +151,7 @@ void OSSetLanguage(u8 language);
 u32 OSGetEuRgb60Mode(void);
 void OSSetEuRgb60Mode(u32 on);
 
-void OSRegisterVersion(const char* id);
+void OSRegisterVersion(const char *id);
 
 BOOL OSDisableInterrupts(void);
 BOOL OSEnableInterrupts(void);
@@ -174,8 +166,7 @@ BOOL OSRestoreInterrupts(BOOL level);
 #endif
 
 #ifndef ASSERTMSG
-#if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__) || defined(__MWERKS__) ||           \
+#if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__) || defined(__MWERKS__) || defined(__SN__)
-    defined(__SN__)
 #define ASSERTMSG(exp, ...) (void)((exp) || (OSPanic(__FILE__, __LINE__, __VA_ARGS__), 0))
 #else
 #define ASSERTMSG(exp, msg) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg)), 0))
@@ -183,18 +174,15 @@ BOOL OSRestoreInterrupts(BOOL level);
 #endif
 
 #ifndef ASSERTMSG1
-#define ASSERTMSG1(exp, msg, param1)                                                               \
+#define ASSERTMSG1(exp, msg, param1) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1)), 0))
-  (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1)), 0))
 #endif
 
 #ifndef ASSERTMSG2
-#define ASSERTMSG2(exp, msg, param1, param2)                                                       \
+#define ASSERTMSG2(exp, msg, param1, param2) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1), (param2)), 0))
-  (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1), (param2)), 0))
 #endif
 
 #ifndef ASSERTMSG3
-#define ASSERTMSG3(exp, msg, param1, param2, param3)                                               \
+#define ASSERTMSG3(exp, msg, param1, param2, param3) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1), (param2), (param3)), 0))
-  (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg), (param1), (param2), (param3)), 0))
 #endif
 
 #ifndef ASSERTMSG4
@@ -209,8 +197,7 @@ BOOL OSRestoreInterrupts(BOOL level);
 #endif
 
 #ifndef ASSERTMSG
-#if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__) || defined(__MWERKS__) ||           \
+#if defined(__STDC_VERSION__) && (199901L <= __STDC_VERSION__) || defined(__MWERKS__) || defined(__SN__)
-    defined(__SN__)
 #define ASSERTMSG(exp, ...) ((void)0)
 #else
 #define ASSERTMSG(exp, msg) ((void)0)
@@ -232,9 +219,9 @@ BOOL OSRestoreInterrupts(BOOL level);
 
 #endif // _DEBUG
 
-void OSReport(const char* msg, ...);
+void OSReport(const char *msg, ...);
-void OSPanic(const char* file, int line, const char* msg, ...);
+void OSPanic(const char *file, int line, const char *msg, ...);
-void OSFatal(GXColor fg, GXColor bg, const char* msg);
+void OSFatal(GXColor fg, GXColor bg, const char *msg);
 
 u32 OSGetPhysicalMemSize(void);
 u32 OSGetConsoleSimulatedMemSize(void);
@@ -253,6 +240,7 @@ u32 OSGetConsoleSimulatedMemSize(void);
 #include <dolphin/os/OSExpansion.h>
 #include <dolphin/os/OSFastCast.h>
 #include <dolphin/os/OSFont.h>
+#include <dolphin/os/OSIC.h>
 #include <dolphin/os/OSInterrupt.h>
 #include <dolphin/os/OSMemory.h>
 #include <dolphin/os/OSMessage.h>

include/dolphin/os/OSAlarm.h

@@ -1,6 +1,7 @@
 #ifndef _DOLPHIN_OSALARM
 #define _DOLPHIN_OSALARM
 
+#include <dolphin/os.h>
 #include <dolphin/os/OSContext.h>
 #include <types.h>
 

include/dolphin/os/OSAlloc.h

@@ -7,19 +7,18 @@
 extern "C" {
 #endif
 typedef int OSHeapHandle;
-typedef void (*OSAllocVisitor)(void* obj, u32 size);
+typedef void (*OSAllocVisitor)(void *obj, u32 size);
-void* OSInitAlloc(void* arenaStart, void* arenaEnd, int maxHeaps);
+void *OSInitAlloc(void *arenaStart, void *arenaEnd, int maxHeaps);
-OSHeapHandle OSCreateHeap(void* start, void* end);
+OSHeapHandle OSCreateHeap(void *start, void *end);
 void OSDestroyHeap(OSHeapHandle heap);
-void OSAddToHeap(OSHeapHandle heap, void* start, void* end);
+void OSAddToHeap(OSHeapHandle heap, void *start, void *end);
 OSHeapHandle OSSetCurrentHeap(OSHeapHandle heap);
-void* OSAllocFromHeap(OSHeapHandle heap, u32 size);
+void *OSAllocFromHeap(OSHeapHandle heap, u32 size);
-void* OSAllocFixed(void** rstart, void** rend);
+void *OSAllocFixed(void **rstart, void **rend);
-void OSFreeToHeap(OSHeapHandle heap, void* ptr);
+void OSFreeToHeap(OSHeapHandle heap, void *ptr);
 long OSCheckHeap(OSHeapHandle heap);
 void OSDumpHeap(OSHeapHandle heap);
-void *OSAllocFixed(void **rstart, void **rend);
+u32 OSReferentSize(void *ptr);
-u32 OSReferentSize(void* ptr);
 void OSVisitAllocated(OSAllocVisitor visitor);
 extern volatile OSHeapHandle __OSCurrHeap;
 #define OSAlloc(size) OSAllocFromHeap(__OSCurrHeap, (size))

include/dolphin/os/OSBootInfo.h

@@ -4,7 +4,7 @@
 #include "dolphin/DVDPriv.h"
 #include "dolphin/types.h"
 
-typedef struct OSBootInfo {
+typedef struct OSBootInfo_s {
   DVDDiskID DVDDiskID;
   u32 magic;
   u32 version;

include/dolphin/os/OSContext.h

@@ -158,10 +158,16 @@ typedef struct OSContext {
 
 } OSContext;
 
+u32 OSGetStackPointer(void);
+void OSDumpContext(OSContext *context);
 u32 OSSaveContext(OSContext* context);
+void OSLoadContext(OSContext* context);
 void OSClearContext(OSContext* context);
 OSContext* OSGetCurrentContext();
 void OSSetCurrentContext(OSContext* context);
+void OSSaveFPUContext(OSContext *fpuContext);
+void OSInitContext(OSContext *context, u32 pc, u32 newsp);
+
 
 #ifdef __cplusplus
 }

include/dolphin/os/OSFont.h

@@ -9,17 +9,44 @@ extern "C" {
 
 #define OS_FONT_ENCODE_ANSI 0u
 #define OS_FONT_ENCODE_SJIS 1u
-#define OS_FONT_ENCODE_UTF8 3u  // UTF-8 [RFC 3629]
+#define OS_FONT_SIZE_ANSI (288 + 131072)    // 9 sheets
-#define OS_FONT_ENCODE_UTF16 4u // UTF-16BE [RFC 2781]
+#define OS_FONT_SIZE_SJIS (3840 + 1179648)  // 1 sheet
-#define OS_FONT_ENCODE_UTF32 5u // UTF-32
+#define OS_FONT_ROM_SIZE_ANSI 0x03000
-#define OS_FONT_ENCODE_MAX 5u
+#define OS_FONT_ROM_SIZE_SJIS 0x4D000
-#define OS_FONT_ENCODE_VOID 0xffffu
 
-#define OS_FONT_PROPORTIONAL FALSE
+typedef struct OSFontHeader
-#define OS_FONT_FIXED TRUE
+{
+    /*0x00*/ u16 fontType;
+             u16 firstChar;
+             u16 lastChar;
+             u16 invalChar;
+    /*0x08*/ u16 ascent;
+             u16 descent;
+             u16 width;
+             u16 leading;
+    /*0x10*/ u16 cellWidth;
+             u16 cellHeight;
+    /*0x14*/ u32 sheetSize;
+    /*0x18*/ u16 sheetFormat;
+             u16 sheetColumn;
+             u16 sheetRow;
+             u16 sheetWidth;
+    /*0x20*/ u16 sheetHeight;
+             u16 widthTable;
+             u32 sheetImage;
+             u32 sheetFullSize;
+             u8 c0;
+             u8 c1;
+             u8 c2;
+             u8 c3;
+} OSFontHeader;
 
 u16 OSGetFontEncode(void);
-u16 OSSetFontEncode(u16 encode);
+BOOL OSInitFont(OSFontHeader *fontData);
+u32 OSLoadFont(OSFontHeader *fontData, void *temp);
+char *OSGetFontTexture(char *string, void **image, s32 *x, s32 *y, s32 *width);
+char *OSGetFontWidth(char *string, s32 *width);
+char *OSGetFontTexel(char *string, void *image, s32 pos, s32 stride, s32 *width);
 
 #ifdef __cplusplus
 }

include/dolphin/os/OSIC.h

@@ -0,0 +1,20 @@
+#ifndef _DOLPHIN_OSIC
+#define _DOLPHIN_OSIC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ICFlashInvalidate(void);
+void ICEnable(void);
+void ICDisable(void);
+void ICFreeze(void);
+void ICUnfreeze(void);
+void ICBlockInvalidate(void *addr);
+void ICSync(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/dolphin/os/OSModule.h

@@ -105,8 +105,8 @@ BOOL OSUnlink(OSModuleInfo* oldModule);
 OSModuleInfo* OSSearchModule(void* ptr, u32* section, u32* offset);
 
 // debugger notification
-void OSNotifyLink(OSModuleInfo* module);
+void OSNotifyLink(void);
-void OSNotifyUnlink(OSModuleInfo* module);
+void OSNotifyUnlink(void);
 
 #ifdef __cplusplus
 }

include/dolphin/os/OSPriv.h

@@ -7,10 +7,42 @@
 extern "C" {
 #endif
 
+#define OFFSET(addr, align) (((u32)(addr) & ((align)-1)))
+
+// OSAudioSystem.c
+void __OSInitAudioSystem(void);
+void __OSStopAudioSystem(void);
+
+// OSCache.c
+void __OSCacheInit(void);
+
+// OSContext.c
+void __OSContextInit(void);
+
+// OSMutex.c
+void __OSUnlockAllMutex(struct OSThread *thread);
+
+// OSInterrupt.c
+extern void __RAS_OSDisableInterrupts_begin(void);
+extern void __RAS_OSDisableInterrupts_end(void);
+void __OSInterruptInit(void);
+void __OSModuleInit(void);
+
+void __OSInitSystemCall(void);
+
+// OSThread.c
+void __OSThreadInit(void);
+void __OSReschedule(void);
+
+typedef void (*OSExceptionHandler)(__OSException, OSContext*);
+OSExceptionHandler __OSSetExceptionHandler(__OSException exception, OSExceptionHandler handler);
 __OSExceptionHandler __OSGetExceptionHandler(__OSException exception);
 OSTime __OSGetSystemTime();
 OSTime __OSTimeToSystemTime(OSTime);
 
+// OSReboot
+void __OSReboot(u32 resetCode, u32 bootDol);
+
 #ifdef __cplusplus
 }
 #endif

include/dolphin/os/OSReset.h

@@ -39,6 +39,7 @@ struct OSResetFunctionInfo {
   OSResetFunctionInfo* prev;
 };
 
+void OSRegisterResetFunction(OSResetFunctionInfo *info);
 u32 OSGetResetCode(void);
 
 #ifdef __cplusplus

include/math.h

@@ -10,15 +10,17 @@
 #ifdef __MWERKS__
 extern inline float sqrtf(float x)
 {
+    static const double _half = .5;
+    static const double _three = 3.0;
     volatile float y;
-	if(x > 0.0f)
+    if (x > 0.0f)
     {
         double guess = __frsqrte((double)x);   // returns an approximation to
-		guess = 0.5*guess*(3.0 - guess*guess*x);  // now have 12 sig bits
+        guess = _half*guess*(_three - guess*guess*x);  // now have 12 sig bits
-		guess = 0.5*guess*(3.0 - guess*guess*x);  // now have 24 sig bits
+        guess = _half*guess*(_three - guess*guess*x);  // now have 24 sig bits
-		guess = 0.5*guess*(3.0 - guess*guess*x);  // now have 32 sig bits
+        guess = _half*guess*(_three - guess*guess*x);  // now have 32 sig bits
-		y=(float)(x*guess);
+        y = (float)(x*guess);
-		return y;
+        return y ;
     }
     return x;
 }

include/msm/msmfio.h

@@ -0,0 +1,19 @@
+#ifndef MSMFIO_H
+#define MSMFIO_H
+
+#include "dolphin.h"
+#include "dolphin/types.h"
+#include "game/msm.h"
+
+struct msmFio {
+    MSM_OPEN open;
+    MSM_READ read;
+    MSM_CLOSE close;
+};
+
+BOOL msmFioClose(DVDFileInfo *fileInfo);
+BOOL msmFioRead(DVDFileInfo *fileInfo, void *addr, s32 length, s32 offset);
+BOOL msmFioOpen(s32 entrynum, DVDFileInfo *fileInfo);
+void msmFioInit(MSM_OPEN open, MSM_READ read, MSM_CLOSE close);
+
+#endif

include/msm/msmmem.h

@@ -3,8 +3,8 @@
 
 #include "dolphin/types.h"
 
-void msmMemFree(void*);
+void msmMemFree(void *);
-void* msmMemAlloc(s32);
+void *msmMemAlloc(u32);
-void msmMemInit(void*, u32);
+void msmMemInit(void *, u32);
 
 #endif

include/msm/msmmus.h

@@ -0,0 +1,10 @@
+#ifndef MSMMUS_H
+#define MSMMUS_H
+
+#include "dolphin.h"
+#include "dolphin/types.h"
+
+s32 msmMusInit(s32 *, DVDFileInfo *);
+void msmMusPeriodicProc(void);
+
+#endif

include/msm/msmse.h

@@ -0,0 +1,10 @@
+#ifndef MSMSE_H
+#define MSMSE_H
+
+#include "dolphin.h"
+#include "dolphin/types.h"
+
+s32 msmSeInit(s32 *, DVDFileInfo *);
+void msmSePeriodicProc(void);
+
+#endif

include/msm/msmstream.h

@@ -0,0 +1,12 @@
+#ifndef MSMSTREAM_H
+#define MSMSTREAM_H
+
+#include "dolphin/types.h"
+
+void msmStreamPeriodicProc(void);
+void msmStreamSetOutputMode(s8);
+void msmStreamAmemFree(void);
+s32 msmStreamAmemAlloc(void);
+s32 msmStreamInit(char *);
+
+#endif

include/rel_sqrt_consts.h

@@ -1,8 +0,0 @@
-#ifndef _REL_SQRT_CONSTS
-#define _REL_SQRT_CONSTS
-
-const double __fakeHalf = 0.5;
-const double __fakeThree = 3.0;
-
-
-#endif

src/OdemuExi2/DebuggerDriver.c

@@ -0,0 +1,327 @@
+#include <dolphin/exi.h>
+#include <dolphin/hw_regs.h>
+#include <dolphin/os.h>
+
+
+typedef void (*MTRCallbackType)(int);
+
+static MTRCallbackType MTRCallback;
+
+static void (*DBGCallback)(u32, OSContext *);
+
+static u32 SendMailData;
+
+static s32 RecvDataLeng;
+
+static u8 *pEXIInputFlag;
+
+static u8 EXIInputFlag;
+
+static u8 SendCount = 0x80;
+
+#define IS_TRUE(x) ((x) != FALSE)
+#define IS_FALSE(x) !IS_TRUE(x)
+#define ROUND_UP(x, align) (((x) + (align)-1) & (-(align)))
+
+// TODO
+
+void DBGEXIInit()
+{
+    __OSMaskInterrupts(0x18000);
+    __EXIRegs[10] = 0;
+}
+
+static u32 DBGEXISelect(u32 v)
+{
+    u32 regs = __EXIRegs[10];
+    regs &= 0x405;
+    regs |= 0x80 | (v << 4);
+    __EXIRegs[10] = regs;
+    return TRUE;
+}
+
+BOOL DBGEXIDeselect(void)
+{
+    __EXIRegs[10] &= 0x405;
+    return TRUE;
+}
+
+static BOOL DBGEXISync()
+{
+    while (__EXIRegs[13] & 1)
+        ;
+
+    return TRUE;
+}
+
+static BOOL DBGEXIImm(void *buffer, s32 bytecounter, u32 write)
+{
+    u8 *tempPointer;
+    u32 writeOutValue;
+    int i;
+
+    if (write) {
+        tempPointer = buffer;
+        writeOutValue = 0;
+        for (i = 0; i < bytecounter; i++) {
+            u8 *temp = ((u8 *)buffer) + i;
+            writeOutValue |= *temp << ((3 - i) << 3);
+        }
+        __EXIRegs[14] = writeOutValue;
+    }
+
+    __EXIRegs[13] = 1 | write << 2 | (bytecounter - 1) << 4;
+    DBGEXISync();
+
+    if (!write) {
+        writeOutValue = __EXIRegs[14];
+        tempPointer = buffer;
+        for (i = 0; i < bytecounter; i++) {
+            *tempPointer++ = writeOutValue >> ((3 - i) << 3);
+        }
+    }
+
+    return TRUE;
+}
+
+static BOOL DBGWriteMailbox(u32 p1)
+{
+    u32 cmd = 0xc0000000;
+    u32 v;
+    u32 base = p1;
+    BOOL total = FALSE;
+
+    DBGEXISelect(4);
+    v = (base & 0x1fffffff) | (cmd);
+    total |= IS_FALSE(DBGEXIImm(&v, sizeof(v), 1));
+    total |= IS_FALSE(DBGEXISync());
+    total |= IS_FALSE(DBGEXIDeselect());
+
+    return IS_FALSE(total);
+}
+
+#pragma dont_inline on
+
+static BOOL DBGReadMailbox(u32 *p1)
+{
+    BOOL total = FALSE;
+    u32 v;
+
+    DBGEXISelect(4);
+
+    v = 0x60000000;
+    total |= IS_FALSE(DBGEXIImm(&v, 2, 1));
+    total |= IS_FALSE(DBGEXISync());
+
+    total |= IS_FALSE(DBGEXIImm(p1, 4, 0));
+    total |= IS_FALSE(DBGEXISync());
+
+    total |= IS_FALSE(DBGEXIDeselect());
+
+    return IS_FALSE(total);
+}
+#pragma dont_inline off
+
+static BOOL DBGRead(u32 count, u32 *buffer, s32 param3)
+{
+    BOOL total = FALSE;
+    u32 *buf_p = (u32 *)buffer;
+    u32 v1;
+    u32 v;
+
+    DBGEXISelect(4);
+
+    v1 = (count & 0x1fffc) << 8 | 0x20000000;
+    total |= IS_FALSE(DBGEXIImm(&v1, sizeof(v1), 1));
+    total |= IS_FALSE(DBGEXISync());
+
+    while (param3) {
+        total |= IS_FALSE(DBGEXIImm(&v, sizeof(v), 0));
+        total |= IS_FALSE(DBGEXISync());
+
+        *buf_p++ = v;
+
+        param3 -= 4;
+        if (param3 < 0) {
+            param3 = 0;
+        }
+    }
+
+    total |= IS_FALSE(DBGEXIDeselect());
+    return IS_FALSE(total);
+}
+
+static BOOL DBGWrite(u32 count, void *buffer, s32 param3)
+{
+    BOOL total = FALSE;
+    u32 *buf_p = (u32 *)buffer;
+    u32 v1;
+    u32 v;
+
+    DBGEXISelect(4);
+
+    v1 = (count & 0x1fffc) << 8 | 0xa0000000;
+    total |= IS_FALSE(DBGEXIImm(&v1, sizeof(v1), 1));
+    total |= IS_FALSE(DBGEXISync());
+
+    while (param3 != 0) {
+        v = *buf_p++;
+
+        total |= IS_FALSE(DBGEXIImm(&v, sizeof(v), 1));
+        total |= IS_FALSE(DBGEXISync());
+
+        param3 -= 4;
+        if (param3 < 0) {
+            param3 = 0;
+        }
+    }
+
+    total |= IS_FALSE(DBGEXIDeselect());
+    return IS_FALSE(total);
+}
+
+static BOOL _DBGReadStatus(u32 *p1)
+{
+    BOOL total = FALSE;
+    u32 v;
+
+    DBGEXISelect(4);
+
+    v = 1 << 30;
+    total |= IS_FALSE(DBGEXIImm(&v, 2, 1));
+    total |= IS_FALSE(DBGEXISync());
+
+    total |= IS_FALSE(DBGEXIImm(p1, 4, 0));
+    total |= IS_FALSE(DBGEXISync());
+
+    total |= IS_FALSE(DBGEXIDeselect());
+
+    return IS_FALSE(total);
+}
+
+static BOOL DBGReadStatus(u32 *p1)
+{
+    return _DBGReadStatus(p1);
+}
+
+static void MWCallback(u32 a, OSContext *b)
+{
+    EXIInputFlag = TRUE;
+    if (MTRCallback) {
+        MTRCallback(0);
+    }
+}
+
+static void DBGHandler(s16 a, OSContext *b)
+{
+    *__PIRegs = 0x1000;
+    if (DBGCallback) {
+        DBGCallback(a, b);
+    }
+}
+
+void DBInitComm(u8 **a, MTRCallbackType b)
+{
+    BOOL interrupts = OSDisableInterrupts();
+    {
+        pEXIInputFlag = (u8 *)EXIInputFlag;
+        pEXIInputFlag = &EXIInputFlag;
+
+        *a = pEXIInputFlag;
+
+        MTRCallback = b;
+
+        DBGEXIInit();
+    }
+    OSRestoreInterrupts(interrupts);
+}
+
+void DBInitInterrupts(void)
+{
+    __OSMaskInterrupts(0x18000);
+    __OSMaskInterrupts(0x40);
+    DBGCallback = &MWCallback;
+    __OSSetInterruptHandler(0x19, DBGHandler);
+    __OSUnmaskInterrupts(0x40);
+}
+
+static void CheckMailBox(void)
+{
+    u32 v;
+    DBGReadStatus(&v);
+    if (v & 1) {
+        DBGReadMailbox(&v);
+        v &= 0x1fffffff;
+
+        if ((v & 0x1f000000) == 0x1f000000) {
+            SendMailData = v;
+            RecvDataLeng = v & 0x7fff;
+            EXIInputFlag = 1;
+        }
+    }
+}
+
+u32 DBQueryData(void)
+{
+    BOOL interrupts;
+    EXIInputFlag = 0;
+    if (!RecvDataLeng) {
+        interrupts = OSDisableInterrupts();
+        CheckMailBox();
+    }
+    OSRestoreInterrupts(interrupts);
+    return RecvDataLeng;
+}
+
+BOOL DBRead(u32 *buffer, s32 count)
+{
+    u32 interrupts = OSDisableInterrupts();
+    u32 v = SendMailData & 0x10000 ? 0x1000 : 0;
+
+    DBGRead(v + 0x1e000, buffer, ROUND_UP(count, 4));
+
+    RecvDataLeng = 0;
+    EXIInputFlag = 0;
+
+    OSRestoreInterrupts(interrupts);
+
+    return 0;
+}
+
+BOOL DBWrite(void *src, u32 size)
+{
+    u32 v;
+    u32 busyFlag;
+    BOOL interrupts = OSDisableInterrupts();
+
+    do {
+        _DBGReadStatus(&busyFlag);
+    } while (busyFlag & 2);
+
+    SendCount++;
+    v = ((SendCount & 1) ? 0x1000 : 0);
+
+    while (!DBGWrite(v | 0x1c000, src, ROUND_UP(size, 4)))
+        ;
+
+    do {
+        _DBGReadStatus(&busyFlag);
+    } while (busyFlag & 2);
+
+    v = SendCount;
+    while (!DBGWriteMailbox((0x1f000000) | v << 0x10 | size))
+        ;
+
+    do {
+        while (!_DBGReadStatus(&busyFlag))
+            ;
+    } while (busyFlag & 2);
+
+    OSRestoreInterrupts(interrupts);
+
+    return 0;
+}
+
+void DBOpen(void) { }
+
+void DBClose(void) { }

src/REL/E3setupDLL/mgselect.c

@@ -6,7 +6,6 @@
 #include "game/sprite.h"
 #include "game/window.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/E3SetupDLL.h"
 
@@ -143,8 +142,6 @@ static float cursorYOfsTbl[] = { -100.0f, -50.0f, 0.0f, 50.0f, 100.0f };
 
 static s32 mgPicTbl[] = { 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52 };
 
-static char startText[] = "\013\016\r PRESS START";
-
 static void StartMGSelect(omObjData *object)
 {
     HuAudSeqPlay(0x2B);
@@ -491,12 +488,12 @@ static void CreateMGInterface(omObjData *object)
     index = HuSprCreate(temp_r3_2, 0x271A, 0);
     HuSprGrpMemberSet(group, 0, index);
     index2++;
-    HuWinMesMaxSizeGet(1, sp8, &startText);
+    HuWinMesMaxSizeGet(1, sp8, "\013\016\r PRESS START");
     index = HuWinCreate(340.0f, 362.0f, sp8[0], sp8[1], 0);
     unkStruct->unk_2C = index;
     HuWinMesColSet(index, 0);
     HuWinBGTPLvlSet(index, 0.0f);
     HuWinMesSpeedSet(index, 0);
-    HuWinMesSet(index, MAKE_MESSID_PTR(startText));
+    HuWinMesSet(index, MAKE_MESSID_PTR("\013\016\r PRESS START"));
     object->func = UpdateMGInterface;
 }

src/REL/_minigameDLL/_minigameDLL.c

@@ -1,6 +1,6 @@
 #include "REL/executor.h"
 #include "dolphin/os.h"
-#include "rel_sqrt_consts.h"
+#include "math.h"
 
 void ObjectSetup(void) {
     OSReport("minigame dll setup\n");

src/REL/board_executor.c

@@ -1,5 +1,5 @@
 #include "REL/board_executor.h"
-#include "rel_sqrt_consts.h"
+#include "math.h"
 
 static void ObjectSetup(void) {
     BoardObjectSetup(BoardCreate, BoardDestroy);

src/REL/bootDll/main.c

@@ -15,7 +15,6 @@
 #include "game/wipe.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
 
 #include "data_num/title.h"
 

src/REL/instDll/main.c

@@ -21,8 +21,6 @@
 #include "ext_math.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 #include "REL/instDll.h"
 
 static s16 lbl_1_data_0 = 1;

src/REL/m401Dll/main.c

@@ -17,8 +17,6 @@
 #include "ext_math.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 float lbl_2_data_0 = -7.1875f;
 
 s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 };

src/REL/m402Dll/main.c

@@ -22,7 +22,6 @@
 
 #include "dolphin.h"
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))

src/REL/m403Dll/main.c

@@ -17,7 +17,6 @@
 #include "game/wipe.h"
 
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 typedef struct {
     /* 0x000 */ u8 unk00;

src/REL/m404Dll/main.c

@@ -10,7 +10,7 @@
 #include "game/pad.h"
 #include "game/sprite.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
+
 #include "string.h"
 
 typedef struct UnkM404Struct {

src/REL/m405Dll/main.c

@@ -22,7 +22,6 @@
 
 #include "dolphin.h"
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))

src/REL/m406Dll/main.c

@@ -5,7 +5,6 @@
 #include "game/hsfdraw.h"
 #include "game/minigame_seq.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m406Dll.h"
 

src/REL/m407dll/player.c

@@ -8,8 +8,6 @@
 #include "game/process.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 typedef void (*ObjFuncs)(omObjData *);
 

src/REL/m408Dll/main.c

@@ -19,8 +19,6 @@
 #include "ext_math.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 s32 lbl_1_data_0[] = {
     DATA_MAKE_NUM(DATADIR_MGCONST, 0x00),
     DATA_MAKE_NUM(DATADIR_MGCONST, 0x01),

src/REL/m409Dll/main.c

@@ -11,7 +11,6 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 #include "math.h"
-#include "rel_sqrt_consts.h"
 
 // bss
 Process *lbl_1_bss_E8;

src/REL/m410Dll/main.c

@@ -5,7 +5,6 @@
 #include "game/minigame_seq.h"
 #include "game/object.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m410Dll.h"
 
@@ -188,7 +187,6 @@ void fn_1_63C(omObjData *object)
             break;
     }
     var_r31->unk_04 = 0;
-	
 }
 
 void fn_1_7A8(omObjData *object)
@@ -263,8 +261,6 @@ void fn_1_FF0(omObjData *object)
         default:
             break;
     }
-
-    
 }
 
 void fn_1_139C(omObjData *object)

src/REL/m411Dll/main.c

@@ -18,7 +18,6 @@
 
 #include "dolphin.h"
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 typedef struct {
     /* 0x00 */ s16 unk00;

src/REL/m412Dll/main.c

@@ -12,7 +12,6 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 #include "math.h"
-#include "rel_sqrt_consts.h"
 
 // bss
 s16 lbl_1_bss_7A0;

src/REL/m413Dll/main.c

@@ -14,8 +14,6 @@
 
 #include "ext_math.h"
 
-#include "rel_sqrt_consts.h"
-
 typedef struct struct_bss_2A6C StructBss2A6C;
 
 typedef struct struct_sp_14C8 StructSp14C8;

src/REL/m414Dll/main.c

@@ -9,7 +9,6 @@
 #include "game/pad.h"
 #include "game/sprite.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 typedef struct UnkM414Struct {
     s32 unk00;

src/REL/m415Dll/main.c

@@ -15,7 +15,6 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 #include "math.h"
-#include "rel_sqrt_consts.h"
 
 // bss
 unkStruct5 lbl_1_bss_36C;

src/REL/m416Dll/main.c

@@ -17,8 +17,6 @@
 
 #include "REL/m416Dll.h"
 
-#include "rel_sqrt_consts.h"
-
 typedef struct camera_view_params {
     float zoom;
     Vec pos;

src/REL/m417Dll/main.c

@@ -3,7 +3,6 @@
 #include "game/hsfdraw.h"
 #include "game/minigame_seq.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m417Dll.h"
 

src/REL/m420dll/main.c

@@ -7,7 +7,6 @@
 #include "game/pad.h"
 #include "game/printfunc.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m420dll.h"
 

src/REL/m426Dll/main.c

@@ -10,7 +10,7 @@
 #include "game/pad.h"
 #include "game/sprite.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
+#include "string.h"
 
 typedef struct UnkM426Struct {
     /* 0x00 */ s32 unk_00;
@@ -677,7 +677,7 @@ void fn_1_117C(omObjData *object)
     fn_1_16F8(var_r31->unk_04[0]);
 }
 
-void fn_1_11EC(omObjData *object) // TODO this probably gets inlined
+void fn_1_11EC(omObjData *object)
 {
     s32 var_r30;
     UnkM426Struct *var_r29;
@@ -779,6 +779,7 @@ void fn_1_125C(omObjData *object)
     object->func = NULL;
 }
 
+// TODO https://decomp.me/scratch/1aZdv
 void fn_1_16F8(omObjData *object)
 {
     s32 spA8[3];
@@ -825,7 +826,7 @@ void fn_1_16F8(omObjData *object)
     }
     if (var_r31->unk_14) {
         sp20 = sp1C = 0.0f;
-        sp10 = var_r21 = 0;
+        sp10 = 0;
         fn_1_2F5C(object, &sp20, &sp1C, &sp10);
     }
     else {
@@ -849,7 +850,7 @@ void fn_1_16F8(omObjData *object)
                     if (!lbl_1_bss_40) {
                         sp20 = sp1C = 0.0f;
 
-                        sp10 = var_r21 = 0;
+                        sp10 = 0;
                     }
                     if (fabs(sp20) > 8.0) {
                         var_f30 = 0.25f * sp20;
@@ -958,7 +959,6 @@ void fn_1_16F8(omObjData *object)
                     else {
                         if (fabs(sp20) > 8.0 || fabs(sp1C) > 8.0) {
                             var_f26 = atan2d(sp20, -sp1C);
-                            var_f26 = var_f26;
                         }
                         else {
                             var_f26 = object->rot.y;
@@ -1124,7 +1124,7 @@ void fn_1_16F8(omObjData *object)
                 var_r31->unk_34 = var_r31->unk_34 ^ 1;
             }
         }
-        if (((var_r21 = var_r31->unk_24) == 0 || var_r31->unk_24 == 1 || var_r31->unk_24 == 2) && var_r31->unk_30) {
+        if ((var_r31->unk_24 == 0 || var_r31->unk_24 == 1 || var_r31->unk_24 == 2) && var_r31->unk_30) {
             if (var_r31->unk_30) {
                 var_r31->unk_30 = var_r31->unk_30 - 1;
             }
@@ -1137,6 +1137,7 @@ void fn_1_16F8(omObjData *object)
         }
         Hu3DModelTPLvlSet(var_r24, 1.0f);
     }
+    (void)var_r21;
 }
 
 Vec lbl_1_data_200[2] = {
@@ -1203,22 +1204,10 @@ void fn_1_2AC8(omObjData *object)
 
 void fn_1_2ADC(void)
 {
-    omObjData *var_r31;
     s32 var_r30;
-    s32 var_r29;
-    UnkM426Struct *var_r27;
-    omObjData *var_r28;
 
     for (var_r30 = 0; var_r30 < 2; var_r30++) {
-        var_r31 = lbl_1_bss_8C[var_r30];
+        fn_1_11EC(lbl_1_bss_8C[var_r30]);
-        var_r27 = var_r31->data;
-        for (var_r29 = 0; var_r29 < 2; var_r29++) {
-            var_r28 = var_r27->unk_04[var_r29];
-            var_r28->data = 0;
-            var_r28->func = 0;
-        }
-        var_r31->data = NULL;
-        var_r31->func = NULL;
     }
 }
 
@@ -1742,8 +1731,7 @@ void fn_1_3EFC(omObjData *object)
 void fn_1_45FC(omObjData *object)
 {
     fn_1_8E10(lbl_1_bss_24);
-    object->data = NULL;
+    fn_1_2AC8(object);
-    object->func = NULL;
 }
 
 void fn_1_4644(void)
@@ -2134,20 +2122,17 @@ void fn_1_5134(omObjData *object)
 
 void fn_1_5B34(omObjData *object)
 {
-    object->data = NULL;
+    fn_1_2AC8(object);
-    object->func = NULL;
 }
 
 void fn_1_5B48(void)
 {
-    omObjData *var_r31;
+    fn_1_5B34(lbl_1_bss_74);
-
-    var_r31 = lbl_1_bss_74;
-    fn_1_5B34(var_r31);
     lbl_1_bss_74 = NULL;
 }
 
-void fn_1_5B88(s32 arg0) // probably gets inlined
+// unused
+void fn_1_5B88(s32 arg0)
 {
     UnkM426Struct4 *var_r31;
     s32 var_r28;

src/REL/m429Dll/main.c

@@ -21,7 +21,6 @@
 #include "game/sprite.h"
 
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))

src/REL/m431Dll/main.c

@@ -16,8 +16,6 @@
 
 #include "REL/m431Dll.h"
 
-#include "rel_sqrt_consts.h"
-
 typedef struct bss_5C_struct {
     s16 unk0[6];
     s16 unkC[2];

src/REL/m434Dll/main.c

@@ -6,15 +6,12 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 
-
 #include "REL/m434Dll.h"
 #include "ext_math.h"
 #include "game/gamework_data.h"
 #include "game/minigame_seq.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 typedef struct camera_view {
     float zoom;
     Vec pos;

src/REL/m437Dll/main.c

@@ -16,7 +16,7 @@
 #include "game/wipe.h"
 
 #include "dolphin.h"
-#include "rel_sqrt_consts.h"
+#include "math.h"
 #include "string.h"
 
 typedef struct {
@@ -1716,7 +1716,6 @@ void fn_1_6580(s32 arg0, s32 arg1, s32 arg2)
 
 float lbl_1_data_188 = -1.0f;
 
-// TODO: https://decomp.me/scratch/dek39
 void fn_1_65E0(omObjData *arg0)
 {
     Mtx sp60;
@@ -1835,7 +1834,8 @@ void fn_1_65E0(omObjData *arg0)
             break;
     }
     if ((temp_r31->unk0C == 4 || temp_r31->unk0C == 7) && temp_r31->unk10 == 0) {
-        Hu3DModelObjMtxGet(lbl_1_bss_8FC.unk00->model[0], "m437a01-chara-point", sp60);
+        StructBss8FC *temp = &lbl_1_bss_8FC;
+        Hu3DModelObjMtxGet(temp->unk00->model[0], "m437a01-chara-point", sp60);
         arg0->trans.y = sp60[1][3];
     }
 }

src/REL/m438Dll/main.c

@@ -9,7 +9,6 @@
 #include "game/pad.h"
 #include "game/sprite.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m438Dll.h"
 

src/REL/m439Dll/main.c

@@ -20,8 +20,6 @@
 
 #include "ext_math.h"
 
-#include "rel_sqrt_consts.h"
-
 #include "REL/m439data.h"
 
 typedef struct camera_params {

src/REL/m440Dll/main.c

@@ -12,7 +12,7 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 #include "math.h"
-#include "rel_sqrt_consts.h"
+
 #include "string.h"
 
 // bss

src/REL/m441Dll/main.c

@@ -21,7 +21,6 @@
 #include "game/sprite.h"
 
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 #undef ABS
 #define ABS(x) ((0 > (x)) ? -(x) : (x))

src/REL/m442Dll/main.c

@@ -12,7 +12,6 @@
 #include "game/pad.h"
 #include "game/sprite.h"
 #include "game/wipe.h"
-#include "rel_sqrt_consts.h"
 
 #include "REL/m442Dll.h"
 

src/REL/m443Dll/main.c

@@ -11,7 +11,7 @@
 #include "game/sprite.h"
 #include "game/wipe.h"
 #include "math.h"
-#include "rel_sqrt_consts.h"
+
 #include "string.h"
 
 #ifndef __MWERKS__
@@ -806,7 +806,6 @@ void fn_1_3770(omObjData *arg0)
     s32 var_r30;
     s32 var_r29;
     M443DllCameraStruct *var_r28;
-    omObjData *var_r27;
     s32 var_r26;
     u32 var_r25;
     s32 var_r24;

src/REL/m444dll/main.c

@@ -19,8 +19,6 @@
 #include "ext_math.h"
 #include "math.h"
 
-#include "rel_sqrt_consts.h"
-
 typedef struct camera_view_params {
     Vec rot;
     Vec pos;

src/REL/m445Dll/main.c

@@ -18,7 +18,6 @@
 
 #include "dolphin.h"
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 typedef struct {
     /* 0x00 */ s16 unk00;

src/REL/m446Dll/main.c

@@ -1,5 +1,5 @@
 #include "REL/m446Dll.h"
-#include "rel_sqrt_consts.h"
+#include "math.h"
 
 #include "game/audio.h"
 #include "game/frand.h"

src/REL/m447dll/main.c

@@ -11,7 +11,7 @@
 #include "game/window.h"
 #include "game/wipe.h"
 
-#include "rel_sqrt_consts.h"
+#include "math.h"
 
 typedef struct {
     /* 0x00 */ s16 unk00;

src/REL/m448Dll/main.c

@@ -20,7 +20,6 @@
 
 #include "dolphin.h"
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 typedef struct {
     /* 0x00 */ s32 unk00;

src/REL/m450Dll/main.c

@@ -31,7 +31,6 @@
 #include "game/sprite.h"
 
 #include "ext_math.h"
-#include "rel_sqrt_consts.h"
 
 #include "game/window.h"
 #include "string.h"
@@ -930,7 +929,7 @@ void fn_1_2C1C(WorkPlayerOld *player, omObjData *obj, s32 arg2, s32 arg3, s32 *a
     player->unk_10 = NULL;
     player->unk_50 = NULL;
     player->unk_64 = 0;
-    player->unk_68 = 0;
+    player->unk_68 = NULL;
     player->unk_38 = 0;
     player->unk_3C = 0;
     player->unk_44 = arg5;
@@ -978,7 +977,7 @@ void fn_1_2DC8(WorkPlayerOld *player, s32 count, Vec *data)
 void fn_1_2DD4(WorkPlayerOld *player)
 {
     omSetTra(player->unk_00, player->unk_6C.x, player->unk_6C.y, player->unk_6C.z);
-    omSetRot(player->unk_00, 0, player->unk_9C, 0);
+    omSetRot(player->unk_00, 0.0f, player->unk_9C, 0.0f);
 }
 
 void fn_1_2E34(WorkPlayerOld *player)
@@ -1123,12 +1122,7 @@ void fn_1_3CE0(WorkPlayerOld *player, s32 *state, u32 *motAttr)
     }
 
     if (player->unk_14[3] >= 0 && (player->unk_28 & 0x100)) {
-        player->unk_38 = 1;
+        fn_1_2BD0(player, 26.766666f, 1.0f);
-        player->unk_84.y = 26.766666f;
-        player->unk_A4 = 1;
-        if (player->unk_3C & 0x2) {
-            player->unk_3C &= ~0x2;
-        }
         *motAttr = HU3D_MOTATTR_NONE;
         *state = 3;
     }
@@ -1181,12 +1175,7 @@ void fn_1_3ECC(WorkPlayerOld *player, s32 *state, u32 *motAttr)
 void fn_1_3F84(WorkPlayerOld *player, s32 *state, u32 *motAttr)
 {
     if (Hu3DMotionShiftIDGet(player->unk_00->model[0]) < 0 && Hu3DMotionEndCheck(player->unk_00->model[0])) {
-        player->unk_38 = 1;
+        fn_1_2BD0(player, 0.0f, 0.0f);
-        player->unk_84.y = 0;
-        player->unk_A4 = 0;
-        if (player->unk_3C & 0x2) {
-            player->unk_3C &= ~0x2;
-        }
     }
 }
 
@@ -1352,12 +1341,8 @@ void fn_1_40C0(WorkPlayerOld *player)
                 player->unk_3C |= 0x800;
             }
             else {
-                player->unk_38 = 1;
+                fn_1_2BD0(player, 0.0f, 0.0f);
-                player->unk_84.y = 0.0f;
+
-                player->unk_A4 = 0.0f;
-                if ((player->unk_3C & 2) != 0) {
-                    player->unk_3C &= ~2;
-                }
                 motAttr = HU3D_MOTATTR_NONE;
                 state = 3;
             }
@@ -6582,12 +6567,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
         HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
         var_r31->unk_FC |= 0x10;
         var_r31->unk_00.unk_3C |= 0x210;
-        var_r31->unk_00.unk_38 = 1;
+        fn_1_2BD0(&var_r31->unk_00, 48.179996f, 0.0f);
-        var_r31->unk_00.unk_84.y = 48.179996f;
-        var_r31->unk_00.unk_A4 = 0.0f;
-        if (var_r31->unk_00.unk_3C & 2) {
-            var_r31->unk_00.unk_3C &= ~0x2;
-        }
         Hu3DMotionShiftSet(var_r30->model[0], var_r30->motion[8], 0.0f, 8.0f, 0);
         if (fn_1_125C0(0, 1) <= 0) {
             var_r31->unk_FC |= 0x80000;
@@ -6599,12 +6579,7 @@ s32 fn_1_1C898(UnkM450Struct5 *var_r31, omObjData *var_r30)
         HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
         var_r31->unk_FC |= 0x100;
         var_r31->unk_00.unk_3C |= 0x210;
-        var_r31->unk_00.unk_38 = 1;
+        fn_1_2BD0(&var_r31->unk_00, 0.0f, 0.0f);
-        var_r31->unk_00.unk_84.y = 0.0f;
-        var_r31->unk_00.unk_A4 = 0.0f;
-        if (var_r31->unk_00.unk_3C & 2) {
-            var_r31->unk_00.unk_3C &= ~0x2;
-        }
         if (fn_1_125C0(0, 1) <= 0) {
             var_r31->unk_FC |= 0x80000;
         }
@@ -6715,12 +6690,7 @@ void fn_1_1E150(omObjData *var_r29)
         HuAudCharVoicePlay(var_r31->unk_11C, 0x123);
         var_r31->unk_FC |= 0x800000;
         var_r31->unk_118 = 0x7EB;
-        var_r31->unk_00.unk_38 = 1;
+        fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
-        var_r31->unk_00.unk_84.y = 53.533333f;
-        var_r31->unk_00.unk_A4 = 0.0f;
-        if (var_r31->unk_00.unk_3C & 2) {
-            var_r31->unk_00.unk_3C &= ~0x2;
-        }
         Hu3DMotionSet(var_r29->model[0], var_r29->motion[8]);
         Hu3DModelAttrReset(var_r29->model[0], HU3D_ATTR_DISPOFF);
         fn_1_125C0(0, 0);
@@ -7129,12 +7099,7 @@ void fn_1_20170(omObjData *var_r30)
                 var_r29->unk_00.unk_A8 = MapPos(
                     var_r29->unk_00.unk_6C.x, var_r29->unk_00.unk_6C.y, var_r29->unk_00.unk_6C.z, var_r29->unk_00.unk_C0, &var_r29->unk_00.unk_AC);
                 if (var_r29->unk_00.unk_A8 > var_r29->unk_00.unk_6C.y) {
-                    var_r31->unk_00.unk_38 = 1;
+                    fn_1_2BD0(&var_r31->unk_00, 53.533333f, 0.0f);
-                    var_r31->unk_00.unk_84.y = 53.533333f;
-                    var_r31->unk_00.unk_A4 = 0.0f;
-                    if (var_r31->unk_00.unk_3C & 2) {
-                        var_r31->unk_00.unk_3C &= ~2;
-                    }
                 }
                 var_f31 = var_r29->unk_00.unk_6C.x;
                 var_f30 = var_r29->unk_00.unk_6C.z;