Continued work on CActor

Former-commit-id: 09dfe946fce8e683eb302afd35e086c15b53c2ff

asm/MetroidPrime/CActor.s

@@ -32,7 +32,7 @@ __vt__6CActor:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803D9F1C
 lbl_803D9F1C:
@@ -2946,8 +2946,8 @@ lbl_8005520C:
 /* 80055214 00052174  38 21 00 10 */	addi r1, r1, 0x10
 /* 80055218 00052178  4E 80 00 20 */	blr
 
-.global DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+.global DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
-DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType:
+DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef:
 /* 8005521C 0005217C  94 21 FF F0 */	stwu r1, -0x10(r1)
 /* 80055220 00052180  7C 08 02 A6 */	mflr r0
 /* 80055224 00052184  2C 06 00 02 */	cmpwi r6, 2

asm/MetroidPrime/CCollisionActor.s

@@ -36,7 +36,7 @@ lbl_803E4B18:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte sub_801a8ea4
 	.4byte GetPrimitiveTransform__15CCollisionActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/CEffect.s

@@ -32,7 +32,7 @@ lbl_803DA118:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/CExplosion.s

@@ -32,7 +32,7 @@ lbl_803DA0A8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata2, "a"

asm/MetroidPrime/CGameLight.s

@@ -32,7 +32,7 @@ lbl_803DF3B8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/CGameProjectile.s

@@ -32,7 +32,7 @@ lbl_803D9CE0:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
 .section .sdata

asm/MetroidPrime/CPhysicsActor.s

@@ -32,7 +32,7 @@ lbl_803E0628:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Cameras/CBallCamera.s

@@ -36,7 +36,7 @@ lbl_803DAB90:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__11CBallCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__11CBallCameraFRC12CTransform4fR13CStateManager
 

asm/MetroidPrime/Cameras/CCinematicCamera.s

@@ -32,7 +32,7 @@ lbl_803DADF8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__16CCinematicCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__16CCinematicCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

asm/MetroidPrime/Cameras/CFirstPersonCamera.s

@@ -31,7 +31,7 @@ lbl_803D9660:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

asm/MetroidPrime/Cameras/CGameCamera.s

@@ -38,7 +38,7 @@ lbl_803DA194:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 	.4byte 0
 

asm/MetroidPrime/Cameras/CInterpolationCamera.s

@@ -32,7 +32,7 @@ lbl_803E9D80:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

asm/MetroidPrime/Cameras/CPathCamera.s

@@ -36,7 +36,7 @@ lbl_803E0C68:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__11CPathCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__11CPathCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

asm/MetroidPrime/Enemies/CActorContraption.s

@@ -163,7 +163,7 @@ lbl_8023F4C4:
 /* 8023F4C4 0023C424  7F 83 E3 78 */	mr r3, r28
 /* 8023F4C8 0023C428  7F A4 EB 78 */	mr r4, r29
 /* 8023F4CC 0023C42C  7F C5 F3 78 */	mr r5, r30
-/* 8023F4D0 0023C430  4B E1 5D 4D */	bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+/* 8023F4D0 0023C430  4B E1 5D 4D */	bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 lbl_8023F4D4:
 /* 8023F4D4 0023C434  80 01 00 24 */	lwz r0, 0x24(r1)
 /* 8023F4D8 0023C438  83 E1 00 1C */	lwz r31, 0x1c(r1)

asm/MetroidPrime/Enemies/CAi.s

@@ -901,7 +901,7 @@ lbl_803DBCCC:
 	.4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CAmbientAI.s

@@ -32,7 +32,7 @@ lbl_803E8CB0:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CBouncyGrenade.s

@@ -32,7 +32,7 @@ lbl_803E7ED0:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte sub_8022ea58

asm/MetroidPrime/Enemies/CDrone.s

@@ -281,7 +281,7 @@ lbl_803E3A58:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Enemies/CFlaahgra.s

@@ -39,7 +39,7 @@ lbl_803E4D08:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803E4D74
 lbl_803E4D74:
@@ -330,7 +330,7 @@ lbl_803E5154:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
 

asm/MetroidPrime/Enemies/CFlaahgraPlants.s

@@ -32,7 +32,7 @@ lbl_803E6FD8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Enemies/CGrenadeLauncher.s

@@ -35,7 +35,7 @@ lbl_803E7F58:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__16CGrenadeLauncherCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CMetroidPrimeExo.s

@@ -515,7 +515,7 @@ lbl_803EB0FC:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s

@@ -32,7 +32,7 @@ lbl_803EC390:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte Explode__23CMetroidPrimeProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
 	.4byte 0

asm/MetroidPrime/Enemies/COmegaPirate.s

@@ -32,7 +32,7 @@ lbl_803EB6C8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803EB734
 lbl_803EB734:

asm/MetroidPrime/Enemies/CPatterned.s

@@ -2820,7 +2820,7 @@ lbl_8007930C:
 /* 80079314 00076274  7F A4 EB 78 */	mr r4, r29
 /* 80079318 00076278  7F C5 F3 78 */	mr r5, r30
 /* 8007931C 0007627C  7F E6 FB 78 */	mr r6, r31
-/* 80079320 00076280  4B FD BE FD */	bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+/* 80079320 00076280  4B FD BE FD */	bl DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 /* 80079324 00076284  E3 E1 02 78 */	psq_l f31, 632(r1), 0, qr0
 /* 80079328 00076288  CB E1 02 70 */	lfd f31, 0x270(r1)
 /* 8007932C 0007628C  E3 C1 02 68 */	psq_l f30, 616(r1), 0, qr0

asm/MetroidPrime/Enemies/CPhazonPool.s

@@ -31,7 +31,7 @@ lbl_803EBB48:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager

asm/MetroidPrime/Enemies/CRipperControlledPlatform.s

@@ -32,7 +32,7 @@ lbl_803E80C0:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__15CScriptPlatformCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__15CScriptPlatformCFv
 	.4byte GetPrimitiveTransform__15CScriptPlatformCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s

@@ -32,7 +32,7 @@ lbl_803E8578:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Enemies/CThardus.s

@@ -279,7 +279,7 @@ lbl_803E6074:
 	.4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s

@@ -32,7 +32,7 @@ lbl_803E6308:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803E6374
 lbl_803E6374:

asm/MetroidPrime/Player/CPlayer.s

@@ -35,7 +35,7 @@ lbl_803D96E8:
 	.4byte FluidFXThink__7CPlayerFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__7CPlayerCFv
 	.4byte GetPrimitiveTransform__7CPlayerCFv
 	.4byte CollidedWith__7CPlayerFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CFire.s

@@ -32,7 +32,7 @@ lbl_803E9990:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CFishCloud.s

@@ -32,7 +32,7 @@ lbl_803E5758:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803E57C4
 lbl_803E57C4:
@@ -63,7 +63,7 @@ lbl_803E57C4:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .section .sdata
 .balign 8

asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s

@@ -32,7 +32,7 @@ lbl_803E0D70:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CRepulsor.s

@@ -32,7 +32,7 @@ lbl_803E70E8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptActor.s

@@ -32,7 +32,7 @@ lbl_803DA450:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__12CScriptActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s

@@ -32,7 +32,7 @@ lbl_803E6398:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s

@@ -32,7 +32,7 @@ lbl_803E3E80:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte InhabitantAdded__18CScriptBallTriggerFR6CActorR13CStateManager
 	.4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantExited__18CScriptBallTriggerFR6CActorR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptBeam.s

@@ -32,7 +32,7 @@ lbl_803EB180:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 

asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s

@@ -32,7 +32,7 @@ lbl_803DF688:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803DF6F4
 lbl_803DF6F4:

asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s

@@ -32,7 +32,7 @@ lbl_803E8C40:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s

@@ -38,7 +38,7 @@ lbl_803E7A70:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s

@@ -32,7 +32,7 @@ lbl_803DF348:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s

@@ -32,7 +32,7 @@ lbl_803E0BF8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s

@@ -32,7 +32,7 @@ lbl_803DFD08:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptDebris.s

@@ -32,7 +32,7 @@ lbl_803DFD78:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CScriptDebrisFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s

@@ -31,7 +31,7 @@ lbl_803E23C8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptDock.s

@@ -32,7 +32,7 @@ lbl_803DF580:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptDoor.s

@@ -32,7 +32,7 @@ lbl_803DAA78:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s

@@ -32,7 +32,7 @@ lbl_803E4400:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptEffect.s

