From c7f154e26aefb51c3f07716f5e13481f4179b0c2 Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Mon, 17 Oct 2022 18:59:36 +0300 Subject: [PATCH] Change CEntity::SetActive argument to uchar Former-commit-id: c6d3f0ae8bf1d68d4e4318656df3311afe52ff60 --- asm/MetroidPrime/CActor.s | 8 ++++---- asm/MetroidPrime/CCollisionActor.s | 2 +- asm/MetroidPrime/CEffect.s | 2 +- asm/MetroidPrime/CEntity.s | 7 +++---- asm/MetroidPrime/CExplosion.s | 2 +- asm/MetroidPrime/CGameLight.s | 2 +- asm/MetroidPrime/CGameProjectile.s | 2 +- asm/MetroidPrime/CPhysicsActor.s | 2 +- asm/MetroidPrime/Cameras/CGameCamera.s | 2 +- asm/MetroidPrime/Enemies/CActorContraption.s | 2 +- asm/MetroidPrime/Enemies/CAi.s | 2 +- asm/MetroidPrime/Enemies/CAmbientAI.s | 2 +- asm/MetroidPrime/Enemies/CAtomicAlpha.s | 2 +- asm/MetroidPrime/Enemies/CAtomicBeta.s | 2 +- asm/MetroidPrime/Enemies/CBabygoth.s | 2 +- asm/MetroidPrime/Enemies/CBeetle.s | 2 +- asm/MetroidPrime/Enemies/CBloodFlower.s | 2 +- asm/MetroidPrime/Enemies/CBouncyGrenade.s | 2 +- asm/MetroidPrime/Enemies/CBurrower.s | 2 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 2 +- asm/MetroidPrime/Enemies/CDrone.s | 4 ++-- asm/MetroidPrime/Enemies/CElitePirate.s | 2 +- asm/MetroidPrime/Enemies/CEyeBall.s | 2 +- asm/MetroidPrime/Enemies/CFireFlea.s | 4 ++-- asm/MetroidPrime/Enemies/CFlaahgra.s | 6 +++--- asm/MetroidPrime/Enemies/CFlaahgraPlants.s | 2 +- asm/MetroidPrime/Enemies/CFlaahgraTentacle.s | 2 +- asm/MetroidPrime/Enemies/CFlickerBat.s | 2 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 2 +- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 2 +- asm/MetroidPrime/Enemies/CIceSheegoth.s | 2 +- asm/MetroidPrime/Enemies/CJellyZap.s | 2 +- asm/MetroidPrime/Enemies/CMagdolite.s | 2 +- asm/MetroidPrime/Enemies/CMetaree.s | 2 +- asm/MetroidPrime/Enemies/CMetroid.s | 2 +- asm/MetroidPrime/Enemies/CMetroidBeta.s | 2 +- asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s | 2 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 4 ++-- asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s | 2 +- asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s | 3 +-- asm/MetroidPrime/Enemies/CNewIntroBoss.s | 2 +- asm/MetroidPrime/Enemies/COmegaPirate.s | 4 ++-- asm/MetroidPrime/Enemies/CParasite.s | 2 +- asm/MetroidPrime/Enemies/CPatterned.s | 2 +- asm/MetroidPrime/Enemies/CPhazonHealingNodule.s | 2 +- asm/MetroidPrime/Enemies/CPhazonPool.s | 4 ++-- asm/MetroidPrime/Enemies/CPuddleSpore.s | 2 +- asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 2 +- asm/MetroidPrime/Enemies/CPuffer.s | 2 +- asm/MetroidPrime/Enemies/CRidley.s | 2 +- asm/MetroidPrime/Enemies/CRipper.s | 2 +- asm/MetroidPrime/Enemies/CRipperControlledPlatform.s | 2 +- asm/MetroidPrime/Enemies/CSeedling.s | 2 +- asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s | 2 +- asm/MetroidPrime/Enemies/CSpacePirate.s | 2 +- asm/MetroidPrime/Enemies/CSpankWeed.s | 2 +- asm/MetroidPrime/Enemies/CTeamAiMgr.s | 3 +-- asm/MetroidPrime/Enemies/CThardus.s | 4 ++-- asm/MetroidPrime/Enemies/CThardusRockProjectile.s | 2 +- asm/MetroidPrime/Enemies/CTryclops.s | 2 +- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 2 +- asm/MetroidPrime/Enemies/CWallWalker.s | 2 +- asm/MetroidPrime/Enemies/CWarWasp.s | 2 +- asm/MetroidPrime/Player/CPlayer.s | 2 +- asm/MetroidPrime/ScriptObjects/CEnergyBall.s | 4 ++-- asm/MetroidPrime/ScriptObjects/CFire.s | 2 +- asm/MetroidPrime/ScriptObjects/CFishCloud.s | 4 ++-- asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s | 2 +- asm/MetroidPrime/ScriptObjects/CRepulsor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptActor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptBeam.s | 2 +- .../ScriptObjects/CScriptCameraBlurKeyframe.s | 2 +- .../ScriptObjects/CScriptCameraFilterKeyframe.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCounter.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDebris.s | 2 +- .../ScriptObjects/CScriptDebugCameraWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDock.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDoor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptEffect.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptGenerator.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptMidi.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptPickup.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptPlatform.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptRelay.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptRipple.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s | 2 +- .../ScriptObjects/CScriptSpiderBallAttractionSurface.s | 2 +- .../ScriptObjects/CScriptSpiderBallWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSteam.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s | 3 +-- asm/MetroidPrime/ScriptObjects/CScriptSwitch.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptTimer.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptTrigger.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptWater.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s | 2 +- asm/MetroidPrime/Weapons/CBeamProjectile.s | 2 +- asm/MetroidPrime/Weapons/CBomb.s | 2 +- asm/MetroidPrime/Weapons/CElectricBeamProjectile.s | 2 +- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 2 +- asm/MetroidPrime/Weapons/CFlameThrower.s | 2 +- asm/MetroidPrime/Weapons/CIceImpact.s | 2 +- asm/MetroidPrime/Weapons/CIceProjectile.s | 2 +- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 2 +- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 2 +- asm/MetroidPrime/Weapons/CPowerBomb.s | 2 +- asm/MetroidPrime/Weapons/CShockWave.s | 2 +- asm/MetroidPrime/Weapons/CTargetableProjectile.s | 2 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 2 +- asm/MetroidPrime/Weapons/CWeapon.s | 2 +- include/MetroidPrime/CActor.hpp | 2 +- include/MetroidPrime/CEntity.hpp | 4 ++-- src/MetroidPrime/CEntity.cpp | 2 +- 148 files changed, 164 insertions(+), 173 deletions(-) diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index b428381b..9b5ea33e 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -13,7 +13,7 @@ __vt__6CActor: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager @@ -1087,8 +1087,8 @@ lbl_8005381C: /* 80053844 000507A4 38 21 00 60 */ addi r1, r1, 0x60 /* 80053848 000507A8 4E 80 00 20 */ blr -.global SetActive__6CActorFb -SetActive__6CActorFb: +.global SetActive__6CActorFUc +SetActive__6CActorFUc: /* 8005384C 000507AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80053850 000507B0 7C 08 02 A6 */ mflr r0 /* 80053854 000507B4 38 C0 00 01 */ li r6, 1 @@ -1105,7 +1105,7 @@ SetActive__6CActorFb: /* 80053880 000507E0 88 03 00 E7 */ lbz r0, 0xe7(r3) /* 80053884 000507E4 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80053888 000507E8 98 03 00 E7 */ stb r0, 0xe7(r3) -/* 8005388C 000507EC 4B FF D8 1D */ bl SetActive__7CEntityFb +/* 8005388C 000507EC 4B FF D8 1D */ bl SetActive__7CEntityFUc /* 80053890 000507F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053894 000507F4 7C 08 03 A6 */ mtlr r0 /* 80053898 000507F8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index c771604c..dad85525 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -17,7 +17,7 @@ lbl_803E4B18: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__15CCollisionActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 431c5e57..1b52b4b5 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -13,7 +13,7 @@ __vt__7CEffect: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CEffectCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CEffectCFRC13CStateManager diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index 5635f971..9eb38724 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -17,7 +17,7 @@ __vt__7CEntity: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .bss .balign 8 @@ -41,8 +41,8 @@ lbl_8005109C: /* 800510A0 0004E000 90 03 00 00 */ stw r0, 0(r3) /* 800510A4 0004E004 4E 80 00 20 */ blr -.global SetActive__7CEntityFb -SetActive__7CEntityFb: +.global SetActive__7CEntityFUc +SetActive__7CEntityFUc: /* 800510A8 0004E008 88 03 00 30 */ lbz r0, 0x30(r3) /* 800510AC 0004E00C 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800510B0 0004E010 98 03 00 30 */ stb r0, 0x30(r3) @@ -429,4 +429,3 @@ lbl_803CCF18: # ROM: 0x3C9F18 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index ac958202..e0e6a26b 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -13,7 +13,7 @@ lbl_803DA0A8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CExplosionFfR13CStateManager .4byte AcceptScriptMsg__10CExplosionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CExplosionFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CExplosionCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CExplosionCFRC13CStateManager diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index c382c259..5447f229 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -13,7 +13,7 @@ lbl_803DF3B8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CGameLightFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index 6cff6b7f..ff74f8b8 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -13,7 +13,7 @@ lbl_803D9CE0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 16d9340e..778f0f49 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -13,7 +13,7 @@ lbl_803E0628: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 271f4883..03fef1cc 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -496,7 +496,7 @@ SetActive__11CGameCameraFb: /* 8005B314 00058274 90 01 00 14 */ stw r0, 0x14(r1) /* 8005B318 00058278 93 E1 00 0C */ stw r31, 0xc(r1) /* 8005B31C 0005827C 7C 7F 1B 78 */ mr r31, r3 -/* 8005B320 00058280 4B FF 85 2D */ bl SetActive__6CActorFb +/* 8005B320 00058280 4B FF 85 2D */ bl SetActive__6CActorFUc /* 8005B324 00058284 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 8005B328 00058288 38 60 00 00 */ li r3, 0 /* 8005B32C 0005828C 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index e63f23b5..33ebde70 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -13,7 +13,7 @@ lbl_803E85E8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CActorContraptionFfR13CStateManager .4byte AcceptScriptMsg__17CActorContraptionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index 10b3290f..8a04ee4d 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -882,7 +882,7 @@ lbl_803DBCCC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__3CAiF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s index 8db997b5..473edbfb 100644 --- a/asm/MetroidPrime/Enemies/CAmbientAI.s +++ b/asm/MetroidPrime/Enemies/CAmbientAI.s @@ -13,7 +13,7 @@ lbl_803E8CB0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CAmbientAIFfR13CStateManager .4byte AcceptScriptMsg__10CAmbientAIF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s index 670d4f98..650d3714 100644 --- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s +++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s @@ -13,7 +13,7 @@ lbl_803E88A8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CAtomicAlphaFfR13CStateManager .4byte AcceptScriptMsg__12CAtomicAlphaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CAtomicAlphaCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CAtomicAlphaCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index 61b902dc..600fabf8 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -20,7 +20,7 @@ lbl_803E8E4C: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CAtomicBetaFfR13CStateManager .4byte AcceptScriptMsg__11CAtomicBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index b02604d1..d7b3db42 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -20,7 +20,7 @@ lbl_803E7350: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CBabygothFfR13CStateManager .4byte AcceptScriptMsg__9CBabygothF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__9CBabygothFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CBabygothCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index b3f2dfa8..996c85bf 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -13,7 +13,7 @@ lbl_803DF890: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CBeetleFfR13CStateManager .4byte AcceptScriptMsg__7CBeetleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__7CBeetleFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CBeetleCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 378f9aa0..88de6703 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -27,7 +27,7 @@ lbl_803E0350: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CBloodFlowerFfR13CStateManager .4byte AcceptScriptMsg__12CBloodFlowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CBloodFlowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index a17d982a..d9bb2397 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -13,7 +13,7 @@ lbl_803E7ED0: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_8022ee5c .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte sub_8022e898 .4byte sub_8022e960 diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index 50359ff1..343209b4 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -48,7 +48,7 @@ lbl_803EA7C4: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CBurrowerFfR13CStateManager .4byte AcceptScriptMsg__9CBurrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__9CBurrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CBurrowerFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 55044e8f..d1c5be67 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -46,7 +46,7 @@ lbl_803E1918: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CChozoGhostFfR13CStateManager .4byte AcceptScriptMsg__11CChozoGhostF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__11CChozoGhostFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CChozoGhostCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 100f3139..b85b2bea 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -14,7 +14,7 @@ lbl_803E36A8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__6CDroneFfR13CStateManager .4byte AcceptScriptMsg__6CDroneF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CDroneFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CDroneCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CDroneCFRC13CStateManager @@ -262,7 +262,7 @@ lbl_803E3A58: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CDroneLaserFfR13CStateManager .4byte AcceptScriptMsg__11CDroneLaserF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CDroneLaserCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CDroneLaserCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 10712fa2..2221db7c 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -22,7 +22,7 @@ lbl_803E7AE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CElitePirateFfR13CStateManager .4byte AcceptScriptMsg__12CElitePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12CElitePirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index a1cb184c..161a52bf 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -20,7 +20,7 @@ lbl_803E774C: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CEyeBallFfR13CStateManager .4byte AcceptScriptMsg__8CEyeBallF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__8CEyeBallFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CEyeBallCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 3b473729..4a3c41de 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -17,7 +17,7 @@ lbl_803E1C88: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CFireFleaFfR13CStateManager .4byte AcceptScriptMsg__9CFireFleaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -200,7 +200,7 @@ lbl_803E1F54: .4byte PreThink__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager .4byte Think__Q29CFireFlea18CDeathCameraEffectFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .4byte 0 .section .sdata diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index f3917656..b362c34f 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -21,7 +21,7 @@ lbl_803E4D08: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CFlaahgraRendererCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager @@ -129,7 +129,7 @@ lbl_803E4E88: .4byte PreThink__9CFlaahgraFfR13CStateManager .4byte Think__9CFlaahgraFfR13CStateManager .4byte AcceptScriptMsg__9CFlaahgraF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__9CFlaahgraCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -312,7 +312,7 @@ lbl_803E5154: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__19CFlaahgraProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index 613b6832..0c6948e0 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -13,7 +13,7 @@ lbl_803E6FD8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CFlaahgraPlantsFfR13CStateManager .4byte AcceptScriptMsg__15CFlaahgraPlantsF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CFlaahgraPlantsCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index b0f6e8c3..9ee063d7 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -13,7 +13,7 @@ lbl_803E6408: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__17CFlaahgraTentacleFfR13CStateManager .4byte AcceptScriptMsg__17CFlaahgraTentacleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index c7c774a2..65f57d66 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -13,7 +13,7 @@ lbl_803E0DE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CFlickerBatFfR13CStateManager .4byte AcceptScriptMsg__11CFlickerBatF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CFlickerBatCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index e1969b15..b073b9a9 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -82,7 +82,7 @@ __vt__13CFlyingPirate: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__13CFlyingPirateFfR13CStateManager .4byte AcceptScriptMsg__13CFlyingPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__13CFlyingPirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CFlyingPirateCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 088b5423..7b4b55e3 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -16,7 +16,7 @@ lbl_803E7F58: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CGrenadeLauncherFfR13CStateManager .4byte AcceptScriptMsg__16CGrenadeLauncherF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__16CGrenadeLauncherFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CGrenadeLauncherCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CGrenadeLauncherCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 6937d94b..85330d57 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -17,7 +17,7 @@ lbl_803E4728: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CIceSheegothFfR13CStateManager .4byte AcceptScriptMsg__12CIceSheegothF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CIceSheegothCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CIceSheegothCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index 278810e7..fc3d66fd 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -34,7 +34,7 @@ lbl_803E5954: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CJellyZapFfR13CStateManager .4byte AcceptScriptMsg__9CJellyZapF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 1697520e..17526105 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -101,7 +101,7 @@ lbl_803E8240: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CMagdoliteFfR13CStateManager .4byte AcceptScriptMsg__10CMagdoliteF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CMagdoliteCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index 1639ef65..c8871711 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -13,7 +13,7 @@ lbl_803E2878: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CMetareeFfR13CStateManager .4byte AcceptScriptMsg__8CMetareeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 6c7e7b36..0a0484d4 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -17,7 +17,7 @@ lbl_803E3AD8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CMetroidFfR13CStateManager .4byte AcceptScriptMsg__8CMetroidF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CMetroidCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index 79bdf6c2..0a5868a3 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -21,7 +21,7 @@ lbl_803E5388: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CMetroidBetaFfR13CStateManager .4byte AcceptScriptMsg__12CMetroidBetaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CMetroidBetaCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CMetroidBetaCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 03875f5b..da00a38f 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -66,7 +66,7 @@ lbl_803EB244: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__20CMetroidPrimeEssenceFfR13CStateManager .4byte AcceptScriptMsg__20CMetroidPrimeEssenceF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__20CMetroidPrimeEssenceFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__20CMetroidPrimeEssenceCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CMetroidPrimeEssenceCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 6dde9032..7d442d1e 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -254,7 +254,7 @@ lbl_803EAD54: .4byte PreThink__16CMetroidPrimeExoFfR13CStateManager .4byte Think__16CMetroidPrimeExoFfR13CStateManager .4byte AcceptScriptMsg__16CMetroidPrimeExoF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CMetroidPrimeExoCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CMetroidPrimeExoCFRC13CStateManager @@ -496,7 +496,7 @@ lbl_803EB0FC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s index bc95dfd3..22a7cf43 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeProjectile.s @@ -13,7 +13,7 @@ lbl_803EC390: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index cb2305d8..149751db 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -13,7 +13,7 @@ lbl_803EB638: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CMetroidPrimeRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" @@ -1773,4 +1773,3 @@ lbl_803D58D8: .asciz "etroid Prime! (Stage 1)" .asciz "Metroid Prime" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index 984a3b44..49124e3f 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -13,7 +13,7 @@ lbl_803E4018: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__13CNewIntroBossFfR13CStateManager .4byte AcceptScriptMsg__13CNewIntroBossF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CNewIntroBossCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index d2c3b4d8..1b6acbc5 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -13,7 +13,7 @@ lbl_803EB6C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__Q212COmegaPirate6CFlashFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__Q212COmegaPirate6CFlashFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager .4byte Render__Q212COmegaPirate6CFlashCFRC13CStateManager @@ -133,7 +133,7 @@ lbl_803EB868: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12COmegaPirateFfR13CStateManager .4byte AcceptScriptMsg__12COmegaPirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12COmegaPirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12COmegaPirateCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 5d0e8bfb..04800afe 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -24,7 +24,7 @@ lbl_803E3004: .4byte PreThink__9CParasiteFfR13CStateManager .4byte Think__9CParasiteFfR13CStateManager .4byte AcceptScriptMsg__9CParasiteF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CParasiteCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index e72d7337..82916799 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -17,7 +17,7 @@ lbl_803DA5C8: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CPatternedFfR13CStateManager .4byte AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index 77631c8c..8b249164 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -13,7 +13,7 @@ lbl_803EBC70: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__20CPhazonHealingNoduleFfR13CStateManager .4byte AcceptScriptMsg__20CPhazonHealingNoduleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CPhazonHealingNoduleCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPhazonPool.s b/asm/MetroidPrime/Enemies/CPhazonPool.s index fbd2cc78..d92851ee 100644 --- a/asm/MetroidPrime/Enemies/CPhazonPool.s +++ b/asm/MetroidPrime/Enemies/CPhazonPool.s @@ -12,7 +12,7 @@ lbl_803EBB48: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CPhazonPoolFfR13CStateManager .4byte AcceptScriptMsg__11CPhazonPoolF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CPhazonPoolCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CPhazonPoolCFRC13CStateManager @@ -901,7 +901,7 @@ lbl_80293154: /* 80293158 002900B8 7F C3 F3 78 */ mr r3, r30 /* 8029315C 002900BC 90 1E 01 DC */ stw r0, 0x1dc(r30) /* 80293160 002900C0 38 80 00 00 */ li r4, 0 -/* 80293164 002900C4 4B DC 06 E9 */ bl SetActive__6CActorFb +/* 80293164 002900C4 4B DC 06 E9 */ bl SetActive__6CActorFUc lbl_80293168: /* 80293168 002900C8 7F C3 F3 78 */ mr r3, r30 /* 8029316C 002900CC 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 478f0b88..943a51e5 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -41,7 +41,7 @@ lbl_803E20C4: .4byte PreThink__12CPuddleSporeFfR13CStateManager .4byte Think__12CPuddleSporeFfR13CStateManager .4byte AcceptScriptMsg__12CPuddleSporeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CPuddleSporeCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index c89cff0d..4e5616a5 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -17,7 +17,7 @@ lbl_803E24E0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__16CPuddleToadGammaFfR13CStateManager .4byte AcceptScriptMsg__16CPuddleToadGammaF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index f6ed84ca..1fb1696b 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -13,7 +13,7 @@ lbl_803E96C0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CPufferFfR13CStateManager .4byte AcceptScriptMsg__7CPufferF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 706771e3..4a26890b 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -130,7 +130,7 @@ lbl_803E9258: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CRidleyR13CStateManager .4byte AcceptScriptMsg__7CRidleyF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__7CRidleyFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CRidleyCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CRidleyCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 2e6ebc09..16c82145 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -13,7 +13,7 @@ lbl_803E3348: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__7CRipperFfR13CStateManager .4byte AcceptScriptMsg__7CRipperF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index 3b770db5..5d26f97c 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -13,7 +13,7 @@ lbl_803E80C0: .4byte PreThink__15CScriptPlatformFfR13CStateManager .4byte Think__15CScriptPlatformFfR13CStateManager .4byte AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptPlatformCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index f2e969b0..59e87505 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -27,7 +27,7 @@ lbl_803E9E10: .4byte PreThink__11CWallWalkerFfR13CStateManager .4byte Think__9CSeedlingFfR13CStateManager .4byte AcceptScriptMsg__9CSeedlingF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__9CSeedlingCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index b7030d88..b92f3ea6 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -13,7 +13,7 @@ lbl_803E8578: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CSnakeWeedSwarmFfR13CStateManager .4byte AcceptScriptMsg__15CSnakeWeedSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__15CSnakeWeedSwarmFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CSnakeWeedSwarmCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 9b8b60a8..f120a4f1 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -141,7 +141,7 @@ lbl_803E0800: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__12CSpacePirateFfR13CStateManager .4byte AcceptScriptMsg__12CSpacePirateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12CSpacePirateFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CSpacePirateCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index fbd3dfe7..fdfb5d64 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -13,7 +13,7 @@ lbl_803E2D28: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__10CSpankWeedFfR13CStateManager .4byte AcceptScriptMsg__10CSpankWeedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CSpankWeedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 09e1f5a2..bf752f14 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -13,7 +13,7 @@ lbl_803E8558: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CTeamAiMgrFfR13CStateManager .4byte AcceptScriptMsg__10CTeamAiMgrF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" @@ -4156,4 +4156,3 @@ lbl_803D4380: # ROM: 0x3D1380 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 5c86bc4c..e97d84c1 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -19,7 +19,7 @@ lbl_803E5CE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CThardusFfR13CStateManager .4byte AcceptScriptMsg__8CThardusF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__8CThardusFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__8CThardusCFRC13CStateManager @@ -260,7 +260,7 @@ lbl_803E6074: .4byte PreThink__16CDestroyableRockFfR13CStateManager .4byte Think__16CDestroyableRockFfR13CStateManager .4byte AcceptScriptMsg__16CDestroyableRockF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__16CDestroyableRockFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CDestroyableRockCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 5a2453b2..55392db6 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -13,7 +13,7 @@ lbl_803E6BE0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__22CThardusRockProjectileFfR13CStateManager .4byte AcceptScriptMsg__22CThardusRockProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__22CThardusRockProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index 9b37ff11..be220146 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -45,7 +45,7 @@ lbl_803E9A40: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__9CTryclopsFfR13CStateManager .4byte sub_80260bf0 - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 41ad7a0f..e5ddf51f 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -13,7 +13,7 @@ lbl_803E6308: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CWallCrawlerSwarmFfR13CStateManager .4byte AcceptScriptMsg__17CWallCrawlerSwarmF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__17CWallCrawlerSwarmFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CWallCrawlerSwarmCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CWallCrawlerSwarmCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 0f9f79d1..c5594bf0 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -13,7 +13,7 @@ lbl_803EA0F0: .4byte PreThink__11CWallWalkerFfR13CStateManager .4byte Think__11CWallWalkerFfR13CStateManager .4byte AcceptScriptMsg__10CPatternedF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CWallWalkerCFRC13CStateManager diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 2f1690cf..b7747938 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -13,7 +13,7 @@ lbl_803DFF90: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__8CWarWaspFfR13CStateManager .4byte AcceptScriptMsg__8CWarWaspF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 29a9c434..50935d1e 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -16,7 +16,7 @@ lbl_803D96E8: .4byte PreThink__7CPlayerFfR13CStateManager .4byte Think__7CPlayerFfR13CStateManager .4byte AcceptScriptMsg__7CPlayerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__7CPlayerFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__7CPlayerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CPlayerCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index b4ed20c6..da08bb8b 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -13,7 +13,7 @@ lbl_803EC0A0: .4byte PreThink__10CPatternedFfR13CStateManager .4byte Think__11CEnergyBallFfR13CStateManager .4byte AcceptScriptMsg__11CEnergyBallF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPatternedCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CPatternedCFRC13CStateManager @@ -197,7 +197,7 @@ lbl_803EC370: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_802a0164 .4byte sub_802a0100 - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 1a47f4b8..1fb2cfc6 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -13,7 +13,7 @@ lbl_803E9990: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__5CFireFfR13CStateManager .4byte AcceptScriptMsg__5CFireF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte Render__5CFireCFRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index bef606a2..5dacbae5 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -13,7 +13,7 @@ lbl_803E5758: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CFishCloudFfR13CStateManager .4byte AcceptScriptMsg__10CFishCloudF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CFishCloudFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CFishCloudCFRC13CStateManager @@ -44,7 +44,7 @@ lbl_803E57C4: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CFishCloudModifierF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index 8e29b015..1f8aec01 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -13,7 +13,7 @@ lbl_803E0D70: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__19CHUDBillboardEffectFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__19CHUDBillboardEffectFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__19CHUDBillboardEffectCFRC14CFrustumPlanesRC13CStateManager .4byte Render__19CHUDBillboardEffectCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index e0396b8a..c096bf1b 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -13,7 +13,7 @@ lbl_803E70E8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__9CRepulsorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index df2f5215..8d14dc10 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -13,7 +13,7 @@ lbl_803DA450: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptActorFfR13CStateManager .4byte AcceptScriptMsg__12CScriptActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12CScriptActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s index 653322d2..db64f624 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s @@ -13,7 +13,7 @@ lbl_803DFE20: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptActorKeyframeFfR13CStateManager .4byte AcceptScriptMsg__20CScriptActorKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .global lbl_803DFE40 lbl_803DFE40: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s index 7b70b02d..22e40300 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorRotate.s @@ -13,7 +13,7 @@ lbl_803E2D08: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptActorRotateFfR13CStateManager .4byte AcceptScriptMsg__18CScriptActorRotateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" @@ -981,4 +981,3 @@ lbl_803D01F0: # ROM: 0x3CD1F0 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index 0d27e901..5a239487 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -13,7 +13,7 @@ lbl_803E6398: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptAiJumpPointFfR13CStateManager .4byte AcceptScriptMsg__18CScriptAiJumpPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__18CScriptAiJumpPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__18CScriptAiJumpPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s index bac55879..8e037f0c 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s @@ -13,7 +13,7 @@ __vt__21CScriptAreaAttributes: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index e23b3696..fc2b2fb0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -13,7 +13,7 @@ lbl_803E3E80: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__18CScriptBallTriggerFfR13CStateManager .4byte AcceptScriptMsg__18CScriptBallTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index fca68449..1f3675e0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -13,7 +13,7 @@ lbl_803EB180: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptBeamFfR13CStateManager .4byte AcceptScriptMsg__11CScriptBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s index a5e5c1e1..6470a24d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraBlurKeyframe.s @@ -13,7 +13,7 @@ lbl_803DFCA0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__25CScriptCameraBlurKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s index 3a8c095b..7b2cba76 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraFilterKeyframe.s @@ -13,7 +13,7 @@ lbl_803DFC80: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__27CScriptCameraFilterKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index 74aa6680..3bf4fdaa 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -13,7 +13,7 @@ lbl_803DF688: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptCameraHintF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index e4ab142e..f2c4925f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -13,7 +13,7 @@ lbl_803E8C40: .4byte PreThink__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__24CScriptCameraHintTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index 8a015b9c..b9a693f0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -19,7 +19,7 @@ lbl_803E7A70: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__24CScriptCameraPitchVolumeFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index dcb6de1f..ba83c83e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -13,7 +13,7 @@ lbl_803DFE00: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__19CScriptCameraShakerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index da57634b..6c1abfa9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -13,7 +13,7 @@ lbl_803DF348: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptCameraWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__21CScriptCameraWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__21CScriptCameraWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index ce45eedc..8057de42 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -12,7 +12,7 @@ lbl_803E6BB0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptColorModulateFfR13CStateManager .4byte AcceptScriptMsg__20CScriptColorModulateF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata .balign 8 @@ -1255,4 +1255,3 @@ lbl_803D2580: # ROM: 0x3CF580 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s index 4d326608..b002fdc8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptControllerAction.s @@ -13,7 +13,7 @@ lbl_803E5C20: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__23CScriptControllerActionFfR13CStateManager .4byte AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s index a39646b6..0f828565 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCounter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCounter.s @@ -13,7 +13,7 @@ __vt__14CScriptCounter: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__14CScriptCounterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .global lbl_803DAF10 lbl_803DAF10: diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index 56ae8f23..43a67af9 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -13,7 +13,7 @@ lbl_803E0BF8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CScriptCoverPointFfR13CStateManager .4byte AcceptScriptMsg__17CScriptCoverPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CScriptCoverPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CScriptCoverPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index 7adad342..a456f61f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -13,7 +13,7 @@ lbl_803DFD08: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__24CScriptDamageableTriggerFfR13CStateManager .4byte AcceptScriptMsg__24CScriptDamageableTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__24CScriptDamageableTriggerFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__24CScriptDamageableTriggerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__24CScriptDamageableTriggerCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index 26bdb508..35e79895 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -13,7 +13,7 @@ lbl_803DFD78: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptDebrisFfR13CStateManager .4byte AcceptScriptMsg__13CScriptDebrisF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__13CScriptDebrisFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CScriptDebrisCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CScriptDebrisCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 5916148b..7f35e514 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -12,7 +12,7 @@ lbl_803E23C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s index 2fa8bce4..b2b07dc3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s @@ -13,7 +13,7 @@ lbl_803E27B0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index cd164ebf..5362f8eb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -13,7 +13,7 @@ lbl_803DF580: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptDockFfR13CStateManager .4byte AcceptScriptMsg__11CScriptDockF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CPhysicsActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s index bc8f3d4a..87bfd6c0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDockAreaChange.s @@ -13,7 +13,7 @@ __vt__21CScriptDockAreaChange: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__21CScriptDockAreaChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index 2055a059..63d96401 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -13,7 +13,7 @@ lbl_803DAA78: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__11CScriptDoorFfR13CStateManager .4byte AcceptScriptMsg__11CScriptDoorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__11CScriptDoorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__11CScriptDoorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index 6e665995..cbae612f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -13,7 +13,7 @@ lbl_803E4400: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__14CScriptEMPulseFfR13CStateManager .4byte AcceptScriptMsg__14CScriptEMPulseF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__14CScriptEMPulseCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 7bb30a0d..064ef680 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -195,7 +195,7 @@ SetActive__13CScriptEffectFb: /* 8008DB78 0008AAD8 90 01 00 14 */ stw r0, 0x14(r1) /* 8008DB7C 0008AADC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8008DB80 0008AAE0 7C 7F 1B 78 */ mr r31, r3 -/* 8008DB84 0008AAE4 4B FC 5C C9 */ bl SetActive__6CActorFb +/* 8008DB84 0008AAE4 4B FC 5C C9 */ bl SetActive__6CActorFUc /* 8008DB88 0008AAE8 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 8008DB8C 0008AAEC 38 60 00 01 */ li r3, 1 /* 8008DB90 0008AAF0 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index 8a1db5b1..8fae4643 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -13,7 +13,7 @@ lbl_803DF328: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__16CScriptGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata2, "a" .balign 8 @@ -941,4 +941,3 @@ lbl_803CDE78: # ROM: 0x3CAE78 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 890afbf9..25162c94 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -13,7 +13,7 @@ lbl_803E0D00: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__19CScriptGrapplePointFfR13CStateManager .4byte AcceptScriptMsg__19CScriptGrapplePointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__19CScriptGrapplePointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__19CScriptGrapplePointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index 987850e0..6c8a2946 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -28,7 +28,7 @@ lbl_803E71EC: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CScriptGunTurretFfR13CStateManager .4byte AcceptScriptMsg__16CScriptGunTurretF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CScriptGunTurretCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CScriptGunTurretCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s index 658bcbac..20ab49ad 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptHUDMemo.s @@ -13,7 +13,7 @@ lbl_803DFBF0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__14CScriptHUDMemoF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 4b7000fd..4d972da3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -15,7 +15,7 @@ lbl_803EB658: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CScriptMazeNodeFfR13CStateManager .4byte AcceptScriptMsg__15CScriptMazeNodeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s index 63c42619..a8ec0ecc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMemoryRelay.s @@ -13,7 +13,7 @@ __vt__18CScriptMemoryRelay: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptMemoryRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s index 1dda4a7e..54ab3472 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMidi.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMidi.s @@ -13,7 +13,7 @@ lbl_803E7048: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__11CScriptMidiF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" @@ -377,4 +377,3 @@ lbl_805ACED0: # ROM: 0x3F9770 .4byte 0 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 5d4cf027..0460f190 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -13,7 +13,7 @@ lbl_803DF4F8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptPickupFfR13CStateManager .4byte AcceptScriptMsg__13CScriptPickupF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CScriptPickupCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index 40497873..74382671 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -13,7 +13,7 @@ lbl_803E3618: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__22CScriptPickupGeneratorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata .balign 8 @@ -971,4 +971,3 @@ lbl_803D0390: # ROM: 0x3CD390 .asciz "??(??)" .balign 4 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 502ab070..60f5fb26 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -13,7 +13,7 @@ __vt__15CScriptPlatform: .4byte PreThink__15CScriptPlatformFfR13CStateManager .4byte Think__15CScriptPlatformFfR13CStateManager .4byte AcceptScriptMsg__15CScriptPlatformF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__15CScriptPlatformFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptPlatformCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 8517b7be..8fb1a682 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -351,7 +351,7 @@ SetActive__18CScriptPlayerActorFb: /* 801AA5F0 001A7550 90 01 00 14 */ stw r0, 0x14(r1) /* 801AA5F4 001A7554 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AA5F8 001A7558 7C 7F 1B 78 */ mr r31, r3 -/* 801AA5FC 001A755C 4B EA 92 51 */ bl SetActive__6CActorFb +/* 801AA5FC 001A755C 4B EA 92 51 */ bl SetActive__6CActorFUc /* 801AA600 001A7560 88 1F 00 E7 */ lbz r0, 0xe7(r31) /* 801AA604 001A7564 38 60 00 01 */ li r3, 1 /* 801AA608 001A7568 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index 1af52109..c82d2865 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -13,7 +13,7 @@ lbl_803E32D8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptPlayerHintF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s index 3a832fd9..77e85755 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerStateChange.s @@ -12,7 +12,7 @@ __vt__24CScriptPlayerStateChange: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__24CScriptPlayerStateChangeF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index f88245b7..48e8b624 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -13,7 +13,7 @@ lbl_803E3638: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptPointOfInterestFfR13CStateManager .4byte AcceptScriptMsg__22CScriptPointOfInterestF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptPointOfInterestCFRC14CFrustumPlanesRC13CStateManager .4byte Render__22CScriptPointOfInterestCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index 5c5d26e2..90c5a0fd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -13,7 +13,7 @@ lbl_803EC030: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptShadowProjectorFfR13CStateManager .4byte AcceptScriptMsg__22CScriptShadowProjectorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__22CScriptShadowProjectorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptShadowProjectorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s index fc602e94..e444a9bd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRandomRelay.s @@ -13,7 +13,7 @@ lbl_803DF870: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__18CScriptRandomRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s index 5f9dcd4c..45027e89 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s @@ -13,7 +13,7 @@ __vt__12CScriptRelay: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptRelayFfR13CStateManager .4byte AcceptScriptMsg__12CScriptRelayF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s index 09425943..8a62f886 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRipple.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRipple.s @@ -13,7 +13,7 @@ __vt__13CScriptRipple: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CScriptRippleFfR13CStateManager .4byte AcceptScriptMsg__13CScriptRippleF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s index 367226af..0fa70522 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s @@ -17,7 +17,7 @@ lbl_803E4708: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CScriptRoomAcousticsFfR13CStateManager .4byte AcceptScriptMsg__20CScriptRoomAcousticsF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sbss, "wa" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 85879c01..64679b7b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -13,7 +13,7 @@ lbl_803DF128: .4byte PreThink__12CScriptSoundFfR13CStateManager .4byte Think__12CScriptSoundFfR13CStateManager .4byte AcceptScriptMsg__12CScriptSoundF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CScriptSoundCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s index 48fb74eb..4369eb36 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpawnPoint.s @@ -13,7 +13,7 @@ lbl_803DF850: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__17CScriptSpawnPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index c88b36a4..28671797 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -13,7 +13,7 @@ lbl_803E2B68: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__22CScriptSpecialFunctionFfR13CStateManager .4byte AcceptScriptMsg__22CScriptSpecialFunctionF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__22CScriptSpecialFunctionFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__22CScriptSpecialFunctionFRC14CFrustumPlanesR13CStateManager .4byte Render__22CScriptSpecialFunctionFR13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index c4ed5a1e..85327ed8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -13,7 +13,7 @@ lbl_803E2438: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__34CScriptSpiderBallAttractionSurfaceFfR13CStateManager .4byte AcceptScriptMsg__34CScriptSpiderBallAttractionSurfaceF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index 00f847b2..94a3fb30 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -13,7 +13,7 @@ lbl_803E02C8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__25CScriptSpiderBallWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__25CScriptSpiderBallWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__25CScriptSpiderBallWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s index 9d4a5138..e4aae251 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSteam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSteam.s @@ -13,7 +13,7 @@ lbl_803E3DA8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptSteamFfR13CStateManager .4byte AcceptScriptMsg__12CScriptSteamF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s index 813b6214..a4a7a8e3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptStreamedAudio.s @@ -13,7 +13,7 @@ lbl_803E7068: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__20CScriptStreamedMusicF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .global lbl_803E7088 lbl_803E7088: @@ -817,4 +817,3 @@ lbl_803D2778: .4byte 0x7377002E .4byte 0x64737000 .4byte 0 - diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s index cc43f334..c193c2c4 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSwitch.s @@ -13,7 +13,7 @@ lbl_803E5C40: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__13CScriptSwitchF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index c38f86fc..33f6a252 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -13,7 +13,7 @@ lbl_803E4330: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__21CScriptTargetingPointFfR13CStateManager .4byte AcceptScriptMsg__21CScriptTargetingPointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__21CScriptTargetingPointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__21CScriptTargetingPointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s index 34e26519..a32fdece 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTimer.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTimer.s @@ -13,7 +13,7 @@ lbl_803DADD8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptTimerFfR13CStateManager .4byte AcceptScriptMsg__12CScriptTimerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .sdata2, "a" .balign 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index 3b25d3c0..65f78f1e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -13,7 +13,7 @@ lbl_803DA4D8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__14CScriptTriggerFfR13CStateManager .4byte AcceptScriptMsg__14CScriptTriggerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__6CActorCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index aeadb65f..8fde57f4 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -13,7 +13,7 @@ lbl_803E5830: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CScriptVisorFlareFfR13CStateManager .4byte AcceptScriptMsg__17CScriptVisorFlareF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__17CScriptVisorFlareFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CScriptVisorFlareCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CScriptVisorFlareCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 9f65c414..152c2e73 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -13,7 +13,7 @@ lbl_803E58C0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__15CScriptVisorGooFfR13CStateManager .4byte AcceptScriptMsg__15CScriptVisorGooF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CScriptVisorGooCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptVisorGooCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index 2d98ca80..4ca9cf2d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -13,7 +13,7 @@ lbl_803DFE70: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__12CScriptWaterFfR13CStateManager .4byte AcceptScriptMsg__12CScriptWaterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__12CScriptWaterCFRC14CFrustumPlanesRC13CStateManager .4byte Render__12CScriptWaterCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index 36a22773..81e7090d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -13,7 +13,7 @@ lbl_803DA558: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__15CScriptWaypointF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__15CScriptWaypointCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CScriptWaypointCFRC13CStateManager diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index 6686ac35..3464c08f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -13,7 +13,7 @@ lbl_803E58A0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CEntityFfR13CStateManager .4byte AcceptScriptMsg__22CScriptWorldTeleporterF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__7CEntityFb + .4byte SetActive__7CEntityFUc .section .text, "ax" diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index 05b87ae1..43f79eb4 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -13,7 +13,7 @@ lbl_803E4648: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__15CGameProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index d3a8494e..ed78ba71 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -13,7 +13,7 @@ lbl_803DACC0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__5CBombFfR13CStateManager .4byte AcceptScriptMsg__5CBombF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__5CBombCFRC14CFrustumPlanesRC13CStateManager .4byte nullsub_99 diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index 9d8e5740..c5bf5b21 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -13,7 +13,7 @@ lbl_803E9118: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__23CElectricBeamProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__23CElectricBeamProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__15CGameProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index d289663e..1de8edac 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -17,7 +17,7 @@ lbl_803E7158: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 4aa5810d..649b8166 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -17,7 +17,7 @@ lbl_803E45D8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__13CFlameThrowerFfR13CStateManager .4byte AcceptScriptMsg__13CFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__13CFlameThrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__13CFlameThrowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 6abc040d..6ad020ae 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -13,7 +13,7 @@ lbl_803E51E8: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CIceImpactFfR13CStateManager .4byte AcceptScriptMsg__10CIceImpactF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__10CIceImpactFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CIceImpactCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CIceImpactCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index e477e935..1a18a4ac 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -13,7 +13,7 @@ lbl_803E6778: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__20CIceAttackProjectileFfR13CStateManager .4byte AcceptScriptMsg__20CIceAttackProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__20CIceAttackProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__20CIceAttackProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index b217b700..9c469e73 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -17,7 +17,7 @@ lbl_803E9D10: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__16CNewFlameThrowerFfR13CStateManager .4byte AcceptScriptMsg__16CNewFlameThrowerF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__16CNewFlameThrowerCFRC14CFrustumPlanesRC13CStateManager .4byte Render__16CNewFlameThrowerCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 2c8cfe5a..505724a6 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -17,7 +17,7 @@ lbl_803E3F00: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__17CPlasmaProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CPlasmaProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CPlasmaProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index e6dfda99..e56d462a 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -17,7 +17,7 @@ lbl_803E2808: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CPowerBombFfR13CStateManager .4byte AcceptScriptMsg__10CPowerBombF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CPowerBombCFRC14CFrustumPlanesRC13CStateManager .4byte nullsub_228 diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 73a44153..eced0d1a 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -13,7 +13,7 @@ lbl_803E8050: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__10CShockwaveFfR13CStateManager .4byte AcceptScriptMsg__10CShockwaveF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__10CShockwaveCFRC14CFrustumPlanesRC13CStateManager .4byte Render__10CShockwaveCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 5cd7ffa4..1b37597b 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -14,7 +14,7 @@ lbl_803E1800: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__17CEnergyProjectileFfR13CStateManager .4byte AcceptScriptMsg__17CEnergyProjectileF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__17CEnergyProjectileCFRC14CFrustumPlanesRC13CStateManager .4byte Render__17CEnergyProjectileCFRC13CStateManager diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index da859170..4ca729ff 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -17,7 +17,7 @@ lbl_803E5318: .4byte PreThink__7CEntityFfR13CStateManager .4byte sub_801bef28 .4byte sub_801bebcc - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte sub_801bee04 .4byte sub_801bedb8 diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index 2ab16e59..db5a3132 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -13,7 +13,7 @@ lbl_803DFEF0: .4byte PreThink__7CEntityFfR13CStateManager .4byte Think__7CWeaponFfR13CStateManager .4byte AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager - .4byte SetActive__6CActorFb + .4byte SetActive__6CActorFUc .4byte PreRender__6CActorFR13CStateManagerRC14CFrustumPlanes .4byte AddToRenderer__6CActorCFRC14CFrustumPlanesRC13CStateManager .4byte Render__7CWeaponCFRC13CStateManager diff --git a/include/MetroidPrime/CActor.hpp b/include/MetroidPrime/CActor.hpp index 85719087..df74a190 100644 --- a/include/MetroidPrime/CActor.hpp +++ b/include/MetroidPrime/CActor.hpp @@ -213,7 +213,7 @@ public: ~CActor() override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; - void SetActive(bool active) override; + void SetActive(uchar active) override; virtual void PreRender(CStateManager&, const CFrustumPlanes&); virtual void AddToRenderer(const CFrustumPlanes&, const CStateManager&) const; diff --git a/include/MetroidPrime/CEntity.hpp b/include/MetroidPrime/CEntity.hpp index 791a1dc8..1d0887ac 100644 --- a/include/MetroidPrime/CEntity.hpp +++ b/include/MetroidPrime/CEntity.hpp @@ -18,7 +18,7 @@ public: virtual void PreThink(float dt, CStateManager& mgr); virtual void Think(float dt, CStateManager& mgr); virtual void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr); - virtual void SetActive(bool active); + virtual void SetActive(uchar active); CEntity(TUniqueId id, const CEntityInfo& info, bool active, const rstl::string& name); @@ -46,7 +46,7 @@ protected: TEditorId xc_editorId; rstl::string x10_name; rstl::vector< SConnection > x20_conns; - bool x30_24_active : 1; + uchar x30_24_active : 1; bool x30_25_inGraveyard : 1; bool x30_26_scriptingBlocked : 1; bool x30_27_notInArea : 1; diff --git a/src/MetroidPrime/CEntity.cpp b/src/MetroidPrime/CEntity.cpp index f6e809cd..4d0a63d3 100644 --- a/src/MetroidPrime/CEntity.cpp +++ b/src/MetroidPrime/CEntity.cpp @@ -56,6 +56,6 @@ void CEntity::PreThink(float dt, CStateManager& mgr) {} void CEntity::Think(float dt, CStateManager& mgr) {} -void CEntity::SetActive(bool active) { x30_24_active = active; } +void CEntity::SetActive(uchar active) { x30_24_active = active; } TAreaId CEntity::GetAreaId() const { return x30_27_notInArea ? kInvalidAreaId : x4_areaId; }