From 1c53176fe606f9214dc614fde42b08f56d842510 Mon Sep 17 00:00:00 2001 From: Henrique Gemignani Passos Lima Date: Thu, 3 Nov 2022 14:29:47 +0200 Subject: [PATCH] Match and link CScriptCameraShaker Former-commit-id: 3d21f9d41dfd464adca99f527835a82db86619d8 --- asm/MetroidPrime/CStateManager.s | 12 +- asm/MetroidPrime/Cameras/CCameraManager.s | 60 +++---- asm/MetroidPrime/Cameras/CCameraShakeData.s | 156 +++++++++--------- asm/MetroidPrime/Enemies/CElitePirate.s | 12 +- asm/MetroidPrime/Enemies/CFlaahgra.s | 12 +- asm/MetroidPrime/Enemies/CFlyingPirate.s | 24 +-- asm/MetroidPrime/Enemies/CIceSheegoth.s | 12 +- .../Enemies/CMetroidPrimeEssence.s | 12 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 96 +++++------ asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s | 72 ++++---- asm/MetroidPrime/Enemies/CPatterned.s | 12 +- asm/MetroidPrime/Enemies/CRidley.s | 72 ++++---- asm/MetroidPrime/Enemies/CThardus.s | 24 +-- .../Enemies/CThardusRockProjectile.s | 12 +- asm/MetroidPrime/Player/CPlayer.s | 36 ++-- asm/MetroidPrime/ScriptLoader.s | 132 +++++++-------- .../ScriptObjects/CScriptCameraShaker.s | 24 +-- asm/MetroidPrime/Weapons/CAuxWeapon.s | 12 +- asm/MetroidPrime/Weapons/CEnergyProjectile.s | 12 +- asm/MetroidPrime/Weapons/CPlasmaBeam.s | 13 +- .../Weapons/CTargetableProjectile.s | 12 +- configure.py | 2 +- .../MetroidPrime/Cameras/CCameraManager.hpp | 3 + .../MetroidPrime/Cameras/CCameraShakeData.hpp | 9 +- .../ScriptObjects/CScriptCameraShaker.hpp | 20 +++ obj_files.mk | 2 +- .../ScriptObjects/CScriptCameraShaker.cpp | 41 +++++ 27 files changed, 487 insertions(+), 419 deletions(-) create mode 100644 include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp create mode 100644 src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 1db20a5d..dea9de42 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -1763,20 +1763,20 @@ lbl_80044F94: /* 80044FF0 00041F50 4B FC 5A 31 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 80044FF4 00041F54 34 81 00 8C */ addic. r4, r1, 0x8c /* 80044FF8 00041F58 41 82 00 10 */ beq lbl_80045008 -/* 80044FFC 00041F5C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80045000 00041F60 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80044FFC 00041F5C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80045000 00041F60 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80045004 00041F64 90 04 00 00 */ stw r0, 0(r4) lbl_80045008: /* 80045008 00041F68 34 81 00 50 */ addic. r4, r1, 0x50 /* 8004500C 00041F6C 41 82 00 10 */ beq lbl_8004501C -/* 80045010 00041F70 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80045014 00041F74 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80045010 00041F70 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80045014 00041F74 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80045018 00041F78 90 04 00 00 */ stw r0, 0(r4) lbl_8004501C: /* 8004501C 00041F7C 34 81 00 14 */ addic. r4, r1, 0x14 /* 80045020 00041F80 41 82 00 10 */ beq lbl_80045030 -/* 80045024 00041F84 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80045028 00041F88 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80045024 00041F84 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80045028 00041F88 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8004502C 00041F8C 90 04 00 00 */ stw r0, 0(r4) lbl_80045030: /* 80045030 00041F90 80 7F 08 8C */ lwz r3, 0x88c(r31) diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index 3d2fa0ed..1072bee5 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803D8EA8 -lbl_803D8EA8: +.global __vt__22CCameraShakerComponent +__vt__22CCameraShakerComponent: # ROM: 0x3D5EA8 .4byte 0 .4byte 0 @@ -2022,20 +2022,20 @@ lbl_8000ABA4: /* 8000ABA4 00007B04 34 A1 00 B0 */ addic. r5, r1, 0xb0 /* 8000ABA8 00007B08 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8000ABAC 00007B0C 41 82 00 10 */ beq lbl_8000ABBC -/* 8000ABB0 00007B10 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000ABB4 00007B14 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000ABB0 00007B10 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000ABB4 00007B14 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000ABB8 00007B18 90 05 00 00 */ stw r0, 0(r5) lbl_8000ABBC: /* 8000ABBC 00007B1C 34 A1 00 74 */ addic. r5, r1, 0x74 /* 8000ABC0 00007B20 41 82 00 10 */ beq lbl_8000ABD0 -/* 8000ABC4 00007B24 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000ABC8 00007B28 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000ABC4 00007B24 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000ABC8 00007B28 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000ABCC 00007B2C 90 05 00 00 */ stw r0, 0(r5) lbl_8000ABD0: /* 8000ABD0 00007B30 34 A1 00 38 */ addic. r5, r1, 0x38 /* 8000ABD4 00007B34 41 82 00 10 */ beq lbl_8000ABE4 -/* 8000ABD8 00007B38 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000ABDC 00007B3C 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000ABD8 00007B38 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000ABDC 00007B3C 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000ABE0 00007B40 90 05 00 00 */ stw r0, 0(r5) lbl_8000ABE4: /* 8000ABE4 00007B44 E3 E1 01 38 */ psq_l f31, 312(r1), 0, qr0 @@ -2143,20 +2143,20 @@ sub_8000ad2c: /* 8000AD40 00007CA0 41 82 00 50 */ beq lbl_8000AD90 /* 8000AD44 00007CA4 34 1F 00 80 */ addic. r0, r31, 0x80 /* 8000AD48 00007CA8 41 82 00 10 */ beq lbl_8000AD58 -/* 8000AD4C 00007CAC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000AD50 00007CB0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000AD4C 00007CAC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000AD50 00007CB0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000AD54 00007CB4 90 1F 00 80 */ stw r0, 0x80(r31) lbl_8000AD58: /* 8000AD58 00007CB8 34 1F 00 44 */ addic. r0, r31, 0x44 /* 8000AD5C 00007CBC 41 82 00 10 */ beq lbl_8000AD6C -/* 8000AD60 00007CC0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000AD64 00007CC4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000AD60 00007CC0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000AD64 00007CC4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000AD68 00007CC8 90 1F 00 44 */ stw r0, 0x44(r31) lbl_8000AD6C: /* 8000AD6C 00007CCC 34 1F 00 08 */ addic. r0, r31, 8 /* 8000AD70 00007CD0 41 82 00 10 */ beq lbl_8000AD80 -/* 8000AD74 00007CD4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000AD78 00007CD8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000AD74 00007CD4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000AD78 00007CD8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000AD7C 00007CDC 90 1F 00 08 */ stw r0, 8(r31) lbl_8000AD80: /* 8000AD80 00007CE0 7C 80 07 35 */ extsh. r0, r4 @@ -2174,8 +2174,8 @@ lbl_8000AD90: .global __ct__16CCameraShakeDataFRC16CCameraShakeData __ct__16CCameraShakeDataFRC16CCameraShakeData: /* 8000ADA8 00007D08 C0 04 00 00 */ lfs f0, 0(r4) -/* 8000ADAC 00007D0C 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha -/* 8000ADB0 00007D10 38 A5 8E A8 */ addi r5, r5, lbl_803D8EA8@l +/* 8000ADAC 00007D0C 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha +/* 8000ADB0 00007D10 38 A5 8E A8 */ addi r5, r5, __vt__22CCameraShakerComponent@l /* 8000ADB4 00007D14 D0 03 00 00 */ stfs f0, 0(r3) /* 8000ADB8 00007D18 C0 04 00 04 */ lfs f0, 4(r4) /* 8000ADBC 00007D1C D0 03 00 04 */ stfs f0, 4(r3) @@ -2288,9 +2288,9 @@ __dt__22CCameraShakerComponentFv: /* 8000AF5C 00007EBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8000AF60 00007EC0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8000AF64 00007EC4 41 82 00 1C */ beq lbl_8000AF80 -/* 8000AF68 00007EC8 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha +/* 8000AF68 00007EC8 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha /* 8000AF6C 00007ECC 7C 80 07 35 */ extsh. r0, r4 -/* 8000AF70 00007ED0 38 05 8E A8 */ addi r0, r5, lbl_803D8EA8@l +/* 8000AF70 00007ED0 38 05 8E A8 */ addi r0, r5, __vt__22CCameraShakerComponent@l /* 8000AF74 00007ED4 90 1F 00 00 */ stw r0, 0(r31) /* 8000AF78 00007ED8 40 81 00 08 */ ble lbl_8000AF80 /* 8000AF7C 00007EDC 48 30 A9 B5 */ bl Free__7CMemoryFPCv @@ -3871,20 +3871,20 @@ lbl_8000C520: /* 8000C53C 0000949C 41 82 00 40 */ beq lbl_8000C57C /* 8000C540 000094A0 34 05 00 80 */ addic. r0, r5, 0x80 /* 8000C544 000094A4 41 82 00 10 */ beq lbl_8000C554 -/* 8000C548 000094A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000C54C 000094AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C548 000094A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000C54C 000094AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000C550 000094B0 90 05 00 80 */ stw r0, 0x80(r5) lbl_8000C554: /* 8000C554 000094B4 34 05 00 44 */ addic. r0, r5, 0x44 /* 8000C558 000094B8 41 82 00 10 */ beq lbl_8000C568 -/* 8000C55C 000094BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000C560 000094C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C55C 000094BC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000C560 000094C0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000C564 000094C4 90 05 00 44 */ stw r0, 0x44(r5) lbl_8000C568: /* 8000C568 000094C8 34 05 00 08 */ addic. r0, r5, 8 /* 8000C56C 000094CC 41 82 00 10 */ beq lbl_8000C57C -/* 8000C570 000094D0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8000C574 000094D4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C570 000094D0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8000C574 000094D4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8000C578 000094D8 90 05 00 08 */ stw r0, 8(r5) lbl_8000C57C: /* 8000C57C 000094DC 28 04 00 00 */ cmplwi r4, 0 @@ -3923,20 +3923,20 @@ lbl_8000C5E0: /* 8000C5EC 0000954C 41 82 00 40 */ beq lbl_8000C62C /* 8000C5F0 00009550 34 05 00 80 */ addic. r0, r5, 0x80 /* 8000C5F4 00009554 41 82 00 10 */ beq lbl_8000C604 -/* 8000C5F8 00009558 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000C5FC 0000955C 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C5F8 00009558 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000C5FC 0000955C 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000C600 00009560 90 05 00 80 */ stw r0, 0x80(r5) lbl_8000C604: /* 8000C604 00009564 34 05 00 44 */ addic. r0, r5, 0x44 /* 8000C608 00009568 41 82 00 10 */ beq lbl_8000C618 -/* 8000C60C 0000956C 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000C610 00009570 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C60C 0000956C 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000C610 00009570 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000C614 00009574 90 05 00 44 */ stw r0, 0x44(r5) lbl_8000C618: /* 8000C618 00009578 34 05 00 08 */ addic. r0, r5, 8 /* 8000C61C 0000957C 41 82 00 10 */ beq lbl_8000C62C -/* 8000C620 00009580 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha -/* 8000C624 00009584 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C620 00009580 3C 80 80 3E */ lis r4, __vt__22CCameraShakerComponent@ha +/* 8000C624 00009584 38 04 8E A8 */ addi r0, r4, __vt__22CCameraShakerComponent@l /* 8000C628 00009588 90 05 00 08 */ stw r0, 8(r5) lbl_8000C62C: /* 8000C62C 0000958C 28 03 00 00 */ cmplwi r3, 0 diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s index d7ad59e7..b5bed57f 100644 --- a/asm/MetroidPrime/Cameras/CCameraShakeData.s +++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s @@ -270,9 +270,9 @@ LoadCameraShakeData__FR12CInputStream: /* 8015CC10 00159B70 38 61 00 98 */ addi r3, r1, 0x98 /* 8015CC14 00159B74 48 00 05 1D */ bl __ct__22CCameraShakerComponentFv /* 8015CC18 00159B78 80 81 00 9C */ lwz r4, 0x9c(r1) -/* 8015CC1C 00159B7C 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha +/* 8015CC1C 00159B7C 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha /* 8015CC20 00159B80 80 61 00 A0 */ lwz r3, 0xa0(r1) -/* 8015CC24 00159B84 38 A5 8E A8 */ addi r5, r5, lbl_803D8EA8@l +/* 8015CC24 00159B84 38 A5 8E A8 */ addi r5, r5, __vt__22CCameraShakerComponent@l /* 8015CC28 00159B88 C1 41 00 A4 */ lfs f10, 0xa4(r1) /* 8015CC2C 00159B8C 34 01 00 98 */ addic. r0, r1, 0x98 /* 8015CC30 00159B90 C1 21 00 A8 */ lfs f9, 0xa8(r1) @@ -321,20 +321,20 @@ lbl_8015CCA0: /* 8015CCD8 00159C38 48 00 01 C1 */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015CCDC 00159C3C 34 01 00 D4 */ addic. r0, r1, 0xd4 /* 8015CCE0 00159C40 41 82 00 10 */ beq lbl_8015CCF0 -/* 8015CCE4 00159C44 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015CCE8 00159C48 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015CCE4 00159C44 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015CCE8 00159C48 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015CCEC 00159C4C 90 01 00 D4 */ stw r0, 0xd4(r1) lbl_8015CCF0: /* 8015CCF0 00159C50 34 01 01 10 */ addic. r0, r1, 0x110 /* 8015CCF4 00159C54 41 82 00 10 */ beq lbl_8015CD04 -/* 8015CCF8 00159C58 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015CCFC 00159C5C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015CCF8 00159C58 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015CCFC 00159C5C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015CD00 00159C60 90 01 01 10 */ stw r0, 0x110(r1) lbl_8015CD04: /* 8015CD04 00159C64 34 01 01 4C */ addic. r0, r1, 0x14c /* 8015CD08 00159C68 41 82 00 10 */ beq lbl_8015CD18 -/* 8015CD0C 00159C6C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015CD10 00159C70 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015CD0C 00159C6C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015CD10 00159C70 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015CD14 00159C74 90 01 01 4C */ stw r0, 0x14c(r1) lbl_8015CD18: /* 8015CD18 00159C78 E3 E1 01 C8 */ psq_l f31, 456(r1), 0, qr0 @@ -447,9 +447,9 @@ SetSfxPositionAndDistance__16CCameraShakeDataFRC9CVector3ff: .global __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent: /* 8015CE98 00159DF8 D0 23 00 00 */ stfs f1, 0(r3) -/* 8015CE9C 00159DFC 3D 20 80 3E */ lis r9, lbl_803D8EA8@ha +/* 8015CE9C 00159DFC 3D 20 80 3E */ lis r9, __vt__22CCameraShakerComponent@ha /* 8015CEA0 00159E00 C0 02 9E E0 */ lfs f0, lbl_805ABC00@sda21(r2) -/* 8015CEA4 00159E04 39 49 8E A8 */ addi r10, r9, lbl_803D8EA8@l +/* 8015CEA4 00159E04 39 49 8E A8 */ addi r10, r9, __vt__22CCameraShakerComponent@l /* 8015CEA8 00159E08 38 00 00 00 */ li r0, 0 /* 8015CEAC 00159E0C D0 03 00 04 */ stfs f0, 4(r3) /* 8015CEB0 00159E10 91 43 00 08 */ stw r10, 8(r3) @@ -699,9 +699,9 @@ LoadNewCameraShakerComponent__FR12CInputStream: .global __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint: -/* 8015D250 0015A1B0 3C E0 80 3E */ lis r7, lbl_803D8EA8@ha +/* 8015D250 0015A1B0 3C E0 80 3E */ lis r7, __vt__22CCameraShakerComponent@ha /* 8015D254 0015A1B4 C0 02 9E E0 */ lfs f0, lbl_805ABC00@sda21(r2) -/* 8015D258 0015A1B8 38 07 8E A8 */ addi r0, r7, lbl_803D8EA8@l +/* 8015D258 0015A1B8 38 07 8E A8 */ addi r0, r7, __vt__22CCameraShakerComponent@l /* 8015D25C 0015A1BC 90 03 00 00 */ stw r0, 0(r3) /* 8015D260 0015A1C0 90 83 00 04 */ stw r4, 4(r3) /* 8015D264 0015A1C4 80 05 00 00 */ lwz r0, 0(r5) @@ -893,20 +893,20 @@ BuildMissileShakeData__16CCameraShakeDataFfffRC9CVector3f: /* 8015D4F8 0015A458 4B EA D8 B1 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8015D4FC 0015A45C 34 81 00 94 */ addic. r4, r1, 0x94 /* 8015D500 0015A460 41 82 00 10 */ beq lbl_8015D510 -/* 8015D504 0015A464 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D508 0015A468 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D504 0015A464 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D508 0015A468 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D50C 0015A46C 90 04 00 00 */ stw r0, 0(r4) lbl_8015D510: /* 8015D510 0015A470 34 81 00 58 */ addic. r4, r1, 0x58 /* 8015D514 0015A474 41 82 00 10 */ beq lbl_8015D524 -/* 8015D518 0015A478 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D51C 0015A47C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D518 0015A478 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D51C 0015A47C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D520 0015A480 90 04 00 00 */ stw r0, 0(r4) lbl_8015D524: /* 8015D524 0015A484 34 81 00 1C */ addic. r4, r1, 0x1c /* 8015D528 0015A488 41 82 00 10 */ beq lbl_8015D538 -/* 8015D52C 0015A48C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D530 0015A490 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D52C 0015A48C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D530 0015A490 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D534 0015A494 90 04 00 00 */ stw r0, 0(r4) lbl_8015D538: /* 8015D538 0015A498 80 DF 00 00 */ lwz r6, 0(r31) @@ -924,20 +924,20 @@ lbl_8015D538: /* 8015D568 0015A4C8 4B EA D8 41 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8015D56C 0015A4CC 34 81 01 68 */ addic. r4, r1, 0x168 /* 8015D570 0015A4D0 41 82 00 10 */ beq lbl_8015D580 -/* 8015D574 0015A4D4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D578 0015A4D8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D574 0015A4D4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D578 0015A4D8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D57C 0015A4DC 90 04 00 00 */ stw r0, 0(r4) lbl_8015D580: /* 8015D580 0015A4E0 34 81 01 2C */ addic. r4, r1, 0x12c /* 8015D584 0015A4E4 41 82 00 10 */ beq lbl_8015D594 -/* 8015D588 0015A4E8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D58C 0015A4EC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D588 0015A4E8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D58C 0015A4EC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D590 0015A4F0 90 04 00 00 */ stw r0, 0(r4) lbl_8015D594: /* 8015D594 0015A4F4 34 81 00 F0 */ addic. r4, r1, 0xf0 /* 8015D598 0015A4F8 41 82 00 10 */ beq lbl_8015D5A8 -/* 8015D59C 0015A4FC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D5A0 0015A500 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D59C 0015A4FC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D5A0 0015A500 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D5A4 0015A504 90 04 00 00 */ stw r0, 0(r4) lbl_8015D5A8: /* 8015D5A8 0015A508 80 01 01 D4 */ lwz r0, 0x1d4(r1) @@ -966,20 +966,20 @@ BuildPatternedExplodeShakeData__16CCameraShakeDataFRC9CVector3ffff: /* 8015D5F8 0015A558 4B EA D7 B1 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8015D5FC 0015A55C 34 81 00 94 */ addic. r4, r1, 0x94 /* 8015D600 0015A560 41 82 00 10 */ beq lbl_8015D610 -/* 8015D604 0015A564 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D608 0015A568 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D604 0015A564 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D608 0015A568 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D60C 0015A56C 90 04 00 00 */ stw r0, 0(r4) lbl_8015D610: /* 8015D610 0015A570 34 81 00 58 */ addic. r4, r1, 0x58 /* 8015D614 0015A574 41 82 00 10 */ beq lbl_8015D624 -/* 8015D618 0015A578 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D61C 0015A57C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D618 0015A578 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D61C 0015A57C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D620 0015A580 90 04 00 00 */ stw r0, 0(r4) lbl_8015D624: /* 8015D624 0015A584 34 81 00 1C */ addic. r4, r1, 0x1c /* 8015D628 0015A588 41 82 00 10 */ beq lbl_8015D638 -/* 8015D62C 0015A58C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D630 0015A590 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D62C 0015A58C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D630 0015A590 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D634 0015A594 90 04 00 00 */ stw r0, 0(r4) lbl_8015D638: /* 8015D638 0015A598 80 DF 00 00 */ lwz r6, 0(r31) @@ -997,20 +997,20 @@ lbl_8015D638: /* 8015D668 0015A5C8 4B EA D7 41 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8015D66C 0015A5CC 34 81 01 68 */ addic. r4, r1, 0x168 /* 8015D670 0015A5D0 41 82 00 10 */ beq lbl_8015D680 -/* 8015D674 0015A5D4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D678 0015A5D8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D674 0015A5D4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D678 0015A5D8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D67C 0015A5DC 90 04 00 00 */ stw r0, 0(r4) lbl_8015D680: /* 8015D680 0015A5E0 34 81 01 2C */ addic. r4, r1, 0x12c /* 8015D684 0015A5E4 41 82 00 10 */ beq lbl_8015D694 -/* 8015D688 0015A5E8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D68C 0015A5EC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D688 0015A5E8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D68C 0015A5EC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D690 0015A5F0 90 04 00 00 */ stw r0, 0(r4) lbl_8015D694: /* 8015D694 0015A5F4 34 81 00 F0 */ addic. r4, r1, 0xf0 /* 8015D698 0015A5F8 41 82 00 10 */ beq lbl_8015D6A8 -/* 8015D69C 0015A5FC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D6A0 0015A600 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D69C 0015A5FC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D6A0 0015A600 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D6A4 0015A604 90 04 00 00 */ stw r0, 0(r4) lbl_8015D6A8: /* 8015D6A8 0015A608 80 01 01 D4 */ lwz r0, 0x1d4(r1) @@ -1092,20 +1092,20 @@ BuildLandingCameraShake__16CCameraShakeDataFff: /* 8015D7CC 0015A72C 4B FF F6 CD */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015D7D0 0015A730 34 01 00 68 */ addic. r0, r1, 0x68 /* 8015D7D4 0015A734 41 82 00 10 */ beq lbl_8015D7E4 -/* 8015D7D8 0015A738 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D7DC 0015A73C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D7D8 0015A738 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D7DC 0015A73C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D7E0 0015A740 90 01 00 68 */ stw r0, 0x68(r1) lbl_8015D7E4: /* 8015D7E4 0015A744 34 01 00 A4 */ addic. r0, r1, 0xa4 /* 8015D7E8 0015A748 41 82 00 10 */ beq lbl_8015D7F8 -/* 8015D7EC 0015A74C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D7F0 0015A750 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D7EC 0015A74C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D7F0 0015A750 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D7F4 0015A754 90 01 00 A4 */ stw r0, 0xa4(r1) lbl_8015D7F8: /* 8015D7F8 0015A758 34 01 00 E0 */ addic. r0, r1, 0xe0 /* 8015D7FC 0015A75C 41 82 00 10 */ beq lbl_8015D80C -/* 8015D800 0015A760 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D804 0015A764 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D800 0015A760 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D804 0015A764 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D808 0015A768 90 01 00 E0 */ stw r0, 0xe0(r1) lbl_8015D80C: /* 8015D80C 0015A76C E3 E1 01 48 */ psq_l f31, 328(r1), 0, qr0 @@ -1166,20 +1166,20 @@ __ct__16CCameraShakeDataFff: /* 8015D8DC 0015A83C 4B FF F5 BD */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015D8E0 0015A840 34 01 00 38 */ addic. r0, r1, 0x38 /* 8015D8E4 0015A844 41 82 00 10 */ beq lbl_8015D8F4 -/* 8015D8E8 0015A848 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D8EC 0015A84C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D8E8 0015A848 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D8EC 0015A84C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D8F0 0015A850 90 01 00 38 */ stw r0, 0x38(r1) lbl_8015D8F4: /* 8015D8F4 0015A854 34 01 00 74 */ addic. r0, r1, 0x74 /* 8015D8F8 0015A858 41 82 00 10 */ beq lbl_8015D908 -/* 8015D8FC 0015A85C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D900 0015A860 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D8FC 0015A85C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D900 0015A860 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D904 0015A864 90 01 00 74 */ stw r0, 0x74(r1) lbl_8015D908: /* 8015D908 0015A868 34 01 00 B0 */ addic. r0, r1, 0xb0 /* 8015D90C 0015A86C 41 82 00 10 */ beq lbl_8015D91C -/* 8015D910 0015A870 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D914 0015A874 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D910 0015A870 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D914 0015A874 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D918 0015A878 90 01 00 B0 */ stw r0, 0xb0(r1) lbl_8015D91C: /* 8015D91C 0015A87C E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 @@ -1238,20 +1238,20 @@ BuildPatternedExplodeShakeData__16CCameraShakeDataFff: /* 8015D9E4 0015A944 4B FF F4 B5 */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015D9E8 0015A948 34 01 00 38 */ addic. r0, r1, 0x38 /* 8015D9EC 0015A94C 41 82 00 10 */ beq lbl_8015D9FC -/* 8015D9F0 0015A950 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015D9F4 0015A954 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015D9F0 0015A950 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015D9F4 0015A954 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015D9F8 0015A958 90 01 00 38 */ stw r0, 0x38(r1) lbl_8015D9FC: /* 8015D9FC 0015A95C 34 01 00 74 */ addic. r0, r1, 0x74 /* 8015DA00 0015A960 41 82 00 10 */ beq lbl_8015DA10 -/* 8015DA04 0015A964 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DA08 0015A968 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DA04 0015A964 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DA08 0015A968 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DA0C 0015A96C 90 01 00 74 */ stw r0, 0x74(r1) lbl_8015DA10: /* 8015DA10 0015A970 34 01 00 B0 */ addic. r0, r1, 0xb0 /* 8015DA14 0015A974 41 82 00 10 */ beq lbl_8015DA24 -/* 8015DA18 0015A978 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DA1C 0015A97C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DA18 0015A978 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DA1C 0015A97C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DA20 0015A980 90 01 00 B0 */ stw r0, 0xb0(r1) lbl_8015DA24: /* 8015DA24 0015A984 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 @@ -1333,20 +1333,20 @@ BuildPhazonCameraShakeData__16CCameraShakeDataFff: /* 8015DB48 0015AAA8 4B FF F3 51 */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015DB4C 0015AAAC 34 01 00 68 */ addic. r0, r1, 0x68 /* 8015DB50 0015AAB0 41 82 00 10 */ beq lbl_8015DB60 -/* 8015DB54 0015AAB4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DB58 0015AAB8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DB54 0015AAB4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DB58 0015AAB8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DB5C 0015AABC 90 01 00 68 */ stw r0, 0x68(r1) lbl_8015DB60: /* 8015DB60 0015AAC0 34 01 00 A4 */ addic. r0, r1, 0xa4 /* 8015DB64 0015AAC4 41 82 00 10 */ beq lbl_8015DB74 -/* 8015DB68 0015AAC8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DB6C 0015AACC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DB68 0015AAC8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DB6C 0015AACC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DB70 0015AAD0 90 01 00 A4 */ stw r0, 0xa4(r1) lbl_8015DB74: /* 8015DB74 0015AAD4 34 01 00 E0 */ addic. r0, r1, 0xe0 /* 8015DB78 0015AAD8 41 82 00 10 */ beq lbl_8015DB88 -/* 8015DB7C 0015AADC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DB80 0015AAE0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DB7C 0015AADC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DB80 0015AAE0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DB84 0015AAE4 90 01 00 E0 */ stw r0, 0xe0(r1) lbl_8015DB88: /* 8015DB88 0015AAE8 E3 E1 01 58 */ psq_l f31, 344(r1), 0, qr0 @@ -1407,20 +1407,20 @@ BuildProjectileCameraShake__16CCameraShakeDataFff: /* 8015DC58 0015ABB8 4B FF F2 41 */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8015DC5C 0015ABBC 34 01 00 38 */ addic. r0, r1, 0x38 /* 8015DC60 0015ABC0 41 82 00 10 */ beq lbl_8015DC70 -/* 8015DC64 0015ABC4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DC68 0015ABC8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DC64 0015ABC4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DC68 0015ABC8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DC6C 0015ABCC 90 01 00 38 */ stw r0, 0x38(r1) lbl_8015DC70: /* 8015DC70 0015ABD0 34 01 00 74 */ addic. r0, r1, 0x74 /* 8015DC74 0015ABD4 41 82 00 10 */ beq lbl_8015DC84 -/* 8015DC78 0015ABD8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DC7C 0015ABDC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DC78 0015ABD8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DC7C 0015ABDC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DC80 0015ABE0 90 01 00 74 */ stw r0, 0x74(r1) lbl_8015DC84: /* 8015DC84 0015ABE4 34 01 00 B0 */ addic. r0, r1, 0xb0 /* 8015DC88 0015ABE8 41 82 00 10 */ beq lbl_8015DC98 -/* 8015DC8C 0015ABEC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DC90 0015ABF0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DC8C 0015ABEC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DC90 0015ABF0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DC94 0015ABF4 90 01 00 B0 */ stw r0, 0xb0(r1) lbl_8015DC98: /* 8015DC98 0015ABF8 E3 E1 01 08 */ psq_l f31, 264(r1), 0, qr0 @@ -1493,20 +1493,20 @@ __sinit_CCameraShakeData_cpp: /* 8015DD98 0015ACF8 48 22 B8 F5 */ bl __register_global_object /* 8015DD9C 0015ACFC 34 01 00 BC */ addic. r0, r1, 0xbc /* 8015DDA0 0015AD00 41 82 00 10 */ beq lbl_8015DDB0 -/* 8015DDA4 0015AD04 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DDA8 0015AD08 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DDA4 0015AD04 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DDA8 0015AD08 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DDAC 0015AD0C 90 01 00 BC */ stw r0, 0xbc(r1) lbl_8015DDB0: /* 8015DDB0 0015AD10 34 01 00 F8 */ addic. r0, r1, 0xf8 /* 8015DDB4 0015AD14 41 82 00 10 */ beq lbl_8015DDC4 -/* 8015DDB8 0015AD18 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DDBC 0015AD1C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DDB8 0015AD18 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DDBC 0015AD1C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DDC0 0015AD20 90 01 00 F8 */ stw r0, 0xf8(r1) lbl_8015DDC4: /* 8015DDC4 0015AD24 34 01 01 34 */ addic. r0, r1, 0x134 /* 8015DDC8 0015AD28 41 82 00 10 */ beq lbl_8015DDD8 -/* 8015DDCC 0015AD2C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DDD0 0015AD30 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DDCC 0015AD2C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DDD0 0015AD30 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DDD4 0015AD34 90 01 01 34 */ stw r0, 0x134(r1) lbl_8015DDD8: /* 8015DDD8 0015AD38 38 61 00 80 */ addi r3, r1, 0x80 @@ -1535,20 +1535,20 @@ lbl_8015DDD8: /* 8015DE34 0015AD94 48 22 B8 59 */ bl __register_global_object /* 8015DE38 0015AD98 34 01 00 08 */ addic. r0, r1, 8 /* 8015DE3C 0015AD9C 41 82 00 10 */ beq lbl_8015DE4C -/* 8015DE40 0015ADA0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DE44 0015ADA4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DE40 0015ADA0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DE44 0015ADA4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DE48 0015ADA8 90 01 00 08 */ stw r0, 8(r1) lbl_8015DE4C: /* 8015DE4C 0015ADAC 34 01 00 44 */ addic. r0, r1, 0x44 /* 8015DE50 0015ADB0 41 82 00 10 */ beq lbl_8015DE60 -/* 8015DE54 0015ADB4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DE58 0015ADB8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DE54 0015ADB4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DE58 0015ADB8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DE5C 0015ADBC 90 01 00 44 */ stw r0, 0x44(r1) lbl_8015DE60: /* 8015DE60 0015ADC0 34 01 00 80 */ addic. r0, r1, 0x80 /* 8015DE64 0015ADC4 41 82 00 10 */ beq lbl_8015DE74 -/* 8015DE68 0015ADC8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8015DE6C 0015ADCC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8015DE68 0015ADC8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8015DE6C 0015ADCC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8015DE70 0015ADD0 90 01 00 80 */ stw r0, 0x80(r1) lbl_8015DE74: /* 8015DE74 0015ADD4 80 01 01 84 */ lwz r0, 0x184(r1) diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 502ce2f6..25040136 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -1571,20 +1571,20 @@ lbl_80228484: /* 802284E0 00225440 4B DE 25 41 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 802284E4 00225444 34 81 00 B0 */ addic. r4, r1, 0xb0 /* 802284E8 00225448 41 82 00 10 */ beq lbl_802284F8 -/* 802284EC 0022544C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802284F0 00225450 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802284EC 0022544C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802284F0 00225450 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802284F4 00225454 90 04 00 00 */ stw r0, 0(r4) lbl_802284F8: /* 802284F8 00225458 34 81 00 74 */ addic. r4, r1, 0x74 /* 802284FC 0022545C 41 82 00 10 */ beq lbl_8022850C -/* 80228500 00225460 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80228504 00225464 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80228500 00225460 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80228504 00225464 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80228508 00225468 90 04 00 00 */ stw r0, 0(r4) lbl_8022850C: /* 8022850C 0022546C 34 81 00 38 */ addic. r4, r1, 0x38 /* 80228510 00225470 41 82 00 88 */ beq lbl_80228598 -/* 80228514 00225474 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80228518 00225478 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80228514 00225474 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80228518 00225478 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8022851C 0022547C 90 04 00 00 */ stw r0, 0(r4) /* 80228520 00225480 48 00 00 78 */ b lbl_80228598 lbl_80228524: diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 83847fce..7aa6670d 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -1400,20 +1400,20 @@ lbl_801AE260: /* 801AE2BC 001AB21C 4B E5 C7 65 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 801AE2C0 001AB220 34 81 00 A4 */ addic. r4, r1, 0xa4 /* 801AE2C4 001AB224 41 82 00 10 */ beq lbl_801AE2D4 -/* 801AE2C8 001AB228 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801AE2CC 001AB22C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801AE2C8 001AB228 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801AE2CC 001AB22C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801AE2D0 001AB230 90 04 00 00 */ stw r0, 0(r4) lbl_801AE2D4: /* 801AE2D4 001AB234 34 81 00 68 */ addic. r4, r1, 0x68 /* 801AE2D8 001AB238 41 82 00 10 */ beq lbl_801AE2E8 -/* 801AE2DC 001AB23C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801AE2E0 001AB240 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801AE2DC 001AB23C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801AE2E0 001AB240 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801AE2E4 001AB244 90 04 00 00 */ stw r0, 0(r4) lbl_801AE2E8: /* 801AE2E8 001AB248 34 81 00 2C */ addic. r4, r1, 0x2c /* 801AE2EC 001AB24C 41 82 00 84 */ beq lbl_801AE370 -/* 801AE2F0 001AB250 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801AE2F4 001AB254 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801AE2F0 001AB250 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801AE2F4 001AB254 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801AE2F8 001AB258 90 04 00 00 */ stw r0, 0(r4) /* 801AE2FC 001AB25C 48 00 00 74 */ b lbl_801AE370 lbl_801AE300: diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index f512f93f..e8c6a402 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -5589,20 +5589,20 @@ lbl_801F89A4: /* 801F8A14 001F5974 48 01 B0 B9 */ bl SetCameraShake__17CEnergyProjectileFRC16CCameraShakeData /* 801F8A18 001F5978 34 81 01 70 */ addic. r4, r1, 0x170 /* 801F8A1C 001F597C 41 82 00 10 */ beq lbl_801F8A2C -/* 801F8A20 001F5980 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801F8A24 001F5984 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801F8A20 001F5980 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801F8A24 001F5984 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801F8A28 001F5988 90 04 00 00 */ stw r0, 0(r4) lbl_801F8A2C: /* 801F8A2C 001F598C 34 81 01 34 */ addic. r4, r1, 0x134 /* 801F8A30 001F5990 41 82 00 10 */ beq lbl_801F8A40 -/* 801F8A34 001F5994 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801F8A38 001F5998 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801F8A34 001F5994 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801F8A38 001F5998 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801F8A3C 001F599C 90 04 00 00 */ stw r0, 0(r4) lbl_801F8A40: /* 801F8A40 001F59A0 34 81 00 F8 */ addic. r4, r1, 0xf8 /* 801F8A44 001F59A4 41 82 00 10 */ beq lbl_801F8A54 -/* 801F8A48 001F59A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801F8A4C 001F59AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801F8A48 001F59A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801F8A4C 001F59AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801F8A50 001F59B0 90 04 00 00 */ stw r0, 0(r4) lbl_801F8A54: /* 801F8A54 001F59B4 88 18 06 A0 */ lbz r0, 0x6a0(r24) @@ -9431,20 +9431,20 @@ lbl_801FC0D4: /* 801FC170 001F90D0 4B E0 E8 B1 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 801FC174 001F90D4 34 81 01 18 */ addic. r4, r1, 0x118 /* 801FC178 001F90D8 41 82 00 10 */ beq lbl_801FC188 -/* 801FC17C 001F90DC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801FC180 001F90E0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801FC17C 001F90DC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801FC180 001F90E0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801FC184 001F90E4 90 04 00 00 */ stw r0, 0(r4) lbl_801FC188: /* 801FC188 001F90E8 34 81 00 DC */ addic. r4, r1, 0xdc /* 801FC18C 001F90EC 41 82 00 10 */ beq lbl_801FC19C -/* 801FC190 001F90F0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801FC194 001F90F4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801FC190 001F90F0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801FC194 001F90F4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801FC198 001F90F8 90 04 00 00 */ stw r0, 0(r4) lbl_801FC19C: /* 801FC19C 001F90FC 34 81 00 A0 */ addic. r4, r1, 0xa0 /* 801FC1A0 001F9100 41 82 00 10 */ beq lbl_801FC1B0 -/* 801FC1A4 001F9104 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801FC1A8 001F9108 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801FC1A4 001F9104 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801FC1A8 001F9108 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801FC1AC 001F910C 90 04 00 00 */ stw r0, 0(r4) lbl_801FC1B0: /* 801FC1B0 001F9110 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 64629c60..223644f8 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -2984,20 +2984,20 @@ lbl_801A07D4: /* 801A086C 0019D7CC 4B E6 A1 B5 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 801A0870 0019D7D0 34 81 00 DC */ addic. r4, r1, 0xdc /* 801A0874 0019D7D4 41 82 00 10 */ beq lbl_801A0884 -/* 801A0878 0019D7D8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801A087C 0019D7DC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801A0878 0019D7D8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801A087C 0019D7DC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801A0880 0019D7E0 90 04 00 00 */ stw r0, 0(r4) lbl_801A0884: /* 801A0884 0019D7E4 34 81 00 A0 */ addic. r4, r1, 0xa0 /* 801A0888 0019D7E8 41 82 00 10 */ beq lbl_801A0898 -/* 801A088C 0019D7EC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801A0890 0019D7F0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801A088C 0019D7EC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801A0890 0019D7F0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801A0894 0019D7F4 90 04 00 00 */ stw r0, 0(r4) lbl_801A0898: /* 801A0898 0019D7F8 34 81 00 64 */ addic. r4, r1, 0x64 /* 801A089C 0019D7FC 41 82 00 10 */ beq lbl_801A08AC -/* 801A08A0 0019D800 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801A08A4 0019D804 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801A08A0 0019D800 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801A08A4 0019D804 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801A08A8 0019D808 90 04 00 00 */ stw r0, 0(r4) lbl_801A08AC: /* 801A08AC 0019D80C 88 1D 0B 28 */ lbz r0, 0xb28(r29) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 4ace17dc..6aa20b2a 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -1086,20 +1086,20 @@ lbl_8027D4B4: /* 8027D4D4 0027A434 4B D8 D5 4D */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 8027D4D8 0027A438 34 81 00 94 */ addic. r4, r1, 0x94 /* 8027D4DC 0027A43C 41 82 00 10 */ beq lbl_8027D4EC -/* 8027D4E0 0027A440 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027D4E4 0027A444 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027D4E0 0027A440 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027D4E4 0027A444 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027D4E8 0027A448 90 04 00 00 */ stw r0, 0(r4) lbl_8027D4EC: /* 8027D4EC 0027A44C 34 81 00 58 */ addic. r4, r1, 0x58 /* 8027D4F0 0027A450 41 82 00 10 */ beq lbl_8027D500 -/* 8027D4F4 0027A454 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027D4F8 0027A458 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027D4F4 0027A454 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027D4F8 0027A458 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027D4FC 0027A45C 90 04 00 00 */ stw r0, 0(r4) lbl_8027D500: /* 8027D500 0027A460 34 81 00 1C */ addic. r4, r1, 0x1c /* 8027D504 0027A464 41 82 00 10 */ beq lbl_8027D514 -/* 8027D508 0027A468 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027D50C 0027A46C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027D508 0027A468 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027D50C 0027A46C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027D510 0027A470 90 04 00 00 */ stw r0, 0(r4) lbl_8027D514: /* 8027D514 0027A474 80 01 00 F4 */ lwz r0, 0xf4(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index cdc48a43..239b509d 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -751,40 +751,40 @@ lbl_802712F4: /* 802712F8 0026E258 41 82 00 40 */ beq lbl_80271338 /* 802712FC 0026E25C 34 1E 13 E8 */ addic. r0, r30, 0x13e8 /* 80271300 0026E260 41 82 00 10 */ beq lbl_80271310 -/* 80271304 0026E264 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271308 0026E268 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271304 0026E264 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271308 0026E268 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027130C 0026E26C 90 1E 13 E8 */ stw r0, 0x13e8(r30) lbl_80271310: /* 80271310 0026E270 34 1E 13 AC */ addic. r0, r30, 0x13ac /* 80271314 0026E274 41 82 00 10 */ beq lbl_80271324 -/* 80271318 0026E278 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027131C 0026E27C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271318 0026E278 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027131C 0026E27C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271320 0026E280 90 1E 13 AC */ stw r0, 0x13ac(r30) lbl_80271324: /* 80271324 0026E284 34 1E 13 70 */ addic. r0, r30, 0x1370 /* 80271328 0026E288 41 82 00 10 */ beq lbl_80271338 -/* 8027132C 0026E28C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271330 0026E290 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027132C 0026E28C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271330 0026E290 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271334 0026E294 90 1E 13 70 */ stw r0, 0x1370(r30) lbl_80271338: /* 80271338 0026E298 34 1E 12 94 */ addic. r0, r30, 0x1294 /* 8027133C 0026E29C 41 82 00 40 */ beq lbl_8027137C /* 80271340 0026E2A0 34 1E 13 14 */ addic. r0, r30, 0x1314 /* 80271344 0026E2A4 41 82 00 10 */ beq lbl_80271354 -/* 80271348 0026E2A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027134C 0026E2AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271348 0026E2A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027134C 0026E2AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271350 0026E2B0 90 1E 13 14 */ stw r0, 0x1314(r30) lbl_80271354: /* 80271354 0026E2B4 34 1E 12 D8 */ addic. r0, r30, 0x12d8 /* 80271358 0026E2B8 41 82 00 10 */ beq lbl_80271368 -/* 8027135C 0026E2BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271360 0026E2C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027135C 0026E2BC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271360 0026E2C0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271364 0026E2C4 90 1E 12 D8 */ stw r0, 0x12d8(r30) lbl_80271368: /* 80271368 0026E2C8 34 1E 12 9C */ addic. r0, r30, 0x129c /* 8027136C 0026E2CC 41 82 00 10 */ beq lbl_8027137C -/* 80271370 0026E2D0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271374 0026E2D4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271370 0026E2D0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271374 0026E2D4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271378 0026E2D8 90 1E 12 9C */ stw r0, 0x129c(r30) lbl_8027137C: /* 8027137C 0026E2DC 34 1E 12 58 */ addic. r0, r30, 0x1258 @@ -864,20 +864,20 @@ lbl_8027146C: /* 80271470 0026E3D0 41 82 00 40 */ beq lbl_802714B0 /* 80271474 0026E3D4 34 1E 11 0C */ addic. r0, r30, 0x110c /* 80271478 0026E3D8 41 82 00 10 */ beq lbl_80271488 -/* 8027147C 0026E3DC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271480 0026E3E0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027147C 0026E3DC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271480 0026E3E0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271484 0026E3E4 90 1E 11 0C */ stw r0, 0x110c(r30) lbl_80271488: /* 80271488 0026E3E8 34 1E 10 D0 */ addic. r0, r30, 0x10d0 /* 8027148C 0026E3EC 41 82 00 10 */ beq lbl_8027149C -/* 80271490 0026E3F0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271494 0026E3F4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271490 0026E3F0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271494 0026E3F4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271498 0026E3F8 90 1E 10 D0 */ stw r0, 0x10d0(r30) lbl_8027149C: /* 8027149C 0026E3FC 34 1E 10 94 */ addic. r0, r30, 0x1094 /* 802714A0 0026E400 41 82 00 10 */ beq lbl_802714B0 -/* 802714A4 0026E404 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802714A8 0026E408 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802714A4 0026E404 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802714A8 0026E408 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802714AC 0026E40C 90 1E 10 94 */ stw r0, 0x1094(r30) lbl_802714B0: /* 802714B0 0026E410 34 1E 10 6C */ addic. r0, r30, 0x106c @@ -1142,20 +1142,20 @@ lbl_80271814: /* 80271818 0026E778 41 82 00 40 */ beq lbl_80271858 /* 8027181C 0026E77C 34 1E 0F 50 */ addic. r0, r30, 0xf50 /* 80271820 0026E780 41 82 00 10 */ beq lbl_80271830 -/* 80271824 0026E784 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271828 0026E788 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271824 0026E784 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271828 0026E788 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027182C 0026E78C 90 1E 0F 50 */ stw r0, 0xf50(r30) lbl_80271830: /* 80271830 0026E790 34 1E 0F 14 */ addic. r0, r30, 0xf14 /* 80271834 0026E794 41 82 00 10 */ beq lbl_80271844 -/* 80271838 0026E798 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027183C 0026E79C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271838 0026E798 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027183C 0026E79C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271840 0026E7A0 90 1E 0F 14 */ stw r0, 0xf14(r30) lbl_80271844: /* 80271844 0026E7A4 34 1E 0E D8 */ addic. r0, r30, 0xed8 /* 80271848 0026E7A8 41 82 00 10 */ beq lbl_80271858 -/* 8027184C 0026E7AC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271850 0026E7B0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027184C 0026E7AC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271850 0026E7B0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271854 0026E7B4 90 1E 0E D8 */ stw r0, 0xed8(r30) lbl_80271858: /* 80271858 0026E7B8 34 1E 0E 70 */ addic. r0, r30, 0xe70 @@ -1169,20 +1169,20 @@ lbl_80271870: /* 80271874 0026E7D4 41 82 00 40 */ beq lbl_802718B4 /* 80271878 0026E7D8 34 1E 0E 1C */ addic. r0, r30, 0xe1c /* 8027187C 0026E7DC 41 82 00 10 */ beq lbl_8027188C -/* 80271880 0026E7E0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271884 0026E7E4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271880 0026E7E0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271884 0026E7E4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271888 0026E7E8 90 1E 0E 1C */ stw r0, 0xe1c(r30) lbl_8027188C: /* 8027188C 0026E7EC 34 1E 0D E0 */ addic. r0, r30, 0xde0 /* 80271890 0026E7F0 41 82 00 10 */ beq lbl_802718A0 -/* 80271894 0026E7F4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271898 0026E7F8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271894 0026E7F4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271898 0026E7F8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027189C 0026E7FC 90 1E 0D E0 */ stw r0, 0xde0(r30) lbl_802718A0: /* 802718A0 0026E800 34 1E 0D A4 */ addic. r0, r30, 0xda4 /* 802718A4 0026E804 41 82 00 10 */ beq lbl_802718B4 -/* 802718A8 0026E808 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802718AC 0026E80C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802718A8 0026E808 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802718AC 0026E80C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802718B0 0026E810 90 1E 0D A4 */ stw r0, 0xda4(r30) lbl_802718B4: /* 802718B4 0026E814 34 1E 0D 74 */ addic. r0, r30, 0xd74 @@ -1199,20 +1199,20 @@ lbl_802718D8: /* 802718DC 0026E83C 41 82 00 40 */ beq lbl_8027191C /* 802718E0 0026E840 34 1E 0D 20 */ addic. r0, r30, 0xd20 /* 802718E4 0026E844 41 82 00 10 */ beq lbl_802718F4 -/* 802718E8 0026E848 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802718EC 0026E84C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802718E8 0026E848 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802718EC 0026E84C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802718F0 0026E850 90 1E 0D 20 */ stw r0, 0xd20(r30) lbl_802718F4: /* 802718F4 0026E854 34 1E 0C E4 */ addic. r0, r30, 0xce4 /* 802718F8 0026E858 41 82 00 10 */ beq lbl_80271908 -/* 802718FC 0026E85C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271900 0026E860 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802718FC 0026E85C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271900 0026E860 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271904 0026E864 90 1E 0C E4 */ stw r0, 0xce4(r30) lbl_80271908: /* 80271908 0026E868 34 1E 0C A8 */ addic. r0, r30, 0xca8 /* 8027190C 0026E86C 41 82 00 10 */ beq lbl_8027191C -/* 80271910 0026E870 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80271914 0026E874 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80271910 0026E870 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80271914 0026E874 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80271918 0026E878 90 1E 0C A8 */ stw r0, 0xca8(r30) lbl_8027191C: /* 8027191C 0026E87C 34 1E 0C 78 */ addic. r0, r30, 0xc78 @@ -11448,20 +11448,20 @@ lbl_8027AB50: lbl_8027AB70: /* 8027AB70 00277AD0 34 81 05 D4 */ addic. r4, r1, 0x5d4 /* 8027AB74 00277AD4 41 82 00 10 */ beq lbl_8027AB84 -/* 8027AB78 00277AD8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027AB7C 00277ADC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027AB78 00277AD8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027AB7C 00277ADC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027AB80 00277AE0 90 04 00 00 */ stw r0, 0(r4) lbl_8027AB84: /* 8027AB84 00277AE4 34 81 05 98 */ addic. r4, r1, 0x598 /* 8027AB88 00277AE8 41 82 00 10 */ beq lbl_8027AB98 -/* 8027AB8C 00277AEC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027AB90 00277AF0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027AB8C 00277AEC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027AB90 00277AF0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027AB94 00277AF4 90 04 00 00 */ stw r0, 0(r4) lbl_8027AB98: /* 8027AB98 00277AF8 34 81 05 5C */ addic. r4, r1, 0x55c /* 8027AB9C 00277AFC 41 82 00 AC */ beq lbl_8027AC48 -/* 8027ABA0 00277B00 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027ABA4 00277B04 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027ABA0 00277B00 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027ABA4 00277B04 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027ABA8 00277B08 90 04 00 00 */ stw r0, 0(r4) /* 8027ABAC 00277B0C 48 00 00 9C */ b lbl_8027AC48 lbl_8027ABB0: @@ -13134,20 +13134,20 @@ BuildCameraShakeData__FRC21SPrimeCameraShakeData: /* 8027C3E4 00279344 4B EE 0A B5 */ bl __ct__16CCameraShakeDataFffiRC9CVector3fRC22CCameraShakerComponentRC22CCameraShakerComponentRC22CCameraShakerComponent /* 8027C3E8 00279348 34 01 00 08 */ addic. r0, r1, 8 /* 8027C3EC 0027934C 41 82 00 10 */ beq lbl_8027C3FC -/* 8027C3F0 00279350 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027C3F4 00279354 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027C3F0 00279350 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027C3F4 00279354 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027C3F8 00279358 90 01 00 08 */ stw r0, 8(r1) lbl_8027C3FC: /* 8027C3FC 0027935C 34 01 00 44 */ addic. r0, r1, 0x44 /* 8027C400 00279360 41 82 00 10 */ beq lbl_8027C410 -/* 8027C404 00279364 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027C408 00279368 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027C404 00279364 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027C408 00279368 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027C40C 0027936C 90 01 00 44 */ stw r0, 0x44(r1) lbl_8027C410: /* 8027C410 00279370 34 01 00 80 */ addic. r0, r1, 0x80 /* 8027C414 00279374 41 82 00 10 */ beq lbl_8027C424 -/* 8027C418 00279378 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8027C41C 0027937C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8027C418 00279378 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8027C41C 0027937C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8027C420 00279380 90 01 00 80 */ stw r0, 0x80(r1) lbl_8027C424: /* 8027C424 00279384 80 01 00 D4 */ lwz r0, 0xd4(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index d352a136..c38f6e76 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -1397,20 +1397,20 @@ __ct__19SPrimeExoParametersFR12CInputStream: /* 80281828 0027E788 4B D8 95 81 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8028182C 0027E78C 34 81 05 1C */ addic. r4, r1, 0x51c /* 80281830 0027E790 41 82 00 10 */ beq lbl_80281840 -/* 80281834 0027E794 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281838 0027E798 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281834 0027E794 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281838 0027E798 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8028183C 0027E79C 90 04 00 00 */ stw r0, 0(r4) lbl_80281840: /* 80281840 0027E7A0 34 81 04 E0 */ addic. r4, r1, 0x4e0 /* 80281844 0027E7A4 41 82 00 10 */ beq lbl_80281854 -/* 80281848 0027E7A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8028184C 0027E7AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281848 0027E7A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8028184C 0027E7AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281850 0027E7B0 90 04 00 00 */ stw r0, 0(r4) lbl_80281854: /* 80281854 0027E7B4 34 81 04 A4 */ addic. r4, r1, 0x4a4 /* 80281858 0027E7B8 41 82 00 10 */ beq lbl_80281868 -/* 8028185C 0027E7BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281860 0027E7C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8028185C 0027E7BC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281860 0027E7C0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281864 0027E7C4 90 04 00 00 */ stw r0, 0(r4) lbl_80281868: /* 80281868 0027E7C8 7F E4 FB 78 */ mr r4, r31 @@ -1421,20 +1421,20 @@ lbl_80281868: /* 8028187C 0027E7DC 4B D8 95 2D */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 80281880 0027E7E0 34 81 04 48 */ addic. r4, r1, 0x448 /* 80281884 0027E7E4 41 82 00 10 */ beq lbl_80281894 -/* 80281888 0027E7E8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8028188C 0027E7EC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281888 0027E7E8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8028188C 0027E7EC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281890 0027E7F0 90 04 00 00 */ stw r0, 0(r4) lbl_80281894: /* 80281894 0027E7F4 34 81 04 0C */ addic. r4, r1, 0x40c /* 80281898 0027E7F8 41 82 00 10 */ beq lbl_802818A8 -/* 8028189C 0027E7FC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802818A0 0027E800 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8028189C 0027E7FC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802818A0 0027E800 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802818A4 0027E804 90 04 00 00 */ stw r0, 0(r4) lbl_802818A8: /* 802818A8 0027E808 34 81 03 D0 */ addic. r4, r1, 0x3d0 /* 802818AC 0027E80C 41 82 00 10 */ beq lbl_802818BC -/* 802818B0 0027E810 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802818B4 0027E814 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802818B0 0027E810 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802818B4 0027E814 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802818B8 0027E818 90 04 00 00 */ stw r0, 0(r4) lbl_802818BC: /* 802818BC 0027E81C 7F E4 FB 78 */ mr r4, r31 @@ -1445,20 +1445,20 @@ lbl_802818BC: /* 802818D0 0027E830 4B D8 94 D9 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 802818D4 0027E834 34 81 03 74 */ addic. r4, r1, 0x374 /* 802818D8 0027E838 41 82 00 10 */ beq lbl_802818E8 -/* 802818DC 0027E83C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802818E0 0027E840 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802818DC 0027E83C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802818E0 0027E840 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802818E4 0027E844 90 04 00 00 */ stw r0, 0(r4) lbl_802818E8: /* 802818E8 0027E848 34 81 03 38 */ addic. r4, r1, 0x338 /* 802818EC 0027E84C 41 82 00 10 */ beq lbl_802818FC -/* 802818F0 0027E850 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802818F4 0027E854 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802818F0 0027E850 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802818F4 0027E854 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802818F8 0027E858 90 04 00 00 */ stw r0, 0(r4) lbl_802818FC: /* 802818FC 0027E85C 34 81 02 FC */ addic. r4, r1, 0x2fc /* 80281900 0027E860 41 82 00 10 */ beq lbl_80281910 -/* 80281904 0027E864 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281908 0027E868 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281904 0027E864 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281908 0027E868 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8028190C 0027E86C 90 04 00 00 */ stw r0, 0(r4) lbl_80281910: /* 80281910 0027E870 7F E4 FB 78 */ mr r4, r31 @@ -1512,20 +1512,20 @@ lbl_8028198C: /* 802819C0 0027E920 4B D8 93 E9 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 802819C4 0027E924 34 81 02 A0 */ addic. r4, r1, 0x2a0 /* 802819C8 0027E928 41 82 00 10 */ beq lbl_802819D8 -/* 802819CC 0027E92C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802819D0 0027E930 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802819CC 0027E92C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802819D0 0027E930 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802819D4 0027E934 90 04 00 00 */ stw r0, 0(r4) lbl_802819D8: /* 802819D8 0027E938 34 81 02 64 */ addic. r4, r1, 0x264 /* 802819DC 0027E93C 41 82 00 10 */ beq lbl_802819EC -/* 802819E0 0027E940 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802819E4 0027E944 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802819E0 0027E940 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802819E4 0027E944 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802819E8 0027E948 90 04 00 00 */ stw r0, 0(r4) lbl_802819EC: /* 802819EC 0027E94C 34 81 02 28 */ addic. r4, r1, 0x228 /* 802819F0 0027E950 41 82 00 10 */ beq lbl_80281A00 -/* 802819F4 0027E954 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802819F8 0027E958 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802819F4 0027E954 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802819F8 0027E958 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802819FC 0027E95C 90 04 00 00 */ stw r0, 0(r4) lbl_80281A00: /* 80281A00 0027E960 7F E3 FB 78 */ mr r3, r31 @@ -1542,20 +1542,20 @@ lbl_80281A00: /* 80281A2C 0027E98C 4B D8 93 7D */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 80281A30 0027E990 34 81 01 CC */ addic. r4, r1, 0x1cc /* 80281A34 0027E994 41 82 00 10 */ beq lbl_80281A44 -/* 80281A38 0027E998 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281A3C 0027E99C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281A38 0027E998 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281A3C 0027E99C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281A40 0027E9A0 90 04 00 00 */ stw r0, 0(r4) lbl_80281A44: /* 80281A44 0027E9A4 34 81 01 90 */ addic. r4, r1, 0x190 /* 80281A48 0027E9A8 41 82 00 10 */ beq lbl_80281A58 -/* 80281A4C 0027E9AC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281A50 0027E9B0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281A4C 0027E9AC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281A50 0027E9B0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281A54 0027E9B4 90 04 00 00 */ stw r0, 0(r4) lbl_80281A58: /* 80281A58 0027E9B8 34 81 01 54 */ addic. r4, r1, 0x154 /* 80281A5C 0027E9BC 41 82 00 10 */ beq lbl_80281A6C -/* 80281A60 0027E9C0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281A64 0027E9C4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281A60 0027E9C0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281A64 0027E9C4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281A68 0027E9C8 90 04 00 00 */ stw r0, 0(r4) lbl_80281A6C: /* 80281A6C 0027E9CC 7F E4 FB 78 */ mr r4, r31 @@ -1572,20 +1572,20 @@ lbl_80281A6C: /* 80281A98 0027E9F8 4B D8 93 11 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 80281A9C 0027E9FC 34 81 00 F8 */ addic. r4, r1, 0xf8 /* 80281AA0 0027EA00 41 82 00 10 */ beq lbl_80281AB0 -/* 80281AA4 0027EA04 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281AA8 0027EA08 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281AA4 0027EA04 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281AA8 0027EA08 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281AAC 0027EA0C 90 04 00 00 */ stw r0, 0(r4) lbl_80281AB0: /* 80281AB0 0027EA10 34 81 00 BC */ addic. r4, r1, 0xbc /* 80281AB4 0027EA14 41 82 00 10 */ beq lbl_80281AC4 -/* 80281AB8 0027EA18 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281ABC 0027EA1C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281AB8 0027EA18 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281ABC 0027EA1C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281AC0 0027EA20 90 04 00 00 */ stw r0, 0(r4) lbl_80281AC4: /* 80281AC4 0027EA24 34 81 00 80 */ addic. r4, r1, 0x80 /* 80281AC8 0027EA28 41 82 00 10 */ beq lbl_80281AD8 -/* 80281ACC 0027EA2C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80281AD0 0027EA30 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80281ACC 0027EA2C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80281AD0 0027EA30 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80281AD4 0027EA34 90 04 00 00 */ stw r0, 0(r4) lbl_80281AD8: /* 80281AD8 0027EA38 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 76006a29..1f54e47a 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -4582,20 +4582,20 @@ lbl_8007AB68: /* 8007AC64 00077BC4 4B F8 FD BD */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 8007AC68 00077BC8 34 81 00 BC */ addic. r4, r1, 0xbc /* 8007AC6C 00077BCC 41 82 00 10 */ beq lbl_8007AC7C -/* 8007AC70 00077BD0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8007AC74 00077BD4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8007AC70 00077BD0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8007AC74 00077BD4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8007AC78 00077BD8 90 04 00 00 */ stw r0, 0(r4) lbl_8007AC7C: /* 8007AC7C 00077BDC 34 81 00 80 */ addic. r4, r1, 0x80 /* 8007AC80 00077BE0 41 82 00 10 */ beq lbl_8007AC90 -/* 8007AC84 00077BE4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8007AC88 00077BE8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8007AC84 00077BE4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8007AC88 00077BE8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8007AC8C 00077BEC 90 04 00 00 */ stw r0, 0(r4) lbl_8007AC90: /* 8007AC90 00077BF0 34 81 00 44 */ addic. r4, r1, 0x44 /* 8007AC94 00077BF4 41 82 00 10 */ beq lbl_8007ACA4 -/* 8007AC98 00077BF8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8007AC9C 00077BFC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8007AC98 00077BF8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8007AC9C 00077BFC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8007ACA0 00077C00 90 04 00 00 */ stw r0, 0(r4) lbl_8007ACA4: /* 8007ACA4 00077C04 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 9390b64e..67b5b48c 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -748,60 +748,60 @@ sub_802527b4: /* 802527D0 0024F730 41 82 00 40 */ beq lbl_80252810 /* 802527D4 0024F734 34 1F 03 34 */ addic. r0, r31, 0x334 /* 802527D8 0024F738 41 82 00 10 */ beq lbl_802527E8 -/* 802527DC 0024F73C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802527E0 0024F740 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802527DC 0024F73C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802527E0 0024F740 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802527E4 0024F744 90 1F 03 34 */ stw r0, 0x334(r31) lbl_802527E8: /* 802527E8 0024F748 34 1F 02 F8 */ addic. r0, r31, 0x2f8 /* 802527EC 0024F74C 41 82 00 10 */ beq lbl_802527FC -/* 802527F0 0024F750 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802527F4 0024F754 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802527F0 0024F750 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802527F4 0024F754 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802527F8 0024F758 90 1F 02 F8 */ stw r0, 0x2f8(r31) lbl_802527FC: /* 802527FC 0024F75C 34 1F 02 BC */ addic. r0, r31, 0x2bc /* 80252800 0024F760 41 82 00 10 */ beq lbl_80252810 -/* 80252804 0024F764 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80252808 0024F768 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252804 0024F764 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80252808 0024F768 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025280C 0024F76C 90 1F 02 BC */ stw r0, 0x2bc(r31) lbl_80252810: /* 80252810 0024F770 34 1F 01 C0 */ addic. r0, r31, 0x1c0 /* 80252814 0024F774 41 82 00 40 */ beq lbl_80252854 /* 80252818 0024F778 34 1F 02 40 */ addic. r0, r31, 0x240 /* 8025281C 0024F77C 41 82 00 10 */ beq lbl_8025282C -/* 80252820 0024F780 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80252824 0024F784 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252820 0024F780 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80252824 0024F784 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80252828 0024F788 90 1F 02 40 */ stw r0, 0x240(r31) lbl_8025282C: /* 8025282C 0024F78C 34 1F 02 04 */ addic. r0, r31, 0x204 /* 80252830 0024F790 41 82 00 10 */ beq lbl_80252840 -/* 80252834 0024F794 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80252838 0024F798 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252834 0024F794 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80252838 0024F798 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025283C 0024F79C 90 1F 02 04 */ stw r0, 0x204(r31) lbl_80252840: /* 80252840 0024F7A0 34 1F 01 C8 */ addic. r0, r31, 0x1c8 /* 80252844 0024F7A4 41 82 00 10 */ beq lbl_80252854 -/* 80252848 0024F7A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025284C 0024F7AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252848 0024F7A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025284C 0024F7AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80252850 0024F7B0 90 1F 01 C8 */ stw r0, 0x1c8(r31) lbl_80252854: /* 80252854 0024F7B4 34 1F 00 CC */ addic. r0, r31, 0xcc /* 80252858 0024F7B8 41 82 00 40 */ beq lbl_80252898 /* 8025285C 0024F7BC 34 1F 01 4C */ addic. r0, r31, 0x14c /* 80252860 0024F7C0 41 82 00 10 */ beq lbl_80252870 -/* 80252864 0024F7C4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80252868 0024F7C8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252864 0024F7C4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80252868 0024F7C8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025286C 0024F7CC 90 1F 01 4C */ stw r0, 0x14c(r31) lbl_80252870: /* 80252870 0024F7D0 34 1F 01 10 */ addic. r0, r31, 0x110 /* 80252874 0024F7D4 41 82 00 10 */ beq lbl_80252884 -/* 80252878 0024F7D8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025287C 0024F7DC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80252878 0024F7D8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025287C 0024F7DC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80252880 0024F7E0 90 1F 01 10 */ stw r0, 0x110(r31) lbl_80252884: /* 80252884 0024F7E4 34 1F 00 D4 */ addic. r0, r31, 0xd4 /* 80252888 0024F7E8 41 82 00 10 */ beq lbl_80252898 -/* 8025288C 0024F7EC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80252890 0024F7F0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025288C 0024F7EC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80252890 0024F7F0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80252894 0024F7F4 90 1F 00 D4 */ stw r0, 0xd4(r31) lbl_80252898: /* 80252898 0024F7F8 7C 80 07 35 */ extsh. r0, r4 @@ -9597,20 +9597,20 @@ sub_8025a6f4: /* 8025A848 002577A8 4B DB 05 61 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8025A84C 002577AC 34 81 02 4C */ addic. r4, r1, 0x24c /* 8025A850 002577B0 41 82 00 10 */ beq lbl_8025A860 -/* 8025A854 002577B4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A858 002577B8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A854 002577B4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A858 002577B8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A85C 002577BC 90 04 00 00 */ stw r0, 0(r4) lbl_8025A860: /* 8025A860 002577C0 34 81 02 10 */ addic. r4, r1, 0x210 /* 8025A864 002577C4 41 82 00 10 */ beq lbl_8025A874 -/* 8025A868 002577C8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A86C 002577CC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A868 002577C8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A86C 002577CC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A870 002577D0 90 04 00 00 */ stw r0, 0(r4) lbl_8025A874: /* 8025A874 002577D4 34 81 01 D4 */ addic. r4, r1, 0x1d4 /* 8025A878 002577D8 41 82 00 10 */ beq lbl_8025A888 -/* 8025A87C 002577DC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A880 002577E0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A87C 002577DC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A880 002577E0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A884 002577E4 90 04 00 00 */ stw r0, 0(r4) lbl_8025A888: /* 8025A888 002577E8 7F C3 F3 78 */ mr r3, r30 @@ -9627,20 +9627,20 @@ lbl_8025A888: /* 8025A8B4 00257814 4B DB 04 F5 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8025A8B8 00257818 34 81 01 78 */ addic. r4, r1, 0x178 /* 8025A8BC 0025781C 41 82 00 10 */ beq lbl_8025A8CC -/* 8025A8C0 00257820 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A8C4 00257824 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A8C0 00257820 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A8C4 00257824 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A8C8 00257828 90 04 00 00 */ stw r0, 0(r4) lbl_8025A8CC: /* 8025A8CC 0025782C 34 81 01 3C */ addic. r4, r1, 0x13c /* 8025A8D0 00257830 41 82 00 10 */ beq lbl_8025A8E0 -/* 8025A8D4 00257834 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A8D8 00257838 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A8D4 00257834 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A8D8 00257838 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A8DC 0025783C 90 04 00 00 */ stw r0, 0(r4) lbl_8025A8E0: /* 8025A8E0 00257840 34 81 01 00 */ addic. r4, r1, 0x100 /* 8025A8E4 00257844 41 82 00 10 */ beq lbl_8025A8F4 -/* 8025A8E8 00257848 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A8EC 0025784C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A8E8 00257848 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A8EC 0025784C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A8F0 00257850 90 04 00 00 */ stw r0, 0(r4) lbl_8025A8F4: /* 8025A8F4 00257854 7F C3 F3 78 */ mr r3, r30 @@ -9659,20 +9659,20 @@ lbl_8025A8F4: /* 8025A928 00257888 4B DB 04 81 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 8025A92C 0025788C 34 81 00 A4 */ addic. r4, r1, 0xa4 /* 8025A930 00257890 41 82 00 10 */ beq lbl_8025A940 -/* 8025A934 00257894 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A938 00257898 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A934 00257894 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A938 00257898 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A93C 0025789C 90 04 00 00 */ stw r0, 0(r4) lbl_8025A940: /* 8025A940 002578A0 34 81 00 68 */ addic. r4, r1, 0x68 /* 8025A944 002578A4 41 82 00 10 */ beq lbl_8025A954 -/* 8025A948 002578A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A94C 002578AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A948 002578A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A94C 002578AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A950 002578B0 90 04 00 00 */ stw r0, 0(r4) lbl_8025A954: /* 8025A954 002578B4 34 81 00 2C */ addic. r4, r1, 0x2c /* 8025A958 002578B8 41 82 00 10 */ beq lbl_8025A968 -/* 8025A95C 002578BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8025A960 002578C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8025A95C 002578BC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8025A960 002578C0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8025A964 002578C4 90 04 00 00 */ stw r0, 0(r4) lbl_8025A968: /* 8025A968 002578C8 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 98f2da67..3e8d7adc 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -1994,20 +1994,20 @@ lbl_801DBACC: /* 801DBB44 001D8AA4 4B E2 EE DD */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 801DBB48 001D8AA8 34 81 00 B4 */ addic. r4, r1, 0xb4 /* 801DBB4C 001D8AAC 41 82 00 10 */ beq lbl_801DBB5C -/* 801DBB50 001D8AB0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801DBB54 001D8AB4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801DBB50 001D8AB0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801DBB54 001D8AB4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801DBB58 001D8AB8 90 04 00 00 */ stw r0, 0(r4) lbl_801DBB5C: /* 801DBB5C 001D8ABC 34 81 00 78 */ addic. r4, r1, 0x78 /* 801DBB60 001D8AC0 41 82 00 10 */ beq lbl_801DBB70 -/* 801DBB64 001D8AC4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801DBB68 001D8AC8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801DBB64 001D8AC4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801DBB68 001D8AC8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801DBB6C 001D8ACC 90 04 00 00 */ stw r0, 0(r4) lbl_801DBB70: /* 801DBB70 001D8AD0 34 81 00 3C */ addic. r4, r1, 0x3c /* 801DBB74 001D8AD4 41 82 00 10 */ beq lbl_801DBB84 -/* 801DBB78 001D8AD8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801DBB7C 001D8ADC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801DBB78 001D8AD8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801DBB7C 001D8ADC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801DBB80 001D8AE0 90 04 00 00 */ stw r0, 0(r4) lbl_801DBB84: /* 801DBB84 001D8AE4 88 1E 09 08 */ lbz r0, 0x908(r30) @@ -7121,20 +7121,20 @@ lbl_801E032C: /* 801E0414 001DD374 4B E2 A6 0D */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 801E0418 001DD378 34 81 01 3C */ addic. r4, r1, 0x13c /* 801E041C 001DD37C 41 82 00 10 */ beq lbl_801E042C -/* 801E0420 001DD380 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801E0424 001DD384 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801E0420 001DD380 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801E0424 001DD384 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801E0428 001DD388 90 04 00 00 */ stw r0, 0(r4) lbl_801E042C: /* 801E042C 001DD38C 34 81 01 00 */ addic. r4, r1, 0x100 /* 801E0430 001DD390 41 82 00 10 */ beq lbl_801E0440 -/* 801E0434 001DD394 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801E0438 001DD398 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801E0434 001DD394 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801E0438 001DD398 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801E043C 001DD39C 90 04 00 00 */ stw r0, 0(r4) lbl_801E0440: /* 801E0440 001DD3A0 34 81 00 C4 */ addic. r4, r1, 0xc4 /* 801E0444 001DD3A4 41 82 00 10 */ beq lbl_801E0454 -/* 801E0448 001DD3A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801E044C 001DD3AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801E0448 001DD3A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801E044C 001DD3AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801E0450 001DD3B0 90 04 00 00 */ stw r0, 0(r4) lbl_801E0454: /* 801E0454 001DD3B4 C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2) diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index cfe5791f..6f650bd2 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -1900,20 +1900,20 @@ lbl_80204D74: /* 80204EAC 00201E0C 4B E0 5B 75 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 80204EB0 00201E10 34 81 01 68 */ addic. r4, r1, 0x168 /* 80204EB4 00201E14 41 82 00 10 */ beq lbl_80204EC4 -/* 80204EB8 00201E18 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80204EBC 00201E1C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80204EB8 00201E18 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80204EBC 00201E1C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80204EC0 00201E20 90 04 00 00 */ stw r0, 0(r4) lbl_80204EC4: /* 80204EC4 00201E24 34 81 01 2C */ addic. r4, r1, 0x12c /* 80204EC8 00201E28 41 82 00 10 */ beq lbl_80204ED8 -/* 80204ECC 00201E2C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80204ED0 00201E30 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80204ECC 00201E2C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80204ED0 00201E30 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80204ED4 00201E34 90 04 00 00 */ stw r0, 0(r4) lbl_80204ED8: /* 80204ED8 00201E38 34 81 00 F0 */ addic. r4, r1, 0xf0 /* 80204EDC 00201E3C 41 82 00 EC */ beq lbl_80204FC8 -/* 80204EE0 00201E40 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80204EE4 00201E44 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80204EE0 00201E40 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80204EE4 00201E44 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80204EE8 00201E48 90 04 00 00 */ stw r0, 0(r4) /* 80204EEC 00201E4C 48 00 00 DC */ b lbl_80204FC8 lbl_80204EF0: diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 477d92c3..0620d0f0 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -2571,20 +2571,20 @@ lbl_80011838: /* 80011874 0000E7D4 4B FF 95 35 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 80011878 0000E7D8 34 81 00 8C */ addic. r4, r1, 0x8c /* 8001187C 0000E7DC 41 82 00 10 */ beq lbl_8001188C -/* 80011880 0000E7E0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80011884 0000E7E4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80011880 0000E7E0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80011884 0000E7E4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80011888 0000E7E8 90 04 00 00 */ stw r0, 0(r4) lbl_8001188C: /* 8001188C 0000E7EC 34 81 00 50 */ addic. r4, r1, 0x50 /* 80011890 0000E7F0 41 82 00 10 */ beq lbl_800118A0 -/* 80011894 0000E7F4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80011898 0000E7F8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80011894 0000E7F4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80011898 0000E7F8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8001189C 0000E7FC 90 04 00 00 */ stw r0, 0(r4) lbl_800118A0: /* 800118A0 0000E800 34 81 00 14 */ addic. r4, r1, 0x14 /* 800118A4 0000E804 41 82 00 10 */ beq lbl_800118B4 -/* 800118A8 0000E808 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800118AC 0000E80C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800118A8 0000E808 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800118AC 0000E80C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800118B0 0000E810 90 04 00 00 */ stw r0, 0(r4) lbl_800118B4: /* 800118B4 0000E814 80 7E 08 70 */ lwz r3, 0x870(r30) @@ -2593,20 +2593,20 @@ lbl_800118B4: /* 800118C0 0000E820 4B FF 91 61 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 800118C4 0000E824 34 81 01 60 */ addic. r4, r1, 0x160 /* 800118C8 0000E828 41 82 00 10 */ beq lbl_800118D8 -/* 800118CC 0000E82C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800118D0 0000E830 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800118CC 0000E82C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800118D0 0000E830 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800118D4 0000E834 90 04 00 00 */ stw r0, 0(r4) lbl_800118D8: /* 800118D8 0000E838 34 81 01 24 */ addic. r4, r1, 0x124 /* 800118DC 0000E83C 41 82 00 10 */ beq lbl_800118EC -/* 800118E0 0000E840 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800118E4 0000E844 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800118E0 0000E840 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800118E4 0000E844 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800118E8 0000E848 90 04 00 00 */ stw r0, 0(r4) lbl_800118EC: /* 800118EC 0000E84C 34 81 00 E8 */ addic. r4, r1, 0xe8 /* 800118F0 0000E850 41 82 00 10 */ beq lbl_80011900 -/* 800118F4 0000E854 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800118F8 0000E858 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800118F4 0000E854 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800118F8 0000E858 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800118FC 0000E85C 90 04 00 00 */ stw r0, 0(r4) lbl_80011900: /* 80011900 0000E860 C0 3F 0A 14 */ lfs f1, 0xa14(r31) @@ -8155,20 +8155,20 @@ lbl_800166A0: /* 80016728 00013688 4B FF 42 F9 */ bl AddCameraShaker__14CCameraManagerFRC16CCameraShakeDatab /* 8001672C 0001368C 34 81 01 68 */ addic. r4, r1, 0x168 /* 80016730 00013690 41 82 00 10 */ beq lbl_80016740 -/* 80016734 00013694 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80016738 00013698 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80016734 00013694 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80016738 00013698 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8001673C 0001369C 90 04 00 00 */ stw r0, 0(r4) lbl_80016740: /* 80016740 000136A0 34 81 01 2C */ addic. r4, r1, 0x12c /* 80016744 000136A4 41 82 00 10 */ beq lbl_80016754 -/* 80016748 000136A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8001674C 000136AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80016748 000136A8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8001674C 000136AC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80016750 000136B0 90 04 00 00 */ stw r0, 0(r4) lbl_80016754: /* 80016754 000136B4 34 81 00 F0 */ addic. r4, r1, 0xf0 /* 80016758 000136B8 41 82 00 10 */ beq lbl_80016768 -/* 8001675C 000136BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 80016760 000136C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8001675C 000136BC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 80016760 000136C0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80016764 000136C4 90 04 00 00 */ stw r0, 0(r4) lbl_80016768: /* 80016768 000136C8 7F 63 DB 78 */ mr r3, r27 diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 4d603b39..318da770 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -2072,20 +2072,20 @@ lbl_800C6E08: /* 800C6E0C 000C3D6C 41 82 00 40 */ beq lbl_800C6E4C /* 800C6E10 000C3D70 34 1E 09 C8 */ addic. r0, r30, 0x9c8 /* 800C6E14 000C3D74 41 82 00 10 */ beq lbl_800C6E24 -/* 800C6E18 000C3D78 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6E1C 000C3D7C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E18 000C3D78 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6E1C 000C3D7C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6E20 000C3D80 90 1E 09 C8 */ stw r0, 0x9c8(r30) lbl_800C6E24: /* 800C6E24 000C3D84 34 1E 09 8C */ addic. r0, r30, 0x98c /* 800C6E28 000C3D88 41 82 00 10 */ beq lbl_800C6E38 -/* 800C6E2C 000C3D8C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6E30 000C3D90 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E2C 000C3D8C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6E30 000C3D90 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6E34 000C3D94 90 1E 09 8C */ stw r0, 0x98c(r30) lbl_800C6E38: /* 800C6E38 000C3D98 34 1E 09 50 */ addic. r0, r30, 0x950 /* 800C6E3C 000C3D9C 41 82 00 10 */ beq lbl_800C6E4C -/* 800C6E40 000C3DA0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6E44 000C3DA4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E40 000C3DA0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6E44 000C3DA4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6E48 000C3DA8 90 1E 09 50 */ stw r0, 0x950(r30) lbl_800C6E4C: /* 800C6E4C 000C3DAC 34 1E 08 F0 */ addic. r0, r30, 0x8f0 @@ -2099,40 +2099,40 @@ lbl_800C6E64: /* 800C6E68 000C3DC8 41 82 00 40 */ beq lbl_800C6EA8 /* 800C6E6C 000C3DCC 34 1E 08 9C */ addic. r0, r30, 0x89c /* 800C6E70 000C3DD0 41 82 00 10 */ beq lbl_800C6E80 -/* 800C6E74 000C3DD4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6E78 000C3DD8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E74 000C3DD4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6E78 000C3DD8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6E7C 000C3DDC 90 1E 08 9C */ stw r0, 0x89c(r30) lbl_800C6E80: /* 800C6E80 000C3DE0 34 1E 08 60 */ addic. r0, r30, 0x860 /* 800C6E84 000C3DE4 41 82 00 10 */ beq lbl_800C6E94 -/* 800C6E88 000C3DE8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6E8C 000C3DEC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E88 000C3DE8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6E8C 000C3DEC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6E90 000C3DF0 90 1E 08 60 */ stw r0, 0x860(r30) lbl_800C6E94: /* 800C6E94 000C3DF4 34 1E 08 24 */ addic. r0, r30, 0x824 /* 800C6E98 000C3DF8 41 82 00 10 */ beq lbl_800C6EA8 -/* 800C6E9C 000C3DFC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6EA0 000C3E00 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6E9C 000C3DFC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6EA0 000C3E00 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6EA4 000C3E04 90 1E 08 24 */ stw r0, 0x824(r30) lbl_800C6EA8: /* 800C6EA8 000C3E08 34 1E 07 28 */ addic. r0, r30, 0x728 /* 800C6EAC 000C3E0C 41 82 00 40 */ beq lbl_800C6EEC /* 800C6EB0 000C3E10 34 1E 07 A8 */ addic. r0, r30, 0x7a8 /* 800C6EB4 000C3E14 41 82 00 10 */ beq lbl_800C6EC4 -/* 800C6EB8 000C3E18 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6EBC 000C3E1C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6EB8 000C3E18 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6EBC 000C3E1C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6EC0 000C3E20 90 1E 07 A8 */ stw r0, 0x7a8(r30) lbl_800C6EC4: /* 800C6EC4 000C3E24 34 1E 07 6C */ addic. r0, r30, 0x76c /* 800C6EC8 000C3E28 41 82 00 10 */ beq lbl_800C6ED8 -/* 800C6ECC 000C3E2C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6ED0 000C3E30 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6ECC 000C3E2C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6ED0 000C3E30 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6ED4 000C3E34 90 1E 07 6C */ stw r0, 0x76c(r30) lbl_800C6ED8: /* 800C6ED8 000C3E38 34 1E 07 30 */ addic. r0, r30, 0x730 /* 800C6EDC 000C3E3C 41 82 00 10 */ beq lbl_800C6EEC -/* 800C6EE0 000C3E40 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6EE4 000C3E44 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6EE0 000C3E40 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6EE4 000C3E44 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6EE8 000C3E48 90 1E 07 30 */ stw r0, 0x730(r30) lbl_800C6EEC: /* 800C6EEC 000C3E4C 34 1E 04 64 */ addic. r0, r30, 0x464 @@ -2167,60 +2167,60 @@ lbl_800C6F48: /* 800C6F4C 000C3EAC 41 82 00 40 */ beq lbl_800C6F8C /* 800C6F50 000C3EB0 34 1E 03 D0 */ addic. r0, r30, 0x3d0 /* 800C6F54 000C3EB4 41 82 00 10 */ beq lbl_800C6F64 -/* 800C6F58 000C3EB8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6F5C 000C3EBC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6F58 000C3EB8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6F5C 000C3EBC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6F60 000C3EC0 90 1E 03 D0 */ stw r0, 0x3d0(r30) lbl_800C6F64: /* 800C6F64 000C3EC4 34 1E 03 94 */ addic. r0, r30, 0x394 /* 800C6F68 000C3EC8 41 82 00 10 */ beq lbl_800C6F78 -/* 800C6F6C 000C3ECC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6F70 000C3ED0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6F6C 000C3ECC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6F70 000C3ED0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6F74 000C3ED4 90 1E 03 94 */ stw r0, 0x394(r30) lbl_800C6F78: /* 800C6F78 000C3ED8 34 1E 03 58 */ addic. r0, r30, 0x358 /* 800C6F7C 000C3EDC 41 82 00 10 */ beq lbl_800C6F8C -/* 800C6F80 000C3EE0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6F84 000C3EE4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6F80 000C3EE0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6F84 000C3EE4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6F88 000C3EE8 90 1E 03 58 */ stw r0, 0x358(r30) lbl_800C6F8C: /* 800C6F8C 000C3EEC 34 1E 02 7C */ addic. r0, r30, 0x27c /* 800C6F90 000C3EF0 41 82 00 40 */ beq lbl_800C6FD0 /* 800C6F94 000C3EF4 34 1E 02 FC */ addic. r0, r30, 0x2fc /* 800C6F98 000C3EF8 41 82 00 10 */ beq lbl_800C6FA8 -/* 800C6F9C 000C3EFC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6FA0 000C3F00 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6F9C 000C3EFC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6FA0 000C3F00 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6FA4 000C3F04 90 1E 02 FC */ stw r0, 0x2fc(r30) lbl_800C6FA8: /* 800C6FA8 000C3F08 34 1E 02 C0 */ addic. r0, r30, 0x2c0 /* 800C6FAC 000C3F0C 41 82 00 10 */ beq lbl_800C6FBC -/* 800C6FB0 000C3F10 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6FB4 000C3F14 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6FB0 000C3F10 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6FB4 000C3F14 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6FB8 000C3F18 90 1E 02 C0 */ stw r0, 0x2c0(r30) lbl_800C6FBC: /* 800C6FBC 000C3F1C 34 1E 02 84 */ addic. r0, r30, 0x284 /* 800C6FC0 000C3F20 41 82 00 10 */ beq lbl_800C6FD0 -/* 800C6FC4 000C3F24 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6FC8 000C3F28 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6FC4 000C3F24 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6FC8 000C3F28 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6FCC 000C3F2C 90 1E 02 84 */ stw r0, 0x284(r30) lbl_800C6FD0: /* 800C6FD0 000C3F30 34 1E 01 A8 */ addic. r0, r30, 0x1a8 /* 800C6FD4 000C3F34 41 82 00 40 */ beq lbl_800C7014 /* 800C6FD8 000C3F38 34 1E 02 28 */ addic. r0, r30, 0x228 /* 800C6FDC 000C3F3C 41 82 00 10 */ beq lbl_800C6FEC -/* 800C6FE0 000C3F40 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6FE4 000C3F44 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6FE0 000C3F40 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6FE4 000C3F44 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6FE8 000C3F48 90 1E 02 28 */ stw r0, 0x228(r30) lbl_800C6FEC: /* 800C6FEC 000C3F4C 34 1E 01 EC */ addic. r0, r30, 0x1ec /* 800C6FF0 000C3F50 41 82 00 10 */ beq lbl_800C7000 -/* 800C6FF4 000C3F54 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C6FF8 000C3F58 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C6FF4 000C3F54 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C6FF8 000C3F58 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C6FFC 000C3F5C 90 1E 01 EC */ stw r0, 0x1ec(r30) lbl_800C7000: /* 800C7000 000C3F60 34 1E 01 B0 */ addic. r0, r30, 0x1b0 /* 800C7004 000C3F64 41 82 00 10 */ beq lbl_800C7014 -/* 800C7008 000C3F68 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800C700C 000C3F6C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800C7008 000C3F68 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800C700C 000C3F6C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800C7010 000C3F70 90 1E 01 B0 */ stw r0, 0x1b0(r30) lbl_800C7014: /* 800C7014 000C3F74 34 1E 01 3C */ addic. r0, r30, 0x13c @@ -15838,9 +15838,9 @@ lbl_800D3778: /* 800D37CC 000D072C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 800D37D0 000D0730 48 08 99 AD */ bl LoadNewCameraShakerComponent__FR12CInputStream /* 800D37D4 000D0734 80 81 00 A8 */ lwz r4, 0xa8(r1) -/* 800D37D8 000D0738 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha +/* 800D37D8 000D0738 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha /* 800D37DC 000D073C 80 61 00 AC */ lwz r3, 0xac(r1) -/* 800D37E0 000D0740 38 A5 8E A8 */ addi r5, r5, lbl_803D8EA8@l +/* 800D37E0 000D0740 38 A5 8E A8 */ addi r5, r5, __vt__22CCameraShakerComponent@l /* 800D37E4 000D0744 C1 41 00 B0 */ lfs f10, 0xb0(r1) /* 800D37E8 000D0748 34 01 00 A4 */ addic. r0, r1, 0xa4 /* 800D37EC 000D074C C1 21 00 B4 */ lfs f9, 0xb4(r1) @@ -15876,9 +15876,9 @@ lbl_800D385C: /* 800D3860 000D07C0 38 61 00 68 */ addi r3, r1, 0x68 /* 800D3864 000D07C4 48 08 99 19 */ bl LoadNewCameraShakerComponent__FR12CInputStream /* 800D3868 000D07C8 80 81 00 6C */ lwz r4, 0x6c(r1) -/* 800D386C 000D07CC 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha +/* 800D386C 000D07CC 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha /* 800D3870 000D07D0 80 61 00 70 */ lwz r3, 0x70(r1) -/* 800D3874 000D07D4 38 A5 8E A8 */ addi r5, r5, lbl_803D8EA8@l +/* 800D3874 000D07D4 38 A5 8E A8 */ addi r5, r5, __vt__22CCameraShakerComponent@l /* 800D3878 000D07D8 C1 41 00 74 */ lfs f10, 0x74(r1) /* 800D387C 000D07DC 34 01 00 68 */ addic. r0, r1, 0x68 /* 800D3880 000D07E0 C1 21 00 78 */ lfs f9, 0x78(r1) @@ -15914,9 +15914,9 @@ lbl_800D38F0: /* 800D38F4 000D0854 38 61 00 2C */ addi r3, r1, 0x2c /* 800D38F8 000D0858 48 08 98 85 */ bl LoadNewCameraShakerComponent__FR12CInputStream /* 800D38FC 000D085C 80 81 00 30 */ lwz r4, 0x30(r1) -/* 800D3900 000D0860 3C A0 80 3E */ lis r5, lbl_803D8EA8@ha +/* 800D3900 000D0860 3C A0 80 3E */ lis r5, __vt__22CCameraShakerComponent@ha /* 800D3904 000D0864 80 61 00 34 */ lwz r3, 0x34(r1) -/* 800D3908 000D0868 38 A5 8E A8 */ addi r5, r5, lbl_803D8EA8@l +/* 800D3908 000D0868 38 A5 8E A8 */ addi r5, r5, __vt__22CCameraShakerComponent@l /* 800D390C 000D086C C1 41 00 38 */ lfs f10, 0x38(r1) /* 800D3910 000D0870 34 01 00 2C */ addic. r0, r1, 0x2c /* 800D3914 000D0874 C1 21 00 3C */ lfs f9, 0x3c(r1) @@ -15981,38 +15981,38 @@ lbl_800D3984: lbl_800D39FC: /* 800D39FC 000D095C 34 81 02 14 */ addic. r4, r1, 0x214 /* 800D3A00 000D0960 41 82 00 10 */ beq lbl_800D3A10 -/* 800D3A04 000D0964 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A08 000D0968 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A04 000D0964 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A08 000D0968 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A0C 000D096C 90 04 00 00 */ stw r0, 0(r4) lbl_800D3A10: /* 800D3A10 000D0970 34 81 01 D8 */ addic. r4, r1, 0x1d8 /* 800D3A14 000D0974 41 82 00 10 */ beq lbl_800D3A24 -/* 800D3A18 000D0978 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A1C 000D097C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A18 000D0978 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A1C 000D097C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A20 000D0980 90 04 00 00 */ stw r0, 0(r4) lbl_800D3A24: /* 800D3A24 000D0984 34 81 01 9C */ addic. r4, r1, 0x19c /* 800D3A28 000D0988 41 82 00 10 */ beq lbl_800D3A38 -/* 800D3A2C 000D098C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A30 000D0990 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A2C 000D098C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A30 000D0990 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A34 000D0994 90 04 00 00 */ stw r0, 0(r4) lbl_800D3A38: /* 800D3A38 000D0998 34 01 00 E0 */ addic. r0, r1, 0xe0 /* 800D3A3C 000D099C 41 82 00 10 */ beq lbl_800D3A4C -/* 800D3A40 000D09A0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A44 000D09A4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A40 000D09A0 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A44 000D09A4 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A48 000D09A8 90 01 00 E0 */ stw r0, 0xe0(r1) lbl_800D3A4C: /* 800D3A4C 000D09AC 34 01 01 1C */ addic. r0, r1, 0x11c /* 800D3A50 000D09B0 41 82 00 10 */ beq lbl_800D3A60 -/* 800D3A54 000D09B4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A58 000D09B8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A54 000D09B4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A58 000D09B8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A5C 000D09BC 90 01 01 1C */ stw r0, 0x11c(r1) lbl_800D3A60: /* 800D3A60 000D09C0 34 01 01 58 */ addic. r0, r1, 0x158 /* 800D3A64 000D09C4 41 82 00 10 */ beq lbl_800D3A74 -/* 800D3A68 000D09C8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3A6C 000D09CC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3A68 000D09C8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3A6C 000D09CC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3A70 000D09D0 90 01 01 58 */ stw r0, 0x158(r1) lbl_800D3A74: /* 800D3A74 000D09D4 38 61 00 1C */ addi r3, r1, 0x1c @@ -16058,20 +16058,20 @@ lbl_800D3ADC: /* 800D3B00 000D0A60 4B F3 72 A9 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 800D3B04 000D0A64 34 81 00 A0 */ addic. r4, r1, 0xa0 /* 800D3B08 000D0A68 41 82 00 10 */ beq lbl_800D3B18 -/* 800D3B0C 000D0A6C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3B10 000D0A70 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3B0C 000D0A6C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3B10 000D0A70 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3B14 000D0A74 90 04 00 00 */ stw r0, 0(r4) lbl_800D3B18: /* 800D3B18 000D0A78 34 81 00 64 */ addic. r4, r1, 0x64 /* 800D3B1C 000D0A7C 41 82 00 10 */ beq lbl_800D3B2C -/* 800D3B20 000D0A80 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3B24 000D0A84 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3B20 000D0A80 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3B24 000D0A84 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3B28 000D0A88 90 04 00 00 */ stw r0, 0(r4) lbl_800D3B2C: /* 800D3B2C 000D0A8C 34 81 00 28 */ addic. r4, r1, 0x28 /* 800D3B30 000D0A90 41 82 00 10 */ beq lbl_800D3B40 -/* 800D3B34 000D0A94 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3B38 000D0A98 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3B34 000D0A94 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3B38 000D0A98 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3B3C 000D0A9C 90 04 00 00 */ stw r0, 0(r4) lbl_800D3B40: /* 800D3B40 000D0AA0 7F 83 E3 78 */ mr r3, r28 @@ -16101,20 +16101,20 @@ lbl_800D3B40: lbl_800D3BA0: /* 800D3BA0 000D0B00 34 81 01 74 */ addic. r4, r1, 0x174 /* 800D3BA4 000D0B04 41 82 00 10 */ beq lbl_800D3BB4 -/* 800D3BA8 000D0B08 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3BAC 000D0B0C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3BA8 000D0B08 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3BAC 000D0B0C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3BB0 000D0B10 90 04 00 00 */ stw r0, 0(r4) lbl_800D3BB4: /* 800D3BB4 000D0B14 34 81 01 38 */ addic. r4, r1, 0x138 /* 800D3BB8 000D0B18 41 82 00 10 */ beq lbl_800D3BC8 -/* 800D3BBC 000D0B1C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3BC0 000D0B20 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3BBC 000D0B1C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3BC0 000D0B20 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3BC4 000D0B24 90 04 00 00 */ stw r0, 0(r4) lbl_800D3BC8: /* 800D3BC8 000D0B28 34 81 00 FC */ addic. r4, r1, 0xfc /* 800D3BCC 000D0B2C 41 82 00 10 */ beq lbl_800D3BDC -/* 800D3BD0 000D0B30 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800D3BD4 000D0B34 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800D3BD0 000D0B30 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800D3BD4 000D0B34 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800D3BD8 000D0B38 90 04 00 00 */ stw r0, 0(r4) lbl_800D3BDC: /* 800D3BDC 000D0B3C 38 61 00 10 */ addi r3, r1, 0x10 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s index ba83c83e..3fde3222 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803DFE00 -lbl_803DFE00: +.global __vt__19CScriptCameraShaker +__vt__19CScriptCameraShaker: # ROM: 0x3DCE00 .4byte 0 .4byte 0 @@ -27,27 +27,27 @@ __dt__19CScriptCameraShakerFv: /* 800FDDF4 000FAD54 93 C1 00 08 */ stw r30, 8(r1) /* 800FDDF8 000FAD58 7C 7E 1B 79 */ or. r30, r3, r3 /* 800FDDFC 000FAD5C 41 82 00 70 */ beq lbl_800FDE6C -/* 800FDE00 000FAD60 3C 60 80 3E */ lis r3, lbl_803DFE00@ha +/* 800FDE00 000FAD60 3C 60 80 3E */ lis r3, __vt__19CScriptCameraShaker@ha /* 800FDE04 000FAD64 34 1E 00 34 */ addic. r0, r30, 0x34 -/* 800FDE08 000FAD68 38 03 FE 00 */ addi r0, r3, lbl_803DFE00@l +/* 800FDE08 000FAD68 38 03 FE 00 */ addi r0, r3, __vt__19CScriptCameraShaker@l /* 800FDE0C 000FAD6C 90 1E 00 00 */ stw r0, 0(r30) /* 800FDE10 000FAD70 41 82 00 40 */ beq lbl_800FDE50 /* 800FDE14 000FAD74 34 1E 00 B4 */ addic. r0, r30, 0xb4 /* 800FDE18 000FAD78 41 82 00 10 */ beq lbl_800FDE28 -/* 800FDE1C 000FAD7C 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800FDE20 000FAD80 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800FDE1C 000FAD7C 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800FDE20 000FAD80 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800FDE24 000FAD84 90 1E 00 B4 */ stw r0, 0xb4(r30) lbl_800FDE28: /* 800FDE28 000FAD88 34 1E 00 78 */ addic. r0, r30, 0x78 /* 800FDE2C 000FAD8C 41 82 00 10 */ beq lbl_800FDE3C -/* 800FDE30 000FAD90 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800FDE34 000FAD94 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800FDE30 000FAD90 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800FDE34 000FAD94 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800FDE38 000FAD98 90 1E 00 78 */ stw r0, 0x78(r30) lbl_800FDE3C: /* 800FDE3C 000FAD9C 34 1E 00 3C */ addic. r0, r30, 0x3c /* 800FDE40 000FADA0 41 82 00 10 */ beq lbl_800FDE50 -/* 800FDE44 000FADA4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800FDE48 000FADA8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800FDE44 000FADA4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800FDE48 000FADA8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800FDE4C 000FADAC 90 1E 00 3C */ stw r0, 0x3c(r30) lbl_800FDE50: /* 800FDE50 000FADB0 7F C3 F3 78 */ mr r3, r30 @@ -175,9 +175,9 @@ lbl_800FDF90: /* 800FDFFC 000FAF5C 7C 87 23 78 */ mr r7, r4 /* 800FE000 000FAF60 38 81 00 08 */ addi r4, r1, 8 /* 800FE004 000FAF64 4B F5 33 21 */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 800FE008 000FAF68 3C 60 80 3E */ lis r3, lbl_803DFE00@ha +/* 800FE008 000FAF68 3C 60 80 3E */ lis r3, __vt__19CScriptCameraShaker@ha /* 800FE00C 000FAF6C 7F E4 FB 78 */ mr r4, r31 -/* 800FE010 000FAF70 38 03 FE 00 */ addi r0, r3, lbl_803DFE00@l +/* 800FE010 000FAF70 38 03 FE 00 */ addi r0, r3, __vt__19CScriptCameraShaker@l /* 800FE014 000FAF74 38 7E 00 34 */ addi r3, r30, 0x34 /* 800FE018 000FAF78 90 1E 00 00 */ stw r0, 0(r30) /* 800FE01C 000FAF7C 4B F0 CD 8D */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData diff --git a/asm/MetroidPrime/Weapons/CAuxWeapon.s b/asm/MetroidPrime/Weapons/CAuxWeapon.s index 61bcac2e..9bdff9cf 100644 --- a/asm/MetroidPrime/Weapons/CAuxWeapon.s +++ b/asm/MetroidPrime/Weapons/CAuxWeapon.s @@ -711,20 +711,20 @@ lbl_801B926C: /* 801B92C4 001B6224 48 05 A8 09 */ bl SetCameraShake__17CEnergyProjectileFRC16CCameraShakeData /* 801B92C8 001B6228 34 81 01 18 */ addic. r4, r1, 0x118 /* 801B92CC 001B622C 41 82 00 10 */ beq lbl_801B92DC -/* 801B92D0 001B6230 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801B92D4 001B6234 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801B92D0 001B6230 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801B92D4 001B6234 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801B92D8 001B6238 90 04 00 00 */ stw r0, 0(r4) lbl_801B92DC: /* 801B92DC 001B623C 34 81 00 DC */ addic. r4, r1, 0xdc /* 801B92E0 001B6240 41 82 00 10 */ beq lbl_801B92F0 -/* 801B92E4 001B6244 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801B92E8 001B6248 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801B92E4 001B6244 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801B92E8 001B6248 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801B92EC 001B624C 90 04 00 00 */ stw r0, 0(r4) lbl_801B92F0: /* 801B92F0 001B6250 34 81 00 A0 */ addic. r4, r1, 0xa0 /* 801B92F4 001B6254 41 82 00 10 */ beq lbl_801B9304 -/* 801B92F8 001B6258 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 801B92FC 001B625C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 801B92F8 001B6258 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 801B92FC 001B625C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 801B9300 001B6260 90 04 00 00 */ stw r0, 0(r4) lbl_801B9304: /* 801B9304 001B6264 3C 80 80 57 */ lis r4, lbl_80571B90@ha diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index 1de8edac..b0212cfa 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -2033,20 +2033,20 @@ lbl_80215680: /* 802157D4 00212734 4B DF 55 D5 */ bl __ct__16CCameraShakeDataFRC16CCameraShakeData /* 802157D8 00212738 34 81 00 D0 */ addic. r4, r1, 0xd0 /* 802157DC 0021273C 41 82 00 10 */ beq lbl_802157EC -/* 802157E0 00212740 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802157E4 00212744 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802157E0 00212740 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802157E4 00212744 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802157E8 00212748 90 04 00 00 */ stw r0, 0(r4) lbl_802157EC: /* 802157EC 0021274C 34 81 00 94 */ addic. r4, r1, 0x94 /* 802157F0 00212750 41 82 00 10 */ beq lbl_80215800 -/* 802157F4 00212754 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 802157F8 00212758 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 802157F4 00212754 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 802157F8 00212758 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 802157FC 0021275C 90 04 00 00 */ stw r0, 0(r4) lbl_80215800: /* 80215800 00212760 34 81 00 58 */ addic. r4, r1, 0x58 /* 80215804 00212764 41 82 00 10 */ beq lbl_80215814 -/* 80215808 00212768 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8021580C 0021276C 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 80215808 00212768 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8021580C 0021276C 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 80215810 00212770 90 04 00 00 */ stw r0, 0(r4) lbl_80215814: /* 80215814 00212774 88 10 03 D0 */ lbz r0, 0x3d0(r16) diff --git a/asm/MetroidPrime/Weapons/CPlasmaBeam.s b/asm/MetroidPrime/Weapons/CPlasmaBeam.s index dcdee721..3ac8dc0d 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaBeam.s +++ b/asm/MetroidPrime/Weapons/CPlasmaBeam.s @@ -898,20 +898,20 @@ __sinit_CPlasmaBeam_cpp: /* 800DF648 000DC5A8 48 2A A0 45 */ bl __register_global_object /* 800DF64C 000DC5AC 34 81 00 88 */ addic. r4, r1, 0x88 /* 800DF650 000DC5B0 41 82 00 10 */ beq lbl_800DF660 -/* 800DF654 000DC5B4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800DF658 000DC5B8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800DF654 000DC5B4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800DF658 000DC5B8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800DF65C 000DC5BC 90 04 00 00 */ stw r0, 0(r4) lbl_800DF660: /* 800DF660 000DC5C0 34 81 00 4C */ addic. r4, r1, 0x4c /* 800DF664 000DC5C4 41 82 00 10 */ beq lbl_800DF674 -/* 800DF668 000DC5C8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800DF66C 000DC5CC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800DF668 000DC5C8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800DF66C 000DC5CC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800DF670 000DC5D0 90 04 00 00 */ stw r0, 0(r4) lbl_800DF674: /* 800DF674 000DC5D4 34 81 00 10 */ addic. r4, r1, 0x10 /* 800DF678 000DC5D8 41 82 00 10 */ beq lbl_800DF688 -/* 800DF67C 000DC5DC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 800DF680 000DC5E0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 800DF67C 000DC5DC 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 800DF680 000DC5E0 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 800DF684 000DC5E4 90 04 00 00 */ stw r0, 0(r4) lbl_800DF688: /* 800DF688 000DC5E8 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -929,4 +929,3 @@ lbl_803CE530: .asciz "lasma2nd_1" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index 1b37597b..f772ca90 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -103,20 +103,20 @@ __dt__17CEnergyProjectileFv: /* 8013B924 00138884 41 82 00 40 */ beq lbl_8013B964 /* 8013B928 00138888 34 1E 03 7C */ addic. r0, r30, 0x37c /* 8013B92C 0013888C 41 82 00 10 */ beq lbl_8013B93C -/* 8013B930 00138890 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8013B934 00138894 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8013B930 00138890 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8013B934 00138894 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8013B938 00138898 90 1E 03 7C */ stw r0, 0x37c(r30) lbl_8013B93C: /* 8013B93C 0013889C 34 1E 03 40 */ addic. r0, r30, 0x340 /* 8013B940 001388A0 41 82 00 10 */ beq lbl_8013B950 -/* 8013B944 001388A4 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8013B948 001388A8 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8013B944 001388A4 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8013B948 001388A8 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8013B94C 001388AC 90 1E 03 40 */ stw r0, 0x340(r30) lbl_8013B950: /* 8013B950 001388B0 34 1E 03 04 */ addic. r0, r30, 0x304 /* 8013B954 001388B4 41 82 00 10 */ beq lbl_8013B964 -/* 8013B958 001388B8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha -/* 8013B95C 001388BC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8013B958 001388B8 3C 60 80 3E */ lis r3, __vt__22CCameraShakerComponent@ha +/* 8013B95C 001388BC 38 03 8E A8 */ addi r0, r3, __vt__22CCameraShakerComponent@l /* 8013B960 001388C0 90 1E 03 04 */ stw r0, 0x304(r30) lbl_8013B964: /* 8013B964 001388C4 7F C3 F3 78 */ mr r3, r30 diff --git a/configure.py b/configure.py index 3ef7c2c9..fe99011d 100755 --- a/configure.py +++ b/configure.py @@ -148,7 +148,7 @@ LIBS = [ "MetroidPrime/Player/CMorphBall", "MetroidPrime/ScriptObjects/CScriptDamageableTrigger", "MetroidPrime/ScriptObjects/CScriptDebris", - "MetroidPrime/ScriptObjects/CScriptCameraShaker", + ["MetroidPrime/ScriptObjects/CScriptCameraShaker", True], "MetroidPrime/ScriptObjects/CScriptActorKeyframe", ["MetroidPrime/CConsoleOutputWindow", False], "MetroidPrime/ScriptObjects/CScriptWater", diff --git a/include/MetroidPrime/Cameras/CCameraManager.hpp b/include/MetroidPrime/Cameras/CCameraManager.hpp index 36671151..c0a041e0 100644 --- a/include/MetroidPrime/Cameras/CCameraManager.hpp +++ b/include/MetroidPrime/Cameras/CCameraManager.hpp @@ -29,6 +29,9 @@ public: void SetPlayerCamera(CStateManager& mgr, TUniqueId newCamId); void SetFogDensity(float fogDensityTarget, float fogDensitySpeed); bool IsInCinematicCamera() const; + + void RemoveCameraShaker(int id); + int AddCameraShaker(const CCameraShakeData& data, bool sfx); static float DefaultThirdPersonFov(); diff --git a/include/MetroidPrime/Cameras/CCameraShakeData.hpp b/include/MetroidPrime/Cameras/CCameraShakeData.hpp index a4bef5e4..350cf6ae 100644 --- a/include/MetroidPrime/Cameras/CCameraShakeData.hpp +++ b/include/MetroidPrime/Cameras/CCameraShakeData.hpp @@ -17,7 +17,7 @@ CHECK_SIZEOF(SCameraShakePoint, 0x18) class CCameraShakerComponent { public: - virtual ~CCameraShakerComponent(); + virtual ~CCameraShakerComponent() {} private: bool x4_useModulation; @@ -28,13 +28,18 @@ private: CHECK_SIZEOF(CCameraShakerComponent, 0x3c) class CCameraShakeData { +public: + CCameraShakeData(const CCameraShakeData&); + void SetShakerId(int id) { xbc_shakerId = id; } + int GetShakerId() const { return xbc_shakerId; } + private: float x0_duration; float x4_curTime; CCameraShakerComponent x8_shakerX; CCameraShakerComponent x44_shakerY; CCameraShakerComponent x80_shakerZ; - uint xbc_shakerId; + int xbc_shakerId; uint xc0_flags; CVector3f xc4_sfxPos; float xd0_sfxDist; diff --git a/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp new file mode 100644 index 00000000..a3412fdf --- /dev/null +++ b/include/MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp @@ -0,0 +1,20 @@ +#ifndef _CSCRIPTCAMERASHAKER +#define _CSCRIPTCAMERASHAKER + +#include "MetroidPrime/CEntity.hpp" + +#include "MetroidPrime/Cameras/CCameraShakeData.hpp" + +class CScriptCameraShaker : public CEntity { + CCameraShakeData x34_shakeData; + +public: + CScriptCameraShaker(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, bool active, + const CCameraShakeData& shakeData); + ~CScriptCameraShaker(); + + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; +}; + +#endif // _CSCRIPTCAMERASHAKER diff --git a/obj_files.mk b/obj_files.mk index 3fd2bda5..10f08f1b 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -113,7 +113,7 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/Player/CMorphBall.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptDebris.o\ - $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptCameraShaker.o\ + $(BUILD_DIR)/src/MetroidPrime/ScriptObjects/CScriptCameraShaker.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.o\ $(BUILD_DIR)/asm/MetroidPrime/CConsoleOutputWindow.o\ $(BUILD_DIR)/asm/MetroidPrime/ScriptObjects/CScriptWater.o\ diff --git a/src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp b/src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp new file mode 100644 index 00000000..495919df --- /dev/null +++ b/src/MetroidPrime/ScriptObjects/CScriptCameraShaker.cpp @@ -0,0 +1,41 @@ +#include "MetroidPrime/ScriptObjects/CScriptCameraShaker.hpp" + +#include "MetroidPrime/CGameArea.hpp" +#include "MetroidPrime/CStateManager.hpp" +#include "MetroidPrime/CWorld.hpp" +#include "MetroidPrime/Cameras/CCameraManager.hpp" + + +CScriptCameraShaker::CScriptCameraShaker(TUniqueId uid, const rstl::string& name, + const CEntityInfo& info, bool active, + const CCameraShakeData& shakeData) +: CEntity(uid, info, active, name), x34_shakeData(shakeData) {} + +void CScriptCameraShaker::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, + CStateManager& stateMgr) { + switch (msg) { + case kSM_Action: { + if (GetActive() && GetCurrentAreaId() != kInvalidAreaId) { + const CGameArea& area = stateMgr.GetWorld()->GetAreaAlways(GetCurrentAreaId()); + CGameArea::EOcclusionState occState = + area.IsLoaded() ? area.GetOcclusionState() : CGameArea::kOS_Occluded; + if (occState != CGameArea::kOS_Occluded) { + x34_shakeData.SetShakerId(stateMgr.CameraManager()->AddCameraShaker(x34_shakeData, false)); + } + } + break; + } + case kSM_Deactivate: { + if (GetActive()) + stateMgr.CameraManager()->RemoveCameraShaker(x34_shakeData.GetShakerId()); + break; + } + default: + break; + } + CEntity::AcceptScriptMsg(msg, objId, stateMgr); +} + +void CScriptCameraShaker::Accept(IVisitor& visitor) { visitor.Visit(*this); } + +CScriptCameraShaker::~CScriptCameraShaker() {}