@@ -32,7 +32,7 @@ lbl_803DAC38:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__13CScriptEffectCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803DACA4
 lbl_803DACA4:

asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s

@@ -32,7 +32,7 @@ lbl_803E0D00:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s

@@ -47,7 +47,7 @@ lbl_803E71EC:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s

@@ -34,7 +34,7 @@ lbl_803EB658:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .text, "ax"

asm/MetroidPrime/ScriptObjects/CScriptPickup.s

@@ -32,7 +32,7 @@ lbl_803DF4F8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptPlatform.s

@@ -32,7 +32,7 @@ lbl_803DF220:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__15CScriptPlatformCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__15CScriptPlatformCFv
 	.4byte GetPrimitiveTransform__15CScriptPlatformCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s

@@ -32,7 +32,7 @@ lbl_803E4BE0:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__12CScriptActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte GetCollisionPrimitive__13CPhysicsActorCFv
 	.4byte GetPrimitiveTransform__13CPhysicsActorCFv
 	.4byte CollidedWith__13CPhysicsActorFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s

@@ -32,7 +32,7 @@ lbl_803E32D8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s

@@ -32,7 +32,7 @@ lbl_803E3638:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s

@@ -32,7 +32,7 @@ lbl_803EC030:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .text, "ax"

asm/MetroidPrime/ScriptObjects/CScriptSound.s

@@ -32,7 +32,7 @@ lbl_803DF128:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803DF194
 lbl_803DF194:

asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s

@@ -32,7 +32,7 @@ lbl_803E2B68:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803E2BD4
 lbl_803E2BD4:

asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s

@@ -32,7 +32,7 @@ lbl_803E2438:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s

@@ -32,7 +32,7 @@ lbl_803E02C8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s

@@ -36,7 +36,7 @@ lbl_803E8670:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ProcessInput__20CScriptSpindleCameraFRC11CFinalInputR13CStateManager
 	.4byte Reset__20CScriptSpindleCameraFRC12CTransform4fR13CStateManager
 	.4byte 0

asm/MetroidPrime/ScriptObjects/CScriptSteam.s

@@ -32,7 +32,7 @@ lbl_803E3DA8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s

@@ -32,7 +32,7 @@ lbl_803E4330:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptTrigger.s

@@ -32,7 +32,7 @@ lbl_803DA4D8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s

@@ -32,7 +32,7 @@ lbl_803E5830:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s

@@ -32,7 +32,7 @@ lbl_803E58C0:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/ScriptObjects/CScriptWater.s

@@ -32,7 +32,7 @@ lbl_803DFE70:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetRenderBounds__12CScriptWaterCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager
 	.4byte InhabitantExited__14CScriptTriggerFR6CActorR13CStateManager

asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s

@@ -32,7 +32,7 @@ lbl_803DA558:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CBeamProjectile.s

@@ -32,7 +32,7 @@ lbl_803E4648:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte UpdateFx__15CBeamProjectileFRC12CTransform4ffR13CStateManager
 	.4byte ResetBeam__15CBeamProjectileFR13CStateManagerb

asm/MetroidPrime/Weapons/CBomb.s

@@ -32,7 +32,7 @@ lbl_803DACC0:
 	.4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CElectricBeamProjectile.s

@@ -32,7 +32,7 @@ lbl_803E9118:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte sub_80251e84
 	.4byte sub_80251d38

asm/MetroidPrime/Weapons/CEnergyProjectile.s

@@ -36,7 +36,7 @@ lbl_803E7158:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId
 	.4byte 0

asm/MetroidPrime/Weapons/CFlameThrower.s

@@ -36,7 +36,7 @@ lbl_803E45D8:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
 .section .bss

asm/MetroidPrime/Weapons/CIceImpact.s

@@ -32,7 +32,7 @@ lbl_803E51E8:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CIceProjectile.s

@@ -32,7 +32,7 @@ lbl_803E6778:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CNewFlameThrower.s

@@ -36,7 +36,7 @@ lbl_803E9D10:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
 .section .sdata

asm/MetroidPrime/Weapons/CPlasmaProjectile.s

@@ -36,7 +36,7 @@ lbl_803E3F00:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte UpdateFx__17CPlasmaProjectileFRC12CTransform4ffR13CStateManager
 	.4byte ResetBeam__17CPlasmaProjectileFR13CStateManagerb

asm/MetroidPrime/Weapons/CPowerBomb.s

