From 269eb4faa12e2fa999c7a1d30fd118508898f7c8 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 16 Oct 2024 00:45:01 -0700 Subject: [PATCH] Symbol fixes for 0-01 --- config/GM8E01_00/symbols.txt | 80 +++++++++---------- config/GM8E01_01/config.yml | 3 +- config/GM8E01_01/symbols.txt | 147 ++++++++++++++++++----------------- configure.py | 4 +- 4 files changed, 118 insertions(+), 116 deletions(-) diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index b011ce3d..830acf84 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -17751,7 +17751,7 @@ lbl_803D69C8 = .rodata:0x803D69C8; // type:object size:0x18 data:4byte lbl_803D69E0 = .rodata:0x803D69E0; // type:object size:0x8 lbl_803D69E8 = .rodata:0x803D69E8; // type:object size:0x18 @stringBase0 = .rodata:0x803D6A00; // type:object size:0x1C scope:local data:string_table -lbl_803D6A20 = .rodata:0x803D6A20; // type:object size:0x23 +@stringBase0 = .rodata:0x803D6A20; // type:object size:0x23 scope:local data:string_table @stringBase0 = .rodata:0x803D6A48; // type:object size:0x7 scope:local data:string_table lbl_803D6A50 = .rodata:0x803D6A50; // type:object size:0xC data:4byte lbl_803D6A5C = .rodata:0x803D6A5C; // type:object size:0xC data:4byte @@ -17920,8 +17920,8 @@ T = .rodata:0x803D8968; // type:object size:0x68 scope:local align:8 data:double lbl_803D89D0 = .rodata:0x803D89D0; // type:object size:0x98 dspMixerCycles = .rodata:0x803D8A68; // type:object size:0x40 scope:global pbOffsets$455 = .rodata:0x803D8AA8; // type:object size:0x18 scope:global -inpColdMIDIDefaults = .rodata:0x803D8AC0; // type:object size:0x88 scope:local -inpWarmMIDIDefaults = .rodata:0x803D8B48; // type:object size:0x88 scope:local data:byte +inpColdMIDIDefaults = .rodata:0x803D8AC0; // type:object size:0x86 scope:local +inpWarmMIDIDefaults = .rodata:0x803D8B48; // type:object size:0x86 scope:local data:byte itdOffTab = .rodata:0x803D8BD0; // type:object size:0x100 scope:local __THPJpegNaturalOrder = .rodata:0x803D8CD0; // type:object size:0x50 scope:local data:byte __THPAANScaleFactor = .rodata:0x803D8D20; // type:object size:0x40 scope:local @@ -19705,7 +19705,7 @@ lbl_805A6E68 = .sdata:0x805A6E68; // type:object size:0x4 data:4byte lbl_805A6E6C = .sdata:0x805A6E6C; // type:object size:0x2 data:2byte lbl_805A6E70 = .sdata:0x805A6E70; // type:object size:0x4 lbl_805A6E74 = .sdata:0x805A6E74; // type:object size:0x4 -@192 = .sdata:0x805A6E78; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A6E78; // type:object size:0x4 scope:local data:4byte lbl_805A6E80 = .sdata:0x805A6E80; // type:object size:0x4 data:4byte lbl_805A6E84 = .sdata:0x805A6E84; // type:object size:0x4 lbl_805A6E88 = .sdata:0x805A6E88; // type:object size:0x4 @@ -19923,7 +19923,7 @@ lbl_805A7200 = .sdata:0x805A7200; // type:object size:0x4 data:4byte lbl_805A7204 = .sdata:0x805A7204; // type:object size:0x4 data:4byte lbl_805A7208 = .sdata:0x805A7208; // type:object size:0x4 data:4byte lbl_805A720C = .sdata:0x805A720C; // type:object size:0x4 data:4byte -@190 = .sdata:0x805A7210; // type:object size:0x4 scope:local data:4byte +@205 = .sdata:0x805A7210; // type:object size:0x4 scope:local data:4byte @191 = .sdata:0x805A7218; // type:object size:0x4 scope:local data:4byte lbl_805A7220 = .sdata:0x805A7220; // type:object size:0x1 data:byte lbl_805A7221 = .sdata:0x805A7221; // type:object size:0x1 data:byte @@ -19960,7 +19960,7 @@ lbl_805A727C = .sdata:0x805A727C; // type:object size:0x1 data:byte lbl_805A727D = .sdata:0x805A727D; // type:object size:0x1 data:byte lbl_805A727E = .sdata:0x805A727E; // type:object size:0x1 data:byte skDrawInDistance = .sdata:0x805A7280; // type:object size:0x4 scope:local data:float -@369 = .sdata:0x805A7284; // type:object size:0x4 scope:local data:float +@390 = .sdata:0x805A7284; // type:object size:0x4 scope:local data:float lbl_805A7288 = .sdata:0x805A7288; // type:object size:0x4 data:4byte lbl_805A728C = .sdata:0x805A728C; // type:object size:0x4 data:4byte lbl_805A7290 = .sdata:0x805A7290; // type:object size:0x4 data:4byte @@ -20209,7 +20209,7 @@ lbl_805A7694 = .sdata:0x805A7694; // type:object size:0x4 lbl_805A7698 = .sdata:0x805A7698; // type:object size:0x4 lbl_805A769C = .sdata:0x805A769C; // type:object size:0x4 lbl_805A76A0 = .sdata:0x805A76A0; // type:object size:0x8 -@192 = .sdata:0x805A76A8; // type:object size:0x4 scope:local data:4byte +@205 = .sdata:0x805A76A8; // type:object size:0x4 scope:local data:4byte lbl_805A76B0 = .sdata:0x805A76B0; // type:object size:0x4 data:4byte lbl_805A76B4 = .sdata:0x805A76B4; // type:object size:0x4 data:4byte lbl_805A76B8 = .sdata:0x805A76B8; // type:object size:0x4 data:float @@ -22632,8 +22632,8 @@ lbl_805AA100 = .sdata2:0x805AA100; // type:object size:0x8 align:8 data:double lbl_805AA108 = .sdata2:0x805AA108; // type:object size:0x4 data:float lbl_805AA10C = .sdata2:0x805AA10C; // type:object size:0x4 data:float kDefaultCharIdx__8CAnimRes = .sdata2:0x805AA110; // type:object size:0x8 scope:global data:4byte -@235 = .sdata2:0x805AA118; // type:object size:0x4 scope:local data:float -@236 = .sdata2:0x805AA11C; // type:object size:0x4 scope:local data:float +@337 = .sdata2:0x805AA118; // type:object size:0x4 scope:local data:float +@338 = .sdata2:0x805AA11C; // type:object size:0x4 scope:local data:float lbl_805AA120 = .sdata2:0x805AA120; // type:object size:0x4 data:float lbl_805AA124 = .sdata2:0x805AA124; // type:object size:0x4 data:float lbl_805AA128 = .sdata2:0x805AA128; // type:object size:0x4 data:float @@ -22782,9 +22782,9 @@ lbl_805AA3B4 = .sdata2:0x805AA3B4; // type:object size:0x4 data:float lbl_805AA3B8 = .sdata2:0x805AA3B8; // type:object size:0x4 data:float lbl_805AA3BC = .sdata2:0x805AA3BC; // type:object size:0x4 data:float lbl_805AA3C0 = .sdata2:0x805AA3C0; // type:object size:0x8 data:float -@426 = .sdata2:0x805AA3C8; // type:object size:0x4 scope:local data:float -@427 = .sdata2:0x805AA3CC; // type:object size:0x4 scope:local data:float -@576 = .sdata2:0x805AA3D0; // type:object size:0x4 scope:local data:float +@442 = .sdata2:0x805AA3C8; // type:object size:0x4 scope:local data:float +@443 = .sdata2:0x805AA3CC; // type:object size:0x4 scope:local data:float +@592 = .sdata2:0x805AA3D0; // type:object size:0x4 scope:local data:float lbl_805AA3D8 = .sdata2:0x805AA3D8; // type:object size:0x4 data:float lbl_805AA3DC = .sdata2:0x805AA3DC; // type:object size:0x4 data:float lbl_805AA3E0 = .sdata2:0x805AA3E0; // type:object size:0x8 align:8 data:double @@ -22904,8 +22904,8 @@ lbl_805AA5E8 = .sdata2:0x805AA5E8; // type:object size:0x8 align:8 data:double lbl_805AA5F0 = .sdata2:0x805AA5F0; // type:object size:0x4 data:float lbl_805AA5F4 = .sdata2:0x805AA5F4; // type:object size:0x4 data:float lbl_805AA5F8 = .sdata2:0x805AA5F8; // type:object size:0x8 data:float -@422 = .sdata2:0x805AA600; // type:object size:0x4 scope:local data:float -@426 = .sdata2:0x805AA608; // type:object size:0x8 scope:local align:8 data:double +@439 = .sdata2:0x805AA600; // type:object size:0x4 scope:local data:float +@443 = .sdata2:0x805AA608; // type:object size:0x8 scope:local align:8 data:double lbl_805AA610 = .sdata2:0x805AA610; // type:object size:0x4 data:float lbl_805AA614 = .sdata2:0x805AA614; // type:object size:0x4 data:float lbl_805AA618 = .sdata2:0x805AA618; // type:object size:0x4 @@ -23041,7 +23041,7 @@ lbl_805AA83C = .sdata2:0x805AA83C; // type:object size:0x4 data:float lbl_805AA840 = .sdata2:0x805AA840; // type:object size:0x8 align:8 data:double lbl_805AA848 = .sdata2:0x805AA848; // type:object size:0x4 data:float kDefaultKnockbackResistance = .sdata2:0x805AA84C; // type:object size:0x4 scope:global data:float -@253 = .sdata2:0x805AA850; // type:object size:0x4 scope:local data:float +@247 = .sdata2:0x805AA850; // type:object size:0x4 scope:local data:float lbl_805AA858 = .sdata2:0x805AA858; // type:object size:0x4 data:float lbl_805AA85C = .sdata2:0x805AA85C; // type:object size:0x4 data:float lbl_805AA860 = .sdata2:0x805AA860; // type:object size:0x4 data:float @@ -23140,8 +23140,8 @@ lbl_805AAA08 = .sdata2:0x805AAA08; // type:object size:0x8 align:8 data:double lbl_805AAA18 = .sdata2:0x805AAA18; // type:object size:0x4 data:float lbl_805AAA1C = .sdata2:0x805AAA1C; // type:object size:0x4 data:float lbl_805AAA20 = .sdata2:0x805AAA20; // type:object size:0x8 data:float -@232 = .sdata2:0x805AAA28; // type:object size:0x4 scope:local data:float -@233 = .sdata2:0x805AAA2C; // type:object size:0x4 scope:local data:float +@234 = .sdata2:0x805AAA28; // type:object size:0x4 scope:local data:float +@235 = .sdata2:0x805AAA2C; // type:object size:0x4 scope:local data:float @253 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local data:float @263 = .sdata2:0x805AAA34; // type:object size:0x4 scope:local data:float @268 = .sdata2:0x805AAA38; // type:object size:0x8 scope:local align:8 data:double @@ -23184,19 +23184,19 @@ lbl_805AAAD8 = .sdata2:0x805AAAD8; // type:object size:0x4 data:float lbl_805AAADC = .sdata2:0x805AAADC; // type:object size:0x4 data:float lbl_805AAAE0 = .sdata2:0x805AAAE0; // type:object size:0x4 data:float lbl_805AAAE4 = .sdata2:0x805AAAE4; // type:object size:0x4 data:float -@674 = .sdata2:0x805AAAE8; // type:object size:0x4 scope:local data:float -@675 = .sdata2:0x805AAAEC; // type:object size:0x4 scope:local data:float -@676 = .sdata2:0x805AAAF0; // type:object size:0x4 scope:local data:float -@677 = .sdata2:0x805AAAF4; // type:object size:0x4 scope:local data:float -@1058 = .sdata2:0x805AAAF8; // type:object size:0x4 scope:local data:float -@1059 = .sdata2:0x805AAAFC; // type:object size:0x4 scope:local data:float -@1060 = .sdata2:0x805AAB00; // type:object size:0x4 scope:local data:float -@1061 = .sdata2:0x805AAB04; // type:object size:0x4 scope:local data:float -@1062 = .sdata2:0x805AAB08; // type:object size:0x4 scope:local data:float -@1063 = .sdata2:0x805AAB0C; // type:object size:0x4 scope:local data:float -@1066 = .sdata2:0x805AAB10; // type:object size:0x8 scope:local align:8 data:double -@1181 = .sdata2:0x805AAB18; // type:object size:0x4 scope:local data:float -@1182 = .sdata2:0x805AAB1C; // type:object size:0x4 scope:local data:float +@696 = .sdata2:0x805AAAE8; // type:object size:0x4 scope:local data:float +@697 = .sdata2:0x805AAAEC; // type:object size:0x4 scope:local data:float +@698 = .sdata2:0x805AAAF0; // type:object size:0x4 scope:local data:float +@699 = .sdata2:0x805AAAF4; // type:object size:0x4 scope:local data:float +@1080 = .sdata2:0x805AAAF8; // type:object size:0x4 scope:local data:float +@1081 = .sdata2:0x805AAAFC; // type:object size:0x4 scope:local data:float +@1082 = .sdata2:0x805AAB00; // type:object size:0x4 scope:local data:float +@1083 = .sdata2:0x805AAB04; // type:object size:0x4 scope:local data:float +@1084 = .sdata2:0x805AAB08; // type:object size:0x4 scope:local data:float +@1085 = .sdata2:0x805AAB0C; // type:object size:0x4 scope:local data:float +@1088 = .sdata2:0x805AAB10; // type:object size:0x8 scope:local align:8 data:double +@1203 = .sdata2:0x805AAB18; // type:object size:0x4 scope:local data:float +@1204 = .sdata2:0x805AAB1C; // type:object size:0x4 scope:local data:float lbl_805AAB20 = .sdata2:0x805AAB20; // type:object size:0x4 data:float lbl_805AAB24 = .sdata2:0x805AAB24; // type:object size:0x4 data:float lbl_805AAB28 = .sdata2:0x805AAB28; // type:object size:0x8 data:float @@ -23317,7 +23317,7 @@ lbl_805AAD28 = .sdata2:0x805AAD28; // type:object size:0x4 data:float lbl_805AAD2C = .sdata2:0x805AAD2C; // type:object size:0x4 data:float lbl_805AAD30 = .sdata2:0x805AAD30; // type:object size:0x4 data:float lbl_805AAD34 = .sdata2:0x805AAD34; // type:object size:0x4 data:float -@303 = .sdata2:0x805AAD38; // type:object size:0x4 scope:local data:float +@299 = .sdata2:0x805AAD38; // type:object size:0x4 scope:local data:float lbl_805AAD40 = .sdata2:0x805AAD40; // type:object size:0x4 data:float lbl_805AAD44 = .sdata2:0x805AAD44; // type:object size:0x4 data:float lbl_805AAD48 = .sdata2:0x805AAD48; // type:object size:0x4 data:float @@ -23352,7 +23352,7 @@ lbl_805AADD4 = .sdata2:0x805AADD4; // type:object size:0x4 data:float lbl_805AADD8 = .sdata2:0x805AADD8; // type:object size:0x4 data:float lbl_805AADDC = .sdata2:0x805AADDC; // type:object size:0x4 data:float lbl_805AADE0 = .sdata2:0x805AADE0; // type:object size:0x8 data:float -@227 = .sdata2:0x805AADE8; // type:object size:0x4 scope:local data:float +@221 = .sdata2:0x805AADE8; // type:object size:0x4 scope:local data:float lbl_805AADF0 = .sdata2:0x805AADF0; // type:object size:0x4 data:float lbl_805AADF4 = .sdata2:0x805AADF4; // type:object size:0x4 data:float lbl_805AADF8 = .sdata2:0x805AADF8; // type:object size:0x4 data:float @@ -23518,8 +23518,8 @@ lbl_805AB0B0 = .sdata2:0x805AB0B0; // type:object size:0x4 data:float lbl_805AB0B4 = .sdata2:0x805AB0B4; // type:object size:0x4 data:float lbl_805AB0B8 = .sdata2:0x805AB0B8; // type:object size:0x4 data:float lbl_805AB0BC = .sdata2:0x805AB0BC; // type:object size:0x4 data:float -@485 = .sdata2:0x805AB0C0; // type:object size:0x4 scope:local data:float -@595 = .sdata2:0x805AB0C4; // type:object size:0x4 scope:local data:float +@498 = .sdata2:0x805AB0C0; // type:object size:0x4 scope:local data:float +@608 = .sdata2:0x805AB0C4; // type:object size:0x4 scope:local data:float lbl_805AB0C8 = .sdata2:0x805AB0C8; // type:object size:0x4 data:float lbl_805AB0D0 = .sdata2:0x805AB0D0; // type:object size:0x8 align:8 data:double lbl_805AB0D8 = .sdata2:0x805AB0D8; // type:object size:0x4 data:float @@ -23804,10 +23804,10 @@ lbl_805AB5A4 = .sdata2:0x805AB5A4; // type:object size:0x4 data:float lbl_805AB5A8 = .sdata2:0x805AB5A8; // type:object size:0x4 data:float lbl_805AB5AC = .sdata2:0x805AB5AC; // type:object size:0x4 data:float lbl_805AB5B0 = .sdata2:0x805AB5B0; // type:object size:0x8 data:float -@341 = .sdata2:0x805AB5B8; // type:object size:0x4 scope:local data:float -@462 = .sdata2:0x805AB5BC; // type:object size:0x4 scope:local data:float -@463 = .sdata2:0x805AB5C0; // type:object size:0x4 scope:local data:float -@552 = .sdata2:0x805AB5C4; // type:object size:0x4 scope:local data:float +@354 = .sdata2:0x805AB5B8; // type:object size:0x4 scope:local data:float +@476 = .sdata2:0x805AB5BC; // type:object size:0x4 scope:local data:float +@477 = .sdata2:0x805AB5C0; // type:object size:0x4 scope:local data:float +@566 = .sdata2:0x805AB5C4; // type:object size:0x4 scope:local data:float lbl_805AB5C8 = .sdata2:0x805AB5C8; // type:object size:0x4 data:float lbl_805AB5CC = .sdata2:0x805AB5CC; // type:object size:0x4 data:float lbl_805AB5D0 = .sdata2:0x805AB5D0; // type:object size:0x4 data:float @@ -26071,8 +26071,8 @@ lbl_805ADD40 = .sdata2:0x805ADD40; // type:object size:0x8 align:8 data:double lbl_805ADD48 = .sdata2:0x805ADD48; // type:object size:0x4 data:float lbl_805ADD4C = .sdata2:0x805ADD4C; // type:object size:0x4 data:float lbl_805ADD50 = .sdata2:0x805ADD50; // type:object size:0x8 data:float -@178 = .sdata2:0x805ADD58; // type:object size:0x4 scope:local data:float -@179 = .sdata2:0x805ADD5C; // type:object size:0x4 scope:local data:float +@191 = .sdata2:0x805ADD58; // type:object size:0x4 scope:local data:float +@192 = .sdata2:0x805ADD5C; // type:object size:0x4 scope:local data:float lbl_805ADD60 = .sdata2:0x805ADD60; // type:object size:0x4 data:float lbl_805ADD64 = .sdata2:0x805ADD64; // type:object size:0x4 data:float lbl_805ADD68 = .sdata2:0x805ADD68; // type:object size:0x4 data:float diff --git a/config/GM8E01_01/config.yml b/config/GM8E01_01/config.yml index 87187407..5d9b4892 100644 --- a/config/GM8E01_01/config.yml +++ b/config/GM8E01_01/config.yml @@ -4,7 +4,8 @@ hash: 860141f9671fc141ce8f55448643f713bc64b349 symbols: config/GM8E01_01/symbols.txt splits: config/GM8E01_01/splits.txt mw_comment_version: 8 -fill_gaps: false +quick_analysis: false # Faster reruns after full analysis +fill_gaps: false # Alignments known # Extract embedded assets diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index 0e06aabe..111a1d8e 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -92,7 +92,7 @@ InitializeSubsystems__5CMainFv = .text:0x80007F80; // type:function size:0x150 s __dt__5CMainFv = .text:0x800080D0; // type:function size:0x1B0 scope:global __ct__5CMainFv = .text:0x80008280; // type:function size:0x1E0 scope:global fn_800083E4 = .text:0x80008460; // type:function size:0xA0 scope:global -fn_80008484 = .text:0x80008500; // type:function size:0x20 scope:global +__sys_free = .text:0x80008500; // type:function size:0x20 scope:weak fn_800084A4 = .text:0x80008520; // type:function size:0x60 scope:global main = .text:0x80008580; // type:function size:0x80 scope:global fn_80008584 = .text:0x80008600; // type:function size:0x60 scope:global @@ -14528,7 +14528,7 @@ FindFreeBlocks__12CARAMManagerFUiUiUi = .text:0x80344C78; // type:function size: Alloc__12CARAMManagerFUi = .text:0x80344D08; // type:function size:0x9C scope:global Shutdown__12CARAMManagerFv = .text:0x80344DA4; // type:function size:0x50 scope:global Initialize__12CARAMManagerFUi = .text:0x80344DF4; // type:function size:0x170 scope:global -do_erase__Q24rstl67listFPQ34rstl67list4node__Fv = .text:0x80344F64; // type:function size:0x7C scope:global +do_erase__Q24rstl67listFPQ34rstl67list4node = .text:0x80344F64; // type:function size:0x7C scope:global __sinit_CARAMManager_cpp = .text:0x80344FE0; // type:function size:0x54 scope:local __dt__Q24rstl67listFv = .text:0x80345034; // type:function size:0x78 scope:global PointInFrustumPlanes__14CFrustumPlanesCFRC9CVector3f = .text:0x803450AC; // type:function size:0x60 scope:global @@ -16724,14 +16724,14 @@ lbl_803CBE8D = .rodata:0x803CC06D; // type:object size:0x8 scope:local data:stri lbl_803CBE95 = .rodata:0x803CC075; // type:object size:0xD scope:local data:string lbl_803CBEA2 = .rodata:0x803CC082; // type:object size:0x186 scope:local @stringBase0 = .rodata:0x803CC208; // type:object size:0x8 scope:local data:string_table -@stringBase0 = .rodata:0x803CC210; // type:object size:0x3F0 scope:local data:string_table +@stringBase0 = .rodata:0x803CC210; // type:object size:0x3EA scope:local data:string_table lbl_803CC420 = .rodata:0x803CC600; // type:object size:0x18 scope:global skPlayerLandSfxSoft__7CPlayer = .rodata:0x803CC618; // type:object size:0x30 scope:global skPlayerLandSfxHard__7CPlayer = .rodata:0x803CC648; // type:object size:0x30 scope:global skLeftStepSounds_7CPlayer = .rodata:0x803CC678; // type:object size:0x30 scope:global skRightStepSounds_7CPlayer = .rodata:0x803CC6A8; // type:object size:0x30 scope:global -lbl_803CC4F8 = .rodata:0x803CC6D8; // type:object size:0x48 scope:global -lbl_803CC540 = .rodata:0x803CC720; // type:object size:0x48 scope:global data:4byte +@stringBase0 = .rodata:0x803CC6D8; // type:object size:0x48 scope:local data:string_table +lbl_803CC540 = .rodata:0x803CC720; // type:object size:0x48 data:4byte MetroidBuildInfo = .rodata:0x803CC768; // type:object size:0x3C scope:global data:string lbl_803CC5C4 = .rodata:0x803CC7A4; // type:object size:0xC data:2byte lbl_803CC5D0 = .rodata:0x803CC7B0; // type:object size:0xC data:2byte @@ -17805,7 +17805,7 @@ lbl_803D69C8 = .rodata:0x803D6BA8; // type:object size:0x18 scope:global data:4b lbl_803D69E0 = .rodata:0x803D6BC0; // type:object size:0x8 scope:global lbl_803D69E8 = .rodata:0x803D6BC8; // type:object size:0x18 scope:global @stringBase0 = .rodata:0x803D6BE0; // type:object size:0x1C scope:local data:string_table -lbl_803D6A20 = .rodata:0x803D6C00; // type:object size:0x28 scope:global +@stringBase0 = .rodata:0x803D6C00; // type:object size:0x28 scope:local data:string_table lbl_803D6A48 = .rodata:0x803D6C28; // type:object size:0x8 scope:global lbl_803D6A50 = .rodata:0x803D6C30; // type:object size:0xC scope:global data:4byte lbl_803D6A5C = .rodata:0x803D6C3C; // type:object size:0xC scope:global data:4byte @@ -17974,8 +17974,8 @@ T = .rodata:0x803D8B48; // type:object size:0x68 scope:local data:double lbl_803D89D0 = .rodata:0x803D8BB0; // type:object size:0x98 scope:global dspMixerCycles = .rodata:0x803D8C48; // type:object size:0x40 scope:global pbOffsets$455 = .rodata:0x803D8C88; // type:object size:0x18 scope:global -inpColdMIDIDefaults = .rodata:0x803D8CA0; // type:object size:0x88 scope:local -inpWarmMIDIDefaults = .rodata:0x803D8D28; // type:object size:0x88 scope:local data:byte +inpColdMIDIDefaults = .rodata:0x803D8CA0; // type:object size:0x86 scope:local +inpWarmMIDIDefaults = .rodata:0x803D8D28; // type:object size:0x86 scope:local data:byte itdOffTab = .rodata:0x803D8DB0; // type:object size:0x100 scope:local __THPJpegNaturalOrder = .rodata:0x803D8EB0; // type:object size:0x50 scope:local data:byte __THPAANScaleFactor = .rodata:0x803D8F00; // type:object size:0x40 scope:local align:8 @@ -18058,12 +18058,12 @@ gPressInputs__13ControlMapper = .data:0x803D95D8; // type:object size:0x114 scop @310 = .data:0x803D96EC; // type:object size:0xF4 scope:local @336 = .data:0x803D97E0; // type:object size:0x60 scope:local lbl_803D9660 = .data:0x803D9840; // type:object size:0x78 scope:global -__vt__11CObjectList = .data:0x803D98B8; // type:object size:0x10 scope:global +__vt__11CObjectList = .data:0x803D98B8; // type:object size:0xC scope:global __vt__7CPlayer = .data:0x803D98C8; // type:object size:0x88 scope:global jumptable_803D9950 = .data:0x803D9950; // type:object size:0x1C scope:local jumptable_803D996C = .data:0x803D996C; // type:object size:0x58 scope:local __vt__19CCollisionPrimitive = .data:0x803D99C4; // type:object size:0x2C scope:global -__vt__21CArchMsgParmUserInput = .data:0x803D99F0; // type:object size:0x10 scope:global +__vt__21CArchMsgParmUserInput = .data:0x803D99F0; // type:object size:0xC scope:global lbl_803D9820 = .data:0x803D9A00; // type:object size:0x9C scope:global data:4byte lbl_803D98BC = .data:0x803D9A9C; // type:object size:0x1C scope:global jumptable_803D9AB8 = .data:0x803D9AB8; // type:object size:0x28 scope:local @@ -18249,7 +18249,7 @@ jumptable_803DF374 = .data:0x803DF374; // type:object size:0x8C scope:local __vt__15CScriptPlatform = .data:0x803DF400; // type:object size:0x8C scope:global jumptable_803DF48C = .data:0x803DF48C; // type:object size:0x7C scope:local __vt__16CScriptGenerator = .data:0x803DF508; // type:object size:0x20 scope:global -__vt__21CScriptCameraWaypoint = .data:0x803DF528; // type:object size:0x70 scope:global +__vt__21CScriptCameraWaypoint = .data:0x803DF528; // type:object size:0x6C scope:global __vt__10CGameLight = .data:0x803DF598; // type:object size:0x6C scope:global lbl_803DF428 = .data:0x803DF608; // type:object size:0x10 scope:global __vt__16CTweakAutoMapper = .data:0x803DF618; // type:object size:0xC scope:global @@ -18282,7 +18282,7 @@ lbl_803DFD08 = .data:0x803DFEE8; // type:object size:0x70 scope:global lbl_803DFD78 = .data:0x803DFF58; // type:object size:0x88 scope:global __vt__19CScriptCameraShaker = .data:0x803DFFE0; // type:object size:0x20 scope:global __vt__20CScriptActorKeyframe = .data:0x803E0000; // type:object size:0x20 scope:global -__vt__14CBCScriptedCmd = .data:0x803E0020; // type:object size:0x10 scope:global +__vt__14CBCScriptedCmd = .data:0x803E0020; // type:object size:0xC scope:global lbl_803DFE50 = .data:0x803E0030; // type:object size:0x20 scope:global lbl_803DFE70 = .data:0x803E0050; // type:object size:0x80 scope:global __vt__7CWeapon = .data:0x803E00D0; // type:object size:0x6C scope:global @@ -18320,7 +18320,7 @@ jumptable_803E0CD8 = .data:0x803E0CD8; // type:object size:0x94 scope:local __vt__11CBCCoverCmd = .data:0x803E0D6C; // type:object size:0xC scope:global __vt__14CBCWallHangCmd = .data:0x803E0D78; // type:object size:0x48 scope:global lbl_803E0BE0 = .data:0x803E0DC0; // type:object size:0x18 scope:global -__vt__17CScriptCoverPoint = .data:0x803E0DD8; // type:object size:0x70 scope:global +__vt__17CScriptCoverPoint = .data:0x803E0DD8; // type:object size:0x6C scope:global __vt__11CPathCamera = .data:0x803E0E48; // type:object size:0x78 scope:global lbl_803E0CE0 = .data:0x803E0EC0; // type:object size:0x20 scope:global __vt__19CScriptGrapplePoint = .data:0x803E0EE0; // type:object size:0x6C scope:global @@ -18991,6 +18991,7 @@ lbl_803F0C68 = .data:0x803F0E48; // type:object size:0x28 scope:global lbl_803F0C90 = .data:0x803F0E70; // type:object size:0x20 scope:global jumptable_803F0E90 = .data:0x803F0E90; // type:object size:0x5C scope:local jumptable_803F0EEC = .data:0x803F0EEC; // type:object size:0x90 scope:local +...data.0 = .data:0x803F0F80; // type:label scope:local @3 = .data:0x803F0F80; // type:object size:0x44 scope:local data:string @76 = .data:0x803F0FC4; // type:object size:0x1E scope:local data:string @77 = .data:0x803F0FE4; // type:object size:0x16 scope:local data:string @@ -19740,7 +19741,7 @@ lbl_805A6E68 = .sdata:0x805A7048; // type:object size:0x4 scope:global data:4byt lbl_805A6E6C = .sdata:0x805A704C; // type:object size:0x2 scope:global data:2byte lbl_805A6E70 = .sdata:0x805A7050; // type:object size:0x4 scope:global lbl_805A6E74 = .sdata:0x805A7054; // type:object size:0x4 scope:global -@193 = .sdata:0x805A7058; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7058; // type:object size:0x4 scope:local data:4byte lbl_805A6E80 = .sdata:0x805A7060; // type:object size:0x4 scope:global data:4byte lbl_805A6E84 = .sdata:0x805A7064; // type:object size:0x4 scope:global lbl_805A6E88 = .sdata:0x805A7068; // type:object size:0x4 scope:global @@ -19958,7 +19959,7 @@ lbl_805A7200 = .sdata:0x805A73E0; // type:object size:0x4 scope:global data:4byt lbl_805A7204 = .sdata:0x805A73E4; // type:object size:0x4 scope:global data:4byte lbl_805A7208 = .sdata:0x805A73E8; // type:object size:0x4 scope:global data:4byte lbl_805A720C = .sdata:0x805A73EC; // type:object size:0x4 scope:global data:4byte -lbl_805A7210 = .sdata:0x805A73F0; // type:object size:0x8 scope:global data:4byte +@205 = .sdata:0x805A73F0; // type:object size:0x4 scope:local data:4byte @192 = .sdata:0x805A73F8; // type:object size:0x4 scope:local data:4byte lbl_805A7220 = .sdata:0x805A7400; // type:object size:0x1 scope:global data:byte lbl_805A7221 = .sdata:0x805A7401; // type:object size:0x1 scope:global data:byte @@ -19995,7 +19996,7 @@ lbl_805A727C = .sdata:0x805A745C; // type:object size:0x1 scope:global data:byte lbl_805A727D = .sdata:0x805A745D; // type:object size:0x1 scope:global data:byte lbl_805A727E = .sdata:0x805A745E; // type:object size:0x1 scope:global data:byte skDrawInDistance = .sdata:0x805A7460; // type:object size:0x4 scope:local data:float -@363 = .sdata:0x805A7464; // type:object size:0x4 scope:local data:float +@390 = .sdata:0x805A7464; // type:object size:0x4 scope:local data:float lbl_805A7288 = .sdata:0x805A7468; // type:object size:0x4 scope:global data:4byte lbl_805A728C = .sdata:0x805A746C; // type:object size:0x4 scope:global data:4byte lbl_805A7290 = .sdata:0x805A7470; // type:object size:0x4 scope:global data:4byte @@ -20244,7 +20245,7 @@ lbl_805A7694 = .sdata:0x805A7874; // type:object size:0x4 scope:global lbl_805A7698 = .sdata:0x805A7878; // type:object size:0x4 scope:global lbl_805A769C = .sdata:0x805A787C; // type:object size:0x4 scope:global lbl_805A76A0 = .sdata:0x805A7880; // type:object size:0x8 scope:global -lbl_805A76A8 = .sdata:0x805A7888; // type:object size:0x8 scope:global data:4byte +@205 = .sdata:0x805A7888; // type:object size:0x8 scope:global data:4byte lbl_805A76B0 = .sdata:0x805A7890; // type:object size:0x4 scope:global data:4byte lbl_805A76B4 = .sdata:0x805A7894; // type:object size:0x4 scope:global data:4byte lbl_805A76B8 = .sdata:0x805A7898; // type:object size:0x4 scope:global data:float @@ -22667,8 +22668,8 @@ lbl_805AA100 = .sdata2:0x805AA2E0; // type:object size:0x8 scope:global data:dou lbl_805AA108 = .sdata2:0x805AA2E8; // type:object size:0x4 scope:global data:float lbl_805AA10C = .sdata2:0x805AA2EC; // type:object size:0x4 scope:global data:float kDefaultCharIdx__8CAnimRes = .sdata2:0x805AA2F0; // type:object size:0x8 scope:global data:4byte -@233 = .sdata2:0x805AA2F8; // type:object size:0x4 scope:local data:float -@234 = .sdata2:0x805AA2FC; // type:object size:0x4 scope:local data:float +@337 = .sdata2:0x805AA2F8; // type:object size:0x4 scope:local data:float +@338 = .sdata2:0x805AA2FC; // type:object size:0x4 scope:local data:float lbl_805AA120 = .sdata2:0x805AA300; // type:object size:0x4 scope:global data:float lbl_805AA124 = .sdata2:0x805AA304; // type:object size:0x4 scope:global data:float lbl_805AA128 = .sdata2:0x805AA308; // type:object size:0x4 scope:global data:float @@ -22817,9 +22818,9 @@ lbl_805AA3B4 = .sdata2:0x805AA594; // type:object size:0x4 scope:global data:flo lbl_805AA3B8 = .sdata2:0x805AA598; // type:object size:0x4 scope:global data:float lbl_805AA3BC = .sdata2:0x805AA59C; // type:object size:0x4 scope:global data:float lbl_805AA3C0 = .sdata2:0x805AA5A0; // type:object size:0x8 scope:global data:float -@429 = .sdata2:0x805AA5A8; // type:object size:0x4 scope:local data:float -@430 = .sdata2:0x805AA5AC; // type:object size:0x4 scope:local data:float -@580 = .sdata2:0x805AA5B0; // type:object size:0x4 scope:local data:float +@442 = .sdata2:0x805AA5A8; // type:object size:0x4 scope:local data:float +@443 = .sdata2:0x805AA5AC; // type:object size:0x4 scope:local data:float +@592 = .sdata2:0x805AA5B0; // type:object size:0x4 scope:local data:float lbl_805AA3D8 = .sdata2:0x805AA5B8; // type:object size:0x4 scope:global data:float lbl_805AA3DC = .sdata2:0x805AA5BC; // type:object size:0x4 scope:global data:float lbl_805AA3E0 = .sdata2:0x805AA5C0; // type:object size:0x8 scope:global data:double @@ -22939,8 +22940,8 @@ lbl_805AA5E8 = .sdata2:0x805AA7C8; // type:object size:0x8 scope:global data:dou lbl_805AA5F0 = .sdata2:0x805AA7D0; // type:object size:0x4 scope:global data:float lbl_805AA5F4 = .sdata2:0x805AA7D4; // type:object size:0x4 scope:global data:float lbl_805AA5F8 = .sdata2:0x805AA7D8; // type:object size:0x8 scope:global data:float -@423 = .sdata2:0x805AA7E0; // type:object size:0x4 scope:local data:float -@427 = .sdata2:0x805AA7E8; // type:object size:0x8 scope:local data:double +@439 = .sdata2:0x805AA7E0; // type:object size:0x4 scope:local data:float +@443 = .sdata2:0x805AA7E8; // type:object size:0x8 scope:local data:double lbl_805AA610 = .sdata2:0x805AA7F0; // type:object size:0x4 scope:global data:float lbl_805AA614 = .sdata2:0x805AA7F4; // type:object size:0x4 scope:global data:float lbl_805AA618 = .sdata2:0x805AA7F8; // type:object size:0x4 scope:global @@ -23061,12 +23062,12 @@ lbl_805AA800 = .sdata2:0x805AA9E0; // type:object size:0x4 scope:global data:flo lbl_805AA804 = .sdata2:0x805AA9E4; // type:object size:0x4 scope:global data:float lbl_805AA808 = .sdata2:0x805AA9E8; // type:object size:0x4 scope:global data:float lbl_805AA80C = .sdata2:0x805AA9EC; // type:object size:0x4 scope:global data:float -@210 = .sdata2:0x805AA9F0; // type:object size:0x4 scope:local data:float -@211 = .sdata2:0x805AA9F4; // type:object size:0x4 scope:local data:float -@212 = .sdata2:0x805AA9F8; // type:object size:0x4 scope:local data:float -@213 = .sdata2:0x805AA9FC; // type:object size:0x4 scope:local data:float -@214 = .sdata2:0x805AAA00; // type:object size:0x4 scope:local data:float -@215 = .sdata2:0x805AAA04; // type:object size:0x4 scope:local data:float +@230 = .sdata2:0x805AA9F0; // type:object size:0x4 scope:local data:float +@231 = .sdata2:0x805AA9F4; // type:object size:0x4 scope:local data:float +@232 = .sdata2:0x805AA9F8; // type:object size:0x4 scope:local data:float +@233 = .sdata2:0x805AA9FC; // type:object size:0x4 scope:local data:float +@234 = .sdata2:0x805AAA00; // type:object size:0x4 scope:local data:float +@235 = .sdata2:0x805AAA04; // type:object size:0x4 scope:local data:float lbl_805AA828 = .sdata2:0x805AAA08; // type:object size:0x4 scope:global data:float lbl_805AA82C = .sdata2:0x805AAA0C; // type:object size:0x4 scope:global data:float kBaseHealthCapacity = .sdata2:0x805AAA10; // type:object size:0x4 scope:global data:float @@ -23076,7 +23077,7 @@ lbl_805AA83C = .sdata2:0x805AAA1C; // type:object size:0x4 scope:global data:flo lbl_805AA840 = .sdata2:0x805AAA20; // type:object size:0x8 scope:global data:double lbl_805AA848 = .sdata2:0x805AAA28; // type:object size:0x4 scope:global data:float kDefaultKnockbackResistance = .sdata2:0x805AAA2C; // type:object size:0x4 scope:global data:float -@254 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local data:float +@247 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local data:float lbl_805AA858 = .sdata2:0x805AAA38; // type:object size:0x4 scope:global data:float lbl_805AA85C = .sdata2:0x805AAA3C; // type:object size:0x4 scope:global data:float lbl_805AA860 = .sdata2:0x805AAA40; // type:object size:0x4 scope:global data:float @@ -23175,8 +23176,8 @@ lbl_805AAA08 = .sdata2:0x805AABE8; // type:object size:0x8 scope:global data:dou lbl_805AAA18 = .sdata2:0x805AABF8; // type:object size:0x4 scope:global data:float lbl_805AAA1C = .sdata2:0x805AABFC; // type:object size:0x4 scope:global data:float lbl_805AAA20 = .sdata2:0x805AAC00; // type:object size:0x8 scope:global data:float -@225 = .sdata2:0x805AAC08; // type:object size:0x4 scope:local data:float -@226 = .sdata2:0x805AAC0C; // type:object size:0x4 scope:local data:float +@234 = .sdata2:0x805AAC08; // type:object size:0x4 scope:local data:float +@235 = .sdata2:0x805AAC0C; // type:object size:0x4 scope:local data:float @255 = .sdata2:0x805AAC10; // type:object size:0x4 scope:local data:float @265 = .sdata2:0x805AAC14; // type:object size:0x4 scope:local data:float @270 = .sdata2:0x805AAC18; // type:object size:0x8 scope:local data:double @@ -23219,19 +23220,19 @@ lbl_805AAAD8 = .sdata2:0x805AACB8; // type:object size:0x4 scope:global data:flo lbl_805AAADC = .sdata2:0x805AACBC; // type:object size:0x4 scope:global data:float lbl_805AAAE0 = .sdata2:0x805AACC0; // type:object size:0x4 scope:global data:float lbl_805AAAE4 = .sdata2:0x805AACC4; // type:object size:0x4 scope:global data:float -@669 = .sdata2:0x805AACC8; // type:object size:0x4 scope:local data:float -@670 = .sdata2:0x805AACCC; // type:object size:0x4 scope:local data:float -@671 = .sdata2:0x805AACD0; // type:object size:0x4 scope:local data:float -@672 = .sdata2:0x805AACD4; // type:object size:0x4 scope:local data:float -@1053 = .sdata2:0x805AACD8; // type:object size:0x4 scope:local data:float -@1054 = .sdata2:0x805AACDC; // type:object size:0x4 scope:local data:float -@1055 = .sdata2:0x805AACE0; // type:object size:0x4 scope:local data:float -@1056 = .sdata2:0x805AACE4; // type:object size:0x4 scope:local data:float -@1057 = .sdata2:0x805AACE8; // type:object size:0x4 scope:local data:float -@1058 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local data:float -@1061 = .sdata2:0x805AACF0; // type:object size:0x8 scope:local data:double -@1176 = .sdata2:0x805AACF8; // type:object size:0x4 scope:local data:float -@1177 = .sdata2:0x805AACFC; // type:object size:0x4 scope:local data:float +@696 = .sdata2:0x805AACC8; // type:object size:0x4 scope:local data:float +@697 = .sdata2:0x805AACCC; // type:object size:0x4 scope:local data:float +@698 = .sdata2:0x805AACD0; // type:object size:0x4 scope:local data:float +@699 = .sdata2:0x805AACD4; // type:object size:0x4 scope:local data:float +@1080 = .sdata2:0x805AACD8; // type:object size:0x4 scope:local data:float +@1081 = .sdata2:0x805AACDC; // type:object size:0x4 scope:local data:float +@1082 = .sdata2:0x805AACE0; // type:object size:0x4 scope:local data:float +@1083 = .sdata2:0x805AACE4; // type:object size:0x4 scope:local data:float +@1084 = .sdata2:0x805AACE8; // type:object size:0x4 scope:local data:float +@1085 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local data:float +@1088 = .sdata2:0x805AACF0; // type:object size:0x8 scope:local data:double +@1203 = .sdata2:0x805AACF8; // type:object size:0x4 scope:local data:float +@1204 = .sdata2:0x805AACFC; // type:object size:0x4 scope:local data:float lbl_805AAB20 = .sdata2:0x805AAD00; // type:object size:0x4 scope:global data:float lbl_805AAB24 = .sdata2:0x805AAD04; // type:object size:0x4 scope:global data:float lbl_805AAB28 = .sdata2:0x805AAD08; // type:object size:0x8 scope:global data:float @@ -23352,7 +23353,7 @@ lbl_805AAD28 = .sdata2:0x805AAF08; // type:object size:0x4 scope:global data:flo lbl_805AAD2C = .sdata2:0x805AAF0C; // type:object size:0x4 scope:global data:float lbl_805AAD30 = .sdata2:0x805AAF10; // type:object size:0x4 scope:global data:float lbl_805AAD34 = .sdata2:0x805AAF14; // type:object size:0x4 scope:global data:float -@297 = .sdata2:0x805AAF18; // type:object size:0x4 scope:local data:float +@299 = .sdata2:0x805AAF18; // type:object size:0x4 scope:local data:float lbl_805AAD40 = .sdata2:0x805AAF20; // type:object size:0x4 scope:global data:float lbl_805AAD44 = .sdata2:0x805AAF24; // type:object size:0x4 scope:global data:float lbl_805AAD48 = .sdata2:0x805AAF28; // type:object size:0x4 scope:global data:float @@ -23387,7 +23388,7 @@ lbl_805AADD4 = .sdata2:0x805AAFB4; // type:object size:0x4 scope:global data:flo lbl_805AADD8 = .sdata2:0x805AAFB8; // type:object size:0x4 scope:global data:float lbl_805AADDC = .sdata2:0x805AAFBC; // type:object size:0x4 scope:global data:float lbl_805AADE0 = .sdata2:0x805AAFC0; // type:object size:0x8 scope:global data:float -@228 = .sdata2:0x805AAFC8; // type:object size:0x4 scope:local data:float +@221 = .sdata2:0x805AAFC8; // type:object size:0x4 scope:local data:float lbl_805AADF0 = .sdata2:0x805AAFD0; // type:object size:0x4 scope:global data:float lbl_805AADF4 = .sdata2:0x805AAFD4; // type:object size:0x4 scope:global data:float lbl_805AADF8 = .sdata2:0x805AAFD8; // type:object size:0x4 scope:global data:float @@ -23553,8 +23554,8 @@ lbl_805AB0B0 = .sdata2:0x805AB290; // type:object size:0x4 scope:global data:flo lbl_805AB0B4 = .sdata2:0x805AB294; // type:object size:0x4 scope:global data:float lbl_805AB0B8 = .sdata2:0x805AB298; // type:object size:0x4 scope:global data:float lbl_805AB0BC = .sdata2:0x805AB29C; // type:object size:0x4 scope:global data:float -lbl_805AB0C0 = .sdata2:0x805AB2A0; // type:object size:0x4 scope:global data:float -lbl_805AB0C4 = .sdata2:0x805AB2A4; // type:object size:0x4 scope:global data:float +@498 = .sdata2:0x805AB2A0; // type:object size:0x4 scope:global data:float +@608 = .sdata2:0x805AB2A4; // type:object size:0x4 scope:global data:float lbl_805AB0C8 = .sdata2:0x805AB2A8; // type:object size:0x4 scope:global data:float lbl_805AB0D0 = .sdata2:0x805AB2B0; // type:object size:0x8 scope:global data:double lbl_805AB0D8 = .sdata2:0x805AB2B8; // type:object size:0x4 scope:global data:float @@ -23839,10 +23840,10 @@ lbl_805AB5A4 = .sdata2:0x805AB784; // type:object size:0x4 scope:global data:flo lbl_805AB5A8 = .sdata2:0x805AB788; // type:object size:0x4 scope:global data:float lbl_805AB5AC = .sdata2:0x805AB78C; // type:object size:0x4 scope:global data:float lbl_805AB5B0 = .sdata2:0x805AB790; // type:object size:0x8 scope:global data:float -lbl_805AB5B8 = .sdata2:0x805AB798; // type:object size:0x4 scope:global data:float -lbl_805AB5BC = .sdata2:0x805AB79C; // type:object size:0x4 scope:global data:float -lbl_805AB5C0 = .sdata2:0x805AB7A0; // type:object size:0x4 scope:global data:float -lbl_805AB5C4 = .sdata2:0x805AB7A4; // type:object size:0x4 scope:global data:float +@354 = .sdata2:0x805AB798; // type:object size:0x4 scope:global data:float +@476 = .sdata2:0x805AB79C; // type:object size:0x4 scope:global data:float +@477 = .sdata2:0x805AB7A0; // type:object size:0x4 scope:global data:float +@566 = .sdata2:0x805AB7A4; // type:object size:0x4 scope:global data:float lbl_805AB5C8 = .sdata2:0x805AB7A8; // type:object size:0x4 scope:global data:float lbl_805AB5CC = .sdata2:0x805AB7AC; // type:object size:0x4 scope:global data:float lbl_805AB5D0 = .sdata2:0x805AB7B0; // type:object size:0x4 scope:global data:float @@ -24147,16 +24148,16 @@ lbl_805ABB0C = .sdata2:0x805ABCEC; // type:object size:0x4 scope:global data:flo lbl_805ABB10 = .sdata2:0x805ABCF0; // type:object size:0x8 scope:global data:float lbl_805ABB18 = .sdata2:0x805ABCF8; // type:object size:0x4 scope:global data:float lbl_805ABB1C = .sdata2:0x805ABCFC; // type:object size:0x4 scope:global data:float -@364 = .sdata2:0x805ABD00; // type:object size:0x4 scope:local data:float -@365 = .sdata2:0x805ABD04; // type:object size:0x4 scope:local data:float -@366 = .sdata2:0x805ABD08; // type:object size:0x4 scope:local data:float -@367 = .sdata2:0x805ABD0C; // type:object size:0x4 scope:local data:float -@368 = .sdata2:0x805ABD10; // type:object size:0x4 scope:local data:float -@369 = .sdata2:0x805ABD14; // type:object size:0x4 scope:local data:float -@370 = .sdata2:0x805ABD18; // type:object size:0x4 scope:local data:float -@371 = .sdata2:0x805ABD1C; // type:object size:0x4 scope:local data:float -@372 = .sdata2:0x805ABD20; // type:object size:0x4 scope:local data:float -@376 = .sdata2:0x805ABD24; // type:object size:0x4 scope:local data:float +@376 = .sdata2:0x805ABD00; // type:object size:0x4 scope:local data:float +@377 = .sdata2:0x805ABD04; // type:object size:0x4 scope:local data:float +@378 = .sdata2:0x805ABD08; // type:object size:0x4 scope:local data:float +@379 = .sdata2:0x805ABD0C; // type:object size:0x4 scope:local data:float +@380 = .sdata2:0x805ABD10; // type:object size:0x4 scope:local data:float +@381 = .sdata2:0x805ABD14; // type:object size:0x4 scope:local data:float +@382 = .sdata2:0x805ABD18; // type:object size:0x4 scope:local data:float +@383 = .sdata2:0x805ABD1C; // type:object size:0x4 scope:local data:float +@384 = .sdata2:0x805ABD20; // type:object size:0x4 scope:local data:float +@388 = .sdata2:0x805ABD24; // type:object size:0x4 scope:local data:float lbl_805ABB48 = .sdata2:0x805ABD28; // type:object size:0x4 scope:global data:float lbl_805ABB4C = .sdata2:0x805ABD2C; // type:object size:0x4 scope:global data:float lbl_805ABB50 = .sdata2:0x805ABD30; // type:object size:0x4 scope:global data:float @@ -26106,8 +26107,8 @@ lbl_805ADD40 = .sdata2:0x805ADF20; // type:object size:0x8 scope:global data:dou lbl_805ADD48 = .sdata2:0x805ADF28; // type:object size:0x4 scope:global data:float lbl_805ADD4C = .sdata2:0x805ADF2C; // type:object size:0x4 scope:global data:float lbl_805ADD50 = .sdata2:0x805ADF30; // type:object size:0x8 scope:global data:float -@171 = .sdata2:0x805ADF38; // type:object size:0x4 scope:local data:float -@172 = .sdata2:0x805ADF3C; // type:object size:0x4 scope:local data:float +@191 = .sdata2:0x805ADF38; // type:object size:0x4 scope:local data:float +@192 = .sdata2:0x805ADF3C; // type:object size:0x4 scope:local data:float lbl_805ADD60 = .sdata2:0x805ADF40; // type:object size:0x4 scope:global data:float lbl_805ADD64 = .sdata2:0x805ADF44; // type:object size:0x4 scope:global data:float lbl_805ADD68 = .sdata2:0x805ADF48; // type:object size:0x4 scope:global data:float @@ -26786,15 +26787,15 @@ lbl_805AEAF8 = .sdata2:0x805AECD8; // type:object size:0x4 scope:global data:flo lbl_805AEAFC = .sdata2:0x805AECDC; // type:object size:0x4 scope:global data:float lbl_805AEB00 = .sdata2:0x805AECE0; // type:object size:0x4 scope:global data:float lbl_805AEB04 = .sdata2:0x805AECE4; // type:object size:0x4 scope:global data:float -@38 = .sdata2:0x805AECE8; // type:object size:0x4 scope:local data:float -@43 = .sdata2:0x805AECEC; // type:object size:0x4 scope:local data:float -@144 = .sdata2:0x805AECF0; // type:object size:0x4 scope:local data:float -@172 = .sdata2:0x805AECF4; // type:object size:0x4 scope:local data:float -@173 = .sdata2:0x805AECF8; // type:object size:0x4 scope:local data:float -@174 = .sdata2:0x805AECFC; // type:object size:0x4 scope:local data:float +@37 = .sdata2:0x805AECE8; // type:object size:0x4 scope:local data:float +@42 = .sdata2:0x805AECEC; // type:object size:0x4 scope:local data:float +@143 = .sdata2:0x805AECF0; // type:object size:0x4 scope:local data:float +@171 = .sdata2:0x805AECF4; // type:object size:0x4 scope:local data:float +@172 = .sdata2:0x805AECF8; // type:object size:0x4 scope:local data:float +@173 = .sdata2:0x805AECFC; // type:object size:0x4 scope:local data:float @11 = .sdata2:0x805AED00; // type:object size:0x4 scope:local data:4byte @12 = .sdata2:0x805AED04; // type:object size:0x4 scope:local data:4byte -gx = .sdata2:0x805AED08; // type:object size:0x4 scope:global data:4byte +__GXData = .sdata2:0x805AED08; // type:object size:0x4 scope:global data:4byte lbl_805AEB2C = .sdata2:0x805AED0C; // type:object size:0x4 scope:global data:4byte lbl_805AEB30 = .sdata2:0x805AED10; // type:object size:0x4 scope:global data:4byte lbl_805AEB34 = .sdata2:0x805AED14; // type:object size:0x4 scope:global data:4byte diff --git a/configure.py b/configure.py index 4e8e70ca..0d0b4a08 100755 --- a/configure.py +++ b/configure.py @@ -445,7 +445,7 @@ config.libs = [ Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptCameraHint.cpp"), Object(NonMatching, "MetroidPrime/ScriptLoader.cpp"), Object(NonMatching, "MetroidPrime/CSamusDoll.cpp"), - Object(Matching, "MetroidPrime/Factories/CStateMachineFactory.cpp"), + Object(Matching if config.version == "GM8E01_00" else NonMatching, "MetroidPrime/Factories/CStateMachineFactory.cpp"), Object(Matching, "MetroidPrime/Weapons/CPlasmaBeam.cpp"), Object(Matching, "MetroidPrime/Weapons/CPowerBeam.cpp"), Object(NonMatching, "MetroidPrime/Weapons/CWaveBeam.cpp"), @@ -666,7 +666,7 @@ config.libs = [ Object(NonMatching, "MetroidPrime/Enemies/CEyeBall.cpp"), Object(NonMatching, "MetroidPrime/CIkChain.cpp"), Object(Matching, "MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.cpp"), - Object(Matching, "MetroidPrime/RumbleFxTable.cpp"), + Object(Matching if config.version == "GM8E01_00" else NonMatching, "MetroidPrime/RumbleFxTable.cpp"), Object(NonMatching, "MetroidPrime/Enemies/CElitePirate.cpp"), Object(Matching, "MetroidPrime/CRumbleManager.cpp"), Object(NonMatching, "MetroidPrime/Enemies/CBouncyGrenade.cpp"),