From 4b08f70a0b3d949d9d7b69ba8293a1191de7cb2e Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Mon, 3 Oct 2022 20:00:51 +0300 Subject: [PATCH] CSfxManager: Add kAllAreas, areaId to int --- asm/Kyoto/Audio/CSfxManager.s | 4 +- asm/MetroidPrime/CActorParticles.s | 4 +- asm/MetroidPrime/CAutoMapper.s | 20 ++++---- asm/MetroidPrime/CCredits.s | 4 +- asm/MetroidPrime/CEnvFxManager.s | 4 +- asm/MetroidPrime/CFluidPlaneManager.s | 2 +- asm/MetroidPrime/CFrontEndUI.s | 48 +++++++++---------- asm/MetroidPrime/CGameProjectile.s | 2 +- asm/MetroidPrime/CInGameGuiManager.s | 4 +- asm/MetroidPrime/CInventoryScreen.s | 2 +- asm/MetroidPrime/CLogBookScreen.s | 2 +- asm/MetroidPrime/CMessageScreen.s | 2 +- asm/MetroidPrime/CPauseScreen.s | 20 ++++---- asm/MetroidPrime/CPauseScreenBlur.s | 8 ++-- asm/MetroidPrime/CPauseScreenFrame.s | 36 +++++++------- asm/MetroidPrime/CSamusDoll.s | 10 ++-- asm/MetroidPrime/CSaveGameScreen.s | 4 +- asm/MetroidPrime/CSlideShow.s | 12 ++--- asm/MetroidPrime/CStateManager.s | 2 +- asm/MetroidPrime/CTargetReticles.s | 4 +- asm/MetroidPrime/CWorldTransManager.s | 4 +- asm/MetroidPrime/Cameras/CCameraManager.s | 4 +- asm/MetroidPrime/Enemies/CBabygoth.s | 2 +- asm/MetroidPrime/Enemies/CChozoGhost.s | 4 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 10 ++-- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 2 +- asm/MetroidPrime/Enemies/CIceSheegoth.s | 2 +- asm/MetroidPrime/Enemies/CMetaree.s | 2 +- .../Enemies/CMetroidPrimeEssence.s | 2 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 4 +- asm/MetroidPrime/Enemies/CParasite.s | 6 +-- asm/MetroidPrime/Enemies/CPatterned.s | 6 +-- asm/MetroidPrime/Enemies/CPuffer.s | 2 +- asm/MetroidPrime/Enemies/CRidley.s | 6 +-- asm/MetroidPrime/Enemies/CSpacePirate.s | 10 ++-- asm/MetroidPrime/Enemies/CThardus.s | 2 +- asm/MetroidPrime/HUD/CHudDecoInterface.s | 14 +++--- asm/MetroidPrime/HUD/CSamusHud.s | 20 ++++---- asm/MetroidPrime/Player/CMorphBall.s | 12 ++--- asm/MetroidPrime/Player/CPlayer.s | 38 +++++++-------- asm/MetroidPrime/Player/CPlayerDynamics.s | 8 ++-- asm/MetroidPrime/Player/CPlayerGun.s | 5 +- asm/MetroidPrime/Player/CPlayerVisor.s | 24 +++++----- asm/MetroidPrime/Player/CScanDisplay.s | 10 ++-- asm/MetroidPrime/ScriptObjects/CEnergyBall.s | 2 +- asm/MetroidPrime/ScriptObjects/CScriptSound.s | 2 +- .../ScriptObjects/CScriptSpecialFunction.s | 6 +-- .../ScriptObjects/CScriptVisorGoo.s | 2 +- asm/MetroidPrime/Weapons/CBomb.s | 4 +- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 4 +- asm/MetroidPrime/Weapons/CIceProjectile.s | 2 +- asm/MetroidPrime/Weapons/CPlasmaProjectile.s | 2 +- asm/MetroidPrime/Weapons/CPowerBomb.s | 4 +- asm/MetroidPrime/Weapons/CShockWave.s | 2 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 4 +- asm/MetroidPrime/Weapons/WeaponTypes.s | 2 +- include/Kyoto/Audio/CSfxManager.hpp | 5 +- 57 files changed, 217 insertions(+), 217 deletions(-) diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index 646cb681..f458731d 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -4619,8 +4619,8 @@ lbl_805AE31C: # ROM: 0x3FABBC .4byte 0xFFFF0000 -.global lbl_805AE320 -lbl_805AE320: +.global kAllAreas__11CSfxManager +kAllAreas__11CSfxManager: # ROM: 0x3FABC0 .4byte 0xFFFFFFFF diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index 599aa07f..f768b5fc 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -97,7 +97,7 @@ StartBurnDeath__20CActorModelParticlesFR5CActor: /* 801E399C 001E08FC A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 801E39A0 001E0900 38 03 04 7E */ addi r0, r3, 0x47e /* 801E39A4 001E0904 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 801E39A8 001E0908 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801E39A8 001E0908 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801E39AC 001E090C 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 801E39B0 001E0910 D0 21 00 14 */ stfs f1, 0x14(r1) /* 801E39B4 001E0914 38 61 00 08 */ addi r3, r1, 8 @@ -2620,7 +2620,7 @@ lbl_801E5C7C: /* 801E5CBC 001E2C1C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 801E5CC0 001E2C20 D0 21 00 34 */ stfs f1, 0x34(r1) /* 801E5CC4 001E2C24 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 801E5CC8 001E2C28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801E5CC8 001E2C28 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801E5CCC 001E2C2C 38 61 00 10 */ addi r3, r1, 0x10 /* 801E5CD0 001E2C30 D0 41 00 38 */ stfs f2, 0x38(r1) /* 801E5CD4 001E2C34 38 A1 00 30 */ addi r5, r1, 0x30 diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index 5ad7fa12..3f518ab1 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -1850,7 +1850,7 @@ SetShouldRotatingSoundBePlaying__11CAutoMapperFb: /* 80096B44 00093AA4 40 82 00 4C */ bne lbl_80096B90 /* 80096B48 00093AA8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80096B4C 00093AAC 38 61 00 0C */ addi r3, r1, 0xc -/* 80096B50 00093AB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80096B50 00093AB0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80096B54 00093AB4 38 80 05 5F */ li r4, 0x55f /* 80096B58 00093AB8 38 A0 00 7F */ li r5, 0x7f /* 80096B5C 00093ABC 38 C0 00 40 */ li r6, 0x40 @@ -1888,7 +1888,7 @@ SetShouldZoomingSoundBePlaying__11CAutoMapperFb: /* 80096BC8 00093B28 40 82 00 4C */ bne lbl_80096C14 /* 80096BCC 00093B2C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80096BD0 00093B30 38 61 00 0C */ addi r3, r1, 0xc -/* 80096BD4 00093B34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80096BD4 00093B34 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80096BD8 00093B38 38 80 05 60 */ li r4, 0x560 /* 80096BDC 00093B3C 38 A0 00 7F */ li r5, 0x7f /* 80096BE0 00093B40 38 C0 00 40 */ li r6, 0x40 @@ -1926,7 +1926,7 @@ SetShouldPanningSoundBePlaying__11CAutoMapperFb: /* 80096C4C 00093BAC 40 82 00 4C */ bne lbl_80096C98 /* 80096C50 00093BB0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80096C54 00093BB4 38 61 00 0C */ addi r3, r1, 0xc -/* 80096C58 00093BB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80096C58 00093BB8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80096C5C 00093BBC 38 80 05 7E */ li r4, 0x57e /* 80096C60 00093BC0 38 A0 00 7F */ li r5, 0x7f /* 80096C64 00093BC4 38 C0 00 40 */ li r6, 0x40 @@ -2666,7 +2666,7 @@ lbl_80097730: /* 8009773C 0009469C 40 82 01 14 */ bne lbl_80097850 /* 80097740 000946A0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80097744 000946A4 38 61 00 10 */ addi r3, r1, 0x10 -/* 80097748 000946A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80097748 000946A8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009774C 000946AC 38 80 05 92 */ li r4, 0x592 /* 80097750 000946B0 38 A0 00 7F */ li r5, 0x7f /* 80097754 000946B4 38 C0 00 40 */ li r6, 0x40 @@ -2739,7 +2739,7 @@ lbl_80097850: /* 8009785C 000947BC 40 82 01 FC */ bne lbl_80097A58 /* 80097860 000947C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80097864 000947C4 38 61 00 0C */ addi r3, r1, 0xc -/* 80097868 000947C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80097868 000947C8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009786C 000947CC 38 80 05 93 */ li r4, 0x593 /* 80097870 000947D0 38 A0 00 7F */ li r5, 0x7f /* 80097874 000947D4 38 C0 00 40 */ li r6, 0x40 @@ -7117,7 +7117,7 @@ lbl_8009B7D0: /* 8009B7D4 00098734 48 13 99 D5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B7D8 00098738 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8009B7DC 0009873C 38 61 00 24 */ addi r3, r1, 0x24 -/* 8009B7E0 00098740 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8009B7E0 00098740 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009B7E4 00098744 38 80 05 AC */ li r4, 0x5ac /* 8009B7E8 00098748 38 A0 00 7F */ li r5, 0x7f /* 8009B7EC 0009874C 38 C0 00 40 */ li r6, 0x40 @@ -7130,7 +7130,7 @@ lbl_8009B800: /* 8009B804 00098764 48 13 99 A5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B808 00098768 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8009B80C 0009876C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8009B810 00098770 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8009B810 00098770 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009B814 00098774 38 80 05 A6 */ li r4, 0x5a6 /* 8009B818 00098778 38 A0 00 7F */ li r5, 0x7f /* 8009B81C 0009877C 38 C0 00 40 */ li r6, 0x40 @@ -7143,7 +7143,7 @@ lbl_8009B830: /* 8009B834 00098794 48 13 99 75 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B838 00098798 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8009B83C 0009879C 38 61 00 1C */ addi r3, r1, 0x1c -/* 8009B840 000987A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8009B840 000987A0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009B844 000987A4 38 80 05 AD */ li r4, 0x5ad /* 8009B848 000987A8 38 A0 00 7F */ li r5, 0x7f /* 8009B84C 000987AC 38 C0 00 40 */ li r6, 0x40 @@ -7435,7 +7435,7 @@ lbl_8009BC40: /* 8009BC6C 00098BCC 40 82 00 2C */ bne lbl_8009BC98 /* 8009BC70 00098BD0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8009BC74 00098BD4 38 61 00 14 */ addi r3, r1, 0x14 -/* 8009BC78 00098BD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8009BC78 00098BD8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009BC7C 00098BDC 38 80 05 6A */ li r4, 0x56a /* 8009BC80 00098BE0 38 A0 00 7F */ li r5, 0x7f /* 8009BC84 00098BE4 38 C0 00 40 */ li r6, 0x40 @@ -7446,7 +7446,7 @@ lbl_8009BC40: lbl_8009BC98: /* 8009BC98 00098BF8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8009BC9C 00098BFC 38 61 00 10 */ addi r3, r1, 0x10 -/* 8009BCA0 00098C00 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8009BCA0 00098C00 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8009BCA4 00098C04 38 80 05 6B */ li r4, 0x56b /* 8009BCA8 00098C08 38 A0 00 7F */ li r5, 0x7f /* 8009BCAC 00098C0C 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CCredits.s b/asm/MetroidPrime/CCredits.s index 148e649f..add9b84c 100644 --- a/asm/MetroidPrime/CCredits.s +++ b/asm/MetroidPrime/CCredits.s @@ -1608,7 +1608,7 @@ sub_8002645c: /* 800264A0 00023400 38 61 00 08 */ addi r3, r1, 8 /* 800264A4 00023404 88 05 00 F4 */ lbz r0, 0xf4(r5) /* 800264A8 00023408 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 -/* 800264AC 0002340C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800264AC 0002340C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800264B0 00023410 38 80 05 8D */ li r4, 0x58d /* 800264B4 00023414 98 05 00 F4 */ stb r0, 0xf4(r5) /* 800264B8 00023418 38 A0 00 7F */ li r5, 0x7f @@ -1713,7 +1713,7 @@ lbl_800265E0: /* 80026618 00023578 38 61 00 18 */ addi r3, r1, 0x18 /* 8002661C 0002357C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80026620 00023580 38 80 05 9E */ li r4, 0x59e -/* 80026624 00023584 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80026624 00023584 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80026628 00023588 38 A0 00 7F */ li r5, 0x7f /* 8002662C 0002358C 38 C0 00 40 */ li r6, 0x40 /* 80026630 00023590 38 E0 00 00 */ li r7, 0 diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index f031e8f7..2878a1d9 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -210,7 +210,7 @@ UpdateRainSounds__13CEnvFxManagerFR13CStateManager: /* 8020FFE8 0020CF48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8020FFEC 0020CF4C A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) /* 8020FFF0 0020CF50 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l -/* 8020FFF4 0020CF54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8020FFF4 0020CF54 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8020FFF8 0020CF58 38 61 00 24 */ addi r3, r1, 0x24 /* 8020FFFC 0020CF5C 38 80 09 F0 */ li r4, 0x9f0 /* 80210000 0020CF60 7C A6 2B 78 */ mr r6, r5 @@ -223,7 +223,7 @@ UpdateRainSounds__13CEnvFxManagerFR13CStateManager: /* 8021001C 0020CF7C A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) /* 80210020 0020CF80 90 1F 0B 6C */ stw r0, 0xb6c(r31) /* 80210024 0020CF84 7C A6 2B 78 */ mr r6, r5 -/* 80210028 0020CF88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80210028 0020CF88 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8021002C 0020CF8C 38 61 00 20 */ addi r3, r1, 0x20 /* 80210030 0020CF90 38 80 09 F1 */ li r4, 0x9f1 /* 80210034 0020CF94 38 E0 00 00 */ li r7, 0 diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s index 2192b4e8..4e13735b 100644 --- a/asm/MetroidPrime/CFluidPlaneManager.s +++ b/asm/MetroidPrime/CFluidPlaneManager.s @@ -428,7 +428,7 @@ lbl_8012F510: /* 8012F534 0012C494 4B FD 01 91 */ bl GetSplashSound__12CScriptWaterCFf /* 8012F538 0012C498 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 8012F53C 0012C49C 7C 64 1B 78 */ mr r4, r3 -/* 8012F540 0012C4A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8012F540 0012C4A0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8012F544 0012C4A4 7F A5 EB 78 */ mr r5, r29 /* 8012F548 0012C4A8 38 61 00 2C */ addi r3, r1, 0x2c /* 8012F54C 0012C4AC 38 C1 00 44 */ addi r6, r1, 0x44 diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index f66c7ff9..47c62785 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -1044,7 +1044,7 @@ lbl_8001BFDC: /* 8001BFF8 00018F58 4B FF FB 95 */ bl SetFadeBlackTimer__11CFrontEndUIFf /* 8001BFFC 00018F5C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C000 00018F60 38 61 00 14 */ addi r3, r1, 0x14 -/* 8001C004 00018F64 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C004 00018F64 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C008 00018F68 38 80 04 54 */ li r4, 0x454 /* 8001C00C 00018F6C 38 A0 00 7F */ li r5, 0x7f /* 8001C010 00018F70 38 C0 00 40 */ li r6, 0x40 @@ -1053,7 +1053,7 @@ lbl_8001BFDC: /* 8001C01C 00018F7C 48 2C DD 59 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 8001C020 00018F80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C024 00018F84 38 61 00 10 */ addi r3, r1, 0x10 -/* 8001C028 00018F88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C028 00018F88 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C02C 00018F8C 38 80 04 55 */ li r4, 0x455 /* 8001C030 00018F90 38 A0 00 7F */ li r5, 0x7f /* 8001C034 00018F94 38 C0 00 40 */ li r6, 0x40 @@ -1082,7 +1082,7 @@ lbl_8001C06C: /* 8001C088 00018FE8 4B FF FB 05 */ bl SetFadeBlackTimer__11CFrontEndUIFf /* 8001C08C 00018FEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C090 00018FF0 38 61 00 0C */ addi r3, r1, 0xc -/* 8001C094 00018FF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C094 00018FF4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C098 00018FF8 38 80 04 56 */ li r4, 0x456 /* 8001C09C 00018FFC 38 A0 00 7F */ li r5, 0x7f /* 8001C0A0 00019000 38 C0 00 40 */ li r6, 0x40 @@ -1091,7 +1091,7 @@ lbl_8001C06C: /* 8001C0AC 0001900C 48 2C DC C9 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 8001C0B0 00019010 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C0B4 00019014 38 61 00 08 */ addi r3, r1, 8 -/* 8001C0B8 00019018 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C0B8 00019018 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C0BC 0001901C 38 80 04 57 */ li r4, 0x457 /* 8001C0C0 00019020 38 A0 00 7F */ li r5, 0x7f /* 8001C0C4 00019024 38 C0 00 40 */ li r6, 0x40 @@ -1613,7 +1613,7 @@ lbl_8001C804: /* 8001C828 00019788 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l /* 8001C82C 0001978C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C830 00019790 54 00 10 3A */ slwi r0, r0, 2 -/* 8001C834 00019794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C834 00019794 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C838 00019798 7C 03 02 AE */ lhax r0, r3, r0 /* 8001C83C 0001979C 38 61 00 0C */ addi r3, r1, 0xc /* 8001C840 000197A0 38 A0 00 7F */ li r5, 0x7f @@ -1627,7 +1627,7 @@ lbl_8001C804: /* 8001C860 000197C0 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l /* 8001C864 000197C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001C868 000197C8 54 00 10 3A */ slwi r0, r0, 2 -/* 8001C86C 000197CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001C86C 000197CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001C870 000197D0 7C 83 02 14 */ add r4, r3, r0 /* 8001C874 000197D4 38 61 00 08 */ addi r3, r1, 8 /* 8001C878 000197D8 A8 04 00 02 */ lha r0, 2(r4) @@ -2814,7 +2814,7 @@ TransitionToFive__11CFrontEndUIFv: /* 8001D8E4 0001A844 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 8001D8E8 0001A848 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001D8EC 0001A84C 54 00 10 3A */ slwi r0, r0, 2 -/* 8001D8F0 0001A850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001D8F0 0001A850 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001D8F4 0001A854 7C 03 02 AE */ lhax r0, r3, r0 /* 8001D8F8 0001A858 38 61 00 0C */ addi r3, r1, 0xc /* 8001D8FC 0001A85C 38 A0 00 7F */ li r5, 0x7f @@ -2828,7 +2828,7 @@ TransitionToFive__11CFrontEndUIFv: /* 8001D91C 0001A87C 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 8001D920 0001A880 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001D924 0001A884 54 00 10 3A */ slwi r0, r0, 2 -/* 8001D928 0001A888 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001D928 0001A888 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001D92C 0001A88C 7C 83 02 14 */ add r4, r3, r0 /* 8001D930 0001A890 38 61 00 08 */ addi r3, r1, 8 /* 8001D934 0001A894 A8 04 00 02 */ lha r0, 2(r4) @@ -3276,7 +3276,7 @@ lbl_8001DF6C: /* 8001DF70 0001AED0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001DF74 0001AED4 98 1F 00 3A */ stb r0, 0x3a(r31) /* 8001DF78 0001AED8 38 61 00 08 */ addi r3, r1, 8 -/* 8001DF7C 0001AEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001DF7C 0001AEDC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001DF80 0001AEE0 38 80 04 46 */ li r4, 0x446 /* 8001DF84 0001AEE4 98 1F 00 39 */ stb r0, 0x39(r31) /* 8001DF88 0001AEE8 38 A0 00 7F */ li r5, 0x7f @@ -3329,7 +3329,7 @@ DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup: /* 8001E030 0001AF90 40 82 00 38 */ bne lbl_8001E068 /* 8001E034 0001AF94 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001E038 0001AF98 38 61 00 0C */ addi r3, r1, 0xc -/* 8001E03C 0001AF9C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001E03C 0001AF9C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001E040 0001AFA0 38 80 04 45 */ li r4, 0x445 /* 8001E044 0001AFA4 38 A0 00 7F */ li r5, 0x7f /* 8001E048 0001AFA8 38 C0 00 40 */ li r6, 0x40 @@ -3343,7 +3343,7 @@ DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup: lbl_8001E068: /* 8001E068 0001AFC8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001E06C 0001AFCC 38 61 00 08 */ addi r3, r1, 8 -/* 8001E070 0001AFD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001E070 0001AFD0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001E074 0001AFD4 38 80 04 47 */ li r4, 0x447 /* 8001E078 0001AFD8 38 A0 00 7F */ li r5, 0x7f /* 8001E07C 0001AFDC 38 C0 00 40 */ li r6, 0x40 @@ -3439,7 +3439,7 @@ lbl_8001E1C0: /* 8001E1C4 0001B124 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001E1C8 0001B128 98 1F 00 3A */ stb r0, 0x3a(r31) /* 8001E1CC 0001B12C 38 61 00 08 */ addi r3, r1, 8 -/* 8001E1D0 0001B130 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001E1D0 0001B130 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001E1D4 0001B134 38 80 04 46 */ li r4, 0x446 /* 8001E1D8 0001B138 38 A0 00 7F */ li r5, 0x7f /* 8001E1DC 0001B13C 38 C0 00 40 */ li r6, 0x40 @@ -4264,7 +4264,7 @@ DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup: /* 8001ED68 0001BCC8 40 82 00 38 */ bne lbl_8001EDA0 /* 8001ED6C 0001BCCC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001ED70 0001BCD0 38 61 00 0C */ addi r3, r1, 0xc -/* 8001ED74 0001BCD4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001ED74 0001BCD4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001ED78 0001BCD8 38 80 04 46 */ li r4, 0x446 /* 8001ED7C 0001BCDC 38 A0 00 7F */ li r5, 0x7f /* 8001ED80 0001BCE0 38 C0 00 40 */ li r6, 0x40 @@ -4278,7 +4278,7 @@ DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup: lbl_8001EDA0: /* 8001EDA0 0001BD00 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001EDA4 0001BD04 38 61 00 08 */ addi r3, r1, 8 -/* 8001EDA8 0001BD08 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001EDA8 0001BD08 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001EDAC 0001BD0C 38 80 04 46 */ li r4, 0x446 /* 8001EDB0 0001BD10 38 A0 00 7F */ li r5, 0x7f /* 8001EDB4 0001BD14 38 C0 00 40 */ li r6, 0x40 @@ -4389,7 +4389,7 @@ DoFileselectCancel__19SNewFileSelectFrameFPC14CGuiTableGroup: /* 8001EF20 0001BE80 40 82 00 30 */ bne lbl_8001EF50 /* 8001EF24 0001BE84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001EF28 0001BE88 38 61 00 08 */ addi r3, r1, 8 -/* 8001EF2C 0001BE8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001EF2C 0001BE8C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001EF30 0001BE90 38 80 04 46 */ li r4, 0x446 /* 8001EF34 0001BE94 38 A0 00 7F */ li r5, 0x7f /* 8001EF38 0001BE98 38 C0 00 40 */ li r6, 0x40 @@ -4413,7 +4413,7 @@ DoSelectionChange__19SNewFileSelectFrameFPC14CGuiTableGroup: /* 8001EF70 0001BED0 48 00 12 29 */ bl HandleActiveChange__19SNewFileSelectFrameFP10CGuiWidget /* 8001EF74 0001BED4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8001EF78 0001BED8 38 61 00 08 */ addi r3, r1, 8 -/* 8001EF7C 0001BEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001EF7C 0001BEDC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001EF80 0001BEE0 38 80 04 45 */ li r4, 0x445 /* 8001EF84 0001BEE4 38 A0 00 7F */ li r5, 0x7f /* 8001EF88 0001BEE8 38 C0 00 40 */ li r6, 0x40 @@ -6820,7 +6820,7 @@ DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup: /* 8002121C 0001E17C 38 A0 00 7F */ li r5, 0x7f /* 80021220 0001E180 90 01 00 24 */ stw r0, 0x24(r1) /* 80021224 0001E184 38 C0 00 40 */ li r6, 0x40 -/* 80021228 0001E188 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80021228 0001E188 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8002122C 0001E18C 38 E0 00 00 */ li r7, 0 /* 80021230 0001E190 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80021234 0001E194 7C 9F 23 78 */ mr r31, r4 @@ -6866,7 +6866,7 @@ lbl_800212B8: /* 800212C0 0001E220 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 800212C4 0001E224 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800212C8 0001E228 54 00 10 3A */ slwi r0, r0, 2 -/* 800212CC 0001E22C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800212CC 0001E22C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800212D0 0001E230 7C 03 02 AE */ lhax r0, r3, r0 /* 800212D4 0001E234 38 61 00 0C */ addi r3, r1, 0xc /* 800212D8 0001E238 38 A0 00 7F */ li r5, 0x7f @@ -6880,7 +6880,7 @@ lbl_800212B8: /* 800212F8 0001E258 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 800212FC 0001E25C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80021300 0001E260 54 00 10 3A */ slwi r0, r0, 2 -/* 80021304 0001E264 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80021304 0001E264 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80021308 0001E268 7C 83 02 14 */ add r4, r3, r0 /* 8002130C 0001E26C 38 61 00 08 */ addi r3, r1, 8 /* 80021310 0001E270 A8 04 00 02 */ lha r0, 2(r4) @@ -7725,7 +7725,7 @@ lbl_80021EA0: /* 80021EBC 0001EE1C 41 82 01 38 */ beq lbl_80021FF4 /* 80021EC0 0001EE20 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80021EC4 0001EE24 38 61 00 10 */ addi r3, r1, 0x10 -/* 80021EC8 0001EE28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80021EC8 0001EE28 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80021ECC 0001EE2C 38 80 04 46 */ li r4, 0x446 /* 80021ED0 0001EE30 38 A0 00 7F */ li r5, 0x7f /* 80021ED4 0001EE34 38 C0 00 40 */ li r6, 0x40 @@ -7774,7 +7774,7 @@ lbl_80021F50: lbl_80021F74: /* 80021F74 0001EED4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80021F78 0001EED8 38 61 00 0C */ addi r3, r1, 0xc -/* 80021F7C 0001EEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80021F7C 0001EEDC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80021F80 0001EEE0 38 80 04 46 */ li r4, 0x446 /* 80021F84 0001EEE4 38 A0 00 7F */ li r5, 0x7f /* 80021F88 0001EEE8 38 C0 00 40 */ li r6, 0x40 @@ -7790,7 +7790,7 @@ lbl_80021FA8: /* 80021FAC 0001EF0C 40 82 00 48 */ bne lbl_80021FF4 /* 80021FB0 0001EF10 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80021FB4 0001EF14 38 61 00 08 */ addi r3, r1, 8 -/* 80021FB8 0001EF18 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80021FB8 0001EF18 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80021FBC 0001EF1C 38 80 04 46 */ li r4, 0x446 /* 80021FC0 0001EF20 38 A0 00 7F */ li r5, 0x7f /* 80021FC4 0001EF24 38 C0 00 40 */ li r6, 0x40 @@ -8912,7 +8912,7 @@ PlayAdvanceSfx__11CFrontEndUIFv: /* 80022F60 0001FEC0 38 80 04 48 */ li r4, 0x448 /* 80022F64 0001FEC4 90 01 00 14 */ stw r0, 0x14(r1) /* 80022F68 0001FEC8 38 61 00 0C */ addi r3, r1, 0xc -/* 80022F6C 0001FECC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80022F6C 0001FECC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80022F70 0001FED0 38 A0 00 7F */ li r5, 0x7f /* 80022F74 0001FED4 38 C0 00 40 */ li r6, 0x40 /* 80022F78 0001FED8 38 E0 00 00 */ li r7, 0 @@ -8920,7 +8920,7 @@ PlayAdvanceSfx__11CFrontEndUIFv: /* 80022F80 0001FEE0 48 2C 6D F5 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80022F84 0001FEE4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80022F88 0001FEE8 38 61 00 08 */ addi r3, r1, 8 -/* 80022F8C 0001FEEC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80022F8C 0001FEEC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80022F90 0001FEF0 38 80 04 43 */ li r4, 0x443 /* 80022F94 0001FEF4 38 A0 00 7F */ li r5, 0x7f /* 80022F98 0001FEF8 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index a90ca197..d7561506 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -449,7 +449,7 @@ lbl_800377DC: /* 800377E0 00034740 38 61 00 20 */ addi r3, r1, 0x20 /* 800377E4 00034744 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800377E8 00034748 38 A0 00 7F */ li r5, 0x7f -/* 800377EC 0003474C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800377EC 0003474C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800377F0 00034750 38 C0 00 40 */ li r6, 0x40 /* 800377F4 00034754 38 E0 00 00 */ li r7, 0 /* 800377F8 00034758 39 20 00 00 */ li r9, 0 diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s index 99ad384c..de816792 100644 --- a/asm/MetroidPrime/CInGameGuiManager.s +++ b/asm/MetroidPrime/CInGameGuiManager.s @@ -1875,7 +1875,7 @@ lbl_801082E4: /* 80108348 001052A8 40 82 00 2C */ bne lbl_80108374 /* 8010834C 001052AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80108350 001052B0 38 61 00 1C */ addi r3, r1, 0x1c -/* 80108354 001052B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80108354 001052B4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80108358 001052B8 38 80 05 79 */ li r4, 0x579 /* 8010835C 001052BC 38 A0 00 7F */ li r5, 0x7f /* 80108360 001052C0 38 C0 00 40 */ li r6, 0x40 @@ -1889,7 +1889,7 @@ lbl_80108374: /* 8010837C 001052DC 40 82 00 28 */ bne lbl_801083A4 /* 80108380 001052E0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80108384 001052E4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80108388 001052E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80108388 001052E8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8010838C 001052EC 38 80 05 78 */ li r4, 0x578 /* 80108390 001052F0 38 A0 00 7F */ li r5, 0x7f /* 80108394 001052F4 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CInventoryScreen.s b/asm/MetroidPrime/CInventoryScreen.s index 28723c16..76099f70 100644 --- a/asm/MetroidPrime/CInventoryScreen.s +++ b/asm/MetroidPrime/CInventoryScreen.s @@ -1726,7 +1726,7 @@ lbl_802072A4: /* 802072B8 00204218 41 82 00 28 */ beq lbl_802072E0 /* 802072BC 0020421C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802072C0 00204220 38 61 00 08 */ addi r3, r1, 8 -/* 802072C4 00204224 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802072C4 00204224 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 802072C8 00204228 38 80 05 A4 */ li r4, 0x5a4 /* 802072CC 0020422C 38 A0 00 7F */ li r5, 0x7f /* 802072D0 00204230 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CLogBookScreen.s b/asm/MetroidPrime/CLogBookScreen.s index 6fd1c0d6..e21bc51b 100644 --- a/asm/MetroidPrime/CLogBookScreen.s +++ b/asm/MetroidPrime/CLogBookScreen.s @@ -1967,7 +1967,7 @@ lbl_80247434: /* 80247448 002443A8 41 82 00 28 */ beq lbl_80247470 /* 8024744C 002443AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80247450 002443B0 38 61 00 08 */ addi r3, r1, 8 -/* 80247454 002443B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80247454 002443B4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80247458 002443B8 38 80 05 A4 */ li r4, 0x5a4 /* 8024745C 002443BC 38 A0 00 7F */ li r5, 0x7f /* 80247460 002443C0 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s index 6a3958bc..9a41bfee 100644 --- a/asm/MetroidPrime/CMessageScreen.s +++ b/asm/MetroidPrime/CMessageScreen.s @@ -121,7 +121,7 @@ lbl_801EF70C: /* 801EF754 001EC6B4 48 14 D9 E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 801EF758 001EC6B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801EF75C 001EC6BC 38 61 00 0C */ addi r3, r1, 0xc -/* 801EF760 001EC6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801EF760 001EC6C0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801EF764 001EC6C4 38 80 05 8D */ li r4, 0x58d /* 801EF768 001EC6C8 38 A0 00 7F */ li r5, 0x7f /* 801EF76C 001EC6CC 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CPauseScreen.s b/asm/MetroidPrime/CPauseScreen.s index 7577eec0..57b1d5a8 100644 --- a/asm/MetroidPrime/CPauseScreen.s +++ b/asm/MetroidPrime/CPauseScreen.s @@ -287,7 +287,7 @@ SetRightTableSelection__16CPauseScreenBaseFii: /* 80070B64 0006DAC4 41 82 00 28 */ beq lbl_80070B8C /* 80070B68 0006DAC8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070B6C 0006DACC 38 61 00 08 */ addi r3, r1, 8 -/* 80070B70 0006DAD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070B70 0006DAD0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070B74 0006DAD4 38 80 05 9C */ li r4, 0x59c /* 80070B78 0006DAD8 38 A0 00 7F */ li r5, 0x7f /* 80070B7C 0006DADC 38 C0 00 40 */ li r6, 0x40 @@ -352,7 +352,7 @@ OnTableSelectionChange__16CPauseScreenBaseFP14CGuiTableGroupi: /* 80070C50 0006DBB0 40 82 00 40 */ bne lbl_80070C90 /* 80070C54 0006DBB4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070C58 0006DBB8 38 61 00 08 */ addi r3, r1, 8 -/* 80070C5C 0006DBBC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070C5C 0006DBBC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070C60 0006DBC0 38 80 05 9C */ li r4, 0x59c /* 80070C64 0006DBC4 38 A0 00 7F */ li r5, 0x7f /* 80070C68 0006DBC8 38 C0 00 40 */ li r6, 0x40 @@ -401,7 +401,7 @@ OnRightTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: /* 80070D00 0006DC60 48 00 01 15 */ bl ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode /* 80070D04 0006DC64 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070D08 0006DC68 38 61 00 08 */ addi r3, r1, 8 -/* 80070D0C 0006DC6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070D0C 0006DC6C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070D10 0006DC70 38 80 05 98 */ li r4, 0x598 /* 80070D14 0006DC74 38 A0 00 7F */ li r5, 0x7f /* 80070D18 0006DC78 38 C0 00 40 */ li r6, 0x40 @@ -442,7 +442,7 @@ OnLeftTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup: /* 80070D88 0006DCE8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070D8C 0006DCEC 98 1F 01 98 */ stb r0, 0x198(r31) /* 80070D90 0006DCF0 38 61 00 08 */ addi r3, r1, 8 -/* 80070D94 0006DCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070D94 0006DCF4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070D98 0006DCF8 38 80 05 98 */ li r4, 0x598 /* 80070D9C 0006DCFC 38 A0 00 7F */ li r5, 0x7f /* 80070DA0 0006DD00 38 C0 00 40 */ li r6, 0x40 @@ -556,7 +556,7 @@ lbl_80070EF8: lbl_80070F08: /* 80070F08 0006DE68 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070F0C 0006DE6C 38 61 00 10 */ addi r3, r1, 0x10 -/* 80070F10 0006DE70 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070F10 0006DE70 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070F14 0006DE74 38 80 05 97 */ li r4, 0x597 /* 80070F18 0006DE78 38 A0 00 7F */ li r5, 0x7f /* 80070F1C 0006DE7C 38 C0 00 40 */ li r6, 0x40 @@ -581,7 +581,7 @@ lbl_80070F58: /* 80070F5C 0006DEBC 40 82 00 28 */ bne lbl_80070F84 /* 80070F60 0006DEC0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80070F64 0006DEC4 38 61 00 0C */ addi r3, r1, 0xc -/* 80070F68 0006DEC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80070F68 0006DEC8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80070F6C 0006DECC 38 80 05 97 */ li r4, 0x597 /* 80070F70 0006DED0 38 A0 00 7F */ li r5, 0x7f /* 80070F74 0006DED4 38 C0 00 40 */ li r6, 0x40 @@ -2612,7 +2612,7 @@ lbl_80072CA8: lbl_80072CCC: /* 80072CCC 0006FC2C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80072CD0 0006FC30 38 61 00 24 */ addi r3, r1, 0x24 -/* 80072CD4 0006FC34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80072CD4 0006FC34 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80072CD8 0006FC38 38 80 05 9A */ li r4, 0x59a /* 80072CDC 0006FC3C 38 A0 00 7F */ li r5, 0x7f /* 80072CE0 0006FC40 38 C0 00 40 */ li r6, 0x40 @@ -2634,7 +2634,7 @@ lbl_80072D0C: /* 80072D1C 0006FC7C 41 82 00 5C */ beq lbl_80072D78 /* 80072D20 0006FC80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80072D24 0006FC84 38 61 00 20 */ addi r3, r1, 0x20 -/* 80072D28 0006FC88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80072D28 0006FC88 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80072D2C 0006FC8C 38 80 05 99 */ li r4, 0x599 /* 80072D30 0006FC90 38 A0 00 7F */ li r5, 0x7f /* 80072D34 0006FC94 38 C0 00 40 */ li r6, 0x40 @@ -2663,7 +2663,7 @@ lbl_80072D78: /* 80072D88 0006FCE8 41 82 00 58 */ beq lbl_80072DE0 /* 80072D8C 0006FCEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80072D90 0006FCF0 38 61 00 1C */ addi r3, r1, 0x1c -/* 80072D94 0006FCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80072D94 0006FCF4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80072D98 0006FCF8 38 80 05 99 */ li r4, 0x599 /* 80072D9C 0006FCFC 38 A0 00 7F */ li r5, 0x7f /* 80072DA0 0006FD00 38 C0 00 40 */ li r6, 0x40 @@ -4110,7 +4110,7 @@ lbl_80074240: /* 8007425C 000711BC 48 2C CB 29 */ bl Lock__6CTokenFv /* 80074260 000711C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80074264 000711C4 38 61 00 08 */ addi r3, r1, 8 -/* 80074268 000711C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80074268 000711C8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8007426C 000711CC 38 80 05 9B */ li r4, 0x59b /* 80074270 000711D0 38 A0 00 7F */ li r5, 0x7f /* 80074274 000711D4 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CPauseScreenBlur.s b/asm/MetroidPrime/CPauseScreenBlur.s index 0c0d5660..a45bb088 100644 --- a/asm/MetroidPrime/CPauseScreenBlur.s +++ b/asm/MetroidPrime/CPauseScreenBlur.s @@ -56,7 +56,7 @@ lbl_8025D5F4: /* 8025D608 0025A568 40 82 00 2C */ bne lbl_8025D634 /* 8025D60C 0025A56C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8025D610 0025A570 38 61 00 14 */ addi r3, r1, 0x14 -/* 8025D614 0025A574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8025D614 0025A574 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8025D618 0025A578 38 80 05 87 */ li r4, 0x587 /* 8025D61C 0025A57C 38 A0 00 7F */ li r5, 0x7f /* 8025D620 0025A580 38 C0 00 40 */ li r6, 0x40 @@ -69,7 +69,7 @@ lbl_8025D634: /* 8025D638 0025A598 40 82 00 28 */ bne lbl_8025D660 /* 8025D63C 0025A59C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8025D640 0025A5A0 38 61 00 10 */ addi r3, r1, 0x10 -/* 8025D644 0025A5A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8025D644 0025A5A4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8025D648 0025A5A8 38 80 05 62 */ li r4, 0x562 /* 8025D64C 0025A5AC 38 A0 00 7F */ li r5, 0x7f /* 8025D650 0025A5B0 38 C0 00 40 */ li r6, 0x40 @@ -103,7 +103,7 @@ lbl_8025D698: /* 8025D6B0 0025A610 40 82 00 2C */ bne lbl_8025D6DC /* 8025D6B4 0025A614 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8025D6B8 0025A618 38 61 00 0C */ addi r3, r1, 0xc -/* 8025D6BC 0025A61C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8025D6BC 0025A61C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8025D6C0 0025A620 38 80 05 88 */ li r4, 0x588 /* 8025D6C4 0025A624 38 A0 00 7F */ li r5, 0x7f /* 8025D6C8 0025A628 38 C0 00 40 */ li r6, 0x40 @@ -116,7 +116,7 @@ lbl_8025D6DC: /* 8025D6E0 0025A640 40 82 00 28 */ bne lbl_8025D708 /* 8025D6E4 0025A644 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8025D6E8 0025A648 38 61 00 08 */ addi r3, r1, 8 -/* 8025D6EC 0025A64C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8025D6EC 0025A64C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8025D6F0 0025A650 38 80 05 64 */ li r4, 0x564 /* 8025D6F4 0025A654 38 A0 00 7F */ li r5, 0x7f /* 8025D6F8 0025A658 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s index 1f81c817..e5a47d80 100644 --- a/asm/MetroidPrime/CPauseScreenFrame.s +++ b/asm/MetroidPrime/CPauseScreenFrame.s @@ -291,7 +291,7 @@ lbl_80241C84: /* 80241CD0 0023EC30 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80241CD4 0023EC34 98 1E 01 34 */ stb r0, 0x134(r30) /* 80241CD8 0023EC38 38 61 00 08 */ addi r3, r1, 8 -/* 80241CDC 0023EC3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80241CDC 0023EC3C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80241CE0 0023EC40 38 80 04 46 */ li r4, 0x446 /* 80241CE4 0023EC44 38 A0 00 7F */ li r5, 0x7f /* 80241CE8 0023EC48 38 C0 00 40 */ li r6, 0x40 @@ -383,7 +383,7 @@ lbl_80241DD8: /* 80241E1C 0023ED7C 41 82 00 34 */ beq lbl_80241E50 /* 80241E20 0023ED80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80241E24 0023ED84 38 61 00 0C */ addi r3, r1, 0xc -/* 80241E28 0023ED88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80241E28 0023ED88 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80241E2C 0023ED8C 38 80 05 B2 */ li r4, 0x5b2 /* 80241E30 0023ED90 38 A0 00 7F */ li r5, 0x7f /* 80241E34 0023ED94 38 C0 00 40 */ li r6, 0x40 @@ -437,7 +437,7 @@ DoMenuCancel__21SOptionsFrontEndFrameFP14CGuiTableGroup: /* 80241EE0 0023EE40 4B FF FC A9 */ bl SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup /* 80241EE4 0023EE44 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80241EE8 0023EE48 38 61 00 08 */ addi r3, r1, 8 -/* 80241EEC 0023EE4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80241EEC 0023EE4C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80241EF0 0023EE50 38 80 04 46 */ li r4, 0x446 /* 80241EF4 0023EE54 38 A0 00 7F */ li r5, 0x7f /* 80241EF8 0023EE58 38 C0 00 40 */ li r6, 0x40 @@ -470,7 +470,7 @@ DoMenuSelectionChange__21SOptionsFrontEndFrameFP14CGuiTableGroup: /* 80241F54 0023EEB4 48 00 05 25 */ bl SetRightUIText__21SOptionsFrontEndFrameFv /* 80241F58 0023EEB8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80241F5C 0023EEBC 38 61 00 10 */ addi r3, r1, 0x10 -/* 80241F60 0023EEC0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80241F60 0023EEC0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80241F64 0023EEC4 38 80 04 45 */ li r4, 0x445 /* 80241F68 0023EEC8 38 A0 00 7F */ li r5, 0x7f /* 80241F6C 0023EECC 38 C0 00 40 */ li r6, 0x40 @@ -486,7 +486,7 @@ lbl_80241F80: /* 80241F90 0023EEF0 48 00 02 3D */ bl HandleRightSelectionChange__21SOptionsFrontEndFrameFv /* 80241F94 0023EEF4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80241F98 0023EEF8 38 61 00 0C */ addi r3, r1, 0xc -/* 80241F9C 0023EEFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80241F9C 0023EEFC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80241FA0 0023EF00 38 80 04 45 */ li r4, 0x445 /* 80241FA4 0023EF04 38 A0 00 7F */ li r5, 0x7f /* 80241FA8 0023EF08 38 C0 00 40 */ li r6, 0x40 @@ -524,7 +524,7 @@ lbl_80241FD4: /* 80242020 0023EF80 48 00 21 89 */ bl SetOption__12CGameOptionsF11EGameOptioni /* 80242024 0023EF84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80242028 0023EF88 38 61 00 08 */ addi r3, r1, 8 -/* 8024202C 0023EF8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024202C 0023EF8C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80242030 0023EF90 38 80 04 47 */ li r4, 0x447 /* 80242034 0023EF94 38 A0 00 7F */ li r5, 0x7f /* 80242038 0023EF98 38 C0 00 40 */ li r6, 0x40 @@ -580,7 +580,7 @@ DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup: /* 802420F0 0023F050 48 08 84 F5 */ bl SetIsActive__10CGuiWidgetFb /* 802420F4 0023F054 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802420F8 0023F058 38 61 00 0C */ addi r3, r1, 0xc -/* 802420FC 0023F05C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802420FC 0023F05C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80242100 0023F060 38 80 04 48 */ li r4, 0x448 /* 80242104 0023F064 38 A0 00 7F */ li r5, 0x7f /* 80242108 0023F068 38 C0 00 40 */ li r6, 0x40 @@ -589,7 +589,7 @@ DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup: /* 80242114 0023F074 48 0A 7C 61 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80242118 0023F078 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8024211C 0023F07C 38 61 00 08 */ addi r3, r1, 8 -/* 80242120 0023F080 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80242120 0023F080 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80242124 0023F084 38 80 04 43 */ li r4, 0x443 /* 80242128 0023F088 38 A0 00 7F */ li r5, 0x7f /* 8024212C 0023F08C 38 C0 00 40 */ li r6, 0x40 @@ -1626,7 +1626,7 @@ lbl_80243058: /* 80243060 0023FFC0 4B E2 E0 85 */ bl UpdateSideTable__16CPauseScreenBaseFP14CGuiTableGroup /* 80243064 0023FFC4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80243068 0023FFC8 38 61 00 08 */ addi r3, r1, 8 -/* 8024306C 0023FFCC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024306C 0023FFCC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80243070 0023FFD0 38 80 05 9D */ li r4, 0x59d /* 80243074 0023FFD4 38 A0 00 7F */ li r5, 0x7f /* 80243078 0023FFD8 38 C0 00 40 */ li r6, 0x40 @@ -2432,7 +2432,7 @@ Update__14COptionsScreenFfR9CRandom16R18CArchitectureQueue: /* 80243BE8 00240B48 41 82 00 34 */ beq lbl_80243C1C /* 80243BEC 00240B4C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80243BF0 00240B50 38 61 00 20 */ addi r3, r1, 0x20 -/* 80243BF4 00240B54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80243BF4 00240B54 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80243BF8 00240B58 38 80 05 AB */ li r4, 0x5ab /* 80243BFC 00240B5C 38 A0 00 7F */ li r5, 0x7f /* 80243C00 00240B60 38 C0 00 40 */ li r6, 0x40 @@ -2542,7 +2542,7 @@ lbl_80243D74: /* 80243D78 00240CD8 48 0A 5B 3D */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels /* 80243D7C 00240CDC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80243D80 00240CE0 38 61 00 10 */ addi r3, r1, 0x10 -/* 80243D84 00240CE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80243D84 00240CE4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80243D88 00240CE8 38 80 05 8E */ li r4, 0x58e /* 80243D8C 00240CEC 38 A0 00 7F */ li r5, 0x7f /* 80243D90 00240CF0 38 C0 00 40 */ li r6, 0x40 @@ -2555,7 +2555,7 @@ lbl_80243DA4: /* 80243DA8 00240D08 40 82 00 60 */ bne lbl_80243E08 /* 80243DAC 00240D0C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80243DB0 00240D10 38 61 00 0C */ addi r3, r1, 0xc -/* 80243DB4 00240D14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80243DB4 00240D14 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80243DB8 00240D18 38 80 05 8F */ li r4, 0x58f /* 80243DBC 00240D1C 38 A0 00 7F */ li r5, 0x7f /* 80243DC0 00240D20 38 C0 00 40 */ li r6, 0x40 @@ -2736,7 +2736,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib: /* 80244020 00240F80 41 82 00 50 */ beq lbl_80244070 /* 80244024 00240F84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80244028 00240F88 38 61 00 10 */ addi r3, r1, 0x10 -/* 8024402C 00240F8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024402C 00240F8C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80244030 00240F90 38 80 04 48 */ li r4, 0x448 /* 80244034 00240F94 38 A0 00 7F */ li r5, 0x7f /* 80244038 00240F98 38 C0 00 40 */ li r6, 0x40 @@ -2745,7 +2745,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib: /* 80244044 00240FA4 48 0A 5D 31 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80244048 00240FA8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8024404C 00240FAC 38 61 00 0C */ addi r3, r1, 0xc -/* 80244050 00240FB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80244050 00240FB0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80244054 00240FB4 38 80 04 43 */ li r4, 0x443 /* 80244058 00240FB8 38 A0 00 7F */ li r5, 0x7f /* 8024405C 00240FBC 38 C0 00 40 */ li r6, 0x40 @@ -2756,7 +2756,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib: lbl_80244070: /* 80244070 00240FD0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80244074 00240FD4 38 61 00 08 */ addi r3, r1, 8 -/* 80244078 00240FD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80244078 00240FD8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8024407C 00240FDC 38 80 05 98 */ li r4, 0x598 /* 80244080 00240FE0 38 A0 00 7F */ li r5, 0x7f /* 80244084 00240FE4 38 C0 00 40 */ li r6, 0x40 @@ -3356,7 +3356,7 @@ DoSelectionChange__15CQuitGameScreenFP14CGuiTableGroup: /* 80244860 002417C0 4B FF FC 41 */ bl SetColors__15CQuitGameScreenFv /* 80244864 002417C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80244868 002417C8 38 61 00 08 */ addi r3, r1, 8 -/* 8024486C 002417CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024486C 002417CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80244870 002417D0 38 80 05 90 */ li r4, 0x590 /* 80244874 002417D4 38 A0 00 7F */ li r5, 0x7f /* 80244878 002417D8 38 C0 00 40 */ li r6, 0x40 @@ -3380,7 +3380,7 @@ DoAdvance__15CQuitGameScreenFP14CGuiTableGroup: /* 802448B4 00241814 40 82 00 34 */ bne lbl_802448E8 /* 802448B8 00241818 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802448BC 0024181C 38 61 00 0C */ addi r3, r1, 0xc -/* 802448C0 00241820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802448C0 00241820 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 802448C4 00241824 38 80 05 98 */ li r4, 0x598 /* 802448C8 00241828 38 A0 00 7F */ li r5, 0x7f /* 802448CC 0024182C 38 C0 00 40 */ li r6, 0x40 @@ -3393,7 +3393,7 @@ DoAdvance__15CQuitGameScreenFP14CGuiTableGroup: lbl_802448E8: /* 802448E8 00241848 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802448EC 0024184C 38 61 00 08 */ addi r3, r1, 8 -/* 802448F0 00241850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802448F0 00241850 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 802448F4 00241854 38 80 05 97 */ li r4, 0x597 /* 802448F8 00241858 38 A0 00 7F */ li r5, 0x7f /* 802448FC 0024185C 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 5303b241..5b2ac349 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -344,7 +344,7 @@ SetRotationSfxPlaying__10CSamusDollFb: /* 800DAA54 000D79B4 40 82 00 4C */ bne lbl_800DAAA0 /* 800DAA58 000D79B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800DAA5C 000D79BC 38 61 00 0C */ addi r3, r1, 0xc -/* 800DAA60 000D79C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800DAA60 000D79C0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800DAA64 000D79C4 38 80 05 5F */ li r4, 0x55f /* 800DAA68 000D79C8 38 A0 00 7F */ li r5, 0x7f /* 800DAA6C 000D79CC 38 C0 00 40 */ li r6, 0x40 @@ -382,7 +382,7 @@ SetZoomSfxPlaying__10CSamusDollFb: /* 800DAAD8 000D7A38 40 82 00 4C */ bne lbl_800DAB24 /* 800DAADC 000D7A3C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800DAAE0 000D7A40 38 61 00 0C */ addi r3, r1, 0xc -/* 800DAAE4 000D7A44 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800DAAE4 000D7A44 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800DAAE8 000D7A48 38 80 05 60 */ li r4, 0x560 /* 800DAAEC 000D7A4C 38 A0 00 7F */ li r5, 0x7f /* 800DAAF0 000D7A50 38 C0 00 40 */ li r6, 0x40 @@ -420,7 +420,7 @@ SetOffsetSfxPlaying__10CSamusDollFb: /* 800DAB5C 000D7ABC 40 82 00 4C */ bne lbl_800DABA8 /* 800DAB60 000D7AC0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800DAB64 000D7AC4 38 61 00 0C */ addi r3, r1, 0xc -/* 800DAB68 000D7AC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800DAB68 000D7AC8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800DAB6C 000D7ACC 38 80 05 7E */ li r4, 0x57e /* 800DAB70 000D7AD0 38 A0 00 7F */ li r5, 0x7f /* 800DAB74 000D7AD4 38 C0 00 40 */ li r6, 0x40 @@ -459,7 +459,7 @@ BeginViewInterpolate__10CSamusDollFb: /* 800DABE4 000D7B44 40 82 00 2C */ bne lbl_800DAC10 /* 800DABE8 000D7B48 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800DABEC 000D7B4C 38 61 00 0C */ addi r3, r1, 0xc -/* 800DABF0 000D7B50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800DABF0 000D7B50 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800DABF4 000D7B54 38 80 05 A0 */ li r4, 0x5a0 /* 800DABF8 000D7B58 38 A0 00 7F */ li r5, 0x7f /* 800DABFC 000D7B5C 38 C0 00 40 */ li r6, 0x40 @@ -481,7 +481,7 @@ lbl_800DAC10: /* 800DAC38 000D7B98 4B FF FD F9 */ bl SetRotationSfxPlaying__10CSamusDollFb /* 800DAC3C 000D7B9C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800DAC40 000D7BA0 38 61 00 08 */ addi r3, r1, 8 -/* 800DAC44 000D7BA4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800DAC44 000D7BA4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800DAC48 000D7BA8 38 80 05 A1 */ li r4, 0x5a1 /* 800DAC4C 000D7BAC 38 A0 00 7F */ li r5, 0x7f /* 800DAC50 000D7BB0 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CSaveGameScreen.s b/asm/MetroidPrime/CSaveGameScreen.s index c1b18081..82f14fe5 100644 --- a/asm/MetroidPrime/CSaveGameScreen.s +++ b/asm/MetroidPrime/CSaveGameScreen.s @@ -109,7 +109,7 @@ DoSelectionChange__15CSaveGameScreenFP14CGuiTableGroup: /* 8024F1DC 0024C13C 38 61 00 08 */ addi r3, r1, 8 /* 8024F1E0 0024C140 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8024F1E4 0024C144 38 A0 00 7F */ li r5, 0x7f -/* 8024F1E8 0024C148 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024F1E8 0024C148 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8024F1EC 0024C14C 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 8024F1F0 0024C150 38 C0 00 40 */ li r6, 0x40 /* 8024F1F4 0024C154 38 E0 00 00 */ li r7, 0 @@ -405,7 +405,7 @@ lbl_8024F5B4: /* 8024F5B8 0024C518 41 80 00 28 */ blt lbl_8024F5E0 /* 8024F5BC 0024C51C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8024F5C0 0024C520 38 61 00 08 */ addi r3, r1, 8 -/* 8024F5C4 0024C524 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8024F5C4 0024C524 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8024F5C8 0024C528 54 C4 04 3E */ clrlwi r4, r6, 0x10 /* 8024F5CC 0024C52C 38 A0 00 7F */ li r5, 0x7f /* 8024F5D0 0024C530 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s index 095faf74..836f7c45 100644 --- a/asm/MetroidPrime/CSlideShow.s +++ b/asm/MetroidPrime/CSlideShow.s @@ -1301,7 +1301,7 @@ sub_80298ad0: /* 80298AF4 00295A54 40 82 00 4C */ bne lbl_80298B40 /* 80298AF8 00295A58 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80298AFC 00295A5C 38 61 00 0C */ addi r3, r1, 0xc -/* 80298B00 00295A60 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80298B00 00295A60 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80298B04 00295A64 38 80 05 AF */ li r4, 0x5af /* 80298B08 00295A68 38 A0 00 7F */ li r5, 0x7f /* 80298B0C 00295A6C 38 C0 00 40 */ li r6, 0x40 @@ -1339,7 +1339,7 @@ sub_80298b54: /* 80298B78 00295AD8 40 82 00 4C */ bne lbl_80298BC4 /* 80298B7C 00295ADC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80298B80 00295AE0 38 61 00 0C */ addi r3, r1, 0xc -/* 80298B84 00295AE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80298B84 00295AE4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80298B88 00295AE8 38 80 05 AE */ li r4, 0x5ae /* 80298B8C 00295AEC 38 A0 00 7F */ li r5, 0x7f /* 80298B90 00295AF0 38 C0 00 40 */ li r6, 0x40 @@ -2130,7 +2130,7 @@ sub_802996f8: /* 8029971C 0029667C 41 82 01 2C */ beq lbl_80299848 /* 80299720 00296680 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80299724 00296684 38 61 00 08 */ addi r3, r1, 8 -/* 80299728 00296688 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80299728 00296688 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8029972C 0029668C 38 80 04 45 */ li r4, 0x445 /* 80299730 00296690 38 A0 00 7F */ li r5, 0x7f /* 80299734 00296694 38 C0 00 40 */ li r6, 0x40 @@ -2249,7 +2249,7 @@ lbl_802998A8: /* 802998C8 00296828 4B FF F2 09 */ bl sub_80298ad0 /* 802998CC 0029682C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802998D0 00296830 38 61 00 10 */ addi r3, r1, 0x10 -/* 802998D4 00296834 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802998D4 00296834 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 802998D8 00296838 38 80 04 46 */ li r4, 0x446 /* 802998DC 0029683C 38 A0 00 7F */ li r5, 0x7f /* 802998E0 00296840 38 C0 00 40 */ li r6, 0x40 @@ -2283,7 +2283,7 @@ lbl_80299914: /* 8029994C 002968AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80299950 002968B0 98 1D 01 35 */ stb r0, 0x135(r29) /* 80299954 002968B4 38 61 00 0C */ addi r3, r1, 0xc -/* 80299958 002968B8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80299958 002968B8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8029995C 002968BC 38 80 05 B1 */ li r4, 0x5b1 /* 80299960 002968C0 38 A0 00 7F */ li r5, 0x7f /* 80299964 002968C4 38 C0 00 40 */ li r6, 0x40 @@ -2294,7 +2294,7 @@ lbl_80299914: lbl_80299978: /* 80299978 002968D8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8029997C 002968DC 38 61 00 08 */ addi r3, r1, 8 -/* 80299980 002968E0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80299980 002968E0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80299984 002968E4 38 80 05 B0 */ li r4, 0x5b0 /* 80299988 002968E8 38 A0 00 7F */ li r5, 0x7f /* 8029998C 002968EC 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 5c287618..b8f4c4c2 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -898,7 +898,7 @@ lbl_80044370: /* 8004440C 0004136C 38 61 00 2C */ addi r3, r1, 0x2c /* 80044410 00041370 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2) /* 80044414 00041374 38 81 00 C4 */ addi r4, r1, 0xc4 -/* 80044418 00041378 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 80044418 00041378 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 8004441C 0004137C 38 A0 00 01 */ li r5, 1 /* 80044420 00041380 38 E0 00 00 */ li r7, 0 /* 80044424 00041384 48 2A 5B BD */ bl AddEmitter__11CSfxManagerFRQ29CAudioSys18C3DEmitterParmDatabsbi diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index 5a2d950b..6945c0fc 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -4645,7 +4645,7 @@ UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: /* 800C0270 000BD1D0 41 82 00 2C */ beq lbl_800C029C /* 800C0274 000BD1D4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800C0278 000BD1D8 38 61 00 3C */ addi r3, r1, 0x3c -/* 800C027C 000BD1DC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800C027C 000BD1DC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800C0280 000BD1E0 38 80 05 71 */ li r4, 0x571 /* 800C0284 000BD1E4 38 A0 00 7F */ li r5, 0x7f /* 800C0288 000BD1E8 38 C0 00 40 */ li r6, 0x40 @@ -4656,7 +4656,7 @@ UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager: lbl_800C029C: /* 800C029C 000BD1FC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800C02A0 000BD200 38 61 00 38 */ addi r3, r1, 0x38 -/* 800C02A4 000BD204 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800C02A4 000BD204 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800C02A8 000BD208 38 80 05 61 */ li r4, 0x561 /* 800C02AC 000BD20C 38 A0 00 7F */ li r5, 0x7f /* 800C02B0 000BD210 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index 7cfa7a2a..44bab825 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -590,7 +590,7 @@ lbl_80209510: /* 80209558 002064B8 38 61 00 0C */ addi r3, r1, 0xc /* 8020955C 002064BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80209560 002064C0 38 80 05 9E */ li r4, 0x59e -/* 80209564 002064C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80209564 002064C4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80209568 002064C8 38 A0 00 7F */ li r5, 0x7f /* 8020956C 002064CC 38 C0 00 40 */ li r6, 0x40 /* 80209570 002064D0 38 E0 00 00 */ li r7, 0 @@ -924,7 +924,7 @@ sub_802099c0: /* 802099FC 0020695C 38 E0 00 00 */ li r7, 0 /* 80209A00 00206960 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80209A04 00206964 39 20 00 01 */ li r9, 1 -/* 80209A08 00206968 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80209A08 00206968 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80209A0C 0020696C 48 0E 03 69 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80209A10 00206970 80 01 00 08 */ lwz r0, 8(r1) /* 80209A14 00206974 90 1F 00 28 */ stw r0, 0x28(r31) diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index f03642c3..eaa06c16 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -1987,7 +1987,7 @@ lbl_8000AAD4: /* 8000AB24 00007A84 54 87 06 3E */ clrlwi r7, r4, 0x18 /* 8000AB28 00007A88 D0 41 00 24 */ stfs f2, 0x24(r1) /* 8000AB2C 00007A8C 38 61 00 18 */ addi r3, r1, 0x18 -/* 8000AB30 00007A90 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 8000AB30 00007A90 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 8000AB34 00007A94 38 A1 00 24 */ addi r5, r1, 0x24 /* 8000AB38 00007A98 D0 21 00 28 */ stfs f1, 0x28(r1) /* 8000AB3C 00007A9C 38 80 04 6D */ li r4, 0x46d @@ -2003,7 +2003,7 @@ lbl_8000AAD4: lbl_8000AB64: /* 8000AB64 00007AC4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8000AB68 00007AC8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8000AB6C 00007ACC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8000AB6C 00007ACC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8000AB70 00007AD0 54 85 06 3E */ clrlwi r5, r4, 0x18 /* 8000AB74 00007AD4 38 80 04 6D */ li r4, 0x46d /* 8000AB78 00007AD8 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 170453f5..f7fbef53 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -696,7 +696,7 @@ lbl_8021D938: /* 8021D958 0021A8B8 7F A4 EB 78 */ mr r4, r29 /* 8021D95C 0021A8BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8021D960 0021A8C0 38 61 00 2C */ addi r3, r1, 0x2c -/* 8021D964 0021A8C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8021D964 0021A8C4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8021D968 0021A8C8 38 C0 00 40 */ li r6, 0x40 /* 8021D96C 0021A8CC 38 E0 00 00 */ li r7, 0 /* 8021D970 0021A8D0 39 20 00 00 */ li r9, 0 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 22c49f33..0026204a 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -691,7 +691,7 @@ lbl_8013F80C: /* 8013F824 0013C784 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 8013F828 0013C788 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F82C 0013C78C 38 61 00 14 */ addi r3, r1, 0x14 -/* 8013F830 0013C790 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8013F830 0013C790 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8013F834 0013C794 38 A1 00 24 */ addi r5, r1, 0x24 /* 8013F838 0013C798 C0 5C 00 60 */ lfs f2, 0x60(r28) /* 8013F83C 0013C79C 38 E0 00 00 */ li r7, 0 @@ -728,7 +728,7 @@ lbl_8013F898: /* 8013F8B0 0013C810 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 8013F8B4 0013C814 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F8B8 0013C818 38 61 00 10 */ addi r3, r1, 0x10 -/* 8013F8BC 0013C81C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8013F8BC 0013C81C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8013F8C0 0013C820 38 A1 00 18 */ addi r5, r1, 0x18 /* 8013F8C4 0013C824 C0 5C 00 60 */ lfs f2, 0x60(r28) /* 8013F8C8 0013C828 38 E0 00 00 */ li r7, 0 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index a3b38bf1..2cf33b63 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -5991,7 +5991,7 @@ lbl_801F8FF8: /* 801F9014 001F5F74 38 A1 00 70 */ addi r5, r1, 0x70 /* 801F9018 001F5F78 D0 01 00 70 */ stfs f0, 0x70(r1) /* 801F901C 001F5F7C 38 E0 00 01 */ li r7, 1 -/* 801F9020 001F5F80 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801F9020 001F5F80 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801F9024 001F5F84 39 00 00 00 */ li r8, 0 /* 801F9028 001F5F88 D0 21 00 74 */ stfs f1, 0x74(r1) /* 801F902C 001F5F8C D0 41 00 78 */ stfs f2, 0x78(r1) @@ -9689,7 +9689,7 @@ lbl_801FC538: /* 801FC544 001F94A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FC548 001F94A8 98 1A 06 A1 */ stb r0, 0x6a1(r26) /* 801FC54C 001F94AC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l -/* 801FC550 001F94B0 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 801FC550 001F94B0 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 801FC554 001F94B4 38 61 00 20 */ addi r3, r1, 0x20 /* 801FC558 001F94B8 88 9A 03 28 */ lbz r4, 0x328(r26) /* 801FC55C 001F94BC 50 A4 36 72 */ rlwimi r4, r5, 6, 0x19, 0x19 @@ -9721,7 +9721,7 @@ lbl_801FC5B0: /* 801FC5BC 001F951C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FC5C0 001F9520 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 801FC5C4 001F9524 38 61 00 1C */ addi r3, r1, 0x1c -/* 801FC5C8 001F9528 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 801FC5C8 001F9528 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 801FC5CC 001F952C 38 A1 00 2C */ addi r5, r1, 0x2c /* 801FC5D0 001F9530 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801FC5D4 001F9534 38 E0 00 7F */ li r7, 0x7f @@ -13486,7 +13486,7 @@ lbl_801FFD3C: /* 801FFD70 001FCCD0 D0 41 00 48 */ stfs f2, 0x48(r1) /* 801FFD74 001FCCD4 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, qr2 /* 801FFD78 001FCCD8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha -/* 801FFD7C 001FCCDC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 801FFD7C 001FCCDC 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 801FFD80 001FCCE0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FFD84 001FCCE4 88 E1 00 10 */ lbz r7, 0x10(r1) /* 801FFD88 001FCCE8 38 61 00 14 */ addi r3, r1, 0x14 @@ -13569,7 +13569,7 @@ sub_801ffe50: /* 801FFEA8 001FCE08 38 A1 00 0C */ addi r5, r1, 0xc /* 801FFEAC 001FCE0C D0 01 00 0C */ stfs f0, 0xc(r1) /* 801FFEB0 001FCE10 38 E0 00 01 */ li r7, 1 -/* 801FFEB4 001FCE14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801FFEB4 001FCE14 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801FFEB8 001FCE18 39 00 00 01 */ li r8, 1 /* 801FFEBC 001FCE1C D0 21 00 10 */ stfs f1, 0x10(r1) /* 801FFEC0 001FCE20 D0 41 00 14 */ stfs f2, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index 1dccff9f..1c9e2ae2 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -340,7 +340,7 @@ lbl_8022F8D0: /* 8022F8F0 0022C850 38 C0 00 40 */ li r6, 0x40 /* 8022F8F4 0022C854 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8022F8F8 0022C858 38 E0 00 00 */ li r7, 0 -/* 8022F8FC 0022C85C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8022F8FC 0022C85C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8022F900 0022C860 39 20 00 00 */ li r9, 0 /* 8022F904 0022C864 48 0B A4 71 */ bl SfxStart__11CSfxManagerFUsssbsbi lbl_8022F908: diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 2f8f2dad..f1cbbb28 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -1561,7 +1561,7 @@ lbl_8019F344: /* 8019F3F0 0019C350 38 A1 00 20 */ addi r5, r1, 0x20 /* 8019F3F4 0019C354 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8019F3F8 0019C358 38 E0 00 00 */ li r7, 0 -/* 8019F3FC 0019C35C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8019F3FC 0019C35C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8019F400 0019C360 39 00 00 01 */ li r8, 1 /* 8019F404 0019C364 D0 21 00 24 */ stfs f1, 0x24(r1) /* 8019F408 0019C368 D0 41 00 28 */ stfs f2, 0x28(r1) diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index 9eee4fd9..1639ef65 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -577,7 +577,7 @@ lbl_8014E5A4: /* 8014E638 0014B598 38 A1 00 0C */ addi r5, r1, 0xc /* 8014E63C 0014B59C D0 01 00 0C */ stfs f0, 0xc(r1) /* 8014E640 0014B5A0 38 E0 00 01 */ li r7, 1 -/* 8014E644 0014B5A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8014E644 0014B5A4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8014E648 0014B5A8 39 00 00 00 */ li r8, 0 /* 8014E64C 0014B5AC D0 21 00 10 */ stfs f1, 0x10(r1) /* 8014E650 0014B5B0 D0 41 00 14 */ stfs f2, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 2c64086b..27c5db8c 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -1010,7 +1010,7 @@ lbl_8027D3AC: /* 8027D3C8 0027A328 38 61 00 08 */ addi r3, r1, 8 /* 8027D3CC 0027A32C D0 01 00 14 */ stfs f0, 0x14(r1) /* 8027D3D0 0027A330 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8027D3D4 0027A334 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8027D3D4 0027A334 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8027D3D8 0027A338 38 E0 00 01 */ li r7, 1 /* 8027D3DC 0027A33C D0 21 00 18 */ stfs f1, 0x18(r1) /* 8027D3E0 0027A340 39 00 00 00 */ li r8, 0 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 778d0d57..ddf6b7d9 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -6443,7 +6443,7 @@ lbl_80276264: /* 80276270 002731D0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80276274 002731D4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80276278 002731D8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8027627C 002731DC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 8027627C 002731DC 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 80276280 002731E0 38 A1 00 24 */ addi r5, r1, 0x24 /* 80276284 002731E4 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80276288 002731E8 38 80 05 19 */ li r4, 0x519 @@ -6571,7 +6571,7 @@ lbl_80276444: /* 80276450 002733B0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80276454 002733B4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80276458 002733B8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8027645C 002733BC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 8027645C 002733BC 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 80276460 002733C0 38 A1 00 1C */ addi r5, r1, 0x1c /* 80276464 002733C4 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80276468 002733C8 38 80 05 1A */ li r4, 0x51a diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 3d2ae07c..1b3cc4b0 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -1427,7 +1427,7 @@ GetUp__9CParasiteFR13CStateManager9EStateMsgf: /* 801579D8 00154938 38 A1 00 0C */ addi r5, r1, 0xc /* 801579DC 0015493C D0 01 00 0C */ stfs f0, 0xc(r1) /* 801579E0 00154940 38 E0 00 01 */ li r7, 1 -/* 801579E4 00154944 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801579E4 00154944 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801579E8 00154948 39 00 00 00 */ li r8, 0 /* 801579EC 0015494C D0 21 00 10 */ stfs f1, 0x10(r1) /* 801579F0 00154950 D0 41 00 14 */ stfs f2, 0x14(r1) @@ -1465,7 +1465,7 @@ Crouch__9CParasiteFR13CStateManager9EStateMsgf: /* 80157A60 001549C0 38 A1 00 0C */ addi r5, r1, 0xc /* 80157A64 001549C4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80157A68 001549C8 38 E0 00 01 */ li r7, 1 -/* 80157A6C 001549CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80157A6C 001549CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80157A70 001549D0 39 00 00 00 */ li r8, 0 /* 80157A74 001549D4 D0 21 00 10 */ stfs f1, 0x10(r1) /* 80157A78 001549D8 D0 41 00 14 */ stfs f2, 0x14(r1) @@ -1519,7 +1519,7 @@ lbl_80157AD0: /* 80157B20 00154A80 38 A1 00 20 */ addi r5, r1, 0x20 /* 80157B24 00154A84 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80157B28 00154A88 38 E0 00 01 */ li r7, 1 -/* 80157B2C 00154A8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80157B2C 00154A8C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80157B30 00154A90 39 00 00 00 */ li r8, 0 /* 80157B34 00154A94 D0 21 00 24 */ stfs f1, 0x24(r1) /* 80157B38 00154A98 D0 41 00 28 */ stfs f2, 0x28(r1) diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 613f96cb..aec363f3 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -2374,7 +2374,7 @@ lbl_80078CA8: /* 80078CA8 00075C08 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80078CAC 00075C0C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2) /* 80078CB0 00075C10 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l -/* 80078CB4 00075C14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80078CB4 00075C14 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80078CB8 00075C18 7F A5 EB 78 */ mr r5, r29 /* 80078CBC 00075C1C 38 E0 00 01 */ li r7, 1 /* 80078CC0 00075C20 39 00 00 00 */ li r8, 0 @@ -4528,7 +4528,7 @@ lbl_8007AB68: /* 8007AB8C 00077AEC 38 A1 00 24 */ addi r5, r1, 0x24 /* 8007AB90 00077AF0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8007AB94 00077AF4 38 E0 00 01 */ li r7, 1 -/* 8007AB98 00077AF8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8007AB98 00077AF8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8007AB9C 00077AFC 39 00 00 00 */ li r8, 0 /* 8007ABA0 00077B00 D0 21 00 28 */ stfs f1, 0x28(r1) /* 8007ABA4 00077B04 D0 41 00 2C */ stfs f2, 0x2c(r1) @@ -4624,7 +4624,7 @@ MassiveDeath__10CPatternedFR13CStateManager: /* 8007ACF4 00077C54 38 E0 00 01 */ li r7, 1 /* 8007ACF8 00077C58 90 01 00 24 */ stw r0, 0x24(r1) /* 8007ACFC 00077C5C 38 A1 00 0C */ addi r5, r1, 0xc -/* 8007AD00 00077C60 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8007AD00 00077C60 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8007AD04 00077C64 39 00 00 00 */ li r8, 0 /* 8007AD08 00077C68 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007AD0C 00077C6C 7C 9F 23 78 */ mr r31, r4 diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index c96a2f75..5e48a7c5 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -425,7 +425,7 @@ Think__7CPufferFfR13CStateManager: /* 8025C2BC 0025921C 38 A1 00 24 */ addi r5, r1, 0x24 /* 8025C2C0 00259220 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 8025C2C4 00259224 38 E0 00 01 */ li r7, 1 -/* 8025C2C8 00259228 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8025C2C8 00259228 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8025C2CC 0025922C 39 00 00 00 */ li r8, 0 /* 8025C2D0 00259230 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8025C2D4 00259234 D0 21 00 28 */ stfs f1, 0x28(r1) diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 60ec35ba..aac84f7a 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -5411,7 +5411,7 @@ lbl_80256974: /* 802569E0 00253940 D0 A1 00 18 */ stfs f5, 0x18(r1) /* 802569E4 00253944 C0 08 00 08 */ lfs f0, 8(r8) /* 802569E8 00253948 D0 A1 00 1C */ stfs f5, 0x1c(r1) -/* 802569EC 0025394C 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 802569EC 0025394C 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 802569F0 00253950 D0 A1 00 20 */ stfs f5, 0x20(r1) /* 802569F4 00253954 D0 81 00 24 */ stfs f4, 0x24(r1) /* 802569F8 00253958 D0 61 00 28 */ stfs f3, 0x28(r1) @@ -5806,7 +5806,7 @@ lbl_80256F04: /* 80256FB8 00253F18 D0 A1 00 B0 */ stfs f5, 0xb0(r1) /* 80256FBC 00253F1C A8 C2 C5 F8 */ lha r6, lbl_805AE318@sda21(r2) /* 80256FC0 00253F20 D0 A1 00 B4 */ stfs f5, 0xb4(r1) -/* 80256FC4 00253F24 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 80256FC4 00253F24 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 80256FC8 00253F28 D0 A1 00 B8 */ stfs f5, 0xb8(r1) /* 80256FCC 00253F2C D0 81 00 BC */ stfs f4, 0xbc(r1) /* 80256FD0 00253F30 D0 61 00 C0 */ stfs f3, 0xc0(r1) @@ -7232,7 +7232,7 @@ lbl_80258428: /* 80258484 002553E4 D0 A1 03 3C */ stfs f5, 0x33c(r1) /* 80258488 002553E8 C0 08 00 08 */ lfs f0, 8(r8) /* 8025848C 002553EC D0 A1 03 40 */ stfs f5, 0x340(r1) -/* 80258490 002553F0 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 80258490 002553F0 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 80258494 002553F4 D0 A1 03 44 */ stfs f5, 0x344(r1) /* 80258498 002553F8 D0 81 03 48 */ stfs f4, 0x348(r1) /* 8025849C 002553FC D0 61 03 4C */ stfs f3, 0x34c(r1) diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 599d915d..a69a6985 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -3144,7 +3144,7 @@ lbl_80122620: /* 8012263C 0011F59C 38 A1 00 70 */ addi r5, r1, 0x70 /* 80122640 0011F5A0 D0 01 00 70 */ stfs f0, 0x70(r1) /* 80122644 0011F5A4 38 E0 00 01 */ li r7, 1 -/* 80122648 0011F5A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80122648 0011F5A8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8012264C 0011F5AC 39 00 00 00 */ li r8, 0 /* 80122650 0011F5B0 D0 21 00 74 */ stfs f1, 0x74(r1) /* 80122654 0011F5B4 D0 41 00 78 */ stfs f2, 0x78(r1) @@ -8495,7 +8495,7 @@ lbl_80127304: /* 80127320 00124280 38 A1 00 80 */ addi r5, r1, 0x80 /* 80127324 00124284 D0 01 00 80 */ stfs f0, 0x80(r1) /* 80127328 00124288 38 E0 00 01 */ li r7, 1 -/* 8012732C 0012428C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8012732C 0012428C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80127330 00124290 39 00 00 00 */ li r8, 0 /* 80127334 00124294 D0 21 00 84 */ stfs f1, 0x84(r1) /* 80127338 00124298 D0 41 00 88 */ stfs f2, 0x88(r1) @@ -9395,7 +9395,7 @@ lbl_80127F8C: /* 80127FD4 00124F34 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80127FD8 00124F38 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 80127FDC 00124F3C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80127FE0 00124F40 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 80127FE0 00124F40 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 80127FE4 00124F44 38 A1 00 24 */ addi r5, r1, 0x24 /* 80127FE8 00124F48 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80127FEC 00124F4C 38 E0 00 7F */ li r7, 0x7f @@ -9425,7 +9425,7 @@ lbl_80128024: /* 80128044 00124FA4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80128048 00124FA8 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 8012804C 00124FAC 38 61 00 10 */ addi r3, r1, 0x10 -/* 80128050 00124FB0 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 80128050 00124FB0 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 80128054 00124FB4 38 A1 00 18 */ addi r5, r1, 0x18 /* 80128058 00124FB8 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8012805C 00124FBC 38 E0 00 7F */ li r7, 0x7f @@ -13834,7 +13834,7 @@ lbl_8012C0A8: /* 8012C0DC 0012903C D0 41 00 40 */ stfs f2, 0x40(r1) /* 8012C0E0 00129040 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, qr2 /* 8012C0E4 00129044 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha -/* 8012C0E8 00129048 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) +/* 8012C0E8 00129048 80 02 C6 00 */ lwz r0, kAllAreas__11CSfxManager@sda21(r2) /* 8012C0EC 0012904C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8012C0F0 00129050 88 E1 00 10 */ lbz r7, 0x10(r1) /* 8012C0F4 00129054 38 61 00 18 */ addi r3, r1, 0x18 diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index a097c5f8..46cf410d 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -3176,7 +3176,7 @@ lbl_801DCBCC: /* 801DCBD0 001D9B30 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801DCBD4 001D9B34 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DCBD8 001D9B38 38 61 00 24 */ addi r3, r1, 0x24 -/* 801DCBDC 001D9B3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801DCBDC 001D9B3C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801DCBE0 001D9B40 38 80 07 AD */ li r4, 0x7ad /* 801DCBE4 001D9B44 38 A0 00 7F */ li r5, 0x7f /* 801DCBE8 001D9B48 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index 56ae4c49..79141f15 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -849,7 +849,7 @@ lbl_8018F9F4: /* 8018F9F8 0018C958 41 82 00 28 */ beq lbl_8018FA20 /* 8018F9FC 0018C95C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8018FA00 0018C960 38 61 00 08 */ addi r3, r1, 8 -/* 8018FA04 0018C964 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8018FA04 0018C964 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8018FA08 0018C968 38 80 05 7D */ li r4, 0x57d /* 8018FA0C 0018C96C 38 A0 00 7F */ li r5, 0x7f /* 8018FA10 0018C970 38 C0 00 40 */ li r6, 0x40 @@ -2831,7 +2831,7 @@ lbl_801915E4: /* 80191608 0018E568 40 82 00 38 */ bne lbl_80191640 /* 8019160C 0018E56C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80191610 0018E570 38 61 00 20 */ addi r3, r1, 0x20 -/* 80191614 0018E574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80191614 0018E574 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80191618 0018E578 38 80 05 75 */ li r4, 0x575 /* 8019161C 0018E57C 38 A0 00 7F */ li r5, 0x7f /* 80191620 0018E580 38 C0 00 40 */ li r6, 0x40 @@ -2847,7 +2847,7 @@ lbl_80191640: /* 80191644 0018E5A4 40 82 00 34 */ bne lbl_80191678 /* 80191648 0018E5A8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8019164C 0018E5AC 38 61 00 1C */ addi r3, r1, 0x1c -/* 80191650 0018E5B0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80191650 0018E5B0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80191654 0018E5B4 38 80 05 75 */ li r4, 0x575 /* 80191658 0018E5B8 38 A0 00 7F */ li r5, 0x7f /* 8019165C 0018E5BC 38 C0 00 40 */ li r6, 0x40 @@ -4665,7 +4665,7 @@ lbl_80193028: /* 8019304C 0018FFAC 40 82 00 2C */ bne lbl_80193078 /* 80193050 0018FFB0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80193054 0018FFB4 38 61 00 30 */ addi r3, r1, 0x30 -/* 80193058 0018FFB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80193058 0018FFB8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8019305C 0018FFBC 38 80 05 74 */ li r4, 0x574 /* 80193060 0018FFC0 38 A0 00 7F */ li r5, 0x7f /* 80193064 0018FFC4 38 C0 00 40 */ li r6, 0x40 @@ -4678,7 +4678,7 @@ lbl_80193078: /* 8019307C 0018FFDC 40 82 00 28 */ bne lbl_801930A4 /* 80193080 0018FFE0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80193084 0018FFE4 38 61 00 2C */ addi r3, r1, 0x2c -/* 80193088 0018FFE8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80193088 0018FFE8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8019308C 0018FFEC 38 80 05 77 */ li r4, 0x577 /* 80193090 0018FFF0 38 A0 00 7F */ li r5, 0x7f /* 80193094 0018FFF4 38 C0 00 40 */ li r6, 0x40 @@ -4716,7 +4716,7 @@ lbl_801930EC: /* 80193104 00190064 40 80 00 28 */ bge lbl_8019312C /* 80193108 00190068 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8019310C 0019006C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80193110 00190070 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80193110 00190070 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80193114 00190074 38 80 05 77 */ li r4, 0x577 /* 80193118 00190078 38 A0 00 7F */ li r5, 0x7f /* 8019311C 0019007C 38 C0 00 40 */ li r6, 0x40 @@ -6110,7 +6110,7 @@ lbl_80194444: /* 80194460 001913C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80194464 001913C4 38 61 00 08 */ addi r3, r1, 8 /* 80194468 001913C8 54 00 08 3C */ slwi r0, r0, 1 -/* 8019446C 001913CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8019446C 001913CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80194470 001913D0 7C 84 02 2E */ lhzx r4, r4, r0 /* 80194474 001913D4 38 A0 00 7F */ li r5, 0x7f /* 80194478 001913D8 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index 32b13b5d..5964e7e3 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -595,7 +595,7 @@ lbl_80064854: /* 80064878 000617D8 41 82 01 AC */ beq lbl_80064A24 /* 8006487C 000617DC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80064880 000617E0 38 61 00 0C */ addi r3, r1, 0xc -/* 80064884 000617E4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80064884 000617E4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80064888 000617E8 38 80 05 A9 */ li r4, 0x5a9 /* 8006488C 000617EC 38 A0 00 7F */ li r5, 0x7f /* 80064890 000617F0 38 C0 00 40 */ li r6, 0x40 @@ -692,7 +692,7 @@ lbl_8006499C: /* 800649E4 00061944 38 80 05 A3 */ li r4, 0x5a3 /* 800649E8 00061948 D0 1D 05 84 */ stfs f0, 0x584(r29) /* 800649EC 0006194C 38 A0 00 7F */ li r5, 0x7f -/* 800649F0 00061950 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800649F0 00061950 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800649F4 00061954 38 C0 00 40 */ li r6, 0x40 /* 800649F8 00061958 D0 1D 05 60 */ stfs f0, 0x560(r29) /* 800649FC 0006195C 38 E0 00 00 */ li r7, 0 @@ -1393,7 +1393,7 @@ lbl_800653E0: /* 80065438 00062398 38 80 05 69 */ li r4, 0x569 /* 8006543C 0006239C C0 0B 00 38 */ lfs f0, 0x38(r11) /* 80065440 000623A0 38 E0 00 00 */ li r7, 0 -/* 80065444 000623A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80065444 000623A4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80065448 000623A8 39 00 00 01 */ li r8, 1 /* 8006544C 000623AC D0 01 00 30 */ stfs f0, 0x30(r1) /* 80065450 000623B0 D0 21 00 34 */ stfs f1, 0x34(r1) @@ -2865,7 +2865,7 @@ lbl_800668F0: /* 800668F4 00063854 41 82 00 28 */ beq lbl_8006691C /* 800668F8 00063858 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800668FC 0006385C 38 61 00 40 */ addi r3, r1, 0x40 -/* 80066900 00063860 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80066900 00063860 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80066904 00063864 38 80 05 A2 */ li r4, 0x5a2 /* 80066908 00063868 38 A0 00 7F */ li r5, 0x7f /* 8006690C 0006386C 38 C0 00 40 */ li r6, 0x40 @@ -3146,7 +3146,7 @@ lbl_80066C90: lbl_80066CE4: /* 80066CE4 00063C44 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80066CE8 00063C48 38 61 00 2C */ addi r3, r1, 0x2c -/* 80066CEC 00063C4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80066CEC 00063C4C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80066CF0 00063C50 38 80 05 8A */ li r4, 0x58a /* 80066CF4 00063C54 38 A0 00 7F */ li r5, 0x7f /* 80066CF8 00063C58 38 C0 00 40 */ li r6, 0x40 @@ -5980,7 +5980,7 @@ lbl_80069528: /* 80069554 000664B4 40 82 00 4C */ bne lbl_800695A0 /* 80069558 000664B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8006955C 000664BC 54 C4 04 3E */ clrlwi r4, r6, 0x10 -/* 80069560 000664C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80069560 000664C0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80069564 000664C4 38 61 00 0C */ addi r3, r1, 0xc /* 80069568 000664C8 38 A0 00 7F */ li r5, 0x7f /* 8006956C 000664CC 38 C0 00 40 */ li r6, 0x40 @@ -6168,7 +6168,7 @@ lbl_800697D0: /* 800697EC 0006674C 41 82 00 2C */ beq lbl_80069818 /* 800697F0 00066750 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800697F4 00066754 38 61 00 1C */ addi r3, r1, 0x1c -/* 800697F8 00066758 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800697F8 00066758 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800697FC 0006675C 38 80 05 70 */ li r4, 0x570 /* 80069800 00066760 38 A0 00 7F */ li r5, 0x7f /* 80069804 00066764 38 C0 00 40 */ li r6, 0x40 @@ -6179,7 +6179,7 @@ lbl_800697D0: lbl_80069818: /* 80069818 00066778 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8006981C 0006677C 38 61 00 18 */ addi r3, r1, 0x18 -/* 80069820 00066780 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80069820 00066780 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80069824 00066784 38 80 05 6E */ li r4, 0x56e /* 80069828 00066788 38 A0 00 7F */ li r5, 0x7f /* 8006982C 0006678C 38 C0 00 40 */ li r6, 0x40 @@ -6292,7 +6292,7 @@ lbl_80069978: /* 800699A4 00066904 40 82 00 4C */ bne lbl_800699F0 /* 800699A8 00066908 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800699AC 0006690C 38 61 00 10 */ addi r3, r1, 0x10 -/* 800699B0 00066910 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800699B0 00066910 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800699B4 00066914 38 80 05 72 */ li r4, 0x572 /* 800699B8 00066918 38 A0 00 7F */ li r5, 0x7f /* 800699BC 0006691C 38 C0 00 40 */ li r6, 0x40 @@ -7429,7 +7429,7 @@ lbl_8006A8DC: /* 8006A8FC 0006785C 40 80 00 28 */ bge lbl_8006A924 /* 8006A900 00067860 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8006A904 00067864 38 61 00 08 */ addi r3, r1, 8 -/* 8006A908 00067868 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8006A908 00067868 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8006A90C 0006786C 38 80 05 7D */ li r4, 0x57d /* 8006A910 00067870 38 A0 00 7F */ li r5, 0x7f /* 8006A914 00067874 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index c6878b80..3a24e1ef 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -1980,7 +1980,7 @@ StartLandingSfx__10CMorphBallFv: /* 800EE828 000EB788 38 E0 00 01 */ li r7, 1 /* 800EE82C 000EB78C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800EE830 000EB790 39 20 00 00 */ li r9, 0 -/* 800EE834 000EB794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800EE834 000EB794 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800EE838 000EB798 48 1F B5 3D */ bl SfxStart__11CSfxManagerFUsssbsbi /* 800EE83C 000EB79C 80 01 00 0C */ lwz r0, 0xc(r1) /* 800EE840 000EB7A0 38 81 00 10 */ addi r4, r1, 0x10 @@ -2096,7 +2096,7 @@ lbl_800EE988: /* 800EE9C8 000EB928 38 E0 00 01 */ li r7, 1 /* 800EE9CC 000EB92C C0 05 00 40 */ lfs f0, 0x40(r5) /* 800EE9D0 000EB930 38 A1 00 5C */ addi r5, r1, 0x5c -/* 800EE9D4 000EB934 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800EE9D4 000EB934 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800EE9D8 000EB938 39 00 00 01 */ li r8, 1 /* 800EE9DC 000EB93C D0 01 00 5C */ stfs f0, 0x5c(r1) /* 800EE9E0 000EB940 D0 21 00 60 */ stfs f1, 0x60(r1) @@ -2173,7 +2173,7 @@ lbl_800EEAD4: /* 800EEAEC 000EBA4C 80 9F 00 00 */ lwz r4, 0(r31) /* 800EEAF0 000EBA50 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800EEAF4 000EBA54 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l -/* 800EEAF8 000EBA58 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800EEAF8 000EBA58 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800EEAFC 000EBA5C C0 44 00 60 */ lfs f2, 0x60(r4) /* 800EEB00 000EBA60 38 61 00 18 */ addi r3, r1, 0x18 /* 800EEB04 000EBA64 C0 24 00 50 */ lfs f1, 0x50(r4) @@ -4556,7 +4556,7 @@ lbl_800F0CBC: /* 800F0D00 000EDC60 38 A1 00 4C */ addi r5, r1, 0x4c /* 800F0D04 000EDC64 D0 01 00 40 */ stfs f0, 0x40(r1) /* 800F0D08 000EDC68 38 C1 00 40 */ addi r6, r1, 0x40 -/* 800F0D0C 000EDC6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800F0D0C 000EDC6C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800F0D10 000EDC70 38 80 05 F5 */ li r4, 0x5f5 /* 800F0D14 000EDC74 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800F0D18 000EDC78 38 E0 00 01 */ li r7, 1 @@ -8413,7 +8413,7 @@ lbl_800F4420: /* 800F44B4 000F1414 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800F44B8 000F1418 90 1E 1E 20 */ stw r0, 0x1e20(r30) /* 800F44BC 000F141C 38 61 00 10 */ addi r3, r1, 0x10 -/* 800F44C0 000F1420 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800F44C0 000F1420 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800F44C4 000F1424 38 80 05 C5 */ li r4, 0x5c5 /* 800F44C8 000F1428 38 A0 00 7F */ li r5, 0x7f /* 800F44CC 000F142C 38 C0 00 40 */ li r6, 0x40 @@ -8471,7 +8471,7 @@ lbl_800F450C: /* 800F4594 000F14F4 80 9E 00 00 */ lwz r4, 0(r30) /* 800F4598 000F14F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F459C 000F14FC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l -/* 800F45A0 000F1500 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800F45A0 000F1500 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800F45A4 000F1504 C0 44 00 60 */ lfs f2, 0x60(r4) /* 800F45A8 000F1508 38 61 00 08 */ addi r3, r1, 8 /* 800F45AC 000F150C C0 24 00 50 */ lfs f1, 0x50(r4) diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index e495d88f..f7eed530 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -1744,7 +1744,7 @@ lbl_80010CE0: /* 80010CE4 0000DC44 41 82 00 34 */ beq lbl_80010D18 /* 80010CE8 0000DC48 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80010CEC 0000DC4C 7F 84 E3 78 */ mr r4, r28 -/* 80010CF0 0000DC50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80010CF0 0000DC50 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80010CF4 0000DC54 7F A5 EB 78 */ mr r5, r29 /* 80010CF8 0000DC58 38 61 00 08 */ addi r3, r1, 8 /* 80010CFC 0000DC5C 38 C0 00 40 */ li r6, 0x40 @@ -3660,7 +3660,7 @@ lbl_80012730: lbl_80012758: /* 80012758 0000F6B8 57 DE 04 3E */ clrlwi r30, r30, 0x10 /* 8001275C 0000F6BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) -/* 80012760 0000F6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80012760 0000F6C0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80012764 0000F6C4 7F C4 F3 78 */ mr r4, r30 /* 80012768 0000F6C8 38 61 00 10 */ addi r3, r1, 0x10 /* 8001276C 0000F6CC 38 A0 00 7F */ li r5, 0x7f @@ -3688,7 +3688,7 @@ lbl_80012794: lbl_800127BC: /* 800127BC 0000F71C 57 F9 04 3E */ clrlwi r25, r31, 0x10 /* 800127C0 0000F720 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) -/* 800127C4 0000F724 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800127C4 0000F724 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800127C8 0000F728 7F 24 CB 78 */ mr r4, r25 /* 800127CC 0000F72C 38 61 00 08 */ addi r3, r1, 8 /* 800127D0 0000F730 38 A0 00 7F */ li r5, 0x7f @@ -6281,7 +6281,7 @@ lbl_80014BD8: lbl_80014C30: /* 80014C30 00011B90 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80014C34 00011B94 38 61 00 10 */ addi r3, r1, 0x10 -/* 80014C38 00011B98 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80014C38 00011B98 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80014C3C 00011B9C 38 80 06 F5 */ li r4, 0x6f5 /* 80014C40 00011BA0 38 A0 00 7F */ li r5, 0x7f /* 80014C44 00011BA4 38 C0 00 40 */ li r6, 0x40 @@ -6336,7 +6336,7 @@ lbl_80014C6C: lbl_80014D04: /* 80014D04 00011C64 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80014D08 00011C68 38 61 00 08 */ addi r3, r1, 8 -/* 80014D0C 00011C6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80014D0C 00011C6C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80014D10 00011C70 38 80 06 F5 */ li r4, 0x6f5 /* 80014D14 00011C74 38 A0 00 7F */ li r5, 0x7f /* 80014D18 00011C78 38 C0 00 40 */ li r6, 0x40 @@ -7168,7 +7168,7 @@ lbl_800158D4: /* 800158F0 00012850 41 82 00 40 */ beq lbl_80015930 /* 800158F4 00012854 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800158F8 00012858 38 61 00 10 */ addi r3, r1, 0x10 -/* 800158FC 0001285C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800158FC 0001285C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80015900 00012860 38 80 0C 37 */ li r4, 0xc37 /* 80015904 00012864 38 A0 00 7F */ li r5, 0x7f /* 80015908 00012868 38 C0 00 40 */ li r6, 0x40 @@ -7184,7 +7184,7 @@ lbl_800158D4: lbl_80015930: /* 80015930 00012890 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80015934 00012894 38 61 00 08 */ addi r3, r1, 8 -/* 80015938 00012898 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80015938 00012898 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001593C 0001289C 38 80 0C 38 */ li r4, 0xc38 /* 80015940 000128A0 38 A0 00 7F */ li r5, 0x7f /* 80015944 000128A4 38 C0 00 40 */ li r6, 0x40 @@ -7418,7 +7418,7 @@ lbl_80015C7C: lbl_80015C8C: /* 80015C8C 00012BEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80015C90 00012BF0 38 61 00 18 */ addi r3, r1, 0x18 -/* 80015C94 00012BF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80015C94 00012BF4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80015C98 00012BF8 38 80 0C 39 */ li r4, 0xc39 /* 80015C9C 00012BFC 38 A0 00 7F */ li r5, 0x7f /* 80015CA0 00012C00 38 C0 00 40 */ li r6, 0x40 @@ -7549,7 +7549,7 @@ lbl_80015E3C: /* 80015E60 00012DC0 38 61 00 08 */ addi r3, r1, 8 /* 80015E64 00012DC4 93 FB 0A 0C */ stw r31, 0xa0c(r27) /* 80015E68 00012DC8 38 A0 00 7F */ li r5, 0x7f -/* 80015E6C 00012DCC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80015E6C 00012DCC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80015E70 00012DD0 38 C0 00 40 */ li r6, 0x40 /* 80015E74 00012DD4 38 E0 00 00 */ li r7, 0 /* 80015E78 00012DD8 39 20 00 00 */ li r9, 0 @@ -7825,7 +7825,7 @@ lbl_8001625C: /* 80016260 000131C0 38 61 00 18 */ addi r3, r1, 0x18 /* 80016264 000131C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80016268 000131C8 38 A0 00 7F */ li r5, 0x7f -/* 8001626C 000131CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001626C 000131CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80016270 000131D0 38 C0 00 40 */ li r6, 0x40 /* 80016274 000131D4 38 E0 00 00 */ li r7, 0 /* 80016278 000131D8 39 20 00 00 */ li r9, 0 @@ -8176,7 +8176,7 @@ lbl_80016768: lbl_80016770: /* 80016770 000136D0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80016774 000136D4 7F E5 FB 78 */ mr r5, r31 -/* 80016778 000136D8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80016778 000136D8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001677C 000136DC 38 61 00 44 */ addi r3, r1, 0x44 /* 80016780 000136E0 57 44 04 3E */ clrlwi r4, r26, 0x10 /* 80016784 000136E4 38 C0 00 40 */ li r6, 0x40 @@ -9491,7 +9491,7 @@ lbl_80017A04: /* 80017A08 00014968 38 61 00 18 */ addi r3, r1, 0x18 /* 80017A0C 0001496C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80017A10 00014970 38 A0 00 7F */ li r5, 0x7f -/* 80017A14 00014974 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80017A14 00014974 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80017A18 00014978 38 C0 00 40 */ li r6, 0x40 /* 80017A1C 0001497C 38 E0 00 00 */ li r7, 0 /* 80017A20 00014980 39 20 00 00 */ li r9, 0 @@ -9866,7 +9866,7 @@ lbl_80017F00: /* 80017F3C 00014E9C 40 82 00 40 */ bne lbl_80017F7C /* 80017F40 00014EA0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80017F44 00014EA4 38 61 00 2C */ addi r3, r1, 0x2c -/* 80017F48 00014EA8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80017F48 00014EA8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80017F4C 00014EAC 7F E5 07 74 */ extsb r5, r31 /* 80017F50 00014EB0 38 80 08 87 */ li r4, 0x887 /* 80017F54 00014EB4 38 C0 00 40 */ li r6, 0x40 @@ -9882,7 +9882,7 @@ lbl_80017F00: lbl_80017F7C: /* 80017F7C 00014EDC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80017F80 00014EE0 38 61 00 24 */ addi r3, r1, 0x24 -/* 80017F84 00014EE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80017F84 00014EE4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80017F88 00014EE8 7F E5 07 74 */ extsb r5, r31 /* 80017F8C 00014EEC 38 80 08 88 */ li r4, 0x888 /* 80017F90 00014EF0 38 C0 00 40 */ li r6, 0x40 @@ -9901,7 +9901,7 @@ lbl_80017FB8: /* 80017FC0 00014F20 40 82 00 40 */ bne lbl_80018000 /* 80017FC4 00014F24 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80017FC8 00014F28 38 61 00 1C */ addi r3, r1, 0x1c -/* 80017FCC 00014F2C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80017FCC 00014F2C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80017FD0 00014F30 7F E5 07 74 */ extsb r5, r31 /* 80017FD4 00014F34 38 80 05 CC */ li r4, 0x5cc /* 80017FD8 00014F38 38 C0 00 40 */ li r6, 0x40 @@ -9917,7 +9917,7 @@ lbl_80017FB8: lbl_80018000: /* 80018000 00014F60 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80018004 00014F64 38 61 00 14 */ addi r3, r1, 0x14 -/* 80018008 00014F68 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80018008 00014F68 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8001800C 00014F6C 7F E5 07 74 */ extsb r5, r31 /* 80018010 00014F70 38 80 05 CD */ li r4, 0x5cd /* 80018014 00014F74 38 C0 00 40 */ li r6, 0x40 @@ -9957,7 +9957,7 @@ lbl_80018070: lbl_80018094: /* 80018094 00014FF4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80018098 00014FF8 38 61 00 0C */ addi r3, r1, 0xc -/* 8001809C 00014FFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8001809C 00014FFC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800180A0 00015000 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 800180A4 00015004 7F E5 07 74 */ extsb r5, r31 /* 800180A8 00015008 38 C0 00 40 */ li r6, 0x40 @@ -10532,7 +10532,7 @@ lbl_8001887C: /* 800188B4 00015814 40 82 00 3C */ bne lbl_800188F0 /* 800188B8 00015818 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 800188BC 0001581C 38 61 00 2C */ addi r3, r1, 0x2c -/* 800188C0 00015820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 800188C0 00015820 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 800188C4 00015824 38 80 05 EC */ li r4, 0x5ec /* 800188C8 00015828 38 A0 00 7F */ li r5, 0x7f /* 800188CC 0001582C 38 C0 00 40 */ li r6, 0x40 @@ -10575,7 +10575,7 @@ lbl_80018940: /* 80018958 000158B8 40 80 00 3C */ bge lbl_80018994 /* 8001895C 000158BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80018960 000158C0 38 61 00 24 */ addi r3, r1, 0x24 -/* 80018964 000158C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80018964 000158C4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80018968 000158C8 38 80 05 EC */ li r4, 0x5ec /* 8001896C 000158CC 38 A0 00 7F */ li r5, 0x7f /* 80018970 000158D0 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 371cbddc..f1fddf3c 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -4097,7 +4097,7 @@ lbl_80285670: /* 8028568C 002825EC 38 A1 00 10 */ addi r5, r1, 0x10 /* 80285690 002825F0 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80285694 002825F4 38 80 05 BC */ li r4, 0x5bc -/* 80285698 002825F8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80285698 002825F8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8028569C 002825FC 38 E0 00 00 */ li r7, 0 /* 802856A0 00282600 D0 21 00 14 */ stfs f1, 0x14(r1) /* 802856A4 00282604 39 00 00 00 */ li r8, 0 @@ -5077,7 +5077,7 @@ lbl_80286434: /* 8028643C 0028339C 40 82 00 80 */ bne lbl_802864BC /* 80286440 002833A0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80286444 002833A4 38 61 00 10 */ addi r3, r1, 0x10 -/* 80286448 002833A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80286448 002833A8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8028644C 002833AC 38 80 05 BE */ li r4, 0x5be /* 80286450 002833B0 38 A0 00 7F */ li r5, 0x7f /* 80286454 002833B4 38 C0 00 40 */ li r6, 0x40 @@ -5111,7 +5111,7 @@ lbl_802864BC: /* 802864C0 00283420 41 82 00 E0 */ beq lbl_802865A0 /* 802864C4 00283424 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 802864C8 00283428 38 61 00 08 */ addi r3, r1, 8 -/* 802864CC 0028342C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 802864CC 0028342C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 802864D0 00283430 38 80 05 BF */ li r4, 0x5bf /* 802864D4 00283434 38 A0 00 7F */ li r5, 0x7f /* 802864D8 00283438 38 C0 00 40 */ li r6, 0x40 @@ -6642,7 +6642,7 @@ lbl_802879AC: /* 80287A30 00284990 4B E9 32 71 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 80287A34 00284994 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80287A38 00284998 38 61 00 14 */ addi r3, r1, 0x14 -/* 80287A3C 0028499C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80287A3C 0028499C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80287A40 002849A0 38 80 06 18 */ li r4, 0x618 /* 80287A44 002849A4 38 A0 00 7F */ li r5, 0x7f /* 80287A48 002849A8 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index 7c1b98ce..eaf22c1c 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -1097,7 +1097,7 @@ lbl_8003B02C: lbl_8003B058: /* 8003B058 00037FB8 A9 02 C5 F8 */ lha r8, lbl_805AE318@sda21(r2) /* 8003B05C 00037FBC 38 61 00 0C */ addi r3, r1, 0xc -/* 8003B060 00037FC0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8003B060 00037FC0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8003B064 00037FC4 38 80 06 EF */ li r4, 0x6ef /* 8003B068 00037FC8 38 A0 00 7F */ li r5, 0x7f /* 8003B06C 00037FCC 38 C0 00 40 */ li r6, 0x40 @@ -5669,7 +5669,7 @@ lbl_8003F100: /* 8003F170 0003C0D0 41 82 00 28 */ beq lbl_8003F198 /* 8003F174 0003C0D4 A9 02 C5 F8 */ lha r8, lbl_805AE318@sda21(r2) /* 8003F178 0003C0D8 38 61 00 08 */ addi r3, r1, 8 -/* 8003F17C 0003C0DC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8003F17C 0003C0DC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8003F180 0003C0E0 38 80 06 EE */ li r4, 0x6ee /* 8003F184 0003C0E4 38 A0 00 7F */ li r5, 0x7f /* 8003F188 0003C0E8 38 C0 00 40 */ li r6, 0x40 @@ -11065,4 +11065,3 @@ lbl_803CCEB0: .asciz "ole Body" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Player/CPlayerVisor.s b/asm/MetroidPrime/Player/CPlayerVisor.s index 520d2355..981eacbb 100644 --- a/asm/MetroidPrime/Player/CPlayerVisor.s +++ b/asm/MetroidPrime/Player/CPlayerVisor.s @@ -1025,7 +1025,7 @@ UpdateScanWindow__12CPlayerVisorFfRC13CStateManager: /* 801129A0 0010F900 38 61 00 18 */ addi r3, r1, 0x18 /* 801129A4 0010F904 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801129A8 0010F908 38 80 05 7F */ li r4, 0x57f -/* 801129AC 0010F90C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801129AC 0010F90C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801129B0 0010F910 38 C0 00 40 */ li r6, 0x40 /* 801129B4 0010F914 38 E0 00 00 */ li r7, 0 /* 801129B8 0010F918 39 20 00 01 */ li r9, 1 @@ -1138,7 +1138,7 @@ lbl_80112B1C: /* 80112B34 0010FA94 38 61 00 10 */ addi r3, r1, 0x10 /* 80112B38 0010FA98 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80112B3C 0010FA9C 38 80 05 83 */ li r4, 0x583 -/* 80112B40 0010FAA0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80112B40 0010FAA0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80112B44 0010FAA4 38 C0 00 40 */ li r6, 0x40 /* 80112B48 0010FAA8 38 E0 00 00 */ li r7, 0 /* 80112B4C 0010FAAC 39 20 00 00 */ li r9, 0 @@ -1190,7 +1190,7 @@ lbl_80112BC8: /* 80112BF0 0010FB50 38 61 00 0C */ addi r3, r1, 0xc /* 80112BF4 0010FB54 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80112BF8 0010FB58 38 80 05 81 */ li r4, 0x581 -/* 80112BFC 0010FB5C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80112BFC 0010FB5C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80112C00 0010FB60 38 C0 00 40 */ li r6, 0x40 /* 80112C04 0010FB64 38 E0 00 00 */ li r7, 0 /* 80112C08 0010FB68 39 20 00 00 */ li r9, 0 @@ -2562,7 +2562,7 @@ lbl_80113F9C: /* 80113FC8 00110F28 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80113FCC 00110F2C 38 80 05 68 */ li r4, 0x568 /* 80113FD0 00110F30 38 06 00 10 */ addi r0, r6, 0x10 -/* 80113FD4 00110F34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80113FD4 00110F34 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80113FD8 00110F38 7C 08 07 34 */ extsh r8, r0 /* 80113FDC 00110F3C 38 C0 00 40 */ li r6, 0x40 /* 80113FE0 00110F40 38 E0 00 00 */ li r7, 0 @@ -2595,7 +2595,7 @@ lbl_80113FF8: /* 80114048 00110FA8 88 BF 00 24 */ lbz r5, 0x24(r31) /* 8011404C 00110FAC 38 80 05 7C */ li r4, 0x57c /* 80114050 00110FB0 38 06 00 10 */ addi r0, r6, 0x10 -/* 80114054 00110FB4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80114054 00110FB4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80114058 00110FB8 7C 08 07 34 */ extsh r8, r0 /* 8011405C 00110FBC 38 C0 00 40 */ li r6, 0x40 /* 80114060 00110FC0 38 E0 00 00 */ li r7, 0 @@ -2613,7 +2613,7 @@ lbl_80114078: /* 8011408C 00110FEC 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80114090 00110FF0 38 80 05 6C */ li r4, 0x56c /* 80114094 00110FF4 38 06 00 10 */ addi r0, r6, 0x10 -/* 80114098 00110FF8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80114098 00110FF8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8011409C 00110FFC 7C 08 07 34 */ extsh r8, r0 /* 801140A0 00111000 38 C0 00 40 */ li r6, 0x40 /* 801140A4 00111004 38 E0 00 00 */ li r7, 0 @@ -2664,7 +2664,7 @@ lbl_8011410C: /* 80114140 001110A0 38 E0 00 00 */ li r7, 0 /* 80114144 001110A4 D0 1F 00 C8 */ stfs f0, 0xc8(r31) /* 80114148 001110A8 39 20 00 00 */ li r9, 0 -/* 8011414C 001110AC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8011414C 001110AC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80114150 001110B0 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80114154 001110B4 48 1D 5C 21 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80114158 001110B8 48 00 00 70 */ b lbl_801141C8 @@ -2673,7 +2673,7 @@ lbl_8011415C: /* 80114160 001110C0 38 61 00 0C */ addi r3, r1, 0xc /* 80114164 001110C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80114168 001110C8 38 80 05 67 */ li r4, 0x567 -/* 8011416C 001110CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8011416C 001110CC 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80114170 001110D0 38 C0 00 40 */ li r6, 0x40 /* 80114174 001110D4 38 E0 00 00 */ li r7, 0 /* 80114178 001110D8 39 20 00 00 */ li r9, 0 @@ -2692,7 +2692,7 @@ lbl_801141A4: /* 801141A8 00111108 38 61 00 08 */ addi r3, r1, 8 /* 801141AC 0011110C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801141B0 00111110 38 80 05 67 */ li r4, 0x567 -/* 801141B4 00111114 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801141B4 00111114 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801141B8 00111118 38 C0 00 40 */ li r6, 0x40 /* 801141BC 0011111C 38 E0 00 00 */ li r7, 0 /* 801141C0 00111120 39 20 00 00 */ li r9, 0 @@ -2784,7 +2784,7 @@ lbl_801142D8: /* 801142DC 0011123C 38 61 00 14 */ addi r3, r1, 0x14 /* 801142E0 00111240 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801142E4 00111244 38 80 05 66 */ li r4, 0x566 -/* 801142E8 00111248 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801142E8 00111248 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801142EC 0011124C 38 C0 00 40 */ li r6, 0x40 /* 801142F0 00111250 38 E0 00 00 */ li r7, 0 /* 801142F4 00111254 39 20 00 00 */ li r9, 0 @@ -2803,7 +2803,7 @@ lbl_8011431C: /* 80114320 00111280 38 61 00 0C */ addi r3, r1, 0xc /* 80114324 00111284 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80114328 00111288 38 80 05 66 */ li r4, 0x566 -/* 8011432C 0011128C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8011432C 0011128C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80114330 00111290 38 C0 00 40 */ li r6, 0x40 /* 80114334 00111294 38 E0 00 00 */ li r7, 0 /* 80114338 00111298 39 20 00 00 */ li r9, 0 @@ -2814,7 +2814,7 @@ lbl_80114344: /* 80114348 001112A8 38 61 00 08 */ addi r3, r1, 8 /* 8011434C 001112AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80114350 001112B0 38 80 05 66 */ li r4, 0x566 -/* 80114354 001112B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80114354 001112B4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80114358 001112B8 38 C0 00 40 */ li r6, 0x40 /* 8011435C 001112BC 38 E0 00 00 */ li r7, 0 /* 80114360 001112C0 39 20 00 00 */ li r9, 0 diff --git a/asm/MetroidPrime/Player/CScanDisplay.s b/asm/MetroidPrime/Player/CScanDisplay.s index 540c1a3b..9f30d138 100644 --- a/asm/MetroidPrime/Player/CScanDisplay.s +++ b/asm/MetroidPrime/Player/CScanDisplay.s @@ -313,7 +313,7 @@ lbl_80172E10: /* 80172E24 0016FD84 38 80 05 9F */ li r4, 0x59f /* 80172E28 0016FD88 D0 1F 01 A4 */ stfs f0, 0x1a4(r31) /* 80172E2C 0016FD8C 38 A0 00 7F */ li r5, 0x7f -/* 80172E30 0016FD90 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80172E30 0016FD90 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80172E34 0016FD94 38 C0 00 40 */ li r6, 0x40 /* 80172E38 0016FD98 38 E0 00 00 */ li r7, 0 /* 80172E3C 0016FD9C 39 20 00 00 */ li r9, 0 @@ -368,7 +368,7 @@ lbl_80172EE0: /* 80172EE8 0016FE48 41 82 00 98 */ beq lbl_80172F80 /* 80172EEC 0016FE4C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80172EF0 0016FE50 38 61 00 20 */ addi r3, r1, 0x20 -/* 80172EF4 0016FE54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80172EF4 0016FE54 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80172EF8 0016FE58 38 80 05 9F */ li r4, 0x59f /* 80172EFC 0016FE5C 38 A0 00 7F */ li r5, 0x7f /* 80172F00 0016FE60 38 C0 00 40 */ li r6, 0x40 @@ -742,7 +742,7 @@ lbl_80173438: /* 8017344C 001703AC 38 80 05 89 */ li r4, 0x589 /* 80173450 001703B0 D0 1F 01 A4 */ stfs f0, 0x1a4(r31) /* 80173454 001703B4 38 A0 00 7F */ li r5, 0x7f -/* 80173458 001703B8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80173458 001703B8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8017345C 001703BC 38 C0 00 40 */ li r6, 0x40 /* 80173460 001703C0 D0 1F 01 B0 */ stfs f0, 0x1b0(r31) /* 80173464 001703C4 38 E0 00 00 */ li r7, 0 @@ -788,7 +788,7 @@ lbl_80173474: /* 80173500 00170460 48 00 15 C1 */ bl SetScanMessageTypeEffect__12CScanDisplayFP12CGuiTextPaneb /* 80173504 00170464 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80173508 00170468 38 61 00 24 */ addi r3, r1, 0x24 -/* 8017350C 0017046C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8017350C 0017046C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80173510 00170470 38 80 05 91 */ li r4, 0x591 /* 80173514 00170474 38 A0 00 7F */ li r5, 0x7f /* 80173518 00170478 38 C0 00 40 */ li r6, 0x40 @@ -945,7 +945,7 @@ lbl_8017372C: /* 8017373C 0017069C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80173740 001706A0 90 1C 00 00 */ stw r0, 0(r28) /* 80173744 001706A4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80173748 001706A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80173748 001706A8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8017374C 001706AC 38 80 05 86 */ li r4, 0x586 /* 80173750 001706B0 D0 1C 00 28 */ stfs f0, 0x28(r28) /* 80173754 001706B4 38 A0 00 7F */ li r5, 0x7f diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 1b55b017..d70c414e 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -447,7 +447,7 @@ lbl_8029F5E8: /* 8029F5EC 0029C54C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 8029F5F0 0029C550 98 01 00 90 */ stb r0, 0x90(r1) /* 8029F5F4 0029C554 38 61 00 3C */ addi r3, r1, 0x3c -/* 8029F5F8 0029C558 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8029F5F8 0029C558 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8029F5FC 0029C55C 38 A0 00 7F */ li r5, 0x7f /* 8029F600 0029C560 A0 9D 05 B4 */ lhz r4, 0x5b4(r29) /* 8029F604 0029C564 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 0e6b42ec..85879c01 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -522,7 +522,7 @@ lbl_800B025C: /* 800B0278 000AD1D8 A8 DD 01 14 */ lha r6, 0x114(r29) /* 800B027C 000AD1DC A9 1D 01 12 */ lha r8, 0x112(r29) /* 800B0280 000AD1E0 41 82 00 08 */ beq lbl_800B0288 -/* 800B0284 000AD1E4 83 E2 C6 00 */ lwz r31, lbl_805AE320@sda21(r2) +/* 800B0284 000AD1E4 83 E2 C6 00 */ lwz r31, kAllAreas__11CSfxManager@sda21(r2) lbl_800B0288: /* 800B0288 000AD1E8 7F EA FB 78 */ mr r10, r31 /* 800B028C 000AD1EC 48 23 9A E9 */ bl SfxStart__11CSfxManagerFUsssbsbi diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index e1964758..18e7cafc 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -361,7 +361,7 @@ AddOrUpdateEmitter__22CScriptSpecialFunctionFfR10CSfxHandleUsRC9CVector3fUc: /* 8014F410 0014C370 7C 9F 23 78 */ mr r31, r4 /* 8014F414 0014C374 28 00 00 00 */ cmplwi r0, 0 /* 8014F418 0014C378 40 82 00 40 */ bne lbl_8014F458 -/* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, lbl_805AE320@sda21(r2) +/* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, kAllAreas__11CSfxManager@sda21(r2) /* 8014F420 0014C380 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l /* 8014F428 0014C388 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2) @@ -1638,7 +1638,7 @@ lbl_80150638: /* 80150694 0014D5F4 38 A1 00 60 */ addi r5, r1, 0x60 /* 80150698 0014D5F8 D0 01 00 60 */ stfs f0, 0x60(r1) /* 8015069C 0014D5FC 38 E0 00 01 */ li r7, 1 -/* 801506A0 0014D600 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801506A0 0014D600 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801506A4 0014D604 39 00 00 00 */ li r8, 0 /* 801506A8 0014D608 D0 21 00 64 */ stfs f1, 0x64(r1) /* 801506AC 0014D60C D0 41 00 68 */ stfs f2, 0x68(r1) @@ -1686,7 +1686,7 @@ lbl_801506F0: /* 80150744 0014D6A4 38 A1 00 54 */ addi r5, r1, 0x54 /* 80150748 0014D6A8 D0 01 00 54 */ stfs f0, 0x54(r1) /* 8015074C 0014D6AC 38 E0 00 01 */ li r7, 1 -/* 80150750 0014D6B0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80150750 0014D6B0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80150754 0014D6B4 39 00 00 00 */ li r8, 0 /* 80150758 0014D6B8 D0 21 00 58 */ stfs f1, 0x58(r1) /* 8015075C 0014D6BC D0 41 00 5C */ stfs f2, 0x5c(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s index 73ad9ba8..293f971d 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptVisorGoo.s @@ -445,7 +445,7 @@ lbl_801D7534: /* 801D7538 001D4498 38 61 00 20 */ addi r3, r1, 0x20 /* 801D753C 001D449C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801D7540 001D44A0 38 A0 00 7F */ li r5, 0x7f -/* 801D7544 001D44A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801D7544 001D44A4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801D7548 001D44A8 38 C0 00 40 */ li r6, 0x40 /* 801D754C 001D44AC 38 E0 00 00 */ li r7, 0 /* 801D7550 001D44B0 39 20 00 00 */ li r9, 0 diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 4da134d3..9496610e 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -424,7 +424,7 @@ lbl_8008FEBC: /* 8008FEF4 0008CE54 38 A1 00 50 */ addi r5, r1, 0x50 /* 8008FEF8 0008CE58 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8008FEFC 0008CE5C 38 80 06 DC */ li r4, 0x6dc -/* 8008FF00 0008CE60 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8008FF00 0008CE60 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8008FF04 0008CE64 38 E0 00 01 */ li r7, 1 /* 8008FF08 0008CE68 D0 21 00 54 */ stfs f1, 0x54(r1) /* 8008FF0C 0008CE6C 39 00 00 00 */ li r8, 0 @@ -937,7 +937,7 @@ Explode__5CBombFRC9CVector3fR13CStateManager: /* 80090674 0008D5D4 38 A1 00 1C */ addi r5, r1, 0x1c /* 80090678 0008D5D8 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 8009067C 0008D5DC 38 80 06 DE */ li r4, 0x6de -/* 80090680 0008D5E0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80090680 0008D5E0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80090684 0008D5E4 38 E0 00 01 */ li r7, 1 /* 80090688 0008D5E8 D0 21 00 20 */ stfs f1, 0x20(r1) /* 8009068C 0008D5EC 39 00 00 00 */ li r8, 0 diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index 11f8fce0..a4eddec8 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -217,7 +217,7 @@ PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes /* 80213D3C 00210C9C 38 61 00 0C */ addi r3, r1, 0xc /* 80213D40 00210CA0 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2) /* 80213D44 00210CA4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80213D48 00210CA8 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 80213D48 00210CA8 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 80213D4C 00210CAC 38 A0 00 01 */ li r5, 1 /* 80213D50 00210CB0 38 E0 00 00 */ li r7, 0 /* 80213D54 00210CB4 48 0D 62 8D */ bl AddEmitter__11CSfxManagerFRQ29CAudioSys18C3DEmitterParmDatabsbi @@ -518,7 +518,7 @@ lbl_802140E8: /* 802141B8 00211118 48 12 CC 89 */ bl __dt__6CTokenFv /* 802141BC 0021111C A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2) /* 802141C0 00211120 38 61 00 1C */ addi r3, r1, 0x1c -/* 802141C4 00211124 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) +/* 802141C4 00211124 81 02 C6 00 */ lwz r8, kAllAreas__11CSfxManager@sda21(r2) /* 802141C8 00211128 38 81 00 90 */ addi r4, r1, 0x90 /* 802141CC 0021112C 38 A0 00 01 */ li r5, 1 /* 802141D0 00211130 38 E0 00 01 */ li r7, 1 diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 702b71f6..c5e20aaf 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -1320,7 +1320,7 @@ UpdateTrailObjects__20CIceAttackProjectileFfR13CStateManager: /* 801F2C74 001EFBD4 38 61 00 0C */ addi r3, r1, 0xc /* 801F2C78 001EFBD8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 801F2C7C 001EFBDC 38 A0 00 7F */ li r5, 0x7f -/* 801F2C80 001EFBE0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801F2C80 001EFBE0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801F2C84 001EFBE4 38 C0 00 40 */ li r6, 0x40 /* 801F2C88 001EFBE8 38 E0 00 00 */ li r7, 0 /* 801F2C8C 001EFBEC 39 20 00 01 */ li r9, 1 diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 4e364ce5..ea2b733a 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -2030,7 +2030,7 @@ lbl_80178778: /* 8017877C 001756DC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80178780 001756E0 98 01 00 68 */ stb r0, 0x68(r1) /* 80178784 001756E4 38 61 00 30 */ addi r3, r1, 0x30 -/* 80178788 001756E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80178788 001756E8 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8017878C 001756EC 38 A0 00 7F */ li r5, 0x7f /* 80178790 001756F0 A0 9D 05 46 */ lhz r4, 0x546(r29) /* 80178794 001756F4 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index feabd7bf..421bd465 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -132,7 +132,7 @@ lbl_8014D98C: /* 8014D9E0 0014A940 38 A1 00 34 */ addi r5, r1, 0x34 /* 8014D9E4 0014A944 D0 01 00 34 */ stfs f0, 0x34(r1) /* 8014D9E8 0014A948 38 80 07 10 */ li r4, 0x710 -/* 8014D9EC 0014A94C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8014D9EC 0014A94C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8014D9F0 0014A950 38 E0 00 01 */ li r7, 1 /* 8014D9F4 0014A954 D0 21 00 38 */ stfs f1, 0x38(r1) /* 8014D9F8 0014A958 39 00 00 00 */ li r8, 0 @@ -152,7 +152,7 @@ lbl_8014D98C: lbl_8014DA30: /* 8014DA30 0014A990 A9 02 C5 F8 */ lha r8, lbl_805AE318@sda21(r2) /* 8014DA34 0014A994 38 61 00 1C */ addi r3, r1, 0x1c -/* 8014DA38 0014A998 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8014DA38 0014A998 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8014DA3C 0014A99C 38 80 07 3F */ li r4, 0x73f /* 8014DA40 0014A9A0 38 A0 00 7F */ li r5, 0x7f /* 8014DA44 0014A9A4 38 C0 00 40 */ li r6, 0x40 diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 70ff1e00..85f97553 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -681,7 +681,7 @@ lbl_80231F64: /* 80231F68 0022EEC8 38 61 00 58 */ addi r3, r1, 0x58 /* 80231F6C 0022EECC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2) /* 80231F70 0022EED0 38 A0 00 7F */ li r5, 0x7f -/* 80231F74 0022EED4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 80231F74 0022EED4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 80231F78 0022EED8 38 C0 00 40 */ li r6, 0x40 /* 80231F7C 0022EEDC 38 E0 00 00 */ li r7, 0 /* 80231F80 0022EEE0 39 20 00 00 */ li r9, 0 diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index 0fe228a1..cdfdbae9 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -2372,7 +2372,7 @@ sub_801bf6ec: /* 801BF8AC 001BC80C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801BF8B0 001BC810 98 1F 03 D0 */ stb r0, 0x3d0(r31) /* 801BF8B4 001BC814 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l -/* 801BF8B8 001BC818 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801BF8B8 001BC818 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801BF8BC 001BC81C 38 61 00 0C */ addi r3, r1, 0xc /* 801BF8C0 001BC820 38 80 06 FF */ li r4, 0x6ff /* 801BF8C4 001BC824 38 E0 00 01 */ li r7, 1 @@ -2917,7 +2917,7 @@ SetNewTarget__11CWaveBusterF9TUniqueId: /* 801C00A8 001BD008 A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) /* 801C00AC 001BD00C D0 03 03 A0 */ stfs f0, 0x3a0(r3) /* 801C00B0 001BD010 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801C00B4 001BD014 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 801C00B4 001BD014 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 801C00B8 001BD018 38 80 06 FF */ li r4, 0x6ff /* 801C00BC 001BD01C C0 43 00 60 */ lfs f2, 0x60(r3) /* 801C00C0 001BD020 38 E0 00 01 */ li r7, 1 diff --git a/asm/MetroidPrime/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s index 18f6cc8e..ec40e2b1 100644 --- a/asm/MetroidPrime/Weapons/WeaponTypes.s +++ b/asm/MetroidPrime/Weapons/WeaponTypes.s @@ -98,7 +98,7 @@ play_sfx__12NWeaponTypesFUsbbs: /* 8028AB10 00287A70 A9 02 C5 F8 */ lha r8, lbl_805AE318@sda21(r2) /* 8028AB14 00287A74 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8028AB18 00287A78 7C BF 2B 78 */ mr r31, r5 -/* 8028AB1C 00287A7C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) +/* 8028AB1C 00287A7C 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2) /* 8028AB20 00287A80 38 A0 00 7F */ li r5, 0x7f /* 8028AB24 00287A84 93 C1 00 18 */ stw r30, 0x18(r1) /* 8028AB28 00287A88 7C 7E 1B 78 */ mr r30, r3 diff --git a/include/Kyoto/Audio/CSfxManager.hpp b/include/Kyoto/Audio/CSfxManager.hpp index cb2d39f6..e978f302 100644 --- a/include/Kyoto/Audio/CSfxManager.hpp +++ b/include/Kyoto/Audio/CSfxManager.hpp @@ -12,9 +12,9 @@ public: static void UpdateEmitter(CSfxHandle handle, const CVector3f& pos, const CVector3f& dir, uchar maxVol); static CSfxHandle AddEmitter(u16 id, const CVector3f& pos, const CVector3f& dir, - bool useAcoustics, bool looped, s16 prio, s32 areaId); + bool useAcoustics, bool looped, s16 prio, int areaId); static CSfxHandle AddEmitter(u16 id, const CVector3f& pos, const CVector3f& dir, uchar vol, - bool useAcoustics, bool looped, s16 prio, s32 areaId); + bool useAcoustics, bool looped, s16 prio, int areaId); static void Shutdown(); static u16 TranslateSFXID(u16); @@ -22,6 +22,7 @@ public: static s16 kMaxPriority; // 0xff static s16 kMedPriority; // 0x7f + static int kAllAreas; }; #endif