@@ -36,7 +36,7 @@ lbl_803E2808:
 	.4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CShockWave.s

@@ -32,7 +32,7 @@ lbl_803E8050:
 	.4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte 0
 
 .section .sdata

asm/MetroidPrime/Weapons/CTargetableProjectile.s

@@ -33,7 +33,7 @@ lbl_803E1800:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13CStateManager
 	.4byte Think__21CTargetableProjectileFfR13CStateManager
 	.4byte 0

asm/MetroidPrime/Weapons/CWaveBuster.s

@@ -36,7 +36,7 @@ lbl_803E5318:
 	.4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 	.4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager
 
 .section .sdata

asm/MetroidPrime/Weapons/CWeapon.s

@@ -32,7 +32,7 @@ lbl_803DFEF0:
 	.4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager
 	.4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager
 	.4byte GetSortingBounds__6CActorCFRC12CTransform4f
-	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventType
+	.4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef
 
 .global lbl_803DFF5C
 lbl_803DFF5C:

include/Kyoto/Audio/CSfxHandle.hpp

@@ -8,6 +8,13 @@ public:
   CSfxHandle() : value(0) {}
   CSfxHandle(u32 value) : value(value) {}
 
+  // GetIndex__10CSfxHandleCFv
+  // NullHandle__10CSfxHandleFv
+  // mRefCount__10CSfxHandle ??
+
+  bool operator==(const CSfxHandle& other) { return value == other.value; }
+  operator bool() const { return value != 0; }
+
 private:
   u32 value;
 };

include/Kyoto/Audio/CSfxManager.hpp

@@ -3,9 +3,12 @@
 
 #include "types.h"
 
+#include "Kyoto/Audio/CSfxHandle.hpp"
+
 class CSfxManager {
 public:
   static void Update(f32 dt);
+  static void RemoveEmitter(CSfxHandle handle);
 };
 
 #endif

include/Kyoto/Math/CAABox.hpp

@@ -8,6 +8,7 @@ public:
   CAABox() {
     // TODO
   }
+  CAABox(const CVector3f& min, const CVector3f& max);// : min(min), max(max) {}
 
   static CAABox mskInvertedBox;
   static CAABox mskNullBox;

include/Kyoto/Math/CVector3f.hpp

@@ -101,13 +101,34 @@ inline bool operator!=(const CVector3f& lhs, const CVector3f& rhs) {
   return lhs.GetX() != rhs.GetX() || lhs.GetY() != rhs.GetY() || lhs.GetZ() != rhs.GetZ();
 }
 inline CVector3f operator-(const CVector3f& lhs, const CVector3f& rhs) {
-  return CVector3f(lhs.GetX() - rhs.GetX(), lhs.GetY() - rhs.GetY(), lhs.GetZ() - rhs.GetZ());
+  f32 x = lhs.GetX() - rhs.GetX();
+  f32 y = lhs.GetY() - rhs.GetY();
+  f32 z = lhs.GetZ() - rhs.GetZ();
+  return CVector3f(x, y, z);
 }
 inline CVector3f operator+(const CVector3f& lhs, const CVector3f& rhs) {
-  return CVector3f(lhs.GetX() + rhs.GetX(), lhs.GetY() + rhs.GetY(), lhs.GetZ() + rhs.GetZ());
+  f32 x = lhs.GetX() + rhs.GetX();
+  f32 y = lhs.GetY() + rhs.GetY();
+  f32 z = lhs.GetZ() + rhs.GetZ();
+  return CVector3f(x, y, z);
+}
+inline CVector3f operator*(const CVector3f& vec, f32 f) {
+  f32 x = vec.GetX() * f;
+  f32 y = vec.GetY() * f;
+  f32 z = vec.GetZ() * f;
+  return CVector3f(x, y, z);
+}
+inline CVector3f operator/(const CVector3f& vec, f32 f) {
+  f32 x = vec.GetX() / f;
+  f32 y = vec.GetY() / f;
+  f32 z = vec.GetZ() / f;
+  return CVector3f(x, y, z);
+}
+inline CVector3f operator-(const CVector3f& vec) {
+  f32 x = -vec.GetX();
+  f32 y = -vec.GetY();
+  f32 z = -vec.GetZ();
+  return CVector3f(x, y, z);
 }
