From ef4af6693f8dc6407e9ccba95ba20dd1db464ae9 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 23 Apr 2022 18:54:45 -0700 Subject: [PATCH] Rename TGameTypes constants --- asm/MetroidPrime/BodyState/CBSHurled.s | 6 +- asm/MetroidPrime/BodyState/CBSJump.s | 10 +- asm/MetroidPrime/BodyState/CBSWallHang.s | 10 +- asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s | 2 +- asm/MetroidPrime/CActor.s | 10 +- asm/MetroidPrime/CActorLights.s | 4 +- asm/MetroidPrime/CActorParticles.s | 6 +- asm/MetroidPrime/CBoneTracking.s | 4 +- asm/MetroidPrime/CCollisionActor.s | 12 +-- asm/MetroidPrime/CCollisionActorManager.s | 10 +- asm/MetroidPrime/CEffect.s | 2 +- asm/MetroidPrime/CEntity.s | 4 +- asm/MetroidPrime/CEnvFxManager.s | 6 +- asm/MetroidPrime/CExplosion.s | 12 +-- asm/MetroidPrime/CFluidPlaneManager.s | 2 +- asm/MetroidPrime/CGameArea.s | 6 +- asm/MetroidPrime/CGameCollision.s | 24 ++--- asm/MetroidPrime/CGameLight.s | 4 +- asm/MetroidPrime/CGameProjectile.s | 58 +++++----- asm/MetroidPrime/CGroundMovement.s | 38 +++---- asm/MetroidPrime/CMFGame.s | 6 +- asm/MetroidPrime/CObjectList.s | 8 +- asm/MetroidPrime/CParticleGenInfo.s | 4 +- asm/MetroidPrime/CParticleGenInfoGeneric.s | 18 ++-- asm/MetroidPrime/CPhysicsActor.s | 2 +- asm/MetroidPrime/CRagDoll.s | 2 +- asm/MetroidPrime/CRippleManager.s | 2 +- asm/MetroidPrime/CScriptMailbox.s | 2 +- asm/MetroidPrime/CSimpleShadow.s | 2 +- asm/MetroidPrime/CStateManager.s | 102 +++++++++--------- asm/MetroidPrime/CTargetReticles.s | 38 +++---- asm/MetroidPrime/CVisorFlare.s | 2 +- asm/MetroidPrime/CWorld.s | 10 +- asm/MetroidPrime/CWorldShadow.s | 4 +- asm/MetroidPrime/Cameras/CBallCamera.s | 38 +++---- .../Cameras/CBallCameraFailsafeState.s | 2 +- asm/MetroidPrime/Cameras/CCameraManager.s | 22 ++-- asm/MetroidPrime/Cameras/CCinematicCamera.s | 14 +-- asm/MetroidPrime/Cameras/CFirstPersonCamera.s | 10 +- asm/MetroidPrime/Cameras/CGameCamera.s | 4 +- .../Cameras/CInterpolationCamera.s | 8 +- asm/MetroidPrime/Cameras/CPathCamera.s | 2 +- asm/MetroidPrime/Enemies/CBabygoth.s | 20 ++-- asm/MetroidPrime/Enemies/CBeetle.s | 12 +-- asm/MetroidPrime/Enemies/CBloodFlower.s | 2 +- asm/MetroidPrime/Enemies/CBouncyGrenade.s | 6 +- asm/MetroidPrime/Enemies/CBurrower.s | 4 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 18 ++-- asm/MetroidPrime/Enemies/CDrone.s | 58 +++++----- asm/MetroidPrime/Enemies/CElitePirate.s | 34 +++--- asm/MetroidPrime/Enemies/CEyeBall.s | 8 +- asm/MetroidPrime/Enemies/CFireFlea.s | 4 +- asm/MetroidPrime/Enemies/CFlaahgra.s | 22 ++-- asm/MetroidPrime/Enemies/CFlaahgraPlants.s | 10 +- asm/MetroidPrime/Enemies/CFlaahgraTentacle.s | 6 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 76 ++++++------- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 4 +- asm/MetroidPrime/Enemies/CIceSheegoth.s | 12 +-- asm/MetroidPrime/Enemies/CJellyZap.s | 4 +- asm/MetroidPrime/Enemies/CMagdolite.s | 16 +-- asm/MetroidPrime/Enemies/CMetroid.s | 74 ++++++------- asm/MetroidPrime/Enemies/CMetroidBeta.s | 10 +- .../Enemies/CMetroidPrimeEssence.s | 10 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 56 +++++----- asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s | 6 +- asm/MetroidPrime/Enemies/CNewIntroBoss.s | 26 ++--- asm/MetroidPrime/Enemies/COmegaPirate.s | 28 ++--- asm/MetroidPrime/Enemies/CParasite.s | 6 +- asm/MetroidPrime/Enemies/CPatterned.s | 20 ++-- .../Enemies/CPhazonHealingNodule.s | 4 +- asm/MetroidPrime/Enemies/CPuddleSpore.s | 2 +- asm/MetroidPrime/Enemies/CPuffer.s | 2 +- asm/MetroidPrime/Enemies/CRidley.s | 24 ++--- asm/MetroidPrime/Enemies/CRipper.s | 24 ++--- asm/MetroidPrime/Enemies/CSeedling.s | 8 +- asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s | 6 +- asm/MetroidPrime/Enemies/CSpacePirate.s | 54 +++++----- asm/MetroidPrime/Enemies/CSpankWeed.s | 2 +- asm/MetroidPrime/Enemies/CTeamAiMgr.s | 6 +- asm/MetroidPrime/Enemies/CThardus.s | 28 ++--- .../Enemies/CThardusRockProjectile.s | 18 ++-- asm/MetroidPrime/Enemies/CTryclops.s | 52 ++++----- asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s | 8 +- asm/MetroidPrime/Enemies/CWarWasp.s | 18 ++-- asm/MetroidPrime/HUD/CHudDecoInterface.s | 12 +-- asm/MetroidPrime/HUD/CSamusHud.s | 6 +- asm/MetroidPrime/Player/CGrappleArm.s | 2 +- asm/MetroidPrime/Player/CMorphBall.s | 20 ++-- asm/MetroidPrime/Player/CPlayer.s | 52 ++++----- asm/MetroidPrime/Player/CPlayerDynamics.s | 10 +- asm/MetroidPrime/Player/CPlayerGun.s | 46 ++++---- asm/MetroidPrime/Player/CPlayerOrbit.s | 94 ++++++++-------- asm/MetroidPrime/Player/CPlayerVisor.s | 2 +- .../Player/CSamusFaceReflection.s | 2 +- asm/MetroidPrime/Player/CScanDisplay.s | 4 +- asm/MetroidPrime/Player/CStaticInterference.s | 2 +- asm/MetroidPrime/ScriptLoader.s | 2 +- asm/MetroidPrime/ScriptObjects/CEnergyBall.s | 2 +- asm/MetroidPrime/ScriptObjects/CFire.s | 4 +- asm/MetroidPrime/ScriptObjects/CFishCloud.s | 8 +- .../ScriptObjects/CHUDBillboardEffect.s | 4 +- asm/MetroidPrime/ScriptObjects/CRepulsor.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptActor.s | 6 +- .../ScriptObjects/CScriptAiJumpPoint.s | 10 +- .../ScriptObjects/CScriptAreaAttributes.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptBeam.s | 6 +- .../ScriptObjects/CScriptCameraHint.s | 8 +- .../ScriptObjects/CScriptCameraHintTrigger.s | 6 +- .../ScriptObjects/CScriptCameraPitchVolume.s | 4 +- .../ScriptObjects/CScriptCameraShaker.s | 2 +- .../ScriptObjects/CScriptCameraWaypoint.s | 6 +- .../ScriptObjects/CScriptColorModulate.s | 8 +- .../ScriptObjects/CScriptCoverPoint.s | 8 +- .../ScriptObjects/CScriptDamageableTrigger.s | 4 +- .../CScriptDebugCameraWaypoint.s | 2 +- .../ScriptObjects/CScriptDistanceFog.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptDock.s | 8 +- asm/MetroidPrime/ScriptObjects/CScriptDoor.s | 22 ++-- .../ScriptObjects/CScriptEMPulse.s | 2 +- .../ScriptObjects/CScriptEffect.s | 18 ++-- .../ScriptObjects/CScriptGenerator.s | 6 +- .../ScriptObjects/CScriptGrapplePoint.s | 2 +- .../ScriptObjects/CScriptGunTurret.s | 32 +++--- .../ScriptObjects/CScriptMazeNode.s | 12 +-- .../ScriptObjects/CScriptPickup.s | 2 +- .../ScriptObjects/CScriptPickupGenerator.s | 6 +- .../ScriptObjects/CScriptPlatform.s | 32 +++--- .../ScriptObjects/CScriptPlayerActor.s | 14 +-- .../ScriptObjects/CScriptPlayerHint.s | 6 +- .../ScriptObjects/CScriptPointOfInterest.s | 2 +- .../ScriptObjects/CScriptProjectedShadow.s | 10 +- asm/MetroidPrime/ScriptObjects/CScriptRelay.s | 10 +- .../ScriptObjects/CScriptRoomAcoustics.s | 6 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 2 +- .../ScriptObjects/CScriptSpecialFunction.s | 14 +-- .../CScriptSpiderBallAttractionSurface.s | 2 +- .../ScriptObjects/CScriptSpiderBallWaypoint.s | 22 ++-- .../ScriptObjects/CScriptSpindleCamera.s | 2 +- .../ScriptObjects/CScriptTargetingPoint.s | 4 +- .../ScriptObjects/CScriptTrigger.s | 14 +-- .../ScriptObjects/CScriptVisorFlare.s | 2 +- .../ScriptObjects/CScriptVisorGoo.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptWater.s | 2 +- .../ScriptObjects/CScriptWaypoint.s | 8 +- asm/MetroidPrime/TGameTypes.s | 10 +- asm/MetroidPrime/Weapons/CAuxWeapon.s | 26 ++--- asm/MetroidPrime/Weapons/CBeamProjectile.s | 12 +-- asm/MetroidPrime/Weapons/CBomb.s | 6 +- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 14 +-- asm/MetroidPrime/Weapons/CFlameThrower.s | 12 +-- asm/MetroidPrime/Weapons/CIceImpact.s | 16 +-- asm/MetroidPrime/Weapons/CIceProjectile.s | 12 +-- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 24 ++--- asm/MetroidPrime/Weapons/CPhazonBeam.s | 4 +- asm/MetroidPrime/Weapons/CPlasmaBeam.s | 6 +- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 4 +- asm/MetroidPrime/Weapons/CPlayerGun.s | 4 +- asm/MetroidPrime/Weapons/CShockWave.s | 10 +- .../Weapons/CTargetableProjectile.s | 4 +- asm/MetroidPrime/Weapons/CWaveBeam.s | 2 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 28 ++--- asm/MetroidPrime/Weapons/CWeapon.s | 4 +- .../Weapons/GunController/CGunMotion.s | 2 +- asm/sbss.s | 12 +-- 164 files changed, 1082 insertions(+), 1082 deletions(-) diff --git a/asm/MetroidPrime/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s index 08f37a39..832333b3 100644 --- a/asm/MetroidPrime/BodyState/CBSHurled.s +++ b/asm/MetroidPrime/BodyState/CBSHurled.s @@ -455,7 +455,7 @@ PlayLandAnimation__9CBSHurledFR15CBodyControllerR13CStateManager: /* 80144A00 00141960 80 83 00 04 */ lwz r4, 4(r3) /* 80144A04 00141964 28 04 00 00 */ cmplwi r4, 0 /* 80144A08 00141968 41 82 00 1C */ beq lbl_80144A24 -/* 80144A0C 0014196C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80144A0C 0014196C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80144A10 00141970 7F A3 EB 78 */ mr r3, r29 /* 80144A14 00141974 38 A1 00 10 */ addi r5, r1, 0x10 /* 80144A18 00141978 38 C0 00 17 */ li r6, 0x17 @@ -1098,11 +1098,11 @@ lbl_801451EC: /* 80145330 00142290 7F 83 E3 78 */ mr r3, r28 /* 80145334 00142294 7F C4 F3 78 */ mr r4, r30 /* 80145338 00142298 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8014533C 0014229C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014533C 0014229C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80145340 001422A0 38 C0 00 1A */ li r6, 0x1a /* 80145344 001422A4 B0 01 00 14 */ sth r0, 0x14(r1) /* 80145348 001422A8 4B EF EB 89 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage -/* 8014534C 001422AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014534C 001422AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80145350 001422B0 7F 83 E3 78 */ mr r3, r28 /* 80145354 001422B4 7F C4 F3 78 */ mr r4, r30 /* 80145358 001422B8 38 A1 00 10 */ addi r5, r1, 0x10 diff --git a/asm/MetroidPrime/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s index e213ab7c..193c1411 100644 --- a/asm/MetroidPrime/BodyState/CBSJump.s +++ b/asm/MetroidPrime/BodyState/CBSJump.s @@ -207,7 +207,7 @@ lbl_8014580C: /* 80145890 001427F0 7F 83 E3 78 */ mr r3, r28 /* 80145894 001427F4 38 81 00 80 */ addi r4, r1, 0x80 /* 80145898 001427F8 4B FF 4B 11 */ bl PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16 -/* 8014589C 001427FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014589C 001427FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801458A0 00142800 7F A3 EB 78 */ mr r3, r29 /* 801458A4 00142804 7F E4 FB 78 */ mr r4, r31 /* 801458A8 00142808 38 A1 00 10 */ addi r5, r1, 0x10 @@ -318,7 +318,7 @@ lbl_801459A0: /* 80145A28 00142988 7F A3 EB 78 */ mr r3, r29 /* 80145A2C 0014298C 38 81 00 5C */ addi r4, r1, 0x5c /* 80145A30 00142990 4B FF 49 79 */ bl PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16 -/* 80145A34 00142994 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80145A34 00142994 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80145A38 00142998 7F C3 F3 78 */ mr r3, r30 /* 80145A3C 0014299C 7F E4 FB 78 */ mr r4, r31 /* 80145A40 001429A0 38 A1 00 10 */ addi r5, r1, 0x10 @@ -612,7 +612,7 @@ lbl_80145E40: /* 80145E40 00142DA0 88 1D 03 00 */ lbz r0, 0x300(r29) /* 80145E44 00142DA4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80145E48 00142DA8 41 82 01 C0 */ beq lbl_80146008 -/* 80145E4C 00142DAC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80145E4C 00142DAC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80145E50 00142DB0 7F C3 F3 78 */ mr r3, r30 /* 80145E54 00142DB4 38 A1 00 10 */ addi r5, r1, 0x10 /* 80145E58 00142DB8 38 C0 00 1A */ li r6, 0x1a @@ -889,14 +889,14 @@ lbl_80146248: /* 80146254 001431B4 83 E3 00 04 */ lwz r31, 4(r3) /* 80146258 001431B8 28 1F 00 00 */ cmplwi r31, 0 /* 8014625C 001431BC 41 82 00 64 */ beq lbl_801462C0 -/* 80146260 001431C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80146260 001431C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80146264 001431C4 7F C3 F3 78 */ mr r3, r30 /* 80146268 001431C8 7F E4 FB 78 */ mr r4, r31 /* 8014626C 001431CC 38 A1 00 14 */ addi r5, r1, 0x14 /* 80146270 001431D0 B0 01 00 14 */ sth r0, 0x14(r1) /* 80146274 001431D4 38 C0 00 1A */ li r6, 0x1a /* 80146278 001431D8 4B EF DC 59 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage -/* 8014627C 001431DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014627C 001431DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80146280 001431E0 7F C3 F3 78 */ mr r3, r30 /* 80146284 001431E4 7F E4 FB 78 */ mr r4, r31 /* 80146288 001431E8 38 A1 00 10 */ addi r5, r1, 0x10 diff --git a/asm/MetroidPrime/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s index 7f74843e..061524f2 100644 --- a/asm/MetroidPrime/BodyState/CBSWallHang.s +++ b/asm/MetroidPrime/BodyState/CBSWallHang.s @@ -186,7 +186,7 @@ lbl_8018D630: /* 8018D6B4 0018A614 7F 83 E3 78 */ mr r3, r28 /* 8018D6B8 0018A618 38 81 00 5C */ addi r4, r1, 0x5c /* 8018D6BC 0018A61C 4B FA CC ED */ bl PlayBestAnimation__15CBodyControllerFRC16CPASAnimParmDataR9CRandom16 -/* 8018D6C0 0018A620 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018D6C0 0018A620 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018D6C4 0018A624 7F A3 EB 78 */ mr r3, r29 /* 8018D6C8 0018A628 7F E4 FB 78 */ mr r4, r31 /* 8018D6CC 0018A62C 38 A1 00 10 */ addi r5, r1, 0x10 @@ -398,7 +398,7 @@ lbl_8018D910: /* 8018D9D4 0018A934 D0 1F 01 54 */ stfs f0, 0x154(r31) /* 8018D9D8 0018A938 C0 07 00 08 */ lfs f0, 8(r7) /* 8018D9DC 0018A93C D0 1F 01 58 */ stfs f0, 0x158(r31) -/* 8018D9E0 0018A940 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018D9E0 0018A940 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018D9E4 0018A944 B0 01 00 10 */ sth r0, 0x10(r1) /* 8018D9E8 0018A948 4B EB 64 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage /* 8018D9EC 0018A94C 34 A1 00 E4 */ addic. r5, r1, 0xe4 @@ -610,7 +610,7 @@ lbl_8018DCCC: /* 8018DCD8 0018AC38 83 43 00 04 */ lwz r26, 4(r3) /* 8018DCDC 0018AC3C 28 1A 00 00 */ cmplwi r26, 0 /* 8018DCE0 0018AC40 41 82 00 CC */ beq lbl_8018DDAC -/* 8018DCE4 0018AC44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018DCE4 0018AC44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018DCE8 0018AC48 7F C3 F3 78 */ mr r3, r30 /* 8018DCEC 0018AC4C 7F 44 D3 78 */ mr r4, r26 /* 8018DCF0 0018AC50 38 A1 00 20 */ addi r5, r1, 0x20 @@ -1235,7 +1235,7 @@ lbl_8018E5D0: /* 8018E5DC 0018B53C 83 23 00 04 */ lwz r25, 4(r3) /* 8018E5E0 0018B540 28 19 00 00 */ cmplwi r25, 0 /* 8018E5E4 0018B544 41 82 00 D4 */ beq lbl_8018E6B8 -/* 8018E5E8 0018B548 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018E5E8 0018B548 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018E5EC 0018B54C 7F C3 F3 78 */ mr r3, r30 /* 8018E5F0 0018B550 7F 24 CB 78 */ mr r4, r25 /* 8018E5F4 0018B554 38 A1 00 14 */ addi r5, r1, 0x14 @@ -1644,7 +1644,7 @@ __ct__11CBSWallHangFv: /* 8018EB6C 0018BACC 90 C3 00 00 */ stw r6, 0(r3) /* 8018EB70 0018BAD0 38 80 00 00 */ li r4, 0 /* 8018EB74 0018BAD4 90 03 00 04 */ stw r0, 4(r3) -/* 8018EB78 0018BAD8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018EB78 0018BAD8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018EB7C 0018BADC B0 03 00 08 */ sth r0, 8(r3) /* 8018EB80 0018BAE0 C0 05 00 00 */ lfs f0, 0(r5) /* 8018EB84 0018BAE4 D0 03 00 0C */ stfs f0, 0xc(r3) diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s index 25e4ac30..bf5c5873 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s +++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s @@ -972,7 +972,7 @@ lbl_80131DA8: /* 801321AC 0012F10C D0 03 02 4C */ stfs f0, 0x24c(r3) /* 801321B0 0012F110 C0 10 00 08 */ lfs f0, 8(r16) /* 801321B4 0012F114 D0 03 02 50 */ stfs f0, 0x250(r3) -/* 801321B8 0012F118 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801321B8 0012F118 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801321BC 0012F11C 90 C3 02 54 */ stw r6, 0x254(r3) /* 801321C0 0012F120 90 03 02 58 */ stw r0, 0x258(r3) /* 801321C4 0012F124 38 00 00 16 */ li r0, 0x16 diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index a6dd0d7f..abefac60 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -587,7 +587,7 @@ lbl_800532E8: /* 80053300 00050260 88 03 00 E6 */ lbz r0, 0xe6(r3) /* 80053304 00050264 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f /* 80053308 00050268 4C 82 00 20 */ bnelr -/* 8005330C 0005026C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005330C 0005026C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80053310 00050270 B0 03 00 C4 */ sth r0, 0xc4(r3) /* 80053314 00050274 4E 80 00 20 */ blr @@ -934,7 +934,7 @@ lbl_80053760: /* 80053774 000506D4 48 00 00 A8 */ b lbl_8005381C .global lbl_80053778 lbl_80053778: -/* 80053778 000506D8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80053778 000506D8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005377C 000506DC 38 A1 00 14 */ addi r5, r1, 0x14 /* 80053780 000506E0 38 80 00 00 */ li r4, 0 /* 80053784 000506E4 B0 01 00 14 */ sth r0, 0x14(r1) @@ -966,7 +966,7 @@ lbl_80053798: /* 800537E0 00050740 28 04 00 00 */ cmplwi r4, 0 /* 800537E4 00050744 41 82 00 1C */ beq lbl_80053800 /* 800537E8 00050748 A0 7C 00 C6 */ lhz r3, 0xc6(r28) -/* 800537EC 0005074C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800537EC 0005074C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800537F0 00050750 7C 03 00 40 */ cmplw r3, r0 /* 800537F4 00050754 40 82 00 0C */ bne lbl_80053800 /* 800537F8 00050758 A0 04 00 08 */ lhz r0, 8(r4) @@ -2603,7 +2603,7 @@ lbl_80054EB0: /* 80054EB4 00051E14 28 00 00 01 */ cmplwi r0, 1 /* 80054EB8 00051E18 40 82 00 74 */ bne lbl_80054F2C /* 80054EBC 00051E1C 80 BD 00 04 */ lwz r5, 4(r29) -/* 80054EC0 00051E20 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80054EC0 00051E20 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80054EC4 00051E24 7C 05 00 00 */ cmpw r5, r0 /* 80054EC8 00051E28 41 82 00 64 */ beq lbl_80054F2C /* 80054ECC 00051E2C 80 7E 08 50 */ lwz r3, 0x850(r30) @@ -3433,7 +3433,7 @@ lbl_800559AC: /* 80055A4C 000529AC 90 FF 00 B8 */ stw r7, 0xb8(r31) /* 80055A50 000529B0 D0 1F 00 BC */ stfs f0, 0xbc(r31) /* 80055A54 000529B4 90 DF 00 C0 */ stw r6, 0xc0(r31) -/* 80055A58 000529B8 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80055A58 000529B8 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80055A5C 000529BC B0 DF 00 C4 */ sth r6, 0xc4(r31) /* 80055A60 000529C0 A0 DE 00 00 */ lhz r6, 0(r30) /* 80055A64 000529C4 B0 DF 00 C6 */ sth r6, 0xc6(r31) diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index 60c26de5..a5bd2347 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -60,7 +60,7 @@ BuildConstantAmbientLighting__12CActorLightsFRC6CColor: /* 801030DC 0010003C 7C 83 23 78 */ mr r3, r4 /* 801030E0 00100040 38 9F 02 88 */ addi r4, r31, 0x288 /* 801030E4 00100044 48 26 02 55 */ bl Get__6CColorCFRfRfRf -/* 801030E8 00100048 80 6D A3 90 */ lwz r3, lbl_805A8F50@sda21(r13) +/* 801030E8 00100048 80 6D A3 90 */ lwz r3, kInvalidAreaId@sda21(r13) /* 801030EC 0010004C 38 80 00 01 */ li r4, 1 /* 801030F0 00100050 38 00 FF FF */ li r0, -1 /* 801030F4 00100054 90 7F 02 94 */ stw r3, 0x294(r31) @@ -2397,7 +2397,7 @@ __ct__12CActorLightsFUi9CVector3fiif: /* 80105200 00102160 D0 03 02 8C */ stfs f0, 0x28c(r3) /* 80105204 00102164 C0 0B 00 08 */ lfs f0, 8(r11) /* 80105208 00102168 D0 03 02 90 */ stfs f0, 0x290(r3) -/* 8010520C 0010216C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8010520C 0010216C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80105210 00102170 90 03 02 94 */ stw r0, 0x294(r3) /* 80105214 00102174 88 03 02 98 */ lbz r0, 0x298(r3) /* 80105218 00102178 51 80 3E 30 */ rlwimi r0, r12, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index 5b209c65..093dd8a9 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -447,7 +447,7 @@ Render__20CActorModelParticlesCFRC6CActor: /* 801E3E78 001E0DD8 7C 1F 00 40 */ cmplw r31, r0 /* 801E3E7C 001E0DDC 41 82 01 D0 */ beq lbl_801E404C /* 801E3E80 001E0DE0 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801E3E84 001E0DE4 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801E3E84 001E0DE4 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801E3E88 001E0DE8 7C 05 00 00 */ cmpw r5, r0 /* 801E3E8C 001E0DEC 41 82 00 48 */ beq lbl_801E3ED4 /* 801E3E90 001E0DF0 80 9D 08 50 */ lwz r4, 0x850(r29) @@ -604,7 +604,7 @@ AddStragglersToRenderer__20CActorModelParticlesCFRC13CStateManager: /* 801E409C 001E0FFC 48 00 01 F8 */ b lbl_801E4294 lbl_801E40A0: /* 801E40A0 001E1000 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801E40A4 001E1004 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801E40A4 001E1004 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801E40A8 001E1008 7C 05 00 00 */ cmpw r5, r0 /* 801E40AC 001E100C 41 82 00 44 */ beq lbl_801E40F0 /* 801E40B0 001E1010 80 9C 08 50 */ lwz r4, 0x850(r28) @@ -3634,7 +3634,7 @@ lbl_801E6AE0: /* 801E6B10 001E3A70 90 1C 00 04 */ stw r0, 4(r28) /* 801E6B14 001E3A74 48 00 00 88 */ b lbl_801E6B9C lbl_801E6B18: -/* 801E6B18 001E3A78 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801E6B18 001E3A78 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801E6B1C 001E3A7C 38 60 00 00 */ li r3, 0 /* 801E6B20 001E3A80 38 00 FF FF */ li r0, -1 /* 801E6B24 001E3A84 B0 9C 00 00 */ sth r4, 0(r28) diff --git a/asm/MetroidPrime/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s index e67e31bd..5a0cfdcb 100644 --- a/asm/MetroidPrime/CBoneTracking.s +++ b/asm/MetroidPrime/CBoneTracking.s @@ -37,7 +37,7 @@ lbl_801751F0: .global UnsetTarget__13CBoneTrackingFv UnsetTarget__13CBoneTrackingFv: -/* 8017520C 0017216C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017520C 0017216C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80175210 00172170 B0 03 00 34 */ sth r0, 0x34(r3) /* 80175214 00172174 4E 80 00 20 */ blr @@ -600,7 +600,7 @@ Update__13CBoneTrackingFf: /* 80175A3C 0017299C D3 DF 00 1C */ stfs f30, 0x1c(r31) /* 80175A40 001729A0 D3 FF 00 20 */ stfs f31, 0x20(r31) /* 80175A44 001729A4 99 1F 00 30 */ stb r8, 0x30(r31) -/* 80175A48 001729A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80175A48 001729A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80175A4C 001729AC B0 1F 00 34 */ sth r0, 0x34(r31) /* 80175A50 001729B0 88 1F 00 36 */ lbz r0, 0x36(r31) /* 80175A54 001729B4 51 00 3E 30 */ rlwimi r0, r8, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index bb5dc95f..91b89dd7 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1007,7 +1007,7 @@ __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff: /* 801A9488 001A63E8 7C 04 03 78 */ mr r4, r0 /* 801A948C 001A63EC 38 61 00 40 */ addi r3, r1, 0x40 /* 801A9490 001A63F0 4B E5 B8 29 */ bl string_l__4rstlFPCc -/* 801A9494 001A63F4 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 801A9494 001A63F4 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 801A9498 001A63F8 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801A949C 001A63FC 80 1A 00 00 */ lwz r0, 0(r26) /* 801A94A0 001A6400 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -1231,7 +1231,7 @@ lbl_801A9708: /* 801A97F8 001A6758 90 DB 02 F4 */ stw r6, 0x2f4(r27) /* 801A97FC 001A675C 80 84 00 64 */ lwz r4, 0x64(r4) /* 801A9800 001A6760 90 9B 02 F8 */ stw r4, 0x2f8(r27) -/* 801A9804 001A6764 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801A9804 001A6764 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801A9808 001A6768 B0 9B 02 FC */ sth r4, 0x2fc(r27) /* 801A980C 001A676C 90 1B 03 00 */ stw r0, 0x300(r27) /* 801A9810 001A6770 C0 05 00 00 */ lfs f0, 0(r5) @@ -1304,7 +1304,7 @@ __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9910 001A6870 7C 04 03 78 */ mr r4, r0 /* 801A9914 001A6874 38 61 00 58 */ addi r3, r1, 0x58 /* 801A9918 001A6878 4B E5 B3 A1 */ bl string_l__4rstlFPCc -/* 801A991C 001A687C 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 801A991C 001A687C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 801A9920 001A6880 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801A9924 001A6884 80 19 00 00 */ lwz r0, 0(r25) /* 801A9928 001A6888 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -1553,7 +1553,7 @@ lbl_801A9BEC: /* 801A9CE4 001A6C44 90 DA 02 F4 */ stw r6, 0x2f4(r26) /* 801A9CE8 001A6C48 80 84 00 64 */ lwz r4, 0x64(r4) /* 801A9CEC 001A6C4C 90 9A 02 F8 */ stw r4, 0x2f8(r26) -/* 801A9CF0 001A6C50 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801A9CF0 001A6C50 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801A9CF4 001A6C54 B0 9A 02 FC */ sth r4, 0x2fc(r26) /* 801A9CF8 001A6C58 90 1A 03 00 */ stw r0, 0x300(r26) /* 801A9CFC 001A6C5C C0 05 00 00 */ lfs f0, 0(r5) @@ -1621,7 +1621,7 @@ __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9DE8 001A6D48 7C 04 03 78 */ mr r4, r0 /* 801A9DEC 001A6D4C 38 61 00 34 */ addi r3, r1, 0x34 /* 801A9DF0 001A6D50 4B E5 AE C9 */ bl string_l__4rstlFPCc -/* 801A9DF4 001A6D54 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 801A9DF4 001A6D54 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 801A9DF8 001A6D58 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801A9DFC 001A6D5C 80 18 00 00 */ lwz r0, 0(r24) /* 801A9E00 001A6D60 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -1822,7 +1822,7 @@ lbl_801A9FFC: /* 801AA0F8 001A7058 90 DF 02 F4 */ stw r6, 0x2f4(r31) /* 801AA0FC 001A705C 80 84 00 64 */ lwz r4, 0x64(r4) /* 801AA100 001A7060 90 9F 02 F8 */ stw r4, 0x2f8(r31) -/* 801AA104 001A7064 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801AA104 001A7064 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801AA108 001A7068 B0 9F 02 FC */ sth r4, 0x2fc(r31) /* 801AA10C 001A706C 90 1F 03 00 */ stw r0, 0x300(r31) /* 801AA110 001A7070 C0 05 00 00 */ lfs f0, 0(r5) diff --git a/asm/MetroidPrime/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s index fd173995..1e2172c9 100644 --- a/asm/MetroidPrime/CCollisionActorManager.s +++ b/asm/MetroidPrime/CCollisionActorManager.s @@ -1565,7 +1565,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A85A0 001A5500 D0 1F 00 24 */ stfs f0, 0x24(r31) /* 801A85A4 001A5504 D0 1F 00 28 */ stfs f0, 0x28(r31) /* 801A85A8 001A5508 48 19 5B B9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 801A85AC 001A550C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A85AC 001A550C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A85B0 001A5510 B0 1F 00 3C */ sth r0, 0x3c(r31) /* 801A85B4 001A5514 D3 FF 00 40 */ stfs f31, 0x40(r31) /* 801A85B8 001A5518 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -1615,7 +1615,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A865C 001A55BC D0 1F 00 24 */ stfs f0, 0x24(r31) /* 801A8660 001A55C0 D0 1F 00 28 */ stfs f0, 0x28(r31) /* 801A8664 001A55C4 48 19 5A FD */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 801A8668 001A55C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A8668 001A55C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A866C 001A55CC B0 1F 00 3C */ sth r0, 0x3c(r31) /* 801A8670 001A55D0 D3 FF 00 40 */ stfs f31, 0x40(r31) /* 801A8674 001A55D4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -1667,7 +1667,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8720 001A5680 D0 1F 00 24 */ stfs f0, 0x24(r31) /* 801A8724 001A5684 D0 1F 00 28 */ stfs f0, 0x28(r31) /* 801A8728 001A5688 48 19 5A 39 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 801A872C 001A568C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A872C 001A568C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A8730 001A5690 B0 1F 00 3C */ sth r0, 0x3c(r31) /* 801A8734 001A5694 D3 FF 00 40 */ stfs f31, 0x40(r31) /* 801A8738 001A5698 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -1716,7 +1716,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A87D8 001A5738 D0 3F 00 24 */ stfs f1, 0x24(r31) /* 801A87DC 001A573C D0 5F 00 28 */ stfs f2, 0x28(r31) /* 801A87E0 001A5740 48 19 59 81 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 801A87E4 001A5744 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A87E4 001A5744 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A87E8 001A5748 B0 1F 00 3C */ sth r0, 0x3c(r31) /* 801A87EC 001A574C D3 FF 00 40 */ stfs f31, 0x40(r31) /* 801A87F0 001A5750 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -1767,7 +1767,7 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8898 001A57F8 D0 3F 00 24 */ stfs f1, 0x24(r31) /* 801A889C 001A57FC D0 1F 00 28 */ stfs f0, 0x28(r31) /* 801A88A0 001A5800 48 19 58 C1 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 801A88A4 001A5804 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A88A4 001A5804 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A88A8 001A5808 B0 1F 00 3C */ sth r0, 0x3c(r31) /* 801A88AC 001A580C D3 FF 00 40 */ stfs f31, 0x40(r31) /* 801A88B0 001A5810 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 diff --git a/asm/MetroidPrime/CEffect.s b/asm/MetroidPrime/CEffect.s index 13b73441..1596e4d1 100644 --- a/asm/MetroidPrime/CEffect.s +++ b/asm/MetroidPrime/CEffect.s @@ -105,7 +105,7 @@ nullsub_84: /* 8005AD7C 00057CDC 4B FD FA 29 */ bl CModelDataNull__10CModelDataFv /* 8005AD80 00057CE0 38 61 00 20 */ addi r3, r1, 0x20 /* 8005AD84 00057CE4 4B FC 00 B5 */ bl None__16CActorParametersFv -/* 8005AD88 00057CE8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8005AD88 00057CE8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8005AD8C 00057CEC 38 00 00 00 */ li r0, 0 /* 8005AD90 00057CF0 80 AD 82 B8 */ lwz r5, lbl_805A6E78@sda21(r13) /* 8005AD94 00057CF4 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index b275cbb0..c86bec62 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -27,7 +27,7 @@ GetAreaId__7CEntityCFv: /* 80051084 0004DFE4 88 04 00 30 */ lbz r0, 0x30(r4) /* 80051088 0004DFE8 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 8005108C 0004DFEC 41 82 00 0C */ beq lbl_80051098 -/* 80051090 0004DFF0 38 8D A3 90 */ addi r4, r13, lbl_805A8F50@sda21 +/* 80051090 0004DFF0 38 8D A3 90 */ addi r4, r13, kInvalidAreaId@sda21 /* 80051094 0004DFF4 48 00 00 08 */ b lbl_8005109C lbl_80051098: /* 80051098 0004DFF8 38 84 00 04 */ addi r4, r4, 4 @@ -310,7 +310,7 @@ lbl_80051420: /* 80051444 0004E3A4 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 80051448 0004E3A8 98 1E 00 30 */ stb r0, 0x30(r30) /* 8005144C 0004E3AC 80 BE 00 04 */ lwz r5, 4(r30) -/* 80051450 0004E3B0 80 8D A3 90 */ lwz r4, lbl_805A8F50@sda21(r13) +/* 80051450 0004E3B0 80 8D A3 90 */ lwz r4, kInvalidAreaId@sda21(r13) /* 80051454 0004E3B4 88 1E 00 30 */ lbz r0, 0x30(r30) /* 80051458 0004E3B8 7C 85 20 50 */ subf r4, r5, r4 /* 8005145C 0004E3BC 7C 84 00 34 */ cntlzw r4, r4 diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index c66c845b..48e484b5 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -1112,7 +1112,7 @@ UpdateVisorSplash__13CEnvFxManagerFR13CStateManagerfRC12CTransform4f: /* 80210D2C 0020DC8C 7C 9F 23 78 */ mr r31, r4 /* 80210D30 0020DC90 A0 63 0B 68 */ lhz r3, 0xb68(r3) /* 80210D34 0020DC94 7C BC 2B 78 */ mr r28, r5 -/* 80210D38 0020DC98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80210D38 0020DC98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80210D3C 0020DC9C 80 84 08 50 */ lwz r4, 0x850(r4) /* 80210D40 0020DCA0 7C 03 00 40 */ cmplw r3, r0 /* 80210D44 0020DCA4 83 A4 00 C4 */ lwz r29, 0xc4(r4) @@ -2889,7 +2889,7 @@ lbl_802126AC: .global sub_802126c4 sub_802126c4: -/* 802126C4 0020F624 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 802126C4 0020F624 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 802126C8 0020F628 38 00 00 00 */ li r0, 0 /* 802126CC 0020F62C B0 83 0B 68 */ sth r4, 0xb68(r3) /* 802126D0 0020F630 98 03 0B 6A */ stb r0, 0xb6a(r3) @@ -3813,7 +3813,7 @@ lbl_80213428: /* 80213434 00210394 38 61 00 4C */ addi r3, r1, 0x4c /* 80213438 00210398 38 80 FF FF */ li r4, -1 /* 8021343C 0021039C 48 12 DA 05 */ bl __dt__6CTokenFv -/* 80213440 002103A0 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80213440 002103A0 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80213444 002103A4 3C 60 80 3D */ lis r3, lbl_803D2818@ha /* 80213448 002103A8 38 83 28 18 */ addi r4, r3, lbl_803D2818@l /* 8021344C 002103AC 38 00 00 00 */ li r0, 0 diff --git a/asm/MetroidPrime/CExplosion.s b/asm/MetroidPrime/CExplosion.s index 8dc478df..c12c2fd3 100644 --- a/asm/MetroidPrime/CExplosion.s +++ b/asm/MetroidPrime/CExplosion.s @@ -284,7 +284,7 @@ lbl_8005A494: /* 8005A4A4 00057404 48 00 00 30 */ b lbl_8005A4D4 lbl_8005A4A8: /* 8005A4A8 00057408 A0 7C 00 EC */ lhz r3, 0xec(r28) -/* 8005A4AC 0005740C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005A4AC 0005740C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A4B0 00057410 7C 03 00 40 */ cmplw r3, r0 /* 8005A4B4 00057414 41 82 00 20 */ beq lbl_8005A4D4 /* 8005A4B8 00057418 A0 1C 00 EC */ lhz r0, 0xec(r28) @@ -292,7 +292,7 @@ lbl_8005A4A8: /* 8005A4C0 00057420 38 81 00 1C */ addi r4, r1, 0x1c /* 8005A4C4 00057424 B0 01 00 1C */ sth r0, 0x1c(r1) /* 8005A4C8 00057428 4B FF 1D A5 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8005A4CC 0005742C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005A4CC 0005742C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A4D0 00057430 B0 1C 00 EC */ sth r0, 0xec(r28) lbl_8005A4D4: /* 8005A4D4 00057434 A0 1E 00 00 */ lhz r0, 0(r30) @@ -303,7 +303,7 @@ lbl_8005A4D4: /* 8005A4E8 00057448 38 A1 00 18 */ addi r5, r1, 0x18 /* 8005A4EC 0005744C 4B FF 91 29 */ bl AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 8005A4F0 00057450 A0 7C 00 EC */ lhz r3, 0xec(r28) -/* 8005A4F4 00057454 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005A4F4 00057454 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A4F8 00057458 7C 03 00 40 */ cmplw r3, r0 /* 8005A4FC 0005745C 41 82 00 28 */ beq lbl_8005A524 /* 8005A500 00057460 A0 1E 00 00 */ lhz r0, 0(r30) @@ -389,7 +389,7 @@ lbl_8005A610: /* 8005A620 00057580 7D 89 03 A6 */ mtctr r12 /* 8005A624 00057584 4E 80 04 21 */ bctrl /* 8005A628 00057588 A0 7D 00 EC */ lhz r3, 0xec(r29) -/* 8005A62C 0005758C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005A62C 0005758C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A630 00057590 7C 03 00 40 */ cmplw r3, r0 /* 8005A634 00057594 41 82 00 60 */ beq lbl_8005A694 /* 8005A638 00057598 A0 1D 00 EC */ lhz r0, 0xec(r29) @@ -629,7 +629,7 @@ lbl_8005A96C: /* 8005A97C 000578DC 38 80 00 00 */ li r4, 0 /* 8005A980 000578E0 48 2E 64 C1 */ bl __dt__6CTokenFv lbl_8005A984: -/* 8005A984 000578E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005A984 000578E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005A988 000578E8 7F 64 DB 78 */ mr r4, r27 /* 8005A98C 000578EC 38 61 00 0C */ addi r3, r1, 0xc /* 8005A990 000578F0 B0 1A 00 EC */ sth r0, 0xec(r26) @@ -780,7 +780,7 @@ lbl_8005AB9C: /* 8005ABAC 00057B0C 38 80 00 00 */ li r4, 0 /* 8005ABB0 00057B10 48 2E 62 91 */ bl __dt__6CTokenFv lbl_8005ABB4: -/* 8005ABB4 00057B14 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005ABB4 00057B14 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005ABB8 00057B18 7F 64 DB 78 */ mr r4, r27 /* 8005ABBC 00057B1C 38 61 00 0C */ addi r3, r1, 0xc /* 8005ABC0 00057B20 B0 1A 00 EC */ sth r0, 0xec(r26) diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s index 80ed831b..787754ba 100644 --- a/asm/MetroidPrime/CFluidPlaneManager.s +++ b/asm/MetroidPrime/CFluidPlaneManager.s @@ -253,7 +253,7 @@ lbl_8012F390: /* 8012F3F8 0012C358 4B ED 58 C1 */ bl string_l__4rstlFPCc /* 8012F3FC 0012C35C 80 1C 00 04 */ lwz r0, 4(r28) /* 8012F400 0012C360 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8012F404 0012C364 80 CD A3 88 */ lwz r6, lbl_805A8F48@sda21(r13) +/* 8012F404 0012C364 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) /* 8012F408 0012C368 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8012F40C 0012C36C 90 01 00 30 */ stw r0, 0x30(r1) /* 8012F410 0012C370 38 61 00 6C */ addi r3, r1, 0x6c diff --git a/asm/MetroidPrime/CGameArea.s b/asm/MetroidPrime/CGameArea.s index 5da356c3..6144b0f7 100644 --- a/asm/MetroidPrime/CGameArea.s +++ b/asm/MetroidPrime/CGameArea.s @@ -4048,7 +4048,7 @@ lbl_800611AC: /* 800611BC 0005E11C 90 1D 00 F4 */ stw r0, 0xf4(r29) /* 800611C0 0005E120 48 00 01 31 */ bl PostConstructArea__9CGameAreaFv /* 800611C4 0005E124 80 7D 00 04 */ lwz r3, 4(r29) -/* 800611C8 0005E128 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800611C8 0005E128 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800611CC 0005E12C 7C 03 00 00 */ cmpw r3, r0 /* 800611D0 0005E130 41 82 00 18 */ beq lbl_800611E8 /* 800611D4 0005E134 80 1D 00 04 */ lwz r0, 4(r29) @@ -4083,7 +4083,7 @@ lbl_80061218: /* 80061240 0005E1A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80061244 0005E1A4 4B FE 6C D9 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 80061248 0005E1A8 A0 C1 00 0C */ lhz r6, 0xc(r1) -/* 8006124C 0005E1AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8006124C 0005E1AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80061250 0005E1B0 B0 C1 00 10 */ sth r6, 0x10(r1) /* 80061254 0005E1B4 7C 06 00 40 */ cmplw r6, r0 /* 80061258 0005E1B8 41 82 00 38 */ beq lbl_80061290 @@ -6793,7 +6793,7 @@ __ct__Q29CGameArea16CPostConstructedFv: /* 80063854 000607B4 90 E3 00 98 */ stw r7, 0x98(r3) /* 80063858 000607B8 90 E3 00 9C */ stw r7, 0x9c(r3) /* 8006385C 000607BC 90 E3 00 A0 */ stw r7, 0xa0(r3) -/* 80063860 000607C0 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80063860 000607C0 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80063864 000607C4 B0 81 00 08 */ sth r4, 8(r1) /* 80063868 000607C8 54 84 04 3E */ clrlwi r4, r4, 0x10 /* 8006386C 000607CC 90 C3 00 A4 */ stw r6, 0xa4(r3) diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s index e1b76063..527e179b 100644 --- a/asm/MetroidPrime/CGameCollision.s +++ b/asm/MetroidPrime/CGameCollision.s @@ -1739,7 +1739,7 @@ lbl_8018124C: /* 80181324 0017E284 40 81 01 1C */ ble lbl_80181440 /* 80181328 0017E288 C0 02 A2 D4 */ lfs f0, lbl_805ABFF4@sda21(r2) /* 8018132C 0017E28C FC 20 F0 90 */ fmr f1, f30 -/* 80181330 0017E290 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80181330 0017E290 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80181334 0017E294 7F A4 EB 78 */ mr r4, r29 /* 80181338 0017E298 EC 80 F0 24 */ fdivs f4, f0, f30 /* 8018133C 0017E29C C0 61 02 E8 */ lfs f3, 0x2e8(r1) @@ -1870,7 +1870,7 @@ lbl_80181514: /* 80181514 0017E474 38 63 00 01 */ addi r3, r3, 1 /* 80181518 0017E478 42 00 FF FC */ bdnz lbl_80181514 lbl_8018151C: -/* 8018151C 0017E47C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018151C 0017E47C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80181520 0017E480 38 60 00 00 */ li r3, 0 /* 80181524 0017E484 90 61 3E 68 */ stw r3, 0x3e68(r1) /* 80181528 0017E488 7F C4 F3 78 */ mr r4, r30 @@ -2193,7 +2193,7 @@ lbl_80181998: /* 801819CC 0017E92C 7C 00 22 78 */ xor r0, r0, r4 /* 801819D0 0017E930 7C 60 03 79 */ or. r0, r3, r0 /* 801819D4 0017E934 40 82 00 20 */ bne lbl_801819F4 -/* 801819D8 0017E938 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801819D8 0017E938 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801819DC 0017E93C 7F A3 EB 78 */ mr r3, r29 /* 801819E0 0017E940 7F C4 F3 78 */ mr r4, r30 /* 801819E4 0017E944 38 A1 00 08 */ addi r5, r1, 8 @@ -3327,7 +3327,7 @@ lbl_801829A0: lbl_801829C8: /* 801829C8 0017F928 38 C0 00 1D */ li r6, 0x1d lbl_801829CC: -/* 801829CC 0017F92C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801829CC 0017F92C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801829D0 0017F930 7C A4 2B 78 */ mr r4, r5 /* 801829D4 0017F934 38 A1 00 08 */ addi r5, r1, 8 /* 801829D8 0017F938 B0 01 00 08 */ sth r0, 8(r1) @@ -3386,7 +3386,7 @@ lbl_80182A88: /* 80182A90 0017F9F0 41 80 FF 98 */ blt lbl_80182A28 /* 80182A94 0017F9F4 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80182A98 0017F9F8 41 82 00 60 */ beq lbl_80182AF8 -/* 80182A9C 0017F9FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80182A9C 0017F9FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80182AA0 0017FA00 7E E3 BB 78 */ mr r3, r23 /* 80182AA4 0017FA04 7F 04 C3 78 */ mr r4, r24 /* 80182AA8 0017FA08 38 A1 00 18 */ addi r5, r1, 0x18 @@ -3483,7 +3483,7 @@ MakeCollisionCallbacks__14CGameCollisionFR13CStateManagerR13CPhysicsActorRC9TUni /* 80182BF0 0017FB50 7D 89 03 A6 */ mtctr r12 /* 80182BF4 0017FB54 4E 80 04 21 */ bctrl /* 80182BF8 0017FB58 A0 7D 00 00 */ lhz r3, 0(r29) -/* 80182BFC 0017FB5C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80182BFC 0017FB5C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80182C00 0017FB60 7C 03 00 40 */ cmplw r3, r0 /* 80182C04 0017FB64 41 82 00 DC */ beq lbl_80182CE0 /* 80182C08 0017FB68 B0 61 00 0C */ sth r3, 0xc(r1) @@ -4849,7 +4849,7 @@ lbl_80183F94: /* 80183FA0 00180F00 38 03 00 04 */ addi r0, r3, 4 /* 80183FA4 00180F04 7C 1D 00 40 */ cmplw r29, r0 /* 80183FA8 00180F08 40 82 FF 30 */ bne lbl_80183ED8 -/* 80183FAC 00180F0C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80183FAC 00180F0C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80183FB0 00180F10 38 60 00 00 */ li r3, 0 /* 80183FB4 00180F14 B0 1A 00 00 */ sth r0, 0(r26) lbl_80183FB8: @@ -5089,7 +5089,7 @@ lbl_801842BC: /* 8018431C 0018127C 7C D9 33 78 */ mr r25, r6 /* 80184320 00181280 7D 3B 4B 78 */ mr r27, r9 /* 80184324 00181284 3B E0 00 00 */ li r31, 0 -/* 80184328 00181288 A1 6D A3 8C */ lhz r11, lbl_805A8F4C@sda21(r13) +/* 80184328 00181288 A1 6D A3 8C */ lhz r11, kInvalidUniqueId@sda21(r13) /* 8018432C 0018128C B1 7C 00 00 */ sth r11, 0(r28) /* 80184330 00181290 81 67 00 08 */ lwz r11, 8(r7) /* 80184334 00181294 81 87 00 0C */ lwz r12, 0xc(r7) @@ -5154,7 +5154,7 @@ lbl_801843CC: /* 8018440C 0018136C 7C DB 33 78 */ mr r27, r6 /* 80184410 00181370 7D 5E 53 78 */ mr r30, r10 /* 80184414 00181374 3B E0 00 00 */ li r31, 0 -/* 80184418 00181378 A1 6D A3 8C */ lhz r11, lbl_805A8F4C@sda21(r13) +/* 80184418 00181378 A1 6D A3 8C */ lhz r11, kInvalidUniqueId@sda21(r13) /* 8018441C 0018137C B1 7D 00 00 */ sth r11, 0(r29) /* 80184420 00181380 81 67 00 08 */ lwz r11, 8(r7) /* 80184424 00181384 81 07 00 0C */ lwz r8, 0xc(r7) @@ -5170,7 +5170,7 @@ lbl_801843CC: /* 8018444C 001813AC 41 82 00 08 */ beq lbl_80184454 /* 80184450 001813B0 3B E0 00 01 */ li r31, 1 lbl_80184454: -/* 80184454 001813B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80184454 001813B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80184458 001813B8 7F 43 D3 78 */ mr r3, r26 /* 8018445C 001813BC 7F 64 DB 78 */ mr r4, r27 /* 80184460 001813C0 7F 85 E3 78 */ mr r5, r28 @@ -5207,7 +5207,7 @@ lbl_8018448C: /* 801844CC 0018142C 7C BB 2B 78 */ mr r27, r5 /* 801844D0 00181430 7D 3E 4B 78 */ mr r30, r9 /* 801844D4 00181434 3B E0 00 00 */ li r31, 0 -/* 801844D8 00181438 A1 4D A3 8C */ lhz r10, lbl_805A8F4C@sda21(r13) +/* 801844D8 00181438 A1 4D A3 8C */ lhz r10, kInvalidUniqueId@sda21(r13) /* 801844DC 0018143C B1 5D 00 00 */ sth r10, 0(r29) /* 801844E0 00181440 81 46 00 08 */ lwz r10, 8(r6) /* 801844E4 00181444 80 E6 00 0C */ lwz r7, 0xc(r6) @@ -5223,7 +5223,7 @@ lbl_8018448C: /* 8018450C 0018146C 41 82 00 08 */ beq lbl_80184514 /* 80184510 00181470 3B E0 00 01 */ li r31, 1 lbl_80184514: -/* 80184514 00181474 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80184514 00181474 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80184518 00181478 7F 43 D3 78 */ mr r3, r26 /* 8018451C 0018147C 7F 64 DB 78 */ mr r4, r27 /* 80184520 00181480 7F 85 E3 78 */ mr r5, r28 diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 86e6fab1..3abb0b85 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -250,7 +250,7 @@ SetLight__10CGameLightFRC6CLight: /* 800B586C 000B27CC 38 C1 00 28 */ addi r6, r1, 0x28 /* 800B5870 000B27D0 80 05 00 00 */ lwz r0, 0(r5) /* 800B5874 000B27D4 38 AB D4 10 */ addi r5, r11, lbl_8056D410@l -/* 800B5878 000B27D8 81 8D A3 88 */ lwz r12, lbl_805A8F48@sda21(r13) +/* 800B5878 000B27D8 81 8D A3 88 */ lwz r12, kInvalidEditorId@sda21(r13) /* 800B587C 000B27DC 90 01 00 2C */ stw r0, 0x2c(r1) /* 800B5880 000B27E0 91 81 00 28 */ stw r12, 0x28(r1) /* 800B5884 000B27E4 4B F9 BC 01 */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" @@ -258,7 +258,7 @@ SetLight__10CGameLightFRC6CLight: /* 800B588C 000B27EC 4B F8 4F 19 */ bl CModelDataNull__10CModelDataFv /* 800B5890 000B27F0 38 61 00 50 */ addi r3, r1, 0x50 /* 800B5894 000B27F4 4B F6 55 A5 */ bl None__16CActorParametersFv -/* 800B5898 000B27F8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800B5898 000B27F8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800B589C 000B27FC 38 00 00 00 */ li r0, 0 /* 800B58A0 000B2800 80 AD 86 58 */ lwz r5, lbl_805A7218@sda21(r13) /* 800B58A4 000B2804 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index 4cd0b69a..d7f9bc11 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -430,7 +430,7 @@ DeleteProjectileLight__15CGameProjectileFR13CStateManager: /* 800378B0 00034810 90 01 00 24 */ stw r0, 0x24(r1) /* 800378B4 00034814 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800378B8 00034818 7C 7F 1B 78 */ mr r31, r3 -/* 800378BC 0003481C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800378BC 0003481C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800378C0 00034820 A0 63 02 C8 */ lhz r3, 0x2c8(r3) /* 800378C4 00034824 7C 03 00 40 */ cmplw r3, r0 /* 800378C8 00034828 41 82 00 20 */ beq lbl_800378E8 @@ -439,7 +439,7 @@ DeleteProjectileLight__15CGameProjectileFR13CStateManager: /* 800378D4 00034834 38 81 00 08 */ addi r4, r1, 8 /* 800378D8 00034838 B0 01 00 08 */ sth r0, 8(r1) /* 800378DC 0003483C 48 01 49 91 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 800378E0 00034840 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800378E0 00034840 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800378E4 00034844 B0 1F 02 C8 */ sth r0, 0x2c8(r31) lbl_800378E8: /* 800378E8 00034848 80 01 00 24 */ lwz r0, 0x24(r1) @@ -532,7 +532,7 @@ Chase__15CGameProjectileFfR13CStateManager: /* 80037A28 00034988 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80037A2C 0003498C 41 82 03 F0 */ beq lbl_80037E1C /* 80037A30 00034990 A0 7D 02 C0 */ lhz r3, 0x2c0(r29) -/* 80037A34 00034994 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80037A34 00034994 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80037A38 00034998 7C 03 00 40 */ cmplw r3, r0 /* 80037A3C 0003499C 41 82 03 E0 */ beq lbl_80037E1C /* 80037A40 000349A0 A0 1D 02 C0 */ lhz r0, 0x2c0(r29) @@ -568,7 +568,7 @@ lbl_80037A98: /* 80037AB4 00034A14 7C 00 22 78 */ xor r0, r0, r4 /* 80037AB8 00034A18 7C 60 03 79 */ or. r0, r3, r0 /* 80037ABC 00034A1C 40 82 00 10 */ bne lbl_80037ACC -/* 80037AC0 00034A20 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80037AC0 00034A20 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80037AC4 00034A24 B0 1D 02 C0 */ sth r0, 0x2c0(r29) /* 80037AC8 00034A28 48 00 03 54 */ b lbl_80037E1C lbl_80037ACC: @@ -614,7 +614,7 @@ lbl_80037B48: /* 80037B64 00034AC4 C3 83 00 2C */ lfs f28, 0x2c(r3) /* 80037B68 00034AC8 48 00 00 10 */ b lbl_80037B78 lbl_80037B6C: -/* 80037B6C 00034ACC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80037B6C 00034ACC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80037B70 00034AD0 B0 1D 02 C0 */ sth r0, 0x2c0(r29) /* 80037B74 00034AD4 48 00 02 A8 */ b lbl_80037E1C lbl_80037B78: @@ -642,7 +642,7 @@ lbl_80037B78: /* 80037BCC 00034B2C C0 1D 02 E0 */ lfs f0, 0x2e0(r29) /* 80037BD0 00034B30 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80037BD4 00034B34 40 80 00 10 */ bge lbl_80037BE4 -/* 80037BD8 00034B38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80037BD8 00034B38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80037BDC 00034B3C B0 1D 02 C0 */ sth r0, 0x2c0(r29) /* 80037BE0 00034B40 48 00 02 3C */ b lbl_80037E1C lbl_80037BE4: @@ -824,7 +824,7 @@ UpdateHoming__15CGameProjectileFfR13CStateManager: /* 80037E78 00034DD8 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80037E7C 00034DDC 41 82 00 68 */ beq lbl_80037EE4 /* 80037E80 00034DE0 A0 7E 02 C0 */ lhz r3, 0x2c0(r30) -/* 80037E84 00034DE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80037E84 00034DE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80037E88 00034DE8 7C 03 00 40 */ cmplw r3, r0 /* 80037E8C 00034DEC 41 82 00 58 */ beq lbl_80037EE4 /* 80037E90 00034DF0 C0 5E 02 A8 */ lfs f2, 0x2a8(r30) @@ -1104,7 +1104,7 @@ ApplyDamageToActors__15CGameProjectileFR13CStateManager: /* 80038290 000351F0 C0 43 00 58 */ lfs f2, 0x58(r3) /* 80038294 000351F4 C0 23 00 48 */ lfs f1, 0x48(r3) /* 80038298 000351F8 C0 03 00 38 */ lfs f0, 0x38(r3) -/* 8003829C 000351FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003829C 000351FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800382A0 00035200 D0 01 00 54 */ stfs f0, 0x54(r1) /* 800382A4 00035204 D0 21 00 58 */ stfs f1, 0x58(r1) /* 800382A8 00035208 D0 41 00 5C */ stfs f2, 0x5c(r1) @@ -1166,7 +1166,7 @@ ApplyDamageToActors__15CGameProjectileFR13CStateManager: /* 80038388 000352E8 7F A4 EB 78 */ mr r4, r29 /* 8003838C 000352EC 4B FD D6 A1 */ bl UnFreeze__7CPlayerFR13CStateManager lbl_80038390: -/* 80038390 000352F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80038390 000352F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80038394 000352F4 B0 1C 02 C6 */ sth r0, 0x2c6(r28) lbl_80038398: /* 80038398 000352F8 83 FC 02 DC */ lwz r31, 0x2dc(r28) @@ -1420,12 +1420,12 @@ Accept__15CGameProjectileFR8IVisitor: /* 800386FC 0003565C 7D 39 4B 78 */ mr r25, r9 /* 80038700 00035660 38 75 02 D0 */ addi r3, r21, 0x2d0 /* 80038704 00035664 4B FF FD B1 */ bl "clear__Q24rstl59vector<22CProjectileTouchResult,Q24rstl17rmemory_allocator>Fv" -/* 80038708 00035668 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80038708 00035668 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003870C 0003566C 38 61 00 1C */ addi r3, r1, 0x1c /* 80038710 00035670 C0 22 84 10 */ lfs f1, lbl_805AA130@sda21(r2) /* 80038714 00035674 B0 16 00 00 */ sth r0, 0(r22) /* 80038718 00035678 C0 02 84 14 */ lfs f0, lbl_805AA134@sda21(r2) -/* 8003871C 0003567C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003871C 0003567C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80038720 00035680 B0 15 02 C6 */ sth r0, 0x2c6(r21) /* 80038724 00035684 D0 21 00 1C */ stfs f1, 0x1c(r1) /* 80038728 00035688 D0 01 00 20 */ stfs f0, 0x20(r1) @@ -1610,7 +1610,7 @@ lbl_800389D8: /* 800389E4 00035944 98 01 01 C4 */ stb r0, 0x1c4(r1) lbl_800389E8: /* 800389E8 00035948 A0 61 02 50 */ lhz r3, 0x250(r1) -/* 800389EC 0003594C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800389EC 0003594C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800389F0 00035950 7C 03 00 40 */ cmplw r3, r0 /* 800389F4 00035954 40 82 00 18 */ bne lbl_80038A0C /* 800389F8 00035958 28 1D 00 00 */ cmplwi r29, 0 @@ -2010,7 +2010,7 @@ lbl_80038FD0: /* 80038FD4 00035F34 54 80 E7 FF */ rlwinm. r0, r4, 0x1c, 0x1f, 0x1f /* 80038FD8 00035F38 41 82 00 20 */ beq lbl_80038FF8 /* 80038FDC 00035F3C A0 76 00 00 */ lhz r3, 0(r22) -/* 80038FE0 00035F40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80038FE0 00035F40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80038FE4 00035F44 7C 03 00 40 */ cmplw r3, r0 /* 80038FE8 00035F48 40 82 00 10 */ bne lbl_80038FF8 /* 80038FEC 00035F4C 38 00 00 00 */ li r0, 0 @@ -2073,7 +2073,7 @@ CanCollideWith__15CGameProjectileFR6CActorR13CStateManager: /* 800390BC 0003601C 48 0C 94 01 */ bl GetVulnerability__20CDamageVulnerabilityCFRC11CWeaponMode /* 800390C0 00036020 2C 03 00 04 */ cmpwi r3, 4 /* 800390C4 00036024 40 82 00 84 */ bne lbl_80039148 -/* 800390C8 00036028 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800390C8 00036028 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800390CC 0003602C 38 60 00 00 */ li r3, 0 /* 800390D0 00036030 98 61 00 54 */ stb r3, 0x54(r1) /* 800390D4 00036034 B0 1C 00 00 */ sth r0, 0(r28) @@ -2208,7 +2208,7 @@ lbl_80039290: /* 800392AC 0003620C A0 1D 00 EC */ lhz r0, 0xec(r29) /* 800392B0 00036210 7C 03 00 40 */ cmplw r3, r0 /* 800392B4 00036214 40 82 00 84 */ bne lbl_80039338 -/* 800392B8 00036218 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800392B8 00036218 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800392BC 0003621C 38 60 00 00 */ li r3, 0 /* 800392C0 00036220 98 61 02 98 */ stb r3, 0x298(r1) /* 800392C4 00036224 B0 1C 00 00 */ sth r0, 0(r28) @@ -2568,7 +2568,7 @@ lbl_80039828: /* 8003982C 0003678C 98 01 01 A0 */ stb r0, 0x1a0(r1) /* 80039830 00036790 48 00 02 40 */ b lbl_80039A70 lbl_80039834: -/* 80039834 00036794 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039834 00036794 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039838 00036798 38 60 00 00 */ li r3, 0 /* 8003983C 0003679C 98 61 01 6C */ stb r3, 0x16c(r1) /* 80039840 000367A0 B0 1C 00 00 */ sth r0, 0(r28) @@ -2653,7 +2653,7 @@ lbl_80039968: /* 8003996C 000368CC 98 01 01 38 */ stb r0, 0x138(r1) /* 80039970 000368D0 48 00 01 00 */ b lbl_80039A70 lbl_80039974: -/* 80039974 000368D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039974 000368D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039978 000368D8 38 60 00 00 */ li r3, 0 /* 8003997C 000368DC 98 61 01 04 */ stb r3, 0x104(r1) /* 80039980 000368E0 B0 1C 00 00 */ sth r0, 0(r28) @@ -2769,7 +2769,7 @@ CanCollideWithGameObject__15CGameProjectileFR6CActorR13CStateManager: /* 80039B1C 00036A7C 4E 80 04 21 */ bctrl /* 80039B20 00036A80 28 03 00 00 */ cmplwi r3, 0 /* 80039B24 00036A84 40 82 00 84 */ bne lbl_80039BA8 -/* 80039B28 00036A88 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039B28 00036A88 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039B2C 00036A8C 38 60 00 00 */ li r3, 0 /* 80039B30 00036A90 98 61 01 CC */ stb r3, 0x1cc(r1) /* 80039B34 00036A94 B0 1C 00 00 */ sth r0, 0(r28) @@ -2807,7 +2807,7 @@ lbl_80039BA8: /* 80039BAC 00036B0C A0 1D 00 EC */ lhz r0, 0xec(r29) /* 80039BB0 00036B10 7C 03 00 40 */ cmplw r3, r0 /* 80039BB4 00036B14 40 82 00 84 */ bne lbl_80039C38 -/* 80039BB8 00036B18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039BB8 00036B18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039BBC 00036B1C 38 60 00 00 */ li r3, 0 /* 80039BC0 00036B20 98 61 01 98 */ stb r3, 0x198(r1) /* 80039BC4 00036B24 B0 1C 00 00 */ sth r0, 0(r28) @@ -2844,7 +2844,7 @@ lbl_80039C38: /* 80039C38 00036B98 A0 1D 02 C2 */ lhz r0, 0x2c2(r29) /* 80039C3C 00036B9C 7C 03 00 40 */ cmplw r3, r0 /* 80039C40 00036BA0 40 82 00 84 */ bne lbl_80039CC4 -/* 80039C44 00036BA4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039C44 00036BA4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039C48 00036BA8 38 60 00 00 */ li r3, 0 /* 80039C4C 00036BAC 98 61 01 64 */ stb r3, 0x164(r1) /* 80039C50 00036BB0 B0 1C 00 00 */ sth r0, 0(r28) @@ -2897,7 +2897,7 @@ lbl_80039CC4: /* 80039D04 00036C64 90 C1 00 20 */ stw r6, 0x20(r1) /* 80039D08 00036C68 90 A1 00 28 */ stw r5, 0x28(r1) /* 80039D0C 00036C6C 41 82 00 88 */ beq lbl_80039D94 -/* 80039D10 00036C70 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039D10 00036C70 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039D14 00036C74 28 04 00 00 */ cmplwi r4, 0 /* 80039D18 00036C78 98 81 01 30 */ stb r4, 0x130(r1) /* 80039D1C 00036C7C B0 1C 00 00 */ sth r0, 0(r28) @@ -2946,7 +2946,7 @@ lbl_80039D94: /* 80039DC0 00036D20 4E 80 04 21 */ bctrl /* 80039DC4 00036D24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80039DC8 00036D28 40 82 01 B4 */ bne lbl_80039F7C -/* 80039DCC 00036D2C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039DCC 00036D2C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039DD0 00036D30 38 60 00 00 */ li r3, 0 /* 80039DD4 00036D34 98 61 00 FC */ stb r3, 0xfc(r1) /* 80039DD8 00036D38 B0 1C 00 00 */ sth r0, 0(r28) @@ -3027,7 +3027,7 @@ lbl_80039EEC: /* 80039EF0 00036E50 41 82 00 8C */ beq lbl_80039F7C /* 80039EF4 00036E54 2C 00 00 01 */ cmpwi r0, 1 /* 80039EF8 00036E58 41 82 00 84 */ beq lbl_80039F7C -/* 80039EFC 00036E5C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80039EFC 00036E5C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80039F00 00036E60 38 60 00 00 */ li r3, 0 /* 80039F04 00036E64 98 61 00 94 */ stb r3, 0x94(r1) /* 80039F08 00036E68 B0 1C 00 00 */ sth r0, 0(r28) @@ -3197,7 +3197,7 @@ lbl_8003A138: /* 8003A150 000370B0 B0 01 00 08 */ sth r0, 8(r1) /* 8003A154 000370B4 48 00 00 08 */ b lbl_8003A15C lbl_8003A158: -/* 8003A158 000370B8 38 6D A3 8C */ addi r3, r13, lbl_805A8F4C@sda21 +/* 8003A158 000370B8 38 6D A3 8C */ addi r3, r13, kInvalidUniqueId@sda21 lbl_8003A15C: /* 8003A15C 000370BC A0 63 00 00 */ lhz r3, 0(r3) /* 8003A160 000370C0 88 01 00 90 */ lbz r0, 0x90(r1) @@ -3234,7 +3234,7 @@ lbl_8003A1D4: /* 8003A1D8 00037138 98 01 00 90 */ stb r0, 0x90(r1) /* 8003A1DC 0003713C 48 00 00 80 */ b lbl_8003A25C lbl_8003A1E0: -/* 8003A1E0 00037140 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003A1E0 00037140 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003A1E4 00037144 38 60 00 00 */ li r3, 0 /* 8003A1E8 00037148 98 61 00 5C */ stb r3, 0x5c(r1) /* 8003A1EC 0003714C B0 1C 00 00 */ sth r0, 0(r28) @@ -3599,13 +3599,13 @@ lbl_8003A6E0: /* 8003A70C 0003766C D8 2F 02 B8 */ stfd f1, 0x2b8(r15) /* 8003A710 00037670 A0 84 00 00 */ lhz r4, 0(r4) /* 8003A714 00037674 B0 8F 02 C0 */ sth r4, 0x2c0(r15) -/* 8003A718 00037678 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8003A718 00037678 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8003A71C 0003767C B0 8F 02 C2 */ sth r4, 0x2c2(r15) -/* 8003A720 00037680 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8003A720 00037680 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8003A724 00037684 B0 8F 02 C4 */ sth r4, 0x2c4(r15) -/* 8003A728 00037688 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8003A728 00037688 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8003A72C 0003768C B0 8F 02 C6 */ sth r4, 0x2c6(r15) -/* 8003A730 00037690 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8003A730 00037690 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8003A734 00037694 B0 8F 02 C8 */ sth r4, 0x2c8(r15) /* 8003A738 00037698 80 91 00 00 */ lwz r4, 0(r17) /* 8003A73C 0003769C 80 84 00 08 */ lwz r4, 8(r4) diff --git a/asm/MetroidPrime/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s index 8690e6e1..d9b90b8e 100644 --- a/asm/MetroidPrime/CGroundMovement.s +++ b/asm/MetroidPrime/CGroundMovement.s @@ -189,7 +189,7 @@ lbl_80185B74: /* 80185BF4 00182B54 C0 1C 00 20 */ lfs f0, 0x20(r28) /* 80185BF8 00182B58 FC 19 00 40 */ fcmpo cr0, f25, f0 /* 80185BFC 00182B5C 40 81 00 E4 */ ble lbl_80185CE0 -/* 80185C00 00182B60 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80185C00 00182B60 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80185C04 00182B64 7F 23 CB 78 */ mr r3, r25 /* 80185C08 00182B68 80 A1 00 C4 */ lwz r5, 0xc4(r1) /* 80185C0C 00182B6C 80 81 00 C8 */ lwz r4, 0xc8(r1) @@ -225,7 +225,7 @@ lbl_80185B74: /* 80185C84 00182BE4 39 41 00 10 */ addi r10, r1, 0x10 /* 80185C88 00182BE8 4B FF E6 65 */ bl "DetectCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRd" /* 80185C8C 00182BEC A0 61 00 10 */ lhz r3, 0x10(r1) -/* 80185C90 00182BF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80185C90 00182BF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80185C94 00182BF4 7C 03 00 40 */ cmplw r3, r0 /* 80185C98 00182BF8 41 82 00 38 */ beq lbl_80185CD0 /* 80185C9C 00182BFC 88 1D 00 04 */ lbz r0, 4(r29) @@ -1312,7 +1312,7 @@ lbl_80186C18: /* 80186C2C 00183B8C 48 14 75 5D */ bl __ct__14CCollisionInfoFQ214CCollisionInfo8EInvalid /* 80186C30 00183B90 D3 A1 01 BC */ stfs f29, 0x1bc(r1) /* 80186C34 00183B94 7E 23 8B 78 */ mr r3, r17 -/* 80186C38 00183B98 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80186C38 00183B98 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80186C3C 00183B9C D3 A1 01 C0 */ stfs f29, 0x1c0(r1) /* 80186C40 00183BA0 80 A1 01 BC */ lwz r5, 0x1bc(r1) /* 80186C44 00183BA4 D3 C1 01 C4 */ stfs f30, 0x1c4(r1) @@ -1398,7 +1398,7 @@ lbl_80186CEC: /* 80186D78 00183CD8 38 80 00 00 */ li r4, 0 /* 80186D7C 00183CDC 48 14 74 0D */ bl __ct__14CCollisionInfoFQ214CCollisionInfo8EInvalid /* 80186D80 00183CE0 C8 01 00 98 */ lfd f0, 0x98(r1) -/* 80186D84 00183CE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80186D84 00183CE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80186D88 00183CE8 FC 20 E0 2A */ fadd f1, f0, f28 /* 80186D8C 00183CEC C8 02 A3 50 */ lfd f0, lbl_805AC070@sda21(r2) /* 80186D90 00183CF0 B0 01 00 34 */ sth r0, 0x34(r1) @@ -1619,7 +1619,7 @@ lbl_80187098: /* 801870A0 00184000 7E 23 8B 78 */ mr r3, r17 /* 801870A4 00184004 7C 84 02 14 */ add r4, r4, r0 /* 801870A8 00184008 4B F9 4D 7D */ bl SetPhysicsState__13CPhysicsActorFRC13CPhysicsState -/* 801870AC 0018400C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801870AC 0018400C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801870B0 00184010 7E 03 83 78 */ mr r3, r16 /* 801870B4 00184014 7E 24 8B 78 */ mr r4, r17 /* 801870B8 00184018 38 A1 00 2C */ addi r5, r1, 0x2c @@ -1954,7 +1954,7 @@ lbl_80187504: /* 80187528 00184488 7D 89 03 A6 */ mtctr r12 /* 8018752C 0018448C 4E 80 04 21 */ bctrl /* 80187530 00184490 C8 02 A3 70 */ lfd f0, lbl_805AC090@sda21(r2) -/* 80187534 00184494 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80187534 00184494 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80187538 00184498 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8018753C 0018449C D8 21 00 88 */ stfd f1, 0x88(r1) /* 80187540 001844A0 C3 02 A3 18 */ lfs f24, lbl_805AC038@sda21(r2) @@ -2040,7 +2040,7 @@ lbl_80187600: /* 8018767C 001845DC 4B FF CC 71 */ bl "DetectCollision_Cached_Moving__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCacheRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilterRCQ24rstl32reserved_vector<9TUniqueId,1024>9CVector3fR9TUniqueIdR14CCollisionInfoRd" lbl_80187680: /* 80187680 001845E0 A0 81 00 30 */ lhz r4, 0x30(r1) -/* 80187684 001845E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80187684 001845E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80187688 001845E8 7C 04 00 40 */ cmplw r4, r0 /* 8018768C 001845EC 41 82 00 38 */ beq lbl_801876C4 /* 80187690 001845F0 88 01 08 34 */ lbz r0, 0x834(r1) @@ -2137,7 +2137,7 @@ lbl_801877CC: /* 801877D0 00184730 98 01 01 0C */ stb r0, 0x10c(r1) /* 801877D4 00184734 48 00 01 C4 */ b lbl_80187998 lbl_801877D8: -/* 801877D8 00184738 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801877D8 00184738 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801877DC 0018473C 7E 03 83 78 */ mr r3, r16 /* 801877E0 00184740 7E 24 8B 78 */ mr r4, r17 /* 801877E4 00184744 38 A1 00 1C */ addi r5, r1, 0x1c @@ -3094,7 +3094,7 @@ lbl_801885B4: /* 801885B4 00185514 38 63 00 01 */ addi r3, r3, 1 /* 801885B8 00185518 42 00 FF FC */ bdnz lbl_801885B4 lbl_801885BC: -/* 801885BC 0018551C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801885BC 0018551C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801885C0 00185520 38 60 00 00 */ li r3, 0 /* 801885C4 00185524 90 61 1A A8 */ stw r3, 0x1aa8(r1) /* 801885C8 00185528 7F C4 F3 78 */ mr r4, r30 @@ -3443,7 +3443,7 @@ lbl_80188A9C: /* 80188AC8 00185A28 7C 00 22 78 */ xor r0, r0, r4 /* 80188ACC 00185A2C 7C 60 03 79 */ or. r0, r3, r0 /* 80188AD0 00185A30 40 82 00 20 */ bne lbl_80188AF0 -/* 80188AD4 00185A34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80188AD4 00185A34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80188AD8 00185A38 7F A3 EB 78 */ mr r3, r29 /* 80188ADC 00185A3C 7F C4 F3 78 */ mr r4, r30 /* 80188AE0 00185A40 38 A1 00 08 */ addi r5, r1, 8 @@ -3540,7 +3540,7 @@ lbl_80188B8C: /* 80188C24 00185B84 7F 03 C3 78 */ mr r3, r24 /* 80188C28 00185B88 38 81 00 54 */ addi r4, r1, 0x54 /* 80188C2C 00185B8C 4B F9 1E 0D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f -/* 80188C30 00185B90 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80188C30 00185B90 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80188C34 00185B94 3C 60 80 5A */ lis r3, lbl_805A6754@ha /* 80188C38 00185B98 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l /* 80188C3C 00185B9C 7F 04 C3 78 */ mr r4, r24 @@ -3690,7 +3690,7 @@ lbl_80188E50: lbl_80188E5C: /* 80188E5C 00185DBC 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 80188E60 00185DC0 40 82 00 20 */ bne lbl_80188E80 -/* 80188E64 00185DC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80188E64 00185DC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80188E68 00185DC8 7E E3 BB 78 */ mr r3, r23 /* 80188E6C 00185DCC 7F 04 C3 78 */ mr r4, r24 /* 80188E70 00185DD0 38 A1 00 08 */ addi r5, r1, 8 @@ -3963,7 +3963,7 @@ lbl_80189238: lbl_80189244: /* 80189244 001861A4 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 80189248 001861A8 40 82 00 20 */ bne lbl_80189268 -/* 8018924C 001861AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018924C 001861AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189250 001861B0 7F A3 EB 78 */ mr r3, r29 /* 80189254 001861B4 7F C4 F3 78 */ mr r4, r30 /* 80189258 001861B8 38 A1 00 08 */ addi r5, r1, 8 @@ -4073,7 +4073,7 @@ lbl_80189368: /* 801893DC 0018633C D0 21 02 3C */ stfs f1, 0x23c(r1) /* 801893E0 00186340 D0 01 02 40 */ stfs f0, 0x240(r1) /* 801893E4 00186344 48 18 B4 D5 */ bl Magnitude__9CVector3fCFv -/* 801893E8 00186348 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801893E8 00186348 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801893EC 0018634C 38 80 00 00 */ li r4, 0 /* 801893F0 00186350 FF E0 08 90 */ fmr f31, f1 /* 801893F4 00186354 90 81 32 24 */ stw r4, 0x3224(r1) @@ -4229,7 +4229,7 @@ lbl_80189510: /* 80189628 00186588 C0 81 00 44 */ lfs f4, 0x44(r1) /* 8018962C 0018658C C0 61 00 48 */ lfs f3, 0x48(r1) /* 80189630 00186590 EC 46 00 B2 */ fmuls f2, f6, f2 -/* 80189634 00186594 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189634 00186594 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189638 00186598 EC 26 00 72 */ fmuls f1, f6, f1 /* 8018963C 0018659C 80 AD 8E AC */ lwz r5, lbl_805A7A6C@sda21(r13) /* 80189640 001865A0 EC 06 00 32 */ fmuls f0, f6, f0 @@ -4390,7 +4390,7 @@ lbl_80189890: lbl_80189894: /* 80189894 001867F4 C0 02 A3 18 */ lfs f0, lbl_805AC038@sda21(r2) /* 80189898 001867F8 38 60 00 00 */ li r3, 0 -/* 8018989C 001867FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018989C 001867FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801898A0 00186800 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801898A4 00186804 90 61 32 24 */ stw r3, 0x3224(r1) /* 801898A8 00186808 B0 01 00 18 */ sth r0, 0x18(r1) @@ -4460,7 +4460,7 @@ lbl_801899A0: /* 801899A4 00186904 7F 64 DB 78 */ mr r4, r27 /* 801899A8 00186908 7F A5 EB 78 */ mr r5, r29 /* 801899AC 0018690C 4B FF 8F AD */ bl SendMaterialMessage__14CGameCollisionFR13CStateManagerRC13CMaterialListR6CActor -/* 801899B0 00186910 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801899B0 00186910 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801899B4 00186914 7F 83 E3 78 */ mr r3, r28 /* 801899B8 00186918 7F A4 EB 78 */ mr r4, r29 /* 801899BC 0018691C 38 A1 00 08 */ addi r5, r1, 8 @@ -4692,7 +4692,7 @@ lbl_80189CB4: lbl_80189CC8: /* 80189CC8 00186C28 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80189CCC 00186C2C 40 82 00 24 */ bne lbl_80189CF0 -/* 80189CD0 00186C30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189CD0 00186C30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189CD4 00186C34 7F 83 E3 78 */ mr r3, r28 /* 80189CD8 00186C38 7F 64 DB 78 */ mr r4, r27 /* 80189CDC 00186C3C 38 A1 00 0C */ addi r5, r1, 0xc @@ -4701,7 +4701,7 @@ lbl_80189CC8: /* 80189CE8 00186C48 4B EB A1 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage /* 80189CEC 00186C4C 48 00 00 94 */ b lbl_80189D80 lbl_80189CF0: -/* 80189CF0 00186C50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189CF0 00186C50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189CF4 00186C54 7F 83 E3 78 */ mr r3, r28 /* 80189CF8 00186C58 7F 64 DB 78 */ mr r4, r27 /* 80189CFC 00186C5C 38 A1 00 08 */ addi r5, r1, 8 diff --git a/asm/MetroidPrime/CMFGame.s b/asm/MetroidPrime/CMFGame.s index b29ae5c3..6685f076 100644 --- a/asm/MetroidPrime/CMFGame.s +++ b/asm/MetroidPrime/CMFGame.s @@ -1070,7 +1070,7 @@ lbl_800247D0: /* 800247E8 00021748 80 7D 00 18 */ lwz r3, 0x18(r29) /* 800247EC 0002174C 80 63 00 00 */ lwz r3, 0(r3) /* 800247F0 00021750 48 0E 4A 25 */ bl StartFadeIn__17CInGameGuiManagerFv -/* 800247F4 00021754 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800247F4 00021754 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800247F8 00021758 B0 1D 00 28 */ sth r0, 0x28(r29) /* 800247FC 0002175C 48 00 02 24 */ b lbl_80024A20 lbl_80024800: @@ -1351,7 +1351,7 @@ lbl_80024A74: /* 80024BFC 00021B5C 28 1C 00 00 */ cmplwi r28, 0 /* 80024C00 00021B60 41 82 00 48 */ beq lbl_80024C48 /* 80024C04 00021B64 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 80024C08 00021B68 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80024C08 00021B68 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80024C0C 00021B6C 80 63 00 00 */ lwz r3, 0(r3) /* 80024C10 00021B70 A0 63 0F 38 */ lhz r3, 0xf38(r3) /* 80024C14 00021B74 7C 03 00 40 */ cmplw r3, r0 @@ -1628,7 +1628,7 @@ lbl_80024F20: /* 80024FCC 00021F2C 90 07 00 04 */ stw r0, 4(r7) /* 80024FD0 00021F30 90 9F 00 1C */ stw r4, 0x1c(r31) /* 80024FD4 00021F34 90 9F 00 24 */ stw r4, 0x24(r31) -/* 80024FD8 00021F38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80024FD8 00021F38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80024FDC 00021F3C B0 1F 00 28 */ sth r0, 0x28(r31) /* 80024FE0 00021F40 88 1F 00 2A */ lbz r0, 0x2a(r31) /* 80024FE4 00021F44 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/CObjectList.s b/asm/MetroidPrime/CObjectList.s index 1944f581..c1f0fd71 100644 --- a/asm/MetroidPrime/CObjectList.s +++ b/asm/MetroidPrime/CObjectList.s @@ -60,7 +60,7 @@ lbl_8000FD3C: .global GetValidObjectById__11CObjectListCF9TUniqueId GetValidObjectById__11CObjectListCF9TUniqueId: /* 8000FD4C 0000CCAC A0 A4 00 00 */ lhz r5, 0(r4) -/* 8000FD50 0000CCB0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000FD50 0000CCB0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000FD54 0000CCB4 7C 05 00 40 */ cmplw r5, r0 /* 8000FD58 0000CCB8 40 82 00 0C */ bne lbl_8000FD64 /* 8000FD5C 0000CCBC 38 60 00 00 */ li r3, 0 @@ -85,7 +85,7 @@ lbl_8000FD8C: .global GetValidObjectById__11CObjectListF9TUniqueId GetValidObjectById__11CObjectListF9TUniqueId: /* 8000FD9C 0000CCFC A0 A4 00 00 */ lhz r5, 0(r4) -/* 8000FDA0 0000CD00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000FDA0 0000CD00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000FDA4 0000CD04 7C 05 00 40 */ cmplw r5, r0 /* 8000FDA8 0000CD08 40 82 00 0C */ bne lbl_8000FDB4 /* 8000FDAC 0000CD0C 38 60 00 00 */ li r3, 0 @@ -110,7 +110,7 @@ lbl_8000FDDC: .global GetObjectById__11CObjectListCF9TUniqueId GetObjectById__11CObjectListCF9TUniqueId: /* 8000FDEC 0000CD4C A0 A4 00 00 */ lhz r5, 0(r4) -/* 8000FDF0 0000CD50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000FDF0 0000CD50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000FDF4 0000CD54 7C 05 00 40 */ cmplw r5, r0 /* 8000FDF8 0000CD58 40 82 00 0C */ bne lbl_8000FE04 /* 8000FDFC 0000CD5C 38 60 00 00 */ li r3, 0 @@ -138,7 +138,7 @@ lbl_8000FE38: .global GetObjectById__11CObjectListF9TUniqueId GetObjectById__11CObjectListF9TUniqueId: /* 8000FE48 0000CDA8 A0 A4 00 00 */ lhz r5, 0(r4) -/* 8000FE4C 0000CDAC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000FE4C 0000CDAC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000FE50 0000CDB0 7C 05 00 40 */ cmplw r5, r0 /* 8000FE54 0000CDB4 40 82 00 0C */ bne lbl_8000FE60 /* 8000FE58 0000CDB8 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/CParticleGenInfo.s b/asm/MetroidPrime/CParticleGenInfo.s index 478c27d1..4dfb57b3 100644 --- a/asm/MetroidPrime/CParticleGenInfo.s +++ b/asm/MetroidPrime/CParticleGenInfo.s @@ -94,7 +94,7 @@ lbl_800B776C: /* 800B7800 000B4760 80 B9 00 00 */ lwz r5, 0(r25) /* 800B7804 000B4764 3C 60 80 3D */ lis r3, lbl_803CDE88@ha /* 800B7808 000B4768 38 83 DE 88 */ addi r4, r3, lbl_803CDE88@l -/* 800B780C 000B476C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B780C 000B476C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7810 000B4770 83 65 00 00 */ lwz r27, 0(r5) /* 800B7814 000B4774 38 61 00 24 */ addi r3, r1, 0x24 /* 800B7818 000B4778 38 84 00 07 */ addi r4, r4, 7 @@ -157,7 +157,7 @@ lbl_800B78F0: /* 800B78F4 000B4854 B0 1C 00 00 */ sth r0, 0(r28) /* 800B78F8 000B4858 48 00 00 0C */ b lbl_800B7904 lbl_800B78FC: -/* 800B78FC 000B485C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B78FC 000B485C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7900 000B4860 B0 1C 00 00 */ sth r0, 0(r28) lbl_800B7904: /* 800B7904 000B4864 BB 21 00 E4 */ lmw r25, 0xe4(r1) diff --git a/asm/MetroidPrime/CParticleGenInfoGeneric.s b/asm/MetroidPrime/CParticleGenInfoGeneric.s index 14a76480..0d65c5c5 100644 --- a/asm/MetroidPrime/CParticleGenInfoGeneric.s +++ b/asm/MetroidPrime/CParticleGenInfoGeneric.s @@ -143,7 +143,7 @@ DeleteLight__23CParticleGenInfoGenericFR13CStateManager: /* 800B7030 000B3F90 90 01 00 24 */ stw r0, 0x24(r1) /* 800B7034 000B3F94 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800B7038 000B3F98 7C 7F 1B 78 */ mr r31, r3 -/* 800B703C 000B3F9C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B703C 000B3F9C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7040 000B3FA0 A0 63 00 88 */ lhz r3, 0x88(r3) /* 800B7044 000B3FA4 7C 03 00 40 */ cmplw r3, r0 /* 800B7048 000B3FA8 41 82 00 20 */ beq lbl_800B7068 @@ -152,7 +152,7 @@ DeleteLight__23CParticleGenInfoGenericFR13CStateManager: /* 800B7054 000B3FB4 38 81 00 08 */ addi r4, r1, 8 /* 800B7058 000B3FB8 B0 01 00 08 */ sth r0, 8(r1) /* 800B705C 000B3FBC 4B F9 52 11 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 800B7060 000B3FC0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B7060 000B3FC0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7064 000B3FC4 B0 1F 00 88 */ sth r0, 0x88(r31) lbl_800B7068: /* 800B7068 000B3FC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -179,7 +179,7 @@ SetParticleEmission__23CParticleGenInfoGenericFbR13CStateManager: /* 800B70B0 000B4010 7D 89 03 A6 */ mtctr r12 /* 800B70B4 000B4014 4E 80 04 21 */ bctrl /* 800B70B8 000B4018 A0 7D 00 88 */ lhz r3, 0x88(r29) -/* 800B70BC 000B401C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B70BC 000B401C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B70C0 000B4020 7C 03 00 40 */ cmplw r3, r0 /* 800B70C4 000B4024 41 82 00 44 */ beq lbl_800B7108 /* 800B70C8 000B4028 A0 1D 00 88 */ lhz r0, 0x88(r29) @@ -241,7 +241,7 @@ SetGlobalTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: /* 800B718C 000B40EC 7D 89 03 A6 */ mtctr r12 /* 800B7190 000B40F0 4E 80 04 21 */ bctrl /* 800B7194 000B40F4 A0 7D 00 88 */ lhz r3, 0x88(r29) -/* 800B7198 000B40F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B7198 000B40F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B719C 000B40FC 7C 03 00 40 */ cmplw r3, r0 /* 800B71A0 000B4100 41 82 00 38 */ beq lbl_800B71D8 /* 800B71A4 000B4104 A0 1D 00 88 */ lhz r0, 0x88(r29) @@ -284,7 +284,7 @@ SetGlobalOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager /* 800B7228 000B4188 7D 89 03 A6 */ mtctr r12 /* 800B722C 000B418C 4E 80 04 21 */ bctrl /* 800B7230 000B4190 A0 7D 00 88 */ lhz r3, 0x88(r29) -/* 800B7234 000B4194 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B7234 000B4194 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7238 000B4198 7C 03 00 40 */ cmplw r3, r0 /* 800B723C 000B419C 41 82 00 98 */ beq lbl_800B72D4 /* 800B7240 000B41A0 A0 1D 00 88 */ lhz r0, 0x88(r29) @@ -351,7 +351,7 @@ SetTranslation__23CParticleGenInfoGenericFRC9CVector3fR13CStateManager: /* 800B7324 000B4284 7D 89 03 A6 */ mtctr r12 /* 800B7328 000B4288 4E 80 04 21 */ bctrl /* 800B732C 000B428C A0 7D 00 88 */ lhz r3, 0x88(r29) -/* 800B7330 000B4290 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B7330 000B4290 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B7334 000B4294 7C 03 00 40 */ cmplw r3, r0 /* 800B7338 000B4298 41 82 00 38 */ beq lbl_800B7370 /* 800B733C 000B429C A0 1D 00 88 */ lhz r0, 0x88(r29) @@ -394,7 +394,7 @@ SetOrientation__23CParticleGenInfoGenericFRC12CTransform4fR13CStateManager: /* 800B73C0 000B4320 7D 89 03 A6 */ mtctr r12 /* 800B73C4 000B4324 4E 80 04 21 */ bctrl /* 800B73C8 000B4328 A0 7D 00 88 */ lhz r3, 0x88(r29) -/* 800B73CC 000B432C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B73CC 000B432C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B73D0 000B4330 7C 03 00 40 */ cmplw r3, r0 /* 800B73D4 000B4334 41 82 00 BC */ beq lbl_800B7490 /* 800B73D8 000B4338 A0 1D 00 88 */ lhz r0, 0x88(r29) @@ -468,7 +468,7 @@ Update__23CParticleGenInfoGenericFfR13CStateManager: /* 800B74D8 000B4438 7D 89 03 A6 */ mtctr r12 /* 800B74DC 000B443C 4E 80 04 21 */ bctrl /* 800B74E0 000B4440 A0 7E 00 88 */ lhz r3, 0x88(r30) -/* 800B74E4 000B4444 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B74E4 000B4444 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B74E8 000B4448 7C 03 00 40 */ cmplw r3, r0 /* 800B74EC 000B444C 41 82 00 58 */ beq lbl_800B7544 /* 800B74F0 000B4450 A0 1E 00 88 */ lhz r0, 0x88(r30) @@ -608,7 +608,7 @@ lbl_800B7644: /* 800B76C8 000B4628 38 03 00 01 */ addi r0, r3, 1 /* 800B76CC 000B462C 90 04 00 04 */ stw r0, 4(r4) /* 800B76D0 000B4630 40 82 00 0C */ bne lbl_800B76DC -/* 800B76D4 000B4634 38 6D A3 8C */ addi r3, r13, lbl_805A8F4C@sda21 +/* 800B76D4 000B4634 38 6D A3 8C */ addi r3, r13, kInvalidUniqueId@sda21 /* 800B76D8 000B4638 48 00 00 28 */ b lbl_800B7700 lbl_800B76DC: /* 800B76DC 000B463C 80 1E 00 00 */ lwz r0, 0(r30) diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 25d3b3b9..63278c23 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -2309,7 +2309,7 @@ lbl_8011C494: /* 8011C4CC 0011942C BF 41 00 58 */ stmw r26, 0x58(r1) /* 8011C4D0 00119430 A0 04 00 00 */ lhz r0, 0(r4) /* 8011C4D4 00119434 FF C0 08 90 */ fmr f30, f1 -/* 8011C4D8 00119438 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8011C4D8 00119438 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8011C4DC 0011943C FF E0 10 90 */ fmr f31, f2 /* 8011C4E0 00119440 B0 01 00 14 */ sth r0, 0x14(r1) /* 8011C4E4 00119444 38 01 00 10 */ addi r0, r1, 0x10 diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s index 6dd2971b..54b1b108 100644 --- a/asm/MetroidPrime/CRagDoll.s +++ b/asm/MetroidPrime/CRagDoll.s @@ -1267,7 +1267,7 @@ lbl_8020D97C: /* 8020D994 0020A8F4 7F C3 F3 78 */ mr r3, r30 /* 8020D998 0020A8F8 38 81 09 5C */ addi r4, r1, 0x95c /* 8020D99C 0020A8FC 4B F7 6D 29 */ bl BuildAreaCollisionCache__14CGameCollisionFRC13CStateManagerR19CAreaCollisionCache -/* 8020D9A0 0020A900 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8020D9A0 0020A900 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8020D9A4 0020A904 3B 60 00 00 */ li r27, 0 /* 8020D9A8 0020A908 B0 01 00 10 */ sth r0, 0x10(r1) /* 8020D9AC 0020A90C 88 1D 00 68 */ lbz r0, 0x68(r29) diff --git a/asm/MetroidPrime/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s index d35afb94..fa0befb6 100644 --- a/asm/MetroidPrime/CRippleManager.s +++ b/asm/MetroidPrime/CRippleManager.s @@ -156,7 +156,7 @@ Init__14CRippleManagerFi: /* 8011D138 0011A098 93 C1 00 58 */ stw r30, 0x58(r1) /* 8011D13C 0011A09C 7C 7E 1B 78 */ mr r30, r3 /* 8011D140 0011A0A0 38 61 00 0C */ addi r3, r1, 0xc -/* 8011D144 0011A0A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8011D144 0011A0A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8011D148 0011A0A8 B0 01 00 08 */ sth r0, 8(r1) /* 8011D14C 0011A0AC 4B FF F7 D1 */ bl __ct__7CRippleF9TUniqueIdRC9CVector3ff /* 8011D150 0011A0B0 7C 65 1B 78 */ mr r5, r3 diff --git a/asm/MetroidPrime/CScriptMailbox.s b/asm/MetroidPrime/CScriptMailbox.s index 0079cbec..bdf895a8 100644 --- a/asm/MetroidPrime/CScriptMailbox.s +++ b/asm/MetroidPrime/CScriptMailbox.s @@ -144,7 +144,7 @@ lbl_800E1BA0: /* 800E1BD4 000DEB34 41 82 00 3C */ beq lbl_800E1C10 /* 800E1BD8 000DEB38 80 A1 00 24 */ lwz r5, 0x24(r1) /* 800E1BDC 000DEB3C 7F 63 DB 78 */ mr r3, r27 -/* 800E1BE0 000DEB40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E1BE0 000DEB40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E1BE4 000DEB44 38 81 00 08 */ addi r4, r1, 8 /* 800E1BE8 000DEB48 90 A1 00 14 */ stw r5, 0x14(r1) /* 800E1BEC 000DEB4C 38 A1 00 14 */ addi r5, r1, 0x14 diff --git a/asm/MetroidPrime/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s index 61321e46..84f493cb 100644 --- a/asm/MetroidPrime/CSimpleShadow.s +++ b/asm/MetroidPrime/CSimpleShadow.s @@ -402,7 +402,7 @@ lbl_80106010: /* 80106094 00102FF4 90 01 00 48 */ stw r0, 0x48(r1) /* 80106098 00102FF8 C0 3E 00 40 */ lfs f1, 0x40(r30) /* 8010609C 00102FFC 4B F4 66 3D */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" -/* 801060A0 00103000 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801060A0 00103000 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801060A4 00103004 3C 60 80 5A */ lis r3, lbl_8059FD18@ha /* 801060A8 00103008 39 03 FD 18 */ addi r8, r3, lbl_8059FD18@l /* 801060AC 0010300C 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index dfde7d6a..d5205185 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -378,7 +378,7 @@ sub_80044098: /* 800440FC 0004105C 48 2C EA 79 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80044100 00041060 A0 78 00 00 */ lhz r3, 0(r24) /* 80044104 00041064 3B 20 00 01 */ li r25, 1 -/* 80044108 00041068 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80044108 00041068 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004410C 0004106C C0 5F 00 04 */ lfs f2, 4(r31) /* 80044110 00041070 C0 3F 00 08 */ lfs f1, 8(r31) /* 80044114 00041074 7C 03 00 40 */ cmplw r3, r0 @@ -480,9 +480,9 @@ lbl_8004420C: /* 80044284 000411E4 38 61 00 40 */ addi r3, r1, 0x40 /* 80044288 000411E8 38 84 00 07 */ addi r4, r4, 7 /* 8004428C 000411EC 4B FC 0A 2D */ bl string_l__4rstlFPCc -/* 80044290 000411F0 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 80044290 000411F0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 80044294 000411F4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80044298 000411F8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80044298 000411F8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004429C 000411FC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 800442A0 00041200 90 81 00 34 */ stw r4, 0x34(r1) /* 800442A4 00041204 38 61 00 7C */ addi r3, r1, 0x7c @@ -712,7 +712,7 @@ UpdateThermalVisor__13CStateManagerFv: /* 800445C8 00041528 2C 03 00 03 */ cmpwi r3, 3 /* 800445CC 0004152C 40 82 01 DC */ bne lbl_800447A8 /* 800445D0 00041530 80 BC 08 CC */ lwz r5, 0x8cc(r28) -/* 800445D4 00041534 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800445D4 00041534 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800445D8 00041538 90 A1 00 18 */ stw r5, 0x18(r1) /* 800445DC 0004153C 7C 05 00 00 */ cmpw r5, r0 /* 800445E0 00041540 41 82 01 C8 */ beq lbl_800447A8 @@ -768,7 +768,7 @@ lbl_80044630: /* 800446A4 00041604 38 A0 00 00 */ li r5, 0 /* 800446A8 00041608 48 01 AC 7D */ bl GetConnectedAreaId__Q29IGameArea4DockCFi /* 800446AC 0004160C 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 800446B0 00041610 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800446B0 00041610 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800446B4 00041614 90 A1 00 14 */ stw r5, 0x14(r1) /* 800446B8 00041618 7C 05 00 00 */ cmpw r5, r0 /* 800446BC 0004161C 41 82 00 4C */ beq lbl_80044708 @@ -1006,7 +1006,7 @@ SpecialSkipCinematic__13CStateManagerFv: /* 800449C4 00041924 93 C1 00 18 */ stw r30, 0x18(r1) /* 800449C8 00041928 93 A1 00 14 */ stw r29, 0x14(r1) /* 800449CC 0004192C 7C 7D 1B 78 */ mr r29, r3 -/* 800449D0 00041930 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800449D0 00041930 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800449D4 00041934 A0 A3 0F 38 */ lhz r5, 0xf38(r3) /* 800449D8 00041938 7C 05 00 40 */ cmplw r5, r0 /* 800449DC 0004193C 40 82 00 0C */ bne lbl_800449E8 @@ -1654,7 +1654,7 @@ SetActorAreaId__13CStateManagerFR6CActor7TAreaId: /* 8004529C 000421FC 80 1D 00 00 */ lwz r0, 0(r29) /* 800452A0 00042200 7C 05 00 00 */ cmpw r5, r0 /* 800452A4 00042204 41 82 00 C4 */ beq lbl_80045368 -/* 800452A8 00042208 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800452A8 00042208 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800452AC 0004220C 83 C3 08 50 */ lwz r30, 0x850(r3) /* 800452B0 00042210 7C 05 00 00 */ cmpw r5, r0 /* 800452B4 00042214 41 82 00 44 */ beq lbl_800452F8 @@ -1678,7 +1678,7 @@ lbl_800452F8: /* 800452F8 00042258 80 7D 00 00 */ lwz r3, 0(r29) /* 800452FC 0004225C 90 7F 00 04 */ stw r3, 4(r31) /* 80045300 00042260 80 BD 00 00 */ lwz r5, 0(r29) -/* 80045304 00042264 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80045304 00042264 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80045308 00042268 90 61 00 1C */ stw r3, 0x1c(r1) /* 8004530C 0004226C 7C 05 00 00 */ cmpw r5, r0 /* 80045310 00042270 41 82 00 58 */ beq lbl_80045368 @@ -1719,7 +1719,7 @@ TouchPlayerActor__13CStateManagerFv: /* 8004538C 000422EC 90 01 00 24 */ stw r0, 0x24(r1) /* 80045390 000422F0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80045394 000422F4 7C 7F 1B 78 */ mr r31, r3 -/* 80045398 000422F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80045398 000422F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004539C 000422FC A0 83 0F 6C */ lhz r4, 0xf6c(r3) /* 800453A0 00042300 7C 04 00 40 */ cmplw r4, r0 /* 800453A4 00042304 41 82 00 20 */ beq lbl_800453C4 @@ -3253,7 +3253,7 @@ lbl_8004692C: /* 80046930 00043890 80 83 00 04 */ lwz r4, 4(r3) /* 80046934 00043894 7C 04 78 00 */ cmpw r4, r15 /* 80046938 00043898 41 82 00 18 */ beq lbl_80046950 -/* 8004693C 0004389C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004693C 0004389C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80046940 000438A0 7C 04 00 00 */ cmpw r4, r0 /* 80046944 000438A4 40 82 00 24 */ bne lbl_80046968 /* 80046948 000438A8 7C 0F 70 00 */ cmpw r15, r14 @@ -3538,7 +3538,7 @@ sub_80046d18: /* 80046D18 00043C78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046D1C 00043C7C 7C 08 02 A6 */ mflr r0 /* 80046D20 00043C80 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046D24 00043C84 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80046D24 00043C84 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80046D28 00043C88 80 A4 00 00 */ lwz r5, 0(r4) /* 80046D2C 00043C8C 7C 05 00 00 */ cmpw r5, r0 /* 80046D30 00043C90 40 82 00 10 */ bne lbl_80046D40 @@ -3569,7 +3569,7 @@ SetupFogForArea__13CStateManagerCF7TAreaId: /* 80046D80 00043CE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046D84 00043CE4 7C 08 02 A6 */ mflr r0 /* 80046D88 00043CE8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80046D8C 00043CEC 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80046D8C 00043CEC 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80046D90 00043CF0 80 A4 00 00 */ lwz r5, 0(r4) /* 80046D94 00043CF4 7C 05 00 00 */ cmpw r5, r0 /* 80046D98 00043CF8 40 82 00 10 */ bne lbl_80046DA8 @@ -4196,7 +4196,7 @@ GetVisSetForArea__13CStateManagerCF7TAreaId7TAreaId: /* 80047654 000445B4 BE A1 00 84 */ stmw r21, 0x84(r1) /* 80047658 000445B8 80 A5 00 00 */ lwz r5, 0(r5) /* 8004765C 000445BC 7C 7C 1B 78 */ mr r28, r3 -/* 80047660 000445C0 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80047660 000445C0 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80047664 000445C4 7C 9D 23 78 */ mr r29, r4 /* 80047668 000445C8 7C DE 33 78 */ mr r30, r6 /* 8004766C 000445CC 7C 05 00 00 */ cmpw r5, r0 @@ -4450,7 +4450,7 @@ lbl_800479F4: /* 80047A00 00044960 7C 03 00 40 */ cmplw r3, r0 /* 80047A04 00044964 41 82 00 60 */ beq lbl_80047A64 /* 80047A08 00044968 A0 9E 00 C6 */ lhz r4, 0xc6(r30) -/* 80047A0C 0004496C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80047A0C 0004496C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80047A10 00044970 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 80047A14 00044974 B0 81 00 0C */ sth r4, 0xc(r1) /* 80047A18 00044978 7C 03 00 40 */ cmplw r3, r0 @@ -4506,7 +4506,7 @@ RecursiveDrawTree__13CStateManagerCF9TUniqueId: /* 80047AC4 00044A24 7C 03 00 40 */ cmplw r3, r0 /* 80047AC8 00044A28 41 82 00 5C */ beq lbl_80047B24 /* 80047ACC 00044A2C A0 9F 00 C6 */ lhz r4, 0xc6(r31) -/* 80047AD0 00044A30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80047AD0 00044A30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80047AD4 00044A34 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 80047AD8 00044A38 B0 81 00 10 */ sth r4, 0x10(r1) /* 80047ADC 00044A3C 7C 03 00 40 */ cmplw r3, r0 @@ -4796,7 +4796,7 @@ lbl_80047E90: lbl_80047EAC: /* 80047EAC 00044E0C 38 00 00 00 */ li r0, 0 /* 80047EB0 00044E10 90 03 00 00 */ stw r0, 0(r3) -/* 80047EB4 00044E14 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80047EB4 00044E14 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80047EB8 00044E18 90 03 00 04 */ stw r0, 4(r3) /* 80047EBC 00044E1C 4E 80 00 20 */ blr @@ -4819,7 +4819,7 @@ GetEditorIdForUniqueId__13CStateManagerCF9TUniqueId: /* 80047EF8 00044E58 90 1F 00 00 */ stw r0, 0(r31) /* 80047EFC 00044E5C 48 00 00 0C */ b lbl_80047F08 lbl_80047F00: -/* 80047F00 00044E60 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80047F00 00044E60 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80047F04 00044E64 90 1F 00 00 */ stw r0, 0(r31) lbl_80047F08: /* 80047F08 00044E68 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4879,7 +4879,7 @@ lbl_80047FA8: /* 80047FB4 00044F14 B0 03 00 00 */ sth r0, 0(r3) /* 80047FB8 00044F18 4E 80 00 20 */ blr lbl_80047FBC: -/* 80047FBC 00044F1C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80047FBC 00044F1C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80047FC0 00044F20 B0 03 00 00 */ sth r0, 0(r3) /* 80047FC4 00044F24 4E 80 00 20 */ blr @@ -4969,13 +4969,13 @@ lbl_80048090: /* 800480DC 0004503C 48 00 00 64 */ b lbl_80048140 lbl_800480E0: /* 800480E0 00045040 80 DD 00 0C */ lwz r6, 0xc(r29) -/* 800480E4 00045044 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 800480E4 00045044 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 800480E8 00045048 7C 66 F8 2E */ lwzx r3, r6, r31 /* 800480EC 0004504C 54 00 01 BE */ clrlwi r0, r0, 6 /* 800480F0 00045050 54 63 01 BE */ clrlwi r3, r3, 6 /* 800480F4 00045054 7C 03 00 40 */ cmplw r3, r0 /* 800480F8 00045058 41 82 00 40 */ beq lbl_80048138 -/* 800480FC 0004505C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800480FC 0004505C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80048100 00045060 7F 84 E3 78 */ mr r4, r28 /* 80048104 00045064 38 61 00 0C */ addi r3, r1, 0xc /* 80048108 00045068 38 A1 00 14 */ addi r5, r1, 0x14 @@ -5049,7 +5049,7 @@ lbl_800481C0: /* 80048200 00045160 90 01 00 0C */ stw r0, 0xc(r1) /* 80048204 00045164 48 00 02 09 */ bl LoadScriptObject__13CStateManagerF7TAreaId17EScriptObjectTypeUiR12CInputStream /* 80048208 00045168 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 8004820C 0004516C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8004820C 0004516C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80048210 00045170 54 83 01 BE */ clrlwi r3, r4, 6 /* 80048214 00045174 90 81 00 10 */ stw r4, 0x10(r1) /* 80048218 00045178 54 00 01 BE */ clrlwi r0, r0, 6 @@ -5173,9 +5173,9 @@ GenerateObject__13CStateManagerF9TEditorId: /* 800483D4 00045334 48 2F 6C D9 */ bl __dt__12CInputStreamFv /* 800483D8 00045338 48 00 00 14 */ b lbl_800483EC lbl_800483DC: -/* 800483DC 0004533C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 800483DC 0004533C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 800483E0 00045340 90 1E 00 00 */ stw r0, 0(r30) -/* 800483E4 00045344 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800483E4 00045344 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800483E8 00045348 B0 1E 00 04 */ sth r0, 4(r30) lbl_800483EC: /* 800483EC 0004534C 80 01 00 74 */ lwz r0, 0x74(r1) @@ -5346,9 +5346,9 @@ lbl_80048630: /* 80048638 00045598 28 1C 00 00 */ cmplwi r28, 0 /* 8004863C 0004559C 40 82 00 58 */ bne lbl_80048694 lbl_80048640: -/* 80048640 000455A0 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80048640 000455A0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80048644 000455A4 90 17 00 00 */ stw r0, 0(r23) -/* 80048648 000455A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80048648 000455A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004864C 000455AC B0 17 00 04 */ sth r0, 4(r23) /* 80048650 000455B0 80 01 00 5C */ lwz r0, 0x5c(r1) /* 80048654 000455B4 80 61 00 64 */ lwz r3, 0x64(r1) @@ -7849,7 +7849,7 @@ lbl_8004AA10: /* 8004AA20 00047980 48 00 1B 55 */ bl ObjectById__13CStateManagerF9TUniqueId /* 8004AA24 00047984 28 03 00 00 */ cmplwi r3, 0 /* 8004AA28 00047988 40 82 00 10 */ bne lbl_8004AA38 -/* 8004AA2C 0004798C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004AA2C 0004798C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004AA30 00047990 B0 1E 0F 76 */ sth r0, 0xf76(r30) /* 8004AA34 00047994 48 00 00 2C */ b lbl_8004AA60 lbl_8004AA38: @@ -7861,7 +7861,7 @@ lbl_8004AA38: /* 8004AA4C 000479AC 4E 80 04 21 */ bctrl lbl_8004AA50: /* 8004AA50 000479B0 A0 7E 0F 76 */ lhz r3, 0xf76(r30) -/* 8004AA54 000479B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004AA54 000479B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004AA58 000479B8 7C 03 00 40 */ cmplw r3, r0 /* 8004AA5C 000479BC 40 82 FF B4 */ bne lbl_8004AA10 lbl_8004AA60: @@ -8152,7 +8152,7 @@ lbl_8004AE10: /* 8004AE4C 00047DAC 54 65 D9 7E */ srwi r5, r3, 5 /* 8004AE50 00047DB0 41 82 00 5C */ beq lbl_8004AEAC /* 8004AE54 00047DB4 80 C4 00 04 */ lwz r6, 4(r4) -/* 8004AE58 00047DB8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004AE58 00047DB8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004AE5C 00047DBC 7C 06 00 00 */ cmpw r6, r0 /* 8004AE60 00047DC0 41 82 00 4C */ beq lbl_8004AEAC /* 8004AE64 00047DC4 80 9B 08 50 */ lwz r4, 0x850(r27) @@ -8495,7 +8495,7 @@ lbl_8004B2C4: /* 8004B31C 0004827C 54 65 D9 7E */ srwi r5, r3, 5 /* 8004B320 00048280 41 82 00 5C */ beq lbl_8004B37C /* 8004B324 00048284 80 C7 00 04 */ lwz r6, 4(r7) -/* 8004B328 00048288 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004B328 00048288 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004B32C 0004828C 7C 06 00 00 */ cmpw r6, r0 /* 8004B330 00048290 41 82 00 4C */ beq lbl_8004B37C /* 8004B334 00048294 80 9C 08 50 */ lwz r4, 0x850(r28) @@ -8521,7 +8521,7 @@ lbl_8004B36C: lbl_8004B37C: /* 8004B37C 000482DC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 8004B380 000482E0 40 82 00 30 */ bne lbl_8004B3B0 -/* 8004B384 000482E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004B384 000482E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004B388 000482E8 7F 83 E3 78 */ mr r3, r28 /* 8004B38C 000482EC 38 81 00 10 */ addi r4, r1, 0x10 /* 8004B390 000482F0 38 A1 00 08 */ addi r5, r1, 8 @@ -8816,7 +8816,7 @@ lbl_8004B71C: /* 8004B774 000486D4 AB 5B 20 08 */ lha r26, 0x2008(r27) /* 8004B778 000486D8 48 00 00 48 */ b lbl_8004B7C0 lbl_8004B77C: -/* 8004B77C 000486DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004B77C 000486DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004B780 000486E0 7F 63 DB 78 */ mr r3, r27 /* 8004B784 000486E4 7F 44 D3 78 */ mr r4, r26 /* 8004B788 000486E8 B0 01 00 08 */ sth r0, 8(r1) @@ -9197,7 +9197,7 @@ RemoveObject__13CStateManagerF9TUniqueId: /* 8004BD10 00048C70 7C 7B 1B 79 */ or. r27, r3, r3 /* 8004BD14 00048C74 41 82 01 58 */ beq lbl_8004BE6C /* 8004BD18 00048C78 80 9B 00 0C */ lwz r4, 0xc(r27) -/* 8004BD1C 00048C7C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8004BD1C 00048C7C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8004BD20 00048C80 54 83 01 BE */ clrlwi r3, r4, 6 /* 8004BD24 00048C84 90 81 00 1C */ stw r4, 0x1c(r1) /* 8004BD28 00048C88 54 00 01 BE */ clrlwi r0, r0, 6 @@ -9261,7 +9261,7 @@ lbl_8004BDF4: /* 8004BDF8 00048D58 40 82 FF 6C */ bne lbl_8004BD64 lbl_8004BDFC: /* 8004BDFC 00048D5C 80 BB 00 04 */ lwz r5, 4(r27) -/* 8004BE00 00048D60 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004BE00 00048D60 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004BE04 00048D64 90 A1 00 18 */ stw r5, 0x18(r1) /* 8004BE08 00048D68 7C 05 00 00 */ cmpw r5, r0 /* 8004BE0C 00048D6C 41 82 00 40 */ beq lbl_8004BE4C @@ -9491,7 +9491,7 @@ SetCurrentAreaId__13CStateManagerF7TAreaId: /* 8004C110 00049070 90 1F 08 CC */ stw r0, 0x8cc(r31) lbl_8004C114: /* 8004C114 00049074 80 7E 00 00 */ lwz r3, 0(r30) -/* 8004C118 00049078 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004C118 00049078 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004C11C 0004907C 7C 03 00 00 */ cmpw r3, r0 /* 8004C120 00049080 41 82 00 5C */ beq lbl_8004C17C /* 8004C124 00049084 90 61 00 0C */ stw r3, 0xc(r1) @@ -9700,7 +9700,7 @@ lbl_8004C3DC: /* 8004C3EC 0004934C 38 04 00 01 */ addi r0, r4, 1 /* 8004C3F0 00049350 38 80 00 22 */ li r4, 0x22 /* 8004C3F4 00049354 90 07 00 00 */ stw r0, 0(r7) -/* 8004C3F8 00049358 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004C3F8 00049358 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004C3FC 0004935C B0 01 00 08 */ sth r0, 8(r1) /* 8004C400 00049360 81 9F 00 00 */ lwz r12, 0(r31) /* 8004C404 00049364 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -10235,7 +10235,7 @@ AddObject__13CStateManagerFR7CEntity: /* 8004CB2C 00049A8C 7C 7E 1B 78 */ mr r30, r3 /* 8004CB30 00049A90 93 A1 00 54 */ stw r29, 0x54(r1) /* 8004CB34 00049A94 93 81 00 50 */ stw r28, 0x50(r1) -/* 8004CB38 00049A98 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8004CB38 00049A98 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8004CB3C 00049A9C 80 A4 00 0C */ lwz r5, 0xc(r4) /* 8004CB40 00049AA0 54 00 01 BE */ clrlwi r0, r0, 6 /* 8004CB44 00049AA4 54 A3 01 BE */ clrlwi r3, r5, 6 @@ -10265,7 +10265,7 @@ lbl_8004CB8C: /* 8004CB98 00049AF8 7C 1C 00 40 */ cmplw r28, r0 /* 8004CB9C 00049AFC 40 82 FF E0 */ bne lbl_8004CB7C /* 8004CBA0 00049B00 80 7F 00 04 */ lwz r3, 4(r31) -/* 8004CBA4 00049B04 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004CBA4 00049B04 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004CBA8 00049B08 7C 03 00 00 */ cmpw r3, r0 /* 8004CBAC 00049B0C 40 82 00 30 */ bne lbl_8004CBDC /* 8004CBB0 00049B10 80 9E 08 4C */ lwz r4, 0x84c(r30) @@ -10281,7 +10281,7 @@ lbl_8004CB8C: /* 8004CBD8 00049B38 90 1F 00 04 */ stw r0, 4(r31) lbl_8004CBDC: /* 8004CBDC 00049B3C 80 BF 00 04 */ lwz r5, 4(r31) -/* 8004CBE0 00049B40 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004CBE0 00049B40 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004CBE4 00049B44 90 A1 00 24 */ stw r5, 0x24(r1) /* 8004CBE8 00049B48 7C 05 00 00 */ cmpw r5, r0 /* 8004CBEC 00049B4C 41 82 00 38 */ beq lbl_8004CC24 @@ -10308,7 +10308,7 @@ lbl_8004CC24: /* 8004CC3C 00049B9C 7F C3 F3 78 */ mr r3, r30 /* 8004CC40 00049BA0 4B FF FB 05 */ bl UpdateActorInSortedLists__13CStateManagerFR6CActor lbl_8004CC44: -/* 8004CC44 00049BA4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004CC44 00049BA4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004CC48 00049BA8 7F E3 FB 78 */ mr r3, r31 /* 8004CC4C 00049BAC 7F C6 F3 78 */ mr r6, r30 /* 8004CC50 00049BB0 38 A1 00 0C */ addi r5, r1, 0xc @@ -10319,7 +10319,7 @@ lbl_8004CC44: /* 8004CC64 00049BC4 7D 89 03 A6 */ mtctr r12 /* 8004CC68 00049BC8 4E 80 04 21 */ bctrl /* 8004CC6C 00049BCC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8004CC70 00049BD0 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004CC70 00049BD0 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8004CC74 00049BD4 7C 03 00 00 */ cmpw r3, r0 /* 8004CC78 00049BD8 41 82 00 5C */ beq lbl_8004CCD4 /* 8004CC7C 00049BDC 7F C3 F3 78 */ mr r3, r30 @@ -10337,7 +10337,7 @@ lbl_8004CC44: /* 8004CCAC 00049C0C 88 03 00 F0 */ lbz r0, 0xf0(r3) /* 8004CCB0 00049C10 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f /* 8004CCB4 00049C14 41 82 00 20 */ beq lbl_8004CCD4 -/* 8004CCB8 00049C18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004CCB8 00049C18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004CCBC 00049C1C 7F C3 F3 78 */ mr r3, r30 /* 8004CCC0 00049C20 7F E4 FB 78 */ mr r4, r31 /* 8004CCC4 00049C24 38 A1 00 08 */ addi r5, r1, 8 @@ -10677,7 +10677,7 @@ lbl_8004D138: /* 8004D15C 0004A0BC 54 00 06 BE */ clrlwi r0, r0, 0x1a /* 8004D160 0004A0C0 B0 04 00 08 */ sth r0, 8(r4) /* 8004D164 0004A0C4 A0 64 00 08 */ lhz r3, 8(r4) -/* 8004D168 0004A0C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004D168 0004A0C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004D16C 0004A0CC 54 63 51 AA */ rlwinm r3, r3, 0xa, 6, 0x15 /* 8004D170 0004A0D0 7F E3 1B 78 */ or r3, r31, r3 /* 8004D174 0004A0D4 54 63 04 3E */ clrlwi r3, r3, 0x10 @@ -10732,7 +10732,7 @@ lbl_8004D208: /* 8004D224 0004A184 A0 04 00 08 */ lhz r0, 8(r4) /* 8004D228 0004A188 7C 05 00 40 */ cmplw r5, r0 /* 8004D22C 0004A18C 41 82 00 60 */ beq lbl_8004D28C -/* 8004D230 0004A190 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004D230 0004A190 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004D234 0004A194 7F A6 EB 78 */ mr r6, r29 /* 8004D238 0004A198 38 A1 00 1C */ addi r5, r1, 0x1c /* 8004D23C 0004A19C 38 80 00 22 */ li r4, 0x22 @@ -10761,7 +10761,7 @@ lbl_8004D28C: /* 8004D294 0004A1F4 40 82 FF 74 */ bne lbl_8004D208 /* 8004D298 0004A1F8 7F A3 EB 78 */ mr r3, r29 /* 8004D29C 0004A1FC 4B FF EE F9 */ bl BringOutYourDead__13CStateManagerFv -/* 8004D2A0 0004A200 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004D2A0 0004A200 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004D2A4 0004A204 7F A6 EB 78 */ mr r6, r29 /* 8004D2A8 0004A208 38 A1 00 10 */ addi r5, r1, 0x10 /* 8004D2AC 0004A20C 38 80 00 22 */ li r4, 0x22 @@ -12003,7 +12003,7 @@ lbl_8004E2E8: /* 8004E320 0004B280 48 00 13 1D */ bl "__nw__36TOneStatic<22CStateManagerContainer>FUlPCcPCc" /* 8004E324 0004B284 7C 79 1B 79 */ or. r25, r3, r3 /* 8004E328 0004B288 41 82 00 6C */ beq lbl_8004E394 -/* 8004E32C 0004B28C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004E32C 0004B28C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004E330 0004B290 38 81 00 20 */ addi r4, r1, 0x20 /* 8004E334 0004B294 B0 01 00 20 */ sth r0, 0x20(r1) /* 8004E338 0004B298 4B FB DD A9 */ bl __ct__14CCameraManagerF9TUniqueId @@ -12108,7 +12108,7 @@ lbl_8004E394: /* 8004E4C0 0004B420 38 84 00 01 */ addi r4, r4, 1 /* 8004E4C4 0004B424 90 86 00 04 */ stw r4, 4(r6) /* 8004E4C8 0004B428 90 1F 08 CC */ stw r0, 0x8cc(r31) -/* 8004E4CC 0004B42C 80 8D A3 90 */ lwz r4, lbl_805A8F50@sda21(r13) +/* 8004E4CC 0004B42C 80 8D A3 90 */ lwz r4, kInvalidAreaId@sda21(r13) /* 8004E4D0 0004B430 90 9F 08 D0 */ stw r4, 0x8d0(r31) /* 8004E4D4 0004B434 90 1F 08 D4 */ stw r0, 0x8d4(r31) /* 8004E4D8 0004B438 90 1F 08 D8 */ stw r0, 0x8d8(r31) @@ -12247,7 +12247,7 @@ lbl_8004E670: /* 8004E6D8 0004B638 D0 3F 0F 10 */ stfs f1, 0xf10(r31) /* 8004E6DC 0004B63C 38 A0 00 00 */ li r5, 0 /* 8004E6E0 0004B640 D0 3F 0F 14 */ stfs f1, 0xf14(r31) -/* 8004E6E4 0004B644 A1 2D A3 8C */ lhz r9, lbl_805A8F4C@sda21(r13) +/* 8004E6E4 0004B644 A1 2D A3 8C */ lhz r9, kInvalidUniqueId@sda21(r13) /* 8004E6E8 0004B648 B1 3F 0F 18 */ sth r9, 0xf18(r31) /* 8004E6EC 0004B64C D0 3F 0F 1C */ stfs f1, 0xf1c(r31) /* 8004E6F0 0004B650 91 1F 0F 20 */ stw r8, 0xf20(r31) @@ -12256,7 +12256,7 @@ lbl_8004E670: /* 8004E6FC 0004B65C D0 1F 0F 2C */ stfs f0, 0xf2c(r31) /* 8004E700 0004B660 D0 1F 0F 30 */ stfs f0, 0xf30(r31) /* 8004E704 0004B664 90 FF 0F 34 */ stw r7, 0xf34(r31) -/* 8004E708 0004B668 A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 8004E708 0004B668 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 8004E70C 0004B66C B0 FF 0F 38 */ sth r7, 0xf38(r31) /* 8004E710 0004B670 90 DF 0F 40 */ stw r6, 0xf40(r31) /* 8004E714 0004B674 90 DF 0F 44 */ stw r6, 0xf44(r31) @@ -12268,12 +12268,12 @@ lbl_8004E670: /* 8004E72C 0004B68C 90 1F 0F 60 */ stw r0, 0xf60(r31) /* 8004E730 0004B690 90 1F 0F 64 */ stw r0, 0xf64(r31) /* 8004E734 0004B694 91 1F 0F 68 */ stw r8, 0xf68(r31) -/* 8004E738 0004B698 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004E738 0004B698 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004E73C 0004B69C B0 1F 0F 6C */ sth r0, 0xf6c(r31) /* 8004E740 0004B6A0 91 1F 0F 70 */ stw r8, 0xf70(r31) -/* 8004E744 0004B6A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004E744 0004B6A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004E748 0004B6A8 B0 1F 0F 74 */ sth r0, 0xf74(r31) -/* 8004E74C 0004B6AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8004E74C 0004B6AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004E750 0004B6B0 B0 1F 0F 76 */ sth r0, 0xf76(r31) /* 8004E754 0004B6B4 D0 3F 0F 78 */ stfs f1, 0xf78(r31) /* 8004E758 0004B6B8 91 1F 0F 7C */ stw r8, 0xf7c(r31) diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index a1f302a5..0efd5fb6 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -990,7 +990,7 @@ lbl_800BCF20: /* 800BCF38 000B9E98 B0 1E 00 00 */ sth r0, 0(r30) /* 800BCF3C 000B9E9C 48 00 00 10 */ b lbl_800BCF4C lbl_800BCF40: -/* 800BCF40 000B9EA0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800BCF40 000B9EA0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800BCF44 000B9EA4 B0 01 00 0C */ sth r0, 0xc(r1) /* 800BCF48 000B9EA8 B0 1E 00 00 */ sth r0, 0(r30) lbl_800BCF4C: @@ -3915,7 +3915,7 @@ lbl_800BFAA4: /* 800BFACC 000BCA2C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 800BFAD0 000BCA30 41 82 00 AC */ beq lbl_800BFB7C /* 800BFAD4 000BCA34 80 C4 00 04 */ lwz r6, 4(r4) -/* 800BFAD8 000BCA38 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800BFAD8 000BCA38 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800BFADC 000BCA3C 90 C1 00 14 */ stw r6, 0x14(r1) /* 800BFAE0 000BCA40 7C 06 00 00 */ cmpw r6, r0 /* 800BFAE4 000BCA44 41 82 00 40 */ beq lbl_800BFB24 @@ -4104,7 +4104,7 @@ lbl_800BFD44: UpdateOrbitZoneGroup__22CCompoundTargetReticleFfRC13CStateManager: /* 800BFD60 000BCCC0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800BFD64 000BCCC4 A0 03 00 F0 */ lhz r0, 0xf0(r3) -/* 800BFD68 000BCCC8 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 800BFD68 000BCCC8 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 800BFD6C 000BCCCC 7C 00 28 40 */ cmplw r0, r5 /* 800BFD70 000BCCD0 40 82 00 44 */ bne lbl_800BFDB4 /* 800BFD74 000BCCD4 A0 03 00 F2 */ lhz r0, 0xf2(r3) @@ -4209,7 +4209,7 @@ UpdateNextLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: /* 800BFEC4 000BCE24 2C 03 00 02 */ cmpwi r3, 2 /* 800BFEC8 000BCE28 40 82 00 18 */ bne lbl_800BFEE0 /* 800BFECC 000BCE2C A0 65 03 10 */ lhz r3, 0x310(r5) -/* 800BFED0 000BCE30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800BFED0 000BCE30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800BFED4 000BCE34 7C 03 00 40 */ cmplw r3, r0 /* 800BFED8 000BCE38 41 82 00 08 */ beq lbl_800BFEE0 /* 800BFEDC 000BCE3C B0 61 00 14 */ sth r3, 0x14(r1) @@ -4218,7 +4218,7 @@ lbl_800BFEE0: /* 800BFEE4 000BCE44 A0 1E 00 F2 */ lhz r0, 0xf2(r30) /* 800BFEE8 000BCE48 7C 03 00 40 */ cmplw r3, r0 /* 800BFEEC 000BCE4C 41 82 02 50 */ beq lbl_800C013C -/* 800BFEF0 000BCE50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800BFEF0 000BCE50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800BFEF4 000BCE54 7C 00 18 40 */ cmplw r0, r3 /* 800BFEF8 000BCE58 40 82 01 18 */ bne lbl_800C0010 /* 800BFEFC 000BCE5C A0 7E 01 74 */ lhz r3, 0x174(r30) @@ -4262,7 +4262,7 @@ lbl_800BFF70: /* 800BFF84 000BCEE4 38 A1 00 28 */ addi r5, r1, 0x28 /* 800BFF88 000BCEE8 90 01 00 28 */ stw r0, 0x28(r1) /* 800BFF8C 000BCEEC 38 C0 00 01 */ li r6, 1 -/* 800BFF90 000BCEF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800BFF90 000BCEF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800BFF94 000BCEF4 FC 60 08 90 */ fmr f3, f1 /* 800BFF98 000BCEF8 90 E1 00 2C */ stw r7, 0x2c(r1) /* 800BFF9C 000BCEFC C0 42 8D 30 */ lfs f2, lbl_805AAA50@sda21(r2) @@ -4358,7 +4358,7 @@ lbl_800C0084: /* 800C00F8 000BD058 D0 1E 01 CC */ stfs f0, 0x1cc(r30) /* 800C00FC 000BD05C 88 01 00 50 */ lbz r0, 0x50(r1) /* 800C0100 000BD060 98 1E 01 D0 */ stb r0, 0x1d0(r30) -/* 800C0104 000BD064 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 800C0104 000BD064 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 800C0108 000BD068 A0 1E 00 F2 */ lhz r0, 0xf2(r30) /* 800C010C 000BD06C 7C 03 00 40 */ cmplw r3, r0 /* 800C0110 000BD070 40 82 00 10 */ bne lbl_800C0120 @@ -4447,7 +4447,7 @@ UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: /* 800C0234 000BD194 41 82 02 58 */ beq lbl_800C048C /* 800C0238 000BD198 7C 00 20 40 */ cmplw r0, r4 /* 800C023C 000BD19C 41 82 00 84 */ beq lbl_800C02C0 -/* 800C0240 000BD1A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C0240 000BD1A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C0244 000BD1A4 7C 03 00 40 */ cmplw r3, r0 /* 800C0248 000BD1A8 41 82 00 78 */ beq lbl_800C02C0 /* 800C024C 000BD1AC B0 81 00 14 */ sth r4, 0x14(r1) @@ -4481,7 +4481,7 @@ lbl_800C029C: /* 800C02B8 000BD218 39 20 00 00 */ li r9, 0 /* 800C02BC 000BD21C 48 22 9A B9 */ bl SfxStart__11CSfxManagerFUsssbsbi lbl_800C02C0: -/* 800C02C0 000BD220 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C02C0 000BD220 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C02C4 000BD224 A0 A1 00 18 */ lhz r5, 0x18(r1) /* 800C02C8 000BD228 7C 00 28 40 */ cmplw r0, r5 /* 800C02CC 000BD22C 40 82 00 7C */ bne lbl_800C0348 @@ -4537,7 +4537,7 @@ lbl_800C0348: /* 800C0388 000BD2E8 98 7E 01 48 */ stb r3, 0x148(r30) /* 800C038C 000BD2EC 98 1E 01 48 */ stb r0, 0x148(r30) /* 800C0390 000BD2F0 A0 7E 00 F0 */ lhz r3, 0xf0(r30) -/* 800C0394 000BD2F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C0394 000BD2F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C0398 000BD2F8 7C 03 00 40 */ cmplw r3, r0 /* 800C039C 000BD2FC 40 82 00 0C */ bne lbl_800C03A8 /* 800C03A0 000BD300 B0 A1 00 10 */ sth r5, 0x10(r1) @@ -4588,7 +4588,7 @@ lbl_800C03D4: /* 800C0448 000BD3A8 D0 1E 01 64 */ stfs f0, 0x164(r30) /* 800C044C 000BD3AC 88 01 00 70 */ lbz r0, 0x70(r1) /* 800C0450 000BD3B0 98 1E 01 68 */ stb r0, 0x168(r30) -/* 800C0454 000BD3B4 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 800C0454 000BD3B4 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 800C0458 000BD3B8 A0 1E 00 F0 */ lhz r0, 0xf0(r30) /* 800C045C 000BD3BC 7C 03 00 40 */ cmplw r3, r0 /* 800C0460 000BD3C0 40 82 00 10 */ bne lbl_800C0470 @@ -5480,7 +5480,7 @@ lbl_800C1074: /* 800C1090 000BDFF0 4B FE 8A 39 */ bl "__ct__33TCastToPtr<19CScriptGrapplePoint>FP7CEntity" /* 800C1094 000BDFF4 A0 1A 00 F2 */ lhz r0, 0xf2(r26) /* 800C1098 000BDFF8 38 A0 00 00 */ li r5, 0 -/* 800C109C 000BDFFC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800C109C 000BDFFC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800C10A0 000BE000 80 63 00 04 */ lwz r3, 4(r3) /* 800C10A4 000BE004 7C 00 20 40 */ cmplw r0, r4 /* 800C10A8 000BE008 41 82 00 08 */ beq lbl_800C10B0 @@ -5524,7 +5524,7 @@ lbl_800C1114: /* 800C1128 000BE088 C0 3A 01 E0 */ lfs f1, 0x1e0(r26) /* 800C112C 000BE08C D0 3A 01 E4 */ stfs f1, 0x1e4(r26) /* 800C1130 000BE090 D0 1A 01 E0 */ stfs f0, 0x1e0(r26) -/* 800C1134 000BE094 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C1134 000BE094 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C1138 000BE098 B0 1A 01 DC */ sth r0, 0x1dc(r26) lbl_800C113C: /* 800C113C 000BE09C C0 5A 01 E0 */ lfs f2, 0x1e0(r26) @@ -5568,7 +5568,7 @@ lbl_800C11B4: /* 800C11C0 000BE120 C0 1A 01 E4 */ lfs f0, 0x1e4(r26) /* 800C11C4 000BE124 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800C11C8 000BE128 40 82 00 0C */ bne lbl_800C11D4 -/* 800C11CC 000BE12C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C11CC 000BE12C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C11D0 000BE130 B0 1A 01 DE */ sth r0, 0x1de(r26) lbl_800C11D4: /* 800C11D4 000BE134 80 6D A1 40 */ lwz r3, gpTweakTargeting@sda21(r13) @@ -5928,9 +5928,9 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1718 000BE678 38 C0 00 00 */ li r6, 0 /* 800C171C 000BE67C 90 1D 00 E8 */ stw r0, 0xe8(r29) /* 800C1720 000BE680 90 1D 00 EC */ stw r0, 0xec(r29) -/* 800C1724 000BE684 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C1724 000BE684 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C1728 000BE688 B0 1D 00 F0 */ sth r0, 0xf0(r29) -/* 800C172C 000BE68C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C172C 000BE68C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C1730 000BE690 B0 1D 00 F2 */ sth r0, 0xf2(r29) /* 800C1734 000BE694 4B FF BA 55 */ bl CalculateOrbitZoneReticlePosition__22CCompoundTargetReticleCFRC13CStateManagerb /* 800C1738 000BE698 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -6056,9 +6056,9 @@ __ct__22CCompoundTargetReticleFRC13CStateManager: /* 800C1918 000BE878 98 BD 01 D0 */ stb r5, 0x1d0(r29) /* 800C191C 000BE87C D0 3D 01 D4 */ stfs f1, 0x1d4(r29) /* 800C1920 000BE880 D0 3D 01 D8 */ stfs f1, 0x1d8(r29) -/* 800C1924 000BE884 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 800C1924 000BE884 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 800C1928 000BE888 B0 BD 01 DC */ sth r5, 0x1dc(r29) -/* 800C192C 000BE88C A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 800C192C 000BE88C A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 800C1930 000BE890 B0 BD 01 DE */ sth r5, 0x1de(r29) /* 800C1934 000BE894 D0 3D 01 E0 */ stfs f1, 0x1e0(r29) /* 800C1938 000BE898 D0 3D 01 E4 */ stfs f1, 0x1e4(r29) @@ -6330,7 +6330,7 @@ __sinit_CTargetReticles_cpp: /* 800C1CD4 000BEC34 38 C3 66 A0 */ addi r6, r3, skZero3f@l /* 800C1CD8 000BEC38 3C 60 80 47 */ lis r3, lbl_8046C450@ha /* 800C1CDC 000BEC3C FC 60 08 90 */ fmr f3, f1 -/* 800C1CE0 000BEC40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C1CE0 000BEC40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C1CE4 000BEC44 38 63 C4 50 */ addi r3, r3, lbl_8046C450@l /* 800C1CE8 000BEC48 80 A6 00 00 */ lwz r5, 0(r6) /* 800C1CEC 000BEC4C 80 86 00 04 */ lwz r4, 4(r6) diff --git a/asm/MetroidPrime/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s index 48817710..14ad20ec 100644 --- a/asm/MetroidPrime/CVisorFlare.s +++ b/asm/MetroidPrime/CVisorFlare.s @@ -767,7 +767,7 @@ lbl_80207FBC: /* 802080BC 0020501C 38 60 00 00 */ li r3, 0 /* 802080C0 00205020 38 80 00 01 */ li r4, 1 /* 802080C4 00205024 48 18 1E 31 */ bl __shl2i -/* 802080C8 00205028 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802080C8 00205028 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802080CC 0020502C 39 40 00 03 */ li r10, 3 /* 802080D0 00205030 FC 20 E8 90 */ fmr f1, f29 /* 802080D4 00205034 90 81 00 74 */ stw r4, 0x74(r1) diff --git a/asm/MetroidPrime/CWorld.s b/asm/MetroidPrime/CWorld.s index 47567064..3b8bc479 100644 --- a/asm/MetroidPrime/CWorld.s +++ b/asm/MetroidPrime/CWorld.s @@ -1833,7 +1833,7 @@ __ct__11CDummyWorldFUi: /* 800574E0 00054440 90 FF 00 30 */ stw r7, 0x30(r31) /* 800574E4 00054444 90 FF 00 34 */ stw r7, 0x34(r31) /* 800574E8 00054448 90 FF 00 38 */ stw r7, 0x38(r31) -/* 800574EC 0005444C 80 6D A3 90 */ lwz r3, lbl_805A8F50@sda21(r13) +/* 800574EC 0005444C 80 6D A3 90 */ lwz r3, kInvalidAreaId@sda21(r13) /* 800574F0 00054450 90 7F 00 3C */ stw r3, 0x3c(r31) /* 800574F4 00054454 80 6D A0 60 */ lwz r3, gpResourceFactory@sda21(r13) /* 800574F8 00054458 90 81 00 14 */ stw r4, 0x14(r1) @@ -1910,7 +1910,7 @@ ICheckWorldComplete__6CWorldFv: /* 800575EC 0005454C 38 C0 FF FF */ li r6, -1 /* 800575F0 00054550 90 01 00 14 */ stw r0, 0x14(r1) /* 800575F4 00054554 38 A1 00 08 */ addi r5, r1, 8 -/* 800575F8 00054558 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800575F8 00054558 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800575FC 0005455C 90 01 00 08 */ stw r0, 8(r1) /* 80057600 00054560 48 00 0D 29 */ bl CheckWorldComplete__6CWorldFP13CStateManager7TAreaIdUi /* 80057604 00054564 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3240,7 +3240,7 @@ lbl_800587C8: /* 800587CC 0005572C 48 2E 85 B9 */ bl Lock__6CTokenFv /* 800587D0 00055730 28 1A 00 00 */ cmplwi r26, 0 /* 800587D4 00055734 41 82 00 7C */ beq lbl_80058850 -/* 800587D8 00055738 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800587D8 00055738 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800587DC 0005573C 38 E0 00 00 */ li r7, 0 /* 800587E0 00055740 90 E1 00 C4 */ stw r7, 0xc4(r1) /* 800587E4 00055744 7F 43 D3 78 */ mr r3, r26 @@ -3469,7 +3469,7 @@ lbl_80058B04: /* 80058B10 00055A70 48 00 02 84 */ b lbl_80058D94 lbl_80058B14: /* 80058B14 00055A74 83 3F 00 68 */ lwz r25, 0x68(r31) -/* 80058B18 00055A78 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80058B18 00055A78 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80058B1C 00055A7C 7C 19 00 00 */ cmpw r25, r0 /* 80058B20 00055A80 40 82 00 20 */ bne lbl_80058B40 /* 80058B24 00055A84 7F E3 FB 78 */ mr r3, r31 @@ -3783,7 +3783,7 @@ __ct__6CWorldFR12IObjectStoreR11CResFactoryUi: /* 80058F4C 00055EAC 90 9E 00 60 */ stw r4, 0x60(r30) /* 80058F50 00055EB0 38 81 00 10 */ addi r4, r1, 0x10 /* 80058F54 00055EB4 93 FE 00 64 */ stw r31, 0x64(r30) -/* 80058F58 00055EB8 80 6D A3 90 */ lwz r3, lbl_805A8F50@sda21(r13) +/* 80058F58 00055EB8 80 6D A3 90 */ lwz r3, kInvalidAreaId@sda21(r13) /* 80058F5C 00055EBC 90 7E 00 68 */ stw r3, 0x68(r30) /* 80058F60 00055EC0 91 3E 00 6C */ stw r9, 0x6c(r30) /* 80058F64 00055EC4 88 7E 00 70 */ lbz r3, 0x70(r30) diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s index 1f18be2d..46582d06 100644 --- a/asm/MetroidPrime/CWorldShadow.s +++ b/asm/MetroidPrime/CWorldShadow.s @@ -192,7 +192,7 @@ lbl_80111234: /* 80111244 0010E1A4 93 7F 00 84 */ stw r27, 0x84(r31) lbl_80111248: /* 80111248 0010E1A8 80 77 00 00 */ lwz r3, 0(r23) -/* 8011124C 0010E1AC 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8011124C 0010E1AC 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80111250 0010E1B0 7C 03 00 00 */ cmpw r3, r0 /* 80111254 0010E1B4 41 82 08 CC */ beq lbl_80111B20 /* 80111258 0010E1B8 80 17 00 00 */ lwz r0, 0(r23) @@ -878,7 +878,7 @@ lbl_80111C34: /* 80111C90 0010EBF0 D0 1F 00 78 */ stfs f0, 0x78(r31) /* 80111C94 0010EBF4 C0 05 00 08 */ lfs f0, 8(r5) /* 80111C98 0010EBF8 D0 1F 00 7C */ stfs f0, 0x7c(r31) -/* 80111C9C 0010EBFC 80 AD A3 90 */ lwz r5, lbl_805A8F50@sda21(r13) +/* 80111C9C 0010EBFC 80 AD A3 90 */ lwz r5, kInvalidAreaId@sda21(r13) /* 80111CA0 0010EC00 90 BF 00 80 */ stw r5, 0x80(r31) /* 80111CA4 0010EC04 90 9F 00 84 */ stw r4, 0x84(r31) /* 80111CA8 0010EC08 98 1F 00 88 */ stb r0, 0x88(r31) diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 5fb02a51..d9f3df99 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -392,7 +392,7 @@ SplineIntersectTest__11CBallCameraCFR13CMaterialListR13CStateManager: /* 80081074 0007DFD4 DB 61 0D F0 */ stfd f27, 0xdf0(r1) /* 80081078 0007DFD8 F3 61 0D F8 */ psq_st f27, -520(r1), 0, qr0 /* 8008107C 0007DFDC BF 01 0D D0 */ stmw r24, 0xdd0(r1) -/* 80081080 0007DFE0 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80081080 0007DFE0 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80081084 0007DFE4 38 00 00 00 */ li r0, 0 /* 80081088 0007DFE8 80 ED 85 34 */ lwz r7, lbl_805A70F4@sda21(r13) /* 8008108C 0007DFEC 7C 7B 1B 78 */ mr r27, r3 @@ -914,7 +914,7 @@ CheckFailsafeFromMorphBallState__11CBallCameraCFR13CStateManager: /* 800817FC 0007E75C DB 61 0B 70 */ stfd f27, 0xb70(r1) /* 80081800 0007E760 F3 61 0B 78 */ psq_st f27, -1160(r1), 0, qr0 /* 80081804 0007E764 BF 61 0B 5C */ stmw r27, 0xb5c(r1) -/* 80081808 0007E768 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80081808 0007E768 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8008180C 0007E76C 38 00 00 00 */ li r0, 0 /* 80081810 0007E770 90 01 03 48 */ stw r0, 0x348(r1) /* 80081814 0007E774 7C 7C 1B 78 */ mr r28, r3 @@ -2022,7 +2022,7 @@ lbl_8008279C: /* 800827C0 0007F720 48 29 30 AD */ bl __nw__FUlPCcPCc /* 800827C4 0007F724 7C 7D 1B 79 */ or. r29, r3, r3 /* 800827C8 0007F728 41 82 00 4C */ beq lbl_80082814 -/* 800827CC 0007F72C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800827CC 0007F72C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800827D0 0007F730 7F E4 FB 78 */ mr r4, r31 /* 800827D4 0007F734 38 61 00 1C */ addi r3, r1, 0x1c /* 800827D8 0007F738 B0 01 00 10 */ sth r0, 0x10(r1) @@ -2226,7 +2226,7 @@ lbl_80082ADC: /* 80082AE4 0007FA44 38 81 00 08 */ addi r4, r1, 8 /* 80082AE8 0007FA48 B0 01 00 08 */ sth r0, 8(r1) /* 80082AEC 0007FA4C 4B FC 97 81 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80082AF0 0007FA50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80082AF0 0007FA50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80082AF4 0007FA54 B0 1F 04 6C */ sth r0, 0x46c(r31) lbl_80082AF8: /* 80082AF8 0007FA58 BB 21 00 E4 */ lmw r25, 0xe4(r1) @@ -3096,7 +3096,7 @@ lbl_8008374C: /* 80083788 000806E8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8008378C 000806EC 41 81 00 20 */ bgt lbl_800837AC /* 80083790 000806F0 A0 7D 03 DC */ lhz r3, 0x3dc(r29) -/* 80083794 000806F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80083794 000806F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80083798 000806F8 7C 03 00 40 */ cmplw r3, r0 /* 8008379C 000806FC 41 82 00 34 */ beq lbl_800837D0 /* 800837A0 00080700 C0 02 89 B8 */ lfs f0, lbl_805AA6D8@sda21(r2) @@ -5650,7 +5650,7 @@ lbl_80085CA8: /* 80085D34 00082C94 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80085D38 00082C98 40 82 01 1C */ bne lbl_80085E54 /* 80085D3C 00082C9C A0 7F 03 68 */ lhz r3, 0x368(r31) -/* 80085D40 00082CA0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80085D40 00082CA0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80085D44 00082CA4 7C 03 00 40 */ cmplw r3, r0 /* 80085D48 00082CA8 40 82 01 0C */ bne lbl_80085E54 /* 80085D4C 00082CAC C0 3F 03 4C */ lfs f1, 0x34c(r31) @@ -5999,7 +5999,7 @@ lbl_8008623C: /* 80086258 000831B8 D0 01 01 C0 */ stfs f0, 0x1c0(r1) /* 8008625C 000831BC D0 21 01 C4 */ stfs f1, 0x1c4(r1) lbl_80086260: -/* 80086260 000831C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80086260 000831C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80086264 000831C4 3C 60 80 47 */ lis r3, lbl_8046C408@ha /* 80086268 000831C8 39 03 C4 08 */ addi r8, r3, lbl_8046C408@l /* 8008626C 000831CC C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -6543,7 +6543,7 @@ lbl_80086A24: /* 80086A74 000839D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80086A78 000839D8 40 80 00 8C */ bge lbl_80086B04 /* 80086A7C 000839DC A0 BF 03 DC */ lhz r5, 0x3dc(r31) -/* 80086A80 000839E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80086A80 000839E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80086A84 000839E4 7C 05 00 40 */ cmplw r5, r0 /* 80086A88 000839E8 41 82 00 7C */ beq lbl_80086B04 /* 80086A8C 000839EC C0 3F 03 E0 */ lfs f1, 0x3e0(r31) @@ -7192,7 +7192,7 @@ ResetSpline__11CBallCameraFR13CStateManager: /* 80087418 00084378 39 03 C4 08 */ addi r8, r3, lbl_8046C408@l /* 8008741C 0008437C C0 61 00 F4 */ lfs f3, 0xf4(r1) /* 80087420 00084380 7F E4 FB 78 */ mr r4, r31 -/* 80087424 00084384 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80087424 00084384 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80087428 00084388 38 61 01 50 */ addi r3, r1, 0x150 /* 8008742C 0008438C C0 02 89 F8 */ lfs f0, lbl_805AA718@sda21(r2) /* 80087430 00084390 38 A1 00 08 */ addi r5, r1, 8 @@ -7712,7 +7712,7 @@ lbl_80087BD4: /* 80087BFC 00084B5C EC 9F 10 2A */ fadds f4, f31, f2 /* 80087C00 00084B60 D0 61 02 98 */ stfs f3, 0x298(r1) /* 80087C04 00084B64 EC 7D 08 2A */ fadds f3, f29, f1 -/* 80087C08 00084B68 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80087C08 00084B68 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80087C0C 00084B6C D0 41 02 9C */ stfs f2, 0x29c(r1) /* 80087C10 00084B70 38 81 02 98 */ addi r4, r1, 0x298 /* 80087C14 00084B74 D0 21 02 A0 */ stfs f1, 0x2a0(r1) @@ -9691,7 +9691,7 @@ UpdateObjectTooCloseId__11CBallCameraFR13CStateManager: /* 80089968 000868C8 7C 9F 23 78 */ mr r31, r4 /* 8008996C 000868CC 38 61 00 48 */ addi r3, r1, 0x48 /* 80089970 000868D0 D0 1E 03 E0 */ stfs f0, 0x3e0(r30) -/* 80089974 000868D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80089974 000868D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80089978 000868D8 B0 1E 03 DC */ sth r0, 0x3dc(r30) /* 8008997C 000868DC 80 84 08 4C */ lwz r4, 0x84c(r4) /* 80089980 000868E0 48 1F B3 C9 */ bl GetBallPosition__7CPlayerCFv @@ -11091,7 +11091,7 @@ lbl_8008AE24: lbl_8008AE34: /* 8008AE34 00087D94 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8008AE38 00087D98 41 82 01 98 */ beq lbl_8008AFD0 -/* 8008AE3C 00087D9C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008AE3C 00087D9C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008AE40 00087DA0 38 61 01 70 */ addi r3, r1, 0x170 /* 8008AE44 00087DA4 38 80 00 00 */ li r4, 0 /* 8008AE48 00087DA8 B0 01 00 10 */ sth r0, 0x10(r1) @@ -11634,7 +11634,7 @@ lbl_8008B5D8: /* 8008B5E0 00088540 EF DE 00 24 */ fdivs f30, f30, f0 /* 8008B5E4 00088544 40 82 00 B0 */ bne lbl_8008B694 /* 8008B5E8 00088548 A0 7F 03 68 */ lhz r3, 0x368(r31) -/* 8008B5EC 0008854C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008B5EC 0008854C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008B5F0 00088550 7C 03 00 40 */ cmplw r3, r0 /* 8008B5F4 00088554 40 82 00 A0 */ bne lbl_8008B694 /* 8008B5F8 00088558 80 BF 03 50 */ lwz r5, 0x350(r31) @@ -12021,7 +12021,7 @@ lbl_8008BB4C: /* 8008BB88 00088AE8 41 82 01 30 */ beq lbl_8008BCB8 /* 8008BB8C 00088AEC 38 61 00 9C */ addi r3, r1, 0x9c /* 8008BB90 00088AF0 48 28 8D 69 */ bl Normalize__9CVector3fFv -/* 8008BB94 00088AF4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008BB94 00088AF4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008BB98 00088AF8 3C 60 80 47 */ lis r3, lbl_8046C408@ha /* 8008BB9C 00088AFC 39 03 C4 08 */ addi r8, r3, lbl_8046C408@l /* 8008BBA0 00088B00 C0 61 01 8C */ lfs f3, 0x18c(r1) @@ -13403,9 +13403,9 @@ __ct__11CBallCameraF9TUniqueId9TUniqueIdRC12CTransform4fffff: /* 8008CFC0 00089F20 38 61 00 30 */ addi r3, r1, 0x30 /* 8008CFC4 00089F24 38 87 00 07 */ addi r4, r7, 7 /* 8008CFC8 00089F28 4B F7 7C F1 */ bl string_l__4rstlFPCc -/* 8008CFCC 00089F2C 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 8008CFCC 00089F2C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 8008CFD0 00089F30 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8008CFD4 00089F34 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8008CFD4 00089F34 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8008CFD8 00089F38 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8008CFDC 00089F3C 90 81 00 28 */ stw r4, 0x28(r1) /* 8008CFE0 00089F40 38 61 00 40 */ addi r3, r1, 0x40 @@ -13725,7 +13725,7 @@ lbl_8008D080: /* 8008D4BC 0008A41C D0 1E 03 60 */ stfs f0, 0x360(r30) /* 8008D4C0 0008A420 C0 1F 00 08 */ lfs f0, 8(r31) /* 8008D4C4 0008A424 D0 1E 03 64 */ stfs f0, 0x364(r30) -/* 8008D4C8 0008A428 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008D4C8 0008A428 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008D4CC 0008A42C B0 1E 03 68 */ sth r0, 0x368(r30) /* 8008D4D0 0008A430 90 BE 03 6C */ stw r5, 0x36c(r30) /* 8008D4D4 0008A434 88 1E 03 70 */ lbz r0, 0x370(r30) @@ -13755,7 +13755,7 @@ lbl_8008D080: /* 8008D534 0008A494 98 1E 03 D0 */ stb r0, 0x3d0(r30) /* 8008D538 0008A498 D0 5E 03 D4 */ stfs f2, 0x3d4(r30) /* 8008D53C 0008A49C D0 5E 03 D8 */ stfs f2, 0x3d8(r30) -/* 8008D540 0008A4A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008D540 0008A4A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008D544 0008A4A4 B0 1E 03 DC */ sth r0, 0x3dc(r30) /* 8008D548 0008A4A8 D0 3E 03 E0 */ stfs f1, 0x3e0(r30) /* 8008D54C 0008A4AC 98 BE 03 E4 */ stb r5, 0x3e4(r30) @@ -13840,7 +13840,7 @@ lbl_8008D080: /* 8008D688 0008A5E8 80 CD A1 1C */ lwz r6, gpTweakBall@sda21(r13) /* 8008D68C 0008A5EC C0 06 01 70 */ lfs f0, 0x170(r6) /* 8008D690 0008A5F0 D0 1E 04 68 */ stfs f0, 0x468(r30) -/* 8008D694 0008A5F4 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 8008D694 0008A5F4 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 8008D698 0008A5F8 B0 DE 04 6C */ sth r6, 0x46c(r30) /* 8008D69C 0008A5FC D0 5E 04 70 */ stfs f2, 0x470(r30) /* 8008D6A0 0008A600 D0 5E 04 74 */ stfs f2, 0x474(r30) diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index 75544936..a3f9128f 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -758,7 +758,7 @@ CheckTransitionLineOfSight__11CBallCameraFRC9CVector3fRC9CVector3fRffR13CStateMa lbl_8023F058: /* 8023F058 0023BFB8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8023F05C 0023BFBC 41 82 01 98 */ beq lbl_8023F1F4 -/* 8023F060 0023BFC0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8023F060 0023BFC0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023F064 0023BFC4 38 61 01 00 */ addi r3, r1, 0x100 /* 8023F068 0023BFC8 38 80 00 00 */ li r4, 0 /* 8023F06C 0023BFCC B0 01 00 10 */ sth r0, 0x10(r1) diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index c1e51961..93df9452 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -287,7 +287,7 @@ HasCameraHint__14CCameraManagerCFR13CStateManager: /* 80009384 000062E4 2C 00 00 00 */ cmpwi r0, 0 /* 80009388 000062E8 41 82 00 34 */ beq lbl_800093BC /* 8000938C 000062EC A0 63 00 A6 */ lhz r3, 0xa6(r3) -/* 80009390 000062F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80009390 000062F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80009394 000062F4 7C 03 00 40 */ cmplw r3, r0 /* 80009398 000062F8 41 82 00 24 */ beq lbl_800093BC /* 8000939C 000062FC B0 61 00 08 */ sth r3, 8(r1) @@ -740,14 +740,14 @@ lbl_800099A0: /* 800099A4 00006904 A0 1E 00 A6 */ lhz r0, 0xa6(r30) /* 800099A8 00006908 7C 03 00 40 */ cmplw r3, r0 /* 800099AC 0000690C 40 82 00 48 */ bne lbl_800099F4 -/* 800099B0 00006910 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800099B0 00006910 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800099B4 00006914 7F C3 F3 78 */ mr r3, r30 /* 800099B8 00006918 7F E5 FB 78 */ mr r5, r31 /* 800099BC 0000691C 38 81 00 38 */ addi r4, r1, 0x38 /* 800099C0 00006920 B0 01 00 38 */ sth r0, 0x38(r1) /* 800099C4 00006924 3B 40 00 01 */ li r26, 1 /* 800099C8 00006928 4B FF F9 01 */ bl SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager -/* 800099CC 0000692C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800099CC 0000692C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800099D0 00006930 7F C3 F3 78 */ mr r3, r30 /* 800099D4 00006934 7F E5 FB 78 */ mr r5, r31 /* 800099D8 00006938 38 81 00 34 */ addi r4, r1, 0x34 @@ -1397,7 +1397,7 @@ RestoreHintlessCamera__14CCameraManagerFR13CStateManager: /* 8000A2E4 00007244 38 61 00 70 */ addi r3, r1, 0x70 /* 8000A2E8 00007248 38 84 00 34 */ addi r4, r4, 0x34 /* 8000A2EC 0000724C 48 30 88 89 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8000A2F0 00007250 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8000A2F0 00007250 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8000A2F4 00007254 28 1F 00 00 */ cmplwi r31, 0 /* 8000A2F8 00007258 38 00 03 E8 */ li r0, 0x3e8 /* 8000A2FC 0000725C B0 7D 00 A6 */ sth r3, 0xa6(r29) @@ -1583,13 +1583,13 @@ lbl_8000A588: /* 8000A5A0 00007500 4B FF EC 71 */ bl SetSpindleCamera__14CCameraManagerF9TUniqueIdR13CStateManager /* 8000A5A4 00007504 48 00 00 34 */ b lbl_8000A5D8 lbl_8000A5A8: -/* 8000A5A8 00007508 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000A5A8 00007508 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000A5AC 0000750C 7F 83 E3 78 */ mr r3, r28 /* 8000A5B0 00007510 7F C5 F3 78 */ mr r5, r30 /* 8000A5B4 00007514 38 81 00 14 */ addi r4, r1, 0x14 /* 8000A5B8 00007518 B0 01 00 14 */ sth r0, 0x14(r1) /* 8000A5BC 0000751C 4B FF ED 0D */ bl SetPathCamera__14CCameraManagerF9TUniqueIdR13CStateManager -/* 8000A5C0 00007520 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000A5C0 00007520 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000A5C4 00007524 7F 83 E3 78 */ mr r3, r28 /* 8000A5C8 00007528 7F C5 F3 78 */ mr r5, r30 /* 8000A5CC 0000752C 38 81 00 10 */ addi r4, r1, 0x10 @@ -3180,7 +3180,7 @@ GetLastCineCameraId__14CCameraManagerCFv: /* 8000BBA8 00008B08 80 A4 00 08 */ lwz r5, 8(r4) /* 8000BBAC 00008B0C 2C 05 00 00 */ cmpwi r5, 0 /* 8000BBB0 00008B10 40 82 00 10 */ bne lbl_8000BBC0 -/* 8000BBB4 00008B14 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000BBB4 00008B14 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000BBB8 00008B18 B0 03 00 00 */ sth r0, 0(r3) /* 8000BBBC 00008B1C 4E 80 00 20 */ blr lbl_8000BBC0: @@ -3595,7 +3595,7 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C15C 000090BC 38 83 66 A0 */ addi r4, r3, skZero3f@l /* 8000C160 000090C0 C0 22 80 94 */ lfs f1, lbl_805A9DB4@sda21(r2) /* 8000C164 000090C4 39 40 FF FF */ li r10, -1 -/* 8000C168 000090C8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8000C168 000090C8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8000C16C 000090CC 38 00 03 E8 */ li r0, 0x3e8 /* 8000C170 000090D0 C0 A2 80 80 */ lfs f5, lbl_805A9DA0@sda21(r2) /* 8000C174 000090D4 FC 40 08 90 */ fmr f2, f1 @@ -3626,11 +3626,11 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C1D8 00009138 89 5F 00 A0 */ lbz r10, 0xa0(r31) /* 8000C1DC 0000913C 51 6A 2E B4 */ rlwimi r10, r11, 5, 0x1a, 0x1a /* 8000C1E0 00009140 99 5F 00 A0 */ stb r10, 0xa0(r31) -/* 8000C1E4 00009144 A1 4D A3 8C */ lhz r10, lbl_805A8F4C@sda21(r13) +/* 8000C1E4 00009144 A1 4D A3 8C */ lhz r10, kInvalidUniqueId@sda21(r13) /* 8000C1E8 00009148 B1 5F 00 A2 */ sth r10, 0xa2(r31) -/* 8000C1EC 0000914C A1 4D A3 8C */ lhz r10, lbl_805A8F4C@sda21(r13) +/* 8000C1EC 0000914C A1 4D A3 8C */ lhz r10, kInvalidUniqueId@sda21(r13) /* 8000C1F0 00009150 B1 5F 00 A4 */ sth r10, 0xa4(r31) -/* 8000C1F4 00009154 A1 4D A3 8C */ lhz r10, lbl_805A8F4C@sda21(r13) +/* 8000C1F4 00009154 A1 4D A3 8C */ lhz r10, kInvalidUniqueId@sda21(r13) /* 8000C1F8 00009158 B1 5F 00 A6 */ sth r10, 0xa6(r31) /* 8000C1FC 0000915C 90 1F 00 A8 */ stw r0, 0xa8(r31) /* 8000C200 00009160 91 7F 00 AC */ stw r11, 0xac(r31) diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index c1ab1d79..e39d3d84 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -643,7 +643,7 @@ lbl_8009337C: /* 800933B0 00090310 D0 01 00 C4 */ stfs f0, 0xc4(r1) /* 800933B4 00090314 48 1F 19 C9 */ bl GetEyePosition__7CPlayerCFv /* 800933B8 00090318 A0 7D 02 0C */ lhz r3, 0x20c(r29) -/* 800933BC 0009031C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800933BC 0009031C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800933C0 00090320 C3 E1 00 9C */ lfs f31, 0x9c(r1) /* 800933C4 00090324 7C 03 00 40 */ cmplw r3, r0 /* 800933C8 00090328 C3 C1 00 A0 */ lfs f30, 0xa0(r1) @@ -1129,7 +1129,7 @@ lbl_80093AC0: /* 80093AC8 00090A28 54 00 08 3C */ slwi r0, r0, 1 /* 80093ACC 00090A2C 7C 63 02 15 */ add. r3, r3, r0 /* 80093AD0 00090A30 41 82 00 0C */ beq lbl_80093ADC -/* 80093AD4 00090A34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80093AD4 00090A34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80093AD8 00090A38 B0 03 00 00 */ sth r0, 0(r3) lbl_80093ADC: /* 80093ADC 00090A3C 80 7B 01 CC */ lwz r3, 0x1cc(r27) @@ -1517,7 +1517,7 @@ lbl_80094030: /* 80094040 00090FA0 38 C4 00 01 */ addi r6, r4, 1 /* 80094044 00090FA4 38 81 01 0C */ addi r4, r1, 0x10c /* 80094048 00090FA8 90 DF 01 AC */ stw r6, 0x1ac(r31) -/* 8009404C 00090FAC 80 CD A3 88 */ lwz r6, lbl_805A8F48@sda21(r13) +/* 8009404C 00090FAC 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) /* 80094050 00090FB0 90 01 01 0C */ stw r0, 0x10c(r1) /* 80094054 00090FB4 90 C1 00 AC */ stw r6, 0xac(r1) /* 80094058 00090FB8 90 01 01 10 */ stw r0, 0x110(r1) @@ -1651,7 +1651,7 @@ lbl_80094218: /* 80094228 00091188 38 C4 00 01 */ addi r6, r4, 1 /* 8009422C 0009118C 38 81 01 00 */ addi r4, r1, 0x100 /* 80094230 00091190 90 DF 01 CC */ stw r6, 0x1cc(r31) -/* 80094234 00091194 80 CD A3 88 */ lwz r6, lbl_805A8F48@sda21(r13) +/* 80094234 00091194 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) /* 80094238 00091198 90 01 01 00 */ stw r0, 0x100(r1) /* 8009423C 0009119C 90 C1 00 8C */ stw r6, 0x8c(r1) /* 80094240 000911A0 90 01 01 04 */ stw r0, 0x104(r1) @@ -2664,7 +2664,7 @@ lbl_80095034: /* 80095058 00091FB8 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 8009505C 00091FBC 98 1E 01 70 */ stb r0, 0x170(r30) /* 80095060 00091FC0 A0 7E 02 0C */ lhz r3, 0x20c(r30) -/* 80095064 00091FC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80095064 00091FC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80095068 00091FC8 7C 03 00 40 */ cmplw r3, r0 /* 8009506C 00091FCC 41 82 00 98 */ beq lbl_80095104 /* 80095070 00091FD0 A0 1E 02 0C */ lhz r0, 0x20c(r30) @@ -2938,7 +2938,7 @@ lbl_800953D8: /* 80095418 00092378 93 A1 00 34 */ stw r29, 0x34(r1) /* 8009541C 0009237C A0 04 00 00 */ lhz r0, 0(r4) /* 80095420 00092380 FF E0 10 90 */ fmr f31, f2 -/* 80095424 00092384 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80095424 00092384 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80095428 00092388 7D 3F 4B 78 */ mr r31, r9 /* 8009542C 0009238C B0 01 00 14 */ sth r0, 0x14(r1) /* 80095430 00092390 FF C0 08 90 */ fmr f30, f1 @@ -3004,7 +3004,7 @@ lbl_800953D8: /* 80095520 00092480 D0 1D 02 04 */ stfs f0, 0x204(r29) /* 80095524 00092484 C0 01 00 24 */ lfs f0, 0x24(r1) /* 80095528 00092488 D0 1D 02 08 */ stfs f0, 0x208(r29) -/* 8009552C 0009248C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8009552C 0009248C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80095530 00092490 B0 1D 02 0C */ sth r0, 0x20c(r29) /* 80095534 00092494 C0 05 00 00 */ lfs f0, 0(r5) /* 80095538 00092498 D0 1D 02 10 */ stfs f0, 0x210(r29) diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index d938a06c..d4f31e11 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -722,7 +722,7 @@ lbl_8000E854: /* 8000E864 0000B7C4 28 00 00 00 */ cmplwi r0, 0 /* 8000E868 0000B7C8 40 82 01 5C */ bne lbl_8000E9C4 /* 8000E86C 0000B7CC A0 7F 01 C4 */ lhz r3, 0x1c4(r31) -/* 8000E870 0000B7D0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000E870 0000B7D0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000E874 0000B7D4 7C 03 00 40 */ cmplw r3, r0 /* 8000E878 0000B7D8 40 82 01 4C */ bne lbl_8000E9C4 /* 8000E87C 0000B7DC C0 5E 02 94 */ lfs f2, 0x294(r30) @@ -1775,7 +1775,7 @@ UpdateElevation__18CFirstPersonCameraFR13CStateManager: /* 8000F834 0000C794 28 1E 00 00 */ cmplwi r30, 0 /* 8000F838 0000C798 41 82 02 1C */ beq lbl_8000FA54 /* 8000F83C 0000C79C A0 7D 01 C4 */ lhz r3, 0x1c4(r29) -/* 8000F840 0000C7A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000F840 0000C7A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000F844 0000C7A4 7C 03 00 40 */ cmplw r3, r0 /* 8000F848 0000C7A8 41 82 02 0C */ beq lbl_8000FA54 /* 8000F84C 0000C7AC A0 1D 01 C4 */ lhz r0, 0x1c4(r29) @@ -1994,9 +1994,9 @@ __ct__18CFirstPersonCameraFRC9TUniqueIdRC12CTransform4f9TUniqueIdfffff: /* 8000FB54 0000CAB4 7C 04 03 78 */ mr r4, r0 /* 8000FB58 0000CAB8 38 61 00 30 */ addi r3, r1, 0x30 /* 8000FB5C 0000CABC 4B FF 51 5D */ bl string_l__4rstlFPCc -/* 8000FB60 0000CAC0 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 8000FB60 0000CAC0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 8000FB64 0000CAC4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8000FB68 0000CAC8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8000FB68 0000CAC8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8000FB6C 0000CACC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8000FB70 0000CAD0 90 81 00 28 */ stw r4, 0x28(r1) /* 8000FB74 0000CAD4 38 61 00 40 */ addi r3, r1, 0x40 @@ -2058,7 +2058,7 @@ lbl_8000FC14: /* 8000FC48 0000CBA8 3C 80 80 5A */ lis r4, skZero3f@ha /* 8000FC4C 0000CBAC 7F C3 F3 78 */ mr r3, r30 /* 8000FC50 0000CBB0 D0 3E 01 C0 */ stfs f1, 0x1c0(r30) -/* 8000FC54 0000CBB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8000FC54 0000CBB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8000FC58 0000CBB8 B0 1E 01 C4 */ sth r0, 0x1c4(r30) /* 8000FC5C 0000CBBC 88 1E 01 C6 */ lbz r0, 0x1c6(r30) /* 8000FC60 0000CBC0 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 8b8b8964..fdeb9570 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -454,7 +454,7 @@ lbl_8005B378: /* 8005B38C 000582EC 4B FB 01 91 */ bl SetInsideFluid__14CCameraManagerFb9TUniqueId /* 8005B390 000582F0 48 00 00 30 */ b lbl_8005B3C0 lbl_8005B394: -/* 8005B394 000582F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8005B394 000582F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8005B398 000582F8 38 A1 00 0C */ addi r5, r1, 0xc /* 8005B39C 000582FC 38 80 00 00 */ li r4, 0 /* 8005B3A0 00058300 B0 01 00 0C */ sth r0, 0xc(r1) @@ -3276,7 +3276,7 @@ lbl_8005DAA0: /* 8005DB24 0005AA84 4B FD CC 81 */ bl CModelDataNull__10CModelDataFv /* 8005DB28 0005AA88 38 61 00 20 */ addi r3, r1, 0x20 /* 8005DB2C 0005AA8C 4B FB D3 0D */ bl None__16CActorParametersFv -/* 8005DB30 0005AA90 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8005DB30 0005AA90 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8005DB34 0005AA94 38 00 00 00 */ li r0, 0 /* 8005DB38 0005AA98 80 AD 82 C0 */ lwz r5, lbl_805A6E80@sda21(r13) /* 8005DB3C 0005AA9C 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index dae33fd8..ee3c8b32 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -1073,9 +1073,9 @@ __ct__20CInterpolationCameraF9TUniqueIdRC12CTransform4f: /* 80265EB4 00262E14 38 61 00 30 */ addi r3, r1, 0x30 /* 80265EB8 00262E18 7C 04 03 78 */ mr r4, r0 /* 80265EBC 00262E1C 4B D9 ED FD */ bl string_l__4rstlFPCc -/* 80265EC0 00262E20 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 80265EC0 00262E20 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 80265EC4 00262E24 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80265EC8 00262E28 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80265EC8 00262E28 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80265ECC 00262E2C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 80265ED0 00262E30 90 81 00 28 */ stw r4, 0x28(r1) /* 80265ED4 00262E34 38 61 00 40 */ addi r3, r1, 0x40 @@ -1083,7 +1083,7 @@ __ct__20CInterpolationCameraF9TUniqueIdRC12CTransform4f: /* 80265EDC 00262E3C 38 C1 00 28 */ addi r6, r1, 0x28 /* 80265EE0 00262E40 90 01 00 2C */ stw r0, 0x2c(r1) /* 80265EE4 00262E44 4B DE B5 A1 */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" -/* 80265EE8 00262E48 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 80265EE8 00262E48 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 80265EEC 00262E4C A0 1D 00 00 */ lhz r0, 0(r29) /* 80265EF0 00262E50 B0 61 00 10 */ sth r3, 0x10(r1) /* 80265EF4 00262E54 B0 01 00 14 */ sth r0, 0x14(r1) @@ -1136,7 +1136,7 @@ lbl_80265F8C: /* 80265FA4 00262F04 90 1F 00 00 */ stw r0, 0(r31) /* 80265FA8 00262F08 38 83 66 70 */ addi r4, r3, skIdentity4f@l /* 80265FAC 00262F0C 38 7F 01 94 */ addi r3, r31, 0x194 -/* 80265FB0 00262F10 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80265FB0 00262F10 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80265FB4 00262F14 B0 1F 01 88 */ sth r0, 0x188(r31) /* 80265FB8 00262F18 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 80265FBC 00262F1C D0 1F 01 90 */ stfs f0, 0x190(r31) diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 2f3493e9..856be130 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -1055,7 +1055,7 @@ lbl_8012E6FC: /* 8012E75C 0012B6BC DB 01 00 40 */ stfd f24, 0x40(r1) /* 8012E760 0012B6C0 F3 01 00 48 */ psq_st f24, 72(r1), 0, qr0 /* 8012E764 0012B6C4 BF 21 00 24 */ stmw r25, 0x24(r1) -/* 8012E768 0012B6C8 A1 6D A3 8C */ lhz r11, lbl_805A8F4C@sda21(r13) +/* 8012E768 0012B6C8 A1 6D A3 8C */ lhz r11, kInvalidUniqueId@sda21(r13) /* 8012E76C 0012B6CC FF 00 08 90 */ fmr f24, f1 /* 8012E770 0012B6D0 A0 04 00 00 */ lhz r0, 0(r4) /* 8012E774 0012B6D4 FF 20 10 90 */ fmr f25, f2 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 450c3095..197e4df9 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -468,7 +468,7 @@ sub_8021d644: /* 8021D650 0021A5B0 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8021D654 0021A5B4 93 C1 00 28 */ stw r30, 0x28(r1) /* 8021D658 0021A5B8 7C 7E 1B 78 */ mr r30, r3 -/* 8021D65C 0021A5BC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021D65C 0021A5BC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021D660 0021A5C0 A0 63 06 E8 */ lhz r3, 0x6e8(r3) /* 8021D664 0021A5C4 7C 03 00 40 */ cmplw r3, r0 /* 8021D668 0021A5C8 41 82 00 68 */ beq lbl_8021D6D0 @@ -513,7 +513,7 @@ sub_8021d6e8: /* 8021D6F4 0021A654 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8021D6F8 0021A658 93 C1 00 28 */ stw r30, 0x28(r1) /* 8021D6FC 0021A65C 7C 7E 1B 78 */ mr r30, r3 -/* 8021D700 0021A660 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021D700 0021A660 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021D704 0021A664 A0 63 06 E8 */ lhz r3, 0x6e8(r3) /* 8021D708 0021A668 7C 03 00 40 */ cmplw r3, r0 /* 8021D70C 0021A66C 41 82 00 68 */ beq lbl_8021D774 @@ -618,7 +618,7 @@ sub_8021d7e0: /* 8021D854 0021A7B4 C0 05 00 08 */ lfs f0, 8(r5) /* 8021D858 0021A7B8 D0 01 00 60 */ stfs f0, 0x60(r1) /* 8021D85C 0021A7BC 4B DE 74 5D */ bl string_l__4rstlFPCc -/* 8021D860 0021A7C0 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8021D860 0021A7C0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8021D864 0021A7C4 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8021D868 0021A7C8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8021D86C 0021A7CC 38 81 00 34 */ addi r4, r1, 0x34 @@ -1268,7 +1268,7 @@ sub_8021e160: /* 8021E16C 0021B0CC BF 21 00 74 */ stmw r25, 0x74(r1) /* 8021E170 0021B0D0 7C 7E 1B 78 */ mr r30, r3 /* 8021E174 0021B0D4 7C 9F 23 78 */ mr r31, r4 -/* 8021E178 0021B0D8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021E178 0021B0D8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021E17C 0021B0DC A0 63 09 80 */ lhz r3, 0x980(r3) /* 8021E180 0021B0E0 7C 03 00 40 */ cmplw r3, r0 /* 8021E184 0021B0E4 40 82 01 2C */ bne lbl_8021E2B0 @@ -6582,7 +6582,7 @@ lbl_80222DE0: /* 80222DE4 0021FD44 7F C4 F3 78 */ mr r4, r30 /* 80222DE8 0021FD48 4B F8 45 DD */ bl Destroy__22CCollisionActorManagerCFR13CStateManager /* 80222DEC 0021FD4C A0 7B 09 80 */ lhz r3, 0x980(r27) -/* 80222DF0 0021FD50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80222DF0 0021FD50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80222DF4 0021FD54 7C 03 00 40 */ cmplw r3, r0 /* 80222DF8 0021FD58 41 82 00 20 */ beq lbl_80222E18 /* 80222DFC 0021FD5C A0 1B 09 80 */ lhz r0, 0x980(r27) @@ -6590,7 +6590,7 @@ lbl_80222DE0: /* 80222E04 0021FD64 38 81 00 3C */ addi r4, r1, 0x3c /* 80222E08 0021FD68 B0 01 00 3C */ sth r0, 0x3c(r1) /* 80222E0C 0021FD6C 4B E2 94 61 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80222E10 0021FD70 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80222E10 0021FD70 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80222E14 0021FD74 B0 1B 09 80 */ sth r0, 0x980(r27) lbl_80222E18: /* 80222E18 0021FD78 7F 63 DB 78 */ mr r3, r27 @@ -6668,7 +6668,7 @@ lbl_80222EE4: /* 80222F14 0021FE74 80 03 10 BC */ lwz r0, 0x10bc(r3) /* 80222F18 0021FE78 90 1B 07 D0 */ stw r0, 0x7d0(r27) /* 80222F1C 0021FE7C A0 7B 06 E8 */ lhz r3, 0x6e8(r27) -/* 80222F20 0021FE80 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80222F20 0021FE80 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80222F24 0021FE84 7C 03 00 40 */ cmplw r3, r0 /* 80222F28 0021FE88 40 82 03 58 */ bne lbl_80223280 /* 80222F2C 0021FE8C 7F 64 DB 78 */ mr r4, r27 @@ -7299,7 +7299,7 @@ lbl_80223764: /* 80223808 00220768 90 BD 05 68 */ stw r5, 0x568(r29) /* 8022380C 0022076C 90 1D 05 6C */ stw r0, 0x56c(r29) /* 80223810 00220770 48 00 09 C9 */ bl __ct__13CBabygothDataFRC13CBabygothData -/* 80223814 00220774 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80223814 00220774 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80223818 00220778 38 7D 06 EC */ addi r3, r29, 0x6ec /* 8022381C 0022077C C0 22 B4 18 */ lfs f1, lbl_805AD138@sda21(r2) /* 80223820 00220780 38 80 00 00 */ li r4, 0 @@ -7385,7 +7385,7 @@ lbl_80223764: /* 80223960 002208C0 D0 1A 00 24 */ stfs f0, 0x24(r26) /* 80223964 002208C4 80 9F 00 08 */ lwz r4, 8(r31) /* 80223968 002208C8 4B FF 87 41 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo -/* 8022396C 002208CC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022396C 002208CC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80223970 002208D0 3B 20 00 00 */ li r25, 0 /* 80223974 002208D4 3B 40 00 00 */ li r26, 0 /* 80223978 002208D8 B0 1D 09 80 */ sth r0, 0x980(r29) @@ -7498,7 +7498,7 @@ lbl_80223A20: /* 80223B14 00220A74 80 FE 00 C0 */ lwz r7, 0xc0(r30) /* 80223B18 00220A78 90 FD 09 F0 */ stw r7, 0x9f0(r29) /* 80223B1C 00220A7C 98 DD 09 F4 */ stb r6, 0x9f4(r29) -/* 80223B20 00220A80 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80223B20 00220A80 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80223B24 00220A84 B0 DD 09 F6 */ sth r6, 0x9f6(r29) /* 80223B28 00220A88 90 1D 09 F8 */ stw r0, 0x9f8(r29) /* 80223B2C 00220A8C C0 1F 01 40 */ lfs f0, 0x140(r31) diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 984e7dd1..e32d8ba7 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -868,7 +868,7 @@ SquadRemove__7CBeetleFR13CStateManager: /* 800E3714 000E0674 93 E1 00 2C */ stw r31, 0x2c(r1) /* 800E3718 000E0678 93 C1 00 28 */ stw r30, 0x28(r1) /* 800E371C 000E067C 7C 7E 1B 78 */ mr r30, r3 -/* 800E3720 000E0680 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E3720 000E0680 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E3724 000E0684 A0 63 05 70 */ lhz r3, 0x570(r3) /* 800E3728 000E0688 7C 03 00 40 */ cmplw r3, r0 /* 800E372C 000E068C 41 82 00 68 */ beq lbl_800E3794 @@ -912,7 +912,7 @@ SquadAdd__7CBeetleFR13CStateManager: /* 800E37B4 000E0714 90 01 00 24 */ stw r0, 0x24(r1) /* 800E37B8 000E0718 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800E37BC 000E071C 7C 7F 1B 78 */ mr r31, r3 -/* 800E37C0 000E0720 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E37C0 000E0720 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E37C4 000E0724 A0 63 05 70 */ lhz r3, 0x570(r3) /* 800E37C8 000E0728 7C 03 00 40 */ cmplw r3, r0 /* 800E37CC 000E072C 41 82 00 44 */ beq lbl_800E3810 @@ -3692,7 +3692,7 @@ lbl_800E5EEC: /* 800E5FE4 000E2F44 D0 41 00 2C */ stfs f2, 0x2c(r1) /* 800E5FE8 000E2F48 C0 3D 05 A0 */ lfs f1, 0x5a0(r29) /* 800E5FEC 000E2F4C 4B F6 66 ED */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" -/* 800E5FF0 000E2F50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E5FF0 000E2F50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E5FF4 000E2F54 38 60 00 00 */ li r3, 0 /* 800E5FF8 000E2F58 80 AD 87 90 */ lwz r5, lbl_805A7350@sda21(r13) /* 800E5FFC 000E2F5C 38 80 00 01 */ li r4, 1 @@ -3914,7 +3914,7 @@ ShouldJumpBack__7CBeetleFR13CStateManagerf: /* 800E6310 000E3270 91 21 00 50 */ stw r9, 0x50(r1) /* 800E6314 000E3274 C0 3D 05 A4 */ lfs f1, 0x5a4(r29) /* 800E6318 000E3278 4B F6 63 C1 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" -/* 800E631C 000E327C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E631C 000E327C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E6320 000E3280 38 60 00 00 */ li r3, 0 /* 800E6324 000E3284 80 AD 87 88 */ lwz r5, lbl_805A7348@sda21(r13) /* 800E6328 000E3288 38 80 00 01 */ li r4, 1 @@ -5468,7 +5468,7 @@ lbl_800E797C: .global lbl_800E7984 lbl_800E7984: /* 800E7984 000E48E4 A0 7B 05 70 */ lhz r3, 0x570(r27) -/* 800E7988 000E48E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E7988 000E48E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E798C 000E48EC 7C 03 00 40 */ cmplw r3, r0 /* 800E7990 000E48F0 40 82 00 34 */ bne lbl_800E79C4 /* 800E7994 000E48F4 7F 64 DB 78 */ mr r4, r27 @@ -5692,7 +5692,7 @@ lbl_800E7BA4: /* 800E7C94 000E4BF4 90 1A 05 68 */ stw r0, 0x568(r26) /* 800E7C98 000E4BF8 3A A0 00 00 */ li r21, 0 /* 800E7C9C 000E4BFC 93 9A 05 6C */ stw r28, 0x56c(r26) -/* 800E7CA0 000E4C00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E7CA0 000E4C00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E7CA4 000E4C04 B0 1A 05 70 */ sth r0, 0x570(r26) /* 800E7CA8 000E4C08 C0 56 00 00 */ lfs f2, 0(r22) /* 800E7CAC 000E4C0C D0 5A 05 74 */ stfs f2, 0x574(r26) diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index a75caec9..248f2b37 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -431,7 +431,7 @@ lbl_80118E68: /* 80118EE4 00115E44 38 61 00 80 */ addi r3, r1, 0x80 /* 80118EE8 00115E48 38 81 00 50 */ addi r4, r1, 0x50 /* 80118EEC 00115E4C 48 1F 9C 89 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80118EF0 00115E50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80118EF0 00115E50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80118EF4 00115E54 7F C3 F3 78 */ mr r3, r30 /* 80118EF8 00115E58 B0 01 00 08 */ sth r0, 8(r1) /* 80118EFC 00115E5C 81 9E 00 00 */ lwz r12, 0(r30) diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index c283bcf3..01f6a639 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -251,7 +251,7 @@ sub_8022e424: lbl_8022E548: /* 8022E548 0022B4A8 A0 7B 00 00 */ lhz r3, 0(r27) /* 8022E54C 0022B4AC 3B BE 02 60 */ addi r29, r30, 0x260 -/* 8022E550 0022B4B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022E550 0022B4B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022E554 0022B4B4 7C 03 00 40 */ cmplw r3, r0 /* 8022E558 0022B4B8 41 82 00 7C */ beq lbl_8022E5D4 /* 8022E55C 0022B4BC 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -797,7 +797,7 @@ lbl_8022EC8C: /* 8022ED4C 0022BCAC 90 1C 02 94 */ stw r0, 0x294(r28) /* 8022ED50 0022BCB0 48 00 00 28 */ b lbl_8022ED78 lbl_8022ED54: -/* 8022ED54 0022BCB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022ED54 0022BCB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022ED58 0022BCB8 7F 83 E3 78 */ mr r3, r28 /* 8022ED5C 0022BCBC 7F E4 FB 78 */ mr r4, r31 /* 8022ED60 0022BCC0 38 A1 00 08 */ addi r5, r1, 8 @@ -1059,7 +1059,7 @@ lbl_8022F0A0: /* 8022F124 0022C084 EC 23 08 2A */ fadds f1, f3, f1 /* 8022F128 0022C088 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8022F12C 0022C08C 40 80 00 1C */ bge lbl_8022F148 -/* 8022F130 0022C090 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022F130 0022C090 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022F134 0022C094 7F C3 F3 78 */ mr r3, r30 /* 8022F138 0022C098 7F E4 FB 78 */ mr r4, r31 /* 8022F13C 0022C09C 38 A1 00 10 */ addi r5, r1, 0x10 diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index 44d9c295..949f1be5 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -618,7 +618,7 @@ TargetPatrol__9CBurrowerFR13CStateManager9EStateMsgf: /* 80270088 0026CFE8 48 00 00 AC */ b lbl_80270134 lbl_8027008C: /* 8027008C 0026CFEC A0 7E 06 A8 */ lhz r3, 0x6a8(r30) -/* 80270090 0026CFF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80270090 0026CFF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80270094 0026CFF4 7C 03 00 40 */ cmplw r3, r0 /* 80270098 0026CFF8 41 82 00 0C */ beq lbl_802700A4 /* 8027009C 0026CFFC 38 7E 06 A8 */ addi r3, r30, 0x6a8 @@ -1422,7 +1422,7 @@ __ct__9CBurrower: /* 80270BDC 0026DB3C D0 1F 06 9C */ stfs f0, 0x69c(r31) /* 80270BE0 0026DB40 D0 1F 06 A0 */ stfs f0, 0x6a0(r31) /* 80270BE4 0026DB44 D0 1F 06 A4 */ stfs f0, 0x6a4(r31) -/* 80270BE8 0026DB48 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80270BE8 0026DB48 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80270BEC 0026DB4C B0 1F 06 A8 */ sth r0, 0x6a8(r31) /* 80270BF0 0026DB50 48 07 7D C1 */ bl TranslateSFXID__11CSfxManagerFUs /* 80270BF4 0026DB54 B0 7F 06 AA */ sth r3, 0x6aa(r31) diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index d21a7eed..9f2747a6 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -1767,7 +1767,7 @@ lbl_8014071C: /* 80140730 0013D690 38 E0 00 06 */ li r7, 6 /* 80140734 0013D694 48 0B 48 65 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 80140738 0013D698 A0 61 00 14 */ lhz r3, 0x14(r1) -/* 8014073C 0013D69C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014073C 0013D69C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80140740 0013D6A0 B0 61 00 18 */ sth r3, 0x18(r1) /* 80140744 0013D6A4 7C 03 00 40 */ cmplw r3, r0 /* 80140748 0013D6A8 41 82 00 24 */ beq lbl_8014076C @@ -2439,7 +2439,7 @@ lbl_801410A8: /* 801410CC 0013E02C 88 1A 00 30 */ lbz r0, 0x30(r26) /* 801410D0 0013E030 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 801410D4 0013E034 41 82 02 68 */ beq lbl_8014133C -/* 801410D8 0013E038 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801410D8 0013E038 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801410DC 0013E03C 7F 43 D3 78 */ mr r3, r26 /* 801410E0 0013E040 38 81 00 08 */ addi r4, r1, 8 /* 801410E4 0013E044 B0 01 00 08 */ sth r0, 8(r1) @@ -2726,7 +2726,7 @@ lbl_8014151C: /* 80141524 0013E484 4B F3 B6 39 */ bl SetDestPos__10CPatternedFRC9CVector3f /* 80141528 0013E488 48 00 00 24 */ b lbl_8014154C lbl_8014152C: -/* 8014152C 0013E48C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014152C 0013E48C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80141530 0013E490 B0 1B 02 DC */ sth r0, 0x2dc(r27) /* 80141534 0013E494 C0 5B 00 60 */ lfs f2, 0x60(r27) /* 80141538 0013E498 C0 3B 00 50 */ lfs f1, 0x50(r27) @@ -2790,7 +2790,7 @@ sub_801415ec: /* 801415F8 0013E558 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801415FC 0013E55C 93 C1 00 28 */ stw r30, 0x28(r1) /* 80141600 0013E560 7C 7E 1B 78 */ mr r30, r3 -/* 80141604 0013E564 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80141604 0013E564 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80141608 0013E568 A0 63 06 C4 */ lhz r3, 0x6c4(r3) /* 8014160C 0013E56C 7C 03 00 40 */ cmplw r3, r0 /* 80141610 0013E570 41 82 00 70 */ beq lbl_80141680 @@ -2819,7 +2819,7 @@ sub_801415ec: /* 8014166C 0013E5CC B0 01 00 08 */ sth r0, 8(r1) /* 80141670 0013E5D0 B0 01 00 0C */ sth r0, 0xc(r1) /* 80141674 0013E5D4 48 0F 7E 81 */ bl RemoveTeamAiRole__10CTeamAiMgrF9TUniqueId -/* 80141678 0013E5D8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80141678 0013E5D8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8014167C 0013E5DC B0 1E 06 C4 */ sth r0, 0x6c4(r30) lbl_80141680: /* 80141680 0013E5E0 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2838,7 +2838,7 @@ sub_80141698: /* 801416A8 0013E608 7C 9F 23 78 */ mr r31, r4 /* 801416AC 0013E60C 93 C1 00 18 */ stw r30, 0x18(r1) /* 801416B0 0013E610 7C 7E 1B 78 */ mr r30, r3 -/* 801416B4 0013E614 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801416B4 0013E614 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801416B8 0013E618 A0 63 06 C4 */ lhz r3, 0x6c4(r3) /* 801416BC 0013E61C 7C 03 00 40 */ cmplw r3, r0 /* 801416C0 0013E620 40 82 00 1C */ bne lbl_801416DC @@ -2850,7 +2850,7 @@ sub_80141698: /* 801416D8 0013E638 B0 1E 06 C4 */ sth r0, 0x6c4(r30) lbl_801416DC: /* 801416DC 0013E63C A0 7E 06 C4 */ lhz r3, 0x6c4(r30) -/* 801416E0 0013E640 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801416E0 0013E640 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801416E4 0013E644 7C 03 00 40 */ cmplw r3, r0 /* 801416E8 0013E648 41 82 00 44 */ beq lbl_8014172C /* 801416EC 0013E64C A0 1E 06 C4 */ lhz r0, 0x6c4(r30) @@ -3580,7 +3580,7 @@ Accept__11CChozoGhostFR8IVisitor: /* 80142134 0013F094 D0 18 06 68 */ stfs f0, 0x668(r24) /* 80142138 0013F098 D0 18 06 6C */ stfs f0, 0x66c(r24) /* 8014213C 0013F09C D0 18 06 70 */ stfs f0, 0x670(r24) -/* 80142140 0013F0A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80142140 0013F0A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80142144 0013F0A4 B0 18 06 74 */ sth r0, 0x674(r24) /* 80142148 0013F0A8 D0 18 06 78 */ stfs f0, 0x678(r24) /* 8014214C 0013F0AC 90 98 06 7C */ stw r4, 0x67c(r24) @@ -3609,7 +3609,7 @@ lbl_80142160: /* 801421A4 0013F104 48 03 38 15 */ bl "__ct__13CBoneTrackingFRC9CAnimDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffb" /* 801421A8 0013F108 38 61 01 24 */ addi r3, r1, 0x124 /* 801421AC 0013F10C 48 1F B9 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 801421B0 0013F110 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801421B0 0013F110 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801421B4 0013F114 3C 60 80 5A */ lis r3, skZero3f@ha /* 801421B8 0013F118 C0 02 9B 5C */ lfs f0, lbl_805AB87C@sda21(r2) /* 801421BC 0013F11C 38 83 66 A0 */ addi r4, r3, skZero3f@l diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 6574797f..daeff11e 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -924,7 +924,7 @@ sub_8015f3f4: /* 8015F400 0015C360 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8015F404 0015C364 93 C1 00 28 */ stw r30, 0x28(r1) /* 8015F408 0015C368 7C 7E 1B 78 */ mr r30, r3 -/* 8015F40C 0015C36C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015F40C 0015C36C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015F410 0015C370 A0 63 06 88 */ lhz r3, 0x688(r3) /* 8015F414 0015C374 7C 03 00 40 */ cmplw r3, r0 /* 8015F418 0015C378 41 82 00 68 */ beq lbl_8015F480 @@ -968,7 +968,7 @@ sub_8015f498: /* 8015F4A0 0015C400 90 01 00 24 */ stw r0, 0x24(r1) /* 8015F4A4 0015C404 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8015F4A8 0015C408 7C 7F 1B 78 */ mr r31, r3 -/* 8015F4AC 0015C40C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015F4AC 0015C40C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015F4B0 0015C410 A0 63 06 88 */ lhz r3, 0x688(r3) /* 8015F4B4 0015C414 7C 03 00 40 */ cmplw r3, r0 /* 8015F4B8 0015C418 41 82 00 44 */ beq lbl_8015F4FC @@ -5241,7 +5241,7 @@ sub_801632a4: /* 801632C4 00160224 7C BB 2B 78 */ mr r27, r5 /* 801632C8 00160228 41 82 00 80 */ beq lbl_80163348 /* 801632CC 0016022C 57 63 08 3C */ slwi r3, r27, 1 -/* 801632D0 00160230 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801632D0 00160230 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801632D4 00160234 7F 9D 1A 14 */ add r28, r29, r3 /* 801632D8 00160238 A0 7C 07 DC */ lhz r3, 0x7dc(r28) /* 801632DC 0016023C 7C 03 00 40 */ cmplw r3, r0 @@ -5428,7 +5428,7 @@ lbl_8016348C: /* 8016358C 001604EC 80 01 01 80 */ lwz r0, 0x180(r1) /* 80163590 001604F0 2C 00 00 00 */ cmpwi r0, 0 /* 80163594 001604F4 40 81 01 B0 */ ble lbl_80163744 -/* 80163598 001604F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80163598 001604F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016359C 001604FC 3C 60 80 47 */ lis r3, lbl_8046C8A8@ha /* 801635A0 00160500 38 E3 C8 A8 */ addi r7, r3, lbl_8046C8A8@l /* 801635A4 00160504 C0 22 9F DC */ lfs f1, lbl_805ABCFC@sda21(r2) @@ -5503,7 +5503,7 @@ lbl_8016348C: /* 801636B8 00160618 D8 01 01 78 */ stfd f0, 0x178(r1) /* 801636BC 0016061C 41 82 00 88 */ beq lbl_80163744 /* 801636C0 00160620 A0 61 00 14 */ lhz r3, 0x14(r1) -/* 801636C4 00160624 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801636C4 00160624 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801636C8 00160628 7C 03 00 40 */ cmplw r3, r0 /* 801636CC 0016062C 41 82 00 78 */ beq lbl_80163744 /* 801636D0 00160630 A0 01 00 14 */ lhz r0, 0x14(r1) @@ -5978,7 +5978,7 @@ lbl_80163D2C: /* 80163DC8 00160D28 38 61 01 60 */ addi r3, r1, 0x160 /* 80163DCC 00160D2C C0 02 9F E4 */ lfs f0, lbl_805ABD04@sda21(r2) /* 80163DD0 00160D30 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 80163DD4 00160D34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80163DD4 00160D34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80163DD8 00160D38 C0 C5 00 00 */ lfs f6, 0(r5) /* 80163DDC 00160D3C ED 60 02 32 */ fmuls f11, f0, f8 /* 80163DE0 00160D40 C0 BD 00 04 */ lfs f5, 4(r29) @@ -6089,7 +6089,7 @@ lbl_80163D2C: /* 80163F84 00160EE4 90 01 02 00 */ stw r0, 0x200(r1) /* 80163F88 00160EE8 41 82 02 3C */ beq lbl_801641C4 /* 80163F8C 00160EEC A0 79 00 00 */ lhz r3, 0(r25) -/* 80163F90 00160EF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80163F90 00160EF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80163F94 00160EF4 7C 03 00 40 */ cmplw r3, r0 /* 80163F98 00160EF8 41 82 00 68 */ beq lbl_80164000 /* 80163F9C 00160EFC A0 19 00 00 */ lhz r0, 0(r25) @@ -6437,7 +6437,7 @@ lbl_80164470: /* 80164494 001613F4 48 1A E6 E1 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80164498 001613F8 38 61 00 44 */ addi r3, r1, 0x44 /* 8016449C 001613FC 48 1D 96 45 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 801644A0 00161400 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801644A0 00161400 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801644A4 00161404 38 00 00 00 */ li r0, 0 /* 801644A8 00161408 90 01 01 60 */ stw r0, 0x160(r1) /* 801644AC 0016140C 54 00 08 3C */ slwi r0, r0, 1 @@ -6510,7 +6510,7 @@ lbl_801644CC: /* 801645B4 00161514 90 01 01 28 */ stw r0, 0x128(r1) /* 801645B8 00161518 41 82 00 60 */ beq lbl_80164618 /* 801645BC 0016151C A0 7E 05 78 */ lhz r3, 0x578(r30) -/* 801645C0 00161520 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801645C0 00161520 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801645C4 00161524 7C 03 00 40 */ cmplw r3, r0 /* 801645C8 00161528 41 82 00 50 */ beq lbl_80164618 /* 801645CC 0016152C A0 1E 05 78 */ lhz r0, 0x578(r30) @@ -7731,7 +7731,7 @@ sub_801656d4: /* 80165748 001626A8 90 C5 00 10 */ stw r6, 0x10(r5) /* 8016574C 001626AC 98 0D A4 20 */ stb r0, lbl_805A8FE0@sda21(r13) lbl_80165750: -/* 80165750 001626B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80165750 001626B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80165754 001626B4 38 A0 00 00 */ li r5, 0 /* 80165758 001626B8 C0 DE 00 24 */ lfs f6, 0x24(r30) /* 8016575C 001626BC 3C 60 80 47 */ lis r3, lbl_8046C848@ha @@ -8434,7 +8434,7 @@ sub_801660a4: /* 80166180 001630E0 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 80166184 001630E4 C0 01 00 F0 */ lfs f0, 0xf0(r1) /* 80166188 001630E8 38 61 00 7C */ addi r3, r1, 0x7c -/* 8016618C 001630EC 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8016618C 001630EC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80166190 001630F0 38 81 00 40 */ addi r4, r1, 0x40 /* 80166194 001630F4 D0 41 00 60 */ stfs f2, 0x60(r1) /* 80166198 001630F8 38 C1 00 44 */ addi r6, r1, 0x44 @@ -8591,7 +8591,7 @@ lbl_801663A0: /* 801663A8 00163308 48 00 00 38 */ b lbl_801663E0 lbl_801663AC: /* 801663AC 0016330C A0 7D 00 00 */ lhz r3, 0(r29) -/* 801663B0 00163310 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801663B0 00163310 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801663B4 00163314 7C 03 00 40 */ cmplw r3, r0 /* 801663B8 00163318 41 82 00 20 */ beq lbl_801663D8 /* 801663BC 0016331C A0 1D 00 00 */ lhz r0, 0(r29) @@ -8599,7 +8599,7 @@ lbl_801663AC: /* 801663C4 00163324 38 81 00 34 */ addi r4, r1, 0x34 /* 801663C8 00163328 B0 01 00 34 */ sth r0, 0x34(r1) /* 801663CC 0016332C 4B EE 5E A1 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801663D0 00163330 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801663D0 00163330 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801663D4 00163334 B0 1D 00 00 */ sth r0, 0(r29) lbl_801663D8: /* 801663D8 00163338 3B BD 00 02 */ addi r29, r29, 2 @@ -8620,7 +8620,7 @@ lbl_801663E0: /* 80166410 00163370 38 63 01 88 */ addi r3, r3, 0x188 /* 80166414 00163374 48 05 A5 A1 */ bl sub_801c09b4 /* 80166418 00163378 A0 7E 05 78 */ lhz r3, 0x578(r30) -/* 8016641C 0016337C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016641C 0016337C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166420 00163380 7C 03 00 40 */ cmplw r3, r0 /* 80166424 00163384 41 82 00 20 */ beq lbl_80166444 /* 80166428 00163388 A0 1E 05 78 */ lhz r0, 0x578(r30) @@ -8628,11 +8628,11 @@ lbl_801663E0: /* 80166430 00163390 38 81 00 28 */ addi r4, r1, 0x28 /* 80166434 00163394 B0 01 00 28 */ sth r0, 0x28(r1) /* 80166438 00163398 4B EE 5E 35 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8016643C 0016339C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016643C 0016339C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166440 001633A0 B0 1E 05 78 */ sth r0, 0x578(r30) lbl_80166444: /* 80166444 001633A4 A0 7E 05 7A */ lhz r3, 0x57a(r30) -/* 80166448 001633A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166448 001633A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016644C 001633AC 7C 03 00 40 */ cmplw r3, r0 /* 80166450 001633B0 41 82 00 20 */ beq lbl_80166470 /* 80166454 001633B4 A0 1E 05 7A */ lhz r0, 0x57a(r30) @@ -8640,7 +8640,7 @@ lbl_80166444: /* 8016645C 001633BC 38 81 00 24 */ addi r4, r1, 0x24 /* 80166460 001633C0 B0 01 00 24 */ sth r0, 0x24(r1) /* 80166464 001633C4 4B EE 5E 09 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80166468 001633C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166468 001633C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016646C 001633CC B0 1E 05 7A */ sth r0, 0x57a(r30) lbl_80166470: /* 80166470 001633D0 80 1E 07 D0 */ lwz r0, 0x7d0(r30) @@ -8758,7 +8758,7 @@ lbl_801665EC: /* 80166610 00163570 80 03 10 BC */ lwz r0, 0x10bc(r3) /* 80166614 00163574 90 1E 06 B0 */ stw r0, 0x6b0(r30) /* 80166618 00163578 A0 7E 06 88 */ lhz r3, 0x688(r30) -/* 8016661C 0016357C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016661C 0016357C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166620 00163580 7C 03 00 40 */ cmplw r3, r0 /* 80166624 00163584 40 82 00 34 */ bne lbl_80166658 /* 80166628 00163588 7F C4 F3 78 */ mr r4, r30 @@ -8973,11 +8973,11 @@ lbl_8016689C: /* 8016693C 0016389C 38 80 FF FF */ li r4, -1 /* 80166940 001638A0 90 11 00 08 */ stw r0, 8(r17) /* 80166944 001638A4 48 1D A4 FD */ bl __dt__6CTokenFv -/* 80166948 001638A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166948 001638A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016694C 001638AC 7F 44 D3 78 */ mr r4, r26 /* 80166950 001638B0 38 7E 05 7C */ addi r3, r30, 0x57c /* 80166954 001638B4 B0 1E 05 78 */ sth r0, 0x578(r30) -/* 80166958 001638B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166958 001638B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016695C 001638BC B0 1E 05 7A */ sth r0, 0x57a(r30) /* 80166960 001638C0 4B F6 7B 0D */ bl sub_800ce46c /* 80166964 001638C4 38 00 00 02 */ li r0, 2 @@ -9076,7 +9076,7 @@ lbl_8016689C: /* 80166AD8 00163A38 D0 1E 06 80 */ stfs f0, 0x680(r30) /* 80166ADC 00163A3C C0 11 00 08 */ lfs f0, 8(r17) /* 80166AE0 00163A40 D0 1E 06 84 */ stfs f0, 0x684(r30) -/* 80166AE4 00163A44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166AE4 00163A44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166AE8 00163A48 B0 1E 06 88 */ sth r0, 0x688(r30) /* 80166AEC 00163A4C 48 16 8D C9 */ bl __ct__19CCollisionPrimitiveFRC13CMaterialList /* 80166AF0 00163A50 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha @@ -9132,12 +9132,12 @@ lbl_8016689C: /* 80166BB8 00163B18 90 7E 07 D0 */ stw r3, 0x7d0(r30) /* 80166BBC 00163B1C 90 1E 07 D8 */ stw r0, 0x7d8(r30) /* 80166BC0 00163B20 41 82 00 0C */ beq lbl_80166BCC -/* 80166BC4 00163B24 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166BC4 00163B24 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166BC8 00163B28 B0 04 00 00 */ sth r0, 0(r4) lbl_80166BCC: /* 80166BCC 00163B2C 34 84 00 02 */ addic. r4, r4, 2 /* 80166BD0 00163B30 41 82 00 0C */ beq lbl_80166BDC -/* 80166BD4 00163B34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80166BD4 00163B34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80166BD8 00163B38 B0 04 00 00 */ sth r0, 0(r4) lbl_80166BDC: /* 80166BDC 00163B3C 38 00 00 02 */ li r0, 2 @@ -9887,7 +9887,7 @@ lbl_801676C8: /* 801676D4 00164634 48 00 00 30 */ b lbl_80167704 lbl_801676D8: /* 801676D8 00164638 A0 7E 00 F4 */ lhz r3, 0xf4(r30) -/* 801676DC 0016463C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801676DC 0016463C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801676E0 00164640 7C 03 00 40 */ cmplw r3, r0 /* 801676E4 00164644 41 82 00 20 */ beq lbl_80167704 /* 801676E8 00164648 A0 1E 00 F4 */ lhz r0, 0xf4(r30) @@ -9895,7 +9895,7 @@ lbl_801676D8: /* 801676F0 00164650 38 81 00 10 */ addi r4, r1, 0x10 /* 801676F4 00164654 B0 01 00 10 */ sth r0, 0x10(r1) /* 801676F8 00164658 4B EE 4B 75 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801676FC 0016465C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801676FC 0016465C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80167700 00164660 B0 1E 00 F4 */ sth r0, 0xf4(r30) lbl_80167704: /* 80167704 00164664 80 01 00 F4 */ lwz r0, 0xf4(r1) @@ -9963,7 +9963,7 @@ sub_80167754: /* 801677E4 00164744 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801677E8 00164748 48 1A D0 69 */ bl AsNormalized__9CVector3fCFv /* 801677EC 0016474C A0 7C 00 F4 */ lhz r3, 0xf4(r28) -/* 801677F0 00164750 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801677F0 00164750 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801677F4 00164754 C3 E1 00 38 */ lfs f31, 0x38(r1) /* 801677F8 00164758 7C 03 00 40 */ cmplw r3, r0 /* 801677FC 0016475C C3 C1 00 3C */ lfs f30, 0x3c(r1) @@ -10050,7 +10050,7 @@ __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi: /* 80167930 00164890 38 61 00 50 */ addi r3, r1, 0x50 /* 80167934 00164894 38 88 00 83 */ addi r4, r8, 0x83 /* 80167938 00164898 4B E9 D3 81 */ bl string_l__4rstlFPCc -/* 8016793C 0016489C 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 8016793C 0016489C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 80167940 001648A0 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80167944 001648A4 80 1B 00 00 */ lwz r0, 0(r27) /* 80167948 001648A8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -10068,7 +10068,7 @@ __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi: /* 80167978 001648D8 38 81 00 E0 */ addi r4, r1, 0xe0 /* 8016797C 001648DC 38 A0 00 01 */ li r5, 1 /* 80167980 001648E0 4B F9 EE 8D */ bl sub_8010680c -/* 80167984 001648E4 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80167984 001648E4 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80167988 001648E8 38 00 00 00 */ li r0, 0 /* 8016798C 001648EC 80 AD 8D 00 */ lwz r5, lbl_805A78C0@sda21(r13) /* 80167990 001648F0 38 60 00 00 */ li r3, 0 @@ -10142,7 +10142,7 @@ lbl_80167A60: /* 80167A94 001649F4 D0 1C 00 EC */ stfs f0, 0xec(r28) /* 80167A98 001649F8 C0 04 00 08 */ lfs f0, 8(r4) /* 80167A9C 001649FC D0 1C 00 F0 */ stfs f0, 0xf0(r28) -/* 80167AA0 00164A00 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80167AA0 00164A00 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80167AA4 00164A04 B0 9C 00 F4 */ sth r4, 0xf4(r28) /* 80167AA8 00164A08 90 01 00 40 */ stw r0, 0x40(r1) /* 80167AAC 00164A0C 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index ce3dcdb6..4f665bc4 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -1385,7 +1385,7 @@ sub_802281d8: /* 80228254 002251B4 C0 05 00 08 */ lfs f0, 8(r5) /* 80228258 002251B8 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 8022825C 002251BC 4B DD CA 5D */ bl string_l__4rstlFPCc -/* 80228260 002251C0 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80228260 002251C0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80228264 002251C4 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80228268 002251C8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8022826C 002251CC 38 81 00 30 */ addi r4, r1, 0x30 @@ -1868,7 +1868,7 @@ sub_80228920: /* 8022893C 0022589C 93 A1 00 24 */ stw r29, 0x24(r1) /* 80228940 002258A0 7C 7D 1B 78 */ mr r29, r3 /* 80228944 002258A4 A0 C6 00 00 */ lhz r6, 0(r6) -/* 80228948 002258A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80228948 002258A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022894C 002258AC 7C 06 00 40 */ cmplw r6, r0 /* 80228950 002258B0 41 82 00 44 */ beq lbl_80228994 /* 80228954 002258B4 B0 C1 00 10 */ sth r6, 0x10(r1) @@ -1923,7 +1923,7 @@ sub_802289dc: /* 802289F8 00225958 7C BD 2B 78 */ mr r29, r5 /* 802289FC 0022595C 93 81 00 70 */ stw r28, 0x70(r1) /* 80228A00 00225960 7C 7C 1B 78 */ mr r28, r3 -/* 80228A04 00225964 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80228A04 00225964 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80228A08 00225968 A0 A5 00 00 */ lhz r5, 0(r5) /* 80228A0C 0022596C 7C 05 00 40 */ cmplw r5, r0 /* 80228A10 00225970 41 82 00 7C */ beq lbl_80228A8C @@ -1956,7 +1956,7 @@ sub_802289dc: /* 80228A7C 002259DC 98 1F 00 E4 */ stb r0, 0xe4(r31) /* 80228A80 002259E0 48 00 00 0C */ b lbl_80228A8C lbl_80228A84: -/* 80228A84 002259E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80228A84 002259E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80228A88 002259E8 B0 1D 00 00 */ sth r0, 0(r29) lbl_80228A8C: /* 80228A8C 002259EC 80 01 00 84 */ lwz r0, 0x84(r1) @@ -2077,7 +2077,7 @@ sub_80228aac: /* 80228C4C 00225BAC C0 02 B5 F4 */ lfs f0, lbl_805AD314@sda21(r2) /* 80228C50 00225BB0 B0 C1 00 20 */ sth r6, 0x20(r1) /* 80228C54 00225BB4 38 61 00 74 */ addi r3, r1, 0x74 -/* 80228C58 00225BB8 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80228C58 00225BB8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80228C5C 00225BBC 38 81 00 38 */ addi r4, r1, 0x38 /* 80228C60 00225BC0 C0 3D 06 9C */ lfs f1, 0x69c(r29) /* 80228C64 00225BC4 B0 C1 00 1C */ sth r6, 0x1c(r1) @@ -2364,7 +2364,7 @@ sub_8022902c: /* 80229070 00225FD0 4E 80 04 21 */ bctrl /* 80229074 00225FD4 A0 9E 00 00 */ lhz r4, 0(r30) /* 80229078 00225FD8 7C 7F 1B 78 */ mr r31, r3 -/* 8022907C 00225FDC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022907C 00225FDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80229080 00225FE0 7C 04 00 40 */ cmplw r4, r0 /* 80229084 00225FE4 41 82 00 60 */ beq lbl_802290E4 /* 80229088 00225FE8 B0 81 00 08 */ sth r4, 8(r1) @@ -5440,7 +5440,7 @@ AggressionCheck__12CElitePirateFR13CStateManagerf: /* 8022BCE4 00228C44 7C 9F 23 78 */ mr r31, r4 /* 8022BCE8 00228C48 93 C1 00 08 */ stw r30, 8(r1) /* 8022BCEC 00228C4C 7C 7E 1B 78 */ mr r30, r3 -/* 8022BCF0 00228C50 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022BCF0 00228C50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022BCF4 00228C54 A0 A3 07 72 */ lhz r5, 0x772(r3) /* 8022BCF8 00228C58 7C 05 00 40 */ cmplw r5, r0 /* 8022BCFC 00228C5C 40 82 00 84 */ bne lbl_8022BD80 @@ -5541,7 +5541,7 @@ sub_8022be38: /* 8022BE3C 00228D9C 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 8022BE40 00228DA0 40 82 00 3C */ bne lbl_8022BE7C /* 8022BE44 00228DA4 A0 85 00 00 */ lhz r4, 0(r5) -/* 8022BE48 00228DA8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022BE48 00228DA8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022BE4C 00228DAC 7C 04 00 40 */ cmplw r4, r0 /* 8022BE50 00228DB0 40 82 00 2C */ bne lbl_8022BE7C /* 8022BE54 00228DB4 88 03 06 F6 */ lbz r0, 0x6f6(r3) @@ -5691,7 +5691,7 @@ sub_8022c01c: /* 8022C050 00228FB0 4C 40 13 82 */ cror 2, 0, 2 /* 8022C054 00228FB4 40 82 02 08 */ bne lbl_8022C25C /* 8022C058 00228FB8 A0 65 00 00 */ lhz r3, 0(r5) -/* 8022C05C 00228FBC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022C05C 00228FBC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022C060 00228FC0 7C 03 00 40 */ cmplw r3, r0 /* 8022C064 00228FC4 41 82 01 F8 */ beq lbl_8022C25C /* 8022C068 00228FC8 B0 61 00 08 */ sth r3, 8(r1) @@ -5975,7 +5975,7 @@ DoUserAnimEvent__12CElitePirateFR13CStateManagerRC13CInt32POINode14EUserEventTyp .global lbl_8022C460 lbl_8022C460: /* 8022C460 002293C0 A0 7C 07 72 */ lhz r3, 0x772(r28) -/* 8022C464 002293C4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022C464 002293C4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022C468 002293C8 7C 03 00 40 */ cmplw r3, r0 /* 8022C46C 002293CC 41 82 00 3C */ beq lbl_8022C4A8 /* 8022C470 002293D0 A0 1C 07 72 */ lhz r0, 0x772(r28) @@ -6074,7 +6074,7 @@ lbl_8022C5C8: lbl_8022C5CC: /* 8022C5CC 0022952C A0 FC 00 08 */ lhz r7, 8(r28) /* 8022C5D0 00229530 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8022C5D4 00229534 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8022C5D4 00229534 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8022C5D8 00229538 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8022C5DC 0022953C B0 E1 00 18 */ sth r7, 0x18(r1) /* 8022C5E0 00229540 38 61 00 78 */ addi r3, r1, 0x78 @@ -6259,7 +6259,7 @@ GetOrbitPosition__12CElitePirateCFRC13CStateManager: /* 8022C828 00229788 7C 9E 23 78 */ mr r30, r4 /* 8022C82C 0022978C 93 A1 00 64 */ stw r29, 0x64(r1) /* 8022C830 00229790 7C 7D 1B 78 */ mr r29, r3 -/* 8022C834 00229794 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022C834 00229794 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022C838 00229798 A0 84 07 72 */ lhz r4, 0x772(r4) /* 8022C83C 0022979C 7C 04 00 40 */ cmplw r4, r0 /* 8022C840 002297A0 41 82 00 40 */ beq lbl_8022C880 @@ -6851,7 +6851,7 @@ lbl_8022D0BC: /* 8022D0C0 0022A020 A0 7D 07 72 */ lhz r3, 0x772(r29) /* 8022D0C4 0022A024 7C 00 18 40 */ cmplw r0, r3 /* 8022D0C8 0022A028 40 82 02 7C */ bne lbl_8022D344 -/* 8022D0CC 0022A02C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022D0CC 0022A02C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022D0D0 0022A030 7C 03 00 40 */ cmplw r3, r0 /* 8022D0D4 0022A034 41 82 02 70 */ beq lbl_8022D344 /* 8022D0D8 0022A038 7F A3 EB 78 */ mr r3, r29 @@ -6946,7 +6946,7 @@ lbl_8022D224: /* 8022D228 0022A188 A0 7D 07 72 */ lhz r3, 0x772(r29) /* 8022D22C 0022A18C 7C 00 18 40 */ cmplw r0, r3 /* 8022D230 0022A190 40 82 00 A8 */ bne lbl_8022D2D8 -/* 8022D234 0022A194 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022D234 0022A194 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022D238 0022A198 7C 03 00 40 */ cmplw r3, r0 /* 8022D23C 0022A19C 41 82 00 9C */ beq lbl_8022D2D8 /* 8022D240 0022A1A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha @@ -7576,7 +7576,7 @@ lbl_8022DB08: /* 8022DB14 0022AA74 38 80 FF FF */ li r4, -1 /* 8022DB18 0022AA78 48 11 33 29 */ bl __dt__6CTokenFv lbl_8022DB1C: -/* 8022DB1C 0022AA7C A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8022DB1C 0022AA7C A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8022DB20 0022AA80 38 E0 00 00 */ li r7, 0 /* 8022DB24 0022AA84 C0 22 B5 CC */ lfs f1, lbl_805AD2EC@sda21(r2) /* 8022DB28 0022AA88 38 00 FF FF */ li r0, -1 @@ -7584,13 +7584,13 @@ lbl_8022DB1C: /* 8022DB30 0022AA90 38 7D 07 D0 */ addi r3, r29, 0x7d0 /* 8022DB34 0022AA94 C0 02 B5 B8 */ lfs f0, lbl_805AD2D8@sda21(r2) /* 8022DB38 0022AA98 FC 40 08 90 */ fmr f2, f1 -/* 8022DB3C 0022AA9C A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 8022DB3C 0022AA9C A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 8022DB40 0022AAA0 38 80 00 00 */ li r4, 0 /* 8022DB44 0022AAA4 38 A0 00 01 */ li r5, 1 /* 8022DB48 0022AAA8 B0 DD 07 72 */ sth r6, 0x772(r29) /* 8022DB4C 0022AAAC 90 FD 07 74 */ stw r7, 0x774(r29) /* 8022DB50 0022AAB0 90 FD 07 88 */ stw r7, 0x788(r29) -/* 8022DB54 0022AAB4 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 8022DB54 0022AAB4 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 8022DB58 0022AAB8 B0 DD 07 9C */ sth r6, 0x79c(r29) /* 8022DB5C 0022AABC C0 7D 03 B4 */ lfs f3, 0x3b4(r29) /* 8022DB60 0022AAC0 D0 7D 07 A0 */ stfs f3, 0x7a0(r29) diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index 0fbe09c8..32be6533 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -1202,7 +1202,7 @@ lbl_802253EC: .global lbl_80225428 lbl_80225428: /* 80225428 00222388 A0 7B 05 EC */ lhz r3, 0x5ec(r27) -/* 8022542C 0022238C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022542C 0022238C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80225430 00222390 7C 03 00 40 */ cmplw r3, r0 /* 80225434 00222394 41 82 00 3C */ beq lbl_80225470 /* 80225438 00222398 A0 1B 05 EC */ lhz r0, 0x5ec(r27) @@ -1220,7 +1220,7 @@ lbl_80225428: /* 80225468 002223C8 38 00 00 00 */ li r0, 0 /* 8022546C 002223CC 90 1B 06 08 */ stw r0, 0x608(r27) lbl_80225470: -/* 80225470 002223D0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80225470 002223D0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80225474 002223D4 B0 1B 05 EC */ sth r0, 0x5ec(r27) .global lbl_80225478 lbl_80225478: @@ -1251,7 +1251,7 @@ CreateBeam__8CEyeballFR13CStateManager: /* 802254C8 00222428 93 A1 00 C4 */ stw r29, 0xc4(r1) /* 802254CC 0022242C 7C 7D 1B 78 */ mr r29, r3 /* 802254D0 00222430 93 81 00 C0 */ stw r28, 0xc0(r1) -/* 802254D4 00222434 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802254D4 00222434 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802254D8 00222438 A0 63 05 EC */ lhz r3, 0x5ec(r3) /* 802254DC 0022243C 7C 03 00 40 */ cmplw r3, r0 /* 802254E0 00222440 40 82 01 C0 */ bne lbl_802256A0 @@ -1482,7 +1482,7 @@ Accept__8CEyeBallFR8IVisitor: /* 80225840 002227A0 92 F3 05 E0 */ stw r23, 0x5e0(r19) /* 80225844 002227A4 93 13 05 E4 */ stw r24, 0x5e4(r19) /* 80225848 002227A8 93 33 05 E8 */ stw r25, 0x5e8(r19) -/* 8022584C 002227AC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8022584C 002227AC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80225850 002227B0 B0 93 05 EC */ sth r4, 0x5ec(r19) /* 80225854 002227B4 90 13 05 F0 */ stw r0, 0x5f0(r19) /* 80225858 002227B8 48 0C 31 59 */ bl TranslateSFXID__11CSfxManagerFUs diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index a2b665cc..b28d26b1 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -343,7 +343,7 @@ GetSearchPath__9CFireFleaFv: InPosition__9CFireFleaFR13CStateManagerf: /* 80142A78 0013F9D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80142A7C 0013F9DC A0 83 02 DC */ lhz r4, 0x2dc(r3) -/* 80142A80 0013F9E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80142A80 0013F9E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80142A84 0013F9E4 7C 04 00 40 */ cmplw r4, r0 /* 80142A88 0013F9E8 41 82 00 5C */ beq lbl_80142AE4 /* 80142A8C 0013F9EC C0 43 0D 84 */ lfs f2, 0xd84(r3) @@ -1689,7 +1689,7 @@ lbl_80143D98: /* 80143DE8 00140D48 38 81 00 20 */ addi r4, r1, 0x20 /* 80143DEC 00140D4C 80 05 00 00 */ lwz r0, 0(r5) /* 80143DF0 00140D50 38 A7 D4 10 */ addi r5, r7, lbl_8056D410@l -/* 80143DF4 00140D54 81 0D A3 88 */ lwz r8, lbl_805A8F48@sda21(r13) +/* 80143DF4 00140D54 81 0D A3 88 */ lwz r8, kInvalidEditorId@sda21(r13) /* 80143DF8 00140D58 90 01 00 20 */ stw r0, 0x20(r1) /* 80143DFC 00140D5C 91 01 00 1C */ stw r8, 0x1c(r1) /* 80143E00 00140D60 4B F0 D6 85 */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index b13ee5a5..5aef0654 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -532,7 +532,7 @@ Accept__17CFlaahgraRendererFR8IVisitor: /* 801AD6C8 001AA628 4B E8 D0 DD */ bl CModelDataNull__10CModelDataFv /* 801AD6CC 001AA62C 38 61 00 20 */ addi r3, r1, 0x20 /* 801AD6D0 001AA630 4B E6 D7 69 */ bl None__16CActorParametersFv -/* 801AD6D4 001AA634 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801AD6D4 001AA634 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801AD6D8 001AA638 38 00 00 00 */ li r0, 0 /* 801AD6DC 001AA63C 80 AD 90 CC */ lwz r5, lbl_805A7C8C@sda21(r13) /* 801AD6E0 001AA640 38 60 00 00 */ li r3, 0 @@ -1176,7 +1176,7 @@ sub_801adfa4: /* 801ADFD8 001AAF38 7C 9B 23 78 */ mr r27, r4 /* 801ADFDC 001AAF3C 80 85 08 4C */ lwz r4, 0x84c(r5) /* 801ADFE0 001AAF40 3B DB 07 74 */ addi r30, r27, 0x774 -/* 801ADFE4 001AAF44 A3 ED A3 8C */ lhz r31, lbl_805A8F4C@sda21(r13) +/* 801ADFE4 001AAF44 A3 ED A3 8C */ lhz r31, kInvalidUniqueId@sda21(r13) /* 801ADFE8 001AAF48 7C 7A 1B 78 */ mr r26, r3 /* 801ADFEC 001AAF4C C3 82 A8 C0 */ lfs f28, lbl_805AC5E0@sda21(r2) /* 801ADFF0 001AAF50 7F DD F3 78 */ mr r29, r30 @@ -3229,7 +3229,7 @@ lbl_801AFD30: /* 801AFD44 001ACCA4 38 80 00 04 */ li r4, 4 /* 801AFD48 001ACCA8 B0 1F 07 7C */ sth r0, 0x77c(r31) /* 801AFD4C 001ACCAC A0 7F 07 7C */ lhz r3, 0x77c(r31) -/* 801AFD50 001ACCB0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AFD50 001ACCB0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AFD54 001ACCB4 7C 03 00 40 */ cmplw r3, r0 /* 801AFD58 001ACCB8 41 82 00 08 */ beq lbl_801AFD60 /* 801AFD5C 001ACCBC 38 80 00 01 */ li r4, 1 @@ -3441,7 +3441,7 @@ lbl_801B0034: /* 801B0068 001ACFC8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l /* 801B006C 001ACFCC 90 01 00 1C */ stw r0, 0x1c(r1) lbl_801B0070: -/* 801B0070 001ACFD0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B0070 001ACFD0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B0074 001ACFD4 B0 1F 07 7C */ sth r0, 0x77c(r31) /* 801B0078 001ACFD8 C0 1F 06 B4 */ lfs f0, 0x6b4(r31) /* 801B007C 001ACFDC D0 1F 07 BC */ stfs f0, 0x7bc(r31) @@ -6218,7 +6218,7 @@ lbl_801B27AC: .global lbl_801B27F8 lbl_801B27F8: /* 801B27F8 001AF758 A0 7B 07 7C */ lhz r3, 0x77c(r27) -/* 801B27FC 001AF75C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B27FC 001AF75C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B2800 001AF760 7C 03 00 40 */ cmplw r3, r0 /* 801B2804 001AF764 41 82 02 F4 */ beq lbl_801B2AF8 /* 801B2808 001AF768 A0 1B 07 7C */ lhz r0, 0x77c(r27) @@ -6591,7 +6591,7 @@ lbl_801B2CE4: /* 801B2D34 001AFC94 48 16 2B 39 */ bl __nw__FUlPCcPCc /* 801B2D38 001AFC98 7C 7B 1B 79 */ or. r27, r3, r3 /* 801B2D3C 001AFC9C 41 82 00 80 */ beq lbl_801B2DBC -/* 801B2D40 001AFCA0 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 801B2D40 001AFCA0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 801B2D44 001AFCA4 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801B2D48 001AFCA8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 801B2D4C 001AFCAC 38 81 00 70 */ addi r4, r1, 0x70 @@ -6682,7 +6682,7 @@ lbl_801B2E4C: /* 801B2E84 001AFDE4 38 81 00 40 */ addi r4, r1, 0x40 /* 801B2E88 001AFDE8 B0 01 00 40 */ sth r0, 0x40(r1) /* 801B2E8C 001AFDEC 4B E9 93 E1 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801B2E90 001AFDF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B2E90 001AFDF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B2E94 001AFDF4 38 60 00 00 */ li r3, 0 /* 801B2E98 001AFDF8 B0 1F 06 D0 */ sth r0, 0x6d0(r31) /* 801B2E9C 001AFDFC 88 1F 08 E5 */ lbz r0, 0x8e5(r31) @@ -7556,7 +7556,7 @@ lbl_801B39AC: /* 801B3ACC 001B0A2C 38 61 00 2C */ addi r3, r1, 0x2c /* 801B3AD0 001B0A30 38 A1 00 34 */ addi r5, r1, 0x34 /* 801B3AD4 001B0A34 90 9C 06 CC */ stw r4, 0x6cc(r28) -/* 801B3AD8 001B0A38 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801B3AD8 001B0A38 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801B3ADC 001B0A3C B0 9C 06 D0 */ sth r4, 0x6d0(r28) /* 801B3AE0 001B0A40 80 DB 00 B8 */ lwz r6, 0xb8(r27) /* 801B3AE4 001B0A44 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) @@ -7592,7 +7592,7 @@ lbl_801B39AC: /* 801B3B5C 001B0ABC 38 61 00 6C */ addi r3, r1, 0x6c /* 801B3B60 001B0AC0 90 DC 07 70 */ stw r6, 0x770(r28) /* 801B3B64 001B0AC4 C0 02 A9 28 */ lfs f0, lbl_805AC648@sda21(r2) -/* 801B3B68 001B0AC8 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 801B3B68 001B0AC8 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 801B3B6C 001B0ACC B0 BC 07 7C */ sth r5, 0x77c(r28) /* 801B3B70 001B0AD0 90 1C 07 80 */ stw r0, 0x780(r28) /* 801B3B74 001B0AD4 90 1C 07 84 */ stw r0, 0x784(r28) @@ -7643,7 +7643,7 @@ lbl_801B39AC: /* 801B3C28 001B0B88 98 9C 07 F4 */ stb r4, 0x7f4(r28) /* 801B3C2C 001B0B8C 90 1C 07 F8 */ stw r0, 0x7f8(r28) /* 801B3C30 001B0B90 90 1C 07 FC */ stw r0, 0x7fc(r28) -/* 801B3C34 001B0B94 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801B3C34 001B0B94 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801B3C38 001B0B98 B0 9C 08 0C */ sth r4, 0x80c(r28) /* 801B3C3C 001B0B9C D0 1C 08 10 */ stfs f0, 0x810(r28) /* 801B3C40 001B0BA0 D0 1C 08 14 */ stfs f0, 0x814(r28) @@ -8168,7 +8168,7 @@ lbl_801B43A8: /* 801B4410 001B1370 7C C7 33 78 */ mr r7, r6 /* 801B4414 001B1374 83 09 00 00 */ lwz r24, 0(r9) /* 801B4418 001B1378 7D 49 53 78 */ mr r9, r10 -/* 801B441C 001B137C A1 0D A3 8C */ lhz r8, lbl_805A8F4C@sda21(r13) +/* 801B441C 001B137C A1 0D A3 8C */ lhz r8, kInvalidUniqueId@sda21(r13) /* 801B4420 001B1380 39 41 00 38 */ addi r10, r1, 0x38 /* 801B4424 001B1384 9A C1 00 4C */ stb r22, 0x4c(r1) /* 801B4428 001B1388 38 C0 00 09 */ li r6, 9 diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index ba1eff69..c7bbfb0f 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -107,7 +107,7 @@ lbl_80208454: /* 8020847C 002053DC 7D 89 03 A6 */ mtctr r12 /* 80208480 002053E0 4E 80 04 21 */ bctrl /* 80208484 002053E4 A0 7D 01 6C */ lhz r3, 0x16c(r29) -/* 80208488 002053E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80208488 002053E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8020848C 002053EC 7C 03 00 40 */ cmplw r3, r0 /* 80208490 002053F0 40 82 01 E8 */ bne lbl_80208678 /* 80208494 002053F4 7F C4 F3 78 */ mr r4, r30 @@ -225,7 +225,7 @@ lbl_8020853C: /* 80208650 002055B0 48 00 00 28 */ b lbl_80208678 lbl_80208654: /* 80208654 002055B4 A0 7D 01 6C */ lhz r3, 0x16c(r29) -/* 80208658 002055B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80208658 002055B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8020865C 002055BC 7C 03 00 40 */ cmplw r3, r0 /* 80208660 002055C0 41 82 00 18 */ beq lbl_80208678 /* 80208664 002055C4 A0 1D 01 6C */ lhz r0, 0x16c(r29) @@ -563,7 +563,7 @@ lbl_80208AB8: /* 80208B18 00205A78 38 C1 00 10 */ addi r6, r1, 0x10 /* 80208B1C 00205A7C 38 A0 FF FF */ li r5, -1 /* 80208B20 00205A80 48 13 56 75 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" -/* 80208B24 00205A84 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 80208B24 00205A84 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 80208B28 00205A88 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80208B2C 00205A8C 80 17 00 00 */ lwz r0, 0(r23) /* 80208B30 00205A90 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -575,7 +575,7 @@ lbl_80208AB8: /* 80208B48 00205AA8 4B E4 89 3D */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" /* 80208B4C 00205AAC 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80208B50 00205AB0 4B E3 1C 55 */ bl CModelDataNull__10CModelDataFv -/* 80208B54 00205AB4 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80208B54 00205AB4 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80208B58 00205AB8 38 00 00 00 */ li r0, 0 /* 80208B5C 00205ABC 80 AD 93 A8 */ lwz r5, lbl_805A7F68@sda21(r13) /* 80208B60 00205AC0 38 60 00 00 */ li r3, 0 @@ -685,7 +685,7 @@ lbl_80208C98: /* 80208CEC 00205C4C 98 18 01 28 */ stb r0, 0x128(r24) /* 80208CF0 00205C50 D0 18 01 2C */ stfs f0, 0x12c(r24) /* 80208CF4 00205C54 48 0C D2 A1 */ bl __ct__6COBBoxFRC12CTransform4fRC9CVector3f -/* 80208CF8 00205C58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80208CF8 00205C58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80208CFC 00205C5C 7F A4 EB 78 */ mr r4, r29 /* 80208D00 00205C60 38 61 00 94 */ addi r3, r1, 0x94 /* 80208D04 00205C64 B0 18 01 6C */ sth r0, 0x16c(r24) diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 730912e2..eb59a1d9 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -627,7 +627,7 @@ lbl_801F04B0: /* 801F05AC 001ED50C 7F 23 CB 78 */ mr r3, r25 /* 801F05B0 001ED510 4B FB 85 E9 */ bl SetDamageVulnerability__15CCollisionActorFRC20CDamageVulnerability /* 801F05B4 001ED514 A0 7D 05 7C */ lhz r3, 0x57c(r29) -/* 801F05B8 001ED518 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F05B8 001ED518 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F05BC 001ED51C 7C 03 00 40 */ cmplw r3, r0 /* 801F05C0 001ED520 40 82 00 38 */ bne lbl_801F05F8 /* 801F05C4 001ED524 80 82 AE B0 */ lwz r4, lbl_805ACBD0@sda21(r2) @@ -1402,7 +1402,7 @@ lbl_801F0FA0: /* 801F1050 001EDFB0 D0 1F 05 70 */ stfs f0, 0x570(r31) /* 801F1054 001EDFB4 D0 1F 05 74 */ stfs f0, 0x574(r31) /* 801F1058 001EDFB8 D0 1F 05 78 */ stfs f0, 0x578(r31) -/* 801F105C 001EDFBC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F105C 001EDFBC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F1060 001EDFC0 B0 1F 05 7C */ sth r0, 0x57c(r31) /* 801F1064 001EDFC4 C0 05 00 00 */ lfs f0, 0(r5) /* 801F1068 001EDFC8 D0 1F 05 80 */ stfs f0, 0x580(r31) @@ -1410,7 +1410,7 @@ lbl_801F0FA0: /* 801F1070 001EDFD0 D0 1F 05 84 */ stfs f0, 0x584(r31) /* 801F1074 001EDFD4 C0 05 00 08 */ lfs f0, 8(r5) /* 801F1078 001EDFD8 D0 1F 05 88 */ stfs f0, 0x588(r31) -/* 801F107C 001EDFDC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F107C 001EDFDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F1080 001EDFE0 B0 1F 05 8C */ sth r0, 0x58c(r31) /* 801F1084 001EDFE4 88 1F 05 8E */ lbz r0, 0x58e(r31) /* 801F1088 001EDFE8 50 C0 3E 30 */ rlwimi r0, r6, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index a56c6f91..58ac9c1f 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -701,7 +701,7 @@ SetupPattern__10CPatternedFR13CStateManager: /* 801F442C 001F138C 48 00 0B 6D */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 801F4430 001F1390 A0 01 00 1C */ lhz r0, 0x1c(r1) /* 801F4434 001F1394 B0 1C 02 DC */ sth r0, 0x2dc(r28) -/* 801F4438 001F1398 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801F4438 001F1398 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801F443C 001F139C A0 1C 02 DC */ lhz r0, 0x2dc(r28) /* 801F4440 001F13A0 7C 03 00 40 */ cmplw r3, r0 /* 801F4444 001F13A4 40 82 00 2C */ bne lbl_801F4470 @@ -732,7 +732,7 @@ lbl_801F4498: /* 801F449C 001F13FC 40 82 FF F8 */ bne lbl_801F4494 /* 801F44A0 001F1400 38 00 00 00 */ li r0, 0 /* 801F44A4 001F1404 90 1C 03 90 */ stw r0, 0x390(r28) -/* 801F44A8 001F1408 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801F44A8 001F1408 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801F44AC 001F140C A0 1C 02 DC */ lhz r0, 0x2dc(r28) /* 801F44B0 001F1410 7C 03 00 40 */ cmplw r3, r0 /* 801F44B4 001F1414 41 82 03 40 */ beq lbl_801F47F4 @@ -1431,7 +1431,7 @@ IsPatternObstructed__10CPatternedCFR13CStateManagerRC9CVector3fRC9CVector3f: /* 801F4EB8 001F1E18 38 C1 00 18 */ addi r6, r1, 0x18 /* 801F4EBC 001F1E1C 38 E1 00 78 */ addi r7, r1, 0x78 /* 801F4EC0 001F1E20 4B E5 78 19 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" -/* 801F4EC4 001F1E24 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F4EC4 001F1E24 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F4EC8 001F1E28 38 60 00 00 */ li r3, 0 /* 801F4ECC 001F1E2C 80 AD 92 C8 */ lwz r5, lbl_805A7E88@sda21(r13) /* 801F4ED0 001F1E30 38 80 00 01 */ li r4, 1 @@ -1593,7 +1593,7 @@ lbl_801F50F0: lbl_801F50FC: /* 801F50FC 001F205C 80 A1 00 18 */ lwz r5, 0x18(r1) /* 801F5100 001F2060 38 60 00 00 */ li r3, 0 -/* 801F5104 001F2064 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5104 001F2064 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5108 001F2068 2C 05 00 00 */ cmpwi r5, 0 /* 801F510C 001F206C B0 19 00 00 */ sth r0, 0(r25) /* 801F5110 001F2070 40 81 00 40 */ ble lbl_801F5150 @@ -1717,7 +1717,7 @@ UpdateDest__10CPatternedFR13CStateManager: /* 801F52AC 001F220C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 801F52B0 001F2210 41 82 03 2C */ beq lbl_801F55DC /* 801F52B4 001F2214 A0 7B 02 DC */ lhz r3, 0x2dc(r27) -/* 801F52B8 001F2218 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F52B8 001F2218 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F52BC 001F221C 7C 03 00 40 */ cmplw r3, r0 /* 801F52C0 001F2220 41 82 03 1C */ beq lbl_801F55DC /* 801F52C4 001F2224 A0 1B 02 DC */ lhz r0, 0x2dc(r27) @@ -1741,7 +1741,7 @@ UpdateDest__10CPatternedFR13CStateManager: /* 801F530C 001F226C A0 01 00 20 */ lhz r0, 0x20(r1) /* 801F5310 001F2270 B0 1B 02 DC */ sth r0, 0x2dc(r27) /* 801F5314 001F2274 A0 7B 02 DC */ lhz r3, 0x2dc(r27) -/* 801F5318 001F2278 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5318 001F2278 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F531C 001F227C 7C 03 00 40 */ cmplw r3, r0 /* 801F5320 001F2280 41 82 02 9C */ beq lbl_801F55BC /* 801F5324 001F2284 C0 5B 00 60 */ lfs f2, 0x60(r27) @@ -1839,7 +1839,7 @@ lbl_801F5480: /* 801F5490 001F23F0 38 61 00 18 */ addi r3, r1, 0x18 /* 801F5494 001F23F4 4B E8 1C A1 */ bl NextWaypoint__15CScriptWaypointCFR13CStateManager /* 801F5498 001F23F8 A0 61 00 18 */ lhz r3, 0x18(r1) -/* 801F549C 001F23FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F549C 001F23FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F54A0 001F2400 B0 61 00 28 */ sth r3, 0x28(r1) /* 801F54A4 001F2404 7C 03 00 40 */ cmplw r3, r0 /* 801F54A8 001F2408 41 82 01 14 */ beq lbl_801F55BC @@ -1922,7 +1922,7 @@ lbl_801F55BC: /* 801F55D8 001F2538 4B E4 E8 F9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage lbl_801F55DC: /* 801F55DC 001F253C A0 7B 02 DC */ lhz r3, 0x2dc(r27) -/* 801F55E0 001F2540 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F55E0 001F2540 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F55E4 001F2544 7C 03 00 40 */ cmplw r3, r0 /* 801F55E8 001F2548 41 82 00 54 */ beq lbl_801F563C /* 801F55EC 001F254C A0 1B 02 DC */ lhz r0, 0x2dc(r27) @@ -2068,7 +2068,7 @@ lbl_801F57C0: /* 801F57F4 001F2754 48 00 00 4C */ b lbl_801F5840 lbl_801F57F8: /* 801F57F8 001F2758 A0 7F 02 DC */ lhz r3, 0x2dc(r31) -/* 801F57FC 001F275C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F57FC 001F275C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5800 001F2760 7C 03 00 40 */ cmplw r3, r0 /* 801F5804 001F2764 41 82 00 3C */ beq lbl_801F5840 /* 801F5808 001F2768 A0 1F 02 DC */ lhz r0, 0x2dc(r31) @@ -2302,7 +2302,7 @@ Delay__10CPatternedFR13CStateManagerf: .global PatrolPathOver__10CPatternedFR13CStateManagerf PatrolPathOver__10CPatternedFR13CStateManagerf: /* 801F5B44 001F2AA4 A0 63 02 DC */ lhz r3, 0x2dc(r3) -/* 801F5B48 001F2AA8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5B48 001F2AA8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5B4C 001F2AAC 7C 03 00 50 */ subf r0, r3, r0 /* 801F5B50 001F2AB0 7C 00 00 34 */ cntlzw r0, r0 /* 801F5B54 001F2AB4 54 03 D9 7E */ srwi r3, r0, 5 @@ -2343,7 +2343,7 @@ HasPatrolPath__10CPatternedFR13CStateManagerf: /* 801F5BB0 001F2B10 38 E0 00 06 */ li r7, 6 /* 801F5BB4 001F2B14 4B FF F3 E5 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 801F5BB8 001F2B18 A0 81 00 08 */ lhz r4, 8(r1) -/* 801F5BBC 001F2B1C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5BBC 001F2B1C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5BC0 001F2B20 7C 64 00 50 */ subf r3, r4, r0 /* 801F5BC4 001F2B24 7C 00 20 50 */ subf r0, r0, r4 /* 801F5BC8 001F2B28 7C 60 03 78 */ or r0, r3, r0 @@ -2393,7 +2393,7 @@ HasRetreatPattern__10CPatternedFR13CStateManagerf: /* 801F5C48 001F2BA8 38 E0 00 06 */ li r7, 6 /* 801F5C4C 001F2BAC 4B FF F3 4D */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 801F5C50 001F2BB0 A0 81 00 08 */ lhz r4, 8(r1) -/* 801F5C54 001F2BB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5C54 001F2BB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5C58 001F2BB8 7C 64 00 50 */ subf r3, r4, r0 /* 801F5C5C 001F2BBC 7C 00 20 50 */ subf r0, r0, r4 /* 801F5C60 001F2BC0 7C 60 03 78 */ or r0, r3, r0 @@ -2415,7 +2415,7 @@ HasAttackPattern__10CPatternedFR13CStateManagerf: /* 801F5C94 001F2BF4 38 E0 00 06 */ li r7, 6 /* 801F5C98 001F2BF8 4B FF F3 01 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 801F5C9C 001F2BFC A0 81 00 08 */ lhz r4, 8(r1) -/* 801F5CA0 001F2C00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F5CA0 001F2C00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F5CA4 001F2C04 7C 64 00 50 */ subf r3, r4, r0 /* 801F5CA8 001F2C08 7C 00 20 50 */ subf r0, r0, r4 /* 801F5CAC 001F2C0C 7C 60 03 78 */ or r0, r3, r0 @@ -3678,7 +3678,7 @@ lbl_801F6EA8: /* 801F6EB0 001F3E10 48 00 01 CC */ b lbl_801F707C lbl_801F6EB4: /* 801F6EB4 001F3E14 A0 7E 03 AC */ lhz r3, 0x3ac(r30) -/* 801F6EB8 001F3E18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F6EB8 001F3E18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F6EBC 001F3E1C 7C 03 00 40 */ cmplw r3, r0 /* 801F6EC0 001F3E20 40 82 00 84 */ bne lbl_801F6F44 /* 801F6EC4 001F3E24 7F C4 F3 78 */ mr r4, r30 @@ -3694,7 +3694,7 @@ lbl_801F6EB4: /* 801F6EEC 001F3E4C 90 1E 03 0C */ stw r0, 0x30c(r30) /* 801F6EF0 001F3E50 D0 1E 03 B0 */ stfs f0, 0x3b0(r30) /* 801F6EF4 001F3E54 A0 7E 02 DC */ lhz r3, 0x2dc(r30) -/* 801F6EF8 001F3E58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F6EF8 001F3E58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F6EFC 001F3E5C 7C 03 00 40 */ cmplw r3, r0 /* 801F6F00 001F3E60 41 82 00 48 */ beq lbl_801F6F48 /* 801F6F04 001F3E64 A0 1E 02 DC */ lhz r0, 0x2dc(r30) @@ -3747,7 +3747,7 @@ lbl_801F6FA8: /* 801F6FAC 001F3F0C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 801F6FB0 001F3F10 41 82 00 5C */ beq lbl_801F700C /* 801F6FB4 001F3F14 A0 7E 02 DC */ lhz r3, 0x2dc(r30) -/* 801F6FB8 001F3F18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F6FB8 001F3F18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F6FBC 001F3F1C 7C 03 00 40 */ cmplw r3, r0 /* 801F6FC0 001F3F20 41 82 00 4C */ beq lbl_801F700C /* 801F6FC4 001F3F24 A0 1E 02 DC */ lhz r0, 0x2dc(r30) @@ -3770,7 +3770,7 @@ lbl_801F6FA8: /* 801F7008 001F3F68 90 1E 02 D8 */ stw r0, 0x2d8(r30) lbl_801F700C: /* 801F700C 001F3F6C A0 7E 02 DC */ lhz r3, 0x2dc(r30) -/* 801F7010 001F3F70 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F7010 001F3F70 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F7014 001F3F74 7C 03 00 40 */ cmplw r3, r0 /* 801F7018 001F3F78 40 82 00 0C */ bne lbl_801F7024 /* 801F701C 001F3F7C 38 00 00 02 */ li r0, 2 @@ -3794,7 +3794,7 @@ lbl_801F7040: /* 801F705C 001F3FBC 48 00 00 30 */ b lbl_801F708C lbl_801F7060: /* 801F7060 001F3FC0 A0 7E 02 DC */ lhz r3, 0x2dc(r30) -/* 801F7064 001F3FC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F7064 001F3FC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F7068 001F3FC8 7C 03 00 40 */ cmplw r3, r0 /* 801F706C 001F3FCC 41 82 00 20 */ beq lbl_801F708C /* 801F7070 001F3FD0 38 00 00 00 */ li r0, 0 @@ -4350,7 +4350,7 @@ lbl_801F77D0: /* 801F77D4 001F4734 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 801F77D8 001F4738 40 82 00 84 */ bne lbl_801F785C /* 801F77DC 001F473C A0 BF 00 C4 */ lhz r5, 0xc4(r31) -/* 801F77E0 001F4740 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F77E0 001F4740 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F77E4 001F4744 7C 05 00 40 */ cmplw r5, r0 /* 801F77E8 001F4748 41 82 00 74 */ beq lbl_801F785C /* 801F77EC 001F474C B0 A1 00 14 */ sth r5, 0x14(r1) @@ -5091,7 +5091,7 @@ lbl_801F824C: /* 801F8304 001F5264 48 00 00 94 */ b lbl_801F8398 lbl_801F8308: /* 801F8308 001F5268 A0 BF 00 C4 */ lhz r5, 0xc4(r31) -/* 801F830C 001F526C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F830C 001F526C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F8310 001F5270 C3 C2 AF 94 */ lfs f30, lbl_805ACCB4@sda21(r2) /* 801F8314 001F5274 7C 05 00 40 */ cmplw r5, r0 /* 801F8318 001F5278 41 82 00 3C */ beq lbl_801F8354 @@ -6911,7 +6911,7 @@ ShouldSpecialAttack__13CFlyingPirateFR13CStateManagerf: /* 801F9D20 001F6C80 2C 00 00 01 */ cmpwi r0, 1 /* 801F9D24 001F6C84 40 82 01 3C */ bne lbl_801F9E60 /* 801F9D28 001F6C88 A0 7F 08 5C */ lhz r3, 0x85c(r31) -/* 801F9D2C 001F6C8C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F9D2C 001F6C8C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F9D30 001F6C90 7C 03 00 40 */ cmplw r3, r0 /* 801F9D34 001F6C94 41 82 01 2C */ beq lbl_801F9E60 /* 801F9D38 001F6C98 C0 3F 08 60 */ lfs f1, 0x860(r31) @@ -6940,7 +6940,7 @@ ShouldSpecialAttack__13CFlyingPirateFR13CStateManagerf: /* 801F9D94 001F6CF4 28 1E 00 00 */ cmplwi r30, 0 /* 801F9D98 001F6CF8 41 82 00 C8 */ beq lbl_801F9E60 /* 801F9D9C 001F6CFC A0 7F 08 90 */ lhz r3, 0x890(r31) -/* 801F9DA0 001F6D00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F9DA0 001F6D00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F9DA4 001F6D04 7C 03 00 40 */ cmplw r3, r0 /* 801F9DA8 001F6D08 41 82 00 34 */ beq lbl_801F9DDC /* 801F9DAC 001F6D0C A0 FF 00 08 */ lhz r7, 8(r31) @@ -8274,7 +8274,7 @@ lbl_801FB0BC: /* 801FB104 001F8064 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801FB108 001F8068 40 80 00 60 */ bge lbl_801FB168 /* 801FB10C 001F806C A0 7D 08 90 */ lhz r3, 0x890(r29) -/* 801FB110 001F8070 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FB110 001F8070 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FB114 001F8074 7C 03 00 40 */ cmplw r3, r0 /* 801FB118 001F8078 41 82 00 34 */ beq lbl_801FB14C /* 801FB11C 001F807C A0 FD 00 08 */ lhz r7, 8(r29) @@ -8877,7 +8877,7 @@ lbl_801FB98C: /* 801FB99C 001F88FC 54 00 D9 7E */ srwi r0, r0, 5 /* 801FB9A0 001F8900 90 1E 07 9C */ stw r0, 0x79c(r30) /* 801FB9A4 001F8904 A0 7E 07 E8 */ lhz r3, 0x7e8(r30) -/* 801FB9A8 001F8908 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FB9A8 001F8908 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FB9AC 001F890C 7C 03 00 40 */ cmplw r3, r0 /* 801FB9B0 001F8910 40 82 00 48 */ bne lbl_801FB9F8 /* 801FB9B4 001F8914 80 7F 08 4C */ lwz r3, 0x84c(r31) @@ -8954,7 +8954,7 @@ HearShot__13CFlyingPirateFR13CStateManagerf: .global PatternOver__13CFlyingPirateFR13CStateManagerf PatternOver__13CFlyingPirateFR13CStateManagerf: /* 801FBAA8 001F8A08 A0 63 02 DC */ lhz r3, 0x2dc(r3) -/* 801FBAAC 001F8A0C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FBAAC 001F8A0C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FBAB0 001F8A10 7C 03 00 50 */ subf r0, r3, r0 /* 801FBAB4 001F8A14 7C 00 00 34 */ cntlzw r0, r0 /* 801FBAB8 001F8A18 54 03 D9 7E */ srwi r3, r0, 5 @@ -9000,7 +9000,7 @@ lbl_801FBB24: /* 801FBB48 001F8AA8 A0 01 00 0C */ lhz r0, 0xc(r1) /* 801FBB4C 001F8AAC B0 1F 02 DC */ sth r0, 0x2dc(r31) /* 801FBB50 001F8AB0 A0 7F 02 DC */ lhz r3, 0x2dc(r31) -/* 801FBB54 001F8AB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FBB54 001F8AB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FBB58 001F8AB8 7C 03 00 40 */ cmplw r3, r0 /* 801FBB5C 001F8ABC 41 82 00 3C */ beq lbl_801FBB98 /* 801FBB60 001F8AC0 B0 61 00 08 */ sth r3, 8(r1) @@ -9320,7 +9320,7 @@ Explode__13CFlyingPirateFR13CStateManager: /* 801FBFF0 001F8F50 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 801FBFF4 001F8F54 D0 01 00 60 */ stfs f0, 0x60(r1) /* 801FBFF8 001F8F58 4B E0 8C C1 */ bl string_l__4rstlFPCc -/* 801FBFFC 001F8F5C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 801FBFFC 001F8F5C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 801FC000 001F8F60 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801FC004 001F8F64 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 801FC008 001F8F68 38 81 00 34 */ addi r4, r1, 0x34 @@ -9542,7 +9542,7 @@ lbl_801FC300: /* 801FC330 001F9290 38 E0 00 08 */ li r7, 8 /* 801FC334 001F9294 4B FF 8C 65 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 801FC338 001F9298 A0 61 00 14 */ lhz r3, 0x14(r1) -/* 801FC33C 001F929C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FC33C 001F929C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FC340 001F92A0 B0 61 00 18 */ sth r3, 0x18(r1) /* 801FC344 001F92A4 7C 03 00 40 */ cmplw r3, r0 /* 801FC348 001F92A8 41 82 00 20 */ beq lbl_801FC368 @@ -10919,7 +10919,7 @@ sub_801fd750: /* 801FD75C 001FA6BC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801FD760 001FA6C0 93 C1 00 28 */ stw r30, 0x28(r1) /* 801FD764 001FA6C4 7C 7E 1B 78 */ mr r30, r3 -/* 801FD768 001FA6C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FD768 001FA6C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FD76C 001FA6CC A0 63 08 90 */ lhz r3, 0x890(r3) /* 801FD770 001FA6D0 7C 03 00 40 */ cmplw r3, r0 /* 801FD774 001FA6D4 41 82 00 70 */ beq lbl_801FD7E4 @@ -10948,7 +10948,7 @@ sub_801fd750: /* 801FD7D0 001FA730 B0 01 00 08 */ sth r0, 8(r1) /* 801FD7D4 001FA734 B0 01 00 0C */ sth r0, 0xc(r1) /* 801FD7D8 001FA738 48 03 BD 1D */ bl RemoveTeamAiRole__10CTeamAiMgrF9TUniqueId -/* 801FD7DC 001FA73C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FD7DC 001FA73C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FD7E0 001FA740 B0 1E 08 90 */ sth r0, 0x890(r30) lbl_801FD7E4: /* 801FD7E4 001FA744 80 01 00 34 */ lwz r0, 0x34(r1) @@ -10967,7 +10967,7 @@ sub_801fd7fc: /* 801FD80C 001FA76C 7C 9F 23 78 */ mr r31, r4 /* 801FD810 001FA770 93 C1 00 18 */ stw r30, 0x18(r1) /* 801FD814 001FA774 7C 7E 1B 78 */ mr r30, r3 -/* 801FD818 001FA778 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FD818 001FA778 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FD81C 001FA77C A0 63 08 90 */ lhz r3, 0x890(r3) /* 801FD820 001FA780 7C 03 00 40 */ cmplw r3, r0 /* 801FD824 001FA784 40 82 00 1C */ bne lbl_801FD840 @@ -10979,7 +10979,7 @@ sub_801fd7fc: /* 801FD83C 001FA79C B0 1E 08 90 */ sth r0, 0x890(r30) lbl_801FD840: /* 801FD840 001FA7A0 A0 7E 08 90 */ lhz r3, 0x890(r30) -/* 801FD844 001FA7A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FD844 001FA7A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FD848 001FA7A8 7C 03 00 40 */ cmplw r3, r0 /* 801FD84C 001FA7AC 41 82 00 44 */ beq lbl_801FD890 /* 801FD850 001FA7B0 A0 1E 08 90 */ lhz r0, 0x890(r30) @@ -11907,9 +11907,9 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE57C 001FB4DC 88 BA 06 A2 */ lbz r5, 0x6a2(r26) /* 801FE580 001FB4E0 50 05 1F 38 */ rlwimi r5, r0, 3, 0x1c, 0x1c /* 801FE584 001FB4E4 98 BA 06 A2 */ stb r5, 0x6a2(r26) -/* 801FE588 001FB4E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE588 001FB4E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE58C 001FB4EC B0 1A 06 A4 */ sth r0, 0x6a4(r26) -/* 801FE590 001FB4F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE590 001FB4F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE594 001FB4F4 B0 1A 06 A6 */ sth r0, 0x6a6(r26) /* 801FE598 001FB4F8 88 1A 06 A0 */ lbz r0, 0x6a0(r26) /* 801FE59C 001FB4FC 80 DB 01 0C */ lwz r6, 0x10c(r27) @@ -11956,7 +11956,7 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE640 001FB5A0 38 7A 07 EC */ addi r3, r26, 0x7ec /* 801FE644 001FB5A4 98 1A 07 E0 */ stb r0, 0x7e0(r26) /* 801FE648 001FB5A8 D0 1A 07 E4 */ stfs f0, 0x7e4(r26) -/* 801FE64C 001FB5AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE64C 001FB5AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE650 001FB5B0 B0 1A 07 E8 */ sth r0, 0x7e8(r26) /* 801FE654 001FB5B4 4B FA EE B1 */ bl __ct__10CBurstFireFPPC6SBursti /* 801FE658 001FB5B8 38 00 FF FF */ li r0, -1 @@ -11975,7 +11975,7 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE68C 001FB5EC C0 62 AF 60 */ lfs f3, lbl_805ACC80@sda21(r2) /* 801FE690 001FB5F0 D0 1A 08 58 */ stfs f0, 0x858(r26) /* 801FE694 001FB5F4 C0 22 AF D0 */ lfs f1, lbl_805ACCF0@sda21(r2) -/* 801FE698 001FB5F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE698 001FB5F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE69C 001FB5FC C0 02 AF 78 */ lfs f0, lbl_805ACC98@sda21(r2) /* 801FE6A0 001FB600 B0 1A 08 5C */ sth r0, 0x85c(r26) /* 801FE6A4 001FB604 D0 5A 08 60 */ stfs f2, 0x860(r26) @@ -11995,12 +11995,12 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE6DC 001FB63C D0 5A 08 84 */ stfs f2, 0x884(r26) /* 801FE6E0 001FB640 D0 3A 08 88 */ stfs f1, 0x888(r26) /* 801FE6E4 001FB644 D0 9A 08 8C */ stfs f4, 0x88c(r26) -/* 801FE6E8 001FB648 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE6E8 001FB648 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE6EC 001FB64C B0 1A 08 90 */ sth r0, 0x890(r26) /* 801FE6F0 001FB650 D0 1A 08 94 */ stfs f0, 0x894(r26) /* 801FE6F4 001FB654 D0 1A 08 98 */ stfs f0, 0x898(r26) /* 801FE6F8 001FB658 90 DA 08 9C */ stw r6, 0x89c(r26) -/* 801FE6FC 001FB65C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801FE6FC 001FB65C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801FE700 001FB660 B0 1A 08 A0 */ sth r0, 0x8a0(r26) /* 801FE704 001FB664 D0 7A 08 A4 */ stfs f3, 0x8a4(r26) /* 801FE708 001FB668 80 BA 00 64 */ lwz r5, 0x64(r26) diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index f2ab5258..a07dc0b9 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -256,7 +256,7 @@ sub_8022f770: /* 8022F7EC 0022C74C C0 05 00 08 */ lfs f0, 8(r5) /* 8022F7F0 0022C750 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8022F7F4 0022C754 4B DD 54 C5 */ bl string_l__4rstlFPCc -/* 8022F7F8 0022C758 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8022F7F8 0022C758 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8022F7FC 0022C75C 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8022F800 0022C760 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8022F804 0022C764 38 81 00 30 */ addi r4, r1, 0x30 @@ -985,7 +985,7 @@ lbl_802301CC: /* 802302A4 0022D204 D0 21 00 A8 */ stfs f1, 0xa8(r1) /* 802302A8 0022D208 D0 01 00 AC */ stfs f0, 0xac(r1) /* 802302AC 0022D20C 4B EE 6A B1 */ bl __ct__10CModelDataFRC10CStaticRes -/* 802302B0 0022D210 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 802302B0 0022D210 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 802302B4 0022D214 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 802302B8 0022D218 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 802302BC 0022D21C 38 81 00 30 */ addi r4, r1, 0x30 diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 109a0e9b..b87a3409 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -1588,7 +1588,7 @@ CreateFlameThrower__12CIceSheegothFR13CStateManager: /* 8019F474 0019C3D4 BF 21 00 74 */ stmw r25, 0x74(r1) /* 8019F478 0019C3D8 7C 7E 1B 78 */ mr r30, r3 /* 8019F47C 0019C3DC 7C 9F 23 78 */ mr r31, r4 -/* 8019F480 0019C3E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8019F480 0019C3E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8019F484 0019C3E4 A0 63 0A 80 */ lhz r3, 0xa80(r3) /* 8019F488 0019C3E8 7C 03 00 40 */ cmplw r3, r0 /* 8019F48C 0019C3EC 40 82 01 2C */ bne lbl_8019F5B8 @@ -8066,7 +8066,7 @@ lbl_801A5160: /* 801A5164 001A20C4 7F C4 F3 78 */ mr r4, r30 /* 801A5168 001A20C8 48 00 22 5D */ bl Destroy__22CCollisionActorManagerCFR13CStateManager /* 801A516C 001A20CC A0 7F 0A 80 */ lhz r3, 0xa80(r31) -/* 801A5170 001A20D0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A5170 001A20D0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A5174 001A20D4 7C 03 00 40 */ cmplw r3, r0 /* 801A5178 001A20D8 41 82 00 20 */ beq lbl_801A5198 /* 801A517C 001A20DC A0 1F 0A 80 */ lhz r0, 0xa80(r31) @@ -8074,7 +8074,7 @@ lbl_801A5160: /* 801A5184 001A20E4 38 81 00 3C */ addi r4, r1, 0x3c /* 801A5188 001A20E8 B0 01 00 3C */ sth r0, 0x3c(r1) /* 801A518C 001A20EC 4B EA 70 E1 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801A5190 001A20F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A5190 001A20F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A5194 001A20F4 B0 1F 0A 80 */ sth r0, 0xa80(r31) lbl_801A5198: /* 801A5198 001A20F8 80 1F 0A F0 */ lwz r0, 0xaf0(r31) @@ -9162,7 +9162,7 @@ lbl_801A5E20: /* 801A6128 001A3088 D0 1C 00 24 */ stfs f0, 0x24(r28) /* 801A612C 001A308C 80 9F 01 50 */ lwz r4, 0x150(r31) /* 801A6130 001A3090 48 07 5F 79 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo -/* 801A6134 001A3094 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A6134 001A3094 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A6138 001A3098 3B 80 00 00 */ li r28, 0 /* 801A613C 001A309C 3B C0 00 00 */ li r30, 0 /* 801A6140 001A30A0 B0 1D 0A 80 */ sth r0, 0xa80(r29) @@ -9455,9 +9455,9 @@ lbl_801A6520: /* 801A658C 001A34EC 90 9D 0A EC */ stw r4, 0xaec(r29) /* 801A6590 001A34F0 90 9D 0A F0 */ stw r4, 0xaf0(r29) /* 801A6594 001A34F4 98 1D 0A F4 */ stb r0, 0xaf4(r29) -/* 801A6598 001A34F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A6598 001A34F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A659C 001A34FC B0 1D 0A F6 */ sth r0, 0xaf6(r29) -/* 801A65A0 001A3500 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801A65A0 001A3500 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801A65A4 001A3504 B0 1D 0A F8 */ sth r0, 0xaf8(r29) /* 801A65A8 001A3508 90 9D 0A FC */ stw r4, 0xafc(r29) /* 801A65AC 001A350C 90 9D 0B 04 */ stw r4, 0xb04(r29) diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index f037be52..fb8dd30b 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -451,7 +451,7 @@ lbl_801D7C04: /* 801D7C2C 001D4B8C 90 01 00 24 */ stw r0, 0x24(r1) /* 801D7C30 001D4B90 4B E7 02 ED */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801D7C34 001D4B94 A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 801D7C38 001D4B98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801D7C38 001D4B98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801D7C3C 001D4B9C B0 61 00 20 */ sth r3, 0x20(r1) /* 801D7C40 001D4BA0 7C 03 00 40 */ cmplw r3, r0 /* 801D7C44 001D4BA4 41 82 00 5C */ beq lbl_801D7CA0 @@ -527,7 +527,7 @@ lbl_801D7D1C: /* 801D7D44 001D4CA4 90 01 00 24 */ stw r0, 0x24(r1) /* 801D7D48 001D4CA8 4B E7 01 D5 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801D7D4C 001D4CAC A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 801D7D50 001D4CB0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801D7D50 001D4CB0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801D7D54 001D4CB4 B0 61 00 20 */ sth r3, 0x20(r1) /* 801D7D58 001D4CB8 7C 03 00 40 */ cmplw r3, r0 /* 801D7D5C 001D4CBC 41 82 00 78 */ beq lbl_801D7DD4 diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index cdc2d5d2..d11fe380 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -689,7 +689,7 @@ sub_80234b20: /* 80234B38 00231A98 7C 7E 1B 78 */ mr r30, r3 /* 80234B3C 00231A9C 93 A1 00 54 */ stw r29, 0x54(r1) /* 80234B40 00231AA0 93 81 00 50 */ stw r28, 0x50(r1) -/* 80234B44 00231AA4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80234B44 00231AA4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80234B48 00231AA8 A0 63 06 C8 */ lhz r3, 0x6c8(r3) /* 80234B4C 00231AAC 7C 03 00 40 */ cmplw r3, r0 /* 80234B50 00231AB0 40 82 00 EC */ bne lbl_80234C3C @@ -786,7 +786,7 @@ lbl_80234C90: /* 80234CA0 00231C00 38 E0 00 06 */ li r7, 6 /* 80234CA4 00231C04 48 00 00 F9 */ bl sub_80234d9c /* 80234CA8 00231C08 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 80234CAC 00231C0C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80234CAC 00231C0C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80234CB0 00231C10 B0 61 00 10 */ sth r3, 0x10(r1) /* 80234CB4 00231C14 7C 03 00 40 */ cmplw r3, r0 /* 80234CB8 00231C18 41 82 00 80 */ beq lbl_80234D38 @@ -842,7 +842,7 @@ HasAttackPattern__10CMagdoliteFR13CStateManagerf: /* 80234D6C 00231CCC 38 E0 00 06 */ li r7, 6 /* 80234D70 00231CD0 48 00 00 2D */ bl sub_80234d9c /* 80234D74 00231CD4 A0 81 00 08 */ lhz r4, 8(r1) -/* 80234D78 00231CD8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80234D78 00231CD8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80234D7C 00231CDC 7C 64 00 50 */ subf r3, r4, r0 /* 80234D80 00231CE0 7C 00 20 50 */ subf r0, r0, r4 /* 80234D84 00231CE4 7C 60 03 78 */ or r0, r3, r0 @@ -873,7 +873,7 @@ sub_80234d9c: /* 80234DDC 00231D3C C3 62 B7 2C */ lfs f27, lbl_805AD44C@sda21(r2) /* 80234DE0 00231D40 7C 78 1B 78 */ mr r24, r3 /* 80234DE4 00231D44 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f -/* 80234DE8 00231D48 A3 ED A3 8C */ lhz r31, lbl_805A8F4C@sda21(r13) +/* 80234DE8 00231D48 A3 ED A3 8C */ lhz r31, kInvalidUniqueId@sda21(r13) /* 80234DEC 00231D4C 7C BA 2B 78 */ mr r26, r5 /* 80234DF0 00231D50 7C DB 33 78 */ mr r27, r6 /* 80234DF4 00231D54 7C FC 3B 78 */ mr r28, r7 @@ -1745,7 +1745,7 @@ lbl_80235A18: /* 80235A2C 0023298C 38 7F 05 84 */ addi r3, r31, 0x584 /* 80235A30 00232990 38 80 00 01 */ li r4, 1 /* 80235A34 00232994 4B F3 F7 75 */ bl SetNoHorizontalAim__13CBoneTrackingFb -/* 80235A38 00232998 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80235A38 00232998 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80235A3C 0023299C 38 7F 05 84 */ addi r3, r31, 0x584 /* 80235A40 002329A0 38 81 00 10 */ addi r4, r1, 0x10 /* 80235A44 002329A4 B0 01 00 10 */ sth r0, 0x10(r1) @@ -3041,7 +3041,7 @@ lbl_80236CD4: /* 80236CD8 00233C38 7F E4 FB 78 */ mr r4, r31 /* 80236CDC 00233C3C 4B F7 06 E9 */ bl Destroy__22CCollisionActorManagerCFR13CStateManager /* 80236CE0 00233C40 A0 7C 06 C8 */ lhz r3, 0x6c8(r28) -/* 80236CE4 00233C44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80236CE4 00233C44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80236CE8 00233C48 7C 03 00 40 */ cmplw r3, r0 /* 80236CEC 00233C4C 41 82 00 54 */ beq lbl_80236D40 /* 80236CF0 00233C50 A0 1C 06 C8 */ lhz r0, 0x6c8(r28) @@ -3049,7 +3049,7 @@ lbl_80236CD4: /* 80236CF8 00233C58 38 81 00 10 */ addi r4, r1, 0x10 /* 80236CFC 00233C5C B0 01 00 10 */ sth r0, 0x10(r1) /* 80236D00 00233C60 4B E1 55 6D */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80236D04 00233C64 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80236D04 00233C64 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80236D08 00233C68 B0 1C 06 C8 */ sth r0, 0x6c8(r28) /* 80236D0C 00233C6C 48 00 00 34 */ b lbl_80236D40 .global lbl_80236D10 @@ -3867,7 +3867,7 @@ lbl_802378D4: /* 80237920 00234880 D0 17 06 C0 */ stfs f0, 0x6c0(r23) /* 80237924 00234884 C0 1E 00 1C */ lfs f0, 0x1c(r30) /* 80237928 00234888 D0 17 06 C4 */ stfs f0, 0x6c4(r23) -/* 8023792C 0023488C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8023792C 0023488C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80237930 00234890 B0 17 06 C8 */ sth r0, 0x6c8(r23) /* 80237934 00234894 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) /* 80237938 00234898 81 84 00 00 */ lwz r12, 0(r4) diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 3af14f18..6779bd1a 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -521,7 +521,7 @@ sub_8016a180: /* 8016A1A8 00167108 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f /* 8016A1AC 0016710C 41 82 00 8C */ beq lbl_8016A238 /* 8016A1B0 00167110 A0 7F 00 C4 */ lhz r3, 0xc4(r31) -/* 8016A1B4 00167114 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016A1B4 00167114 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016A1B8 00167118 7C 03 00 40 */ cmplw r3, r0 /* 8016A1BC 0016711C 41 82 00 74 */ beq lbl_8016A230 /* 8016A1C0 00167120 7F E4 FB 78 */ mr r4, r31 @@ -839,7 +839,7 @@ sub_8016a5e8: /* 8016A640 001675A0 7C 03 00 40 */ cmplw r3, r0 /* 8016A644 001675A4 40 82 00 28 */ bne lbl_8016A66C /* 8016A648 001675A8 A0 65 02 6C */ lhz r3, 0x26c(r5) -/* 8016A64C 001675AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016A64C 001675AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016A650 001675B0 7C 03 00 40 */ cmplw r3, r0 /* 8016A654 001675B4 41 82 00 50 */ beq lbl_8016A6A4 /* 8016A658 001675B8 A0 1E 00 08 */ lhz r0, 8(r30) @@ -854,7 +854,7 @@ lbl_8016A66C: /* 8016A678 001675D8 28 03 00 00 */ cmplwi r3, 0 /* 8016A67C 001675DC 41 82 00 28 */ beq lbl_8016A6A4 /* 8016A680 001675E0 A0 63 07 B4 */ lhz r3, 0x7b4(r3) -/* 8016A684 001675E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016A684 001675E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016A688 001675E8 7C 03 00 40 */ cmplw r3, r0 /* 8016A68C 001675EC 41 82 00 18 */ beq lbl_8016A6A4 /* 8016A690 001675F0 A0 1E 00 08 */ lhz r0, 8(r30) @@ -2229,7 +2229,7 @@ sub_8016badc: /* 8016BAEC 00168A4C 2C 00 00 02 */ cmpwi r0, 2 /* 8016BAF0 00168A50 40 82 00 68 */ bne lbl_8016BB58 /* 8016BAF4 00168A54 A0 83 09 BC */ lhz r4, 0x9bc(r3) -/* 8016BAF8 00168A58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016BAF8 00168A58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016BAFC 00168A5C 7C 04 00 40 */ cmplw r4, r0 /* 8016BB00 00168A60 40 82 00 58 */ bne lbl_8016BB58 /* 8016BB04 00168A64 88 03 09 BE */ lbz r0, 0x9be(r3) @@ -2382,7 +2382,7 @@ sub_8016bcf4: /* 8016BD30 00168C90 7C 9E 23 78 */ mr r30, r4 /* 8016BD34 00168C94 98 03 09 C0 */ stb r0, 0x9c0(r3) /* 8016BD38 00168C98 A0 A3 07 B0 */ lhz r5, 0x7b0(r3) -/* 8016BD3C 00168C9C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016BD3C 00168C9C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016BD40 00168CA0 7C 05 00 40 */ cmplw r5, r0 /* 8016BD44 00168CA4 41 82 04 E8 */ beq lbl_8016C22C /* 8016BD48 00168CA8 80 1D 07 C8 */ lwz r0, 0x7c8(r29) @@ -2771,7 +2771,7 @@ lbl_8016C2E4: /* 8016C2F8 00169258 4B FF E2 25 */ bl sub_8016a51c /* 8016C2FC 0016925C 48 00 00 88 */ b lbl_8016C384 lbl_8016C300: -/* 8016C300 00169260 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016C300 00169260 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016C304 00169264 7C 04 00 40 */ cmplw r4, r0 /* 8016C308 00169268 41 82 00 78 */ beq lbl_8016C380 /* 8016C30C 0016926C A0 1D 07 B0 */ lhz r0, 0x7b0(r29) @@ -3360,7 +3360,7 @@ lbl_8016CB48: /* 8016CB9C 00169AFC C0 01 00 84 */ lfs f0, 0x84(r1) /* 8016CBA0 00169B00 7F 63 DB 78 */ mr r3, r27 /* 8016CBA4 00169B04 D0 61 00 B0 */ stfs f3, 0xb0(r1) -/* 8016CBA8 00169B08 A1 2D A3 8C */ lhz r9, lbl_805A8F4C@sda21(r13) +/* 8016CBA8 00169B08 A1 2D A3 8C */ lhz r9, kInvalidUniqueId@sda21(r13) /* 8016CBAC 00169B0C 7F 28 CB 78 */ mr r8, r25 /* 8016CBB0 00169B10 D0 41 00 B4 */ stfs f2, 0xb4(r1) /* 8016CBB4 00169B14 38 81 01 88 */ addi r4, r1, 0x188 @@ -3697,7 +3697,7 @@ lbl_8016D04C: /* 8016D09C 00169FFC D0 1D 08 14 */ stfs f0, 0x814(r29) /* 8016D0A0 0016A000 48 00 00 90 */ b lbl_8016D130 lbl_8016D0A4: -/* 8016D0A4 0016A004 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016D0A4 0016A004 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016D0A8 0016A008 7C 03 00 40 */ cmplw r3, r0 /* 8016D0AC 0016A00C 41 82 00 84 */ beq lbl_8016D130 /* 8016D0B0 0016A010 A0 1D 07 B0 */ lhz r0, 0x7b0(r29) @@ -3810,7 +3810,7 @@ sub_8016d228: /* 8016D234 0016A194 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8016D238 0016A198 93 C1 00 28 */ stw r30, 0x28(r1) /* 8016D23C 0016A19C 7C 7E 1B 78 */ mr r30, r3 -/* 8016D240 0016A1A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016D240 0016A1A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016D244 0016A1A4 A0 63 06 98 */ lhz r3, 0x698(r3) /* 8016D248 0016A1A8 7C 03 00 40 */ cmplw r3, r0 /* 8016D24C 0016A1AC 41 82 00 68 */ beq lbl_8016D2B4 @@ -3855,7 +3855,7 @@ sub_8016d2cc: /* 8016D2D8 0016A238 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8016D2DC 0016A23C 93 C1 00 28 */ stw r30, 0x28(r1) /* 8016D2E0 0016A240 7C 7E 1B 78 */ mr r30, r3 -/* 8016D2E4 0016A244 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016D2E4 0016A244 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016D2E8 0016A248 A0 63 06 98 */ lhz r3, 0x698(r3) /* 8016D2EC 0016A24C 7C 03 00 40 */ cmplw r3, r0 /* 8016D2F0 0016A250 41 82 00 68 */ beq lbl_8016D358 @@ -4165,7 +4165,7 @@ lbl_8016D768: /* 8016D77C 0016A6DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D780 0016A6E0 41 82 00 D8 */ beq lbl_8016D858 /* 8016D784 0016A6E4 A0 7F 07 B0 */ lhz r3, 0x7b0(r31) -/* 8016D788 0016A6E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016D788 0016A6E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016D78C 0016A6EC 7C 03 00 40 */ cmplw r3, r0 /* 8016D790 0016A6F0 41 82 00 C8 */ beq lbl_8016D858 /* 8016D794 0016A6F4 A0 1F 07 B0 */ lhz r0, 0x7b0(r31) @@ -4591,7 +4591,7 @@ sub_8016ddb0: /* 8016DDC4 0016AD24 93 C1 00 78 */ stw r30, 0x78(r1) /* 8016DDC8 0016AD28 7C 7E 1B 78 */ mr r30, r3 /* 8016DDCC 0016AD2C 93 A1 00 74 */ stw r29, 0x74(r1) -/* 8016DDD0 0016AD30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016DDD0 0016AD30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016DDD4 0016AD34 A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 8016DDD8 0016AD38 7C 03 00 40 */ cmplw r3, r0 /* 8016DDDC 0016AD3C 41 82 01 44 */ beq lbl_8016DF20 @@ -4741,7 +4741,7 @@ sub_8016dfbc: /* 8016DFE8 0016AF48 93 A1 00 D4 */ stw r29, 0xd4(r1) /* 8016DFEC 0016AF4C A0 C4 07 B0 */ lhz r6, 0x7b0(r4) /* 8016DFF0 0016AF50 7C 7D 1B 78 */ mr r29, r3 -/* 8016DFF4 0016AF54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016DFF4 0016AF54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016DFF8 0016AF58 7C BE 2B 78 */ mr r30, r5 /* 8016DFFC 0016AF5C 7C 06 00 40 */ cmplw r6, r0 /* 8016E000 0016AF60 41 82 01 24 */ beq lbl_8016E124 @@ -4849,7 +4849,7 @@ sub_8016e178: /* 8016E178 0016B0D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8016E17C 0016B0DC 7C 08 02 A6 */ mflr r0 /* 8016E180 0016B0E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8016E184 0016B0E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016E184 0016B0E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016E188 0016B0E8 A0 64 07 B4 */ lhz r3, 0x7b4(r4) /* 8016E18C 0016B0EC 7C 03 00 40 */ cmplw r3, r0 /* 8016E190 0016B0F0 40 82 00 50 */ bne lbl_8016E1E0 @@ -4958,7 +4958,7 @@ lbl_8016E2E0: /* 8016E2F8 0016B258 48 00 00 80 */ b lbl_8016E378 lbl_8016E2FC: /* 8016E2FC 0016B25C A0 7F 07 B0 */ lhz r3, 0x7b0(r31) -/* 8016E300 0016B260 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016E300 0016B260 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016E304 0016B264 7C 03 00 40 */ cmplw r3, r0 /* 8016E308 0016B268 41 82 00 70 */ beq lbl_8016E378 /* 8016E30C 0016B26C A0 1F 07 B0 */ lhz r0, 0x7b0(r31) @@ -5251,7 +5251,7 @@ lbl_8016E71C: /* 8016E720 0016B680 48 00 01 F4 */ b lbl_8016E914 lbl_8016E724: /* 8016E724 0016B684 A0 7F 07 B0 */ lhz r3, 0x7b0(r31) -/* 8016E728 0016B688 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016E728 0016B688 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016E72C 0016B68C 7C 03 00 40 */ cmplw r3, r0 /* 8016E730 0016B690 41 82 01 E4 */ beq lbl_8016E914 /* 8016E734 0016B694 A0 1F 07 B0 */ lhz r0, 0x7b0(r31) @@ -5652,7 +5652,7 @@ TurnAround__8CMetroidFR13CStateManager9EStateMsgf: /* 8016ED04 0016BC64 48 00 00 FC */ b lbl_8016EE00 lbl_8016ED08: /* 8016ED08 0016BC68 A0 7E 07 B0 */ lhz r3, 0x7b0(r30) -/* 8016ED0C 0016BC6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016ED0C 0016BC6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016ED10 0016BC70 7C 03 00 40 */ cmplw r3, r0 /* 8016ED14 0016BC74 41 82 00 EC */ beq lbl_8016EE00 /* 8016ED18 0016BC78 A0 1E 07 B0 */ lhz r0, 0x7b0(r30) @@ -5909,7 +5909,7 @@ lbl_8016F0AC: lbl_8016F0C0: /* 8016F0C0 0016C020 90 7E 05 68 */ stw r3, 0x568(r30) /* 8016F0C4 0016C024 A0 7E 07 B0 */ lhz r3, 0x7b0(r30) -/* 8016F0C8 0016C028 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016F0C8 0016C028 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016F0CC 0016C02C 7C 03 00 40 */ cmplw r3, r0 /* 8016F0D0 0016C030 40 82 02 40 */ bne lbl_8016F310 /* 8016F0D4 0016C034 80 7F 08 4C */ lwz r3, 0x84c(r31) @@ -6162,7 +6162,7 @@ lbl_8016F464: /* 8016F47C 0016C3DC 48 00 00 74 */ b lbl_8016F4F0 lbl_8016F480: /* 8016F480 0016C3E0 A0 7E 07 B0 */ lhz r3, 0x7b0(r30) -/* 8016F484 0016C3E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016F484 0016C3E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016F488 0016C3E8 7C 03 00 40 */ cmplw r3, r0 /* 8016F48C 0016C3EC 41 82 00 64 */ beq lbl_8016F4F0 /* 8016F490 0016C3F0 A0 1E 07 B0 */ lhz r0, 0x7b0(r30) @@ -6574,7 +6574,7 @@ lbl_8016FA7C: /* 8016FA7C 0016C9DC 80 7D 04 50 */ lwz r3, 0x450(r29) /* 8016FA80 0016C9E0 38 80 00 01 */ li r4, 1 /* 8016FA84 0016C9E4 4B FC AF 55 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType -/* 8016FA88 0016C9E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016FA88 0016C9E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016FA8C 0016C9EC 38 A0 00 00 */ li r5, 0 /* 8016FA90 0016C9F0 7F A3 EB 78 */ mr r3, r29 /* 8016FA94 0016C9F4 7F C4 F3 78 */ mr r4, r30 @@ -6685,7 +6685,7 @@ lbl_8016FC10: /* 8016FC10 0016CB70 80 7D 04 50 */ lwz r3, 0x450(r29) /* 8016FC14 0016CB74 38 80 00 01 */ li r4, 1 /* 8016FC18 0016CB78 4B FC AD C1 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType -/* 8016FC1C 0016CB7C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016FC1C 0016CB7C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016FC20 0016CB80 38 60 00 00 */ li r3, 0 /* 8016FC24 0016CB84 B0 1D 07 B0 */ sth r0, 0x7b0(r29) /* 8016FC28 0016CB88 88 1D 09 BF */ lbz r0, 0x9bf(r29) @@ -6929,7 +6929,7 @@ Inside__8CMetroidFR13CStateManagerf: /* 8016FF84 0016CEE4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 8016FF88 0016CEE8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8016FF8C 0016CEEC 7C 7F 1B 78 */ mr r31, r3 -/* 8016FF90 0016CEF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8016FF90 0016CEF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8016FF94 0016CEF4 A0 63 09 BC */ lhz r3, 0x9bc(r3) /* 8016FF98 0016CEF8 FF E0 08 90 */ fmr f31, f1 /* 8016FF9C 0016CEFC 7C 03 00 40 */ cmplw r3, r0 @@ -7028,7 +7028,7 @@ lbl_801700A0: /* 801700D8 0016D038 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801700DC 0016D03C 40 81 00 A4 */ ble lbl_80170180 /* 801700E0 0016D040 A0 7E 07 B0 */ lhz r3, 0x7b0(r30) -/* 801700E4 0016D044 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801700E4 0016D044 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801700E8 0016D048 7C 03 00 40 */ cmplw r3, r0 /* 801700EC 0016D04C 41 82 00 8C */ beq lbl_80170178 /* 801700F0 0016D050 A0 1E 07 B0 */ lhz r0, 0x7b0(r30) @@ -7085,7 +7085,7 @@ ShouldTurn__8CMetroidFR13CStateManagerf: /* 801701A4 0016D104 90 01 00 64 */ stw r0, 0x64(r1) /* 801701A8 0016D108 93 E1 00 5C */ stw r31, 0x5c(r1) /* 801701AC 0016D10C 7C 7F 1B 78 */ mr r31, r3 -/* 801701B0 0016D110 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801701B0 0016D110 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801701B4 0016D114 A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 801701B8 0016D118 7C 03 00 40 */ cmplw r3, r0 /* 801701BC 0016D11C 41 82 00 D4 */ beq lbl_80170290 @@ -7160,7 +7160,7 @@ AggressionCheck__8CMetroidFR13CStateManagerf: /* 801702BC 0016D21C 7C 9E 23 78 */ mr r30, r4 /* 801702C0 0016D220 93 A1 00 24 */ stw r29, 0x24(r1) /* 801702C4 0016D224 7C 7D 1B 78 */ mr r29, r3 -/* 801702C8 0016D228 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801702C8 0016D228 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801702CC 0016D22C A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 801702D0 0016D230 7C 03 00 40 */ cmplw r3, r0 /* 801702D4 0016D234 41 82 00 E4 */ beq lbl_801703B8 @@ -7184,7 +7184,7 @@ AggressionCheck__8CMetroidFR13CStateManagerf: /* 8017031C 0016D27C 4B FF DE 5D */ bl sub_8016e178 /* 80170320 0016D280 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80170324 0016D284 40 82 00 14 */ bne lbl_80170338 -/* 80170328 0016D288 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170328 0016D288 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017032C 0016D28C 38 60 00 00 */ li r3, 0 /* 80170330 0016D290 B0 1D 07 B0 */ sth r0, 0x7b0(r29) /* 80170334 0016D294 48 00 00 88 */ b lbl_801703BC @@ -7221,7 +7221,7 @@ lbl_801703A8: /* 801703A8 0016D308 38 60 00 01 */ li r3, 1 /* 801703AC 0016D30C 48 00 00 10 */ b lbl_801703BC lbl_801703B0: -/* 801703B0 0016D310 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801703B0 0016D310 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801703B4 0016D314 B0 1D 07 B0 */ sth r0, 0x7b0(r29) lbl_801703B8: /* 801703B8 0016D318 38 60 00 00 */ li r3, 0 @@ -7253,7 +7253,7 @@ SpotPlayer__8CMetroidFR13CStateManagerf: /* 80170410 0016D370 7C 03 00 00 */ cmpw r3, r0 /* 80170414 0016D374 40 82 01 14 */ bne lbl_80170528 /* 80170418 0016D378 A0 7E 07 B0 */ lhz r3, 0x7b0(r30) -/* 8017041C 0016D37C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017041C 0016D37C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80170420 0016D380 7C 03 00 40 */ cmplw r3, r0 /* 80170424 0016D384 40 82 00 F0 */ bne lbl_80170514 /* 80170428 0016D388 C0 1E 03 BC */ lfs f0, 0x3bc(r30) @@ -7344,7 +7344,7 @@ InDetectionRange__8CMetroidFR13CStateManagerf: /* 80170554 0016D4B4 BF 61 08 9C */ stmw r27, 0x89c(r1) /* 80170558 0016D4B8 7C 7E 1B 78 */ mr r30, r3 /* 8017055C 0016D4BC 7C 9F 23 78 */ mr r31, r4 -/* 80170560 0016D4C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170560 0016D4C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80170564 0016D4C4 A0 C3 07 B0 */ lhz r6, 0x7b0(r3) /* 80170568 0016D4C8 7C 06 00 40 */ cmplw r6, r0 /* 8017056C 0016D4CC 40 82 02 28 */ bne lbl_80170794 @@ -7572,7 +7572,7 @@ InRange__8CMetroidFR13CStateManagerf: /* 8017088C 0016D7EC 7C 9E 23 78 */ mr r30, r4 /* 80170890 0016D7F0 93 A1 00 34 */ stw r29, 0x34(r1) /* 80170894 0016D7F4 7C 7D 1B 78 */ mr r29, r3 -/* 80170898 0016D7F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170898 0016D7F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017089C 0016D7FC A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 801708A0 0016D800 7C 03 00 40 */ cmplw r3, r0 /* 801708A4 0016D804 41 82 00 CC */ beq lbl_80170970 @@ -7710,7 +7710,7 @@ InAttackPosition__8CMetroidFR13CStateManagerf: /* 80170A88 0016D9E8 93 A1 00 E4 */ stw r29, 0xe4(r1) /* 80170A8C 0016D9EC 93 81 00 E0 */ stw r28, 0xe0(r1) /* 80170A90 0016D9F0 7C 7E 1B 78 */ mr r30, r3 -/* 80170A94 0016D9F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170A94 0016D9F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80170A98 0016D9F8 A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 80170A9C 0016D9FC 7C 9F 23 78 */ mr r31, r4 /* 80170AA0 0016DA00 7C 03 00 40 */ cmplw r3, r0 @@ -8009,7 +8009,7 @@ PatternShagged__8CMetroidFR13CStateManagerf: /* 80170ED8 0016DE38 7C 9F 23 78 */ mr r31, r4 /* 80170EDC 0016DE3C 93 C1 00 18 */ stw r30, 0x18(r1) /* 80170EE0 0016DE40 7C 7E 1B 78 */ mr r30, r3 -/* 80170EE4 0016DE44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170EE4 0016DE44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80170EE8 0016DE48 A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 80170EEC 0016DE4C 7C 03 00 40 */ cmplw r3, r0 /* 80170EF0 0016DE50 41 82 00 90 */ beq lbl_80170F80 @@ -8070,7 +8070,7 @@ LostInterest__8CMetroidFR13CStateManagerf: /* 80170FAC 0016DF0C 7C 9F 23 78 */ mr r31, r4 /* 80170FB0 0016DF10 93 C1 00 18 */ stw r30, 0x18(r1) /* 80170FB4 0016DF14 7C 7E 1B 78 */ mr r30, r3 -/* 80170FB8 0016DF18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80170FB8 0016DF18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80170FBC 0016DF1C A0 63 07 B0 */ lhz r3, 0x7b0(r3) /* 80170FC0 0016DF20 7C 03 00 40 */ cmplw r3, r0 /* 80170FC4 0016DF24 41 82 00 B8 */ beq lbl_8017107C @@ -8091,7 +8091,7 @@ LostInterest__8CMetroidFR13CStateManagerf: /* 80171000 0016DF60 28 03 00 00 */ cmplwi r3, 0 /* 80171004 0016DF64 41 82 00 2C */ beq lbl_80171030 /* 80171008 0016DF68 A0 63 07 B4 */ lhz r3, 0x7b4(r3) -/* 8017100C 0016DF6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017100C 0016DF6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80171010 0016DF70 7C 03 00 40 */ cmplw r3, r0 /* 80171014 0016DF74 40 82 00 14 */ bne lbl_80171028 /* 80171018 0016DF78 80 7E 04 50 */ lwz r3, 0x450(r30) @@ -8932,7 +8932,7 @@ lbl_80171BC0: /* 80171BD0 0016EB30 48 00 00 58 */ b lbl_80171C28 lbl_80171BD4: /* 80171BD4 0016EB34 A0 7F 06 98 */ lhz r3, 0x698(r31) -/* 80171BD8 0016EB38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80171BD8 0016EB38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80171BDC 0016EB3C 7C 03 00 40 */ cmplw r3, r0 /* 80171BE0 0016EB40 40 82 00 1C */ bne lbl_80171BFC /* 80171BE4 0016EB44 7F E4 FB 78 */ mr r4, r31 @@ -9166,7 +9166,7 @@ lbl_80171E4C: /* 80171F14 0016EE74 38 7A 05 6C */ addi r3, r26, 0x56c /* 80171F18 0016EE78 90 1A 05 68 */ stw r0, 0x568(r26) /* 80171F1C 0016EE7C 4B FF 99 15 */ bl sub_8016b830 -/* 80171F20 0016EE80 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80171F20 0016EE80 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80171F24 0016EE84 3C 60 80 5A */ lis r3, skZero3f@ha /* 80171F28 0016EE88 C0 02 A1 08 */ lfs f0, lbl_805ABE28@sda21(r2) /* 80171F2C 0016EE8C 3B E3 66 A0 */ addi r31, r3, skZero3f@l @@ -9217,7 +9217,7 @@ lbl_80171E4C: /* 80171FE0 0016EF40 D0 1A 07 A8 */ stfs f0, 0x7a8(r26) /* 80171FE4 0016EF44 C0 1F 00 08 */ lfs f0, 8(r31) /* 80171FE8 0016EF48 D0 1A 07 AC */ stfs f0, 0x7ac(r26) -/* 80171FEC 0016EF4C A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 80171FEC 0016EF4C A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 80171FF0 0016EF50 B0 FA 07 B0 */ sth r7, 0x7b0(r26) /* 80171FF4 0016EF54 D0 3A 07 B4 */ stfs f1, 0x7b4(r26) /* 80171FF8 0016EF58 D0 3A 07 B8 */ stfs f1, 0x7b8(r26) diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index 8dabb2b8..98936e56 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -723,7 +723,7 @@ sub_801c126c: /* 801C1278 001BE1D8 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801C127C 001BE1DC 93 C1 00 28 */ stw r30, 0x28(r1) /* 801C1280 001BE1E0 7C 7E 1B 78 */ mr r30, r3 -/* 801C1284 001BE1E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801C1284 001BE1E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801C1288 001BE1E8 A0 63 06 78 */ lhz r3, 0x678(r3) /* 801C128C 001BE1EC 7C 03 00 40 */ cmplw r3, r0 /* 801C1290 001BE1F0 41 82 00 68 */ beq lbl_801C12F8 @@ -768,7 +768,7 @@ sub_801c1310: /* 801C131C 001BE27C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 801C1320 001BE280 93 C1 00 28 */ stw r30, 0x28(r1) /* 801C1324 001BE284 7C 7E 1B 78 */ mr r30, r3 -/* 801C1328 001BE288 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801C1328 001BE288 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801C132C 001BE28C A0 63 06 78 */ lhz r3, 0x678(r3) /* 801C1330 001BE290 7C 03 00 40 */ cmplw r3, r0 /* 801C1334 001BE294 41 82 00 68 */ beq lbl_801C139C @@ -5843,7 +5843,7 @@ lbl_801C5C10: .global lbl_801C5CA4 lbl_801C5CA4: /* 801C5CA4 001C2C04 A0 7D 06 78 */ lhz r3, 0x678(r29) -/* 801C5CA8 001C2C08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801C5CA8 001C2C08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801C5CAC 001C2C0C 7C 03 00 40 */ cmplw r3, r0 /* 801C5CB0 001C2C10 40 82 00 1C */ bne lbl_801C5CCC /* 801C5CB4 001C2C14 7F A4 EB 78 */ mr r4, r29 @@ -6168,7 +6168,7 @@ lbl_801C6070: /* 801C611C 001C307C 38 7E 05 6C */ addi r3, r30, 0x56c /* 801C6120 001C3080 90 1E 05 68 */ stw r0, 0x568(r30) /* 801C6124 001C3084 48 00 06 BD */ bl sub_801c67e0 -/* 801C6128 001C3088 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801C6128 001C3088 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801C612C 001C308C 38 7E 06 7C */ addi r3, r30, 0x67c /* 801C6130 001C3090 C0 22 AA A4 */ lfs f1, lbl_805AC7C4@sda21(r2) /* 801C6134 001C3094 38 80 00 00 */ li r4, 0 @@ -6211,7 +6211,7 @@ lbl_801C6070: /* 801C61C8 001C3128 D0 1C 00 20 */ stfs f0, 0x20(r28) /* 801C61CC 001C312C C0 01 00 D4 */ lfs f0, 0xd4(r1) /* 801C61D0 001C3130 D0 1C 00 24 */ stfs f0, 0x24(r28) -/* 801C61D4 001C3134 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 801C61D4 001C3134 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 801C61D8 001C3138 B0 DE 07 90 */ sth r6, 0x790(r30) /* 801C61DC 001C313C D0 3E 07 94 */ stfs f1, 0x794(r30) /* 801C61E0 001C3140 D0 3E 07 98 */ stfs f1, 0x798(r30) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 32f1f21d..82ff1c49 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -1153,7 +1153,7 @@ sub_8027d52c: /* 8027D5E0 0027A540 41 82 00 A4 */ beq lbl_8027D684 /* 8027D5E4 0027A544 A0 FB 00 08 */ lhz r7, 8(r27) /* 8027D5E8 0027A548 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8027D5EC 0027A54C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8027D5EC 0027A54C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8027D5F0 0027A550 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8027D5F4 0027A554 B0 E1 00 14 */ sth r7, 0x14(r1) /* 8027D5F8 0027A558 38 61 00 44 */ addi r3, r1, 0x44 @@ -2617,7 +2617,7 @@ sub_8027e870: /* 8027EA38 0027B998 93 61 00 D0 */ stw r27, 0xd0(r1) /* 8027EA3C 0027B99C 90 01 00 D8 */ stw r0, 0xd8(r1) /* 8027EA40 0027B9A0 4B DC DC E1 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" -/* 8027EA44 0027B9A4 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8027EA44 0027B9A4 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8027EA48 0027B9A8 38 00 00 00 */ li r0, 0 /* 8027EA4C 0027B9AC 80 AD 99 1C */ lwz r5, lbl_805A84DC@sda21(r13) /* 8027EA50 0027B9B0 38 60 00 00 */ li r3, 0 @@ -3929,7 +3929,7 @@ lbl_8027FCFC: /* 8027FCFC 0027CC5C 80 7D 06 58 */ lwz r3, 0x658(r29) /* 8027FD00 0027CC60 7F E4 FB 78 */ mr r4, r31 /* 8027FD04 0027CC64 4B F2 76 C1 */ bl Destroy__22CCollisionActorManagerCFR13CStateManager -/* 8027FD08 0027CC68 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027FD08 0027CC68 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027FD0C 0027CC6C 7F E3 FB 78 */ mr r3, r31 /* 8027FD10 0027CC70 C0 22 BD 10 */ lfs f1, lbl_805ADA30@sda21(r2) /* 8027FD14 0027CC74 38 81 00 48 */ addi r4, r1, 0x48 @@ -4378,9 +4378,9 @@ __ct__20CMetroidPrimeEssence: /* 80280398 0027D2F8 90 BA 06 F8 */ stw r5, 0x6f8(r26) /* 8028039C 0027D2FC 90 FA 06 FC */ stw r7, 0x6fc(r26) /* 802803A0 0027D300 90 1A 07 00 */ stw r0, 0x700(r26) -/* 802803A4 0027D304 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802803A4 0027D304 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802803A8 0027D308 B0 1A 07 04 */ sth r0, 0x704(r26) -/* 802803AC 0027D30C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802803AC 0027D30C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802803B0 0027D310 B0 1A 07 06 */ sth r0, 0x706(r26) /* 802803B4 0027D314 90 FA 07 08 */ stw r7, 0x708(r26) /* 802803B8 0027D318 48 06 85 F9 */ bl TranslateSFXID__11CSfxManagerFUs diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 1f1b899a..4e68c4ef 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -3391,7 +3391,7 @@ ShouldDoubleSnap__16CMetroidPrimeExoFR13CStateManagerf: /* 80273754 002706B4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80273758 002706B8 40 82 00 24 */ bne lbl_8027377C /* 8027375C 002706BC A0 A3 02 DC */ lhz r5, 0x2dc(r3) -/* 80273760 002706C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80273760 002706C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80273764 002706C4 7C 05 00 40 */ cmplw r5, r0 /* 80273768 002706C8 41 82 00 14 */ beq lbl_8027377C /* 8027376C 002706CC C0 22 BC 54 */ lfs f1, lbl_805AD974@sda21(r2) @@ -4124,7 +4124,7 @@ sub_802740fc: /* 80274140 002710A0 48 0A 17 2D */ bl __nw__FUlPCcPCc /* 80274144 002710A4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80274148 002710A8 41 82 00 70 */ beq lbl_802741B8 -/* 8027414C 002710AC 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8027414C 002710AC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80274150 002710B0 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80274154 002710B4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 80274158 002710B8 38 81 00 24 */ addi r4, r1, 0x24 @@ -4529,7 +4529,7 @@ lbl_8027470C: /* 8027471C 0027167C B0 01 00 14 */ sth r0, 0x14(r1) lbl_80274720: /* 80274720 00271680 A0 61 00 14 */ lhz r3, 0x14(r1) -/* 80274724 00271684 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80274724 00271684 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80274728 00271688 7C 03 00 40 */ cmplw r3, r0 /* 8027472C 0027168C 40 82 FF 94 */ bne lbl_802746C0 /* 80274730 00271690 C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) @@ -5689,7 +5689,7 @@ sub_80275800: /* 80275830 00272790 7F A4 EB 78 */ mr r4, r29 /* 80275834 00272794 48 00 11 AD */ bl sub_802769e0 /* 80275838 00272798 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 8027583C 0027279C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027583C 0027279C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80275840 002727A0 B0 61 00 10 */ sth r3, 0x10(r1) /* 80275844 002727A4 7C 03 00 40 */ cmplw r3, r0 /* 80275848 002727A8 41 82 00 8C */ beq lbl_802758D4 @@ -6970,7 +6970,7 @@ sub_802769e0: /* 80276A10 00273970 38 E0 00 06 */ li r7, 6 /* 80276A14 00273974 48 00 01 29 */ bl sub_80276b3c /* 80276A18 00273978 A0 01 00 10 */ lhz r0, 0x10(r1) -/* 80276A1C 0027397C A3 ED A3 8C */ lhz r31, lbl_805A8F4C@sda21(r13) +/* 80276A1C 0027397C A3 ED A3 8C */ lhz r31, kInvalidUniqueId@sda21(r13) /* 80276A20 00273980 B0 01 00 14 */ sth r0, 0x14(r1) /* 80276A24 00273984 C3 E2 BC 08 */ lfs f31, lbl_805AD928@sda21(r2) /* 80276A28 00273988 48 00 00 E4 */ b lbl_80276B0C @@ -7032,11 +7032,11 @@ lbl_80276AEC: /* 80276AFC 00273A5C B0 01 00 14 */ sth r0, 0x14(r1) /* 80276B00 00273A60 48 00 00 0C */ b lbl_80276B0C lbl_80276B04: -/* 80276B04 00273A64 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80276B04 00273A64 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80276B08 00273A68 B0 01 00 14 */ sth r0, 0x14(r1) lbl_80276B0C: /* 80276B0C 00273A6C A0 61 00 14 */ lhz r3, 0x14(r1) -/* 80276B10 00273A70 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80276B10 00273A70 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80276B14 00273A74 7C 03 00 40 */ cmplw r3, r0 /* 80276B18 00273A78 40 82 FF 14 */ bne lbl_80276A2C /* 80276B1C 00273A7C B3 FB 00 00 */ sth r31, 0(r27) @@ -7183,7 +7183,7 @@ lbl_80276D0C: /* 80276D0C 00273C6C 38 00 00 00 */ li r0, 0 /* 80276D10 00273C70 90 01 00 24 */ stw r0, 0x24(r1) lbl_80276D14: -/* 80276D14 00273C74 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80276D14 00273C74 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80276D18 00273C78 B0 19 00 00 */ sth r0, 0(r25) lbl_80276D1C: /* 80276D1C 00273C7C BB 21 00 44 */ lmw r25, 0x44(r1) @@ -7201,7 +7201,7 @@ sub_80276d30: /* 80276D40 00273CA0 7C 7D 1B 78 */ mr r29, r3 /* 80276D44 00273CA4 7C 9E 23 78 */ mr r30, r4 /* 80276D48 00273CA8 7C BF 2B 78 */ mr r31, r5 -/* 80276D4C 00273CAC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80276D4C 00273CAC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80276D50 00273CB0 A0 63 05 68 */ lhz r3, 0x568(r3) /* 80276D54 00273CB4 7C 03 00 40 */ cmplw r3, r0 /* 80276D58 00273CB8 41 82 00 3C */ beq lbl_80276D94 @@ -7216,12 +7216,12 @@ sub_80276d30: /* 80276D7C 00273CDC 80 63 00 04 */ lwz r3, 4(r3) /* 80276D80 00273CE0 28 03 00 00 */ cmplwi r3, 0 /* 80276D84 00273CE4 41 82 00 10 */ beq lbl_80276D94 -/* 80276D88 00273CE8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80276D88 00273CE8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80276D8C 00273CEC B0 01 00 18 */ sth r0, 0x18(r1) /* 80276D90 00273CF0 B0 03 00 34 */ sth r0, 0x34(r3) lbl_80276D94: /* 80276D94 00273CF4 83 9E 08 10 */ lwz r28, 0x810(r30) -/* 80276D98 00273CF8 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80276D98 00273CF8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80276D9C 00273CFC AB 7C 20 08 */ lha r27, 0x2008(r28) /* 80276DA0 00273D00 90 01 00 24 */ stw r0, 0x24(r1) /* 80276DA4 00273D04 48 00 00 6C */ b lbl_80276E10 @@ -7257,11 +7257,11 @@ lbl_80276E0C: lbl_80276E10: /* 80276E10 00273D70 2C 1B FF FF */ cmpwi r27, -1 /* 80276E14 00273D74 40 82 FF 94 */ bne lbl_80276DA8 -/* 80276E18 00273D78 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 80276E18 00273D78 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 80276E1C 00273D7C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80276E20 00273D80 B0 7D 05 68 */ sth r3, 0x568(r29) /* 80276E24 00273D84 54 03 01 BE */ clrlwi r3, r0, 6 -/* 80276E28 00273D88 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80276E28 00273D88 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80276E2C 00273D8C 54 00 01 BE */ clrlwi r0, r0, 6 /* 80276E30 00273D90 7C 03 00 40 */ cmplw r3, r0 /* 80276E34 00273D94 41 82 00 60 */ beq lbl_80276E94 @@ -7312,7 +7312,7 @@ sub_80276ec0: /* 80276ED8 00273E38 93 81 00 10 */ stw r28, 0x10(r1) /* 80276EDC 00273E3C 7C BC 2B 78 */ mr r28, r5 /* 80276EE0 00273E40 83 E4 08 10 */ lwz r31, 0x810(r4) -/* 80276EE4 00273E44 83 CD A3 88 */ lwz r30, lbl_805A8F48@sda21(r13) +/* 80276EE4 00273E44 83 CD A3 88 */ lwz r30, kInvalidEditorId@sda21(r13) /* 80276EE8 00273E48 AB BF 20 08 */ lha r29, 0x2008(r31) /* 80276EEC 00273E4C 48 00 00 68 */ b lbl_80276F54 lbl_80276EF0: @@ -7346,7 +7346,7 @@ lbl_80276F50: lbl_80276F54: /* 80276F54 00273EB4 2C 1D FF FF */ cmpwi r29, -1 /* 80276F58 00273EB8 40 82 FF 98 */ bne lbl_80276EF0 -/* 80276F5C 00273EBC 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80276F5C 00273EBC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80276F60 00273EC0 57 C4 01 BE */ clrlwi r4, r30, 6 /* 80276F64 00273EC4 54 00 01 BE */ clrlwi r0, r0, 6 /* 80276F68 00273EC8 7C 64 00 50 */ subf r3, r4, r0 @@ -7736,7 +7736,7 @@ lbl_802774E0: /* 802774E8 00274448 48 00 00 5C */ b lbl_80277544 lbl_802774EC: /* 802774EC 0027444C A0 7D 00 00 */ lhz r3, 0(r29) -/* 802774F0 00274450 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802774F0 00274450 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802774F4 00274454 7C 03 00 40 */ cmplw r3, r0 /* 802774F8 00274458 41 82 00 44 */ beq lbl_8027753C /* 802774FC 0027445C A0 1D 00 00 */ lhz r0, 0(r29) @@ -8048,7 +8048,7 @@ lbl_80277988: /* 80277988 002748E8 80 9F 08 4C */ lwz r4, 0x84c(r31) /* 8027798C 002748EC 3C 60 80 5A */ lis r3, lbl_805A6700@ha /* 80277990 002748F0 38 E3 67 00 */ addi r7, r3, lbl_805A6700@l -/* 80277994 002748F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80277994 002748F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80277998 002748F8 C0 A4 00 60 */ lfs f5, 0x60(r4) /* 8027799C 002748FC 38 C0 00 00 */ li r6, 0 /* 802779A0 00274900 C0 84 00 50 */ lfs f4, 0x50(r4) @@ -8190,7 +8190,7 @@ sub_80277b74: /* 80277BA0 00274B00 48 00 00 38 */ b lbl_80277BD8 lbl_80277BA4: /* 80277BA4 00274B04 A0 7F 00 00 */ lhz r3, 0(r31) -/* 80277BA8 00274B08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80277BA8 00274B08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80277BAC 00274B0C 7C 03 00 40 */ cmplw r3, r0 /* 80277BB0 00274B10 41 82 00 20 */ beq lbl_80277BD0 /* 80277BB4 00274B14 A0 1F 00 00 */ lhz r0, 0(r31) @@ -8198,7 +8198,7 @@ lbl_80277BA4: /* 80277BBC 00274B1C 38 81 00 08 */ addi r4, r1, 8 /* 80277BC0 00274B20 B0 01 00 08 */ sth r0, 8(r1) /* 80277BC4 00274B24 4B DD 46 A9 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80277BC8 00274B28 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80277BC8 00274B28 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80277BCC 00274B2C B0 1F 00 00 */ sth r0, 0(r31) lbl_80277BD0: /* 80277BD0 00274B30 3B FF 00 02 */ addi r31, r31, 2 @@ -11751,7 +11751,7 @@ __ct__16CMetroidPrimeExo: /* 8027AFDC 00277F3C 90 10 00 00 */ stw r0, 0(r16) /* 8027AFE0 00277F40 38 00 00 01 */ li r0, 1 /* 8027AFE4 00277F44 38 6F 00 04 */ addi r3, r15, 4 -/* 8027AFE8 00277F48 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 8027AFE8 00277F48 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 8027AFEC 00277F4C B0 D0 05 68 */ sth r6, 0x568(r16) /* 8027AFF0 00277F50 90 B0 05 6C */ stw r5, 0x56c(r16) /* 8027AFF4 00277F54 90 10 05 70 */ stw r0, 0x570(r16) @@ -11842,7 +11842,7 @@ lbl_8027B128: /* 8027B13C 0027809C D0 30 08 C0 */ stfs f1, 0x8c0(r16) /* 8027B140 002780A0 D0 10 08 C4 */ stfs f0, 0x8c4(r16) /* 8027B144 002780A4 D0 10 08 C8 */ stfs f0, 0x8c8(r16) -/* 8027B148 002780A8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8027B148 002780A8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8027B14C 002780AC B0 70 08 CC */ sth r3, 0x8cc(r16) /* 8027B150 002780B0 90 10 08 D0 */ stw r0, 0x8d0(r16) /* 8027B154 002780B4 90 10 08 D4 */ stw r0, 0x8d4(r16) @@ -11952,22 +11952,22 @@ lbl_8027B128: /* 8027B2F4 00278254 90 10 0A 80 */ stw r0, 0xa80(r16) /* 8027B2F8 00278258 90 90 0B 24 */ stw r4, 0xb24(r16) /* 8027B2FC 0027825C 41 82 00 0C */ beq lbl_8027B308 -/* 8027B300 00278260 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027B300 00278260 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027B304 00278264 B0 03 00 00 */ sth r0, 0(r3) lbl_8027B308: /* 8027B308 00278268 34 63 00 02 */ addic. r3, r3, 2 /* 8027B30C 0027826C 41 82 00 0C */ beq lbl_8027B318 -/* 8027B310 00278270 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027B310 00278270 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027B314 00278274 B0 03 00 00 */ sth r0, 0(r3) lbl_8027B318: /* 8027B318 00278278 34 63 00 02 */ addic. r3, r3, 2 /* 8027B31C 0027827C 41 82 00 0C */ beq lbl_8027B328 -/* 8027B320 00278280 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027B320 00278280 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027B324 00278284 B0 03 00 00 */ sth r0, 0(r3) lbl_8027B328: /* 8027B328 00278288 34 63 00 02 */ addic. r3, r3, 2 /* 8027B32C 0027828C 41 82 00 0C */ beq lbl_8027B338 -/* 8027B330 00278290 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027B330 00278290 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027B334 00278294 B0 03 00 00 */ sth r0, 0(r3) lbl_8027B338: /* 8027B338 00278298 38 80 00 00 */ li r4, 0 @@ -12085,7 +12085,7 @@ lbl_8027B3FC: /* 8027B4F0 00278450 90 B0 0E A4 */ stw r5, 0xea4(r16) /* 8027B4F4 00278454 88 BB 00 38 */ lbz r5, 0x38(r27) /* 8027B4F8 00278458 98 B0 0E A8 */ stb r5, 0xea8(r16) -/* 8027B4FC 0027845C A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8027B4FC 0027845C A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8027B500 00278460 B0 B0 0E AC */ sth r5, 0xeac(r16) /* 8027B504 00278464 90 10 0E B0 */ stw r0, 0xeb0(r16) /* 8027B508 00278468 80 1C 00 00 */ lwz r0, 0(r28) @@ -12238,9 +12238,9 @@ lbl_8027B730: /* 8027B744 002786A4 38 70 10 8C */ addi r3, r16, 0x108c /* 8027B748 002786A8 90 D0 10 38 */ stw r6, 0x1038(r16) /* 8027B74C 002786AC 80 81 01 CC */ lwz r4, 0x1cc(r1) -/* 8027B750 002786B0 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8027B750 002786B0 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8027B754 002786B4 B0 B0 10 44 */ sth r5, 0x1044(r16) -/* 8027B758 002786B8 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8027B758 002786B8 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8027B75C 002786BC B0 B0 10 46 */ sth r5, 0x1046(r16) /* 8027B760 002786C0 D0 30 10 48 */ stfs f1, 0x1048(r16) /* 8027B764 002786C4 D0 10 10 4C */ stfs f0, 0x104c(r16) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index 9c1f22e3..4f7949f0 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -158,7 +158,7 @@ lbl_802805D8: /* 80280648 0027D5A8 4B E9 65 0D */ bl __ct__10CModelDataFRC8CAnimRes /* 8028064C 0027D5AC 80 1D 00 04 */ lwz r0, 4(r29) /* 80280650 0027D5B0 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80280654 0027D5B4 80 CD A3 88 */ lwz r6, lbl_805A8F48@sda21(r13) +/* 80280654 0027D5B4 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) /* 80280658 0027D5B8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8028065C 0027D5BC 90 01 00 7C */ stw r0, 0x7c(r1) /* 80280660 0027D5C0 38 61 00 9C */ addi r3, r1, 0x9c @@ -268,7 +268,7 @@ lbl_802807E8: /* 802807E8 0027D748 7F C3 F3 78 */ mr r3, r30 /* 802807EC 0027D74C 7F E4 FB 78 */ mr r4, r31 /* 802807F0 0027D750 4B DC C3 25 */ bl AddObject__13CStateManagerFR7CEntity -/* 802807F4 0027D754 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802807F4 0027D754 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802807F8 0027D758 7F C3 F3 78 */ mr r3, r30 /* 802807FC 0027D75C 7F E4 FB 78 */ mr r4, r31 /* 80280800 0027D760 38 A1 00 60 */ addi r5, r1, 0x60 @@ -417,7 +417,7 @@ Accept__18CMetroidPrimeRelay: /* 802809F4 0027D954 38 03 B6 38 */ addi r0, r3, lbl_803EB638@l /* 802809F8 0027D958 38 74 00 38 */ addi r3, r20, 0x38 /* 802809FC 0027D95C 90 14 00 00 */ stw r0, 0(r20) -/* 80280A00 0027D960 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80280A00 0027D960 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80280A04 0027D964 B0 14 00 34 */ sth r0, 0x34(r20) /* 80280A08 0027D968 48 09 21 6D */ bl __ct__12CTransform4fFRC12CTransform4f /* 80280A0C 0027D96C C0 15 00 00 */ lfs f0, 0(r21) diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index f8dcb33a..051173e0 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -289,7 +289,7 @@ DeleteBeam__13CNewIntroBossFR13CStateManager: /* 80189EB0 00186E10 7C 9F 23 78 */ mr r31, r4 /* 80189EB4 00186E14 93 C1 00 18 */ stw r30, 0x18(r1) /* 80189EB8 00186E18 7C 7E 1B 78 */ mr r30, r3 -/* 80189EBC 00186E1C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189EBC 00186E1C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189EC0 00186E20 A0 63 05 D4 */ lhz r3, 0x5d4(r3) /* 80189EC4 00186E24 7C 03 00 40 */ cmplw r3, r0 /* 80189EC8 00186E28 41 82 00 20 */ beq lbl_80189EE8 @@ -298,11 +298,11 @@ DeleteBeam__13CNewIntroBossFR13CStateManager: /* 80189ED4 00186E34 38 81 00 10 */ addi r4, r1, 0x10 /* 80189ED8 00186E38 B0 01 00 10 */ sth r0, 0x10(r1) /* 80189EDC 00186E3C 4B EC 23 91 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80189EE0 00186E40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189EE0 00186E40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189EE4 00186E44 B0 1E 05 D4 */ sth r0, 0x5d4(r30) lbl_80189EE8: /* 80189EE8 00186E48 A0 7E 05 D6 */ lhz r3, 0x5d6(r30) -/* 80189EEC 00186E4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189EEC 00186E4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189EF0 00186E50 7C 03 00 40 */ cmplw r3, r0 /* 80189EF4 00186E54 41 82 00 20 */ beq lbl_80189F14 /* 80189EF8 00186E58 A0 1E 05 D6 */ lhz r0, 0x5d6(r30) @@ -310,11 +310,11 @@ lbl_80189EE8: /* 80189F00 00186E60 38 81 00 0C */ addi r4, r1, 0xc /* 80189F04 00186E64 B0 01 00 0C */ sth r0, 0xc(r1) /* 80189F08 00186E68 4B EC 23 65 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80189F0C 00186E6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189F0C 00186E6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189F10 00186E70 B0 1E 05 D6 */ sth r0, 0x5d6(r30) lbl_80189F14: /* 80189F14 00186E74 A0 7E 05 D8 */ lhz r3, 0x5d8(r30) -/* 80189F18 00186E78 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189F18 00186E78 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189F1C 00186E7C 7C 03 00 40 */ cmplw r3, r0 /* 80189F20 00186E80 41 82 00 20 */ beq lbl_80189F40 /* 80189F24 00186E84 A0 1E 05 D8 */ lhz r0, 0x5d8(r30) @@ -322,7 +322,7 @@ lbl_80189F14: /* 80189F2C 00186E8C 38 81 00 08 */ addi r4, r1, 8 /* 80189F30 00186E90 B0 01 00 08 */ sth r0, 8(r1) /* 80189F34 00186E94 4B EC 23 39 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80189F38 00186E98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80189F38 00186E98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80189F3C 00186E9C B0 1E 05 D8 */ sth r0, 0x5d8(r30) lbl_80189F40: /* 80189F40 00186EA0 7F C3 F3 78 */ mr r3, r30 @@ -489,7 +489,7 @@ lbl_8018A148: /* 8018A178 001870D8 7F C4 F3 78 */ mr r4, r30 /* 8018A17C 001870DC 4B FB 0B 75 */ bl Activate__15CBodyControllerFR13CStateManager /* 8018A180 001870E0 A0 7F 05 D4 */ lhz r3, 0x5d4(r31) -/* 8018A184 001870E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018A184 001870E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018A188 001870E8 7C 03 00 40 */ cmplw r3, r0 /* 8018A18C 001870EC 40 82 05 4C */ bne lbl_8018A6D8 /* 8018A190 001870F0 C0 22 A3 90 */ lfs f1, lbl_805AC0B0@sda21(r2) @@ -2524,7 +2524,7 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018BF6C 00188ECC 7F 65 DB 78 */ mr r5, r27 /* 8018BF70 00188ED0 38 78 05 AC */ addi r3, r24, 0x5ac /* 8018BF74 00188ED4 48 09 01 35 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo -/* 8018BF78 00188ED8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8018BF78 00188ED8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8018BF7C 00188EDC 3C 60 80 5A */ lis r3, skZero3f@ha /* 8018BF80 00188EE0 38 CD A9 18 */ addi r6, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8018BF84 00188EE4 38 00 00 00 */ li r0, 0 @@ -2532,12 +2532,12 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018BF8C 00188EEC 38 A3 66 A0 */ addi r5, r3, skZero3f@l /* 8018BF90 00188EF0 C0 62 A3 C0 */ lfs f3, lbl_805AC0E0@sda21(r2) /* 8018BF94 00188EF4 7F 24 CB 78 */ mr r4, r25 -/* 8018BF98 00188EF8 A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 8018BF98 00188EF8 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 8018BF9C 00188EFC 38 78 06 44 */ addi r3, r24, 0x644 /* 8018BFA0 00188F00 C0 22 A3 C8 */ lfs f1, lbl_805AC0E8@sda21(r2) /* 8018BFA4 00188F04 B0 F8 05 D6 */ sth r7, 0x5d6(r24) /* 8018BFA8 00188F08 C0 02 A3 AC */ lfs f0, lbl_805AC0CC@sda21(r2) -/* 8018BFAC 00188F0C A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 8018BFAC 00188F0C A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 8018BFB0 00188F10 B0 F8 05 D8 */ sth r7, 0x5d8(r24) /* 8018BFB4 00188F14 90 D8 05 DC */ stw r6, 0x5dc(r24) /* 8018BFB8 00188F18 90 18 05 E0 */ stw r0, 0x5e0(r24) @@ -2547,9 +2547,9 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018BFC8 00188F28 93 B8 05 F4 */ stw r29, 0x5f4(r24) /* 8018BFCC 00188F2C 93 D8 05 F8 */ stw r30, 0x5f8(r24) /* 8018BFD0 00188F30 93 F8 05 FC */ stw r31, 0x5fc(r24) -/* 8018BFD4 00188F34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018BFD4 00188F34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018BFD8 00188F38 B0 18 06 00 */ sth r0, 0x600(r24) -/* 8018BFDC 00188F3C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018BFDC 00188F3C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018BFE0 00188F40 B0 18 06 02 */ sth r0, 0x602(r24) /* 8018BFE4 00188F44 C0 45 00 00 */ lfs f2, 0(r5) /* 8018BFE8 00188F48 D0 58 06 04 */ stfs f2, 0x604(r24) @@ -2584,7 +2584,7 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018C05C 00188FBC 38 00 00 00 */ li r0, 0 /* 8018C060 00188FC0 B0 78 06 74 */ sth r3, 0x674(r24) /* 8018C064 00188FC4 38 78 05 AC */ addi r3, r24, 0x5ac -/* 8018C068 00188FC8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8018C068 00188FC8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8018C06C 00188FCC B0 98 06 76 */ sth r4, 0x676(r24) /* 8018C070 00188FD0 98 18 06 78 */ stb r0, 0x678(r24) /* 8018C074 00188FD4 48 1B 4D 11 */ bl Lock__6CTokenFv diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index c6da4418..49216670 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -590,7 +590,7 @@ lbl_8028B704: /* 8028B710 00288670 81 8C 00 1C */ lwz r12, 0x1c(r12) /* 8028B714 00288674 7D 89 03 A6 */ mtctr r12 /* 8028B718 00288678 4E 80 04 21 */ bctrl -/* 8028B71C 0028867C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8028B71C 0028867C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8028B720 00288680 7F E3 FB 78 */ mr r3, r31 /* 8028B724 00288684 C0 22 BE 9C */ lfs f1, lbl_805ADBBC@sda21(r2) /* 8028B728 00288688 38 81 00 08 */ addi r4, r1, 8 @@ -1020,7 +1020,7 @@ AddToRenderer__Q212COmegaPirate6CFlashCFRC14CFrustumPlanesRC13CStateManager: /* 8028BD4C 00288CAC 4B DA EA 59 */ bl CModelDataNull__10CModelDataFv /* 8028BD50 00288CB0 38 61 00 60 */ addi r3, r1, 0x60 /* 8028BD54 00288CB4 4B D8 F0 E5 */ bl None__16CActorParametersFv -/* 8028BD58 00288CB8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8028BD58 00288CB8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8028BD5C 00288CBC 38 A0 00 00 */ li r5, 0 /* 8028BD60 00288CC0 A0 1C 00 00 */ lhz r0, 0(r28) /* 8028BD64 00288CC4 7F C4 F3 78 */ mr r4, r30 @@ -1095,7 +1095,7 @@ CreateFlash__12COmegaPirateFR13CStateManagerf: /* 8028BE6C 00288DCC 48 08 9A 01 */ bl __nw__FUlPCcPCc /* 8028BE70 00288DD0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028BE74 00288DD4 41 82 00 84 */ beq lbl_8028BEF8 -/* 8028BE78 00288DD8 80 CD A3 88 */ lwz r6, lbl_805A8F48@sda21(r13) +/* 8028BE78 00288DD8 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) /* 8028BE7C 00288DDC 38 00 00 00 */ li r0, 0 /* 8028BE80 00288DE0 90 01 00 40 */ stw r0, 0x40(r1) /* 8028BE84 00288DE4 38 61 00 58 */ addi r3, r1, 0x58 @@ -5908,7 +5908,7 @@ lbl_80290184: /* 802901FC 0028D15C 4B F2 97 25 */ bl SetNewTarget__10CAuxWeaponF9TUniqueIdR13CStateManager /* 80290200 0028D160 48 00 00 24 */ b lbl_80290224 lbl_80290204: -/* 80290204 0028D164 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80290204 0028D164 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80290208 0028D168 7F E5 FB 78 */ mr r5, r31 /* 8029020C 0028D16C 38 81 00 1C */ addi r4, r1, 0x1c /* 80290210 0028D170 B0 01 00 1C */ sth r0, 0x1c(r1) @@ -6089,7 +6089,7 @@ AggressionCheck__12COmegaPirateFR13CStateManagerf: /* 80290490 0028D3F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80290494 0028D3F4 3B E0 00 00 */ li r31, 0 /* 80290498 0028D3F8 A0 A3 09 90 */ lhz r5, 0x990(r3) -/* 8029049C 0028D3FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029049C 0028D3FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802904A0 0028D400 7C 05 00 40 */ cmplw r5, r0 /* 802904A4 0028D404 40 82 00 14 */ bne lbl_802904B8 /* 802904A8 0028D408 4B F9 B8 2D */ bl AggressionCheck__12CElitePirateFR13CStateManagerf @@ -6229,7 +6229,7 @@ lbl_8029064C: .global lbl_80290654 lbl_80290654: /* 80290654 0028D5B4 A0 7E 09 90 */ lhz r3, 0x990(r30) -/* 80290658 0028D5B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80290658 0028D5B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029065C 0028D5BC 7C 03 00 40 */ cmplw r3, r0 /* 80290660 0028D5C0 41 82 01 9C */ beq lbl_802907FC /* 80290664 0028D5C4 A0 1E 09 90 */ lhz r0, 0x990(r30) @@ -6369,7 +6369,7 @@ GetOrbitPosition__12COmegaPirateCFRC13CStateManager: /* 8029082C 0028D78C 7C 9E 23 78 */ mr r30, r4 /* 80290830 0028D790 93 A1 00 14 */ stw r29, 0x14(r1) /* 80290834 0028D794 7C 7D 1B 78 */ mr r29, r3 -/* 80290838 0028D798 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80290838 0028D798 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029083C 0028D79C A0 84 09 90 */ lhz r4, 0x990(r4) /* 80290840 0028D7A0 7C 04 00 40 */ cmplw r4, r0 /* 80290844 0028D7A4 41 82 00 40 */ beq lbl_80290884 @@ -6601,7 +6601,7 @@ lbl_80290B54: /* 80290B7C 0028DADC 2C 00 00 0A */ cmpwi r0, 0xa /* 80290B80 0028DAE0 B0 81 00 A8 */ sth r4, 0xa8(r1) /* 80290B84 0028DAE4 40 82 06 44 */ bne lbl_802911C8 -/* 80290B88 0028DAE8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80290B88 0028DAE8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80290B8C 0028DAEC 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 80290B90 0028DAF0 7C 03 00 40 */ cmplw r3, r0 /* 80290B94 0028DAF4 41 82 06 34 */ beq lbl_802911C8 @@ -7048,7 +7048,7 @@ lbl_802911DC: /* 802911F0 0028E150 A0 7F 09 90 */ lhz r3, 0x990(r31) /* 802911F4 0028E154 7C 00 18 40 */ cmplw r0, r3 /* 802911F8 0028E158 40 82 00 20 */ bne lbl_80291218 -/* 802911FC 0028E15C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802911FC 0028E15C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80291200 0028E160 7C 03 00 40 */ cmplw r3, r0 /* 80291204 0028E164 41 82 00 14 */ beq lbl_80291218 /* 80291208 0028E168 7F E3 FB 78 */ mr r3, r31 @@ -7132,7 +7132,7 @@ lbl_80291330: /* 80291334 0028E294 A0 7F 09 90 */ lhz r3, 0x990(r31) /* 80291338 0028E298 7C 00 18 40 */ cmplw r0, r3 /* 8029133C 0028E29C 40 82 00 A4 */ bne lbl_802913E0 -/* 80291340 0028E2A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80291340 0028E2A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80291344 0028E2A4 7C 03 00 40 */ cmplw r3, r0 /* 80291348 0028E2A8 41 82 00 98 */ beq lbl_802913E0 /* 8029134C 0028E2AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha @@ -7547,7 +7547,7 @@ lbl_8029186C: /* 802918E4 0028E844 38 80 00 01 */ li r4, 1 /* 802918E8 0028E848 C0 22 BE 9C */ lfs f1, lbl_805ADBBC@sda21(r2) /* 802918EC 0028E84C 38 03 44 4C */ addi r0, r3, 0x434D444C@l -/* 802918F0 0028E850 A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 802918F0 0028E850 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 802918F4 0028E854 38 61 00 3C */ addi r3, r1, 0x3c /* 802918F8 0028E858 C0 02 BE A0 */ lfs f0, lbl_805ADBC0@sda21(r2) /* 802918FC 0028E85C 38 A1 00 44 */ addi r5, r1, 0x44 @@ -7666,9 +7666,9 @@ lbl_8029186C: /* 80291AC0 0028EA20 98 BF 0A 3C */ stb r5, 0xa3c(r31) /* 80291AC4 0028EA24 90 1F 0A 40 */ stw r0, 0xa40(r31) /* 80291AC8 0028EA28 98 BF 0A 44 */ stb r5, 0xa44(r31) -/* 80291ACC 0028EA2C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80291ACC 0028EA2C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80291AD0 0028EA30 B0 1F 0A 46 */ sth r0, 0xa46(r31) -/* 80291AD4 0028EA34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80291AD4 0028EA34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80291AD8 0028EA38 B0 1F 0A 48 */ sth r0, 0xa48(r31) /* 80291ADC 0028EA3C 98 BF 0A 4A */ stb r5, 0xa4a(r31) /* 80291AE0 0028EA40 48 08 10 95 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -7700,7 +7700,7 @@ lbl_8029186C: /* 80291B48 0028EAA8 98 1F 0A D0 */ stb r0, 0xad0(r31) /* 80291B4C 0028EAAC D0 5F 0A D4 */ stfs f2, 0xad4(r31) /* 80291B50 0028EAB0 98 1F 0A D8 */ stb r0, 0xad8(r31) -/* 80291B54 0028EAB4 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80291B54 0028EAB4 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80291B58 0028EAB8 B0 BF 0A DA */ sth r5, 0xada(r31) /* 80291B5C 0028EABC 98 1F 0A DC */ stb r0, 0xadc(r31) /* 80291B60 0028EAC0 98 1F 0A DD */ stb r0, 0xadd(r31) diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 72161930..1863f93c 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -2375,7 +2375,7 @@ lbl_80158810: /* 80158838 00155798 D0 1F 01 58 */ stfs f0, 0x158(r31) /* 8015883C 0015579C 48 00 06 C5 */ bl GetClosestWaypointForState__9CParasiteCF18EScriptObjectStateR13CStateManager /* 80158840 001557A0 A0 61 00 08 */ lhz r3, 8(r1) -/* 80158844 001557A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80158844 001557A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80158848 001557A8 7C 03 00 40 */ cmplw r3, r0 /* 8015884C 001557AC 41 82 00 08 */ beq lbl_80158854 /* 80158850 001557B0 B0 7F 02 DC */ sth r3, 0x2dc(r31) @@ -2872,7 +2872,7 @@ GetClosestWaypointForState__9CParasiteCF18EScriptObjectStateR13CStateManager: /* 80158F14 00155E74 BF 41 00 28 */ stmw r26, 0x28(r1) /* 80158F18 00155E78 7C 9B 23 78 */ mr r27, r4 /* 80158F1C 00155E7C C3 E2 9E 80 */ lfs f31, lbl_805ABBA0@sda21(r2) -/* 80158F20 00155E80 A3 ED A3 8C */ lhz r31, lbl_805A8F4C@sda21(r13) +/* 80158F20 00155E80 A3 ED A3 8C */ lhz r31, kInvalidUniqueId@sda21(r13) /* 80158F24 00155E84 7C 7A 1B 78 */ mr r26, r3 /* 80158F28 00155E88 83 C4 00 2C */ lwz r30, 0x2c(r4) /* 80158F2C 00155E8C 7C BC 2B 78 */ mr r28, r5 @@ -2992,7 +2992,7 @@ lbl_801590AC: /* 801590D4 00156034 90 01 00 20 */ stw r0, 0x20(r1) /* 801590D8 00156038 4B EE EE 45 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801590DC 0015603C A0 61 00 14 */ lhz r3, 0x14(r1) -/* 801590E0 00156040 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801590E0 00156040 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801590E4 00156044 B0 61 00 1C */ sth r3, 0x1c(r1) /* 801590E8 00156048 7C 03 00 40 */ cmplw r3, r0 /* 801590EC 0015604C 41 82 00 74 */ beq lbl_80159160 diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 711034c7..bc7bd39a 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -916,7 +916,7 @@ lbl_80077A90: /* 80077AF0 00074A50 B0 01 00 40 */ sth r0, 0x40(r1) /* 80077AF4 00074A54 48 00 00 08 */ b lbl_80077AFC lbl_80077AF8: -/* 80077AF8 00074A58 38 8D A3 8C */ addi r4, r13, lbl_805A8F4C@sda21 +/* 80077AF8 00074A58 38 8D A3 8C */ addi r4, r13, kInvalidUniqueId@sda21 lbl_80077AFC: /* 80077AFC 00074A5C A0 04 00 00 */ lhz r0, 0(r4) /* 80077B00 00074A60 7E E4 BB 78 */ mr r4, r23 @@ -3450,7 +3450,7 @@ lbl_80079E34: /* 80079F08 00076E68 D0 21 01 80 */ stfs f1, 0x180(r1) /* 80079F0C 00076E6C 98 01 01 84 */ stb r0, 0x184(r1) /* 80079F10 00076E70 48 30 FF E5 */ bl __shl2i -/* 80079F14 00076E74 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80079F14 00076E74 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80079F18 00076E78 38 C0 00 00 */ li r6, 0 /* 80079F1C 00076E7C 38 00 00 03 */ li r0, 3 /* 80079F20 00076E80 90 81 01 04 */ stw r4, 0x104(r1) @@ -3535,7 +3535,7 @@ lbl_80079FA8: /* 8007A054 00076FB4 D0 21 01 64 */ stfs f1, 0x164(r1) /* 8007A058 00076FB8 98 01 01 68 */ stb r0, 0x168(r1) /* 8007A05C 00076FBC 48 30 FE 99 */ bl __shl2i -/* 8007A060 00076FC0 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8007A060 00076FC0 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8007A064 00076FC4 38 C0 00 00 */ li r6, 0 /* 8007A068 00076FC8 38 00 00 03 */ li r0, 3 /* 8007A06C 00076FCC 90 81 00 B4 */ stw r4, 0xb4(r1) @@ -4546,7 +4546,7 @@ GenerateIceDeathExplosion__10CPatternedFR13CStateManager: /* 8007AEB0 00077E10 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8007AEB4 00077E14 A0 81 00 10 */ lhz r4, 0x10(r1) /* 8007AEB8 00077E18 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l -/* 8007AEBC 00077E1C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8007AEBC 00077E1C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007AEC0 00077E20 38 61 00 74 */ addi r3, r1, 0x74 /* 8007AEC4 00077E24 B0 81 00 14 */ sth r4, 0x14(r1) /* 8007AEC8 00077E28 38 81 00 2C */ addi r4, r1, 0x2c @@ -4701,7 +4701,7 @@ lbl_8007B020: /* 8007B0F0 00078050 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8007B0F4 00078054 A0 81 00 18 */ lhz r4, 0x18(r1) /* 8007B0F8 00078058 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l -/* 8007B0FC 0007805C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8007B0FC 0007805C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007B100 00078060 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8007B104 00078064 B0 81 00 1C */ sth r4, 0x1c(r1) /* 8007B108 00078068 38 81 00 4C */ addi r4, r1, 0x4c @@ -4807,7 +4807,7 @@ lbl_8007B214: /* 8007B27C 000781DC 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8007B280 000781E0 A0 81 00 10 */ lhz r4, 0x10(r1) /* 8007B284 000781E4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l -/* 8007B288 000781E8 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8007B288 000781E8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007B28C 000781EC 38 61 00 BC */ addi r3, r1, 0xbc /* 8007B290 000781F0 B0 81 00 14 */ sth r4, 0x14(r1) /* 8007B294 000781F4 38 81 00 44 */ addi r4, r1, 0x44 @@ -6363,7 +6363,7 @@ ReleaseCoverPoint__10CPatternedFR13CStateManagerR9TUniqueId: /* 8007C884 000797E4 41 82 00 14 */ beq lbl_8007C898 /* 8007C888 000797E8 38 80 00 00 */ li r4, 0 /* 8007C88C 000797EC 48 0B 0B 65 */ bl SetInUse__17CScriptCoverPointFb -/* 8007C890 000797F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007C890 000797F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007C894 000797F4 B0 1F 00 00 */ sth r0, 0(r31) lbl_8007C898: /* 8007C898 000797F8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6379,7 +6379,7 @@ GetCoverPoint__10CPatternedCFR13CStateManager9TUniqueId: /* 8007C8B4 00079814 38 60 00 00 */ li r3, 0 /* 8007C8B8 00079818 90 01 00 24 */ stw r0, 0x24(r1) /* 8007C8BC 0007981C A0 A5 00 00 */ lhz r5, 0(r5) -/* 8007C8C0 00079820 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007C8C0 00079820 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007C8C4 00079824 7C 05 00 40 */ cmplw r5, r0 /* 8007C8C8 00079828 41 82 00 24 */ beq lbl_8007C8EC /* 8007C8CC 0007982C B0 A1 00 08 */ sth r5, 8(r1) @@ -7263,7 +7263,7 @@ lbl_8007D494: /* 8007D550 0007A4B0 38 E0 00 00 */ li r7, 0 /* 8007D554 0007A4B4 C0 02 89 08 */ lfs f0, lbl_805AA628@sda21(r2) /* 8007D558 0007A4B8 54 06 D9 7E */ srwi r6, r0, 5 -/* 8007D55C 0007A4BC A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8007D55C 0007A4BC A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8007D560 0007A4C0 20 79 00 01 */ subfic r3, r25, 1 /* 8007D564 0007A4C4 38 19 FF FF */ addi r0, r25, -1 /* 8007D568 0007A4C8 38 80 00 01 */ li r4, 1 @@ -7377,7 +7377,7 @@ lbl_8007D494: /* 8007D718 0007A678 D0 5F 03 A4 */ stfs f2, 0x3a4(r31) /* 8007D71C 0007A67C C0 5E 00 08 */ lfs f2, 8(r30) /* 8007D720 0007A680 D0 5F 03 A8 */ stfs f2, 0x3a8(r31) -/* 8007D724 0007A684 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007D724 0007A684 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007D728 0007A688 B0 1F 03 AC */ sth r0, 0x3ac(r31) /* 8007D72C 0007A68C D0 1F 03 B0 */ stfs f0, 0x3b0(r31) /* 8007D730 0007A690 C0 18 00 04 */ lfs f0, 4(r24) diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index c56163db..a823b048 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -1030,7 +1030,7 @@ lbl_80295818: /* 8029583C 0029279C A0 61 00 0C */ lhz r3, 0xc(r1) /* 80295840 002927A0 2C 00 00 0D */ cmpwi r0, 0xd /* 80295844 002927A4 40 82 00 20 */ bne lbl_80295864 -/* 80295848 002927A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80295848 002927A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029584C 002927AC 7C 03 00 40 */ cmplw r3, r0 /* 80295850 002927B0 41 82 00 14 */ beq lbl_80295864 /* 80295854 002927B4 80 1C 00 04 */ lwz r0, 4(r28) @@ -1134,7 +1134,7 @@ lbl_802958F8: /* 802959A4 00292904 38 A1 00 2C */ addi r5, r1, 0x2c /* 802959A8 00292908 90 9E 05 68 */ stw r4, 0x568(r30) /* 802959AC 0029290C 98 9E 05 6C */ stb r4, 0x56c(r30) -/* 802959B0 00292910 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 802959B0 00292910 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 802959B4 00292914 B0 9E 05 6E */ sth r4, 0x56e(r30) /* 802959B8 00292918 90 01 00 2C */ stw r0, 0x2c(r1) /* 802959BC 0029291C 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 8b2f7824..c9d233c6 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -1388,7 +1388,7 @@ lbl_80147AB0: /* 80147B1C 00144A7C 41 82 01 10 */ beq lbl_80147C2C /* 80147B20 00144A80 C0 02 9C 98 */ lfs f0, lbl_805AB9B8@sda21(r2) /* 80147B24 00144A84 38 60 00 00 */ li r3, 0 -/* 80147B28 00144A88 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80147B28 00144A88 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80147B2C 00144A8C 7F 84 E3 78 */ mr r4, r28 /* 80147B30 00144A90 98 61 00 84 */ stb r3, 0x84(r1) /* 80147B34 00144A94 38 61 00 30 */ addi r3, r1, 0x30 diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index fdbff81b..d08b8b4d 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -860,7 +860,7 @@ __ct__7CPuffer: /* 8025CBC0 00259B20 D0 17 05 C4 */ stfs f0, 0x5c4(r23) /* 8025CBC4 00259B24 C0 05 00 08 */ lfs f0, 8(r5) /* 8025CBC8 00259B28 D0 17 05 C8 */ stfs f0, 0x5c8(r23) -/* 8025CBCC 00259B2C A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8025CBCC 00259B2C A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8025CBD0 00259B30 B0 B7 05 CC */ sth r5, 0x5cc(r23) /* 8025CBD4 00259B34 90 17 05 D0 */ stw r0, 0x5d0(r23) /* 8025CBD8 00259B38 90 17 05 D4 */ stw r0, 0x5d4(r23) diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index f8783f11..88a409d3 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -1256,7 +1256,7 @@ Dead__7CRidleyFR13CStateManager9EStateMsgf: /* 80252DE4 0024FD44 41 80 00 24 */ blt lbl_80252E08 /* 80252DE8 0024FD48 48 00 00 20 */ b lbl_80252E08 lbl_80252DEC: -/* 80252DEC 0024FD4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80252DEC 0024FD4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80252DF0 0024FD50 7C 83 23 78 */ mr r3, r4 /* 80252DF4 0024FD54 C0 22 B9 18 */ lfs f1, lbl_805AD638@sda21(r2) /* 80252DF8 0024FD58 38 81 00 08 */ addi r4, r1, 8 @@ -3112,7 +3112,7 @@ lbl_8025487C: /* 802548A4 00251804 90 01 00 2C */ stw r0, 0x2c(r1) /* 802548A8 00251808 4B DF 36 75 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 802548AC 0025180C A0 61 00 0C */ lhz r3, 0xc(r1) -/* 802548B0 00251810 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802548B0 00251810 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802548B4 00251814 B0 61 00 10 */ sth r3, 0x10(r1) /* 802548B8 00251818 7C 03 00 40 */ cmplw r3, r0 /* 802548BC 0025181C 41 82 01 08 */ beq lbl_802549C4 @@ -3684,7 +3684,7 @@ lbl_80254FE0: /* 80255130 00252090 D0 01 00 64 */ stfs f0, 0x64(r1) /* 80255134 00252094 D0 01 00 68 */ stfs f0, 0x68(r1) /* 80255138 00252098 4B DA FB 81 */ bl string_l__4rstlFPCc -/* 8025513C 0025209C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8025513C 0025209C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80255140 002520A0 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80255144 002520A4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 80255148 002520A8 38 81 00 2C */ addi r4, r1, 0x2c @@ -5675,7 +5675,7 @@ sub_80256db4: /* 80256DCC 00253D2C 93 A1 00 D4 */ stw r29, 0xd4(r1) /* 80256DD0 00253D30 7C 7D 1B 78 */ mr r29, r3 /* 80256DD4 00253D34 93 81 00 D0 */ stw r28, 0xd0(r1) -/* 80256DD8 00253D38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80256DD8 00253D38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80256DDC 00253D3C A0 63 0B 64 */ lhz r3, 0xb64(r3) /* 80256DE0 00253D40 7C 03 00 40 */ cmplw r3, r0 /* 80256DE4 00253D44 40 82 01 20 */ bne lbl_80256F04 @@ -7558,7 +7558,7 @@ lbl_80258828: /* 80258968 002558C8 41 82 00 BC */ beq lbl_80258A24 /* 8025896C 002558CC C0 02 B9 28 */ lfs f0, lbl_805AD648@sda21(r2) /* 80258970 002558D0 38 60 00 00 */ li r3, 0 -/* 80258974 002558D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80258974 002558D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80258978 002558D8 7F A4 EB 78 */ mr r4, r29 /* 8025897C 002558DC 98 61 00 D8 */ stb r3, 0xd8(r1) /* 80258980 002558E0 38 61 00 50 */ addi r3, r1, 0x50 @@ -7935,7 +7935,7 @@ lbl_80258EA4: /* 80258EB4 00255E14 7F C4 F3 78 */ mr r4, r30 /* 80258EB8 00255E18 4B F4 E5 0D */ bl Destroy__22CCollisionActorManagerCFR13CStateManager /* 80258EBC 00255E1C A0 7F 0B 64 */ lhz r3, 0xb64(r31) -/* 80258EC0 00255E20 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80258EC0 00255E20 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80258EC4 00255E24 7C 03 00 40 */ cmplw r3, r0 /* 80258EC8 00255E28 41 82 0D E4 */ beq lbl_80259CAC /* 80258ECC 00255E2C A0 1F 0B 64 */ lhz r0, 0xb64(r31) @@ -7943,7 +7943,7 @@ lbl_80258EA4: /* 80258ED4 00255E34 38 81 00 88 */ addi r4, r1, 0x88 /* 80258ED8 00255E38 B0 01 00 88 */ sth r0, 0x88(r1) /* 80258EDC 00255E3C 4B DF 33 91 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80258EE0 00255E40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80258EE0 00255E40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80258EE4 00255E44 B0 1F 0B 64 */ sth r0, 0xb64(r31) /* 80258EE8 00255E48 48 00 0D C4 */ b lbl_80259CAC .global lbl_80258EEC @@ -7955,7 +7955,7 @@ lbl_80258EEC: /* 80258EFC 00255E5C 38 E0 00 06 */ li r7, 6 /* 80258F00 00255E60 4B F9 C0 99 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 80258F04 00255E64 A0 61 00 84 */ lhz r3, 0x84(r1) -/* 80258F08 00255E68 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80258F08 00255E68 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80258F0C 00255E6C B0 61 00 A4 */ sth r3, 0xa4(r1) /* 80258F10 00255E70 7C 03 00 40 */ cmplw r3, r0 /* 80258F14 00255E74 41 82 0D 98 */ beq lbl_80259CAC @@ -8626,7 +8626,7 @@ lbl_802598FC: /* 80259924 00256884 41 82 03 88 */ beq lbl_80259CAC /* 80259928 00256888 80 1F 0C 64 */ lwz r0, 0xc64(r31) /* 8025992C 0025688C 38 80 00 00 */ li r4, 0 -/* 80259930 00256890 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 80259930 00256890 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 80259934 00256894 2C 00 00 03 */ cmpwi r0, 3 /* 80259938 00256898 B0 61 00 9C */ sth r3, 0x9c(r1) /* 8025993C 0025689C 41 82 00 30 */ beq lbl_8025996C @@ -8943,9 +8943,9 @@ Accept__7CRidleyFR8IVisitor: /* 80259DD0 00256D30 38 61 00 94 */ addi r3, r1, 0x94 /* 80259DD4 00256D34 38 A1 00 9C */ addi r5, r1, 0x9c /* 80259DD8 00256D38 90 9F 09 84 */ stw r4, 0x984(r31) -/* 80259DDC 00256D3C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80259DDC 00256D3C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80259DE0 00256D40 B0 9F 09 88 */ sth r4, 0x988(r31) -/* 80259DE4 00256D44 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80259DE4 00256D44 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80259DE8 00256D48 B0 9F 09 8A */ sth r4, 0x98a(r31) /* 80259DEC 00256D4C 80 DF 05 98 */ lwz r6, 0x598(r31) /* 80259DF0 00256D50 80 8D A0 64 */ lwz r4, gpSimplePool@sda21(r13) @@ -9194,7 +9194,7 @@ Accept__7CRidleyFR8IVisitor: /* 8025A1BC 0025711C 80 9F 00 64 */ lwz r4, 0x64(r31) /* 8025A1C0 00257120 80 84 00 10 */ lwz r4, 0x10(r4) /* 8025A1C4 00257124 4B F1 B7 F5 */ bl "__ct__13CBoneTrackingFRC9CAnimDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffb" -/* 8025A1C8 00257128 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025A1C8 00257128 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025A1CC 0025712C 38 7F 0B 68 */ addi r3, r31, 0xb68 /* 8025A1D0 00257130 38 BF 05 B0 */ addi r5, r31, 0x5b0 /* 8025A1D4 00257134 B0 1F 0B 64 */ sth r0, 0xb64(r31) diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 102b0287..37e1978b 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -217,7 +217,7 @@ RemovePlatform__7CRipperFR13CStateManager: /* 8015BDD4 00158D34 90 01 00 24 */ stw r0, 0x24(r1) /* 8015BDD8 00158D38 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8015BDDC 00158D3C 7C 7F 1B 78 */ mr r31, r3 -/* 8015BDE0 00158D40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015BDE0 00158D40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015BDE4 00158D44 A0 63 05 9A */ lhz r3, 0x59a(r3) /* 8015BDE8 00158D48 7C 03 00 40 */ cmplw r3, r0 /* 8015BDEC 00158D4C 41 82 00 20 */ beq lbl_8015BE0C @@ -226,7 +226,7 @@ RemovePlatform__7CRipperFR13CStateManager: /* 8015BDF8 00158D58 38 81 00 08 */ addi r4, r1, 8 /* 8015BDFC 00158D5C B0 01 00 08 */ sth r0, 8(r1) /* 8015BE00 00158D60 4B EF 04 6D */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8015BE04 00158D64 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015BE04 00158D64 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015BE08 00158D68 B0 1F 05 9A */ sth r0, 0x59a(r31) lbl_8015BE0C: /* 8015BE0C 00158D6C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -243,7 +243,7 @@ AddPlatform__7CRipperFR13CStateManager: /* 8015BE2C 00158D8C BF 41 00 D8 */ stmw r26, 0xd8(r1) /* 8015BE30 00158D90 7C 7D 1B 78 */ mr r29, r3 /* 8015BE34 00158D94 7C 9E 23 78 */ mr r30, r4 -/* 8015BE38 00158D98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015BE38 00158D98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015BE3C 00158D9C A0 63 05 9A */ lhz r3, 0x59a(r3) /* 8015BE40 00158DA0 7C 03 00 40 */ cmplw r3, r0 /* 8015BE44 00158DA4 40 82 01 DC */ bne lbl_8015C020 @@ -285,7 +285,7 @@ AddPlatform__7CRipperFR13CStateManager: /* 8015BED4 00158E34 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8015BED8 00158E38 98 01 00 58 */ stb r0, 0x58(r1) /* 8015BEDC 00158E3C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l -/* 8015BEE0 00158E40 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8015BEE0 00158E40 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8015BEE4 00158E44 38 61 00 5C */ addi r3, r1, 0x5c /* 8015BEE8 00158E48 88 FD 00 30 */ lbz r7, 0x30(r29) /* 8015BEEC 00158E4C 38 81 00 34 */ addi r4, r1, 0x34 @@ -391,7 +391,7 @@ sub_8015c034: /* 8015C050 00158FB0 2C 00 00 01 */ cmpwi r0, 1 /* 8015C054 00158FB4 40 82 00 74 */ bne lbl_8015C0C8 /* 8015C058 00158FB8 A0 7E 05 98 */ lhz r3, 0x598(r30) -/* 8015C05C 00158FBC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C05C 00158FBC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C060 00158FC0 7C 03 00 40 */ cmplw r3, r0 /* 8015C064 00158FC4 41 82 00 64 */ beq lbl_8015C0C8 /* 8015C068 00158FC8 A0 1E 05 98 */ lhz r0, 0x598(r30) @@ -433,7 +433,7 @@ sub_8015c0e0: /* 8015C0E8 00159048 90 01 00 24 */ stw r0, 0x24(r1) /* 8015C0EC 0015904C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8015C0F0 00159050 7C 7F 1B 78 */ mr r31, r3 -/* 8015C0F4 00159054 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C0F4 00159054 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C0F8 00159058 A0 63 05 98 */ lhz r3, 0x598(r3) /* 8015C0FC 0015905C 7C 03 00 40 */ cmplw r3, r0 /* 8015C100 00159060 41 82 00 20 */ beq lbl_8015C120 @@ -442,7 +442,7 @@ sub_8015c0e0: /* 8015C10C 0015906C 38 81 00 08 */ addi r4, r1, 8 /* 8015C110 00159070 B0 01 00 08 */ sth r0, 8(r1) /* 8015C114 00159074 4B EF 01 59 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8015C118 00159078 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C118 00159078 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C11C 0015907C B0 1F 05 98 */ sth r0, 0x598(r31) lbl_8015C120: /* 8015C120 00159080 80 01 00 24 */ lwz r0, 0x24(r1) @@ -459,7 +459,7 @@ AddGrapplePoint__7CRipperFR13CStateManager: /* 8015C140 001590A0 BF 61 00 5C */ stmw r27, 0x5c(r1) /* 8015C144 001590A4 7C 7D 1B 78 */ mr r29, r3 /* 8015C148 001590A8 7C 9E 23 78 */ mr r30, r4 -/* 8015C14C 001590AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C14C 001590AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C150 001590B0 A0 63 05 98 */ lhz r3, 0x598(r3) /* 8015C154 001590B4 7C 03 00 40 */ cmplw r3, r0 /* 8015C158 001590B8 40 82 01 10 */ bne lbl_8015C268 @@ -476,7 +476,7 @@ AddGrapplePoint__7CRipperFR13CStateManager: /* 8015C184 001590E4 48 1B 96 E9 */ bl __nw__FUlPCcPCc /* 8015C188 001590E8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015C18C 001590EC 41 82 00 78 */ beq lbl_8015C204 -/* 8015C190 001590F0 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8015C190 001590F0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8015C194 001590F4 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8015C198 001590F8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8015C19C 001590FC 38 81 00 24 */ addi r4, r1, 0x24 @@ -773,7 +773,7 @@ Think__7CRipperFfR13CStateManager: /* 8015C5AC 0015950C 80 9E 08 4C */ lwz r4, 0x84c(r30) /* 8015C5B0 00159510 A0 BF 05 98 */ lhz r5, 0x598(r31) /* 8015C5B4 00159514 80 64 04 90 */ lwz r3, 0x490(r4) -/* 8015C5B8 00159518 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C5B8 00159518 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C5BC 0015951C 80 63 07 40 */ lwz r3, 0x740(r3) /* 8015C5C0 00159520 7C 05 00 40 */ cmplw r5, r0 /* 8015C5C4 00159524 80 63 03 34 */ lwz r3, 0x334(r3) @@ -941,9 +941,9 @@ lbl_8015C714: /* 8015C810 00159770 D0 1F 05 90 */ stfs f0, 0x590(r31) /* 8015C814 00159774 88 1D 00 2C */ lbz r0, 0x2c(r29) /* 8015C818 00159778 98 1F 05 94 */ stb r0, 0x594(r31) -/* 8015C81C 0015977C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C81C 0015977C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C820 00159780 B0 1F 05 98 */ sth r0, 0x598(r31) -/* 8015C824 00159784 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015C824 00159784 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015C828 00159788 B0 1F 05 9A */ sth r0, 0x59a(r31) /* 8015C82C 0015978C 88 1F 05 9C */ lbz r0, 0x59c(r31) /* 8015C830 00159790 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index a3b793e9..6a1ca527 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -702,7 +702,7 @@ lbl_80266694: /* 802666E4 00263644 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 802666E8 00263648 98 1F 00 F8 */ stb r0, 0xf8(r31) /* 802666EC 0026364C A0 7F 07 20 */ lhz r3, 0x720(r31) -/* 802666F0 00263650 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802666F0 00263650 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802666F4 00263654 7C 03 00 40 */ cmplw r3, r0 /* 802666F8 00263658 41 82 00 0C */ beq lbl_80266704 /* 802666FC 0026365C 38 7F 07 20 */ addi r3, r31, 0x720 @@ -717,7 +717,7 @@ lbl_80266704: /* 8026671C 0026367C 38 61 00 08 */ addi r3, r1, 8 lbl_80266720: /* 80266720 00263680 A0 63 00 00 */ lhz r3, 0(r3) -/* 80266724 00263684 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80266724 00263684 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80266728 00263688 7C 03 00 40 */ cmplw r3, r0 /* 8026672C 0026368C 41 82 01 E8 */ beq lbl_80266914 /* 80266730 00263690 B0 7F 02 DC */ sth r3, 0x2dc(r31) @@ -1191,7 +1191,7 @@ lbl_80266DF0: /* 80266E10 00263D70 38 E0 00 06 */ li r7, 6 /* 80266E14 00263D74 4B F8 E1 85 */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 80266E18 00263D78 A0 61 00 08 */ lhz r3, 8(r1) -/* 80266E1C 00263D7C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80266E1C 00263D7C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80266E20 00263D80 7C 03 00 40 */ cmplw r3, r0 /* 80266E24 00263D84 41 82 00 08 */ beq lbl_80266E2C /* 80266E28 00263D88 B0 7F 02 DC */ sth r3, 0x2dc(r31) @@ -1389,7 +1389,7 @@ lbl_8026705C: /* 802670E8 00264048 C0 26 00 14 */ lfs f1, 0x14(r6) /* 802670EC 0026404C D0 3A 07 18 */ stfs f1, 0x718(r26) /* 802670F0 00264050 D0 1A 07 1C */ stfs f0, 0x71c(r26) -/* 802670F4 00264054 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802670F4 00264054 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802670F8 00264058 B0 1A 07 20 */ sth r0, 0x720(r26) /* 802670FC 0026405C 88 1A 07 22 */ lbz r0, 0x722(r26) /* 80267100 00264060 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index 4fea2742..efc12f49 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -1530,7 +1530,7 @@ lbl_8023C970: /* 8023C974 002398D4 28 00 00 01 */ cmplwi r0, 1 /* 8023C978 002398D8 40 82 00 5C */ bne lbl_8023C9D4 /* 8023C97C 002398DC 80 BE 00 04 */ lwz r5, 4(r30) -/* 8023C980 002398E0 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8023C980 002398E0 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8023C984 002398E4 7C 05 00 00 */ cmpw r5, r0 /* 8023C988 002398E8 41 82 00 4C */ beq lbl_8023C9D4 /* 8023C98C 002398EC 80 7F 08 50 */ lwz r3, 0x850(r31) @@ -1753,7 +1753,7 @@ lbl_8023CC54: /* 8023CCA4 00239C04 48 00 16 FD */ bl sub_8023e3a0 /* 8023CCA8 00239C08 2C 03 00 00 */ cmpwi r3, 0 /* 8023CCAC 00239C0C 40 82 00 34 */ bne lbl_8023CCE0 -/* 8023CCB0 00239C10 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8023CCB0 00239C10 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023CCB4 00239C14 7F A3 EB 78 */ mr r3, r29 /* 8023CCB8 00239C18 7F E4 FB 78 */ mr r4, r31 /* 8023CCBC 00239C1C 38 A1 00 08 */ addi r5, r1, 8 @@ -2581,7 +2581,7 @@ __ct__15CSnakeWeedSwarm: /* 8023D890 0023A7F0 C3 E1 02 84 */ lfs f31, 0x284(r1) /* 8023D894 0023A7F4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8023D898 0023A7F8 4B DF CF 0D */ bl CModelDataNull__10CModelDataFv -/* 8023D89C 0023A7FC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8023D89C 0023A7FC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8023D8A0 0023A800 38 00 00 00 */ li r0, 0 /* 8023D8A4 0023A804 80 AD 96 74 */ lwz r5, lbl_805A8234@sda21(r13) /* 8023D8A8 0023A808 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index d462a4b4..1dfc5887 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -1170,7 +1170,7 @@ lbl_80120D38: /* 80120DD4 0011DD34 48 00 00 9C */ b lbl_80120E70 lbl_80120DD8: /* 80120DD8 0011DD38 A0 BE 00 C4 */ lhz r5, 0xc4(r30) -/* 80120DDC 0011DD3C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80120DDC 0011DD3C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80120DE0 0011DD40 C3 C2 97 C0 */ lfs f30, lbl_805AB4E0@sda21(r2) /* 80120DE4 0011DD44 7C 05 00 40 */ cmplw r5, r0 /* 80120DE8 0011DD48 41 82 00 48 */ beq lbl_80120E30 @@ -1558,7 +1558,7 @@ lbl_8012133C: /* 80121390 0011E2F0 40 82 02 00 */ bne lbl_80121590 lbl_80121394: /* 80121394 0011E2F4 A0 7D 08 C8 */ lhz r3, 0x8c8(r29) -/* 80121398 0011E2F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80121398 0011E2F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012139C 0011E2FC 7C 03 00 40 */ cmplw r3, r0 /* 801213A0 0011E300 41 82 00 34 */ beq lbl_801213D4 /* 801213A4 0011E304 A0 FD 00 08 */ lhz r7, 8(r29) @@ -3445,7 +3445,7 @@ lbl_80122E58: /* 80122EA0 0011FE00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80122EA4 0011FE04 40 82 02 00 */ bne lbl_801230A4 /* 80122EA8 0011FE08 A0 BE 01 0E */ lhz r5, 0x10e(r30) -/* 80122EAC 0011FE0C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80122EAC 0011FE0C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80122EB0 0011FE10 7C 05 00 40 */ cmplw r5, r0 /* 80122EB4 0011FE14 41 82 01 F0 */ beq lbl_801230A4 /* 80122EB8 0011FE18 80 7E 00 04 */ lwz r3, 4(r30) @@ -4606,7 +4606,7 @@ lbl_80123ED4: /* 80123F04 00120E64 4B F5 8C 59 */ bl SetDestPos__10CPatternedFRC9CVector3f /* 80123F08 00120E68 48 00 00 30 */ b lbl_80123F38 lbl_80123F0C: -/* 80123F0C 00120E6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80123F0C 00120E6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80123F10 00120E70 7F E3 FB 78 */ mr r3, r31 /* 80123F14 00120E74 38 81 00 2C */ addi r4, r1, 0x2c /* 80123F18 00120E78 B0 1F 02 DC */ sth r0, 0x2dc(r31) @@ -5194,7 +5194,7 @@ lbl_8012467C: /* 80124798 001216F8 D0 41 00 C0 */ stfs f2, 0xc0(r1) /* 8012479C 001216FC D0 21 00 C4 */ stfs f1, 0xc4(r1) /* 801247A0 00121700 4B F5 83 BD */ bl SetDestPos__10CPatternedFRC9CVector3f -/* 801247A4 00121704 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801247A4 00121704 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801247A8 00121708 38 60 00 01 */ li r3, 1 /* 801247AC 0012170C B0 1D 02 DC */ sth r0, 0x2dc(r29) /* 801247B0 00121710 90 7D 03 0C */ stw r3, 0x30c(r29) @@ -5291,7 +5291,7 @@ lbl_801247C4: /* 80124918 00121878 D0 41 00 54 */ stfs f2, 0x54(r1) /* 8012491C 0012187C D0 21 00 58 */ stfs f1, 0x58(r1) /* 80124920 00121880 4B F5 82 3D */ bl SetDestPos__10CPatternedFRC9CVector3f -/* 80124924 00121884 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80124924 00121884 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80124928 00121888 38 60 00 00 */ li r3, 0 /* 8012492C 0012188C B0 1D 02 DC */ sth r0, 0x2dc(r29) /* 80124930 00121890 90 7D 03 0C */ stw r3, 0x30c(r29) @@ -5370,7 +5370,7 @@ lbl_80124A20: /* 80124A24 00121984 40 80 08 94 */ bge lbl_801252B8 /* 80124A28 00121988 48 00 08 60 */ b lbl_80125288 lbl_80124A2C: -/* 80124A2C 0012198C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80124A2C 0012198C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80124A30 00121990 38 A1 00 28 */ addi r5, r1, 0x28 /* 80124A34 00121994 B0 1A 08 40 */ sth r0, 0x840(r26) /* 80124A38 00121998 A0 1A 06 40 */ lhz r0, 0x640(r26) @@ -5505,7 +5505,7 @@ lbl_80124BE0: /* 80124C28 00121B88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80124C2C 00121B8C 40 82 02 24 */ bne lbl_80124E50 /* 80124C30 00121B90 A0 7E 01 0E */ lhz r3, 0x10e(r30) -/* 80124C34 00121B94 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80124C34 00121B94 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80124C38 00121B98 7C 03 00 40 */ cmplw r3, r0 /* 80124C3C 00121B9C 40 82 02 14 */ bne lbl_80124E50 /* 80124C40 00121BA0 80 7E 00 04 */ lwz r3, 4(r30) @@ -5779,7 +5779,7 @@ lbl_80125024: lbl_80125048: /* 80125048 00121FA8 48 0D 16 85 */ bl PathFind__10CPatternedFR13CStateManager9EStateMsgf /* 8012504C 00121FAC A0 7A 08 40 */ lhz r3, 0x840(r26) -/* 80125050 00121FB0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80125050 00121FB0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80125054 00121FB4 7C 03 00 40 */ cmplw r3, r0 /* 80125058 00121FB8 41 82 01 0C */ beq lbl_80125164 /* 8012505C 00121FBC A0 1A 08 40 */ lhz r0, 0x840(r26) @@ -5929,7 +5929,7 @@ lbl_80125288: /* 8012528C 001221EC 38 80 00 00 */ li r4, 0 /* 80125290 001221F0 38 00 00 01 */ li r0, 1 /* 80125294 001221F4 90 9A 03 2C */ stw r4, 0x32c(r26) -/* 80125298 001221F8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 80125298 001221F8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8012529C 001221FC B0 7A 08 40 */ sth r3, 0x840(r26) /* 801252A0 00122200 90 1A 03 0C */ stw r0, 0x30c(r26) /* 801252A4 00122204 88 1A 06 39 */ lbz r0, 0x639(r26) @@ -8017,7 +8017,7 @@ lbl_80127048: /* 80127078 00123FD8 B0 01 00 14 */ sth r0, 0x14(r1) /* 8012707C 00123FDC 48 04 E1 9D */ bl SetTarget__13CBoneTrackingF9TUniqueId /* 80127080 00123FE0 A0 7E 07 C0 */ lhz r3, 0x7c0(r30) -/* 80127084 00123FE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80127084 00123FE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80127088 00123FE8 7C 03 00 40 */ cmplw r3, r0 /* 8012708C 00123FEC 40 82 00 10 */ bne lbl_8012709C /* 80127090 00123FF0 80 7F 08 4C */ lwz r3, 0x84c(r31) @@ -8310,7 +8310,7 @@ HearShot__12CSpacePirateFR13CStateManagerf: .global PatternOver__12CSpacePirateFR13CStateManagerf PatternOver__12CSpacePirateFR13CStateManagerf: /* 8012748C 001243EC A0 63 02 DC */ lhz r3, 0x2dc(r3) -/* 80127490 001243F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80127490 001243F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80127494 001243F4 7C 03 00 50 */ subf r0, r3, r0 /* 80127498 001243F8 7C 00 00 34 */ cntlzw r0, r0 /* 8012749C 001243FC 54 03 D9 7E */ srwi r3, r0, 5 @@ -8888,7 +8888,7 @@ Death__12CSpacePirateFRC9CVector3fR13CStateManager: /* 80127CAC 00124C0C 41 82 00 AC */ beq lbl_80127D58 /* 80127CB0 00124C10 4B F5 36 F5 */ bl Death__10CPatternedFR13CStateManagerRC9CVector3f18EScriptObjectState /* 80127CB4 00124C14 A0 7F 07 B4 */ lhz r3, 0x7b4(r31) -/* 80127CB8 00124C18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80127CB8 00124C18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80127CBC 00124C1C 7C 03 00 40 */ cmplw r3, r0 /* 80127CC0 00124C20 41 82 00 98 */ beq lbl_80127D58 /* 80127CC4 00124C24 3C 60 80 3E */ lis r3, lbl_803DAA68@ha @@ -10663,7 +10663,7 @@ SquadRemove__12CSpacePirateFR13CStateManager: /* 80129694 001265F4 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80129698 001265F8 93 C1 00 28 */ stw r30, 0x28(r1) /* 8012969C 001265FC 7C 7E 1B 78 */ mr r30, r3 -/* 801296A0 00126600 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801296A0 00126600 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801296A4 00126604 A0 63 08 C8 */ lhz r3, 0x8c8(r3) /* 801296A8 00126608 7C 03 00 40 */ cmplw r3, r0 /* 801296AC 0012660C 41 82 00 70 */ beq lbl_8012971C @@ -10692,7 +10692,7 @@ SquadRemove__12CSpacePirateFR13CStateManager: /* 80129708 00126668 B0 01 00 08 */ sth r0, 8(r1) /* 8012970C 0012666C B0 01 00 0C */ sth r0, 0xc(r1) /* 80129710 00126670 48 10 FD E5 */ bl RemoveTeamAiRole__10CTeamAiMgrF9TUniqueId -/* 80129714 00126674 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80129714 00126674 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129718 00126678 B0 1E 08 C8 */ sth r0, 0x8c8(r30) lbl_8012971C: /* 8012971C 0012667C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -10711,7 +10711,7 @@ SquadAdd__12CSpacePirateFR13CStateManager: /* 80129744 001266A4 7C 9F 23 78 */ mr r31, r4 /* 80129748 001266A8 93 C1 00 18 */ stw r30, 0x18(r1) /* 8012974C 001266AC 7C 7E 1B 78 */ mr r30, r3 -/* 80129750 001266B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80129750 001266B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129754 001266B4 A0 63 08 C8 */ lhz r3, 0x8c8(r3) /* 80129758 001266B8 7C 03 00 40 */ cmplw r3, r0 /* 8012975C 001266BC 40 82 00 1C */ bne lbl_80129778 @@ -10723,7 +10723,7 @@ SquadAdd__12CSpacePirateFR13CStateManager: /* 80129774 001266D4 B0 1E 08 C8 */ sth r0, 0x8c8(r30) lbl_80129778: /* 80129778 001266D8 A0 7E 08 C8 */ lhz r3, 0x8c8(r30) -/* 8012977C 001266DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012977C 001266DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129780 001266E0 7C 03 00 40 */ cmplw r3, r0 /* 80129784 001266E4 41 82 00 54 */ beq lbl_801297D8 /* 80129788 001266E8 A0 1E 08 C8 */ lhz r0, 0x8c8(r30) @@ -10767,14 +10767,14 @@ GetOrigin__12CSpacePirateCFv: .global DetachActorFromPirate__12CSpacePirateFv DetachActorFromPirate__12CSpacePirateFv: -/* 8012980C 0012676C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012980C 0012676C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129810 00126770 B0 03 07 B4 */ sth r0, 0x7b4(r3) /* 80129814 00126774 4E 80 00 20 */ blr .global AttachActorToPirate__12CSpacePirateF9TUniqueId AttachActorToPirate__12CSpacePirateF9TUniqueId: /* 80129818 00126778 A0 A3 07 B4 */ lhz r5, 0x7b4(r3) -/* 8012981C 0012677C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012981C 0012677C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80129820 00126780 7C 05 00 40 */ cmplw r5, r0 /* 80129824 00126784 40 82 00 14 */ bne lbl_80129838 /* 80129828 00126788 A0 04 00 00 */ lhz r0, 0(r4) @@ -11786,9 +11786,9 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A678 001275D8 50 07 3E 30 */ rlwimi r7, r0, 7, 0x18, 0x18 /* 8012A67C 001275DC 98 FD 06 3A */ stb r7, 0x63a(r29) /* 8012A680 001275E0 90 1D 06 3C */ stw r0, 0x63c(r29) -/* 8012A684 001275E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012A684 001275E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012A688 001275E8 B0 1D 06 40 */ sth r0, 0x640(r29) -/* 8012A68C 001275EC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012A68C 001275EC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012A690 001275F0 B0 1D 06 42 */ sth r0, 0x642(r29) /* 8012A694 001275F4 D0 3D 06 44 */ stfs f1, 0x644(r29) /* 8012A698 001275F8 C0 06 00 00 */ lfs f0, 0(r6) @@ -11846,14 +11846,14 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A768 001276C8 D0 3D 07 A8 */ stfs f1, 0x7a8(r29) /* 8012A76C 001276CC D0 1D 07 AC */ stfs f0, 0x7ac(r29) /* 8012A770 001276D0 90 BD 07 B0 */ stw r5, 0x7b0(r29) -/* 8012A774 001276D4 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8012A774 001276D4 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8012A778 001276D8 B0 BD 07 B4 */ sth r5, 0x7b4(r29) /* 8012A77C 001276DC 98 1D 07 B6 */ stb r0, 0x7b6(r29) /* 8012A780 001276E0 98 1D 07 B7 */ stb r0, 0x7b7(r29) /* 8012A784 001276E4 98 1D 07 B8 */ stb r0, 0x7b8(r29) /* 8012A788 001276E8 98 1D 07 B9 */ stb r0, 0x7b9(r29) /* 8012A78C 001276EC D0 5D 07 BC */ stfs f2, 0x7bc(r29) -/* 8012A790 001276F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012A790 001276F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012A794 001276F4 B0 1D 07 C0 */ sth r0, 0x7c0(r29) /* 8012A798 001276F8 80 BD 06 14 */ lwz r5, 0x614(r29) /* 8012A79C 001276FC 48 08 2D 69 */ bl __ct__10CBurstFireFPPC6SBursti @@ -11875,7 +11875,7 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A7DC 0012773C 90 BD 08 34 */ stw r5, 0x834(r29) /* 8012A7E0 00127740 D0 3D 08 38 */ stfs f1, 0x838(r29) /* 8012A7E4 00127744 90 BD 08 3C */ stw r5, 0x83c(r29) -/* 8012A7E8 00127748 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8012A7E8 00127748 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8012A7EC 0012774C B0 9D 08 40 */ sth r4, 0x840(r29) /* 8012A7F0 00127750 90 BD 08 44 */ stw r5, 0x844(r29) /* 8012A7F4 00127754 D0 7D 08 48 */ stfs f3, 0x848(r29) @@ -11899,7 +11899,7 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A83C 0012779C D0 1D 08 C0 */ stfs f0, 0x8c0(r29) /* 8012A840 001277A0 C0 1D 06 10 */ lfs f0, 0x610(r29) /* 8012A844 001277A4 D0 1D 08 C4 */ stfs f0, 0x8c4(r29) -/* 8012A848 001277A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012A848 001277A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012A84C 001277AC B0 1D 08 C8 */ sth r0, 0x8c8(r29) /* 8012A850 001277B0 48 21 F7 5D */ bl White__6CColorFv /* 8012A854 001277B4 80 03 00 00 */ lwz r0, 0(r3) @@ -12809,7 +12809,7 @@ lbl_8012B2F4: /* 8012B5D0 00128530 80 01 01 F8 */ lwz r0, 0x1f8(r1) /* 8012B5D4 00128534 90 04 00 10 */ stw r0, 0x10(r4) /* 8012B5D8 00128538 80 7A 00 6C */ lwz r3, 0x6c(r26) -/* 8012B5DC 0012853C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012B5DC 0012853C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012B5E0 00128540 A0 63 07 B4 */ lhz r3, 0x7b4(r3) /* 8012B5E4 00128544 83 BF 00 D4 */ lwz r29, 0xd4(r31) /* 8012B5E8 00128548 7C 03 00 40 */ cmplw r3, r0 @@ -13141,7 +13141,7 @@ Update__14CPirateRagDollFR13CStateManagerf: /* 8012BAD0 00128A30 41 82 06 88 */ beq lbl_8012C158 lbl_8012BAD4: /* 8012BAD4 00128A34 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 8012BAD8 00128A38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012BAD8 00128A38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012BADC 00128A3C A0 63 07 B4 */ lhz r3, 0x7b4(r3) /* 8012BAE0 00128A40 7C 03 00 40 */ cmplw r3, r0 /* 8012BAE4 00128A44 41 82 01 70 */ beq lbl_8012BC54 diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index f48dd644..93c446f9 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -1982,7 +1982,7 @@ Accept__10CSpankWeedFR8IVisitor: /* 80156508 00153468 D0 1F 05 84 */ stfs f0, 0x584(r31) /* 8015650C 0015346C D0 3F 05 88 */ stfs f1, 0x588(r31) /* 80156510 00153470 D0 5F 05 8C */ stfs f2, 0x58c(r31) -/* 80156514 00153474 A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 80156514 00153474 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 80156518 00153478 B0 FF 05 90 */ sth r7, 0x590(r31) /* 8015651C 0015347C 91 1F 05 94 */ stw r8, 0x594(r31) /* 80156520 00153480 98 DF 05 98 */ stb r6, 0x598(r31) diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 5ab143b2..8b6bfa98 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -110,7 +110,7 @@ lbl_80237C84: .global UpdateTeamCaptain__10CTeamAiMgrFv UpdateTeamCaptain__10CTeamAiMgrFv: -/* 80237CA0 00234C00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80237CA0 00234C00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80237CA4 00234C04 3C C0 80 00 */ lis r6, 0x8000 /* 80237CA8 00234C08 B0 03 00 8C */ sth r0, 0x8c(r3) /* 80237CAC 00234C0C 80 A3 00 64 */ lwz r5, 0x64(r3) @@ -2820,7 +2820,7 @@ lbl_8023A284: /* 8023A290 002371F0 7C 03 02 14 */ add r0, r3, r0 /* 8023A294 002371F4 7C 1F 00 40 */ cmplw r31, r0 /* 8023A298 002371F8 40 82 FF 80 */ bne lbl_8023A218 -/* 8023A29C 002371FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8023A29C 002371FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023A2A0 00237200 B0 1C 00 00 */ sth r0, 0(r28) lbl_8023A2A4: /* 8023A2A4 00237204 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2882,7 +2882,7 @@ lbl_8023A2A4: /* 8023A378 002372D8 90 1F 00 80 */ stw r0, 0x80(r31) /* 8023A37C 002372DC 90 1F 00 84 */ stw r0, 0x84(r31) /* 8023A380 002372E0 D0 1F 00 88 */ stfs f0, 0x88(r31) -/* 8023A384 002372E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8023A384 002372E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023A388 002372E8 B0 1F 00 8C */ sth r0, 0x8c(r31) /* 8023A38C 002372EC C0 1E 00 1C */ lfs f0, 0x1c(r30) /* 8023A390 002372F0 D0 1F 00 90 */ stfs f0, 0x90(r31) diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 03568bf1..9da42b8f 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -2292,7 +2292,7 @@ sub_801dbf34: lbl_801DBF98: /* 801DBF98 001D8EF8 A0 7D 09 28 */ lhz r3, 0x928(r29) /* 801DBF9C 001D8EFC 3B E0 00 00 */ li r31, 0 -/* 801DBFA0 001D8F00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801DBFA0 001D8F00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801DBFA4 001D8F04 C3 E2 AC DC */ lfs f31, lbl_805AC9FC@sda21(r2) /* 801DBFA8 001D8F08 7C 03 00 40 */ cmplw r3, r0 /* 801DBFAC 001D8F0C C3 C2 AC D8 */ lfs f30, lbl_805AC9F8@sda21(r2) @@ -2316,7 +2316,7 @@ lbl_801DBF98: /* 801DBFF4 001D8F54 D0 5D 09 34 */ stfs f2, 0x934(r29) /* 801DBFF8 001D8F58 48 00 00 0C */ b lbl_801DC004 lbl_801DBFFC: -/* 801DBFFC 001D8F5C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801DBFFC 001D8F5C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801DC000 001D8F60 B0 1D 09 28 */ sth r0, 0x928(r29) lbl_801DC004: /* 801DC004 001D8F64 88 1D 09 39 */ lbz r0, 0x939(r29) @@ -4749,7 +4749,7 @@ lbl_801DE230: /* 801DE248 001DB1A8 90 01 00 14 */ stw r0, 0x14(r1) /* 801DE24C 001DB1AC 4B E6 9C D1 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801DE250 001DB1B0 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 801DE254 001DB1B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801DE254 001DB1B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801DE258 001DB1B8 B0 61 00 10 */ sth r3, 0x10(r1) /* 801DE25C 001DB1BC 7C 03 00 40 */ cmplw r3, r0 /* 801DE260 001DB1C0 41 82 00 3C */ beq lbl_801DE29C @@ -7264,7 +7264,7 @@ lbl_801E0640: /* 801E0648 001DD5A8 38 BE 06 0C */ addi r5, r30, 0x60c /* 801E064C 001DD5AC 4B E6 7C 9D */ bl GenerateObject__13CStateManagerF9TEditorId /* 801E0650 001DD5B0 A0 81 00 F0 */ lhz r4, 0xf0(r1) -/* 801E0654 001DD5B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E0654 001DD5B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E0658 001DD5B8 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 801E065C 001DD5BC B0 81 00 58 */ sth r4, 0x58(r1) /* 801E0660 001DD5C0 7C 03 00 40 */ cmplw r3, r0 @@ -8130,7 +8130,7 @@ lbl_801E119C: /* 801E12F0 001DE250 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801E12F4 001DE254 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 801E12F8 001DE258 D3 E1 01 60 */ stfs f31, 0x160(r1) -/* 801E12FC 001DE25C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 801E12FC 001DE25C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 801E1300 001DE260 38 61 02 38 */ addi r3, r1, 0x238 /* 801E1304 001DE264 D0 01 01 64 */ stfs f0, 0x164(r1) /* 801E1308 001DE268 38 81 00 F8 */ addi r4, r1, 0xf8 @@ -8499,7 +8499,7 @@ lbl_801E1828: /* 801E1840 001DE7A0 90 01 00 E8 */ stw r0, 0xe8(r1) /* 801E1844 001DE7A4 4B E6 66 D9 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801E1848 001DE7A8 A0 61 00 8C */ lhz r3, 0x8c(r1) -/* 801E184C 001DE7AC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801E184C 001DE7AC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801E1850 001DE7B0 B0 61 00 C4 */ sth r3, 0xc4(r1) /* 801E1854 001DE7B4 7C 03 20 40 */ cmplw r3, r4 /* 801E1858 001DE7B8 41 82 03 0C */ beq lbl_801E1B64 @@ -8940,7 +8940,7 @@ lbl_801E1E74: /* 801E1EAC 001DEE0C 80 7F 05 F0 */ lwz r3, 0x5f0(r31) /* 801E1EB0 001DEE10 B0 01 00 BC */ sth r0, 0xbc(r1) /* 801E1EB4 001DEE14 4B FC 53 95 */ bl GetNumCollisionActors__22CCollisionActorManagerCFv -/* 801E1EB8 001DEE18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E1EB8 001DEE18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E1EBC 001DEE1C 7C 72 1B 78 */ mr r18, r3 /* 801E1EC0 001DEE20 3A 60 00 00 */ li r19, 0 /* 801E1EC4 001DEE24 B0 01 00 B8 */ sth r0, 0xb8(r1) @@ -8965,7 +8965,7 @@ lbl_801E1F00: /* 801E1F04 001DEE64 41 80 FF C8 */ blt lbl_801E1ECC lbl_801E1F08: /* 801E1F08 001DEE68 A0 61 00 B8 */ lhz r3, 0xb8(r1) -/* 801E1F0C 001DEE6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E1F0C 001DEE6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E1F10 001DEE70 7C 03 00 40 */ cmplw r3, r0 /* 801E1F14 001DEE74 41 82 02 BC */ beq lbl_801E21D0 /* 801E1F18 001DEE78 A0 01 00 B8 */ lhz r0, 0xb8(r1) @@ -9251,7 +9251,7 @@ Accept__8CThardusFR8IVisitor: /* 801E2324 001DF284 90 6F 00 00 */ stw r3, 0(r15) /* 801E2328 001DF288 7E 24 8B 78 */ mr r4, r17 /* 801E232C 001DF28C 38 6F 05 CC */ addi r3, r15, 0x5cc -/* 801E2330 001DF290 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 801E2330 001DF290 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 801E2334 001DF294 B0 CF 05 6C */ sth r6, 0x56c(r15) /* 801E2338 001DF298 90 AF 05 70 */ stw r5, 0x570(r15) /* 801E233C 001DF29C 90 AF 05 74 */ stw r5, 0x574(r15) @@ -9271,14 +9271,14 @@ Accept__8CThardusFR8IVisitor: /* 801E2374 001DF2D4 C0 42 AC D8 */ lfs f2, lbl_805AC9F8@sda21(r2) /* 801E2378 001DF2D8 90 8F 05 F4 */ stw r4, 0x5f4(r15) /* 801E237C 001DF2DC 90 8F 05 F8 */ stw r4, 0x5f8(r15) -/* 801E2380 001DF2E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E2380 001DF2E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E2384 001DF2E4 B0 0F 05 FC */ sth r0, 0x5fc(r15) /* 801E2388 001DF2E8 80 01 01 C0 */ lwz r0, 0x1c0(r1) /* 801E238C 001DF2EC 90 0F 06 00 */ stw r0, 0x600(r15) /* 801E2390 001DF2F0 80 01 01 C4 */ lwz r0, 0x1c4(r1) /* 801E2394 001DF2F4 90 0F 06 04 */ stw r0, 0x604(r15) /* 801E2398 001DF2F8 92 6F 06 08 */ stw r19, 0x608(r15) -/* 801E239C 001DF2FC 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 801E239C 001DF2FC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 801E23A0 001DF300 90 0F 06 0C */ stw r0, 0x60c(r15) /* 801E23A4 001DF304 90 8F 06 14 */ stw r4, 0x614(r15) /* 801E23A8 001DF308 90 8F 06 18 */ stw r4, 0x618(r15) @@ -9292,7 +9292,7 @@ Accept__8CThardusFR8IVisitor: /* 801E23C8 001DF328 90 8F 06 40 */ stw r4, 0x640(r15) /* 801E23CC 001DF32C 90 AF 06 44 */ stw r5, 0x644(r15) /* 801E23D0 001DF330 90 8F 06 48 */ stw r4, 0x648(r15) -/* 801E23D4 001DF334 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E23D4 001DF334 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E23D8 001DF338 B0 0F 06 4C */ sth r0, 0x64c(r15) /* 801E23DC 001DF33C 48 13 1E 25 */ bl __ct__9CVector2fFff /* 801E23E0 001DF340 38 80 FF FF */ li r4, -1 @@ -9440,7 +9440,7 @@ Accept__8CThardusFR8IVisitor: /* 801E2618 001DF578 90 10 00 08 */ stw r0, 8(r16) /* 801E261C 001DF57C 38 80 FF FF */ li r4, -1 /* 801E2620 001DF580 48 15 E8 21 */ bl __dt__6CTokenFv -/* 801E2624 001DF584 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E2624 001DF584 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E2628 001DF588 3C 60 80 5A */ lis r3, skZero3f@ha /* 801E262C 001DF58C 38 C3 66 A0 */ addi r6, r3, skZero3f@l /* 801E2630 001DF590 38 A0 00 00 */ li r5, 0 @@ -9991,7 +9991,7 @@ lbl_801E2DB8: .global sub_801e2dd0 sub_801e2dd0: -/* 801E2DD0 001DFD30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E2DD0 001DFD30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E2DD4 001DFD34 3C 80 80 5A */ lis r4, skZero3f@ha /* 801E2DD8 001DFD38 38 A4 66 A0 */ addi r5, r4, skZero3f@l /* 801E2DDC 001DFD3C 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 482e9053..2fc5d558 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -395,7 +395,7 @@ sub_80203824: /* 80203900 00200860 38 61 00 88 */ addi r3, r1, 0x88 /* 80203904 00200864 90 01 00 64 */ stw r0, 0x64(r1) /* 80203908 00200868 38 81 00 44 */ addi r4, r1, 0x44 -/* 8020390C 0020086C 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8020390C 0020086C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80203910 00200870 38 A1 00 68 */ addi r5, r1, 0x68 /* 80203914 00200874 B0 C1 00 14 */ sth r6, 0x14(r1) /* 80203918 00200878 38 C1 00 48 */ addi r6, r1, 0x48 @@ -518,7 +518,7 @@ sub_80203a94: /* 80203AB8 00200A18 93 A1 00 C4 */ stw r29, 0xc4(r1) /* 80203ABC 00200A1C 93 81 00 C0 */ stw r28, 0xc0(r1) /* 80203AC0 00200A20 7C 7D 1B 78 */ mr r29, r3 -/* 80203AC4 00200A24 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80203AC4 00200A24 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80203AC8 00200A28 A0 63 05 D0 */ lhz r3, 0x5d0(r3) /* 80203ACC 00200A2C 7C 9E 23 78 */ mr r30, r4 /* 80203AD0 00200A30 7C BC 2B 78 */ mr r28, r5 @@ -2290,7 +2290,7 @@ lbl_80205314: /* 8020546C 002023CC 4E 80 04 21 */ bctrl /* 80205470 002023D0 80 DF 05 88 */ lwz r6, 0x588(r31) /* 80205474 002023D4 3C 80 80 57 */ lis r4, lbl_8056D410@ha -/* 80205478 002023D8 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80205478 002023D8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8020547C 002023DC 38 A4 D4 10 */ addi r5, r4, lbl_8056D410@l /* 80205480 002023E0 7C 72 1B 78 */ mr r18, r3 /* 80205484 002023E4 7E 26 EA 14 */ add r17, r6, r29 @@ -2469,7 +2469,7 @@ lbl_802056D4: /* 802056FC 0020265C 41 82 04 10 */ beq lbl_80205B0C /* 80205700 00202660 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80205704 00202664 4B FA 1B 45 */ bl GetNumCollisionActors__22CCollisionActorManagerCFv -/* 80205708 00202668 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80205708 00202668 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8020570C 0020266C 7C 71 1B 78 */ mr r17, r3 /* 80205710 00202670 3A 80 00 00 */ li r20, 0 /* 80205714 00202674 B0 01 00 7C */ sth r0, 0x7c(r1) @@ -2525,7 +2525,7 @@ lbl_80205758: /* 802057CC 0020272C 28 11 00 00 */ cmplwi r17, 0 /* 802057D0 00202730 41 82 03 3C */ beq lbl_80205B0C /* 802057D4 00202734 A0 7F 05 D0 */ lhz r3, 0x5d0(r31) -/* 802057D8 00202738 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802057D8 00202738 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802057DC 0020273C 7C 03 00 40 */ cmplw r3, r0 /* 802057E0 00202740 41 82 03 2C */ beq lbl_80205B0C /* 802057E4 00202744 A0 1F 05 D0 */ lhz r0, 0x5d0(r31) @@ -2676,7 +2676,7 @@ lbl_802058D0: lbl_80205A1C: /* 80205A1C 0020297C 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80205A20 00202980 4B FA 18 29 */ bl GetNumCollisionActors__22CCollisionActorManagerCFv -/* 80205A24 00202984 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80205A24 00202984 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80205A28 00202988 7C 73 1B 78 */ mr r19, r3 /* 80205A2C 0020298C 3A 80 00 00 */ li r20, 0 /* 80205A30 00202990 B0 01 00 70 */ sth r0, 0x70(r1) @@ -2701,7 +2701,7 @@ lbl_80205A6C: /* 80205A70 002029D0 41 80 FF C8 */ blt lbl_80205A38 lbl_80205A74: /* 80205A74 002029D4 A0 61 00 70 */ lhz r3, 0x70(r1) -/* 80205A78 002029D8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80205A78 002029D8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80205A7C 002029DC 7C 03 00 40 */ cmplw r3, r0 /* 80205A80 002029E0 41 82 00 8C */ beq lbl_80205B0C /* 80205A84 002029E4 A0 01 00 70 */ lhz r0, 0x70(r1) @@ -2806,7 +2806,7 @@ Accept__22CThardusRockProjectileFR8IVisitor: /* 80205BEC 00202B4C 7F 84 E3 78 */ mr r4, r28 /* 80205BF0 00202B50 38 7F 05 7C */ addi r3, r31, 0x57c /* 80205BF4 00202B54 D0 1F 05 68 */ stfs f0, 0x568(r31) -/* 80205BF8 00202B58 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80205BF8 00202B58 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80205BFC 00202B5C B0 DF 05 70 */ sth r6, 0x570(r31) /* 80205C00 00202B60 98 BF 05 72 */ stb r5, 0x572(r31) /* 80205C04 00202B64 90 1F 05 74 */ stw r0, 0x574(r31) @@ -2833,7 +2833,7 @@ Accept__22CThardusRockProjectileFR8IVisitor: /* 80205C58 00202BB8 90 9F 05 C4 */ stw r4, 0x5c4(r31) /* 80205C5C 00202BBC 90 9F 05 C8 */ stw r4, 0x5c8(r31) /* 80205C60 00202BC0 90 9F 05 CC */ stw r4, 0x5cc(r31) -/* 80205C64 00202BC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80205C64 00202BC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80205C68 00202BC8 B0 1F 05 D0 */ sth r0, 0x5d0(r31) /* 80205C6C 00202BCC 90 9F 05 D4 */ stw r4, 0x5d4(r31) /* 80205C70 00202BD0 90 9F 05 D8 */ stw r4, 0x5d8(r31) diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index a62bd61b..49d35f24 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -708,7 +708,7 @@ sub_8025e1b4: /* 8025E1E4 0025B144 48 00 00 64 */ b lbl_8025E248 lbl_8025E1E8: /* 8025E1E8 0025B148 A0 7D 06 94 */ lhz r3, 0x694(r29) -/* 8025E1EC 0025B14C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E1EC 0025B14C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E1F0 0025B150 7C 03 00 40 */ cmplw r3, r0 /* 8025E1F4 0025B154 41 82 00 54 */ beq lbl_8025E248 /* 8025E1F8 0025B158 A0 1D 06 94 */ lhz r0, 0x694(r29) @@ -729,7 +729,7 @@ lbl_8025E1E8: /* 8025E234 0025B194 88 04 01 90 */ lbz r0, 0x190(r4) /* 8025E238 0025B198 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 8025E23C 0025B19C 98 04 01 90 */ stb r0, 0x190(r4) -/* 8025E240 0025B1A0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E240 0025B1A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E244 0025B1A4 B0 1D 06 94 */ sth r0, 0x694(r29) lbl_8025E248: /* 8025E248 0025B1A8 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1056,7 +1056,7 @@ sub_8025e640: /* 8025E6A0 0025B600 48 00 00 64 */ b lbl_8025E704 lbl_8025E6A4: /* 8025E6A4 0025B604 A0 7C 06 94 */ lhz r3, 0x694(r28) -/* 8025E6A8 0025B608 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E6A8 0025B608 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E6AC 0025B60C 7C 03 00 40 */ cmplw r3, r0 /* 8025E6B0 0025B610 41 82 00 54 */ beq lbl_8025E704 /* 8025E6B4 0025B614 A0 1C 06 94 */ lhz r0, 0x694(r28) @@ -1078,7 +1078,7 @@ lbl_8025E6A4: /* 8025E6F4 0025B654 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 8025E6F8 0025B658 98 04 01 90 */ stb r0, 0x190(r4) lbl_8025E6FC: -/* 8025E6FC 0025B65C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E6FC 0025B65C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E700 0025B660 B0 1C 06 94 */ sth r0, 0x694(r28) lbl_8025E704: /* 8025E704 0025B664 7F 83 E3 78 */ mr r3, r28 @@ -1153,7 +1153,7 @@ sub_8025e79c: /* 8025E7E4 0025B744 48 00 00 78 */ b lbl_8025E85C lbl_8025E7E8: /* 8025E7E8 0025B748 A0 7C 06 94 */ lhz r3, 0x694(r28) -/* 8025E7EC 0025B74C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E7EC 0025B74C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E7F0 0025B750 7C 03 00 40 */ cmplw r3, r0 /* 8025E7F4 0025B754 40 82 00 44 */ bne lbl_8025E838 /* 8025E7F8 0025B758 88 1C 06 98 */ lbz r0, 0x698(r28) @@ -1235,7 +1235,7 @@ lbl_8025E8F8: /* 8025E900 0025B860 48 00 02 70 */ b lbl_8025EB70 lbl_8025E904: /* 8025E904 0025B864 A0 7E 06 94 */ lhz r3, 0x694(r30) -/* 8025E908 0025B868 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E908 0025B868 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E90C 0025B86C 7C 03 00 40 */ cmplw r3, r0 /* 8025E910 0025B870 40 82 00 28 */ bne lbl_8025E938 /* 8025E914 0025B874 7F A3 EB 78 */ mr r3, r29 @@ -1256,7 +1256,7 @@ lbl_8025E938: /* 8025E94C 0025B8AC 4B F9 66 4D */ bl GetWaypointForState__10CPatternedFR13CStateManager18EScriptObjectState /* 8025E950 0025B8B0 A0 61 00 10 */ lhz r3, 0x10(r1) /* 8025E954 0025B8B4 3B A0 00 00 */ li r29, 0 -/* 8025E958 0025B8B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025E958 0025B8B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025E95C 0025B8BC B0 61 00 14 */ sth r3, 0x14(r1) /* 8025E960 0025B8C0 7C 03 00 40 */ cmplw r3, r0 /* 8025E964 0025B8C4 40 82 00 28 */ bne lbl_8025E98C @@ -1364,7 +1364,7 @@ lbl_8025EAC4: /* 8025EAEC 0025BA4C 90 01 00 44 */ stw r0, 0x44(r1) /* 8025EAF0 0025BA50 4B E1 DC C5 */ bl TryCommand__10CPatternedFR13CStateManageriM10CPatternedFR13CStateManageri_vi /* 8025EAF4 0025BA54 A0 7E 06 94 */ lhz r3, 0x694(r30) -/* 8025EAF8 0025BA58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025EAF8 0025BA58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025EAFC 0025BA5C 7C 03 00 40 */ cmplw r3, r0 /* 8025EB00 0025BA60 40 82 00 60 */ bne lbl_8025EB60 /* 8025EB04 0025BA64 80 82 BA 28 */ lwz r4, lbl_805AD748@sda21(r2) @@ -1433,7 +1433,7 @@ sub_8025ebd8: /* 8025EBE8 0025BB48 93 C1 00 18 */ stw r30, 0x18(r1) /* 8025EBEC 0025BB4C 7C 7E 1B 78 */ mr r30, r3 /* 8025EBF0 0025BB50 A0 63 06 94 */ lhz r3, 0x694(r3) -/* 8025EBF4 0025BB54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025EBF4 0025BB54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025EBF8 0025BB58 83 E4 08 4C */ lwz r31, 0x84c(r4) /* 8025EBFC 0025BB5C 7C 03 00 40 */ cmplw r3, r0 /* 8025EC00 0025BB60 41 82 00 C8 */ beq lbl_8025ECC8 @@ -1483,7 +1483,7 @@ sub_8025ebd8: /* 8025ECB0 0025BC10 88 05 01 90 */ lbz r0, 0x190(r5) /* 8025ECB4 0025BC14 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 8025ECB8 0025BC18 98 05 01 90 */ stb r0, 0x190(r5) -/* 8025ECBC 0025BC1C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025ECBC 0025BC1C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025ECC0 0025BC20 B0 1E 06 94 */ sth r0, 0x694(r30) /* 8025ECC4 0025BC24 48 00 00 08 */ b lbl_8025ECCC lbl_8025ECC8: @@ -1511,7 +1511,7 @@ sub_8025ece4: /* 8025ED0C 0025BC6C 93 C1 00 38 */ stw r30, 0x38(r1) /* 8025ED10 0025BC70 93 A1 00 34 */ stw r29, 0x34(r1) /* 8025ED14 0025BC74 7C 7D 1B 78 */ mr r29, r3 -/* 8025ED18 0025BC78 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025ED18 0025BC78 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025ED1C 0025BC7C A0 63 06 94 */ lhz r3, 0x694(r3) /* 8025ED20 0025BC80 7C 9E 23 78 */ mr r30, r4 /* 8025ED24 0025BC84 7C 03 00 40 */ cmplw r3, r0 @@ -1565,7 +1565,7 @@ lbl_8025EDCC: /* 8025EDE0 0025BD40 88 1D 06 98 */ lbz r0, 0x698(r29) /* 8025EDE4 0025BD44 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 8025EDE8 0025BD48 98 1D 06 98 */ stb r0, 0x698(r29) -/* 8025EDEC 0025BD4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025EDEC 0025BD4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025EDF0 0025BD50 B0 1D 06 94 */ sth r0, 0x694(r29) /* 8025EDF4 0025BD54 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8025EDF8 0025BD58 CB E1 00 60 */ lfd f31, 0x60(r1) @@ -2255,7 +2255,7 @@ lbl_8025F778: /* 8025F7E0 0025C740 4B E1 D3 7D */ bl SetDestPos__10CPatternedFRC9CVector3f lbl_8025F7E4: /* 8025F7E4 0025C744 A0 7E 06 94 */ lhz r3, 0x694(r30) -/* 8025F7E8 0025C748 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025F7E8 0025C748 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025F7EC 0025C74C 7C 03 00 40 */ cmplw r3, r0 /* 8025F7F0 0025C750 41 82 00 4C */ beq lbl_8025F83C /* 8025F7F4 0025C754 A0 1E 06 94 */ lhz r0, 0x694(r30) @@ -2275,7 +2275,7 @@ lbl_8025F7E4: /* 8025F82C 0025C78C 98 04 01 90 */ stb r0, 0x190(r4) /* 8025F830 0025C790 48 00 00 0C */ b lbl_8025F83C lbl_8025F834: -/* 8025F834 0025C794 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025F834 0025C794 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025F838 0025C798 B0 1E 06 94 */ sth r0, 0x694(r30) lbl_8025F83C: /* 8025F83C 0025C79C 7F C3 F3 78 */ mr r3, r30 @@ -2753,7 +2753,7 @@ sub_8025fedc: /* 8025FEF8 0025CE58 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a /* 8025FEFC 0025CE5C 98 1F 06 98 */ stb r0, 0x698(r31) /* 8025FF00 0025CE60 A0 7F 06 94 */ lhz r3, 0x694(r31) -/* 8025FF04 0025CE64 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025FF04 0025CE64 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025FF08 0025CE68 7C 03 00 40 */ cmplw r3, r0 /* 8025FF0C 0025CE6C 41 82 00 58 */ beq lbl_8025FF64 /* 8025FF10 0025CE70 A0 1F 06 94 */ lhz r0, 0x694(r31) @@ -2774,7 +2774,7 @@ sub_8025fedc: /* 8025FF4C 0025CEAC 98 1F 06 98 */ stb r0, 0x698(r31) /* 8025FF50 0025CEB0 48 00 00 18 */ b lbl_8025FF68 lbl_8025FF54: -/* 8025FF54 0025CEB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025FF54 0025CEB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025FF58 0025CEB8 38 60 00 01 */ li r3, 1 /* 8025FF5C 0025CEBC B0 1F 06 94 */ sth r0, 0x694(r31) /* 8025FF60 0025CEC0 48 00 00 08 */ b lbl_8025FF68 @@ -2796,7 +2796,7 @@ sub_8025ff7c: /* 8025FF8C 0025CEEC F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8025FF90 0025CEF0 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8025FF94 0025CEF4 7C 7F 1B 78 */ mr r31, r3 -/* 8025FF98 0025CEF8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8025FF98 0025CEF8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8025FF9C 0025CEFC A0 63 06 94 */ lhz r3, 0x694(r3) /* 8025FFA0 0025CF00 FF E0 08 90 */ fmr f31, f1 /* 8025FFA4 0025CF04 7C 03 00 40 */ cmplw r3, r0 @@ -3152,7 +3152,7 @@ sub_802604c0: /* 802604D0 0025D430 7C 9F 23 78 */ mr r31, r4 /* 802604D4 0025D434 93 C1 00 48 */ stw r30, 0x48(r1) /* 802604D8 0025D438 7C 7E 1B 78 */ mr r30, r3 -/* 802604DC 0025D43C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802604DC 0025D43C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802604E0 0025D440 A0 63 06 94 */ lhz r3, 0x694(r3) /* 802604E4 0025D444 7C 03 00 40 */ cmplw r3, r0 /* 802604E8 0025D448 41 82 00 80 */ beq lbl_80260568 @@ -3279,7 +3279,7 @@ lbl_8026069C: /* 802606A0 0025D600 38 80 00 01 */ li r4, 1 /* 802606A4 0025D604 4B ED A3 35 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 802606A8 0025D608 A0 7E 06 94 */ lhz r3, 0x694(r30) -/* 802606AC 0025D60C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802606AC 0025D60C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802606B0 0025D610 7C 03 00 40 */ cmplw r3, r0 /* 802606B4 0025D614 41 82 00 60 */ beq lbl_80260714 /* 802606B8 0025D618 A0 1E 06 94 */ lhz r0, 0x694(r30) @@ -3304,7 +3304,7 @@ lbl_8026069C: /* 80260704 0025D664 4B E1 C4 59 */ bl SetDestPos__10CPatternedFRC9CVector3f /* 80260708 0025D668 48 00 00 0C */ b lbl_80260714 lbl_8026070C: -/* 8026070C 0025D66C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8026070C 0025D66C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80260710 0025D670 B0 1E 06 94 */ sth r0, 0x694(r30) lbl_80260714: /* 80260714 0025D674 80 01 00 34 */ lwz r0, 0x34(r1) @@ -3384,7 +3384,7 @@ sub_802607fc: /* 80260818 0025D778 83 E4 08 4C */ lwz r31, 0x84c(r4) /* 8026081C 0025D77C C0 43 06 8C */ lfs f2, 0x68c(r3) /* 80260820 0025D780 A0 BF 02 6C */ lhz r5, 0x26c(r31) -/* 80260824 0025D784 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80260824 0025D784 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80260828 0025D788 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 8026082C 0025D78C 7C 05 00 50 */ subf r0, r5, r0 /* 80260830 0025D790 7C 00 00 34 */ cntlzw r0, r0 @@ -3435,7 +3435,7 @@ sub_802608a8: /* 802608D0 0025D830 F3 81 08 B8 */ psq_st f28, -1864(r1), 0, qr0 /* 802608D4 0025D834 BF 61 08 9C */ stmw r27, 0x89c(r1) /* 802608D8 0025D838 7C 7E 1B 78 */ mr r30, r3 -/* 802608DC 0025D83C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802608DC 0025D83C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802608E0 0025D840 A0 63 06 94 */ lhz r3, 0x694(r3) /* 802608E4 0025D844 7C 9F 23 78 */ mr r31, r4 /* 802608E8 0025D848 7C 03 00 40 */ cmplw r3, r0 @@ -3493,7 +3493,7 @@ lbl_802608F8: /* 802609B4 0025D914 91 01 00 68 */ stw r8, 0x68(r1) /* 802609B8 0025D918 90 01 00 70 */ stw r0, 0x70(r1) /* 802609BC 0025D91C 4B DE BD 65 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" -/* 802609C0 0025D920 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802609C0 0025D920 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802609C4 0025D924 3B A1 00 94 */ addi r29, r1, 0x94 /* 802609C8 0025D928 7F BC EB 78 */ mr r28, r29 /* 802609CC 0025D92C B0 1E 06 94 */ sth r0, 0x694(r30) @@ -3558,7 +3558,7 @@ lbl_80260A9C: /* 80260AA8 0025DA08 7C 1C 00 40 */ cmplw r28, r0 /* 80260AAC 0025DA0C 40 82 FF 28 */ bne lbl_802609D4 /* 80260AB0 0025DA10 A0 7E 06 94 */ lhz r3, 0x694(r30) -/* 80260AB4 0025DA14 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80260AB4 0025DA14 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80260AB8 0025DA18 7C 03 00 40 */ cmplw r3, r0 /* 80260ABC 0025DA1C 41 82 00 A8 */ beq lbl_80260B64 /* 80260AC0 0025DA20 A0 1E 06 94 */ lhz r0, 0x694(r30) @@ -3829,9 +3829,9 @@ __ct__9CTryclops: /* 80260E70 0025DDD0 D3 FF 06 88 */ stfs f31, 0x688(r31) /* 80260E74 0025DDD4 D0 1F 06 8C */ stfs f0, 0x68c(r31) /* 80260E78 0025DDD8 90 BF 06 90 */ stw r5, 0x690(r31) -/* 80260E7C 0025DDDC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80260E7C 0025DDDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80260E80 0025DDE0 B0 1F 06 94 */ sth r0, 0x694(r31) -/* 80260E84 0025DDE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80260E84 0025DDE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80260E88 0025DDE8 B0 1F 06 96 */ sth r0, 0x696(r31) /* 80260E8C 0025DDEC 88 1F 06 98 */ lbz r0, 0x698(r31) /* 80260E90 0025DDF0 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index a075049c..a591f0f7 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -1535,7 +1535,7 @@ lbl_801E89D0: /* 801E89DC 001E593C 7C 03 02 14 */ add r0, r3, r0 /* 801E89E0 001E5940 7C 07 00 40 */ cmplw r7, r0 /* 801E89E4 001E5944 40 82 FF B4 */ bne lbl_801E8998 -/* 801E89E8 001E5948 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E89E8 001E5948 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E89EC 001E594C B0 1F 00 00 */ sth r0, 0(r31) lbl_801E89F0: /* 801E89F0 001E5950 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1598,7 +1598,7 @@ MoveToWayPoint__17CWallCrawlerSwarmFRQ217CWallCrawlerSwarm5CBoidR13CStateManager /* 801E8AC8 001E5A28 A0 01 00 0C */ lhz r0, 0xc(r1) /* 801E8ACC 001E5A2C B0 1C 00 3C */ sth r0, 0x3c(r28) /* 801E8AD0 001E5A30 A0 7C 00 3C */ lhz r3, 0x3c(r28) -/* 801E8AD4 001E5A34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801E8AD4 001E5A34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E8AD8 001E5A38 7C 03 00 40 */ cmplw r3, r0 /* 801E8ADC 001E5A3C 40 82 00 38 */ bne lbl_801E8B14 /* 801E8AE0 001E5A40 80 1B 05 58 */ lwz r0, 0x558(r27) @@ -7259,7 +7259,7 @@ lbl_801EDB60: /* 801EDCA8 001EAC08 83 C1 03 24 */ lwz r30, 0x324(r1) /* 801EDCAC 001EAC0C 83 E1 03 28 */ lwz r31, 0x328(r1) /* 801EDCB0 001EAC10 4B E4 CA F5 */ bl CModelDataNull__10CModelDataFv -/* 801EDCB4 001EAC14 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801EDCB4 001EAC14 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801EDCB8 001EAC18 38 00 00 00 */ li r0, 0 /* 801EDCBC 001EAC1C 80 AD 92 3C */ lwz r5, lbl_805A7DFC@sda21(r13) /* 801EDCC0 001EAC20 38 60 00 00 */ li r3, 0 @@ -8351,7 +8351,7 @@ __ct__Q217CWallCrawlerSwarm5CBoidFRC12CTransform4fUi: /* 801EECCC 001EBC2C D0 1E 00 34 */ stfs f0, 0x34(r30) /* 801EECD0 001EBC30 FC 60 08 90 */ fmr f3, f1 /* 801EECD4 001EBC34 D0 1E 00 38 */ stfs f0, 0x38(r30) -/* 801EECD8 001EBC38 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801EECD8 001EBC38 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801EECDC 001EBC3C B0 1E 00 3C */ sth r0, 0x3c(r30) /* 801EECE0 001EBC40 48 17 47 0D */ bl __ct__6CColorFffff /* 801EECE4 001EBC44 38 00 00 00 */ li r0, 0 diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index a67b1c22..2d1fa586 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -524,7 +524,7 @@ lbl_8010B148: /* 8010B158 001080B8 7C 1C 00 40 */ cmplw r28, r0 /* 8010B15C 001080BC 40 82 FF A0 */ bne lbl_8010B0FC lbl_8010B160: -/* 8010B160 001080C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010B160 001080C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010B164 001080C4 B0 1D 00 00 */ sth r0, 0(r29) lbl_8010B168: /* 8010B168 001080C8 BB 61 00 2C */ lmw r27, 0x2c(r1) @@ -2916,7 +2916,7 @@ SwarmRemove__8CWarWaspFR13CStateManager: /* 8010D45C 0010A3BC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8010D460 0010A3C0 93 C1 00 28 */ stw r30, 0x28(r1) /* 8010D464 0010A3C4 7C 7E 1B 78 */ mr r30, r3 -/* 8010D468 0010A3C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010D468 0010A3C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010D46C 0010A3CC A0 63 06 74 */ lhz r3, 0x674(r3) /* 8010D470 0010A3D0 7C 03 00 40 */ cmplw r3, r0 /* 8010D474 0010A3D4 41 82 00 68 */ beq lbl_8010D4DC @@ -2962,7 +2962,7 @@ SwarmAdd__8CWarWaspFR13CStateManager: /* 8010D504 0010A464 93 C1 00 28 */ stw r30, 0x28(r1) /* 8010D508 0010A468 93 A1 00 24 */ stw r29, 0x24(r1) /* 8010D50C 0010A46C 7C 7D 1B 78 */ mr r29, r3 -/* 8010D510 0010A470 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010D510 0010A470 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010D514 0010A474 A0 63 06 74 */ lhz r3, 0x674(r3) /* 8010D518 0010A478 7C 03 00 40 */ cmplw r3, r0 /* 8010D51C 0010A47C 41 82 00 7C */ beq lbl_8010D598 @@ -3648,7 +3648,7 @@ lbl_8010DEC0: /* 8010DEE0 0010AE40 7F A3 EB 78 */ mr r3, r29 /* 8010DEE4 0010AE44 7F C4 F3 78 */ mr r4, r30 /* 8010DEE8 0010AE48 4B FF F5 69 */ bl SwarmRemove__8CWarWaspFR13CStateManager -/* 8010DEEC 0010AE4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010DEEC 0010AE4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010DEF0 0010AE50 7F A3 EB 78 */ mr r3, r29 /* 8010DEF4 0010AE54 38 9D 06 78 */ addi r4, r29, 0x678 /* 8010DEF8 0010AE58 B0 1D 06 74 */ sth r0, 0x674(r29) @@ -4430,7 +4430,7 @@ lbl_8010EA04: /* 8010EA0C 0010B96C 50 60 1F 38 */ rlwimi r0, r3, 3, 0x1c, 0x1c /* 8010EA10 0010B970 98 1F 07 2E */ stb r0, 0x72e(r31) /* 8010EA14 0010B974 A0 7F 06 74 */ lhz r3, 0x674(r31) -/* 8010EA18 0010B978 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010EA18 0010B978 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010EA1C 0010B97C 7C 03 00 40 */ cmplw r3, r0 /* 8010EA20 0010B980 41 82 00 40 */ beq lbl_8010EA60 /* 8010EA24 0010B984 A0 FF 00 08 */ lhz r7, 8(r31) @@ -4606,7 +4606,7 @@ lbl_8010EC7C: /* 8010EC94 0010BBF4 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 /* 8010EC98 0010BBF8 98 1F 07 2E */ stb r0, 0x72e(r31) /* 8010EC9C 0010BBFC A0 7F 06 74 */ lhz r3, 0x674(r31) -/* 8010ECA0 0010BC00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8010ECA0 0010BC00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8010ECA4 0010BC04 7C 03 00 40 */ cmplw r3, r0 /* 8010ECA8 0010BC08 41 82 00 40 */ beq lbl_8010ECE8 /* 8010ECAC 0010BC0C A0 FF 00 08 */ lhz r7, 8(r31) @@ -6244,7 +6244,7 @@ lbl_801103C4: /* 80110444 0010D3A4 48 20 42 B5 */ bl CanBeNormalized__9CVector3fCFv /* 80110448 0010D3A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011044C 0010D3AC 41 82 01 68 */ beq lbl_801105B4 -/* 80110450 0010D3B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80110450 0010D3B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80110454 0010D3B4 38 80 00 00 */ li r4, 0 /* 80110458 0010D3B8 90 81 01 F0 */ stw r4, 0x1f0(r1) /* 8011045C 0010D3BC 38 60 00 00 */ li r3, 0 @@ -6637,7 +6637,7 @@ lbl_801109B8: /* 801109C4 0010D924 48 00 00 9C */ b lbl_80110A60 lbl_801109C8: /* 801109C8 0010D928 A0 7D 06 74 */ lhz r3, 0x674(r29) -/* 801109CC 0010D92C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801109CC 0010D92C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801109D0 0010D930 7C 03 00 40 */ cmplw r3, r0 /* 801109D4 0010D934 40 82 00 1C */ bne lbl_801109F0 /* 801109D8 0010D938 7F A4 EB 78 */ mr r4, r29 @@ -6860,7 +6860,7 @@ lbl_80110BE0: /* 80110CE0 0010DC40 D0 37 00 1C */ stfs f1, 0x1c(r23) /* 80110CE4 0010DC44 80 D9 01 0C */ lwz r6, 0x10c(r25) /* 80110CE8 0010DC48 48 0B 80 AD */ bl __ct__15CPathFindSearchFP7CPFAreaUiff -/* 80110CEC 0010DC4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80110CEC 0010DC4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80110CF0 0010DC50 3C 80 80 5A */ lis r4, skZero3f@ha /* 80110CF4 0010DC54 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 80110CF8 0010DC58 C0 02 94 F0 */ lfs f0, lbl_805AB210@sda21(r2) diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index caa8d576..9541472a 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -6567,7 +6567,7 @@ Update__24CHudDecoInterfaceThermalFfRC13CStateManager: /* 80194ADC 00191A3C 93 A1 00 F4 */ stw r29, 0xf4(r1) /* 80194AE0 00191A40 80 84 08 4C */ lwz r4, 0x84c(r4) /* 80194AE4 00191A44 7C 7D 1B 78 */ mr r29, r3 -/* 80194AE8 00191A48 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80194AE8 00191A48 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80194AEC 00191A4C FF C0 08 90 */ fmr f30, f1 /* 80194AF0 00191A50 A0 64 03 10 */ lhz r3, 0x310(r4) /* 80194AF4 00191A54 C0 5D 00 68 */ lfs f2, 0x68(r29) @@ -7230,7 +7230,7 @@ lbl_8019540C: /* 80195414 00192374 7C 03 00 40 */ cmplw r3, r0 /* 80195418 00192378 41 82 00 AC */ beq lbl_801954C4 /* 8019541C 0019237C B0 7E 01 D0 */ sth r3, 0x1d0(r30) -/* 80195420 00192380 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80195420 00192380 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80195424 00192384 7C 03 00 40 */ cmplw r3, r0 /* 80195428 00192388 41 82 00 9C */ beq lbl_801954C4 /* 8019542C 0019238C B0 61 00 20 */ sth r3, 0x20(r1) @@ -7310,7 +7310,7 @@ lbl_80195540: /* 80195548 001924A8 FC 40 E8 90 */ fmr f2, f29 /* 8019554C 001924AC 4B FD DC 09 */ bl Update__12CScanDisplayFff /* 80195550 001924B0 A0 7E 01 D2 */ lhz r3, 0x1d2(r30) -/* 80195554 001924B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80195554 001924B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80195558 001924B8 7C 03 00 40 */ cmplw r3, r0 /* 8019555C 001924BC 41 82 00 68 */ beq lbl_801955C4 /* 80195560 001924C0 7F C3 F3 78 */ mr r3, r30 @@ -7343,7 +7343,7 @@ lbl_801955C4: /* 801955C8 00192528 2C 00 00 01 */ cmpwi r0, 1 /* 801955CC 0019252C 41 82 00 60 */ beq lbl_8019562C /* 801955D0 00192530 A0 7E 01 D0 */ lhz r3, 0x1d0(r30) -/* 801955D4 00192534 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801955D4 00192534 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801955D8 00192538 7C 03 00 40 */ cmplw r3, r0 /* 801955DC 0019253C 41 82 00 24 */ beq lbl_80195600 /* 801955E0 00192540 A0 1E 01 D0 */ lhz r0, 0x1d0(r30) @@ -8059,7 +8059,7 @@ __ct__21CHudDecoInterfaceScanFR9CGuiFrame: /* 80195FBC 00192F1C 38 7D 00 18 */ addi r3, r29, 0x18 /* 80195FC0 00192F20 93 DD 00 14 */ stw r30, 0x14(r29) /* 80195FC4 00192F24 4B FD E5 81 */ bl __ct__12CScanDisplayFv -/* 80195FC8 00192F28 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80195FC8 00192F28 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80195FCC 00192F2C 3C 80 80 5A */ lis r4, lbl_805A6660@ha /* 80195FD0 00192F30 38 C4 66 60 */ addi r6, r4, lbl_805A6660@l /* 80195FD4 00192F34 38 00 00 00 */ li r0, 0 @@ -8067,7 +8067,7 @@ __ct__21CHudDecoInterfaceScanFR9CGuiFrame: /* 80195FDC 00192F3C 3C 60 80 5A */ lis r3, skZero3f@ha /* 80195FE0 00192F40 38 A3 66 A0 */ addi r5, r3, skZero3f@l /* 80195FE4 00192F44 C0 22 A6 6C */ lfs f1, lbl_805AC38C@sda21(r2) -/* 80195FE8 00192F48 A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 80195FE8 00192F48 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 80195FEC 00192F4C 38 80 00 01 */ li r4, 1 /* 80195FF0 00192F50 C0 02 A6 68 */ lfs f0, lbl_805AC388@sda21(r2) /* 80195FF4 00192F54 7F 83 E3 78 */ mr r3, r28 diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index f46c88e4..53a65553 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -4403,7 +4403,7 @@ UpdateHudDynamicLights__9CSamusHudFfRC13CStateManager: /* 800682EC 0006524C 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b /* 800682F0 00065250 98 1C 02 98 */ stb r0, 0x298(r28) /* 800682F4 00065254 80 7F 08 4C */ lwz r3, 0x84c(r31) -/* 800682F8 00065258 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800682F8 00065258 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800682FC 0006525C 80 A3 00 04 */ lwz r5, 4(r3) /* 80068300 00065260 7C 05 00 00 */ cmpw r5, r0 /* 80068304 00065264 90 A1 00 8C */ stw r5, 0x8c(r1) @@ -6077,7 +6077,7 @@ lbl_80069AC0: /* 80069AD8 00066A38 7F C5 F3 78 */ mr r5, r30 /* 80069ADC 00066A3C A0 E4 03 10 */ lhz r7, 0x310(r4) /* 80069AE0 00066A40 7F E4 FB 78 */ mr r4, r31 -/* 80069AE4 00066A44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80069AE4 00066A44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80069AE8 00066A48 81 8C 00 08 */ lwz r12, 8(r12) /* 80069AEC 00066A4C 7C C7 00 50 */ subf r6, r7, r0 /* 80069AF0 00066A50 7C 00 38 50 */ subf r0, r0, r7 @@ -8638,7 +8638,7 @@ lbl_8006BEB8: /* 8006BEBC 00068E1C 80 1F 02 BC */ lwz r0, 0x2bc(r31) /* 8006BEC0 00068E20 20 83 00 01 */ subfic r4, r3, 1 /* 8006BEC4 00068E24 A0 A7 03 10 */ lhz r5, 0x310(r7) -/* 8006BEC8 00068E28 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8006BEC8 00068E28 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8006BECC 00068E2C 7C 86 00 34 */ cntlzw r6, r4 /* 8006BED0 00068E30 2C 00 00 03 */ cmpwi r0, 3 /* 8006BED4 00068E34 7C 85 18 50 */ subf r4, r5, r3 diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s index 47df011a..4d6593ba 100644 --- a/asm/MetroidPrime/Player/CGrappleArm.s +++ b/asm/MetroidPrime/Player/CGrappleArm.s @@ -1998,7 +1998,7 @@ lbl_8011EFB8: lbl_8011EFC8: /* 8011EFC8 0011BF28 C0 02 97 68 */ lfs f0, lbl_805AB488@sda21(r2) lbl_8011EFCC: -/* 8011EFCC 0011BF2C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8011EFCC 0011BF2C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8011EFD0 0011BF30 EC 3F 00 32 */ fmuls f1, f31, f0 /* 8011EFD4 0011BF34 7F C4 F3 78 */ mr r4, r30 /* 8011EFD8 0011BF38 7F E5 FB 78 */ mr r5, r31 diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index 3fe98cbb..634c4cdb 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -3082,7 +3082,7 @@ lbl_800F0030: /* 800F0030 000ECF90 80 AD A1 1C */ lwz r5, gpTweakBall@sda21(r13) /* 800F0034 000ECF94 54 04 10 3A */ slwi r4, r0, 2 /* 800F0038 000ECF98 A0 66 02 6C */ lhz r3, 0x26c(r6) -/* 800F003C 000ECF9C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F003C 000ECF9C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F0040 000ECFA0 7C 85 22 14 */ add r4, r5, r4 /* 800F0044 000ECFA4 C0 24 00 24 */ lfs f1, 0x24(r4) /* 800F0048 000ECFA8 7C 03 00 40 */ cmplw r3, r0 @@ -4148,7 +4148,7 @@ lbl_800F0FAC: /* 800F0FB0 000EDF10 42 00 FF A0 */ bdnz lbl_800F0F50 lbl_800F0FB4: /* 800F0FB4 000EDF14 A0 7E 00 00 */ lhz r3, 0(r30) -/* 800F0FB8 000EDF18 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F0FB8 000EDF18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F0FBC 000EDF1C 7C 03 00 40 */ cmplw r3, r0 /* 800F0FC0 000EDF20 40 82 01 EC */ bne lbl_800F11AC /* 800F0FC4 000EDF24 80 9D 00 00 */ lwz r4, 0(r29) @@ -6369,7 +6369,7 @@ PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes: /* 800F2FA4 000EFF04 C0 21 00 78 */ lfs f1, 0x78(r1) /* 800F2FA8 000EFF08 C0 01 00 7C */ lfs f0, 0x7c(r1) /* 800F2FAC 000EFF0C D0 A1 00 A0 */ stfs f5, 0xa0(r1) -/* 800F2FB0 000EFF10 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800F2FB0 000EFF10 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800F2FB4 000EFF14 D0 81 00 A4 */ stfs f4, 0xa4(r1) /* 800F2FB8 000EFF18 D0 61 00 A8 */ stfs f3, 0xa8(r1) /* 800F2FBC 000EFF1C D0 41 00 AC */ stfs f2, 0xac(r1) @@ -8644,7 +8644,7 @@ lbl_800F50E4: /* 800F50F4 000F2054 7F A3 EB 78 */ mr r3, r29 /* 800F50F8 000F2058 4B FF CC 8D */ bl UpdateIceBreakEffect__10CMorphBallFf /* 800F50FC 000F205C A0 7D 1C 10 */ lhz r3, 0x1c10(r29) -/* 800F5100 000F2060 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F5100 000F2060 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F5104 000F2064 7C 03 00 40 */ cmplw r3, r0 /* 800F5108 000F2068 41 82 02 C0 */ beq lbl_800F53C8 /* 800F510C 000F206C A0 1D 1C 10 */ lhz r0, 0x1c10(r29) @@ -9090,7 +9090,7 @@ SetBallLightActive__10CMorphBallFR13CStateManagerb: /* 800F574C 000F26AC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800F5750 000F26B0 7C BF 2B 78 */ mr r31, r5 /* 800F5754 000F26B4 A0 C3 1C 10 */ lhz r6, 0x1c10(r3) -/* 800F5758 000F26B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F5758 000F26B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F575C 000F26BC 7C 06 00 40 */ cmplw r6, r0 /* 800F5760 000F26C0 41 82 00 44 */ beq lbl_800F57A4 /* 800F5764 000F26C4 A0 03 1C 10 */ lhz r0, 0x1c10(r3) @@ -9123,7 +9123,7 @@ DeleteLight__10CMorphBallFR13CStateManager: /* 800F57C0 000F2720 90 01 00 24 */ stw r0, 0x24(r1) /* 800F57C4 000F2724 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800F57C8 000F2728 7C 7F 1B 78 */ mr r31, r3 -/* 800F57CC 000F272C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F57CC 000F272C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F57D0 000F2730 A0 63 1C 10 */ lhz r3, 0x1c10(r3) /* 800F57D4 000F2734 7C 03 00 40 */ cmplw r3, r0 /* 800F57D8 000F2738 41 82 00 20 */ beq lbl_800F57F8 @@ -9132,7 +9132,7 @@ DeleteLight__10CMorphBallFR13CStateManager: /* 800F57E4 000F2744 38 81 00 08 */ addi r4, r1, 8 /* 800F57E8 000F2748 B0 01 00 08 */ sth r0, 8(r1) /* 800F57EC 000F274C 4B F5 6A 81 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 800F57F0 000F2750 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F57F0 000F2750 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F57F4 000F2754 B0 1F 1C 10 */ sth r0, 0x1c10(r31) lbl_800F57F8: /* 800F57F8 000F2758 80 01 00 24 */ lwz r0, 0x24(r1) @@ -9191,7 +9191,7 @@ lbl_800F583C: /* 800F58BC 000F281C B0 01 00 14 */ sth r0, 0x14(r1) /* 800F58C0 000F2820 B0 01 00 18 */ sth r0, 0x18(r1) /* 800F58C4 000F2824 4B F0 F3 F5 */ bl string_l__4rstlFPCc -/* 800F58C8 000F2828 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800F58C8 000F2828 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800F58CC 000F282C 7F 84 E3 78 */ mr r4, r28 /* 800F58D0 000F2830 38 61 00 64 */ addi r3, r1, 0x64 /* 800F58D4 000F2834 3B 80 00 01 */ li r28, 1 @@ -9301,7 +9301,7 @@ lbl_800F5A4C: /* 800F5A4C 000F29AC 80 1E 00 58 */ lwz r0, 0x58(r30) /* 800F5A50 000F29B0 28 00 00 00 */ cmplwi r0, 0 /* 800F5A54 000F29B4 41 82 00 28 */ beq lbl_800F5A7C -/* 800F5A58 000F29B8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800F5A58 000F29B8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800F5A5C 000F29BC FC 20 F8 90 */ fmr f1, f31 /* 800F5A60 000F29C0 7F E5 FB 78 */ mr r5, r31 /* 800F5A64 000F29C4 38 61 00 18 */ addi r3, r1, 0x18 @@ -14015,7 +14015,7 @@ lbl_800F9E28: /* 800F9E78 000F6DD8 38 84 00 DC */ addi r4, r4, 0xdc /* 800F9E7C 000F6DDC 38 A0 00 00 */ li r5, 0 /* 800F9E80 000F6DE0 90 1F 1C 0C */ stw r0, 0x1c0c(r31) -/* 800F9E84 000F6DE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800F9E84 000F6DE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800F9E88 000F6DE8 B0 1F 1C 10 */ sth r0, 0x1c10(r31) /* 800F9E8C 000F6DEC 48 21 B9 E1 */ bl __nw__FUlPCcPCc /* 800F9E90 000F6DF0 7C 60 1B 79 */ or. r0, r3, r3 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index f4054f0f..920a23d3 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -1660,7 +1660,7 @@ UpdatePhazonDamage__7CPlayerFfR13CStateManager: /* 800111FC 0000E15C F3 81 09 F8 */ psq_st f28, -1544(r1), 0, qr0 /* 80011200 0000E160 BE E1 09 CC */ stmw r23, 0x9cc(r1) /* 80011204 0000E164 7C 7E 1B 78 */ mr r30, r3 -/* 80011208 0000E168 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80011208 0000E168 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8001120C 0000E16C 80 C3 00 04 */ lwz r6, 4(r3) /* 80011210 0000E170 FF 80 08 90 */ fmr f28, f1 /* 80011214 0000E174 7C 9F 23 78 */ mr r31, r4 @@ -1945,7 +1945,7 @@ lbl_800115CC: /* 80011628 0000E588 D0 01 00 D4 */ stfs f0, 0xd4(r1) /* 8001162C 0000E58C 98 01 00 D8 */ stb r0, 0xd8(r1) /* 80011630 0000E590 48 37 88 C5 */ bl __shl2i -/* 80011634 0000E594 A1 4D A3 8C */ lhz r10, lbl_805A8F4C@sda21(r13) +/* 80011634 0000E594 A1 4D A3 8C */ lhz r10, kInvalidUniqueId@sda21(r13) /* 80011638 0000E598 39 00 00 00 */ li r8, 0 /* 8001163C 0000E59C 38 00 00 03 */ li r0, 3 /* 80011640 0000E5A0 90 81 00 64 */ stw r4, 0x64(r1) @@ -4010,7 +4010,7 @@ lbl_80013288: /* 80013298 000101F8 A0 9E 03 10 */ lhz r4, 0x310(r30) /* 8001329C 000101FC 7C 00 20 40 */ cmplw r0, r4 /* 800132A0 00010200 41 82 00 18 */ beq lbl_800132B8 -/* 800132A4 00010204 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800132A4 00010204 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800132A8 00010208 7C 04 00 40 */ cmplw r4, r0 /* 800132AC 0001020C 41 82 00 0C */ beq lbl_800132B8 /* 800132B0 00010210 38 80 00 00 */ li r4, 0 @@ -4359,7 +4359,7 @@ lbl_80013700: /* 800137A8 00010708 C0 22 81 0C */ lfs f1, lbl_805A9E2C@sda21(r2) /* 800137AC 0001070C 48 07 DE 29 */ bl SetScanTime__12CPlayerStateFUif lbl_800137B0: -/* 800137B0 00010710 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800137B0 00010710 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800137B4 00010714 B0 1D 03 B4 */ sth r0, 0x3b4(r29) /* 800137B8 00010718 48 00 00 34 */ b lbl_800137EC lbl_800137BC: @@ -5637,7 +5637,7 @@ lbl_80014978: .global DetachActorFromPlayer__7CPlayerFv DetachActorFromPlayer__7CPlayerFv: -/* 800149A4 00011904 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800149A4 00011904 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800149A8 00011908 38 80 00 00 */ li r4, 0 /* 800149AC 0001190C C0 02 81 0C */ lfs f0, lbl_805A9E2C@sda21(r2) /* 800149B0 00011910 B0 03 02 6C */ sth r0, 0x26c(r3) @@ -5654,7 +5654,7 @@ AttachActorToPlayer__7CPlayerF9TUniqueId: /* 800149D0 00011930 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800149D4 00011934 7C 08 02 A6 */ mflr r0 /* 800149D8 00011938 90 01 00 14 */ stw r0, 0x14(r1) -/* 800149DC 0001193C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800149DC 0001193C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800149E0 00011940 A0 C3 02 6C */ lhz r6, 0x26c(r3) /* 800149E4 00011944 7C 06 00 40 */ cmplw r6, r0 /* 800149E8 00011948 40 82 00 44 */ bne lbl_80014A2C @@ -6239,7 +6239,7 @@ lbl_80015228: /* 80015240 000121A0 40 82 01 04 */ bne lbl_80015344 /* 80015244 000121A4 A0 7D 02 6C */ lhz r3, 0x26c(r29) /* 80015248 000121A8 80 8D A1 1C */ lwz r4, gpTweakBall@sda21(r13) -/* 8001524C 000121AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001524C 000121AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80015250 000121B0 C3 A4 01 E4 */ lfs f29, 0x1e4(r4) /* 80015254 000121B4 7C 03 00 40 */ cmplw r3, r0 /* 80015258 000121B8 C3 C4 01 E8 */ lfs f30, 0x1e8(r4) @@ -6443,7 +6443,7 @@ lbl_80015530: /* 80015544 000124A4 2C 00 00 01 */ cmpwi r0, 1 /* 80015548 000124A8 40 82 01 04 */ bne lbl_8001564C /* 8001554C 000124AC A0 7D 02 6C */ lhz r3, 0x26c(r29) -/* 80015550 000124B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80015550 000124B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80015554 000124B4 7C 03 00 40 */ cmplw r3, r0 /* 80015558 000124B8 41 82 00 F4 */ beq lbl_8001564C /* 8001555C 000124BC 7F C4 F3 78 */ mr r4, r30 @@ -8049,7 +8049,7 @@ lbl_80016BF8: /* 80016C08 00013B68 48 00 01 1C */ b lbl_80016D24 .global lbl_80016C0C lbl_80016C0C: -/* 80016C0C 00013B6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80016C0C 00013B6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80016C10 00013B70 38 A1 00 24 */ addi r5, r1, 0x24 /* 80016C14 00013B74 38 80 00 00 */ li r4, 0 /* 80016C18 00013B78 B0 01 00 24 */ sth r0, 0x24(r1) @@ -9063,7 +9063,7 @@ GetVisorRunoffEffect__FRC7CPlayerRC13CStateManager: /* 80017A68 000149C8 90 01 00 24 */ stw r0, 0x24(r1) /* 80017A6C 000149CC A0 A3 00 C4 */ lhz r5, 0xc4(r3) /* 80017A70 000149D0 38 60 00 00 */ li r3, 0 -/* 80017A74 000149D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80017A74 000149D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80017A78 000149D8 7C 05 00 40 */ cmplw r5, r0 /* 80017A7C 000149DC 41 82 00 28 */ beq lbl_80017AA4 /* 80017A80 000149E0 B0 A1 00 08 */ sth r5, 8(r1) @@ -9585,7 +9585,7 @@ lbl_80018188: /* 800181C8 00015128 90 C5 00 10 */ stw r6, 0x10(r5) /* 800181CC 0001512C 98 CD A0 C1 */ stb r6, lbl_805A8C81@sda21(r13) lbl_800181D0: -/* 800181D0 00015130 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 800181D0 00015130 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 800181D4 00015134 38 00 00 00 */ li r0, 0 /* 800181D8 00015138 90 01 00 D0 */ stw r0, 0xd0(r1) /* 800181DC 0001513C 7F 44 D3 78 */ mr r4, r26 @@ -10222,7 +10222,7 @@ lbl_80018A8C: /* 80018AD4 00015A34 7F C3 F3 78 */ mr r3, r30 /* 80018AD8 00015A38 4B FF F9 61 */ bl UpdatePlayerSounds__7CPlayerFf /* 80018ADC 00015A3C A0 7E 02 6C */ lhz r3, 0x26c(r30) -/* 80018AE0 00015A40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80018AE0 00015A40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80018AE4 00015A44 7C 03 00 40 */ cmplw r3, r0 /* 80018AE8 00015A48 41 82 00 14 */ beq lbl_80018AFC /* 80018AEC 00015A4C C0 3E 02 70 */ lfs f1, 0x270(r30) @@ -11236,7 +11236,7 @@ UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager: /* 80019994 000168F4 93 A1 00 84 */ stw r29, 0x84(r1) /* 80019998 000168F8 93 81 00 80 */ stw r28, 0x80(r1) /* 8001999C 000168FC 7C 7F 1B 78 */ mr r31, r3 -/* 800199A0 00016900 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800199A0 00016900 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800199A4 00016904 A0 C3 03 F4 */ lhz r6, 0x3f4(r3) /* 800199A8 00016908 7C 9C 23 78 */ mr r28, r4 /* 800199AC 0001690C 7C BD 2B 78 */ mr r29, r5 @@ -11515,7 +11515,7 @@ lbl_80019D88: .global ResetAimTargetPrediction__7CPlayerF9TUniqueId ResetAimTargetPrediction__7CPlayerF9TUniqueId: /* 80019DA4 00016D04 A0 A4 00 00 */ lhz r5, 0(r4) -/* 80019DA8 00016D08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80019DA8 00016D08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80019DAC 00016D0C 7C 05 00 40 */ cmplw r5, r0 /* 80019DB0 00016D10 41 82 00 10 */ beq lbl_80019DC0 /* 80019DB4 00016D14 A0 03 03 F4 */ lhz r0, 0x3f4(r3) @@ -11780,7 +11780,7 @@ ResetGun__7CPlayerFR13CStateManager: /* 8001A138 00017098 D0 03 04 9C */ stfs f0, 0x49c(r3) /* 8001A13C 0001709C 80 63 04 90 */ lwz r3, 0x490(r3) /* 8001A140 000170A0 48 02 29 19 */ bl CancelFiring__10CPlayerGunFR13CStateManager -/* 8001A144 000170A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A144 000170A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A148 000170A8 7F E3 FB 78 */ mr r3, r31 /* 8001A14C 000170AC 38 81 00 08 */ addi r4, r1, 8 /* 8001A150 000170B0 B0 01 00 08 */ sth r0, 8(r1) @@ -11829,7 +11829,7 @@ lbl_8001A1DC: /* 8001A1E0 00017140 90 1F 04 98 */ stw r0, 0x498(r31) /* 8001A1E4 00017144 80 7F 04 90 */ lwz r3, 0x490(r31) /* 8001A1E8 00017148 48 02 28 71 */ bl CancelFiring__10CPlayerGunFR13CStateManager -/* 8001A1EC 0001714C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A1EC 0001714C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A1F0 00017150 7F E3 FB 78 */ mr r3, r31 /* 8001A1F4 00017154 38 81 00 08 */ addi r4, r1, 8 /* 8001A1F8 00017158 B0 01 00 08 */ sth r0, 8(r1) @@ -11886,9 +11886,9 @@ __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialL /* 8001A2A0 00017200 38 61 00 50 */ addi r3, r1, 0x50 /* 8001A2A4 00017204 38 8A 00 3F */ addi r4, r10, 0x3f /* 8001A2A8 00017208 4B FE AA 11 */ bl string_l__4rstlFPCc -/* 8001A2AC 0001720C 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 8001A2AC 0001720C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 8001A2B0 00017210 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8001A2B4 00017214 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8001A2B4 00017214 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8001A2B8 00017218 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8001A2BC 0001721C 90 81 00 30 */ stw r4, 0x30(r1) /* 8001A2C0 00017220 38 61 00 94 */ addi r3, r1, 0x94 @@ -11988,7 +11988,7 @@ lbl_8001A404: /* 8001A42C 0001738C 90 1F 02 60 */ stw r0, 0x260(r31) /* 8001A430 00017390 90 1F 02 64 */ stw r0, 0x264(r31) /* 8001A434 00017394 90 1F 02 68 */ stw r0, 0x268(r31) -/* 8001A438 00017398 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A438 00017398 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A43C 0001739C B0 1F 02 6C */ sth r0, 0x26c(r31) /* 8001A440 000173A0 D0 1F 02 70 */ stfs f0, 0x270(r31) /* 8001A444 000173A4 48 19 A8 81 */ bl __ct__18CPlayerEnergyDrainFUi @@ -12033,7 +12033,7 @@ lbl_8001A404: /* 8001A4E0 00017440 91 1F 03 04 */ stw r8, 0x304(r31) /* 8001A4E4 00017444 91 1F 03 08 */ stw r8, 0x308(r31) /* 8001A4E8 00017448 90 1F 03 0C */ stw r0, 0x30c(r31) -/* 8001A4EC 0001744C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A4EC 0001744C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A4F0 00017450 B0 1F 03 10 */ sth r0, 0x310(r31) /* 8001A4F4 00017454 D0 9F 03 14 */ stfs f4, 0x314(r31) /* 8001A4F8 00017458 D0 9F 03 18 */ stfs f4, 0x318(r31) @@ -12045,7 +12045,7 @@ lbl_8001A404: /* 8001A510 00017470 91 1F 03 30 */ stw r8, 0x330(r31) /* 8001A514 00017474 90 7F 03 34 */ stw r3, 0x334(r31) /* 8001A518 00017478 90 7F 03 38 */ stw r3, 0x338(r31) -/* 8001A51C 0001747C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A51C 0001747C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A520 00017480 B0 1F 03 3C */ sth r0, 0x33c(r31) /* 8001A524 00017484 D0 9F 03 40 */ stfs f4, 0x340(r31) /* 8001A528 00017488 91 1F 03 48 */ stw r8, 0x348(r31) @@ -12083,7 +12083,7 @@ lbl_8001A404: /* 8001A5A8 00017508 91 1F 03 A8 */ stw r8, 0x3a8(r31) /* 8001A5AC 0001750C D0 9F 03 AC */ stfs f4, 0x3ac(r31) /* 8001A5B0 00017510 D0 9F 03 B0 */ stfs f4, 0x3b0(r31) -/* 8001A5B4 00017514 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A5B4 00017514 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A5B8 00017518 B0 1F 03 B4 */ sth r0, 0x3b4(r31) /* 8001A5BC 0001751C 91 1F 03 B8 */ stw r8, 0x3b8(r31) /* 8001A5C0 00017520 D0 9F 03 BC */ stfs f4, 0x3bc(r31) @@ -12102,7 +12102,7 @@ lbl_8001A404: /* 8001A5F4 00017554 D0 9F 03 E8 */ stfs f4, 0x3e8(r31) /* 8001A5F8 00017558 D0 9F 03 EC */ stfs f4, 0x3ec(r31) /* 8001A5FC 0001755C D0 9F 03 F0 */ stfs f4, 0x3f0(r31) -/* 8001A600 00017560 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8001A600 00017560 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8001A604 00017564 B0 1F 03 F4 */ sth r0, 0x3f4(r31) /* 8001A608 00017568 C0 06 00 00 */ lfs f0, 0(r6) /* 8001A60C 0001756C D0 1F 03 F8 */ stfs f0, 0x3f8(r31) @@ -12307,9 +12307,9 @@ lbl_8001A854: /* 8001A91C 0001787C D0 5F 08 24 */ stfs f2, 0x824(r31) /* 8001A920 00017880 D0 5F 08 28 */ stfs f2, 0x828(r31) /* 8001A924 00017884 98 1F 08 2C */ stb r0, 0x82c(r31) -/* 8001A928 00017888 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8001A928 00017888 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8001A92C 0001788C B0 BF 08 2E */ sth r5, 0x82e(r31) -/* 8001A930 00017890 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8001A930 00017890 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8001A934 00017894 B0 BF 08 30 */ sth r5, 0x830(r31) /* 8001A938 00017898 90 7F 08 34 */ stw r3, 0x834(r31) /* 8001A93C 0001789C 90 1F 08 38 */ stw r0, 0x838(r31) @@ -12399,7 +12399,7 @@ lbl_8001A854: /* 8001AA8C 000179EC D0 5F 09 F4 */ stfs f2, 0x9f4(r31) /* 8001AA90 000179F0 D0 5F 09 F8 */ stfs f2, 0x9f8(r31) /* 8001AA94 000179F4 D0 5F 09 FC */ stfs f2, 0x9fc(r31) -/* 8001AA98 000179F8 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8001AA98 000179F8 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8001AA9C 000179FC B0 BF 0A 00 */ sth r5, 0xa00(r31) /* 8001AAA0 00017A00 D0 5F 0A 04 */ stfs f2, 0xa04(r31) /* 8001AAA4 00017A04 90 9F 0A 08 */ stw r4, 0xa08(r31) diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 576ddec9..caec1ff2 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -391,7 +391,7 @@ lbl_80282194: /* 80282198 0027F0F8 3B 60 00 00 */ li r27, 0 /* 8028219C 0027F0FC 48 00 00 38 */ b lbl_802821D4 lbl_802821A0: -/* 802821A0 0027F100 80 6D A3 90 */ lwz r3, lbl_805A8F50@sda21(r13) +/* 802821A0 0027F100 80 6D A3 90 */ lwz r3, kInvalidAreaId@sda21(r13) /* 802821A4 0027F104 FC 20 F8 90 */ fmr f1, f31 /* 802821A8 0027F108 38 1B 00 04 */ addi r0, r27, 4 /* 802821AC 0027F10C 7F A5 EB 78 */ mr r5, r29 @@ -2450,7 +2450,7 @@ SetIntoBallReadyAnimation__7CPlayerFR13CStateManager: /* 80283FC4 00280F24 88 08 02 20 */ lbz r0, 0x220(r8) /* 80283FC8 00280F28 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 80283FCC 00280F2C 98 08 02 20 */ stb r0, 0x220(r8) -/* 80283FD0 00280F30 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80283FD0 00280F30 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80283FD4 00280F34 90 01 00 08 */ stw r0, 8(r1) /* 80283FD8 00280F38 80 9E 00 64 */ lwz r4, 0x64(r30) /* 80283FDC 00280F3C 4B E9 1B 59 */ bl AdvanceAnimation__10CModelDataFfR13CStateManager7TAreaIdb @@ -3156,7 +3156,7 @@ lbl_80284978: /* 80284978 002818D8 80 1E 08 38 */ lwz r0, 0x838(r30) /* 8028497C 002818DC 2C 00 00 00 */ cmpwi r0, 0 /* 80284980 002818E0 40 82 00 24 */ bne lbl_802849A4 -/* 80284984 002818E4 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80284984 002818E4 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80284988 002818E8 38 00 03 E8 */ li r0, 0x3e8 /* 8028498C 002818EC 7F C3 F3 78 */ mr r3, r30 /* 80284990 002818F0 7F E4 FB 78 */ mr r4, r31 @@ -3199,7 +3199,7 @@ lbl_80284A00: lbl_80284A14: /* 80284A14 00281974 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 80284A18 00281978 40 82 00 20 */ bne lbl_80284A38 -/* 80284A1C 0028197C A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 80284A1C 0028197C A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 80284A20 00281980 38 00 03 E8 */ li r0, 0x3e8 /* 80284A24 00281984 7F C3 F3 78 */ mr r3, r30 /* 80284A28 00281988 7F E4 FB 78 */ mr r4, r31 @@ -4053,7 +4053,7 @@ lbl_8028562C: /* 80285634 00282594 48 00 00 3C */ b lbl_80285670 lbl_80285638: /* 80285638 00282598 80 7E 08 70 */ lwz r3, 0x870(r30) -/* 8028563C 0028259C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8028563C 0028259C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80285640 002825A0 80 83 00 80 */ lwz r4, 0x80(r3) /* 80285644 002825A4 A0 64 03 DC */ lhz r3, 0x3dc(r4) /* 80285648 002825A8 7C 03 00 40 */ cmplw r3, r0 diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 05ea82d6..222260d6 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -328,7 +328,7 @@ lbl_8003A9A4: /* 8003AA24 00037984 48 30 64 85 */ bl __ct__6CTokenFRC6CToken /* 8003AA28 00037988 A0 C1 00 14 */ lhz r6, 0x14(r1) /* 8003AA2C 0003798C 38 61 00 70 */ addi r3, r1, 0x70 -/* 8003AA30 00037990 80 AD A3 90 */ lwz r5, lbl_805A8F50@sda21(r13) +/* 8003AA30 00037990 80 AD A3 90 */ lwz r5, kInvalidAreaId@sda21(r13) /* 8003AA34 00037994 38 81 00 2C */ addi r4, r1, 0x2c /* 8003AA38 00037998 A0 1E 05 38 */ lhz r0, 0x538(r30) /* 8003AA3C 0003799C 3B 60 00 01 */ li r27, 1 @@ -1071,7 +1071,7 @@ SetGunLightActive__10CPlayerGunFbR13CStateManager: /* 8003B484 000383E4 7C 9E 23 78 */ mr r30, r4 /* 8003B488 000383E8 93 A1 00 C4 */ stw r29, 0xc4(r1) /* 8003B48C 000383EC 7C 7D 1B 78 */ mr r29, r3 -/* 8003B490 000383F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003B490 000383F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003B494 000383F4 A0 63 05 3C */ lhz r3, 0x53c(r3) /* 8003B498 000383F8 7C 03 00 40 */ cmplw r3, r0 /* 8003B49C 000383FC 41 82 00 B8 */ beq lbl_8003B554 @@ -1184,7 +1184,7 @@ UpdateGunLight__10CPlayerGunFRC12CTransform4fR13CStateManager: /* 8003B62C 0003858C 93 A1 00 D4 */ stw r29, 0xd4(r1) /* 8003B630 00038590 93 81 00 D0 */ stw r28, 0xd0(r1) /* 8003B634 00038594 7C 9C 23 78 */ mr r28, r4 -/* 8003B638 00038598 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003B638 00038598 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003B63C 0003859C A0 63 05 3C */ lhz r3, 0x53c(r3) /* 8003B640 000385A0 7C 03 00 40 */ cmplw r3, r0 /* 8003B644 000385A4 41 82 01 20 */ beq lbl_8003B764 @@ -1276,7 +1276,7 @@ DeleteGunLight__10CPlayerGunFR13CStateManager: /* 8003B78C 000386EC 90 01 00 24 */ stw r0, 0x24(r1) /* 8003B790 000386F0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8003B794 000386F4 7C 7F 1B 78 */ mr r31, r3 -/* 8003B798 000386F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003B798 000386F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003B79C 000386FC A0 63 05 3C */ lhz r3, 0x53c(r3) /* 8003B7A0 00038700 7C 03 00 40 */ cmplw r3, r0 /* 8003B7A4 00038704 41 82 00 20 */ beq lbl_8003B7C4 @@ -1285,7 +1285,7 @@ DeleteGunLight__10CPlayerGunFR13CStateManager: /* 8003B7B0 00038710 38 81 00 08 */ addi r4, r1, 8 /* 8003B7B4 00038714 B0 01 00 08 */ sth r0, 8(r1) /* 8003B7B8 00038718 48 01 0A B5 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8003B7BC 0003871C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003B7BC 0003871C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003B7C0 00038720 B0 1F 05 3C */ sth r0, 0x53c(r31) lbl_8003B7C4: /* 8003B7C4 00038724 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1302,7 +1302,7 @@ CreateGunLight__10CPlayerGunFR13CStateManager: /* 8003B7E4 00038744 BF 61 00 8C */ stmw r27, 0x8c(r1) /* 8003B7E8 00038748 7C 7E 1B 78 */ mr r30, r3 /* 8003B7EC 0003874C 7C 9F 23 78 */ mr r31, r4 -/* 8003B7F0 00038750 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003B7F0 00038750 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003B7F4 00038754 A0 63 05 3C */ lhz r3, 0x53c(r3) /* 8003B7F8 00038758 7C 03 00 40 */ cmplw r3, r0 /* 8003B7FC 0003875C 40 82 00 DC */ bne lbl_8003B8D8 @@ -1328,7 +1328,7 @@ CreateGunLight__10CPlayerGunFR13CStateManager: /* 8003B84C 000387AC B0 01 00 14 */ sth r0, 0x14(r1) /* 8003B850 000387B0 38 84 00 10 */ addi r4, r4, 0x10 /* 8003B854 000387B4 4B FC 94 65 */ bl string_l__4rstlFPCc -/* 8003B858 000387B8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8003B858 000387B8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8003B85C 000387BC 3B 60 00 01 */ li r27, 1 /* 8003B860 000387C0 90 01 00 1C */ stw r0, 0x1c(r1) /* 8003B864 000387C4 A0 1E 05 3C */ lhz r0, 0x53c(r30) @@ -1467,7 +1467,7 @@ UpdateAuxWeapons__10CPlayerGunFfRC12CTransform4fR13CStateManager: /* 8003BA54 000389B4 38 61 00 10 */ addi r3, r1, 0x10 /* 8003BA58 000389B8 48 17 DE 61 */ bl HasTarget__10CAuxWeaponCFRC13CStateManager /* 8003BA5C 000389BC A0 61 00 10 */ lhz r3, 0x10(r1) -/* 8003BA60 000389C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003BA60 000389C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003BA64 000389C4 7C 03 00 40 */ cmplw r3, r0 /* 8003BA68 000389C8 40 82 00 4C */ bne lbl_8003BAB4 /* 8003BA6C 000389CC 7F C4 F3 78 */ mr r4, r30 @@ -1475,7 +1475,7 @@ UpdateAuxWeapons__10CPlayerGunFfRC12CTransform4fR13CStateManager: /* 8003BA74 000389D4 38 61 00 0C */ addi r3, r1, 0xc /* 8003BA78 000389D8 48 00 27 85 */ bl GetTargetId__10CPlayerGunFR13CStateManager /* 8003BA7C 000389DC A0 61 00 0C */ lhz r3, 0xc(r1) -/* 8003BA80 000389E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003BA80 000389E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003BA84 000389E4 B0 61 00 14 */ sth r3, 0x14(r1) /* 8003BA88 000389E8 7C 03 00 40 */ cmplw r3, r0 /* 8003BA8C 000389EC 40 82 00 10 */ bne lbl_8003BA9C @@ -2502,7 +2502,7 @@ lbl_8003C894: /* 8003C8D0 00039830 3B 40 00 01 */ li r26, 1 /* 8003C8D4 00039834 D0 1D 03 94 */ stfs f0, 0x394(r29) /* 8003C8D8 00039838 A0 9B 02 6C */ lhz r4, 0x26c(r27) -/* 8003C8DC 0003983C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003C8DC 0003983C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003C8E0 00039840 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 8003C8E4 00039844 B0 81 00 30 */ sth r4, 0x30(r1) /* 8003C8E8 00039848 7C 03 00 40 */ cmplw r3, r0 @@ -3823,7 +3823,7 @@ lbl_8003DB80: /* 8003DBB4 0003AB14 50 03 1F 38 */ rlwimi r3, r0, 3, 0x1c, 0x1c /* 8003DBB8 0003AB18 98 79 08 35 */ stb r3, 0x835(r25) /* 8003DBBC 0003AB1C A0 79 05 3A */ lhz r3, 0x53a(r25) -/* 8003DBC0 0003AB20 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003DBC0 0003AB20 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003DBC4 0003AB24 7C 03 00 40 */ cmplw r3, r0 /* 8003DBC8 0003AB28 41 82 00 70 */ beq lbl_8003DC38 /* 8003DBCC 0003AB2C A0 19 05 38 */ lhz r0, 0x538(r25) @@ -3852,7 +3852,7 @@ lbl_8003DB80: /* 8003DC28 0003AB88 98 19 08 35 */ stb r0, 0x835(r25) /* 8003DC2C 0003AB8C 48 00 00 0C */ b lbl_8003DC38 lbl_8003DC30: -/* 8003DC30 0003AB90 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003DC30 0003AB90 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003DC34 0003AB94 B0 19 05 3A */ sth r0, 0x53a(r25) lbl_8003DC38: /* 8003DC38 0003AB98 57 C0 07 FF */ clrlwi. r0, r30, 0x1f @@ -4275,7 +4275,7 @@ GetTargetId__10CPlayerGunFR13CStateManager: /* 8003E21C 0003B17C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8003E220 0003B180 B0 61 00 0C */ sth r3, 0xc(r1) /* 8003E224 0003B184 41 82 00 28 */ beq lbl_8003E24C -/* 8003E228 0003B188 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003E228 0003B188 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003E22C 0003B18C 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8003E230 0003B190 7C 03 00 40 */ cmplw r3, r0 /* 8003E234 0003B194 40 82 00 18 */ bne lbl_8003E24C @@ -4286,7 +4286,7 @@ GetTargetId__10CPlayerGunFR13CStateManager: /* 8003E248 0003B1A8 B0 01 00 0C */ sth r0, 0xc(r1) lbl_8003E24C: /* 8003E24C 0003B1AC A0 61 00 0C */ lhz r3, 0xc(r1) -/* 8003E250 0003B1B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003E250 0003B1B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003E254 0003B1B4 7C 03 00 40 */ cmplw r3, r0 /* 8003E258 0003B1B8 41 82 00 70 */ beq lbl_8003E2C8 /* 8003E25C 0003B1BC A0 01 00 0C */ lhz r0, 0xc(r1) @@ -4315,7 +4315,7 @@ lbl_8003E2B4: /* 8003E2B4 0003B214 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8003E2B8 0003B218 28 00 00 01 */ cmplwi r0, 1 /* 8003E2BC 0003B21C 41 82 00 0C */ beq lbl_8003E2C8 -/* 8003E2C0 0003B220 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8003E2C0 0003B220 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8003E2C4 0003B224 B0 01 00 0C */ sth r0, 0xc(r1) lbl_8003E2C8: /* 8003E2C8 0003B228 A0 01 00 0C */ lhz r0, 0xc(r1) @@ -6377,7 +6377,7 @@ lbl_8003FFF4: /* 80040014 0003CF74 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 80040018 0003CF78 B0 61 00 14 */ sth r3, 0x14(r1) /* 8004001C 0003CF7C 41 82 00 2C */ beq lbl_80040048 -/* 80040020 0003CF80 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80040020 0003CF80 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80040024 0003CF84 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80040028 0003CF88 7C 03 00 40 */ cmplw r3, r0 /* 8004002C 0003CF8C 40 82 00 1C */ bne lbl_80040048 @@ -6635,7 +6635,7 @@ lbl_8004037C: /* 800403DC 0003D33C 38 61 00 08 */ addi r3, r1, 8 /* 800403E0 0003D340 48 00 00 08 */ b lbl_800403E8 lbl_800403E4: -/* 800403E4 0003D344 38 6D A3 8C */ addi r3, r13, lbl_805A8F4C@sda21 +/* 800403E4 0003D344 38 6D A3 8C */ addi r3, r13, kInvalidUniqueId@sda21 lbl_800403E8: /* 800403E8 0003D348 A0 03 00 00 */ lhz r0, 0(r3) /* 800403EC 0003D34C FC 20 E0 90 */ fmr f1, f28 @@ -7110,7 +7110,7 @@ lbl_80040A50: /* 80040A74 0003D9D4 28 17 00 00 */ cmplwi r23, 0 /* 80040A78 0003D9D8 41 82 00 28 */ beq lbl_80040AA0 lbl_80040A7C: -/* 80040A7C 0003D9DC 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80040A7C 0003D9DC 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80040A80 0003D9E0 FC 20 E0 90 */ fmr f1, f28 /* 80040A84 0003D9E4 7F A5 EB 78 */ mr r5, r29 /* 80040A88 0003D9E8 38 61 01 00 */ addi r3, r1, 0x100 @@ -7585,7 +7585,7 @@ lbl_800410AC: /* 8004114C 0003E0AC 38 81 03 C0 */ addi r4, r1, 0x3c0 /* 80041150 0003E0B0 38 A1 00 E8 */ addi r5, r1, 0xe8 /* 80041154 0003E0B4 48 00 B5 CD */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" -/* 80041158 0003E0B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80041158 0003E0B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8004115C 0003E0BC 38 61 00 44 */ addi r3, r1, 0x44 /* 80041160 0003E0C0 38 81 00 38 */ addi r4, r1, 0x38 /* 80041164 0003E0C4 B0 01 00 0C */ sth r0, 0xc(r1) @@ -7961,7 +7961,7 @@ lbl_800416A0: /* 800416D8 0003E638 38 61 00 08 */ addi r3, r1, 8 /* 800416DC 0003E63C 4B FF CB 21 */ bl GetTargetId__10CPlayerGunFR13CStateManager /* 800416E0 0003E640 A0 61 00 08 */ lhz r3, 8(r1) -/* 800416E4 0003E644 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800416E4 0003E644 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800416E8 0003E648 7C 03 00 40 */ cmplw r3, r0 /* 800416EC 0003E64C 41 82 00 50 */ beq lbl_8004173C /* 800416F0 0003E650 88 7C 08 32 */ lbz r3, 0x832(r28) @@ -9174,7 +9174,7 @@ lbl_8004280C: /* 80042860 0003F7C0 C0 21 00 30 */ lfs f1, 0x30(r1) /* 80042864 0003F7C4 C0 01 00 34 */ lfs f0, 0x34(r1) /* 80042868 0003F7C8 D0 A1 00 38 */ stfs f5, 0x38(r1) -/* 8004286C 0003F7CC 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8004286C 0003F7CC 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 80042870 0003F7D0 D0 81 00 3C */ stfs f4, 0x3c(r1) /* 80042874 0003F7D4 D0 61 00 40 */ stfs f3, 0x40(r1) /* 80042878 0003F7D8 D0 41 00 44 */ stfs f2, 0x44(r1) @@ -10001,9 +10001,9 @@ __ct__10CPlayerGunF9TUniqueId: /* 800433BC 0004031C 38 00 00 00 */ li r0, 0 /* 800433C0 00040320 38 61 00 38 */ addi r3, r1, 0x38 /* 800433C4 00040324 B0 9F 05 38 */ sth r4, 0x538(r31) -/* 800433C8 00040328 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800433C8 00040328 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800433CC 0004032C B0 9F 05 3A */ sth r4, 0x53a(r31) -/* 800433D0 00040330 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800433D0 00040330 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800433D4 00040334 B0 9F 05 3C */ sth r4, 0x53c(r31) /* 800433D8 00040338 90 1F 05 44 */ stw r0, 0x544(r31) /* 800433DC 0004033C 90 1F 05 48 */ stw r0, 0x548(r31) diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index e52fb53e..be55d41b 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -1379,7 +1379,7 @@ UpdateGrappleState__7CPlayerFRC11CFinalInputR13CStateManager: /* 8017A6DC 0017763C 48 00 06 E8 */ b lbl_8017ADC4 lbl_8017A6E0: /* 8017A6E0 00177640 A0 BC 03 10 */ lhz r5, 0x310(r28) -/* 8017A6E4 00177644 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017A6E4 00177644 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017A6E8 00177648 7C 05 00 40 */ cmplw r5, r0 /* 8017A6EC 0017764C 40 82 00 20 */ bne lbl_8017A70C /* 8017A6F0 00177650 38 00 00 00 */ li r0, 0 @@ -1508,7 +1508,7 @@ lbl_8017A804: /* 8017A8D0 00177830 48 00 0D 1D */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager /* 8017A8D4 00177834 38 00 00 02 */ li r0, 2 /* 8017A8D8 00177838 90 1C 03 B8 */ stw r0, 0x3b8(r28) -/* 8017A8DC 0017783C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017A8DC 0017783C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017A8E0 00177840 B0 1C 03 3C */ sth r0, 0x33c(r28) /* 8017A8E4 00177844 80 7C 04 90 */ lwz r3, 0x490(r28) /* 8017A8E8 00177848 B0 01 00 08 */ sth r0, 8(r1) @@ -2395,13 +2395,13 @@ lbl_8017B554: /* 8017B554 001784B4 C0 02 A2 30 */ lfs f0, lbl_805ABF50@sda21(r2) /* 8017B558 001784B8 D0 1E 03 40 */ stfs f0, 0x340(r30) lbl_8017B55C: -/* 8017B55C 001784BC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B55C 001784BC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B560 001784C0 7F C3 F3 78 */ mr r3, r30 /* 8017B564 001784C4 7F E5 FB 78 */ mr r5, r31 /* 8017B568 001784C8 38 81 00 1C */ addi r4, r1, 0x1c /* 8017B56C 001784CC B0 01 00 1C */ sth r0, 0x1c(r1) /* 8017B570 001784D0 48 00 00 7D */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager -/* 8017B574 001784D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B574 001784D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B578 001784D8 B0 01 00 18 */ sth r0, 0x18(r1) /* 8017B57C 001784DC B0 1E 03 3C */ sth r0, 0x33c(r30) /* 8017B580 001784E0 48 00 00 54 */ b lbl_8017B5D4 @@ -2412,19 +2412,19 @@ lbl_8017B584: /* 8017B590 001784F0 C0 26 01 80 */ lfs f1, 0x180(r6) /* 8017B594 001784F4 D0 3E 03 2C */ stfs f1, 0x32c(r30) /* 8017B598 001784F8 D0 1E 03 2C */ stfs f0, 0x32c(r30) -/* 8017B59C 001784FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B59C 001784FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B5A0 00178500 B0 01 00 14 */ sth r0, 0x14(r1) /* 8017B5A4 00178504 48 00 00 49 */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager -/* 8017B5A8 00178508 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B5A8 00178508 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B5AC 0017850C B0 01 00 10 */ sth r0, 0x10(r1) /* 8017B5B0 00178510 B0 1E 03 3C */ sth r0, 0x33c(r30) /* 8017B5B4 00178514 48 00 00 20 */ b lbl_8017B5D4 lbl_8017B5B8: -/* 8017B5B8 00178518 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B5B8 00178518 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B5BC 0017851C 38 81 00 0C */ addi r4, r1, 0xc /* 8017B5C0 00178520 B0 01 00 0C */ sth r0, 0xc(r1) /* 8017B5C4 00178524 48 00 00 29 */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager -/* 8017B5C8 00178528 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B5C8 00178528 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B5CC 0017852C B0 01 00 08 */ sth r0, 8(r1) /* 8017B5D0 00178530 B0 1E 03 3C */ sth r0, 0x33c(r30) lbl_8017B5D4: @@ -2444,7 +2444,7 @@ SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager: /* 8017B5FC 0017855C 7C 9E 23 78 */ mr r30, r4 /* 8017B600 00178560 7C 7D 1B 78 */ mr r29, r3 /* 8017B604 00178564 7C BF 2B 78 */ mr r31, r5 -/* 8017B608 00178568 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B608 00178568 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B60C 0017856C A0 84 00 00 */ lhz r4, 0(r4) /* 8017B610 00178570 7C 04 00 40 */ cmplw r4, r0 /* 8017B614 00178574 41 82 00 CC */ beq lbl_8017B6E0 @@ -2504,7 +2504,7 @@ lbl_8017B6E0: /* 8017B6E0 00178640 A0 1E 00 00 */ lhz r0, 0(r30) /* 8017B6E4 00178644 B0 1D 03 10 */ sth r0, 0x310(r29) /* 8017B6E8 00178648 A0 7D 03 10 */ lhz r3, 0x310(r29) -/* 8017B6EC 0017864C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B6EC 0017864C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B6F0 00178650 7C 03 00 40 */ cmplw r3, r0 /* 8017B6F4 00178654 40 82 00 0C */ bne lbl_8017B700 /* 8017B6F8 00178658 38 00 00 00 */ li r0, 0 @@ -2551,7 +2551,7 @@ lbl_8017B75C: /* 8017B784 001786E4 28 04 00 00 */ cmplwi r4, 0 /* 8017B788 001786E8 41 82 00 44 */ beq lbl_8017B7CC /* 8017B78C 001786EC A0 7E 03 10 */ lhz r3, 0x310(r30) -/* 8017B790 001786F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017B790 001786F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017B794 001786F4 7C 03 00 40 */ cmplw r3, r0 /* 8017B798 001786F8 41 82 00 34 */ beq lbl_8017B7CC /* 8017B79C 001786FC 81 84 00 00 */ lwz r12, 0(r4) @@ -2781,7 +2781,7 @@ UpdateAimTarget__7CPlayerFR13CStateManager: /* 8017BAD8 00178A38 48 00 02 A9 */ bl ValidateAimTargetId__7CPlayerF9TUniqueIdR13CStateManager /* 8017BADC 00178A3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017BAE0 00178A40 40 82 00 18 */ bne lbl_8017BAF8 -/* 8017BAE4 00178A44 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BAE4 00178A44 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BAE8 00178A48 7F 83 E3 78 */ mr r3, r28 /* 8017BAEC 00178A4C 38 81 00 54 */ addi r4, r1, 0x54 /* 8017BAF0 00178A50 B0 01 00 54 */ sth r0, 0x54(r1) @@ -2791,7 +2791,7 @@ lbl_8017BAF8: /* 8017BAFC 00178A5C 4B E9 7D 4D */ bl GetCombatMode__7CPlayerCFv /* 8017BB00 00178A60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017BB04 00178A64 40 82 00 24 */ bne lbl_8017BB28 -/* 8017BB08 00178A68 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BB08 00178A68 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BB0C 00178A6C 7F 83 E3 78 */ mr r3, r28 /* 8017BB10 00178A70 38 81 00 50 */ addi r4, r1, 0x50 /* 8017BB14 00178A74 B0 01 00 50 */ sth r0, 0x50(r1) @@ -2806,7 +2806,7 @@ lbl_8017BB28: /* 8017BB34 00178A94 88 02 80 E1 */ lbz r0, lbl_805A9E01@sda21(r2) /* 8017BB38 00178A98 28 00 00 00 */ cmplwi r0, 0 /* 8017BB3C 00178A9C 41 82 00 74 */ beq lbl_8017BBB0 -/* 8017BB40 00178AA0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BB40 00178AA0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BB44 00178AA4 7F 83 E3 78 */ mr r3, r28 /* 8017BB48 00178AA8 38 81 00 4C */ addi r4, r1, 0x4c /* 8017BB4C 00178AAC B0 01 00 4C */ sth r0, 0x4c(r1) @@ -2924,7 +2924,7 @@ lbl_8017BCA0: /* 8017BCEC 00178C4C 48 00 05 75 */ bl ValidateObjectForMode__7CPlayerCF9TUniqueIdR13CStateManager /* 8017BCF0 00178C50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017BCF4 00178C54 41 82 00 1C */ beq lbl_8017BD10 -/* 8017BCF8 00178C58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BCF8 00178C58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BCFC 00178C5C 7F 83 E3 78 */ mr r3, r28 /* 8017BD00 00178C60 38 81 00 10 */ addi r4, r1, 0x10 /* 8017BD04 00178C64 B0 01 00 10 */ sth r0, 0x10(r1) @@ -2953,7 +2953,7 @@ lbl_8017BD34: .global UpdateAimTargetTimer__7CPlayerFf UpdateAimTargetTimer__7CPlayerFf: /* 8017BD54 00178CB4 A0 83 03 F4 */ lhz r4, 0x3f4(r3) -/* 8017BD58 00178CB8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BD58 00178CB8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BD5C 00178CBC 7C 04 00 40 */ cmplw r4, r0 /* 8017BD60 00178CC0 4D 82 00 20 */ beqlr /* 8017BD64 00178CC4 C0 43 04 8C */ lfs f2, 0x48c(r3) @@ -2976,7 +2976,7 @@ ValidateAimTargetId__7CPlayerF9TUniqueIdR13CStateManager: /* 8017BD9C 00178CFC 93 A1 08 E4 */ stw r29, 0x8e4(r1) /* 8017BDA0 00178D00 93 81 08 E0 */ stw r28, 0x8e0(r1) /* 8017BDA4 00178D04 7C 9D 23 78 */ mr r29, r4 -/* 8017BDA8 00178D08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BDA8 00178D08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BDAC 00178D0C A0 84 00 00 */ lhz r4, 0(r4) /* 8017BDB0 00178D10 7C 7C 1B 78 */ mr r28, r3 /* 8017BDB4 00178D14 7C BE 2B 78 */ mr r30, r5 @@ -3058,7 +3058,7 @@ lbl_8017BEA8: /* 8017BEC0 00178E20 48 00 31 BD */ bl ValidateOrbitTargetId__7CPlayerCF9TUniqueIdR13CStateManager /* 8017BEC4 00178E24 2C 03 00 00 */ cmpwi r3, 0 /* 8017BEC8 00178E28 41 82 00 28 */ beq lbl_8017BEF0 -/* 8017BECC 00178E2C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BECC 00178E2C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BED0 00178E30 7F 83 E3 78 */ mr r3, r28 /* 8017BED4 00178E34 38 81 00 10 */ addi r4, r1, 0x10 /* 8017BED8 00178E38 B0 01 00 10 */ sth r0, 0x10(r1) @@ -3077,7 +3077,7 @@ lbl_8017BEF8: /* 8017BF04 00178E64 7C 60 03 79 */ or. r0, r3, r0 /* 8017BF08 00178E68 41 82 03 10 */ beq lbl_8017C218 /* 8017BF0C 00178E6C A0 7D 00 00 */ lhz r3, 0(r29) -/* 8017BF10 00178E70 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017BF10 00178E70 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017BF14 00178E74 7C 03 00 40 */ cmplw r3, r0 /* 8017BF18 00178E78 41 82 03 00 */ beq lbl_8017C218 /* 8017BF1C 00178E7C B0 61 00 0C */ sth r3, 0xc(r1) @@ -3189,7 +3189,7 @@ lbl_8017C0AC: /* 8017C0C0 00179020 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8017C0C4 00179024 4C 40 13 82 */ cror 2, 0, 2 /* 8017C0C8 00179028 40 82 01 38 */ bne lbl_8017C200 -/* 8017C0CC 0017902C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017C0CC 0017902C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017C0D0 00179030 38 60 00 00 */ li r3, 0 /* 8017C0D4 00179034 90 61 00 B0 */ stw r3, 0xb0(r1) /* 8017C0D8 00179038 38 61 00 5C */ addi r3, r1, 0x5c @@ -3283,7 +3283,7 @@ lbl_8017C200: /* 8017C210 00179170 38 60 00 01 */ li r3, 1 /* 8017C214 00179174 48 00 00 24 */ b lbl_8017C238 lbl_8017C218: -/* 8017C218 00179178 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017C218 00179178 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017C21C 0017917C 7F 83 E3 78 */ mr r3, r28 /* 8017C220 00179180 38 81 00 08 */ addi r4, r1, 8 /* 8017C224 00179184 B0 01 00 08 */ sth r0, 8(r1) @@ -3329,7 +3329,7 @@ ValidateObjectForMode__7CPlayerCF9TUniqueIdR13CStateManager: /* 8017C2B4 00179214 28 1F 00 00 */ cmplwi r31, 0 /* 8017C2B8 00179218 41 82 00 14 */ beq lbl_8017C2CC /* 8017C2BC 0017921C A0 7D 00 00 */ lhz r3, 0(r29) -/* 8017C2C0 00179220 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017C2C0 00179220 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017C2C4 00179224 7C 03 00 40 */ cmplw r3, r0 /* 8017C2C8 00179228 40 82 00 0C */ bne lbl_8017C2D4 lbl_8017C2CC: @@ -3676,7 +3676,7 @@ lbl_8017C690: /* 8017C7C4 00179724 3B 1C 00 04 */ addi r24, r28, 4 /* 8017C7C8 00179728 C8 62 A2 98 */ lfd f3, lbl_805ABFB8@sda21(r2) /* 8017C7CC 0017972C 90 E1 10 E8 */ stw r7, 0x10e8(r1) -/* 8017C7D0 00179730 A3 2D A3 8C */ lhz r25, lbl_805A8F4C@sda21(r13) +/* 8017C7D0 00179730 A3 2D A3 8C */ lhz r25, kInvalidUniqueId@sda21(r13) /* 8017C7D4 00179734 C8 01 10 E8 */ lfd f0, 0x10e8(r1) /* 8017C7D8 00179738 90 C1 10 F4 */ stw r6, 0x10f4(r1) /* 8017C7DC 0017973C EC 40 18 28 */ fsubs f2, f0, f3 @@ -3811,7 +3811,7 @@ lbl_8017C844: /* 8017C9DC 0017993C C0 23 02 4C */ lfs f1, 0x24c(r3) /* 8017C9E0 00179940 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 8017C9E4 00179944 40 81 00 FC */ ble lbl_8017CAE0 -/* 8017C9E8 00179948 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017C9E8 00179948 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017C9EC 0017994C 38 60 00 00 */ li r3, 0 /* 8017C9F0 00179950 90 61 08 E4 */ stw r3, 0x8e4(r1) /* 8017C9F4 00179954 38 61 00 40 */ addi r3, r1, 0x40 @@ -3893,7 +3893,7 @@ lbl_8017CAE0: /* 8017CB0C 00179A6C EF 41 00 2A */ fadds f26, f1, f0 /* 8017CB10 00179A70 FC 1A F0 40 */ fcmpo cr0, f26, f30 /* 8017CB14 00179A74 40 80 00 E0 */ bge lbl_8017CBF4 -/* 8017CB18 00179A78 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017CB18 00179A78 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017CB1C 00179A7C 38 60 00 00 */ li r3, 0 /* 8017CB20 00179A80 90 61 00 E0 */ stw r3, 0xe0(r1) /* 8017CB24 00179A84 38 61 00 40 */ addi r3, r1, 0x40 @@ -4300,7 +4300,7 @@ lbl_8017CF98: /* 8017D0F4 0017A054 C8 62 A2 98 */ lfd f3, lbl_805ABFB8@sda21(r2) /* 8017D0F8 0017A058 3B C1 01 5C */ addi r30, r1, 0x15c /* 8017D0FC 0017A05C 90 E1 19 68 */ stw r7, 0x1968(r1) -/* 8017D100 0017A060 A3 0D A3 8C */ lhz r24, lbl_805A8F4C@sda21(r13) +/* 8017D100 0017A060 A3 0D A3 8C */ lhz r24, kInvalidUniqueId@sda21(r13) /* 8017D104 0017A064 C8 01 19 68 */ lfd f0, 0x1968(r1) /* 8017D108 0017A068 90 C1 19 74 */ stw r6, 0x1974(r1) /* 8017D10C 0017A06C EC 40 18 28 */ fsubs f2, f0, f3 @@ -4404,7 +4404,7 @@ lbl_8017D178: /* 8017D290 0017A1F0 C0 03 02 A0 */ lfs f0, 0x2a0(r3) /* 8017D294 0017A1F4 FC 19 00 40 */ fcmpo cr0, f25, f0 /* 8017D298 0017A1F8 40 80 06 60 */ bge lbl_8017D8F8 -/* 8017D29C 0017A1FC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8017D29C 0017A1FC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8017D2A0 0017A200 38 00 00 00 */ li r0, 0 /* 8017D2A4 0017A204 90 01 11 60 */ stw r0, 0x1160(r1) /* 8017D2A8 0017A208 38 61 00 94 */ addi r3, r1, 0x94 @@ -4556,7 +4556,7 @@ lbl_8017D4A8: /* 8017D4C4 0017A424 80 03 00 14 */ lwz r0, 0x14(r3) /* 8017D4C8 0017A428 2C 00 00 02 */ cmpwi r0, 2 /* 8017D4CC 0017A42C 41 82 01 FC */ beq lbl_8017D6C8 -/* 8017D4D0 0017A430 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017D4D0 0017A430 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017D4D4 0017A434 38 60 00 00 */ li r3, 0 /* 8017D4D8 0017A438 90 61 09 5C */ stw r3, 0x95c(r1) /* 8017D4DC 0017A43C 38 61 00 94 */ addi r3, r1, 0x94 @@ -4582,7 +4582,7 @@ lbl_8017D514: /* 8017D528 0017A488 28 03 00 00 */ cmplwi r3, 0 /* 8017D52C 0017A48C 41 82 00 D0 */ beq lbl_8017D5FC /* 8017D530 0017A490 80 A3 00 04 */ lwz r5, 4(r3) -/* 8017D534 0017A494 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8017D534 0017A494 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8017D538 0017A498 90 A1 00 2C */ stw r5, 0x2c(r1) /* 8017D53C 0017A49C 7C 05 00 00 */ cmpw r5, r0 /* 8017D540 0017A4A0 41 82 00 50 */ beq lbl_8017D590 @@ -4718,7 +4718,7 @@ lbl_8017D6F8: /* 8017D708 0017A668 EE C1 00 2A */ fadds f22, f1, f0 /* 8017D70C 0017A66C FC 16 E0 40 */ fcmpo cr0, f22, f28 /* 8017D710 0017A670 40 80 01 E8 */ bge lbl_8017D8F8 -/* 8017D714 0017A674 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8017D714 0017A674 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8017D718 0017A678 38 00 00 00 */ li r0, 0 /* 8017D71C 0017A67C 90 01 01 58 */ stw r0, 0x158(r1) /* 8017D720 0017A680 38 61 00 94 */ addi r3, r1, 0x94 @@ -4744,7 +4744,7 @@ lbl_8017D758: /* 8017D76C 0017A6CC 28 03 00 00 */ cmplwi r3, 0 /* 8017D770 0017A6D0 41 82 00 D0 */ beq lbl_8017D840 /* 8017D774 0017A6D4 80 A3 00 04 */ lwz r5, 4(r3) -/* 8017D778 0017A6D8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8017D778 0017A6D8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8017D77C 0017A6DC 90 A1 00 28 */ stw r5, 0x28(r1) /* 8017D780 0017A6E0 7C 05 00 00 */ cmpw r5, r0 /* 8017D784 0017A6E4 41 82 00 50 */ beq lbl_8017D7D4 @@ -5412,7 +5412,7 @@ lbl_8017E0B8: /* 8017E0C0 0017B020 38 81 00 10 */ addi r4, r1, 0x10 /* 8017E0C4 0017B024 38 05 00 01 */ addi r0, r5, 1 /* 8017E0C8 0017B028 90 1E 09 E4 */ stw r0, 0x9e4(r30) -/* 8017E0CC 0017B02C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E0CC 0017B02C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E0D0 0017B030 B0 01 00 10 */ sth r0, 0x10(r1) /* 8017E0D4 0017B034 4B E9 BC D1 */ bl ResetAimTargetPrediction__7CPlayerF9TUniqueId /* 8017E0D8 0017B038 A0 1E 03 10 */ lhz r0, 0x310(r30) @@ -5427,7 +5427,7 @@ lbl_8017E0B8: /* 8017E0FC 0017B05C 80 03 00 04 */ lwz r0, 4(r3) /* 8017E100 0017B060 28 00 00 00 */ cmplwi r0, 0 /* 8017E104 0017B064 40 82 00 1C */ bne lbl_8017E120 -/* 8017E108 0017B068 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E108 0017B068 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E10C 0017B06C 7F C3 F3 78 */ mr r3, r30 /* 8017E110 0017B070 7F E5 FB 78 */ mr r5, r31 /* 8017E114 0017B074 38 81 00 08 */ addi r4, r1, 8 @@ -5566,7 +5566,7 @@ lbl_8017E2B4: /* 8017E2DC 0017B23C B0 01 00 64 */ sth r0, 0x64(r1) /* 8017E2E0 0017B240 4B FF D3 0D */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager /* 8017E2E4 0017B244 A0 DD 03 10 */ lhz r6, 0x310(r29) -/* 8017E2E8 0017B248 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E2E8 0017B248 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E2EC 0017B24C 7C 06 00 40 */ cmplw r6, r0 /* 8017E2F0 0017B250 41 82 04 70 */ beq lbl_8017E760 /* 8017E2F4 0017B254 B0 C1 00 58 */ sth r6, 0x58(r1) @@ -5620,7 +5620,7 @@ lbl_8017E384: /* 8017E3A8 0017B308 48 00 03 B8 */ b lbl_8017E760 lbl_8017E3AC: /* 8017E3AC 0017B30C A0 7D 03 10 */ lhz r3, 0x310(r29) -/* 8017E3B0 0017B310 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E3B0 0017B310 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E3B4 0017B314 7C 03 00 40 */ cmplw r3, r0 /* 8017E3B8 0017B318 40 82 03 A8 */ bne lbl_8017E760 /* 8017E3BC 0017B31C 7F A3 EB 78 */ mr r3, r29 @@ -5719,7 +5719,7 @@ lbl_8017E4DC: /* 8017E510 0017B470 B0 01 00 44 */ sth r0, 0x44(r1) /* 8017E514 0017B474 4B FF D0 D9 */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager /* 8017E518 0017B478 A0 DD 03 10 */ lhz r6, 0x310(r29) -/* 8017E51C 0017B47C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E51C 0017B47C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E520 0017B480 7C 06 00 40 */ cmplw r6, r0 /* 8017E524 0017B484 41 82 01 20 */ beq lbl_8017E644 /* 8017E528 0017B488 B0 C1 00 38 */ sth r6, 0x38(r1) @@ -5824,7 +5824,7 @@ lbl_8017E668: /* 8017E69C 0017B5FC B0 01 00 2C */ sth r0, 0x2c(r1) /* 8017E6A0 0017B600 4B FF CF 4D */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager /* 8017E6A4 0017B604 A0 DD 03 10 */ lhz r6, 0x310(r29) -/* 8017E6A8 0017B608 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E6A8 0017B608 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E6AC 0017B60C 7C 06 00 40 */ cmplw r6, r0 /* 8017E6B0 0017B610 41 82 00 6C */ beq lbl_8017E71C /* 8017E6B4 0017B614 B0 C1 00 20 */ sth r6, 0x20(r1) @@ -5887,7 +5887,7 @@ lbl_8017E760: /* 8017E788 0017B6E8 A0 1D 03 10 */ lhz r0, 0x310(r29) /* 8017E78C 0017B6EC 7C 03 00 40 */ cmplw r3, r0 /* 8017E790 0017B6F0 40 82 01 38 */ bne lbl_8017E8C8 -/* 8017E794 0017B6F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E794 0017B6F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E798 0017B6F8 B0 1D 03 3C */ sth r0, 0x33c(r29) /* 8017E79C 0017B6FC 48 00 01 2C */ b lbl_8017E8C8 lbl_8017E7A0: @@ -5944,7 +5944,7 @@ lbl_8017E82C: /* 8017E858 0017B7B8 A0 1D 03 10 */ lhz r0, 0x310(r29) /* 8017E85C 0017B7BC 7C 03 00 40 */ cmplw r3, r0 /* 8017E860 0017B7C0 40 82 00 68 */ bne lbl_8017E8C8 -/* 8017E864 0017B7C4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E864 0017B7C4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E868 0017B7C8 B0 1D 03 3C */ sth r0, 0x33c(r29) /* 8017E86C 0017B7CC 48 00 00 5C */ b lbl_8017E8C8 lbl_8017E870: @@ -6062,7 +6062,7 @@ UpdateOrbitSelection__7CPlayerFRC11CFinalInputR13CStateManager: /* 8017E9F0 0017B950 28 03 00 00 */ cmplwi r3, 0 /* 8017E9F4 0017B954 40 82 00 10 */ bne lbl_8017EA04 lbl_8017E9F8: -/* 8017E9F8 0017B958 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017E9F8 0017B958 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017E9FC 0017B95C B0 1E 03 3C */ sth r0, 0x33c(r30) /* 8017EA00 0017B960 48 00 00 AC */ b lbl_8017EAAC lbl_8017EA04: @@ -6072,7 +6072,7 @@ lbl_8017EA04: /* 8017EA10 0017B970 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017EA14 0017B974 41 82 00 98 */ beq lbl_8017EAAC /* 8017EA18 0017B978 A0 7E 03 3C */ lhz r3, 0x33c(r30) -/* 8017EA1C 0017B97C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017EA1C 0017B97C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017EA20 0017B980 7C 03 00 40 */ cmplw r3, r0 /* 8017EA24 0017B984 41 82 00 88 */ beq lbl_8017EAAC /* 8017EA28 0017B988 A0 1E 03 3C */ lhz r0, 0x33c(r30) @@ -6233,7 +6233,7 @@ UpdateOrbitTarget__7CPlayerFR13CStateManager: /* 8017EC60 0017BBC0 48 00 0C B1 */ bl ValidateOrbitTargetIdAndPointer__7CPlayerCF9TUniqueIdR13CStateManager /* 8017EC64 0017BBC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017EC68 0017BBC8 40 82 00 1C */ bne lbl_8017EC84 -/* 8017EC6C 0017BBCC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017EC6C 0017BBCC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017EC70 0017BBD0 7F C3 F3 78 */ mr r3, r30 /* 8017EC74 0017BBD4 7F E5 FB 78 */ mr r5, r31 /* 8017EC78 0017BBD8 38 81 00 20 */ addi r4, r1, 0x20 @@ -6249,7 +6249,7 @@ lbl_8017EC84: /* 8017EC9C 0017BBFC 48 00 0C 75 */ bl ValidateOrbitTargetIdAndPointer__7CPlayerCF9TUniqueIdR13CStateManager /* 8017ECA0 0017BC00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017ECA4 0017BC04 40 82 00 10 */ bne lbl_8017ECB4 -/* 8017ECA8 0017BC08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017ECA8 0017BC08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017ECAC 0017BC0C B0 01 00 14 */ sth r0, 0x14(r1) /* 8017ECB0 0017BC10 B0 1E 03 3C */ sth r0, 0x33c(r30) lbl_8017ECB4: @@ -6478,7 +6478,7 @@ lbl_8017EFB0: /* 8017EFEC 0017BF4C D0 1E 03 40 */ stfs f0, 0x340(r30) /* 8017EFF0 0017BF50 48 00 00 1C */ b lbl_8017F00C lbl_8017EFF4: -/* 8017EFF4 0017BF54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017EFF4 0017BF54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017EFF8 0017BF58 7F C3 F3 78 */ mr r3, r30 /* 8017EFFC 0017BF5C 7F E5 FB 78 */ mr r5, r31 /* 8017F000 0017BF60 38 81 00 08 */ addi r4, r1, 8 @@ -6537,7 +6537,7 @@ ValidateOrbitTargetId__7CPlayerCF9TUniqueIdR13CStateManager: /* 8017F0A8 0017C008 93 A1 00 54 */ stw r29, 0x54(r1) /* 8017F0AC 0017C00C A0 84 00 00 */ lhz r4, 0(r4) /* 8017F0B0 0017C010 7C 7E 1B 78 */ mr r30, r3 -/* 8017F0B4 0017C014 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017F0B4 0017C014 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017F0B8 0017C018 7C BD 2B 78 */ mr r29, r5 /* 8017F0BC 0017C01C 7C 04 00 40 */ cmplw r4, r0 /* 8017F0C0 0017C020 40 82 00 0C */ bne lbl_8017F0CC @@ -6837,7 +6837,7 @@ lbl_8017F4D4: /* 8017F4EC 0017C44C 7F C4 F3 78 */ mr r4, r30 /* 8017F4F0 0017C450 C0 01 00 9C */ lfs f0, 0x9c(r1) /* 8017F4F4 0017C454 7F 65 DB 78 */ mr r5, r27 -/* 8017F4F8 0017C458 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017F4F8 0017C458 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017F4FC 0017C45C 38 61 00 88 */ addi r3, r1, 0x88 /* 8017F500 0017C460 D0 41 00 B8 */ stfs f2, 0xb8(r1) /* 8017F504 0017C464 D0 21 00 BC */ stfs f1, 0xbc(r1) @@ -7131,7 +7131,7 @@ ValidateOrbitTargetIdAndPointer__7CPlayerCF9TUniqueIdR13CStateManager: /* 8017F914 0017C874 7C 08 02 A6 */ mflr r0 /* 8017F918 0017C878 90 01 00 24 */ stw r0, 0x24(r1) /* 8017F91C 0017C87C A0 64 00 00 */ lhz r3, 0(r4) -/* 8017F920 0017C880 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8017F920 0017C880 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017F924 0017C884 7C 03 00 40 */ cmplw r3, r0 /* 8017F928 0017C888 40 82 00 0C */ bne lbl_8017F934 /* 8017F92C 0017C88C 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s index 7152d1ec..ac0d2ad4 100644 --- a/asm/MetroidPrime/Player/CPlayerVisor.s +++ b/asm/MetroidPrime/Player/CPlayerVisor.s @@ -3143,7 +3143,7 @@ __ct__12CPlayerVisorFRC13CStateManager: /* 80114A10 00111970 90 1E 00 08 */ stw r0, 8(r30) /* 80114A14 00111974 38 80 FF FF */ li r4, -1 /* 80114A18 00111978 48 22 C4 29 */ bl __dt__6CTokenFv -/* 80114A1C 0011197C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80114A1C 0011197C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80114A20 00111980 38 A0 00 40 */ li r5, 0x40 /* 80114A24 00111984 38 C0 00 00 */ li r6, 0 /* 80114A28 00111988 38 00 00 08 */ li r0, 8 diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index 63e78a21..835bb1fb 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -382,7 +382,7 @@ Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16: /* 8015B318 00158278 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b /* 8015B31C 0015827C 98 1E 02 98 */ stb r0, 0x298(r30) /* 8015B320 00158280 80 7C 08 4C */ lwz r3, 0x84c(r28) -/* 8015B324 00158284 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8015B324 00158284 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8015B328 00158288 80 63 00 04 */ lwz r3, 4(r3) /* 8015B32C 0015828C 7C 03 00 00 */ cmpw r3, r0 /* 8015B330 00158290 90 61 00 18 */ stw r3, 0x18(r1) diff --git a/asm/MetroidPrime/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s index d973b935..3c887f2c 100644 --- a/asm/MetroidPrime/Player/CScanDisplay.s +++ b/asm/MetroidPrime/Player/CScanDisplay.s @@ -1129,7 +1129,7 @@ lbl_801739BC: /* 801739DC 0017093C 38 7F 00 14 */ addi r3, r31, 0x14 /* 801739E0 00170940 90 BF 00 0C */ stw r5, 0xc(r31) /* 801739E4 00170944 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 801739E8 00170948 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801739E8 00170948 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801739EC 0017094C B0 1F 00 10 */ sth r0, 0x10(r31) /* 801739F0 00170950 98 A1 01 70 */ stb r5, 0x170(r1) /* 801739F4 00170954 48 00 03 A5 */ bl sub_80173d98 @@ -1992,7 +1992,7 @@ __ct__12CScanDisplayFv: /* 801745A0 00171500 38 80 00 00 */ li r4, 0 /* 801745A4 00171504 38 61 00 10 */ addi r3, r1, 0x10 /* 801745A8 00171508 90 9E 00 0C */ stw r4, 0xc(r30) -/* 801745AC 0017150C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801745AC 0017150C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801745B0 00171510 B0 1E 00 10 */ sth r0, 0x10(r30) /* 801745B4 00171514 98 9E 00 9C */ stb r4, 0x9c(r30) /* 801745B8 00171518 93 FE 00 A0 */ stw r31, 0xa0(r30) diff --git a/asm/MetroidPrime/Player/CStaticInterference.s b/asm/MetroidPrime/Player/CStaticInterference.s index 8d8acc20..0d3441a4 100644 --- a/asm/MetroidPrime/Player/CStaticInterference.s +++ b/asm/MetroidPrime/Player/CStaticInterference.s @@ -138,7 +138,7 @@ GetTotalInterference__19CStaticInterferenceCFv: /* 801C0930 001BD890 80 A3 00 0C */ lwz r5, 0xc(r3) /* 801C0934 001BD894 FC 40 08 90 */ fmr f2, f1 /* 801C0938 001BD898 1C 00 00 0C */ mulli r0, r0, 0xc -/* 801C093C 001BD89C A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801C093C 001BD89C A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801C0940 001BD8A0 7C 85 02 14 */ add r4, r5, r0 /* 801C0944 001BD8A4 48 00 00 2C */ b lbl_801C0970 lbl_801C0948: diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 23f0819f..8cfa346e 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -11662,7 +11662,7 @@ lbl_800CFC04: /* 800CFC1C 000CCB7C 48 24 5C 51 */ bl __nw__FUlPCcPCc /* 800CFC20 000CCB80 7C 7C 1B 79 */ or. r28, r3, r3 /* 800CFC24 000CCB84 41 82 00 A8 */ beq lbl_800CFCCC -/* 800CFC28 000CCB88 A1 0D A3 8C */ lhz r8, lbl_805A8F4C@sda21(r13) +/* 800CFC28 000CCB88 A1 0D A3 8C */ lhz r8, kInvalidUniqueId@sda21(r13) /* 800CFC2C 000CCB8C 38 A0 00 01 */ li r5, 1 /* 800CFC30 000CCB90 80 E1 03 F8 */ lwz r7, 0x3f8(r1) /* 800CFC34 000CCB94 38 61 00 C4 */ addi r3, r1, 0xc4 diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 5db7bf48..aa5436a1 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -502,7 +502,7 @@ lbl_8029F694: /* 8029F6C8 0029C628 38 84 5E B8 */ addi r4, r4, lbl_803D5EB8@l /* 8029F6CC 0029C62C 38 84 00 26 */ addi r4, r4, 0x26 /* 8029F6D0 0029C630 4B D6 55 E9 */ bl string_l__4rstlFPCc -/* 8029F6D4 0029C634 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8029F6D4 0029C634 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8029F6D8 0029C638 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8029F6DC 0029C63C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 8029F6E0 0029C640 38 81 00 34 */ addi r4, r1, 0x34 diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 3a81c4f9..56ff2797 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -496,7 +496,7 @@ __ct__5CFire: /* 8025D268 0025A1C8 38 C1 00 10 */ addi r6, r1, 0x10 /* 8025D26C 0025A1CC 38 A0 FF FF */ li r5, -1 /* 8025D270 0025A1D0 48 0E 0F 25 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" -/* 8025D274 0025A1D4 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 8025D274 0025A1D4 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 8025D278 0025A1D8 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8025D27C 0025A1DC 80 11 00 00 */ lwz r0, 0(r17) /* 8025D280 0025A1E0 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -510,7 +510,7 @@ __ct__5CFire: /* 8025D2A0 0025A200 4B DD D5 05 */ bl CModelDataNull__10CModelDataFv /* 8025D2A4 0025A204 38 61 00 7C */ addi r3, r1, 0x7c /* 8025D2A8 0025A208 4B DB DB 91 */ bl None__16CActorParametersFv -/* 8025D2AC 0025A20C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8025D2AC 0025A20C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8025D2B0 0025A210 38 00 00 00 */ li r0, 0 /* 8025D2B4 0025A214 80 AD 97 D4 */ lwz r5, lbl_805A8394@sda21(r13) /* 8025D2B8 0025A218 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index b277db7c..fe2b55b2 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -4622,7 +4622,7 @@ lbl_801D2090: /* 801D2258 001CF1B8 38 61 00 EC */ addi r3, r1, 0xec /* 801D225C 001CF1BC 38 81 01 54 */ addi r4, r1, 0x154 /* 801D2260 001CF1C0 4B F3 45 AD */ bl sub_8010680c -/* 801D2264 001CF1C4 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801D2264 001CF1C4 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801D2268 001CF1C8 38 00 00 00 */ li r0, 0 /* 801D226C 001CF1CC 80 AD 91 8C */ lwz r5, lbl_805A7D4C@sda21(r13) /* 801D2270 001CF1D0 38 60 00 00 */ li r3, 0 @@ -5496,7 +5496,7 @@ lbl_801D2F00: /* 801D2F28 001CFE88 90 01 00 24 */ stw r0, 0x24(r1) /* 801D2F2C 001CFE8C 4B E7 4F F1 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801D2F30 001CFE90 A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 801D2F34 001CFE94 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801D2F34 001CFE94 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801D2F38 001CFE98 B0 61 00 20 */ sth r3, 0x20(r1) /* 801D2F3C 001CFE9C 7C 03 00 40 */ cmplw r3, r0 /* 801D2F40 001CFEA0 41 82 00 64 */ beq lbl_801D2FA4 @@ -5568,7 +5568,7 @@ lbl_801D3004: /* 801D302C 001CFF8C 90 01 00 24 */ stw r0, 0x24(r1) /* 801D3030 001CFF90 4B E7 4E ED */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 801D3034 001CFF94 A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 801D3038 001CFF98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801D3038 001CFF98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801D303C 001CFF9C B0 61 00 20 */ sth r3, 0x20(r1) /* 801D3040 001CFFA0 7C 03 00 40 */ cmplw r3, r0 /* 801D3044 001CFFA4 41 82 00 7C */ beq lbl_801D30C0 @@ -5708,7 +5708,7 @@ Accept__18CFishCloudModifierFR8IVisitor: /* 801D321C 001D017C 4B E6 75 89 */ bl CModelDataNull__10CModelDataFv /* 801D3220 001D0180 38 61 00 50 */ addi r3, r1, 0x50 /* 801D3224 001D0184 4B E4 7C 15 */ bl None__16CActorParametersFv -/* 801D3228 001D0188 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801D3228 001D0188 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801D322C 001D018C 38 00 00 00 */ li r0, 0 /* 801D3230 001D0190 80 AD 91 88 */ lwz r5, lbl_805A7D48@sda21(r13) /* 801D3234 001D0194 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index e491e055..c6912af4 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -356,9 +356,9 @@ lbl_8012FEDC: /* 8012FF04 0012CE64 DB E1 00 80 */ stfd f31, 0x80(r1) /* 8012FF08 0012CE68 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 8012FF0C 0012CE6C BE C1 00 58 */ stmw r22, 0x58(r1) -/* 8012FF10 0012CE70 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 8012FF10 0012CE70 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8012FF14 0012CE74 3D 60 80 57 */ lis r11, lbl_8056D410@ha -/* 8012FF18 0012CE78 81 8D A3 90 */ lwz r12, lbl_805A8F50@sda21(r13) +/* 8012FF18 0012CE78 81 8D A3 90 */ lwz r12, kInvalidAreaId@sda21(r13) /* 8012FF1C 0012CE7C FF E0 08 90 */ fmr f31, f1 /* 8012FF20 0012CE80 90 01 00 1C */ stw r0, 0x1c(r1) /* 8012FF24 0012CE84 38 0B D4 10 */ addi r0, r11, lbl_8056D410@l diff --git a/asm/MetroidPrime/ScriptObjects/CRepulsor.s b/asm/MetroidPrime/ScriptObjects/CRepulsor.s index 0820a0be..1d3d4c7b 100644 --- a/asm/MetroidPrime/ScriptObjects/CRepulsor.s +++ b/asm/MetroidPrime/ScriptObjects/CRepulsor.s @@ -122,7 +122,7 @@ Accept__9CRepulsorFR8IVisitor: /* 8020FD40 0020CCA0 4B E2 AA 65 */ bl CModelDataNull__10CModelDataFv /* 8020FD44 0020CCA4 38 61 00 50 */ addi r3, r1, 0x50 /* 8020FD48 0020CCA8 4B E0 B0 F1 */ bl None__16CActorParametersFv -/* 8020FD4C 0020CCAC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8020FD4C 0020CCAC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8020FD50 0020CCB0 38 00 00 00 */ li r0, 0 /* 8020FD54 0020CCB4 80 AD 94 B0 */ lwz r5, lbl_805A8070@sda21(r13) /* 8020FD58 0020CCB8 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index c30da987..c89994ac 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -53,7 +53,7 @@ GetSortingBounds__12CScriptActorCFRC12CTransform4f: /* 80074F78 00071ED8 7C 9E 23 78 */ mr r30, r4 /* 80074F7C 00071EDC 93 A1 00 14 */ stw r29, 0x14(r1) /* 80074F80 00071EE0 7C 7D 1B 78 */ mr r29, r3 -/* 80074F84 00071EE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80074F84 00071EE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80074F88 00071EE8 A0 84 02 E0 */ lhz r4, 0x2e0(r4) /* 80074F8C 00071EEC 7C 04 00 40 */ cmplw r4, r0 /* 80074F90 00071EF0 41 82 00 28 */ beq lbl_80074FB8 @@ -290,7 +290,7 @@ lbl_800752C8: /* 800752D8 00072238 4B FD 72 CD */ bl GetObjectById__13CStateManagerCF9TUniqueId /* 800752DC 0007223C 28 03 00 00 */ cmplwi r3, 0 /* 800752E0 00072240 40 82 00 0C */ bne lbl_800752EC -/* 800752E4 00072244 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800752E4 00072244 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800752E8 00072248 B0 1C 02 E0 */ sth r0, 0x2e0(r28) lbl_800752EC: /* 800752EC 0007224C BB 41 00 28 */ lmw r26, 0x28(r1) @@ -859,7 +859,7 @@ lbl_80075890: /* 80075AF4 00072A54 D0 0F 02 D4 */ stfs f0, 0x2d4(r15) /* 80075AF8 00072A58 93 6F 02 D8 */ stw r27, 0x2d8(r15) /* 80075AFC 00072A5C D3 EF 02 DC */ stfs f31, 0x2dc(r15) -/* 80075B00 00072A60 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80075B00 00072A60 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80075B04 00072A64 B0 0F 02 E0 */ sth r0, 0x2e0(r15) /* 80075B08 00072A68 88 0F 02 E2 */ lbz r0, 0x2e2(r15) /* 80075B0C 00072A6C 53 80 3E 30 */ rlwimi r0, r28, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s index e3b0d858..14f973f3 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAiJumpPoint.s @@ -130,7 +130,7 @@ GetInUse__18CScriptAiJumpPointCF9TUniqueId: /* 801EF2EC 001EC24C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801EF2F0 001EC250 41 81 00 28 */ bgt lbl_801EF318 /* 801EF2F4 001EC254 A0 C3 01 0A */ lhz r6, 0x10a(r3) -/* 801EF2F8 001EC258 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801EF2F8 001EC258 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801EF2FC 001EC25C 7C 06 18 40 */ cmplw r6, r3 /* 801EF300 001EC260 41 82 00 1C */ beq lbl_801EF31C /* 801EF304 001EC264 A0 04 00 00 */ lhz r0, 0(r4) @@ -252,7 +252,7 @@ Accept__18CScriptAiJumpPointFR8IVisitor: /* 801EF494 001EC3F4 4B E4 B3 11 */ bl CModelDataNull__10CModelDataFv /* 801EF498 001EC3F8 38 61 00 50 */ addi r3, r1, 0x50 /* 801EF49C 001EC3FC 4B E2 B9 9D */ bl None__16CActorParametersFv -/* 801EF4A0 001EC400 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801EF4A0 001EC400 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801EF4A4 001EC404 38 00 00 00 */ li r0, 0 /* 801EF4A8 001EC408 80 AD 92 68 */ lwz r5, lbl_805A7E28@sda21(r13) /* 801EF4AC 001EC40C 38 60 00 00 */ li r3, 0 @@ -328,11 +328,11 @@ lbl_801EF5B4: /* 801EF5C0 001EC520 C0 02 AE 40 */ lfs f0, lbl_805ACB60@sda21(r2) /* 801EF5C4 001EC524 98 1F 01 08 */ stb r0, 0x108(r31) /* 801EF5C8 001EC528 7F E3 FB 78 */ mr r3, r31 -/* 801EF5CC 001EC52C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801EF5CC 001EC52C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801EF5D0 001EC530 B0 1F 01 0A */ sth r0, 0x10a(r31) -/* 801EF5D4 001EC534 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801EF5D4 001EC534 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801EF5D8 001EC538 B0 1F 01 0C */ sth r0, 0x10c(r31) -/* 801EF5DC 001EC53C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801EF5DC 001EC53C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801EF5E0 001EC540 B0 1F 01 0E */ sth r0, 0x10e(r31) /* 801EF5E4 001EC544 D0 1F 01 10 */ stfs f0, 0x110(r31) /* 801EF5E8 001EC548 E3 E1 01 28 */ psq_l f31, 296(r1), 0, qr0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s index 5a4ccf72..89b99d72 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptAreaAttributes.s @@ -77,7 +77,7 @@ AcceptScriptMsg__21CScriptAreaAttributesF20EScriptObjectMessage9TUniqueIdR13CSta /* 801BD50C 001BA46C B0 01 00 08 */ sth r0, 8(r1) /* 801BD510 001BA470 4B E9 3C 4D */ bl AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 801BD514 001BA474 80 BD 00 04 */ lwz r5, 4(r29) -/* 801BD518 001BA478 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801BD518 001BA478 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801BD51C 001BA47C 7C 05 00 00 */ cmpw r5, r0 /* 801BD520 001BA480 41 82 00 8C */ beq lbl_801BD5AC /* 801BD524 001BA484 2C 1E 00 23 */ cmpwi r30, 0x23 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s index a78f89ff..fff2f1dd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBeam.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBeam.s @@ -104,7 +104,7 @@ Think__11CScriptBeamFfR13CStateManager: /* 8027C6B0 00279610 4E 80 04 21 */ bctrl /* 8027C6B4 00279614 48 00 00 0C */ b lbl_8027C6C0 lbl_8027C6B8: -/* 8027C6B8 00279618 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027C6B8 00279618 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027C6BC 0027961C B0 1E 01 54 */ sth r0, 0x154(r30) lbl_8027C6C0: /* 8027C6C0 00279620 80 01 00 24 */ lwz r0, 0x24(r1) @@ -317,7 +317,7 @@ lbl_8027C950: /* 8027C9B8 00279918 4B DB DD ED */ bl CModelDataNull__10CModelDataFv /* 8027C9BC 0027991C 38 61 00 20 */ addi r3, r1, 0x20 /* 8027C9C0 00279920 4B D9 E4 79 */ bl None__16CActorParametersFv -/* 8027C9C4 00279924 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027C9C4 00279924 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027C9C8 00279928 38 80 00 00 */ li r4, 0 /* 8027C9CC 0027992C A1 97 00 00 */ lhz r12, 0(r23) /* 8027C9D0 00279930 39 61 00 20 */ addi r11, r1, 0x20 @@ -403,7 +403,7 @@ lbl_8027C950: /* 8027CB10 00279A70 D0 1D 01 4C */ stfs f0, 0x14c(r29) /* 8027CB14 00279A74 88 1F 00 18 */ lbz r0, 0x18(r31) /* 8027CB18 00279A78 98 1D 01 50 */ stb r0, 0x150(r29) -/* 8027CB1C 00279A7C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8027CB1C 00279A7C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8027CB20 00279A80 B0 1D 01 54 */ sth r0, 0x154(r29) /* 8027CB24 00279A84 BA E1 00 DC */ lmw r23, 0xdc(r1) /* 8027CB28 00279A88 80 01 01 04 */ lwz r0, 0x104(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index d33aaaeb..ea2659cf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -270,7 +270,7 @@ InitializeInArea__17CScriptCameraHintFR13CStateManager: /* 800C49B8 000C1918 7C 9B 23 78 */ mr r27, r4 /* 800C49BC 000C191C 83 E4 08 10 */ lwz r31, 0x810(r4) /* 800C49C0 000C1920 A3 A3 00 08 */ lhz r29, 8(r3) -/* 800C49C4 000C1924 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C49C4 000C1924 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C49C8 000C1928 B0 03 01 64 */ sth r0, 0x164(r3) /* 800C49CC 000C192C AB 9F 20 08 */ lha r28, 0x2008(r31) /* 800C49D0 000C1930 48 00 01 AC */ b lbl_800C4B7C @@ -607,7 +607,7 @@ GetFirstHelper__17CScriptCameraHintCFv: /* 800C4E28 000C1D88 B0 03 00 00 */ sth r0, 0(r3) /* 800C4E2C 000C1D8C 4E 80 00 20 */ blr lbl_800C4E30: -/* 800C4E30 000C1D90 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C4E30 000C1D90 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C4E34 000C1D94 B0 03 00 00 */ sth r0, 0(r3) /* 800C4E38 000C1D98 4E 80 00 20 */ blr @@ -735,7 +735,7 @@ lbl_800C4EF4: /* 800C4FF0 000C1F50 4B F7 57 B5 */ bl CModelDataNull__10CModelDataFv /* 800C4FF4 000C1F54 38 61 00 30 */ addi r3, r1, 0x30 /* 800C4FF8 000C1F58 4B F5 5E 41 */ bl None__16CActorParametersFv -/* 800C4FFC 000C1F5C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800C4FFC 000C1F5C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800C5000 000C1F60 38 00 00 00 */ li r0, 0 /* 800C5004 000C1F64 80 AD 86 D8 */ lwz r5, lbl_805A7298@sda21(r13) /* 800C5008 000C1F68 38 60 00 00 */ li r3, 0 @@ -799,7 +799,7 @@ lbl_800C4EF4: /* 800C50F0 000C2050 7F 04 C3 78 */ mr r4, r24 /* 800C50F4 000C2054 90 B4 01 50 */ stw r5, 0x150(r20) /* 800C50F8 000C2058 38 74 01 68 */ addi r3, r20, 0x168 -/* 800C50FC 000C205C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800C50FC 000C205C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800C5100 000C2060 B0 14 01 64 */ sth r0, 0x164(r20) /* 800C5104 000C2064 98 B4 01 66 */ stb r5, 0x166(r20) /* 800C5108 000C2068 48 24 DA 6D */ bl __ct__12CTransform4fFRC12CTransform4f diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index abe001e1..a03e544a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -99,7 +99,7 @@ AcceptScriptMsg__24CScriptCameraHintTriggerF20EScriptObjectMessage9TUniqueIdR13C /* 8024B454 002483B4 88 1E 01 30 */ lbz r0, 0x130(r30) /* 8024B458 002483B8 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8024B45C 002483BC 41 82 00 20 */ beq lbl_8024B47C -/* 8024B460 002483C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8024B460 002483C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8024B464 002483C4 7F E3 FB 78 */ mr r3, r31 /* 8024B468 002483C8 7F C4 F3 78 */ mr r4, r30 /* 8024B46C 002483CC 38 A1 00 0C */ addi r5, r1, 0xc @@ -123,7 +123,7 @@ lbl_8024B47C: /* 8024B4B0 00248410 88 1E 01 30 */ lbz r0, 0x130(r30) /* 8024B4B4 00248414 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 8024B4B8 00248418 41 82 00 20 */ beq lbl_8024B4D8 -/* 8024B4BC 0024841C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8024B4BC 0024841C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8024B4C0 00248420 7F E3 FB 78 */ mr r3, r31 /* 8024B4C4 00248424 7F C4 F3 78 */ mr r4, r30 /* 8024B4C8 00248428 38 A1 00 08 */ addi r5, r1, 8 @@ -298,7 +298,7 @@ Accept__24CScriptCameraHintTriggerFR8IVisitor: /* 8024B720 00248680 4B DE F0 85 */ bl CModelDataNull__10CModelDataFv /* 8024B724 00248684 38 61 00 20 */ addi r3, r1, 0x20 /* 8024B728 00248688 4B DC F7 11 */ bl None__16CActorParametersFv -/* 8024B72C 0024868C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8024B72C 0024868C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8024B730 00248690 38 00 00 00 */ li r0, 0 /* 8024B734 00248694 80 AD 97 08 */ lwz r5, lbl_805A82C8@sda21(r13) /* 8024B738 00248698 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index a22e775e..a647ace8 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -81,7 +81,7 @@ Exited__24CScriptCameraPitchVolumeFR13CStateManager: /* 80226540 002234A0 50 A0 36 72 */ rlwimi r0, r5, 6, 0x19, 0x19 /* 80226544 002234A4 98 03 01 3C */ stb r0, 0x13c(r3) /* 80226548 002234A8 80 64 08 70 */ lwz r3, 0x870(r4) -/* 8022654C 002234AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8022654C 002234AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80226550 002234B0 80 63 00 7C */ lwz r3, 0x7c(r3) /* 80226554 002234B4 B0 01 00 08 */ sth r0, 8(r1) /* 80226558 002234B8 B0 03 01 C4 */ sth r0, 0x1c4(r3) @@ -293,7 +293,7 @@ Accept__24CScriptCameraPitchVolumeFR8IVisitor: /* 8022682C 0022378C 4B E1 3F 79 */ bl CModelDataNull__10CModelDataFv /* 80226830 00223790 38 61 00 2C */ addi r3, r1, 0x2c /* 80226834 00223794 4B DF 46 05 */ bl None__16CActorParametersFv -/* 80226838 00223798 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80226838 00223798 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8022683C 0022379C 38 00 00 00 */ li r0, 0 /* 80226840 002237A0 80 AD 95 60 */ lwz r5, lbl_805A8120@sda21(r13) /* 80226844 002237A4 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index 47b94018..c3e6bc13 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -106,7 +106,7 @@ lbl_800FDF04: /* 800FDF08 000FAE68 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 800FDF0C 000FAE6C 41 82 00 84 */ beq lbl_800FDF90 /* 800FDF10 000FAE70 80 BC 00 04 */ lwz r5, 4(r28) -/* 800FDF14 000FAE74 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800FDF14 000FAE74 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800FDF18 000FAE78 7C 05 00 00 */ cmpw r5, r0 /* 800FDF1C 000FAE7C 41 82 00 74 */ beq lbl_800FDF90 /* 800FDF20 000FAE80 80 9F 08 50 */ lwz r4, 0x850(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s index 107fac60..b7c78a40 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraWaypoint.s @@ -99,7 +99,7 @@ lbl_800B523C: /* 800B5264 000B21C4 90 01 00 2C */ stw r0, 0x2c(r1) /* 800B5268 000B21C8 4B F9 2C B5 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 800B526C 000B21CC A3 61 00 08 */ lhz r27, 8(r1) -/* 800B5270 000B21D0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B5270 000B21D0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B5274 000B21D4 7C 1B 00 40 */ cmplw r27, r0 /* 800B5278 000B21D8 41 82 00 60 */ beq lbl_800B52D8 /* 800B527C 000B21DC 80 81 00 34 */ lwz r4, 0x34(r1) @@ -140,7 +140,7 @@ lbl_800B52DC: /* 800B52F4 000B2254 80 81 00 34 */ lwz r4, 0x34(r1) /* 800B52F8 000B2258 2C 04 00 00 */ cmpwi r4, 0 /* 800B52FC 000B225C 40 82 00 50 */ bne lbl_800B534C -/* 800B5300 000B2260 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B5300 000B2260 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B5304 000B2264 B0 1C 00 00 */ sth r0, 0(r28) /* 800B5308 000B2268 80 01 00 34 */ lwz r0, 0x34(r1) /* 800B530C 000B226C 80 61 00 3C */ lwz r3, 0x3c(r1) @@ -278,7 +278,7 @@ lbl_800B5480: /* 800B54D4 000B2434 4B F8 52 D1 */ bl CModelDataNull__10CModelDataFv /* 800B54D8 000B2438 38 61 00 20 */ addi r3, r1, 0x20 /* 800B54DC 000B243C 4B F6 59 5D */ bl None__16CActorParametersFv -/* 800B54E0 000B2440 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800B54E0 000B2440 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800B54E4 000B2444 38 00 00 00 */ li r0, 0 /* 800B54E8 000B2448 80 AD 86 50 */ lwz r5, lbl_805A7210@sda21(r13) /* 800B54EC 000B244C 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index 01e5a9ec..aa9ae7bb 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -818,7 +818,7 @@ lbl_802016F0: /* 80201700 001FE660 7C 1F 00 40 */ cmplw r31, r0 /* 80201704 001FE664 40 82 FF 28 */ bne lbl_8020162C /* 80201708 001FE668 A0 7C 00 34 */ lhz r3, 0x34(r28) -/* 8020170C 001FE66C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8020170C 001FE66C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80201710 001FE670 7C 03 00 40 */ cmplw r3, r0 /* 80201714 001FE674 41 82 00 50 */ beq lbl_80201764 /* 80201718 001FE678 A0 1C 00 34 */ lhz r0, 0x34(r28) @@ -895,7 +895,7 @@ lbl_802017D8: /* 8020181C 001FE77C 48 11 40 51 */ bl __nw__FUlPCcPCc /* 80201820 001FE780 7C 7B 1B 79 */ or. r27, r3, r3 /* 80201824 001FE784 41 82 00 B8 */ beq lbl_802018DC -/* 80201828 001FE788 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 80201828 001FE788 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 8020182C 001FE78C 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80201830 001FE790 80 01 00 58 */ lwz r0, 0x58(r1) /* 80201834 001FE794 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -1044,7 +1044,7 @@ lbl_80201A08: /* 80201A4C 001FE9AC 48 11 3E 21 */ bl __nw__FUlPCcPCc /* 80201A50 001FE9B0 7C 7B 1B 79 */ or. r27, r3, r3 /* 80201A54 001FE9B4 41 82 00 B8 */ beq lbl_80201B0C -/* 80201A58 001FE9B8 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 80201A58 001FE9B8 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 80201A5C 001FE9BC 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 80201A60 001FE9C0 80 01 00 58 */ lwz r0, 0x58(r1) /* 80201A64 001FE9C4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -1178,7 +1178,7 @@ lbl_80201B54: /* 80201C48 001FEBA8 C0 02 B0 30 */ lfs f0, lbl_805ACD50@sda21(r2) /* 80201C4C 001FEBAC 90 18 00 00 */ stw r0, 0(r24) /* 80201C50 001FEBB0 7F 03 C3 78 */ mr r3, r24 -/* 80201C54 001FEBB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80201C54 001FEBB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80201C58 001FEBB8 B0 18 00 34 */ sth r0, 0x34(r24) /* 80201C5C 001FEBBC 90 B8 00 38 */ stw r5, 0x38(r24) /* 80201C60 001FEBC0 D0 18 00 3C */ stfs f0, 0x3c(r24) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s index ae2329dd..2247736f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCoverPoint.s @@ -142,7 +142,7 @@ GetInUse__17CScriptCoverPointCF9TUniqueId: /* 8012D42C 0012A38C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012D430 0012A390 41 81 00 28 */ bgt lbl_8012D458 /* 8012D434 0012A394 A0 C3 00 FA */ lhz r6, 0xfa(r3) -/* 8012D438 0012A398 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8012D438 0012A398 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8012D43C 0012A39C 7C 06 18 40 */ cmplw r6, r3 /* 8012D440 0012A3A0 41 82 00 1C */ beq lbl_8012D45C /* 8012D444 0012A3A4 A0 04 00 00 */ lhz r0, 0(r4) @@ -392,7 +392,7 @@ Accept__17CScriptCoverPointFR8IVisitor: /* 8012D76C 0012A6CC 4B F0 D0 39 */ bl CModelDataNull__10CModelDataFv /* 8012D770 0012A6D0 38 61 00 50 */ addi r3, r1, 0x50 /* 8012D774 0012A6D4 4B EE D6 C5 */ bl None__16CActorParametersFv -/* 8012D778 0012A6D8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8012D778 0012A6D8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8012D77C 0012A6DC 38 00 00 00 */ li r0, 0 /* 8012D780 0012A6E0 80 AD 8A E8 */ lwz r5, lbl_805A76A8@sda21(r13) /* 8012D784 0012A6E4 38 60 00 00 */ li r3, 0 @@ -453,9 +453,9 @@ Accept__17CScriptCoverPointFR8IVisitor: /* 8012D860 0012A7C0 88 1E 00 F8 */ lbz r0, 0xf8(r30) /* 8012D864 0012A7C4 50 C0 36 72 */ rlwimi r0, r6, 6, 0x19, 0x19 /* 8012D868 0012A7C8 98 1E 00 F8 */ stb r0, 0xf8(r30) -/* 8012D86C 0012A7CC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012D86C 0012A7CC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012D870 0012A7D0 B0 1E 00 FA */ sth r0, 0xfa(r30) -/* 8012D874 0012A7D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8012D874 0012A7D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8012D878 0012A7D8 B0 1E 00 FC */ sth r0, 0xfc(r30) /* 8012D87C 0012A7DC C0 5F 00 2C */ lfs f2, 0x2c(r31) /* 8012D880 0012A7E0 C0 3F 00 1C */ lfs f1, 0x1c(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index 0da53c83..60ef4092 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -172,7 +172,7 @@ Render__24CScriptDamageableTriggerCFRC13CStateManager: /* 800FA754 000F76B4 C0 61 00 70 */ lfs f3, 0x70(r1) /* 800FA758 000F76B8 C0 41 00 74 */ lfs f2, 0x74(r1) /* 800FA75C 000F76BC C0 21 00 78 */ lfs f1, 0x78(r1) -/* 800FA760 000F76C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800FA760 000F76C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800FA764 000F76C4 D0 C1 00 7C */ stfs f6, 0x7c(r1) /* 800FA768 000F76C8 D0 A1 00 80 */ stfs f5, 0x80(r1) /* 800FA76C 000F76CC D0 81 00 84 */ stfs f4, 0x84(r1) @@ -997,7 +997,7 @@ lbl_800FB240: /* 800FB2BC 000F821C 38 61 01 FC */ addi r3, r1, 0x1fc /* 800FB2C0 000F8220 38 81 02 64 */ addi r4, r1, 0x264 /* 800FB2C4 000F8224 48 00 B4 ED */ bl MakeDamageableTriggerActorParms__FRC16CActorParametersRC16CVisorParameters -/* 800FB2C8 000F8228 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800FB2C8 000F8228 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800FB2CC 000F822C 2C 1E 00 01 */ cmpwi r30, 1 /* 800FB2D0 000F8230 3A 21 00 10 */ addi r17, r1, 0x10 /* 800FB2D4 000F8234 B0 01 00 10 */ sth r0, 0x10(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s index 20fa05b5..a2266b20 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebugCameraWaypoint.s @@ -104,7 +104,7 @@ Accept__26CScriptDebugCameraWaypointFR8IVisitor: /* 8014ACA8 00147C08 4B EE FA FD */ bl CModelDataNull__10CModelDataFv /* 8014ACAC 00147C0C 38 61 00 20 */ addi r3, r1, 0x20 /* 8014ACB0 00147C10 4B ED 01 89 */ bl None__16CActorParametersFv -/* 8014ACB4 00147C14 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8014ACB4 00147C14 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8014ACB8 00147C18 38 00 00 00 */ li r0, 0 /* 8014ACBC 00147C1C 80 AD 8B E8 */ lwz r5, lbl_805A77A8@sda21(r13) /* 8014ACC0 00147C20 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s index 7350cf28..98b02980 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDistanceFog.s @@ -32,7 +32,7 @@ AcceptScriptMsg__18CScriptDistanceFogF20EScriptObjectMessage9TUniqueIdR13CStateM /* 8014D028 00149F88 B0 01 00 08 */ sth r0, 8(r1) /* 8014D02C 00149F8C 4B F0 41 31 */ bl AcceptScriptMsg__7CEntityF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 8014D030 00149F90 80 DE 00 04 */ lwz r6, 4(r30) -/* 8014D034 00149F94 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8014D034 00149F94 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8014D038 00149F98 7C 06 00 00 */ cmpw r6, r0 /* 8014D03C 00149F9C 41 82 01 68 */ beq lbl_8014D1A4 /* 8014D040 00149FA0 88 1E 00 30 */ lbz r0, 0x30(r30) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index cd815efe..9c042eb7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -135,7 +135,7 @@ GetCurrentConnectedAreaId__11CScriptDockCFRC13CStateManager: /* 800C3774 000C06D4 4B F9 BB B1 */ bl GetConnectedAreaId__Q29IGameArea4DockCFi /* 800C3778 000C06D8 48 00 00 0C */ b lbl_800C3784 lbl_800C377C: -/* 800C377C 000C06DC 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800C377C 000C06DC 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800C3780 000C06E0 90 1E 00 00 */ stw r0, 0(r30) lbl_800C3784: /* 800C3784 000C06E4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -184,7 +184,7 @@ lbl_800C3804: /* 800C3820 000C0780 38 61 00 14 */ addi r3, r1, 0x14 /* 800C3824 000C0784 4B F9 BB 01 */ bl GetConnectedAreaId__Q29IGameArea4DockCFi /* 800C3828 000C0788 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 800C382C 000C078C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800C382C 000C078C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800C3830 000C0790 90 C1 00 1C */ stw r6, 0x1c(r1) /* 800C3834 000C0794 7C 06 00 00 */ cmpw r6, r0 /* 800C3838 000C0798 41 82 00 28 */ beq lbl_800C3860 @@ -401,7 +401,7 @@ lbl_800C3AF0: /* 800C3B2C 000C0A8C 38 61 00 24 */ addi r3, r1, 0x24 /* 800C3B30 000C0A90 4B F9 B7 F5 */ bl GetConnectedAreaId__Q29IGameArea4DockCFi /* 800C3B34 000C0A94 80 C1 00 24 */ lwz r6, 0x24(r1) -/* 800C3B38 000C0A98 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800C3B38 000C0A98 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800C3B3C 000C0A9C 90 C1 00 30 */ stw r6, 0x30(r1) /* 800C3B40 000C0AA0 7C 06 00 00 */ cmpw r6, r0 /* 800C3B44 000C0AA4 41 82 00 74 */ beq lbl_800C3BB8 @@ -490,7 +490,7 @@ lbl_800C3C00: /* 800C3C7C 000C0BDC 38 61 00 14 */ addi r3, r1, 0x14 /* 800C3C80 000C0BE0 4B F9 B6 A5 */ bl GetConnectedAreaId__Q29IGameArea4DockCFi /* 800C3C84 000C0BE4 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 800C3C88 000C0BE8 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800C3C88 000C0BE8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800C3C8C 000C0BEC 90 A1 00 2C */ stw r5, 0x2c(r1) /* 800C3C90 000C0BF0 7C 05 00 00 */ cmpw r5, r0 /* 800C3C94 000C0BF4 41 82 00 E4 */ beq lbl_800C3D78 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index e1cc8d98..71276af0 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -524,7 +524,7 @@ lbl_8007E598: /* 8007E59C 0007B4FC 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8007E5A0 0007B500 41 82 04 14 */ beq lbl_8007E9B4 /* 8007E5A4 0007B504 A0 7D 02 7C */ lhz r3, 0x27c(r29) -/* 8007E5A8 0007B508 A0 AD A3 8C */ lhz r5, lbl_805A8F4C@sda21(r13) +/* 8007E5A8 0007B508 A0 AD A3 8C */ lhz r5, kInvalidUniqueId@sda21(r13) /* 8007E5AC 0007B50C 7C 03 28 40 */ cmplw r3, r5 /* 8007E5B0 0007B510 41 82 00 10 */ beq lbl_8007E5C0 /* 8007E5B4 0007B514 A0 1E 00 00 */ lhz r0, 0(r30) @@ -596,7 +596,7 @@ lbl_8007E680: .global lbl_8007E6AC lbl_8007E6AC: /* 8007E6AC 0007B60C A0 7D 02 7C */ lhz r3, 0x27c(r29) -/* 8007E6B0 0007B610 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007E6B0 0007B610 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007E6B4 0007B614 7C 03 00 40 */ cmplw r3, r0 /* 8007E6B8 0007B618 41 82 00 80 */ beq lbl_8007E738 /* 8007E6BC 0007B61C A0 1D 02 7C */ lhz r0, 0x27c(r29) @@ -897,9 +897,9 @@ OpenDoor__11CScriptDoorF9TUniqueIdR13CStateManager: /* 8007EAE0 0007BA40 88 1C 02 A8 */ lbz r0, 0x2a8(r28) /* 8007EAE4 0007BA44 50 A0 26 F6 */ rlwimi r0, r5, 4, 0x1b, 0x1b /* 8007EAE8 0007BA48 98 1C 02 A8 */ stb r0, 0x2a8(r28) -/* 8007EAEC 0007BA4C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007EAEC 0007BA4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007EAF0 0007BA50 B0 1C 02 7C */ sth r0, 0x27c(r28) -/* 8007EAF4 0007BA54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007EAF4 0007BA54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007EAF8 0007BA58 B0 1C 02 7E */ sth r0, 0x27e(r28) /* 8007EAFC 0007BA5C A0 1D 00 00 */ lhz r0, 0(r29) /* 8007EB00 0007BA60 B0 01 00 24 */ sth r0, 0x24(r1) @@ -917,7 +917,7 @@ lbl_8007EB28: /* 8007EB2C 0007BA8C 38 80 00 00 */ li r4, 0 /* 8007EB30 0007BA90 4B FF FE A1 */ bl SetDoorAnimation__11CScriptDoorFQ211CScriptDoor13EDoorAnimType /* 8007EB34 0007BA94 A0 7C 02 7C */ lhz r3, 0x27c(r28) -/* 8007EB38 0007BA98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007EB38 0007BA98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007EB3C 0007BA9C 7C 03 00 40 */ cmplw r3, r0 /* 8007EB40 0007BAA0 41 82 00 1C */ beq lbl_8007EB5C /* 8007EB44 0007BAA4 7F 83 E3 78 */ mr r3, r28 @@ -1014,7 +1014,7 @@ lbl_8007EC94: /* 8007EC98 0007BBF8 40 82 FF 10 */ bne lbl_8007EBA8 lbl_8007EC9C: /* 8007EC9C 0007BBFC A0 1C 02 7C */ lhz r0, 0x27c(r28) -/* 8007ECA0 0007BC00 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8007ECA0 0007BC00 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8007ECA4 0007BC04 7C 00 18 40 */ cmplw r0, r3 /* 8007ECA8 0007BC08 40 82 00 90 */ bne lbl_8007ED38 /* 8007ECAC 0007BC0C A0 1C 02 7E */ lhz r0, 0x27e(r28) @@ -1222,7 +1222,7 @@ lbl_8007EF80: /* 8007EF84 0007BEE4 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 8007EF88 0007BEE8 41 82 00 1C */ beq lbl_8007EFA4 /* 8007EF8C 0007BEEC A0 64 02 82 */ lhz r3, 0x282(r4) -/* 8007EF90 0007BEF0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007EF90 0007BEF0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007EF94 0007BEF4 7C 03 00 40 */ cmplw r3, r0 /* 8007EF98 0007BEF8 41 82 00 0C */ beq lbl_8007EFA4 /* 8007EF9C 0007BEFC 38 60 00 01 */ li r3, 1 @@ -1580,13 +1580,13 @@ lbl_8007F420: /* 8007F4B4 0007C414 D0 1E 02 74 */ stfs f0, 0x274(r30) /* 8007F4B8 0007C418 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 8007F4BC 0007C41C D0 1E 02 78 */ stfs f0, 0x278(r30) -/* 8007F4C0 0007C420 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007F4C0 0007C420 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007F4C4 0007C424 B0 1E 02 7C */ sth r0, 0x27c(r30) -/* 8007F4C8 0007C428 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007F4C8 0007C428 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007F4CC 0007C42C B0 1E 02 7E */ sth r0, 0x27e(r30) -/* 8007F4D0 0007C430 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007F4D0 0007C430 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007F4D4 0007C434 B0 1E 02 80 */ sth r0, 0x280(r30) -/* 8007F4D8 0007C438 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007F4D8 0007C438 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007F4DC 0007C43C B0 1E 02 82 */ sth r0, 0x282(r30) /* 8007F4E0 0007C440 48 29 37 61 */ bl GetRotation__12CTransform4fCFv /* 8007F4E4 0007C444 7F 24 CB 78 */ mr r4, r25 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s index 6e416a5f..fa1bbfa2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEMPulse.s @@ -497,7 +497,7 @@ lbl_8018F18C: /* 8018F210 0018C170 38 81 00 98 */ addi r4, r1, 0x98 /* 8018F214 0018C174 38 A0 00 01 */ li r5, 1 /* 8018F218 0018C178 4B F7 75 F5 */ bl sub_8010680c -/* 8018F21C 0018C17C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8018F21C 0018C17C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8018F220 0018C180 38 00 00 00 */ li r0, 0 /* 8018F224 0018C184 80 AD 8E F0 */ lwz r5, lbl_805A7AB0@sda21(r13) /* 8018F228 0018C188 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 08b250cf..470acd60 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -168,7 +168,7 @@ GetSortingBounds__13CScriptEffectCFRC12CTransform4f: /* 8008DBBC 0008AB1C 7C 9F 23 78 */ mr r31, r4 /* 8008DBC0 0008AB20 93 C1 00 18 */ stw r30, 0x18(r1) /* 8008DBC4 0008AB24 7C 7E 1B 78 */ mr r30, r3 -/* 8008DBC8 0008AB28 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008DBC8 0008AB28 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008DBCC 0008AB2C A0 84 01 3C */ lhz r4, 0x13c(r4) /* 8008DBD0 0008AB30 7C 04 00 40 */ cmplw r4, r0 /* 8008DBD4 0008AB34 41 82 00 28 */ beq lbl_8008DBFC @@ -594,7 +594,7 @@ lbl_8008E190: /* 8008E1A0 0008B100 4B FB E4 05 */ bl GetObjectById__13CStateManagerCF9TUniqueId /* 8008E1A4 0008B104 28 03 00 00 */ cmplwi r3, 0 /* 8008E1A8 0008B108 40 82 00 0C */ bne lbl_8008E1B4 -/* 8008E1AC 0008B10C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008E1AC 0008B10C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008E1B0 0008B110 B0 1E 01 3C */ sth r0, 0x13c(r30) lbl_8008E1B4: /* 8008E1B4 0008B114 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 @@ -959,7 +959,7 @@ lbl_8008E6A4: /* 8008E6B4 0008B614 48 00 03 54 */ b lbl_8008EA08 lbl_8008E6B8: /* 8008E6B8 0008B618 A0 7F 01 08 */ lhz r3, 0x108(r31) -/* 8008E6BC 0008B61C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008E6BC 0008B61C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008E6C0 0008B620 7C 03 00 40 */ cmplw r3, r0 /* 8008E6C4 0008B624 41 82 03 44 */ beq lbl_8008EA08 /* 8008E6C8 0008B628 A0 1F 01 08 */ lhz r0, 0x108(r31) @@ -967,7 +967,7 @@ lbl_8008E6B8: /* 8008E6D0 0008B630 38 81 00 24 */ addi r4, r1, 0x24 /* 8008E6D4 0008B634 B0 01 00 24 */ sth r0, 0x24(r1) /* 8008E6D8 0008B638 4B FB DB 95 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 8008E6DC 0008B63C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008E6DC 0008B63C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008E6E0 0008B640 B0 1F 01 08 */ sth r0, 0x108(r31) /* 8008E6E4 0008B644 48 00 03 24 */ b lbl_8008EA08 lbl_8008E6E8: @@ -1231,7 +1231,7 @@ lbl_8008EAA0: /* 8008EAC8 0008BA28 90 01 00 4C */ stw r0, 0x4c(r1) /* 8008EACC 0008BA2C 4B FB 94 51 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 8008EAD0 0008BA30 A2 C1 00 14 */ lhz r22, 0x14(r1) -/* 8008EAD4 0008BA34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008EAD4 0008BA34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008EAD8 0008BA38 7C 16 00 40 */ cmplw r22, r0 /* 8008EADC 0008BA3C 41 82 00 50 */ beq lbl_8008EB2C /* 8008EAE0 0008BA40 80 01 00 D8 */ lwz r0, 0xd8(r1) @@ -1595,7 +1595,7 @@ lbl_8008EFB0: /* 8008EFEC 0008BF4C 90 0D A2 9C */ stw r0, lbl_805A8E5C@sda21(r13) lbl_8008EFF0: /* 8008EFF0 0008BF50 A0 7E 01 08 */ lhz r3, 0x108(r30) -/* 8008EFF4 0008BF54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008EFF4 0008BF54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008EFF8 0008BF58 7C 03 00 40 */ cmplw r3, r0 /* 8008EFFC 0008BF5C 41 82 00 60 */ beq lbl_8008F05C /* 8008F000 0008BF60 A0 1E 01 08 */ lhz r0, 0x108(r30) @@ -1737,7 +1737,7 @@ lbl_8008F11C: /* 8008F200 0008C160 38 61 01 58 */ addi r3, r1, 0x158 /* 8008F204 0008C164 38 81 01 C0 */ addi r4, r1, 0x1c0 /* 8008F208 0008C168 48 07 76 05 */ bl sub_8010680c -/* 8008F20C 0008C16C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8008F20C 0008C16C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8008F210 0008C170 38 00 00 00 */ li r0, 0 /* 8008F214 0008C174 80 AD 85 50 */ lwz r5, lbl_805A7110@sda21(r13) /* 8008F218 0008C178 38 60 00 00 */ li r3, 0 @@ -1834,7 +1834,7 @@ lbl_8008F36C: /* 8008F37C 0008C2DC 38 60 00 00 */ li r3, 0 /* 8008F380 0008C2E0 28 1E 00 00 */ cmplwi r30, 0 /* 8008F384 0008C2E4 90 6F 01 04 */ stw r3, 0x104(r15) -/* 8008F388 0008C2E8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008F388 0008C2E8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008F38C 0008C2EC B0 0F 01 08 */ sth r0, 0x108(r15) /* 8008F390 0008C2F0 92 AF 01 0C */ stw r21, 0x10c(r15) /* 8008F394 0008C2F4 88 0F 01 10 */ lbz r0, 0x110(r15) @@ -1903,7 +1903,7 @@ lbl_8008F400: /* 8008F48C 0008C3EC 38 80 00 01 */ li r4, 1 /* 8008F490 0008C3F0 48 07 5C 45 */ bl __dt__12CActorLightsFv lbl_8008F494: -/* 8008F494 0008C3F4 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 8008F494 0008C3F4 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 8008F498 0008C3F8 3C 15 00 01 */ addis r0, r21, 1 /* 8008F49C 0008C3FC C0 02 8A C8 */ lfs f0, lbl_805AA7E8@sda21(r2) /* 8008F4A0 0008C400 28 00 FF FF */ cmplwi r0, 0xffff diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index f0cb30e6..be447e69 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -82,7 +82,7 @@ lbl_800B45BC: /* 800B45E4 000B1544 90 01 00 AC */ stw r0, 0xac(r1) /* 800B45E8 000B1548 4B F9 39 35 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 800B45EC 000B154C A0 61 00 40 */ lhz r3, 0x40(r1) -/* 800B45F0 000B1550 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B45F0 000B1550 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B45F4 000B1554 B0 61 00 4C */ sth r3, 0x4c(r1) /* 800B45F8 000B1558 7C 03 00 40 */ cmplw r3, r0 /* 800B45FC 000B155C 41 82 00 78 */ beq lbl_800B4674 @@ -173,7 +173,7 @@ lbl_800B470C: /* 800B4728 000B1688 90 01 00 A8 */ stw r0, 0xa8(r1) /* 800B472C 000B168C 4B F9 37 F1 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 800B4730 000B1690 A0 C1 00 38 */ lhz r6, 0x38(r1) -/* 800B4734 000B1694 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B4734 000B1694 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B4738 000B1698 B0 C1 00 48 */ sth r6, 0x48(r1) /* 800B473C 000B169C 7C 06 00 40 */ cmplw r6, r0 /* 800B4740 000B16A0 41 82 00 A8 */ beq lbl_800B47E8 @@ -376,7 +376,7 @@ lbl_800B497C: /* 800B4A10 000B1970 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 800B4A14 000B1974 B0 81 00 44 */ sth r4, 0x44(r1) /* 800B4A18 000B1978 98 1F 0F 94 */ stb r0, 0xf94(r31) -/* 800B4A1C 000B197C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B4A1C 000B197C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B4A20 000B1980 7C 03 00 40 */ cmplw r3, r0 /* 800B4A24 000B1984 41 82 03 7C */ beq lbl_800B4DA0 /* 800B4A28 000B1988 B0 81 00 18 */ sth r4, 0x18(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s index 391de19b..d9896039 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGrapplePoint.s @@ -193,7 +193,7 @@ lbl_8012F904: /* 8012F950 0012C8B0 4B F0 AE 55 */ bl CModelDataNull__10CModelDataFv /* 8012F954 0012C8B4 38 61 00 50 */ addi r3, r1, 0x50 /* 8012F958 0012C8B8 4B EE B4 E1 */ bl None__16CActorParametersFv -/* 8012F95C 0012C8BC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8012F95C 0012C8BC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8012F960 0012C8C0 38 00 00 00 */ li r0, 0 /* 8012F964 0012C8C4 80 AD 8B 20 */ lwz r5, lbl_805A76E0@sda21(r13) /* 8012F968 0012C8C8 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index ddf3c61f..117a37a5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -687,7 +687,7 @@ LineOfSightTest__16CScriptGunTurretCFR13CStateManager: /* 80215FC4 00212F24 93 A1 09 34 */ stw r29, 0x934(r1) /* 80215FC8 00212F28 93 81 09 30 */ stw r28, 0x930(r1) /* 80215FCC 00212F2C 7C 7E 1B 78 */ mr r30, r3 -/* 80215FD0 00212F30 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80215FD0 00212F30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80215FD4 00212F34 A0 63 02 5C */ lhz r3, 0x25c(r3) /* 80215FD8 00212F38 7C 9C 23 78 */ mr r28, r4 /* 80215FDC 00212F3C 7C 03 00 40 */ cmplw r3, r0 @@ -816,7 +816,7 @@ lbl_80216038: /* 802161C0 00213120 93 E1 00 88 */ stw r31, 0x88(r1) /* 802161C4 00213124 90 01 00 90 */ stw r0, 0x90(r1) /* 802161C8 00213128 4B E3 65 11 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC9CVector3fRC9CVector3ffRC15CMaterialFilterPC6CActor" -/* 802161CC 0021312C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802161CC 0021312C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802161D0 00213130 FC 20 F8 90 */ fmr f1, f31 /* 802161D4 00213134 7F 84 E3 78 */ mr r4, r28 /* 802161D8 00213138 38 61 00 98 */ addi r3, r1, 0x98 @@ -1188,7 +1188,7 @@ UpdateGunParticles__16CScriptGunTurretFfR13CStateManager: /* 80216708 00213668 93 A1 03 54 */ stw r29, 0x354(r1) /* 8021670C 0021366C 93 81 03 50 */ stw r28, 0x350(r1) /* 80216710 00213670 7C 7E 1B 78 */ mr r30, r3 -/* 80216714 00213674 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80216714 00213674 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80216718 00213678 A0 63 04 98 */ lhz r3, 0x498(r3) /* 8021671C 0021367C FF E0 08 90 */ fmr f31, f1 /* 80216720 00213680 3B E0 00 00 */ li r31, 0 @@ -2247,7 +2247,7 @@ lbl_802176A0: /* 802176E8 00214648 7F E4 FB 78 */ mr r4, r31 /* 802176EC 0021464C C0 02 B3 68 */ lfs f0, lbl_805AD088@sda21(r2) /* 802176F0 00214650 38 61 00 30 */ addi r3, r1, 0x30 -/* 802176F4 00214654 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802176F4 00214654 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802176F8 00214658 D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 802176FC 0021465C D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80217700 00214660 D0 01 00 A8 */ stfs f0, 0xa8(r1) @@ -2670,7 +2670,7 @@ UpdateHealthInfo__16CScriptGunTurretFR13CStateManager: /* 80217D04 00214C64 48 00 01 18 */ b lbl_80217E1C lbl_80217D08: /* 80217D08 00214C68 A0 9F 02 5C */ lhz r4, 0x25c(r31) -/* 80217D0C 00214C6C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80217D0C 00214C6C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80217D10 00214C70 7C 04 00 40 */ cmplw r4, r0 /* 80217D14 00214C74 41 82 00 80 */ beq lbl_80217D94 /* 80217D18 00214C78 A0 1F 02 5C */ lhz r0, 0x25c(r31) @@ -2692,7 +2692,7 @@ lbl_80217D08: /* 80217D58 00214CB8 38 60 00 00 */ li r3, 0 /* 80217D5C 00214CBC 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 80217D60 00214CC0 98 1F 05 60 */ stb r0, 0x560(r31) -/* 80217D64 00214CC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80217D64 00214CC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80217D68 00214CC8 B0 1F 02 5C */ sth r0, 0x25c(r31) /* 80217D6C 00214CCC 80 1F 05 0C */ lwz r0, 0x50c(r31) /* 80217D70 00214CD0 28 00 00 00 */ cmplwi r0, 0 @@ -2850,7 +2850,7 @@ UpdateGunOrientation__16CScriptGunTurretFfR13CStateManager: /* 80217F8C 00214EEC 93 C1 03 E8 */ stw r30, 0x3e8(r1) /* 80217F90 00214EF0 93 A1 03 E4 */ stw r29, 0x3e4(r1) /* 80217F94 00214EF4 7C 7E 1B 78 */ mr r30, r3 -/* 80217F98 00214EF8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80217F98 00214EF8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80217F9C 00214EFC A0 63 02 5C */ lhz r3, 0x25c(r3) /* 80217FA0 00214F00 FF A0 08 90 */ fmr f29, f1 /* 80217FA4 00214F04 7C 9D 23 78 */ mr r29, r4 @@ -3861,7 +3861,7 @@ ProcessExitTargettingState__16CScriptGunTurretFfR13CStateManager: /* 80218E5C 00215DBC 48 00 00 D8 */ b lbl_80218F34 lbl_80218E60: /* 80218E60 00215DC0 A0 7D 02 5C */ lhz r3, 0x25c(r29) -/* 80218E64 00215DC4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80218E64 00215DC4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80218E68 00215DC8 7C 03 00 40 */ cmplw r3, r0 /* 80218E6C 00215DCC 41 82 00 C8 */ beq lbl_80218F34 /* 80218E70 00215DD0 A0 1D 02 5C */ lhz r0, 0x25c(r29) @@ -3970,7 +3970,7 @@ lbl_80218FE4: /* 80218FEC 00215F4C 7F 84 E3 78 */ mr r4, r28 /* 80218FF0 00215F50 4B FF F8 41 */ bl UpdateTargettingMode__16CScriptGunTurretFfR13CStateManager /* 80218FF4 00215F54 A0 7F 02 5C */ lhz r3, 0x25c(r31) -/* 80218FF8 00215F58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80218FF8 00215F58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80218FFC 00215F5C 7C 03 00 40 */ cmplw r3, r0 /* 80219000 00215F60 41 82 02 00 */ beq lbl_80219200 /* 80219004 00215F64 A0 1F 02 5C */ lhz r0, 0x25c(r31) @@ -4484,7 +4484,7 @@ lbl_80219718: lbl_8021977C: /* 8021977C 002166DC A0 7D 02 5C */ lhz r3, 0x25c(r29) /* 80219780 002166E0 3B E0 00 00 */ li r31, 0 -/* 80219784 002166E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80219784 002166E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80219788 002166E8 7C 03 00 40 */ cmplw r3, r0 /* 8021978C 002166EC 41 82 00 58 */ beq lbl_802197E4 /* 80219790 002166F0 A0 1D 02 5C */ lhz r0, 0x25c(r29) @@ -4701,7 +4701,7 @@ ProcessGunStateMachine__16CScriptGunTurretFfR13CStateManager: /* 80219A48 002169A8 D0 1D 05 24 */ stfs f0, 0x524(r29) /* 80219A4C 002169AC 4B FF D6 D9 */ bl PlayAdditiveChargingAnimation__16CScriptGunTurretFR13CStateManager /* 80219A50 002169B0 A0 7D 02 5C */ lhz r3, 0x25c(r29) -/* 80219A54 002169B4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80219A54 002169B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80219A58 002169B8 7C 03 00 40 */ cmplw r3, r0 /* 80219A5C 002169BC 41 82 00 98 */ beq lbl_80219AF4 /* 80219A60 002169C0 A0 1D 02 5C */ lhz r0, 0x25c(r29) @@ -5440,7 +5440,7 @@ lbl_8021A4C4: /* 8021A4C8 00217428 2C 00 00 01 */ cmpwi r0, 1 /* 8021A4CC 0021742C 40 82 00 28 */ bne lbl_8021A4F4 /* 8021A4D0 00217430 A0 7E 04 98 */ lhz r3, 0x498(r30) -/* 8021A4D4 00217434 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021A4D4 00217434 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021A4D8 00217438 7C 03 00 40 */ cmplw r3, r0 /* 8021A4DC 0021743C 41 82 00 18 */ beq lbl_8021A4F4 /* 8021A4E0 00217440 A0 1E 04 98 */ lhz r0, 0x498(r30) @@ -6108,7 +6108,7 @@ lbl_8021ADF0: /* 8021AE3C 00217D9C 90 1F 00 00 */ stw r0, 0(r31) /* 8021AE40 00217DA0 38 7F 02 D4 */ addi r3, r31, 0x2d4 /* 8021AE44 00217DA4 93 BF 02 58 */ stw r29, 0x258(r31) -/* 8021AE48 00217DA8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021AE48 00217DA8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021AE4C 00217DAC B0 1F 02 5C */ sth r0, 0x25c(r31) /* 8021AE50 00217DB0 D0 1F 02 60 */ stfs f0, 0x260(r31) /* 8021AE54 00217DB4 C0 18 00 00 */ lfs f0, 0(r24) @@ -6168,7 +6168,7 @@ lbl_8021ADF0: /* 8021AF2C 00217E8C 80 19 00 64 */ lwz r0, 0x64(r25) /* 8021AF30 00217E90 90 1F 02 D0 */ stw r0, 0x2d0(r31) /* 8021AF34 00217E94 48 00 08 5D */ bl __ct__20CScriptGunTurretDataFRC20CScriptGunTurretData -/* 8021AF38 00217E98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021AF38 00217E98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021AF3C 00217E9C 38 7F 03 7C */ addi r3, r31, 0x37c /* 8021AF40 00217EA0 38 BB 00 44 */ addi r5, r27, 0x44 /* 8021AF44 00217EA4 B0 1F 03 78 */ sth r0, 0x378(r31) @@ -6618,13 +6618,13 @@ lbl_8021B5C0: /* 8021B5E0 00218540 38 80 00 00 */ li r4, 0 /* 8021B5E4 00218544 48 12 58 5D */ bl __dt__6CTokenFv lbl_8021B5E8: -/* 8021B5E8 00218548 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021B5E8 00218548 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021B5EC 0021854C 38 A0 00 00 */ li r5, 0 /* 8021B5F0 00218550 38 7F 04 A4 */ addi r3, r31, 0x4a4 /* 8021B5F4 00218554 38 81 01 1C */ addi r4, r1, 0x11c /* 8021B5F8 00218558 B0 1F 04 98 */ sth r0, 0x498(r31) /* 8021B5FC 0021855C 90 BF 04 9C */ stw r5, 0x49c(r31) -/* 8021B600 00218560 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021B600 00218560 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021B604 00218564 B0 1F 04 A0 */ sth r0, 0x4a0(r31) /* 8021B608 00218568 98 A1 01 68 */ stb r5, 0x168(r1) /* 8021B60C 0021856C 4B EC CC 21 */ bl sub_800e822c diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 434a983a..81b10f76 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -865,7 +865,7 @@ sub_80289340: /* 802893A0 00286300 38 81 00 08 */ addi r4, r1, 8 /* 802893A4 00286304 B0 01 00 08 */ sth r0, 8(r1) /* 802893A8 00286308 4B DC 2E C5 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 802893AC 0028630C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802893AC 0028630C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802893B0 00286310 B0 1E 00 F4 */ sth r0, 0xf4(r30) /* 802893B4 00286314 A0 1E 00 F4 */ lhz r0, 0xf4(r30) /* 802893B8 00286318 B0 1E 01 0C */ sth r0, 0x10c(r30) @@ -1077,7 +1077,7 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 802896B0 00286610 4B DB 10 F5 */ bl CModelDataNull__10CModelDataFv /* 802896B4 00286614 38 61 00 20 */ addi r3, r1, 0x20 /* 802896B8 00286618 4B D9 17 81 */ bl None__16CActorParametersFv -/* 802896BC 0028661C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802896BC 0028661C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802896C0 00286620 38 80 00 00 */ li r4, 0 /* 802896C4 00286624 A1 94 00 00 */ lhz r12, 0(r20) /* 802896C8 00286628 39 61 00 20 */ addi r11, r1, 0x20 @@ -1113,10 +1113,10 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 80289740 002866A0 93 3F 00 E8 */ stw r25, 0xe8(r31) /* 80289744 002866A4 93 5F 00 EC */ stw r26, 0xec(r31) /* 80289748 002866A8 93 7F 00 F0 */ stw r27, 0xf0(r31) -/* 8028974C 002866AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8028974C 002866AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80289750 002866B0 B0 1F 00 F4 */ sth r0, 0xf4(r31) /* 80289754 002866B4 D0 1F 00 F8 */ stfs f0, 0xf8(r31) -/* 80289758 002866B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80289758 002866B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8028975C 002866BC B0 1F 00 FC */ sth r0, 0xfc(r31) /* 80289760 002866C0 C0 1C 00 00 */ lfs f0, 0(r28) /* 80289764 002866C4 D0 1F 01 00 */ stfs f0, 0x100(r31) @@ -1124,7 +1124,7 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 8028976C 002866CC D0 1F 01 04 */ stfs f0, 0x104(r31) /* 80289770 002866D0 C0 1C 00 08 */ lfs f0, 8(r28) /* 80289774 002866D4 D0 1F 01 08 */ stfs f0, 0x108(r31) -/* 80289778 002866D8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80289778 002866D8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8028977C 002866DC B0 1F 01 0C */ sth r0, 0x10c(r31) /* 80289780 002866E0 C0 1D 00 00 */ lfs f0, 0(r29) /* 80289784 002866E4 D0 1F 01 10 */ stfs f0, 0x110(r31) @@ -1132,7 +1132,7 @@ Accept__15CScriptMazeNodeFR8IVisitor: /* 8028978C 002866EC D0 1F 01 14 */ stfs f0, 0x114(r31) /* 80289790 002866F0 C0 1D 00 08 */ lfs f0, 8(r29) /* 80289794 002866F4 D0 1F 01 18 */ stfs f0, 0x118(r31) -/* 80289798 002866F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80289798 002866F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8028979C 002866FC B0 1F 01 1C */ sth r0, 0x11c(r31) /* 802897A0 00286700 C0 1E 00 00 */ lfs f0, 0(r30) /* 802897A4 00286704 D0 1F 01 20 */ stfs f0, 0x120(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index ab3c9690..5ce4e67d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -217,7 +217,7 @@ lbl_800C2790: /* 800C280C 000BF76C A0 81 00 18 */ lhz r4, 0x18(r1) /* 800C2810 000BF770 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 800C2814 000BF774 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l -/* 800C2818 000BF778 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 800C2818 000BF778 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 800C281C 000BF77C B0 81 00 1C */ sth r4, 0x1c(r1) /* 800C2820 000BF780 38 61 00 84 */ addi r3, r1, 0x84 /* 800C2824 000BF784 38 81 00 34 */ addi r4, r1, 0x34 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index cfb797d3..a15bd1ed 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -348,7 +348,7 @@ GeneratePickup__22CScriptPickupGeneratorFR13CStateManager9TUniqueId9TEditorId: /* 8015E300 0015B260 54 83 04 3E */ clrlwi r3, r4, 0x10 /* 8015E304 0015B264 B0 81 00 20 */ sth r4, 0x20(r1) /* 8015E308 0015B268 98 1F 0F 94 */ stb r0, 0xf94(r31) -/* 8015E30C 0015B26C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015E30C 0015B26C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015E310 0015B270 7C 03 00 40 */ cmplw r3, r0 /* 8015E314 0015B274 41 82 01 34 */ beq lbl_8015E448 /* 8015E318 0015B278 B0 81 00 10 */ sth r4, 0x10(r1) @@ -476,7 +476,7 @@ lbl_8015E4B8: /* 8015E4E0 0015B440 90 01 00 14 */ stw r0, 0x14(r1) /* 8015E4E4 0015B444 4B EE 9A 39 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 8015E4E8 0015B448 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 8015E4EC 0015B44C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015E4EC 0015B44C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015E4F0 0015B450 B0 61 00 10 */ sth r3, 0x10(r1) /* 8015E4F4 0015B454 7C 03 00 40 */ cmplw r3, r0 /* 8015E4F8 0015B458 41 82 01 FC */ beq lbl_8015E6F4 @@ -680,7 +680,7 @@ lbl_8015E798: /* 8015E7C0 0015B720 90 01 00 14 */ stw r0, 0x14(r1) /* 8015E7C4 0015B724 4B EE 97 59 */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 8015E7C8 0015B728 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 8015E7CC 0015B72C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015E7CC 0015B72C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015E7D0 0015B730 B0 61 00 10 */ sth r3, 0x10(r1) /* 8015E7D4 0015B734 7C 03 00 40 */ cmplw r3, r0 /* 8015E7D8 0015B738 41 82 00 78 */ beq lbl_8015E850 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 4603b2e6..6e237281 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -186,7 +186,7 @@ GetSortingBounds__15CScriptPlatformCFRC12CTransform4f: /* 800B0CF4 000ADC54 7C 9E 23 78 */ mr r30, r4 /* 800B0CF8 000ADC58 93 A1 00 14 */ stw r29, 0x14(r1) /* 800B0CFC 000ADC5C 7C 7D 1B 78 */ mr r29, r3 -/* 800B0D00 000ADC60 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B0D00 000ADC60 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B0D04 000ADC64 A0 84 03 54 */ lhz r4, 0x354(r4) /* 800B0D08 000ADC68 7C 04 00 40 */ cmplw r4, r0 /* 800B0D0C 000ADC6C 41 82 00 28 */ beq lbl_800B0D34 @@ -446,7 +446,7 @@ lbl_800B10A8: /* 800B10B8 000AE018 4B F9 B4 ED */ bl GetObjectById__13CStateManagerCF9TUniqueId /* 800B10BC 000AE01C 28 03 00 00 */ cmplwi r3, 0 /* 800B10C0 000AE020 40 82 00 0C */ bne lbl_800B10CC -/* 800B10C4 000AE024 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B10C4 000AE024 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B10C8 000AE028 B0 1B 03 54 */ sth r0, 0x354(r27) lbl_800B10CC: /* 800B10CC 000AE02C BB 41 00 28 */ lmw r26, 0x28(r1) @@ -465,7 +465,7 @@ Move__15CScriptPlatformFR13CStateManager: /* 800B10F4 000AE054 13 E1 00 0E */ psq_stx f31, r1, r0, 0, qr0 /* 800B10F8 000AE058 BF 21 11 84 */ stmw r25, 0x1184(r1) /* 800B10FC 000AE05C 7C 9F 23 78 */ mr r31, r4 -/* 800B1100 000AE060 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B1100 000AE060 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B1104 000AE064 A0 C4 02 5A */ lhz r6, 0x25a(r4) /* 800B1108 000AE068 FF E0 08 90 */ fmr f31, f1 /* 800B110C 000AE06C 7C 7E 1B 78 */ mr r30, r3 @@ -492,7 +492,7 @@ lbl_800B1144: /* 800B115C 000AE0BC 38 61 00 68 */ addi r3, r1, 0x68 /* 800B1160 000AE0C0 4B FF 53 ED */ bl "__ct__29TCastToPtr<15CScriptWaypoint>FP7CEntity" /* 800B1164 000AE0C4 A0 9F 02 58 */ lhz r4, 0x258(r31) -/* 800B1168 000AE0C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B1168 000AE0C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B116C 000AE0CC 80 63 00 04 */ lwz r3, 4(r3) /* 800B1170 000AE0D0 7C 04 00 40 */ cmplw r4, r0 /* 800B1174 000AE0D4 41 82 00 88 */ beq lbl_800B11FC @@ -509,7 +509,7 @@ lbl_800B1144: /* 800B11A0 000AE100 38 A1 00 40 */ addi r5, r1, 0x40 /* 800B11A4 000AE104 48 00 28 29 */ bl GetNext__15CScriptPlatformF9TUniqueIdR13CStateManager /* 800B11A8 000AE108 A0 61 00 44 */ lhz r3, 0x44(r1) -/* 800B11AC 000AE10C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B11AC 000AE10C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B11B0 000AE110 B0 61 00 54 */ sth r3, 0x54(r1) /* 800B11B4 000AE114 7C 03 00 40 */ cmplw r3, r0 /* 800B11B8 000AE118 40 82 00 44 */ bne lbl_800B11FC @@ -531,7 +531,7 @@ lbl_800B1144: /* 800B11F8 000AE158 B0 01 00 54 */ sth r0, 0x54(r1) lbl_800B11FC: /* 800B11FC 000AE15C A0 61 00 54 */ lhz r3, 0x54(r1) -/* 800B1200 000AE160 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B1200 000AE160 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B1204 000AE164 7C 03 00 40 */ cmplw r3, r0 /* 800B1208 000AE168 40 82 00 2C */ bne lbl_800B1234 /* 800B120C 000AE16C 3C 60 80 5A */ lis r3, lbl_805A6660@ha @@ -562,7 +562,7 @@ lbl_800B1248: /* 800B1268 000AE1C8 83 43 00 04 */ lwz r26, 4(r3) /* 800B126C 000AE1CC 28 1A 00 00 */ cmplwi r26, 0 /* 800B1270 000AE1D0 40 82 00 10 */ bne lbl_800B1280 -/* 800B1274 000AE1D4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B1274 000AE1D4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B1278 000AE1D8 B0 01 00 54 */ sth r0, 0x54(r1) /* 800B127C 000AE1DC 48 00 09 30 */ b lbl_800B1BAC lbl_800B1280: @@ -626,7 +626,7 @@ lbl_800B1344: /* 800B1360 000AE2C0 A0 01 00 24 */ lhz r0, 0x24(r1) /* 800B1364 000AE2C4 B0 01 00 54 */ sth r0, 0x54(r1) lbl_800B1368: -/* 800B1368 000AE2C8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 800B1368 000AE2C8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 800B136C 000AE2CC A0 01 00 54 */ lhz r0, 0x54(r1) /* 800B1370 000AE2D0 7C 03 00 40 */ cmplw r3, r0 /* 800B1374 000AE2D4 40 82 08 28 */ bne lbl_800B1B9C @@ -1216,7 +1216,7 @@ lbl_800B1B94: /* 800B1B98 000AEAF8 90 01 09 78 */ stw r0, 0x978(r1) lbl_800B1B9C: /* 800B1B9C 000AEAFC A0 61 00 54 */ lhz r3, 0x54(r1) -/* 800B1BA0 000AEB00 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B1BA0 000AEB00 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B1BA4 000AEB04 7C 03 00 40 */ cmplw r3, r0 /* 800B1BA8 000AEB08 40 82 F6 A0 */ bne lbl_800B1248 lbl_800B1BAC: @@ -1725,7 +1725,7 @@ lbl_800B2270: /* 800B2288 000AF1E8 A0 01 00 60 */ lhz r0, 0x60(r1) /* 800B228C 000AF1EC B0 1C 02 5A */ sth r0, 0x25a(r28) /* 800B2290 000AF1F0 A0 7C 02 5A */ lhz r3, 0x25a(r28) -/* 800B2294 000AF1F4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B2294 000AF1F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B2298 000AF1F8 7C 03 00 40 */ cmplw r3, r0 /* 800B229C 000AF1FC 40 82 00 28 */ bne lbl_800B22C4 /* 800B22A0 000AF200 A0 1C 00 08 */ lhz r0, 8(r28) @@ -1852,7 +1852,7 @@ lbl_800B2448: /* 800B2460 000AF3C0 A0 01 00 3C */ lhz r0, 0x3c(r1) /* 800B2464 000AF3C4 B0 1C 02 5A */ sth r0, 0x25a(r28) /* 800B2468 000AF3C8 A0 7C 02 5A */ lhz r3, 0x25a(r28) -/* 800B246C 000AF3CC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B246C 000AF3CC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B2470 000AF3D0 7C 03 00 40 */ cmplw r3, r0 /* 800B2474 000AF3D4 40 82 00 28 */ bne lbl_800B249C /* 800B2478 000AF3D8 A0 1C 00 08 */ lhz r0, 8(r28) @@ -3086,7 +3086,7 @@ lbl_800B35E4: /* 800B35F8 000B0558 FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 800B35FC 000B055C 4C 40 13 82 */ cror 2, 0, 2 /* 800B3600 000B0560 40 82 00 44 */ bne lbl_800B3644 -/* 800B3604 000B0564 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B3604 000B0564 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B3608 000B0568 7F E3 FB 78 */ mr r3, r31 /* 800B360C 000B056C 38 81 00 0C */ addi r4, r1, 0xc /* 800B3610 000B0570 38 A1 00 08 */ addi r5, r1, 8 @@ -3443,7 +3443,7 @@ lbl_800B3AE0: /* 800B3AEC 000B0A4C 7C 03 02 14 */ add r0, r3, r0 /* 800B3AF0 000B0A50 7C 06 00 40 */ cmplw r6, r0 /* 800B3AF4 000B0A54 40 82 FF C0 */ bne lbl_800B3AB4 -/* 800B3AF8 000B0A58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B3AF8 000B0A58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B3AFC 000B0A5C B0 1F 00 00 */ sth r0, 0(r31) lbl_800B3B00: /* 800B3B00 000B0A60 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3788,9 +3788,9 @@ lbl_800B3DE8: /* 800B3FD4 000B0F34 3C 80 80 5A */ lis r4, skZero3f@ha /* 800B3FD8 000B0F38 90 1F 00 00 */ stw r0, 0(r31) /* 800B3FDC 000B0F3C 3C 60 80 5A */ lis r3, lbl_805A6660@ha -/* 800B3FE0 000B0F40 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B3FE0 000B0F40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B3FE4 000B0F44 B0 1F 02 58 */ sth r0, 0x258(r31) -/* 800B3FE8 000B0F48 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B3FE8 000B0F48 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B3FEC 000B0F4C B0 1F 02 5A */ sth r0, 0x25a(r31) /* 800B3FF0 000B0F50 D3 DF 02 5C */ stfs f30, 0x25c(r31) /* 800B3FF4 000B0F54 D0 1F 02 60 */ stfs f0, 0x260(r31) @@ -3905,7 +3905,7 @@ lbl_800B416C: /* 800B41A4 000B1104 D3 FF 03 48 */ stfs f31, 0x348(r31) /* 800B41A8 000B1108 91 DF 03 4C */ stw r14, 0x34c(r31) /* 800B41AC 000B110C 93 3F 03 50 */ stw r25, 0x350(r31) -/* 800B41B0 000B1110 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800B41B0 000B1110 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800B41B4 000B1114 B0 1F 03 54 */ sth r0, 0x354(r31) /* 800B41B8 000B1118 88 1F 03 56 */ lbz r0, 0x356(r31) /* 800B41BC 000B111C 50 C0 3E 30 */ rlwimi r0, r6, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s index 3d7e382e..1408546f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerActor.s @@ -221,7 +221,7 @@ SetIntoStateManager__18CScriptPlayerActorFR13CStateManagerb: /* 801AA430 001A7390 40 82 00 24 */ bne lbl_801AA454 /* 801AA434 001A7394 A0 7D 03 56 */ lhz r3, 0x356(r29) /* 801AA438 001A7398 B0 7E 0F 6C */ sth r3, 0xf6c(r30) -/* 801AA43C 001A739C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AA43C 001A739C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AA440 001A73A0 B0 61 00 24 */ sth r3, 0x24(r1) /* 801AA444 001A73A4 B0 61 00 28 */ sth r3, 0x28(r1) /* 801AA448 001A73A8 B0 01 00 20 */ sth r0, 0x20(r1) @@ -243,7 +243,7 @@ lbl_801AA468: /* 801AA480 001A73E0 41 82 00 A8 */ beq lbl_801AA528 /* 801AA484 001A73E4 A0 7D 03 56 */ lhz r3, 0x356(r29) /* 801AA488 001A73E8 B0 7B 03 56 */ sth r3, 0x356(r27) -/* 801AA48C 001A73EC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AA48C 001A73EC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AA490 001A73F0 B0 61 00 18 */ sth r3, 0x18(r1) /* 801AA494 001A73F4 B0 61 00 1C */ sth r3, 0x1c(r1) /* 801AA498 001A73F8 B0 01 00 14 */ sth r0, 0x14(r1) @@ -269,13 +269,13 @@ lbl_801AA4A4: /* 801AA4E4 001A7444 B0 01 00 2C */ sth r0, 0x2c(r1) /* 801AA4E8 001A7448 48 00 00 14 */ b lbl_801AA4FC lbl_801AA4EC: -/* 801AA4EC 001A744C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AA4EC 001A744C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AA4F0 001A7450 B0 01 00 2C */ sth r0, 0x2c(r1) /* 801AA4F4 001A7454 B0 01 00 0C */ sth r0, 0xc(r1) /* 801AA4F8 001A7458 B0 1D 03 56 */ sth r0, 0x356(r29) lbl_801AA4FC: /* 801AA4FC 001A745C A0 61 00 2C */ lhz r3, 0x2c(r1) -/* 801AA500 001A7460 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AA500 001A7460 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AA504 001A7464 7C 03 00 40 */ cmplw r3, r0 /* 801AA508 001A7468 40 82 FF 60 */ bne lbl_801AA468 /* 801AA50C 001A746C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 @@ -1311,11 +1311,11 @@ lbl_801AB2F4: /* 801AB33C 001A829C B0 01 00 0C */ sth r0, 0xc(r1) /* 801AB340 001A82A0 48 00 00 0C */ b lbl_801AB34C lbl_801AB344: -/* 801AB344 001A82A4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AB344 001A82A4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AB348 001A82A8 B0 01 00 0C */ sth r0, 0xc(r1) lbl_801AB34C: /* 801AB34C 001A82AC A0 61 00 0C */ lhz r3, 0xc(r1) -/* 801AB350 001A82B0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AB350 001A82B0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AB354 001A82B4 7C 03 00 40 */ cmplw r3, r0 /* 801AB358 001A82B8 40 82 FF 9C */ bne lbl_801AB2F4 /* 801AB35C 001A82BC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2297,7 +2297,7 @@ lbl_801ABFAC: /* 801AC154 001A90B4 88 1C 03 55 */ lbz r0, 0x355(r28) /* 801AC158 001A90B8 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 801AC15C 001A90BC 98 1C 03 55 */ stb r0, 0x355(r28) -/* 801AC160 001A90C0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801AC160 001A90C0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801AC164 001A90C4 B0 1C 03 56 */ sth r0, 0x356(r28) /* 801AC168 001A90C8 4B EA 77 55 */ bl GetMaterialFilter__6CActorCFv /* 801AC16C 001A90CC 83 A3 00 08 */ lwz r29, 8(r3) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s index a6c3d892..529426ca 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlayerHint.s @@ -157,7 +157,7 @@ lbl_8015B990: /* 8015B9C8 00158928 98 1C 00 FC */ stb r0, 0xfc(r28) /* 8015B9CC 0015892C 48 00 00 A0 */ b lbl_8015BA6C lbl_8015B9D0: -/* 8015B9D0 00158930 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015B9D0 00158930 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015B9D4 00158934 B0 1C 01 08 */ sth r0, 0x108(r28) /* 8015B9D8 00158938 80 1C 01 04 */ lwz r0, 0x104(r28) /* 8015B9DC 0015893C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 @@ -395,7 +395,7 @@ lbl_8015BCB0: /* 8015BCF0 00158C50 4B ED EA B5 */ bl CModelDataNull__10CModelDataFv /* 8015BCF4 00158C54 38 61 00 20 */ addi r3, r1, 0x20 /* 8015BCF8 00158C58 4B EB F1 41 */ bl None__16CActorParametersFv -/* 8015BCFC 00158C5C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8015BCFC 00158C5C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8015BD00 00158C60 38 00 00 00 */ li r0, 0 /* 8015BD04 00158C64 80 AD 8C B0 */ lwz r5, lbl_805A7870@sda21(r13) /* 8015BD08 00158C68 38 60 00 00 */ li r3, 0 @@ -440,7 +440,7 @@ lbl_8015BCB0: /* 8015BDA4 00158D04 98 1F 00 FC */ stb r0, 0xfc(r31) /* 8015BDA8 00158D08 93 BF 01 00 */ stw r29, 0x100(r31) /* 8015BDAC 00158D0C 93 DF 01 04 */ stw r30, 0x104(r31) -/* 8015BDB0 00158D10 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015BDB0 00158D10 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015BDB4 00158D14 B0 1F 01 08 */ sth r0, 0x108(r31) /* 8015BDB8 00158D18 BB 01 00 E0 */ lmw r24, 0xe0(r1) /* 8015BDBC 00158D1C 80 01 01 04 */ lwz r0, 0x104(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s index 465f20f7..483ba37a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPointOfInterest.s @@ -248,7 +248,7 @@ lbl_8015ED18: /* 8015ED7C 0015BCDC 38 61 00 20 */ addi r3, r1, 0x20 /* 8015ED80 0015BCE0 38 81 00 88 */ addi r4, r1, 0x88 /* 8015ED84 0015BCE4 4B FA 7A E9 */ bl Scannable__16CActorParametersCFRC20CScannableParameters -/* 8015ED88 0015BCE8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8015ED88 0015BCE8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8015ED8C 0015BCEC 38 00 00 00 */ li r0, 0 /* 8015ED90 0015BCF0 80 AD 8C E8 */ lwz r5, lbl_805A78A8@sda21(r13) /* 8015ED94 0015BCF4 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s index 6d694d93..e44b0fc7 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptProjectedShadow.s @@ -180,7 +180,7 @@ lbl_8029EECC: /* 8029EECC 0029BE2C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8029EED0 0029BE30 40 82 00 10 */ bne lbl_8029EEE0 lbl_8029EED4: -/* 8029EED4 0029BE34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029EED4 0029BE34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029EED8 0029BE38 B0 1E 01 04 */ sth r0, 0x104(r30) /* 8029EEDC 0029BE3C 48 00 00 6C */ b lbl_8029EF48 lbl_8029EEE0: @@ -306,7 +306,7 @@ lbl_8029F068: /* 8029F07C 0029BFDC 40 82 FF 58 */ bne lbl_8029EFD4 lbl_8029F080: /* 8029F080 0029BFE0 A0 7E 01 04 */ lhz r3, 0x104(r30) -/* 8029F084 0029BFE4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029F084 0029BFE4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029F088 0029BFE8 7C 03 00 40 */ cmplw r3, r0 /* 8029F08C 0029BFEC 40 82 00 20 */ bne lbl_8029F0AC /* 8029F090 0029BFF0 A0 1E 00 08 */ lhz r0, 8(r30) @@ -321,7 +321,7 @@ lbl_8029F0AC: /* 8029F0B0 0029C010 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8029F0B4 0029C014 41 82 00 6C */ beq lbl_8029F120 /* 8029F0B8 0029C018 A0 7E 01 04 */ lhz r3, 0x104(r30) -/* 8029F0BC 0029C01C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029F0BC 0029C01C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029F0C0 0029C020 7C 03 00 40 */ cmplw r3, r0 /* 8029F0C4 0029C024 41 82 00 5C */ beq lbl_8029F120 /* 8029F0C8 0029C028 C0 3E 00 FC */ lfs f1, 0xfc(r30) @@ -406,7 +406,7 @@ lbl_8029F164: /* 8029F1E8 0029C148 4B D9 B5 BD */ bl CModelDataNull__10CModelDataFv /* 8029F1EC 0029C14C 38 61 00 20 */ addi r3, r1, 0x20 /* 8029F1F0 0029C150 4B D7 BC 49 */ bl None__16CActorParametersFv -/* 8029F1F4 0029C154 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029F1F4 0029C154 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029F1F8 0029C158 38 80 00 00 */ li r4, 0 /* 8029F1FC 0029C15C A1 97 00 00 */ lhz r12, 0(r23) /* 8029F200 0029C160 39 61 00 20 */ addi r11, r1, 0x20 @@ -458,7 +458,7 @@ lbl_8029F2B0: /* 8029F2B0 0029C210 D0 1F 01 00 */ stfs f0, 0x100(r31) /* 8029F2B4 0029C214 38 A0 00 00 */ li r5, 0 /* 8029F2B8 0029C218 7F E3 FB 78 */ mr r3, r31 -/* 8029F2BC 0029C21C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8029F2BC 0029C21C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8029F2C0 0029C220 B0 1F 01 04 */ sth r0, 0x104(r31) /* 8029F2C4 0029C224 90 BF 01 08 */ stw r5, 0x108(r31) /* 8029F2C8 0029C228 93 DF 01 0C */ stw r30, 0x10c(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s index 4fb7b557..a6ab3896 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRelay.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRelay.s @@ -137,7 +137,7 @@ lbl_800E21EC: /* 800E21FC 000DF15C 4B F6 A3 79 */ bl ObjectById__13CStateManagerF9TUniqueId /* 800E2200 000DF160 28 03 00 00 */ cmplwi r3, 0 /* 800E2204 000DF164 40 82 00 10 */ bne lbl_800E2214 -/* 800E2208 000DF168 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E2208 000DF168 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E220C 000DF16C B0 01 00 10 */ sth r0, 0x10(r1) /* 800E2210 000DF170 48 00 00 28 */ b lbl_800E2238 lbl_800E2214: @@ -148,12 +148,12 @@ lbl_800E221C: /* 800E2220 000DF180 A0 1E 00 08 */ lhz r0, 8(r30) /* 800E2224 000DF184 7C 03 00 40 */ cmplw r3, r0 /* 800E2228 000DF188 41 82 00 10 */ beq lbl_800E2238 -/* 800E222C 000DF18C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E222C 000DF18C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E2230 000DF190 7C 03 00 40 */ cmplw r3, r0 /* 800E2234 000DF194 40 82 FF B8 */ bne lbl_800E21EC lbl_800E2238: /* 800E2238 000DF198 A0 61 00 10 */ lhz r3, 0x10(r1) -/* 800E223C 000DF19C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E223C 000DF19C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E2240 000DF1A0 7C 03 00 40 */ cmplw r3, r0 /* 800E2244 000DF1A4 40 82 00 24 */ bne lbl_800E2268 /* 800E2248 000DF1A8 A0 1F 0F 76 */ lhz r0, 0xf76(r31) @@ -205,7 +205,7 @@ lbl_800E22E0: /* 800E22E0 000DF240 28 04 00 00 */ cmplwi r4, 0 /* 800E22E4 000DF244 41 82 00 14 */ beq lbl_800E22F8 /* 800E22E8 000DF248 A0 64 00 00 */ lhz r3, 0(r4) -/* 800E22EC 000DF24C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800E22EC 000DF24C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800E22F0 000DF250 7C 03 00 40 */ cmplw r3, r0 /* 800E22F4 000DF254 40 82 FF B4 */ bne lbl_800E22A8 lbl_800E22F8: @@ -236,7 +236,7 @@ lbl_800E22F8: /* 800E234C 000DF2AC 38 83 F8 30 */ addi r4, r3, lbl_803DF830@l /* 800E2350 000DF2B0 7F E3 FB 78 */ mr r3, r31 /* 800E2354 000DF2B4 90 9F 00 00 */ stw r4, 0(r31) -/* 800E2358 000DF2B8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800E2358 000DF2B8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800E235C 000DF2BC B0 9F 00 34 */ sth r4, 0x34(r31) /* 800E2360 000DF2C0 90 1F 00 38 */ stw r0, 0x38(r31) /* 800E2364 000DF2C4 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s index 03dbbffb..29d6da4f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptRoomAcoustics.s @@ -50,7 +50,7 @@ DisableAuxCallbacks__20CScriptRoomAcousticsFv: /* 8019DD68 0019ACC8 7C 08 02 A6 */ mflr r0 /* 8019DD6C 0019ACCC 90 01 00 14 */ stw r0, 0x14(r1) /* 8019DD70 0019ACD0 48 14 A6 C9 */ bl DisableAuxProcessing__11CSfxManagerFv -/* 8019DD74 0019ACD4 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8019DD74 0019ACD4 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8019DD78 0019ACD8 90 0D A4 88 */ stw r0, lbl_805A9048@sda21(r13) /* 8019DD7C 0019ACDC 48 1A CA 81 */ bl GetDefaultVolumeScale__9CAudioSysFv /* 8019DD80 0019ACE0 48 1A CA 8D */ bl SetVolumeScale__9CAudioSysFs @@ -209,7 +209,7 @@ lbl_8019DF98: /* 8019DFA0 0019AF00 7C 03 00 00 */ cmpw r3, r0 /* 8019DFA4 0019AF04 40 82 00 18 */ bne lbl_8019DFBC /* 8019DFA8 0019AF08 48 14 A4 91 */ bl DisableAuxProcessing__11CSfxManagerFv -/* 8019DFAC 0019AF0C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8019DFAC 0019AF0C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8019DFB0 0019AF10 90 0D A4 88 */ stw r0, lbl_805A9048@sda21(r13) /* 8019DFB4 0019AF14 48 1A C8 49 */ bl GetDefaultVolumeScale__9CAudioSysFv /* 8019DFB8 0019AF18 48 1A C8 55 */ bl SetVolumeScale__9CAudioSysFs @@ -381,6 +381,6 @@ Accept__20CScriptRoomAcousticsFR8IVisitor: .global __sinit_CScriptRoomAcoustics_cpp __sinit_CScriptRoomAcoustics_cpp: -/* 8019E234 0019B194 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8019E234 0019B194 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8019E238 0019B198 90 0D A4 88 */ stw r0, lbl_805A9048@sda21(r13) /* 8019E23C 0019B19C 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index ab773e18..c962a68b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -997,7 +997,7 @@ PreThink__12CScriptSoundFfR13CStateManager: /* 800B0A24 000AD984 4B F8 9D 81 */ bl CModelDataNull__10CModelDataFv /* 800B0A28 000AD988 38 61 00 20 */ addi r3, r1, 0x20 /* 800B0A2C 000AD98C 4B F6 A4 0D */ bl None__16CActorParametersFv -/* 800B0A30 000AD990 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 800B0A30 000AD990 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 800B0A34 000AD994 38 00 00 00 */ li r0, 0 /* 800B0A38 000AD998 80 AD 86 20 */ lwz r5, lbl_805A71E0@sda21(r13) /* 800B0A3C 000AD99C 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index 9d51620e..3e795e37 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -1089,7 +1089,7 @@ ThinkObjectFollowObject__22CScriptSpecialFunctionFfR13CStateManager: /* 8014FEA8 0014CE08 7C 9E 23 78 */ mr r30, r4 /* 8014FEAC 0014CE0C 93 A1 00 54 */ stw r29, 0x54(r1) /* 8014FEB0 0014CE10 7C 7D 1B 78 */ mr r29, r3 -/* 8014FEB4 0014CE14 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8014FEB4 0014CE14 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8014FEB8 0014CE18 83 E3 00 2C */ lwz r31, 0x2c(r3) /* 8014FEBC 0014CE1C B0 01 00 1C */ sth r0, 0x1c(r1) /* 8014FEC0 0014CE20 B0 01 00 18 */ sth r0, 0x18(r1) @@ -1212,7 +1212,7 @@ ThinkObjectFollowLocator__22CScriptSpecialFunctionFfR13CStateManager: /* 8015006C 0014CFCC 7C 9E 23 78 */ mr r30, r4 /* 80150070 0014CFD0 93 A1 00 E4 */ stw r29, 0xe4(r1) /* 80150074 0014CFD4 7C 7D 1B 78 */ mr r29, r3 -/* 80150078 0014CFD8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80150078 0014CFD8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015007C 0014CFDC 83 E3 00 2C */ lwz r31, 0x2c(r3) /* 80150080 0014CFE0 B0 01 00 1C */ sth r0, 0x1c(r1) /* 80150084 0014CFE4 B0 01 00 18 */ sth r0, 0x18(r1) @@ -1293,7 +1293,7 @@ lbl_80150184: /* 80150194 0014D0F4 7C 1F 00 40 */ cmplw r31, r0 /* 80150198 0014D0F8 40 82 FE F4 */ bne lbl_8015008C /* 8015019C 0014D0FC A0 01 00 1C */ lhz r0, 0x1c(r1) -/* 801501A0 0014D100 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801501A0 0014D100 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801501A4 0014D104 7C 00 18 40 */ cmplw r0, r3 /* 801501A8 0014D108 41 82 00 C8 */ beq lbl_80150270 /* 801501AC 0014D10C A0 01 00 18 */ lhz r0, 0x18(r1) @@ -2901,7 +2901,7 @@ SkipCinematic__22CScriptSpecialFunctionFR13CStateManager: /* 8015183C 0014E79C 38 80 00 09 */ li r4, 9 /* 80151840 0014E7A0 7F E5 FB 78 */ mr r5, r31 /* 80151844 0014E7A4 4B EF F8 7D */ bl SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage -/* 80151848 0014E7A8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80151848 0014E7A8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8015184C 0014E7AC B0 01 00 08 */ sth r0, 8(r1) /* 80151850 0014E7B0 B0 1F 0F 38 */ sth r0, 0xf38(r31) /* 80151854 0014E7B4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -3539,7 +3539,7 @@ lbl_801520EC: lbl_80152124: /* 80152124 0014F084 2C 1C 00 05 */ cmpwi r28, 5 /* 80152128 0014F088 40 82 07 78 */ bne lbl_801528A0 -/* 8015212C 0014F08C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8015212C 0014F08C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80152130 0014F090 7F C3 F3 78 */ mr r3, r30 /* 80152134 0014F094 C0 22 9D 9C */ lfs f1, lbl_805ABABC@sda21(r2) /* 80152138 0014F098 38 81 00 18 */ addi r4, r1, 0x18 @@ -3601,7 +3601,7 @@ lbl_801521C4: lbl_801521F4: /* 801521F4 0014F154 2C 1C 00 05 */ cmpwi r28, 5 /* 801521F8 0014F158 40 82 06 A8 */ bne lbl_801528A0 -/* 801521FC 0014F15C A0 ED A3 8C */ lhz r7, lbl_805A8F4C@sda21(r13) +/* 801521FC 0014F15C A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 80152200 0014F160 38 81 00 AC */ addi r4, r1, 0xac /* 80152204 0014F164 38 A0 00 01 */ li r5, 1 /* 80152208 0014F168 B0 FE 0F 38 */ sth r7, 0xf38(r30) @@ -4368,7 +4368,7 @@ lbl_80152BA8: /* 80152C48 0014FBA8 4B EE 7B 5D */ bl CModelDataNull__10CModelDataFv /* 80152C4C 0014FBAC 38 61 00 50 */ addi r3, r1, 0x50 /* 80152C50 0014FBB0 4B EC 81 E9 */ bl None__16CActorParametersFv -/* 80152C54 0014FBB4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80152C54 0014FBB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80152C58 0014FBB8 38 80 00 00 */ li r4, 0 /* 80152C5C 0014FBBC A1 9B 00 00 */ lhz r12, 0(r27) /* 80152C60 0014FBC0 39 61 00 50 */ addi r11, r1, 0x50 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s index cae46890..2ea33a41 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallAttractionSurface.s @@ -191,7 +191,7 @@ lbl_8014AF00: /* 8014AF4C 00147EAC 4B EE F8 59 */ bl CModelDataNull__10CModelDataFv /* 8014AF50 00147EB0 38 61 00 98 */ addi r3, r1, 0x98 /* 8014AF54 00147EB4 4B EC FE E5 */ bl None__16CActorParametersFv -/* 8014AF58 00147EB8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8014AF58 00147EB8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8014AF5C 00147EBC 38 00 00 00 */ li r0, 0 /* 8014AF60 00147EC0 80 AD 8B F0 */ lwz r5, lbl_805A77B0@sda21(r13) /* 8014AF64 00147EC4 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index 2a4c9ec8..38e9b5b2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -158,7 +158,7 @@ lbl_80117DE0: /* 80117DEC 00114D4C 38 C0 00 01 */ li r6, 1 /* 80117DF0 00114D50 48 00 07 65 */ bl PreviousWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 80117DF4 00114D54 A0 61 00 44 */ lhz r3, 0x44(r1) -/* 80117DF8 00114D58 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80117DF8 00114D58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80117DFC 00114D5C 7C 03 00 40 */ cmplw r3, r0 /* 80117E00 00114D60 40 82 FF B4 */ bne lbl_80117DB4 /* 80117E04 00114D64 3C 60 80 5A */ lis r3, skZero3f@ha @@ -184,7 +184,7 @@ lbl_80117E44: /* 80117E50 00114DB0 38 C0 00 00 */ li r6, 0 /* 80117E54 00114DB4 48 00 07 B9 */ bl NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 80117E58 00114DB8 A0 61 00 40 */ lhz r3, 0x40(r1) -/* 80117E5C 00114DBC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80117E5C 00114DBC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80117E60 00114DC0 7C 03 00 40 */ cmplw r3, r0 /* 80117E64 00114DC4 41 82 04 90 */ beq lbl_801182F4 /* 80117E68 00114DC8 56 E0 06 3F */ clrlwi. r0, r23, 0x18 @@ -222,7 +222,7 @@ lbl_80117E44: /* 80117EE8 00114E48 D0 21 00 F0 */ stfs f1, 0xf0(r1) /* 80117EEC 00114E4C 48 00 06 69 */ bl PreviousWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 80117EF0 00114E50 A0 61 00 34 */ lhz r3, 0x34(r1) -/* 80117EF4 00114E54 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80117EF4 00114E54 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80117EF8 00114E58 7C 03 00 40 */ cmplw r3, r0 /* 80117EFC 00114E5C 40 82 00 1C */ bne lbl_80117F18 /* 80117F00 00114E60 C0 41 00 EC */ lfs f2, 0xec(r1) @@ -384,7 +384,7 @@ lbl_80118158: /* 80118164 001150C4 38 C0 00 00 */ li r6, 0 /* 80118168 001150C8 48 00 04 A5 */ bl NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 8011816C 001150CC A0 61 00 30 */ lhz r3, 0x30(r1) -/* 80118170 001150D0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80118170 001150D0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80118174 001150D4 7C 03 00 40 */ cmplw r3, r0 /* 80118178 001150D8 41 82 01 10 */ beq lbl_80118288 /* 8011817C 001150DC EC 5F E0 28 */ fsubs f2, f31, f28 @@ -490,7 +490,7 @@ lbl_801182F4: /* 80118300 00115260 38 C0 00 01 */ li r6, 1 /* 80118304 00115264 48 00 03 09 */ bl NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 80118308 00115268 A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 8011830C 0011526C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8011830C 0011526C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80118310 00115270 7C 03 00 40 */ cmplw r3, r0 /* 80118314 00115274 41 82 00 38 */ beq lbl_8011834C /* 80118318 00115278 7F E4 FB 78 */ mr r4, r31 @@ -536,7 +536,7 @@ lbl_80118350: /* 801183B0 00115310 D2 FB 00 08 */ stfs f23, 8(r27) /* 801183B4 00115314 48 00 01 A1 */ bl PreviousWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 801183B8 00115318 A0 61 00 10 */ lhz r3, 0x10(r1) -/* 801183BC 0011531C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801183BC 0011531C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801183C0 00115320 7C 03 00 40 */ cmplw r3, r0 /* 801183C4 00115324 41 82 00 6C */ beq lbl_80118430 /* 801183C8 00115328 7F E4 FB 78 */ mr r4, r31 @@ -694,7 +694,7 @@ lbl_801185E4: /* 801185E4 00115544 80 1A 00 F0 */ lwz r0, 0xf0(r26) /* 801185E8 00115548 7C 1D 00 00 */ cmpw r29, r0 /* 801185EC 0011554C 41 80 FF 94 */ blt lbl_80118580 -/* 801185F0 00115550 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801185F0 00115550 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801185F4 00115554 B0 1F 00 00 */ sth r0, 0(r31) lbl_801185F8: /* 801185F8 00115558 BB 41 00 18 */ lmw r26, 0x18(r1) @@ -757,7 +757,7 @@ lbl_801186B4: /* 801186C0 00115620 7C 03 02 14 */ add r0, r3, r0 /* 801186C4 00115624 7C 1E 00 40 */ cmplw r30, r0 /* 801186C8 00115628 40 82 FF 6C */ bne lbl_80118634 -/* 801186CC 0011562C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801186CC 0011562C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801186D0 00115630 B0 1F 00 00 */ sth r0, 0(r31) lbl_801186D4: /* 801186D4 00115634 BB 61 00 1C */ lmw r27, 0x1c(r1) @@ -852,7 +852,7 @@ lbl_801187E4: /* 8011880C 0011576C 90 01 00 28 */ stw r0, 0x28(r1) /* 80118810 00115770 4B F2 F7 0D */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 80118814 00115774 A0 61 00 20 */ lhz r3, 0x20(r1) -/* 80118818 00115778 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80118818 00115778 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8011881C 0011577C B0 61 00 24 */ sth r3, 0x24(r1) /* 80118820 00115780 7C 03 00 40 */ cmplw r3, r0 /* 80118824 00115784 41 82 00 2C */ beq lbl_80118850 @@ -909,7 +909,7 @@ lbl_801188D0: /* 801188DC 0011583C 38 C0 00 01 */ li r6, 1 /* 801188E0 00115840 4B FF FD 2D */ bl NextWaypoint__25CScriptSpiderBallWaypointCFRC13CStateManagerQ225CScriptSpiderBallWaypoint20ECheckActiveWaypoint /* 801188E4 00115844 A0 61 00 08 */ lhz r3, 8(r1) -/* 801188E8 00115848 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801188E8 00115848 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801188EC 0011584C 7C 03 00 40 */ cmplw r3, r0 /* 801188F0 00115850 40 82 FF B4 */ bne lbl_801188A4 /* 801188F4 00115854 C0 5E 00 60 */ lfs f2, 0x60(r30) @@ -1071,7 +1071,7 @@ lbl_80118ABC: /* 80118B08 00115A68 4B F2 1C 9D */ bl CModelDataNull__10CModelDataFv /* 80118B0C 00115A6C 38 61 00 20 */ addi r3, r1, 0x20 /* 80118B10 00115A70 4B F0 23 29 */ bl None__16CActorParametersFv -/* 80118B14 00115A74 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80118B14 00115A74 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80118B18 00115A78 38 00 00 00 */ li r0, 0 /* 80118B1C 00115A7C 80 AD 8A 60 */ lwz r5, lbl_805A7620@sda21(r13) /* 80118B20 00115A80 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index f6ec79b9..7db686fd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -1577,7 +1577,7 @@ __ct__20CScriptSpindleCameraF9TUniqueIdRCQ24rstl12basic_stringRC11CEntityInfoRC1 /* 8024118C 0023E0EC DB 21 00 70 */ stfd f25, 0x70(r1) /* 80241190 0023E0F0 F3 21 00 78 */ psq_st f25, 120(r1), 0, qr0 /* 80241194 0023E0F4 BD C1 00 28 */ stmw r14, 0x28(r1) -/* 80241198 0023E0F8 A1 6D A3 8C */ lhz r11, lbl_805A8F4C@sda21(r13) +/* 80241198 0023E0F8 A1 6D A3 8C */ lhz r11, kInvalidUniqueId@sda21(r13) /* 8024119C 0023E0FC FF 20 08 90 */ fmr f25, f1 /* 802411A0 0023E100 A0 04 00 00 */ lhz r0, 0(r4) /* 802411A4 0023E104 FF 40 10 90 */ fmr f26, f2 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s index 0d912c3e..a991588a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTargetingPoint.s @@ -168,7 +168,7 @@ Accept__21CScriptTargetingPointFR8IVisitor: /* 8018D3DC 0018A33C 4B EA D3 C9 */ bl CModelDataNull__10CModelDataFv /* 8018D3E0 0018A340 38 61 00 20 */ addi r3, r1, 0x20 /* 8018D3E4 0018A344 4B E8 DA 55 */ bl None__16CActorParametersFv -/* 8018D3E8 0018A348 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 8018D3E8 0018A348 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8018D3EC 0018A34C 38 00 00 00 */ li r0, 0 /* 8018D3F0 0018A350 80 AD 8E E8 */ lwz r5, lbl_805A7AA8@sda21(r13) /* 8018D3F4 0018A354 38 60 00 00 */ li r3, 0 @@ -213,7 +213,7 @@ Accept__21CScriptTargetingPointFR8IVisitor: /* 8018D490 0018A3F0 88 1F 00 E8 */ lbz r0, 0xe8(r31) /* 8018D494 0018A3F4 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 8018D498 0018A3F8 98 1F 00 E8 */ stb r0, 0xe8(r31) -/* 8018D49C 0018A3FC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8018D49C 0018A3FC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8018D4A0 0018A400 B0 1F 00 EA */ sth r0, 0xea(r31) /* 8018D4A4 0018A404 D0 1F 00 EC */ stfs f0, 0xec(r31) /* 8018D4A8 0018A408 BB 41 00 D8 */ lmw r26, 0xd8(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index 85ad08d3..f256fcba 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -209,7 +209,7 @@ lbl_80075E48: /* 80075E4C 00072DAC A0 1D 00 08 */ lhz r0, 8(r29) /* 80075E50 00072DB0 7C 03 00 40 */ cmplw r3, r0 /* 80075E54 00072DB4 40 82 00 10 */ bne lbl_80075E64 -/* 80075E58 00072DB8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80075E58 00072DB8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80075E5C 00072DBC B0 01 00 10 */ sth r0, 0x10(r1) /* 80075E60 00072DC0 B0 1E 0F 74 */ sth r0, 0xf74(r30) lbl_80075E64: @@ -466,7 +466,7 @@ lbl_8007621C: /* 80076220 00073180 A0 1D 00 08 */ lhz r0, 8(r29) /* 80076224 00073184 7C 03 00 40 */ cmplw r3, r0 /* 80076228 00073188 40 82 00 10 */ bne lbl_80076238 -/* 8007622C 0007318C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8007622C 0007318C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80076230 00073190 B0 01 00 0C */ sth r0, 0xc(r1) /* 80076234 00073194 B0 1E 0F 74 */ sth r0, 0xf74(r30) lbl_80076238: @@ -511,7 +511,7 @@ lbl_800762C0: /* 800762C4 00073224 A0 1D 00 08 */ lhz r0, 8(r29) /* 800762C8 00073228 7C 03 00 40 */ cmplw r3, r0 /* 800762CC 0007322C 40 82 00 10 */ bne lbl_800762DC -/* 800762D0 00073230 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800762D0 00073230 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800762D4 00073234 B0 01 00 08 */ sth r0, 8(r1) /* 800762D8 00073238 B0 1E 0F 74 */ sth r0, 0xf74(r30) lbl_800762DC: @@ -710,7 +710,7 @@ lbl_80076594: /* 80076598 000734F8 A0 1C 00 08 */ lhz r0, 8(r28) /* 8007659C 000734FC 7C 03 00 40 */ cmplw r3, r0 /* 800765A0 00073500 40 82 00 74 */ bne lbl_80076614 -/* 800765A4 00073504 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800765A4 00073504 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800765A8 00073508 B0 01 00 0C */ sth r0, 0xc(r1) /* 800765AC 0007350C B0 1F 0F 74 */ sth r0, 0xf74(r31) /* 800765B0 00073510 48 00 00 64 */ b lbl_80076614 @@ -737,7 +737,7 @@ lbl_800765F8: /* 800765FC 0007355C A0 1C 00 08 */ lhz r0, 8(r28) /* 80076600 00073560 7C 03 00 40 */ cmplw r3, r0 /* 80076604 00073564 40 82 00 10 */ bne lbl_80076614 -/* 80076608 00073568 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80076608 00073568 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007660C 0007356C B0 01 00 08 */ sth r0, 8(r1) /* 80076610 00073570 B0 1F 0F 74 */ sth r0, 0xf74(r31) lbl_80076614: @@ -871,7 +871,7 @@ Touch__14CScriptTriggerFR6CActorR13CStateManager: /* 800767E4 00073744 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800767E8 00073748 41 82 00 24 */ beq lbl_8007680C /* 800767EC 0007374C A0 7D 0F 74 */ lhz r3, 0xf74(r29) -/* 800767F0 00073750 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 800767F0 00073750 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 800767F4 00073754 7C 03 00 40 */ cmplw r3, r0 /* 800767F8 00073758 40 82 04 74 */ bne lbl_80076C6C /* 800767FC 0007375C A0 1B 00 08 */ lhz r0, 8(r27) @@ -1264,7 +1264,7 @@ lbl_80076D34: /* 80076D9C 00073CFC 4B FC 3A 09 */ bl CModelDataNull__10CModelDataFv /* 80076DA0 00073D00 38 61 00 50 */ addi r3, r1, 0x50 /* 80076DA4 00073D04 4B FA 40 95 */ bl None__16CActorParametersFv -/* 80076DA8 00073D08 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80076DA8 00073D08 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80076DAC 00073D0C 38 00 00 00 */ li r0, 0 /* 80076DB0 00073D10 80 AD 83 D4 */ lwz r5, lbl_805A6F94@sda21(r13) /* 80076DB4 00073D14 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s index 1417a971..a1a83741 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorFlare.s @@ -266,7 +266,7 @@ lbl_801D6710: /* 801D6784 001D36E4 4B E6 40 21 */ bl CModelDataNull__10CModelDataFv /* 801D6788 001D36E8 38 61 00 50 */ addi r3, r1, 0x50 /* 801D678C 001D36EC 4B E4 46 AD */ bl None__16CActorParametersFv -/* 801D6790 001D36F0 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801D6790 001D36F0 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801D6794 001D36F4 38 00 00 00 */ li r0, 0 /* 801D6798 001D36F8 80 AD 91 B8 */ lwz r5, lbl_805A7D78@sda21(r13) /* 801D679C 001D36FC 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 15822506..83c79ad1 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -542,7 +542,7 @@ lbl_801D7614: /* 801D7698 001D45F8 4B E6 31 0D */ bl CModelDataNull__10CModelDataFv /* 801D769C 001D45FC 38 61 00 68 */ addi r3, r1, 0x68 /* 801D76A0 001D4600 4B E4 37 99 */ bl None__16CActorParametersFv -/* 801D76A4 001D4604 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801D76A4 001D4604 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801D76A8 001D4608 38 80 00 00 */ li r4, 0 /* 801D76AC 001D460C A1 95 00 00 */ lhz r12, 0(r21) /* 801D76B0 001D4610 39 61 00 68 */ addi r11, r1, 0x68 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWater.s b/asm/MetroidPrime/ScriptObjects/CScriptWater.s index c8720efb..7afaac65 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWater.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWater.s @@ -1279,7 +1279,7 @@ PreRender__12CScriptWaterFR13CStateManagerRC14CFrustumPlanes: /* 800FFDA0 000FCD00 54 60 FF FF */ rlwinm. r0, r3, 0x1f, 0x1f, 0x1f /* 800FFDA4 000FCD04 40 82 01 88 */ bne lbl_800FFF2C /* 800FFDA8 000FCD08 80 BD 00 04 */ lwz r5, 4(r29) -/* 800FFDAC 000FCD0C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800FFDAC 000FCD0C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800FFDB0 000FCD10 7C 05 00 00 */ cmpw r5, r0 /* 800FFDB4 000FCD14 41 82 00 A8 */ beq lbl_800FFE5C /* 800FFDB8 000FCD18 83 7D 00 90 */ lwz r27, 0x90(r29) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s index 42228e12..08e06ea4 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWaypoint.s @@ -101,7 +101,7 @@ lbl_80077100: /* 8007710C 0007406C 7C 03 02 14 */ add r0, r3, r0 /* 80077110 00074070 7C 06 00 40 */ cmplw r6, r0 /* 80077114 00074074 40 82 FF B4 */ bne lbl_800770C8 -/* 80077118 00074078 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80077118 00074078 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007711C 0007407C B0 1F 00 00 */ sth r0, 0(r31) lbl_80077120: /* 80077120 00074080 80 01 00 24 */ lwz r0, 0x24(r1) @@ -138,7 +138,7 @@ lbl_80077164: /* 8007718C 000740EC 90 01 00 14 */ stw r0, 0x14(r1) /* 80077190 000740F0 4B FD 0D 8D */ bl GetIdForScript__13CStateManagerCF9TEditorId /* 80077194 000740F4 A0 61 00 0C */ lhz r3, 0xc(r1) -/* 80077198 000740F8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80077198 000740F8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8007719C 000740FC B0 61 00 10 */ sth r3, 0x10(r1) /* 800771A0 00074100 7C 03 00 40 */ cmplw r3, r0 /* 800771A4 00074104 41 82 00 5C */ beq lbl_80077200 @@ -179,7 +179,7 @@ lbl_80077204: /* 80077224 00074184 40 82 00 64 */ bne lbl_80077288 /* 80077228 00074188 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8007722C 0007418C 38 60 00 00 */ li r3, 0 -/* 80077230 00074190 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80077230 00074190 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80077234 00074194 2C 05 00 00 */ cmpwi r5, 0 /* 80077238 00074198 B0 1B 00 00 */ sth r0, 0(r27) /* 8007723C 0007419C 40 81 00 40 */ ble lbl_8007727C @@ -347,7 +347,7 @@ lbl_800773F8: /* 8007746C 000743CC 4B FC 33 39 */ bl CModelDataNull__10CModelDataFv /* 80077470 000743D0 38 61 00 20 */ addi r3, r1, 0x20 /* 80077474 000743D4 4B FA 39 C5 */ bl None__16CActorParametersFv -/* 80077478 000743D8 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80077478 000743D8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 8007747C 000743DC 38 00 00 00 */ li r0, 0 /* 80077480 000743E0 80 AD 83 D8 */ lwz r5, lbl_805A6F98@sda21(r13) /* 80077484 000743E4 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/TGameTypes.s b/asm/MetroidPrime/TGameTypes.s index 6c34094a..88661368 100644 --- a/asm/MetroidPrime/TGameTypes.s +++ b/asm/MetroidPrime/TGameTypes.s @@ -21,11 +21,11 @@ __ct__9TEditorIdFR12CInputStream: .global __sinit_TGameTypes_cpp __sinit_TGameTypes_cpp: -/* 8011A498 001173F8 3C 60 00 01 */ lis r3, 0x0000FFFF@ha +/* 8011A498 001173F8 3C 60 00 01 */ lis r3, 1 /* 8011A49C 001173FC 38 80 FF FF */ li r4, -1 -/* 8011A4A0 00117400 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l -/* 8011A4A4 00117404 90 8D A3 88 */ stw r4, lbl_805A8F48@sda21(r13) -/* 8011A4A8 00117408 B0 0D A3 8C */ sth r0, lbl_805A8F4C@sda21(r13) -/* 8011A4AC 0011740C 90 8D A3 90 */ stw r4, lbl_805A8F50@sda21(r13) +/* 8011A4A0 00117400 38 03 FF FF */ subi r0, r3, 1 +/* 8011A4A4 00117404 90 8D A3 88 */ stw r4, kInvalidEditorId@sda21(r13) +/* 8011A4A8 00117408 B0 0D A3 8C */ sth r0, kInvalidUniqueId@sda21(r13) +/* 8011A4AC 0011740C 90 8D A3 90 */ stw r4, kInvalidAreaId@sda21(r13) /* 8011A4B0 00117410 90 8D A3 94 */ stw r4, lbl_805A8F54@sda21(r13) /* 8011A4B4 00117414 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s index 54431074..829ea6fa 100644 --- a/asm/MetroidPrime/Weapons/CAuxWeapon.s +++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s @@ -153,7 +153,7 @@ DeleteWaveBusterBeam__10CAuxWeaponFR13CStateManager: /* 801B8A9C 001B59FC 7C 7E 1B 78 */ mr r30, r3 /* 801B8AA0 001B5A00 4B FF FF 4D */ bl FreeComboVoiceId__10CAuxWeaponFv /* 801B8AA4 001B5A04 A0 7E 00 70 */ lhz r3, 0x70(r30) -/* 801B8AA8 001B5A08 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B8AA8 001B5A08 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B8AAC 001B5A0C 7C 03 00 40 */ cmplw r3, r0 /* 801B8AB0 001B5A10 41 82 00 4C */ beq lbl_801B8AFC /* 801B8AB4 001B5A14 A0 1E 00 70 */ lhz r0, 0x70(r30) @@ -161,7 +161,7 @@ DeleteWaveBusterBeam__10CAuxWeaponFR13CStateManager: /* 801B8ABC 001B5A1C 38 81 00 08 */ addi r4, r1, 8 /* 801B8AC0 001B5A20 B0 01 00 08 */ sth r0, 8(r1) /* 801B8AC4 001B5A24 4B E9 37 A9 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801B8AC8 001B5A28 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801B8AC8 001B5A28 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801B8ACC 001B5A2C 38 00 FF FF */ li r0, -1 /* 801B8AD0 001B5A30 B0 7E 00 70 */ sth r3, 0x70(r30) /* 801B8AD4 001B5A34 90 1E 00 74 */ stw r0, 0x74(r30) @@ -193,7 +193,7 @@ DeleteFlameThrower__10CAuxWeaponFR13CStateManager: /* 801B8B2C 001B5A8C 7C 7E 1B 78 */ mr r30, r3 /* 801B8B30 001B5A90 4B FF FE BD */ bl FreeComboVoiceId__10CAuxWeaponFv /* 801B8B34 001B5A94 A0 7E 00 6E */ lhz r3, 0x6e(r30) -/* 801B8B38 001B5A98 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B8B38 001B5A98 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B8B3C 001B5A9C 7C 03 00 40 */ cmplw r3, r0 /* 801B8B40 001B5AA0 41 82 00 4C */ beq lbl_801B8B8C /* 801B8B44 001B5AA4 A0 1E 00 6E */ lhz r0, 0x6e(r30) @@ -201,7 +201,7 @@ DeleteFlameThrower__10CAuxWeaponFR13CStateManager: /* 801B8B4C 001B5AAC 38 81 00 08 */ addi r4, r1, 8 /* 801B8B50 001B5AB0 B0 01 00 08 */ sth r0, 8(r1) /* 801B8B54 001B5AB4 4B E9 37 19 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801B8B58 001B5AB8 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 801B8B58 001B5AB8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 801B8B5C 001B5ABC 38 00 FF FF */ li r0, -1 /* 801B8B60 001B5AC0 B0 7E 00 6E */ sth r3, 0x6e(r30) /* 801B8B64 001B5AC4 90 1E 00 74 */ stw r0, 0x74(r30) @@ -236,7 +236,7 @@ CreateWaveBusterBeam__10CAuxWeaponFUi9TUniqueIdRC12CTransform4fR13CStateManager: /* 801B8BC8 001B5B28 7F E4 FB 78 */ mr r4, r31 /* 801B8BCC 001B5B2C 4B FF FE B9 */ bl DeleteWaveBusterBeam__10CAuxWeaponFR13CStateManager /* 801B8BD0 001B5B30 A0 7C 00 70 */ lhz r3, 0x70(r28) -/* 801B8BD4 001B5B34 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B8BD4 001B5B34 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B8BD8 001B5B38 7C 03 00 40 */ cmplw r3, r0 /* 801B8BDC 001B5B3C 40 82 01 8C */ bne lbl_801B8D68 /* 801B8BE0 001B5B40 7F E4 FB 78 */ mr r4, r31 @@ -257,7 +257,7 @@ CreateWaveBusterBeam__10CAuxWeaponFUi9TUniqueIdRC12CTransform4fR13CStateManager: /* 801B8C1C 001B5B7C 80 8D A1 34 */ lwz r4, gpTweakPlayerGun@sda21(r13) /* 801B8C20 001B5B80 38 61 00 38 */ addi r3, r1, 0x38 /* 801B8C24 001B5B84 B0 01 00 20 */ sth r0, 0x20(r1) -/* 801B8C28 001B5B88 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801B8C28 001B5B88 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801B8C2C 001B5B8C 38 84 02 2C */ addi r4, r4, 0x22c /* 801B8C30 001B5B90 A0 DC 00 6C */ lhz r6, 0x6c(r28) /* 801B8C34 001B5B94 B0 C1 00 1C */ sth r6, 0x1c(r1) @@ -362,7 +362,7 @@ CreateFlameThrower__10CAuxWeaponFRC12CTransform4fR13CStateManagerf: /* 801B8DA0 001B5D00 7F 84 E3 78 */ mr r4, r28 /* 801B8DA4 001B5D04 4B FF FD 71 */ bl DeleteFlameThrower__10CAuxWeaponFR13CStateManager /* 801B8DA8 001B5D08 A0 7A 00 6E */ lhz r3, 0x6e(r26) -/* 801B8DAC 001B5D0C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B8DAC 001B5D0C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B8DB0 001B5D10 7C 03 00 40 */ cmplw r3, r0 /* 801B8DB4 001B5D14 40 82 02 A4 */ bne lbl_801B9058 /* 801B8DB8 001B5D18 3C 60 80 3D */ lis r3, lbl_803D1678@ha @@ -426,7 +426,7 @@ CreateFlameThrower__10CAuxWeaponFRC12CTransform4fR13CStateManagerf: /* 801B8EA0 001B5E00 41 82 00 94 */ beq lbl_801B8F34 /* 801B8EA4 001B5E04 A0 BA 00 6C */ lhz r5, 0x6c(r26) /* 801B8EA8 001B5E08 3C 60 80 3D */ lis r3, lbl_803D1678@ha -/* 801B8EAC 001B5E0C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801B8EAC 001B5E0C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801B8EB0 001B5E10 38 83 16 78 */ addi r4, r3, lbl_803D1678@l /* 801B8EB4 001B5E14 B0 A1 00 1C */ sth r5, 0x1c(r1) /* 801B8EB8 001B5E18 38 61 00 34 */ addi r3, r1, 0x34 @@ -601,7 +601,7 @@ lbl_801B90F8: /* 801B9128 001B6088 7F C4 F3 78 */ mr r4, r30 /* 801B912C 001B608C 98 01 00 78 */ stb r0, 0x78(r1) /* 801B9130 001B6090 39 C1 00 6C */ addi r14, r1, 0x6c -/* 801B9134 001B6094 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801B9134 001B6094 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801B9138 001B6098 39 E1 00 60 */ addi r15, r1, 0x60 /* 801B913C 001B609C D0 01 00 60 */ stfs f0, 0x60(r1) /* 801B9140 001B60A0 3A 81 00 3C */ addi r20, r1, 0x3c @@ -1028,7 +1028,7 @@ lbl_801B96E8: /* 801B9730 001B6690 54 1E D7 FE */ rlwinm r30, r0, 0x1a, 0x1f, 0x1f lbl_801B9734: /* 801B9734 001B6694 A0 78 00 6E */ lhz r3, 0x6e(r24) -/* 801B9738 001B6698 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B9738 001B6698 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B973C 001B669C 7C 03 00 40 */ cmplw r3, r0 /* 801B9740 001B66A0 41 82 00 10 */ beq lbl_801B9750 /* 801B9744 001B66A4 7E E3 BB 78 */ mr r3, r23 @@ -1159,7 +1159,7 @@ lbl_801B98DC: /* 801B98FC 001B685C B0 1F 00 00 */ sth r0, 0(r31) /* 801B9900 001B6860 48 00 00 0C */ b lbl_801B990C lbl_801B9904: -/* 801B9904 001B6864 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B9904 001B6864 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B9908 001B6868 B0 1F 00 00 */ sth r0, 0(r31) lbl_801B990C: /* 801B990C 001B686C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1370,9 +1370,9 @@ __ct__10CAuxWeaponF9TUniqueId: /* 801B9BF4 001B6B54 D0 1E 00 68 */ stfs f0, 0x68(r30) /* 801B9BF8 001B6B58 A0 9F 00 00 */ lhz r4, 0(r31) /* 801B9BFC 001B6B5C B0 9E 00 6C */ sth r4, 0x6c(r30) -/* 801B9C00 001B6B60 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801B9C00 001B6B60 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801B9C04 001B6B64 B0 9E 00 6E */ sth r4, 0x6e(r30) -/* 801B9C08 001B6B68 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801B9C08 001B6B68 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801B9C0C 001B6B6C B0 9E 00 70 */ sth r4, 0x70(r30) /* 801B9C10 001B6B70 90 1E 00 74 */ stw r0, 0x74(r30) /* 801B9C14 001B6B74 90 BE 00 78 */ stw r5, 0x78(r30) diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index f2d95ba6..27dc1456 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -193,7 +193,7 @@ lbl_80198E8C: /* 80199008 00195F68 90 BC 03 7C */ stw r5, 0x37c(r28) /* 8019900C 00195F6C 80 A1 01 1C */ lwz r5, 0x11c(r1) /* 80199010 00195F70 90 BC 03 80 */ stw r5, 0x380(r28) -/* 80199014 00195F74 A0 CD A3 8C */ lhz r6, lbl_805A8F4C@sda21(r13) +/* 80199014 00195F74 A0 CD A3 8C */ lhz r6, kInvalidUniqueId@sda21(r13) /* 80199018 00195F78 80 AD 8F D0 */ lwz r5, lbl_805A7B90@sda21(r13) /* 8019901C 00195F7C B0 C1 00 1C */ sth r6, 0x1c(r1) /* 80199020 00195F80 90 01 01 C8 */ stw r0, 0x1c8(r1) @@ -278,7 +278,7 @@ lbl_80199158: /* 80199158 001960B8 88 01 01 B8 */ lbz r0, 0x1b8(r1) /* 8019915C 001960BC 28 00 00 00 */ cmplwi r0, 0 /* 80199160 001960C0 41 82 00 90 */ beq lbl_801991F0 -/* 80199164 001960C4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80199164 001960C4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80199168 001960C8 7F 83 E3 78 */ mr r3, r28 /* 8019916C 001960CC 38 A1 01 98 */ addi r5, r1, 0x198 /* 80199170 001960D0 38 C1 00 10 */ addi r6, r1, 0x10 @@ -397,7 +397,7 @@ SetCollisionResultData__15CBeamProjectileFQ215CBeamProjectile11EDamageTypeRC14CR /* 8019930C 0019626C 40 82 00 08 */ bne lbl_80199314 /* 80199310 00196270 48 00 00 08 */ b lbl_80199318 lbl_80199314: -/* 80199314 00196274 38 CD A3 8C */ addi r6, r13, lbl_805A8F4C@sda21 +/* 80199314 00196274 38 CD A3 8C */ addi r6, r13, kInvalidUniqueId@sda21 lbl_80199318: /* 80199318 00196278 A0 06 00 00 */ lhz r0, 0(r6) /* 8019931C 0019627C 38 85 00 04 */ addi r4, r5, 4 @@ -523,7 +523,7 @@ lbl_80199484: /* 801994A8 00196408 BE 61 00 6C */ stmw r19, 0x6c(r1) /* 801994AC 0019640C C0 02 A6 CC */ lfs f0, lbl_805AC3EC@sda21(r2) /* 801994B0 00196410 38 00 00 00 */ li r0, 0 -/* 801994B4 00196414 A2 ED A3 8C */ lhz r23, lbl_805A8F4C@sda21(r13) +/* 801994B4 00196414 A2 ED A3 8C */ lhz r23, kInvalidUniqueId@sda21(r13) /* 801994B8 00196418 7C BB 2B 78 */ mr r27, r5 /* 801994BC 0019641C 98 01 00 4C */ stb r0, 0x4c(r1) /* 801994C0 00196420 7C DC 33 78 */ mr r28, r6 @@ -605,9 +605,9 @@ lbl_80199594: /* 801995EC 0019654C D0 1A 02 F0 */ stfs f0, 0x2f0(r26) /* 801995F0 00196550 D3 DA 02 F4 */ stfs f30, 0x2f4(r26) /* 801995F4 00196554 90 1A 02 F8 */ stw r0, 0x2f8(r26) -/* 801995F8 00196558 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801995F8 00196558 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801995FC 0019655C B0 1A 02 FC */ sth r0, 0x2fc(r26) -/* 80199600 00196560 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80199600 00196560 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80199604 00196564 B0 1A 02 FE */ sth r0, 0x2fe(r26) /* 80199608 00196568 41 82 00 0C */ beq lbl_80199614 /* 8019960C 0019656C C0 02 A6 C8 */ lfs f0, lbl_805AC3E8@sda21(r2) diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index b72a8d35..4dd31ed8 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -119,7 +119,7 @@ sub_8008faf0: /* 8008FB18 0008CA78 7D 89 03 A6 */ mtctr r12 /* 8008FB1C 0008CA7C 4E 80 04 21 */ bctrl /* 8008FB20 0008CA80 A0 7E 01 88 */ lhz r3, 0x188(r30) -/* 8008FB24 0008CA84 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008FB24 0008CA84 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008FB28 0008CA88 7C 03 00 40 */ cmplw r3, r0 /* 8008FB2C 0008CA8C 41 82 00 60 */ beq lbl_8008FB8C /* 8008FB30 0008CA90 A0 1E 01 88 */ lhz r0, 0x188(r30) @@ -411,7 +411,7 @@ lbl_8008FEBC: /* 8008FF40 0008CEA0 48 00 00 50 */ b lbl_8008FF90 lbl_8008FF44: /* 8008FF44 0008CEA4 A0 7C 01 88 */ lhz r3, 0x188(r28) -/* 8008FF48 0008CEA8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8008FF48 0008CEA8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8008FF4C 0008CEAC 7C 03 00 40 */ cmplw r3, r0 /* 8008FF50 0008CEB0 41 82 00 18 */ beq lbl_8008FF68 /* 8008FF54 0008CEB4 A0 1C 01 88 */ lhz r0, 0x188(r28) @@ -1173,7 +1173,7 @@ lbl_80090A64: /* 80090A74 0008D9D4 38 80 00 00 */ li r4, 0 /* 80090A78 0008D9D8 48 2B 03 C9 */ bl __dt__6CTokenFv lbl_80090A7C: -/* 80090A7C 0008D9DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80090A7C 0008D9DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80090A80 0008D9E0 7F E4 FB 78 */ mr r4, r31 /* 80090A84 0008D9E4 38 61 00 2C */ addi r3, r1, 0x2c /* 80090A88 0008D9E8 B0 1E 01 88 */ sth r0, 0x188(r30) diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index b17718ee..b86be5dd 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -577,7 +577,7 @@ ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManage /* 802142C0 00211220 70 00 00 90 */ andi. r0, r0, 0x90 /* 802142C4 00211224 2C 00 00 90 */ cmpwi r0, 0x90 /* 802142C8 00211228 41 82 00 9C */ beq lbl_80214364 -/* 802142CC 0021122C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802142CC 0021122C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802142D0 00211230 3C 60 80 57 */ lis r3, lbl_8056D578@ha /* 802142D4 00211234 39 03 D5 78 */ addi r8, r3, lbl_8056D578@l /* 802142D8 00211238 7F E7 FB 78 */ mr r7, r31 @@ -613,7 +613,7 @@ ResolveCollisionWithWorld__17CEnergyProjectileFRC14CRayCastResultR13CStateManage /* 80214350 002112B0 B0 01 00 10 */ sth r0, 0x10(r1) /* 80214354 002112B4 4B E3 49 59 */ bl ApplyDamageToWorld__13CStateManagerF9TUniqueIdRC6CActorRC9CVector3fRC11CDamageInfoRC15CMaterialFilter lbl_80214358: -/* 80214358 002112B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80214358 002112B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021435C 002112BC B0 01 00 08 */ sth r0, 8(r1) /* 80214360 002112C0 B0 1D 02 C2 */ sth r0, 0x2c2(r29) lbl_80214364: @@ -796,7 +796,7 @@ lbl_802145F8: /* 802145FC 0021155C 7F A3 EB 78 */ mr r3, r29 /* 80214600 00211560 7F C4 F3 78 */ mr r4, r30 /* 80214604 00211564 4B E2 38 F9 */ bl UpdateProjectileMovement__15CGameProjectileFfR13CStateManager -/* 80214608 00211568 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80214608 00211568 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8021460C 0021156C 7F A4 EB 78 */ mr r4, r29 /* 80214610 00211570 7F C6 F3 78 */ mr r6, r30 /* 80214614 00211574 38 61 00 70 */ addi r3, r1, 0x70 @@ -861,7 +861,7 @@ lbl_802146E0: /* 802146F8 00211658 88 1D 03 D0 */ lbz r0, 0x3d0(r29) /* 802146FC 0021165C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 80214700 00211660 41 82 00 58 */ beq lbl_80214758 -/* 80214704 00211664 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80214704 00211664 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80214708 00211668 3C A0 80 5A */ lis r5, lbl_805A66F4@ha /* 8021470C 0021166C 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 80214710 00211670 7F A3 EB 78 */ mr r3, r29 @@ -884,7 +884,7 @@ lbl_802146E0: /* 80214754 002116B4 4E 80 04 21 */ bctrl lbl_80214758: /* 80214758 002116B8 A0 BD 02 C8 */ lhz r5, 0x2c8(r29) -/* 8021475C 002116BC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8021475C 002116BC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80214760 002116C0 7C 05 00 40 */ cmplw r5, r0 /* 80214764 002116C4 41 82 00 D0 */ beq lbl_80214834 /* 80214768 002116C8 B0 A1 00 18 */ sth r5, 0x18(r1) @@ -1369,7 +1369,7 @@ lbl_80214E48: /* 80214E50 00211DB0 4B E3 E0 3D */ bl SetTranslation__6CActorFRC9CVector3f /* 80214E54 00211DB4 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 80214E58 00211DB8 41 82 00 28 */ beq lbl_80214E80 -/* 80214E5C 00211DBC A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80214E5C 00211DBC A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80214E60 00211DC0 38 60 00 00 */ li r3, 0 /* 80214E64 00211DC4 3B 80 00 00 */ li r28, 0 /* 80214E68 00211DC8 B0 9F 02 C0 */ sth r4, 0x2c0(r31) @@ -1621,7 +1621,7 @@ lbl_802151D8: /* 80215208 00212168 38 84 28 90 */ addi r4, r4, lbl_803D2890@l /* 8021520C 0021216C 38 84 00 26 */ addi r4, r4, 0x26 /* 80215210 00212170 4B DE FA A9 */ bl string_l__4rstlFPCc -/* 80215214 00212174 80 0D A3 88 */ lwz r0, lbl_805A8F48@sda21(r13) +/* 80215214 00212174 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 80215218 00212178 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 8021521C 0021217C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l /* 80215220 00212180 38 81 00 58 */ addi r4, r1, 0x58 diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 5a141b22..a7a21d12 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -139,7 +139,7 @@ SetFlameLightActive__13CFlameThrowerFbR13CStateManager: /* 8019761C 0019457C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80197620 00194580 7C 9F 23 78 */ mr r31, r4 /* 80197624 00194584 A0 C3 02 C8 */ lhz r6, 0x2c8(r3) -/* 80197628 00194588 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80197628 00194588 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8019762C 0019458C 7C 06 00 40 */ cmplw r6, r0 /* 80197630 00194590 41 82 00 44 */ beq lbl_80197674 /* 80197634 00194594 B0 C1 00 08 */ sth r6, 8(r1) @@ -351,7 +351,7 @@ lbl_80197944: /* 80197950 001948B0 98 01 01 64 */ stb r0, 0x164(r1) lbl_80197954: /* 80197954 001948B4 A0 61 01 C0 */ lhz r3, 0x1c0(r1) -/* 80197958 001948B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80197958 001948B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8019795C 001948BC 7C 03 00 40 */ cmplw r3, r0 /* 80197960 001948C0 40 82 00 18 */ bne lbl_80197978 /* 80197964 001948C4 28 17 00 00 */ cmplwi r23, 0 @@ -899,7 +899,7 @@ lbl_801980F8: /* 80198140 001950A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80198144 001950A4 41 82 00 5C */ beq lbl_801981A0 /* 80198148 001950A8 A0 7E 02 C8 */ lhz r3, 0x2c8(r30) -/* 8019814C 001950AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8019814C 001950AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80198150 001950B0 7C 03 00 40 */ cmplw r3, r0 /* 80198154 001950B4 40 82 00 4C */ bne lbl_801981A0 /* 80198158 001950B8 3C 80 80 3D */ lis r4, lbl_803D1210@ha @@ -1324,7 +1324,7 @@ lbl_80198734: /* 80198740 001956A0 38 03 00 04 */ addi r0, r3, 4 /* 80198744 001956A4 7C 05 00 40 */ cmplw r5, r0 /* 80198748 001956A8 40 82 FF 70 */ bne lbl_801986B8 -/* 8019874C 001956AC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8019874C 001956AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80198750 001956B0 38 61 00 9C */ addi r3, r1, 0x9c /* 80198754 001956B4 38 81 00 4C */ addi r4, r1, 0x4c /* 80198758 001956B8 38 A1 00 40 */ addi r5, r1, 0x40 @@ -1445,7 +1445,7 @@ lbl_801988C0: /* 8019891C 0019587C D0 41 00 3C */ stfs f2, 0x3c(r1) /* 80198920 00195880 4B EB A5 6D */ bl SetTranslation__6CActorFRC9CVector3f /* 80198924 00195884 A0 BD 02 C8 */ lhz r5, 0x2c8(r29) -/* 80198928 00195888 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80198928 00195888 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8019892C 0019588C 7C 05 00 40 */ cmplw r5, r0 /* 80198930 00195890 41 82 00 B8 */ beq lbl_801989E8 /* 80198934 00195894 B0 A1 00 08 */ sth r5, 8(r1) @@ -1601,7 +1601,7 @@ lbl_80198AE8: /* 80198B40 00195AA0 83 A1 00 D8 */ lwz r29, 0xd8(r1) /* 80198B44 00195AA4 7C 7A 1B 78 */ mr r26, r3 /* 80198B48 00195AA8 7D 1C 43 78 */ mr r28, r8 -/* 80198B4C 00195AAC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80198B4C 00195AAC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80198B50 00195AB0 9A A1 00 70 */ stb r21, 0x70(r1) /* 80198B54 00195AB4 B0 01 00 30 */ sth r0, 0x30(r1) /* 80198B58 00195AB8 A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2) diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 5207ef15..85b62bd1 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -1365,7 +1365,7 @@ lbl_801B6CC0: /* 801B6E60 001B3DC0 38 60 00 00 */ li r3, 0 /* 801B6E64 001B3DC4 38 80 00 01 */ li r4, 1 /* 801B6E68 001B3DC8 48 1D 30 8D */ bl __shl2i -/* 801B6E6C 001B3DCC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B6E6C 001B3DCC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B6E70 001B3DD0 39 00 00 00 */ li r8, 0 /* 801B6E74 001B3DD4 39 40 00 03 */ li r10, 3 /* 801B6E78 001B3DD8 90 81 00 84 */ stw r4, 0x84(r1) @@ -1410,7 +1410,7 @@ lbl_801B6ECC: /* 801B6F10 001B3E70 38 60 00 00 */ li r3, 0 /* 801B6F14 001B3E74 38 80 00 01 */ li r4, 1 /* 801B6F18 001B3E78 48 1D 2F DD */ bl __shl2i -/* 801B6F1C 001B3E7C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B6F1C 001B3E7C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B6F20 001B3E80 39 00 00 00 */ li r8, 0 /* 801B6F24 001B3E84 39 40 00 03 */ li r10, 3 /* 801B6F28 001B3E88 90 81 00 6C */ stw r4, 0x6c(r1) @@ -1579,7 +1579,7 @@ lbl_801B7174: /* 801B7184 001B40E4 48 00 00 30 */ b lbl_801B71B4 lbl_801B7188: /* 801B7188 001B40E8 A0 7C 00 EC */ lhz r3, 0xec(r28) -/* 801B718C 001B40EC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B718C 001B40EC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B7190 001B40F0 7C 03 00 40 */ cmplw r3, r0 /* 801B7194 001B40F4 41 82 00 20 */ beq lbl_801B71B4 /* 801B7198 001B40F8 A0 1C 00 EC */ lhz r0, 0xec(r28) @@ -1587,7 +1587,7 @@ lbl_801B7188: /* 801B71A0 001B4100 38 81 00 1C */ addi r4, r1, 0x1c /* 801B71A4 001B4104 B0 01 00 1C */ sth r0, 0x1c(r1) /* 801B71A8 001B4108 4B E9 50 C5 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801B71AC 001B410C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B71AC 001B410C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B71B0 001B4110 B0 1C 00 EC */ sth r0, 0xec(r28) lbl_801B71B4: /* 801B71B4 001B4114 A0 1E 00 00 */ lhz r0, 0(r30) @@ -1598,7 +1598,7 @@ lbl_801B71B4: /* 801B71C8 001B4128 38 A1 00 18 */ addi r5, r1, 0x18 /* 801B71CC 001B412C 4B E9 C4 49 */ bl AcceptScriptMsg__6CActorF20EScriptObjectMessage9TUniqueIdR13CStateManager /* 801B71D0 001B4130 A0 7C 00 EC */ lhz r3, 0xec(r28) -/* 801B71D4 001B4134 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B71D4 001B4134 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B71D8 001B4138 7C 03 00 40 */ cmplw r3, r0 /* 801B71DC 001B413C 41 82 00 28 */ beq lbl_801B7204 /* 801B71E0 001B4140 A0 1E 00 00 */ lhz r0, 0(r30) @@ -1862,7 +1862,7 @@ lbl_801B7558: /* 801B7584 001B44E4 7D 89 03 A6 */ mtctr r12 /* 801B7588 001B44E8 4E 80 04 21 */ bctrl /* 801B758C 001B44EC A0 7A 00 EC */ lhz r3, 0xec(r26) -/* 801B7590 001B44F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B7590 001B44F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B7594 001B44F4 7C 03 00 40 */ cmplw r3, r0 /* 801B7598 001B44F8 41 82 00 60 */ beq lbl_801B75F8 /* 801B759C 001B44FC A0 1A 00 EC */ lhz r0, 0xec(r26) @@ -2223,7 +2223,7 @@ lbl_801B7A38: /* 801B7A84 001B49E4 38 81 00 20 */ addi r4, r1, 0x20 /* 801B7A88 001B49E8 80 06 00 00 */ lwz r0, 0(r6) /* 801B7A8C 001B49EC 3C C0 80 57 */ lis r6, lbl_8056D410@ha -/* 801B7A90 001B49F0 81 6D A3 88 */ lwz r11, lbl_805A8F48@sda21(r13) +/* 801B7A90 001B49F0 81 6D A3 88 */ lwz r11, kInvalidEditorId@sda21(r13) /* 801B7A94 001B49F4 90 01 00 20 */ stw r0, 0x20(r1) /* 801B7A98 001B49F8 38 06 D4 10 */ addi r0, r6, lbl_8056D410@l /* 801B7A9C 001B49FC 7C 05 03 78 */ mr r5, r0 @@ -2287,7 +2287,7 @@ lbl_801B7B64: /* 801B7B74 001B4AD4 38 80 00 00 */ li r4, 0 /* 801B7B78 001B4AD8 48 18 92 C9 */ bl __dt__6CTokenFv lbl_801B7B7C: -/* 801B7B7C 001B4ADC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801B7B7C 001B4ADC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801B7B80 001B4AE0 7F A4 EB 78 */ mr r4, r29 /* 801B7B84 001B4AE4 38 61 00 24 */ addi r3, r1, 0x24 /* 801B7B88 001B4AE8 B0 1C 00 EC */ sth r0, 0xec(r28) diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 53c48f23..0812c589 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -464,7 +464,7 @@ DeleteCollisionObject__Q220CIceAttackProjectile12CTrailObjectFR13CStateManager: /* 801F1FF8 001EEF58 90 01 00 24 */ stw r0, 0x24(r1) /* 801F1FFC 001EEF5C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801F2000 001EEF60 7C 7F 1B 78 */ mr r31, r3 -/* 801F2004 001EEF64 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F2004 001EEF64 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F2008 001EEF68 A0 63 00 10 */ lhz r3, 0x10(r3) /* 801F200C 001EEF6C 7C 03 00 40 */ cmplw r3, r0 /* 801F2010 001EEF70 41 82 00 20 */ beq lbl_801F2030 @@ -473,7 +473,7 @@ DeleteCollisionObject__Q220CIceAttackProjectile12CTrailObjectFR13CStateManager: /* 801F201C 001EEF7C 38 81 00 08 */ addi r4, r1, 8 /* 801F2020 001EEF80 B0 01 00 08 */ sth r0, 8(r1) /* 801F2024 001EEF84 4B E5 A2 49 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 801F2028 001EEF88 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F2028 001EEF88 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F202C 001EEF8C B0 1F 00 10 */ sth r0, 0x10(r31) lbl_801F2030: /* 801F2030 001EEF90 80 01 00 24 */ lwz r0, 0x24(r1) @@ -702,7 +702,7 @@ lbl_801F2348: /* 801F2360 001EF2C0 48 00 00 44 */ b lbl_801F23A4 lbl_801F2364: /* 801F2364 001EF2C4 A0 7E 00 00 */ lhz r3, 0(r30) -/* 801F2368 001EF2C8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F2368 001EF2C8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F236C 001EF2CC 7C 03 00 40 */ cmplw r3, r0 /* 801F2370 001EF2D0 40 82 00 34 */ bne lbl_801F23A4 /* 801F2374 001EF2D4 3B C0 00 00 */ li r30, 0 @@ -898,7 +898,7 @@ lbl_801F25A0: /* 801F264C 001EF5AC 88 1B 01 92 */ lbz r0, 0x192(r27) /* 801F2650 001EF5B0 28 00 00 00 */ cmplwi r0, 0 /* 801F2654 001EF5B4 41 82 01 88 */ beq lbl_801F27DC -/* 801F2658 001EF5B8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801F2658 001EF5B8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801F265C 001EF5BC 38 60 00 00 */ li r3, 0 /* 801F2660 001EF5C0 80 AD 92 AC */ lwz r5, lbl_805A7E6C@sda21(r13) /* 801F2664 001EF5C4 38 80 00 01 */ li r4, 1 @@ -2294,7 +2294,7 @@ lbl_801F39D4: /* 801F3A64 001F09C4 38 61 00 84 */ addi r3, r1, 0x84 /* 801F3A68 001F09C8 38 8B 00 07 */ addi r4, r11, 7 /* 801F3A6C 001F09CC 4B E1 12 4D */ bl string_l__4rstlFPCc -/* 801F3A70 001F09D0 80 8D A3 88 */ lwz r4, lbl_805A8F48@sda21(r13) +/* 801F3A70 001F09D0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) /* 801F3A74 001F09D4 3C 60 80 57 */ lis r3, lbl_8056D410@ha /* 801F3A78 001F09D8 80 11 00 00 */ lwz r0, 0(r17) /* 801F3A7C 001F09DC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l @@ -2308,7 +2308,7 @@ lbl_801F39D4: /* 801F3A9C 001F09FC 4B E4 6D 09 */ bl CModelDataNull__10CModelDataFv /* 801F3AA0 001F0A00 38 61 01 00 */ addi r3, r1, 0x100 /* 801F3AA4 001F0A04 4B E2 73 95 */ bl None__16CActorParametersFv -/* 801F3AA8 001F0A08 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801F3AA8 001F0A08 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801F3AAC 001F0A0C 38 00 00 00 */ li r0, 0 /* 801F3AB0 001F0A10 80 AD 92 9C */ lwz r5, lbl_805A7E5C@sda21(r13) /* 801F3AB4 001F0A14 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index 9bc60721..08b3604c 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -409,7 +409,7 @@ lbl_80261484: /* 802614AC 0025E40C 4B DD 8B 75 */ bl CanCollideWithTrigger__15CGameProjectileFR6CActorR13CStateManager /* 802614B0 0025E410 A0 A1 00 5C */ lhz r5, 0x5c(r1) /* 802614B4 0025E414 38 00 00 00 */ li r0, 0 -/* 802614B8 0025E418 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 802614B8 0025E418 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 802614BC 0025E41C 98 01 00 90 */ stb r0, 0x90(r1) /* 802614C0 0025E420 7C 65 20 50 */ subf r3, r5, r4 /* 802614C4 0025E424 7C 04 28 50 */ subf r0, r4, r5 @@ -446,7 +446,7 @@ lbl_80261524: /* 80261534 0025E494 4B DD 85 69 */ bl CanCollideWithGameObject__15CGameProjectileFR6CActorR13CStateManager /* 80261538 0025E498 A0 A1 00 24 */ lhz r5, 0x24(r1) /* 8026153C 0025E49C 38 00 00 00 */ li r0, 0 -/* 80261540 0025E4A0 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80261540 0025E4A0 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80261544 0025E4A4 98 01 00 58 */ stb r0, 0x58(r1) /* 80261548 0025E4A8 7C 65 20 50 */ subf r3, r5, r4 /* 8026154C 0025E4AC 7C 04 28 50 */ subf r0, r4, r5 @@ -485,7 +485,7 @@ SetWorldLighting__16CNewFlameThrowerFR13CStateManager7TAreaIdff: /* 802615C0 0025E520 80 1D 00 00 */ lwz r0, 0(r29) /* 802615C4 0025E524 7C 03 00 00 */ cmpw r3, r0 /* 802615C8 0025E528 41 82 00 44 */ beq lbl_8026160C -/* 802615CC 0025E52C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 802615CC 0025E52C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 802615D0 0025E530 7C 03 00 00 */ cmpw r3, r0 /* 802615D4 0025E534 41 82 00 38 */ beq lbl_8026160C /* 802615D8 0025E538 80 1E 03 78 */ lwz r0, 0x378(r30) @@ -513,7 +513,7 @@ lbl_8026160C: /* 8026162C 0025E58C 50 60 1F 38 */ rlwimi r0, r3, 3, 0x1c, 0x1c /* 80261630 0025E590 98 1E 03 7C */ stb r0, 0x37c(r30) /* 80261634 0025E594 80 7E 03 78 */ lwz r3, 0x378(r30) -/* 80261638 0025E598 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 80261638 0025E598 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8026163C 0025E59C 7C 03 00 00 */ cmpw r3, r0 /* 80261640 0025E5A0 41 82 00 38 */ beq lbl_80261678 /* 80261644 0025E5A4 80 1E 03 78 */ lwz r0, 0x378(r30) @@ -1038,7 +1038,7 @@ lbl_80261D70: /* 80261D74 0025ECD4 38 61 00 1C */ addi r3, r1, 0x1c /* 80261D78 0025ECD8 4B DE B3 65 */ bl AllocateUniqueId__13CStateManagerFv /* 80261D7C 0025ECDC A0 61 00 1C */ lhz r3, 0x1c(r1) -/* 80261D80 0025ECE0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80261D80 0025ECE0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80261D84 0025ECE4 B0 61 00 20 */ sth r3, 0x20(r1) /* 80261D88 0025ECE8 7C 03 00 40 */ cmplw r3, r0 /* 80261D8C 0025ECEC 41 82 01 08 */ beq lbl_80261E94 @@ -1698,7 +1698,7 @@ lbl_802626B0: /* 80262710 0025F670 38 81 00 90 */ addi r4, r1, 0x90 /* 80262714 0025F674 90 A1 00 94 */ stw r5, 0x94(r1) /* 80262718 0025F678 48 06 D1 9D */ bl __ct__19CCollisionPrimitiveFRC13CMaterialList -/* 8026271C 0025F67C A1 2D A3 8C */ lhz r9, lbl_805A8F4C@sda21(r13) +/* 8026271C 0025F67C A1 2D A3 8C */ lhz r9, kInvalidUniqueId@sda21(r13) /* 80262720 0025F680 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 80262724 0025F684 38 A3 CA F8 */ addi r5, r3, lbl_803ECAF8@l /* 80262728 0025F688 38 00 00 00 */ li r0, 0 @@ -1926,7 +1926,7 @@ lbl_80262A6C: /* 80262A74 0025F9D4 D2 FD 02 FC */ stfs f23, 0x2fc(r29) lbl_80262A78: /* 80262A78 0025F9D8 A0 61 00 50 */ lhz r3, 0x50(r1) -/* 80262A7C 0025F9DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80262A7C 0025F9DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80262A80 0025F9E0 7C 03 00 40 */ cmplw r3, r0 /* 80262A84 0025F9E4 41 82 00 D0 */ beq lbl_80262B54 /* 80262A88 0025F9E8 A0 01 00 50 */ lhz r0, 0x50(r1) @@ -2331,7 +2331,7 @@ lbl_80262FF8: /* 80263008 0025FF68 88 0F 00 00 */ lbz r0, 0(r15) /* 8026300C 0025FF6C 28 00 00 00 */ cmplwi r0, 0 /* 80263010 0025FF70 41 82 01 E4 */ beq lbl_802631F4 -/* 80263014 0025FF74 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 80263014 0025FF74 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 80263018 0025FF78 38 00 00 00 */ li r0, 0 /* 8026301C 0025FF7C 90 01 02 A4 */ stw r0, 0x2a4(r1) /* 80263020 0025FF80 38 60 00 00 */ li r3, 0 @@ -2369,7 +2369,7 @@ lbl_80262FF8: /* 802630A0 00260000 D3 41 02 04 */ stfs f26, 0x204(r1) /* 802630A4 00260004 4B FF EF 15 */ bl sub_80261fb8 /* 802630A8 00260008 A0 61 00 4C */ lhz r3, 0x4c(r1) -/* 802630AC 0026000C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802630AC 0026000C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802630B0 00260010 7C 03 00 40 */ cmplw r3, r0 /* 802630B4 00260014 41 82 00 D0 */ beq lbl_80263184 /* 802630B8 00260018 A0 01 00 4C */ lhz r0, 0x4c(r1) @@ -3702,7 +3702,7 @@ lbl_8026437C: /* 802643A4 00261304 4B DE 0E D5 */ bl SetActorAreaId__13CStateManagerFR6CActor7TAreaId /* 802643A8 00261308 48 00 00 0C */ b lbl_802643B4 lbl_802643AC: -/* 802643AC 0026130C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 802643AC 0026130C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802643B0 00261310 B0 1E 00 00 */ sth r0, 0(r30) lbl_802643B4: /* 802643B4 00261314 3B DE 00 02 */ addi r30, r30, 2 @@ -3768,7 +3768,7 @@ GetTouchBounds__16CNewFlameThrowerCFv: /* 80264470 002613D0 7C 7E 1B 78 */ mr r30, r3 /* 80264474 002613D4 7E 66 9B 78 */ mr r6, r19 /* 80264478 002613D8 7E 87 A3 78 */ mr r7, r20 -/* 8026447C 002613DC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8026447C 002613DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80264480 002613E0 9B 01 00 DC */ stb r24, 0xdc(r1) /* 80264484 002613E4 B0 01 00 30 */ sth r0, 0x30(r1) /* 80264488 002613E8 A0 02 C5 FC */ lhz r0, lbl_805AE31C@sda21(r2) @@ -3991,7 +3991,7 @@ lbl_80264508: /* 802647E8 00261748 90 FE 03 6C */ stw r7, 0x36c(r30) /* 802647EC 0026174C 90 FE 03 70 */ stw r7, 0x370(r30) /* 802647F0 00261750 90 FE 03 74 */ stw r7, 0x374(r30) -/* 802647F4 00261754 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 802647F4 00261754 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 802647F8 00261758 90 1E 03 78 */ stw r0, 0x378(r30) /* 802647FC 0026175C 88 1E 03 7C */ lbz r0, 0x37c(r30) /* 80264800 00261760 50 E0 3E 30 */ rlwimi r0, r7, 7, 0x18, 0x18 diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s index 441c127d..0f04fe8f 100644 --- a/asm/MetroidPrime/Weapons/CPhazonBeam.s +++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s @@ -36,7 +36,7 @@ AcceptScriptMsg__11CPhazonBeamF20EScriptObjectMessage9TUniqueIdR13CStateManager: /* 8018C23C 0018919C 48 00 00 40 */ b lbl_8018C27C lbl_8018C240: /* 8018C240 001891A0 80 66 08 4C */ lwz r3, 0x84c(r6) -/* 8018C244 001891A4 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8018C244 001891A4 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8018C248 001891A8 80 A3 00 04 */ lwz r5, 4(r3) /* 8018C24C 001891AC 7C 05 00 00 */ cmpw r5, r0 /* 8018C250 001891B0 90 A1 00 0C */ stw r5, 0xc(r1) @@ -304,7 +304,7 @@ Update__11CPhazonBeamFfR13CStateManager: /* 8018C5EC 0018954C EC 00 F8 2A */ fadds f0, f0, f31 /* 8018C5F0 00189550 D0 1E 02 78 */ stfs f0, 0x278(r30) /* 8018C5F4 00189554 80 7F 08 4C */ lwz r3, 0x84c(r31) -/* 8018C5F8 00189558 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 8018C5F8 00189558 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 8018C5FC 0018955C 80 A3 00 04 */ lwz r5, 4(r3) /* 8018C600 00189560 7C 05 00 00 */ cmpw r5, r0 /* 8018C604 00189564 90 A1 00 0C */ stw r5, 0xc(r1) diff --git a/asm/MetroidPrime/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s index 1fa90bb8..c15bddf2 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s +++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s @@ -65,7 +65,7 @@ SetWorldLighting__11CPlasmaBeamFR13CStateManager7TAreaIdff: /* 800DEBE8 000DBB48 80 1D 00 00 */ lwz r0, 0(r29) /* 800DEBEC 000DBB4C 7C 03 00 00 */ cmpw r3, r0 /* 800DEBF0 000DBB50 41 82 00 44 */ beq lbl_800DEC34 -/* 800DEBF4 000DBB54 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800DEBF4 000DBB54 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800DEBF8 000DBB58 7C 03 00 00 */ cmpw r3, r0 /* 800DEBFC 000DBB5C 41 82 00 38 */ beq lbl_800DEC34 /* 800DEC00 000DBB60 80 1E 02 3C */ lwz r0, 0x23c(r30) @@ -93,7 +93,7 @@ lbl_800DEC34: /* 800DEC54 000DBBB4 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 800DEC58 000DBBB8 98 1E 02 2C */ stb r0, 0x22c(r30) /* 800DEC5C 000DBBBC 80 7E 02 3C */ lwz r3, 0x23c(r30) -/* 800DEC60 000DBBC0 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800DEC60 000DBBC0 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800DEC64 000DBBC4 7C 03 00 00 */ cmpw r3, r0 /* 800DEC68 000DBBC8 41 82 00 38 */ beq lbl_800DECA0 /* 800DEC6C 000DBBCC 80 1E 02 3C */ lwz r0, 0x23c(r30) @@ -790,7 +790,7 @@ __ct__11CPlasmaBeamFUi11EWeaponType9TUniqueId14EMaterialTypesRC9CVector3f: /* 800DF5E0 000DC540 D0 1F 02 30 */ stfs f0, 0x230(r31) /* 800DF5E4 000DC544 D0 1F 02 34 */ stfs f0, 0x234(r31) /* 800DF5E8 000DC548 D0 1F 02 38 */ stfs f0, 0x238(r31) -/* 800DF5EC 000DC54C 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800DF5EC 000DC54C 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800DF5F0 000DC550 90 1F 02 3C */ stw r0, 0x23c(r31) /* 800DF5F4 000DC554 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DF5F8 000DC558 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 59d8a948..b7237d42 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -429,7 +429,7 @@ DeletePlasmaLights__17CPlasmaProjectileFR13CStateManager: /* 80177080 00173FE0 48 00 00 28 */ b lbl_801770A8 lbl_80177084: /* 80177084 00173FE4 A0 7F 00 00 */ lhz r3, 0(r31) -/* 80177088 00173FE8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80177088 00173FE8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8017708C 00173FEC 7C 03 00 40 */ cmplw r3, r0 /* 80177090 00173FF0 41 82 00 14 */ beq lbl_801770A4 /* 80177094 00173FF4 B0 61 00 08 */ sth r3, 8(r1) @@ -594,7 +594,7 @@ SetLightsActive__17CPlasmaProjectileFbR13CStateManager: /* 801772D0 00174230 48 00 00 54 */ b lbl_80177324 lbl_801772D4: /* 801772D4 00174234 A0 7F 00 00 */ lhz r3, 0(r31) -/* 801772D8 00174238 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801772D8 00174238 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801772DC 0017423C 7C 03 00 40 */ cmplw r3, r0 /* 801772E0 00174240 41 82 00 40 */ beq lbl_80177320 /* 801772E4 00174244 B0 61 00 08 */ sth r3, 8(r1) diff --git a/asm/MetroidPrime/Weapons/CPlayerGun.s b/asm/MetroidPrime/Weapons/CPlayerGun.s index 1b68f8b8..c3b9e45c 100644 --- a/asm/MetroidPrime/Weapons/CPlayerGun.s +++ b/asm/MetroidPrime/Weapons/CPlayerGun.s @@ -2145,7 +2145,7 @@ lbl_801BB9CC: /* 801BBA04 001B8964 38 00 00 00 */ li r0, 0 /* 801BBA08 001B8968 98 01 00 54 */ stb r0, 0x54(r1) /* 801BBA0C 001B896C 7F 64 DB 78 */ mr r4, r27 -/* 801BBA10 001B8970 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801BBA10 001B8970 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801BBA14 001B8974 38 61 00 30 */ addi r3, r1, 0x30 /* 801BBA18 001B8978 B0 A1 00 40 */ sth r5, 0x40(r1) /* 801BBA1C 001B897C 3A C0 00 01 */ li r22, 1 @@ -2879,7 +2879,7 @@ Update__10CGunWeaponFfR13CStateManager: /* 801BC49C 001B93FC 88 03 02 18 */ lbz r0, 0x218(r3) /* 801BC4A0 001B9400 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 801BC4A4 001B9404 41 82 00 50 */ beq lbl_801BC4F4 -/* 801BC4A8 001B9408 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801BC4A8 001B9408 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801BC4AC 001B940C 7F E5 FB 78 */ mr r5, r31 /* 801BC4B0 001B9410 38 61 00 0C */ addi r3, r1, 0xc /* 801BC4B4 001B9414 38 9E 00 10 */ addi r4, r30, 0x10 diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 92c13aa4..e0307876 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -239,7 +239,7 @@ lbl_802318F0: /* 80231900 0022E860 48 00 00 30 */ b lbl_80231930 lbl_80231904: /* 80231904 0022E864 A0 7C 09 80 */ lhz r3, 0x980(r28) -/* 80231908 0022E868 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80231908 0022E868 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023190C 0022E86C 7C 03 00 40 */ cmplw r3, r0 /* 80231910 0022E870 41 82 00 20 */ beq lbl_80231930 /* 80231914 0022E874 A0 1C 09 80 */ lhz r0, 0x980(r28) @@ -247,7 +247,7 @@ lbl_80231904: /* 8023191C 0022E87C 38 81 00 1C */ addi r4, r1, 0x1c /* 80231920 0022E880 B0 01 00 1C */ sth r0, 0x1c(r1) /* 80231924 0022E884 4B E1 A9 49 */ bl FreeScriptObject__13CStateManagerF9TUniqueId -/* 80231928 0022E888 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80231928 0022E888 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8023192C 0022E88C B0 1C 09 80 */ sth r0, 0x980(r28) lbl_80231930: /* 80231930 0022E890 A0 1E 00 00 */ lhz r0, 0(r30) @@ -899,7 +899,7 @@ lbl_80232234: /* 80232288 0022F1E8 48 00 00 70 */ b lbl_802322F8 lbl_8023228C: /* 8023228C 0022F1EC A0 7F 09 80 */ lhz r3, 0x980(r31) -/* 80232290 0022F1F0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80232290 0022F1F0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80232294 0022F1F4 7C 03 00 40 */ cmplw r3, r0 /* 80232298 0022F1F8 41 82 00 60 */ beq lbl_802322F8 /* 8023229C 0022F1FC A0 1F 09 80 */ lhz r0, 0x980(r31) @@ -977,7 +977,7 @@ __ct__10CShockWaveFv: /* 802323A0 0022F300 4B E0 84 05 */ bl CModelDataNull__10CModelDataFv /* 802323A4 0022F304 38 61 00 A4 */ addi r3, r1, 0xa4 /* 802323A8 0022F308 4B DE 8A 91 */ bl None__16CActorParametersFv -/* 802323AC 0022F30C A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 802323AC 0022F30C A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 802323B0 0022F310 38 00 00 00 */ li r0, 0 /* 802323B4 0022F314 80 AD 96 2C */ lwz r5, lbl_805A81EC@sda21(r13) /* 802323B8 0022F318 38 60 00 00 */ li r3, 0 @@ -1206,7 +1206,7 @@ lbl_802326FC: /* 80232708 0022F668 38 80 FF FF */ li r4, -1 /* 8023270C 0022F66C 48 10 E7 35 */ bl __dt__6CTokenFv lbl_80232710: -/* 80232710 0022F670 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 80232710 0022F670 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80232714 0022F674 38 80 00 01 */ li r4, 1 /* 80232718 0022F678 B0 1E 09 80 */ sth r0, 0x980(r30) /* 8023271C 0022F67C 80 7E 01 10 */ lwz r3, 0x110(r30) diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index f1b8952d..4854e876 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -316,7 +316,7 @@ Think__21CTargetableProjectileFfR13CStateManager: /* 8013BC70 00138BD0 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8013BC74 00138BD4 40 82 02 30 */ bne lbl_8013BEA4 /* 8013BC78 00138BD8 A0 7C 02 C4 */ lhz r3, 0x2c4(r28) -/* 8013BC7C 00138BDC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8013BC7C 00138BDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8013BC80 00138BE0 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 8013BC84 00138BE4 B0 61 00 60 */ sth r3, 0x60(r1) /* 8013BC88 00138BE8 7C 04 00 40 */ cmplw r4, r0 @@ -454,7 +454,7 @@ lbl_8013BE50: /* 8013BE8C 00138DEC B0 01 00 34 */ sth r0, 0x34(r1) /* 8013BE90 00138DF0 80 7D 08 4C */ lwz r3, 0x84c(r29) /* 8013BE94 00138DF4 48 03 F7 59 */ bl SetOrbitTargetId__7CPlayerF9TUniqueIdR13CStateManager -/* 8013BE98 00138DF8 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 8013BE98 00138DF8 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8013BE9C 00138DFC B0 01 00 30 */ sth r0, 0x30(r1) /* 8013BEA0 00138E00 B0 1C 02 C4 */ sth r0, 0x2c4(r28) lbl_8013BEA4: diff --git a/asm/MetroidPrime/Weapons/CWaveBeam.s b/asm/MetroidPrime/Weapons/CWaveBeam.s index 36dcfd5b..25c8ae3d 100644 --- a/asm/MetroidPrime/Weapons/CWaveBeam.s +++ b/asm/MetroidPrime/Weapons/CWaveBeam.s @@ -363,7 +363,7 @@ lbl_800E04E4: /* 800E0558 000DD4B8 7E E4 BB 78 */ mr r4, r23 /* 800E055C 000DD4BC 98 01 00 6C */ stb r0, 0x6c(r1) /* 800E0560 000DD4C0 38 61 00 30 */ addi r3, r1, 0x30 -/* 800E0564 000DD4C4 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 800E0564 000DD4C4 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 800E0568 000DD4C8 3A 40 00 01 */ li r18, 1 /* 800E056C 000DD4CC D0 01 00 54 */ stfs f0, 0x54(r1) /* 800E0570 000DD4D0 D0 01 00 58 */ stfs f0, 0x58(r1) diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index 283bfdb4..cf2b5734 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -792,7 +792,7 @@ sub_801be010: /* 801BE120 001BB080 7F 84 E3 78 */ mr r4, r28 /* 801BE124 001BB084 C0 A2 AA 04 */ lfs f5, lbl_805AC724@sda21(r2) /* 801BE128 001BB088 7F 47 D3 78 */ mr r7, r26 -/* 801BE12C 001BB08C A1 6D A3 8C */ lhz r11, lbl_805A8F4C@sda21(r13) +/* 801BE12C 001BB08C A1 6D A3 8C */ lhz r11, kInvalidUniqueId@sda21(r13) /* 801BE130 001BB090 7F 68 DB 78 */ mr r8, r27 /* 801BE134 001BB094 C0 81 00 98 */ lfs f4, 0x98(r1) /* 801BE138 001BB098 38 A1 00 0C */ addi r5, r1, 0xc @@ -1794,7 +1794,7 @@ lbl_801BEF98: /* 801BF014 001BBF74 40 82 01 54 */ bne lbl_801BF168 /* 801BF018 001BBF78 54 60 DF FF */ rlwinm. r0, r3, 0x1b, 0x1f, 0x1f /* 801BF01C 001BBF7C 40 82 01 4C */ bne lbl_801BF168 -/* 801BF020 001BBF80 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF020 001BBF80 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF024 001BBF84 FC 20 F0 90 */ fmr f1, f30 /* 801BF028 001BBF88 7F C4 F3 78 */ mr r4, r30 /* 801BF02C 001BBF8C 7F E8 FB 78 */ mr r8, r31 @@ -1880,7 +1880,7 @@ lbl_801BF158: /* 801BF164 001BC0C4 98 1E 03 D0 */ stb r0, 0x3d0(r30) lbl_801BF168: /* 801BF168 001BC0C8 A0 7E 02 C0 */ lhz r3, 0x2c0(r30) -/* 801BF16C 001BC0CC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF16C 001BC0CC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF170 001BC0D0 7C 03 00 40 */ cmplw r3, r0 /* 801BF174 001BC0D4 41 82 00 24 */ beq lbl_801BF198 /* 801BF178 001BC0D8 88 1E 03 D0 */ lbz r0, 0x3d0(r30) @@ -1953,7 +1953,7 @@ lbl_801BF254: lbl_801BF278: /* 801BF278 001BC1D8 A0 7E 02 C0 */ lhz r3, 0x2c0(r30) /* 801BF27C 001BC1DC 38 80 00 00 */ li r4, 0 -/* 801BF280 001BC1E0 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF280 001BC1E0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF284 001BC1E4 7C 03 00 40 */ cmplw r3, r0 /* 801BF288 001BC1E8 41 82 00 14 */ beq lbl_801BF29C /* 801BF28C 001BC1EC 88 1E 03 D0 */ lbz r0, 0x3d0(r30) @@ -2023,7 +2023,7 @@ lbl_801BF36C: /* 801BF380 001BC2E0 C1 23 00 08 */ lfs f9, 8(r3) /* 801BF384 001BC2E4 40 80 00 64 */ bge lbl_801BF3E8 /* 801BF388 001BC2E8 A0 7E 02 C0 */ lhz r3, 0x2c0(r30) -/* 801BF38C 001BC2EC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF38C 001BC2EC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF390 001BC2F0 7C 03 00 40 */ cmplw r3, r0 /* 801BF394 001BC2F4 41 82 00 54 */ beq lbl_801BF3E8 /* 801BF398 001BC2F8 EC 61 00 24 */ fdivs f3, f1, f0 @@ -2060,7 +2060,7 @@ lbl_801BF3E8: /* 801BF410 001BC370 D0 1E 03 A0 */ stfs f0, 0x3a0(r30) lbl_801BF414: /* 801BF414 001BC374 A0 7E 02 C8 */ lhz r3, 0x2c8(r30) -/* 801BF418 001BC378 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF418 001BC378 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF41C 001BC37C 7C 03 00 40 */ cmplw r3, r0 /* 801BF420 001BC380 41 82 00 EC */ beq lbl_801BF50C /* 801BF424 001BC384 80 7E 03 90 */ lwz r3, 0x390(r30) @@ -2173,12 +2173,12 @@ sub_801bf598: /* 801BF5B4 001BC514 93 C1 00 68 */ stw r30, 0x68(r1) /* 801BF5B8 001BC518 7C 9E 23 78 */ mr r30, r4 /* 801BF5BC 001BC51C 7F E4 FB 78 */ mr r4, r31 -/* 801BF5C0 001BC520 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF5C0 001BC520 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF5C4 001BC524 7F C6 F3 78 */ mr r6, r30 /* 801BF5C8 001BC528 B0 01 00 14 */ sth r0, 0x14(r1) /* 801BF5CC 001BC52C 48 00 01 21 */ bl sub_801bf6ec /* 801BF5D0 001BC530 A0 BF 02 C0 */ lhz r5, 0x2c0(r31) -/* 801BF5D4 001BC534 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF5D4 001BC534 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF5D8 001BC538 7C 05 00 40 */ cmplw r5, r0 /* 801BF5DC 001BC53C 41 82 00 A4 */ beq lbl_801BF680 /* 801BF5E0 001BC540 B0 A1 00 0C */ sth r5, 0xc(r1) @@ -2206,7 +2206,7 @@ sub_801bf598: /* 801BF638 001BC598 C0 02 AA 40 */ lfs f0, lbl_805AC760@sda21(r2) /* 801BF63C 001BC59C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801BF640 001BC5A0 40 81 00 24 */ ble lbl_801BF664 -/* 801BF644 001BC5A4 A0 8D A3 8C */ lhz r4, lbl_805A8F4C@sda21(r13) +/* 801BF644 001BC5A4 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) /* 801BF648 001BC5A8 38 60 00 00 */ li r3, 0 /* 801BF64C 001BC5AC B0 9F 02 C0 */ sth r4, 0x2c0(r31) /* 801BF650 001BC5B0 88 1F 03 D0 */ lbz r0, 0x3d0(r31) @@ -2356,7 +2356,7 @@ sub_801bf6ec: /* 801BF878 001BC7D8 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 801BF87C 001BC7DC 98 1F 03 D0 */ stb r0, 0x3d0(r31) /* 801BF880 001BC7E0 A0 7A 00 00 */ lhz r3, 0(r26) -/* 801BF884 001BC7E4 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF884 001BC7E4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF888 001BC7E8 7C 03 00 40 */ cmplw r3, r0 /* 801BF88C 001BC7EC 41 82 00 48 */ beq lbl_801BF8D4 /* 801BF890 001BC7F0 A0 1F 02 C0 */ lhz r0, 0x2c0(r31) @@ -2377,7 +2377,7 @@ sub_801bf6ec: /* 801BF8CC 001BC82C 48 12 A9 E5 */ bl AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi /* 801BF8D0 001BC830 48 00 00 24 */ b lbl_801BF8F4 lbl_801BF8D4: -/* 801BF8D4 001BC834 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BF8D4 001BC834 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BF8D8 001BC838 B0 01 00 08 */ sth r0, 8(r1) /* 801BF8DC 001BC83C B0 1F 02 C0 */ sth r0, 0x2c0(r31) /* 801BF8E0 001BC840 48 00 00 14 */ b lbl_801BF8F4 @@ -2589,7 +2589,7 @@ lbl_801BFB24: /* 801BFBF0 001BCB50 88 1F 00 E4 */ lbz r0, 0xe4(r31) /* 801BFBF4 001BCB54 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d /* 801BFBF8 001BCB58 98 1F 00 E4 */ stb r0, 0xe4(r31) -/* 801BFBFC 001BCB5C A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BFBFC 001BCB5C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BFC00 001BCB60 B0 1F 02 C0 */ sth r0, 0x2c0(r31) /* 801BFC04 001BCB64 D0 1F 03 9C */ stfs f0, 0x39c(r31) /* 801BFC08 001BCB68 B0 01 00 08 */ sth r0, 8(r1) @@ -2771,7 +2771,7 @@ lbl_801BFE78: /* 801BFEA4 001BCE04 EC 01 07 BA */ fmadds f0, f1, f30, f0 /* 801BFEA8 001BCE08 D0 1D 03 C4 */ stfs f0, 0x3c4(r29) /* 801BFEAC 001BCE0C C4 43 C9 14 */ lfsu f2, lbl_8046C914@l(r3) -/* 801BFEB0 001BCE10 A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801BFEB0 001BCE10 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801BFEB4 001BCE14 C0 23 00 04 */ lfs f1, 4(r3) /* 801BFEB8 001BCE18 C0 03 00 08 */ lfs f0, 8(r3) /* 801BFEBC 001BCE1C D0 41 00 28 */ stfs f2, 0x28(r1) @@ -2900,7 +2900,7 @@ SetNewTarget__11CWaveBusterF9TUniqueId: /* 801C0070 001BCFD0 A0 C4 00 00 */ lhz r6, 0(r4) /* 801C0074 001BCFD4 B0 C3 02 C0 */ sth r6, 0x2c0(r3) /* 801C0078 001BCFD8 A0 84 00 00 */ lhz r4, 0(r4) -/* 801C007C 001BCFDC A0 0D A3 8C */ lhz r0, lbl_805A8F4C@sda21(r13) +/* 801C007C 001BCFDC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801C0080 001BCFE0 B0 C1 00 08 */ sth r6, 8(r1) /* 801C0084 001BCFE4 7C 04 00 40 */ cmplw r4, r0 /* 801C0088 001BCFE8 41 82 00 78 */ beq lbl_801C0100 diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index bd086a2e..2f775dc3 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -354,7 +354,7 @@ lbl_80102278: /* 801022E0 000FF240 38 C1 00 28 */ addi r6, r1, 0x28 /* 801022E4 000FF244 80 05 00 00 */ lwz r0, 0(r5) /* 801022E8 000FF248 38 AB D4 10 */ addi r5, r11, lbl_8056D410@l -/* 801022EC 000FF24C 81 8D A3 88 */ lwz r12, lbl_805A8F48@sda21(r13) +/* 801022EC 000FF24C 81 8D A3 88 */ lwz r12, kInvalidEditorId@sda21(r13) /* 801022F0 000FF250 90 01 00 2C */ stw r0, 0x2c(r1) /* 801022F4 000FF254 91 81 00 28 */ stw r12, 0x28(r1) /* 801022F8 000FF258 4B F4 F1 8D */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" @@ -364,7 +364,7 @@ lbl_80102278: /* 80102308 000FF268 38 81 00 B0 */ addi r4, r1, 0xb0 /* 8010230C 000FF26C 38 A0 00 01 */ li r5, 1 /* 80102310 000FF270 48 00 44 FD */ bl sub_8010680c -/* 80102314 000FF274 A0 6D A3 8C */ lhz r3, lbl_805A8F4C@sda21(r13) +/* 80102314 000FF274 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) /* 80102318 000FF278 38 81 00 48 */ addi r4, r1, 0x48 /* 8010231C 000FF27C A0 F4 00 00 */ lhz r7, 0(r20) /* 80102320 000FF280 38 01 00 10 */ addi r0, r1, 0x10 diff --git a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s index 2b7335b9..8506636d 100644 --- a/asm/MetroidPrime/Weapons/GunController/CGunMotion.s +++ b/asm/MetroidPrime/Weapons/GunController/CGunMotion.s @@ -147,7 +147,7 @@ Update__10CGunMotionFfR13CStateManager: /* 801D9158 001D60B8 7C 7E 1B 78 */ mr r30, r3 /* 801D915C 001D60BC 7F C4 F3 78 */ mr r4, r30 /* 801D9160 001D60C0 38 61 00 0C */ addi r3, r1, 0xc -/* 801D9164 001D60C4 80 0D A3 90 */ lwz r0, lbl_805A8F50@sda21(r13) +/* 801D9164 001D60C4 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) /* 801D9168 001D60C8 90 01 00 08 */ stw r0, 8(r1) /* 801D916C 001D60CC 4B F3 C9 C9 */ bl AdvanceAnimation__10CModelDataFfR13CStateManager7TAreaIdb /* 801D9170 001D60D0 FC 20 F8 90 */ fmr f1, f31 diff --git a/asm/sbss.s b/asm/sbss.s index f4e30d32..c1f5b208 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -523,14 +523,14 @@ lbl_805A8F44: .skip 0x4 # TGameTypes -.global lbl_805A8F48 -lbl_805A8F48: +.global kInvalidEditorId +kInvalidEditorId: .skip 0x4 -.global lbl_805A8F4C -lbl_805A8F4C: +.global kInvalidUniqueId +kInvalidUniqueId: .skip 0x4 -.global lbl_805A8F50 -lbl_805A8F50: +.global kInvalidAreaId +kInvalidAreaId: .skip 0x4 .global lbl_805A8F54 lbl_805A8F54: