Continued work on CActor

2025-12-09 20:27:40 +00:00 · 2022-08-15 00:51:06 -04:00
parent 16514e942e
commit 09dfe946fc
97 changed files with 234 additions and 159 deletions
--- a/asm/MetroidPrime/ScriptObjects/CFire.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s
+++ b/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


--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s
+++ b/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:
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s
+++ b/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:
--- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s
+++ b/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"
--- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s
+++ b/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"
--- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s
+++ b/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:
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
+++ b/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:
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s
+++ b/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
--- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s
+++ b/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