-inline CVector3f operator*(const CVector3f& vec, f32 f) { return CVector3f(vec.GetX() * f, vec.GetY() * f, vec.GetZ() * f); }
-inline CVector3f operator/(const CVector3f& vec, f32 f) { return CVector3f(vec.GetX() / f, vec.GetY() / f, vec.GetZ() / f); }
-inline CVector3f operator-(const CVector3f& vec) { return CVector3f(-vec.GetX(), -vec.GetY(), -vec.GetZ()); }
 
 #endif // __CVECTOR3F_HPP__

include/MetroidPrime/CActor.hpp

@@ -9,8 +9,8 @@
 #include "MetroidPrime/CEntity.hpp"
 #include "MetroidPrime/CModelData.hpp"
 #include "MetroidPrime/CModelFlags.hpp"
-#include "MetroidPrime/CSfxHandle.hpp"
 
+#include "Kyoto/Audio/CSfxHandle.hpp"
 #include "Kyoto/Graphics/CColor.hpp"
 #include "Kyoto/Math/CAABox.hpp"
 #include "Kyoto/Math/CTransform4f.hpp"
@@ -189,11 +189,6 @@ enum EUserEventType {
   kUE_EffectOff = 34,
 };
 
-// class CBoolPOINode;
-// class CInt32POINode;
-// class CParticlePOINode;
-// class CSoundPOINode;
-
 class CActor : public CEntity {
 public:
   enum EThermalFlags {
@@ -235,7 +230,7 @@ public:
   virtual void FluidFXThink(EFluidState, CScriptWater&, CStateManager&);
   virtual void OnScanStateChanged(EScanState, CStateManager&);
   virtual CAABox GetSortingBounds(const CStateManager&) const;
-  virtual void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float dt);
+  virtual void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt);
 
   SAdvancementDeltas UpdateAnimation(float dt, CStateManager& mgr, bool advTree);
 
@@ -244,24 +239,17 @@ public:
 
   void UpdateSfxEmitters();
   void RemoveEmitter();
+  void SetModelData(const CModelData& modelData);
 
   const CTransform4f& GetTransform() const { return x34_transform; }
   CVector3f GetTranslation() const { return x34_transform.GetTranslation(); }
   bool GetMuted() const { return xe5_26_muted; }
   bool HasAnimation() const { return x64_modelData && x64_modelData->GetAnimationData(); }
-
+  bool HasModelData() const { return x64_modelData && (x64_modelData->GetAnimationData() || x64_modelData->HasNormalModel()); }
-  // const CBoolPOINode* GetBoolPOIList(s32& count) {
+  CModelData* GetModelData() const { return x64_modelData.get(); }
-  //   return HasAnimation() ? x64_modelData->GetAnimationData()->GetBoolPOIList(count) : nullptr;
+  CAnimData* AnimationData() { return GetModelData()->GetAnimationData(); }
-  // }
+  const CAnimData* GetAnimationData() const { return GetModelData()->GetAnimationData(); }
-  // const CInt32POINode* GetInt32POIList(s32& count) {
+  f32 GetAverageAnimVelocity(s32 anim);
-  //   return HasAnimation() ? x64_modelData->GetAnimationData()->GetInt32POIList(count) : nullptr;
-  // }
-  // const CParticlePOINode* GetParticlePOIList(s32& count) {
-  //   return HasAnimation() ? x64_modelData->GetAnimationData()->GetParticlePOIList(count) : nullptr;
-  // }
-  // const CSoundPOINode* GetSoundPOIList(s32& count) {
-  //   return HasAnimation() ? x64_modelData->GetAnimationData()->GetSoundPOIList(count) : nullptr;
-  // }
 
 protected:
   CTransform4f x34_transform;

include/MetroidPrime/CAnimData.hpp

@@ -36,20 +36,21 @@ public:
   }
 
   s32 GetCharacterIndex() const { return x204_charIdx; }
+  f32 GetAverageVelocity(s32 idx) const;
 
