diff --git a/GM8E01-0-00/map b/GM8E01-0-00/map index e261d70..8ce8490 100644 --- a/GM8E01-0-00/map +++ b/GM8E01-0-00/map @@ -356,7 +356,7 @@ 800149D0 00000004 800149D0 0 AttachActorToPlayer__7CPlayerF9TUniqueId 80014A40 00000004 80014A40 0 CalculateLeftStickEdgePosition__7CPlayerCFff 80014B40 00000004 80014B40 0 GetMaximumPlayerPositiveVerticalVelocity__7CPlayerCFRC13CStateManager -80014B80 00000004 80014B80 0 UpdateMorphBallState__7CPlayerFRC11CFinalInputR13CStateManager +80014B80 00000004 80014B80 0 UpdateMorphBallState__7CPlayerFfRC11CFinalInputR13CStateManager 80014D5C 00000004 80014D5C 0 ProcessInput__7CPlayerFRC11CFinalInputR13CStateManager 8001570C 00000004 8001570C 0 GetMaterial__19CCollisionPrimitiveCFv 80015714 00000004 80015714 0 StartLandingControlFreeze__7CPlayerFv @@ -1094,7 +1094,6 @@ 80048174 00000004 80048174 0 LoadScriptObjects__13CStateManagerF7TAreaIdR12CInputStreamQ213CStateManager18EScriptPersistence 800482E8 00000004 800482E8 0 GenerateObject__13CStateManagerF9TEditorId 8004840C 00000004 8004840C 0 LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream -800486F4 00000004 800486F4 0 sub_800486f4 800486F8 00000004 800486F8 0 __dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv 80048784 00000004 80048784 0 InformListeners__13CStateManagerFRC9CVector3f16EListenNoiseType 80048870 00000004 80048870 0 Listen__3CAiFRC9CVector3f16EListenNoiseType @@ -11337,7 +11336,7 @@ 80282EF0 00000004 80282EF0 0 EnterMorphBallState__7CPlayerFR13CStateManager 8028302C 00000004 8028302C 0 ActivateMorphBallCamera__7CPlayerFR13CStateManager 80283074 00000004 80283074 0 TransitionFromMorphBallState__7CPlayerFR13CStateManager -8028394C 00000004 8028394C 0 TransitionToMorphBallState__7CPlayerFR13CStateManager +8028394C 00000004 8028394C 0 TransitionToMorphBallState__7CPlayerFfR13CStateManager 80283C44 00000004 80283C44 0 GetNextBallTransitionAnim__7CPlayerFfRbR13CStateManager 80283D84 00000004 80283D84 0 ChoseTransitionToAnimation__7CPlayerCFR13CStateManager 80283F28 00000004 80283F28 0 SetIntoBallReadyAnimation__7CPlayerFR13CStateManager @@ -15865,9 +15864,9 @@ 80381ECC 00000004 80381ECC 0 nullsub_27 80381ED0 00000004 80381ED0 0 nullsub_26 80381ED4 00000004 80381ED4 0 sub_80381ed4 -80382190 00000004 80382190 0 sub_80382190 +80382190 00000004 80382190 0 OSLink 803823EC 00000004 803823EC 0 sub_803823ec -80382624 00000004 80382624 0 sub_80382624 +80382624 00000004 80382624 0 OSUnlink 803827F8 00000004 803827F8 0 __OSModuleInit 80382810 00000004 80382810 0 sub_80382810 80382870 00000004 80382870 0 sub_80382870 diff --git a/GM8E01-0-00/objects b/GM8E01-0-00/objects index 4ccd885..7c303a2 100644 --- a/GM8E01-0-00/objects +++ b/GM8E01-0-00/objects @@ -1375,7 +1375,7 @@ 80014B40 LVAR 14 LR 80014B40 LVAR 10 BPpop 80014B40 LVAR -10 BPpush -80014B80 FUNC 4 UpdateMorphBallState__7CPlayerFRC11CFinalInputR13CStateManager +80014B80 FUNC 4 UpdateMorphBallState__7CPlayerFfRC11CFinalInputR13CStateManager 80014B80 LVAR 54 LR 80014B80 LVAR 50 BPpop 80014B80 LVAR -50 BPpush @@ -4991,10 +4991,10 @@ 80048390 COMM 0 size 80048394 COMM 0 data 8004840C FUNC 4 LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream -8004840C LVAR B4 LRpush +8004840C LVAR B4 LR +8004840C LVAR B0 BPpop 8004840C LVAR -B0 BPpush -8004843C STR 6 aHhi8 -800486F4 FUNC 4 sub_800486f4 +80048508 COMM 0 0x00000001 800486F8 FUNC 4 __dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv 800486F8 LVAR 24 LR 800486F8 LVAR 20 BPpop @@ -43539,7 +43539,7 @@ 80283650 COMM 0 this 80283654 COMM 0 TUniqueId 802838F0 COMM 0 CPlayer * -8028394C FUNC 4 TransitionToMorphBallState__7CPlayerFR13CStateManager +8028394C FUNC 4 TransitionToMorphBallState__7CPlayerFfR13CStateManager 8028394C LVAR A4 LR 8028394C LVAR A0 BPpop 8028394C LVAR -A0 BPpush @@ -66940,7 +66940,7 @@ 803820F4 COMM 0 0x00000000 803820F8 COMM 0 0x00000004 8038210C COMM 0 0x00000004 -80382190 FUNC 4 sub_80382190 +80382190 FUNC 4 OSLink 80382190 LVAR 1C LR 80382190 LVAR 18 BPpop 80382190 LVAR 4 LRpush @@ -66964,7 +66964,7 @@ 80382588 COMM 0 0x00000000 8038258C COMM 0 0x00000004 803825A0 COMM 0 0x00000004 -80382624 FUNC 4 sub_80382624 +80382624 FUNC 4 OSUnlink 80382624 LVAR 1C LR 80382624 LVAR 18 BPpop 80382624 LVAR 4 LRpush @@ -74718,7 +74718,7 @@ 805A8F34 DWORD 1 mLastDecalCreatedIndex__13CDecalManager 805A8F38 DWORD 1 mLastDecalCreatedAssetId__13CDecalManager 805A8F48 DWORD 1 kInvalidEditorId -805A8F4C DWORD 1 kInvalidUniqueId +805A8F4C WORD 1 kInvalidUniqueId 805A8F50 DWORD 1 kInvalidAreaId 805A8F54 DWORD 1 kInvalidResId 805A8F5C BYTE 4 sRippleRandom__7CRipple @@ -75141,6 +75141,8 @@ 805AE298 DOUBLE 1 byte_805ae298 805AE2D8 DOUBLE 1 byte_805ae2d8 805AE2F0 DOUBLE 1 byte_805ae2f0 +805AE31A WORD 1 kDefaultSfxPrio +805AE320 DWORD 1 kInvalidAreaId2 805AE378 DOUBLE 1 byte_805ae378 805AE388 DOUBLE 1 byte_805ae388 805AE3E8 DOUBLE 1 byte_805ae3e8