From 478f2369da9b70a63d1655426c668ccbcfdf5c2f Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 22 Apr 2025 23:57:41 -0700 Subject: [PATCH] Start DolphinCSkinnedModel, run `ninja apply` --- config/GM8E01_00/symbols.txt | 611 ++++++++++--------- config/GM8E01_01/symbols.txt | 46 +- include/Kyoto/Alloc/CCircularBuffer.hpp | 7 +- include/Kyoto/Animation/CSkinnedModel.hpp | 1 + include/Kyoto/Animation/IMetaAnim.hpp | 50 +- include/dolphin/gx/GXManage.h | 5 + src/Kyoto/Alloc/CCircularBuffer.cpp | 13 +- src/Kyoto/Animation/DolphinCSkinnedModel.cpp | 49 ++ src/Kyoto/Animation/IMetaAnim.cpp | 26 + 9 files changed, 467 insertions(+), 341 deletions(-) create mode 100644 src/Kyoto/Animation/DolphinCSkinnedModel.cpp create mode 100644 src/Kyoto/Animation/IMetaAnim.cpp diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 043470ff..8b063ddc 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -13171,7 +13171,7 @@ VClone__27CConstantAnimationTimeScaleCFv = .text:0x802FDBBC; // type:function si VFindUpperLimit__27CConstantAnimationTimeScaleCFRCfRCf = .text:0x802FDC44; // type:function size:0x18 scope:global VTimeScaleIntegral__27CConstantAnimationTimeScaleCFRCfRCf = .text:0x802FDC5C; // type:function size:0x18 scope:global GetType__27CConstantAnimationTimeScaleCFv = .text:0x802FDC74; // type:function size:0x8 scope:global -IsCAnimTreeNode__11IAnimReaderCFv = .text:0x802FDC7C; // type:function size:0x8 scope:global +IsCAnimTreeNode__11IAnimReaderCFv = .text:0x802FDC7C; // type:function size:0x8 scope:weak GetSoundPOIList__11IAnimReaderCFRC13CCharAnimTimeP13CSoundPOINodeUiUii = .text:0x802FDC84; // type:function size:0x7C scope:global GetParticlePOIList__11IAnimReaderCFRC13CCharAnimTimeP16CParticlePOINodeUiUii = .text:0x802FDD00; // type:function size:0x7C scope:global GetInt32POIList__11IAnimReaderCFRC13CCharAnimTimeP13CInt32POINodeUiUii = .text:0x802FDD7C; // type:function size:0x7C scope:global @@ -13206,7 +13206,7 @@ __dt__25CColorOverrideInstructionFv = .text:0x802FE8EC; // type:function size:0x PageInvoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FE948; // type:function size:0x2C scope:global Invoke__25CColorOverrideInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FE974; // type:function size:0x60 scope:global __ct__18CDrawStringOptionsFv = .text:0x802FE9D4; // type:function size:0xAC scope:global -__dt__16CFontInstructionFv = .text:0x802FEA80; // type:function size:0x80 scope:global +__dt__16CFontInstructionFv = .text:0x802FEA80; // type:function size:0x80 scope:weak PageInvoke__16CFontInstructionCFR16CFontRenderStateP17CTextRenderBuffer = .text:0x802FEB00; // type:function size:0x2C scope:global GetAssetCount__16CFontInstructionCFv = .text:0x802FEB2C; // type:function size:0x8 scope:global GetAssets__16CFontInstructionCFRQ24rstl42vector<6CToken,Q24rstl17rmemory_allocator> = .text:0x802FEB34; // type:function size:0x10C scope:global @@ -14838,12 +14838,12 @@ fn_80353120 = .text:0x80353120; // type:function size:0x15C __dt__13CSkinnedModelFv = .text:0x8035327C; // type:function size:0xE8 scope:global __ct__13CSkinnedModelFRC13CSkinnedModel = .text:0x80353364; // type:function size:0xD4 scope:global __ct__13CSkinnedModelFRC21TLockedToken<6CModel>RC26TLockedToken<10CSkinRules>RC31TLockedToken<15CCharLayoutInfo>Q213CSkinnedModel14EDataOwnership = .text:0x80353438; // type:function size:0xD4 scope:global -fn_8035350C = .text:0x8035350C; // type:function size:0xA0 -fn_803535AC = .text:0x803535AC; // type:function size:0x154 -fn_80353700 = .text:0x80353700; // type:function size:0x7C +DelSkinnedRef__8SkinningFv = .text:0x8035350C; // type:function size:0xA0 +AddSkinnedRef__8SkinningFv = .text:0x803535AC; // type:function size:0x154 +do_erase__Q24rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>FPQ34rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>4node = .text:0x80353700; // type:function size:0x7C __sinit_DolphinCSkinnedModel_cpp = .text:0x8035377C; // type:function size:0x80 scope:local -__dt__Q24rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>Fv = .text:0x803537FC; // type:function size:0x78 scope:global -__dt__Q24rstl34optional_object<15CCircularBuffer>Fv = .text:0x80353874; // type:function size:0x80 scope:global +__dt__Q24rstl53list<18SSkinnedAllocation,Q24rstl17rmemory_allocator>Fv = .text:0x803537FC; // type:function size:0x78 scope:weak +__dt__Q24rstl34optional_object<15CCircularBuffer>Fv = .text:0x80353874; // type:function size:0x80 scope:weak ProcessingNormals__10CSkinRulesFiPPUs = .text:0x803538F4; // type:function size:0xFC scope:global ProcessingPoints__10CSkinRulesFiPPUs = .text:0x803539F0; // type:function size:0xFC scope:global WaitForQueue__Fv = .text:0x80353AEC; // type:function size:0x30 scope:global @@ -16694,11 +16694,11 @@ __GBASetDelay = .text:0x803CAF1C; // type:function size:0x24 scope:global F23 = .text:0x803CAF40; // type:function size:0xDC scope:local F25 = .text:0x803CB01C; // type:function size:0xA8 scope:global __GBAX02 = .text:0x803CB0C4; // type:function size:0xE4 scope:global -__init_cpp_exceptions_reference = .ctors:0x803CB1C0; // type:object size:0x4 scope:global +__init_cpp_exceptions_reference = .ctors:0x803CB1C0; // type:object size:0x4 scope:local _ctors = .ctors:0x803CB1C0; // type:label scope:global data:4byte _dtors = .dtors:0x803CB380; // type:label scope:global data:4byte -__destroy_global_chain_reference = .dtors:0x803CB380; // type:object size:0x4 scope:global -__fini_cpp_exceptions_reference = .dtors:0x803CB384; // type:object size:0x4 scope:global +__destroy_global_chain_reference = .dtors:0x803CB380; // type:object size:0x4 scope:local +__fini_cpp_exceptions_reference = .dtors:0x803CB384; // type:object size:0x4 scope:local __destroy_global_chain_reference = .dtors:0x803CB388; // type:object size:0x4 scope:local sDefaultFontData = .rodata:0x803CB3A0; // type:object size:0x650 scope:local data:byte sDefaultFontTexture = .rodata:0x803CB9F0; // type:object size:0x45C scope:local data:byte @@ -18143,7 +18143,7 @@ jumptable_803DAE7C = .data:0x803DAE7C; // type:object size:0x2C scope:local jumptable_803DAEA8 = .data:0x803DAEA8; // type:object size:0x2C scope:local jumptable_803DAED4 = .data:0x803DAED4; // type:object size:0x1C scope:local __vt__14CScriptCounter = .data:0x803DAEF0; // type:object size:0x20 scope:global -@250 = .data:0x803DAF10; // type:object size:0x24 scope:local +@252 = .data:0x803DAF10; // type:object size:0x24 scope:local lbl_803DAF38 = .data:0x803DAF38; // type:object size:0x10 lbl_803DAF48 = .data:0x803DAF48; // type:object size:0x10 lbl_803DAF58 = .data:0x803DAF58; // type:object size:0xD74 data:4byte @@ -18244,7 +18244,7 @@ __vt__14CBCScriptedCmd = .data:0x803DFE40; // type:object size:0xC scope:weak __vt__20CConsoleOutputWindow = .data:0x803DFE50; // type:object size:0x1C lbl_803DFE70 = .data:0x803DFE70; // type:object size:0x80 __vt__7CWeapon = .data:0x803DFEF0; // type:object size:0x6C scope:global -@389 = .data:0x803DFF5C; // type:object size:0x24 scope:local +@391 = .data:0x803DFF5C; // type:object size:0x24 scope:local __vt__16CLightParameters = .data:0x803DFF80; // type:object size:0xC scope:global lbl_803DFF90 = .data:0x803DFF90; // type:object size:0x2CC jumptable_803E025C = .data:0x803E025C; // type:object size:0x48 scope:local @@ -18712,7 +18712,7 @@ __vt__15CARAMDvdRequest = .data:0x803ED578; // type:object size:0x1C scope:globa __vt__15CRealDvdRequest = .data:0x803ED594; // type:object size:0x1C scope:global __vt__17CColorInstruction = .data:0x803ED5B0; // type:object size:0x1C scope:global __vt__25CColorOverrideInstruction = .data:0x803ED5D0; // type:object size:0x1C scope:global -__vt__16CFontInstruction = .data:0x803ED5F0; // type:object size:0x20 +__vt__16CFontInstruction = .data:0x803ED5F0; // type:object size:0x1C __vt__26CLineExtraSpaceInstruction = .data:0x803ED610; // type:object size:0x1C scope:global lbl_803ED630 = .data:0x803ED630; // type:object size:0x1C jumptable_803ED64C = .data:0x803ED64C; // type:object size:0x28 scope:local @@ -18773,7 +18773,7 @@ __vt__8CMVEWind = .data:0x803EDCC8; // type:object size:0x10 scope:global __vt__11CMVEGravity = .data:0x803EDCD8; // type:object size:0x10 scope:global __vt__16CMVEFastConstant = .data:0x803EDCE8; // type:object size:0x10 scope:global __vt__12CMVEConstant = .data:0x803EDCF8; // type:object size:0x10 scope:global -__vt__12CParticleGen = .data:0x803EDD08; // type:object size:0x78 scope:weak +__vt__12CParticleGen = .data:0x803EDD08; // type:object size:0x78 scope:global __vt__15CParticleSwoosh = .data:0x803EDD80; // type:object size:0x78 scope:global __vt__46TObjOwnerDerivedFromIObj<18CSwooshDescription> = .data:0x803EDDF8; // type:object size:0x10 scope:global __vt__15CREIntTimesReal = .data:0x803EDE08; // type:object size:0x14 scope:global @@ -19064,7 +19064,7 @@ __lconv = .data:0x803F2D20; // type:object size:0x38 scope:global data:4byte @1293 = .data:0x803F2DDC; // type:object size:0x84 scope:local @1428 = .data:0x803F2E60; // type:object size:0xE0 scope:local @1427 = .data:0x803F2F40; // type:object size:0x44 scope:local -@1682 = .data:0x803F2F88; // type:object size:0x50 scope:local +@1680 = .data:0x803F2F88; // type:object size:0x50 scope:local kf$483 = .data:0x803F2FD8; // type:object size:0x1A scope:local midi2TimeTab = .data:0x803F2FF4; // type:object size:0x200 scope:local mask$1021 = .data:0x803F31F8; // type:object size:0x20 scope:local @@ -19077,7 +19077,7 @@ tonedown_tab = .data:0x803F3620; // type:object size:0x200 scope:local dspAttenuationTab = .data:0x803F3820; // type:object size:0x184 scope:global dspScale2IndexTab = .data:0x803F39A4; // type:object size:0x400 scope:global dspDLSVolTab = .data:0x803F3DA4; // type:object size:0x204 scope:global -dspSRCCycles = .data:0x803F3FA8; // type:object size:0x12 scope:global +dspSRCCycles = .data:0x803F3FA8; // type:object size:0x12 scope:local ...data.0 = .data:0x803F3FC0; // type:object scope:local pan_tab = .data:0x803F41C4; // type:object size:0x10 scope:local pan_tab_dpl2 = .data:0x803F41D4; // type:object size:0x10 scope:local @@ -19174,7 +19174,7 @@ lbl_8045C598 = .bss:0x8045C598; // type:object size:0xC lbl_8045C5A4 = .bss:0x8045C5A4; // type:object size:0x10 lbl_8045C5B4 = .bss:0x8045C5B4; // type:object size:0xF3C8 lbl_8046B97C = .bss:0x8046B97C; // type:object size:0xA3C -@166 = .bss:0x8046C3B8; // type:object size:0xC scope:local +@168 = .bss:0x8046C3B8; // type:object size:0xC scope:local lbl_8046C3C8 = .bss:0x8046C3C8; // type:object size:0xC align:4 data:float lbl_8046C3D4 = .bss:0x8046C3D4; // type:object size:0xC data:4byte MinesPostTransforms = .bss:0x8046C3E0; // type:object size:0x28 scope:local align:4 data:float @@ -19184,7 +19184,7 @@ lbl_8046C438 = .bss:0x8046C438; // type:object size:0x18 data:4byte lbl_8046C450 = .bss:0x8046C450; // type:object size:0x20 data:2byte lbl_8046C470 = .bss:0x8046C470; // type:object size:0xC align:4 data:float lbl_8046C47C = .bss:0x8046C47C; // type:object size:0xC align:4 data:float -@286 = .bss:0x8046C488; // type:object size:0xC scope:local +@314 = .bss:0x8046C488; // type:object size:0xC scope:local skDoorVerts__15CMappableObject = .bss:0x8046C498; // type:object size:0x60 scope:local align:4 data:float lbl_8046C4F8 = .bss:0x8046C4F8; // type:object size:0xC lbl_8046C504 = .bss:0x8046C504; // type:object size:0x1C data:4byte @@ -19195,7 +19195,7 @@ lbl_8046C564 = .bss:0x8046C564; // type:object size:0xC lbl_8046C570 = .bss:0x8046C570; // type:object size:0xA8 lbl_8046C618 = .bss:0x8046C618; // type:object size:0x108 lbl_8046C720 = .bss:0x8046C720; // type:object size:0x18 data:4byte -result$293 = .bss:0x8046C738; // type:object size:0xC scope:local align:4 data:float +result$448 = .bss:0x8046C738; // type:object size:0xC scope:local align:4 data:float lbl_8046C748 = .bss:0x8046C748; // type:object size:0x10 lbl_8046C758 = .bss:0x8046C758; // type:object size:0x18 data:4byte lbl_8046C770 = .bss:0x8046C770; // type:object size:0x18 data:4byte @@ -19275,9 +19275,10 @@ sTextureProjectionTransform = .bss:0x804BFF5C; // type:object size:0x34 scope:lo lbl_804BFF90 = .bss:0x804BFF90; // type:object size:0x10 lbl_804BFFA0 = .bss:0x804BFFA0; // type:object size:0xC lbl_804BFFAC = .bss:0x804BFFAC; // type:object size:0x14 -sStaticSkinningData__8Skinning = .bss:0x804BFFC0; // type:object size:0x8000C scope:local align:32 -sSkinningBuffer__8Skinning = .bss:0x8053FFCC; // type:object size:0x28 scope:local data:byte -sAllocations__8Skinning = .bss:0x8053FFF4; // type:object size:0x1C scope:local +sStaticSkinningData__8Skinning = .bss:0x804BFFC0; // type:object size:0x80000 scope:local align:32 +sSkinningBuffer__8Skinning = .bss:0x8053FFC0; // type:object size:0x1C scope:local data:byte +sAllocations__8Skinning = .bss:0x8053FFDC; // type:object size:0x18 scope:local +lbl_8053FFF4 = .bss:0x8053FFF4; // type:object size:0x1C @148 = .bss:0x80540010; // type:object size:0xC scope:local lbl_80540020 = .bss:0x80540020; // type:object size:0x500 align:32 lbl_80540520 = .bss:0x80540520; // type:object size:0x30 @@ -19426,7 +19427,7 @@ __GBA = .bss:0x8056A1A0; // type:object size:0x400 scope:global align:8 gCommandFilterFlag__13ControlMapper = .bss:0x8056A5A0; // type:object size:0x48 scope:global data:4byte sIdentity__10CAxisAngle = .bss:0x8056A5E8; // type:object size:0xC scope:global align:4 data:float lbl_8056A5F4 = .bss:0x8056A5F4; // type:object size:0xC align:4 data:float -mBoolPOINodes__9CAnimData = .bss:0x8056A600; // type:object size:0x1E4 scope:global align:4 data:4byte +mBoolPOINodes__9CAnimData = .bss:0x8056A600; // type:object size:0x17F4 scope:global align:4 data:4byte mInt32POINodes__9CAnimData = .bss:0x8056BDF4; // type:object size:0x4C4 scope:global data:4byte mParticlePOINodes__9CAnimData = .bss:0x8056C2B8; // type:object size:0x734 scope:global data:4byte mSoundPOINodes__9CAnimData = .bss:0x8056C9EC; // type:object size:0x554 scope:global data:4byte @@ -19435,36 +19436,36 @@ kScaleVector__10CPlayerGun = .bss:0x8056D404; // type:object size:0xC scope:glob NullConnectionList__7CEntity = .bss:0x8056D410; // type:object size:0x10 scope:global CameraShaker = .bss:0x8056D420; // type:object size:0xD4 scope:global lbl_8056D4F4 = .bss:0x8056D4F4; // type:object size:0x84 data:4byte -sNormalVulnerability__20CDamageVulnerability = .bss:0x8056D578; // type:object size:0x68 scope:global data:4byte +sNormalVulnerability__20CDamageVulnerability = .bss:0x8056D578; // type:object size:0x1A0 scope:global data:4byte sImmuneVulnerability__20CDamageVulnerability = .bss:0x8056D718; // type:object size:0x68 scope:global data:4byte sReflectVulnerability__20CDamageVulnerability = .bss:0x8056D780; // type:object size:0x68 scope:global data:4byte sPassThroughVulnerability__20CDamageVulnerability = .bss:0x8056D7E8; // type:object size:0x68 scope:global data:4byte -mDecalPool__13CDecalManager = .bss:0x8056D850; // type:object size:0x1E04 scope:global data:4byte +mDecalPool__13CDecalManager = .bss:0x8056D850; // type:object size:0x1F08 scope:global data:4byte mActiveIndexList__13CDecalManager = .bss:0x8056F758; // type:object size:0x104 scope:global data:4byte -lbl_8056F85C = .bss:0x8056F85C; // type:object size:0x18 +lbl_8056F85C = .bss:0x8056F85C; // type:object size:0x38 lbl_8056F894 = .bss:0x8056F894; // type:object size:0x10 lbl_8056F8A4 = .bss:0x8056F8A4; // type:object size:0x10 -lbl_8056F8B4 = .bss:0x8056F8B4; // type:object size:0x18 +lbl_8056F8B4 = .bss:0x8056F8B4; // type:object size:0x1098 lbl_8057094C = .bss:0x8057094C; // type:object size:0x1000 data:byte lbl_8057194C = .bss:0x8057194C; // type:object size:0x40 data:byte lbl_8057198C = .bss:0x8057198C; // type:object size:0x40 data:byte -lbl_805719CC = .bss:0x805719CC; // type:object size:0x4 +lbl_805719CC = .bss:0x805719CC; // type:object size:0x10 lbl_805719DC = .bss:0x805719DC; // type:object size:0xC align:4 data:float -skHardRecoil__16CCameraShakeData = .bss:0x805719E8; // type:object size:0xD4 scope:global +skHardRecoil__16CCameraShakeData = .bss:0x805719E8; // type:object size:0x1A8 scope:global lbl_80571B90 = .bss:0x80571B90; // type:object size:0xD4 -lbl_80571C64 = .bss:0x80571C64; // type:object size:0x68 +lbl_80571C64 = .bss:0x80571C64; // type:object size:0x208 lbl_80571E6C = .bss:0x80571E6C; // type:object size:0x68 lbl_80571ED4 = .bss:0x80571ED4; // type:object size:0x68 lbl_80571F3C = .bss:0x80571F3C; // type:object size:0x68 lbl_80571FA4 = .bss:0x80571FA4; // type:object size:0x68 lbl_8057200C = .bss:0x8057200C; // type:object size:0xC align:4 data:float lbl_80572018 = .bss:0x80572018; // type:object size:0xC align:4 data:float -lbl_80572024 = .bss:0x80572024; // type:object size:0xC align:4 data:float +lbl_80572024 = .bss:0x80572024; // type:object size:0x18 align:4 data:float lbl_8057203C = .bss:0x8057203C; // type:object size:0xC align:4 data:float -lbl_80572048 = .bss:0x80572048; // type:object size:0xC align:4 data:float +lbl_80572048 = .bss:0x80572048; // type:object size:0x18 align:4 data:float lbl_80572060 = .bss:0x80572060; // type:object size:0xC align:4 data:float lbl_8057206C = .bss:0x8057206C; // type:object size:0xC align:4 data:float -lbl_80572078 = .bss:0x80572078; // type:object size:0x10 +lbl_80572078 = .bss:0x80572078; // type:object size:0x60 lbl_805720D8 = .bss:0x805720D8; // type:object size:0x10 lbl_805720E8 = .bss:0x805720E8; // type:object size:0x10 lbl_805720F8 = .bss:0x805720F8; // type:object size:0x10 @@ -19473,24 +19474,24 @@ lbl_80572118 = .bss:0x80572118; // type:object size:0x10 lbl_80572128 = .bss:0x80572128; // type:object size:0xC align:4 data:float skScaleFactor__24CScriptCameraPitchVolume = .bss:0x80572134; // type:object size:0xC scope:global align:4 data:float skRumbleFxTable = .bss:0x80572140; // type:object size:0x2A0 scope:global align:4 data:float -skExtendedClawBounds__12CElitePirate = .bss:0x805723E0; // type:object size:0xC scope:global align:4 data:float +skExtendedClawBounds__12CElitePirate = .bss:0x805723E0; // type:object size:0x18 scope:global align:4 data:float skLocalShieldBounds__12CElitePirate = .bss:0x805723F8; // type:object size:0xC scope:global align:4 data:float -lbl_80572404 = .bss:0x80572404; // type:object size:0x10 +lbl_80572404 = .bss:0x80572404; // type:object size:0x110 lbl_80572514 = .bss:0x80572514; // type:object size:0x10 lbl_80572524 = .bss:0x80572524; // type:object size:0x10 lbl_80572534 = .bss:0x80572534; // type:object size:0x10 lbl_80572544 = .bss:0x80572544; // type:object size:0x68 data:4byte lbl_805725AC = .bss:0x805725AC; // type:object size:0x68 data:4byte -lbl_80572614 = .bss:0x80572614; // type:object size:0x68 data:4byte +lbl_80572614 = .bss:0x80572614; // type:object size:0x74 data:4byte lbl_80572688 = .bss:0x80572688; // type:object size:0xC align:4 data:float lbl_80572694 = .bss:0x80572694; // type:object size:0x68 data:4byte sMazeSeeds__15CScriptMazeNode = .bss:0x805726FC; // type:object size:0x4B0 scope:global data:4byte -sDupVertexList__20CMetroidAreaCollider = .bss:0x80572BAC; // type:object size:0x5000 scope:global +sDupVertexList__20CMetroidAreaCollider = .bss:0x80572BAC; // type:object size:0x19000 scope:global sDupEdgeList__20CMetroidAreaCollider = .bss:0x8058BBAC; // type:object size:0xC000 scope:global sDupTriangleList__20CMetroidAreaCollider = .bss:0x80597BAC; // type:object size:0x8000 scope:global -kDefaultPosition__11CWorldLight = .bss:0x8059FBAC; // type:object size:0xC align:4 data:float +kDefaultPosition__11CWorldLight = .bss:0x8059FBAC; // type:object size:0x18 align:4 data:float kDefaultDirection__11CWorldLight = .bss:0x8059FBC4; // type:object size:0xC align:4 data:float -lbl_8059FBD0 = .bss:0x8059FBD0; // type:object size:0x18 data:4byte +lbl_8059FBD0 = .bss:0x8059FBD0; // type:object size:0xA8 data:4byte lbl_8059FC78 = .bss:0x8059FC78; // type:object size:0x18 data:4byte lbl_8059FC90 = .bss:0x8059FC90; // type:object size:0x18 data:4byte lbl_8059FCA8 = .bss:0x8059FCA8; // type:object size:0x18 data:4byte @@ -19500,7 +19501,7 @@ lbl_8059FCF0 = .bss:0x8059FCF0; // type:object size:0x18 data:4byte sDefaultDrawParms__19CGuiWidgetDrawParms = .bss:0x8059FD08; // type:object size:0x10 scope:global align:4 data:float skPassEverything__15CMaterialFilter = .bss:0x8059FD18; // type:object size:0x18 scope:global data:4byte mData__10CStopwatch = .bss:0x8059FD30; // type:object size:0x18 scope:global data:4byte -mChannels__11CSfxManager = .bss:0x8059FD48; // type:object size:0x5B0 scope:global +mChannels__11CSfxManager = .bss:0x8059FD48; // type:object size:0x2E18 scope:global mEmitterWrapperPool__11CSfxManager = .bss:0x805A2B60; // type:object size:0x1604 scope:global data:4byte mWrapperPool__11CSfxManager = .bss:0x805A4164; // type:object size:0xA04 scope:global data:4byte lbl_805A4B68 = .bss:0x805A4B68; // type:object size:0x1E0 data:4byte @@ -19511,11 +19512,11 @@ lbl_805A4F98 = .bss:0x805A4F98; // type:object size:0x1E0 data:4byte lbl_805A5178 = .bss:0x805A5178; // type:object size:0x9C data:4byte lbl_805A5214 = .bss:0x805A5214; // type:object size:0x154 data:4byte lbl_805A5368 = .bss:0x805A5368; // type:object size:0x60 data:4byte -kDefaultPosition__6CLight = .bss:0x805A53C8; // type:object size:0xC scope:global align:4 data:float +kDefaultPosition__6CLight = .bss:0x805A53C8; // type:object size:0x18 scope:global align:4 data:float kDefaultDirection__6CLight = .bss:0x805A53E0; // type:object size:0xC scope:global align:4 data:float sGXState__3CGX = .bss:0x805A53EC; // type:object size:0x260 scope:global data:4byte kEnvPassthru__13CTevCombiners = .bss:0x805A564C; // type:object size:0x4C scope:global -kEnvModulateConstColor__9CGraphics = .bss:0x805A5698; // type:object size:0x4C scope:global +kEnvModulateConstColor__9CGraphics = .bss:0x805A5698; // type:object size:0x7D8 scope:global kEnvConstColor__9CGraphics = .bss:0x805A5E70; // type:object size:0x4C scope:global kEnvModulate__9CGraphics = .bss:0x805A5EBC; // type:object size:0x4C scope:global kEnvDecal__9CGraphics = .bss:0x805A5F08; // type:object size:0x4C scope:global @@ -19552,18 +19553,18 @@ sRightVector__9CVector3f = .bss:0x805A6718; // type:object size:0xC scope:global sForwardVector__9CVector3f = .bss:0x805A6724; // type:object size:0xC scope:global align:4 data:float sBackVector__9CVector3f = .bss:0x805A6730; // type:object size:0xC scope:global align:4 data:float lbl_805A673C = .bss:0x805A673C; // type:object size:0x18 -mskInvertedBox__6CAABox = .bss:0x805A6754; // type:object size:0x18 scope:global align:4 data:float +mskInvertedBox__6CAABox = .bss:0x805A6754; // type:object size:0x30 scope:global align:4 data:float mskNullBox__6CAABox = .bss:0x805A6784; // type:object size:0x18 scope:global align:4 data:float mActiveDMAs__12CARAMManager = .bss:0x805A679C; // type:object size:0x18 scope:global sViewingFrom__13CCubeMaterial = .bss:0x805A67B4; // type:object size:0xC scope:global align:4 data:float skDefaultNormal__12CCubeSurface = .bss:0x805A67C0; // type:object size:0xC scope:global align:4 data:float mpDefaultInvalidString__9CAudioSys = .bss:0x805A67CC; // type:object size:0x10 scope:global -lbl_805A67DC = .bss:0x805A67DC; // type:object size:0x10 +lbl_805A67DC = .bss:0x805A67DC; // type:object size:0x20 lbl_805A67FC = .bss:0x805A67FC; // type:object size:0x10 sLists__10CARAMToken = .bss:0x805A680C; // type:object size:0x1C scope:global mMidiWrappers__12CMidiManager = .bss:0x805A6828; // type:object size:0x28 data:4byte lbl_805A6860 = .bss:0x805A6860; // type:object size:0x300 align:32 data:4byte -lbl_805A6B60 = .bss:0x805A6B60; // type:object size:0x10 data:4byte +lbl_805A6B60 = .bss:0x805A6B60; // type:object size:0x30 data:4byte lbl_805A6B90 = .bss:0x805A6B90; // type:object size:0x10 data:4byte lbl_805A6BA0 = .bss:0x805A6BA0; // type:object size:0x10 data:4byte lbl_805A6BC0 = .sdata:0x805A6BC0; // type:object size:0x1 data:byte @@ -19731,7 +19732,7 @@ lbl_805A6E68 = .sdata:0x805A6E68; // type:object size:0x4 data:4byte lbl_805A6E6C = .sdata:0x805A6E6C; // type:object size:0x2 data:2byte lbl_805A6E70 = .sdata:0x805A6E70; // type:object size:0x4 lbl_805A6E74 = .sdata:0x805A6E74; // type:object size:0x4 -@207 = .sdata:0x805A6E78; // type:object size:0x4 scope:local data:4byte +@209 = .sdata:0x805A6E78; // type:object size:0x4 scope:local data:4byte lbl_805A6E80 = .sdata:0x805A6E80; // type:object size:0x4 data:4byte lbl_805A6E84 = .sdata:0x805A6E84; // type:object size:0x4 lbl_805A6E88 = .sdata:0x805A6E88; // type:object size:0x4 @@ -19799,7 +19800,7 @@ lbl_805A6F88 = .sdata:0x805A6F88; // type:object size:0x4 lbl_805A6F8C = .sdata:0x805A6F8C; // type:object size:0x4 lbl_805A6F90 = .sdata:0x805A6F90; // type:object size:0x4 data:4byte lbl_805A6F94 = .sdata:0x805A6F94; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A6F98; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A6F98; // type:object size:0x4 scope:local data:4byte lbl_805A6FA0 = .sdata:0x805A6FA0; // type:object size:0x4 data:4byte lbl_805A6FA4 = .sdata:0x805A6FA4; // type:object size:0x4 data:4byte lbl_805A6FA8 = .sdata:0x805A6FA8; // type:object size:0x4 data:4byte @@ -19949,8 +19950,8 @@ lbl_805A7200 = .sdata:0x805A7200; // type:object size:0x4 data:4byte lbl_805A7204 = .sdata:0x805A7204; // type:object size:0x4 data:4byte lbl_805A7208 = .sdata:0x805A7208; // type:object size:0x4 data:4byte lbl_805A720C = .sdata:0x805A720C; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A7210; // type:object size:0x4 scope:local data:4byte -@206 = .sdata:0x805A7218; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7210; // type:object size:0x4 scope:local data:4byte +@208 = .sdata:0x805A7218; // type:object size:0x4 scope:local data:4byte lbl_805A7220 = .sdata:0x805A7220; // type:object size:0x1 data:byte lbl_805A7221 = .sdata:0x805A7221; // type:object size:0x1 data:byte lbl_805A7222 = .sdata:0x805A7222; // type:object size:0x1 data:byte @@ -19986,7 +19987,7 @@ lbl_805A727C = .sdata:0x805A727C; // type:object size:0x1 data:byte lbl_805A727D = .sdata:0x805A727D; // type:object size:0x1 data:byte lbl_805A727E = .sdata:0x805A727E; // type:object size:0x1 data:byte skDrawInDistance = .sdata:0x805A7280; // type:object size:0x4 scope:local align:4 data:float -@390 = .sdata:0x805A7284; // type:object size:0x4 scope:local align:4 data:float +@418 = .sdata:0x805A7284; // type:object size:0x4 scope:local align:4 data:float lbl_805A7288 = .sdata:0x805A7288; // type:object size:0x4 data:4byte lbl_805A728C = .sdata:0x805A728C; // type:object size:0x4 data:4byte lbl_805A7290 = .sdata:0x805A7290; // type:object size:0x4 data:4byte @@ -20023,9 +20024,9 @@ lbl_805A7310 = .sdata:0x805A7310; // type:object size:0x4 align:4 data:float lbl_805A7314 = .sdata:0x805A7314; // type:object size:0x4 align:4 data:float lbl_805A7318 = .sdata:0x805A7318; // type:object size:0x4 lbl_805A731C = .sdata:0x805A731C; // type:object size:0x4 -@333 = .sdata:0x805A7320; // type:object size:0x4 scope:local align:4 data:float -@270 = .sdata:0x805A7328; // type:object size:0x1 scope:local data:byte -@339 = .sdata:0x805A7329; // type:object size:0x1 scope:local data:byte +@361 = .sdata:0x805A7320; // type:object size:0x4 scope:local align:4 data:float +@298 = .sdata:0x805A7328; // type:object size:0x1 scope:local data:byte +@367 = .sdata:0x805A7329; // type:object size:0x1 scope:local data:byte lbl_805A7330 = .sdata:0x805A7330; // type:object size:0x4 data:4byte lbl_805A7334 = .sdata:0x805A7334; // type:object size:0x4 data:4byte lbl_805A7338 = .sdata:0x805A7338; // type:object size:0x4 data:4byte @@ -20158,7 +20159,7 @@ lbl_805A7548 = .sdata:0x805A7548; // type:object size:0x1 data:byte lbl_805A754C = .sdata:0x805A754C; // type:object size:0x4 data:4byte lbl_805A7550 = .sdata:0x805A7550; // type:object size:0x4 align:4 data:float lbl_805A7554 = .sdata:0x805A7554; // type:object size:0x4 data:4byte -@262 = .sdata:0x805A7558; // type:object size:0x4 scope:local data:float +@264 = .sdata:0x805A7558; // type:object size:0x4 scope:local data:float lbl_805A7560 = .sdata:0x805A7560; // type:object size:0x1 data:byte lbl_805A7564 = .sdata:0x805A7564; // type:object size:0x4 data:4byte lbl_805A7568 = .sdata:0x805A7568; // type:object size:0x4 data:4byte @@ -20235,7 +20236,7 @@ lbl_805A7694 = .sdata:0x805A7694; // type:object size:0x4 lbl_805A7698 = .sdata:0x805A7698; // type:object size:0x4 lbl_805A769C = .sdata:0x805A769C; // type:object size:0x4 lbl_805A76A0 = .sdata:0x805A76A0; // type:object size:0x8 -@205 = .sdata:0x805A76A8; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A76A8; // type:object size:0x4 scope:local data:4byte lbl_805A76B0 = .sdata:0x805A76B0; // type:object size:0x4 data:4byte lbl_805A76B4 = .sdata:0x805A76B4; // type:object size:0x4 data:4byte lbl_805A76B8 = .sdata:0x805A76B8; // type:object size:0x4 align:4 data:float @@ -20246,8 +20247,8 @@ lbl_805A76CC = .sdata:0x805A76CC; // type:object size:0x4 align:4 data:float lbl_805A76D0 = .sdata:0x805A76D0; // type:object size:0x8 align:4 data:float lbl_805A76D8 = .sdata:0x805A76D8; // type:object size:0x4 data:4byte lbl_805A76DC = .sdata:0x805A76DC; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A76E0; // type:object size:0x4 scope:local data:4byte -@286 = .sdata:0x805A76E8; // type:object size:0x4 scope:local align:4 data:float +@207 = .sdata:0x805A76E0; // type:object size:0x4 scope:local data:4byte +@441 = .sdata:0x805A76E8; // type:object size:0x4 scope:local align:4 data:float lbl_805A76F0 = .sdata:0x805A76F0; // type:object size:0x4 data:4byte lbl_805A76F4 = .sdata:0x805A76F4; // type:object size:0x4 data:4byte lbl_805A76F8 = .sdata:0x805A76F8; // type:object size:0x4 data:4byte @@ -20290,7 +20291,7 @@ lbl_805A7790 = .sdata:0x805A7790; // type:object size:0x4 data:4byte lbl_805A7794 = .sdata:0x805A7794; // type:object size:0x4 data:4byte lbl_805A7798 = .sdata:0x805A7798; // type:object size:0x8 data:4byte lbl_805A77A0 = .sdata:0x805A77A0; // type:object size:0x8 data:4byte -@205 = .sdata:0x805A77A8; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A77A8; // type:object size:0x4 scope:local data:4byte lbl_805A77B0 = .sdata:0x805A77B0; // type:object size:0x8 data:4byte lbl_805A77B8 = .sdata:0x805A77B8; // type:object size:0x4 data:4byte lbl_805A77BC = .sdata:0x805A77BC; // type:object size:0x4 data:4byte @@ -20300,13 +20301,13 @@ lbl_805A77C8 = .sdata:0x805A77C8; // type:object size:0x4 data:4byte lbl_805A77CC = .sdata:0x805A77CC; // type:object size:0x4 data:4byte lbl_805A77D0 = .sdata:0x805A77D0; // type:object size:0x4 data:4byte lbl_805A77D4 = .sdata:0x805A77D4; // type:object size:0x4 data:4byte -@238 = .sdata:0x805A77D8; // type:object size:0x4 scope:local data:4byte -@239 = .sdata:0x805A77DC; // type:object size:0x4 scope:local data:4byte -@240 = .sdata:0x805A77E0; // type:object size:0x4 scope:local data:4byte -@241 = .sdata:0x805A77E4; // type:object size:0x4 scope:local data:4byte -@242 = .sdata:0x805A77E8; // type:object size:0x4 scope:local data:4byte -@243 = .sdata:0x805A77EC; // type:object size:0x4 scope:local data:4byte -@244 = .sdata:0x805A77F0; // type:object size:0x4 scope:local data:4byte +@401 = .sdata:0x805A77D8; // type:object size:0x4 scope:local data:4byte +@402 = .sdata:0x805A77DC; // type:object size:0x4 scope:local data:4byte +@403 = .sdata:0x805A77E0; // type:object size:0x4 scope:local data:4byte +@404 = .sdata:0x805A77E4; // type:object size:0x4 scope:local data:4byte +@405 = .sdata:0x805A77E8; // type:object size:0x4 scope:local data:4byte +@406 = .sdata:0x805A77EC; // type:object size:0x4 scope:local data:4byte +@407 = .sdata:0x805A77F0; // type:object size:0x4 scope:local data:4byte lbl_805A77F8 = .sdata:0x805A77F8; // type:object size:0x4 data:4byte lbl_805A77FC = .sdata:0x805A77FC; // type:object size:0x4 data:4byte lbl_805A7800 = .sdata:0x805A7800; // type:object size:0x8 data:4byte @@ -20334,7 +20335,7 @@ lbl_805A785C = .sdata:0x805A785C; // type:object size:0x4 data:4byte lbl_805A7860 = .sdata:0x805A7860; // type:object size:0x8 data:4byte lbl_805A7868 = .sdata:0x805A7868; // type:object size:0x4 lbl_805A786C = .sdata:0x805A786C; // type:object size:0x4 -@223 = .sdata:0x805A7870; // type:object size:0x4 scope:local data:4byte +@225 = .sdata:0x805A7870; // type:object size:0x4 scope:local data:4byte lbl_805A7878 = .sdata:0x805A7878; // type:object size:0x4 data:4byte lbl_805A787C = .sdata:0x805A787C; // type:object size:0x4 data:4byte lbl_805A7880 = .sdata:0x805A7880; // type:object size:0x4 data:4byte @@ -20346,7 +20347,7 @@ lbl_805A7894 = .sdata:0x805A7894; // type:object size:0x4 lbl_805A7898 = .sdata:0x805A7898; // type:object size:0x4 lbl_805A789C = .sdata:0x805A789C; // type:object size:0x4 lbl_805A78A0 = .sdata:0x805A78A0; // type:object size:0x8 data:4byte -@209 = .sdata:0x805A78A8; // type:object size:0x4 scope:local data:4byte +@211 = .sdata:0x805A78A8; // type:object size:0x4 scope:local data:4byte lbl_805A78B0 = .sdata:0x805A78B0; // type:object size:0x4 data:4byte lbl_805A78B4 = .sdata:0x805A78B4; // type:object size:0x4 data:4byte lbl_805A78B8 = .sdata:0x805A78B8; // type:object size:0x4 data:4byte @@ -20467,8 +20468,8 @@ lbl_805A7A90 = .sdata:0x805A7A90; // type:object size:0x8 align:8 data:double lbl_805A7A98 = .sdata:0x805A7A98; // type:object size:0x8 align:4 data:float lbl_805A7AA0 = .sdata:0x805A7AA0; // type:object size:0x4 data:4byte lbl_805A7AA4 = .sdata:0x805A7AA4; // type:object size:0x4 align:4 data:float -@205 = .sdata:0x805A7AA8; // type:object size:0x4 scope:local data:4byte -@220 = .sdata:0x805A7AB0; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7AA8; // type:object size:0x4 scope:local data:4byte +@384 = .sdata:0x805A7AB0; // type:object size:0x4 scope:local data:4byte lbl_805A7AB8 = .sdata:0x805A7AB8; // type:object size:0x4 lbl_805A7ABC = .sdata:0x805A7ABC; // type:object size:0x4 lbl_805A7AC0 = .sdata:0x805A7AC0; // type:object size:0x4 align:4 data:float @@ -20638,8 +20639,8 @@ lbl_805A7D6C = .sdata:0x805A7D6C; // type:object size:0x1 data:byte lbl_805A7D6D = .sdata:0x805A7D6D; // type:object size:0x1 data:byte lbl_805A7D6E = .sdata:0x805A7D6E; // type:object size:0x2 lbl_805A7D70 = .sdata:0x805A7D70; // type:object size:0x8 -@242 = .sdata:0x805A7D78; // type:object size:0x4 scope:local data:4byte -@389 = .sdata:0x805A7D80; // type:object size:0x4 scope:local align:4 data:float +@244 = .sdata:0x805A7D78; // type:object size:0x4 scope:local data:4byte +@417 = .sdata:0x805A7D80; // type:object size:0x4 scope:local align:4 data:float lbl_805A7D88 = .sdata:0x805A7D88; // type:object size:0x4 lbl_805A7D8C = .sdata:0x805A7D8C; // type:object size:0x4 lbl_805A7D90 = .sdata:0x805A7D90; // type:object size:0x8 data:4byte @@ -20678,7 +20679,7 @@ lbl_805A7E14 = .sdata:0x805A7E14; // type:object size:0x4 data:4byte lbl_805A7E18 = .sdata:0x805A7E18; // type:object size:0x4 data:4byte lbl_805A7E1C = .sdata:0x805A7E1C; // type:object size:0x4 lbl_805A7E20 = .sdata:0x805A7E20; // type:object size:0x8 -@205 = .sdata:0x805A7E28; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A7E28; // type:object size:0x4 scope:local data:4byte lbl_805A7E30 = .sdata:0x805A7E30; // type:object size:0x4 align:4 data:float lbl_805A7E34 = .sdata:0x805A7E34; // type:object size:0x4 align:4 data:float lbl_805A7E38 = .sdata:0x805A7E38; // type:object size:0x4 @@ -20752,13 +20753,13 @@ lbl_805A7F58 = .sdata:0x805A7F58; // type:object size:0x4 data:4byte lbl_805A7F5C = .sdata:0x805A7F5C; // type:object size:0x4 data:4byte lbl_805A7F60 = .sdata:0x805A7F60; // type:object size:0x4 align:4 data:float lbl_805A7F64 = .sdata:0x805A7F64; // type:object size:0x4 align:4 data:float -@251 = .sdata:0x805A7F68; // type:object size:0x4 scope:local data:4byte -@336 = .sdata:0x805A7F6C; // type:object size:0x4 scope:local data:4byte -@400 = .sdata:0x805A7F70; // type:object size:0x4 scope:local data:4byte -@401 = .sdata:0x805A7F74; // type:object size:0x4 scope:local data:4byte -@402 = .sdata:0x805A7F78; // type:object size:0x4 scope:local data:4byte -@403 = .sdata:0x805A7F7C; // type:object size:0x4 scope:local data:4byte -@404 = .sdata:0x805A7F80; // type:object size:0x4 scope:local data:4byte +@390 = .sdata:0x805A7F68; // type:object size:0x4 scope:local data:4byte +@475 = .sdata:0x805A7F6C; // type:object size:0x4 scope:local data:4byte +@539 = .sdata:0x805A7F70; // type:object size:0x4 scope:local data:4byte +@540 = .sdata:0x805A7F74; // type:object size:0x4 scope:local data:4byte +@541 = .sdata:0x805A7F78; // type:object size:0x4 scope:local data:4byte +@542 = .sdata:0x805A7F7C; // type:object size:0x4 scope:local data:4byte +@543 = .sdata:0x805A7F80; // type:object size:0x4 scope:local data:4byte lbl_805A7F88 = .sdata:0x805A7F88; // type:object size:0x4 lbl_805A7F8C = .sdata:0x805A7F8C; // type:object size:0x4 lbl_805A7F90 = .sdata:0x805A7F90; // type:object size:0x4 @@ -20815,7 +20816,7 @@ lbl_805A805C = .sdata:0x805A805C; // type:object size:0x4 data:4byte lbl_805A8060 = .sdata:0x805A8060; // type:object size:0x4 data:4byte lbl_805A8064 = .sdata:0x805A8064; // type:object size:0x4 data:4byte lbl_805A8068 = .sdata:0x805A8068; // type:object size:0x8 data:4byte -@205 = .sdata:0x805A8070; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A8070; // type:object size:0x4 scope:local data:4byte lbl_805A8078 = .sdata:0x805A8078; // type:object size:0x1 data:byte lbl_805A807C = .sdata:0x805A807C; // type:object size:0x4 align:4 data:float lbl_805A8080 = .sdata:0x805A8080; // type:object size:0x1 data:byte @@ -20856,7 +20857,7 @@ lbl_805A8110 = .sdata:0x805A8110; // type:object size:0x4 lbl_805A8114 = .sdata:0x805A8114; // type:object size:0x4 lbl_805A8118 = .sdata:0x805A8118; // type:object size:0x4 lbl_805A811C = .sdata:0x805A811C; // type:object size:0x4 -@267 = .sdata:0x805A8120; // type:object size:0x4 scope:local data:4byte +@295 = .sdata:0x805A8120; // type:object size:0x4 scope:local data:4byte lbl_805A8128 = .sdata:0x805A8128; // type:object size:0x4 data:4byte lbl_805A812C = .sdata:0x805A812C; // type:object size:0x4 data:4byte lbl_805A8130 = .sdata:0x805A8130; // type:object size:0x4 data:4byte @@ -20957,7 +20958,7 @@ lbl_805A82B4 = .sdata:0x805A82B4; // type:object size:0x4 data:4byte @141 = .sdata:0x805A82BC; // type:object size:0x4 scope:local align:4 data:float lbl_805A82C0 = .sdata:0x805A82C0; // type:object size:0x4 data:4byte lbl_805A82C4 = .sdata:0x805A82C4; // type:object size:0x4 data:4byte -@205 = .sdata:0x805A82C8; // type:object size:0x4 scope:local data:4byte +@207 = .sdata:0x805A82C8; // type:object size:0x4 scope:local data:4byte lbl_805A82D0 = .sdata:0x805A82D0; // type:object size:0x1 data:byte lbl_805A82D1 = .sdata:0x805A82D1; // type:object size:0x1 lbl_805A82D2 = .sdata:0x805A82D2; // type:object size:0x1 data:byte @@ -21004,7 +21005,7 @@ lbl_805A8380 = .sdata:0x805A8380; // type:object size:0x4 data:4byte lbl_805A8384 = .sdata:0x805A8384; // type:object size:0x4 data:4byte lbl_805A8388 = .sdata:0x805A8388; // type:object size:0x8 data:4byte SolidMaterial = .sdata:0x805A8390; // type:object size:0x4 scope:local data:4byte -@223 = .sdata:0x805A8394; // type:object size:0x4 scope:local data:4byte +@387 = .sdata:0x805A8394; // type:object size:0x4 scope:local data:4byte @289 = .sdata:0x805A8398; // type:object size:0x4 scope:local align:4 data:float @294 = .sdata:0x805A839C; // type:object size:0x4 scope:local align:4 data:float lbl_805A83A0 = .sdata:0x805A83A0; // type:object size:0x4 data:4byte @@ -21542,8 +21543,8 @@ lbl_805A8CC0 = .sbss:0x805A8CC0; // type:object size:0x4 data:4byte lbl_805A8CC4 = .sbss:0x805A8CC4; // type:object size:0x1 data:byte lbl_805A8CC8 = .sbss:0x805A8CC8; // type:object size:0x4 data:4byte lbl_805A8CCC = .sbss:0x805A8CCC; // type:object size:0x4 data:4byte -sReferenceCount$360 = .sbss:0x805A8CD0; // type:object size:0x4 scope:local data:4byte -init$361 = .sbss:0x805A8CD4; // type:object size:0x1 scope:local data:byte +sReferenceCount$362 = .sbss:0x805A8CD0; // type:object size:0x4 scope:local data:4byte +init$363 = .sbss:0x805A8CD4; // type:object size:0x1 scope:local data:byte gpTweakPlayer = .sbss:0x805A8CD8; // type:object size:0x4 scope:global data:4byte gpTweakBall = .sbss:0x805A8CDC; // type:object size:0x4 scope:global data:4byte gpTweakGame = .sbss:0x805A8CE0; // type:object size:0x4 scope:global data:4byte @@ -21693,7 +21694,7 @@ lbl_805A8F68 = .sbss:0x805A8F68; // type:object size:0x4 data:4byte lbl_805A8F6C = .sbss:0x805A8F6C; // type:object size:0x4 data:4byte g_BillboardCount__19CHUDBillboardEffect = .sbss:0x805A8F70; // type:object size:0x4 scope:global data:4byte g_IndirectTexturedBillboardCount__19CHUDBillboardEffect = .sbss:0x805A8F74; // type:object size:0x4 scope:global data:4byte -init$294 = .sbss:0x805A8F78; // type:object size:0x1 scope:local data:byte +init$449 = .sbss:0x805A8F78; // type:object size:0x1 scope:local data:byte lbl_805A8F80 = .sbss:0x805A8F80; // type:object size:0x8 align:4 data:float lbl_805A8F88 = .sbss:0x805A8F88; // type:object size:0x4 align:4 data:float lbl_805A8F8C = .sbss:0x805A8F8C; // type:object size:0x1 data:byte @@ -22078,9 +22079,9 @@ lbl_805A95E9 = .sbss:0x805A95E9; // type:object size:0x1 data:byte lbl_805A95EA = .sbss:0x805A95EA; // type:object size:0x6 data:byte lbl_805A95F0 = .sbss:0x805A95F0; // type:object size:0x4 data:4byte lbl_805A95F4 = .sbss:0x805A95F4; // type:object size:0x4 data:4byte -lbl_805A95F8 = .sbss:0x805A95F8; // type:object size:0x2 data:2byte -lbl_805A95FC = .sbss:0x805A95FC; // type:object size:0x4 data:4byte -lbl_805A9600 = .sbss:0x805A9600; // type:object size:0x1 data:byte +skCurrentToken__8Skinning = .sbss:0x805A95F8; // type:object size:0x2 data:2byte +sNumSkinnedObjects__8Skinning = .sbss:0x805A95FC; // type:object size:0x4 data:4byte +sSkinningInitialized__8Skinning = .sbss:0x805A9600; // type:object size:0x1 data:byte lbl_805A9601 = .sbss:0x805A9601; // type:object size:0x7 data:byte lbl_805A9608 = .sbss:0x805A9608; // type:object size:0x1 data:byte lbl_805A960C = .sbss:0x805A960C; // type:object size:0x1 data:byte @@ -22392,8 +22393,8 @@ salLastTick = .sbss:0x805A9B7C; // type:object size:0x4 scope:local data:4byte salLogicActive = .sbss:0x805A9B80; // type:object size:0x4 scope:local data:4byte salLogicIsWaiting = .sbss:0x805A9B84; // type:object size:0x4 scope:local data:4byte salDspIsDone = .sbss:0x805A9B88; // type:object size:0x4 scope:local data:4byte -salAIBufferBase = .sbss:0x805A9B8C; // type:object size:0x4 scope:global data:4byte -salAIBufferIndex = .sbss:0x805A9B90; // type:object size:0x1 scope:local data:byte +salAIBufferBase = .sbss:0x805A9B8C; // type:object size:0x4 scope:local data:4byte +salAIBufferIndex = .sbss:0x805A9B90; // type:object size:0x1 scope:global data:byte userCallback = .sbss:0x805A9B94; // type:object size:0x4 scope:local data:4byte __DTKCurrentTrack = .sbss:0x805A9B98; // type:object size:0x4 scope:local data:4byte __DTKPlayListHead = .sbss:0x805A9B9C; // type:object size:0x4 scope:local data:4byte @@ -22656,8 +22657,8 @@ lbl_805AA100 = .sdata2:0x805AA100; // type:object size:0x8 align:8 data:double lbl_805AA108 = .sdata2:0x805AA108; // type:object size:0x4 align:4 data:float lbl_805AA10C = .sdata2:0x805AA10C; // type:object size:0x4 align:4 data:float kDefaultCharIdx__8CAnimRes = .sdata2:0x805AA110; // type:object size:0x8 scope:global data:4byte -@337 = .sdata2:0x805AA118; // type:object size:0x4 scope:local align:4 data:float -@338 = .sdata2:0x805AA11C; // type:object size:0x4 scope:local align:4 data:float +@339 = .sdata2:0x805AA118; // type:object size:0x4 scope:local align:4 data:float +@340 = .sdata2:0x805AA11C; // type:object size:0x4 scope:local align:4 data:float lbl_805AA120 = .sdata2:0x805AA120; // type:object size:0x4 align:4 data:float lbl_805AA124 = .sdata2:0x805AA124; // type:object size:0x4 align:4 data:float lbl_805AA128 = .sdata2:0x805AA128; // type:object size:0x4 align:4 data:float @@ -22806,9 +22807,9 @@ lbl_805AA3B4 = .sdata2:0x805AA3B4; // type:object size:0x4 align:4 data:float lbl_805AA3B8 = .sdata2:0x805AA3B8; // type:object size:0x4 align:4 data:float lbl_805AA3BC = .sdata2:0x805AA3BC; // type:object size:0x4 align:4 data:float lbl_805AA3C0 = .sdata2:0x805AA3C0; // type:object size:0x8 align:4 data:float -@442 = .sdata2:0x805AA3C8; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AA3CC; // type:object size:0x4 scope:local align:4 data:float -@592 = .sdata2:0x805AA3D0; // type:object size:0x4 scope:local align:4 data:float +@571 = .sdata2:0x805AA3C8; // type:object size:0x4 scope:local align:4 data:float +@572 = .sdata2:0x805AA3CC; // type:object size:0x4 scope:local align:4 data:float +@721 = .sdata2:0x805AA3D0; // type:object size:0x4 scope:local align:4 data:float lbl_805AA3D8 = .sdata2:0x805AA3D8; // type:object size:0x4 align:4 data:float lbl_805AA3DC = .sdata2:0x805AA3DC; // type:object size:0x4 align:4 data:float lbl_805AA3E0 = .sdata2:0x805AA3E0; // type:object size:0x8 align:8 data:double @@ -22919,17 +22920,17 @@ 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:0x4 align:4 data:float lbl_805AA5C8 = .sdata2:0x805AA5C8; // type:object size:0x8 align:8 data:double -@625 = .sdata2:0x805AA5D0; // type:object size:0x4 scope:local align:4 data:float -@799 = .sdata2:0x805AA5D4; // type:object size:0x4 scope:local align:4 data:float -@800 = .sdata2:0x805AA5D8; // type:object size:0x4 scope:local align:4 data:float -@909 = .sdata2:0x805AA5DC; // type:object size:0x4 scope:local align:4 data:float -@910 = .sdata2:0x805AA5E0; // type:object size:0x4 scope:local align:4 data:float -@911 = .sdata2:0x805AA5E8; // type:object size:0x8 scope:local align:8 data:double +@653 = .sdata2:0x805AA5D0; // type:object size:0x4 scope:local align:4 data:float +@827 = .sdata2:0x805AA5D4; // type:object size:0x4 scope:local align:4 data:float +@828 = .sdata2:0x805AA5D8; // type:object size:0x4 scope:local align:4 data:float +@937 = .sdata2:0x805AA5DC; // type:object size:0x4 scope:local align:4 data:float +@938 = .sdata2:0x805AA5E0; // type:object size:0x4 scope:local align:4 data:float +@939 = .sdata2:0x805AA5E8; // type:object size:0x8 scope:local align:8 data:double lbl_805AA5F0 = .sdata2:0x805AA5F0; // type:object size:0x4 align:4 data:float lbl_805AA5F4 = .sdata2:0x805AA5F4; // type:object size:0x4 align:4 data:float lbl_805AA5F8 = .sdata2:0x805AA5F8; // type:object size:0x8 align:4 data:float -@439 = .sdata2:0x805AA600; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AA608; // type:object size:0x8 scope:local align:8 data:double +@441 = .sdata2:0x805AA600; // type:object size:0x4 scope:local align:4 data:float +@445 = .sdata2:0x805AA608; // type:object size:0x8 scope:local align:8 data:double lbl_805AA610 = .sdata2:0x805AA610; // type:object size:0x4 align:4 data:float lbl_805AA614 = .sdata2:0x805AA614; // type:object size:0x4 align:4 data:float lbl_805AA618 = .sdata2:0x805AA618; // type:object size:0x4 @@ -23065,7 +23066,7 @@ lbl_805AA83C = .sdata2:0x805AA83C; // type:object size:0x4 align:4 data:float lbl_805AA840 = .sdata2:0x805AA840; // type:object size:0x8 align:8 data:double lbl_805AA848 = .sdata2:0x805AA848; // type:object size:0x4 align:4 data:float kDefaultKnockbackResistance = .sdata2:0x805AA84C; // type:object size:0x4 scope:global align:4 data:float -@247 = .sdata2:0x805AA850; // type:object size:0x4 scope:local align:4 data:float +@249 = .sdata2:0x805AA850; // type:object size:0x4 scope:local align:4 data:float lbl_805AA858 = .sdata2:0x805AA858; // type:object size:0x4 align:4 data:float lbl_805AA85C = .sdata2:0x805AA85C; // type:object size:0x4 align:4 data:float lbl_805AA860 = .sdata2:0x805AA860; // type:object size:0x4 align:4 data:float @@ -23160,15 +23161,15 @@ lbl_805AA9F8 = .sdata2:0x805AA9F8; // type:object size:0x4 align:4 data:float lbl_805AA9FC = .sdata2:0x805AA9FC; // type:object size:0x4 align:4 data:float lbl_805AAA00 = .sdata2:0x805AAA00; // type:object size:0x4 align:4 data:float lbl_805AAA08 = .sdata2:0x805AAA08; // type:object size:0x8 align:8 data:double -@296 = .sdata2:0x805AAA10; // type:object size:0x4 scope:local align:4 data:float +@298 = .sdata2:0x805AAA10; // type:object size:0x4 scope:local align:4 data:float lbl_805AAA18 = .sdata2:0x805AAA18; // type:object size:0x4 align:4 data:float lbl_805AAA1C = .sdata2:0x805AAA1C; // type:object size:0x4 align:4 data:float lbl_805AAA20 = .sdata2:0x805AAA20; // type:object size:0x8 align:4 data:float -@234 = .sdata2:0x805AAA28; // type:object size:0x4 scope:local align:4 data:float -@235 = .sdata2:0x805AAA2C; // type:object size:0x4 scope:local align:4 data:float -@268 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local align:4 data:float -@278 = .sdata2:0x805AAA34; // type:object size:0x4 scope:local align:4 data:float -@283 = .sdata2:0x805AAA38; // type:object size:0x8 scope:local align:8 data:double +@233 = .sdata2:0x805AAA28; // type:object size:0x4 scope:local align:4 data:float +@234 = .sdata2:0x805AAA2C; // type:object size:0x4 scope:local align:4 data:float +@270 = .sdata2:0x805AAA30; // type:object size:0x4 scope:local align:4 data:float +@280 = .sdata2:0x805AAA34; // type:object size:0x4 scope:local align:4 data:float +@285 = .sdata2:0x805AAA38; // type:object size:0x8 scope:local align:8 data:double lbl_805AAA40 = .sdata2:0x805AAA40; // type:object size:0x4 align:4 data:float lbl_805AAA44 = .sdata2:0x805AAA44; // type:object size:0x4 align:4 data:float lbl_805AAA48 = .sdata2:0x805AAA48; // type:object size:0x4 align:4 data:float @@ -23208,19 +23209,19 @@ lbl_805AAAD8 = .sdata2:0x805AAAD8; // type:object size:0x4 align:4 data:float lbl_805AAADC = .sdata2:0x805AAADC; // type:object size:0x4 align:4 data:float lbl_805AAAE0 = .sdata2:0x805AAAE0; // type:object size:0x4 align:4 data:float lbl_805AAAE4 = .sdata2:0x805AAAE4; // type:object size:0x4 align:4 data:float -@696 = .sdata2:0x805AAAE8; // type:object size:0x4 scope:local align:4 data:float -@697 = .sdata2:0x805AAAEC; // type:object size:0x4 scope:local align:4 data:float -@698 = .sdata2:0x805AAAF0; // type:object size:0x4 scope:local align:4 data:float -@699 = .sdata2:0x805AAAF4; // type:object size:0x4 scope:local align:4 data:float -@1080 = .sdata2:0x805AAAF8; // type:object size:0x4 scope:local align:4 data:float -@1081 = .sdata2:0x805AAAFC; // type:object size:0x4 scope:local align:4 data:float -@1082 = .sdata2:0x805AAB00; // type:object size:0x4 scope:local align:4 data:float -@1083 = .sdata2:0x805AAB04; // type:object size:0x4 scope:local align:4 data:float -@1084 = .sdata2:0x805AAB08; // type:object size:0x4 scope:local align:4 data:float -@1085 = .sdata2:0x805AAB0C; // type:object size:0x4 scope:local align:4 data:float -@1088 = .sdata2:0x805AAB10; // type:object size:0x8 scope:local align:8 data:double -@1203 = .sdata2:0x805AAB18; // type:object size:0x4 scope:local align:4 data:float -@1204 = .sdata2:0x805AAB1C; // type:object size:0x4 scope:local align:4 data:float +@724 = .sdata2:0x805AAAE8; // type:object size:0x4 scope:local align:4 data:float +@725 = .sdata2:0x805AAAEC; // type:object size:0x4 scope:local align:4 data:float +@726 = .sdata2:0x805AAAF0; // type:object size:0x4 scope:local align:4 data:float +@727 = .sdata2:0x805AAAF4; // type:object size:0x4 scope:local align:4 data:float +@1105 = .sdata2:0x805AAAF8; // type:object size:0x4 scope:local align:4 data:float +@1106 = .sdata2:0x805AAAFC; // type:object size:0x4 scope:local align:4 data:float +@1107 = .sdata2:0x805AAB00; // type:object size:0x4 scope:local align:4 data:float +@1108 = .sdata2:0x805AAB04; // type:object size:0x4 scope:local align:4 data:float +@1109 = .sdata2:0x805AAB08; // type:object size:0x4 scope:local align:4 data:float +@1110 = .sdata2:0x805AAB0C; // type:object size:0x4 scope:local align:4 data:float +@1113 = .sdata2:0x805AAB10; // type:object size:0x8 scope:local align:8 data:double +@1228 = .sdata2:0x805AAB18; // type:object size:0x4 scope:local align:4 data:float +@1229 = .sdata2:0x805AAB1C; // type:object size:0x4 scope:local align:4 data:float lbl_805AAB20 = .sdata2:0x805AAB20; // type:object size:0x4 align:4 data:float lbl_805AAB24 = .sdata2:0x805AAB24; // type:object size:0x4 align:4 data:float lbl_805AAB28 = .sdata2:0x805AAB28; // type:object size:0x8 align:4 data:float @@ -23289,22 +23290,22 @@ lbl_805AAC40 = .sdata2:0x805AAC40; // type:object size:0x4 align:4 data:float lbl_805AAC44 = .sdata2:0x805AAC44; // type:object size:0x4 align:4 data:float lbl_805AAC48 = .sdata2:0x805AAC48; // type:object size:0x8 align:4 data:float kSoundId = .sdata2:0x805AAC50; // type:object size:0x4 scope:local -@482 = .sdata2:0x805AAC54; // type:object size:0x4 scope:local align:4 data:float -@483 = .sdata2:0x805AAC58; // type:object size:0x4 scope:local align:4 data:float -@556 = .sdata2:0x805AAC5C; // type:object size:0x4 scope:local align:4 data:float -@557 = .sdata2:0x805AAC60; // type:object size:0x4 scope:local align:4 data:float -@558 = .sdata2:0x805AAC64; // type:object size:0x4 scope:local align:4 data:float -@559 = .sdata2:0x805AAC68; // type:object size:0x4 scope:local align:4 data:float -@560 = .sdata2:0x805AAC6C; // type:object size:0x4 scope:local align:4 data:float -@613 = .sdata2:0x805AAC70; // type:object size:0x4 scope:local align:4 data:float -@614 = .sdata2:0x805AAC74; // type:object size:0x4 scope:local align:4 data:float -@615 = .sdata2:0x805AAC78; // type:object size:0x4 scope:local align:4 data:float -@616 = .sdata2:0x805AAC7C; // type:object size:0x4 scope:local align:4 data:float -@712 = .sdata2:0x805AAC80; // type:object size:0x4 scope:local align:4 data:float -@713 = .sdata2:0x805AAC84; // type:object size:0x4 scope:local align:4 data:float -skSoundId$327 = .sdata2:0x805AAC88; // type:object size:0x4 scope:local -@484 = .sdata2:0x805AAC8C; // type:object size:0x4 scope:local align:4 data:float -@485 = .sdata2:0x805AAC90; // type:object size:0x4 scope:local align:4 data:float +@510 = .sdata2:0x805AAC54; // type:object size:0x4 scope:local align:4 data:float +@511 = .sdata2:0x805AAC58; // type:object size:0x4 scope:local align:4 data:float +@584 = .sdata2:0x805AAC5C; // type:object size:0x4 scope:local align:4 data:float +@585 = .sdata2:0x805AAC60; // type:object size:0x4 scope:local align:4 data:float +@586 = .sdata2:0x805AAC64; // type:object size:0x4 scope:local align:4 data:float +@587 = .sdata2:0x805AAC68; // type:object size:0x4 scope:local align:4 data:float +@588 = .sdata2:0x805AAC6C; // type:object size:0x4 scope:local align:4 data:float +@641 = .sdata2:0x805AAC70; // type:object size:0x4 scope:local align:4 data:float +@642 = .sdata2:0x805AAC74; // type:object size:0x4 scope:local align:4 data:float +@643 = .sdata2:0x805AAC78; // type:object size:0x4 scope:local align:4 data:float +@644 = .sdata2:0x805AAC7C; // type:object size:0x4 scope:local align:4 data:float +@740 = .sdata2:0x805AAC80; // type:object size:0x4 scope:local align:4 data:float +@741 = .sdata2:0x805AAC84; // type:object size:0x4 scope:local align:4 data:float +skSoundId$473 = .sdata2:0x805AAC88; // type:object size:0x4 scope:local +@630 = .sdata2:0x805AAC8C; // type:object size:0x4 scope:local align:4 data:float +@631 = .sdata2:0x805AAC90; // type:object size:0x4 scope:local align:4 data:float lbl_805AAC98 = .sdata2:0x805AAC98; // type:object size:0x4 lbl_805AAC9C = .sdata2:0x805AAC9C; // type:object size:0x4 align:4 data:float lbl_805AACA0 = .sdata2:0x805AACA0; // type:object size:0x4 align:4 data:float @@ -23341,7 +23342,7 @@ lbl_805AAD28 = .sdata2:0x805AAD28; // type:object size:0x4 align:4 data:float lbl_805AAD2C = .sdata2:0x805AAD2C; // type:object size:0x4 align:4 data:float lbl_805AAD30 = .sdata2:0x805AAD30; // type:object size:0x4 align:4 data:float lbl_805AAD34 = .sdata2:0x805AAD34; // type:object size:0x4 align:4 data:float -@275 = .sdata2:0x805AAD38; // type:object size:0x4 scope:local align:4 data:float +@277 = .sdata2:0x805AAD38; // type:object size:0x4 scope:local align:4 data:float lbl_805AAD40 = .sdata2:0x805AAD40; // type:object size:0x4 align:4 data:float lbl_805AAD44 = .sdata2:0x805AAD44; // type:object size:0x4 align:4 data:float lbl_805AAD48 = .sdata2:0x805AAD48; // type:object size:0x4 align:4 data:float @@ -23376,7 +23377,7 @@ lbl_805AADD4 = .sdata2:0x805AADD4; // type:object size:0x4 align:4 data:float lbl_805AADD8 = .sdata2:0x805AADD8; // type:object size:0x4 align:4 data:float lbl_805AADDC = .sdata2:0x805AADDC; // type:object size:0x4 align:4 data:float lbl_805AADE0 = .sdata2:0x805AADE0; // type:object size:0x8 align:4 data:float -@221 = .sdata2:0x805AADE8; // type:object size:0x4 scope:local align:4 data:float +@223 = .sdata2:0x805AADE8; // type:object size:0x4 scope:local align:4 data:float lbl_805AADF0 = .sdata2:0x805AADF0; // type:object size:0x4 align:4 data:float lbl_805AADF4 = .sdata2:0x805AADF4; // type:object size:0x4 align:4 data:float lbl_805AADF8 = .sdata2:0x805AADF8; // type:object size:0x4 align:4 data:float @@ -23542,8 +23543,8 @@ lbl_805AB0B0 = .sdata2:0x805AB0B0; // type:object size:0x4 align:4 data:float lbl_805AB0B4 = .sdata2:0x805AB0B4; // type:object size:0x4 align:4 data:float lbl_805AB0B8 = .sdata2:0x805AB0B8; // type:object size:0x4 align:4 data:float lbl_805AB0BC = .sdata2:0x805AB0BC; // type:object size:0x4 align:4 data:float -@498 = .sdata2:0x805AB0C0; // type:object size:0x4 scope:local align:4 data:float -@608 = .sdata2:0x805AB0C4; // type:object size:0x4 scope:local align:4 data:float +@500 = .sdata2:0x805AB0C0; // type:object size:0x4 scope:local align:4 data:float +@610 = .sdata2:0x805AB0C4; // type:object size:0x4 scope:local align:4 data:float @386 = .sdata2:0x805AB0C8; // type:object size:0x4 scope:local align:4 data:float @388 = .sdata2:0x805AB0D0; // type:object size:0x8 scope:local align:8 data:double lbl_805AB0D8 = .sdata2:0x805AB0D8; // type:object size:0x4 align:4 data:float @@ -23556,12 +23557,12 @@ lbl_805AB0F4 = .sdata2:0x805AB0F4; // type:object size:0x4 align:4 data:float lbl_805AB0F8 = .sdata2:0x805AB0F8; // type:object size:0x4 align:4 data:float lbl_805AB0FC = .sdata2:0x805AB0FC; // type:object size:0x4 align:4 data:float lbl_805AB100 = .sdata2:0x805AB100; // type:object size:0x8 align:4 data:float -@383 = .sdata2:0x805AB108; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805AB10C; // type:object size:0x4 scope:local align:4 data:float -@385 = .sdata2:0x805AB110; // type:object size:0x4 scope:local align:4 data:float -@386 = .sdata2:0x805AB114; // type:object size:0x4 scope:local align:4 data:float -@387 = .sdata2:0x805AB118; // type:object size:0x4 scope:local align:4 data:float -@388 = .sdata2:0x805AB11C; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805AB108; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805AB10C; // type:object size:0x4 scope:local align:4 data:float +@387 = .sdata2:0x805AB110; // type:object size:0x4 scope:local align:4 data:float +@388 = .sdata2:0x805AB114; // type:object size:0x4 scope:local align:4 data:float +@389 = .sdata2:0x805AB118; // type:object size:0x4 scope:local align:4 data:float +@390 = .sdata2:0x805AB11C; // type:object size:0x4 scope:local align:4 data:float lbl_805AB120 = .sdata2:0x805AB120; // type:object size:0x4 data:4byte kDefaultPositionUpdateThreshold__12CActorLights = .sdata2:0x805AB124; // type:object size:0x4 scope:global align:4 data:float lbl_805AB128 = .sdata2:0x805AB128; // type:object size:0x4 align:4 data:float @@ -23828,10 +23829,10 @@ lbl_805AB5A4 = .sdata2:0x805AB5A4; // type:object size:0x4 align:4 data:float lbl_805AB5A8 = .sdata2:0x805AB5A8; // type:object size:0x4 align:4 data:float lbl_805AB5AC = .sdata2:0x805AB5AC; // type:object size:0x4 align:4 data:float lbl_805AB5B0 = .sdata2:0x805AB5B0; // type:object size:0x8 align:4 data:float -@354 = .sdata2:0x805AB5B8; // type:object size:0x4 scope:local align:4 data:float -@476 = .sdata2:0x805AB5BC; // type:object size:0x4 scope:local align:4 data:float -@477 = .sdata2:0x805AB5C0; // type:object size:0x4 scope:local align:4 data:float -@566 = .sdata2:0x805AB5C4; // type:object size:0x4 scope:local align:4 data:float +@356 = .sdata2:0x805AB5B8; // type:object size:0x4 scope:local align:4 data:float +@472 = .sdata2:0x805AB5BC; // type:object size:0x4 scope:local align:4 data:float +@473 = .sdata2:0x805AB5C0; // type:object size:0x4 scope:local align:4 data:float +@562 = .sdata2:0x805AB5C4; // type:object size:0x4 scope:local align:4 data:float lbl_805AB5C8 = .sdata2:0x805AB5C8; // type:object size:0x4 align:4 data:float lbl_805AB5CC = .sdata2:0x805AB5CC; // type:object size:0x4 align:4 data:float lbl_805AB5D0 = .sdata2:0x805AB5D0; // type:object size:0x4 align:4 data:float @@ -23864,15 +23865,15 @@ lbl_805AB63C = .sdata2:0x805AB63C; // type:object size:0x4 align:4 data:float lbl_805AB640 = .sdata2:0x805AB640; // type:object size:0x4 align:4 data:float lbl_805AB644 = .sdata2:0x805AB644; // type:object size:0x4 align:4 data:float lbl_805AB648 = .sdata2:0x805AB648; // type:object size:0x8 align:4 data:float -@358 = .sdata2:0x805AB650; // type:object size:0x4 scope:local align:4 data:float -@440 = .sdata2:0x805AB658; // type:object size:0x4 scope:local align:4 data:float -@443 = .sdata2:0x805AB65C; // type:object size:0x4 scope:local align:4 data:float -@593 = .sdata2:0x805AB660; // type:object size:0x4 scope:local align:4 data:float -@654 = .sdata2:0x805AB664; // type:object size:0x4 scope:local align:4 data:float -@659 = .sdata2:0x805AB668; // type:object size:0x4 scope:local align:4 data:float -@670 = .sdata2:0x805AB66C; // type:object size:0x4 scope:local align:4 data:float -@671 = .sdata2:0x805AB670; // type:object size:0x4 scope:local align:4 data:float -@673 = .sdata2:0x805AB678; // type:object size:0x8 scope:local align:8 data:double +@360 = .sdata2:0x805AB650; // type:object size:0x4 scope:local align:4 data:float +@595 = .sdata2:0x805AB658; // type:object size:0x4 scope:local align:4 data:float +@598 = .sdata2:0x805AB65C; // type:object size:0x4 scope:local align:4 data:float +@748 = .sdata2:0x805AB660; // type:object size:0x4 scope:local align:4 data:float +@809 = .sdata2:0x805AB664; // type:object size:0x4 scope:local align:4 data:float +@814 = .sdata2:0x805AB668; // type:object size:0x4 scope:local align:4 data:float +@825 = .sdata2:0x805AB66C; // type:object size:0x4 scope:local align:4 data:float +@826 = .sdata2:0x805AB670; // type:object size:0x4 scope:local align:4 data:float +@828 = .sdata2:0x805AB678; // type:object size:0x8 scope:local align:8 data:double lbl_805AB680 = .sdata2:0x805AB680; // type:object size:0x4 align:4 data:float lbl_805AB684 = .sdata2:0x805AB684; // type:object size:0x4 align:4 data:float lbl_805AB688 = .sdata2:0x805AB688; // type:object size:0x4 align:4 data:float @@ -23892,10 +23893,10 @@ lbl_805AB6BC = .sdata2:0x805AB6BC; // type:object size:0x4 align:4 data:float lbl_805AB6C0 = .sdata2:0x805AB6C0; // type:object size:0x4 align:4 data:float lbl_805AB6C4 = .sdata2:0x805AB6C4; // type:object size:0x4 align:4 data:float lbl_805AB6C8 = .sdata2:0x805AB6C8; // type:object size:0x8 align:4 data:float -@251 = .sdata2:0x805AB6D0; // type:object size:0x4 scope:local align:4 data:float -@291 = .sdata2:0x805AB6D4; // type:object size:0x4 scope:local align:4 data:float -@292 = .sdata2:0x805AB6D8; // type:object size:0x4 scope:local align:4 data:float -@293 = .sdata2:0x805AB6DC; // type:object size:0x4 scope:local align:4 data:float +@253 = .sdata2:0x805AB6D0; // type:object size:0x4 scope:local align:4 data:float +@293 = .sdata2:0x805AB6D4; // type:object size:0x4 scope:local align:4 data:float +@294 = .sdata2:0x805AB6D8; // type:object size:0x4 scope:local align:4 data:float +@295 = .sdata2:0x805AB6DC; // type:object size:0x4 scope:local align:4 data:float lbl_805AB6E0 = .sdata2:0x805AB6E0; // type:object size:0x4 align:4 data:float lbl_805AB6E4 = .sdata2:0x805AB6E4; // type:object size:0x4 align:4 data:float lbl_805AB6E8 = .sdata2:0x805AB6E8; // type:object size:0x4 align:4 data:float @@ -23906,8 +23907,8 @@ lbl_805AB6F8 = .sdata2:0x805AB6F8; // type:object size:0x4 align:4 data:float lbl_805AB6FC = .sdata2:0x805AB6FC; // type:object size:0x4 align:4 data:float lbl_805AB700 = .sdata2:0x805AB700; // type:object size:0x4 align:4 data:float lbl_805AB708 = .sdata2:0x805AB708; // type:object size:0x8 align:8 data:double -@298 = .sdata2:0x805AB710; // type:object size:0x4 scope:local align:4 data:float -@299 = .sdata2:0x805AB714; // type:object size:0x4 scope:local align:4 data:float +@300 = .sdata2:0x805AB710; // type:object size:0x4 scope:local align:4 data:float +@301 = .sdata2:0x805AB714; // type:object size:0x4 scope:local align:4 data:float lbl_805AB718 = .sdata2:0x805AB718; // type:object size:0x4 align:4 data:float lbl_805AB71C = .sdata2:0x805AB71C; // type:object size:0x4 align:4 data:float lbl_805AB720 = .sdata2:0x805AB720; // type:object size:0x4 align:4 data:float @@ -23919,8 +23920,8 @@ lbl_805AB734 = .sdata2:0x805AB734; // type:object size:0x4 align:4 data:float lbl_805AB738 = .sdata2:0x805AB738; // type:object size:0x4 align:4 data:float lbl_805AB73C = .sdata2:0x805AB73C; // type:object size:0x4 align:4 data:float lbl_805AB740 = .sdata2:0x805AB740; // type:object size:0x8 align:8 data:double -@358 = .sdata2:0x805AB748; // type:object size:0x4 scope:local align:4 data:float -@359 = .sdata2:0x805AB74C; // type:object size:0x4 scope:local align:4 data:float +@360 = .sdata2:0x805AB748; // type:object size:0x4 scope:local align:4 data:float +@361 = .sdata2:0x805AB74C; // type:object size:0x4 scope:local align:4 data:float lbl_805AB750 = .sdata2:0x805AB750; // type:object size:0x4 align:4 data:float lbl_805AB754 = .sdata2:0x805AB754; // type:object size:0x4 align:4 data:float lbl_805AB758 = .sdata2:0x805AB758; // type:object size:0x4 align:4 data:float @@ -23931,7 +23932,7 @@ lbl_805AB768 = .sdata2:0x805AB768; // type:object size:0x4 align:4 data:float lbl_805AB76C = .sdata2:0x805AB76C; // type:object size:0x4 align:4 data:float lbl_805AB770 = .sdata2:0x805AB770; // type:object size:0x4 align:4 data:float lbl_805AB774 = .sdata2:0x805AB774; // type:object size:0x4 align:4 data:float -@314 = .sdata2:0x805AB778; // type:object size:0x4 scope:local align:4 data:float +@316 = .sdata2:0x805AB778; // type:object size:0x4 scope:local align:4 data:float lbl_805AB780 = .sdata2:0x805AB780; // type:object size:0x4 align:4 data:float lbl_805AB784 = .sdata2:0x805AB784; // type:object size:0x4 align:4 data:float lbl_805AB788 = .sdata2:0x805AB788; // type:object size:0x4 align:4 data:float @@ -24051,8 +24052,8 @@ lbl_805AB98C = .sdata2:0x805AB98C; // type:object size:0x4 align:4 data:float lbl_805AB990 = .sdata2:0x805AB990; // type:object size:0x4 align:4 data:float lbl_805AB994 = .sdata2:0x805AB994; // type:object size:0x4 align:4 data:float lbl_805AB998 = .sdata2:0x805AB998; // type:object size:0x8 align:4 data:float -@318 = .sdata2:0x805AB9A0; // type:object size:0x4 scope:local align:4 data:float -@375 = .sdata2:0x805AB9A4; // type:object size:0x4 scope:local align:4 data:float +@320 = .sdata2:0x805AB9A0; // type:object size:0x4 scope:local align:4 data:float +@377 = .sdata2:0x805AB9A4; // type:object size:0x4 scope:local align:4 data:float lbl_805AB9A8 = .sdata2:0x805AB9A8; // type:object size:0x4 align:4 data:float lbl_805AB9AC = .sdata2:0x805AB9AC; // type:object size:0x4 align:4 data:float lbl_805AB9B0 = .sdata2:0x805AB9B0; // type:object size:0x4 align:4 data:float @@ -24071,12 +24072,12 @@ lbl_805AB9E0 = .sdata2:0x805AB9E0; // type:object size:0x4 align:4 data:float lbl_805AB9E4 = .sdata2:0x805AB9E4; // type:object size:0x4 align:4 data:float lbl_805AB9E8 = .sdata2:0x805AB9E8; // type:object size:0x4 align:4 data:float lbl_805AB9EC = .sdata2:0x805AB9EC; // type:object size:0x4 align:4 data:float -@278 = .sdata2:0x805AB9F0; // type:object size:0x4 scope:local align:4 data:float +@280 = .sdata2:0x805AB9F0; // type:object size:0x4 scope:local align:4 data:float lbl_805AB9F8 = .sdata2:0x805AB9F8; // type:object size:0x4 align:4 data:float lbl_805AB9FC = .sdata2:0x805AB9FC; // type:object size:0x4 align:4 data:float lbl_805ABA00 = .sdata2:0x805ABA00; // type:object size:0x8 align:4 data:float -@293 = .sdata2:0x805ABA08; // type:object size:0x4 scope:local align:4 data:float -@303 = .sdata2:0x805ABA0C; // type:object size:0x4 scope:local align:4 data:float +@295 = .sdata2:0x805ABA08; // type:object size:0x4 scope:local align:4 data:float +@305 = .sdata2:0x805ABA0C; // type:object size:0x4 scope:local align:4 data:float lbl_805ABA10 = .sdata2:0x805ABA10; // type:object size:0x4 align:4 data:float lbl_805ABA14 = .sdata2:0x805ABA14; // type:object size:0x4 align:4 data:float lbl_805ABA18 = .sdata2:0x805ABA18; // type:object size:0x4 align:4 data:float @@ -24093,24 +24094,24 @@ lbl_805ABA40 = .sdata2:0x805ABA40; // type:object size:0x4 align:4 data:float lbl_805ABA44 = .sdata2:0x805ABA44; // type:object size:0x4 align:4 data:float lbl_805ABA48 = .sdata2:0x805ABA48; // type:object size:0x4 align:4 data:float lbl_805ABA50 = .sdata2:0x805ABA50; // type:object size:0x8 align:8 data:double -@340 = .sdata2:0x805ABA58; // type:object size:0x4 scope:local align:4 data:float -@444 = .sdata2:0x805ABA5C; // type:object size:0x4 scope:local align:4 data:float -@445 = .sdata2:0x805ABA60; // type:object size:0x4 scope:local align:4 data:float -@446 = .sdata2:0x805ABA64; // type:object size:0x4 scope:local align:4 data:float -@447 = .sdata2:0x805ABA68; // type:object size:0x4 scope:local align:4 data:float -@448 = .sdata2:0x805ABA6C; // type:object size:0x4 scope:local align:4 data:float -@449 = .sdata2:0x805ABA70; // type:object size:0x4 scope:local align:4 data:float -@452 = .sdata2:0x805ABA78; // type:object size:0x8 scope:local align:8 data:double +@342 = .sdata2:0x805ABA58; // type:object size:0x4 scope:local align:4 data:float +@446 = .sdata2:0x805ABA5C; // type:object size:0x4 scope:local align:4 data:float +@447 = .sdata2:0x805ABA60; // type:object size:0x4 scope:local align:4 data:float +@448 = .sdata2:0x805ABA64; // type:object size:0x4 scope:local align:4 data:float +@449 = .sdata2:0x805ABA68; // type:object size:0x4 scope:local align:4 data:float +@450 = .sdata2:0x805ABA6C; // type:object size:0x4 scope:local align:4 data:float +@451 = .sdata2:0x805ABA70; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805ABA78; // type:object size:0x8 scope:local align:8 data:double kEndingTime__10CPowerBomb = .sdata2:0x805ABA80; // type:object size:0x4 scope:global align:4 data:float -@402 = .sdata2:0x805ABA84; // type:object size:0x4 scope:local align:4 data:float -@403 = .sdata2:0x805ABA88; // type:object size:0x4 scope:local align:4 data:float -@447 = .sdata2:0x805ABA8C; // type:object size:0x4 scope:local align:4 data:float -@448 = .sdata2:0x805ABA90; // type:object size:0x4 scope:local align:4 data:float -@449 = .sdata2:0x805ABA94; // type:object size:0x4 scope:local align:4 data:float -@450 = .sdata2:0x805ABA98; // type:object size:0x4 scope:local align:4 data:float -@451 = .sdata2:0x805ABA9C; // type:object size:0x4 scope:local align:4 data:float -@452 = .sdata2:0x805ABAA0; // type:object size:0x4 scope:local align:4 data:float -@453 = .sdata2:0x805ABAA4; // type:object size:0x4 scope:local align:4 data:float +@565 = .sdata2:0x805ABA84; // type:object size:0x4 scope:local align:4 data:float +@566 = .sdata2:0x805ABA88; // type:object size:0x4 scope:local align:4 data:float +@610 = .sdata2:0x805ABA8C; // type:object size:0x4 scope:local align:4 data:float +@611 = .sdata2:0x805ABA90; // type:object size:0x4 scope:local align:4 data:float +@612 = .sdata2:0x805ABA94; // type:object size:0x4 scope:local align:4 data:float +@613 = .sdata2:0x805ABA98; // type:object size:0x4 scope:local align:4 data:float +@614 = .sdata2:0x805ABA9C; // type:object size:0x4 scope:local align:4 data:float +@615 = .sdata2:0x805ABAA0; // type:object size:0x4 scope:local align:4 data:float +@616 = .sdata2:0x805ABAA4; // type:object size:0x4 scope:local align:4 data:float lbl_805ABAA8 = .sdata2:0x805ABAA8; // type:object size:0x4 align:4 data:float lbl_805ABAAC = .sdata2:0x805ABAAC; // type:object size:0x4 align:4 data:float lbl_805ABAB0 = .sdata2:0x805ABAB0; // type:object size:0x8 align:4 data:float @@ -24136,16 +24137,16 @@ lbl_805ABB0C = .sdata2:0x805ABB0C; // type:object size:0x4 align:4 data:float lbl_805ABB10 = .sdata2:0x805ABB10; // type:object size:0x8 align:4 data:float lbl_805ABB18 = .sdata2:0x805ABB18; // type:object size:0x4 align:4 data:float lbl_805ABB1C = .sdata2:0x805ABB1C; // type:object size:0x4 align:4 data:float -@376 = .sdata2:0x805ABB20; // type:object size:0x4 scope:local align:4 data:float -@377 = .sdata2:0x805ABB24; // type:object size:0x4 scope:local align:4 data:float -@378 = .sdata2:0x805ABB28; // type:object size:0x4 scope:local align:4 data:float -@379 = .sdata2:0x805ABB2C; // type:object size:0x4 scope:local align:4 data:float -@380 = .sdata2:0x805ABB30; // type:object size:0x4 scope:local align:4 data:float -@381 = .sdata2:0x805ABB34; // type:object size:0x4 scope:local align:4 data:float -@382 = .sdata2:0x805ABB38; // type:object size:0x4 scope:local align:4 data:float -@383 = .sdata2:0x805ABB3C; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805ABB40; // type:object size:0x4 scope:local align:4 data:float -@388 = .sdata2:0x805ABB44; // type:object size:0x4 scope:local align:4 data:float +@378 = .sdata2:0x805ABB20; // type:object size:0x4 scope:local align:4 data:float +@379 = .sdata2:0x805ABB24; // type:object size:0x4 scope:local align:4 data:float +@380 = .sdata2:0x805ABB28; // type:object size:0x4 scope:local align:4 data:float +@381 = .sdata2:0x805ABB2C; // type:object size:0x4 scope:local align:4 data:float +@382 = .sdata2:0x805ABB30; // type:object size:0x4 scope:local align:4 data:float +@383 = .sdata2:0x805ABB34; // type:object size:0x4 scope:local align:4 data:float +@384 = .sdata2:0x805ABB38; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805ABB3C; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805ABB40; // type:object size:0x4 scope:local align:4 data:float +@390 = .sdata2:0x805ABB44; // type:object size:0x4 scope:local align:4 data:float lbl_805ABB48 = .sdata2:0x805ABB48; // type:object size:0x4 align:4 data:float lbl_805ABB4C = .sdata2:0x805ABB4C; // type:object size:0x4 align:4 data:float lbl_805ABB50 = .sdata2:0x805ABB50; // type:object size:0x4 align:4 data:float @@ -24217,7 +24218,7 @@ lbl_805ABC6C = .sdata2:0x805ABC6C; // type:object size:0x4 align:4 data:float lbl_805ABC70 = .sdata2:0x805ABC70; // type:object size:0x4 align:4 data:float lbl_805ABC74 = .sdata2:0x805ABC74; // type:object size:0x4 align:4 data:float lbl_805ABC78 = .sdata2:0x805ABC78; // type:object size:0x8 align:4 data:float -@331 = .sdata2:0x805ABC80; // type:object size:0x4 scope:local align:4 data:float +@333 = .sdata2:0x805ABC80; // 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:0x4 align:4 data:float @@ -24330,12 +24331,12 @@ lbl_805ABE60 = .sdata2:0x805ABE60; // type:object size:0x4 align:4 data:float lbl_805ABE64 = .sdata2:0x805ABE64; // type:object size:0x4 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 -@376 = .sdata2:0x805ABE70; // type:object size:0x4 scope:local align:4 data:float -@377 = .sdata2:0x805ABE74; // type:object size:0x4 scope:local align:4 data:float -@378 = .sdata2:0x805ABE78; // type:object size:0x4 scope:local align:4 data:float -@426 = .sdata2:0x805ABE80; // type:object size:0x8 scope:local align:8 data:double -@427 = .sdata2:0x805ABE88; // type:object size:0x4 scope:local align:4 data:float -@329 = .sdata2:0x805ABE90; // type:object size:0x4 scope:local align:4 data:float +@404 = .sdata2:0x805ABE70; // type:object size:0x4 scope:local align:4 data:float +@405 = .sdata2:0x805ABE74; // type:object size:0x4 scope:local align:4 data:float +@406 = .sdata2:0x805ABE78; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805ABE80; // type:object size:0x8 scope:local align:8 data:double +@455 = .sdata2:0x805ABE88; // type:object size:0x4 scope:local align:4 data:float +@332 = .sdata2:0x805ABE90; // type:object size:0x4 scope:local align:4 data:float lbl_805ABE98 = .sdata2:0x805ABE98; // type:object size:0x4 align:4 data:float lbl_805ABE9C = .sdata2:0x805ABE9C; // type:object size:0x4 align:4 data:float lbl_805ABEA0 = .sdata2:0x805ABEA0; // type:object size:0x4 align:4 data:float @@ -24348,10 +24349,10 @@ lbl_805ABEBC = .sdata2:0x805ABEBC; // type:object size:0x4 align:4 data:float lbl_805ABEC0 = .sdata2:0x805ABEC0; // type:object size:0x4 align:4 data:float lbl_805ABEC4 = .sdata2:0x805ABEC4; // type:object size:0x4 align:4 data:float lbl_805ABEC8 = .sdata2:0x805ABEC8; // type:object size:0x8 align:4 data:float -@487 = .sdata2:0x805ABED0; // type:object size:0x4 scope:local align:4 data:float -@488 = .sdata2:0x805ABED4; // type:object size:0x4 scope:local align:4 data:float -@489 = .sdata2:0x805ABED8; // type:object size:0x4 scope:local align:4 data:float -@528 = .sdata2:0x805ABEDC; // type:object size:0x4 scope:local align:4 data:float +@489 = .sdata2:0x805ABED0; // type:object size:0x4 scope:local align:4 data:float +@490 = .sdata2:0x805ABED4; // type:object size:0x4 scope:local align:4 data:float +@491 = .sdata2:0x805ABED8; // type:object size:0x4 scope:local align:4 data:float +@530 = .sdata2:0x805ABEDC; // type:object size:0x4 scope:local align:4 data:float lbl_805ABEE0 = .sdata2:0x805ABEE0; // type:object size:0x4 align:4 data:float lbl_805ABEE4 = .sdata2:0x805ABEE4; // type:object size:0x4 align:4 data:float lbl_805ABEE8 = .sdata2:0x805ABEE8; // type:object size:0x4 align:4 data:float @@ -24503,7 +24504,7 @@ lbl_805AC16C = .sdata2:0x805AC16C; // type:object size:0x4 align:4 data:float lbl_805AC170 = .sdata2:0x805AC170; // type:object size:0x4 align:4 data:float lbl_805AC174 = .sdata2:0x805AC174; // type:object size:0x4 align:4 data:float lbl_805AC178 = .sdata2:0x805AC178; // type:object size:0x8 align:4 data:float -@255 = .sdata2:0x805AC180; // type:object size:0x4 scope:local align:4 data:float +@257 = .sdata2:0x805AC180; // type:object size:0x4 scope:local align:4 data:float lbl_805AC188 = .sdata2:0x805AC188; // type:object size:0x4 align:4 data:float lbl_805AC18C = .sdata2:0x805AC18C; // type:object size:0x4 align:4 data:float lbl_805AC190 = .sdata2:0x805AC190; // type:object size:0x4 align:4 data:float @@ -24513,7 +24514,7 @@ lbl_805AC19C = .sdata2:0x805AC19C; // type:object size:0x4 align:4 data:float lbl_805AC1A0 = .sdata2:0x805AC1A0; // type:object size:0x4 align:4 data:float lbl_805AC1A4 = .sdata2:0x805AC1A4; // type:object size:0x4 align:4 data:float lbl_805AC1A8 = .sdata2:0x805AC1A8; // type:object size:0x8 align:4 data:float -@406 = .sdata2:0x805AC1B0; // type:object size:0x4 scope:local align:4 data:float +@570 = .sdata2:0x805AC1B0; // type:object size:0x4 scope:local align:4 data:float lbl_805AC1B8 = .sdata2:0x805AC1B8; // type:object size:0x4 align:4 data:float lbl_805AC1BC = .sdata2:0x805AC1BC; // type:object size:0x4 align:4 data:float lbl_805AC1C0 = .sdata2:0x805AC1C0; // type:object size:0x4 align:4 data:float @@ -24728,12 +24729,12 @@ lbl_805AC580 = .sdata2:0x805AC580; // type:object size:0x4 align:4 data:float lbl_805AC584 = .sdata2:0x805AC584; // type:object size:0x4 align:4 data:float lbl_805AC588 = .sdata2:0x805AC588; // type:object size:0x8 align:8 data:double lbl_805AC590 = .sdata2:0x805AC590; // type:object size:0x8 align:4 data:float -@288 = .sdata2:0x805AC598; // type:object size:0x4 scope:local align:4 data:float -@289 = .sdata2:0x805AC59C; // type:object size:0x4 scope:local align:4 data:float -@331 = .sdata2:0x805AC5A0; // type:object size:0x4 scope:local align:4 data:float -@334 = .sdata2:0x805AC5A8; // type:object size:0x8 scope:local align:8 data:double -@344 = .sdata2:0x805AC5B0; // type:object size:0x4 scope:local align:4 data:float -@345 = .sdata2:0x805AC5B4; // type:object size:0x4 scope:local align:4 data:float +@290 = .sdata2:0x805AC598; // type:object size:0x4 scope:local align:4 data:float +@291 = .sdata2:0x805AC59C; // type:object size:0x4 scope:local align:4 data:float +@333 = .sdata2:0x805AC5A0; // type:object size:0x4 scope:local align:4 data:float +@336 = .sdata2:0x805AC5A8; // type:object size:0x8 scope:local align:8 data:double +@346 = .sdata2:0x805AC5B0; // type:object size:0x4 scope:local align:4 data:float +@347 = .sdata2:0x805AC5B4; // type:object size:0x4 scope:local align:4 data:float lbl_805AC5B8 = .sdata2:0x805AC5B8; // type:object size:0x4 data:4byte lbl_805AC5BC = .sdata2:0x805AC5BC; // type:object size:0x8 lbl_805AC5C4 = .sdata2:0x805AC5C4; // type:object size:0x8 @@ -24901,9 +24902,9 @@ lbl_805AC898 = .sdata2:0x805AC898; // type:object size:0x8 align:4 data:float lbl_805AC8A0 = .sdata2:0x805AC8A0; // type:object size:0x4 align:4 data:float lbl_805AC8A4 = .sdata2:0x805AC8A4; // type:object size:0x4 align:4 data:float lbl_805AC8A8 = .sdata2:0x805AC8A8; // type:object size:0x8 align:4 data:float -@322 = .sdata2:0x805AC8B0; // type:object size:0x4 scope:local align:4 data:float -@323 = .sdata2:0x805AC8B4; // type:object size:0x4 scope:local align:4 data:float -@370 = .sdata2:0x805AC8B8; // type:object size:0x4 scope:local align:4 data:float +@324 = .sdata2:0x805AC8B0; // type:object size:0x4 scope:local align:4 data:float +@325 = .sdata2:0x805AC8B4; // type:object size:0x4 scope:local align:4 data:float +@372 = .sdata2:0x805AC8B8; // type:object size:0x4 scope:local align:4 data:float lbl_805AC8C0 = .sdata2:0x805AC8C0; // type:object size:0x4 align:4 data:float lbl_805AC8C4 = .sdata2:0x805AC8C4; // type:object size:0x4 align:4 data:float lbl_805AC8C8 = .sdata2:0x805AC8C8; // type:object size:0x8 align:4 data:float @@ -24935,17 +24936,17 @@ lbl_805AC948 = .sdata2:0x805AC948; // type:object size:0x4 align:4 data:float lbl_805AC94C = .sdata2:0x805AC94C; // type:object size:0x4 align:4 data:float lbl_805AC950 = .sdata2:0x805AC950; // type:object size:0x8 align:8 data:double lbl_805AC958 = .sdata2:0x805AC958; // type:object size:0x8 align:8 data:double -@477 = .sdata2:0x805AC960; // type:object size:0x4 scope:local align:4 data:float -@478 = .sdata2:0x805AC964; // type:object size:0x4 scope:local align:4 data:float -@479 = .sdata2:0x805AC968; // type:object size:0x4 scope:local align:4 data:float -@711 = .sdata2:0x805AC970; // type:object size:0x4 scope:local align:4 data:float -@712 = .sdata2:0x805AC974; // type:object size:0x4 scope:local align:4 data:float -@713 = .sdata2:0x805AC978; // type:object size:0x4 scope:local align:4 data:float -@714 = .sdata2:0x805AC97C; // type:object size:0x4 scope:local align:4 data:float -@715 = .sdata2:0x805AC980; // type:object size:0x4 scope:local align:4 data:float -@716 = .sdata2:0x805AC984; // type:object size:0x4 scope:local align:4 data:float -@717 = .sdata2:0x805AC988; // type:object size:0x4 scope:local align:4 data:float -@810 = .sdata2:0x805AC98C; // type:object size:0x4 scope:local align:4 data:float +@490 = .sdata2:0x805AC960; // type:object size:0x4 scope:local align:4 data:float +@491 = .sdata2:0x805AC964; // type:object size:0x4 scope:local align:4 data:float +@492 = .sdata2:0x805AC968; // type:object size:0x4 scope:local align:4 data:float +@736 = .sdata2:0x805AC970; // type:object size:0x4 scope:local align:4 data:float +@737 = .sdata2:0x805AC974; // type:object size:0x4 scope:local align:4 data:float +@738 = .sdata2:0x805AC978; // type:object size:0x4 scope:local align:4 data:float +@739 = .sdata2:0x805AC97C; // type:object size:0x4 scope:local align:4 data:float +@740 = .sdata2:0x805AC980; // type:object size:0x4 scope:local align:4 data:float +@741 = .sdata2:0x805AC984; // type:object size:0x4 scope:local align:4 data:float +@742 = .sdata2:0x805AC988; // type:object size:0x4 scope:local align:4 data:float +@835 = .sdata2:0x805AC98C; // type:object size:0x4 scope:local align:4 data:float lbl_805AC990 = .sdata2:0x805AC990; // type:object size:0x4 align:4 data:float lbl_805AC994 = .sdata2:0x805AC994; // type:object size:0x4 align:4 data:float lbl_805AC998 = .sdata2:0x805AC998; // type:object size:0x4 align:4 data:float @@ -24958,9 +24959,9 @@ lbl_805AC9B0 = .sdata2:0x805AC9B0; // type:object size:0x4 align:4 data:float lbl_805AC9B4 = .sdata2:0x805AC9B4; // type:object size:0x4 align:4 data:float lbl_805AC9B8 = .sdata2:0x805AC9B8; // type:object size:0x4 align:4 data:float lbl_805AC9BC = .sdata2:0x805AC9BC; // type:object size:0x4 align:4 data:float -@337 = .sdata2:0x805AC9C0; // type:object size:0x4 scope:local align:4 data:float -@338 = .sdata2:0x805AC9C4; // type:object size:0x4 scope:local align:4 data:float -@399 = .sdata2:0x805AC9C8; // type:object size:0x4 scope:local align:4 data:float +@339 = .sdata2:0x805AC9C0; // type:object size:0x4 scope:local align:4 data:float +@340 = .sdata2:0x805AC9C4; // type:object size:0x4 scope:local align:4 data:float +@401 = .sdata2:0x805AC9C8; // type:object size:0x4 scope:local align:4 data:float lbl_805AC9D0 = .sdata2:0x805AC9D0; // type:object size:0x4 align:4 data:float lbl_805AC9D4 = .sdata2:0x805AC9D4; // type:object size:0x4 lbl_805AC9D8 = .sdata2:0x805AC9D8; // type:object size:0x4 @@ -25054,7 +25055,7 @@ lbl_805ACB50 = .sdata2:0x805ACB50; // type:object size:0x4 align:4 data:float lbl_805ACB54 = .sdata2:0x805ACB54; // type:object size:0x4 align:4 data:float lbl_805ACB58 = .sdata2:0x805ACB58; // type:object size:0x4 align:4 data:float lbl_805ACB5C = .sdata2:0x805ACB5C; // type:object size:0x4 align:4 data:float -@325 = .sdata2:0x805ACB60; // type:object size:0x4 scope:local align:4 data:float +@327 = .sdata2:0x805ACB60; // type:object size:0x4 scope:local align:4 data:float lbl_805ACB68 = .sdata2:0x805ACB68; // type:object size:0x4 align:4 data:float lbl_805ACB6C = .sdata2:0x805ACB6C; // type:object size:0x4 align:4 data:float lbl_805ACB70 = .sdata2:0x805ACB70; // type:object size:0x4 align:4 data:float @@ -25084,11 +25085,11 @@ lbl_805ACBD4 = .sdata2:0x805ACBD4; // type:object size:0x4 align:4 data:float lbl_805ACBD8 = .sdata2:0x805ACBD8; // type:object size:0x4 align:4 data:float lbl_805ACBDC = .sdata2:0x805ACBDC; // type:object size:0x4 align:4 data:float lbl_805ACBE0 = .sdata2:0x805ACBE0; // type:object size:0x8 align:4 data:float -@476 = .sdata2:0x805ACBE8; // type:object size:0x4 scope:local align:4 data:float -@481 = .sdata2:0x805ACBEC; // type:object size:0x4 scope:local align:4 data:float -@383 = .sdata2:0x805ACBF0; // type:object size:0x4 scope:local align:4 data:float -@444 = .sdata2:0x805ACBF4; // type:object size:0x4 scope:local align:4 data:float -@490 = .sdata2:0x805ACBF8; // type:object size:0x4 scope:local align:4 data:float +@478 = .sdata2:0x805ACBE8; // type:object size:0x4 scope:local align:4 data:float +@483 = .sdata2:0x805ACBEC; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805ACBF0; // type:object size:0x4 scope:local align:4 data:float +@446 = .sdata2:0x805ACBF4; // type:object size:0x4 scope:local align:4 data:float +@492 = .sdata2:0x805ACBF8; // type:object size:0x4 scope:local align:4 data:float lbl_805ACC00 = .sdata2:0x805ACC00; // type:object size:0x4 align:4 data:float lbl_805ACC04 = .sdata2:0x805ACC04; // type:object size:0x4 align:4 data:float lbl_805ACC08 = .sdata2:0x805ACC08; // type:object size:0x4 align:4 data:float @@ -25216,10 +25217,10 @@ lbl_805ACE1C = .sdata2:0x805ACE1C; // type:object size:0x4 align:4 data:float lbl_805ACE20 = .sdata2:0x805ACE20; // type:object size:0x4 align:4 data:float lbl_805ACE24 = .sdata2:0x805ACE24; // type:object size:0x4 align:4 data:float lbl_805ACE28 = .sdata2:0x805ACE28; // type:object size:0x8 align:4 data:float -@507 = .sdata2:0x805ACE30; // type:object size:0x4 scope:local align:4 data:float -@508 = .sdata2:0x805ACE34; // type:object size:0x4 scope:local align:4 data:float -@509 = .sdata2:0x805ACE38; // type:object size:0x4 scope:local align:4 data:float -@510 = .sdata2:0x805ACE3C; // type:object size:0x4 scope:local align:4 data:float +@646 = .sdata2:0x805ACE30; // type:object size:0x4 scope:local align:4 data:float +@647 = .sdata2:0x805ACE34; // type:object size:0x4 scope:local align:4 data:float +@648 = .sdata2:0x805ACE38; // type:object size:0x4 scope:local align:4 data:float +@649 = .sdata2:0x805ACE3C; // type:object size:0x4 scope:local align:4 data:float lbl_805ACE40 = .sdata2:0x805ACE40; // type:object size:0x4 align:4 data:float lbl_805ACE44 = .sdata2:0x805ACE44; // type:object size:0x4 align:4 data:float lbl_805ACE48 = .sdata2:0x805ACE48; // type:object size:0x4 align:4 data:float @@ -25376,9 +25377,9 @@ lbl_805AD0EC = .sdata2:0x805AD0EC; // type:object size:0x4 align:4 data:float lbl_805AD0F0 = .sdata2:0x805AD0F0; // type:object size:0x4 align:4 data:float lbl_805AD0F4 = .sdata2:0x805AD0F4; // type:object size:0x4 align:4 data:float lbl_805AD0F8 = .sdata2:0x805AD0F8; // type:object size:0x8 align:4 data:float -@383 = .sdata2:0x805AD100; // type:object size:0x4 scope:local align:4 data:float -@384 = .sdata2:0x805AD104; // type:object size:0x4 scope:local align:4 data:float -@410 = .sdata2:0x805AD108; // type:object size:0x4 scope:local align:4 data:float +@385 = .sdata2:0x805AD100; // type:object size:0x4 scope:local align:4 data:float +@386 = .sdata2:0x805AD104; // type:object size:0x4 scope:local align:4 data:float +@412 = .sdata2:0x805AD108; // type:object size:0x4 scope:local align:4 data:float lbl_805AD110 = .sdata2:0x805AD110; // type:object size:0x4 data:4byte lbl_805AD114 = .sdata2:0x805AD114; // type:object size:0x4 data:4byte lbl_805AD118 = .sdata2:0x805AD118; // type:object size:0x4 data:4byte @@ -25424,7 +25425,7 @@ lbl_805AD1C8 = .sdata2:0x805AD1C8; // type:object size:0x4 align:4 data:float lbl_805AD1CC = .sdata2:0x805AD1CC; // type:object size:0x4 align:4 data:float lbl_805AD1D0 = .sdata2:0x805AD1D0; // type:object size:0x4 align:4 data:float lbl_805AD1D4 = .sdata2:0x805AD1D4; // type:object size:0x4 align:4 data:float -@501 = .sdata2:0x805AD1D8; // type:object size:0x4 scope:local align:4 data:float +@529 = .sdata2:0x805AD1D8; // type:object size:0x4 scope:local align:4 data:float @66 = .sdata2:0x805AD1E0; // type:object size:0x4 scope:local align:4 data:float @67 = .sdata2:0x805AD1E4; // type:object size:0x4 scope:local align:4 data:float @68 = .sdata2:0x805AD1E8; // type:object size:0x4 scope:local align:4 data:float @@ -25514,9 +25515,9 @@ lbl_805AD338 = .sdata2:0x805AD338; // type:object size:0x4 align:4 data:float lbl_805AD33C = .sdata2:0x805AD33C; // type:object size:0x4 align:4 data:float lbl_805AD340 = .sdata2:0x805AD340; // type:object size:0x4 align:4 data:float lbl_805AD344 = .sdata2:0x805AD344; // type:object size:0x4 align:4 data:float -@306 = .sdata2:0x805AD348; // type:object size:0x4 scope:local align:4 data:float -@307 = .sdata2:0x805AD34C; // type:object size:0x4 scope:local align:4 data:float -@308 = .sdata2:0x805AD350; // type:object size:0x4 scope:local align:4 data:float +@308 = .sdata2:0x805AD348; // type:object size:0x4 scope:local align:4 data:float +@309 = .sdata2:0x805AD34C; // type:object size:0x4 scope:local align:4 data:float +@310 = .sdata2:0x805AD350; // type:object size:0x4 scope:local align:4 data:float lbl_805AD358 = .sdata2:0x805AD358; // type:object size:0x4 align:4 data:float lbl_805AD35C = .sdata2:0x805AD35C; // type:object size:0x4 align:4 data:float lbl_805AD360 = .sdata2:0x805AD360; // type:object size:0x4 align:4 data:float @@ -25551,14 +25552,14 @@ 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:0x8 align:4 data:float -@428 = .sdata2:0x805AD3E8; // type:object size:0x4 scope:local align:4 data:float -@429 = .sdata2:0x805AD3EC; // type:object size:0x4 scope:local align:4 data:float -@430 = .sdata2:0x805AD3F0; // type:object size:0x4 scope:local align:4 data:float -@431 = .sdata2:0x805AD3F4; // type:object size:0x4 scope:local align:4 data:float -@434 = .sdata2:0x805AD3F8; // type:object size:0x8 scope:local align:8 data:double -@461 = .sdata2:0x805AD400; // type:object size:0x4 scope:local align:4 data:float -@462 = .sdata2:0x805AD404; // type:object size:0x4 scope:local align:4 data:float -@463 = .sdata2:0x805AD408; // type:object size:0x4 scope:local align:4 data:float +@430 = .sdata2:0x805AD3E8; // type:object size:0x4 scope:local align:4 data:float +@431 = .sdata2:0x805AD3EC; // type:object size:0x4 scope:local align:4 data:float +@432 = .sdata2:0x805AD3F0; // type:object size:0x4 scope:local align:4 data:float +@433 = .sdata2:0x805AD3F4; // type:object size:0x4 scope:local align:4 data:float +@436 = .sdata2:0x805AD3F8; // type:object size:0x8 scope:local align:8 data:double +@463 = .sdata2:0x805AD400; // type:object size:0x4 scope:local align:4 data:float +@464 = .sdata2:0x805AD404; // type:object size:0x4 scope:local align:4 data:float +@465 = .sdata2:0x805AD408; // type:object size:0x4 scope:local align:4 data:float lbl_805AD410 = .sdata2:0x805AD410; // type:object size:0x8 lbl_805AD418 = .sdata2:0x805AD418; // type:object size:0x4 align:4 data:float lbl_805AD41C = .sdata2:0x805AD41C; // type:object size:0x4 align:4 data:float @@ -25647,13 +25648,13 @@ MAGIC = .sdata2:0x805AD598; // type:object size:0x4 scope:local data:string @320 = .sdata2:0x805AD59C; // type:object size:0x4 scope:local align:4 data:float @321 = .sdata2:0x805AD5A0; // type:object size:0x4 scope:local align:4 data:float lbl_805AD5A8 = .sdata2:0x805AD5A8; // type:object size:0x8 data:4byte -@367 = .sdata2:0x805AD5B0; // type:object size:0x4 scope:local align:4 data:float -@508 = .sdata2:0x805AD5B4; // type:object size:0x4 scope:local align:4 data:float -@509 = .sdata2:0x805AD5B8; // type:object size:0x4 scope:local align:4 data:float -@519 = .sdata2:0x805AD5BC; // type:object size:0x4 scope:local align:4 data:float -@520 = .sdata2:0x805AD5C0; // type:object size:0x4 scope:local align:4 data:float -@575 = .sdata2:0x805AD5C4; // type:object size:0x4 scope:local align:4 data:float -@576 = .sdata2:0x805AD5C8; // type:object size:0x4 scope:local align:4 data:float +@369 = .sdata2:0x805AD5B0; // type:object size:0x4 scope:local align:4 data:float +@510 = .sdata2:0x805AD5B4; // type:object size:0x4 scope:local align:4 data:float +@511 = .sdata2:0x805AD5B8; // type:object size:0x4 scope:local align:4 data:float +@521 = .sdata2:0x805AD5BC; // type:object size:0x4 scope:local align:4 data:float +@522 = .sdata2:0x805AD5C0; // type:object size:0x4 scope:local align:4 data:float +@577 = .sdata2:0x805AD5C4; // type:object size:0x4 scope:local align:4 data:float +@578 = .sdata2:0x805AD5C8; // type:object size:0x4 scope:local align:4 data:float skSaveFileNames = .sdata2:0x805AD5D0; // type:object size:0x8 scope:global data:4byte lbl_805AD5D8 = .sdata2:0x805AD5D8; // type:object size:0x4 data:4byte lbl_805AD5DC = .sdata2:0x805AD5DC; // type:object size:0x4 data:4byte @@ -25731,11 +25732,11 @@ lbl_805AD708 = .sdata2:0x805AD708; // type:object size:0x4 align:4 data:float lbl_805AD70C = .sdata2:0x805AD70C; // type:object size:0x4 align:4 data:float lbl_805AD710 = .sdata2:0x805AD710; // type:object size:0x4 align:4 data:float lbl_805AD714 = .sdata2:0x805AD714; // type:object size:0x4 align:4 data:float -@430 = .sdata2:0x805AD718; // type:object size:0x4 scope:local align:4 data:float -@431 = .sdata2:0x805AD71C; // type:object size:0x4 scope:local align:4 data:float -@432 = .sdata2:0x805AD720; // type:object size:0x4 scope:local align:4 data:float -@433 = .sdata2:0x805AD724; // type:object size:0x4 scope:local align:4 data:float -@435 = .sdata2:0x805AD728; // type:object size:0x8 scope:local align:8 data:double +@594 = .sdata2:0x805AD718; // type:object size:0x4 scope:local align:4 data:float +@595 = .sdata2:0x805AD71C; // type:object size:0x4 scope:local align:4 data:float +@596 = .sdata2:0x805AD720; // type:object size:0x4 scope:local align:4 data:float +@597 = .sdata2:0x805AD724; // type:object size:0x4 scope:local align:4 data:float +@599 = .sdata2:0x805AD728; // type:object size:0x8 scope:local align:8 data:double @403 = .sdata2:0x805AD730; // type:object size:0x4 scope:local align:4 data:float @404 = .sdata2:0x805AD734; // type:object size:0x4 scope:local align:4 data:float @462 = .sdata2:0x805AD738; // type:object size:0x4 scope:local align:4 data:float @@ -25990,8 +25991,8 @@ lbl_805ADB6C = .sdata2:0x805ADB6C; // type:object size:0x4 align:4 data:float lbl_805ADB70 = .sdata2:0x805ADB70; // type:object size:0x4 align:4 data:float lbl_805ADB74 = .sdata2:0x805ADB74; // type:object size:0x4 align:4 data:float lbl_805ADB78 = .sdata2:0x805ADB78; // type:object size:0x8 align:4 data:float -@793 = .sdata2:0x805ADB80; // type:object size:0x4 scope:local align:4 data:float -@794 = .sdata2:0x805ADB84; // type:object size:0x4 scope:local align:4 data:float +@795 = .sdata2:0x805ADB80; // type:object size:0x4 scope:local align:4 data:float +@796 = .sdata2:0x805ADB84; // type:object size:0x4 scope:local align:4 data:float lbl_805ADB88 = .sdata2:0x805ADB88; // type:object size:0x4 align:4 data:float lbl_805ADB8C = .sdata2:0x805ADB8C; // type:object size:0x4 align:4 data:float lbl_805ADB90 = .sdata2:0x805ADB90; // type:object size:0x4 data:4byte @@ -26122,18 +26123,18 @@ lbl_805ADDBC = .sdata2:0x805ADDBC; // type:object size:0x4 align:4 data:float lbl_805ADDC0 = .sdata2:0x805ADDC0; // type:object size:0x4 align:4 data:float lbl_805ADDC4 = .sdata2:0x805ADDC4; // type:object size:0x4 align:4 data:float lbl_805ADDC8 = .sdata2:0x805ADDC8; // type:object size:0x8 align:8 data:double -@318 = .sdata2:0x805ADDD0; // type:object size:0x4 scope:local align:4 data:float -@319 = .sdata2:0x805ADDD4; // type:object size:0x4 scope:local align:4 data:float -@320 = .sdata2:0x805ADDD8; // type:object size:0x4 scope:local align:4 data:float -@321 = .sdata2:0x805ADDDC; // type:object size:0x4 scope:local align:4 data:float -@322 = .sdata2:0x805ADDE0; // type:object size:0x4 scope:local align:4 data:float -@323 = .sdata2:0x805ADDE4; // type:object size:0x4 scope:local align:4 data:float -@324 = .sdata2:0x805ADDE8; // type:object size:0x4 scope:local align:4 data:float -@325 = .sdata2:0x805ADDEC; // type:object size:0x4 scope:local align:4 data:float -@326 = .sdata2:0x805ADDF0; // type:object size:0x4 scope:local align:4 data:float -@328 = .sdata2:0x805ADDF8; // type:object size:0x8 scope:local align:8 data:double -@341 = .sdata2:0x805ADE00; // type:object size:0x4 scope:local align:4 data:float -@418 = .sdata2:0x805ADE04; // type:object size:0x4 scope:local align:4 data:float +@450 = .sdata2:0x805ADDD0; // type:object size:0x4 scope:local align:4 data:float +@451 = .sdata2:0x805ADDD4; // type:object size:0x4 scope:local align:4 data:float +@452 = .sdata2:0x805ADDD8; // type:object size:0x4 scope:local align:4 data:float +@453 = .sdata2:0x805ADDDC; // type:object size:0x4 scope:local align:4 data:float +@454 = .sdata2:0x805ADDE0; // type:object size:0x4 scope:local align:4 data:float +@455 = .sdata2:0x805ADDE4; // type:object size:0x4 scope:local align:4 data:float +@456 = .sdata2:0x805ADDE8; // type:object size:0x4 scope:local align:4 data:float +@457 = .sdata2:0x805ADDEC; // type:object size:0x4 scope:local align:4 data:float +@458 = .sdata2:0x805ADDF0; // type:object size:0x4 scope:local align:4 data:float +@460 = .sdata2:0x805ADDF8; // type:object size:0x8 scope:local align:8 data:double +@473 = .sdata2:0x805ADE00; // type:object size:0x4 scope:local align:4 data:float +@550 = .sdata2:0x805ADE04; // type:object size:0x4 scope:local align:4 data:float lbl_805ADE08 = .sdata2:0x805ADE08; // type:object size:0x4 align:4 data:float lbl_805ADE0C = .sdata2:0x805ADE0C; // type:object size:0x4 align:4 data:float lbl_805ADE10 = .sdata2:0x805ADE10; // type:object size:0x8 align:8 data:double @@ -26142,9 +26143,9 @@ lbl_805ADE1C = .sdata2:0x805ADE1C; // type:object size:0x4 align:4 data:float lbl_805ADE20 = .sdata2:0x805ADE20; // type:object size:0x4 align:4 data:float lbl_805ADE24 = .sdata2:0x805ADE24; // type:object size:0x4 align:4 data:float lbl_805ADE28 = .sdata2:0x805ADE28; // type:object size:0x8 align:4 data:float -@398 = .sdata2:0x805ADE30; // type:object size:0x4 scope:local align:4 data:float -@399 = .sdata2:0x805ADE34; // type:object size:0x4 scope:local align:4 data:float -@106 = .sdata2:0x805ADE38; // type:object size:0x4 scope:local align:4 data:float +@400 = .sdata2:0x805ADE30; // type:object size:0x4 scope:local align:4 data:float +@401 = .sdata2:0x805ADE34; // type:object size:0x4 scope:local align:4 data:float +@109 = .sdata2:0x805ADE38; // type:object size:0x4 scope:local align:4 data:float lbl_805ADE40 = .sdata2:0x805ADE40; // type:object size:0x4 align:4 data:float lbl_805ADE44 = .sdata2:0x805ADE44; // type:object size:0x4 align:4 data:float lbl_805ADE48 = .sdata2:0x805ADE48; // type:object size:0x4 align:4 data:float @@ -26263,8 +26264,8 @@ lbl_805AE088 = .sdata2:0x805AE088; // type:object size:0x8 align:8 data:double lbl_805AE090 = .sdata2:0x805AE090; // type:object size:0x4 align:4 data:float lbl_805AE094 = .sdata2:0x805AE094; // type:object size:0x4 align:4 data:float lbl_805AE098 = .sdata2:0x805AE098; // type:object size:0x8 align:4 data:float -@234 = .sdata2:0x805AE0A0; // type:object size:0x4 scope:local align:4 data:float -@235 = .sdata2:0x805AE0A4; // type:object size:0x4 scope:local align:4 data:float +@231 = .sdata2:0x805AE0A0; // type:object size:0x4 scope:local align:4 data:float +@232 = .sdata2:0x805AE0A4; // type:object size:0x4 scope:local align:4 data:float lbl_805AE0A8 = .sdata2:0x805AE0A8; // type:object size:0x4 align:4 data:float lbl_805AE0B0 = .sdata2:0x805AE0B0; // type:object size:0x8 align:8 data:double lbl_805AE0B8 = .sdata2:0x805AE0B8; // type:object size:0x4 align:4 data:float @@ -26526,7 +26527,7 @@ lbl_805AE5F4 = .sdata2:0x805AE5F4; // type:object size:0x4 align:4 data:float lbl_805AE5F8 = .sdata2:0x805AE5F8; // type:object size:0x4 align:4 data:float lbl_805AE600 = .sdata2:0x805AE600; // type:object size:0x8 align:8 data:double lbl_805AE608 = .sdata2:0x805AE608; // type:object size:0x8 align:4 data:float -@18 = .sdata2:0x805AE610; // type:object size:0x4 scope:local align:4 data:float +@20 = .sdata2:0x805AE610; // type:object size:0x4 scope:local align:4 data:float @150 = .sdata2:0x805AE618; // type:object size:0x4 scope:local align:4 data:float @204 = .sdata2:0x805AE61C; // type:object size:0x4 scope:local align:4 data:float @205 = .sdata2:0x805AE620; // type:object size:0x4 scope:local align:4 data:float @@ -26652,8 +26653,8 @@ lbl_805AE88C = .sdata2:0x805AE88C; // type:object size:0x4 align:4 data:float lbl_805AE890 = .sdata2:0x805AE890; // type:object size:0x4 align:4 data:float lbl_805AE894 = .sdata2:0x805AE894; // type:object size:0x4 align:4 data:float lbl_805AE898 = .sdata2:0x805AE898; // type:object size:0x8 align:4 data:float -@149 = .sdata2:0x805AE8A0; // type:object size:0x4 scope:local align:4 data:float -@150 = .sdata2:0x805AE8A4; // type:object size:0x4 scope:local align:4 data:float +@151 = .sdata2:0x805AE8A0; // type:object size:0x4 scope:local align:4 data:float +@152 = .sdata2:0x805AE8A4; // type:object size:0x4 scope:local align:4 data:float lbl_805AE8A8 = .sdata2:0x805AE8A8; // type:object size:0x4 align:4 data:float lbl_805AE8AC = .sdata2:0x805AE8AC; // type:object size:0x4 align:4 data:float lbl_805AE8B0 = .sdata2:0x805AE8B0; // type:object size:0x4 align:4 data:float @@ -27028,11 +27029,11 @@ lbl_805AEC98 = .sdata2:0x805AEC98; // type:object size:0x8 align:8 data:double @137 = .sdata2:0x805AF1F8; // type:object size:0x8 scope:local align:8 data:double @104 = .sdata2:0x805AF200; // type:object size:0x8 scope:local align:8 data:double @90 = .sdata2:0x805AF208; // type:object size:0x8 scope:local align:8 data:double -@620 = .sdata2:0x805AF210; // type:object size:0x4 scope:local align:4 data:float -@621 = .sdata2:0x805AF214; // type:object size:0x4 scope:local align:4 data:float -@622 = .sdata2:0x805AF218; // type:object size:0x4 scope:local align:4 data:float -@623 = .sdata2:0x805AF220; // type:object size:0x8 scope:local align:8 data:double -@625 = .sdata2:0x805AF228; // type:object size:0x8 scope:local align:8 data:double +@618 = .sdata2:0x805AF210; // type:object size:0x4 scope:local align:4 data:float +@619 = .sdata2:0x805AF214; // type:object size:0x4 scope:local align:4 data:float +@620 = .sdata2:0x805AF218; // type:object size:0x4 scope:local align:4 data:float +@621 = .sdata2:0x805AF220; // type:object size:0x8 scope:local align:8 data:double +@623 = .sdata2:0x805AF228; // type:object size:0x8 scope:local align:8 data:double @583 = .sdata2:0x805AF230; // type:object size:0x4 scope:local align:4 data:float @584 = .sdata2:0x805AF234; // type:object size:0x4 scope:local align:4 data:float @585 = .sdata2:0x805AF238; // type:object size:0x4 scope:local align:4 data:float @@ -27123,7 +27124,7 @@ i2fMagic = .sdata2:0x805AF3E8; // type:object size:0x8 scope:local align:8 data: i2fMagic = .sdata2:0x805AF420; // type:object size:0x8 scope:local align:8 data:double value0_6 = .sdata2:0x805AF428; // type:object size:0x4 scope:local align:4 data:float value0_3 = .sdata2:0x805AF42C; // type:object size:0x4 scope:local align:4 data:float -@326 = .sdata2:0x805AF430; // type:object size:0x4 scope:local align:4 data:float +@327 = .sdata2:0x805AF430; // type:object size:0x4 scope:local align:4 data:float i2fMagic = .sdata2:0x805AF438; // type:object size:0x8 scope:global align:8 data:double @200 = .sdata2:0x805AF440; // type:object size:0x8 scope:local align:8 data:double @636 = .sdata2:0x805AF448; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt index 0ce5e257..230cc4ee 100644 --- a/config/GM8E01_01/symbols.txt +++ b/config/GM8E01_01/symbols.txt @@ -13171,7 +13171,7 @@ VClone__27CConstantAnimationTimeScaleCFv = .text:0x802FDC9C; // type:function si VFindUpperLimit__27CConstantAnimationTimeScaleCFRCfRCf = .text:0x802FDD24; // type:function size:0x18 scope:global VTimeScaleIntegral__27CConstantAnimationTimeScaleCFRCfRCf = .text:0x802FDD3C; // type:function size:0x18 scope:global GetType__27CConstantAnimationTimeScaleCFv = .text:0x802FDD54; // type:function size:0x8 scope:global -IsCAnimTreeNode__11IAnimReaderCFv = .text:0x802FDD5C; // type:function size:0x8 scope:global +IsCAnimTreeNode__11IAnimReaderCFv = .text:0x802FDD5C; // type:function size:0x8 scope:weak GetSoundPOIList__11IAnimReaderCFRC13CCharAnimTimeP13CSoundPOINodeUiUii = .text:0x802FDD64; // type:function size:0x7C scope:global GetParticlePOIList__11IAnimReaderCFRC13CCharAnimTimeP16CParticlePOINodeUiUii = .text:0x802FDDE0; // type:function size:0x7C scope:global GetInt32POIList__11IAnimReaderCFRC13CCharAnimTimeP13CInt32POINodeUiUii = .text:0x802FDE5C; // type:function size:0x7C scope:global @@ -23235,15 +23235,15 @@ lbl_805AACC4 = .sdata2:0x805AACC4; // type:object size:0x4 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 +@1105 = .sdata2:0x805AACD8; // type:object size:0x4 scope:local align:4 data:float +@1106 = .sdata2:0x805AACDC; // type:object size:0x4 scope:local align:4 data:float +@1107 = .sdata2:0x805AACE0; // type:object size:0x4 scope:local align:4 data:float +@1108 = .sdata2:0x805AACE4; // type:object size:0x4 scope:local align:4 data:float +@1109 = .sdata2:0x805AACE8; // type:object size:0x4 scope:local align:4 data:float +@1110 = .sdata2:0x805AACEC; // type:object size:0x4 scope:local align:4 data:float +@1113 = .sdata2:0x805AACF0; // type:object size:0x8 scope:local align:8 data:double +@1228 = .sdata2:0x805AACF8; // type:object size:0x4 scope:local align:4 data:float +@1229 = .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 @@ -23852,9 +23852,9 @@ 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 @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 +@472 = .sdata2:0x805AB79C; // type:object size:0x4 scope:local align:4 data:float +@473 = .sdata2:0x805AB7A0; // type:object size:0x4 scope:local align:4 data:float +@562 = .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 @@ -24961,14 +24961,14 @@ lbl_805ACB38 = .sdata2:0x805ACB38; // type:object size:0x8 align:8 data:double @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 +@736 = .sdata2:0x805ACB50; // type:object size:0x4 scope:local align:4 data:float +@737 = .sdata2:0x805ACB54; // type:object size:0x4 scope:local align:4 data:float +@738 = .sdata2:0x805ACB58; // type:object size:0x4 scope:local align:4 data:float +@739 = .sdata2:0x805ACB5C; // type:object size:0x4 scope:local align:4 data:float +@740 = .sdata2:0x805ACB60; // type:object size:0x4 scope:local align:4 data:float +@741 = .sdata2:0x805ACB64; // type:object size:0x4 scope:local align:4 data:float +@742 = .sdata2:0x805ACB68; // type:object size:0x4 scope:local align:4 data:float +@835 = .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 @@ -26286,8 +26286,8 @@ lbl_805AE268 = .sdata2:0x805AE268; // type:object size:0x8 align:8 data:double lbl_805AE270 = .sdata2:0x805AE270; // type:object size:0x4 align:4 data:float lbl_805AE274 = .sdata2:0x805AE274; // type:object size:0x4 align:4 data:float lbl_805AE278 = .sdata2:0x805AE278; // type:object size:0x8 align:4 data:float -@234 = .sdata2:0x805AE280; // type:object size:0x4 scope:local align:4 data:float -@235 = .sdata2:0x805AE284; // type:object size:0x4 scope:local align:4 data:float +@231 = .sdata2:0x805AE280; // type:object size:0x4 scope:local align:4 data:float +@232 = .sdata2:0x805AE284; // type:object size:0x4 scope:local align:4 data:float lbl_805AE288 = .sdata2:0x805AE288; // type:object size:0x4 align:4 data:float lbl_805AE290 = .sdata2:0x805AE290; // type:object size:0x8 align:8 data:double lbl_805AE298 = .sdata2:0x805AE298; // type:object size:0x4 align:4 data:float diff --git a/include/Kyoto/Alloc/CCircularBuffer.hpp b/include/Kyoto/Alloc/CCircularBuffer.hpp index 82f14a49..7385a1fd 100644 --- a/include/Kyoto/Alloc/CCircularBuffer.hpp +++ b/include/Kyoto/Alloc/CCircularBuffer.hpp @@ -2,6 +2,7 @@ #define _CCIRCULARBUFFER #include +#include class CCircularBuffer { public: @@ -12,10 +13,12 @@ public: void* Alloc(int len); void Free(void* ptr, int len); int GetAllocatedAmount() const; + void* GetOffsettedMemory(int offset) { + return x0_ptr.get() + offset; + } private: - uchar x0_owned; - void* x4_ptr; + rstl::auto_ptr x0_ptr; int x8_bufferLen; int xc_; int x10_nextFreeAddr; diff --git a/include/Kyoto/Animation/CSkinnedModel.hpp b/include/Kyoto/Animation/CSkinnedModel.hpp index 642dc1e0..c68bfe03 100644 --- a/include/Kyoto/Animation/CSkinnedModel.hpp +++ b/include/Kyoto/Animation/CSkinnedModel.hpp @@ -10,6 +10,7 @@ class CModel; class CSkinRules; class CCharLayoutInfo; +class CVector3f; class CSkinnedModel { public: diff --git a/include/Kyoto/Animation/IMetaAnim.hpp b/include/Kyoto/Animation/IMetaAnim.hpp index 75b52589..889fd1e2 100644 --- a/include/Kyoto/Animation/IMetaAnim.hpp +++ b/include/Kyoto/Animation/IMetaAnim.hpp @@ -1,18 +1,58 @@ #ifndef _IMETAANIM #define _IMETAANIM -#include "rstl/rc_ptr.hpp" -#include "rstl/set.hpp" +#include "Kyoto/Animation/CCharAnimTime.hpp" -enum EMetaAnimType { kMAT_Play, kMAT_Blend, kMAT_PhaseBlend, kMAT_Random, kMAT_Sequence }; +#include +#include +#include +#include + +enum EMetaAnimType { + kMAT_Play, + kMAT_Blend, + kMAT_PhaseBlend, + kMAT_Random, + kMAT_Sequence, +}; class CAnimTreeNode; class CPrimitive; class CCharAnimTime; class IAnimReader; class CAnimSysContext; -class CMetaAnimTreeBuildOrders; -class CPreAdvanceIndicator; + +class CPreAdvanceIndicator { + bool mIsTime; + CCharAnimTime mTime; + rstl::string mString; + uint unk1; + uint unk2; + uint unk3; + uint unk4; + uint unk5; + uint unk6; + uint unk7; + uint unk8; + uint unk9; + +public: + explicit CPreAdvanceIndicator(const CCharAnimTime& time) : mIsTime(true), mTime(time) {} + explicit CPreAdvanceIndicator(const rstl::string& string) : mIsTime(false), mString(string) {} + bool IsTime() const; + const CCharAnimTime& GetTime() const; + + bool IsString() const; + const rstl::string& GetString() const; +}; + +class CMetaAnimTreeBuildOrders { + rstl::optional_object< CPreAdvanceIndicator > mRecursiveAdvance; + rstl::optional_object< CPreAdvanceIndicator > mSingleAdvance; + + static CMetaAnimTreeBuildOrders NoSpecialOrders(); + static CMetaAnimTreeBuildOrders PreAdvanceForAll(const CPreAdvanceIndicator& ind); +}; class IMetaAnim { public: diff --git a/include/dolphin/gx/GXManage.h b/include/dolphin/gx/GXManage.h index ab3a72c8..f77c7cb3 100644 --- a/include/dolphin/gx/GXManage.h +++ b/include/dolphin/gx/GXManage.h @@ -10,7 +10,12 @@ extern "C" { typedef void (*GXDrawDoneCallback)(void); GXFifoObj* GXInit(void* base, u32 size); +void GXAbortFrame(); + +void GXSetDrawSync(u16 token); +u16 GXReadDrawSync(void); GXDrawDoneCallback GXSetDrawDoneCallback(GXDrawDoneCallback cb); + void GXDrawDone(void); void GXSetDrawDone(void); void GXFlush(void); diff --git a/src/Kyoto/Alloc/CCircularBuffer.cpp b/src/Kyoto/Alloc/CCircularBuffer.cpp index c64405c6..9c3d8ea7 100644 --- a/src/Kyoto/Alloc/CCircularBuffer.cpp +++ b/src/Kyoto/Alloc/CCircularBuffer.cpp @@ -1,9 +1,10 @@ #include "Kyoto/Alloc/CCircularBuffer.hpp" CCircularBuffer::CCircularBuffer(void* buf, int len, CCircularBuffer::EOwnership ownership) -: x0_owned(buf != NULL), x4_ptr(buf), x8_bufferLen(len), xc_(0), x10_nextFreeAddr(0), x14_(-1) { - if (ownership == kOS_NotOwned) - x0_owned = false; +: x0_ptr(static_cast(buf)), x8_bufferLen(len), xc_(0), x10_nextFreeAddr(0), x14_(-1) { + if (ownership == kOS_NotOwned) { + x0_ptr.release(); + } } bool CCircularBuffer::IsWrappedMemory(int offset, int len) { @@ -18,7 +19,7 @@ void* CCircularBuffer::Alloc(int len) { uchar* ret; if ((x8_bufferLen - x10_nextFreeAddr) >= len && !IsWrappedMemory(x10_nextFreeAddr, len)) { int offset = x10_nextFreeAddr; - uchar* ptr = (uchar*)x4_ptr; + uchar* ptr = (uchar*)x0_ptr.get(); x10_nextFreeAddr = offset + len; return ptr + offset; } else if (xc_ >= len && !IsWrappedMemory(0, len)) { @@ -26,7 +27,7 @@ void* CCircularBuffer::Alloc(int len) { xc_ = 0; x10_nextFreeAddr = len; x14_ = r3; - return x4_ptr; + return x0_ptr.get(); } return nullptr; @@ -34,7 +35,7 @@ void* CCircularBuffer::Alloc(int len) { void CCircularBuffer::Free(void* ptr, int len) { if (x14_ > -1) { - if (ptr == x4_ptr) { + if (ptr == x0_ptr.get()) { x14_ = -1; xc_ = len; } else { diff --git a/src/Kyoto/Animation/DolphinCSkinnedModel.cpp b/src/Kyoto/Animation/DolphinCSkinnedModel.cpp new file mode 100644 index 00000000..0553c09e --- /dev/null +++ b/src/Kyoto/Animation/DolphinCSkinnedModel.cpp @@ -0,0 +1,49 @@ +#include "Kyoto/Animation/CSkinnedModel.hpp" + +#include "Kyoto/Alloc/CCircularBuffer.hpp" + +#include +#include + +struct SSkinnedAllocation { + SSkinnedAllocation(void* ptr, int w1, ushort w2) : x0_ptr(ptr), x4_unk1(w1), x8_unk2(w2) {} + + void* x0_ptr; + int x4_unk1; + ushort x8_unk2; +}; + +namespace Skinning { +static ushort skCurrentToken = 0; +static int sNumSkinnedObjects = 0; +static bool sSkinningInitialized = false; +static char sStaticSkinningData[0x80000] ATTRIBUTE_ALIGN(32); +static rstl::optional_object< CCircularBuffer > sSkinningBuffer; +static rstl::list< SSkinnedAllocation > sAllocations; + +void AddSkinnedRef(); +void DelSkinnedRef(); +} // namespace Skinning + +void Skinning::AddSkinnedRef() { + if (!sSkinningInitialized) { + GXSetDrawSync(0xFFFF); + while (GXReadDrawSync() != 0xFFFF) { + } + skCurrentToken = 1; + sSkinningInitialized = true; + } + + if (sNumSkinnedObjects == 0) { + sSkinningBuffer = CCircularBuffer(sStaticSkinningData, sizeof(sStaticSkinningData)); + } + ++sNumSkinnedObjects; +} + +void Skinning::DelSkinnedRef() { + --sNumSkinnedObjects; + if (sNumSkinnedObjects == 0) { + sSkinningBuffer.clear(); + sAllocations.clear(); + } +} diff --git a/src/Kyoto/Animation/IMetaAnim.cpp b/src/Kyoto/Animation/IMetaAnim.cpp new file mode 100644 index 00000000..e1dd3ba3 --- /dev/null +++ b/src/Kyoto/Animation/IMetaAnim.cpp @@ -0,0 +1,26 @@ +#include "Kyoto/Animation/IMetaAnim.hpp" + +bool CPreAdvanceIndicator::IsTime() const { + return mIsTime; +} + +const CCharAnimTime& CPreAdvanceIndicator::GetTime() const { + return mTime; +} + +bool CPreAdvanceIndicator::IsString() const { + return !IsTime(); +} + +const rstl::string& CPreAdvanceIndicator::GetString() const { + return mString; +} + +CMetaAnimTreeBuildOrders CMetaAnimTreeBuildOrders::NoSpecialOrders() { + return CMetaAnimTreeBuildOrders(); +} +CMetaAnimTreeBuildOrders CMetaAnimTreeBuildOrders::PreAdvanceForAll(const CPreAdvanceIndicator& ind) { + CMetaAnimTreeBuildOrders ret; + ret.mSingleAdvance = ind; + return ret; +}