-  const CBoolPOINode* GetBoolPOIList(s32& count) {
+  const CBoolPOINode* GetBoolPOIList(s32& count) const {
     count = x20c_passedBoolCount;
     return mBoolPOINodes.data();
   }
-  const CInt32POINode* GetInt32POIList(s32& count) {
+  const CInt32POINode* GetInt32POIList(s32& count) const {
     count = x210_passedIntCount;
     return mInt32POINodes.data();
   }
-  const CParticlePOINode* GetParticlePOIList(s32& count) {
+  const CParticlePOINode* GetParticlePOIList(s32& count) const {
     count = x214_passedParticleCount;
     return mParticlePOINodes.data();
   }
-  const CSoundPOINode* GetSoundPOIList(s32& count) {
+  const CSoundPOINode* GetSoundPOIList(s32& count) const {
     count = x218_passedSoundCount;
     return mSoundPOINodes.data();
   }
@@ -171,10 +172,10 @@ private:
   f32 x200_speedScale;
   s32 x204_charIdx;
   s32 x208_defaultAnim;
-  u32 x20c_passedBoolCount;
+  s32 x20c_passedBoolCount;
-  u32 x210_passedIntCount;
+  s32 x210_passedIntCount;
-  u32 x214_passedParticleCount;
+  s32 x214_passedParticleCount;
-  u32 x218_passedSoundCount;
+  s32 x218_passedSoundCount;
   s32 x21c_particleLightIdx;
   bool x220_24_animating : 1;
   bool x220_25_loop : 1;

include/MetroidPrime/CEnvFxManager.hpp

@@ -3,9 +3,9 @@
 
 #include "types.h"
 
-#include "MetroidPrime/CSfxHandle.hpp"
 #include "MetroidPrime/TGameTypes.hpp"
 
+#include "Kyoto/Audio/CSfxHandle.hpp"
 #include "Kyoto/Math/CAABox.hpp"
 #include "Kyoto/Math/CVector2i.hpp"
 #include "Kyoto/Math/CVector3f.hpp"

include/MetroidPrime/CModelData.hpp

@@ -6,14 +6,15 @@
 #include "MetroidPrime/TGameTypes.hpp"
 
 #include "Kyoto/Graphics/CColor.hpp"
-#include "Kyoto/Math/CVector3f.hpp"
 #include "Kyoto/Math/CTransform4f.hpp"
+#include "Kyoto/Math/CVector3f.hpp"
 #include "Kyoto/TToken.hpp"
 
 #include "rstl/auto_ptr.hpp"
 #include "rstl/optional_object.hpp"
 #include "rstl/pair.hpp"
 
+class CAABox;
 class CAnimData;
 class CModel;
 
@@ -27,11 +28,13 @@ CHECK_SIZEOF(SAdvancementDeltas, 0x1c)
 
 class CModelData {
 public:
+  // TODO these probably aren't real
   bool IsStaticModel() const { return xc_animData.get() == nullptr && !x1c_normalModel; }
+  bool HasNormalModel() const { return x1c_normalModel; }
 
-  CModelData() {
+  CModelData();
-    // TODO
+  // __ct__10CModelDataFRC8CAnimRes
-  }
+  // __ct__10CModelDataFRC10CStaticRes
   CModelData(const CModelData& other);
   ~CModelData();
 
@@ -39,6 +42,10 @@ public:
   void AdvanceParticles(const CTransform4f& xf, float dt, CStateManager& mgr);
 
   CAnimData* GetAnimationData() const { return xc_animData.get(); }
+  CAABox GetBounds(const CTransform4f& xf) const;
+  CAABox GetBounds() const;
+
+  bool IsNull() const { return xc_animData.get() == nullptr && !x1c_normalModel; }
 
   void SetXRayModel(const rstl::pair< CAssetId, CAssetId >& assets);
   void SetInfraModel(const rstl::pair< CAssetId, CAssetId >& assets);

include/MetroidPrime/CPOINode.hpp

@@ -8,21 +8,23 @@
 
 #include "rstl/string.hpp"
 
-#define POITYPE_LOOP 0
+enum EPOIType {
-#define POITYPE_EMPTYBOOL 1
+  kPT_Loop = 0,
-#define POITYPE_EMPTYINT32 2
+  kPT_EmptyBool = 1,
-#define POITYPE_SOUNDINT32 4
+  kPT_EmptyInt32 = 2,
-#define POITYPE_PARTICLE 5
+  kPT_SoundInt32 = 4,
-#define POITYPE_USEREVENT 6
+  kPT_Particle = 5,
-#define POITYPE_RANDRATE 7
+  kPT_UserEvent = 6,
-#define POITYPE_SOUND 8
+  kPT_RandRate = 7,
+  kPT_Sound = 8,
+};
 
 class CPOINode {
 public:
   virtual ~CPOINode();
 
   const rstl::string& GetString() const { return x8_name; }
-  s32 GetPoiType() const { return x18_type; }
+  EPOIType GetPoiType() const { return static_cast< EPOIType >(x18_type); }
   const CCharAnimTime& GetTime() const { return x1c_time; }
   f32 GetWeight() const { return x2c_weight; }
   s32 GetCharacterIndex() const { return x30_charIdx; }
@@ -31,7 +33,7 @@ public:
 protected:
   u16 x4_;
   rstl::string x8_name;
-  s16 x18_type;
+  u16 x18_type;
   CCharAnimTime x1c_time;
   s32 x24_index;
   bool x28_unique;

include/rstl/single_ptr.hpp

@@ -12,8 +12,8 @@ public:
   single_ptr() : x0_ptr(nullptr) {}
   single_ptr(T* ptr) : x0_ptr(ptr) {}
   ~single_ptr() { delete x0_ptr; }
-  T* get() { return x0_ptr; }
+  T* get() const { return x0_ptr; }
-  const T* get() const { return x0_ptr; }
+  // const T* get() const { return x0_ptr; }
   T* operator->() { return x0_ptr; }
   const T* operator->() const { return x0_ptr; }
   void operator=(T* ptr) {

src/MetroidPrime/CActor.cpp

@@ -8,6 +8,7 @@
 #include "MetroidPrime/Cameras/CGameCamera.hpp"
 
 #include "Kyoto/Audio/CAudioSys.hpp"
+#include "Kyoto/Audio/CSfxManager.hpp"
 
 static CMaterialList MakeActorMaterialList(const CMaterialList& in, const CActorParameters& params) {
   CMaterialList ret = in;
@@ -87,10 +88,10 @@ CActor::CActor(TUniqueId uid, bool active, const rstl::string& name, const CEnti
 
 CActor::~CActor() { RemoveEmitter(); }
 
-// TODO nonmatching
+// TODO nonmatching https://decomp.me/scratch/hQjHM
 SAdvancementDeltas CActor::UpdateAnimation(float dt, CStateManager& mgr, bool advTree) {
-  SAdvancementDeltas result = x64_modelData->AdvanceAnimation(dt, mgr, GetAreaId(), advTree);
+  SAdvancementDeltas result = GetModelData()->AdvanceAnimation(dt, mgr, GetAreaId(), advTree);
-  x64_modelData->AdvanceParticles(GetTransform(), dt, mgr);
+  GetModelData()->AdvanceParticles(GetTransform(), dt, mgr);
   UpdateSfxEmitters();
   if (HasAnimation()) {
     u16 maxVol = xd4_maxVol;
@@ -101,49 +102,93 @@ SAdvancementDeltas CActor::UpdateAnimation(float dt, CStateManager& mgr, bool ad
     const CVector3f toCamera = camera->GetTranslation() - origin;
 
     s32 soundNodeCount = 0;
-    const CSoundPOINode* soundNode = HasAnimation() ? x64_modelData->GetAnimationData()->GetSoundPOIList(soundNodeCount) : nullptr;
+    const CSoundPOINode* soundNode;
+    if (HasAnimation()) {
+      soundNode = GetAnimationData()->GetSoundPOIList(soundNodeCount);
+    } else {
+      soundNode = nullptr;
+    }
     if (soundNodeCount > 0 && soundNode != nullptr) {
       for (s32 i = 0; i < soundNodeCount; ++soundNode, ++i) {
         s32 charIdx = soundNode->GetCharacterIndex();
-        if (soundNode->GetPoiType() != POITYPE_SOUND)
+        if (soundNode->GetPoiType() != kPT_Sound || GetMuted())
           continue;
-        if (GetMuted())
+        if (charIdx != -1 && GetAnimationData()->GetCharacterIndex() != charIdx)
           continue;
-        if (charIdx != -1 && x64_modelData->GetAnimationData()->GetCharacterIndex() != charIdx)
+        // if (soundNode->GetPoiType() == kPT_Sound && !GetMuted() && (charIdx == -1 || GetAnimationData()->GetCharacterIndex() == charIdx))
-          continue;
-        // if (soundNode->GetPoiType() == POITYPE_SOUND && !GetMuted() && (charIdx == -1 ||
-        // x64_modelData->GetAnimationData()->GetCharacterIndex() == charIdx))
         ProcessSoundEvent(soundNode->GetSoundId(), soundNode->GetWeight(), soundNode->GetFlags(), soundNode->GetFallOff(),
                           soundNode->GetMaxDistance(), 20, maxVol, toCamera, origin, aid, mgr, true);
       }
     }
 
     s32 intNodeCount = 0;
-    const CInt32POINode* intNode = HasAnimation() ? x64_modelData->GetAnimationData()->GetInt32POIList(intNodeCount) : nullptr;
+    const CInt32POINode* intNode;
+    if (HasAnimation()) {
+      intNode = GetAnimationData()->GetInt32POIList(intNodeCount);
+    } else {
+      intNode = nullptr;
+    }
     if (intNodeCount > 0 && intNode != nullptr) {
       for (s32 i = 0; i < intNodeCount; ++intNode, ++i) {
         s32 charIdx = intNode->GetCharacterIndex();
-        if (soundNode->GetPoiType() == POITYPE_SOUNDINT32 && !GetMuted() &&
+        if (intNode->GetPoiType() == kPT_SoundInt32 && !GetMuted() &&
-            (charIdx == -1 || x64_modelData->GetAnimationData()->GetCharacterIndex() == charIdx)) {
+            (charIdx == -1 || GetAnimationData()->GetCharacterIndex() == charIdx)) {
           ProcessSoundEvent(intNode->GetValue(), intNode->GetWeight(), intNode->GetFlags(), 0.1f, 150.f, 20, maxVol, toCamera, origin, aid,
                             mgr, true);
-        } else if (soundNode->GetPoiType() == POITYPE_USEREVENT) {
+        } else if (intNode->GetPoiType() == kPT_UserEvent) {
           DoUserAnimEvent(mgr, *intNode, static_cast< EUserEventType >(intNode->GetValue()), dt);
         }
       }
     }
 
     s32 particleNodeCount = 0;
-    const CParticlePOINode* particleNode =
+    const CParticlePOINode* particleNode;
-        HasAnimation() ? x64_modelData->GetAnimationData()->GetParticlePOIList(particleNodeCount) : nullptr;
+    if (HasAnimation()) {
+      particleNode = GetAnimationData()->GetParticlePOIList(particleNodeCount);
+    } else {
+      particleNode = nullptr;
+    }
     if (particleNodeCount > 0 && particleNode != nullptr) {
       for (s32 i = 0; i < particleNodeCount; ++particleNode, ++i) {
-        s32 charIdx = soundNode->GetCharacterIndex();
+        s32 charIdx = particleNode->GetCharacterIndex();
-        if (charIdx != -1 && x64_modelData->GetAnimationData()->GetCharacterIndex() != charIdx)
+        if (charIdx != -1 && GetAnimationData()->GetCharacterIndex() != charIdx)
           continue;
-        x64_modelData->GetAnimationData()->SetParticleEffectState(particleNode->GetString(), true, mgr);
+        AnimationData()->SetParticleEffectState(particleNode->GetString(), true, mgr);
       }
     }
   }
   return result;
 }
+
+void CActor::RemoveEmitter() {
+  CSfxHandle handle = x8c_loopingSfxHandle;
+  if (handle) {
+    CSfxManager::RemoveEmitter(handle);
+    x88_sfxId = -1;
+    x8c_loopingSfxHandle = 0;
+  }
+}
+
+void CActor::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt) {
+  if (type == kUE_LoopedSoundStop) {
+    RemoveEmitter();
+  }
+}
+
+f32 CActor::GetAverageAnimVelocity(s32 anim) { return HasAnimation() ? GetAnimationData()->GetAverageVelocity(anim) : 0.f; }
+
+void CActor::CalculateRenderBounds() {
+  if (HasModelData()) {
+    x9c_renderBounds = GetModelData()->GetBounds(GetTransform());
+  } else {
+    const CVector3f origin = GetTranslation();
+    x9c_renderBounds = CAABox(origin, origin);
+  }
+}
+
+void CActor::SetModelData(const CModelData& modelData) { x64_modelData = modelData.IsNull() ? nullptr : new CModelData(modelData); }
+
+// Unreferenced
+extern "C" {
+void sub_8005502c() {}
+}