From e1867b885e4bdcf106d42526880008674f983da4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 9 Apr 2025 22:11:16 -0700 Subject: [PATCH] Fixup 0-01 symbols --- config/GM8E01_00/symbols.txt | 2 +- config/GM8E01_01/symbols.txt | 734 ++++++++++++------------- include/MetroidPrime/CMapWorldInfo.hpp | 4 +- src/MetroidPrime/CMapArea.cpp | 3 +- 4 files changed, 372 insertions(+), 371 deletions(-) diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 548532f8..1a51ef07 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -6087,7 +6087,7 @@ Accept__14CScriptHUDMemoFR8IVisitor = .text:0x800E832C; // type:function size:0x AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x800E8364; // type:function size:0x168 scope:global __dt__14CScriptHUDMemoFv = .text:0x800E84CC; // type:function size:0x98 scope:global __ct__14CScriptHUDMemoF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC13CHUDMemoParmsQ214CScriptHUDMemo12EDisplayTypeUib = .text:0x800E8564; // type:function size:0x20C scope:global -AdjustTransformForType__15CMappableObjectFv = .text:0x800E8770; // type:function size:0x2D4 scope:global +AdjustTransformForType__15CMappableObjectCFv = .text:0x800E8770; // type:function size:0x2D4 scope:global GetIsVisibleToAutoMapper__15CMappableObjectFbRC13CMapWorldInfo = .text:0x800E8A44; // type:function size:0x100 scope:global BuildSurfaceCenterPoint__15CMappableObjectCFi = .text:0x800E8B44; // type:function size:0x14C scope:global DrawDoorSurface__15CMappableObjectCFiRC13CMapWorldInfofib = .text:0x800E8C90; // type:function size:0x11C scope:global diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index d04263fb..aeb932bc 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -6087,7 +6087,7 @@ Accept__14CScriptHUDMemoFR8IVisitor = .text:0x800E83A8; // type:function size:0x AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager = .text:0x800E83E0; // type:function size:0x168 scope:global __dt__14CScriptHUDMemoFv = .text:0x800E8548; // type:function size:0x98 scope:global __ct__14CScriptHUDMemoF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC13CHUDMemoParmsQ214CScriptHUDMemo12EDisplayTypeUib = .text:0x800E85E0; // type:function size:0x20C scope:global -AdjustTransformForType__15CMappableObjectFv = .text:0x800E87EC; // type:function size:0x2D4 scope:global +AdjustTransformForType__15CMappableObjectCFv = .text:0x800E87EC; // type:function size:0x2D4 scope:global GetIsVisibleToAutoMapper__15CMappableObjectFbRC13CMapWorldInfo = .text:0x800E8AC0; // type:function size:0x100 scope:global BuildSurfaceCenterPoint__15CMappableObjectCFi = .text:0x800E8BC0; // type:function size:0x14C scope:global DrawDoorSurface__15CMappableObjectCFiRC13CMapWorldInfofib = .text:0x800E8D0C; // type:function size:0x11C scope:global @@ -13206,7 +13206,7 @@ __dt__25CColorOverrideInstructionFv = .text:0x802FE9CC; // type:function size:0x PageInvoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FEA28; // type:function size:0x2C scope:global Invoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FEA54; // type:function size:0x60 scope:global __ct__18CDrawStringOptionsFv = .text:0x802FEAB4; // type:function size:0xAC scope:global -__dt__16CFontInstructionFv = .text:0x802FEB60; // type:function size:0x80 scope:global +__dt__16CFontInstructionFv = .text:0x802FEB60; // type:function size:0x80 scope:weak PageInvoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FEBE0; // type:function size:0x2C scope:global GetAssetCount__16CFontInstructionCFv = .text:0x802FEC0C; // type:function size:0x8 scope:global GetAssets__16CFontInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator> = .text:0x802FEC14; // type:function size:0x10C scope:global @@ -15795,9 +15795,9 @@ OSReceiveMessage = .text:0x80382B14; // type:function size:0xDC scope:global OnReset = .text:0x80382BF0; // type:function size:0x3C scope:local MEMIntrruptHandler = .text:0x80382C2C; // type:function size:0x6C scope:local OSProtectRange = .text:0x80382C98; // type:function size:0xC4 scope:global -Config24MB = .text:0x80382D5C; // type:function size:0x80 scope:global -Config48MB = .text:0x80382DDC; // type:function size:0x80 scope:global -RealMode = .text:0x80382E5C; // type:function size:0x18 scope:global +Config24MB = .text:0x80382D5C; // type:function size:0x80 scope:local +Config48MB = .text:0x80382DDC; // type:function size:0x80 scope:local +RealMode = .text:0x80382E5C; // type:function size:0x18 scope:local __OSInitMemoryProtection = .text:0x80382E74; // type:function size:0x120 scope:global __OSUnlockAllMutex = .text:0x80382F94; // type:function size:0x70 scope:global Run = .text:0x80383004; // type:function size:0x10 scope:local @@ -16658,8 +16658,8 @@ __THPHuffDecodeDCTCompU = .text:0x803C84B4; // type:function size:0x6A8 scope:lo __THPHuffDecodeDCTCompV = .text:0x803C8B5C; // type:function size:0x6A8 scope:local THPInit = .text:0x803C9204; // type:function size:0xA0 scope:global THPAudioDecode = .text:0x803C92A4; // type:function size:0x464 scope:global -__THPAudioGetNewSample = .text:0x803C9708; // type:function size:0x90 scope:global -__THPAudioInitialize = .text:0x803C9798; // type:function size:0x3C scope:global +__THPAudioGetNewSample = .text:0x803C9708; // type:function size:0x90 scope:local +__THPAudioInitialize = .text:0x803C9798; // type:function size:0x3C scope:local ShortCommandProc = .text:0x803C97D4; // type:function size:0x54 scope:local GBAInit = .text:0x803C9828; // type:function size:0xA4 scope:global GBAGetStatusAsync = .text:0x803C98CC; // type:function size:0x64 scope:global @@ -17847,8 +17847,8 @@ lbl_803D70A8 = .rodata:0x803D70A8; // type:object size:0x1F8 lbl_803D72A0 = .rodata:0x803D72A0; // type:object size:0x2C8 lbl_803D7568 = .rodata:0x803D7568; // type:object size:0x10 lbl_803D7578 = .rodata:0x803D7578; // type:object size:0x8 -lbl_803D7580 = .rodata:0x803D7580; // type:object size:0x18 -lbl_803D7598 = .rodata:0x803D7598; // type:object size:0x10 +indMtx$268 = .rodata:0x803D7580; // type:object size:0x18 scope:local +vtxDescList$289 = .rodata:0x803D7598; // type:object size:0x10 scope:local lbl_803D75A8 = .rodata:0x803D75A8; // type:object size:0x20 @stringBase0 = .rodata:0x803D75C8; // type:object size:0x7 scope:local data:string_table @477 = .rodata:0x803D75D0; // type:object size:0x10 scope:local data:4byte @@ -18179,7 +18179,7 @@ jumptable_803DB05C = .data:0x803DB05C; // type:object size:0x2C scope:local jumptable_803DB088 = .data:0x803DB088; // type:object size:0x2C scope:local jumptable_803DB0B4 = .data:0x803DB0B4; // type:object size:0x1C scope:local __vt__14CScriptCounter = .data:0x803DB0D0; // type:object size:0x20 -@250 = .data:0x803DB0F0; // type:object size:0x24 scope:local +@252 = .data:0x803DB0F0; // type:object size:0x24 scope:local lbl_803DB118 = .data:0x803DB118; // type:object size:0x10 lbl_803DB128 = .data:0x803DB128; // type:object size:0x10 lbl_803DB138 = .data:0x803DB138; // type:object size:0xD74 data:4byte @@ -18280,7 +18280,7 @@ __vt__14CBCScriptedCmd = .data:0x803E0020; // type:object size:0xC scope:weak __vt__20CConsoleOutputWindow = .data:0x803E0030; // type:object size:0x1C lbl_803E0050 = .data:0x803E0050; // type:object size:0x80 __vt__7CWeapon = .data:0x803E00D0; // type:object size:0x6C -@389 = .data:0x803E013C; // type:object size:0x24 scope:local +@391 = .data:0x803E013C; // type:object size:0x24 scope:local __vt__16CLightParameters = .data:0x803E0160; // type:object size:0xC lbl_803E0170 = .data:0x803E0170; // type:object size:0x2CC jumptable_803E043C = .data:0x803E043C; // type:object size:0x48 scope:local @@ -18517,7 +18517,7 @@ jumptable_803E785C = .data:0x803E785C; // type:object size:0xC4 scope:local lbl_803E7920 = .data:0x803E7920; // type:object size:0xC data:4byte lbl_803E792C = .data:0x803E792C; // type:object size:0x2CC jumptable_803E7BF8 = .data:0x803E7BF8; // type:object size:0x58 scope:local -lbl_803E7C50 = .data:0x803E7C50; // type:object size:0x70 +__vt__24CScriptCameraPitchVolume = .data:0x803E7C50; // type:object size:0x6C lbl_803E7CC0 = .data:0x803E7CC0; // type:object size:0x2E0 jumptable_803E7FA0 = .data:0x803E7FA0; // type:object size:0x60 scope:local jumptable_803E8000 = .data:0x803E8000; // type:object size:0xAC scope:local @@ -18746,7 +18746,7 @@ __vt__15CARAMDvdRequest = .data:0x803ED758; // type:object size:0x1C __vt__15CRealDvdRequest = .data:0x803ED774; // type:object size:0x1C __vt__17CColorInstruction = .data:0x803ED790; // type:object size:0x1C __vt__25CColorOverrideInstruction = .data:0x803ED7B0; // type:object size:0x1C -__vt__16CFontInstruction = .data:0x803ED7D0; // type:object size:0x20 +__vt__16CFontInstruction = .data:0x803ED7D0; // type:object size:0x1C __vt__26CLineExtraSpaceInstruction = .data:0x803ED7F0; // type:object size:0x1C lbl_803ED810 = .data:0x803ED810; // type:object size:0x1C jumptable_803ED82C = .data:0x803ED82C; // type:object size:0x28 scope:local @@ -19097,7 +19097,7 @@ __lconv = .data:0x803F2F00; // type:object size:0x38 data:4byte jumptable_803F2FBC = .data:0x803F2FBC; // type:object size:0x84 scope:local jumptable_803F3040 = .data:0x803F3040; // type:object size:0xE0 scope:local jumptable_803F3120 = .data:0x803F3120; // type:object size:0x44 scope:local -@1682 = .data:0x803F3168; // type:object size:0x50 scope:local +@1680 = .data:0x803F3168; // type:object size:0x50 scope:local kf$483 = .data:0x803F31B8; // type:object size:0x1A scope:local midi2TimeTab = .data:0x803F31D4; // type:object size:0x200 scope:local mask$1021 = .data:0x803F33D8; // type:object size:0x20 scope:local @@ -19110,7 +19110,7 @@ tonedown_tab = .data:0x803F3800; // type:object size:0x200 scope:local dspAttenuationTab = .data:0x803F3A00; // type:object size:0x184 dspScale2IndexTab = .data:0x803F3B84; // type:object size:0x400 dspDLSVolTab = .data:0x803F3F84; // type:object size:0x204 -dspSRCCycles = .data:0x803F4188; // type:object size:0x12 +dspSRCCycles = .data:0x803F4188; // type:object size:0x12 scope:local musyx_vol_tab = .data:0x803F41A0; // type:object size:0x204 scope:local ...data.0 = .data:0x803F41A0; // type:label scope:local pan_tab = .data:0x803F43A4; // type:object size:0x10 scope:local @@ -19203,7 +19203,7 @@ lbl_8045C778 = .bss:0x8045C778; // type:object size:0xC lbl_8045C784 = .bss:0x8045C784; // type:object size:0x10 lbl_8045C794 = .bss:0x8045C794; // type:object size:0xF3C8 lbl_8046BB5C = .bss:0x8046BB5C; // type:object size:0xA3C -@166 = .bss:0x8046C598; // type:object size:0xC scope:local +@168 = .bss:0x8046C598; // type:object size:0xC scope:local lbl_8046C5A8 = .bss:0x8046C5A8; // type:object size:0xC align:4 data:float lbl_8046C5B4 = .bss:0x8046C5B4; // type:object size:0xC data:4byte lbl_8046C5C0 = .bss:0x8046C5C0; // type:object size:0x28 align:4 data:float @@ -19213,7 +19213,7 @@ lbl_8046C618 = .bss:0x8046C618; // type:object size:0x18 data:4byte lbl_8046C630 = .bss:0x8046C630; // type:object size:0x20 data:2byte lbl_8046C650 = .bss:0x8046C650; // type:object size:0xC align:4 data:float lbl_8046C65C = .bss:0x8046C65C; // type:object size:0xC align:4 data:float -@286 = .bss:0x8046C668; // type:object size:0xC scope:local +@314 = .bss:0x8046C668; // type:object size:0xC scope:local lbl_8046C678 = .bss:0x8046C678; // type:object size:0x60 align:4 data:float lbl_8046C6D8 = .bss:0x8046C6D8; // type:object size:0xC lbl_8046C6E4 = .bss:0x8046C6E4; // type:object size:0x1C data:4byte @@ -19224,7 +19224,7 @@ lbl_8046C744 = .bss:0x8046C744; // type:object size:0xC lbl_8046C750 = .bss:0x8046C750; // type:object size:0xA8 lbl_8046C7F8 = .bss:0x8046C7F8; // type:object size:0x108 lbl_8046C900 = .bss:0x8046C900; // type:object size:0x18 data:4byte -result$293 = .bss:0x8046C918; // type:object size:0xC scope:local align:4 data:float +result$448 = .bss:0x8046C918; // type:object size:0xC scope:local align:4 data:float lbl_8046C928 = .bss:0x8046C928; // type:object size:0x10 lbl_8046C938 = .bss:0x8046C938; // type:object size:0x18 data:4byte lbl_8046C950 = .bss:0x8046C950; // type:object size:0x18 data:4byte @@ -19277,7 +19277,7 @@ lbl_80479738 = .bss:0x80479738; // type:object size:0x48 align:4 data:float stringize_Buffer$11 = .bss:0x80479780; // type:object size:0x200 scope:local rs_debugger_buffer = .bss:0x80479980; // type:object size:0x400 scope:local lbl_80479D80 = .bss:0x80479D80; // type:object size:0x30 -lbl_80479DB0 = .bss:0x80479DB0; // type:object size:0xF0 data:4byte +sVtxDescList = .bss:0x80479DB0; // type:object size:0xF0 scope:local data:4byte lbl_80479EA0 = .bss:0x80479EA0; // type:object size:0x46000 lbl_804BFEA0 = .bss:0x804BFEA0; // type:object size:0x50 sLoadedTextures = .bss:0x804BFEF0; // type:object size:0x20 scope:local @@ -19535,7 +19535,7 @@ lbl_805A5178 = .bss:0x805A5178; // type:object size:0x1E0 data:4byte lbl_805A5358 = .bss:0x805A5358; // type:object size:0x9C data:4byte lbl_805A53F4 = .bss:0x805A53F4; // type:object size:0x154 data:4byte lbl_805A5548 = .bss:0x805A5548; // type:object size:0x60 data:4byte -kDefaultPosition__6CLight = .bss:0x805A55A8; // type:object size:0xC align:4 data:float +kDefaultPosition__6CLight = .bss:0x805A55A8; // type:object size:0x18 align:4 data:float kDefaultDirection__6CLight = .bss:0x805A55C0; // type:object size:0xC align:4 data:float sGXState__3CGX = .bss:0x805A55CC; // type:object size:0x260 data:4byte kEnvPassthru__13CTevCombiners = .bss:0x805A582C; // type:object size:0x4C @@ -19568,7 +19568,7 @@ sIdentity__9CMatrix3f = .bss:0x805A67DC; // type:object size:0x24 sIdentity__9CMatrix4f = .bss:0x805A6800; // type:object size:0x40 align:4 data:float sNoRotation__11CQuaternion = .bss:0x805A6840; // type:object size:0x10 align:4 data:float sIdentity__12CTransform4f = .bss:0x805A6850; // type:object size:0x30 align:4 data:float -sZeroVector__9CVector3f = .bss:0x805A6880; // type:object size:0xC align:4 data:float +sZeroVector__9CVector3f = .bss:0x805A6880; // type:object size:0x54 align:4 data:float sUpVector__9CVector3f = .bss:0x805A68D4; // type:object size:0xC align:4 data:float sDownVector__9CVector3f = .bss:0x805A68E0; // type:object size:0xC align:4 data:float sLeftVector__9CVector3f = .bss:0x805A68EC; // type:object size:0xC align:4 data:float @@ -19755,7 +19755,7 @@ lbl_805A7048 = .sdata:0x805A7048; // type:object size:0x4 data:4byte lbl_805A704C = .sdata:0x805A704C; // type:object size:0x2 data:2byte lbl_805A7050 = .sdata:0x805A7050; // type:object size:0x4 lbl_805A7054 = .sdata:0x805A7054; // type:object size:0x4 -@207 = .sdata:0x805A7058; // type:object size:0x4 scope:local data:4byte +@209 = .sdata:0x805A7058; // type:object size:0x4 scope:local data:4byte lbl_805A7060 = .sdata:0x805A7060; // type:object size:0x4 data:4byte lbl_805A7064 = .sdata:0x805A7064; // type:object size:0x4 lbl_805A7068 = .sdata:0x805A7068; // type:object size:0x4 @@ -19823,7 +19823,7 @@ lbl_805A7168 = .sdata:0x805A7168; // type:object size:0x4 lbl_805A716C = .sdata:0x805A716C; // type:object size:0x4 lbl_805A7170 = .sdata:0x805A7170; // type:object size:0x4 data:4byte lbl_805A7174 = .sdata:0x805A7174; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A7178; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7178; // type:object size:0x4 scope:local data:4byte lbl_805A7180 = .sdata:0x805A7180; // type:object size:0x4 data:4byte lbl_805A7184 = .sdata:0x805A7184; // type:object size:0x4 data:4byte lbl_805A7188 = .sdata:0x805A7188; // type:object size:0x4 data:4byte @@ -19973,8 +19973,8 @@ lbl_805A73E0 = .sdata:0x805A73E0; // type:object size:0x4 data:4byte lbl_805A73E4 = .sdata:0x805A73E4; // type:object size:0x4 data:4byte lbl_805A73E8 = .sdata:0x805A73E8; // type:object size:0x4 data:4byte lbl_805A73EC = .sdata:0x805A73EC; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A73F0; // type:object size:0x4 scope:local data:4byte -@206 = .sdata:0x805A73F8; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A73F0; // type:object size:0x4 scope:local data:4byte +@208 = .sdata:0x805A73F8; // type:object size:0x4 scope:local data:4byte lbl_805A7400 = .sdata:0x805A7400; // type:object size:0x1 data:byte lbl_805A7401 = .sdata:0x805A7401; // type:object size:0x1 data:byte lbl_805A7402 = .sdata:0x805A7402; // type:object size:0x1 data:byte @@ -20010,7 +20010,7 @@ lbl_805A745C = .sdata:0x805A745C; // type:object size:0x1 data:byte lbl_805A745D = .sdata:0x805A745D; // type:object size:0x1 data:byte lbl_805A745E = .sdata:0x805A745E; // type:object size:0x1 data:byte skDrawInDistance = .sdata:0x805A7460; // type:object size:0x4 scope:local align:4 data:float -@390 = .sdata:0x805A7464; // type:object size:0x4 scope:local align:4 data:float +@418 = .sdata:0x805A7464; // type:object size:0x4 scope:local align:4 data:float lbl_805A7468 = .sdata:0x805A7468; // type:object size:0x4 data:4byte lbl_805A746C = .sdata:0x805A746C; // type:object size:0x4 data:4byte lbl_805A7470 = .sdata:0x805A7470; // type:object size:0x4 data:4byte @@ -20047,9 +20047,9 @@ lbl_805A74F0 = .sdata:0x805A74F0; // type:object size:0x4 align:4 data:float lbl_805A74F4 = .sdata:0x805A74F4; // type:object size:0x4 align:4 data:float lbl_805A74F8 = .sdata:0x805A74F8; // type:object size:0x4 lbl_805A74FC = .sdata:0x805A74FC; // type:object size:0x4 -@333 = .sdata:0x805A7500; // type:object size:0x4 scope:local align:4 data:float -@270 = .sdata:0x805A7508; // type:object size:0x1 scope:local data:byte -@339 = .sdata:0x805A7509; // type:object size:0x1 scope:local data:byte +@361 = .sdata:0x805A7500; // type:object size:0x4 scope:local align:4 data:float +@298 = .sdata:0x805A7508; // type:object size:0x1 scope:local data:byte +@367 = .sdata:0x805A7509; // type:object size:0x1 scope:local data:byte lbl_805A7510 = .sdata:0x805A7510; // type:object size:0x4 data:4byte lbl_805A7514 = .sdata:0x805A7514; // type:object size:0x4 data:4byte lbl_805A7518 = .sdata:0x805A7518; // type:object size:0x4 data:4byte @@ -20182,7 +20182,7 @@ lbl_805A7728 = .sdata:0x805A7728; // type:object size:0x1 data:byte lbl_805A772C = .sdata:0x805A772C; // type:object size:0x4 data:4byte lbl_805A7730 = .sdata:0x805A7730; // type:object size:0x4 align:4 data:float lbl_805A7734 = .sdata:0x805A7734; // type:object size:0x4 data:4byte -@262 = .sdata:0x805A7738; // type:object size:0x4 scope:local +@264 = .sdata:0x805A7738; // type:object size:0x4 scope:local lbl_805A7740 = .sdata:0x805A7740; // type:object size:0x1 data:byte lbl_805A7744 = .sdata:0x805A7744; // type:object size:0x4 data:4byte lbl_805A7748 = .sdata:0x805A7748; // type:object size:0x4 data:4byte @@ -20259,7 +20259,7 @@ lbl_805A7874 = .sdata:0x805A7874; // type:object size:0x4 lbl_805A7878 = .sdata:0x805A7878; // type:object size:0x4 lbl_805A787C = .sdata:0x805A787C; // type:object size:0x4 lbl_805A7880 = .sdata:0x805A7880; // type:object size:0x8 -@205 = .sdata:0x805A7888; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7888; // type:object size:0x4 scope:local data:4byte lbl_805A7890 = .sdata:0x805A7890; // type:object size:0x4 data:4byte lbl_805A7894 = .sdata:0x805A7894; // type:object size:0x4 data:4byte lbl_805A7898 = .sdata:0x805A7898; // type:object size:0x4 align:4 data:float @@ -20270,8 +20270,8 @@ lbl_805A78AC = .sdata:0x805A78AC; // type:object size:0x4 align:4 data:float lbl_805A78B0 = .sdata:0x805A78B0; // type:object size:0x8 align:4 data:float lbl_805A78B8 = .sdata:0x805A78B8; // type:object size:0x4 data:4byte lbl_805A78BC = .sdata:0x805A78BC; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A78C0; // type:object size:0x4 scope:local data:4byte -@286 = .sdata:0x805A78C8; // type:object size:0x4 scope:local align:4 data:float +@207 = .sdata:0x805A78C0; // type:object size:0x4 scope:local data:4byte +@441 = .sdata:0x805A78C8; // type:object size:0x4 scope:local align:4 data:float lbl_805A78D0 = .sdata:0x805A78D0; // type:object size:0x4 data:4byte lbl_805A78D4 = .sdata:0x805A78D4; // type:object size:0x4 data:4byte lbl_805A78D8 = .sdata:0x805A78D8; // type:object size:0x4 data:4byte @@ -20314,7 +20314,7 @@ lbl_805A7970 = .sdata:0x805A7970; // type:object size:0x4 data:4byte lbl_805A7974 = .sdata:0x805A7974; // type:object size:0x4 data:4byte lbl_805A7978 = .sdata:0x805A7978; // type:object size:0x8 data:4byte lbl_805A7980 = .sdata:0x805A7980; // type:object size:0x8 data:4byte -@205 = .sdata:0x805A7988; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7988; // type:object size:0x4 scope:local data:4byte lbl_805A7990 = .sdata:0x805A7990; // type:object size:0x8 data:4byte lbl_805A7998 = .sdata:0x805A7998; // type:object size:0x4 data:4byte lbl_805A799C = .sdata:0x805A799C; // type:object size:0x4 data:4byte @@ -20324,13 +20324,13 @@ lbl_805A79A8 = .sdata:0x805A79A8; // type:object size:0x4 data:4byte lbl_805A79AC = .sdata:0x805A79AC; // type:object size:0x4 data:4byte lbl_805A79B0 = .sdata:0x805A79B0; // type:object size:0x4 data:4byte lbl_805A79B4 = .sdata:0x805A79B4; // type:object size:0x4 data:4byte -@238 = .sdata:0x805A79B8; // type:object size:0x4 scope:local data:4byte -@239 = .sdata:0x805A79BC; // type:object size:0x4 scope:local data:4byte -@240 = .sdata:0x805A79C0; // type:object size:0x4 scope:local data:4byte -@241 = .sdata:0x805A79C4; // type:object size:0x4 scope:local data:4byte -@242 = .sdata:0x805A79C8; // type:object size:0x4 scope:local data:4byte -@243 = .sdata:0x805A79CC; // type:object size:0x4 scope:local data:4byte -@244 = .sdata:0x805A79D0; // type:object size:0x4 scope:local data:4byte +@401 = .sdata:0x805A79B8; // type:object size:0x4 scope:local data:4byte +@402 = .sdata:0x805A79BC; // type:object size:0x4 scope:local data:4byte +@403 = .sdata:0x805A79C0; // type:object size:0x4 scope:local data:4byte +@404 = .sdata:0x805A79C4; // type:object size:0x4 scope:local data:4byte +@405 = .sdata:0x805A79C8; // type:object size:0x4 scope:local data:4byte +@406 = .sdata:0x805A79CC; // type:object size:0x4 scope:local data:4byte +@407 = .sdata:0x805A79D0; // type:object size:0x4 scope:local data:4byte lbl_805A79D8 = .sdata:0x805A79D8; // type:object size:0x4 data:4byte lbl_805A79DC = .sdata:0x805A79DC; // type:object size:0x4 data:4byte lbl_805A79E0 = .sdata:0x805A79E0; // type:object size:0x8 data:4byte @@ -20358,7 +20358,7 @@ lbl_805A7A3C = .sdata:0x805A7A3C; // type:object size:0x4 data:4byte lbl_805A7A40 = .sdata:0x805A7A40; // type:object size:0x8 data:4byte lbl_805A7A48 = .sdata:0x805A7A48; // type:object size:0x4 lbl_805A7A4C = .sdata:0x805A7A4C; // type:object size:0x4 -@223 = .sdata:0x805A7A50; // type:object size:0x4 scope:local data:4byte +@225 = .sdata:0x805A7A50; // type:object size:0x4 scope:local data:4byte lbl_805A7A58 = .sdata:0x805A7A58; // type:object size:0x4 data:4byte lbl_805A7A5C = .sdata:0x805A7A5C; // type:object size:0x4 data:4byte lbl_805A7A60 = .sdata:0x805A7A60; // type:object size:0x4 data:4byte @@ -20370,7 +20370,7 @@ lbl_805A7A74 = .sdata:0x805A7A74; // type:object size:0x4 lbl_805A7A78 = .sdata:0x805A7A78; // type:object size:0x4 lbl_805A7A7C = .sdata:0x805A7A7C; // type:object size:0x4 lbl_805A7A80 = .sdata:0x805A7A80; // type:object size:0x8 data:4byte -@209 = .sdata:0x805A7A88; // type:object size:0x4 scope:local data:4byte +@211 = .sdata:0x805A7A88; // type:object size:0x4 scope:local data:4byte lbl_805A7A90 = .sdata:0x805A7A90; // type:object size:0x4 data:4byte lbl_805A7A94 = .sdata:0x805A7A94; // type:object size:0x4 data:4byte lbl_805A7A98 = .sdata:0x805A7A98; // type:object size:0x4 data:4byte @@ -20491,8 +20491,8 @@ lbl_805A7C70 = .sdata:0x805A7C70; // type:object size:0x8 align:8 data:double lbl_805A7C78 = .sdata:0x805A7C78; // type:object size:0x8 align:4 data:float lbl_805A7C80 = .sdata:0x805A7C80; // type:object size:0x4 data:4byte lbl_805A7C84 = .sdata:0x805A7C84; // type:object size:0x4 align:4 data:float -@205 = .sdata:0x805A7C88; // type:object size:0x4 scope:local data:4byte -@220 = .sdata:0x805A7C90; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7C88; // type:object size:0x4 scope:local data:4byte +@384 = .sdata:0x805A7C90; // type:object size:0x4 scope:local data:4byte lbl_805A7C98 = .sdata:0x805A7C98; // type:object size:0x4 lbl_805A7C9C = .sdata:0x805A7C9C; // type:object size:0x4 lbl_805A7CA0 = .sdata:0x805A7CA0; // type:object size:0x4 align:4 data:float @@ -20662,8 +20662,8 @@ lbl_805A7F4C = .sdata:0x805A7F4C; // type:object size:0x1 data:byte lbl_805A7F4D = .sdata:0x805A7F4D; // type:object size:0x1 data:byte lbl_805A7F4E = .sdata:0x805A7F4E; // type:object size:0x2 lbl_805A7F50 = .sdata:0x805A7F50; // type:object size:0x8 -@242 = .sdata:0x805A7F58; // type:object size:0x4 scope:local data:4byte -@389 = .sdata:0x805A7F60; // type:object size:0x4 scope:local align:4 data:float +@244 = .sdata:0x805A7F58; // type:object size:0x4 scope:local data:4byte +@417 = .sdata:0x805A7F60; // type:object size:0x4 scope:local align:4 data:float lbl_805A7F68 = .sdata:0x805A7F68; // type:object size:0x4 lbl_805A7F6C = .sdata:0x805A7F6C; // type:object size:0x4 lbl_805A7F70 = .sdata:0x805A7F70; // type:object size:0x8 data:4byte @@ -20702,7 +20702,7 @@ lbl_805A7FF4 = .sdata:0x805A7FF4; // type:object size:0x4 data:4byte lbl_805A7FF8 = .sdata:0x805A7FF8; // type:object size:0x4 data:4byte lbl_805A7FFC = .sdata:0x805A7FFC; // type:object size:0x4 lbl_805A8000 = .sdata:0x805A8000; // type:object size:0x8 -@205 = .sdata:0x805A8008; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A8008; // type:object size:0x4 scope:local data:4byte lbl_805A8010 = .sdata:0x805A8010; // type:object size:0x4 align:4 data:float lbl_805A8014 = .sdata:0x805A8014; // type:object size:0x4 align:4 data:float lbl_805A8018 = .sdata:0x805A8018; // type:object size:0x4 @@ -20776,13 +20776,13 @@ lbl_805A8138 = .sdata:0x805A8138; // type:object size:0x4 data:4byte lbl_805A813C = .sdata:0x805A813C; // type:object size:0x4 data:4byte lbl_805A8140 = .sdata:0x805A8140; // type:object size:0x4 align:4 data:float lbl_805A8144 = .sdata:0x805A8144; // type:object size:0x4 align:4 data:float -@251 = .sdata:0x805A8148; // type:object size:0x4 scope:local data:4byte -@336 = .sdata:0x805A814C; // type:object size:0x4 scope:local data:4byte -@400 = .sdata:0x805A8150; // type:object size:0x4 scope:local data:4byte -@401 = .sdata:0x805A8154; // type:object size:0x4 scope:local data:4byte -@402 = .sdata:0x805A8158; // type:object size:0x4 scope:local data:4byte -@403 = .sdata:0x805A815C; // type:object size:0x4 scope:local data:4byte -@404 = .sdata:0x805A8160; // type:object size:0x4 scope:local data:4byte +@390 = .sdata:0x805A8148; // type:object size:0x4 scope:local data:4byte +@475 = .sdata:0x805A814C; // type:object size:0x4 scope:local data:4byte +@539 = .sdata:0x805A8150; // type:object size:0x4 scope:local data:4byte +@540 = .sdata:0x805A8154; // type:object size:0x4 scope:local data:4byte +@541 = .sdata:0x805A8158; // type:object size:0x4 scope:local data:4byte +@542 = .sdata:0x805A815C; // type:object size:0x4 scope:local data:4byte +@543 = .sdata:0x805A8160; // type:object size:0x4 scope:local data:4byte lbl_805A8168 = .sdata:0x805A8168; // type:object size:0x4 lbl_805A816C = .sdata:0x805A816C; // type:object size:0x4 lbl_805A8170 = .sdata:0x805A8170; // type:object size:0x4 @@ -20839,7 +20839,7 @@ lbl_805A823C = .sdata:0x805A823C; // type:object size:0x4 data:4byte lbl_805A8240 = .sdata:0x805A8240; // type:object size:0x4 data:4byte lbl_805A8244 = .sdata:0x805A8244; // type:object size:0x4 data:4byte lbl_805A8248 = .sdata:0x805A8248; // type:object size:0x8 data:4byte -@205 = .sdata:0x805A8250; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A8250; // type:object size:0x4 scope:local data:4byte lbl_805A8258 = .sdata:0x805A8258; // type:object size:0x1 data:byte lbl_805A825C = .sdata:0x805A825C; // type:object size:0x4 align:4 data:float lbl_805A8260 = .sdata:0x805A8260; // type:object size:0x1 data:byte @@ -20880,7 +20880,7 @@ lbl_805A82F0 = .sdata:0x805A82F0; // type:object size:0x4 lbl_805A82F4 = .sdata:0x805A82F4; // type:object size:0x4 lbl_805A82F8 = .sdata:0x805A82F8; // type:object size:0x4 lbl_805A82FC = .sdata:0x805A82FC; // type:object size:0x4 -lbl_805A8300 = .sdata:0x805A8300; // type:object size:0x8 data:4byte +@295 = .sdata:0x805A8300; // type:object size:0x4 scope:local data:4byte lbl_805A8308 = .sdata:0x805A8308; // type:object size:0x4 data:4byte lbl_805A830C = .sdata:0x805A830C; // type:object size:0x4 data:4byte lbl_805A8310 = .sdata:0x805A8310; // type:object size:0x4 data:4byte @@ -20981,7 +20981,7 @@ lbl_805A8494 = .sdata:0x805A8494; // type:object size:0x4 data:4byte @141 = .sdata:0x805A849C; // type:object size:0x4 scope:local align:4 data:float lbl_805A84A0 = .sdata:0x805A84A0; // type:object size:0x4 data:4byte lbl_805A84A4 = .sdata:0x805A84A4; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A84A8; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A84A8; // type:object size:0x4 scope:local data:4byte lbl_805A84B0 = .sdata:0x805A84B0; // type:object size:0x1 data:byte lbl_805A84B1 = .sdata:0x805A84B1; // type:object size:0x1 lbl_805A84B2 = .sdata:0x805A84B2; // type:object size:0x1 data:byte @@ -21028,7 +21028,7 @@ lbl_805A8560 = .sdata:0x805A8560; // type:object size:0x4 data:4byte lbl_805A8564 = .sdata:0x805A8564; // type:object size:0x4 data:4byte lbl_805A8568 = .sdata:0x805A8568; // type:object size:0x8 data:4byte SolidMaterial = .sdata:0x805A8570; // type:object size:0x4 scope:local data:4byte -@223 = .sdata:0x805A8574; // type:object size:0x4 scope:local data:4byte +@387 = .sdata:0x805A8574; // type:object size:0x4 scope:local data:4byte @289 = .sdata:0x805A8578; // type:object size:0x4 scope:local align:4 data:float @294 = .sdata:0x805A857C; // type:object size:0x4 scope:local align:4 data:float lbl_805A8580 = .sdata:0x805A8580; // type:object size:0x4 data:4byte @@ -21298,12 +21298,12 @@ lbl_805A89D3 = .sdata:0x805A89D3; // type:object size:0x5 data:byte lbl_805A89D8 = .sdata:0x805A89D8; // type:object size:0x8 data:4byte @105 = .sdata:0x805A89E0; // type:object size:0x4 scope:local data:4byte @140 = .sdata:0x805A89E8; // type:object size:0x1 scope:local data:byte -lbl_805A89F0 = .sdata:0x805A89F0; // type:object size:0x4 align:4 data:float -lbl_805A89F4 = .sdata:0x805A89F4; // type:object size:0x4 align:4 data:float -lbl_805A89F8 = .sdata:0x805A89F8; // type:object size:0x4 align:4 data:float -lbl_805A89FC = .sdata:0x805A89FC; // type:object size:0x4 align:4 data:float -lbl_805A8A00 = .sdata:0x805A8A00; // type:object size:0x1 data:byte -lbl_805A8A04 = .sdata:0x805A8A04; // type:object size:0x4 data:4byte +@144 = .sdata:0x805A89F0; // type:object size:0x4 scope:local align:4 data:float +@145 = .sdata:0x805A89F4; // type:object size:0x4 scope:local align:4 data:float +@149 = .sdata:0x805A89F8; // type:object size:0x4 scope:local align:4 data:float +@150 = .sdata:0x805A89FC; // type:object size:0x4 scope:local align:4 data:float +sValidPasses__13CTevCombiners = .sdata:0x805A8A00; // type:object size:0x2 data:byte +sNumEnabledPasses__13CTevCombiners = .sdata:0x805A8A04; // type:object size:0x4 data:4byte kEnvPassthru__9CGraphics = .sdata:0x805A8A08; // type:object size:0x4 data:4byte lbl_805A8A0C = .sdata:0x805A8A0C; // type:object size:0x1 data:byte lbl_805A8A10 = .sdata:0x805A8A10; // type:object size:0x4 data:4byte @@ -21566,8 +21566,8 @@ lbl_805A8EA0 = .sbss:0x805A8EA0; // type:object size:0x4 data:4byte lbl_805A8EA4 = .sbss:0x805A8EA4; // type:object size:0x1 data:byte lbl_805A8EA8 = .sbss:0x805A8EA8; // type:object size:0x4 data:4byte lbl_805A8EAC = .sbss:0x805A8EAC; // type:object size:0x4 data:4byte -sReferenceCount$360 = .sbss:0x805A8EB0; // type:object size:0x4 scope:local data:4byte -init$361 = .sbss:0x805A8EB4; // type:object size:0x1 scope:local data:byte +sReferenceCount$362 = .sbss:0x805A8EB0; // type:object size:0x4 scope:local data:4byte +init$363 = .sbss:0x805A8EB4; // type:object size:0x1 scope:local data:byte gpTweakPlayer = .sbss:0x805A8EB8; // type:object size:0x4 data:4byte lbl_805A8EBC = .sbss:0x805A8EBC; // type:object size:0x4 data:4byte gpTweakGame = .sbss:0x805A8EC0; // type:object size:0x4 data:4byte @@ -21579,7 +21579,7 @@ lbl_805A8ED4 = .sbss:0x805A8ED4; // type:object size:0x4 data:4byte gpTweakGui = .sbss:0x805A8ED8; // type:object size:0x4 data:4byte gpTweakGuiColors = .sbss:0x805A8EDC; // type:object size:0x4 data:4byte lbl_805A8EE0 = .sbss:0x805A8EE0; // type:object size:0x4 data:4byte -lbl_805A8EE4 = .sbss:0x805A8EE4; // type:object size:0x4 data:4byte +gpTweakAutoMapper = .sbss:0x805A8EE4; // type:object size:0x4 data:4byte lbl_805A8EE8 = .sbss:0x805A8EE8; // type:object size:0x4 data:4byte lbl_805A8EEC = .sbss:0x805A8EEC; // type:object size:0x4 data:4byte lbl_805A8EF0 = .sbss:0x805A8EF0; // type:object size:0x4 data:4byte @@ -21717,7 +21717,7 @@ lbl_805A9148 = .sbss:0x805A9148; // type:object size:0x4 data:4byte lbl_805A914C = .sbss:0x805A914C; // type:object size:0x4 data:4byte g_BillboardCount__19CHUDBillboardEffect = .sbss:0x805A9150; // type:object size:0x4 data:4byte g_IndirectTexturedBillboardCount__19CHUDBillboardEffect = .sbss:0x805A9154; // type:object size:0x4 data:4byte -init$294 = .sbss:0x805A9158; // type:object size:0x1 scope:local data:byte +init$449 = .sbss:0x805A9158; // type:object size:0x1 scope:local data:byte lbl_805A9160 = .sbss:0x805A9160; // type:object size:0x8 align:4 data:float lbl_805A9168 = .sbss:0x805A9168; // type:object size:0x4 align:4 data:float lbl_805A916C = .sbss:0x805A916C; // type:object size:0x1 data:byte @@ -21935,9 +21935,9 @@ lbl_805A9524 = .sbss:0x805A9524; // type:object size:0x4 data:4byte lbl_805A9528 = .sbss:0x805A9528; // type:object size:0x1 data:byte lbl_805A952C = .sbss:0x805A952C; // type:object size:0x4 data:4byte lbl_805A9530 = .sbss:0x805A9530; // type:object size:0x8 data:byte -lbl_805A9538 = .sbss:0x805A9538; // type:object size:0x4 data:4byte -lbl_805A953C = .sbss:0x805A953C; // type:object size:0x4 -lbl_805A9540 = .sbss:0x805A9540; // type:object size:0x8 +sNextUniquePass__13CTevCombiners = .sbss:0x805A9538; // type:object size:0x4 data:4byte +skAlphaOne__13CTevCombiners = .sbss:0x805A953C; // type:object size:0x4 +skColorOne__13CTevCombiners = .sbss:0x805A9540; // type:object size:0x4 lbl_805A9548 = .sbss:0x805A9548; // type:object size:0x8 data:byte lbl_805A9550 = .sbss:0x805A9550; // type:object size:0x4 data:4byte lbl_805A9554 = .sbss:0x805A9554; // type:object size:0x4 data:4byte @@ -22415,8 +22415,8 @@ salLastTick = .sbss:0x805A9D5C; // type:object size:0x4 scope:local data:4byte salLogicActive = .sbss:0x805A9D60; // type:object size:0x4 scope:local data:4byte salLogicIsWaiting = .sbss:0x805A9D64; // type:object size:0x4 scope:local data:4byte salDspIsDone = .sbss:0x805A9D68; // type:object size:0x4 scope:local data:4byte -salAIBufferBase = .sbss:0x805A9D6C; // type:object size:0x4 data:4byte -salAIBufferIndex = .sbss:0x805A9D70; // type:object size:0x1 scope:local data:byte +salAIBufferBase = .sbss:0x805A9D6C; // type:object size:0x4 scope:local data:4byte +salAIBufferIndex = .sbss:0x805A9D70; // type:object size:0x1 scope:global data:byte userCallback = .sbss:0x805A9D74; // type:object size:0x4 scope:local data:4byte __DTKCurrentTrack = .sbss:0x805A9D78; // type:object size:0x4 scope:local data:4byte __DTKPlayListHead = .sbss:0x805A9D7C; // type:object size:0x4 scope:local data:4byte @@ -22679,8 +22679,8 @@ lbl_805AA2E0 = .sdata2:0x805AA2E0; // type:object size:0x8 align:8 data:double lbl_805AA2E8 = .sdata2:0x805AA2E8; // type:object size:0x4 align:4 data:float lbl_805AA2EC = .sdata2:0x805AA2EC; // type:object size:0x4 align:4 data:float lbl_805AA2F0 = .sdata2:0x805AA2F0; // type:object size:0x8 data:4byte -@337 = .sdata2:0x805AA2F8; // type:object size:0x4 scope:local align:4 data:float -@338 = .sdata2:0x805AA2FC; // type:object size:0x4 scope:local align:4 data:float +@339 = .sdata2:0x805AA2F8; // type:object size:0x4 scope:local align:4 data:float +@340 = .sdata2:0x805AA2FC; // type:object size:0x4 scope:local align:4 data:float lbl_805AA300 = .sdata2:0x805AA300; // type:object size:0x4 align:4 data:float lbl_805AA304 = .sdata2:0x805AA304; // type:object size:0x4 align:4 data:float lbl_805AA308 = .sdata2:0x805AA308; // type:object size:0x4 align:4 data:float @@ -22829,9 +22829,9 @@ lbl_805AA594 = .sdata2:0x805AA594; // type:object size:0x4 align:4 data:float lbl_805AA598 = .sdata2:0x805AA598; // type:object size:0x4 align:4 data:float lbl_805AA59C = .sdata2:0x805AA59C; // type:object size:0x4 align:4 data:float lbl_805AA5A0 = .sdata2:0x805AA5A0; // type:object size:0x8 align:4 data:float -@442 = .sdata2:0x805AA5A8; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AA5AC; // type:object size:0x4 scope:local align:4 data:float -@592 = .sdata2:0x805AA5B0; // type:object size:0x4 scope:local align:4 data:float +@571 = .sdata2:0x805AA5A8; // type:object size:0x4 scope:local align:4 data:float +@572 = .sdata2:0x805AA5AC; // type:object size:0x4 scope:local align:4 data:float +@721 = .sdata2:0x805AA5B0; // type:object size:0x4 scope:local align:4 data:float lbl_805AA5B8 = .sdata2:0x805AA5B8; // type:object size:0x4 align:4 data:float lbl_805AA5BC = .sdata2:0x805AA5BC; // type:object size:0x4 align:4 data:float lbl_805AA5C0 = .sdata2:0x805AA5C0; // type:object size:0x8 align:8 data:double @@ -22942,17 +22942,17 @@ lbl_805AA798 = .sdata2:0x805AA798; // type:object size:0x4 align:4 data:float lbl_805AA79C = .sdata2:0x805AA79C; // type:object size:0x4 align:4 data:float lbl_805AA7A0 = .sdata2:0x805AA7A0; // type:object size:0x4 align:4 data:float lbl_805AA7A8 = .sdata2:0x805AA7A8; // type:object size:0x8 align:8 data:double -@625 = .sdata2:0x805AA7B0; // type:object size:0x4 scope:local align:4 data:float -@799 = .sdata2:0x805AA7B4; // type:object size:0x4 scope:local align:4 data:float -@800 = .sdata2:0x805AA7B8; // type:object size:0x4 scope:local align:4 data:float -@909 = .sdata2:0x805AA7BC; // type:object size:0x4 scope:local align:4 data:float -@910 = .sdata2:0x805AA7C0; // type:object size:0x4 scope:local align:4 data:float -@911 = .sdata2:0x805AA7C8; // type:object size:0x8 scope:local align:8 data:double +@653 = .sdata2:0x805AA7B0; // type:object size:0x4 scope:local align:4 data:float +@827 = .sdata2:0x805AA7B4; // type:object size:0x4 scope:local align:4 data:float +@828 = .sdata2:0x805AA7B8; // type:object size:0x4 scope:local align:4 data:float +@937 = .sdata2:0x805AA7BC; // type:object size:0x4 scope:local align:4 data:float +@938 = .sdata2:0x805AA7C0; // type:object size:0x4 scope:local align:4 data:float +@939 = .sdata2:0x805AA7C8; // type:object size:0x8 scope:local align:8 data:double lbl_805AA7D0 = .sdata2:0x805AA7D0; // type:object size:0x4 align:4 data:float lbl_805AA7D4 = .sdata2:0x805AA7D4; // type:object size:0x4 align:4 data:float lbl_805AA7D8 = .sdata2:0x805AA7D8; // type:object size:0x8 align:4 data:float -@439 = .sdata2:0x805AA7E0; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AA7E8; // type:object size:0x8 scope:local align:8 data:double +@441 = .sdata2:0x805AA7E0; // type:object size:0x4 scope:local align:4 data:float +@445 = .sdata2:0x805AA7E8; // type:object size:0x8 scope:local align:8 data:double lbl_805AA7F0 = .sdata2:0x805AA7F0; // type:object size:0x4 align:4 data:float lbl_805AA7F4 = .sdata2:0x805AA7F4; // type:object size:0x4 align:4 data:float lbl_805AA7F8 = .sdata2:0x805AA7F8; // type:object size:0x4 @@ -23088,7 +23088,7 @@ lbl_805AAA1C = .sdata2:0x805AAA1C; // type:object size:0x4 align:4 data:float lbl_805AAA20 = .sdata2:0x805AAA20; // type:object size:0x8 align:8 data:double lbl_805AAA28 = .sdata2:0x805AAA28; // type:object size:0x4 align:4 data:float lbl_805AAA2C = .sdata2:0x805AAA2C; // type:object size:0x4 align:4 data:float -@247 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local align:4 data:float +@249 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local align:4 data:float lbl_805AAA38 = .sdata2:0x805AAA38; // type:object size:0x4 align:4 data:float lbl_805AAA3C = .sdata2:0x805AAA3C; // type:object size:0x4 align:4 data:float lbl_805AAA40 = .sdata2:0x805AAA40; // type:object size:0x4 align:4 data:float @@ -23183,15 +23183,15 @@ lbl_805AABD8 = .sdata2:0x805AABD8; // type:object size:0x4 align:4 data:float lbl_805AABDC = .sdata2:0x805AABDC; // type:object size:0x4 align:4 data:float lbl_805AABE0 = .sdata2:0x805AABE0; // type:object size:0x4 align:4 data:float lbl_805AABE8 = .sdata2:0x805AABE8; // type:object size:0x8 align:8 data:double -@296 = .sdata2:0x805AABF0; // type:object size:0x4 scope:local align:4 data:float +@298 = .sdata2:0x805AABF0; // type:object size:0x4 scope:local align:4 data:float lbl_805AABF8 = .sdata2:0x805AABF8; // type:object size:0x4 align:4 data:float lbl_805AABFC = .sdata2:0x805AABFC; // type:object size:0x4 align:4 data:float lbl_805AAC00 = .sdata2:0x805AAC00; // type:object size:0x8 align:4 data:float -@234 = .sdata2:0x805AAC08; // type:object size:0x4 scope:local align:4 data:float -@235 = .sdata2:0x805AAC0C; // type:object size:0x4 scope:local align:4 data:float -@268 = .sdata2:0x805AAC10; // type:object size:0x4 scope:local align:4 data:float -@278 = .sdata2:0x805AAC14; // type:object size:0x4 scope:local align:4 data:float -@283 = .sdata2:0x805AAC18; // type:object size:0x8 scope:local align:8 data:double +@233 = .sdata2:0x805AAC08; // type:object size:0x4 scope:local align:4 data:float +@234 = .sdata2:0x805AAC0C; // type:object size:0x4 scope:local align:4 data:float +@270 = .sdata2:0x805AAC10; // type:object size:0x4 scope:local align:4 data:float +@280 = .sdata2:0x805AAC14; // type:object size:0x4 scope:local align:4 data:float +@285 = .sdata2:0x805AAC18; // type:object size:0x8 scope:local align:8 data:double lbl_805AAC20 = .sdata2:0x805AAC20; // type:object size:0x4 align:4 data:float lbl_805AAC24 = .sdata2:0x805AAC24; // type:object size:0x4 align:4 data:float lbl_805AAC28 = .sdata2:0x805AAC28; // type:object size:0x4 align:4 data:float @@ -23231,19 +23231,19 @@ lbl_805AACB8 = .sdata2:0x805AACB8; // type:object size:0x4 align:4 data:float lbl_805AACBC = .sdata2:0x805AACBC; // type:object size:0x4 align:4 data:float lbl_805AACC0 = .sdata2:0x805AACC0; // type:object size:0x4 align:4 data:float lbl_805AACC4 = .sdata2:0x805AACC4; // type:object size:0x4 align:4 data:float -@696 = .sdata2:0x805AACC8; // type:object size:0x4 scope:local align:4 data:float -@697 = .sdata2:0x805AACCC; // type:object size:0x4 scope:local align:4 data:float -@698 = .sdata2:0x805AACD0; // type:object size:0x4 scope:local align:4 data:float -@699 = .sdata2:0x805AACD4; // type:object size:0x4 scope:local align:4 data:float -@1080 = .sdata2:0x805AACD8; // type:object size:0x4 scope:local align:4 data:float -@1081 = .sdata2:0x805AACDC; // type:object size:0x4 scope:local align:4 data:float -@1082 = .sdata2:0x805AACE0; // type:object size:0x4 scope:local align:4 data:float -@1083 = .sdata2:0x805AACE4; // type:object size:0x4 scope:local align:4 data:float -@1084 = .sdata2:0x805AACE8; // type:object size:0x4 scope:local align:4 data:float -@1085 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local align:4 data:float -@1088 = .sdata2:0x805AACF0; // type:object size:0x8 scope:local align:8 data:double -@1203 = .sdata2:0x805AACF8; // type:object size:0x4 scope:local align:4 data:float -@1204 = .sdata2:0x805AACFC; // type:object size:0x4 scope:local align:4 data:float +@724 = .sdata2:0x805AACC8; // type:object size:0x4 scope:local align:4 data:float +@725 = .sdata2:0x805AACCC; // type:object size:0x4 scope:local align:4 data:float +@726 = .sdata2:0x805AACD0; // type:object size:0x4 scope:local align:4 data:float +@727 = .sdata2:0x805AACD4; // type:object size:0x4 scope:local align:4 data:float +@1108 = .sdata2:0x805AACD8; // type:object size:0x4 scope:local align:4 data:float +@1109 = .sdata2:0x805AACDC; // type:object size:0x4 scope:local align:4 data:float +@1110 = .sdata2:0x805AACE0; // type:object size:0x4 scope:local align:4 data:float +@1111 = .sdata2:0x805AACE4; // type:object size:0x4 scope:local align:4 data:float +@1112 = .sdata2:0x805AACE8; // type:object size:0x4 scope:local align:4 data:float +@1113 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local align:4 data:float +@1116 = .sdata2:0x805AACF0; // type:object size:0x8 scope:local align:8 data:double +@1231 = .sdata2:0x805AACF8; // type:object size:0x4 scope:local align:4 data:float +@1232 = .sdata2:0x805AACFC; // type:object size:0x4 scope:local align:4 data:float lbl_805AAD00 = .sdata2:0x805AAD00; // type:object size:0x4 align:4 data:float lbl_805AAD04 = .sdata2:0x805AAD04; // type:object size:0x4 align:4 data:float lbl_805AAD08 = .sdata2:0x805AAD08; // type:object size:0x8 align:4 data:float @@ -23312,22 +23312,22 @@ lbl_805AAE20 = .sdata2:0x805AAE20; // type:object size:0x4 align:4 data:float lbl_805AAE24 = .sdata2:0x805AAE24; // type:object size:0x4 align:4 data:float lbl_805AAE28 = .sdata2:0x805AAE28; // type:object size:0x8 align:4 data:float kSoundId = .sdata2:0x805AAE30; // type:object size:0x4 scope:local -@482 = .sdata2:0x805AAE34; // type:object size:0x4 scope:local align:4 data:float -@483 = .sdata2:0x805AAE38; // type:object size:0x4 scope:local align:4 data:float -@556 = .sdata2:0x805AAE3C; // type:object size:0x4 scope:local align:4 data:float -@557 = .sdata2:0x805AAE40; // type:object size:0x4 scope:local align:4 data:float -@558 = .sdata2:0x805AAE44; // type:object size:0x4 scope:local align:4 data:float -@559 = .sdata2:0x805AAE48; // type:object size:0x4 scope:local align:4 data:float -@560 = .sdata2:0x805AAE4C; // type:object size:0x4 scope:local align:4 data:float -@613 = .sdata2:0x805AAE50; // type:object size:0x4 scope:local align:4 data:float -@614 = .sdata2:0x805AAE54; // type:object size:0x4 scope:local align:4 data:float -@615 = .sdata2:0x805AAE58; // type:object size:0x4 scope:local align:4 data:float -@616 = .sdata2:0x805AAE5C; // type:object size:0x4 scope:local align:4 data:float -@712 = .sdata2:0x805AAE60; // type:object size:0x4 scope:local align:4 data:float -@713 = .sdata2:0x805AAE64; // type:object size:0x4 scope:local align:4 data:float -skSoundId$327 = .sdata2:0x805AAE68; // type:object size:0x4 scope:local -@484 = .sdata2:0x805AAE6C; // type:object size:0x4 scope:local align:4 data:float -@485 = .sdata2:0x805AAE70; // type:object size:0x4 scope:local align:4 data:float +@510 = .sdata2:0x805AAE34; // type:object size:0x4 scope:local align:4 data:float +@511 = .sdata2:0x805AAE38; // type:object size:0x4 scope:local align:4 data:float +@584 = .sdata2:0x805AAE3C; // type:object size:0x4 scope:local align:4 data:float +@585 = .sdata2:0x805AAE40; // type:object size:0x4 scope:local align:4 data:float +@586 = .sdata2:0x805AAE44; // type:object size:0x4 scope:local align:4 data:float +@587 = .sdata2:0x805AAE48; // type:object size:0x4 scope:local align:4 data:float +@588 = .sdata2:0x805AAE4C; // type:object size:0x4 scope:local align:4 data:float +@641 = .sdata2:0x805AAE50; // type:object size:0x4 scope:local align:4 data:float +@642 = .sdata2:0x805AAE54; // type:object size:0x4 scope:local align:4 data:float +@643 = .sdata2:0x805AAE58; // type:object size:0x4 scope:local align:4 data:float +@644 = .sdata2:0x805AAE5C; // type:object size:0x4 scope:local align:4 data:float +@740 = .sdata2:0x805AAE60; // type:object size:0x4 scope:local align:4 data:float +@741 = .sdata2:0x805AAE64; // type:object size:0x4 scope:local align:4 data:float +skSoundId$473 = .sdata2:0x805AAE68; // type:object size:0x4 scope:local +@630 = .sdata2:0x805AAE6C; // type:object size:0x4 scope:local align:4 data:float +@631 = .sdata2:0x805AAE70; // type:object size:0x4 scope:local align:4 data:float lbl_805AAE78 = .sdata2:0x805AAE78; // type:object size:0x4 lbl_805AAE7C = .sdata2:0x805AAE7C; // type:object size:0x4 align:4 data:float lbl_805AAE80 = .sdata2:0x805AAE80; // type:object size:0x4 align:4 data:float @@ -23364,7 +23364,7 @@ lbl_805AAF08 = .sdata2:0x805AAF08; // type:object size:0x4 align:4 data:float lbl_805AAF0C = .sdata2:0x805AAF0C; // type:object size:0x4 align:4 data:float lbl_805AAF10 = .sdata2:0x805AAF10; // type:object size:0x4 align:4 data:float lbl_805AAF14 = .sdata2:0x805AAF14; // type:object size:0x4 align:4 data:float -@275 = .sdata2:0x805AAF18; // type:object size:0x4 scope:local align:4 data:float +@277 = .sdata2:0x805AAF18; // type:object size:0x4 scope:local align:4 data:float lbl_805AAF20 = .sdata2:0x805AAF20; // type:object size:0x4 align:4 data:float lbl_805AAF24 = .sdata2:0x805AAF24; // type:object size:0x4 align:4 data:float lbl_805AAF28 = .sdata2:0x805AAF28; // type:object size:0x4 align:4 data:float @@ -23399,7 +23399,7 @@ lbl_805AAFB4 = .sdata2:0x805AAFB4; // type:object size:0x4 align:4 data:float lbl_805AAFB8 = .sdata2:0x805AAFB8; // type:object size:0x4 align:4 data:float lbl_805AAFBC = .sdata2:0x805AAFBC; // type:object size:0x4 align:4 data:float lbl_805AAFC0 = .sdata2:0x805AAFC0; // type:object size:0x8 align:4 data:float -@221 = .sdata2:0x805AAFC8; // type:object size:0x4 scope:local align:4 data:float +@223 = .sdata2:0x805AAFC8; // type:object size:0x4 scope:local align:4 data:float lbl_805AAFD0 = .sdata2:0x805AAFD0; // type:object size:0x4 align:4 data:float lbl_805AAFD4 = .sdata2:0x805AAFD4; // type:object size:0x4 align:4 data:float lbl_805AAFD8 = .sdata2:0x805AAFD8; // type:object size:0x4 align:4 data:float @@ -23565,8 +23565,8 @@ lbl_805AB290 = .sdata2:0x805AB290; // type:object size:0x4 align:4 data:float lbl_805AB294 = .sdata2:0x805AB294; // type:object size:0x4 align:4 data:float lbl_805AB298 = .sdata2:0x805AB298; // type:object size:0x4 align:4 data:float lbl_805AB29C = .sdata2:0x805AB29C; // type:object size:0x4 align:4 data:float -@498 = .sdata2:0x805AB2A0; // type:object size:0x4 scope:local align:4 data:float -@608 = .sdata2:0x805AB2A4; // type:object size:0x4 scope:local align:4 data:float +@500 = .sdata2:0x805AB2A0; // type:object size:0x4 scope:local align:4 data:float +@610 = .sdata2:0x805AB2A4; // type:object size:0x4 scope:local align:4 data:float @386 = .sdata2:0x805AB2A8; // type:object size:0x4 scope:local align:4 data:float @388 = .sdata2:0x805AB2B0; // type:object size:0x8 scope:local align:8 data:double lbl_805AB2B8 = .sdata2:0x805AB2B8; // type:object size:0x4 align:4 data:float @@ -23579,12 +23579,12 @@ lbl_805AB2D4 = .sdata2:0x805AB2D4; // type:object size:0x4 align:4 data:float lbl_805AB2D8 = .sdata2:0x805AB2D8; // type:object size:0x4 align:4 data:float lbl_805AB2DC = .sdata2:0x805AB2DC; // type:object size:0x4 align:4 data:float lbl_805AB2E0 = .sdata2:0x805AB2E0; // type:object size:0x8 align:4 data:float -@383 = .sdata2:0x805AB2E8; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805AB2EC; // type:object size:0x4 scope:local align:4 data:float -@385 = .sdata2:0x805AB2F0; // type:object size:0x4 scope:local align:4 data:float -@386 = .sdata2:0x805AB2F4; // type:object size:0x4 scope:local align:4 data:float -@387 = .sdata2:0x805AB2F8; // type:object size:0x4 scope:local align:4 data:float -@388 = .sdata2:0x805AB2FC; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805AB2E8; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805AB2EC; // type:object size:0x4 scope:local align:4 data:float +@387 = .sdata2:0x805AB2F0; // type:object size:0x4 scope:local align:4 data:float +@388 = .sdata2:0x805AB2F4; // type:object size:0x4 scope:local align:4 data:float +@389 = .sdata2:0x805AB2F8; // type:object size:0x4 scope:local align:4 data:float +@390 = .sdata2:0x805AB2FC; // type:object size:0x4 scope:local align:4 data:float lbl_805AB300 = .sdata2:0x805AB300; // type:object size:0x4 data:4byte kDefaultPositionUpdateThreshold__12CActorLights = .sdata2:0x805AB304; // type:object size:0x4 align:4 data:float lbl_805AB308 = .sdata2:0x805AB308; // type:object size:0x4 align:4 data:float @@ -23851,10 +23851,10 @@ lbl_805AB784 = .sdata2:0x805AB784; // type:object size:0x4 align:4 data:float lbl_805AB788 = .sdata2:0x805AB788; // type:object size:0x4 align:4 data:float lbl_805AB78C = .sdata2:0x805AB78C; // type:object size:0x4 align:4 data:float lbl_805AB790 = .sdata2:0x805AB790; // type:object size:0x8 align:4 data:float -@354 = .sdata2:0x805AB798; // type:object size:0x4 scope:local align:4 data:float -@476 = .sdata2:0x805AB79C; // type:object size:0x4 scope:local align:4 data:float -@477 = .sdata2:0x805AB7A0; // type:object size:0x4 scope:local align:4 data:float -@566 = .sdata2:0x805AB7A4; // type:object size:0x4 scope:local align:4 data:float +@356 = .sdata2:0x805AB798; // type:object size:0x4 scope:local align:4 data:float +@478 = .sdata2:0x805AB79C; // type:object size:0x4 scope:local align:4 data:float +@479 = .sdata2:0x805AB7A0; // type:object size:0x4 scope:local align:4 data:float +@568 = .sdata2:0x805AB7A4; // type:object size:0x4 scope:local align:4 data:float lbl_805AB7A8 = .sdata2:0x805AB7A8; // type:object size:0x4 align:4 data:float lbl_805AB7AC = .sdata2:0x805AB7AC; // type:object size:0x4 align:4 data:float lbl_805AB7B0 = .sdata2:0x805AB7B0; // type:object size:0x4 align:4 data:float @@ -23887,15 +23887,15 @@ lbl_805AB81C = .sdata2:0x805AB81C; // type:object size:0x4 align:4 data:float lbl_805AB820 = .sdata2:0x805AB820; // type:object size:0x4 align:4 data:float lbl_805AB824 = .sdata2:0x805AB824; // type:object size:0x4 align:4 data:float lbl_805AB828 = .sdata2:0x805AB828; // type:object size:0x8 align:4 data:float -@358 = .sdata2:0x805AB830; // type:object size:0x4 scope:local align:4 data:float -@440 = .sdata2:0x805AB838; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AB83C; // type:object size:0x4 scope:local align:4 data:float -@593 = .sdata2:0x805AB840; // type:object size:0x4 scope:local align:4 data:float -@654 = .sdata2:0x805AB844; // type:object size:0x4 scope:local align:4 data:float -@659 = .sdata2:0x805AB848; // type:object size:0x4 scope:local align:4 data:float -@670 = .sdata2:0x805AB84C; // type:object size:0x4 scope:local align:4 data:float -@671 = .sdata2:0x805AB850; // type:object size:0x4 scope:local align:4 data:float -@673 = .sdata2:0x805AB858; // type:object size:0x8 scope:local align:8 data:double +@360 = .sdata2:0x805AB830; // type:object size:0x4 scope:local align:4 data:float +@595 = .sdata2:0x805AB838; // type:object size:0x4 scope:local align:4 data:float +@598 = .sdata2:0x805AB83C; // type:object size:0x4 scope:local align:4 data:float +@748 = .sdata2:0x805AB840; // type:object size:0x4 scope:local align:4 data:float +@809 = .sdata2:0x805AB844; // type:object size:0x4 scope:local align:4 data:float +@814 = .sdata2:0x805AB848; // type:object size:0x4 scope:local align:4 data:float +@825 = .sdata2:0x805AB84C; // type:object size:0x4 scope:local align:4 data:float +@826 = .sdata2:0x805AB850; // type:object size:0x4 scope:local align:4 data:float +@828 = .sdata2:0x805AB858; // type:object size:0x8 scope:local align:8 data:double lbl_805AB860 = .sdata2:0x805AB860; // type:object size:0x4 align:4 data:float lbl_805AB864 = .sdata2:0x805AB864; // type:object size:0x4 align:4 data:float lbl_805AB868 = .sdata2:0x805AB868; // type:object size:0x4 align:4 data:float @@ -23915,10 +23915,10 @@ lbl_805AB89C = .sdata2:0x805AB89C; // type:object size:0x4 align:4 data:float lbl_805AB8A0 = .sdata2:0x805AB8A0; // type:object size:0x4 align:4 data:float lbl_805AB8A4 = .sdata2:0x805AB8A4; // type:object size:0x4 align:4 data:float lbl_805AB8A8 = .sdata2:0x805AB8A8; // type:object size:0x8 align:4 data:float -@251 = .sdata2:0x805AB8B0; // type:object size:0x4 scope:local align:4 data:float -@291 = .sdata2:0x805AB8B4; // type:object size:0x4 scope:local align:4 data:float -@292 = .sdata2:0x805AB8B8; // type:object size:0x4 scope:local align:4 data:float -@293 = .sdata2:0x805AB8BC; // type:object size:0x4 scope:local align:4 data:float +@253 = .sdata2:0x805AB8B0; // type:object size:0x4 scope:local align:4 data:float +@293 = .sdata2:0x805AB8B4; // type:object size:0x4 scope:local align:4 data:float +@294 = .sdata2:0x805AB8B8; // type:object size:0x4 scope:local align:4 data:float +@295 = .sdata2:0x805AB8BC; // type:object size:0x4 scope:local align:4 data:float lbl_805AB8C0 = .sdata2:0x805AB8C0; // type:object size:0x4 align:4 data:float lbl_805AB8C4 = .sdata2:0x805AB8C4; // type:object size:0x4 align:4 data:float lbl_805AB8C8 = .sdata2:0x805AB8C8; // type:object size:0x4 align:4 data:float @@ -23929,8 +23929,8 @@ lbl_805AB8D8 = .sdata2:0x805AB8D8; // type:object size:0x4 align:4 data:float lbl_805AB8DC = .sdata2:0x805AB8DC; // type:object size:0x4 align:4 data:float lbl_805AB8E0 = .sdata2:0x805AB8E0; // type:object size:0x4 align:4 data:float lbl_805AB8E8 = .sdata2:0x805AB8E8; // type:object size:0x8 align:8 data:double -@298 = .sdata2:0x805AB8F0; // type:object size:0x4 scope:local align:4 data:float -@299 = .sdata2:0x805AB8F4; // type:object size:0x4 scope:local align:4 data:float +@300 = .sdata2:0x805AB8F0; // type:object size:0x4 scope:local align:4 data:float +@301 = .sdata2:0x805AB8F4; // type:object size:0x4 scope:local align:4 data:float lbl_805AB8F8 = .sdata2:0x805AB8F8; // type:object size:0x4 align:4 data:float lbl_805AB8FC = .sdata2:0x805AB8FC; // type:object size:0x4 align:4 data:float lbl_805AB900 = .sdata2:0x805AB900; // type:object size:0x4 align:4 data:float @@ -23942,8 +23942,8 @@ lbl_805AB914 = .sdata2:0x805AB914; // type:object size:0x4 align:4 data:float lbl_805AB918 = .sdata2:0x805AB918; // type:object size:0x4 align:4 data:float lbl_805AB91C = .sdata2:0x805AB91C; // type:object size:0x4 align:4 data:float lbl_805AB920 = .sdata2:0x805AB920; // type:object size:0x8 align:8 data:double -@358 = .sdata2:0x805AB928; // type:object size:0x4 scope:local align:4 data:float -@359 = .sdata2:0x805AB92C; // type:object size:0x4 scope:local align:4 data:float +@360 = .sdata2:0x805AB928; // type:object size:0x4 scope:local align:4 data:float +@361 = .sdata2:0x805AB92C; // type:object size:0x4 scope:local align:4 data:float lbl_805AB930 = .sdata2:0x805AB930; // type:object size:0x4 align:4 data:float lbl_805AB934 = .sdata2:0x805AB934; // type:object size:0x4 align:4 data:float lbl_805AB938 = .sdata2:0x805AB938; // type:object size:0x4 align:4 data:float @@ -23954,7 +23954,7 @@ lbl_805AB948 = .sdata2:0x805AB948; // type:object size:0x4 align:4 data:float lbl_805AB94C = .sdata2:0x805AB94C; // type:object size:0x4 align:4 data:float lbl_805AB950 = .sdata2:0x805AB950; // type:object size:0x4 align:4 data:float lbl_805AB954 = .sdata2:0x805AB954; // type:object size:0x4 align:4 data:float -@314 = .sdata2:0x805AB958; // type:object size:0x4 scope:local align:4 data:float +@316 = .sdata2:0x805AB958; // type:object size:0x4 scope:local align:4 data:float lbl_805AB960 = .sdata2:0x805AB960; // type:object size:0x4 align:4 data:float lbl_805AB964 = .sdata2:0x805AB964; // type:object size:0x4 align:4 data:float lbl_805AB968 = .sdata2:0x805AB968; // type:object size:0x4 align:4 data:float @@ -24074,8 +24074,8 @@ lbl_805ABB6C = .sdata2:0x805ABB6C; // type:object size:0x4 align:4 data:float lbl_805ABB70 = .sdata2:0x805ABB70; // type:object size:0x4 align:4 data:float lbl_805ABB74 = .sdata2:0x805ABB74; // type:object size:0x4 align:4 data:float lbl_805ABB78 = .sdata2:0x805ABB78; // type:object size:0x8 align:4 data:float -@318 = .sdata2:0x805ABB80; // type:object size:0x4 scope:local align:4 data:float -@375 = .sdata2:0x805ABB84; // type:object size:0x4 scope:local align:4 data:float +@320 = .sdata2:0x805ABB80; // type:object size:0x4 scope:local align:4 data:float +@377 = .sdata2:0x805ABB84; // type:object size:0x4 scope:local align:4 data:float lbl_805ABB88 = .sdata2:0x805ABB88; // type:object size:0x4 align:4 data:float lbl_805ABB8C = .sdata2:0x805ABB8C; // type:object size:0x4 align:4 data:float lbl_805ABB90 = .sdata2:0x805ABB90; // type:object size:0x4 align:4 data:float @@ -24094,12 +24094,12 @@ lbl_805ABBC0 = .sdata2:0x805ABBC0; // type:object size:0x4 align:4 data:float lbl_805ABBC4 = .sdata2:0x805ABBC4; // type:object size:0x4 align:4 data:float lbl_805ABBC8 = .sdata2:0x805ABBC8; // type:object size:0x4 align:4 data:float lbl_805ABBCC = .sdata2:0x805ABBCC; // type:object size:0x4 align:4 data:float -@278 = .sdata2:0x805ABBD0; // type:object size:0x4 scope:local align:4 data:float +@280 = .sdata2:0x805ABBD0; // type:object size:0x4 scope:local align:4 data:float lbl_805ABBD8 = .sdata2:0x805ABBD8; // type:object size:0x4 align:4 data:float lbl_805ABBDC = .sdata2:0x805ABBDC; // type:object size:0x4 align:4 data:float lbl_805ABBE0 = .sdata2:0x805ABBE0; // type:object size:0x8 align:4 data:float -@293 = .sdata2:0x805ABBE8; // type:object size:0x4 scope:local align:4 data:float -@303 = .sdata2:0x805ABBEC; // type:object size:0x4 scope:local align:4 data:float +@295 = .sdata2:0x805ABBE8; // type:object size:0x4 scope:local align:4 data:float +@305 = .sdata2:0x805ABBEC; // type:object size:0x4 scope:local align:4 data:float lbl_805ABBF0 = .sdata2:0x805ABBF0; // type:object size:0x4 align:4 data:float lbl_805ABBF4 = .sdata2:0x805ABBF4; // type:object size:0x4 align:4 data:float lbl_805ABBF8 = .sdata2:0x805ABBF8; // type:object size:0x4 align:4 data:float @@ -24116,24 +24116,24 @@ lbl_805ABC20 = .sdata2:0x805ABC20; // type:object size:0x4 align:4 data:float lbl_805ABC24 = .sdata2:0x805ABC24; // type:object size:0x4 align:4 data:float lbl_805ABC28 = .sdata2:0x805ABC28; // type:object size:0x4 align:4 data:float lbl_805ABC30 = .sdata2:0x805ABC30; // type:object size:0x8 align:8 data:double -@340 = .sdata2:0x805ABC38; // type:object size:0x4 scope:local align:4 data:float -@444 = .sdata2:0x805ABC3C; // type:object size:0x4 scope:local align:4 data:float -@445 = .sdata2:0x805ABC40; // type:object size:0x4 scope:local align:4 data:float -@446 = .sdata2:0x805ABC44; // type:object size:0x4 scope:local align:4 data:float -@447 = .sdata2:0x805ABC48; // type:object size:0x4 scope:local align:4 data:float -@448 = .sdata2:0x805ABC4C; // type:object size:0x4 scope:local align:4 data:float -@449 = .sdata2:0x805ABC50; // type:object size:0x4 scope:local align:4 data:float -@452 = .sdata2:0x805ABC58; // type:object size:0x8 scope:local align:8 data:double +@342 = .sdata2:0x805ABC38; // type:object size:0x4 scope:local align:4 data:float +@446 = .sdata2:0x805ABC3C; // type:object size:0x4 scope:local align:4 data:float +@447 = .sdata2:0x805ABC40; // type:object size:0x4 scope:local align:4 data:float +@448 = .sdata2:0x805ABC44; // type:object size:0x4 scope:local align:4 data:float +@449 = .sdata2:0x805ABC48; // type:object size:0x4 scope:local align:4 data:float +@450 = .sdata2:0x805ABC4C; // type:object size:0x4 scope:local align:4 data:float +@451 = .sdata2:0x805ABC50; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805ABC58; // type:object size:0x8 scope:local align:8 data:double kEndingTime__10CPowerBomb = .sdata2:0x805ABC60; // type:object size:0x4 align:4 data:float -@402 = .sdata2:0x805ABC64; // type:object size:0x4 scope:local align:4 data:float -@403 = .sdata2:0x805ABC68; // type:object size:0x4 scope:local align:4 data:float -@447 = .sdata2:0x805ABC6C; // type:object size:0x4 scope:local align:4 data:float -@448 = .sdata2:0x805ABC70; // type:object size:0x4 scope:local align:4 data:float -@449 = .sdata2:0x805ABC74; // type:object size:0x4 scope:local align:4 data:float -@450 = .sdata2:0x805ABC78; // type:object size:0x4 scope:local align:4 data:float -@451 = .sdata2:0x805ABC7C; // type:object size:0x4 scope:local align:4 data:float -@452 = .sdata2:0x805ABC80; // type:object size:0x4 scope:local align:4 data:float -@453 = .sdata2:0x805ABC84; // type:object size:0x4 scope:local align:4 data:float +@565 = .sdata2:0x805ABC64; // type:object size:0x4 scope:local align:4 data:float +@566 = .sdata2:0x805ABC68; // type:object size:0x4 scope:local align:4 data:float +@610 = .sdata2:0x805ABC6C; // type:object size:0x4 scope:local align:4 data:float +@611 = .sdata2:0x805ABC70; // type:object size:0x4 scope:local align:4 data:float +@612 = .sdata2:0x805ABC74; // type:object size:0x4 scope:local align:4 data:float +@613 = .sdata2:0x805ABC78; // type:object size:0x4 scope:local align:4 data:float +@614 = .sdata2:0x805ABC7C; // type:object size:0x4 scope:local align:4 data:float +@615 = .sdata2:0x805ABC80; // type:object size:0x4 scope:local align:4 data:float +@616 = .sdata2:0x805ABC84; // type:object size:0x4 scope:local align:4 data:float lbl_805ABC88 = .sdata2:0x805ABC88; // type:object size:0x4 align:4 data:float lbl_805ABC8C = .sdata2:0x805ABC8C; // type:object size:0x4 align:4 data:float lbl_805ABC90 = .sdata2:0x805ABC90; // type:object size:0x8 align:4 data:float @@ -24159,16 +24159,16 @@ lbl_805ABCEC = .sdata2:0x805ABCEC; // type:object size:0x4 align:4 data:float lbl_805ABCF0 = .sdata2:0x805ABCF0; // type:object size:0x8 align:4 data:float lbl_805ABCF8 = .sdata2:0x805ABCF8; // type:object size:0x4 align:4 data:float lbl_805ABCFC = .sdata2:0x805ABCFC; // type:object size:0x4 align:4 data:float -@376 = .sdata2:0x805ABD00; // type:object size:0x4 scope:local align:4 data:float -@377 = .sdata2:0x805ABD04; // type:object size:0x4 scope:local align:4 data:float -@378 = .sdata2:0x805ABD08; // type:object size:0x4 scope:local align:4 data:float -@379 = .sdata2:0x805ABD0C; // type:object size:0x4 scope:local align:4 data:float -@380 = .sdata2:0x805ABD10; // type:object size:0x4 scope:local align:4 data:float -@381 = .sdata2:0x805ABD14; // type:object size:0x4 scope:local align:4 data:float -@382 = .sdata2:0x805ABD18; // type:object size:0x4 scope:local align:4 data:float -@383 = .sdata2:0x805ABD1C; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805ABD20; // type:object size:0x4 scope:local align:4 data:float -@388 = .sdata2:0x805ABD24; // type:object size:0x4 scope:local align:4 data:float +@378 = .sdata2:0x805ABD00; // type:object size:0x4 scope:local align:4 data:float +@379 = .sdata2:0x805ABD04; // type:object size:0x4 scope:local align:4 data:float +@380 = .sdata2:0x805ABD08; // type:object size:0x4 scope:local align:4 data:float +@381 = .sdata2:0x805ABD0C; // type:object size:0x4 scope:local align:4 data:float +@382 = .sdata2:0x805ABD10; // type:object size:0x4 scope:local align:4 data:float +@383 = .sdata2:0x805ABD14; // type:object size:0x4 scope:local align:4 data:float +@384 = .sdata2:0x805ABD18; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805ABD1C; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805ABD20; // type:object size:0x4 scope:local align:4 data:float +@390 = .sdata2:0x805ABD24; // type:object size:0x4 scope:local align:4 data:float lbl_805ABD28 = .sdata2:0x805ABD28; // type:object size:0x4 align:4 data:float lbl_805ABD2C = .sdata2:0x805ABD2C; // type:object size:0x4 align:4 data:float lbl_805ABD30 = .sdata2:0x805ABD30; // type:object size:0x4 align:4 data:float @@ -24240,7 +24240,7 @@ lbl_805ABE4C = .sdata2:0x805ABE4C; // type:object size:0x4 align:4 data:float lbl_805ABE50 = .sdata2:0x805ABE50; // type:object size:0x4 align:4 data:float lbl_805ABE54 = .sdata2:0x805ABE54; // type:object size:0x4 align:4 data:float lbl_805ABE58 = .sdata2:0x805ABE58; // type:object size:0x8 align:4 data:float -@331 = .sdata2:0x805ABE60; // type:object size:0x4 scope:local align:4 data:float +@333 = .sdata2:0x805ABE60; // type:object size:0x4 scope:local align:4 data:float lbl_805ABE68 = .sdata2:0x805ABE68; // type:object size:0x4 align:4 data:float lbl_805ABE6C = .sdata2:0x805ABE6C; // type:object size:0x4 align:4 data:float lbl_805ABE70 = .sdata2:0x805ABE70; // type:object size:0x4 align:4 data:float @@ -24353,12 +24353,12 @@ lbl_805AC040 = .sdata2:0x805AC040; // type:object size:0x4 align:4 data:float lbl_805AC044 = .sdata2:0x805AC044; // type:object size:0x4 align:4 data:float lbl_805AC048 = .sdata2:0x805AC048; // type:object size:0x4 align:4 data:float lbl_805AC04C = .sdata2:0x805AC04C; // type:object size:0x4 align:4 data:float -@376 = .sdata2:0x805AC050; // type:object size:0x4 scope:local align:4 data:float -@377 = .sdata2:0x805AC054; // type:object size:0x4 scope:local align:4 data:float -@378 = .sdata2:0x805AC058; // type:object size:0x4 scope:local align:4 data:float -@426 = .sdata2:0x805AC060; // type:object size:0x8 scope:local align:8 data:double -@427 = .sdata2:0x805AC068; // type:object size:0x4 scope:local align:4 data:float -@329 = .sdata2:0x805AC070; // type:object size:0x4 scope:local align:4 data:float +@404 = .sdata2:0x805AC050; // type:object size:0x4 scope:local align:4 data:float +@405 = .sdata2:0x805AC054; // type:object size:0x4 scope:local align:4 data:float +@406 = .sdata2:0x805AC058; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805AC060; // type:object size:0x8 scope:local align:8 data:double +@455 = .sdata2:0x805AC068; // type:object size:0x4 scope:local align:4 data:float +@332 = .sdata2:0x805AC070; // type:object size:0x4 scope:local align:4 data:float lbl_805AC078 = .sdata2:0x805AC078; // type:object size:0x4 align:4 data:float lbl_805AC07C = .sdata2:0x805AC07C; // type:object size:0x4 align:4 data:float lbl_805AC080 = .sdata2:0x805AC080; // type:object size:0x4 align:4 data:float @@ -24371,10 +24371,10 @@ lbl_805AC09C = .sdata2:0x805AC09C; // type:object size:0x4 align:4 data:float lbl_805AC0A0 = .sdata2:0x805AC0A0; // type:object size:0x4 align:4 data:float lbl_805AC0A4 = .sdata2:0x805AC0A4; // type:object size:0x4 align:4 data:float lbl_805AC0A8 = .sdata2:0x805AC0A8; // type:object size:0x8 align:4 data:float -@487 = .sdata2:0x805AC0B0; // type:object size:0x4 scope:local align:4 data:float -@488 = .sdata2:0x805AC0B4; // type:object size:0x4 scope:local align:4 data:float -@489 = .sdata2:0x805AC0B8; // type:object size:0x4 scope:local align:4 data:float -@528 = .sdata2:0x805AC0BC; // type:object size:0x4 scope:local align:4 data:float +@489 = .sdata2:0x805AC0B0; // type:object size:0x4 scope:local align:4 data:float +@490 = .sdata2:0x805AC0B4; // type:object size:0x4 scope:local align:4 data:float +@491 = .sdata2:0x805AC0B8; // type:object size:0x4 scope:local align:4 data:float +@530 = .sdata2:0x805AC0BC; // type:object size:0x4 scope:local align:4 data:float lbl_805AC0C0 = .sdata2:0x805AC0C0; // type:object size:0x4 align:4 data:float lbl_805AC0C4 = .sdata2:0x805AC0C4; // type:object size:0x4 align:4 data:float lbl_805AC0C8 = .sdata2:0x805AC0C8; // type:object size:0x4 align:4 data:float @@ -24526,7 +24526,7 @@ lbl_805AC34C = .sdata2:0x805AC34C; // type:object size:0x4 align:4 data:float lbl_805AC350 = .sdata2:0x805AC350; // type:object size:0x4 align:4 data:float lbl_805AC354 = .sdata2:0x805AC354; // type:object size:0x4 align:4 data:float lbl_805AC358 = .sdata2:0x805AC358; // type:object size:0x8 align:4 data:float -@255 = .sdata2:0x805AC360; // type:object size:0x4 scope:local align:4 data:float +@257 = .sdata2:0x805AC360; // type:object size:0x4 scope:local align:4 data:float lbl_805AC368 = .sdata2:0x805AC368; // type:object size:0x4 align:4 data:float lbl_805AC36C = .sdata2:0x805AC36C; // type:object size:0x4 align:4 data:float lbl_805AC370 = .sdata2:0x805AC370; // type:object size:0x4 align:4 data:float @@ -24536,7 +24536,7 @@ lbl_805AC37C = .sdata2:0x805AC37C; // type:object size:0x4 align:4 data:float lbl_805AC380 = .sdata2:0x805AC380; // type:object size:0x4 align:4 data:float lbl_805AC384 = .sdata2:0x805AC384; // type:object size:0x4 align:4 data:float lbl_805AC388 = .sdata2:0x805AC388; // type:object size:0x8 align:4 data:float -@406 = .sdata2:0x805AC390; // type:object size:0x4 scope:local align:4 data:float +@570 = .sdata2:0x805AC390; // type:object size:0x4 scope:local align:4 data:float lbl_805AC398 = .sdata2:0x805AC398; // type:object size:0x4 align:4 data:float lbl_805AC39C = .sdata2:0x805AC39C; // type:object size:0x4 align:4 data:float lbl_805AC3A0 = .sdata2:0x805AC3A0; // type:object size:0x4 align:4 data:float @@ -24751,12 +24751,12 @@ lbl_805AC760 = .sdata2:0x805AC760; // type:object size:0x4 align:4 data:float lbl_805AC764 = .sdata2:0x805AC764; // type:object size:0x4 align:4 data:float lbl_805AC768 = .sdata2:0x805AC768; // type:object size:0x8 align:8 data:double lbl_805AC770 = .sdata2:0x805AC770; // type:object size:0x8 align:4 data:float -@288 = .sdata2:0x805AC778; // type:object size:0x4 scope:local align:4 data:float -@289 = .sdata2:0x805AC77C; // type:object size:0x4 scope:local align:4 data:float -@331 = .sdata2:0x805AC780; // type:object size:0x4 scope:local align:4 data:float -@334 = .sdata2:0x805AC788; // type:object size:0x8 scope:local align:8 data:double -@344 = .sdata2:0x805AC790; // type:object size:0x4 scope:local align:4 data:float -@345 = .sdata2:0x805AC794; // type:object size:0x4 scope:local align:4 data:float +@290 = .sdata2:0x805AC778; // type:object size:0x4 scope:local align:4 data:float +@291 = .sdata2:0x805AC77C; // type:object size:0x4 scope:local align:4 data:float +@333 = .sdata2:0x805AC780; // type:object size:0x4 scope:local align:4 data:float +@336 = .sdata2:0x805AC788; // type:object size:0x8 scope:local align:8 data:double +@346 = .sdata2:0x805AC790; // type:object size:0x4 scope:local align:4 data:float +@347 = .sdata2:0x805AC794; // type:object size:0x4 scope:local align:4 data:float lbl_805AC798 = .sdata2:0x805AC798; // type:object size:0x4 data:4byte lbl_805AC79C = .sdata2:0x805AC79C; // type:object size:0x8 lbl_805AC7A4 = .sdata2:0x805AC7A4; // type:object size:0x8 @@ -24924,9 +24924,9 @@ lbl_805ACA78 = .sdata2:0x805ACA78; // type:object size:0x8 align:4 data:float lbl_805ACA80 = .sdata2:0x805ACA80; // type:object size:0x4 align:4 data:float lbl_805ACA84 = .sdata2:0x805ACA84; // type:object size:0x4 align:4 data:float lbl_805ACA88 = .sdata2:0x805ACA88; // type:object size:0x8 align:4 data:float -@322 = .sdata2:0x805ACA90; // type:object size:0x4 scope:local align:4 data:float -@323 = .sdata2:0x805ACA94; // type:object size:0x4 scope:local align:4 data:float -@370 = .sdata2:0x805ACA98; // type:object size:0x4 scope:local align:4 data:float +@324 = .sdata2:0x805ACA90; // type:object size:0x4 scope:local align:4 data:float +@325 = .sdata2:0x805ACA94; // type:object size:0x4 scope:local align:4 data:float +@372 = .sdata2:0x805ACA98; // type:object size:0x4 scope:local align:4 data:float lbl_805ACAA0 = .sdata2:0x805ACAA0; // type:object size:0x4 align:4 data:float lbl_805ACAA4 = .sdata2:0x805ACAA4; // type:object size:0x4 align:4 data:float lbl_805ACAA8 = .sdata2:0x805ACAA8; // type:object size:0x8 align:4 data:float @@ -24958,17 +24958,17 @@ lbl_805ACB28 = .sdata2:0x805ACB28; // type:object size:0x4 align:4 data:float lbl_805ACB2C = .sdata2:0x805ACB2C; // type:object size:0x4 align:4 data:float lbl_805ACB30 = .sdata2:0x805ACB30; // type:object size:0x8 align:8 data:double lbl_805ACB38 = .sdata2:0x805ACB38; // type:object size:0x8 align:8 data:double -@477 = .sdata2:0x805ACB40; // type:object size:0x4 scope:local align:4 data:float -@478 = .sdata2:0x805ACB44; // type:object size:0x4 scope:local align:4 data:float -@479 = .sdata2:0x805ACB48; // type:object size:0x4 scope:local align:4 data:float -@711 = .sdata2:0x805ACB50; // type:object size:0x4 scope:local align:4 data:float -@712 = .sdata2:0x805ACB54; // type:object size:0x4 scope:local align:4 data:float -@713 = .sdata2:0x805ACB58; // type:object size:0x4 scope:local align:4 data:float -@714 = .sdata2:0x805ACB5C; // type:object size:0x4 scope:local align:4 data:float -@715 = .sdata2:0x805ACB60; // type:object size:0x4 scope:local align:4 data:float -@716 = .sdata2:0x805ACB64; // type:object size:0x4 scope:local align:4 data:float -@717 = .sdata2:0x805ACB68; // type:object size:0x4 scope:local align:4 data:float -@810 = .sdata2:0x805ACB6C; // type:object size:0x4 scope:local align:4 data:float +@490 = .sdata2:0x805ACB40; // type:object size:0x4 scope:local align:4 data:float +@491 = .sdata2:0x805ACB44; // type:object size:0x4 scope:local align:4 data:float +@492 = .sdata2:0x805ACB48; // type:object size:0x4 scope:local align:4 data:float +@739 = .sdata2:0x805ACB50; // type:object size:0x4 scope:local align:4 data:float +@740 = .sdata2:0x805ACB54; // type:object size:0x4 scope:local align:4 data:float +@741 = .sdata2:0x805ACB58; // type:object size:0x4 scope:local align:4 data:float +@742 = .sdata2:0x805ACB5C; // type:object size:0x4 scope:local align:4 data:float +@743 = .sdata2:0x805ACB60; // type:object size:0x4 scope:local align:4 data:float +@744 = .sdata2:0x805ACB64; // type:object size:0x4 scope:local align:4 data:float +@745 = .sdata2:0x805ACB68; // type:object size:0x4 scope:local align:4 data:float +@838 = .sdata2:0x805ACB6C; // type:object size:0x4 scope:local align:4 data:float lbl_805ACB70 = .sdata2:0x805ACB70; // type:object size:0x4 align:4 data:float lbl_805ACB74 = .sdata2:0x805ACB74; // type:object size:0x4 align:4 data:float lbl_805ACB78 = .sdata2:0x805ACB78; // type:object size:0x4 align:4 data:float @@ -24981,9 +24981,9 @@ lbl_805ACB90 = .sdata2:0x805ACB90; // type:object size:0x4 align:4 data:float lbl_805ACB94 = .sdata2:0x805ACB94; // type:object size:0x4 align:4 data:float lbl_805ACB98 = .sdata2:0x805ACB98; // type:object size:0x4 align:4 data:float lbl_805ACB9C = .sdata2:0x805ACB9C; // type:object size:0x4 align:4 data:float -@337 = .sdata2:0x805ACBA0; // type:object size:0x4 scope:local align:4 data:float -@338 = .sdata2:0x805ACBA4; // type:object size:0x4 scope:local align:4 data:float -@399 = .sdata2:0x805ACBA8; // type:object size:0x4 scope:local align:4 data:float +@339 = .sdata2:0x805ACBA0; // type:object size:0x4 scope:local align:4 data:float +@340 = .sdata2:0x805ACBA4; // type:object size:0x4 scope:local align:4 data:float +@401 = .sdata2:0x805ACBA8; // type:object size:0x4 scope:local align:4 data:float lbl_805ACBB0 = .sdata2:0x805ACBB0; // type:object size:0x4 align:4 data:float lbl_805ACBB4 = .sdata2:0x805ACBB4; // type:object size:0x4 lbl_805ACBB8 = .sdata2:0x805ACBB8; // type:object size:0x4 @@ -25077,7 +25077,7 @@ lbl_805ACD30 = .sdata2:0x805ACD30; // type:object size:0x4 align:4 data:float lbl_805ACD34 = .sdata2:0x805ACD34; // type:object size:0x4 align:4 data:float lbl_805ACD38 = .sdata2:0x805ACD38; // type:object size:0x4 align:4 data:float lbl_805ACD3C = .sdata2:0x805ACD3C; // type:object size:0x4 align:4 data:float -@325 = .sdata2:0x805ACD40; // type:object size:0x4 scope:local align:4 data:float +@327 = .sdata2:0x805ACD40; // type:object size:0x4 scope:local align:4 data:float lbl_805ACD48 = .sdata2:0x805ACD48; // type:object size:0x4 align:4 data:float lbl_805ACD4C = .sdata2:0x805ACD4C; // type:object size:0x4 align:4 data:float lbl_805ACD50 = .sdata2:0x805ACD50; // type:object size:0x4 align:4 data:float @@ -25107,11 +25107,11 @@ lbl_805ACDB4 = .sdata2:0x805ACDB4; // type:object size:0x4 align:4 data:float lbl_805ACDB8 = .sdata2:0x805ACDB8; // type:object size:0x4 align:4 data:float lbl_805ACDBC = .sdata2:0x805ACDBC; // type:object size:0x4 align:4 data:float lbl_805ACDC0 = .sdata2:0x805ACDC0; // type:object size:0x8 align:4 data:float -@476 = .sdata2:0x805ACDC8; // type:object size:0x4 scope:local align:4 data:float -@481 = .sdata2:0x805ACDCC; // type:object size:0x4 scope:local align:4 data:float -@383 = .sdata2:0x805ACDD0; // type:object size:0x4 scope:local align:4 data:float -@444 = .sdata2:0x805ACDD4; // type:object size:0x4 scope:local align:4 data:float -@490 = .sdata2:0x805ACDD8; // type:object size:0x4 scope:local align:4 data:float +@478 = .sdata2:0x805ACDC8; // type:object size:0x4 scope:local align:4 data:float +@483 = .sdata2:0x805ACDCC; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805ACDD0; // type:object size:0x4 scope:local align:4 data:float +@446 = .sdata2:0x805ACDD4; // type:object size:0x4 scope:local align:4 data:float +@492 = .sdata2:0x805ACDD8; // type:object size:0x4 scope:local align:4 data:float lbl_805ACDE0 = .sdata2:0x805ACDE0; // type:object size:0x4 align:4 data:float lbl_805ACDE4 = .sdata2:0x805ACDE4; // type:object size:0x4 align:4 data:float lbl_805ACDE8 = .sdata2:0x805ACDE8; // type:object size:0x4 align:4 data:float @@ -25239,10 +25239,10 @@ lbl_805ACFFC = .sdata2:0x805ACFFC; // type:object size:0x4 align:4 data:float lbl_805AD000 = .sdata2:0x805AD000; // type:object size:0x4 align:4 data:float lbl_805AD004 = .sdata2:0x805AD004; // type:object size:0x4 align:4 data:float lbl_805AD008 = .sdata2:0x805AD008; // type:object size:0x8 align:4 data:float -@507 = .sdata2:0x805AD010; // type:object size:0x4 scope:local align:4 data:float -@508 = .sdata2:0x805AD014; // type:object size:0x4 scope:local align:4 data:float -@509 = .sdata2:0x805AD018; // type:object size:0x4 scope:local align:4 data:float -@510 = .sdata2:0x805AD01C; // type:object size:0x4 scope:local align:4 data:float +@646 = .sdata2:0x805AD010; // type:object size:0x4 scope:local align:4 data:float +@647 = .sdata2:0x805AD014; // type:object size:0x4 scope:local align:4 data:float +@648 = .sdata2:0x805AD018; // type:object size:0x4 scope:local align:4 data:float +@649 = .sdata2:0x805AD01C; // type:object size:0x4 scope:local align:4 data:float lbl_805AD020 = .sdata2:0x805AD020; // type:object size:0x4 align:4 data:float lbl_805AD024 = .sdata2:0x805AD024; // type:object size:0x4 align:4 data:float lbl_805AD028 = .sdata2:0x805AD028; // type:object size:0x4 align:4 data:float @@ -25399,9 +25399,9 @@ lbl_805AD2CC = .sdata2:0x805AD2CC; // type:object size:0x4 align:4 data:float lbl_805AD2D0 = .sdata2:0x805AD2D0; // type:object size:0x4 align:4 data:float lbl_805AD2D4 = .sdata2:0x805AD2D4; // type:object size:0x4 align:4 data:float lbl_805AD2D8 = .sdata2:0x805AD2D8; // type:object size:0x8 align:4 data:float -@383 = .sdata2:0x805AD2E0; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805AD2E4; // type:object size:0x4 scope:local align:4 data:float -@410 = .sdata2:0x805AD2E8; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805AD2E0; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805AD2E4; // type:object size:0x4 scope:local align:4 data:float +@412 = .sdata2:0x805AD2E8; // type:object size:0x4 scope:local align:4 data:float lbl_805AD2F0 = .sdata2:0x805AD2F0; // type:object size:0x4 data:4byte lbl_805AD2F4 = .sdata2:0x805AD2F4; // type:object size:0x4 data:4byte lbl_805AD2F8 = .sdata2:0x805AD2F8; // type:object size:0x4 data:4byte @@ -25447,62 +25447,62 @@ lbl_805AD3A8 = .sdata2:0x805AD3A8; // type:object size:0x4 align:4 data:float lbl_805AD3AC = .sdata2:0x805AD3AC; // type:object size:0x4 align:4 data:float lbl_805AD3B0 = .sdata2:0x805AD3B0; // type:object size:0x4 align:4 data:float lbl_805AD3B4 = .sdata2:0x805AD3B4; // type:object size:0x4 align:4 data:float -lbl_805AD3B8 = .sdata2:0x805AD3B8; // type:object size:0x8 align:4 data:float -lbl_805AD3C0 = .sdata2:0x805AD3C0; // type:object size:0x4 align:4 data:float -lbl_805AD3C4 = .sdata2:0x805AD3C4; // type:object size:0x4 align:4 data:float -lbl_805AD3C8 = .sdata2:0x805AD3C8; // type:object size:0x4 align:4 data:float -lbl_805AD3CC = .sdata2:0x805AD3CC; // type:object size:0x4 align:4 data:float -lbl_805AD3D0 = .sdata2:0x805AD3D0; // type:object size:0x4 align:4 data:float -lbl_805AD3D4 = .sdata2:0x805AD3D4; // type:object size:0x4 align:4 data:float -lbl_805AD3D8 = .sdata2:0x805AD3D8; // type:object size:0x4 align:4 data:float -lbl_805AD3DC = .sdata2:0x805AD3DC; // type:object size:0x4 align:4 data:float -lbl_805AD3E0 = .sdata2:0x805AD3E0; // type:object size:0x4 align:4 data:float -lbl_805AD3E4 = .sdata2:0x805AD3E4; // type:object size:0x4 align:4 data:float -lbl_805AD3E8 = .sdata2:0x805AD3E8; // type:object size:0x4 align:4 data:float -lbl_805AD3EC = .sdata2:0x805AD3EC; // type:object size:0x4 align:4 data:float -lbl_805AD3F0 = .sdata2:0x805AD3F0; // type:object size:0x4 align:4 data:float -lbl_805AD3F4 = .sdata2:0x805AD3F4; // type:object size:0x4 align:4 data:float -lbl_805AD3F8 = .sdata2:0x805AD3F8; // type:object size:0x4 align:4 data:float -lbl_805AD3FC = .sdata2:0x805AD3FC; // type:object size:0x4 align:4 data:float -lbl_805AD400 = .sdata2:0x805AD400; // type:object size:0x4 align:4 data:float -lbl_805AD404 = .sdata2:0x805AD404; // type:object size:0x4 align:4 data:float -lbl_805AD408 = .sdata2:0x805AD408; // type:object size:0x4 align:4 data:float -lbl_805AD40C = .sdata2:0x805AD40C; // type:object size:0x4 align:4 data:float -lbl_805AD410 = .sdata2:0x805AD410; // type:object size:0x4 align:4 data:float -lbl_805AD414 = .sdata2:0x805AD414; // type:object size:0x4 align:4 data:float -lbl_805AD418 = .sdata2:0x805AD418; // type:object size:0x4 align:4 data:float -lbl_805AD41C = .sdata2:0x805AD41C; // type:object size:0x4 align:4 data:float -lbl_805AD420 = .sdata2:0x805AD420; // type:object size:0x4 align:4 data:float -lbl_805AD424 = .sdata2:0x805AD424; // type:object size:0x4 align:4 data:float -lbl_805AD428 = .sdata2:0x805AD428; // type:object size:0x4 align:4 data:float -lbl_805AD42C = .sdata2:0x805AD42C; // type:object size:0x4 align:4 data:float -lbl_805AD430 = .sdata2:0x805AD430; // type:object size:0x4 align:4 data:float -lbl_805AD434 = .sdata2:0x805AD434; // type:object size:0x4 align:4 data:float -lbl_805AD438 = .sdata2:0x805AD438; // type:object size:0x4 align:4 data:float -lbl_805AD43C = .sdata2:0x805AD43C; // type:object size:0x4 align:4 data:float -lbl_805AD440 = .sdata2:0x805AD440; // type:object size:0x4 align:4 data:float -lbl_805AD444 = .sdata2:0x805AD444; // type:object size:0x4 align:4 data:float -lbl_805AD448 = .sdata2:0x805AD448; // type:object size:0x4 align:4 data:float -lbl_805AD44C = .sdata2:0x805AD44C; // type:object size:0x4 align:4 data:float -lbl_805AD450 = .sdata2:0x805AD450; // type:object size:0x4 align:4 data:float -lbl_805AD454 = .sdata2:0x805AD454; // type:object size:0x4 align:4 data:float -lbl_805AD458 = .sdata2:0x805AD458; // type:object size:0x4 align:4 data:float -lbl_805AD45C = .sdata2:0x805AD45C; // type:object size:0x4 align:4 data:float -lbl_805AD460 = .sdata2:0x805AD460; // type:object size:0x4 align:4 data:float -lbl_805AD464 = .sdata2:0x805AD464; // type:object size:0x4 align:4 data:float -lbl_805AD468 = .sdata2:0x805AD468; // type:object size:0x4 align:4 data:float -lbl_805AD46C = .sdata2:0x805AD46C; // type:object size:0x4 align:4 data:float -lbl_805AD470 = .sdata2:0x805AD470; // type:object size:0x4 align:4 data:float -lbl_805AD474 = .sdata2:0x805AD474; // type:object size:0x4 align:4 data:float -lbl_805AD478 = .sdata2:0x805AD478; // type:object size:0x4 align:4 data:float -lbl_805AD47C = .sdata2:0x805AD47C; // type:object size:0x4 align:4 data:float -lbl_805AD480 = .sdata2:0x805AD480; // type:object size:0x4 align:4 data:float -lbl_805AD484 = .sdata2:0x805AD484; // type:object size:0x4 align:4 data:float -lbl_805AD488 = .sdata2:0x805AD488; // type:object size:0x4 align:4 data:float -lbl_805AD48C = .sdata2:0x805AD48C; // type:object size:0x4 align:4 data:float -lbl_805AD490 = .sdata2:0x805AD490; // type:object size:0x4 align:4 data:float -lbl_805AD494 = .sdata2:0x805AD494; // type:object size:0x4 align:4 data:float -lbl_805AD498 = .sdata2:0x805AD498; // type:object size:0x8 align:4 data:float +@529 = .sdata2:0x805AD3B8; // type:object size:0x4 scope:local align:4 data:float +@66 = .sdata2:0x805AD3C0; // type:object size:0x4 scope:local align:4 data:float +@67 = .sdata2:0x805AD3C4; // type:object size:0x4 scope:local align:4 data:float +@68 = .sdata2:0x805AD3C8; // type:object size:0x4 scope:local align:4 data:float +@69 = .sdata2:0x805AD3CC; // type:object size:0x4 scope:local align:4 data:float +@70 = .sdata2:0x805AD3D0; // type:object size:0x4 scope:local align:4 data:float +@71 = .sdata2:0x805AD3D4; // type:object size:0x4 scope:local align:4 data:float +@72 = .sdata2:0x805AD3D8; // type:object size:0x4 scope:local align:4 data:float +@73 = .sdata2:0x805AD3DC; // type:object size:0x4 scope:local align:4 data:float +@74 = .sdata2:0x805AD3E0; // type:object size:0x4 scope:local align:4 data:float +@75 = .sdata2:0x805AD3E4; // type:object size:0x4 scope:local align:4 data:float +@76 = .sdata2:0x805AD3E8; // type:object size:0x4 scope:local align:4 data:float +@77 = .sdata2:0x805AD3EC; // type:object size:0x4 scope:local align:4 data:float +@78 = .sdata2:0x805AD3F0; // type:object size:0x4 scope:local align:4 data:float +@79 = .sdata2:0x805AD3F4; // type:object size:0x4 scope:local align:4 data:float +@80 = .sdata2:0x805AD3F8; // type:object size:0x4 scope:local align:4 data:float +@81 = .sdata2:0x805AD3FC; // type:object size:0x4 scope:local align:4 data:float +@82 = .sdata2:0x805AD400; // type:object size:0x4 scope:local align:4 data:float +@83 = .sdata2:0x805AD404; // type:object size:0x4 scope:local align:4 data:float +@84 = .sdata2:0x805AD408; // type:object size:0x4 scope:local align:4 data:float +@85 = .sdata2:0x805AD40C; // type:object size:0x4 scope:local align:4 data:float +@86 = .sdata2:0x805AD410; // type:object size:0x4 scope:local align:4 data:float +@87 = .sdata2:0x805AD414; // type:object size:0x4 scope:local align:4 data:float +@88 = .sdata2:0x805AD418; // type:object size:0x4 scope:local align:4 data:float +@89 = .sdata2:0x805AD41C; // type:object size:0x4 scope:local align:4 data:float +@90 = .sdata2:0x805AD420; // type:object size:0x4 scope:local align:4 data:float +@91 = .sdata2:0x805AD424; // type:object size:0x4 scope:local align:4 data:float +@92 = .sdata2:0x805AD428; // type:object size:0x4 scope:local align:4 data:float +@93 = .sdata2:0x805AD42C; // type:object size:0x4 scope:local align:4 data:float +@94 = .sdata2:0x805AD430; // type:object size:0x4 scope:local align:4 data:float +@95 = .sdata2:0x805AD434; // type:object size:0x4 scope:local align:4 data:float +@96 = .sdata2:0x805AD438; // type:object size:0x4 scope:local align:4 data:float +@97 = .sdata2:0x805AD43C; // type:object size:0x4 scope:local align:4 data:float +@98 = .sdata2:0x805AD440; // type:object size:0x4 scope:local align:4 data:float +@99 = .sdata2:0x805AD444; // type:object size:0x4 scope:local align:4 data:float +@100 = .sdata2:0x805AD448; // type:object size:0x4 scope:local align:4 data:float +@101 = .sdata2:0x805AD44C; // type:object size:0x4 scope:local align:4 data:float +@102 = .sdata2:0x805AD450; // type:object size:0x4 scope:local align:4 data:float +@103 = .sdata2:0x805AD454; // type:object size:0x4 scope:local align:4 data:float +@104 = .sdata2:0x805AD458; // type:object size:0x4 scope:local align:4 data:float +@105 = .sdata2:0x805AD45C; // type:object size:0x4 scope:local align:4 data:float +@106 = .sdata2:0x805AD460; // type:object size:0x4 scope:local align:4 data:float +@107 = .sdata2:0x805AD464; // type:object size:0x4 scope:local align:4 data:float +@108 = .sdata2:0x805AD468; // type:object size:0x4 scope:local align:4 data:float +@109 = .sdata2:0x805AD46C; // type:object size:0x4 scope:local align:4 data:float +@110 = .sdata2:0x805AD470; // type:object size:0x4 scope:local align:4 data:float +@111 = .sdata2:0x805AD474; // type:object size:0x4 scope:local align:4 data:float +@112 = .sdata2:0x805AD478; // type:object size:0x4 scope:local align:4 data:float +@113 = .sdata2:0x805AD47C; // type:object size:0x4 scope:local align:4 data:float +@114 = .sdata2:0x805AD480; // type:object size:0x4 scope:local align:4 data:float +@115 = .sdata2:0x805AD484; // type:object size:0x4 scope:local align:4 data:float +@116 = .sdata2:0x805AD488; // type:object size:0x4 scope:local align:4 data:float +@117 = .sdata2:0x805AD48C; // type:object size:0x4 scope:local align:4 data:float +@118 = .sdata2:0x805AD490; // type:object size:0x4 scope:local align:4 data:float +@119 = .sdata2:0x805AD494; // type:object size:0x4 scope:local align:4 data:float +@120 = .sdata2:0x805AD498; // type:object size:0x4 scope:local align:4 data:float lbl_805AD4A0 = .sdata2:0x805AD4A0; // type:object size:0x4 data:4byte lbl_805AD4A4 = .sdata2:0x805AD4A4; // type:object size:0x4 data:4byte lbl_805AD4A8 = .sdata2:0x805AD4A8; // type:object size:0x4 data:4byte @@ -25537,9 +25537,9 @@ lbl_805AD518 = .sdata2:0x805AD518; // type:object size:0x4 align:4 data:float lbl_805AD51C = .sdata2:0x805AD51C; // type:object size:0x4 align:4 data:float lbl_805AD520 = .sdata2:0x805AD520; // type:object size:0x4 align:4 data:float lbl_805AD524 = .sdata2:0x805AD524; // type:object size:0x4 align:4 data:float -@306 = .sdata2:0x805AD528; // type:object size:0x4 scope:local align:4 data:float -@307 = .sdata2:0x805AD52C; // type:object size:0x4 scope:local align:4 data:float -@308 = .sdata2:0x805AD530; // type:object size:0x4 scope:local align:4 data:float +@308 = .sdata2:0x805AD528; // type:object size:0x4 scope:local align:4 data:float +@309 = .sdata2:0x805AD52C; // type:object size:0x4 scope:local align:4 data:float +@310 = .sdata2:0x805AD530; // type:object size:0x4 scope:local align:4 data:float lbl_805AD538 = .sdata2:0x805AD538; // type:object size:0x4 align:4 data:float lbl_805AD53C = .sdata2:0x805AD53C; // type:object size:0x4 align:4 data:float lbl_805AD540 = .sdata2:0x805AD540; // type:object size:0x4 align:4 data:float @@ -25574,14 +25574,14 @@ lbl_805AD5B4 = .sdata2:0x805AD5B4; // type:object size:0x4 align:4 data:float lbl_805AD5B8 = .sdata2:0x805AD5B8; // type:object size:0x4 align:4 data:float lbl_805AD5BC = .sdata2:0x805AD5BC; // type:object size:0x4 align:4 data:float lbl_805AD5C0 = .sdata2:0x805AD5C0; // type:object size:0x8 align:4 data:float -@428 = .sdata2:0x805AD5C8; // type:object size:0x4 scope:local align:4 data:float -@429 = .sdata2:0x805AD5CC; // type:object size:0x4 scope:local align:4 data:float -@430 = .sdata2:0x805AD5D0; // type:object size:0x4 scope:local align:4 data:float -@431 = .sdata2:0x805AD5D4; // type:object size:0x4 scope:local align:4 data:float -@434 = .sdata2:0x805AD5D8; // type:object size:0x8 scope:local align:8 data:double -@461 = .sdata2:0x805AD5E0; // type:object size:0x4 scope:local align:4 data:float -@462 = .sdata2:0x805AD5E4; // type:object size:0x4 scope:local align:4 data:float -@463 = .sdata2:0x805AD5E8; // type:object size:0x4 scope:local align:4 data:float +@430 = .sdata2:0x805AD5C8; // type:object size:0x4 scope:local align:4 data:float +@431 = .sdata2:0x805AD5CC; // type:object size:0x4 scope:local align:4 data:float +@432 = .sdata2:0x805AD5D0; // type:object size:0x4 scope:local align:4 data:float +@433 = .sdata2:0x805AD5D4; // type:object size:0x4 scope:local align:4 data:float +@436 = .sdata2:0x805AD5D8; // type:object size:0x8 scope:local align:8 data:double +@463 = .sdata2:0x805AD5E0; // type:object size:0x4 scope:local align:4 data:float +@464 = .sdata2:0x805AD5E4; // type:object size:0x4 scope:local align:4 data:float +@465 = .sdata2:0x805AD5E8; // type:object size:0x4 scope:local align:4 data:float lbl_805AD5F0 = .sdata2:0x805AD5F0; // type:object size:0x8 lbl_805AD5F8 = .sdata2:0x805AD5F8; // type:object size:0x4 align:4 data:float lbl_805AD5FC = .sdata2:0x805AD5FC; // type:object size:0x4 align:4 data:float @@ -25670,13 +25670,13 @@ MAGIC = .sdata2:0x805AD778; // type:object size:0x4 scope:local data:string @320 = .sdata2:0x805AD77C; // type:object size:0x4 scope:local align:4 data:float @321 = .sdata2:0x805AD780; // type:object size:0x4 scope:local align:4 data:float lbl_805AD788 = .sdata2:0x805AD788; // type:object size:0x8 data:4byte -@367 = .sdata2:0x805AD790; // type:object size:0x4 scope:local align:4 data:float -@508 = .sdata2:0x805AD794; // type:object size:0x4 scope:local align:4 data:float -@509 = .sdata2:0x805AD798; // type:object size:0x4 scope:local align:4 data:float -@519 = .sdata2:0x805AD79C; // type:object size:0x4 scope:local align:4 data:float -@520 = .sdata2:0x805AD7A0; // type:object size:0x4 scope:local align:4 data:float -@575 = .sdata2:0x805AD7A4; // type:object size:0x4 scope:local align:4 data:float -@576 = .sdata2:0x805AD7A8; // type:object size:0x4 scope:local align:4 data:float +@369 = .sdata2:0x805AD790; // type:object size:0x4 scope:local align:4 data:float +@510 = .sdata2:0x805AD794; // type:object size:0x4 scope:local align:4 data:float +@511 = .sdata2:0x805AD798; // type:object size:0x4 scope:local align:4 data:float +@521 = .sdata2:0x805AD79C; // type:object size:0x4 scope:local align:4 data:float +@522 = .sdata2:0x805AD7A0; // type:object size:0x4 scope:local align:4 data:float +@577 = .sdata2:0x805AD7A4; // type:object size:0x4 scope:local align:4 data:float +@578 = .sdata2:0x805AD7A8; // type:object size:0x4 scope:local align:4 data:float lbl_805AD7B0 = .sdata2:0x805AD7B0; // type:object size:0x8 data:4byte lbl_805AD7B8 = .sdata2:0x805AD7B8; // type:object size:0x4 data:4byte lbl_805AD7BC = .sdata2:0x805AD7BC; // type:object size:0x4 data:4byte @@ -25754,11 +25754,11 @@ lbl_805AD8E8 = .sdata2:0x805AD8E8; // type:object size:0x4 align:4 data:float lbl_805AD8EC = .sdata2:0x805AD8EC; // type:object size:0x4 align:4 data:float lbl_805AD8F0 = .sdata2:0x805AD8F0; // type:object size:0x4 align:4 data:float lbl_805AD8F4 = .sdata2:0x805AD8F4; // type:object size:0x4 align:4 data:float -@430 = .sdata2:0x805AD8F8; // type:object size:0x4 scope:local align:4 data:float -@431 = .sdata2:0x805AD8FC; // type:object size:0x4 scope:local align:4 data:float -@432 = .sdata2:0x805AD900; // type:object size:0x4 scope:local align:4 data:float -@433 = .sdata2:0x805AD904; // type:object size:0x4 scope:local align:4 data:float -@435 = .sdata2:0x805AD908; // type:object size:0x8 scope:local align:8 data:double +@594 = .sdata2:0x805AD8F8; // type:object size:0x4 scope:local align:4 data:float +@595 = .sdata2:0x805AD8FC; // type:object size:0x4 scope:local align:4 data:float +@596 = .sdata2:0x805AD900; // type:object size:0x4 scope:local align:4 data:float +@597 = .sdata2:0x805AD904; // type:object size:0x4 scope:local align:4 data:float +@599 = .sdata2:0x805AD908; // type:object size:0x8 scope:local align:8 data:double @403 = .sdata2:0x805AD910; // type:object size:0x4 scope:local align:4 data:float @404 = .sdata2:0x805AD914; // type:object size:0x4 scope:local align:4 data:float @462 = .sdata2:0x805AD918; // type:object size:0x4 scope:local align:4 data:float @@ -26013,8 +26013,8 @@ lbl_805ADD4C = .sdata2:0x805ADD4C; // type:object size:0x4 align:4 data:float lbl_805ADD50 = .sdata2:0x805ADD50; // type:object size:0x4 align:4 data:float lbl_805ADD54 = .sdata2:0x805ADD54; // type:object size:0x4 align:4 data:float lbl_805ADD58 = .sdata2:0x805ADD58; // type:object size:0x8 align:4 data:float -@793 = .sdata2:0x805ADD60; // type:object size:0x4 scope:local align:4 data:float -@794 = .sdata2:0x805ADD64; // type:object size:0x4 scope:local align:4 data:float +@795 = .sdata2:0x805ADD60; // type:object size:0x4 scope:local align:4 data:float +@796 = .sdata2:0x805ADD64; // type:object size:0x4 scope:local align:4 data:float lbl_805ADD68 = .sdata2:0x805ADD68; // type:object size:0x4 align:4 data:float lbl_805ADD6C = .sdata2:0x805ADD6C; // type:object size:0x4 align:4 data:float lbl_805ADD70 = .sdata2:0x805ADD70; // type:object size:0x4 data:4byte @@ -26145,18 +26145,18 @@ lbl_805ADF9C = .sdata2:0x805ADF9C; // type:object size:0x4 align:4 data:float lbl_805ADFA0 = .sdata2:0x805ADFA0; // type:object size:0x4 align:4 data:float lbl_805ADFA4 = .sdata2:0x805ADFA4; // type:object size:0x4 align:4 data:float lbl_805ADFA8 = .sdata2:0x805ADFA8; // type:object size:0x8 align:8 data:double -@318 = .sdata2:0x805ADFB0; // type:object size:0x4 scope:local align:4 data:float -@319 = .sdata2:0x805ADFB4; // type:object size:0x4 scope:local align:4 data:float -@320 = .sdata2:0x805ADFB8; // type:object size:0x4 scope:local align:4 data:float -@321 = .sdata2:0x805ADFBC; // type:object size:0x4 scope:local align:4 data:float -@322 = .sdata2:0x805ADFC0; // type:object size:0x4 scope:local align:4 data:float -@323 = .sdata2:0x805ADFC4; // type:object size:0x4 scope:local align:4 data:float -@324 = .sdata2:0x805ADFC8; // type:object size:0x4 scope:local align:4 data:float -@325 = .sdata2:0x805ADFCC; // type:object size:0x4 scope:local align:4 data:float -@326 = .sdata2:0x805ADFD0; // type:object size:0x4 scope:local align:4 data:float -@328 = .sdata2:0x805ADFD8; // type:object size:0x8 scope:local align:8 data:double -@341 = .sdata2:0x805ADFE0; // type:object size:0x4 scope:local align:4 data:float -@418 = .sdata2:0x805ADFE4; // type:object size:0x4 scope:local align:4 data:float +@450 = .sdata2:0x805ADFB0; // type:object size:0x4 scope:local align:4 data:float +@451 = .sdata2:0x805ADFB4; // type:object size:0x4 scope:local align:4 data:float +@452 = .sdata2:0x805ADFB8; // type:object size:0x4 scope:local align:4 data:float +@453 = .sdata2:0x805ADFBC; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805ADFC0; // type:object size:0x4 scope:local align:4 data:float +@455 = .sdata2:0x805ADFC4; // type:object size:0x4 scope:local align:4 data:float +@456 = .sdata2:0x805ADFC8; // type:object size:0x4 scope:local align:4 data:float +@457 = .sdata2:0x805ADFCC; // type:object size:0x4 scope:local align:4 data:float +@458 = .sdata2:0x805ADFD0; // type:object size:0x4 scope:local align:4 data:float +@460 = .sdata2:0x805ADFD8; // type:object size:0x8 scope:local align:8 data:double +@473 = .sdata2:0x805ADFE0; // type:object size:0x4 scope:local align:4 data:float +@550 = .sdata2:0x805ADFE4; // type:object size:0x4 scope:local align:4 data:float lbl_805ADFE8 = .sdata2:0x805ADFE8; // type:object size:0x4 align:4 data:float lbl_805ADFEC = .sdata2:0x805ADFEC; // type:object size:0x4 align:4 data:float lbl_805ADFF0 = .sdata2:0x805ADFF0; // type:object size:0x8 align:8 data:double @@ -26165,9 +26165,9 @@ lbl_805ADFFC = .sdata2:0x805ADFFC; // type:object size:0x4 align:4 data:float lbl_805AE000 = .sdata2:0x805AE000; // type:object size:0x4 align:4 data:float lbl_805AE004 = .sdata2:0x805AE004; // type:object size:0x4 align:4 data:float lbl_805AE008 = .sdata2:0x805AE008; // type:object size:0x8 align:4 data:float -@398 = .sdata2:0x805AE010; // type:object size:0x4 scope:local align:4 data:float -@399 = .sdata2:0x805AE014; // type:object size:0x4 scope:local align:4 data:float -@106 = .sdata2:0x805AE018; // type:object size:0x4 scope:local align:4 data:float +@400 = .sdata2:0x805AE010; // type:object size:0x4 scope:local align:4 data:float +@401 = .sdata2:0x805AE014; // type:object size:0x4 scope:local align:4 data:float +@109 = .sdata2:0x805AE018; // type:object size:0x4 scope:local align:4 data:float lbl_805AE020 = .sdata2:0x805AE020; // type:object size:0x4 align:4 data:float lbl_805AE024 = .sdata2:0x805AE024; // type:object size:0x4 align:4 data:float lbl_805AE028 = .sdata2:0x805AE028; // type:object size:0x4 align:4 data:float @@ -26315,8 +26315,8 @@ lbl_805AE308 = .sdata2:0x805AE308; // type:object size:0x4 align:4 data:float lbl_805AE30C = .sdata2:0x805AE30C; // type:object size:0x4 align:4 data:float lbl_805AE310 = .sdata2:0x805AE310; // type:object size:0x2 data:2byte gkInvalidWidgetId__10CGuiWidget = .sdata2:0x805AE312; // type:object size:0x6 data:2byte -lbl_805AE318 = .sdata2:0x805AE318; // type:object size:0x4 align:4 data:float -lbl_805AE31C = .sdata2:0x805AE31C; // type:object size:0x4 align:4 data:float +@4 = .sdata2:0x805AE318; // type:object size:0x4 scope:local align:4 data:float +@5 = .sdata2:0x805AE31C; // type:object size:0x4 scope:local align:4 data:float lbl_805AE320 = .sdata2:0x805AE320; // type:object size:0x4 align:4 data:float lbl_805AE324 = .sdata2:0x805AE324; // type:object size:0x4 align:4 data:float lbl_805AE328 = .sdata2:0x805AE328; // type:object size:0x8 align:8 data:double @@ -26470,18 +26470,18 @@ lbl_805AE660 = .sdata2:0x805AE660; // type:object size:0x8 align:8 data:double lbl_805AE668 = .sdata2:0x805AE668; // type:object size:0x8 align:4 data:float @109 = .sdata2:0x805AE670; // type:object size:0x4 scope:local align:4 data:float @117 = .sdata2:0x805AE674; // type:object size:0x4 scope:local align:4 data:float -lbl_805AE678 = .sdata2:0x805AE678; // type:object size:0x4 align:4 data:float -lbl_805AE67C = .sdata2:0x805AE67C; // type:object size:0x4 align:4 data:float -lbl_805AE680 = .sdata2:0x805AE680; // type:object size:0x4 align:4 data:float +gkEpsilon32 = .sdata2:0x805AE678; // type:object size:0x4 scope:local align:4 data:float +@252 = .sdata2:0x805AE67C; // type:object size:0x4 scope:local align:4 data:float +@253 = .sdata2:0x805AE680; // type:object size:0x4 scope:local align:4 data:float @259 = .sdata2:0x805AE684; // type:object size:0x4 scope:local align:4 data:float @260 = .sdata2:0x805AE688; // type:object size:0x4 scope:local align:4 data:float -lbl_805AE68C = .sdata2:0x805AE68C; // type:object size:0x4 align:4 data:float -lbl_805AE690 = .sdata2:0x805AE690; // type:object size:0x4 align:4 data:float -lbl_805AE694 = .sdata2:0x805AE694; // type:object size:0x4 align:4 data:float -lbl_805AE698 = .sdata2:0x805AE698; // type:object size:0x4 data:4byte -lbl_805AE69C = .sdata2:0x805AE69C; // type:object size:0x4 align:4 data:float -lbl_805AE6A0 = .sdata2:0x805AE6A0; // type:object size:0x4 align:4 data:float -lbl_805AE6A4 = .sdata2:0x805AE6A4; // type:object size:0x4 align:4 data:float +@312 = .sdata2:0x805AE68C; // type:object size:0x4 scope:local align:4 data:float +@313 = .sdata2:0x805AE690; // type:object size:0x4 scope:local align:4 data:float +@339 = .sdata2:0x805AE694; // type:object size:0x4 scope:local align:4 data:float +@205 = .sdata2:0x805AE698; // type:object size:0x4 scope:local data:4byte +@507 = .sdata2:0x805AE69C; // type:object size:0x4 scope:local align:4 data:float +@508 = .sdata2:0x805AE6A0; // type:object size:0x4 scope:local align:4 data:float +@509 = .sdata2:0x805AE6A4; // type:object size:0x4 scope:local align:4 data:float lbl_805AE6A8 = .sdata2:0x805AE6A8; // type:object size:0x4 data:4byte lbl_805AE6AC = .sdata2:0x805AE6AC; // type:object size:0x4 data:4byte lbl_805AE6B0 = .sdata2:0x805AE6B0; // type:object size:0x8 data:byte @@ -26549,17 +26549,17 @@ lbl_805AE7D4 = .sdata2:0x805AE7D4; // type:object size:0x4 align:4 data:float lbl_805AE7D8 = .sdata2:0x805AE7D8; // type:object size:0x4 align:4 data:float lbl_805AE7E0 = .sdata2:0x805AE7E0; // type:object size:0x8 align:8 data:double lbl_805AE7E8 = .sdata2:0x805AE7E8; // type:object size:0x8 align:4 data:float -@18 = .sdata2:0x805AE7F0; // type:object size:0x4 scope:local align:4 data:float +@20 = .sdata2:0x805AE7F0; // type:object size:0x4 scope:local align:4 data:float @150 = .sdata2:0x805AE7F8; // type:object size:0x4 scope:local align:4 data:float @204 = .sdata2:0x805AE7FC; // type:object size:0x4 scope:local align:4 data:float @205 = .sdata2:0x805AE800; // type:object size:0x4 scope:local align:4 data:float @206 = .sdata2:0x805AE804; // type:object size:0x4 scope:local align:4 data:float @163 = .sdata2:0x805AE808; // type:object size:0x8 scope:local align:8 data:double -lbl_805AE810 = .sdata2:0x805AE810; // type:object size:0x4 align:4 data:float -lbl_805AE814 = .sdata2:0x805AE814; // type:object size:0x4 align:4 data:float -lbl_805AE818 = .sdata2:0x805AE818; // type:object size:0x4 align:4 data:float -lbl_805AE81C = .sdata2:0x805AE81C; // type:object size:0x4 align:4 data:float -lbl_805AE820 = .sdata2:0x805AE820; // type:object size:0x8 align:4 data:float +@239 = .sdata2:0x805AE810; // type:object size:0x4 scope:local align:4 data:float +@240 = .sdata2:0x805AE814; // type:object size:0x4 scope:local align:4 data:float +@241 = .sdata2:0x805AE818; // type:object size:0x4 scope:local align:4 data:float +@242 = .sdata2:0x805AE81C; // type:object size:0x4 scope:local align:4 data:float +@280 = .sdata2:0x805AE820; // type:object size:0x4 scope:local align:4 data:float lbl_805AE828 = .sdata2:0x805AE828; // type:object size:0x4 align:4 data:float lbl_805AE82C = .sdata2:0x805AE82C; // type:object size:0x4 align:4 data:float lbl_805AE830 = .sdata2:0x805AE830; // type:object size:0x4 align:4 data:float @@ -26675,8 +26675,8 @@ lbl_805AEA6C = .sdata2:0x805AEA6C; // type:object size:0x4 align:4 data:float lbl_805AEA70 = .sdata2:0x805AEA70; // type:object size:0x4 align:4 data:float lbl_805AEA74 = .sdata2:0x805AEA74; // type:object size:0x4 align:4 data:float lbl_805AEA78 = .sdata2:0x805AEA78; // type:object size:0x8 align:4 data:float -@149 = .sdata2:0x805AEA80; // type:object size:0x4 scope:local align:4 data:float -@150 = .sdata2:0x805AEA84; // type:object size:0x4 scope:local align:4 data:float +@151 = .sdata2:0x805AEA80; // type:object size:0x4 scope:local align:4 data:float +@152 = .sdata2:0x805AEA84; // type:object size:0x4 scope:local align:4 data:float lbl_805AEA88 = .sdata2:0x805AEA88; // type:object size:0x4 align:4 data:float lbl_805AEA8C = .sdata2:0x805AEA8C; // type:object size:0x4 align:4 data:float lbl_805AEA90 = .sdata2:0x805AEA90; // type:object size:0x4 align:4 data:float @@ -26707,8 +26707,8 @@ lbl_805AEB04 = .sdata2:0x805AEB04; // type:object size:0x4 align:4 data:float lbl_805AEB08 = .sdata2:0x805AEB08; // type:object size:0x4 align:4 data:float lbl_805AEB0C = .sdata2:0x805AEB0C; // type:object size:0x4 align:4 data:float lbl_805AEB10 = .sdata2:0x805AEB10; // type:object size:0x8 align:8 data:double -lbl_805AEB18 = .sdata2:0x805AEB18; // type:object size:0x4 align:4 data:float -lbl_805AEB1C = .sdata2:0x805AEB1C; // type:object size:0x4 align:4 data:float +@23 = .sdata2:0x805AEB18; // type:object size:0x4 scope:local align:4 data:float +@24 = .sdata2:0x805AEB1C; // type:object size:0x4 scope:local align:4 data:float @249 = .sdata2:0x805AEB20; // type:object size:0x4 scope:local align:4 data:float kInput_AnalogOnThreshhold__11CFinalInput = .sdata2:0x805AEB28; // type:object size:0x4 align:4 data:float kInput_AnalogTriggerOnThreshhold__11CFinalInput = .sdata2:0x805AEB2C; // type:object size:0x4 align:4 data:float @@ -26845,12 +26845,12 @@ lbl_805AEDC0 = .sdata2:0x805AEDC0; // type:object size:0x8 align:8 data:double lbl_805AEDC8 = .sdata2:0x805AEDC8; // type:object size:0x4 align:4 data:float lbl_805AEDCC = .sdata2:0x805AEDCC; // type:object size:0x4 align:4 data:float lbl_805AEDD0 = .sdata2:0x805AEDD0; // type:object size:0x8 align:4 data:float -@2 = .sdata2:0x805AEDD8; // type:object size:0x4 scope:local align:4 data:float -@3 = .sdata2:0x805AEDDC; // type:object size:0x4 scope:local align:4 data:float -lbl_805AEDE0 = .sdata2:0x805AEDE0; // type:object size:0x4 align:4 data:float -lbl_805AEDE4 = .sdata2:0x805AEDE4; // type:object size:0x4 align:4 data:float -lbl_805AEDE8 = .sdata2:0x805AEDE8; // type:object size:0x4 align:4 data:float -lbl_805AEDEC = .sdata2:0x805AEDEC; // type:object size:0x4 align:4 data:float +@34 = .sdata2:0x805AEDD8; // type:object size:0x4 scope:local align:4 data:float +@35 = .sdata2:0x805AEDDC; // type:object size:0x4 scope:local align:4 data:float +@37 = .sdata2:0x805AEDE0; // type:object size:0x4 scope:local align:4 data:float +@38 = .sdata2:0x805AEDE4; // type:object size:0x4 scope:local align:4 data:float +@39 = .sdata2:0x805AEDE8; // type:object size:0x4 scope:local align:4 data:float +@40 = .sdata2:0x805AEDEC; // type:object size:0x4 scope:local align:4 data:float lbl_805AEDF0 = .sdata2:0x805AEDF0; // type:object size:0x4 align:4 data:float lbl_805AEDF4 = .sdata2:0x805AEDF4; // type:object size:0x4 align:4 data:float lbl_805AEDF8 = .sdata2:0x805AEDF8; // type:object size:0x4 align:4 data:float @@ -27051,11 +27051,11 @@ lbl_805AEE78 = .sdata2:0x805AEE78; // type:object size:0x8 align:8 data:double @137 = .sdata2:0x805AF3D8; // type:object size:0x8 scope:local align:8 data:double @104 = .sdata2:0x805AF3E0; // type:object size:0x8 scope:local align:8 data:double @90 = .sdata2:0x805AF3E8; // type:object size:0x8 scope:local align:8 data:double -@620 = .sdata2:0x805AF3F0; // type:object size:0x4 scope:local align:4 data:float -@621 = .sdata2:0x805AF3F4; // type:object size:0x4 scope:local align:4 data:float -@622 = .sdata2:0x805AF3F8; // type:object size:0x4 scope:local align:4 data:float -@623 = .sdata2:0x805AF400; // type:object size:0x8 scope:local align:8 data:double -@625 = .sdata2:0x805AF408; // type:object size:0x8 scope:local align:8 data:double +@618 = .sdata2:0x805AF3F0; // type:object size:0x4 scope:local align:4 data:float +@619 = .sdata2:0x805AF3F4; // type:object size:0x4 scope:local align:4 data:float +@620 = .sdata2:0x805AF3F8; // type:object size:0x4 scope:local align:4 data:float +@621 = .sdata2:0x805AF400; // type:object size:0x8 scope:local align:8 data:double +@623 = .sdata2:0x805AF408; // type:object size:0x8 scope:local align:8 data:double @583 = .sdata2:0x805AF410; // type:object size:0x4 scope:local align:4 data:float @584 = .sdata2:0x805AF414; // type:object size:0x4 scope:local align:4 data:float @585 = .sdata2:0x805AF418; // type:object size:0x4 scope:local align:4 data:float @@ -27146,7 +27146,7 @@ i2fMagic = .sdata2:0x805AF5C8; // type:object size:0x8 scope:local align:8 data: i2fMagic = .sdata2:0x805AF600; // type:object size:0x8 scope:local align:8 data:double value0_6 = .sdata2:0x805AF608; // type:object size:0x4 scope:local align:4 data:float value0_3 = .sdata2:0x805AF60C; // type:object size:0x4 scope:local align:4 data:float -@326 = .sdata2:0x805AF610; // type:object size:0x4 scope:local align:4 data:float +@327 = .sdata2:0x805AF610; // type:object size:0x4 scope:local align:4 data:float i2fMagic = .sdata2:0x805AF618; // type:object size:0x8 scope:global align:8 data:double @200 = .sdata2:0x805AF620; // type:object size:0x8 scope:local align:8 data:double @636 = .sdata2:0x805AF628; // type:object size:0x4 scope:local align:4 data:float @@ -27167,7 +27167,7 @@ lbl_805AF66C = .sbss2:0x805AF66C; // type:object size:0x4 data:4byte lbl_805AF670 = .sbss2:0x805AF670; // type:object size:0x4 data:4byte lbl_805AF674 = .sbss2:0x805AF674; // type:object size:0x4 data:4byte lbl_805AF678 = .sbss2:0x805AF678; // type:object size:0x8 data:4byte -lbl_805AF680 = .sbss2:0x805AF680; // type:object size:0x8 data:4byte +@204 = .sbss2:0x805AF680; // type:object size:0x4 scope:local data:4byte lbl_805AF688 = .sbss2:0x805AF688; // type:object size:0x4 data:4byte lbl_805AF68C = .sbss2:0x805AF68C; // type:object size:0x4 data:4byte lbl_805AF690 = .sbss2:0x805AF690; // type:object size:0x4 data:4byte diff --git a/include/MetroidPrime/CMapWorldInfo.hpp b/include/MetroidPrime/CMapWorldInfo.hpp index 15df4550..782de631 100644 --- a/include/MetroidPrime/CMapWorldInfo.hpp +++ b/include/MetroidPrime/CMapWorldInfo.hpp @@ -5,8 +5,8 @@ class CMapWorldInfo { public: - bool IsAreaVisible(TAreaId areaId) const; - bool IsDoorVisited(TEditorId eid) const; + bool IsAreaVisible(const TAreaId areaId) const; + bool IsDoorVisited(const TEditorId eid) const; }; #endif // _CMAPWORLDINFO diff --git a/src/MetroidPrime/CMapArea.cpp b/src/MetroidPrime/CMapArea.cpp index 6d6e6039..4110dbe5 100644 --- a/src/MetroidPrime/CMapArea.cpp +++ b/src/MetroidPrime/CMapArea.cpp @@ -1,5 +1,6 @@ #include "MetroidPrime/CMapArea.hpp" +#include "Kyoto/Basics/CBasics.hpp" #include "MetroidPrime/CMappableObject.hpp" #include "MetroidPrime/CWorld.hpp" #include "MetroidPrime/Tweaks/CTweakAutoMapper.hpp" @@ -104,7 +105,7 @@ void CMapArea::PostConstruct() { } float* floatStart = reinterpret_cast< float* >(x3c_vertexStart); for (int i = 0; i < x2c_vertexCount * 3; ++i) { - floatStart[i] = floatStart[i]; // no-op, stripped out, possible byteswapping? + floatStart[i] = CBasics::SwapBytes(floatStart[i]); } for (int i = 0; i < x30_surfaceCount; ++i) { x40_surfaceStart[i].PostConstruct(x44_buf.get());