From 8659785c5c8058c00d215bfc9d95b9733c8ffbdf Mon Sep 17 00:00:00 2001 From: Luke Street Date: Thu, 29 Sep 2022 20:24:12 -0400 Subject: [PATCH] Fix GetSortingBounds symbol; various fixes Former-commit-id: c8c05c2cd500511590431360926ba9c9f0078bfd --- asm/MetroidPrime/CActor.s | 7 +++---- asm/MetroidPrime/CCollisionActor.s | 3 +-- asm/MetroidPrime/CEffect.s | 2 +- asm/MetroidPrime/CExplosion.s | 3 +-- asm/MetroidPrime/CGameLight.s | 2 +- asm/MetroidPrime/CGameProjectile.s | 3 +-- asm/MetroidPrime/CPhysicsActor.s | 2 +- asm/MetroidPrime/Cameras/CBallCamera.s | 3 +-- asm/MetroidPrime/Cameras/CCinematicCamera.s | 3 +-- asm/MetroidPrime/Cameras/CFirstPersonCamera.s | 2 +- asm/MetroidPrime/Cameras/CGameCamera.s | 2 +- asm/MetroidPrime/Cameras/CInterpolationCamera.s | 3 +-- asm/MetroidPrime/Cameras/CPathCamera.s | 2 +- asm/MetroidPrime/Enemies/CActorContraption.s | 3 +-- asm/MetroidPrime/Enemies/CAi.s | 2 +- asm/MetroidPrime/Enemies/CAmbientAI.s | 3 +-- asm/MetroidPrime/Enemies/CAtomicAlpha.s | 3 +-- asm/MetroidPrime/Enemies/CAtomicBeta.s | 3 +-- asm/MetroidPrime/Enemies/CBabygoth.s | 3 +-- asm/MetroidPrime/Enemies/CBeetle.s | 2 +- asm/MetroidPrime/Enemies/CBloodFlower.s | 2 +- asm/MetroidPrime/Enemies/CBouncyGrenade.s | 3 +-- asm/MetroidPrime/Enemies/CBurrower.s | 3 +-- asm/MetroidPrime/Enemies/CChozoGhost.s | 3 +-- asm/MetroidPrime/Enemies/CDrone.s | 5 ++--- asm/MetroidPrime/Enemies/CElitePirate.s | 3 +-- asm/MetroidPrime/Enemies/CEyeBall.s | 3 +-- asm/MetroidPrime/Enemies/CFireFlea.s | 3 +-- asm/MetroidPrime/Enemies/CFlaahgra.s | 7 +++---- asm/MetroidPrime/Enemies/CFlaahgraPlants.s | 3 +-- asm/MetroidPrime/Enemies/CFlaahgraTentacle.s | 3 +-- asm/MetroidPrime/Enemies/CFlickerBat.s | 3 +-- asm/MetroidPrime/Enemies/CFlyingPirate.s | 3 +-- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 3 +-- asm/MetroidPrime/Enemies/CIceSheegoth.s | 9 ++++----- asm/MetroidPrime/Enemies/CJellyZap.s | 3 +-- asm/MetroidPrime/Enemies/CMagdolite.s | 3 +-- asm/MetroidPrime/Enemies/CMetaree.s | 3 +-- asm/MetroidPrime/Enemies/CMetroid.s | 3 +-- asm/MetroidPrime/Enemies/CMetroidBeta.s | 3 +-- asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s | 3 +-- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 5 ++--- asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s | 3 +-- asm/MetroidPrime/Enemies/COmegaPirate.s | 5 ++--- asm/MetroidPrime/Enemies/CParasite.s | 3 +-- asm/MetroidPrime/Enemies/CPatterned.s | 3 +-- asm/MetroidPrime/Enemies/CPhazonHealingNodule.s | 3 +-- asm/MetroidPrime/Enemies/CPhazonPool.s | 3 +-- asm/MetroidPrime/Enemies/CPuddleSpore.s | 3 +-- asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 3 +-- asm/MetroidPrime/Enemies/CPuffer.s | 3 +-- asm/MetroidPrime/Enemies/CRidley.s | 7 +++---- asm/MetroidPrime/Enemies/CRipper.s | 3 +-- asm/MetroidPrime/Enemies/CRipperControlledPlatform.s | 3 +-- asm/MetroidPrime/Enemies/CSeedling.s | 3 +-- asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s | 3 +-- asm/MetroidPrime/Enemies/CSpacePirate.s | 7 +++---- asm/MetroidPrime/Enemies/CSpankWeed.s | 3 +-- asm/MetroidPrime/Enemies/CThardus.s | 9 ++++----- asm/MetroidPrime/Enemies/CThardusRockProjectile.s | 2 +- asm/MetroidPrime/Enemies/CTryclops.s | 4 ++-- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 3 +-- asm/MetroidPrime/Enemies/CWallWalker.s | 4 ++-- asm/MetroidPrime/Enemies/CWarWasp.s | 3 +-- asm/MetroidPrime/Player/CPlayer.s | 2 +- asm/MetroidPrime/ScriptObjects/CEnergyBall.s | 3 +-- asm/MetroidPrime/ScriptObjects/CFire.s | 3 +-- asm/MetroidPrime/ScriptObjects/CFishCloud.s | 5 ++--- asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s | 3 +-- asm/MetroidPrime/ScriptObjects/CRepulsor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptActor.s | 9 ++++----- asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptBeam.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s | 2 +- .../ScriptObjects/CScriptCameraHintTrigger.s | 2 +- .../ScriptObjects/CScriptCameraPitchVolume.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s | 2 +- .../ScriptObjects/CScriptDamageableTrigger.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDebris.s | 3 +-- .../ScriptObjects/CScriptDebugCameraWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDock.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDoor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptEffect.s | 7 +++---- asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptPickup.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptPlatform.s | 9 ++++----- asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s | 3 +-- .../ScriptObjects/CScriptSpiderBallAttractionSurface.s | 3 +-- .../ScriptObjects/CScriptSpiderBallWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptSteam.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptTrigger.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s | 2 +- asm/MetroidPrime/Weapons/CBeamProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CBomb.s | 3 +-- asm/MetroidPrime/Weapons/CElectricBeamProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CFlameThrower.s | 3 +-- asm/MetroidPrime/Weapons/CIceImpact.s | 3 +-- asm/MetroidPrime/Weapons/CIceProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 3 +-- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CPowerBomb.s | 3 +-- asm/MetroidPrime/Weapons/CShockWave.s | 3 +-- asm/MetroidPrime/Weapons/CTargetableProjectile.s | 3 +-- asm/MetroidPrime/Weapons/CWaveBuster.s | 3 +-- asm/MetroidPrime/Weapons/CWeapon.s | 2 +- include/Kyoto/Audio/CSfxHandle.hpp | 2 +- include/Kyoto/TToken.hpp | 2 +- include/MetroidPrime/CActor.hpp | 2 +- include/MetroidPrime/CGameCollision.hpp | 1 + include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp | 2 +- src/MetroidPrime/CActor.cpp | 7 +++---- src/MetroidPrime/ScriptObjects/CScriptPlatform.cpp | 2 +- 127 files changed, 157 insertions(+), 248 deletions(-) diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index 1dee53b3..6c28a57d 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -31,7 +31,7 @@ __vt__6CActor: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803D9F1C @@ -910,8 +910,8 @@ lbl_800535CC: FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager: /* 800535DC 0005053C 4E 80 00 20 */ blr -.global GetSortingBounds__6CActorCFRC12CTransform4f -GetSortingBounds__6CActorCFRC12CTransform4f: +.global GetSortingBounds__6CActorCFRC13CStateManager +GetSortingBounds__6CActorCFRC13CStateManager: /* 800535E0 00050540 C0 04 00 9C */ lfs f0, 0x9c(r4) /* 800535E4 00050544 D0 03 00 00 */ stfs f0, 0(r3) /* 800535E8 00050548 C0 04 00 A0 */ lfs f0, 0xa0(r4) @@ -3742,4 +3742,3 @@ lbl_803CCF68: # ROM: 0x3C9F68 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index efff3e08..165a5bcd 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -35,7 +35,7 @@ lbl_803E4B18: .4byte GetCollisionResponseType__15CCollisionActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__15CCollisionActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte sub_801a8ea4 .4byte GetPrimitiveTransform__15CCollisionActorCFv @@ -1980,4 +1980,3 @@ lbl_803D14A0: .byte 0x3F .asciz "?(??)" .balign 4 - diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 7308b3f3..956c4dec 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -31,7 +31,7 @@ lbl_803DA118: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index 7755c6c1..207f7412 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -31,7 +31,7 @@ lbl_803DA0A8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -882,4 +882,3 @@ lbl_803CCF78: .byte 0x45 .asciz "xplodePLight_" .balign 4 - diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index ce00ef68..c382c259 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -31,7 +31,7 @@ lbl_803DF3B8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index 50e620dc..dc206e00 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -31,7 +31,7 @@ lbl_803D9CE0: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager @@ -3732,4 +3732,3 @@ lbl_803CCE20: .asciz "isorAcid" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 107675c3..2203d2a9 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -31,7 +31,7 @@ lbl_803E0628: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index b103e8fa..652ae5b4 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -35,7 +35,7 @@ __vt__11CBallCamera: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__11CBallCameraFRC11CFinalInputR13CStateManager .4byte Reset__11CBallCameraFRC12CTransform4fR13CStateManager @@ -14453,4 +14453,3 @@ __sinit_CBallCamera_cpp: .asciz "all Camera" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index 6b25892c..a0fb6c1e 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -31,7 +31,7 @@ lbl_803DADF8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__16CCinematicCameraFRC11CFinalInputR13CStateManager .4byte Reset__16CCinematicCameraFRC12CTransform4fR13CStateManager @@ -3175,4 +3175,3 @@ lbl_803CD7C0: .asciz "??(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index 6aea612a..ad9853bf 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -30,7 +30,7 @@ lbl_803D9660: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__18CFirstPersonCameraFRC11CFinalInputR13CStateManager .4byte Reset__18CFirstPersonCameraFRC12CTransform4fR13CStateManager diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 61fc4384..271f4883 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -37,7 +37,7 @@ lbl_803DA194: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 .4byte 0 diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index 4b2db148..1427e723 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -31,7 +31,7 @@ lbl_803E9D80: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__20CInterpolationCameraFRC11CFinalInputR13CStateManager .4byte Reset__20CInterpolationCameraFRC12CTransform4fR13CStateManager @@ -1239,4 +1239,3 @@ lbl_803D5298: # ROM: 0x3D2298 .asciz "Interpolation Camera" .balign 4 - diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 168cc2c1..1814a325 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -35,7 +35,7 @@ lbl_803E0C68: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__11CPathCameraFRC11CFinalInputR13CStateManager .4byte Reset__11CPathCameraFRC12CTransform4fR13CStateManager diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index 8d1bdc3a..be440ea2 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -31,7 +31,7 @@ lbl_803E85E8: .4byte GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__12CScriptActorCFRC12CTransform4f + .4byte GetSortingBounds__12CScriptActorCFRC13CStateManager .4byte DoUserAnimEvent__17CActorContraptionFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -701,4 +701,3 @@ lbl_803D43A0: .byte 0x46, 0x6C, 0x61 .asciz "meThrower" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 9c54135d..0c2800ef 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -900,7 +900,7 @@ lbl_803DBCCC: .4byte GetCollisionResponseType__3CAiCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s index b49e6ade..8db997b5 100644 --- a/asm/MetroidPrime/Enemies/CAmbientAI.s +++ b/asm/MetroidPrime/Enemies/CAmbientAI.s @@ -31,7 +31,7 @@ lbl_803E8CB0: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -801,4 +801,3 @@ lbl_803D4798: .asciz "Whole Body" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s index 83e1b5b8..3287ae1d 100644 --- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s +++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s @@ -31,7 +31,7 @@ lbl_803E88A8: .4byte GetCollisionResponseType__12CAtomicAlphaCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12CAtomicAlphaFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1285,4 +1285,3 @@ lbl_803D4730: .byte 0x62, 0x6F, 0x6D .asciz "b4_LCTR" .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index ca3f7d5c..bccbfe07 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -38,7 +38,7 @@ lbl_803E8E4C: .4byte GetCollisionResponseType__11CAtomicBetaCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1466,4 +1466,3 @@ lbl_803D4B66: .asciz "mb4_LCTR" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index bbb6ab83..7481c7d4 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -38,7 +38,7 @@ lbl_803E7350: .4byte GetCollisionResponseType__9CBabygothCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__9CBabygothFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__9CBabygothCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -8476,4 +8476,3 @@ lbl_803D31F3: .asciz "Head_1" .byte 0x46 .asciz "lameThrower" - diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 1e06e594..9b6b8515 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -31,7 +31,7 @@ lbl_803DF890: .4byte GetCollisionResponseType__7CBeetleCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__7CBeetleFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 0a0ae668..4b1824c8 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -45,7 +45,7 @@ lbl_803E0350: .4byte GetCollisionResponseType__12CBloodFlowerCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12CBloodFlowerFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index 2f1ff465..a67a9012 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -31,7 +31,7 @@ lbl_803E7ED0: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1471,4 +1471,3 @@ lbl_803D3408: # ROM: 0x3D0408 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index a3824a60..40805acb 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -66,7 +66,7 @@ lbl_803EA7C4: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__9CBurrowerFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1928,4 +1928,3 @@ lbl_803D5420: # ROM: 0x3D2420 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index ea99c524..0e5888c9 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -64,7 +64,7 @@ lbl_803E1918: .4byte GetCollisionResponseType__11CChozoGhostCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__11CChozoGhostFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -4287,4 +4287,3 @@ lbl_803D0078: .asciz "eedSwoosh" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index b3cfdded..e6817ecc 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -32,7 +32,7 @@ lbl_803E36A8: .4byte GetCollisionResponseType__6CDroneCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CDroneFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__6CDroneCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -280,7 +280,7 @@ lbl_803E3A58: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -10592,4 +10592,3 @@ lbl_803D03B3: .byte 0x44 .asciz "roneLaser" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 9d37d55d..bcdbaa59 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -39,7 +39,7 @@ lbl_803E7AE0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__12CElitePirateCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -8329,4 +8329,3 @@ lbl_803D33B5: .asciz "Shock Wave" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index 38c3d0a2..c7a7423f 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -38,7 +38,7 @@ lbl_803E774C: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__8CEyeBallFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1612,4 +1612,3 @@ lbl_803D3248: .asciz "Ball_Beam" .byte 0x45, 0x79 .4byte 0x65000000 - diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 301a29cf..7c5a5341 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -35,7 +35,7 @@ lbl_803E1C88: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1885,4 +1885,3 @@ lbl_803D0098: # ROM: 0x3CD098 .4byte 0x003F3F28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index cbe1f8ba..ce7cde9d 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -38,7 +38,7 @@ lbl_803E4D08: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803E4D74 @@ -146,7 +146,7 @@ lbl_803E4E88: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__9CFlaahgraFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -329,7 +329,7 @@ lbl_803E5154: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId @@ -8653,4 +8653,3 @@ lbl_803D1607: .4byte 0x6400466C .asciz "aahgra Renderer" .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index 4126295f..bf934ed8 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -31,7 +31,7 @@ lbl_803E6FD8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -797,4 +797,3 @@ lbl_803D2738: .byte 0x46 .asciz "laahgra Plants" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 47e2f933..b0f6e8c3 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -31,7 +31,7 @@ lbl_803E6408: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1490,4 +1490,3 @@ lbl_803D2025: .asciz "??(??)" .byte 0x44 .4byte 0x65616400 - diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index 3ec3fbe6..212618b4 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -31,7 +31,7 @@ lbl_803E0DE0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__11CFlickerBatFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1499,4 +1499,3 @@ lbl_803D0050: # ROM: 0x3CD050 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index 17c80eda..77a47f51 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -100,7 +100,7 @@ __vt__13CFlyingPirate: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__13CFlyingPirateFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -15103,4 +15103,3 @@ lbl_803D247C: .byte 0x72, 0x6F .asciz "cket_LCTR" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 9f7eb7b2..01db36e6 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -34,7 +34,7 @@ lbl_803E7F58: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__16CGrenadeLauncherCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -2513,4 +2513,3 @@ lbl_803D341D: .asciz "ouncy Grenade" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 9e1a205e..ca99f44c 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -35,7 +35,7 @@ lbl_803E4728: .4byte GetCollisionResponseType__12CIceSheegothCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__12CIceSheegothCFRC12CTransform4f + .4byte GetSortingBounds__12CIceSheegothCFRC13CStateManager .4byte DoUserAnimEvent__12CIceSheegothFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__12CIceSheegothCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -370,15 +370,15 @@ GetGravityConstant__12CIceSheegothCFv: /* 8019E26C 0019B1CC EC 21 00 32 */ fmuls f1, f1, f0 /* 8019E270 0019B1D0 4E 80 00 20 */ blr -.global GetSortingBounds__12CIceSheegothCFRC12CTransform4f -GetSortingBounds__12CIceSheegothCFRC12CTransform4f: +.global GetSortingBounds__12CIceSheegothCFRC13CStateManager +GetSortingBounds__12CIceSheegothCFRC13CStateManager: /* 8019E274 0019B1D4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8019E278 0019B1D8 7C 08 02 A6 */ mflr r0 /* 8019E27C 0019B1DC 90 01 00 74 */ stw r0, 0x74(r1) /* 8019E280 0019B1E0 93 E1 00 6C */ stw r31, 0x6c(r1) /* 8019E284 0019B1E4 7C 7F 1B 78 */ mr r31, r3 /* 8019E288 0019B1E8 38 61 00 2C */ addi r3, r1, 0x2c -/* 8019E28C 0019B1EC 4B EB 53 55 */ bl GetSortingBounds__6CActorCFRC12CTransform4f +/* 8019E28C 0019B1EC 4B EB 53 55 */ bl GetSortingBounds__6CActorCFRC13CStateManager /* 8019E290 0019B1F0 C0 A1 00 2C */ lfs f5, 0x2c(r1) /* 8019E294 0019B1F4 38 61 00 20 */ addi r3, r1, 0x20 /* 8019E298 0019B1F8 C0 81 00 30 */ lfs f4, 0x30(r1) @@ -10451,4 +10451,3 @@ lbl_803D1459: .asciz "FlameThrower" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index badcf966..6a34c59b 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -52,7 +52,7 @@ lbl_803E5954: .4byte GetCollisionResponseType__9CJellyZapCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__9CJellyZapFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1700,4 +1700,3 @@ lbl_805AC9B0: lbl_805AC9B4: # ROM: 0x3F9254 .float 0.75 - diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 58dfc770..300db5cc 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -119,7 +119,7 @@ lbl_803E8240: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__10CMagdoliteFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CMagdoliteFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -4169,4 +4169,3 @@ lbl_803D4354: .byte 0x46, 0x6C .asciz "ameThrower" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index 7bacc144..27cc6fd1 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -31,7 +31,7 @@ lbl_803E2878: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1231,4 +1231,3 @@ lbl_805ABAB0: # ROM: 0x3F8350 .float 1.0 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index b11086b3..1bffe19f 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -35,7 +35,7 @@ lbl_803E3AD8: .4byte GetCollisionResponseType__8CMetroidCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__8CMetroidFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__8CMetroidCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -10351,4 +10351,3 @@ lbl_803D05F5: .asciz "awned Metroid" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index 44dcb5a5..22152f02 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -38,7 +38,7 @@ lbl_803E5388: .4byte GetCollisionResponseType__12CMetroidBetaCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12CMetroidBetaFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__12CMetroidBetaCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -7065,4 +7065,3 @@ lbl_803D1A90: .asciz "R_Claw_1" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index d19cb6d8..f713bdc2 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -84,7 +84,7 @@ lbl_803EB244: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__20CMetroidPrimeEssenceFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -4620,4 +4620,3 @@ lbl_803D58B4: .byte 0x57, 0x68 .asciz "ole Body" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 47f0d4dc..bf585988 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -272,7 +272,7 @@ lbl_803EAD54: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__16CMetroidPrimeExoFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -514,7 +514,7 @@ lbl_803EB0FC: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -14125,4 +14125,3 @@ lbl_803D5833: .asciz "ect_Electric" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s index efb81720..606a3c3a 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s @@ -31,7 +31,7 @@ lbl_803EC390: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte Explode__23CMetroidPrimeProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId @@ -380,4 +380,3 @@ lbl_803D5EE8: # ROM: 0x3D2EE8 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index ac1d2ed0..35c64fd6 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -31,7 +31,7 @@ lbl_803EB6C8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803EB734 @@ -151,7 +151,7 @@ lbl_803EB868: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12COmegaPirateFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__12CElitePirateCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -9878,4 +9878,3 @@ lbl_803D5B1C: .byte 0x54, 0x68, 0x65 .asciz "rmal_Spot_2" .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 74eda79b..0422cd99 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -42,7 +42,7 @@ lbl_803E3004: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__11CWallWalkerCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -5147,4 +5147,3 @@ lbl_803D0330: .asciz "Ice_LCTR" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index fe6caefe..7dc83c98 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -35,7 +35,7 @@ lbl_803DA5C8: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -8173,4 +8173,3 @@ lbl_803CD600: .4byte 0x61640053 .asciz "tart" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index fcd3c026..c4ef8ba3 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -31,7 +31,7 @@ lbl_803EBC70: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__20CPhazonHealingNoduleFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1262,4 +1262,3 @@ lbl_803D5BB0: .4byte 0x726F6C00 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s index 5eca269a..fbd2cc78 100644 --- a/asm/MetroidPrime/Enemies/CPhazonPool.s +++ b/asm/MetroidPrime/Enemies/CPhazonPool.s @@ -30,7 +30,7 @@ lbl_803EBB48: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager .4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager @@ -1611,4 +1611,3 @@ lbl_803D5B78: # ROM: 0x3D2B78 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 6422e4d5..44aa4a78 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -59,7 +59,7 @@ lbl_803E20C4: .4byte GetCollisionResponseType__12CPuddleSporeCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__12CPuddleSporeFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__12CPuddleSporeFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__12CPuddleSporeCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -3248,4 +3248,3 @@ lbl_803D015A: .byte 0x3F .asciz "?(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 49a33625..f5539893 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -35,7 +35,7 @@ lbl_803E24E0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__16CPuddleToadGammaFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__16CPuddleToadGammaCFv .4byte GetPrimitiveTransform__16CPuddleToadGammaCFv @@ -2273,4 +2273,3 @@ lbl_803D017F: .asciz "(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index f86e8f57..c4148dfd 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -31,7 +31,7 @@ lbl_803E96C0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1087,4 +1087,3 @@ lbl_805AD710: lbl_805AD714: # ROM: 0x3F9FB4 .float -1.0 - diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 5cbcd899..dd42cda5 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -148,7 +148,7 @@ lbl_803E9258: .4byte GetCollisionResponseType__7CRidleyCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__7CRidleyCFRC12CTransform4f + .4byte GetSortingBounds__7CRidleyCFRC13CStateManager .4byte DoUserAnimEvent__7CRidleyFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -7042,8 +7042,8 @@ lbl_802581C0: /* 802581D0 00255130 38 21 00 30 */ addi r1, r1, 0x30 /* 802581D4 00255134 4E 80 00 20 */ blr -.global GetSortingBounds__7CRidleyCFRC12CTransform4f -GetSortingBounds__7CRidleyCFRC12CTransform4f: +.global GetSortingBounds__7CRidleyCFRC13CStateManager +GetSortingBounds__7CRidleyCFRC13CStateManager: /* 802581D8 00255138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802581DC 0025513C 7C 08 02 A6 */ mflr r0 /* 802581E0 00255140 90 01 00 14 */ stw r0, 0x14(r1) @@ -11926,4 +11926,3 @@ lbl_803D521A: .byte 0x3F, 0x3F .asciz "(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 75e8b640..fbc7057f 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -31,7 +31,7 @@ lbl_803E3348: .4byte GetCollisionResponseType__7CRipperFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1017,4 +1017,3 @@ lbl_803D0358: .byte 0x52, 0x69 .asciz "pperGrapplePoint" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index d9066e58..e8ee13c6 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -31,7 +31,7 @@ lbl_803E80C0: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__15CScriptPlatformCFRC12CTransform4f + .4byte GetSortingBounds__15CScriptPlatformCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__15CScriptPlatformCFv .4byte GetPrimitiveTransform__15CScriptPlatformCFv @@ -426,4 +426,3 @@ lbl_805AD408: # ROM: 0x3F9CA8 .float 1.0 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index f24040e8..e33d3714 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -45,7 +45,7 @@ lbl_803E9E10: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__9CSeedlingFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__11CWallWalkerCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1532,4 +1532,3 @@ lbl_803D53A6: .asciz "spike6_LCTR_SDK" .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index 13e96623..a5ea454c 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -31,7 +31,7 @@ lbl_803E8578: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -3626,4 +3626,3 @@ lbl_803D4388: .asciz "?(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index a3abab1c..fd2640e3 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -159,7 +159,7 @@ lbl_803E0800: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__12CSpacePirateCFRC12CTransform4f + .4byte GetSortingBounds__12CSpacePirateCFRC13CStateManager .4byte DoUserAnimEvent__12CSpacePirateFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -2328,8 +2328,8 @@ lbl_80121A44: /* 80121A6C 0011E9CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80121A70 0011E9D0 4E 80 00 20 */ blr -.global GetSortingBounds__12CSpacePirateCFRC12CTransform4f -GetSortingBounds__12CSpacePirateCFRC12CTransform4f: +.global GetSortingBounds__12CSpacePirateCFRC13CStateManager +GetSortingBounds__12CSpacePirateCFRC13CStateManager: /* 80121A74 0011E9D4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80121A78 0011E9D8 7C 08 02 A6 */ mflr r0 /* 80121A7C 0011E9DC 7C 85 23 78 */ mr r5, r4 @@ -15886,4 +15886,3 @@ lbl_803CFF70: .asciz "woEyes" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index 2eade601..fbd3dfe7 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -31,7 +31,7 @@ lbl_803E2D28: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -2417,4 +2417,3 @@ lbl_803D027D: .asciz "pank Weed Collision " .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 3c46b1d8..44abf12a 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -37,7 +37,7 @@ lbl_803E5CE0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__8CThardusCFRC12CTransform4f + .4byte GetSortingBounds__8CThardusCFRC13CStateManager .4byte DoUserAnimEvent__8CThardusFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -278,7 +278,7 @@ lbl_803E6074: .4byte GetCollisionResponseType__3CAiCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1203,8 +1203,8 @@ lbl_801DB048: /* 801DB05C 001D7FBC 38 21 00 80 */ addi r1, r1, 0x80 /* 801DB060 001D7FC0 4E 80 00 20 */ blr -.global GetSortingBounds__8CThardusCFRC12CTransform4f -GetSortingBounds__8CThardusCFRC12CTransform4f: +.global GetSortingBounds__8CThardusCFRC13CStateManager +GetSortingBounds__8CThardusCFRC13CStateManager: /* 801DB064 001D7FC4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801DB068 001D7FC8 7C 08 02 A6 */ mflr r0 /* 801DB06C 001D7FCC 90 01 00 74 */ stw r0, 0x74(r1) @@ -11247,4 +11247,3 @@ lbl_803D1E1E: .asciz "ermal_Spot_2" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 780cd7fa..6605d1e6 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -31,7 +31,7 @@ lbl_803E6BE0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index d817bf46..9703af36 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -63,7 +63,7 @@ lbl_803E9A40: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte sub_8025e79c .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -4072,4 +4072,4 @@ lbl_803D5269: # ROM: 0x3D2269 .byte 0x53, 0x6B, 0x65 .asciz "leton_Root" - .balign 4 \ No newline at end of file + .balign 4 diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 64f3be50..dd157403 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -31,7 +31,7 @@ lbl_803E6308: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803E6374 @@ -8952,4 +8952,3 @@ lbl_803D1F30: .asciz "?(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 66035006..0f9f79d1 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -31,7 +31,7 @@ lbl_803EA0F0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__11CWallWalkerCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1292,4 +1292,4 @@ lbl_803D53C8: # ROM: 0x3D23C8 .asciz "BendingAnimationHack" - .balign 4 \ No newline at end of file + .balign 4 diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 55fe694b..2f1690cf 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -31,7 +31,7 @@ lbl_803DFF90: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__8CWarWaspFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__8CWarWaspCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -7270,4 +7270,3 @@ lbl_803CF1E4: .asciz "LCTR_WARTAIL" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 55062e6d..14b2beb8 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -34,7 +34,7 @@ lbl_803D96E8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__7CPlayerFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__7CPlayerCFv .4byte GetPrimitiveTransform__7CPlayerCFv diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index bac5e23f..4dedd93b 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -31,7 +31,7 @@ lbl_803EC0A0: .4byte GetCollisionResponseType__10CPatternedCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__3CAiFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__10CPatternedFR13CStateManagerRC13CInt32POINode14EUserEventType .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1417,4 +1417,3 @@ lbl_803D5EB8: .asciz "PlasmaVisorFx" .byte 0x53, 0x75 .asciz "sDamage" - diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 139b14f6..fccd5d9c 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -31,7 +31,7 @@ lbl_803E9990: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -751,4 +751,3 @@ lbl_803D5230: .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index b35922cf..32df9fd9 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -31,7 +31,7 @@ lbl_803E5758: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803E57C4 @@ -62,7 +62,7 @@ lbl_803E57C4: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .section .sdata @@ -6295,4 +6295,3 @@ lbl_803D1B70: .asciz "hole Body" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index 42ae4aaa..36e452f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -31,7 +31,7 @@ lbl_803E0D70: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -696,4 +696,3 @@ lbl_803D0048: # ROM: 0x3CD048 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index 4441eb15..e0396b8a 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -31,7 +31,7 @@ lbl_803E70E8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index 715de949..6ed7266a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -31,7 +31,7 @@ lbl_803DA450: .4byte GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__12CScriptActorCFRC12CTransform4f + .4byte GetSortingBounds__12CScriptActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -77,8 +77,8 @@ lbl_805AA5E8: .section .text, "ax" -.global GetSortingBounds__12CScriptActorCFRC12CTransform4f -GetSortingBounds__12CScriptActorCFRC12CTransform4f: +.global GetSortingBounds__12CScriptActorCFRC13CStateManager +GetSortingBounds__12CScriptActorCFRC13CStateManager: /* 80074F60 00071EC0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074F64 00071EC4 7C 08 02 A6 */ mflr r0 /* 80074F68 00071EC8 90 01 00 24 */ stw r0, 0x24(r1) @@ -105,7 +105,7 @@ lbl_80074FB8: /* 80074FB8 00071F18 7F A3 EB 78 */ mr r3, r29 /* 80074FBC 00071F1C 7F C4 F3 78 */ mr r4, r30 /* 80074FC0 00071F20 7F E5 FB 78 */ mr r5, r31 -/* 80074FC4 00071F24 4B FD E6 1D */ bl GetSortingBounds__6CActorCFRC12CTransform4f +/* 80074FC4 00071F24 4B FD E6 1D */ bl GetSortingBounds__6CActorCFRC13CStateManager lbl_80074FC8: /* 80074FC8 00071F28 80 01 00 24 */ lwz r0, 0x24(r1) /* 80074FCC 00071F2C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -998,4 +998,3 @@ lbl_803CD5E8: .asciz "Whole Body" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index eadfc9df..0d27e901 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -31,7 +31,7 @@ lbl_803E6398: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -352,4 +352,3 @@ lbl_805ACB60: # ROM: 0x3F9400 .4byte 0 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index cd293fd7..e23b3696 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -31,7 +31,7 @@ lbl_803E3E80: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte InhabitantAdded__18CScriptBallTriggerFR6CActorR13CStateManager .4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager @@ -502,4 +502,3 @@ lbl_805ABED8: lbl_805ABEDC: # ROM: 0x3F877C .4byte 0x3EA8F5C3 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index 2684e36a..8d57dc3e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -31,7 +31,7 @@ lbl_803EB180: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -422,4 +422,3 @@ lbl_803D5868: .asciz "Projectile" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index 42020f3e..74aa6680 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -31,7 +31,7 @@ lbl_803DF688: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803DF6F4 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index 00cc78ee..e4ab142e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -31,7 +31,7 @@ lbl_803E8C40: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index 3685d35b..8a015b9c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -37,7 +37,7 @@ lbl_803E7A70: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -409,4 +409,3 @@ lbl_805AD1D8: # ROM: 0x3F9A78 .float 0.5 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index 096bbd20..da57634b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -31,7 +31,7 @@ lbl_803DF348: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index d8ffb5fa..56ae8f23 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -31,7 +31,7 @@ lbl_803E0BF8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index aa88eb72..48b92f3e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -31,7 +31,7 @@ lbl_803DFD08: .4byte GetCollisionResponseType__24CScriptDamageableTriggerCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index f2ae578b..26bdb508 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -31,7 +31,7 @@ lbl_803DFD78: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -2793,4 +2793,3 @@ lbl_803CEDF8: # ROM: 0x3CBDF8 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 73dffa15..5916148b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -30,7 +30,7 @@ lbl_803E23C8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index 146bdef5..03672f1e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -31,7 +31,7 @@ lbl_803DF580: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 1fc188e4..2055a059 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -31,7 +31,7 @@ lbl_803DAA78: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index 41c9a82f..e329fe97 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -31,7 +31,7 @@ lbl_803E4400: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -598,4 +598,3 @@ lbl_803D0940: # ROM: 0x3CD940 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 6c19e213..414e6b56 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -31,7 +31,7 @@ lbl_803DAC38: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__13CScriptEffectCFRC12CTransform4f + .4byte GetSortingBounds__13CScriptEffectCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803DACA4 @@ -206,8 +206,8 @@ SetActive__13CScriptEffectFb: /* 8008DBA4 0008AB04 38 21 00 10 */ addi r1, r1, 0x10 /* 8008DBA8 0008AB08 4E 80 00 20 */ blr -.global GetSortingBounds__13CScriptEffectCFRC12CTransform4f -GetSortingBounds__13CScriptEffectCFRC12CTransform4f: +.global GetSortingBounds__13CScriptEffectCFRC13CStateManager +GetSortingBounds__13CScriptEffectCFRC13CStateManager: /* 8008DBAC 0008AB0C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008DBB0 0008AB10 7C 08 02 A6 */ mflr r0 /* 8008DBB4 0008AB14 90 01 00 24 */ stw r0, 0x24(r1) @@ -2395,4 +2395,3 @@ lbl_803CD690: .byte 0x45 .asciz "ffectPLight_" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 89d00ada..890afbf9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -31,7 +31,7 @@ lbl_803E0D00: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index 0cd5724c..3cc32c39 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -46,7 +46,7 @@ lbl_803E71EC: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -7765,4 +7765,3 @@ lbl_803D3003: .4byte 0x3F3F2900 .asciz "ParticleLight_" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 5302d4b6..4b7000fd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -33,7 +33,7 @@ lbl_803EB658: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -2398,4 +2398,3 @@ lbl_803D5980: .byte 0x3F .asciz "?(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 668f3099..b90db51f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -31,7 +31,7 @@ lbl_803DF4F8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -1130,4 +1130,3 @@ lbl_803CE020: .asciz "G_AllPickupsFound_2" .asciz "STRG_AllPickupsFound_1" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 67eba210..502ab070 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -31,7 +31,7 @@ __vt__15CScriptPlatform: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__15CScriptPlatformCFRC12CTransform4f + .4byte GetSortingBounds__15CScriptPlatformCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__15CScriptPlatformCFv .4byte GetPrimitiveTransform__15CScriptPlatformCFv @@ -242,8 +242,8 @@ lbl_800B0CC0: /* 800B0CD4 000ADC34 38 21 00 20 */ addi r1, r1, 0x20 /* 800B0CD8 000ADC38 4E 80 00 20 */ blr -.global GetSortingBounds__15CScriptPlatformCFRC12CTransform4f -GetSortingBounds__15CScriptPlatformCFRC12CTransform4f: +.global GetSortingBounds__15CScriptPlatformCFRC13CStateManager +GetSortingBounds__15CScriptPlatformCFRC13CStateManager: /* 800B0CDC 000ADC3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800B0CE0 000ADC40 7C 08 02 A6 */ mflr r0 /* 800B0CE4 000ADC44 90 01 00 24 */ stw r0, 0x24(r1) @@ -270,7 +270,7 @@ lbl_800B0D34: /* 800B0D34 000ADC94 7F A3 EB 78 */ mr r3, r29 /* 800B0D38 000ADC98 7F C4 F3 78 */ mr r4, r30 /* 800B0D3C 000ADC9C 7F E5 FB 78 */ mr r5, r31 -/* 800B0D40 000ADCA0 4B FA 28 A1 */ bl GetSortingBounds__6CActorCFRC12CTransform4f +/* 800B0D40 000ADCA0 4B FA 28 A1 */ bl GetSortingBounds__6CActorCFRC13CStateManager lbl_800B0D44: /* 800B0D44 000ADCA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B0D48 000ADCA8 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -4201,4 +4201,3 @@ lbl_803CDE70: # ROM: 0x3CAE70 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 6f5e0498..efac668f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -31,7 +31,7 @@ lbl_803E4BE0: .4byte GetCollisionResponseType__12CScriptActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__12CScriptActorCFRC12CTransform4f + .4byte GetSortingBounds__12CScriptActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte GetCollisionPrimitive__13CPhysicsActorCFv .4byte GetPrimitiveTransform__13CPhysicsActorCFv @@ -2423,4 +2423,3 @@ lbl_803D14B8: .4byte 0x3F3F2900 .asciz "PhazonIndirectTexture" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index e6c6ea11..1af52109 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -31,7 +31,7 @@ lbl_803E32D8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index d174e994..f88245b7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -31,7 +31,7 @@ lbl_803E3638: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -308,4 +308,3 @@ lbl_805ABC80: # ROM: 0x3F8520 .4byte 0 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index 0b99cb22..5c5d26e2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -31,7 +31,7 @@ lbl_803EC030: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -508,4 +508,3 @@ lbl_803D5EB0: # ROM: 0x3D2EB0 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 00992356..dd402760 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -31,7 +31,7 @@ lbl_803DF128: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803DF194 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index 55e21a02..91f8d7fc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -31,7 +31,7 @@ lbl_803E2B68: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803E2BD4 @@ -5448,4 +5448,3 @@ lbl_803D01D0: .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index 7efa8797..c4ed5a1e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -31,7 +31,7 @@ lbl_803E2438: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -291,4 +291,3 @@ lbl_805ABA00: # ROM: 0x3F82A0 .float 0.5 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index 9aec1add..00f847b2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -31,7 +31,7 @@ lbl_803E02C8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index ae87e238..2dbf6423 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -35,7 +35,7 @@ lbl_803E8670: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ProcessInput__20CScriptSpindleCameraFRC11CFinalInputR13CStateManager .4byte Reset__20CScriptSpindleCameraFRC12CTransform4fR13CStateManager @@ -2166,4 +2166,3 @@ lbl_805AD528: # ROM: 0x3F9DC8 .float 0.017453292 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s index fe0c4f8d..9d4a5138 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s @@ -31,7 +31,7 @@ lbl_803E3DA8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager .4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager @@ -356,4 +356,3 @@ lbl_805ABE88: # ROM: 0x3F8728 .float 1.0 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index 9273486f..c38f86fc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -31,7 +31,7 @@ lbl_803E4330: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -231,4 +231,3 @@ lbl_805AC180: # ROM: 0x3F8A20 .4byte 0 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index fdce48ec..cc981652 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -31,7 +31,7 @@ lbl_803DA4D8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte InhabitantAdded__14CScriptTriggerFR6CActorR13CStateManager .4byte InhabitantIdle__14CScriptTriggerFR6CActorR13CStateManager @@ -1495,4 +1495,3 @@ lbl_803CD5F8: # ROM: 0x3CA5F8 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index da897244..aeadb65f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -31,7 +31,7 @@ lbl_803E5830: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index a23f2db7..ee8dcbc2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -31,7 +31,7 @@ lbl_803E58C0: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -760,4 +760,3 @@ lbl_803D1B90: .asciz "??(??)" .byte 0x56 .asciz "isorGoo" - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index ddca4603..36a22773 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -31,7 +31,7 @@ lbl_803DA558: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index f9c3827a..45ab9902 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -31,7 +31,7 @@ lbl_803E4648: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte UpdateFx__15CBeamProjectileFRC12CTransform4ffR13CStateManager @@ -804,4 +804,3 @@ lbl_805AC3EC: lbl_805AC3F0: # ROM: 0x3F8C90 .double 4.503601774854144E15 - diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 14917984..fa917185 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -31,7 +31,7 @@ lbl_803DACC0: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -1270,4 +1270,3 @@ lbl_803CD6A8: .asciz "ombPLight_" .byte 0x42 .4byte 0x6F6D6200 - diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index f4adf90a..9d8e5740 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -31,7 +31,7 @@ lbl_803E9118: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte sub_80251e84 @@ -786,4 +786,3 @@ lbl_803D4B78: .byte 0x3F .asciz "?(??)" .balign 4 - diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index ccfff41d..ff78ad7e 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -35,7 +35,7 @@ lbl_803E7158: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__17CEnergyProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseTypesR13CStateManagerRC20CDamageVulnerability9TUniqueId @@ -2169,4 +2169,3 @@ lbl_803D2890: .asciz "GameProjectile" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 17e79fe3..8ebae4c4 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -35,7 +35,7 @@ lbl_803E45D8: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager @@ -1837,4 +1837,3 @@ lbl_803D1210: .asciz "lameThrower_Light" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index aaf4b504..d1d52df2 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -31,7 +31,7 @@ lbl_803E51E8: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -3016,4 +3016,3 @@ lbl_803D1640: .asciz "cePLight_" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index b7464be3..8b546e32 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -31,7 +31,7 @@ lbl_803E6778: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -2822,4 +2822,3 @@ lbl_803D2050: .asciz "ceAttackProjectile" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index ae2a1801..30a09357 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -35,7 +35,7 @@ lbl_803E9D10: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager @@ -4650,4 +4650,3 @@ lbl_803D5278: .asciz "lamethrowerLight" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index bd70758b..7b4b7ac7 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -35,7 +35,7 @@ lbl_803E3F00: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte UpdateFx__17CPlasmaProjectileFRC12CTransform4ffR13CStateManager @@ -3016,4 +3016,3 @@ lbl_803D0668: .asciz "lasmaElectricFx" .asciz "PlasmaVisorFx" .balign 4 - diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index 98385835..ca6c0d54 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -35,7 +35,7 @@ lbl_803E2808: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -695,4 +695,3 @@ lbl_803D01A0: .asciz "(??)" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index f0433796..f34f97b8 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -31,7 +31,7 @@ lbl_803E8050: .4byte GetCollisionResponseType__6CActorCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__6CActorFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte 0 @@ -1303,4 +1303,3 @@ lbl_803D3468: .byte 0x56 .asciz "isorElectricFx" .balign 4 - diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 92c45385..36834e3c 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -32,7 +32,7 @@ lbl_803E1800: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13CStateManager .4byte Think__21CTargetableProjectileFfR13CStateManager @@ -612,4 +612,3 @@ lbl_803D0070: # ROM: 0x3CD070 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index c47c73de..0fe228a1 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -35,7 +35,7 @@ lbl_803E5318: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__15CGameProjectileFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .4byte ResolveCollisionWithActor__15CGameProjectileFRC14CRayCastResultR6CActorR13CStateManager @@ -3580,4 +3580,3 @@ lbl_803D1A20: .asciz "terLight" .byte 0x3F, 0x3F, 0x28 .4byte 0x3F3F2900 - diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index db63226c..2ab16e59 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -31,7 +31,7 @@ lbl_803DFEF0: .4byte GetCollisionResponseType__7CWeaponCFRC9CVector3fRC9CVector3fRC11CWeaponModei .4byte FluidFXThink__7CWeaponFQ26CActor11EFluidStateR12CScriptWaterR13CStateManager .4byte OnScanStateChange__6CActorFQ26CActor10EScanStateR13CStateManager - .4byte GetSortingBounds__6CActorCFRC12CTransform4f + .4byte GetSortingBounds__6CActorCFRC13CStateManager .4byte DoUserAnimEvent__6CActorFR13CStateManagerRC13CInt32POINode14EUserEventTypef .global lbl_803DFF5C diff --git a/include/Kyoto/Audio/CSfxHandle.hpp b/include/Kyoto/Audio/CSfxHandle.hpp index 3431b46e..3ad4e7f3 100644 --- a/include/Kyoto/Audio/CSfxHandle.hpp +++ b/include/Kyoto/Audio/CSfxHandle.hpp @@ -5,7 +5,7 @@ class CSfxHandle { public: - CSfxHandle() : mID(~0) {} + CSfxHandle() : mID(0) {} CSfxHandle(uint value); uint GetIndex() const { return mID & 0xFFF; } diff --git a/include/Kyoto/TToken.hpp b/include/Kyoto/TToken.hpp index 313d09d8..2e6846f4 100644 --- a/include/Kyoto/TToken.hpp +++ b/include/Kyoto/TToken.hpp @@ -33,7 +33,7 @@ template < typename T > class TCachedToken : public TToken< T > { public: TCachedToken() {} - TCachedToken(const CToken& token) : TToken< T >(token), x8_item(GetT()) {} + TCachedToken(const CToken& token) : TToken< T >(token), x8_item(nullptr) {} T* operator*() { return x8_item; } diff --git a/include/MetroidPrime/CActor.hpp b/include/MetroidPrime/CActor.hpp index db79f336..f38f712b 100644 --- a/include/MetroidPrime/CActor.hpp +++ b/include/MetroidPrime/CActor.hpp @@ -235,7 +235,7 @@ public: int /*EProjectileAttrib?*/) const; virtual void FluidFXThink(EFluidState, CScriptWater&, CStateManager&); virtual void OnScanStateChange(EScanState, CStateManager&); - virtual CAABox GetSortingBounds(const CTransform4f&) const; + virtual CAABox GetSortingBounds(const CStateManager&) const; virtual void DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUserEventType type, float dt); diff --git a/include/MetroidPrime/CGameCollision.hpp b/include/MetroidPrime/CGameCollision.hpp index c18be726..bf33c421 100644 --- a/include/MetroidPrime/CGameCollision.hpp +++ b/include/MetroidPrime/CGameCollision.hpp @@ -4,6 +4,7 @@ #include "types.h" class CAreaCollisionCache; +class CCollisionInfo; class CCollisionPrimitive; class CMaterialFilter; class CStateManager; diff --git a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp index 0ef2931b..6ac6c5c6 100644 --- a/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp +++ b/include/MetroidPrime/ScriptObjects/CScriptPlatform.hpp @@ -54,7 +54,7 @@ public: rstl::optional_object< CAABox > GetTouchBounds() const override; CVector3f GetOrbitPosition(const CStateManager&) const override; CVector3f GetAimPosition(const CStateManager&, float) const override; - CAABox GetSortingBounds(const CTransform4f&) const override; + CAABox GetSortingBounds(const CStateManager&) const override; // CPhysicsActor const CCollisionPrimitive* GetCollisionPrimitive() const override; diff --git a/src/MetroidPrime/CActor.cpp b/src/MetroidPrime/CActor.cpp index f1421a1e..3bdf517b 100644 --- a/src/MetroidPrime/CActor.cpp +++ b/src/MetroidPrime/CActor.cpp @@ -45,9 +45,8 @@ CActor::CActor(TUniqueId uid, bool active, const rstl::string& name, const CEnti , x70_materialFilter( CMaterialFilter::MakeIncludeExclude(CMaterialList(SolidMaterial), CMaterialList())) , x88_sfxId(InvalidSfxId) -, x8c_loopingSfxHandle(0) , x90_actorLights(mData.IsNull() ? nullptr : params.GetLighting().MakeActorLights().release()) -, x9c_renderBounds(CAABox::mskInvertedBox) +, x9c_renderBounds(CAABox::MakeMaxInvertedBox()) , xb4_drawFlags(CModelFlags::Normal()) , xbc_time(0.f) , xc0_pitchBend(8192) @@ -57,7 +56,7 @@ CActor::CActor(TUniqueId uid, bool active, const rstl::string& name, const CEnti , xcc_addedToken(-1) , xd0_damageMag(params.GetThermalMag()) , xd4_maxVol(CAudioSys::kMaxVolume) -, xd8_nonLoopingSfxHandles(CSfxHandle(0)) +, xd8_nonLoopingSfxHandles(CSfxHandle()) , xe4_24_nextNonLoopingSfxHandle(0) , xe4_27_notInSortedLists(true) , xe4_28_transformDirty(true) @@ -181,7 +180,7 @@ void CActor::RemoveEmitter() { if (CSfxHandle handle = x8c_loopingSfxHandle) { CSfxManager::RemoveEmitter(handle); x88_sfxId = -1; - x8c_loopingSfxHandle = 0; + x8c_loopingSfxHandle = CSfxHandle(); } } diff --git a/src/MetroidPrime/ScriptObjects/CScriptPlatform.cpp b/src/MetroidPrime/ScriptObjects/CScriptPlatform.cpp index 772eed02..48958937 100644 --- a/src/MetroidPrime/ScriptObjects/CScriptPlatform.cpp +++ b/src/MetroidPrime/ScriptObjects/CScriptPlatform.cpp @@ -275,4 +275,4 @@ void CScriptPlatform::PreThink(f32 dt, CStateManager& mgr) { } } } -} \ No newline at end of file +}