diff --git a/asm/MetroidPrime/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s index ebd6339d..bbf62f7b 100644 --- a/asm/MetroidPrime/BodyState/CBSAttack.s +++ b/asm/MetroidPrime/BodyState/CBSAttack.s @@ -54,8 +54,8 @@ __dt__9CBSAttackFv: /* 80134E08 00131D68 38 03 AA 08 */ addi r0, r3, lbl_803DAA08@l /* 80134E0C 00131D6C 90 1F 00 08 */ stw r0, 8(r31) /* 80134E10 00131D70 41 82 00 10 */ beq lbl_80134E20 -/* 80134E14 00131D74 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80134E18 00131D78 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80134E14 00131D74 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80134E18 00131D78 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80134E1C 00131D7C 90 1F 00 08 */ stw r0, 8(r31) lbl_80134E20: /* 80134E20 00131D80 28 1F 00 00 */ cmplwi r31, 0 @@ -604,10 +604,10 @@ __ct__9CBSAttackFv: /* 801355B8 00132518 90 03 00 00 */ stw r0, 0(r3) /* 801355BC 0013251C 3C 80 80 3E */ lis r4, lbl_803DAA08@ha /* 801355C0 00132520 39 26 66 A0 */ addi r9, r6, sZeroVector__9CVector3f@l -/* 801355C4 00132524 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801355C4 00132524 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801355C8 00132528 91 43 00 04 */ stw r10, 4(r3) /* 801355CC 0013252C 38 04 AA 08 */ addi r0, r4, lbl_803DAA08@l -/* 801355D0 00132530 38 C5 AA 68 */ addi r6, r5, lbl_803DAA68@l +/* 801355D0 00132530 38 C5 AA 68 */ addi r6, r5, __vt__13CBodyStateCmd@l /* 801355D4 00132534 38 A0 00 11 */ li r5, 0x11 /* 801355D8 00132538 81 09 00 00 */ lwz r8, 0(r9) /* 801355DC 0013253C 80 E9 00 04 */ lwz r7, 4(r9) diff --git a/asm/MetroidPrime/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s index 744322b4..2a96c4b1 100644 --- a/asm/MetroidPrime/BodyState/CBodyController.s +++ b/asm/MetroidPrime/BodyState/CBodyController.s @@ -87,9 +87,9 @@ lbl_80139E0C: /* 80139E50 00136DB0 48 0B 77 E5 */ bl HasIceBreakoutState__15CBodyControllerFv /* 80139E54 00136DB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80139E58 00136DB8 41 82 00 84 */ beq lbl_80139EDC -/* 80139E5C 00136DBC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80139E5C 00136DBC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80139E60 00136DC0 C0 02 9A 70 */ lfs f0, lbl_805AB790@sda21(r2) -/* 80139E64 00136DC4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80139E64 00136DC4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80139E68 00136DC8 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80139E6C 00136DCC 90 01 00 08 */ stw r0, 8(r1) /* 80139E70 00136DD0 38 C3 10 C8 */ addi r6, r3, lbl_803E10C8@l @@ -108,9 +108,9 @@ lbl_80139E0C: /* 80139EA4 00136E04 80 01 00 0C */ lwz r0, 0xc(r1) /* 80139EA8 00136E08 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80139EAC 00136E0C 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 80139EB0 00136E10 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80139EB0 00136E10 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80139EB4 00136E14 90 1F 02 88 */ stw r0, 0x288(r31) -/* 80139EB8 00136E18 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80139EB8 00136E18 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80139EBC 00136E1C C0 01 00 10 */ lfs f0, 0x10(r1) /* 80139EC0 00136E20 80 A1 00 14 */ lwz r5, 0x14(r1) /* 80139EC4 00136E24 D0 1F 02 8C */ stfs f0, 0x28c(r31) @@ -138,9 +138,9 @@ StopElectrocution__15CBodyControllerFv: /* 80139F0C 00136E6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80139F10 00136E70 7C 08 02 A6 */ mflr r0 /* 80139F14 00136E74 7C 66 1B 78 */ mr r6, r3 -/* 80139F18 00136E78 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80139F18 00136E78 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80139F1C 00136E7C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80139F20 00136E80 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80139F20 00136E80 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80139F24 00136E84 C0 02 9A 78 */ lfs f0, lbl_805AB798@sda21(r2) /* 80139F28 00136E88 38 00 00 1B */ li r0, 0x1b /* 80139F2C 00136E8C 38 66 00 04 */ addi r3, r6, 4 @@ -152,8 +152,8 @@ StopElectrocution__15CBodyControllerFv: /* 80139F44 00136EA4 4B FF 78 75 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80139F48 00136EA8 34 01 00 08 */ addic. r0, r1, 8 /* 80139F4C 00136EAC 41 82 00 10 */ beq lbl_80139F5C -/* 80139F50 00136EB0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80139F54 00136EB4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80139F50 00136EB0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80139F54 00136EB4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80139F58 00136EB8 90 01 00 08 */ stw r0, 8(r1) lbl_80139F5C: /* 80139F5C 00136EBC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -176,9 +176,9 @@ SetElectrocuting__15CBodyControllerFf: /* 80139F94 00136EF4 FF E0 08 90 */ fmr f31, f1 /* 80139F98 00136EF8 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 80139F9C 00136EFC 41 81 00 84 */ bgt lbl_8013A020 -/* 80139FA0 00136F00 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80139FA0 00136F00 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80139FA4 00136F04 C0 02 9A 70 */ lfs f0, lbl_805AB790@sda21(r2) -/* 80139FA8 00136F08 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80139FA8 00136F08 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80139FAC 00136F0C 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80139FB0 00136F10 90 01 00 08 */ stw r0, 8(r1) /* 80139FB4 00136F14 38 C3 10 C8 */ addi r6, r3, lbl_803E10C8@l @@ -197,9 +197,9 @@ SetElectrocuting__15CBodyControllerFf: /* 80139FE8 00136F48 80 01 00 0C */ lwz r0, 0xc(r1) /* 80139FEC 00136F4C 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80139FF0 00136F50 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 80139FF4 00136F54 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80139FF4 00136F54 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80139FF8 00136F58 90 1E 02 88 */ stw r0, 0x288(r30) -/* 80139FFC 00136F5C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80139FFC 00136F5C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8013A000 00136F60 C0 01 00 10 */ lfs f0, 0x10(r1) /* 8013A004 00136F64 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8013A008 00136F68 D0 1E 02 8C */ stfs f0, 0x28c(r30) @@ -1287,4 +1287,3 @@ lbl_803D0060: .asciz "Whole Body" .balign 4 .4byte 0 - diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s index e41d5b96..39fd05c4 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s +++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s @@ -334,8 +334,8 @@ __dt__16CBodyStateCmdMgrFv: /* 80131864 0012E7C4 D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 80131868 0012E7C8 90 1F 00 B4 */ stw r0, 0xb4(r31) /* 8013186C 0012E7CC 41 82 00 10 */ beq lbl_8013187C -/* 80131870 0012E7D0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131874 0012E7D4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131870 0012E7D0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131874 0012E7D4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131878 0012E7D8 90 1F 02 98 */ stw r0, 0x298(r31) lbl_8013187C: /* 8013187C 0012E7DC 34 1F 02 84 */ addic. r0, r31, 0x284 @@ -345,8 +345,8 @@ lbl_8013187C: /* 8013188C 0012E7EC 38 03 10 C8 */ addi r0, r3, lbl_803E10C8@l /* 80131890 0012E7F0 90 1F 02 84 */ stw r0, 0x284(r31) /* 80131894 0012E7F4 41 82 00 10 */ beq lbl_801318A4 -/* 80131898 0012E7F8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8013189C 0012E7FC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131898 0012E7F8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8013189C 0012E7FC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801318A0 0012E800 90 1F 02 84 */ stw r0, 0x284(r31) lbl_801318A4: /* 801318A4 0012E804 34 1F 02 78 */ addic. r0, r31, 0x278 @@ -356,8 +356,8 @@ lbl_801318A4: /* 801318B4 0012E814 38 03 10 BC */ addi r0, r3, lbl_803E10BC@l /* 801318B8 0012E818 90 1F 02 78 */ stw r0, 0x278(r31) /* 801318BC 0012E81C 41 82 00 10 */ beq lbl_801318CC -/* 801318C0 0012E820 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801318C4 0012E824 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801318C0 0012E820 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801318C4 0012E824 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801318C8 0012E828 90 1F 02 78 */ stw r0, 0x278(r31) lbl_801318CC: /* 801318CC 0012E82C 34 1F 02 70 */ addic. r0, r31, 0x270 @@ -367,20 +367,20 @@ lbl_801318CC: /* 801318DC 0012E83C 38 03 06 1C */ addi r0, r3, lbl_803E061C@l /* 801318E0 0012E840 90 1F 02 70 */ stw r0, 0x270(r31) /* 801318E4 0012E844 41 82 00 10 */ beq lbl_801318F4 -/* 801318E8 0012E848 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801318EC 0012E84C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801318E8 0012E848 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801318EC 0012E84C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801318F0 0012E850 90 1F 02 70 */ stw r0, 0x270(r31) lbl_801318F4: /* 801318F4 0012E854 34 1F 02 68 */ addic. r0, r31, 0x268 /* 801318F8 0012E858 41 82 00 10 */ beq lbl_80131908 -/* 801318FC 0012E85C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131900 0012E860 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801318FC 0012E85C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131900 0012E860 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131904 0012E864 90 1F 02 68 */ stw r0, 0x268(r31) lbl_80131908: /* 80131908 0012E868 34 1F 02 60 */ addic. r0, r31, 0x260 /* 8013190C 0012E86C 41 82 00 10 */ beq lbl_8013191C -/* 80131910 0012E870 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131914 0012E874 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131910 0012E870 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131914 0012E874 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131918 0012E878 90 1F 02 60 */ stw r0, 0x260(r31) lbl_8013191C: /* 8013191C 0012E87C 34 1F 02 54 */ addic. r0, r31, 0x254 @@ -390,8 +390,8 @@ lbl_8013191C: /* 8013192C 0012E88C 38 03 0B 98 */ addi r0, r3, lbl_803E0B98@l /* 80131930 0012E890 90 1F 02 54 */ stw r0, 0x254(r31) /* 80131934 0012E894 41 82 00 10 */ beq lbl_80131944 -/* 80131938 0012E898 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8013193C 0012E89C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131938 0012E898 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8013193C 0012E89C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131940 0012E8A0 90 1F 02 54 */ stw r0, 0x254(r31) lbl_80131944: /* 80131944 0012E8A4 34 1F 02 30 */ addic. r0, r31, 0x230 @@ -401,19 +401,19 @@ lbl_80131944: /* 80131954 0012E8B4 38 03 0B 8C */ addi r0, r3, lbl_803E0B8C@l /* 80131958 0012E8B8 90 1F 02 30 */ stw r0, 0x230(r31) /* 8013195C 0012E8BC 41 82 00 10 */ beq lbl_8013196C -/* 80131960 0012E8C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131964 0012E8C4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131960 0012E8C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131964 0012E8C4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131968 0012E8C8 90 1F 02 30 */ stw r0, 0x230(r31) lbl_8013196C: /* 8013196C 0012E8CC 34 1F 02 1C */ addic. r0, r31, 0x21c /* 80131970 0012E8D0 41 82 00 24 */ beq lbl_80131994 -/* 80131974 0012E8D4 3C 60 80 3E */ lis r3, lbl_803DFE40@ha +/* 80131974 0012E8D4 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha /* 80131978 0012E8D8 34 1F 02 1C */ addic. r0, r31, 0x21c -/* 8013197C 0012E8DC 38 03 FE 40 */ addi r0, r3, lbl_803DFE40@l +/* 8013197C 0012E8DC 38 03 FE 40 */ addi r0, r3, __vt__14CBCScriptedCmd@l /* 80131980 0012E8E0 90 1F 02 1C */ stw r0, 0x21c(r31) /* 80131984 0012E8E4 41 82 00 10 */ beq lbl_80131994 -/* 80131988 0012E8E8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8013198C 0012E8EC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131988 0012E8E8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8013198C 0012E8EC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131990 0012E8F0 90 1F 02 1C */ stw r0, 0x21c(r31) lbl_80131994: /* 80131994 0012E8F4 34 1F 02 10 */ addic. r0, r31, 0x210 @@ -423,8 +423,8 @@ lbl_80131994: /* 801319A4 0012E904 38 03 AA 14 */ addi r0, r3, lbl_803DAA14@l /* 801319A8 0012E908 90 1F 02 10 */ stw r0, 0x210(r31) /* 801319AC 0012E90C 41 82 00 10 */ beq lbl_801319BC -/* 801319B0 0012E910 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801319B4 0012E914 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801319B0 0012E910 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801319B4 0012E914 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801319B8 0012E918 90 1F 02 10 */ stw r0, 0x210(r31) lbl_801319BC: /* 801319BC 0012E91C 34 1F 01 F8 */ addic. r0, r31, 0x1f8 @@ -434,8 +434,8 @@ lbl_801319BC: /* 801319CC 0012E92C 38 03 AA 08 */ addi r0, r3, lbl_803DAA08@l /* 801319D0 0012E930 90 1F 01 F8 */ stw r0, 0x1f8(r31) /* 801319D4 0012E934 41 82 00 10 */ beq lbl_801319E4 -/* 801319D8 0012E938 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801319DC 0012E93C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801319D8 0012E938 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801319DC 0012E93C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801319E0 0012E940 90 1F 01 F8 */ stw r0, 0x1f8(r31) lbl_801319E4: /* 801319E4 0012E944 34 1F 01 D0 */ addic. r0, r31, 0x1d0 @@ -445,8 +445,8 @@ lbl_801319E4: /* 801319F4 0012E954 38 03 A9 FC */ addi r0, r3, lbl_803DA9FC@l /* 801319F8 0012E958 90 1F 01 D0 */ stw r0, 0x1d0(r31) /* 801319FC 0012E95C 41 82 00 10 */ beq lbl_80131A0C -/* 80131A00 0012E960 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A04 0012E964 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A00 0012E960 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A04 0012E964 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A08 0012E968 90 1F 01 D0 */ stw r0, 0x1d0(r31) lbl_80131A0C: /* 80131A0C 0012E96C 34 1F 01 AC */ addic. r0, r31, 0x1ac @@ -456,8 +456,8 @@ lbl_80131A0C: /* 80131A1C 0012E97C 38 03 AA 5C */ addi r0, r3, lbl_803DAA5C@l /* 80131A20 0012E980 90 1F 01 AC */ stw r0, 0x1ac(r31) /* 80131A24 0012E984 41 82 00 10 */ beq lbl_80131A34 -/* 80131A28 0012E988 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A2C 0012E98C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A28 0012E988 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A2C 0012E98C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A30 0012E990 90 1F 01 AC */ stw r0, 0x1ac(r31) lbl_80131A34: /* 80131A34 0012E994 34 1F 01 8C */ addic. r0, r31, 0x18c @@ -467,32 +467,32 @@ lbl_80131A34: /* 80131A44 0012E9A4 38 03 A9 F0 */ addi r0, r3, lbl_803DA9F0@l /* 80131A48 0012E9A8 90 1F 01 8C */ stw r0, 0x18c(r31) /* 80131A4C 0012E9AC 41 82 00 10 */ beq lbl_80131A5C -/* 80131A50 0012E9B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A54 0012E9B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A50 0012E9B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A54 0012E9B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A58 0012E9B8 90 1F 01 8C */ stw r0, 0x18c(r31) lbl_80131A5C: /* 80131A5C 0012E9BC 34 1F 01 84 */ addic. r0, r31, 0x184 /* 80131A60 0012E9C0 41 82 00 10 */ beq lbl_80131A70 -/* 80131A64 0012E9C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A68 0012E9C8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A64 0012E9C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A68 0012E9C8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A6C 0012E9CC 90 1F 01 84 */ stw r0, 0x184(r31) lbl_80131A70: /* 80131A70 0012E9D0 34 1F 01 7C */ addic. r0, r31, 0x17c /* 80131A74 0012E9D4 41 82 00 10 */ beq lbl_80131A84 -/* 80131A78 0012E9D8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A7C 0012E9DC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A78 0012E9D8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A7C 0012E9DC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A80 0012E9E0 90 1F 01 7C */ stw r0, 0x17c(r31) lbl_80131A84: /* 80131A84 0012E9E4 34 1F 01 74 */ addic. r0, r31, 0x174 /* 80131A88 0012E9E8 41 82 00 10 */ beq lbl_80131A98 -/* 80131A8C 0012E9EC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131A90 0012E9F0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131A8C 0012E9EC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131A90 0012E9F0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131A94 0012E9F4 90 1F 01 74 */ stw r0, 0x174(r31) lbl_80131A98: /* 80131A98 0012E9F8 34 1F 01 6C */ addic. r0, r31, 0x16c /* 80131A9C 0012E9FC 41 82 00 10 */ beq lbl_80131AAC -/* 80131AA0 0012EA00 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131AA4 0012EA04 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131AA0 0012EA00 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131AA4 0012EA04 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131AA8 0012EA08 90 1F 01 6C */ stw r0, 0x16c(r31) lbl_80131AAC: /* 80131AAC 0012EA0C 34 1F 01 60 */ addic. r0, r31, 0x160 @@ -502,8 +502,8 @@ lbl_80131AAC: /* 80131ABC 0012EA1C 38 03 AA 38 */ addi r0, r3, lbl_803DAA38@l /* 80131AC0 0012EA20 90 1F 01 60 */ stw r0, 0x160(r31) /* 80131AC4 0012EA24 41 82 00 10 */ beq lbl_80131AD4 -/* 80131AC8 0012EA28 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131ACC 0012EA2C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131AC8 0012EA28 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131ACC 0012EA2C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131AD0 0012EA30 90 1F 01 60 */ stw r0, 0x160(r31) lbl_80131AD4: /* 80131AD4 0012EA34 34 1F 01 54 */ addic. r0, r31, 0x154 @@ -513,8 +513,8 @@ lbl_80131AD4: /* 80131AE4 0012EA44 38 03 AA 2C */ addi r0, r3, lbl_803DAA2C@l /* 80131AE8 0012EA48 90 1F 01 54 */ stw r0, 0x154(r31) /* 80131AEC 0012EA4C 41 82 00 10 */ beq lbl_80131AFC -/* 80131AF0 0012EA50 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131AF4 0012EA54 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131AF0 0012EA50 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131AF4 0012EA54 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131AF8 0012EA58 90 1F 01 54 */ stw r0, 0x154(r31) lbl_80131AFC: /* 80131AFC 0012EA5C 34 1F 01 44 */ addic. r0, r31, 0x144 @@ -524,8 +524,8 @@ lbl_80131AFC: /* 80131B0C 0012EA6C 38 03 10 B0 */ addi r0, r3, lbl_803E10B0@l /* 80131B10 0012EA70 90 1F 01 44 */ stw r0, 0x144(r31) /* 80131B14 0012EA74 41 82 00 10 */ beq lbl_80131B24 -/* 80131B18 0012EA78 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131B1C 0012EA7C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131B18 0012EA78 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131B1C 0012EA7C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131B20 0012EA80 90 1F 01 44 */ stw r0, 0x144(r31) lbl_80131B24: /* 80131B24 0012EA84 34 1F 01 28 */ addic. r0, r31, 0x128 @@ -535,8 +535,8 @@ lbl_80131B24: /* 80131B34 0012EA94 38 03 A9 CC */ addi r0, r3, lbl_803DA9CC@l /* 80131B38 0012EA98 90 1F 01 28 */ stw r0, 0x128(r31) /* 80131B3C 0012EA9C 41 82 00 10 */ beq lbl_80131B4C -/* 80131B40 0012EAA0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131B44 0012EAA4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131B40 0012EAA0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131B44 0012EAA4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131B48 0012EAA8 90 1F 01 28 */ stw r0, 0x128(r31) lbl_80131B4C: /* 80131B4C 0012EAAC 34 1F 01 0C */ addic. r0, r31, 0x10c @@ -546,8 +546,8 @@ lbl_80131B4C: /* 80131B5C 0012EABC 38 03 A9 D8 */ addi r0, r3, lbl_803DA9D8@l /* 80131B60 0012EAC0 90 1F 01 0C */ stw r0, 0x10c(r31) /* 80131B64 0012EAC4 41 82 00 10 */ beq lbl_80131B74 -/* 80131B68 0012EAC8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131B6C 0012EACC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131B68 0012EAC8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131B6C 0012EACC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131B70 0012EAD0 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_80131B74: /* 80131B74 0012EAD4 34 1F 00 F4 */ addic. r0, r31, 0xf4 @@ -557,8 +557,8 @@ lbl_80131B74: /* 80131B84 0012EAE4 38 03 AA 44 */ addi r0, r3, lbl_803DAA44@l /* 80131B88 0012EAE8 90 1F 00 F4 */ stw r0, 0xf4(r31) /* 80131B8C 0012EAEC 41 82 00 10 */ beq lbl_80131B9C -/* 80131B90 0012EAF0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131B94 0012EAF4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131B90 0012EAF0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131B94 0012EAF4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131B98 0012EAF8 90 1F 00 F4 */ stw r0, 0xf4(r31) lbl_80131B9C: /* 80131B9C 0012EAFC 34 1F 00 DC */ addic. r0, r31, 0xdc @@ -568,14 +568,14 @@ lbl_80131B9C: /* 80131BAC 0012EB0C 38 03 AA 50 */ addi r0, r3, lbl_803DAA50@l /* 80131BB0 0012EB10 90 1F 00 DC */ stw r0, 0xdc(r31) /* 80131BB4 0012EB14 41 82 00 10 */ beq lbl_80131BC4 -/* 80131BB8 0012EB18 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131BBC 0012EB1C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131BB8 0012EB18 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131BBC 0012EB1C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131BC0 0012EB20 90 1F 00 DC */ stw r0, 0xdc(r31) lbl_80131BC4: /* 80131BC4 0012EB24 34 1F 00 D4 */ addic. r0, r31, 0xd4 /* 80131BC8 0012EB28 41 82 00 10 */ beq lbl_80131BD8 -/* 80131BCC 0012EB2C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131BD0 0012EB30 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131BCC 0012EB2C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131BD0 0012EB30 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131BD4 0012EB34 90 1F 00 D4 */ stw r0, 0xd4(r31) lbl_80131BD8: /* 80131BD8 0012EB38 34 1F 00 C4 */ addic. r0, r31, 0xc4 @@ -585,8 +585,8 @@ lbl_80131BD8: /* 80131BE8 0012EB48 38 03 A9 E4 */ addi r0, r3, lbl_803DA9E4@l /* 80131BEC 0012EB4C 90 1F 00 C4 */ stw r0, 0xc4(r31) /* 80131BF0 0012EB50 41 82 00 10 */ beq lbl_80131C00 -/* 80131BF4 0012EB54 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131BF8 0012EB58 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131BF4 0012EB54 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131BF8 0012EB58 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131BFC 0012EB5C 90 1F 00 C4 */ stw r0, 0xc4(r31) lbl_80131C00: /* 80131C00 0012EB60 34 1F 00 B8 */ addic. r0, r31, 0xb8 @@ -596,8 +596,8 @@ lbl_80131C00: /* 80131C10 0012EB70 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l /* 80131C14 0012EB74 90 1F 00 B8 */ stw r0, 0xb8(r31) /* 80131C18 0012EB78 41 82 00 10 */ beq lbl_80131C28 -/* 80131C1C 0012EB7C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80131C20 0012EB80 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80131C1C 0012EB7C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80131C20 0012EB80 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80131C24 0012EB84 90 1F 00 B8 */ stw r0, 0xb8(r31) lbl_80131C28: /* 80131C28 0012EB88 34 1F 00 40 */ addic. r0, r31, 0x40 @@ -717,9 +717,9 @@ lbl_80131DA8: /* 80131DAC 0012ED0C 38 E7 00 04 */ addi r7, r7, 4 /* 80131DB0 0012ED10 42 00 FF A4 */ bdnz lbl_80131D54 /* 80131DB4 0012ED14 38 E0 00 00 */ li r7, 0 -/* 80131DB8 0012ED18 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80131DB8 0012ED18 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80131DBC 0012ED1C 90 E3 00 B4 */ stw r7, 0xb4(r3) -/* 80131DC0 0012ED20 38 C4 AA 68 */ addi r6, r4, lbl_803DAA68@l +/* 80131DC0 0012ED20 38 C4 AA 68 */ addi r6, r4, __vt__13CBodyStateCmd@l /* 80131DC4 0012ED24 3C A0 80 3E */ lis r5, lbl_803DAA20@ha /* 80131DC8 0012ED28 3D 80 80 3E */ lis r12, lbl_803DAA50@ha /* 80131DCC 0012ED2C 90 C3 00 B8 */ stw r6, 0xb8(r3) @@ -919,7 +919,7 @@ lbl_80131DA8: /* 801320D4 0012F034 90 B7 00 08 */ stw r5, 8(r23) /* 801320D8 0012F038 3D E0 80 3E */ lis r15, lbl_803DAA14@ha /* 801320DC 0012F03C C0 01 00 0C */ lfs f0, 0xc(r1) -/* 801320E0 0012F040 3E 20 80 3E */ lis r17, lbl_803DFE40@ha +/* 801320E0 0012F040 3E 20 80 3E */ lis r17, __vt__14CBCScriptedCmd@ha /* 801320E4 0012F044 C0 21 00 10 */ lfs f1, 0x10(r1) /* 801320E8 0012F048 38 00 00 12 */ li r0, 0x12 /* 801320EC 0012F04C D0 17 00 0C */ stfs f0, 0xc(r23) @@ -927,7 +927,7 @@ lbl_80131DA8: /* 801320F4 0012F054 C0 01 00 14 */ lfs f0, 0x14(r1) /* 801320F8 0012F058 3A 40 00 13 */ li r18, 0x13 /* 801320FC 0012F05C D0 37 00 10 */ stfs f1, 0x10(r23) -/* 80132100 0012F060 3A 31 FE 40 */ addi r17, r17, lbl_803DFE40@l +/* 80132100 0012F060 3A 31 FE 40 */ addi r17, r17, __vt__14CBCScriptedCmd@l /* 80132104 0012F064 C0 22 99 88 */ lfs f1, lbl_805AB6A8@sda21(r2) /* 80132108 0012F068 3E 00 80 3E */ lis r16, lbl_803E0B8C@ha /* 8013210C 0012F06C D0 17 00 14 */ stfs f0, 0x14(r23) @@ -1078,8 +1078,8 @@ __dt__22CBCAdditiveReactionCmdFv: /* 80132344 0012F2A4 38 03 10 C8 */ addi r0, r3, lbl_803E10C8@l /* 80132348 0012F2A8 90 1F 00 00 */ stw r0, 0(r31) /* 8013234C 0012F2AC 41 82 00 10 */ beq lbl_8013235C -/* 80132350 0012F2B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80132354 0012F2B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80132350 0012F2B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80132354 0012F2B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80132358 0012F2B8 90 1F 00 00 */ stw r0, 0(r31) lbl_8013235C: /* 8013235C 0012F2BC 7C 80 07 35 */ extsh. r0, r4 @@ -1106,8 +1106,8 @@ __dt__20CBCAdditiveFlinchCmdFv: /* 801323A0 0012F300 38 03 10 BC */ addi r0, r3, lbl_803E10BC@l /* 801323A4 0012F304 90 1F 00 00 */ stw r0, 0(r31) /* 801323A8 0012F308 41 82 00 10 */ beq lbl_801323B8 -/* 801323AC 0012F30C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801323B0 0012F310 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801323AC 0012F30C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801323B0 0012F310 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801323B4 0012F314 90 1F 00 00 */ stw r0, 0(r31) lbl_801323B8: /* 801323B8 0012F318 7C 80 07 35 */ extsh. r0, r4 @@ -1134,8 +1134,8 @@ __dt__16CBCLoopAttackCmdFv: /* 801323FC 0012F35C 38 03 10 B0 */ addi r0, r3, lbl_803E10B0@l /* 80132400 0012F360 90 1F 00 00 */ stw r0, 0(r31) /* 80132404 0012F364 41 82 00 10 */ beq lbl_80132414 -/* 80132408 0012F368 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8013240C 0012F36C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80132408 0012F368 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8013240C 0012F36C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80132410 0012F370 90 1F 00 00 */ stw r0, 0(r31) lbl_80132414: /* 80132414 0012F374 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 41c6be38..4e0904de 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -890,9 +890,9 @@ lbl_8021DBE4: /* 8021DC04 0021AB64 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f /* 8021DC08 0021AB68 40 82 00 B8 */ bne lbl_8021DCC0 /* 8021DC0C 0021AB6C 38 00 00 03 */ li r0, 3 -/* 8021DC10 0021AB70 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8021DC10 0021AB70 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8021DC14 0021AB74 90 1F 05 68 */ stw r0, 0x568(r31) -/* 8021DC18 0021AB78 38 C4 AA 68 */ addi r6, r4, lbl_803DAA68@l +/* 8021DC18 0021AB78 38 C4 AA 68 */ addi r6, r4, __vt__13CBodyStateCmd@l /* 8021DC1C 0021AB7C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8021DC20 0021AB80 38 E0 00 05 */ li r7, 5 /* 8021DC24 0021AB84 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) @@ -918,9 +918,9 @@ lbl_8021DBE4: /* 8021DC74 0021ABD4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8021DC78 0021ABD8 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8021DC7C 0021ABDC 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8021DC80 0021ABE0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021DC80 0021ABE0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021DC84 0021ABE4 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8021DC88 0021ABE8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8021DC88 0021ABE8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8021DC8C 0021ABEC 80 61 00 10 */ lwz r3, 0x10(r1) /* 8021DC90 0021ABF0 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8021DC94 0021ABF4 90 7F 01 14 */ stw r3, 0x114(r31) @@ -3032,9 +3032,9 @@ lbl_8021FACC: /* 8021FAE0 0021CA40 90 03 05 68 */ stw r0, 0x568(r3) /* 8021FAE4 0021CA44 48 00 00 90 */ b lbl_8021FB74 lbl_8021FAE8: -/* 8021FAE8 0021CA48 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FAE8 0021CA48 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FAEC 0021CA4C 38 A0 00 00 */ li r5, 0 -/* 8021FAF0 0021CA50 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8021FAF0 0021CA50 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8021FAF4 0021CA54 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 8021FAF8 0021CA58 90 01 00 08 */ stw r0, 8(r1) /* 8021FAFC 0021CA5C 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -3048,9 +3048,9 @@ lbl_8021FAE8: /* 8021FB1C 0021CA7C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8021FB20 0021CA80 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 8021FB24 0021CA84 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 8021FB28 0021CA88 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FB28 0021CA88 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FB2C 0021CA8C 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 8021FB30 0021CA90 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8021FB30 0021CA90 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8021FB34 0021CA94 80 61 00 10 */ lwz r3, 0x10(r1) /* 8021FB38 0021CA98 90 81 00 08 */ stw r4, 8(r1) /* 8021FB3C 0021CA9C 90 7F 00 C0 */ stw r3, 0xc0(r31) @@ -3113,12 +3113,12 @@ lbl_8021FBE8: /* 8021FBFC 0021CB5C 90 03 05 68 */ stw r0, 0x568(r3) /* 8021FC00 0021CB60 48 00 00 EC */ b lbl_8021FCEC lbl_8021FC04: -/* 8021FC04 0021CB64 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8021FC04 0021CB64 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8021FC08 0021CB68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8021FC0C 0021CB6C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8021FC10 0021CB70 80 81 00 24 */ lwz r4, 0x24(r1) /* 8021FC14 0021CB74 38 60 00 00 */ li r3, 0 -/* 8021FC18 0021CB78 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 8021FC18 0021CB78 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 8021FC1C 0021CB7C 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 8021FC20 0021CB80 C0 45 00 00 */ lfs f2, 0(r5) /* 8021FC24 0021CB84 C0 25 00 04 */ lfs f1, 4(r5) @@ -3147,9 +3147,9 @@ lbl_8021FC04: /* 8021FC80 0021CBE0 80 01 00 0C */ lwz r0, 0xc(r1) /* 8021FC84 0021CBE4 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8021FC88 0021CBE8 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8021FC8C 0021CBEC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FC8C 0021CBEC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FC90 0021CBF0 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8021FC94 0021CBF4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8021FC94 0021CBF4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8021FC98 0021CBF8 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8021FC9C 0021CBFC 80 61 00 14 */ lwz r3, 0x14(r1) /* 8021FCA0 0021CC00 90 BF 01 94 */ stw r5, 0x194(r31) @@ -3229,9 +3229,9 @@ lbl_8021FD90: /* 8021FDA4 0021CD04 41 82 00 08 */ beq lbl_8021FDAC /* 8021FDA8 0021CD08 48 00 00 EC */ b lbl_8021FE94 lbl_8021FDAC: -/* 8021FDAC 0021CD0C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FDAC 0021CD0C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FDB0 0021CD10 38 C0 00 01 */ li r6, 1 -/* 8021FDB4 0021CD14 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8021FDB4 0021CD14 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8021FDB8 0021CD18 80 7F 04 50 */ lwz r3, 0x450(r31) /* 8021FDBC 0021CD1C 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8021FDC0 0021CD20 90 01 00 10 */ stw r0, 0x10(r1) @@ -3248,9 +3248,9 @@ lbl_8021FDAC: /* 8021FDEC 0021CD4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021FDF0 0021CD50 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8021FDF4 0021CD54 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8021FDF8 0021CD58 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FDF8 0021CD58 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FDFC 0021CD5C 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8021FE00 0021CD60 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8021FE00 0021CD60 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8021FE04 0021CD64 80 C1 00 18 */ lwz r6, 0x18(r1) /* 8021FE08 0021CD68 38 00 00 03 */ li r0, 3 /* 8021FE0C 0021CD6C 80 A1 00 1C */ lwz r5, 0x1c(r1) @@ -3313,9 +3313,9 @@ Taunt__9CBabygothFR13CStateManager9EStateMsgf: /* 8021FED4 0021CE34 40 80 00 08 */ bge lbl_8021FEDC /* 8021FED8 0021CE38 48 00 00 8C */ b lbl_8021FF64 lbl_8021FEDC: -/* 8021FEDC 0021CE3C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8021FEDC 0021CE3C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8021FEE0 0021CE40 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 8021FEE4 0021CE44 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8021FEE4 0021CE44 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8021FEE8 0021CE48 3C 80 80 3E */ lis r4, lbl_803DAA14@ha /* 8021FEEC 0021CE4C 90 01 00 08 */ stw r0, 8(r1) /* 8021FEF0 0021CE50 38 A4 AA 14 */ addi r5, r4, lbl_803DAA14@l @@ -3331,9 +3331,9 @@ lbl_8021FEDC: /* 8021FF18 0021CE78 80 01 00 0C */ lwz r0, 0xc(r1) /* 8021FF1C 0021CE7C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 8021FF20 0021CE80 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 8021FF24 0021CE84 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8021FF24 0021CE84 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8021FF28 0021CE88 90 1E 02 14 */ stw r0, 0x214(r30) -/* 8021FF2C 0021CE8C 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8021FF2C 0021CE8C 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8021FF30 0021CE90 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8021FF34 0021CE94 38 00 00 03 */ li r0, 3 /* 8021FF38 0021CE98 90 81 00 08 */ stw r4, 8(r1) @@ -3545,12 +3545,12 @@ lbl_80220200: /* 80220220 0021D180 4B F1 A7 B9 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 80220224 0021D184 48 00 00 EC */ b lbl_80220310 lbl_80220228: -/* 80220228 0021D188 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 80220228 0021D188 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8022022C 0021D18C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80220230 0021D190 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80220234 0021D194 80 81 00 3C */ lwz r4, 0x3c(r1) /* 80220238 0021D198 38 60 00 00 */ li r3, 0 -/* 8022023C 0021D19C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 8022023C 0021D19C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 80220240 0021D1A0 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 80220244 0021D1A4 C0 45 00 00 */ lfs f2, 0(r5) /* 80220248 0021D1A8 C0 25 00 04 */ lfs f1, 4(r5) @@ -3579,9 +3579,9 @@ lbl_80220228: /* 802202A4 0021D204 80 01 00 24 */ lwz r0, 0x24(r1) /* 802202A8 0021D208 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 802202AC 0021D20C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 802202B0 0021D210 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802202B0 0021D210 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802202B4 0021D214 90 1F 01 90 */ stw r0, 0x190(r31) -/* 802202B8 0021D218 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802202B8 0021D218 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802202BC 0021D21C 80 A1 00 28 */ lwz r5, 0x28(r1) /* 802202C0 0021D220 80 61 00 2C */ lwz r3, 0x2c(r1) /* 802202C4 0021D224 90 BF 01 94 */ stw r5, 0x194(r31) @@ -3660,9 +3660,9 @@ lbl_80220398: /* 802203C8 0021D328 4B E3 0C F9 */ bl SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage /* 802203CC 0021D32C 48 00 00 E4 */ b lbl_802204B0 lbl_802203D0: -/* 802203D0 0021D330 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 802203D0 0021D330 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 802203D4 0021D334 38 C0 00 00 */ li r6, 0 -/* 802203D8 0021D338 39 27 AA 68 */ addi r9, r7, lbl_803DAA68@l +/* 802203D8 0021D338 39 27 AA 68 */ addi r9, r7, __vt__13CBodyStateCmd@l /* 802203DC 0021D33C 80 81 00 24 */ lwz r4, 0x24(r1) /* 802203E0 0021D340 50 C4 F8 00 */ rlwimi r4, r6, 0x1f, 0, 0 /* 802203E4 0021D344 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha @@ -3692,9 +3692,9 @@ lbl_802203D0: /* 80220444 0021D3A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80220448 0021D3A8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8022044C 0021D3AC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 80220450 0021D3B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80220450 0021D3B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80220454 0021D3B4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 80220458 0021D3B8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80220458 0021D3B8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022045C 0021D3BC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80220460 0021D3C0 80 61 00 14 */ lwz r3, 0x14(r1) /* 80220464 0021D3C4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4509,9 +4509,9 @@ lbl_80221024: /* 80221048 0021DFA8 D0 1F 03 B4 */ stfs f0, 0x3b4(r31) /* 8022104C 0021DFAC 48 00 01 3C */ b lbl_80221188 lbl_80221050: -/* 80221050 0021DFB0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80221050 0021DFB0 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80221054 0021DFB4 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha -/* 80221058 0021DFB8 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80221058 0021DFB8 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8022105C 0021DFBC 38 80 00 06 */ li r4, 6 /* 80221060 0021DFC0 90 01 00 38 */ stw r0, 0x38(r1) /* 80221064 0021DFC4 38 C3 A9 CC */ addi r6, r3, lbl_803DA9CC@l @@ -4531,9 +4531,9 @@ lbl_80221050: /* 8022109C 0021DFFC 80 01 00 3C */ lwz r0, 0x3c(r1) /* 802210A0 0021E000 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 802210A4 0021E004 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 802210A8 0021E008 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802210A8 0021E008 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802210AC 0021E00C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 802210B0 0021E010 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802210B0 0021E010 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802210B4 0021E014 80 61 00 40 */ lwz r3, 0x40(r1) /* 802210B8 0021E018 80 A1 00 44 */ lwz r5, 0x44(r1) /* 802210BC 0021E01C 90 7F 01 30 */ stw r3, 0x130(r31) @@ -4567,16 +4567,16 @@ lbl_80221104: /* 80221124 0021E084 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 80221128 0021E088 2C 00 00 12 */ cmpwi r0, 0x12 /* 8022112C 0021E08C 40 82 00 30 */ bne lbl_8022115C -/* 80221130 0021E090 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80221130 0021E090 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80221134 0021E094 38 00 00 0C */ li r0, 0xc -/* 80221138 0021E098 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80221138 0021E098 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8022113C 0021E09C 90 01 00 2C */ stw r0, 0x2c(r1) /* 80221140 0021E0A0 38 64 00 04 */ addi r3, r4, 4 /* 80221144 0021E0A4 38 81 00 28 */ addi r4, r1, 0x28 /* 80221148 0021E0A8 90 A1 00 28 */ stw r5, 0x28(r1) /* 8022114C 0021E0AC 4B F1 06 6D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80221150 0021E0B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80221154 0021E0B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80221150 0021E0B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80221154 0021E0B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80221158 0021E0B8 90 01 00 28 */ stw r0, 0x28(r1) lbl_8022115C: /* 8022115C 0021E0BC A1 1F 00 08 */ lhz r8, 8(r31) @@ -4843,9 +4843,9 @@ lbl_802214FC: /* 80221520 0021E480 D0 1E 03 B4 */ stfs f0, 0x3b4(r30) /* 80221524 0021E484 48 00 01 D8 */ b lbl_802216FC lbl_80221528: -/* 80221528 0021E488 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80221528 0021E488 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8022152C 0021E48C 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha -/* 80221530 0021E490 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80221530 0021E490 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80221534 0021E494 38 80 00 06 */ li r4, 6 /* 80221538 0021E498 90 01 00 58 */ stw r0, 0x58(r1) /* 8022153C 0021E49C 38 C3 A9 CC */ addi r6, r3, lbl_803DA9CC@l @@ -4865,9 +4865,9 @@ lbl_80221528: /* 80221574 0021E4D4 80 01 00 5C */ lwz r0, 0x5c(r1) /* 80221578 0021E4D8 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8022157C 0021E4DC 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 80221580 0021E4E0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80221580 0021E4E0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80221584 0021E4E4 90 1E 01 2C */ stw r0, 0x12c(r30) -/* 80221588 0021E4E8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80221588 0021E4E8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022158C 0021E4EC 80 61 00 60 */ lwz r3, 0x60(r1) /* 80221590 0021E4F0 80 A1 00 64 */ lwz r5, 0x64(r1) /* 80221594 0021E4F4 90 7E 01 30 */ stw r3, 0x130(r30) @@ -4937,16 +4937,16 @@ lbl_80221670: /* 80221684 0021E5E4 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 80221688 0021E5E8 2C 00 00 12 */ cmpwi r0, 0x12 /* 8022168C 0021E5EC 40 82 00 30 */ bne lbl_802216BC -/* 80221690 0021E5F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80221690 0021E5F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80221694 0021E5F4 38 00 00 0C */ li r0, 0xc -/* 80221698 0021E5F8 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80221698 0021E5F8 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8022169C 0021E5FC 90 01 00 34 */ stw r0, 0x34(r1) /* 802216A0 0021E600 38 64 00 04 */ addi r3, r4, 4 /* 802216A4 0021E604 38 81 00 30 */ addi r4, r1, 0x30 /* 802216A8 0021E608 90 A1 00 30 */ stw r5, 0x30(r1) /* 802216AC 0021E60C 4B F1 01 0D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 802216B0 0021E610 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 802216B4 0021E614 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802216B0 0021E610 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 802216B4 0021E614 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802216B8 0021E618 90 01 00 30 */ stw r0, 0x30(r1) lbl_802216BC: /* 802216BC 0021E61C 38 7E 08 F0 */ addi r3, r30, 0x8f0 diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 50279429..b81da300 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -2000,9 +2000,9 @@ lbl_800E4580: /* 800E45B0 000E1510 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 800E45B4 000E1514 2C 00 00 07 */ cmpwi r0, 7 /* 800E45B8 000E1518 40 82 00 48 */ bne lbl_800E4600 -/* 800E45BC 000E151C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E45BC 000E151C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E45C0 000E1520 38 00 00 0C */ li r0, 0xc -/* 800E45C4 000E1524 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 800E45C4 000E1524 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 800E45C8 000E1528 90 01 00 0C */ stw r0, 0xc(r1) /* 800E45CC 000E152C 38 64 00 04 */ addi r3, r4, 4 /* 800E45D0 000E1530 38 81 00 08 */ addi r4, r1, 8 @@ -2010,8 +2010,8 @@ lbl_800E4580: /* 800E45D8 000E1538 48 04 D1 E1 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 800E45DC 000E153C 34 01 00 08 */ addic. r0, r1, 8 /* 800E45E0 000E1540 41 82 00 10 */ beq lbl_800E45F0 -/* 800E45E4 000E1544 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 800E45E8 000E1548 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E45E4 000E1544 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 800E45E8 000E1548 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E45EC 000E154C 90 01 00 08 */ stw r0, 8(r1) lbl_800E45F0: /* 800E45F0 000E1550 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -2432,10 +2432,10 @@ lbl_800E4BE0: /* 800E4BEC 000E1B4C 4E 80 04 21 */ bctrl /* 800E4BF0 000E1B50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4BF4 000E1B54 41 82 00 D4 */ beq lbl_800E4CC8 -/* 800E4BF8 000E1B58 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 800E4BF8 000E1B58 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 800E4BFC 000E1B5C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E4C00 000E1B60 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 800E4C04 000E1B64 39 46 AA 68 */ addi r10, r6, lbl_803DAA68@l +/* 800E4C04 000E1B64 39 46 AA 68 */ addi r10, r6, __vt__13CBodyStateCmd@l /* 800E4C08 000E1B68 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 800E4C0C 000E1B6C 80 81 00 E0 */ lwz r4, 0xe0(r1) /* 800E4C10 000E1B70 38 A0 00 00 */ li r5, 0 @@ -2466,9 +2466,9 @@ lbl_800E4BE0: /* 800E4C74 000E1BD4 80 01 00 C8 */ lwz r0, 0xc8(r1) /* 800E4C78 000E1BD8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 800E4C7C 000E1BDC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 800E4C80 000E1BE0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E4C80 000E1BE0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E4C84 000E1BE4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 800E4C88 000E1BE8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E4C88 000E1BE8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E4C8C 000E1BEC 80 A1 00 CC */ lwz r5, 0xcc(r1) /* 800E4C90 000E1BF0 80 61 00 D0 */ lwz r3, 0xd0(r1) /* 800E4C94 000E1BF4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -2900,9 +2900,9 @@ lbl_800E52AC: lbl_800E52C8: /* 800E52C8 000E2228 38 A0 00 00 */ li r5, 0 lbl_800E52CC: -/* 800E52CC 000E222C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 800E52CC 000E222C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 800E52D0 000E2230 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 800E52D4 000E2234 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 800E52D4 000E2234 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 800E52D8 000E2238 3C 80 80 3E */ lis r4, lbl_803DAA14@ha /* 800E52DC 000E223C 90 01 00 08 */ stw r0, 8(r1) /* 800E52E0 000E2240 38 04 AA 14 */ addi r0, r4, lbl_803DAA14@l @@ -2917,9 +2917,9 @@ lbl_800E52CC: /* 800E5304 000E2264 80 01 00 0C */ lwz r0, 0xc(r1) /* 800E5308 000E2268 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 800E530C 000E226C 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 800E5310 000E2270 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E5310 000E2270 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E5314 000E2274 90 1E 02 14 */ stw r0, 0x214(r30) -/* 800E5318 000E2278 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 800E5318 000E2278 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 800E531C 000E227C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 800E5320 000E2280 38 00 00 02 */ li r0, 2 /* 800E5324 000E2284 90 81 00 08 */ stw r4, 8(r1) @@ -2986,9 +2986,9 @@ lbl_800E53DC: /* 800E53F8 000E2358 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 800E53FC 000E235C 41 82 01 00 */ beq lbl_800E54FC /* 800E5400 000E2360 C0 5E 00 38 */ lfs f2, 0x38(r30) -/* 800E5404 000E2364 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E5404 000E2364 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E5408 000E2368 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 800E540C 000E236C 38 E3 AA 68 */ addi r7, r3, lbl_803DAA68@l +/* 800E540C 000E236C 38 E3 AA 68 */ addi r7, r3, __vt__13CBodyStateCmd@l /* 800E5410 000E2370 C0 1E 00 58 */ lfs f0, 0x58(r30) /* 800E5414 000E2374 3C 80 80 3E */ lis r4, lbl_803DAA08@ha /* 800E5418 000E2378 D0 41 00 08 */ stfs f2, 8(r1) @@ -3021,9 +3021,9 @@ lbl_800E53DC: /* 800E5484 000E23E4 80 01 00 24 */ lwz r0, 0x24(r1) /* 800E5488 000E23E8 3C 60 80 3E */ lis r3, lbl_803DAA08@ha /* 800E548C 000E23EC 38 83 AA 08 */ addi r4, r3, lbl_803DAA08@l -/* 800E5490 000E23F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E5490 000E23F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E5494 000E23F4 90 1F 01 FC */ stw r0, 0x1fc(r31) -/* 800E5498 000E23F8 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 800E5498 000E23F8 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 800E549C 000E23FC 80 C1 00 28 */ lwz r6, 0x28(r1) /* 800E54A0 000E2400 38 00 00 02 */ li r0, 2 /* 800E54A4 000E2404 80 A1 00 2C */ lwz r5, 0x2c(r1) @@ -3534,9 +3534,9 @@ lbl_800E5B7C: /* 800E5BB4 000E2B14 48 04 BB 65 */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd /* 800E5BB8 000E2B18 48 00 00 74 */ b lbl_800E5C2C lbl_800E5BBC: -/* 800E5BBC 000E2B1C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 800E5BBC 000E2B1C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 800E5BC0 000E2B20 80 9F 04 50 */ lwz r4, 0x450(r31) -/* 800E5BC4 000E2B24 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 800E5BC4 000E2B24 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 800E5BC8 000E2B28 3C A0 80 3E */ lis r5, lbl_803DA9E4@ha /* 800E5BCC 000E2B2C 90 01 00 08 */ stw r0, 8(r1) /* 800E5BD0 000E2B30 38 A5 A9 E4 */ addi r5, r5, lbl_803DA9E4@l @@ -3553,9 +3553,9 @@ lbl_800E5BBC: /* 800E5BFC 000E2B5C 80 01 00 0C */ lwz r0, 0xc(r1) /* 800E5C00 000E2B60 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 800E5C04 000E2B64 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 800E5C08 000E2B68 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E5C08 000E2B68 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E5C0C 000E2B6C 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 800E5C10 000E2B70 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E5C10 000E2B70 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E5C14 000E2B74 80 A1 00 10 */ lwz r5, 0x10(r1) /* 800E5C18 000E2B78 90 81 00 08 */ stw r4, 8(r1) /* 800E5C1C 000E2B7C 80 61 00 14 */ lwz r3, 0x14(r1) @@ -3632,10 +3632,10 @@ lbl_800E5CFC: /* 800E5D10 000E2C70 90 03 05 68 */ stw r0, 0x568(r3) /* 800E5D14 000E2C74 48 00 00 F4 */ b lbl_800E5E08 lbl_800E5D18: -/* 800E5D18 000E2C78 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 800E5D18 000E2C78 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 800E5D1C 000E2C7C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E5D20 000E2C80 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 800E5D24 000E2C84 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 800E5D24 000E2C84 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 800E5D28 000E2C88 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 800E5D2C 000E2C8C 90 A1 00 08 */ stw r5, 8(r1) /* 800E5D30 000E2C90 38 00 00 00 */ li r0, 0 @@ -3657,9 +3657,9 @@ lbl_800E5D18: /* 800E5D70 000E2CD0 80 01 00 0C */ lwz r0, 0xc(r1) /* 800E5D74 000E2CD4 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 800E5D78 000E2CD8 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 800E5D7C 000E2CDC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E5D7C 000E2CDC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E5D80 000E2CE0 90 1F 01 10 */ stw r0, 0x110(r31) -/* 800E5D84 000E2CE4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E5D84 000E2CE4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E5D88 000E2CE8 80 61 00 10 */ lwz r3, 0x10(r1) /* 800E5D8C 000E2CEC 80 A1 00 14 */ lwz r5, 0x14(r1) /* 800E5D90 000E2CF0 90 7F 01 14 */ stw r3, 0x114(r31) @@ -3942,9 +3942,9 @@ lbl_800E6184: /* 800E6190 000E30F0 4E 80 04 21 */ bctrl /* 800E6194 000E30F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6198 000E30F8 41 82 00 90 */ beq lbl_800E6228 -/* 800E619C 000E30FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E619C 000E30FC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E61A0 000E3100 38 C0 00 01 */ li r6, 1 -/* 800E61A4 000E3104 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E61A4 000E3104 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E61A8 000E3108 80 7F 04 50 */ lwz r3, 0x450(r31) /* 800E61AC 000E310C 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 800E61B0 000E3110 90 01 00 08 */ stw r0, 8(r1) @@ -3961,9 +3961,9 @@ lbl_800E6184: /* 800E61DC 000E313C 80 01 00 0C */ lwz r0, 0xc(r1) /* 800E61E0 000E3140 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 800E61E4 000E3144 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 800E61E8 000E3148 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E61E8 000E3148 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E61EC 000E314C 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 800E61F0 000E3150 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E61F0 000E3150 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E61F4 000E3154 80 A1 00 10 */ lwz r5, 0x10(r1) /* 800E61F8 000E3158 90 81 00 08 */ stw r4, 8(r1) /* 800E61FC 000E315C 80 61 00 14 */ lwz r3, 0x14(r1) @@ -4321,9 +4321,9 @@ lbl_800E66E4: /* 800E66F0 000E3650 4E 80 04 21 */ bctrl /* 800E66F4 000E3654 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E66F8 000E3658 41 82 01 58 */ beq lbl_800E6850 -/* 800E66FC 000E365C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 800E66FC 000E365C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 800E6700 000E3660 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 800E6704 000E3664 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 800E6704 000E3664 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 800E6708 000E3668 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 800E670C 000E366C 90 01 00 18 */ stw r0, 0x18(r1) /* 800E6710 000E3670 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -4341,9 +4341,9 @@ lbl_800E66E4: /* 800E6740 000E36A0 80 01 00 1C */ lwz r0, 0x1c(r1) /* 800E6744 000E36A4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 800E6748 000E36A8 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 800E674C 000E36AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E674C 000E36AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E6750 000E36B0 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 800E6754 000E36B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E6754 000E36B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E6758 000E36B8 80 A1 00 20 */ lwz r5, 0x20(r1) /* 800E675C 000E36BC 90 81 00 18 */ stw r4, 0x18(r1) /* 800E6760 000E36C0 80 61 00 24 */ lwz r3, 0x24(r1) @@ -4362,9 +4362,9 @@ lbl_800E6774: /* 800E6790 000E36F0 4E 80 04 21 */ bctrl /* 800E6794 000E36F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6798 000E36F8 41 82 00 B8 */ beq lbl_800E6850 -/* 800E679C 000E36FC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 800E679C 000E36FC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 800E67A0 000E3700 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 800E67A4 000E3704 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 800E67A4 000E3704 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 800E67A8 000E3708 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 800E67AC 000E370C 90 01 00 08 */ stw r0, 8(r1) /* 800E67B0 000E3710 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -4382,9 +4382,9 @@ lbl_800E6774: /* 800E67E0 000E3740 80 01 00 0C */ lwz r0, 0xc(r1) /* 800E67E4 000E3744 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 800E67E8 000E3748 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 800E67EC 000E374C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E67EC 000E374C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E67F0 000E3750 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 800E67F4 000E3754 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 800E67F4 000E3754 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 800E67F8 000E3758 80 C1 00 10 */ lwz r6, 0x10(r1) /* 800E67FC 000E375C 38 00 00 02 */ li r0, 2 /* 800E6800 000E3760 80 A1 00 14 */ lwz r5, 0x14(r1) @@ -4553,9 +4553,9 @@ lbl_800E69A8: /* 800E6A54 000E39B4 EF FF 08 2A */ fadds f31, f31, f1 /* 800E6A58 000E39B8 EF DE 00 2A */ fadds f30, f30, f0 lbl_800E6A5C: -/* 800E6A5C 000E39BC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E6A5C 000E39BC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E6A60 000E39C0 38 00 00 01 */ li r0, 1 -/* 800E6A64 000E39C4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 800E6A64 000E39C4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 800E6A68 000E39C8 80 7F 04 50 */ lwz r3, 0x450(r31) /* 800E6A6C 000E39CC 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 800E6A70 000E39D0 90 A1 00 50 */ stw r5, 0x50(r1) @@ -4575,9 +4575,9 @@ lbl_800E6A5C: /* 800E6AA8 000E3A08 80 01 00 54 */ lwz r0, 0x54(r1) /* 800E6AAC 000E3A0C 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 800E6AB0 000E3A10 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 800E6AB4 000E3A14 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E6AB4 000E3A14 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E6AB8 000E3A18 90 1E 01 10 */ stw r0, 0x110(r30) -/* 800E6ABC 000E3A1C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E6ABC 000E3A1C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E6AC0 000E3A20 80 61 00 58 */ lwz r3, 0x58(r1) /* 800E6AC4 000E3A24 80 A1 00 5C */ lwz r5, 0x5c(r1) /* 800E6AC8 000E3A28 90 7E 01 14 */ stw r3, 0x114(r30) @@ -4806,12 +4806,12 @@ lbl_800E6DE0: /* 800E6DEC 000E3D4C 4E 80 04 21 */ bctrl /* 800E6DF0 000E3D50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6DF4 000E3D54 41 82 00 D4 */ beq lbl_800E6EC8 -/* 800E6DF8 000E3D58 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 800E6DF8 000E3D58 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 800E6DFC 000E3D5C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E6E00 000E3D60 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800E6E04 000E3D64 80 81 00 C8 */ lwz r4, 0xc8(r1) /* 800E6E08 000E3D68 38 60 00 00 */ li r3, 0 -/* 800E6E0C 000E3D6C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 800E6E0C 000E3D6C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 800E6E10 000E3D70 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 800E6E14 000E3D74 C0 45 00 00 */ lfs f2, 0(r5) /* 800E6E18 000E3D78 C0 25 00 04 */ lfs f1, 4(r5) @@ -4840,9 +4840,9 @@ lbl_800E6DE0: /* 800E6E74 000E3DD4 80 01 00 B0 */ lwz r0, 0xb0(r1) /* 800E6E78 000E3DD8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 800E6E7C 000E3DDC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 800E6E80 000E3DE0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E6E80 000E3DE0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E6E84 000E3DE4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 800E6E88 000E3DE8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E6E88 000E3DE8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E6E8C 000E3DEC 80 A1 00 B4 */ lwz r5, 0xb4(r1) /* 800E6E90 000E3DF0 80 61 00 B8 */ lwz r3, 0xb8(r1) /* 800E6E94 000E3DF4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -5048,9 +5048,9 @@ lbl_800E7174: /* 800E7184 000E40E4 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 800E7188 000E40E8 41 82 01 80 */ beq lbl_800E7308 lbl_800E718C: -/* 800E718C 000E40EC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 800E718C 000E40EC 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 800E7190 000E40F0 38 C0 00 00 */ li r6, 0 -/* 800E7194 000E40F4 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 800E7194 000E40F4 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 800E7198 000E40F8 80 61 00 EC */ lwz r3, 0xec(r1) /* 800E719C 000E40FC 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 800E71A0 000E4100 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -5082,8 +5082,8 @@ lbl_800E718C: /* 800E7208 000E4168 38 E3 A9 F0 */ addi r7, r3, lbl_803DA9F0@l /* 800E720C 000E416C 81 01 00 D8 */ lwz r8, 0xd8(r1) /* 800E7210 000E4170 90 1E 01 90 */ stw r0, 0x190(r30) -/* 800E7214 000E4174 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 800E7218 000E4178 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 800E7214 000E4174 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha +/* 800E7218 000E4178 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 800E721C 000E417C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800E7220 000E4180 91 1E 01 94 */ stw r8, 0x194(r30) /* 800E7224 000E4184 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l @@ -5145,13 +5145,13 @@ lbl_800E718C: /* 800E7304 000E4264 48 00 00 D0 */ b lbl_800E73D4 lbl_800E7308: /* 800E7308 000E4268 81 1C 03 88 */ lwz r8, 0x388(r28) -/* 800E730C 000E426C 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 800E730C 000E426C 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 800E7310 000E4270 38 C0 00 00 */ li r6, 0 /* 800E7314 000E4274 80 A1 00 CC */ lwz r5, 0xcc(r1) /* 800E7318 000E4278 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800E731C 000E427C C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 800E7320 000E4280 50 C5 F8 00 */ rlwimi r5, r6, 0x1f, 0, 0 -/* 800E7324 000E4284 38 E7 AA 68 */ addi r7, r7, lbl_803DAA68@l +/* 800E7324 000E4284 38 E7 AA 68 */ addi r7, r7, __vt__13CBodyStateCmd@l /* 800E7328 000E4288 C0 24 00 04 */ lfs f1, 4(r4) /* 800E732C 000E428C 20 68 FF FF */ subfic r3, r8, -1 /* 800E7330 000E4290 C0 04 00 08 */ lfs f0, 8(r4) @@ -5178,9 +5178,9 @@ lbl_800E7308: /* 800E7384 000E42E4 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 800E7388 000E42E8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 800E738C 000E42EC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 800E7390 000E42F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E7390 000E42F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E7394 000E42F4 90 1E 01 90 */ stw r0, 0x190(r30) -/* 800E7398 000E42F8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E7398 000E42F8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E739C 000E42FC 80 A1 00 B8 */ lwz r5, 0xb8(r1) /* 800E73A0 000E4300 80 61 00 BC */ lwz r3, 0xbc(r1) /* 800E73A4 000E4304 90 BE 01 94 */ stw r5, 0x194(r30) @@ -5234,9 +5234,9 @@ lbl_800E7434: /* 800E7450 000E43B0 D0 3C 05 A8 */ stfs f1, 0x5a8(r28) /* 800E7454 000E43B4 48 00 03 80 */ b lbl_800E77D4 lbl_800E7458: -/* 800E7458 000E43B8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 800E7458 000E43B8 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 800E745C 000E43BC 38 C0 00 00 */ li r6, 0 -/* 800E7460 000E43C0 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 800E7460 000E43C0 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 800E7464 000E43C4 80 61 00 AC */ lwz r3, 0xac(r1) /* 800E7468 000E43C8 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 800E746C 000E43CC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -5266,9 +5266,9 @@ lbl_800E7458: /* 800E74CC 000E442C 80 01 00 94 */ lwz r0, 0x94(r1) /* 800E74D0 000E4430 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 800E74D4 000E4434 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 800E74D8 000E4438 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800E74D8 000E4438 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800E74DC 000E443C 90 1E 01 90 */ stw r0, 0x190(r30) -/* 800E74E0 000E4440 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800E74E0 000E4440 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800E74E4 000E4444 80 A1 00 98 */ lwz r5, 0x98(r1) /* 800E74E8 000E4448 80 61 00 9C */ lwz r3, 0x9c(r1) /* 800E74EC 000E444C 90 BE 01 94 */ stw r5, 0x194(r30) diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 1eda8dd2..5438db31 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -1130,10 +1130,10 @@ lbl_801197B8: /* 801197BC 0011671C 40 80 02 4C */ bge lbl_80119A08 /* 801197C0 00116720 48 00 01 84 */ b lbl_80119944 lbl_801197C4: -/* 801197C4 00116724 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801197C4 00116724 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801197C8 00116728 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801197CC 0011672C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801197D0 00116730 38 E4 AA 68 */ addi r7, r4, lbl_803DAA68@l +/* 801197D0 00116730 38 E4 AA 68 */ addi r7, r4, __vt__13CBodyStateCmd@l /* 801197D4 00116734 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801197D8 00116738 90 E1 00 6C */ stw r7, 0x6c(r1) /* 801197DC 0011673C 38 00 00 00 */ li r0, 0 @@ -1156,11 +1156,11 @@ lbl_801197C4: /* 80119820 00116780 80 01 00 70 */ lwz r0, 0x70(r1) /* 80119824 00116784 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 80119828 00116788 38 C3 A9 D8 */ addi r6, r3, lbl_803DA9D8@l -/* 8011982C 0011678C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8011982C 0011678C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80119830 00116790 90 1D 01 10 */ stw r0, 0x110(r29) /* 80119834 00116794 38 00 00 02 */ li r0, 2 /* 80119838 00116798 81 01 00 74 */ lwz r8, 0x74(r1) -/* 8011983C 0011679C 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8011983C 0011679C 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80119840 001167A0 80 E1 00 78 */ lwz r7, 0x78(r1) /* 80119844 001167A4 38 80 00 01 */ li r4, 1 /* 80119848 001167A8 91 1D 01 14 */ stw r8, 0x114(r29) @@ -1238,11 +1238,11 @@ lbl_80119944: /* 80119960 001168C0 7F E4 FB 78 */ mr r4, r31 /* 80119964 001168C4 38 A0 00 00 */ li r5, 0 /* 80119968 001168C8 48 00 00 C5 */ bl sub_80119a2c -/* 8011996C 001168CC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8011996C 001168CC 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 80119970 001168D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80119974 001168D4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80119978 001168D8 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 8011997C 001168DC 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 8011997C 001168DC 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 80119980 001168E0 C0 44 00 00 */ lfs f2, 0(r4) /* 80119984 001168E4 C0 24 00 04 */ lfs f1, 4(r4) /* 80119988 001168E8 3C A0 80 3E */ lis r5, lbl_803DAA44@ha @@ -1264,9 +1264,9 @@ lbl_80119944: /* 801199C8 00116928 80 01 00 24 */ lwz r0, 0x24(r1) /* 801199CC 0011692C 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801199D0 00116930 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801199D4 00116934 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801199D4 00116934 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801199D8 00116938 90 1D 00 F8 */ stw r0, 0xf8(r29) -/* 801199DC 0011693C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801199DC 0011693C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801199E0 00116940 80 A1 00 28 */ lwz r5, 0x28(r1) /* 801199E4 00116944 80 61 00 2C */ lwz r3, 0x2c(r1) /* 801199E8 00116948 90 BD 00 FC */ stw r5, 0xfc(r29) @@ -1377,8 +1377,8 @@ BulbAttack__12CBloodFlowerFR13CStateManager9EStateMsgf: /* 80119B58 00116AB8 48 00 00 B4 */ b lbl_80119C0C lbl_80119B5C: /* 80119B5C 00116ABC 80 A4 08 4C */ lwz r5, 0x84c(r4) -/* 80119B60 00116AC0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80119B64 00116AC4 38 C3 AA 68 */ addi r6, r3, lbl_803DAA68@l +/* 80119B60 00116AC0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80119B64 00116AC4 38 C3 AA 68 */ addi r6, r3, __vt__13CBodyStateCmd@l /* 80119B68 00116AC8 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80119B6C 00116ACC C0 45 00 60 */ lfs f2, 0x60(r5) /* 80119B70 00116AD0 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha @@ -1403,9 +1403,9 @@ lbl_80119B5C: /* 80119BBC 00116B1C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80119BC0 00116B20 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 80119BC4 00116B24 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 80119BC8 00116B28 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80119BC8 00116B28 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80119BCC 00116B2C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 80119BD0 00116B30 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80119BD0 00116B30 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80119BD4 00116B34 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80119BD8 00116B38 38 00 00 01 */ li r0, 1 /* 80119BDC 00116B3C 80 C1 00 14 */ lwz r6, 0x14(r1) @@ -1469,9 +1469,9 @@ lbl_80119C84: /* 80119CA8 00116C08 91 01 00 30 */ stw r8, 0x30(r1) /* 80119CAC 00116C0C 90 01 00 34 */ stw r0, 0x34(r1) /* 80119CB0 00116C10 4B F6 2B 05 */ bl TryCommand__10CPatternedFR13CStateManageriM10CPatternedFR13CStateManageri_vi -/* 80119CB4 00116C14 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80119CB4 00116C14 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80119CB8 00116C18 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 80119CBC 00116C1C 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80119CBC 00116C1C 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80119CC0 00116C20 3C 80 80 3E */ lis r4, lbl_803E061C@ha /* 80119CC4 00116C24 90 01 00 18 */ stw r0, 0x18(r1) /* 80119CC8 00116C28 38 04 06 1C */ addi r0, r4, lbl_803E061C@l @@ -1485,9 +1485,9 @@ lbl_80119C84: /* 80119CE8 00116C48 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80119CEC 00116C4C 3C 60 80 3E */ lis r3, lbl_803E061C@ha /* 80119CF0 00116C50 38 C3 06 1C */ addi r6, r3, lbl_803E061C@l -/* 80119CF4 00116C54 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80119CF4 00116C54 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80119CF8 00116C58 90 1D 02 74 */ stw r0, 0x274(r29) -/* 80119CFC 00116C5C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80119CFC 00116C5C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80119D00 00116C60 38 61 00 20 */ addi r3, r1, 0x20 /* 80119D04 00116C64 38 9E 00 34 */ addi r4, r30, 0x34 /* 80119D08 00116C68 C0 1E 05 84 */ lfs f0, 0x584(r30) @@ -1521,9 +1521,9 @@ lbl_80119C84: /* 80119D78 00116CD8 D0 43 00 30 */ stfs f2, 0x30(r3) /* 80119D7C 00116CDC 48 00 00 6C */ b lbl_80119DE8 lbl_80119D80: -/* 80119D80 00116CE0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80119D80 00116CE0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80119D84 00116CE4 38 00 00 0A */ li r0, 0xa -/* 80119D88 00116CE8 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80119D88 00116CE8 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80119D8C 00116CEC 90 01 00 14 */ stw r0, 0x14(r1) /* 80119D90 00116CF0 38 81 00 10 */ addi r4, r1, 0x10 /* 80119D94 00116CF4 90 61 00 10 */ stw r3, 0x10(r1) @@ -1532,21 +1532,21 @@ lbl_80119D80: /* 80119DA0 00116D00 48 01 7A 19 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80119DA4 00116D04 34 01 00 10 */ addic. r0, r1, 0x10 /* 80119DA8 00116D08 41 82 00 10 */ beq lbl_80119DB8 -/* 80119DAC 00116D0C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80119DB0 00116D10 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80119DAC 00116D0C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80119DB0 00116D10 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80119DB4 00116D14 90 01 00 10 */ stw r0, 0x10(r1) lbl_80119DB8: -/* 80119DB8 00116D18 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80119DB8 00116D18 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80119DBC 00116D1C 38 00 00 17 */ li r0, 0x17 -/* 80119DC0 00116D20 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80119DC0 00116D20 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80119DC4 00116D24 90 01 00 0C */ stw r0, 0xc(r1) /* 80119DC8 00116D28 38 81 00 08 */ addi r4, r1, 8 /* 80119DCC 00116D2C 90 61 00 08 */ stw r3, 8(r1) /* 80119DD0 00116D30 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80119DD4 00116D34 38 63 00 04 */ addi r3, r3, 4 /* 80119DD8 00116D38 48 01 79 E1 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80119DDC 00116D3C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80119DE0 00116D40 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80119DDC 00116D3C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80119DE0 00116D40 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80119DE4 00116D44 90 01 00 08 */ stw r0, 8(r1) lbl_80119DE8: /* 80119DE8 00116D48 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -1571,8 +1571,8 @@ __dt__17CBCAdditiveAimCmd: /* 80119E28 00116D88 38 03 06 1C */ addi r0, r3, lbl_803E061C@l /* 80119E2C 00116D8C 90 1F 00 00 */ stw r0, 0(r31) /* 80119E30 00116D90 41 82 00 10 */ beq lbl_80119E40 -/* 80119E34 00116D94 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80119E38 00116D98 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80119E34 00116D94 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80119E38 00116D98 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80119E3C 00116D9C 90 1F 00 00 */ stw r0, 0(r31) lbl_80119E40: /* 80119E40 00116DA0 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 228515b1..778432a9 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -1089,9 +1089,9 @@ lbl_8013FD80: /* 8013FD90 0013CCF0 C0 1F 06 38 */ lfs f0, 0x638(r31) /* 8013FD94 0013CCF4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013FD98 0013CCF8 40 81 00 88 */ ble lbl_8013FE20 -/* 8013FD9C 0013CCFC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8013FD9C 0013CCFC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8013FDA0 0013CD00 38 00 00 0A */ li r0, 0xa -/* 8013FDA4 0013CD04 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8013FDA4 0013CD04 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8013FDA8 0013CD08 90 01 00 0C */ stw r0, 0xc(r1) /* 8013FDAC 0013CD0C 38 81 00 08 */ addi r4, r1, 8 /* 8013FDB0 0013CD10 90 61 00 08 */ stw r3, 8(r1) @@ -1100,8 +1100,8 @@ lbl_8013FD80: /* 8013FDBC 0013CD1C 4B FF 19 FD */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 8013FDC0 0013CD20 34 01 00 08 */ addic. r0, r1, 8 /* 8013FDC4 0013CD24 41 82 00 10 */ beq lbl_8013FDD4 -/* 8013FDC8 0013CD28 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8013FDCC 0013CD2C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8013FDC8 0013CD28 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8013FDCC 0013CD2C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8013FDD0 0013CD30 90 01 00 08 */ stw r0, 8(r1) lbl_8013FDD4: /* 8013FDD4 0013CD34 80 7F 04 50 */ lwz r3, 0x450(r31) diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index c86a04a3..6a7d2b24 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -1136,9 +1136,9 @@ lbl_8015F694: /* 8015F6F4 0015C654 D0 C1 00 3C */ stfs f6, 0x3c(r1) /* 8015F6F8 0015C658 D0 E1 00 40 */ stfs f7, 0x40(r1) /* 8015F6FC 0015C65C 40 80 00 7C */ bge lbl_8015F778 -/* 8015F700 0015C660 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8015F700 0015C660 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8015F704 0015C664 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 8015F708 0015C668 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8015F708 0015C668 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8015F70C 0015C66C 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8015F710 0015C670 90 01 00 1C */ stw r0, 0x1c(r1) /* 8015F714 0015C674 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -1156,9 +1156,9 @@ lbl_8015F694: /* 8015F744 0015C6A4 80 01 00 20 */ lwz r0, 0x20(r1) /* 8015F748 0015C6A8 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8015F74C 0015C6AC 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8015F750 0015C6B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8015F750 0015C6B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015F754 0015C6B4 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8015F758 0015C6B8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8015F758 0015C6B8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8015F75C 0015C6BC 80 A1 00 24 */ lwz r5, 0x24(r1) /* 8015F760 0015C6C0 90 81 00 1C */ stw r4, 0x1c(r1) /* 8015F764 0015C6C4 80 61 00 28 */ lwz r3, 0x28(r1) @@ -1170,9 +1170,9 @@ lbl_8015F778: /* 8015F778 0015C6D8 C0 02 9F 8C */ lfs f0, lbl_805ABCAC@sda21(r2) /* 8015F77C 0015C6DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8015F780 0015C6E0 40 81 00 78 */ ble lbl_8015F7F8 -/* 8015F784 0015C6E4 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8015F784 0015C6E4 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8015F788 0015C6E8 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 8015F78C 0015C6EC 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8015F78C 0015C6EC 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8015F790 0015C6F0 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8015F794 0015C6F4 90 01 00 0C */ stw r0, 0xc(r1) /* 8015F798 0015C6F8 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -1190,9 +1190,9 @@ lbl_8015F778: /* 8015F7C8 0015C728 80 01 00 10 */ lwz r0, 0x10(r1) /* 8015F7CC 0015C72C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8015F7D0 0015C730 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8015F7D4 0015C734 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8015F7D4 0015C734 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015F7D8 0015C738 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8015F7DC 0015C73C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8015F7DC 0015C73C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8015F7E0 0015C740 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8015F7E4 0015C744 90 81 00 0C */ stw r4, 0xc(r1) /* 8015F7E8 0015C748 80 61 00 18 */ lwz r3, 0x18(r1) @@ -2557,8 +2557,8 @@ lbl_80160BE0: /* 80160BF8 0015DB58 48 00 00 C4 */ b lbl_80160CBC lbl_80160BFC: /* 80160BFC 0015DB5C 80 DF 08 4C */ lwz r6, 0x84c(r31) -/* 80160C00 0015DB60 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80160C04 0015DB64 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80160C00 0015DB60 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80160C04 0015DB64 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80160C08 0015DB68 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 80160C0C 0015DB6C C0 46 00 60 */ lfs f2, 0x60(r6) /* 80160C10 0015DB70 38 E0 00 06 */ li r7, 6 @@ -2582,9 +2582,9 @@ lbl_80160BFC: /* 80160C58 0015DBB8 80 01 00 78 */ lwz r0, 0x78(r1) /* 80160C5C 0015DBBC 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 80160C60 0015DBC0 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 80160C64 0015DBC4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80160C64 0015DBC4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80160C68 0015DBC8 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 80160C6C 0015DBCC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80160C6C 0015DBCC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80160C70 0015DBD0 80 61 00 7C */ lwz r3, 0x7c(r1) /* 80160C74 0015DBD4 80 A1 00 80 */ lwz r5, 0x80(r1) /* 80160C78 0015DBD8 90 7F 01 30 */ stw r3, 0x130(r31) @@ -2773,9 +2773,9 @@ lbl_80160EE8: /* 80160F00 0015DE60 48 00 02 48 */ b lbl_80161148 lbl_80160F04: /* 80160F04 0015DE64 88 1D 08 34 */ lbz r0, 0x834(r29) -/* 80160F08 0015DE68 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80160F08 0015DE68 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80160F0C 0015DE6C 80 DE 08 4C */ lwz r6, 0x84c(r30) -/* 80160F10 0015DE70 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80160F10 0015DE70 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80160F14 0015DE74 54 05 E7 FE */ rlwinm r5, r0, 0x1c, 0x1f, 0x1f /* 80160F18 0015DE78 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 80160F1C 0015DE7C 7C 05 00 D0 */ neg r0, r5 @@ -2802,9 +2802,9 @@ lbl_80160F04: /* 80160F70 0015DED0 80 01 00 B0 */ lwz r0, 0xb0(r1) /* 80160F74 0015DED4 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 80160F78 0015DED8 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 80160F7C 0015DEDC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80160F7C 0015DEDC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80160F80 0015DEE0 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 80160F84 0015DEE4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80160F84 0015DEE4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80160F88 0015DEE8 80 61 00 B4 */ lwz r3, 0xb4(r1) /* 80160F8C 0015DEEC 80 A1 00 B8 */ lwz r5, 0xb8(r1) /* 80160F90 0015DEF0 90 7F 01 30 */ stw r3, 0x130(r31) @@ -3046,9 +3046,9 @@ lbl_801612C4: /* 801612D8 0015E238 90 03 07 C8 */ stw r0, 0x7c8(r3) /* 801612DC 0015E23C 48 00 00 94 */ b lbl_80161370 lbl_801612E0: -/* 801612E0 0015E240 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801612E0 0015E240 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801612E4 0015E244 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801612E8 0015E248 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801612E8 0015E248 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801612EC 0015E24C 38 80 00 12 */ li r4, 0x12 /* 801612F0 0015E250 90 01 00 08 */ stw r0, 8(r1) /* 801612F4 0015E254 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -3063,9 +3063,9 @@ lbl_801612E0: /* 80161318 0015E278 80 01 00 0C */ lwz r0, 0xc(r1) /* 8016131C 0015E27C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 80161320 0015E280 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 80161324 0015E284 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161324 0015E284 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161328 0015E288 90 1F 02 14 */ stw r0, 0x214(r31) -/* 8016132C 0015E28C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016132C 0015E28C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80161330 0015E290 80 61 00 10 */ lwz r3, 0x10(r1) /* 80161334 0015E294 90 81 00 08 */ stw r4, 8(r1) /* 80161338 0015E298 90 7F 02 18 */ stw r3, 0x218(r31) @@ -3203,9 +3203,9 @@ lbl_80161514: /* 80161518 0015E478 40 80 01 6C */ bge lbl_80161684 /* 8016151C 0015E47C 48 00 00 E0 */ b lbl_801615FC lbl_80161520: -/* 80161520 0015E480 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161520 0015E480 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161524 0015E484 38 C0 00 01 */ li r6, 1 -/* 80161528 0015E488 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80161528 0015E488 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016152C 0015E48C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80161530 0015E490 90 01 00 4C */ stw r0, 0x4c(r1) /* 80161534 0015E494 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -3220,9 +3220,9 @@ lbl_80161520: /* 80161558 0015E4B8 80 01 00 50 */ lwz r0, 0x50(r1) /* 8016155C 0015E4BC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80161560 0015E4C0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80161564 0015E4C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161564 0015E4C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161568 0015E4C8 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8016156C 0015E4CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016156C 0015E4CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80161570 0015E4D0 80 A1 00 54 */ lwz r5, 0x54(r1) /* 80161574 0015E4D4 90 81 00 4C */ stw r4, 0x4c(r1) /* 80161578 0015E4D8 80 61 00 58 */ lwz r3, 0x58(r1) @@ -3231,9 +3231,9 @@ lbl_80161520: /* 80161584 0015E4E4 90 01 00 4C */ stw r0, 0x4c(r1) /* 80161588 0015E4E8 48 00 00 FC */ b lbl_80161684 lbl_8016158C: -/* 8016158C 0015E4EC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8016158C 0015E4EC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80161590 0015E4F0 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha -/* 80161594 0015E4F4 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80161594 0015E4F4 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80161598 0015E4F8 38 80 00 01 */ li r4, 1 /* 8016159C 0015E4FC 90 01 00 3C */ stw r0, 0x3c(r1) /* 801615A0 0015E500 38 C3 A9 E4 */ addi r6, r3, lbl_803DA9E4@l @@ -3249,9 +3249,9 @@ lbl_8016158C: /* 801615C8 0015E528 80 01 00 40 */ lwz r0, 0x40(r1) /* 801615CC 0015E52C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801615D0 0015E530 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801615D4 0015E534 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801615D4 0015E534 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801615D8 0015E538 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801615DC 0015E53C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801615DC 0015E53C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801615E0 0015E540 80 A1 00 44 */ lwz r5, 0x44(r1) /* 801615E4 0015E544 90 81 00 3C */ stw r4, 0x3c(r1) /* 801615E8 0015E548 80 61 00 48 */ lwz r3, 0x48(r1) @@ -3260,9 +3260,9 @@ lbl_8016158C: /* 801615F4 0015E554 90 01 00 3C */ stw r0, 0x3c(r1) /* 801615F8 0015E558 48 00 00 8C */ b lbl_80161684 lbl_801615FC: -/* 801615FC 0015E55C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801615FC 0015E55C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80161600 0015E560 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha -/* 80161604 0015E564 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80161604 0015E564 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80161608 0015E568 38 80 00 01 */ li r4, 1 /* 8016160C 0015E56C 90 01 00 2C */ stw r0, 0x2c(r1) /* 80161610 0015E570 38 C3 A9 E4 */ addi r6, r3, lbl_803DA9E4@l @@ -3278,9 +3278,9 @@ lbl_801615FC: /* 80161638 0015E598 80 01 00 30 */ lwz r0, 0x30(r1) /* 8016163C 0015E59C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80161640 0015E5A0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80161644 0015E5A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161644 0015E5A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161648 0015E5A8 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8016164C 0015E5AC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016164C 0015E5AC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80161650 0015E5B0 80 A1 00 34 */ lwz r5, 0x34(r1) /* 80161654 0015E5B4 90 81 00 2C */ stw r4, 0x2c(r1) /* 80161658 0015E5B8 80 61 00 38 */ lwz r3, 0x38(r1) @@ -3543,9 +3543,9 @@ lbl_801619F8: /* 80161A0C 0015E96C 90 1E 07 C8 */ stw r0, 0x7c8(r30) /* 80161A10 0015E970 48 00 00 98 */ b lbl_80161AA8 lbl_80161A14: -/* 80161A14 0015E974 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161A14 0015E974 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161A18 0015E978 38 C0 00 01 */ li r6, 1 -/* 80161A1C 0015E97C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80161A1C 0015E97C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80161A20 0015E980 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80161A24 0015E984 90 01 00 2C */ stw r0, 0x2c(r1) /* 80161A28 0015E988 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -3561,9 +3561,9 @@ lbl_80161A14: /* 80161A50 0015E9B0 80 01 00 30 */ lwz r0, 0x30(r1) /* 80161A54 0015E9B4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80161A58 0015E9B8 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80161A5C 0015E9BC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80161A5C 0015E9BC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80161A60 0015E9C0 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 80161A64 0015E9C4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80161A64 0015E9C4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80161A68 0015E9C8 80 A1 00 34 */ lwz r5, 0x34(r1) /* 80161A6C 0015E9CC 90 81 00 2C */ stw r4, 0x2c(r1) /* 80161A70 0015E9D0 80 61 00 38 */ lwz r3, 0x38(r1) @@ -4253,12 +4253,12 @@ lbl_80162460: /* 80162460 0015F3C0 88 1E 08 34 */ lbz r0, 0x834(r30) /* 80162464 0015F3C4 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80162468 0015F3C8 41 82 00 D0 */ beq lbl_80162538 -/* 8016246C 0015F3CC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8016246C 0015F3CC 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 80162470 0015F3D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80162474 0015F3D4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80162478 0015F3D8 80 7E 04 50 */ lwz r3, 0x450(r30) /* 8016247C 0015F3DC C0 04 00 00 */ lfs f0, 0(r4) -/* 80162480 0015F3E0 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 80162480 0015F3E0 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 80162484 0015F3E4 C0 24 00 04 */ lfs f1, 4(r4) /* 80162488 0015F3E8 3C A0 80 3E */ lis r5, lbl_803DAA5C@ha /* 8016248C 0015F3EC C0 44 00 08 */ lfs f2, 8(r4) @@ -4282,9 +4282,9 @@ lbl_80162460: /* 801624D4 0015F434 80 01 00 24 */ lwz r0, 0x24(r1) /* 801624D8 0015F438 3C 60 80 3E */ lis r3, lbl_803DAA5C@ha /* 801624DC 0015F43C 38 83 AA 5C */ addi r4, r3, lbl_803DAA5C@l -/* 801624E0 0015F440 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801624E0 0015F440 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801624E4 0015F444 90 1F 01 B0 */ stw r0, 0x1b0(r31) -/* 801624E8 0015F448 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801624E8 0015F448 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801624EC 0015F44C 80 A1 00 28 */ lwz r5, 0x28(r1) /* 801624F0 0015F450 38 00 00 01 */ li r0, 1 /* 801624F4 0015F454 80 C1 00 2C */ lwz r6, 0x2c(r1) @@ -4305,11 +4305,11 @@ lbl_80162460: /* 80162530 0015F490 90 1E 07 C8 */ stw r0, 0x7c8(r30) /* 80162534 0015F494 48 00 00 B0 */ b lbl_801625E4 lbl_80162538: -/* 80162538 0015F498 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80162538 0015F498 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8016253C 0015F49C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80162540 0015F4A0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80162544 0015F4A4 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 80162548 0015F4A8 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 80162548 0015F4A8 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 8016254C 0015F4AC C0 44 00 00 */ lfs f2, 0(r4) /* 80162550 0015F4B0 C0 24 00 04 */ lfs f1, 4(r4) /* 80162554 0015F4B4 3C A0 80 3E */ lis r5, lbl_803DAA50@ha @@ -4331,9 +4331,9 @@ lbl_80162538: /* 80162594 0015F4F4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80162598 0015F4F8 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 8016259C 0015F4FC 38 A3 AA 50 */ addi r5, r3, lbl_803DAA50@l -/* 801625A0 0015F500 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801625A0 0015F500 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801625A4 0015F504 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 801625A8 0015F508 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 801625A8 0015F508 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 801625AC 0015F50C 80 E1 00 10 */ lwz r7, 0x10(r1) /* 801625B0 0015F510 38 00 00 01 */ li r0, 1 /* 801625B4 0015F514 80 C1 00 14 */ lwz r6, 0x14(r1) @@ -4752,9 +4752,9 @@ lbl_80162BB0: /* 80162BC4 0015FB24 40 80 00 08 */ bge lbl_80162BCC /* 80162BC8 0015FB28 48 00 02 78 */ b lbl_80162E40 lbl_80162BCC: -/* 80162BCC 0015FB2C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162BCC 0015FB2C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162BD0 0015FB30 38 00 00 0C */ li r0, 0xc -/* 80162BD4 0015FB34 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80162BD4 0015FB34 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80162BD8 0015FB38 90 01 00 0C */ stw r0, 0xc(r1) /* 80162BDC 0015FB3C 38 81 00 08 */ addi r4, r1, 8 /* 80162BE0 0015FB40 90 61 00 08 */ stw r3, 8(r1) @@ -4763,8 +4763,8 @@ lbl_80162BCC: /* 80162BEC 0015FB4C 4B FC EB CD */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80162BF0 0015FB50 34 01 00 08 */ addic. r0, r1, 8 /* 80162BF4 0015FB54 41 82 00 10 */ beq lbl_80162C04 -/* 80162BF8 0015FB58 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80162BFC 0015FB5C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80162BF8 0015FB58 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80162BFC 0015FB5C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80162C00 0015FB60 90 01 00 08 */ stw r0, 8(r1) lbl_80162C04: /* 80162C04 0015FB64 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -4780,9 +4780,9 @@ lbl_80162C24: /* 80162C28 0015FB88 40 80 01 F4 */ bge lbl_80162E1C /* 80162C2C 0015FB8C 48 00 01 78 */ b lbl_80162DA4 lbl_80162C30: -/* 80162C30 0015FB90 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162C30 0015FB90 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162C34 0015FB94 38 C0 00 01 */ li r6, 1 -/* 80162C38 0015FB98 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80162C38 0015FB98 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80162C3C 0015FB9C 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80162C40 0015FBA0 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80162C44 0015FBA4 90 01 00 40 */ stw r0, 0x40(r1) @@ -4799,9 +4799,9 @@ lbl_80162C30: /* 80162C70 0015FBD0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80162C74 0015FBD4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80162C78 0015FBD8 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80162C7C 0015FBDC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162C7C 0015FBDC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162C80 0015FBE0 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 80162C84 0015FBE4 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80162C84 0015FBE4 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80162C88 0015FBE8 80 C1 00 48 */ lwz r6, 0x48(r1) /* 80162C8C 0015FBEC 38 00 00 03 */ li r0, 3 /* 80162C90 0015FBF0 80 A1 00 4C */ lwz r5, 0x4c(r1) @@ -4812,9 +4812,9 @@ lbl_80162C30: /* 80162CA4 0015FC04 90 1E 05 8C */ stw r0, 0x58c(r30) /* 80162CA8 0015FC08 48 00 01 74 */ b lbl_80162E1C lbl_80162CAC: -/* 80162CAC 0015FC0C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162CAC 0015FC0C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162CB0 0015FC10 38 C0 00 01 */ li r6, 1 -/* 80162CB4 0015FC14 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80162CB4 0015FC14 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80162CB8 0015FC18 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80162CBC 0015FC1C 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80162CC0 0015FC20 90 01 00 30 */ stw r0, 0x30(r1) @@ -4831,9 +4831,9 @@ lbl_80162CAC: /* 80162CEC 0015FC4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80162CF0 0015FC50 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80162CF4 0015FC54 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80162CF8 0015FC58 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162CF8 0015FC58 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162CFC 0015FC5C 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 80162D00 0015FC60 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80162D00 0015FC60 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80162D04 0015FC64 80 C1 00 38 */ lwz r6, 0x38(r1) /* 80162D08 0015FC68 38 00 00 04 */ li r0, 4 /* 80162D0C 0015FC6C 80 A1 00 3C */ lwz r5, 0x3c(r1) @@ -4844,9 +4844,9 @@ lbl_80162CAC: /* 80162D20 0015FC80 90 1E 05 8C */ stw r0, 0x58c(r30) /* 80162D24 0015FC84 48 00 00 F8 */ b lbl_80162E1C lbl_80162D28: -/* 80162D28 0015FC88 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162D28 0015FC88 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162D2C 0015FC8C 38 C0 00 01 */ li r6, 1 -/* 80162D30 0015FC90 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80162D30 0015FC90 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80162D34 0015FC94 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80162D38 0015FC98 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80162D3C 0015FC9C 90 01 00 20 */ stw r0, 0x20(r1) @@ -4863,9 +4863,9 @@ lbl_80162D28: /* 80162D68 0015FCC8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80162D6C 0015FCCC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80162D70 0015FCD0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80162D74 0015FCD4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162D74 0015FCD4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162D78 0015FCD8 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 80162D7C 0015FCDC 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80162D7C 0015FCDC 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80162D80 0015FCE0 80 C1 00 28 */ lwz r6, 0x28(r1) /* 80162D84 0015FCE4 38 00 00 05 */ li r0, 5 /* 80162D88 0015FCE8 80 A1 00 2C */ lwz r5, 0x2c(r1) @@ -4876,9 +4876,9 @@ lbl_80162D28: /* 80162D9C 0015FCFC 90 1E 05 8C */ stw r0, 0x58c(r30) /* 80162DA0 0015FD00 48 00 00 7C */ b lbl_80162E1C lbl_80162DA4: -/* 80162DA4 0015FD04 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162DA4 0015FD04 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162DA8 0015FD08 38 C0 00 01 */ li r6, 1 -/* 80162DAC 0015FD0C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80162DAC 0015FD0C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80162DB0 0015FD10 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80162DB4 0015FD14 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80162DB8 0015FD18 90 01 00 10 */ stw r0, 0x10(r1) @@ -4895,9 +4895,9 @@ lbl_80162DA4: /* 80162DE4 0015FD44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80162DE8 0015FD48 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80162DEC 0015FD4C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80162DF0 0015FD50 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80162DF0 0015FD50 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80162DF4 0015FD54 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 80162DF8 0015FD58 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80162DF8 0015FD58 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80162DFC 0015FD5C 80 C1 00 18 */ lwz r6, 0x18(r1) /* 80162E00 0015FD60 38 00 00 02 */ li r0, 2 /* 80162E04 0015FD64 80 A1 00 1C */ lwz r5, 0x1c(r1) diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 25040136..447e945a 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -797,9 +797,9 @@ lbl_80227954: /* 8022795C 002248BC 41 82 00 08 */ beq lbl_80227964 /* 80227960 002248C0 38 C0 00 07 */ li r6, 7 lbl_80227964: -/* 80227964 002248C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80227964 002248C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80227968 002248C8 C0 02 B5 CC */ lfs f0, lbl_805AD2EC@sda21(r2) -/* 8022796C 002248CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022796C 002248CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80227970 002248D0 80 7E 04 50 */ lwz r3, 0x450(r30) /* 80227974 002248D4 3C 80 80 3E */ lis r4, lbl_803E10C8@ha /* 80227978 002248D8 90 01 00 4C */ stw r0, 0x4c(r1) @@ -818,9 +818,9 @@ lbl_80227964: /* 802279AC 0022490C 80 01 00 50 */ lwz r0, 0x50(r1) /* 802279B0 00224910 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 802279B4 00224914 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 802279B8 00224918 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802279B8 00224918 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802279BC 0022491C 90 1D 02 88 */ stw r0, 0x288(r29) -/* 802279C0 00224920 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802279C0 00224920 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802279C4 00224924 C0 01 00 54 */ lfs f0, 0x54(r1) /* 802279C8 00224928 80 A1 00 58 */ lwz r5, 0x58(r1) /* 802279CC 0022492C D0 1D 02 8C */ stfs f0, 0x28c(r29) @@ -831,9 +831,9 @@ lbl_80227964: /* 802279E0 00224940 90 01 00 4C */ stw r0, 0x4c(r1) /* 802279E4 00224944 48 00 00 88 */ b lbl_80227A6C lbl_802279E8: -/* 802279E8 00224948 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802279E8 00224948 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802279EC 0022494C C0 02 B5 CC */ lfs f0, lbl_805AD2EC@sda21(r2) -/* 802279F0 00224950 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802279F0 00224950 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802279F4 00224954 80 7E 04 50 */ lwz r3, 0x450(r30) /* 802279F8 00224958 3C 80 80 3E */ lis r4, lbl_803E10C8@ha /* 802279FC 0022495C 90 01 00 38 */ stw r0, 0x38(r1) @@ -853,9 +853,9 @@ lbl_802279E8: /* 80227A34 00224994 80 01 00 3C */ lwz r0, 0x3c(r1) /* 80227A38 00224998 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80227A3C 0022499C 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 80227A40 002249A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80227A40 002249A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80227A44 002249A4 90 1D 02 88 */ stw r0, 0x288(r29) -/* 80227A48 002249A8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80227A48 002249A8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80227A4C 002249AC C0 01 00 40 */ lfs f0, 0x40(r1) /* 80227A50 002249B0 80 A1 00 44 */ lwz r5, 0x44(r1) /* 80227A54 002249B4 D0 1D 02 8C */ stfs f0, 0x28c(r29) @@ -3506,12 +3506,12 @@ lbl_8022A0AC: /* 8022A0C0 00227020 90 03 05 68 */ stw r0, 0x568(r3) /* 8022A0C4 00227024 48 00 01 00 */ b lbl_8022A1C4 lbl_8022A0C8: -/* 8022A0C8 00227028 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8022A0C8 00227028 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8022A0CC 0022702C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022A0D0 00227030 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8022A0D4 00227034 80 81 00 24 */ lwz r4, 0x24(r1) /* 8022A0D8 00227038 38 60 00 00 */ li r3, 0 -/* 8022A0DC 0022703C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 8022A0DC 0022703C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 8022A0E0 00227040 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 8022A0E4 00227044 C0 45 00 00 */ lfs f2, 0(r5) /* 8022A0E8 00227048 C0 25 00 04 */ lfs f1, 4(r5) @@ -3540,9 +3540,9 @@ lbl_8022A0C8: /* 8022A144 002270A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8022A148 002270A8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8022A14C 002270AC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8022A150 002270B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022A150 002270B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022A154 002270B4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8022A158 002270B8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022A158 002270B8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022A15C 002270BC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8022A160 002270C0 80 61 00 14 */ lwz r3, 0x14(r1) /* 8022A164 002270C4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -3964,10 +3964,10 @@ lbl_8022A744: /* 8022A770 002276D0 90 1E 07 C8 */ stw r0, 0x7c8(r30) /* 8022A774 002276D4 48 00 02 F4 */ b lbl_8022AA68 lbl_8022A778: -/* 8022A778 002276D8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8022A778 002276D8 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8022A77C 002276DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022A780 002276E0 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 8022A784 002276E4 38 C5 AA 68 */ addi r6, r5, lbl_803DAA68@l +/* 8022A784 002276E4 38 C5 AA 68 */ addi r6, r5, __vt__13CBodyStateCmd@l /* 8022A788 002276E8 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8022A78C 002276EC 90 C1 00 24 */ stw r6, 0x24(r1) /* 8022A790 002276F0 38 C4 A9 D8 */ addi r6, r4, lbl_803DA9D8@l @@ -3990,9 +3990,9 @@ lbl_8022A778: /* 8022A7D4 00227734 80 01 00 28 */ lwz r0, 0x28(r1) /* 8022A7D8 00227738 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8022A7DC 0022773C 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8022A7E0 00227740 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022A7E0 00227740 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022A7E4 00227744 90 1E 01 10 */ stw r0, 0x110(r30) -/* 8022A7E8 00227748 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022A7E8 00227748 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022A7EC 0022774C 80 61 00 2C */ lwz r3, 0x2c(r1) /* 8022A7F0 00227750 80 A1 00 30 */ lwz r5, 0x30(r1) /* 8022A7F4 00227754 90 7E 01 14 */ stw r3, 0x114(r30) @@ -4061,11 +4061,11 @@ lbl_8022A8A0: /* 8022A8E4 00227844 4E 80 04 21 */ bctrl /* 8022A8E8 00227848 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022A8EC 0022784C 41 82 01 7C */ beq lbl_8022AA68 -/* 8022A8F0 00227850 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8022A8F0 00227850 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8022A8F4 00227854 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022A8F8 00227858 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8022A8FC 0022785C 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 8022A900 00227860 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 8022A900 00227860 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 8022A904 00227864 C0 44 00 00 */ lfs f2, 0(r4) /* 8022A908 00227868 C0 24 00 04 */ lfs f1, 4(r4) /* 8022A90C 0022786C 3C C0 80 3E */ lis r6, lbl_803DA9D8@ha @@ -4089,9 +4089,9 @@ lbl_8022A8A0: /* 8022A954 002278B4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8022A958 002278B8 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8022A95C 002278BC 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8022A960 002278C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022A960 002278C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022A964 002278C4 90 1E 01 10 */ stw r0, 0x110(r30) -/* 8022A968 002278C8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022A968 002278C8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022A96C 002278CC 80 61 00 10 */ lwz r3, 0x10(r1) /* 8022A970 002278D0 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8022A974 002278D4 90 7E 01 14 */ stw r3, 0x114(r30) @@ -4216,9 +4216,9 @@ lbl_8022AAFC: /* 8022AB20 00227A80 98 1F 09 88 */ stb r0, 0x988(r31) /* 8022AB24 00227A84 48 00 00 F4 */ b lbl_8022AC18 lbl_8022AB28: -/* 8022AB28 00227A88 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8022AB28 00227A88 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8022AB2C 00227A8C 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha -/* 8022AB30 00227A90 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8022AB30 00227A90 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8022AB34 00227A94 38 80 00 06 */ li r4, 6 /* 8022AB38 00227A98 90 01 00 08 */ stw r0, 8(r1) /* 8022AB3C 00227A9C 38 C3 A9 CC */ addi r6, r3, lbl_803DA9CC@l @@ -4238,9 +4238,9 @@ lbl_8022AB28: /* 8022AB74 00227AD4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8022AB78 00227AD8 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8022AB7C 00227ADC 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 8022AB80 00227AE0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022AB80 00227AE0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022AB84 00227AE4 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8022AB88 00227AE8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022AB88 00227AE8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022AB8C 00227AEC 80 61 00 10 */ lwz r3, 0x10(r1) /* 8022AB90 00227AF0 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8022AB94 00227AF4 90 7F 01 30 */ stw r3, 0x130(r31) @@ -4331,9 +4331,9 @@ lbl_8022ACA4: /* 8022ACB8 00227C18 90 03 05 68 */ stw r0, 0x568(r3) /* 8022ACBC 00227C1C 48 00 00 E4 */ b lbl_8022ADA0 lbl_8022ACC0: -/* 8022ACC0 00227C20 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8022ACC0 00227C20 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8022ACC4 00227C24 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha -/* 8022ACC8 00227C28 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8022ACC8 00227C28 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8022ACCC 00227C2C 38 80 00 06 */ li r4, 6 /* 8022ACD0 00227C30 90 01 00 08 */ stw r0, 8(r1) /* 8022ACD4 00227C34 38 C3 A9 CC */ addi r6, r3, lbl_803DA9CC@l @@ -4353,9 +4353,9 @@ lbl_8022ACC0: /* 8022AD0C 00227C6C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8022AD10 00227C70 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8022AD14 00227C74 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 8022AD18 00227C78 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022AD18 00227C78 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022AD1C 00227C7C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8022AD20 00227C80 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022AD20 00227C80 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022AD24 00227C84 80 61 00 10 */ lwz r3, 0x10(r1) /* 8022AD28 00227C88 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8022AD2C 00227C8C 90 7F 01 30 */ stw r3, 0x130(r31) @@ -4493,9 +4493,9 @@ lbl_8022AEF0: /* 8022AF04 00227E64 90 1E 05 68 */ stw r0, 0x568(r30) /* 8022AF08 00227E68 48 00 01 10 */ b lbl_8022B018 lbl_8022AF0C: -/* 8022AF0C 00227E6C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8022AF0C 00227E6C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8022AF10 00227E70 38 C0 00 00 */ li r6, 0 -/* 8022AF14 00227E74 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 8022AF14 00227E74 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 8022AF18 00227E78 80 61 00 3C */ lwz r3, 0x3c(r1) /* 8022AF1C 00227E7C 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 8022AF20 00227E80 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -4525,9 +4525,9 @@ lbl_8022AF0C: /* 8022AF80 00227EE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022AF84 00227EE4 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8022AF88 00227EE8 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8022AF8C 00227EEC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022AF8C 00227EEC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022AF90 00227EF0 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8022AF94 00227EF4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022AF94 00227EF4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022AF98 00227EF8 80 A1 00 28 */ lwz r5, 0x28(r1) /* 8022AF9C 00227EFC 80 61 00 2C */ lwz r3, 0x2c(r1) /* 8022AFA0 00227F00 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4775,9 +4775,9 @@ lbl_8022B2EC: /* 8022B300 00228260 90 03 05 68 */ stw r0, 0x568(r3) /* 8022B304 00228264 48 00 00 B8 */ b lbl_8022B3BC lbl_8022B308: -/* 8022B308 00228268 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8022B308 00228268 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8022B30C 0022826C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 8022B310 00228270 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8022B310 00228270 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8022B314 00228274 38 80 00 12 */ li r4, 0x12 /* 8022B318 00228278 90 01 00 08 */ stw r0, 8(r1) /* 8022B31C 0022827C 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -4792,9 +4792,9 @@ lbl_8022B308: /* 8022B340 002282A0 80 01 00 0C */ lwz r0, 0xc(r1) /* 8022B344 002282A4 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 8022B348 002282A8 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 8022B34C 002282AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022B34C 002282AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022B350 002282B0 90 1F 02 14 */ stw r0, 0x214(r31) -/* 8022B354 002282B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022B354 002282B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022B358 002282B8 80 61 00 10 */ lwz r3, 0x10(r1) /* 8022B35C 002282BC 90 81 00 08 */ stw r4, 8(r1) /* 8022B360 002282C0 90 7F 02 18 */ stw r3, 0x218(r31) @@ -6959,9 +6959,9 @@ lbl_8022D224: /* 8022D234 0022A194 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 8022D238 0022A198 7C 03 00 40 */ cmplw r3, r0 /* 8022D23C 0022A19C 41 82 00 9C */ beq lbl_8022D2D8 -/* 8022D240 0022A1A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022D240 0022A1A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022D244 0022A1A4 C0 5D 00 58 */ lfs f2, 0x58(r29) -/* 8022D248 0022A1A8 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8022D248 0022A1A8 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8022D24C 0022A1AC C0 3D 00 48 */ lfs f1, 0x48(r29) /* 8022D250 0022A1B0 C0 1D 00 38 */ lfs f0, 0x38(r29) /* 8022D254 0022A1B4 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -6983,9 +6983,9 @@ lbl_8022D224: /* 8022D294 0022A1F4 80 01 00 C8 */ lwz r0, 0xc8(r1) /* 8022D298 0022A1F8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8022D29C 0022A1FC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8022D2A0 0022A200 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8022D2A0 0022A200 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8022D2A4 0022A204 90 1A 00 F8 */ stw r0, 0xf8(r26) -/* 8022D2A8 0022A208 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8022D2A8 0022A208 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8022D2AC 0022A20C 80 A1 00 CC */ lwz r5, 0xcc(r1) /* 8022D2B0 0022A210 80 61 00 D0 */ lwz r3, 0xd0(r1) /* 8022D2B4 0022A214 90 BA 00 FC */ stw r5, 0xfc(r26) diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index c4b5de0c..9f49e883 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -529,19 +529,19 @@ lbl_80224A98: /* 80224AA0 00221A00 81 23 05 F4 */ lwz r9, 0x5f4(r3) /* 80224AA4 00221A04 2C 09 FF FF */ cmpwi r9, -1 /* 80224AA8 00221A08 41 82 00 98 */ beq lbl_80224B40 -/* 80224AAC 00221A0C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80224AAC 00221A0C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 80224AB0 00221A10 88 61 00 24 */ lbz r3, 0x24(r1) /* 80224AB4 00221A14 38 80 00 00 */ li r4, 0 /* 80224AB8 00221A18 81 1F 04 50 */ lwz r8, 0x450(r31) /* 80224ABC 00221A1C 50 83 3E 30 */ rlwimi r3, r4, 7, 0x18, 0x18 -/* 80224AC0 00221A20 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 80224AC0 00221A20 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 80224AC4 00221A24 C0 02 B4 70 */ lfs f0, lbl_805AD190@sda21(r2) -/* 80224AC8 00221A28 3C A0 80 3E */ lis r5, lbl_803DFE40@ha +/* 80224AC8 00221A28 3C A0 80 3E */ lis r5, __vt__14CBCScriptedCmd@ha /* 80224ACC 00221A2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224AD0 00221A30 38 C0 00 13 */ li r6, 0x13 /* 80224AD4 00221A34 3B C8 00 04 */ addi r30, r8, 4 /* 80224AD8 00221A38 90 E1 00 18 */ stw r7, 0x18(r1) -/* 80224ADC 00221A3C 38 A5 FE 40 */ addi r5, r5, lbl_803DFE40@l +/* 80224ADC 00221A3C 38 A5 FE 40 */ addi r5, r5, __vt__14CBCScriptedCmd@l /* 80224AE0 00221A40 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 80224AE4 00221A44 98 61 00 24 */ stb r3, 0x24(r1) /* 80224AE8 00221A48 7F C3 F3 78 */ mr r3, r30 @@ -553,11 +553,11 @@ lbl_80224A98: /* 80224B00 00221A60 D0 01 00 28 */ stfs f0, 0x28(r1) /* 80224B04 00221A64 4B F0 C9 35 */ bl DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd /* 80224B08 00221A68 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80224B0C 00221A6C 3C 60 80 3E */ lis r3, lbl_803DFE40@ha -/* 80224B10 00221A70 38 83 FE 40 */ addi r4, r3, lbl_803DFE40@l -/* 80224B14 00221A74 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80224B0C 00221A6C 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha +/* 80224B10 00221A70 38 83 FE 40 */ addi r4, r3, __vt__14CBCScriptedCmd@l +/* 80224B14 00221A74 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80224B18 00221A78 90 1E 02 20 */ stw r0, 0x220(r30) -/* 80224B1C 00221A7C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80224B1C 00221A7C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80224B20 00221A80 80 A1 00 20 */ lwz r5, 0x20(r1) /* 80224B24 00221A84 88 61 00 24 */ lbz r3, 0x24(r1) /* 80224B28 00221A88 90 BE 02 24 */ stw r5, 0x224(r30) @@ -675,9 +675,9 @@ Render__8CEyeBallCFRC13CStateManager: sub_80224c84: /* 80224C84 00221BE4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80224C88 00221BE8 7C 08 02 A6 */ mflr r0 -/* 80224C8C 00221BEC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80224C8C 00221BEC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80224C90 00221BF0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80224C94 00221BF4 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80224C94 00221BF4 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80224C98 00221BF8 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 80224C9C 00221BFC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80224CA0 00221C00 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -700,9 +700,9 @@ sub_80224c84: /* 80224CE4 00221C44 80 01 00 0C */ lwz r0, 0xc(r1) /* 80224CE8 00221C48 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 80224CEC 00221C4C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 80224CF0 00221C50 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80224CF0 00221C50 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80224CF4 00221C54 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 80224CF8 00221C58 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80224CF8 00221C58 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80224CFC 00221C5C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80224D00 00221C60 80 61 00 14 */ lwz r3, 0x14(r1) /* 80224D04 00221C64 90 BF 00 FC */ stw r5, 0xfc(r31) diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index f4f3aeda..017e06ba 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -3073,9 +3073,9 @@ lbl_801AFA98: /* 801AFAAC 001ACA0C 90 1E 05 68 */ stw r0, 0x568(r30) /* 801AFAB0 001ACA10 48 00 02 24 */ b lbl_801AFCD4 lbl_801AFAB4: -/* 801AFAB4 001ACA14 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801AFAB4 001ACA14 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801AFAB8 001ACA18 3C 60 80 3E */ lis r3, lbl_803DAA20@ha -/* 801AFABC 001ACA1C 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801AFABC 001ACA1C 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801AFAC0 001ACA20 38 80 00 00 */ li r4, 0 /* 801AFAC4 001ACA24 90 01 00 1C */ stw r0, 0x1c(r1) /* 801AFAC8 001ACA28 38 A3 AA 20 */ addi r5, r3, lbl_803DAA20@l @@ -3090,9 +3090,9 @@ lbl_801AFAB4: /* 801AFAEC 001ACA4C 80 01 00 20 */ lwz r0, 0x20(r1) /* 801AFAF0 001ACA50 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801AFAF4 001ACA54 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801AFAF8 001ACA58 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801AFAF8 001ACA58 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801AFAFC 001ACA5C 90 1D 00 BC */ stw r0, 0xbc(r29) -/* 801AFB00 001ACA60 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801AFB00 001ACA60 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801AFB04 001ACA64 80 61 00 24 */ lwz r3, 0x24(r1) /* 801AFB08 001ACA68 90 81 00 1C */ stw r4, 0x1c(r1) /* 801AFB0C 001ACA6C 90 7D 00 C0 */ stw r3, 0xc0(r29) @@ -3106,9 +3106,9 @@ lbl_801AFB18: /* 801AFB28 001ACA88 2C 00 00 00 */ cmpwi r0, 0 /* 801AFB2C 001ACA8C 41 82 00 A4 */ beq lbl_801AFBD0 /* 801AFB30 001ACA90 C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 801AFB34 001ACA94 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801AFB34 001ACA94 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801AFB38 001ACA98 C0 3E 00 48 */ lfs f1, 0x48(r30) -/* 801AFB3C 001ACA9C 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 801AFB3C 001ACA9C 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 801AFB40 001ACAA0 C0 1E 00 38 */ lfs f0, 0x38(r30) /* 801AFB44 001ACAA4 FC 40 10 50 */ fneg f2, f2 /* 801AFB48 001ACAA8 FC 20 08 50 */ fneg f1, f1 @@ -3131,9 +3131,9 @@ lbl_801AFB18: /* 801AFB8C 001ACAEC 80 01 00 38 */ lwz r0, 0x38(r1) /* 801AFB90 001ACAF0 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 801AFB94 001ACAF4 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 801AFB98 001ACAF8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801AFB98 001ACAF8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801AFB9C 001ACAFC 90 1D 00 E0 */ stw r0, 0xe0(r29) -/* 801AFBA0 001ACB00 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801AFBA0 001ACB00 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801AFBA4 001ACB04 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 801AFBA8 001ACB08 80 61 00 40 */ lwz r3, 0x40(r1) /* 801AFBAC 001ACB0C 90 BD 00 E4 */ stw r5, 0xe4(r29) @@ -3370,10 +3370,10 @@ lbl_801AFEF4: /* 801AFF0C 001ACE6C 48 00 01 84 */ b lbl_801B0090 lbl_801AFF10: /* 801AFF10 001ACE70 80 1F 07 B0 */ lwz r0, 0x7b0(r31) -/* 801AFF14 001ACE74 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801AFF14 001ACE74 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801AFF18 001ACE78 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801AFF1C 001ACE7C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801AFF20 001ACE80 38 A5 AA 68 */ addi r5, r5, lbl_803DAA68@l +/* 801AFF20 001ACE80 38 A5 AA 68 */ addi r5, r5, __vt__13CBodyStateCmd@l /* 801AFF24 001ACE84 54 00 10 3A */ slwi r0, r0, 2 /* 801AFF28 001ACE88 38 C2 A8 A4 */ addi r6, r2, lbl_805AC5C4@sda21 /* 801AFF2C 001ACE8C C0 23 00 04 */ lfs f1, 4(r3) @@ -3398,9 +3398,9 @@ lbl_801AFF10: /* 801AFF78 001ACED8 80 01 00 6C */ lwz r0, 0x6c(r1) /* 801AFF7C 001ACEDC 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801AFF80 001ACEE0 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801AFF84 001ACEE4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801AFF84 001ACEE4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801AFF88 001ACEE8 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801AFF8C 001ACEEC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801AFF8C 001ACEEC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801AFF90 001ACEF0 80 61 00 70 */ lwz r3, 0x70(r1) /* 801AFF94 001ACEF4 80 A1 00 74 */ lwz r5, 0x74(r1) /* 801AFF98 001ACEF8 90 7F 01 14 */ stw r3, 0x114(r31) @@ -3449,16 +3449,16 @@ lbl_801B0034: /* 801B0038 001ACF98 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801B003C 001ACF9C 2C 00 00 07 */ cmpwi r0, 7 /* 801B0040 001ACFA0 40 82 00 30 */ bne lbl_801B0070 -/* 801B0044 001ACFA4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0044 001ACFA4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0048 001ACFA8 38 00 00 0C */ li r0, 0xc -/* 801B004C 001ACFAC 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B004C 001ACFAC 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B0050 001ACFB0 90 01 00 20 */ stw r0, 0x20(r1) /* 801B0054 001ACFB4 38 64 00 04 */ addi r3, r4, 4 /* 801B0058 001ACFB8 38 81 00 1C */ addi r4, r1, 0x1c /* 801B005C 001ACFBC 90 A1 00 1C */ stw r5, 0x1c(r1) /* 801B0060 001ACFC0 4B F8 17 59 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801B0064 001ACFC4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B0068 001ACFC8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0064 001ACFC4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B0068 001ACFC8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B006C 001ACFCC 90 01 00 1C */ stw r0, 0x1c(r1) lbl_801B0070: /* 801B0070 001ACFD0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -3521,9 +3521,9 @@ lbl_801B0130: /* 801B0130 001AD090 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 801B0134 001AD094 4C 41 13 82 */ cror 2, 1, 2 /* 801B0138 001AD098 40 82 00 50 */ bne lbl_801B0188 -/* 801B013C 001AD09C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B013C 001AD09C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0140 001AD0A0 38 00 00 0A */ li r0, 0xa -/* 801B0144 001AD0A4 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801B0144 001AD0A4 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801B0148 001AD0A8 90 01 00 14 */ stw r0, 0x14(r1) /* 801B014C 001AD0AC 38 81 00 10 */ addi r4, r1, 0x10 /* 801B0150 001AD0B0 90 61 00 10 */ stw r3, 0x10(r1) @@ -3532,8 +3532,8 @@ lbl_801B0130: /* 801B015C 001AD0BC 4B F8 16 5D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801B0160 001AD0C0 34 01 00 10 */ addic. r0, r1, 0x10 /* 801B0164 001AD0C4 41 82 00 10 */ beq lbl_801B0174 -/* 801B0168 001AD0C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B016C 001AD0CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0168 001AD0C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B016C 001AD0CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0170 001AD0D0 90 01 00 10 */ stw r0, 0x10(r1) lbl_801B0174: /* 801B0174 001AD0D4 88 1F 08 E5 */ lbz r0, 0x8e5(r31) @@ -3549,9 +3549,9 @@ lbl_801B0194: /* 801B0194 001AD0F4 88 1F 08 E5 */ lbz r0, 0x8e5(r31) /* 801B0198 001AD0F8 38 60 00 00 */ li r3, 0 /* 801B019C 001AD0FC 50 60 0F BC */ rlwimi r0, r3, 1, 0x1e, 0x1e -/* 801B01A0 001AD100 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B01A0 001AD100 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B01A4 001AD104 98 1F 08 E5 */ stb r0, 0x8e5(r31) -/* 801B01A8 001AD108 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801B01A8 001AD108 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801B01AC 001AD10C 38 00 00 0A */ li r0, 0xa /* 801B01B0 001AD110 38 81 00 08 */ addi r4, r1, 8 /* 801B01B4 001AD114 C0 1F 08 14 */ lfs f0, 0x814(r31) @@ -3563,8 +3563,8 @@ lbl_801B0194: /* 801B01CC 001AD12C 80 7F 04 50 */ lwz r3, 0x450(r31) /* 801B01D0 001AD130 38 63 00 04 */ addi r3, r3, 4 /* 801B01D4 001AD134 4B F8 15 E5 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801B01D8 001AD138 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B01DC 001AD13C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B01D8 001AD138 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B01DC 001AD13C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B01E0 001AD140 90 01 00 08 */ stw r0, 8(r1) lbl_801B01E4: /* 801B01E4 001AD144 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3671,8 +3671,8 @@ lbl_801B033C: /* 801B033C 001AD29C 39 00 00 07 */ li r8, 7 lbl_801B0340: /* 801B0340 001AD2A0 80 E4 08 4C */ lwz r7, 0x84c(r4) -/* 801B0344 001AD2A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B0348 001AD2A8 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B0344 001AD2A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B0348 001AD2A8 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B034C 001AD2AC 80 7F 04 50 */ lwz r3, 0x450(r31) /* 801B0350 001AD2B0 C0 47 00 60 */ lfs f2, 0x60(r7) /* 801B0354 001AD2B4 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha @@ -3696,9 +3696,9 @@ lbl_801B0340: /* 801B039C 001AD2FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B03A0 001AD300 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801B03A4 001AD304 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 801B03A8 001AD308 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B03A8 001AD308 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B03AC 001AD30C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801B03B0 001AD310 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B03B0 001AD310 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B03B4 001AD314 80 61 00 18 */ lwz r3, 0x18(r1) /* 801B03B8 001AD318 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 801B03BC 001AD31C 90 7F 01 30 */ stw r3, 0x130(r31) @@ -3760,16 +3760,16 @@ lbl_801B043C: /* 801B0490 001AD3F0 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801B0494 001AD3F4 2C 00 00 12 */ cmpwi r0, 0x12 /* 801B0498 001AD3F8 40 82 00 30 */ bne lbl_801B04C8 -/* 801B049C 001AD3FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B049C 001AD3FC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B04A0 001AD400 38 00 00 0C */ li r0, 0xc -/* 801B04A4 001AD404 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B04A4 001AD404 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B04A8 001AD408 90 01 00 0C */ stw r0, 0xc(r1) /* 801B04AC 001AD40C 38 64 00 04 */ addi r3, r4, 4 /* 801B04B0 001AD410 38 81 00 08 */ addi r4, r1, 8 /* 801B04B4 001AD414 90 A1 00 08 */ stw r5, 8(r1) /* 801B04B8 001AD418 4B F8 13 01 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801B04BC 001AD41C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B04C0 001AD420 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B04BC 001AD41C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B04C0 001AD420 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B04C4 001AD424 90 01 00 08 */ stw r0, 8(r1) lbl_801B04C8: /* 801B04C8 001AD428 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 @@ -3838,8 +3838,8 @@ lbl_801B057C: /* 801B05A4 001AD504 48 00 01 98 */ b lbl_801B073C lbl_801B05A8: /* 801B05A8 001AD508 81 04 08 4C */ lwz r8, 0x84c(r4) -/* 801B05AC 001AD50C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B05B0 001AD510 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 801B05AC 001AD50C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B05B0 001AD510 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 801B05B4 001AD514 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801B05B8 001AD518 C0 48 00 60 */ lfs f2, 0x60(r8) /* 801B05BC 001AD51C 38 E0 00 06 */ li r7, 6 @@ -3863,9 +3863,9 @@ lbl_801B05A8: /* 801B0604 001AD564 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B0608 001AD568 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801B060C 001AD56C 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 801B0610 001AD570 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0610 001AD570 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0614 001AD574 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801B0618 001AD578 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0618 001AD578 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B061C 001AD57C 80 61 00 18 */ lwz r3, 0x18(r1) /* 801B0620 001AD580 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 801B0624 001AD584 90 7F 01 30 */ stw r3, 0x130(r31) @@ -3930,16 +3930,16 @@ lbl_801B06A4: /* 801B0704 001AD664 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801B0708 001AD668 2C 00 00 12 */ cmpwi r0, 0x12 /* 801B070C 001AD66C 40 82 00 30 */ bne lbl_801B073C -/* 801B0710 001AD670 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0710 001AD670 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0714 001AD674 38 00 00 0C */ li r0, 0xc -/* 801B0718 001AD678 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B0718 001AD678 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B071C 001AD67C 90 01 00 0C */ stw r0, 0xc(r1) /* 801B0720 001AD680 38 64 00 04 */ addi r3, r4, 4 /* 801B0724 001AD684 38 81 00 08 */ addi r4, r1, 8 /* 801B0728 001AD688 90 A1 00 08 */ stw r5, 8(r1) /* 801B072C 001AD68C 4B F8 10 8D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801B0730 001AD690 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B0734 001AD694 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0730 001AD690 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B0734 001AD694 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0738 001AD698 90 01 00 08 */ stw r0, 8(r1) lbl_801B073C: /* 801B073C 001AD69C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 @@ -4046,9 +4046,9 @@ lbl_801B08A0: /* 801B08A4 001AD804 3C A0 80 3D */ lis r5, lbl_803D1568@ha /* 801B08A8 001AD808 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B08AC 001AD80C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801B08B0 001AD810 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801B08B0 001AD810 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801B08B4 001AD814 38 C5 15 68 */ addi r6, r5, lbl_803D1568@l -/* 801B08B8 001AD818 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 801B08B8 001AD818 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 801B08BC 001AD81C 54 00 10 3A */ slwi r0, r0, 2 /* 801B08C0 001AD820 7D 06 00 2E */ lwzx r8, r6, r0 /* 801B08C4 001AD824 38 C0 00 05 */ li r6, 5 @@ -4072,9 +4072,9 @@ lbl_801B08A0: /* 801B090C 001AD86C 80 01 00 3C */ lwz r0, 0x3c(r1) /* 801B0910 001AD870 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801B0914 001AD874 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801B0918 001AD878 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0918 001AD878 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B091C 001AD87C 90 1E 01 10 */ stw r0, 0x110(r30) -/* 801B0920 001AD880 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0920 001AD880 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0924 001AD884 80 61 00 40 */ lwz r3, 0x40(r1) /* 801B0928 001AD888 80 A1 00 44 */ lwz r5, 0x44(r1) /* 801B092C 001AD88C 90 7E 01 14 */ stw r3, 0x114(r30) @@ -4120,14 +4120,14 @@ lbl_801B0990: /* 801B09C0 001AD920 41 82 01 C8 */ beq lbl_801B0B88 /* 801B09C4 001AD924 80 1E 07 A8 */ lwz r0, 0x7a8(r30) /* 801B09C8 001AD928 3C 60 80 3D */ lis r3, lbl_803D157C@ha -/* 801B09CC 001AD92C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801B09CC 001AD92C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801B09D0 001AD930 3C 80 80 3D */ lis r4, lbl_803D1568@ha /* 801B09D4 001AD934 54 00 10 3A */ slwi r0, r0, 2 /* 801B09D8 001AD938 38 63 15 7C */ addi r3, r3, lbl_803D157C@l /* 801B09DC 001AD93C 7C 03 00 2E */ lwzx r0, r3, r0 /* 801B09E0 001AD940 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B09E4 001AD944 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801B09E8 001AD948 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 801B09E8 001AD948 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 801B09EC 001AD94C 54 00 10 3A */ slwi r0, r0, 2 /* 801B09F0 001AD950 38 84 15 68 */ addi r4, r4, lbl_803D1568@l /* 801B09F4 001AD954 7C A4 00 2E */ lwzx r5, r4, r0 @@ -4153,9 +4153,9 @@ lbl_801B0990: /* 801B0A44 001AD9A4 80 01 00 20 */ lwz r0, 0x20(r1) /* 801B0A48 001AD9A8 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801B0A4C 001AD9AC 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801B0A50 001AD9B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0A50 001AD9B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0A54 001AD9B4 90 1E 01 10 */ stw r0, 0x110(r30) -/* 801B0A58 001AD9B8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0A58 001AD9B8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0A5C 001AD9BC 80 61 00 24 */ lwz r3, 0x24(r1) /* 801B0A60 001AD9C0 80 A1 00 28 */ lwz r5, 0x28(r1) /* 801B0A64 001AD9C4 90 7E 01 14 */ stw r3, 0x114(r30) @@ -4224,16 +4224,16 @@ lbl_801B0B44: /* 801B0B50 001ADAB0 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801B0B54 001ADAB4 2C 00 00 07 */ cmpwi r0, 7 /* 801B0B58 001ADAB8 40 82 00 30 */ bne lbl_801B0B88 -/* 801B0B5C 001ADABC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0B5C 001ADABC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0B60 001ADAC0 38 00 00 0C */ li r0, 0xc -/* 801B0B64 001ADAC4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B0B64 001ADAC4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B0B68 001ADAC8 90 01 00 0C */ stw r0, 0xc(r1) /* 801B0B6C 001ADACC 38 64 00 04 */ addi r3, r4, 4 /* 801B0B70 001ADAD0 38 81 00 08 */ addi r4, r1, 8 /* 801B0B74 001ADAD4 90 A1 00 08 */ stw r5, 8(r1) /* 801B0B78 001ADAD8 4B F8 0C 41 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801B0B7C 001ADADC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B0B80 001ADAE0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0B7C 001ADADC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B0B80 001ADAE0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0B84 001ADAE4 90 01 00 08 */ stw r0, 8(r1) lbl_801B0B88: /* 801B0B88 001ADAE8 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 @@ -4378,8 +4378,8 @@ lbl_801B0D7C: /* 801B0D7C 001ADCDC 39 60 00 00 */ li r11, 0 /* 801B0D80 001ADCE0 80 A1 00 30 */ lwz r5, 0x30(r1) /* 801B0D84 001ADCE4 91 7E 05 68 */ stw r11, 0x568(r30) -/* 801B0D88 001ADCE8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 801B0D8C 001ADCEC 39 44 AA 68 */ addi r10, r4, lbl_803DAA68@l +/* 801B0D88 001ADCE8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha +/* 801B0D8C 001ADCEC 39 44 AA 68 */ addi r10, r4, __vt__13CBodyStateCmd@l /* 801B0D90 001ADCF0 51 65 F8 00 */ rlwimi r5, r11, 0x1f, 0, 0 /* 801B0D94 001ADCF4 88 1E 08 E4 */ lbz r0, 0x8e4(r30) /* 801B0D98 001ADCF8 51 60 2E B4 */ rlwimi r0, r11, 5, 0x1a, 0x1a @@ -4413,9 +4413,9 @@ lbl_801B0D7C: /* 801B0E08 001ADD68 80 81 00 18 */ lwz r4, 0x18(r1) /* 801B0E0C 001ADD6C 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801B0E10 001ADD70 38 03 A9 F0 */ addi r0, r3, lbl_803DA9F0@l -/* 801B0E14 001ADD74 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0E14 001ADD74 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0E18 001ADD78 90 9F 01 90 */ stw r4, 0x190(r31) -/* 801B0E1C 001ADD7C 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801B0E1C 001ADD7C 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801B0E20 001ADD80 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 801B0E24 001ADD84 80 81 00 20 */ lwz r4, 0x20(r1) /* 801B0E28 001ADD88 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4454,9 +4454,9 @@ lbl_801B0E8C: /* 801B0EA0 001ADE00 90 1E 05 68 */ stw r0, 0x568(r30) /* 801B0EA4 001ADE04 48 00 00 FC */ b lbl_801B0FA0 lbl_801B0EA8: -/* 801B0EA8 001ADE08 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0EA8 001ADE08 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0EAC 001ADE0C 38 A0 00 00 */ li r5, 0 -/* 801B0EB0 001ADE10 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0EB0 001ADE10 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0EB4 001ADE14 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801B0EB8 001ADE18 90 01 00 08 */ stw r0, 8(r1) /* 801B0EBC 001ADE1C 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -4470,9 +4470,9 @@ lbl_801B0EA8: /* 801B0EDC 001ADE3C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B0EE0 001ADE40 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801B0EE4 001ADE44 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801B0EE8 001ADE48 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B0EE8 001ADE48 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B0EEC 001ADE4C 90 1E 00 BC */ stw r0, 0xbc(r30) -/* 801B0EF0 001ADE50 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B0EF0 001ADE50 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B0EF4 001ADE54 80 61 00 10 */ lwz r3, 0x10(r1) /* 801B0EF8 001ADE58 90 81 00 08 */ stw r4, 8(r1) /* 801B0EFC 001ADE5C 90 7E 00 C0 */ stw r3, 0xc0(r30) @@ -4599,8 +4599,8 @@ lbl_801B1070: /* 801B10A4 001AE004 48 00 01 08 */ b lbl_801B11AC lbl_801B10A8: /* 801B10A8 001AE008 88 9E 08 E4 */ lbz r4, 0x8e4(r30) -/* 801B10AC 001AE00C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B10B0 001AE010 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B10AC 001AE00C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B10B0 001AE010 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B10B4 001AE014 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801B10B8 001AE018 54 85 F7 FE */ rlwinm r5, r4, 0x1e, 0x1f, 0x1f /* 801B10BC 001AE01C 38 80 00 00 */ li r4, 0 @@ -4618,9 +4618,9 @@ lbl_801B10A8: /* 801B10EC 001AE04C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B10F0 001AE050 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801B10F4 001AE054 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801B10F8 001AE058 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B10F8 001AE058 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B10FC 001AE05C 90 1E 00 BC */ stw r0, 0xbc(r30) -/* 801B1100 001AE060 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B1100 001AE060 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B1104 001AE064 80 61 00 10 */ lwz r3, 0x10(r1) /* 801B1108 001AE068 90 81 00 08 */ stw r4, 8(r1) /* 801B110C 001AE06C 90 7E 00 C0 */ stw r3, 0xc0(r30) @@ -4713,9 +4713,9 @@ lbl_801B1204: /* 801B1240 001AE1A0 38 C0 FF FF */ li r6, -1 /* 801B1244 001AE1A4 4B E9 FE 7D */ bl SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage /* 801B1248 001AE1A8 80 9F 07 AC */ lwz r4, 0x7ac(r31) -/* 801B124C 001AE1AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B124C 001AE1AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1250 001AE1B0 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 801B1254 001AE1B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B1254 001AE1B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B1258 001AE1B8 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 801B125C 001AE1BC 54 84 10 3A */ slwi r4, r4, 2 /* 801B1260 001AE1C0 C0 1F 00 38 */ lfs f0, 0x38(r31) @@ -4742,9 +4742,9 @@ lbl_801B1204: /* 801B12B4 001AE214 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B12B8 001AE218 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 801B12BC 001AE21C 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 801B12C0 001AE220 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B12C0 001AE220 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B12C4 001AE224 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 801B12C8 001AE228 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B12C8 001AE228 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B12CC 001AE22C 80 A1 00 28 */ lwz r5, 0x28(r1) /* 801B12D0 001AE230 80 61 00 2C */ lwz r3, 0x2c(r1) /* 801B12D4 001AE234 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -4783,9 +4783,9 @@ lbl_801B1320: /* 801B134C 001AE2AC 48 00 01 28 */ b lbl_801B1474 lbl_801B1350: /* 801B1350 001AE2B0 80 9F 07 AC */ lwz r4, 0x7ac(r31) -/* 801B1354 001AE2B4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B1354 001AE2B4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1358 001AE2B8 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 801B135C 001AE2BC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B135C 001AE2BC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B1360 001AE2C0 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 801B1364 001AE2C4 54 84 10 3A */ slwi r4, r4, 2 /* 801B1368 001AE2C8 C0 1F 00 38 */ lfs f0, 0x38(r31) @@ -4811,9 +4811,9 @@ lbl_801B1350: /* 801B13B8 001AE318 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B13BC 001AE31C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 801B13C0 001AE320 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 801B13C4 001AE324 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B13C4 001AE324 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B13C8 001AE328 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 801B13CC 001AE32C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B13CC 001AE32C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B13D0 001AE330 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801B13D4 001AE334 80 61 00 14 */ lwz r3, 0x14(r1) /* 801B13D8 001AE338 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -4889,8 +4889,8 @@ lbl_801B14CC: /* 801B14CC 001AE42C 39 60 00 00 */ li r11, 0 /* 801B14D0 001AE430 80 A1 00 50 */ lwz r5, 0x50(r1) /* 801B14D4 001AE434 91 7E 05 68 */ stw r11, 0x568(r30) -/* 801B14D8 001AE438 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 801B14DC 001AE43C 39 44 AA 68 */ addi r10, r4, lbl_803DAA68@l +/* 801B14D8 001AE438 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha +/* 801B14DC 001AE43C 39 44 AA 68 */ addi r10, r4, __vt__13CBodyStateCmd@l /* 801B14E0 001AE440 51 65 F8 00 */ rlwimi r5, r11, 0x1f, 0, 0 /* 801B14E4 001AE444 88 1E 08 E4 */ lbz r0, 0x8e4(r30) /* 801B14E8 001AE448 51 60 2E B4 */ rlwimi r0, r11, 5, 0x1a, 0x1a @@ -4924,9 +4924,9 @@ lbl_801B14CC: /* 801B1558 001AE4B8 80 01 00 38 */ lwz r0, 0x38(r1) /* 801B155C 001AE4BC 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801B1560 001AE4C0 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801B1564 001AE4C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B1564 001AE4C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1568 001AE4C8 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801B156C 001AE4CC 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801B156C 001AE4CC 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801B1570 001AE4D0 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 801B1574 001AE4D4 80 01 00 40 */ lwz r0, 0x40(r1) /* 801B1578 001AE4D8 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4973,12 +4973,12 @@ lbl_801B15FC: /* 801B1610 001AE570 90 1E 05 68 */ stw r0, 0x568(r30) /* 801B1614 001AE574 48 00 01 D0 */ b lbl_801B17E4 lbl_801B1618: -/* 801B1618 001AE578 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801B1618 001AE578 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801B161C 001AE57C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B1620 001AE580 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801B1624 001AE584 80 81 00 30 */ lwz r4, 0x30(r1) /* 801B1628 001AE588 38 60 00 00 */ li r3, 0 -/* 801B162C 001AE58C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 801B162C 001AE58C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 801B1630 001AE590 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 801B1634 001AE594 C0 45 00 00 */ lfs f2, 0(r5) /* 801B1638 001AE598 C0 25 00 04 */ lfs f1, 4(r5) @@ -5007,9 +5007,9 @@ lbl_801B1618: /* 801B1694 001AE5F4 80 01 00 18 */ lwz r0, 0x18(r1) /* 801B1698 001AE5F8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801B169C 001AE5FC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801B16A0 001AE600 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B16A0 001AE600 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B16A4 001AE604 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801B16A8 001AE608 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B16A8 001AE608 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B16AC 001AE60C 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 801B16B0 001AE610 80 61 00 20 */ lwz r3, 0x20(r1) /* 801B16B4 001AE614 90 BF 01 94 */ stw r5, 0x194(r31) @@ -5147,9 +5147,9 @@ lbl_801B1868: /* 801B1888 001AE7E8 4B F8 91 51 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 801B188C 001AE7EC 48 00 00 FC */ b lbl_801B1988 lbl_801B1890: -/* 801B1890 001AE7F0 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801B1890 001AE7F0 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801B1894 001AE7F4 38 C0 00 00 */ li r6, 0 -/* 801B1898 001AE7F8 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 801B1898 001AE7F8 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 801B189C 001AE7FC 80 61 00 24 */ lwz r3, 0x24(r1) /* 801B18A0 001AE800 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 801B18A4 001AE804 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -5179,9 +5179,9 @@ lbl_801B1890: /* 801B1904 001AE864 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B1908 001AE868 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801B190C 001AE86C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801B1910 001AE870 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B1910 001AE870 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1914 001AE874 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801B1918 001AE878 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B1918 001AE878 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B191C 001AE87C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801B1920 001AE880 80 61 00 14 */ lwz r3, 0x14(r1) /* 801B1924 001AE884 90 BF 01 94 */ stw r5, 0x194(r31) @@ -5259,9 +5259,9 @@ lbl_801B1A04: /* 801B1A18 001AE978 90 03 05 68 */ stw r0, 0x568(r3) /* 801B1A1C 001AE97C 48 00 00 8C */ b lbl_801B1AA8 lbl_801B1A20: -/* 801B1A20 001AE980 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801B1A20 001AE980 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801B1A24 001AE984 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801B1A28 001AE988 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801B1A28 001AE988 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801B1A2C 001AE98C 38 80 00 12 */ li r4, 0x12 /* 801B1A30 001AE990 90 01 00 08 */ stw r0, 8(r1) /* 801B1A34 001AE994 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -5276,9 +5276,9 @@ lbl_801B1A20: /* 801B1A58 001AE9B8 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B1A5C 001AE9BC 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 801B1A60 001AE9C0 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 801B1A64 001AE9C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B1A64 001AE9C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1A68 001AE9C8 90 1F 02 14 */ stw r0, 0x214(r31) -/* 801B1A6C 001AE9CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B1A6C 001AE9CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B1A70 001AE9D0 80 61 00 10 */ lwz r3, 0x10(r1) /* 801B1A74 001AE9D4 90 81 00 08 */ stw r4, 8(r1) /* 801B1A78 001AE9D8 90 7F 02 18 */ stw r3, 0x218(r31) @@ -5383,11 +5383,11 @@ FadeOut__9CFlaahgraFR13CStateManager9EStateMsgf: /* 801B1BD8 001AEB38 88 1F 08 E4 */ lbz r0, 0x8e4(r31) /* 801B1BDC 001AEB3C 38 C0 00 00 */ li r6, 0 /* 801B1BE0 001AEB40 50 C0 2E B4 */ rlwimi r0, r6, 5, 0x1a, 0x1a -/* 801B1BE4 001AEB44 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B1BE4 001AEB44 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B1BE8 001AEB48 98 1F 08 E4 */ stb r0, 0x8e4(r31) /* 801B1BEC 001AEB4C 38 A0 00 03 */ li r5, 3 /* 801B1BF0 001AEB50 C0 02 A8 C4 */ lfs f0, lbl_805AC5E4@sda21(r2) -/* 801B1BF4 001AEB54 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801B1BF4 001AEB54 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801B1BF8 001AEB58 38 00 00 0C */ li r0, 0xc /* 801B1BFC 001AEB5C 38 81 00 08 */ addi r4, r1, 8 /* 801B1C00 001AEB60 D0 1F 07 C0 */ stfs f0, 0x7c0(r31) @@ -5404,8 +5404,8 @@ FadeOut__9CFlaahgraFR13CStateManager9EStateMsgf: /* 801B1C2C 001AEB8C 4B F7 FB 8D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801B1C30 001AEB90 34 01 00 08 */ addic. r0, r1, 8 /* 801B1C34 001AEB94 41 82 00 10 */ beq lbl_801B1C44 -/* 801B1C38 001AEB98 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801B1C3C 001AEB9C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B1C38 001AEB98 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801B1C3C 001AEB9C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B1C40 001AEBA0 90 01 00 08 */ stw r0, 8(r1) lbl_801B1C44: /* 801B1C44 001AEBA4 80 7F 04 50 */ lwz r3, 0x450(r31) @@ -6909,9 +6909,9 @@ lbl_801B3138: /* 801B31A0 001B0100 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 801B31A4 001B0104 4C 41 13 82 */ cror 2, 1, 2 /* 801B31A8 001B0108 40 82 00 6C */ bne lbl_801B3214 -/* 801B31AC 001B010C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801B31AC 001B010C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801B31B0 001B0110 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 801B31B4 001B0114 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801B31B4 001B0114 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801B31B8 001B0118 3C 80 80 3E */ lis r4, lbl_803DAA38@ha /* 801B31BC 001B011C 90 01 00 A8 */ stw r0, 0xa8(r1) /* 801B31C0 001B0120 38 A4 AA 38 */ addi r5, r4, lbl_803DAA38@l @@ -6927,9 +6927,9 @@ lbl_801B3138: /* 801B31E8 001B0148 80 01 00 AC */ lwz r0, 0xac(r1) /* 801B31EC 001B014C 3C 60 80 3E */ lis r3, lbl_803DAA38@ha /* 801B31F0 001B0150 38 83 AA 38 */ addi r4, r3, lbl_803DAA38@l -/* 801B31F4 001B0154 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B31F4 001B0154 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B31F8 001B0158 90 1B 01 64 */ stw r0, 0x164(r27) -/* 801B31FC 001B015C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B31FC 001B015C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B3200 001B0160 80 61 00 B0 */ lwz r3, 0xb0(r1) /* 801B3204 001B0164 90 81 00 A8 */ stw r4, 0xa8(r1) /* 801B3208 001B0168 90 7B 01 68 */ stw r3, 0x168(r27) @@ -6950,9 +6950,9 @@ lbl_801B3214: /* 801B3240 001B01A0 40 82 02 1C */ bne lbl_801B345C lbl_801B3244: /* 801B3244 001B01A4 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 801B3248 001B01A8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B3248 001B01A8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B324C 001B01AC C0 3F 00 48 */ lfs f1, 0x48(r31) -/* 801B3250 001B01B0 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801B3250 001B01B0 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801B3254 001B01B4 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 801B3258 001B01B8 FC 40 10 50 */ fneg f2, f2 /* 801B325C 001B01BC FC 20 08 50 */ fneg f1, f1 @@ -6976,9 +6976,9 @@ lbl_801B3244: /* 801B32A4 001B0204 80 01 00 C8 */ lwz r0, 0xc8(r1) /* 801B32A8 001B0208 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801B32AC 001B020C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801B32B0 001B0210 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B32B0 001B0210 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B32B4 001B0214 90 1B 00 F8 */ stw r0, 0xf8(r27) -/* 801B32B8 001B0218 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B32B8 001B0218 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B32BC 001B021C 80 A1 00 CC */ lwz r5, 0xcc(r1) /* 801B32C0 001B0220 80 61 00 D0 */ lwz r3, 0xd0(r1) /* 801B32C4 001B0224 90 BB 00 FC */ stw r5, 0xfc(r27) @@ -7016,9 +7016,9 @@ lbl_801B3314: /* 801B333C 001B029C 2C 00 00 06 */ cmpwi r0, 6 /* 801B3340 001B02A0 40 82 01 1C */ bne lbl_801B345C lbl_801B3344: -/* 801B3344 001B02A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B3344 001B02A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B3348 001B02A8 C0 02 A8 DC */ lfs f0, lbl_805AC5FC@sda21(r2) -/* 801B334C 001B02AC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B334C 001B02AC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B3350 001B02B0 80 7F 04 50 */ lwz r3, 0x450(r31) /* 801B3354 001B02B4 3C 80 80 3E */ lis r4, lbl_803E10BC@ha /* 801B3358 001B02B8 90 01 00 9C */ stw r0, 0x9c(r1) @@ -7034,9 +7034,9 @@ lbl_801B3344: /* 801B3380 001B02E0 80 01 00 A0 */ lwz r0, 0xa0(r1) /* 801B3384 001B02E4 3C 60 80 3E */ lis r3, lbl_803E10BC@ha /* 801B3388 001B02E8 38 83 10 BC */ addi r4, r3, lbl_803E10BC@l -/* 801B338C 001B02EC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801B338C 001B02EC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801B3390 001B02F0 90 1B 02 7C */ stw r0, 0x27c(r27) -/* 801B3394 001B02F4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801B3394 001B02F4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801B3398 001B02F8 C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 801B339C 001B02FC 90 81 00 9C */ stw r4, 0x9c(r1) /* 801B33A0 001B0300 D0 1B 02 80 */ stfs f0, 0x280(r27) diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 8ea22acd..485c29db 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -730,11 +730,11 @@ lbl_801F0704: lbl_801F071C: /* 801F071C 001ED67C 39 00 00 01 */ li r8, 1 lbl_801F0720: -/* 801F0720 001ED680 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801F0720 001ED680 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801F0724 001ED684 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F0728 001ED688 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801F072C 001ED68C 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 801F0730 001ED690 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 801F0730 001ED690 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 801F0734 001ED694 C0 44 00 00 */ lfs f2, 0(r4) /* 801F0738 001ED698 C0 24 00 04 */ lfs f1, 4(r4) /* 801F073C 001ED69C 3C A0 80 3E */ lis r5, lbl_803DA9D8@ha @@ -757,9 +757,9 @@ lbl_801F0720: /* 801F0780 001ED6E0 80 01 00 0C */ lwz r0, 0xc(r1) /* 801F0784 001ED6E4 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801F0788 001ED6E8 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801F078C 001ED6EC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F078C 001ED6EC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F0790 001ED6F0 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801F0794 001ED6F4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F0794 001ED6F4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F0798 001ED6F8 80 61 00 10 */ lwz r3, 0x10(r1) /* 801F079C 001ED6FC 80 A1 00 14 */ lwz r5, 0x14(r1) /* 801F07A0 001ED700 90 7F 01 14 */ stw r3, 0x114(r31) diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index 8f69eb3a..4030a223 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -1782,9 +1782,9 @@ UpdateDest__10CPatternedFR13CStateManager: /* 801F5388 001F22E8 A0 7F 00 FA */ lhz r3, 0xfa(r31) /* 801F538C 001F22EC 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 801F5390 001F22F0 41 82 00 F0 */ beq lbl_801F5480 -/* 801F5394 001F22F4 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801F5394 001F22F4 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801F5398 001F22F8 38 A0 00 00 */ li r5, 0 -/* 801F539C 001F22FC 39 06 AA 68 */ addi r8, r6, lbl_803DAA68@l +/* 801F539C 001F22FC 39 06 AA 68 */ addi r8, r6, __vt__13CBodyStateCmd@l /* 801F53A0 001F2300 88 81 00 A4 */ lbz r4, 0xa4(r1) /* 801F53A4 001F2304 50 A4 3E 30 */ rlwimi r4, r5, 7, 0x18, 0x18 /* 801F53A8 001F2308 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha @@ -1819,9 +1819,9 @@ UpdateDest__10CPatternedFR13CStateManager: /* 801F541C 001F237C 80 01 00 84 */ lwz r0, 0x84(r1) /* 801F5420 001F2380 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 801F5424 001F2384 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 801F5428 001F2388 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F5428 001F2388 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F542C 001F238C 90 1E 01 D4 */ stw r0, 0x1d4(r30) -/* 801F5430 001F2390 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F5430 001F2390 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F5434 001F2394 80 A1 00 88 */ lwz r5, 0x88(r1) /* 801F5438 001F2398 80 61 00 8C */ lwz r3, 0x8c(r1) /* 801F543C 001F239C 90 BE 01 D8 */ stw r5, 0x1d8(r30) @@ -1863,12 +1863,12 @@ lbl_801F5480: /* 801F54C8 001F2428 81 03 00 04 */ lwz r8, 4(r3) /* 801F54CC 001F242C 28 08 00 00 */ cmplwi r8, 0 /* 801F54D0 001F2430 41 82 00 EC */ beq lbl_801F55BC -/* 801F54D4 001F2434 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F54D4 001F2434 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F54D8 001F2438 88 A1 00 7C */ lbz r5, 0x7c(r1) /* 801F54DC 001F243C 38 00 00 01 */ li r0, 1 /* 801F54E0 001F2440 80 FB 04 50 */ lwz r7, 0x450(r27) /* 801F54E4 001F2444 50 05 3E 30 */ rlwimi r5, r0, 7, 0x18, 0x18 -/* 801F54E8 001F2448 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 801F54E8 001F2448 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 801F54EC 001F244C C0 48 00 60 */ lfs f2, 0x60(r8) /* 801F54F0 001F2450 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 801F54F4 001F2454 C0 28 00 50 */ lfs f1, 0x50(r8) @@ -1900,9 +1900,9 @@ lbl_801F5480: /* 801F555C 001F24BC 80 01 00 5C */ lwz r0, 0x5c(r1) /* 801F5560 001F24C0 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 801F5564 001F24C4 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 801F5568 001F24C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F5568 001F24C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F556C 001F24CC 90 1D 01 D4 */ stw r0, 0x1d4(r29) -/* 801F5570 001F24D0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F5570 001F24D0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F5574 001F24D4 80 A1 00 60 */ lwz r5, 0x60(r1) /* 801F5578 001F24D8 80 61 00 64 */ lwz r3, 0x64(r1) /* 801F557C 001F24DC 90 BD 01 D8 */ stw r5, 0x1d8(r29) @@ -2171,9 +2171,9 @@ lbl_801F594C: /* 801F5954 001F28B4 4B FF F3 B9 */ bl GetStepDirection__10CPatternedFRC9CVector3f /* 801F5958 001F28B8 2C 03 00 00 */ cmpwi r3, 0 /* 801F595C 001F28BC 41 82 00 78 */ beq lbl_801F59D4 -/* 801F5960 001F28C0 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801F5960 001F28C0 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801F5964 001F28C4 80 9F 04 50 */ lwz r4, 0x450(r31) -/* 801F5968 001F28C8 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 801F5968 001F28C8 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 801F596C 001F28CC 3C A0 80 3E */ lis r5, lbl_803DA9E4@ha /* 801F5970 001F28D0 90 01 00 14 */ stw r0, 0x14(r1) /* 801F5974 001F28D4 38 A5 A9 E4 */ addi r5, r5, lbl_803DA9E4@l @@ -2190,9 +2190,9 @@ lbl_801F594C: /* 801F59A0 001F2900 80 01 00 18 */ lwz r0, 0x18(r1) /* 801F59A4 001F2904 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801F59A8 001F2908 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801F59AC 001F290C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F59AC 001F290C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F59B0 001F2910 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 801F59B4 001F2914 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F59B4 001F2914 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F59B8 001F2918 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 801F59BC 001F291C 90 81 00 14 */ stw r4, 0x14(r1) /* 801F59C0 001F2920 80 61 00 20 */ lwz r3, 0x20(r1) @@ -3359,9 +3359,9 @@ lbl_801F69F8: /* 801F6A10 001F3970 D0 1E 03 24 */ stfs f0, 0x324(r30) /* 801F6A14 001F3974 48 00 00 B0 */ b lbl_801F6AC4 lbl_801F6A18: -/* 801F6A18 001F3978 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F6A18 001F3978 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F6A1C 001F397C 38 00 00 02 */ li r0, 2 -/* 801F6A20 001F3980 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801F6A20 001F3980 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801F6A24 001F3984 90 01 00 0C */ stw r0, 0xc(r1) /* 801F6A28 001F3988 38 81 00 08 */ addi r4, r1, 8 /* 801F6A2C 001F398C 90 61 00 08 */ stw r3, 8(r1) @@ -3370,8 +3370,8 @@ lbl_801F6A18: /* 801F6A38 001F3998 4B F3 AD 81 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801F6A3C 001F399C 34 01 00 08 */ addic. r0, r1, 8 /* 801F6A40 001F39A0 41 82 00 10 */ beq lbl_801F6A50 -/* 801F6A44 001F39A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801F6A48 001F39A8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F6A44 001F39A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801F6A48 001F39A8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F6A4C 001F39AC 90 01 00 08 */ stw r0, 8(r1) lbl_801F6A50: /* 801F6A50 001F39B0 88 1E 04 00 */ lbz r0, 0x400(r30) @@ -4647,9 +4647,9 @@ lbl_801F7BD8: /* 801F7C18 001F4B78 88 1F 06 A0 */ lbz r0, 0x6a0(r31) /* 801F7C1C 001F4B7C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 801F7C20 001F4B80 40 82 00 C4 */ bne lbl_801F7CE4 -/* 801F7C24 001F4B84 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801F7C24 001F4B84 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801F7C28 001F4B88 3C 60 80 3E */ lis r3, lbl_803E061C@ha -/* 801F7C2C 001F4B8C 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801F7C2C 001F4B8C 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801F7C30 001F4B90 38 A0 00 18 */ li r5, 0x18 /* 801F7C34 001F4B94 90 01 00 68 */ stw r0, 0x68(r1) /* 801F7C38 001F4B98 38 03 06 1C */ addi r0, r3, lbl_803E061C@l @@ -4662,9 +4662,9 @@ lbl_801F7BD8: /* 801F7C54 001F4BB4 3C 60 80 3E */ lis r3, lbl_803E061C@ha /* 801F7C58 001F4BB8 80 C1 00 6C */ lwz r6, 0x6c(r1) /* 801F7C5C 001F4BBC 38 03 06 1C */ addi r0, r3, lbl_803E061C@l -/* 801F7C60 001F4BC0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F7C60 001F4BC0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F7C64 001F4BC4 90 01 00 68 */ stw r0, 0x68(r1) -/* 801F7C68 001F4BC8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F7C68 001F4BC8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F7C6C 001F4BCC 7F E4 FB 78 */ mr r4, r31 /* 801F7C70 001F4BD0 7F C5 F3 78 */ mr r5, r30 /* 801F7C74 001F4BD4 90 DC 02 74 */ stw r6, 0x274(r28) @@ -4696,17 +4696,17 @@ lbl_801F7BD8: /* 801F7CDC 001F4C3C D0 43 00 30 */ stfs f2, 0x30(r3) /* 801F7CE0 001F4C40 48 00 00 34 */ b lbl_801F7D14 lbl_801F7CE4: -/* 801F7CE4 001F4C44 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801F7CE4 001F4C44 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801F7CE8 001F4C48 38 00 00 17 */ li r0, 0x17 -/* 801F7CEC 001F4C4C 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801F7CEC 001F4C4C 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801F7CF0 001F4C50 90 01 00 64 */ stw r0, 0x64(r1) /* 801F7CF4 001F4C54 38 81 00 60 */ addi r4, r1, 0x60 /* 801F7CF8 001F4C58 90 61 00 60 */ stw r3, 0x60(r1) /* 801F7CFC 001F4C5C 80 7F 04 50 */ lwz r3, 0x450(r31) /* 801F7D00 001F4C60 38 63 00 04 */ addi r3, r3, 4 /* 801F7D04 001F4C64 4B F3 9A B5 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801F7D08 001F4C68 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801F7D0C 001F4C6C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801F7D08 001F4C68 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801F7D0C 001F4C6C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801F7D10 001F4C70 90 01 00 60 */ stw r0, 0x60(r1) lbl_801F7D14: /* 801F7D14 001F4C74 C0 3F 08 70 */ lfs f1, 0x870(r31) @@ -8647,9 +8647,9 @@ lbl_801FB634: /* 801FB638 001F8598 41 82 00 08 */ beq lbl_801FB640 /* 801FB63C 001F859C 48 00 00 BC */ b lbl_801FB6F8 lbl_801FB640: -/* 801FB640 001F85A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801FB640 001F85A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801FB644 001F85A4 38 00 00 0A */ li r0, 0xa -/* 801FB648 001F85A8 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801FB648 001F85A8 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801FB64C 001F85AC 90 01 00 18 */ stw r0, 0x18(r1) /* 801FB650 001F85B0 38 64 00 04 */ addi r3, r4, 4 /* 801FB654 001F85B4 38 81 00 14 */ addi r4, r1, 0x14 @@ -8657,8 +8657,8 @@ lbl_801FB640: /* 801FB65C 001F85BC 4B F3 61 5D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801FB660 001F85C0 34 01 00 14 */ addic. r0, r1, 0x14 /* 801FB664 001F85C4 41 82 00 10 */ beq lbl_801FB674 -/* 801FB668 001F85C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801FB66C 001F85CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801FB668 001F85C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801FB66C 001F85CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801FB670 001F85D0 90 01 00 14 */ stw r0, 0x14(r1) lbl_801FB674: /* 801FB674 001F85D4 88 1F 03 28 */ lbz r0, 0x328(r31) @@ -8667,9 +8667,9 @@ lbl_801FB674: /* 801FB680 001F85E0 98 1F 03 28 */ stb r0, 0x328(r31) /* 801FB684 001F85E4 48 00 00 74 */ b lbl_801FB6F8 lbl_801FB688: -/* 801FB688 001F85E8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801FB688 001F85E8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801FB68C 001F85EC 38 A0 00 00 */ li r5, 0 -/* 801FB690 001F85F0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801FB690 001F85F0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801FB694 001F85F4 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801FB698 001F85F8 90 01 00 1C */ stw r0, 0x1c(r1) /* 801FB69C 001F85FC 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -8683,9 +8683,9 @@ lbl_801FB688: /* 801FB6BC 001F861C 80 01 00 20 */ lwz r0, 0x20(r1) /* 801FB6C0 001F8620 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801FB6C4 001F8624 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801FB6C8 001F8628 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801FB6C8 001F8628 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801FB6CC 001F862C 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 801FB6D0 001F8630 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801FB6D0 001F8630 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801FB6D4 001F8634 80 61 00 24 */ lwz r3, 0x24(r1) /* 801FB6D8 001F8638 90 81 00 1C */ stw r4, 0x1c(r1) /* 801FB6DC 001F863C 90 7F 00 C0 */ stw r3, 0xc0(r31) @@ -11348,9 +11348,9 @@ sub_801fdd44: /* 801FDD58 001FACB8 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801FDD5C 001FACBC 2C 00 00 02 */ cmpwi r0, 2 /* 801FDD60 001FACC0 40 82 00 60 */ bne lbl_801FDDC0 -/* 801FDD64 001FACC4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801FDD64 001FACC4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801FDD68 001FACC8 38 A0 00 00 */ li r5, 0 -/* 801FDD6C 001FACCC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801FDD6C 001FACCC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801FDD70 001FACD0 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801FDD74 001FACD4 90 01 00 08 */ stw r0, 8(r1) /* 801FDD78 001FACD8 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -11364,9 +11364,9 @@ sub_801fdd44: /* 801FDD98 001FACF8 80 01 00 0C */ lwz r0, 0xc(r1) /* 801FDD9C 001FACFC 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801FDDA0 001FAD00 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801FDDA4 001FAD04 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801FDDA4 001FAD04 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801FDDA8 001FAD08 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 801FDDAC 001FAD0C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801FDDAC 001FAD0C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801FDDB0 001FAD10 80 61 00 10 */ lwz r3, 0x10(r1) /* 801FDDB4 001FAD14 90 81 00 08 */ stw r4, 8(r1) /* 801FDDB8 001FAD18 90 7F 00 C0 */ stw r3, 0xc0(r31) diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 223644f8..3b8d3961 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -4094,9 +4094,9 @@ lbl_801A1888: /* 801A189C 0019E7FC 90 1E 05 68 */ stw r0, 0x568(r30) /* 801A18A0 0019E800 48 00 00 DC */ b lbl_801A197C lbl_801A18A4: -/* 801A18A4 0019E804 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A18A4 0019E804 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A18A8 0019E808 C0 5E 09 80 */ lfs f2, 0x980(r30) -/* 801A18AC 0019E80C 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 801A18AC 0019E80C 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 801A18B0 0019E810 C0 3E 09 84 */ lfs f1, 0x984(r30) /* 801A18B4 0019E814 C0 1E 09 88 */ lfs f0, 0x988(r30) /* 801A18B8 0019E818 3C 60 80 3E */ lis r3, lbl_803DAA44@ha @@ -4117,9 +4117,9 @@ lbl_801A18A4: /* 801A18F4 0019E854 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A18F8 0019E858 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801A18FC 0019E85C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801A1900 0019E860 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A1900 0019E860 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A1904 0019E864 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 801A1908 0019E868 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A1908 0019E868 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A190C 0019E86C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801A1910 0019E870 80 61 00 14 */ lwz r3, 0x14(r1) /* 801A1914 0019E874 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -4335,12 +4335,12 @@ lbl_801A1BF4: /* 801A1C08 0019EB68 90 03 05 68 */ stw r0, 0x568(r3) /* 801A1C0C 0019EB6C 48 00 00 EC */ b lbl_801A1CF8 lbl_801A1C10: -/* 801A1C10 0019EB70 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801A1C10 0019EB70 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801A1C14 0019EB74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A1C18 0019EB78 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A1C1C 0019EB7C 80 81 00 24 */ lwz r4, 0x24(r1) /* 801A1C20 0019EB80 38 60 00 00 */ li r3, 0 -/* 801A1C24 0019EB84 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 801A1C24 0019EB84 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 801A1C28 0019EB88 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 801A1C2C 0019EB8C C0 45 00 00 */ lfs f2, 0(r5) /* 801A1C30 0019EB90 C0 25 00 04 */ lfs f1, 4(r5) @@ -4369,9 +4369,9 @@ lbl_801A1C10: /* 801A1C8C 0019EBEC 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A1C90 0019EBF0 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801A1C94 0019EBF4 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801A1C98 0019EBF8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A1C98 0019EBF8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A1C9C 0019EBFC 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801A1CA0 0019EC00 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A1CA0 0019EC00 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A1CA4 0019EC04 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801A1CA8 0019EC08 80 61 00 14 */ lwz r3, 0x14(r1) /* 801A1CAC 0019EC0C 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4445,9 +4445,9 @@ lbl_801A1D84: /* 801A1D98 0019ECF8 90 1F 05 68 */ stw r0, 0x568(r31) /* 801A1D9C 0019ECFC 48 00 00 9C */ b lbl_801A1E38 lbl_801A1DA0: -/* 801A1DA0 0019ED00 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801A1DA0 0019ED00 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801A1DA4 0019ED04 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801A1DA8 0019ED08 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801A1DA8 0019ED08 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801A1DAC 0019ED0C 38 80 00 12 */ li r4, 0x12 /* 801A1DB0 0019ED10 90 01 00 08 */ stw r0, 8(r1) /* 801A1DB4 0019ED14 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -4462,9 +4462,9 @@ lbl_801A1DA0: /* 801A1DD8 0019ED38 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A1DDC 0019ED3C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 801A1DE0 0019ED40 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 801A1DE4 0019ED44 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A1DE4 0019ED44 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A1DE8 0019ED48 90 1F 02 14 */ stw r0, 0x214(r31) -/* 801A1DEC 0019ED4C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A1DEC 0019ED4C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A1DF0 0019ED50 80 61 00 10 */ lwz r3, 0x10(r1) /* 801A1DF4 0019ED54 90 81 00 08 */ stw r4, 8(r1) /* 801A1DF8 0019ED58 90 7F 02 18 */ stw r3, 0x218(r31) @@ -4673,12 +4673,12 @@ lbl_801A20B0: /* 801A20D0 0019F030 4B F9 89 09 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 801A20D4 0019F034 48 00 00 EC */ b lbl_801A21C0 lbl_801A20D8: -/* 801A20D8 0019F038 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801A20D8 0019F038 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801A20DC 0019F03C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A20E0 0019F040 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A20E4 0019F044 80 81 00 3C */ lwz r4, 0x3c(r1) /* 801A20E8 0019F048 38 60 00 00 */ li r3, 0 -/* 801A20EC 0019F04C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 801A20EC 0019F04C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 801A20F0 0019F050 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 801A20F4 0019F054 C0 45 00 00 */ lfs f2, 0(r5) /* 801A20F8 0019F058 C0 25 00 04 */ lfs f1, 4(r5) @@ -4707,9 +4707,9 @@ lbl_801A20D8: /* 801A2154 0019F0B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A2158 0019F0B8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801A215C 0019F0BC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801A2160 0019F0C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A2160 0019F0C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A2164 0019F0C4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801A2168 0019F0C8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A2168 0019F0C8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A216C 0019F0CC 80 A1 00 28 */ lwz r5, 0x28(r1) /* 801A2170 0019F0D0 80 61 00 2C */ lwz r3, 0x2c(r1) /* 801A2174 0019F0D4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4794,10 +4794,10 @@ lbl_801A2280: /* 801A228C 0019F1EC 41 82 00 08 */ beq lbl_801A2294 /* 801A2290 0019F1F0 39 20 00 08 */ li r9, 8 lbl_801A2294: -/* 801A2294 0019F1F4 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801A2294 0019F1F4 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801A2298 0019F1F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A229C 0019F1FC C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801A22A0 0019F200 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 801A22A0 0019F200 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 801A22A4 0019F204 3C C0 80 3E */ lis r6, lbl_803DA9F0@ha /* 801A22A8 0019F208 80 01 00 24 */ lwz r0, 0x24(r1) /* 801A22AC 0019F20C 38 80 00 00 */ li r4, 0 @@ -4826,9 +4826,9 @@ lbl_801A2294: /* 801A2308 0019F268 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A230C 0019F26C 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801A2310 0019F270 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801A2314 0019F274 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A2314 0019F274 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A2318 0019F278 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801A231C 0019F27C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A231C 0019F27C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A2320 0019F280 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801A2324 0019F284 80 61 00 14 */ lwz r3, 0x14(r1) /* 801A2328 0019F288 90 BF 01 94 */ stw r5, 0x194(r31) @@ -5661,10 +5661,10 @@ lbl_801A2F48: /* 801A2F54 0019FEB4 4E 80 04 21 */ bctrl /* 801A2F58 0019FEB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2F5C 0019FEBC 41 82 01 30 */ beq lbl_801A308C -/* 801A2F60 0019FEC0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801A2F60 0019FEC0 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801A2F64 0019FEC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A2F68 0019FEC8 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801A2F6C 0019FECC 38 E4 AA 68 */ addi r7, r4, lbl_803DAA68@l +/* 801A2F6C 0019FECC 38 E4 AA 68 */ addi r7, r4, __vt__13CBodyStateCmd@l /* 801A2F70 0019FED0 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801A2F74 0019FED4 90 E1 00 08 */ stw r7, 8(r1) /* 801A2F78 0019FED8 38 00 00 00 */ li r0, 0 @@ -5687,9 +5687,9 @@ lbl_801A2F48: /* 801A2FBC 0019FF1C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A2FC0 0019FF20 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801A2FC4 0019FF24 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801A2FC8 0019FF28 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A2FC8 0019FF28 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A2FCC 0019FF2C 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801A2FD0 0019FF30 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A2FD0 0019FF30 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A2FD4 0019FF34 80 61 00 10 */ lwz r3, 0x10(r1) /* 801A2FD8 0019FF38 80 A1 00 14 */ lwz r5, 0x14(r1) /* 801A2FDC 0019FF3C 90 7F 01 14 */ stw r3, 0x114(r31) @@ -5801,9 +5801,9 @@ lbl_801A3130: /* 801A3154 001A00B4 D0 1E 03 B4 */ stfs f0, 0x3b4(r30) /* 801A3158 001A00B8 48 00 00 D0 */ b lbl_801A3228 lbl_801A315C: -/* 801A315C 001A00BC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801A315C 001A00BC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801A3160 001A00C0 3C 60 80 3E */ lis r3, lbl_803E10B0@ha -/* 801A3164 001A00C4 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801A3164 001A00C4 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801A3168 001A00C8 38 80 00 07 */ li r4, 7 /* 801A316C 001A00CC 90 01 00 08 */ stw r0, 8(r1) /* 801A3170 001A00D0 38 C3 10 B0 */ addi r6, r3, lbl_803E10B0@l @@ -5820,9 +5820,9 @@ lbl_801A315C: /* 801A319C 001A00FC 80 01 00 0C */ lwz r0, 0xc(r1) /* 801A31A0 001A0100 3C 60 80 3E */ lis r3, lbl_803E10B0@ha /* 801A31A4 001A0104 38 83 10 B0 */ addi r4, r3, lbl_803E10B0@l -/* 801A31A8 001A0108 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A31A8 001A0108 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A31AC 001A010C 90 1F 01 48 */ stw r0, 0x148(r31) -/* 801A31B0 001A0110 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A31B0 001A0110 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A31B4 001A0114 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801A31B8 001A0118 90 81 00 08 */ stw r4, 8(r1) /* 801A31BC 001A011C 80 61 00 14 */ lwz r3, 0x14(r1) @@ -5959,11 +5959,11 @@ lbl_801A3350: /* 801A339C 001A02FC 40 82 00 08 */ bne lbl_801A33A4 /* 801A33A0 001A0300 39 00 00 02 */ li r8, 2 lbl_801A33A4: -/* 801A33A4 001A0304 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801A33A4 001A0304 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801A33A8 001A0308 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A33AC 001A030C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801A33B0 001A0310 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 801A33B4 001A0314 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 801A33B4 001A0314 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 801A33B8 001A0318 C0 44 00 00 */ lfs f2, 0(r4) /* 801A33BC 001A031C C0 24 00 04 */ lfs f1, 4(r4) /* 801A33C0 001A0320 3C A0 80 3E */ lis r5, lbl_803DA9D8@ha @@ -5986,9 +5986,9 @@ lbl_801A33A4: /* 801A3404 001A0364 80 01 00 18 */ lwz r0, 0x18(r1) /* 801A3408 001A0368 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801A340C 001A036C 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801A3410 001A0370 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A3410 001A0370 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A3414 001A0374 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801A3418 001A0378 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A3418 001A0378 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A341C 001A037C 80 61 00 1C */ lwz r3, 0x1c(r1) /* 801A3420 001A0380 80 A1 00 20 */ lwz r5, 0x20(r1) /* 801A3424 001A0384 90 7F 01 14 */ stw r3, 0x114(r31) @@ -6177,9 +6177,9 @@ lbl_801A36A0: /* 801A36C4 001A0624 D0 1F 03 B4 */ stfs f0, 0x3b4(r31) /* 801A36C8 001A0628 48 00 01 74 */ b lbl_801A383C lbl_801A36CC: -/* 801A36CC 001A062C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801A36CC 001A062C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801A36D0 001A0630 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha -/* 801A36D4 001A0634 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801A36D4 001A0634 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801A36D8 001A0638 38 80 00 06 */ li r4, 6 /* 801A36DC 001A063C 90 01 00 14 */ stw r0, 0x14(r1) /* 801A36E0 001A0640 38 C3 A9 CC */ addi r6, r3, lbl_803DA9CC@l @@ -6199,9 +6199,9 @@ lbl_801A36CC: /* 801A3718 001A0678 80 01 00 18 */ lwz r0, 0x18(r1) /* 801A371C 001A067C 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801A3720 001A0680 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 801A3724 001A0684 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A3724 001A0684 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A3728 001A0688 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801A372C 001A068C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A372C 001A068C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A3730 001A0690 80 61 00 1C */ lwz r3, 0x1c(r1) /* 801A3734 001A0694 80 A1 00 20 */ lwz r5, 0x20(r1) /* 801A3738 001A0698 90 7F 01 30 */ stw r3, 0x130(r31) @@ -6255,16 +6255,16 @@ lbl_801A37D4: /* 801A37E8 001A0748 80 04 02 B8 */ lwz r0, 0x2b8(r4) /* 801A37EC 001A074C 2C 00 00 12 */ cmpwi r0, 0x12 /* 801A37F0 001A0750 40 82 00 30 */ bne lbl_801A3820 -/* 801A37F4 001A0754 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A37F4 001A0754 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A37F8 001A0758 38 00 00 0C */ li r0, 0xc -/* 801A37FC 001A075C 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 801A37FC 001A075C 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 801A3800 001A0760 90 01 00 10 */ stw r0, 0x10(r1) /* 801A3804 001A0764 38 64 00 04 */ addi r3, r4, 4 /* 801A3808 001A0768 38 81 00 0C */ addi r4, r1, 0xc /* 801A380C 001A076C 90 A1 00 0C */ stw r5, 0xc(r1) /* 801A3810 001A0770 4B F8 DF A9 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801A3814 001A0774 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801A3818 001A0778 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A3814 001A0774 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801A3818 001A0778 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A381C 001A077C 90 01 00 0C */ stw r0, 0xc(r1) lbl_801A3820: /* 801A3820 001A0780 88 1F 0B 29 */ lbz r0, 0xb29(r31) @@ -7415,17 +7415,17 @@ lbl_801A4814: /* 801A4840 001A17A0 4E 80 04 21 */ bctrl /* 801A4844 001A17A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A4848 001A17A8 40 82 00 34 */ bne lbl_801A487C -/* 801A484C 001A17AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A484C 001A17AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A4850 001A17B0 38 00 00 0A */ li r0, 0xa -/* 801A4854 001A17B4 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801A4854 001A17B4 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801A4858 001A17B8 90 01 00 24 */ stw r0, 0x24(r1) /* 801A485C 001A17BC 38 81 00 20 */ addi r4, r1, 0x20 /* 801A4860 001A17C0 90 61 00 20 */ stw r3, 0x20(r1) /* 801A4864 001A17C4 80 7C 04 50 */ lwz r3, 0x450(r28) /* 801A4868 001A17C8 38 63 00 04 */ addi r3, r3, 4 /* 801A486C 001A17CC 4B F8 CF 4D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801A4870 001A17D0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801A4874 001A17D4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A4870 001A17D0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801A4874 001A17D4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A4878 001A17D8 90 01 00 20 */ stw r0, 0x20(r1) lbl_801A487C: /* 801A487C 001A17DC 3B 60 00 01 */ li r27, 1 @@ -8543,9 +8543,9 @@ lbl_801A5810: /* 801A5820 001A2780 C0 3E 09 6C */ lfs f1, 0x96c(r30) /* 801A5824 001A2784 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801A5828 001A2788 40 80 00 A0 */ bge lbl_801A58C8 -/* 801A582C 001A278C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A582C 001A278C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A5830 001A2790 C0 02 A7 60 */ lfs f0, lbl_805AC480@sda21(r2) -/* 801A5834 001A2794 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A5834 001A2794 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A5838 001A2798 80 7E 04 50 */ lwz r3, 0x450(r30) /* 801A583C 001A279C 3C 80 80 3E */ lis r4, lbl_803E10C8@ha /* 801A5840 001A27A0 90 01 00 18 */ stw r0, 0x18(r1) @@ -8565,9 +8565,9 @@ lbl_801A5810: /* 801A5878 001A27D8 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801A587C 001A27DC 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 801A5880 001A27E0 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 801A5884 001A27E4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801A5884 001A27E4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801A5888 001A27E8 90 1D 02 88 */ stw r0, 0x288(r29) -/* 801A588C 001A27EC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801A588C 001A27EC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801A5890 001A27F0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 801A5894 001A27F4 80 A1 00 24 */ lwz r5, 0x24(r1) /* 801A5898 001A27F8 D0 1D 02 8C */ stfs f0, 0x28c(r29) diff --git a/asm/MetroidPrime/Enemies/CJellyZap.s b/asm/MetroidPrime/Enemies/CJellyZap.s index db0d496c..2ce4c25b 100644 --- a/asm/MetroidPrime/Enemies/CJellyZap.s +++ b/asm/MetroidPrime/Enemies/CJellyZap.s @@ -1022,9 +1022,9 @@ lbl_801D835C: /* 801D8410 001D5370 4B FE 87 29 */ bl AddSource__19CStaticInterferenceF9TUniqueIdff /* 801D8414 001D5374 48 00 00 7C */ b lbl_801D8490 lbl_801D8418: -/* 801D8418 001D5378 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801D8418 001D5378 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801D841C 001D537C 38 00 00 0A */ li r0, 0xa -/* 801D8420 001D5380 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801D8420 001D5380 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801D8424 001D5384 90 01 00 1C */ stw r0, 0x1c(r1) /* 801D8428 001D5388 38 81 00 18 */ addi r4, r1, 0x18 /* 801D842C 001D538C 90 61 00 18 */ stw r3, 0x18(r1) @@ -1033,8 +1033,8 @@ lbl_801D8418: /* 801D8438 001D5398 4B F5 93 81 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801D843C 001D539C 34 01 00 18 */ addic. r0, r1, 0x18 /* 801D8440 001D53A0 41 82 00 10 */ beq lbl_801D8450 -/* 801D8444 001D53A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801D8448 001D53A8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801D8444 001D53A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801D8448 001D53A8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801D844C 001D53AC 90 01 00 18 */ stw r0, 0x18(r1) lbl_801D8450: /* 801D8450 001D53B0 A0 1E 00 08 */ lhz r0, 8(r30) diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s index 1fa498de..e7bd457e 100644 --- a/asm/MetroidPrime/Enemies/CKnockBackController.s +++ b/asm/MetroidPrime/Enemies/CKnockBackController.s @@ -129,9 +129,9 @@ lbl_80232D44: /* 80232DCC 0022FD2C 38 81 00 68 */ addi r4, r1, 0x68 /* 80232DD0 0022FD30 48 0E 1A 81 */ bl AsNormalized__9CVector3fCFv /* 80232DD4 0022FD34 C0 41 00 5C */ lfs f2, 0x5c(r1) -/* 80232DD8 0022FD38 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80232DD8 0022FD38 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80232DDC 0022FD3C C0 21 00 60 */ lfs f1, 0x60(r1) -/* 80232DE0 0022FD40 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80232DE0 0022FD40 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80232DE4 0022FD44 C0 01 00 64 */ lfs f0, 0x64(r1) /* 80232DE8 0022FD48 EC BF 00 B2 */ fmuls f5, f31, f2 /* 80232DEC 0022FD4C C0 5B 00 08 */ lfs f2, 8(r27) @@ -163,11 +163,11 @@ lbl_80232D44: /* 80232E54 0022FDB4 80 01 00 A8 */ lwz r0, 0xa8(r1) /* 80232E58 0022FDB8 3C 60 80 3E */ lis r3, lbl_803DAA5C@ha /* 80232E5C 0022FDBC 38 A3 AA 5C */ addi r5, r3, lbl_803DAA5C@l -/* 80232E60 0022FDC0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80232E60 0022FDC0 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80232E64 0022FDC4 90 1F 01 B0 */ stw r0, 0x1b0(r31) /* 80232E68 0022FDC8 7F C3 F3 78 */ mr r3, r30 /* 80232E6C 0022FDCC 80 E1 00 AC */ lwz r7, 0xac(r1) -/* 80232E70 0022FDD0 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80232E70 0022FDD0 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80232E74 0022FDD4 80 C1 00 B0 */ lwz r6, 0xb0(r1) /* 80232E78 0022FDD8 90 FF 01 B4 */ stw r7, 0x1b4(r31) /* 80232E7C 0022FDDC 80 81 00 B4 */ lwz r4, 0xb4(r1) @@ -197,9 +197,9 @@ lbl_80232D44: /* 80232EDC 0022FE3C 48 00 02 A4 */ b lbl_80233180 lbl_80232EE0: /* 80232EE0 0022FE40 C0 5B 00 08 */ lfs f2, 8(r27) -/* 80232EE4 0022FE44 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80232EE4 0022FE44 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80232EE8 0022FE48 C0 3B 00 04 */ lfs f1, 4(r27) -/* 80232EEC 0022FE4C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80232EEC 0022FE4C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80232EF0 0022FE50 C0 1B 00 00 */ lfs f0, 0(r27) /* 80232EF4 0022FE54 FC 40 10 50 */ fneg f2, f2 /* 80232EF8 0022FE58 FC 20 08 50 */ fneg f1, f1 @@ -222,9 +222,9 @@ lbl_80232EE0: /* 80232F3C 0022FE9C 80 01 00 90 */ lwz r0, 0x90(r1) /* 80232F40 0022FEA0 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 80232F44 0022FEA4 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 80232F48 0022FEA8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80232F48 0022FEA8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80232F4C 0022FEAC 90 1D 00 E0 */ stw r0, 0xe0(r29) -/* 80232F50 0022FEB0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80232F50 0022FEB0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80232F54 0022FEB4 80 A1 00 94 */ lwz r5, 0x94(r1) /* 80232F58 0022FEB8 80 61 00 98 */ lwz r3, 0x98(r1) /* 80232F5C 0022FEBC 90 BD 00 E4 */ stw r5, 0xe4(r29) @@ -238,9 +238,9 @@ lbl_80232EE0: /* 80232F7C 0022FEDC 48 00 02 04 */ b lbl_80233180 lbl_80232F80: /* 80232F80 0022FEE0 C0 5B 00 08 */ lfs f2, 8(r27) -/* 80232F84 0022FEE4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80232F84 0022FEE4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80232F88 0022FEE8 C0 3B 00 04 */ lfs f1, 4(r27) -/* 80232F8C 0022FEEC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80232F8C 0022FEEC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80232F90 0022FEF0 C0 1B 00 00 */ lfs f0, 0(r27) /* 80232F94 0022FEF4 FC 40 10 50 */ fneg f2, f2 /* 80232F98 0022FEF8 FC 20 08 50 */ fneg f1, f1 @@ -263,9 +263,9 @@ lbl_80232F80: /* 80232FDC 0022FF3C 80 01 00 78 */ lwz r0, 0x78(r1) /* 80232FE0 0022FF40 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 80232FE4 0022FF44 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 80232FE8 0022FF48 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80232FE8 0022FF48 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80232FEC 0022FF4C 90 1D 00 F8 */ stw r0, 0xf8(r29) -/* 80232FF0 0022FF50 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80232FF0 0022FF50 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80232FF4 0022FF54 80 A1 00 7C */ lwz r5, 0x7c(r1) /* 80232FF8 0022FF58 80 61 00 80 */ lwz r3, 0x80(r1) /* 80232FFC 0022FF5C 90 BD 00 FC */ stw r5, 0xfc(r29) @@ -1128,16 +1128,16 @@ lbl_80233BC0: /* 80233BD4 00230B34 C0 24 03 24 */ lfs f1, 0x324(r4) /* 80233BD8 00230B38 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80233BDC 00230B3C 40 81 00 30 */ ble lbl_80233C0C -/* 80233BE0 00230B40 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80233BE0 00230B40 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80233BE4 00230B44 38 00 00 16 */ li r0, 0x16 -/* 80233BE8 00230B48 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80233BE8 00230B48 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80233BEC 00230B4C 90 01 00 0C */ stw r0, 0xc(r1) /* 80233BF0 00230B50 38 64 00 04 */ addi r3, r4, 4 /* 80233BF4 00230B54 38 81 00 08 */ addi r4, r1, 8 /* 80233BF8 00230B58 90 A1 00 08 */ stw r5, 8(r1) /* 80233BFC 00230B5C 4B EF DB BD */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80233C00 00230B60 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80233C04 00230B64 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80233C00 00230B60 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80233C04 00230B64 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80233C08 00230B68 90 01 00 08 */ stw r0, 8(r1) lbl_80233C0C: /* 80233C0C 00230B6C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index f370bb49..37c40154 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -1620,9 +1620,9 @@ lbl_8023584C: /* 80235864 002327C4 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 80235868 002327C8 98 1F 07 54 */ stb r0, 0x754(r31) /* 8023586C 002327CC 4B F3 F9 B9 */ bl SetActive__13CBoneTrackingFb -/* 80235870 002327D0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80235870 002327D0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80235874 002327D4 38 00 00 0C */ li r0, 0xc -/* 80235878 002327D8 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80235878 002327D8 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8023587C 002327DC 90 01 00 0C */ stw r0, 0xc(r1) /* 80235880 002327E0 38 81 00 08 */ addi r4, r1, 8 /* 80235884 002327E4 90 61 00 08 */ stw r3, 8(r1) @@ -1631,8 +1631,8 @@ lbl_8023584C: /* 80235890 002327F0 4B EF BF 29 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80235894 002327F4 34 01 00 08 */ addic. r0, r1, 8 /* 80235898 002327F8 41 82 00 10 */ beq lbl_802358A8 -/* 8023589C 002327FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 802358A0 00232800 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8023589C 002327FC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 802358A0 00232800 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802358A4 00232804 90 01 00 08 */ stw r0, 8(r1) lbl_802358A8: /* 802358A8 00232808 88 1F 07 54 */ lbz r0, 0x754(r31) diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index 949a5309..da310bde 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -421,9 +421,9 @@ lbl_8014E3E0: /* 8014E3F4 0014B354 90 1F 05 A8 */ stw r0, 0x5a8(r31) /* 8014E3F8 0014B358 48 00 00 90 */ b lbl_8014E488 lbl_8014E3FC: -/* 8014E3FC 0014B35C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8014E3FC 0014B35C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8014E400 0014B360 C0 22 9D 8C */ lfs f1, lbl_805ABAAC@sda21(r2) -/* 8014E404 0014B364 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8014E404 0014B364 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8014E408 0014B368 C0 02 9D 90 */ lfs f0, lbl_805ABAB0@sda21(r2) /* 8014E40C 0014B36C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 8014E410 0014B370 90 01 00 20 */ stw r0, 0x20(r1) @@ -443,9 +443,9 @@ lbl_8014E3FC: /* 8014E448 0014B3A8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014E44C 0014B3AC 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 8014E450 0014B3B0 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 8014E454 0014B3B4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8014E454 0014B3B4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8014E458 0014B3B8 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 8014E45C 0014B3BC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8014E45C 0014B3BC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8014E460 0014B3C0 80 A1 00 28 */ lwz r5, 0x28(r1) /* 8014E464 0014B3C4 80 61 00 2C */ lwz r3, 0x2c(r1) /* 8014E468 0014B3C8 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -725,9 +725,9 @@ lbl_8014E854: /* 8014E854 0014B7B4 39 20 00 00 */ li r9, 0 /* 8014E858 0014B7B8 88 1F 04 00 */ lbz r0, 0x400(r31) /* 8014E85C 0014B7BC 51 20 3E 30 */ rlwimi r0, r9, 7, 0x18, 0x18 -/* 8014E860 0014B7C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8014E860 0014B7C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8014E864 0014B7C4 98 1F 04 00 */ stb r0, 0x400(r31) -/* 8014E868 0014B7C8 39 03 AA 68 */ addi r8, r3, lbl_803DAA68@l +/* 8014E868 0014B7C8 39 03 AA 68 */ addi r8, r3, __vt__13CBodyStateCmd@l /* 8014E86C 0014B7CC 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8014E870 0014B7D0 38 E0 00 0E */ li r7, 0xe /* 8014E874 0014B7D4 C0 62 9D 8C */ lfs f3, lbl_805ABAAC@sda21(r2) @@ -769,11 +769,11 @@ lbl_8014E854: /* 8014E904 0014B864 80 01 00 30 */ lwz r0, 0x30(r1) /* 8014E908 0014B868 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8014E90C 0014B86C 38 A3 A9 F0 */ addi r5, r3, lbl_803DA9F0@l -/* 8014E910 0014B870 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8014E910 0014B870 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8014E914 0014B874 90 1E 01 90 */ stw r0, 0x190(r30) /* 8014E918 0014B878 7F E3 FB 78 */ mr r3, r31 /* 8014E91C 0014B87C 80 C1 00 34 */ lwz r6, 0x34(r1) -/* 8014E920 0014B880 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8014E920 0014B880 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8014E924 0014B884 80 81 00 38 */ lwz r4, 0x38(r1) /* 8014E928 0014B888 90 DE 01 94 */ stw r6, 0x194(r30) /* 8014E92C 0014B88C 80 C1 00 3C */ lwz r6, 0x3c(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 43bbd390..13418c96 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -4950,9 +4950,9 @@ lbl_8016E25C: /* 8016E25C 0016B1BC 80 DF 08 18 */ lwz r6, 0x818(r31) /* 8016E260 0016B1C0 2C 06 FF FF */ cmpwi r6, -1 /* 8016E264 0016B1C4 41 82 01 14 */ beq lbl_8016E378 -/* 8016E268 0016B1C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016E268 0016B1C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016E26C 0016B1CC 38 A0 00 01 */ li r5, 1 -/* 8016E270 0016B1D0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016E270 0016B1D0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016E274 0016B1D4 80 7F 04 50 */ lwz r3, 0x450(r31) /* 8016E278 0016B1D8 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8016E27C 0016B1DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4968,9 +4968,9 @@ lbl_8016E25C: /* 8016E2A4 0016B204 80 01 00 18 */ lwz r0, 0x18(r1) /* 8016E2A8 0016B208 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8016E2AC 0016B20C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8016E2B0 0016B210 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016E2B0 0016B210 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016E2B4 0016B214 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8016E2B8 0016B218 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8016E2B8 0016B218 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8016E2BC 0016B21C 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8016E2C0 0016B220 38 00 00 02 */ li r0, 2 /* 8016E2C4 0016B224 80 A1 00 20 */ lwz r5, 0x20(r1) @@ -5101,9 +5101,9 @@ lbl_8016E470: /* 8016E484 0016B3E4 90 1F 05 68 */ stw r0, 0x568(r31) /* 8016E488 0016B3E8 48 00 01 04 */ b lbl_8016E58C lbl_8016E48C: -/* 8016E48C 0016B3EC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8016E48C 0016B3EC 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8016E490 0016B3F0 38 C0 00 00 */ li r6, 0 -/* 8016E494 0016B3F4 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 8016E494 0016B3F4 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 8016E498 0016B3F8 80 61 00 24 */ lwz r3, 0x24(r1) /* 8016E49C 0016B3FC 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 8016E4A0 0016B400 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -5133,9 +5133,9 @@ lbl_8016E48C: /* 8016E500 0016B460 80 01 00 0C */ lwz r0, 0xc(r1) /* 8016E504 0016B464 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8016E508 0016B468 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8016E50C 0016B46C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016E50C 0016B46C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016E510 0016B470 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8016E514 0016B474 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016E514 0016B474 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016E518 0016B478 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8016E51C 0016B47C 80 61 00 14 */ lwz r3, 0x14(r1) /* 8016E520 0016B480 90 BF 01 94 */ stw r5, 0x194(r31) @@ -5496,9 +5496,9 @@ lbl_8016EA2C: /* 8016EA40 0016B9A0 90 1E 05 68 */ stw r0, 0x568(r30) /* 8016EA44 0016B9A4 48 00 02 84 */ b lbl_8016ECC8 lbl_8016EA48: -/* 8016EA48 0016B9A8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8016EA48 0016B9A8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8016EA4C 0016B9AC 3C 60 80 3E */ lis r3, lbl_803E10B0@ha -/* 8016EA50 0016B9B0 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8016EA50 0016B9B0 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8016EA54 0016B9B4 38 80 00 07 */ li r4, 7 /* 8016EA58 0016B9B8 90 01 00 44 */ stw r0, 0x44(r1) /* 8016EA5C 0016B9BC 38 C3 10 B0 */ addi r6, r3, lbl_803E10B0@l @@ -5515,9 +5515,9 @@ lbl_8016EA48: /* 8016EA88 0016B9E8 80 01 00 48 */ lwz r0, 0x48(r1) /* 8016EA8C 0016B9EC 3C 60 80 3E */ lis r3, lbl_803E10B0@ha /* 8016EA90 0016B9F0 38 83 10 B0 */ addi r4, r3, lbl_803E10B0@l -/* 8016EA94 0016B9F4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016EA94 0016B9F4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016EA98 0016B9F8 90 1E 01 48 */ stw r0, 0x148(r30) -/* 8016EA9C 0016B9FC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016EA9C 0016B9FC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016EAA0 0016BA00 80 A1 00 4C */ lwz r5, 0x4c(r1) /* 8016EAA4 0016BA04 90 81 00 44 */ stw r4, 0x44(r1) /* 8016EAA8 0016BA08 80 61 00 50 */ lwz r3, 0x50(r1) @@ -5569,9 +5569,9 @@ lbl_8016EB48: /* 8016EB50 0016BAB0 4B FF D7 09 */ bl sub_8016c258 /* 8016EB54 0016BAB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016EB58 0016BAB8 41 82 01 70 */ beq lbl_8016ECC8 -/* 8016EB5C 0016BABC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016EB5C 0016BABC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016EB60 0016BAC0 38 00 00 0A */ li r0, 0xa -/* 8016EB64 0016BAC4 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8016EB64 0016BAC4 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8016EB68 0016BAC8 90 01 00 24 */ stw r0, 0x24(r1) /* 8016EB6C 0016BACC 38 81 00 20 */ addi r4, r1, 0x20 /* 8016EB70 0016BAD0 90 61 00 20 */ stw r3, 0x20(r1) @@ -5580,8 +5580,8 @@ lbl_8016EB48: /* 8016EB7C 0016BADC 4B FC 2C 3D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 8016EB80 0016BAE0 34 01 00 20 */ addic. r0, r1, 0x20 /* 8016EB84 0016BAE4 41 82 00 10 */ beq lbl_8016EB94 -/* 8016EB88 0016BAE8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8016EB8C 0016BAEC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016EB88 0016BAE8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8016EB8C 0016BAEC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016EB90 0016BAF0 90 01 00 20 */ stw r0, 0x20(r1) lbl_8016EB94: /* 8016EB94 0016BAF4 7F C3 F3 78 */ mr r3, r30 @@ -6132,12 +6132,12 @@ lbl_8016F378: /* 8016F38C 0016C2EC 90 1E 05 68 */ stw r0, 0x568(r30) /* 8016F390 0016C2F0 48 00 01 60 */ b lbl_8016F4F0 lbl_8016F394: -/* 8016F394 0016C2F4 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8016F394 0016C2F4 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8016F398 0016C2F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016F39C 0016C2FC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8016F3A0 0016C300 80 81 00 70 */ lwz r4, 0x70(r1) /* 8016F3A4 0016C304 38 60 00 00 */ li r3, 0 -/* 8016F3A8 0016C308 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 8016F3A8 0016C308 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 8016F3AC 0016C30C 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 8016F3B0 0016C310 C0 45 00 00 */ lfs f2, 0(r5) /* 8016F3B4 0016C314 C0 25 00 04 */ lfs f1, 4(r5) @@ -6166,9 +6166,9 @@ lbl_8016F394: /* 8016F410 0016C370 80 01 00 58 */ lwz r0, 0x58(r1) /* 8016F414 0016C374 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8016F418 0016C378 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8016F41C 0016C37C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016F41C 0016C37C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016F420 0016C380 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8016F424 0016C384 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016F424 0016C384 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016F428 0016C388 80 A1 00 5C */ lwz r5, 0x5c(r1) /* 8016F42C 0016C38C 80 61 00 60 */ lwz r3, 0x60(r1) /* 8016F430 0016C390 90 BF 01 94 */ stw r5, 0x194(r31) @@ -6328,10 +6328,10 @@ lbl_8016F64C: /* 8016F65C 0016C5BC 4E 80 04 21 */ bctrl /* 8016F660 0016C5C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F664 0016C5C4 41 82 00 D4 */ beq lbl_8016F738 -/* 8016F668 0016C5C8 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8016F668 0016C5C8 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8016F66C 0016C5CC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016F670 0016C5D0 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 8016F674 0016C5D4 39 46 AA 68 */ addi r10, r6, lbl_803DAA68@l +/* 8016F674 0016C5D4 39 46 AA 68 */ addi r10, r6, __vt__13CBodyStateCmd@l /* 8016F678 0016C5D8 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8016F67C 0016C5DC 80 81 00 4C */ lwz r4, 0x4c(r1) /* 8016F680 0016C5E0 38 A0 00 00 */ li r5, 0 @@ -6362,9 +6362,9 @@ lbl_8016F64C: /* 8016F6E4 0016C644 80 01 00 34 */ lwz r0, 0x34(r1) /* 8016F6E8 0016C648 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8016F6EC 0016C64C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8016F6F0 0016C650 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016F6F0 0016C650 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016F6F4 0016C654 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8016F6F8 0016C658 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016F6F8 0016C658 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016F6FC 0016C65C 80 A1 00 38 */ lwz r5, 0x38(r1) /* 8016F700 0016C660 80 61 00 3C */ lwz r3, 0x3c(r1) /* 8016F704 0016C664 90 BF 01 94 */ stw r5, 0x194(r31) @@ -6381,10 +6381,10 @@ lbl_8016F64C: /* 8016F730 0016C690 90 01 00 30 */ stw r0, 0x30(r1) /* 8016F734 0016C694 48 00 02 C4 */ b lbl_8016F9F8 lbl_8016F738: -/* 8016F738 0016C698 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8016F738 0016C698 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8016F73C 0016C69C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016F740 0016C6A0 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 8016F744 0016C6A4 39 46 AA 68 */ addi r10, r6, lbl_803DAA68@l +/* 8016F744 0016C6A4 39 46 AA 68 */ addi r10, r6, __vt__13CBodyStateCmd@l /* 8016F748 0016C6A8 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8016F74C 0016C6AC 80 81 00 2C */ lwz r4, 0x2c(r1) /* 8016F750 0016C6B0 38 A0 00 00 */ li r5, 0 @@ -6415,9 +6415,9 @@ lbl_8016F738: /* 8016F7B4 0016C714 80 01 00 14 */ lwz r0, 0x14(r1) /* 8016F7B8 0016C718 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8016F7BC 0016C71C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8016F7C0 0016C720 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8016F7C0 0016C720 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8016F7C4 0016C724 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8016F7C8 0016C728 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8016F7C8 0016C728 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8016F7CC 0016C72C 80 A1 00 18 */ lwz r5, 0x18(r1) /* 8016F7D0 0016C730 80 61 00 1C */ lwz r3, 0x1c(r1) /* 8016F7D4 0016C734 90 BF 01 94 */ stw r5, 0x194(r31) diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index e87af728..ef108407 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -2422,9 +2422,9 @@ lbl_801C2AEC: /* 801C2B00 001BFA60 90 1E 05 68 */ stw r0, 0x568(r30) /* 801C2B04 001BFA64 48 00 01 04 */ b lbl_801C2C08 lbl_801C2B08: -/* 801C2B08 001BFA68 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801C2B08 001BFA68 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801C2B0C 001BFA6C 38 C0 00 00 */ li r6, 0 -/* 801C2B10 001BFA70 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 801C2B10 001BFA70 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 801C2B14 001BFA74 80 61 00 24 */ lwz r3, 0x24(r1) /* 801C2B18 001BFA78 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 801C2B1C 001BFA7C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -2454,9 +2454,9 @@ lbl_801C2B08: /* 801C2B7C 001BFADC 80 01 00 0C */ lwz r0, 0xc(r1) /* 801C2B80 001BFAE0 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801C2B84 001BFAE4 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801C2B88 001BFAE8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801C2B88 001BFAE8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801C2B8C 001BFAEC 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801C2B90 001BFAF0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801C2B90 001BFAF0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801C2B94 001BFAF4 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801C2B98 001BFAF8 80 61 00 14 */ lwz r3, 0x14(r1) /* 801C2B9C 001BFAFC 90 BF 01 94 */ stw r5, 0x194(r31) @@ -2574,10 +2574,10 @@ lbl_801C2D14: /* 801C2D24 001BFC84 4E 80 04 21 */ bctrl /* 801C2D28 001BFC88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C2D2C 001BFC8C 41 82 00 D4 */ beq lbl_801C2E00 -/* 801C2D30 001BFC90 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801C2D30 001BFC90 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801C2D34 001BFC94 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801C2D38 001BFC98 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801C2D3C 001BFC9C 39 46 AA 68 */ addi r10, r6, lbl_803DAA68@l +/* 801C2D3C 001BFC9C 39 46 AA 68 */ addi r10, r6, __vt__13CBodyStateCmd@l /* 801C2D40 001BFCA0 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 801C2D44 001BFCA4 80 81 00 58 */ lwz r4, 0x58(r1) /* 801C2D48 001BFCA8 38 A0 00 00 */ li r5, 0 @@ -2608,9 +2608,9 @@ lbl_801C2D14: /* 801C2DAC 001BFD0C 80 01 00 40 */ lwz r0, 0x40(r1) /* 801C2DB0 001BFD10 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801C2DB4 001BFD14 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801C2DB8 001BFD18 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801C2DB8 001BFD18 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801C2DBC 001BFD1C 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801C2DC0 001BFD20 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801C2DC0 001BFD20 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801C2DC4 001BFD24 80 A1 00 44 */ lwz r5, 0x44(r1) /* 801C2DC8 001BFD28 80 61 00 48 */ lwz r3, 0x48(r1) /* 801C2DCC 001BFD2C 90 BF 01 94 */ stw r5, 0x194(r31) @@ -2627,10 +2627,10 @@ lbl_801C2D14: /* 801C2DF8 001BFD58 90 01 00 3C */ stw r0, 0x3c(r1) /* 801C2DFC 001BFD5C 48 00 02 A0 */ b lbl_801C309C lbl_801C2E00: -/* 801C2E00 001BFD60 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801C2E00 001BFD60 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801C2E04 001BFD64 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801C2E08 001BFD68 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801C2E0C 001BFD6C 39 46 AA 68 */ addi r10, r6, lbl_803DAA68@l +/* 801C2E0C 001BFD6C 39 46 AA 68 */ addi r10, r6, __vt__13CBodyStateCmd@l /* 801C2E10 001BFD70 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 801C2E14 001BFD74 80 81 00 38 */ lwz r4, 0x38(r1) /* 801C2E18 001BFD78 38 A0 00 00 */ li r5, 0 @@ -2661,9 +2661,9 @@ lbl_801C2E00: /* 801C2E7C 001BFDDC 80 01 00 20 */ lwz r0, 0x20(r1) /* 801C2E80 001BFDE0 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801C2E84 001BFDE4 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801C2E88 001BFDE8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801C2E88 001BFDE8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801C2E8C 001BFDEC 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801C2E90 001BFDF0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801C2E90 001BFDF0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801C2E94 001BFDF4 80 A1 00 24 */ lwz r5, 0x24(r1) /* 801C2E98 001BFDF8 80 61 00 28 */ lwz r3, 0x28(r1) /* 801C2E9C 001BFDFC 90 BF 01 94 */ stw r5, 0x194(r31) @@ -2940,12 +2940,12 @@ lbl_801C326C: /* 801C3280 001C01E0 90 03 05 68 */ stw r0, 0x568(r3) /* 801C3284 001C01E4 48 00 01 24 */ b lbl_801C33A8 lbl_801C3288: -/* 801C3288 001C01E8 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801C3288 001C01E8 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 801C328C 001C01EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801C3290 001C01F0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801C3294 001C01F4 80 81 00 24 */ lwz r4, 0x24(r1) /* 801C3298 001C01F8 38 60 00 00 */ li r3, 0 -/* 801C329C 001C01FC 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 801C329C 001C01FC 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 801C32A0 001C0200 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 801C32A4 001C0204 C0 45 00 00 */ lfs f2, 0(r5) /* 801C32A8 001C0208 C0 25 00 04 */ lfs f1, 4(r5) @@ -2974,9 +2974,9 @@ lbl_801C3288: /* 801C3304 001C0264 80 01 00 0C */ lwz r0, 0xc(r1) /* 801C3308 001C0268 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 801C330C 001C026C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 801C3310 001C0270 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801C3310 001C0270 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801C3314 001C0274 90 1F 01 90 */ stw r0, 0x190(r31) -/* 801C3318 001C0278 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801C3318 001C0278 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801C331C 001C027C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801C3320 001C0280 80 61 00 14 */ lwz r3, 0x14(r1) /* 801C3324 001C0284 90 BF 01 94 */ stw r5, 0x194(r31) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 6aa20b2a..e8374196 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -475,9 +475,9 @@ sub_8027cb40: /* 8027CC14 00279B74 40 80 00 08 */ bge lbl_8027CC1C /* 8027CC18 00279B78 3B 80 00 01 */ li r28, 1 lbl_8027CC1C: -/* 8027CC1C 00279B7C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8027CC1C 00279B7C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8027CC20 00279B80 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 8027CC24 00279B84 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8027CC24 00279B84 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8027CC28 00279B88 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8027CC2C 00279B8C 90 01 00 08 */ stw r0, 8(r1) /* 8027CC30 00279B90 38 A4 A9 E4 */ addi r5, r4, lbl_803DA9E4@l @@ -496,8 +496,8 @@ lbl_8027CC1C: /* 8027CC64 00279BC4 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l /* 8027CC68 00279BC8 7F 85 E3 78 */ mr r5, r28 /* 8027CC6C 00279BCC 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 8027CC70 00279BD0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8027CC74 00279BD4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8027CC70 00279BD0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8027CC74 00279BD4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8027CC78 00279BD8 80 61 00 14 */ lwz r3, 0x14(r1) /* 8027CC7C 00279BDC 90 BD 00 CC */ stw r5, 0xcc(r29) /* 8027CC80 00279BE0 90 7D 00 D0 */ stw r3, 0xd0(r29) @@ -4070,9 +4070,9 @@ lbl_8027FE20: /* 8027FF08 0027CE68 40 82 01 70 */ bne lbl_80280078 /* 8027FF0C 0027CE6C 54 60 DF FF */ rlwinm. r0, r3, 0x1b, 0x1f, 0x1f /* 8027FF10 0027CE70 40 82 01 68 */ bne lbl_80280078 -/* 8027FF14 0027CE74 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8027FF14 0027CE74 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8027FF18 0027CE78 C0 5D 00 58 */ lfs f2, 0x58(r29) -/* 8027FF1C 0027CE7C 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8027FF1C 0027CE7C 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8027FF20 0027CE80 C0 3D 00 48 */ lfs f1, 0x48(r29) /* 8027FF24 0027CE84 C0 1D 00 38 */ lfs f0, 0x38(r29) /* 8027FF28 0027CE88 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -4094,9 +4094,9 @@ lbl_8027FE20: /* 8027FF68 0027CEC8 80 01 00 9C */ lwz r0, 0x9c(r1) /* 8027FF6C 0027CECC 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8027FF70 0027CED0 38 A3 AA 44 */ addi r5, r3, lbl_803DAA44@l -/* 8027FF74 0027CED4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8027FF74 0027CED4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8027FF78 0027CED8 90 1E 00 F8 */ stw r0, 0xf8(r30) -/* 8027FF7C 0027CEDC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8027FF7C 0027CEDC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8027FF80 0027CEE0 80 E1 00 A0 */ lwz r7, 0xa0(r1) /* 8027FF84 0027CEE4 7F A3 EB 78 */ mr r3, r29 /* 8027FF88 0027CEE8 80 C1 00 A4 */ lwz r6, 0xa4(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index e5ccf551..9800afb8 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -3484,20 +3484,20 @@ CodeTrigger__16CMetroidPrimeExoFR13CStateManagerf: sub_8027381c: /* 8027381C 0027077C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80273820 00270780 7C 08 02 A6 */ mflr r0 -/* 80273824 00270784 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 80273824 00270784 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 80273828 00270788 C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) /* 8027382C 0027078C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80273830 00270790 38 E7 AA 68 */ addi r7, r7, lbl_803DAA68@l +/* 80273830 00270790 38 E7 AA 68 */ addi r7, r7, __vt__13CBodyStateCmd@l /* 80273834 00270794 39 00 00 13 */ li r8, 0x13 /* 80273838 00270798 88 81 00 14 */ lbz r4, 0x14(r1) /* 8027383C 0027079C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80273840 002707A0 38 C0 00 00 */ li r6, 0 /* 80273844 002707A4 50 C4 3E 30 */ rlwimi r4, r6, 7, 0x18, 0x18 /* 80273848 002707A8 81 23 04 50 */ lwz r9, 0x450(r3) -/* 8027384C 002707AC 3C 60 80 3E */ lis r3, lbl_803DFE40@ha +/* 8027384C 002707AC 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha /* 80273850 002707B0 90 E1 00 08 */ stw r7, 8(r1) /* 80273854 002707B4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 80273858 002707B8 38 E3 FE 40 */ addi r7, r3, lbl_803DFE40@l +/* 80273858 002707B8 38 E3 FE 40 */ addi r7, r3, __vt__14CBCScriptedCmd@l /* 8027385C 002707BC 3B E9 00 04 */ addi r31, r9, 4 /* 80273860 002707C0 98 81 00 14 */ stb r4, 0x14(r1) /* 80273864 002707C4 50 C0 36 72 */ rlwimi r0, r6, 6, 0x19, 0x19 @@ -3510,11 +3510,11 @@ sub_8027381c: /* 80273880 002707E0 D0 01 00 18 */ stfs f0, 0x18(r1) /* 80273884 002707E4 4B EB DB B5 */ bl DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd /* 80273888 002707E8 80 01 00 0C */ lwz r0, 0xc(r1) -/* 8027388C 002707EC 3C 60 80 3E */ lis r3, lbl_803DFE40@ha -/* 80273890 002707F0 38 83 FE 40 */ addi r4, r3, lbl_803DFE40@l -/* 80273894 002707F4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8027388C 002707EC 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha +/* 80273890 002707F0 38 83 FE 40 */ addi r4, r3, __vt__14CBCScriptedCmd@l +/* 80273894 002707F4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80273898 002707F8 90 1F 02 20 */ stw r0, 0x220(r31) -/* 8027389C 002707FC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8027389C 002707FC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802738A0 00270800 80 A1 00 10 */ lwz r5, 0x10(r1) /* 802738A4 00270804 88 61 00 14 */ lbz r3, 0x14(r1) /* 802738A8 00270808 90 BF 02 24 */ stw r5, 0x224(r31) @@ -6456,8 +6456,8 @@ lbl_80276264: /* 802762A4 00273204 90 01 00 08 */ stw r0, 8(r1) /* 802762A8 00273208 48 07 3F 11 */ bl AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fUcbbsi /* 802762AC 0027320C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802762B0 00273210 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 802762B4 00273214 38 C3 AA 68 */ addi r6, r3, lbl_803DAA68@l +/* 802762B0 00273210 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 802762B4 00273214 38 C3 AA 68 */ addi r6, r3, __vt__13CBodyStateCmd@l /* 802762B8 00273218 C0 02 BC 30 */ lfs f0, lbl_805AD950@sda21(r2) /* 802762BC 0027321C 90 1F 0F BC */ stw r0, 0xfbc(r31) /* 802762C0 00273220 3C 80 80 3E */ lis r4, lbl_803E10C8@ha @@ -6479,9 +6479,9 @@ lbl_80276264: /* 80276300 00273260 80 01 00 34 */ lwz r0, 0x34(r1) /* 80276304 00273264 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 80276308 00273268 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 8027630C 0027326C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8027630C 0027326C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80276310 00273270 90 1F 02 88 */ stw r0, 0x288(r31) -/* 80276314 00273274 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80276314 00273274 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80276318 00273278 C0 01 00 38 */ lfs f0, 0x38(r1) /* 8027631C 0027327C 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 80276320 00273280 D0 1F 02 8C */ stfs f0, 0x28c(r31) @@ -6497,9 +6497,9 @@ lbl_8027633C: /* 80276344 002732A4 90 01 00 10 */ stw r0, 0x10(r1) /* 80276348 002732A8 48 07 3B 3D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle /* 8027634C 002732AC 38 00 00 00 */ li r0, 0 -/* 80276350 002732B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80276350 002732B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80276354 002732B4 90 1F 0F BC */ stw r0, 0xfbc(r31) -/* 80276358 002732B8 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80276358 002732B8 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8027635C 002732BC 38 00 00 1B */ li r0, 0x1b /* 80276360 002732C0 38 81 00 1C */ addi r4, r1, 0x1c /* 80276364 002732C4 90 61 00 1C */ stw r3, 0x1c(r1) @@ -6507,8 +6507,8 @@ lbl_8027633C: /* 8027636C 002732CC 80 7F 04 50 */ lwz r3, 0x450(r31) /* 80276370 002732D0 38 63 00 04 */ addi r3, r3, 4 /* 80276374 002732D4 4B EB B4 45 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80276378 002732D8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8027637C 002732DC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80276378 002732D8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8027637C 002732DC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80276380 002732E0 90 01 00 1C */ stw r0, 0x1c(r1) lbl_80276384: /* 80276384 002732E4 80 01 00 54 */ lwz r0, 0x54(r1) diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index ea145333..c22c1422 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -1286,10 +1286,10 @@ lbl_8018AD4C: /* 8018AD64 00187CC4 48 00 00 FC */ b lbl_8018AE60 lbl_8018AD68: /* 8018AD68 00187CC8 48 00 13 F1 */ bl GetGenerateForHealth__13CNewIntroBossCFRC13CStateManager -/* 8018AD6C 00187CCC 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 8018AD6C 00187CCC 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 8018AD70 00187CD0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8018AD74 00187CD4 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) -/* 8018AD78 00187CD8 39 47 AA 68 */ addi r10, r7, lbl_803DAA68@l +/* 8018AD78 00187CD8 39 47 AA 68 */ addi r10, r7, __vt__13CBodyStateCmd@l /* 8018AD7C 00187CDC 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8018AD80 00187CE0 80 A1 00 24 */ lwz r5, 0x24(r1) /* 8018AD84 00187CE4 38 C0 00 00 */ li r6, 0 @@ -1319,9 +1319,9 @@ lbl_8018AD68: /* 8018ADE4 00187D44 80 01 00 0C */ lwz r0, 0xc(r1) /* 8018ADE8 00187D48 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8018ADEC 00187D4C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8018ADF0 00187D50 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8018ADF0 00187D50 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8018ADF4 00187D54 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8018ADF8 00187D58 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8018ADF8 00187D58 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8018ADFC 00187D5C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8018AE00 00187D60 80 61 00 14 */ lwz r3, 0x14(r1) /* 8018AE04 00187D64 90 BF 01 94 */ stw r5, 0x194(r31) @@ -1491,8 +1491,8 @@ lbl_8018B014: /* 8018B02C 00187F8C 48 00 01 50 */ b lbl_8018B17C lbl_8018B030: /* 8018B030 00187F90 81 1E 08 4C */ lwz r8, 0x84c(r30) -/* 8018B034 00187F94 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8018B038 00187F98 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 8018B034 00187F94 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8018B038 00187F98 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 8018B03C 00187F9C 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8018B040 00187FA0 C0 48 00 60 */ lfs f2, 0x60(r8) /* 8018B044 00187FA4 38 E0 00 06 */ li r7, 6 @@ -1516,9 +1516,9 @@ lbl_8018B030: /* 8018B08C 00187FEC 80 01 00 10 */ lwz r0, 0x10(r1) /* 8018B090 00187FF0 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8018B094 00187FF4 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 8018B098 00187FF8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8018B098 00187FF8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8018B09C 00187FFC 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8018B0A0 00188000 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8018B0A0 00188000 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8018B0A4 00188004 80 61 00 14 */ lwz r3, 0x14(r1) /* 8018B0A8 00188008 80 A1 00 18 */ lwz r5, 0x18(r1) /* 8018B0AC 0018800C 90 7F 01 30 */ stw r3, 0x130(r31) diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index 2c9435ac..7cafcfec 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -1510,9 +1510,9 @@ lbl_8028C3E4: /* 8028C3F8 00289358 90 03 05 68 */ stw r0, 0x568(r3) /* 8028C3FC 0028935C 48 00 00 90 */ b lbl_8028C48C lbl_8028C400: -/* 8028C400 00289360 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8028C400 00289360 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8028C404 00289364 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 8028C408 00289368 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8028C408 00289368 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8028C40C 0028936C 38 80 00 12 */ li r4, 0x12 /* 8028C410 00289370 90 01 00 08 */ stw r0, 8(r1) /* 8028C414 00289374 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -1527,9 +1527,9 @@ lbl_8028C400: /* 8028C438 00289398 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028C43C 0028939C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 8028C440 002893A0 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 8028C444 002893A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028C444 002893A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028C448 002893A8 90 1F 02 14 */ stw r0, 0x214(r31) -/* 8028C44C 002893AC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028C44C 002893AC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028C450 002893B0 80 61 00 10 */ lwz r3, 0x10(r1) /* 8028C454 002893B4 90 81 00 08 */ stw r4, 8(r1) /* 8028C458 002893B8 90 7F 02 18 */ stw r3, 0x218(r31) @@ -3354,9 +3354,9 @@ lbl_8028DD2C: /* 8028DD4C 0028ACAC 4B EA CC 8D */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 8028DD50 0028ACB0 48 00 00 B8 */ b lbl_8028DE08 lbl_8028DD54: -/* 8028DD54 0028ACB4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028DD54 0028ACB4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028DD58 0028ACB8 38 C0 00 01 */ li r6, 1 -/* 8028DD5C 0028ACBC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028DD5C 0028ACBC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028DD60 0028ACC0 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028DD64 0028ACC4 90 01 00 10 */ stw r0, 0x10(r1) /* 8028DD68 0028ACC8 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -3372,9 +3372,9 @@ lbl_8028DD54: /* 8028DD90 0028ACF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028DD94 0028ACF4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028DD98 0028ACF8 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8028DD9C 0028ACFC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028DD9C 0028ACFC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028DDA0 0028AD00 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8028DDA4 0028AD04 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028DDA4 0028AD04 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028DDA8 0028AD08 80 A1 00 18 */ lwz r5, 0x18(r1) /* 8028DDAC 0028AD0C 90 81 00 10 */ stw r4, 0x10(r1) /* 8028DDB0 0028AD10 80 61 00 1C */ lwz r3, 0x1c(r1) @@ -3440,9 +3440,9 @@ lbl_8028DE50: /* 8028DE84 0028ADE4 90 1E 0A 40 */ stw r0, 0xa40(r30) /* 8028DE88 0028ADE8 80 7E 04 50 */ lwz r3, 0x450(r30) /* 8028DE8C 0028ADEC 4B EA CB 4D */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType -/* 8028DE90 0028ADF0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028DE90 0028ADF0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028DE94 0028ADF4 C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 8028DE98 0028ADF8 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8028DE98 0028ADF8 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8028DE9C 0028ADFC C0 3E 00 48 */ lfs f1, 0x48(r30) /* 8028DEA0 0028AE00 C0 1E 00 38 */ lfs f0, 0x38(r30) /* 8028DEA4 0028AE04 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -3464,9 +3464,9 @@ lbl_8028DE50: /* 8028DEE4 0028AE44 80 01 00 10 */ lwz r0, 0x10(r1) /* 8028DEE8 0028AE48 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8028DEEC 0028AE4C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8028DEF0 0028AE50 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028DEF0 0028AE50 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028DEF4 0028AE54 90 1C 00 F8 */ stw r0, 0xf8(r28) -/* 8028DEF8 0028AE58 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028DEF8 0028AE58 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028DEFC 0028AE5C 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8028DF00 0028AE60 3B 60 00 00 */ li r27, 0 /* 8028DF04 0028AE64 80 61 00 18 */ lwz r3, 0x18(r1) @@ -3585,9 +3585,9 @@ lbl_8028E080: /* 8028E094 0028AFF4 90 1E 05 68 */ stw r0, 0x568(r30) /* 8028E098 0028AFF8 48 00 00 90 */ b lbl_8028E128 lbl_8028E09C: -/* 8028E09C 0028AFFC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8028E09C 0028AFFC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8028E0A0 0028B000 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha -/* 8028E0A4 0028B004 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8028E0A4 0028B004 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8028E0A8 0028B008 38 80 00 01 */ li r4, 1 /* 8028E0AC 0028B00C 90 01 00 08 */ stw r0, 8(r1) /* 8028E0B0 0028B010 38 C3 A9 E4 */ addi r6, r3, lbl_803DA9E4@l @@ -3604,9 +3604,9 @@ lbl_8028E09C: /* 8028E0DC 0028B03C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028E0E0 0028B040 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028E0E4 0028B044 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8028E0E8 0028B048 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E0E8 0028B048 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E0EC 0028B04C 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8028E0F0 0028B050 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E0F0 0028B050 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E0F4 0028B054 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8028E0F8 0028B058 90 81 00 08 */ stw r4, 8(r1) /* 8028E0FC 0028B05C 80 61 00 14 */ lwz r3, 0x14(r1) @@ -3733,9 +3733,9 @@ lbl_8028E298: /* 8028E2AC 0028B20C 90 1F 05 68 */ stw r0, 0x568(r31) /* 8028E2B0 0028B210 48 00 00 DC */ b lbl_8028E38C lbl_8028E2B4: -/* 8028E2B4 0028B214 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E2B4 0028B214 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E2B8 0028B218 38 C0 00 01 */ li r6, 1 -/* 8028E2BC 0028B21C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E2BC 0028B21C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E2C0 0028B220 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028E2C4 0028B224 90 01 00 18 */ stw r0, 0x18(r1) /* 8028E2C8 0028B228 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -3751,9 +3751,9 @@ lbl_8028E2B4: /* 8028E2F0 0028B250 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8028E2F4 0028B254 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028E2F8 0028B258 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8028E2FC 0028B25C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E2FC 0028B25C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E300 0028B260 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8028E304 0028B264 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E304 0028B264 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E308 0028B268 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8028E30C 0028B26C 90 81 00 18 */ stw r4, 0x18(r1) /* 8028E310 0028B270 80 61 00 24 */ lwz r3, 0x24(r1) @@ -3823,9 +3823,9 @@ lbl_8028E3EC: /* 8028E3F0 0028B350 40 80 03 CC */ bge lbl_8028E7BC /* 8028E3F4 0028B354 48 00 03 70 */ b lbl_8028E764 lbl_8028E3F8: -/* 8028E3F8 0028B358 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8028E3F8 0028B358 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8028E3FC 0028B35C 80 7B 04 50 */ lwz r3, 0x450(r27) -/* 8028E400 0028B360 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8028E400 0028B360 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8028E404 0028B364 3C 80 80 3E */ lis r4, lbl_803DAA2C@ha /* 8028E408 0028B368 90 01 00 48 */ stw r0, 0x48(r1) /* 8028E40C 0028B36C 38 A4 AA 2C */ addi r5, r4, lbl_803DAA2C@l @@ -3841,11 +3841,11 @@ lbl_8028E3F8: /* 8028E434 0028B394 80 01 00 4C */ lwz r0, 0x4c(r1) /* 8028E438 0028B398 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8028E43C 0028B39C 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 8028E440 0028B3A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E440 0028B3A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E444 0028B3A4 90 1A 01 58 */ stw r0, 0x158(r26) /* 8028E448 0028B3A8 38 00 00 01 */ li r0, 1 /* 8028E44C 0028B3AC 80 A1 00 50 */ lwz r5, 0x50(r1) -/* 8028E450 0028B3B0 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8028E450 0028B3B0 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8028E454 0028B3B4 90 81 00 48 */ stw r4, 0x48(r1) /* 8028E458 0028B3B8 90 BA 01 5C */ stw r5, 0x15c(r26) /* 8028E45C 0028B3BC 98 1B 0A 44 */ stb r0, 0xa44(r27) @@ -4029,8 +4029,8 @@ lbl_8028E6E4: /* 8028E6EC 0028B64C D0 1B 0B 50 */ stfs f0, 0xb50(r27) lbl_8028E6F0: /* 8028E6F0 0028B650 C0 1B 0B 58 */ lfs f0, 0xb58(r27) -/* 8028E6F4 0028B654 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8028E6F8 0028B658 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 8028E6F4 0028B654 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8028E6F8 0028B658 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 8028E6FC 0028B65C 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8028E700 0028B660 EC 00 E8 2A */ fadds f0, f0, f29 /* 8028E704 0028B664 38 C0 00 08 */ li r6, 8 @@ -4049,18 +4049,18 @@ lbl_8028E6F0: /* 8028E738 0028B698 80 01 00 40 */ lwz r0, 0x40(r1) /* 8028E73C 0028B69C 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8028E740 0028B6A0 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 8028E744 0028B6A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E744 0028B6A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E748 0028B6A8 90 1A 01 58 */ stw r0, 0x158(r26) -/* 8028E74C 0028B6AC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E74C 0028B6AC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E750 0028B6B0 80 61 00 44 */ lwz r3, 0x44(r1) /* 8028E754 0028B6B4 90 81 00 3C */ stw r4, 0x3c(r1) /* 8028E758 0028B6B8 90 7A 01 5C */ stw r3, 0x15c(r26) /* 8028E75C 0028B6BC 90 01 00 3C */ stw r0, 0x3c(r1) /* 8028E760 0028B6C0 48 00 00 5C */ b lbl_8028E7BC lbl_8028E764: -/* 8028E764 0028B6C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E764 0028B6C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E768 0028B6C8 38 00 00 0A */ li r0, 0xa -/* 8028E76C 0028B6CC 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8028E76C 0028B6CC 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8028E770 0028B6D0 90 01 00 20 */ stw r0, 0x20(r1) /* 8028E774 0028B6D4 38 81 00 1C */ addi r4, r1, 0x1c /* 8028E778 0028B6D8 90 61 00 1C */ stw r3, 0x1c(r1) @@ -4069,8 +4069,8 @@ lbl_8028E764: /* 8028E784 0028B6E4 4B EA 30 35 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 8028E788 0028B6E8 34 01 00 1C */ addic. r0, r1, 0x1c /* 8028E78C 0028B6EC 41 82 00 10 */ beq lbl_8028E79C -/* 8028E790 0028B6F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8028E794 0028B6F4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E790 0028B6F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8028E794 0028B6F4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E798 0028B6F8 90 01 00 1C */ stw r0, 0x1c(r1) lbl_8028E79C: /* 8028E79C 0028B6FC C0 3B 0B 58 */ lfs f1, 0xb58(r27) @@ -4115,9 +4115,9 @@ lbl_8028E81C: /* 8028E820 0028B780 98 03 0A 44 */ stb r0, 0xa44(r3) /* 8028E824 0028B784 48 00 00 9C */ b lbl_8028E8C0 lbl_8028E828: -/* 8028E828 0028B788 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8028E828 0028B788 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8028E82C 0028B78C 80 63 04 50 */ lwz r3, 0x450(r3) -/* 8028E830 0028B790 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8028E830 0028B790 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8028E834 0028B794 3C 80 80 3E */ lis r4, lbl_803DAA2C@ha /* 8028E838 0028B798 90 01 00 10 */ stw r0, 0x10(r1) /* 8028E83C 0028B79C 38 A4 AA 2C */ addi r5, r4, lbl_803DAA2C@l @@ -4133,26 +4133,26 @@ lbl_8028E828: /* 8028E864 0028B7C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028E868 0028B7C8 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8028E86C 0028B7CC 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 8028E870 0028B7D0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028E870 0028B7D0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028E874 0028B7D4 90 1F 01 58 */ stw r0, 0x158(r31) -/* 8028E878 0028B7D8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E878 0028B7D8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E87C 0028B7DC 80 61 00 18 */ lwz r3, 0x18(r1) /* 8028E880 0028B7E0 90 81 00 10 */ stw r4, 0x10(r1) /* 8028E884 0028B7E4 90 7F 01 5C */ stw r3, 0x15c(r31) /* 8028E888 0028B7E8 90 01 00 10 */ stw r0, 0x10(r1) /* 8028E88C 0028B7EC 48 00 00 34 */ b lbl_8028E8C0 lbl_8028E890: -/* 8028E890 0028B7F0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8028E890 0028B7F0 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8028E894 0028B7F4 38 00 00 0A */ li r0, 0xa -/* 8028E898 0028B7F8 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 8028E898 0028B7F8 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 8028E89C 0028B7FC 90 01 00 0C */ stw r0, 0xc(r1) /* 8028E8A0 0028B800 38 81 00 08 */ addi r4, r1, 8 /* 8028E8A4 0028B804 90 A1 00 08 */ stw r5, 8(r1) /* 8028E8A8 0028B808 80 63 04 50 */ lwz r3, 0x450(r3) /* 8028E8AC 0028B80C 38 63 00 04 */ addi r3, r3, 4 /* 8028E8B0 0028B810 4B EA 2F 09 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 8028E8B4 0028B814 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8028E8B8 0028B818 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028E8B4 0028B814 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8028E8B8 0028B818 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028E8BC 0028B81C 90 01 00 08 */ stw r0, 8(r1) lbl_8028E8C0: /* 8028E8C0 0028B820 80 01 00 34 */ lwz r0, 0x34(r1) @@ -4352,9 +4352,9 @@ lbl_8028EB6C: /* 8028EB80 0028BAE0 90 06 05 68 */ stw r0, 0x568(r6) /* 8028EB84 0028BAE4 48 00 00 9C */ b lbl_8028EC20 lbl_8028EB88: -/* 8028EB88 0028BAE8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028EB88 0028BAE8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028EB8C 0028BAEC 38 C0 00 01 */ li r6, 1 -/* 8028EB90 0028BAF0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028EB90 0028BAF0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028EB94 0028BAF4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028EB98 0028BAF8 90 01 00 08 */ stw r0, 8(r1) /* 8028EB9C 0028BAFC 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -4370,9 +4370,9 @@ lbl_8028EB88: /* 8028EBC4 0028BB24 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028EBC8 0028BB28 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028EBCC 0028BB2C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8028EBD0 0028BB30 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028EBD0 0028BB30 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028EBD4 0028BB34 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8028EBD8 0028BB38 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028EBD8 0028BB38 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028EBDC 0028BB3C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8028EBE0 0028BB40 90 81 00 08 */ stw r4, 8(r1) /* 8028EBE4 0028BB44 80 61 00 14 */ lwz r3, 0x14(r1) @@ -4446,9 +4446,9 @@ lbl_8028ECB4: /* 8028ECC8 0028BC28 90 1C 05 68 */ stw r0, 0x568(r28) /* 8028ECCC 0028BC2C 48 00 01 8C */ b lbl_8028EE58 lbl_8028ECD0: -/* 8028ECD0 0028BC30 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028ECD0 0028BC30 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028ECD4 0028BC34 38 C0 00 01 */ li r6, 1 -/* 8028ECD8 0028BC38 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028ECD8 0028BC38 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028ECDC 0028BC3C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028ECE0 0028BC40 90 01 00 18 */ stw r0, 0x18(r1) /* 8028ECE4 0028BC44 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -4464,9 +4464,9 @@ lbl_8028ECD0: /* 8028ED0C 0028BC6C 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8028ED10 0028BC70 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028ED14 0028BC74 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l -/* 8028ED18 0028BC78 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028ED18 0028BC78 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028ED1C 0028BC7C 90 1B 00 C8 */ stw r0, 0xc8(r27) -/* 8028ED20 0028BC80 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028ED20 0028BC80 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028ED24 0028BC84 80 C1 00 20 */ lwz r6, 0x20(r1) /* 8028ED28 0028BC88 38 80 00 01 */ li r4, 1 /* 8028ED2C 0028BC8C 80 61 00 24 */ lwz r3, 0x24(r1) @@ -4594,9 +4594,9 @@ lbl_8028EECC: /* 8028EEE0 0028BE40 90 03 05 68 */ stw r0, 0x568(r3) /* 8028EEE4 0028BE44 48 00 00 8C */ b lbl_8028EF70 lbl_8028EEE8: -/* 8028EEE8 0028BE48 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028EEE8 0028BE48 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028EEEC 0028BE4C 38 00 00 00 */ li r0, 0 -/* 8028EEF0 0028BE50 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 8028EEF0 0028BE50 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 8028EEF4 0028BE54 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028EEF8 0028BE58 90 81 00 08 */ stw r4, 8(r1) /* 8028EEFC 0028BE5C 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -4612,9 +4612,9 @@ lbl_8028EEE8: /* 8028EF24 0028BE84 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028EF28 0028BE88 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8028EF2C 0028BE8C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8028EF30 0028BE90 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028EF30 0028BE90 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028EF34 0028BE94 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8028EF38 0028BE98 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028EF38 0028BE98 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028EF3C 0028BE9C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8028EF40 0028BEA0 90 81 00 08 */ stw r4, 8(r1) /* 8028EF44 0028BEA4 80 61 00 14 */ lwz r3, 0x14(r1) @@ -5699,9 +5699,9 @@ lbl_8028FEE4: /* 8028FEE8 0028CE48 C0 02 BF 08 */ lfs f0, lbl_805ADC28@sda21(r2) /* 8028FEEC 0028CE4C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8028FEF0 0028CE50 40 81 00 90 */ ble lbl_8028FF80 -/* 8028FEF4 0028CE54 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028FEF4 0028CE54 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028FEF8 0028CE58 C0 02 BE A0 */ lfs f0, lbl_805ADBC0@sda21(r2) -/* 8028FEFC 0028CE5C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028FEFC 0028CE5C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028FF00 0028CE60 80 7E 04 50 */ lwz r3, 0x450(r30) /* 8028FF04 0028CE64 3C 80 80 3E */ lis r4, lbl_803E10C8@ha /* 8028FF08 0028CE68 90 01 00 C0 */ stw r0, 0xc0(r1) @@ -5721,9 +5721,9 @@ lbl_8028FEE4: /* 8028FF40 0028CEA0 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 8028FF44 0028CEA4 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 8028FF48 0028CEA8 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 8028FF4C 0028CEAC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8028FF4C 0028CEAC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8028FF50 0028CEB0 90 1D 02 88 */ stw r0, 0x288(r29) -/* 8028FF54 0028CEB4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8028FF54 0028CEB4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8028FF58 0028CEB8 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 8028FF5C 0028CEBC 80 A1 00 CC */ lwz r5, 0xcc(r1) /* 8028FF60 0028CEC0 D0 1D 02 8C */ stfs f0, 0x28c(r29) @@ -7131,9 +7131,9 @@ AcceptScriptMsg_Damaged: /* 802913BC 0028E31C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 802913C0 0028E320 7C 03 00 40 */ cmplw r3, r0 /* 802913C4 0028E324 41 82 00 98 */ beq lbl_8029145C -/* 802913C8 0028E328 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802913C8 0028E328 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802913CC 0028E32C C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 802913D0 0028E330 38 A3 AC 48 */ addi r5, r3, lbl_803DAA68@l +/* 802913D0 0028E330 38 A3 AC 48 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 802913D4 0028E334 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 802913D8 0028E338 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 802913DC 0028E33C 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -7155,9 +7155,9 @@ AcceptScriptMsg_Damaged: /* 8029141C 0028E37C 80 01 01 7C */ lwz r0, 0x17c(r1) /* 80291420 0028E380 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 80291424 0028E384 38 83 AC 24 */ addi r4, r3, lbl_803DAA44@l -/* 80291428 0028E388 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80291428 0028E388 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8029142C 0028E38C 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 80291430 0028E390 38 03 AC 48 */ addi r0, r3, lbl_803DAA68@l +/* 80291430 0028E390 38 03 AC 48 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80291434 0028E394 80 A1 01 80 */ lwz r5, 0x180(r1) /* 80291438 0028E398 80 61 01 84 */ lwz r3, 0x184(r1) /* 8029143C 0028E39C 90 B2 00 FC */ stw r5, 0xfc(r18) @@ -7262,11 +7262,11 @@ AcceptScriptMsg_Start: /* 802915A8 0028E508 88 1F 0A DE */ lbz r0, 0xade(r31) /* 802915AC 0028E50C 28 00 00 04 */ cmplwi r0, 0x4 /* 802915B0 0028E510 40 80 02 5C */ bge lbl_8029180C -/* 802915B4 0028E514 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 802915B4 0028E514 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 802915B8 0028E518 3C 60 80 5A */ lis r3, sLeftVector__9CVector3f@ha /* 802915BC 0028E51C 38 83 68 EC */ addi r4, r3, sLeftVector__9CVector3f@l /* 802915C0 0028E520 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 802915C4 0028E524 38 E5 AC 48 */ addi r7, r5, lbl_803DAA68@l +/* 802915C4 0028E524 38 E5 AC 48 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 802915C8 0028E528 C0 44 00 00 */ lfs f2, 0x0(r4) /* 802915CC 0028E52C C0 24 00 04 */ lfs f1, 0x4(r4) /* 802915D0 0028E530 3C A0 80 3E */ lis r5, lbl_803DAA44@ha @@ -7288,9 +7288,9 @@ AcceptScriptMsg_Start: /* 80291610 0028E570 80 01 01 48 */ lwz r0, 0x148(r1) /* 80291614 0028E574 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 80291618 0028E578 38 83 AC 24 */ addi r4, r3, lbl_803DAA44@l -/* 8029161C 0028E57C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8029161C 0028E57C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80291620 0028E580 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 80291624 0028E584 38 03 AC 48 */ addi r0, r3, lbl_803DAA68@l +/* 80291624 0028E584 38 03 AC 48 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80291628 0028E588 80 A1 01 4C */ lwz r5, 0x14c(r1) /* 8029162C 0028E58C 80 61 01 50 */ lwz r3, 0x150(r1) /* 80291630 0028E590 90 B2 00 FC */ stw r5, 0xfc(r18) @@ -7311,11 +7311,11 @@ AcceptScriptMsg_Action: /* 80291668 0028E5C8 88 1F 0A DE */ lbz r0, 0xade(r31) /* 8029166C 0028E5CC 28 00 00 04 */ cmplwi r0, 0x4 /* 80291670 0028E5D0 40 80 01 9C */ bge lbl_8029180C -/* 80291674 0028E5D4 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80291674 0028E5D4 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 80291678 0028E5D8 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha /* 8029167C 0028E5DC 38 83 68 F8 */ addi r4, r3, sRightVector__9CVector3f@l /* 80291680 0028E5E0 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 80291684 0028E5E4 38 E5 AC 48 */ addi r7, r5, lbl_803DAA68@l +/* 80291684 0028E5E4 38 E5 AC 48 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 80291688 0028E5E8 C0 44 00 00 */ lfs f2, 0x0(r4) /* 8029168C 0028E5EC C0 24 00 04 */ lfs f1, 0x4(r4) /* 80291690 0028E5F0 3C A0 80 3E */ lis r5, lbl_803DAA44@ha @@ -7337,9 +7337,9 @@ AcceptScriptMsg_Action: /* 802916D0 0028E630 80 01 01 30 */ lwz r0, 0x130(r1) /* 802916D4 0028E634 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 802916D8 0028E638 38 83 AC 24 */ addi r4, r3, lbl_803DAA44@l -/* 802916DC 0028E63C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802916DC 0028E63C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802916E0 0028E640 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 802916E4 0028E644 38 03 AC 48 */ addi r0, r3, lbl_803DAA68@l +/* 802916E4 0028E644 38 03 AC 48 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802916E8 0028E648 80 A1 01 34 */ lwz r5, 0x134(r1) /* 802916EC 0028E64C 80 61 01 38 */ lwz r3, 0x138(r1) /* 802916F0 0028E650 90 B2 00 FC */ stw r5, 0xfc(r18) @@ -7353,9 +7353,9 @@ AcceptScriptMsg_Action: /* 80291710 0028E670 48 00 00 FC */ b lbl_8029180C AcceptScriptMsg_Reset: /* 80291714 0028E674 38 00 00 01 */ li r0, 0x1 -/* 80291718 0028E678 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80291718 0028E678 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8029171C 0028E67C 98 1F 0B 78 */ stb r0, 0xb78(r31) -/* 80291720 0028E680 38 63 AC 48 */ addi r3, r3, lbl_803DAA68@l +/* 80291720 0028E680 38 63 AC 48 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80291724 0028E684 38 00 00 0C */ li r0, 0xc /* 80291728 0028E688 38 81 00 DC */ addi r4, r1, 0xdc /* 8029172C 0028E68C 90 61 00 DC */ stw r3, 0xdc(r1) @@ -7363,8 +7363,8 @@ AcceptScriptMsg_Reset: /* 80291734 0028E694 80 7F 04 50 */ lwz r3, 0x450(r31) /* 80291738 0028E698 38 63 00 04 */ addi r3, r3, 0x4 /* 8029173C 0028E69C 4B EA 00 F9 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80291740 0028E6A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80291744 0028E6A4 38 03 AC 48 */ addi r0, r3, lbl_803DAA68@l +/* 80291740 0028E6A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80291744 0028E6A4 38 03 AC 48 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80291748 0028E6A8 90 01 00 DC */ stw r0, 0xdc(r1) /* 8029174C 0028E6AC 48 00 00 C0 */ b lbl_8029180C AcceptScriptMsg_Open: @@ -8161,9 +8161,9 @@ AcceptScriptMsg_Damaged: /* 80291340 0028E2A0 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80291344 0028E2A4 7C 03 00 40 */ cmplw r3, r0 /* 80291348 0028E2A8 41 82 00 98 */ beq lbl_802913E0 -/* 8029134C 0028E2AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8029134C 0028E2AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80291350 0028E2B0 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80291354 0028E2B4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80291354 0028E2B4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80291358 0028E2B8 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 8029135C 0028E2BC C0 1F 00 38 */ lfs f0, 0x38(r31) /* 80291360 0028E2C0 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -8185,9 +8185,9 @@ AcceptScriptMsg_Damaged: /* 802913A0 0028E300 80 01 01 74 */ lwz r0, 0x174(r1) /* 802913A4 0028E304 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 802913A8 0028E308 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 802913AC 0028E30C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802913AC 0028E30C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802913B0 0028E310 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 802913B4 0028E314 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802913B4 0028E314 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802913B8 0028E318 80 A1 01 78 */ lwz r5, 0x178(r1) /* 802913BC 0028E31C 80 61 01 7C */ lwz r3, 0x17c(r1) /* 802913C0 0028E320 90 B2 00 FC */ stw r5, 0xfc(r18) @@ -8292,11 +8292,11 @@ AcceptScriptMsg_Start: /* 8029152C 0028E48C 88 1F 0A DE */ lbz r0, 0xade(r31) /* 80291530 0028E490 28 00 00 04 */ cmplwi r0, 4 /* 80291534 0028E494 40 80 02 2C */ bge lbl_80291760 -/* 80291538 0028E498 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80291538 0028E498 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8029153C 0028E49C 3C 60 80 5A */ lis r3, sLeftVector__9CVector3f@ha /* 80291540 0028E4A0 38 83 67 0C */ addi r4, r3, sLeftVector__9CVector3f@l /* 80291544 0028E4A4 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 80291548 0028E4A8 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 80291548 0028E4A8 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 8029154C 0028E4AC C0 44 00 00 */ lfs f2, 0(r4) /* 80291550 0028E4B0 C0 24 00 04 */ lfs f1, 4(r4) /* 80291554 0028E4B4 3C A0 80 3E */ lis r5, lbl_803DAA44@ha @@ -8318,9 +8318,9 @@ AcceptScriptMsg_Start: /* 80291594 0028E4F4 80 01 01 40 */ lwz r0, 0x140(r1) /* 80291598 0028E4F8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8029159C 0028E4FC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 802915A0 0028E500 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802915A0 0028E500 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802915A4 0028E504 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 802915A8 0028E508 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802915A8 0028E508 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802915AC 0028E50C 80 A1 01 44 */ lwz r5, 0x144(r1) /* 802915B0 0028E510 80 61 01 48 */ lwz r3, 0x148(r1) /* 802915B4 0028E514 90 B2 00 FC */ stw r5, 0xfc(r18) @@ -8341,11 +8341,11 @@ AcceptScriptMsg_Action: /* 802915EC 0028E54C 88 1F 0A DE */ lbz r0, 0xade(r31) /* 802915F0 0028E550 28 00 00 04 */ cmplwi r0, 4 /* 802915F4 0028E554 40 80 01 6C */ bge lbl_80291760 -/* 802915F8 0028E558 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 802915F8 0028E558 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 802915FC 0028E55C 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha /* 80291600 0028E560 38 83 67 18 */ addi r4, r3, sRightVector__9CVector3f@l /* 80291604 0028E564 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 80291608 0028E568 38 E5 AA 68 */ addi r7, r5, lbl_803DAA68@l +/* 80291608 0028E568 38 E5 AA 68 */ addi r7, r5, __vt__13CBodyStateCmd@l /* 8029160C 0028E56C C0 44 00 00 */ lfs f2, 0(r4) /* 80291610 0028E570 C0 24 00 04 */ lfs f1, 4(r4) /* 80291614 0028E574 3C A0 80 3E */ lis r5, lbl_803DAA44@ha @@ -8367,9 +8367,9 @@ AcceptScriptMsg_Action: /* 80291654 0028E5B4 80 01 01 28 */ lwz r0, 0x128(r1) /* 80291658 0028E5B8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8029165C 0028E5BC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 80291660 0028E5C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80291660 0028E5C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80291664 0028E5C4 90 12 00 F8 */ stw r0, 0xf8(r18) -/* 80291668 0028E5C8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80291668 0028E5C8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8029166C 0028E5CC 80 A1 01 2C */ lwz r5, 0x12c(r1) /* 80291670 0028E5D0 80 61 01 30 */ lwz r3, 0x130(r1) /* 80291674 0028E5D4 90 B2 00 FC */ stw r5, 0xfc(r18) diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index b078fc39..b6b5e0fa 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -1545,9 +1545,9 @@ lbl_80157B48: /* 80157B84 00154AE4 98 1F 04 00 */ stb r0, 0x400(r31) /* 80157B88 00154AE8 48 00 00 5C */ b lbl_80157BE4 lbl_80157B8C: -/* 80157B8C 00154AEC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80157B8C 00154AEC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80157B90 00154AF0 38 00 00 0A */ li r0, 0xa -/* 80157B94 00154AF4 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80157B94 00154AF4 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80157B98 00154AF8 90 01 00 10 */ stw r0, 0x10(r1) /* 80157B9C 00154AFC 38 81 00 0C */ addi r4, r1, 0xc /* 80157BA0 00154B00 90 61 00 0C */ stw r3, 0xc(r1) @@ -1556,8 +1556,8 @@ lbl_80157B8C: /* 80157BAC 00154B0C 4B FD 9C 0D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80157BB0 00154B10 34 01 00 0C */ addic. r0, r1, 0xc /* 80157BB4 00154B14 41 82 00 10 */ beq lbl_80157BC4 -/* 80157BB8 00154B18 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80157BBC 00154B1C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80157BB8 00154B18 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80157BBC 00154B1C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80157BC0 00154B20 90 01 00 0C */ stw r0, 0xc(r1) lbl_80157BC4: /* 80157BC4 00154B24 38 60 00 00 */ li r3, 0 @@ -1871,13 +1871,13 @@ lbl_80157FC8: /* 8015802C 00154F8C 39 60 00 00 */ li r11, 0 /* 80158030 00154F90 39 20 00 01 */ li r9, 1 /* 80158034 00154F94 91 7F 05 E8 */ stw r11, 0x5e8(r31) -/* 80158038 00154F98 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80158038 00154F98 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8015803C 00154F9C 88 61 00 50 */ lbz r3, 0x50(r1) /* 80158040 00154FA0 51 63 3E 30 */ rlwimi r3, r11, 7, 0x18, 0x18 /* 80158044 00154FA4 88 1F 07 42 */ lbz r0, 0x742(r31) /* 80158048 00154FA8 51 60 26 F6 */ rlwimi r0, r11, 4, 0x1b, 0x1b /* 8015804C 00154FAC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha -/* 80158050 00154FB0 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 80158050 00154FB0 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 80158054 00154FB4 98 1F 07 42 */ stb r0, 0x742(r31) /* 80158058 00154FB8 3C C0 80 3E */ lis r6, lbl_803DA9FC@ha /* 8015805C 00154FBC 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -1917,9 +1917,9 @@ lbl_80157FC8: /* 801580E4 00155044 80 01 00 30 */ lwz r0, 0x30(r1) /* 801580E8 00155048 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 801580EC 0015504C 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 801580F0 00155050 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801580F0 00155050 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801580F4 00155054 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 801580F8 00155058 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801580F8 00155058 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801580FC 0015505C 80 A1 00 34 */ lwz r5, 0x34(r1) /* 80158100 00155060 80 61 00 38 */ lwz r3, 0x38(r1) /* 80158104 00155064 90 BF 01 D8 */ stw r5, 0x1d8(r31) @@ -2125,9 +2125,9 @@ lbl_801583CC: /* 801583F0 00155350 80 1F 06 00 */ lwz r0, 0x600(r31) /* 801583F4 00155354 90 01 00 10 */ stw r0, 0x10(r1) /* 801583F8 00155358 48 00 01 51 */ bl FaceTarget__9CParasiteF9CVector3f -/* 801583FC 0015535C 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 801583FC 0015535C 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 80158400 00155360 38 A0 00 00 */ li r5, 0 -/* 80158404 00155364 39 06 AA 68 */ addi r8, r6, lbl_803DAA68@l +/* 80158404 00155364 39 06 AA 68 */ addi r8, r6, __vt__13CBodyStateCmd@l /* 80158408 00155368 88 61 00 74 */ lbz r3, 0x74(r1) /* 8015840C 0015536C 50 A3 3E 30 */ rlwimi r3, r5, 7, 0x18, 0x18 /* 80158410 00155370 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -2162,9 +2162,9 @@ lbl_801583CC: /* 80158484 001553E4 80 01 00 54 */ lwz r0, 0x54(r1) /* 80158488 001553E8 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 8015848C 001553EC 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 80158490 001553F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80158490 001553F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80158494 001553F4 90 1E 01 D4 */ stw r0, 0x1d4(r30) -/* 80158498 001553F8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80158498 001553F8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8015849C 001553FC 80 A1 00 58 */ lwz r5, 0x58(r1) /* 801584A0 00155400 80 61 00 5C */ lwz r3, 0x5c(r1) /* 801584A4 00155404 90 BE 01 D8 */ stw r5, 0x1d8(r30) @@ -2637,12 +2637,12 @@ lbl_80158B20: /* 80158B34 00155A94 90 1E 05 E8 */ stw r0, 0x5e8(r30) /* 80158B38 00155A98 48 00 00 D0 */ b lbl_80158C08 lbl_80158B3C: -/* 80158B3C 00155A9C 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 80158B3C 00155A9C 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 80158B40 00155AA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80158B44 00155AA4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80158B48 00155AA8 80 81 00 2C */ lwz r4, 0x2c(r1) /* 80158B4C 00155AAC 38 60 00 00 */ li r3, 0 -/* 80158B50 00155AB0 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 80158B50 00155AB0 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 80158B54 00155AB4 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 80158B58 00155AB8 C0 45 00 00 */ lfs f2, 0(r5) /* 80158B5C 00155ABC C0 25 00 04 */ lfs f1, 4(r5) @@ -2671,9 +2671,9 @@ lbl_80158B3C: /* 80158BB8 00155B18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80158BBC 00155B1C 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 80158BC0 00155B20 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 80158BC4 00155B24 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80158BC4 00155B24 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80158BC8 00155B28 90 1F 01 90 */ stw r0, 0x190(r31) -/* 80158BCC 00155B2C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80158BCC 00155B2C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80158BD0 00155B30 80 A1 00 18 */ lwz r5, 0x18(r1) /* 80158BD4 00155B34 80 61 00 1C */ lwz r3, 0x1c(r1) /* 80158BD8 00155B38 90 BF 01 94 */ stw r5, 0x194(r31) @@ -2730,9 +2730,9 @@ lbl_80158C74: /* 80158C88 00155BE8 90 03 05 E8 */ stw r0, 0x5e8(r3) /* 80158C8C 00155BEC 48 00 00 E4 */ b lbl_80158D70 lbl_80158C90: -/* 80158C90 00155BF0 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 80158C90 00155BF0 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 80158C94 00155BF4 38 C0 00 00 */ li r6, 0 -/* 80158C98 00155BF8 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 80158C98 00155BF8 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 80158C9C 00155BFC 80 61 00 24 */ lwz r3, 0x24(r1) /* 80158CA0 00155C00 50 C3 F8 00 */ rlwimi r3, r6, 0x1f, 0, 0 /* 80158CA4 00155C04 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha @@ -2762,9 +2762,9 @@ lbl_80158C90: /* 80158D04 00155C64 80 01 00 0C */ lwz r0, 0xc(r1) /* 80158D08 00155C68 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 80158D0C 00155C6C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 80158D10 00155C70 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80158D10 00155C70 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80158D14 00155C74 90 1F 01 90 */ stw r0, 0x190(r31) -/* 80158D18 00155C78 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80158D18 00155C78 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80158D1C 00155C7C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80158D20 00155C80 80 61 00 14 */ lwz r3, 0x14(r1) /* 80158D24 00155C84 90 BF 01 94 */ stw r5, 0x194(r31) diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 4e7c0d09..aef69e4c 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -371,8 +371,8 @@ lbl_803DAA5C: .4byte 0 .4byte __dt__12CBCHurledCmd -.global lbl_803DAA68 -lbl_803DAA68: +.global __vt__13CBodyStateCmd +__vt__13CBodyStateCmd: # ROM: 0x3D7A68 .4byte 0 .4byte 0 @@ -5264,9 +5264,9 @@ lbl_8007B62C: /* 8007B658 000785B8 2C 00 00 03 */ cmpwi r0, 3 /* 8007B65C 000785BC 40 82 00 D8 */ bne lbl_8007B734 /* 8007B660 000785C0 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8007B664 000785C4 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007B664 000785C4 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007B668 000785C8 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8007B66C 000785CC 38 84 AA 68 */ addi r4, r4, lbl_803DAA68@l +/* 8007B66C 000785CC 38 84 AA 68 */ addi r4, r4, __vt__13CBodyStateCmd@l /* 8007B670 000785D0 C0 1F 00 00 */ lfs f0, 0(r31) /* 8007B674 000785D4 FC A0 10 50 */ fneg f5, f2 /* 8007B678 000785D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha @@ -5296,9 +5296,9 @@ lbl_8007B62C: /* 8007B6D8 00078638 80 01 00 50 */ lwz r0, 0x50(r1) /* 8007B6DC 0007863C 3C 60 80 3E */ lis r3, lbl_803DAA5C@ha /* 8007B6E0 00078640 38 83 AA 5C */ addi r4, r3, lbl_803DAA5C@l -/* 8007B6E4 00078644 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007B6E4 00078644 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007B6E8 00078648 90 1F 01 B0 */ stw r0, 0x1b0(r31) -/* 8007B6EC 0007864C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007B6EC 0007864C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007B6F0 00078650 80 61 00 54 */ lwz r3, 0x54(r1) /* 8007B6F4 00078654 80 A1 00 58 */ lwz r5, 0x58(r1) /* 8007B6F8 00078658 90 7F 01 B4 */ stw r3, 0x1b4(r31) @@ -5323,9 +5323,9 @@ lbl_8007B734: /* 8007B740 000786A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007B744 000786A4 41 82 00 A4 */ beq lbl_8007B7E8 /* 8007B748 000786A8 C0 5F 00 08 */ lfs f2, 8(r31) -/* 8007B74C 000786AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007B74C 000786AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007B750 000786B0 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8007B754 000786B4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8007B754 000786B4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8007B758 000786B8 C0 1F 00 00 */ lfs f0, 0(r31) /* 8007B75C 000786BC FC 40 10 50 */ fneg f2, f2 /* 8007B760 000786C0 FC 20 08 50 */ fneg f1, f1 @@ -5349,9 +5349,9 @@ lbl_8007B734: /* 8007B7A8 00078708 80 01 00 38 */ lwz r0, 0x38(r1) /* 8007B7AC 0007870C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 8007B7B0 00078710 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 8007B7B4 00078714 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007B7B4 00078714 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007B7B8 00078718 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 8007B7BC 0007871C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007B7BC 0007871C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007B7C0 00078720 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 8007B7C4 00078724 80 61 00 40 */ lwz r3, 0x40(r1) /* 8007B7C8 00078728 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -5392,8 +5392,8 @@ __dt__15CBCKnockDownCmd: /* 8007B840 000787A0 38 03 AA 50 */ addi r0, r3, lbl_803DAA50@l /* 8007B844 000787A4 90 1F 00 00 */ stw r0, 0(r31) /* 8007B848 000787A8 41 82 00 10 */ beq lbl_8007B858 -/* 8007B84C 000787AC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007B850 000787B0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007B84C 000787AC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007B850 000787B0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007B854 000787B4 90 1F 00 00 */ stw r0, 0(r31) lbl_8007B858: /* 8007B858 000787B8 7C 80 07 35 */ extsh. r0, r4 @@ -5420,8 +5420,8 @@ __dt__12CBCHurledCmd: /* 8007B89C 000787FC 38 03 AA 5C */ addi r0, r3, lbl_803DAA5C@l /* 8007B8A0 00078800 90 1F 00 00 */ stw r0, 0(r31) /* 8007B8A4 00078804 41 82 00 10 */ beq lbl_8007B8B4 -/* 8007B8A8 00078808 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007B8AC 0007880C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007B8A8 00078808 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007B8AC 0007880C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007B8B0 00078810 90 1F 00 00 */ stw r0, 0(r31) lbl_8007B8B4: /* 8007B8B4 00078814 7C 80 07 35 */ extsh. r0, r4 @@ -5444,9 +5444,9 @@ __dt__13CBodyStateCmdFv: /* 8007B8E8 00078848 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007B8EC 0007884C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8007B8F0 00078850 41 82 00 1C */ beq lbl_8007B90C -/* 8007B8F4 00078854 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8007B8F4 00078854 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8007B8F8 00078858 7C 80 07 35 */ extsh. r0, r4 -/* 8007B8FC 0007885C 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 8007B8FC 0007885C 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 8007B900 00078860 90 1F 00 00 */ stw r0, 0(r31) /* 8007B904 00078864 40 81 00 08 */ ble lbl_8007B90C /* 8007B908 00078868 48 29 A0 29 */ bl Free__7CMemoryFPCv @@ -5462,9 +5462,9 @@ lbl_8007B90C: sub_8007b924: /* 8007B924 00078884 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007B928 00078888 7C 08 02 A6 */ mflr r0 -/* 8007B92C 0007888C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007B92C 0007888C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007B930 00078890 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007B934 00078894 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007B934 00078894 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007B938 00078898 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 8007B93C 0007889C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8007B940 000788A0 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -5487,9 +5487,9 @@ sub_8007b924: /* 8007B984 000788E4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007B988 000788E8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8007B98C 000788EC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8007B990 000788F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007B990 000788F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007B994 000788F4 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 8007B998 000788F8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007B998 000788F8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007B99C 000788FC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007B9A0 00078900 80 61 00 14 */ lwz r3, 0x14(r1) /* 8007B9A4 00078904 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -5518,8 +5518,8 @@ __dt__15CBCKnockBackCmd: /* 8007B9F4 00078954 38 03 AA 44 */ addi r0, r3, lbl_803DAA44@l /* 8007B9F8 00078958 90 1F 00 00 */ stw r0, 0(r31) /* 8007B9FC 0007895C 41 82 00 10 */ beq lbl_8007BA0C -/* 8007BA00 00078960 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BA04 00078964 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BA00 00078960 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BA04 00078964 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BA08 00078968 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BA0C: /* 8007BA0C 0007896C 7C 80 07 35 */ extsh. r0, r4 @@ -5546,8 +5546,8 @@ __dt__21CBCLoopHitReactionCmd: /* 8007BA50 000789B0 38 03 AA 38 */ addi r0, r3, lbl_803DAA38@l /* 8007BA54 000789B4 90 1F 00 00 */ stw r0, 0(r31) /* 8007BA58 000789B8 41 82 00 10 */ beq lbl_8007BA68 -/* 8007BA5C 000789BC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BA60 000789C0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BA5C 000789BC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BA60 000789C0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BA64 000789C4 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BA68: /* 8007BA68 000789C8 7C 80 07 35 */ extsh. r0, r4 @@ -5566,9 +5566,9 @@ lbl_8007BA78: TryLoopReaction__10CPatternedFR13CStateManageri: /* 8007BA90 000789F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007BA94 000789F4 7C 08 02 A6 */ mflr r0 -/* 8007BA98 000789F8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007BA98 000789F8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007BA9C 000789FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007BAA0 00078A00 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007BAA0 00078A00 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007BAA4 00078A04 38 80 00 08 */ li r4, 8 /* 8007BAA8 00078A08 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007BAAC 00078A0C 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -5585,9 +5585,9 @@ TryLoopReaction__10CPatternedFR13CStateManageri: /* 8007BAD8 00078A38 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007BADC 00078A3C 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8007BAE0 00078A40 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 8007BAE4 00078A44 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007BAE4 00078A44 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007BAE8 00078A48 90 1F 01 58 */ stw r0, 0x158(r31) -/* 8007BAEC 00078A4C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BAEC 00078A4C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BAF0 00078A50 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007BAF4 00078A54 90 81 00 08 */ stw r4, 8(r1) /* 8007BAF8 00078A58 90 7F 01 5C */ stw r3, 0x15c(r31) @@ -5610,8 +5610,8 @@ __dt__18CBCLoopReactionCmd: /* 8007BB30 00078A90 38 03 AA 2C */ addi r0, r3, lbl_803DAA2C@l /* 8007BB34 00078A94 90 1F 00 00 */ stw r0, 0(r31) /* 8007BB38 00078A98 41 82 00 10 */ beq lbl_8007BB48 -/* 8007BB3C 00078A9C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BB40 00078AA0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BB3C 00078A9C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BB40 00078AA0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BB44 00078AA4 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BB48: /* 8007BB48 00078AA8 7C 80 07 35 */ extsh. r0, r4 @@ -5678,9 +5678,9 @@ TryTurn__10CPatternedFR13CStateManageri: TryGetUp__10CPatternedFR13CStateManageri: /* 8007BC24 00078B84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007BC28 00078B88 7C 08 02 A6 */ mflr r0 -/* 8007BC2C 00078B8C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007BC2C 00078B8C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007BC30 00078B90 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007BC34 00078B94 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007BC34 00078B94 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007BC38 00078B98 38 80 00 00 */ li r4, 0 /* 8007BC3C 00078B9C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007BC40 00078BA0 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -5697,9 +5697,9 @@ TryGetUp__10CPatternedFR13CStateManageri: /* 8007BC6C 00078BCC 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007BC70 00078BD0 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 8007BC74 00078BD4 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 8007BC78 00078BD8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007BC78 00078BD8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007BC7C 00078BDC 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 8007BC80 00078BE0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BC80 00078BE0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BC84 00078BE4 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007BC88 00078BE8 90 81 00 08 */ stw r4, 8(r1) /* 8007BC8C 00078BEC 90 7F 00 C0 */ stw r3, 0xc0(r31) @@ -5722,8 +5722,8 @@ __dt__11CBCGetupCmd: /* 8007BCC4 00078C24 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l /* 8007BCC8 00078C28 90 1F 00 00 */ stw r0, 0(r31) /* 8007BCCC 00078C2C 41 82 00 10 */ beq lbl_8007BCDC -/* 8007BCD0 00078C30 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BCD4 00078C34 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BCD0 00078C30 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BCD4 00078C34 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BCD8 00078C38 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BCDC: /* 8007BCDC 00078C3C 7C 80 07 35 */ extsh. r0, r4 @@ -5742,9 +5742,9 @@ lbl_8007BCEC: sub_8007bd04: /* 8007BD04 00078C64 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007BD08 00078C68 7C 08 02 A6 */ mflr r0 -/* 8007BD0C 00078C6C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007BD0C 00078C6C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007BD10 00078C70 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007BD14 00078C74 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007BD14 00078C74 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007BD18 00078C78 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 8007BD1C 00078C7C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8007BD20 00078C80 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -5767,9 +5767,9 @@ sub_8007bd04: /* 8007BD64 00078CC4 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007BD68 00078CC8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8007BD6C 00078CCC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8007BD70 00078CD0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007BD70 00078CD0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007BD74 00078CD4 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 8007BD78 00078CD8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BD78 00078CD8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BD7C 00078CDC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007BD80 00078CE0 80 61 00 14 */ lwz r3, 0x14(r1) /* 8007BD84 00078CE4 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -5790,9 +5790,9 @@ sub_8007bd04: TryTaunt__10CPatternedFR13CStateManageri: /* 8007BDB8 00078D18 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007BDBC 00078D1C 7C 08 02 A6 */ mflr r0 -/* 8007BDC0 00078D20 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007BDC0 00078D20 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007BDC4 00078D24 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007BDC8 00078D28 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007BDC8 00078D28 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007BDCC 00078D2C 38 80 00 12 */ li r4, 0x12 /* 8007BDD0 00078D30 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007BDD4 00078D34 80 C3 04 50 */ lwz r6, 0x450(r3) @@ -5809,9 +5809,9 @@ TryTaunt__10CPatternedFR13CStateManageri: /* 8007BE00 00078D60 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007BE04 00078D64 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 8007BE08 00078D68 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 8007BE0C 00078D6C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007BE0C 00078D6C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007BE10 00078D70 90 1F 02 14 */ stw r0, 0x214(r31) -/* 8007BE14 00078D74 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BE14 00078D74 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BE18 00078D78 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007BE1C 00078D7C 90 81 00 08 */ stw r4, 8(r1) /* 8007BE20 00078D80 90 7F 02 18 */ stw r3, 0x218(r31) @@ -5834,8 +5834,8 @@ __dt__11CBCTauntCmd: /* 8007BE58 00078DB8 38 03 AA 14 */ addi r0, r3, lbl_803DAA14@l /* 8007BE5C 00078DBC 90 1F 00 00 */ stw r0, 0(r31) /* 8007BE60 00078DC0 41 82 00 10 */ beq lbl_8007BE70 -/* 8007BE64 00078DC4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BE68 00078DC8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BE64 00078DC4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BE68 00078DC8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BE6C 00078DCC 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BE70: /* 8007BE70 00078DD0 7C 80 07 35 */ extsh. r0, r4 @@ -5862,8 +5862,8 @@ __dt__11CBCSlideCmd: /* 8007BEB4 00078E14 38 03 AA 08 */ addi r0, r3, lbl_803DAA08@l /* 8007BEB8 00078E18 90 1F 00 00 */ stw r0, 0(r31) /* 8007BEBC 00078E1C 41 82 00 10 */ beq lbl_8007BECC -/* 8007BEC0 00078E20 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007BEC4 00078E24 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BEC0 00078E20 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007BEC4 00078E24 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BEC8 00078E28 90 1F 00 00 */ stw r0, 0(r31) lbl_8007BECC: /* 8007BECC 00078E2C 7C 80 07 35 */ extsh. r0, r4 @@ -5883,9 +5883,9 @@ TryJump__10CPatternedFR13CStateManageri: /* 8007BEF4 00078E54 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8007BEF8 00078E58 7C 08 02 A6 */ mflr r0 /* 8007BEFC 00078E5C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha -/* 8007BF00 00078E60 3D 00 80 3E */ lis r8, lbl_803DAA68@ha +/* 8007BF00 00078E60 3D 00 80 3E */ lis r8, __vt__13CBodyStateCmd@ha /* 8007BF04 00078E64 90 01 00 44 */ stw r0, 0x44(r1) -/* 8007BF08 00078E68 39 48 AA 68 */ addi r10, r8, lbl_803DAA68@l +/* 8007BF08 00078E68 39 48 AA 68 */ addi r10, r8, __vt__13CBodyStateCmd@l /* 8007BF0C 00078E6C 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8007BF10 00078E70 3D 00 80 3E */ lis r8, lbl_803DA9FC@ha /* 8007BF14 00078E74 93 E1 00 3C */ stw r31, 0x3c(r1) @@ -5922,9 +5922,9 @@ TryJump__10CPatternedFR13CStateManageri: /* 8007BF90 00078EF0 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007BF94 00078EF4 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 8007BF98 00078EF8 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 8007BF9C 00078EFC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007BF9C 00078EFC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007BFA0 00078F00 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 8007BFA4 00078F04 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007BFA4 00078F04 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007BFA8 00078F08 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007BFAC 00078F0C 80 61 00 14 */ lwz r3, 0x14(r1) /* 8007BFB0 00078F10 90 BF 01 D8 */ stw r5, 0x1d8(r31) @@ -5961,8 +5961,8 @@ __dt__10CBCJumpCmd: /* 8007C020 00078F80 38 03 A9 FC */ addi r0, r3, lbl_803DA9FC@l /* 8007C024 00078F84 90 1F 00 00 */ stw r0, 0(r31) /* 8007C028 00078F88 41 82 00 10 */ beq lbl_8007C038 -/* 8007C02C 00078F8C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007C030 00078F90 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C02C 00078F8C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007C030 00078F90 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C034 00078F94 90 1F 00 00 */ stw r0, 0(r31) lbl_8007C038: /* 8007C038 00078F98 7C 80 07 35 */ extsh. r0, r4 @@ -5981,10 +5981,10 @@ lbl_8007C048: sub_8007c060: /* 8007C060 00078FC0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C064 00078FC4 7C 08 02 A6 */ mflr r0 -/* 8007C068 00078FC8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8007C068 00078FC8 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8007C06C 00078FCC 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 8007C070 00078FD0 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007C074 00078FD4 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@l +/* 8007C074 00078FD4 39 25 AA 68 */ addi r9, r5, __vt__13CBodyStateCmd@l /* 8007C078 00078FD8 38 C0 00 00 */ li r6, 0 /* 8007C07C 00078FDC 39 00 00 0E */ li r8, 0xe /* 8007C080 00078FE0 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -6016,9 +6016,9 @@ sub_8007c060: /* 8007C0E8 00079048 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C0EC 0007904C 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8007C0F0 00079050 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8007C0F4 00079054 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C0F4 00079054 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C0F8 00079058 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8007C0FC 0007905C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C0FC 0007905C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C100 00079060 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007C104 00079064 80 61 00 14 */ lwz r3, 0x14(r1) /* 8007C108 00079068 90 BF 01 94 */ stw r5, 0x194(r31) @@ -6051,8 +6051,8 @@ __dt__14CBCGenerateCmd: /* 8007C168 000790C8 38 03 A9 F0 */ addi r0, r3, lbl_803DA9F0@l /* 8007C16C 000790CC 90 1F 00 00 */ stw r0, 0(r31) /* 8007C170 000790D0 41 82 00 10 */ beq lbl_8007C180 -/* 8007C174 000790D4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007C178 000790D8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C174 000790D4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007C178 000790D8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C17C 000790DC 90 1F 00 00 */ stw r0, 0(r31) lbl_8007C180: /* 8007C180 000790E0 7C 80 07 35 */ extsh. r0, r4 @@ -6072,10 +6072,10 @@ sub_8007c1a8: /* 8007C1A8 00079108 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C1AC 0007910C 7C 08 02 A6 */ mflr r0 /* 8007C1B0 00079110 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha -/* 8007C1B4 00079114 3D 00 80 3E */ lis r8, lbl_803DAA68@ha +/* 8007C1B4 00079114 3D 00 80 3E */ lis r8, __vt__13CBodyStateCmd@ha /* 8007C1B8 00079118 90 01 00 34 */ stw r0, 0x34(r1) /* 8007C1BC 0007911C 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l -/* 8007C1C0 00079120 39 08 AA 68 */ addi r8, r8, lbl_803DAA68@l +/* 8007C1C0 00079120 39 08 AA 68 */ addi r8, r8, __vt__13CBodyStateCmd@l /* 8007C1C4 00079124 39 20 00 0E */ li r9, 0xe /* 8007C1C8 00079128 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8007C1CC 0007912C 38 C0 00 00 */ li r6, 0 @@ -6107,9 +6107,9 @@ sub_8007c1a8: /* 8007C234 00079194 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C238 00079198 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8007C23C 0007919C 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8007C240 000791A0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C240 000791A0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C244 000791A4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8007C248 000791A8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C248 000791A8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C24C 000791AC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007C250 000791B0 80 61 00 14 */ lwz r3, 0x14(r1) /* 8007C254 000791B4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -6134,9 +6134,9 @@ sub_8007c1a8: TryBreakDodge__10CPatternedFR13CStateManageri: /* 8007C298 000791F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C29C 000791FC 7C 08 02 A6 */ mflr r0 -/* 8007C2A0 00079200 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007C2A0 00079200 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007C2A4 00079204 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007C2A8 00079208 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007C2A8 00079208 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007C2AC 0007920C 38 80 00 01 */ li r4, 1 /* 8007C2B0 00079210 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007C2B4 00079214 80 E3 04 50 */ lwz r7, 0x450(r3) @@ -6155,9 +6155,9 @@ TryBreakDodge__10CPatternedFR13CStateManageri: /* 8007C2E8 00079248 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C2EC 0007924C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8007C2F0 00079250 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8007C2F4 00079254 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C2F4 00079254 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C2F8 00079258 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8007C2FC 0007925C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C2FC 0007925C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C300 00079260 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007C304 00079264 90 81 00 08 */ stw r4, 8(r1) /* 8007C308 00079268 80 61 00 14 */ lwz r3, 0x14(r1) @@ -6182,8 +6182,8 @@ __dt__10CBCStepCmd: /* 8007C348 000792A8 38 03 A9 E4 */ addi r0, r3, lbl_803DA9E4@l /* 8007C34C 000792AC 90 1F 00 00 */ stw r0, 0(r31) /* 8007C350 000792B0 41 82 00 10 */ beq lbl_8007C360 -/* 8007C354 000792B4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007C358 000792B8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C354 000792B4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007C358 000792B8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C35C 000792BC 90 1F 00 00 */ stw r0, 0(r31) lbl_8007C360: /* 8007C360 000792C0 7C 80 07 35 */ extsh. r0, r4 @@ -6203,9 +6203,9 @@ TryDodge__10CPatternedFR13CStateManageri: /* 8007C388 000792E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C38C 000792EC 7C 08 02 A6 */ mflr r0 /* 8007C390 000792F0 38 C0 00 01 */ li r6, 1 -/* 8007C394 000792F4 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007C394 000792F4 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007C398 000792F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007C39C 000792FC 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007C39C 000792FC 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007C3A0 00079300 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007C3A4 00079304 80 83 04 50 */ lwz r4, 0x450(r3) /* 8007C3A8 00079308 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha @@ -6222,9 +6222,9 @@ TryDodge__10CPatternedFR13CStateManageri: /* 8007C3D4 00079334 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C3D8 00079338 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8007C3DC 0007933C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8007C3E0 00079340 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C3E0 00079340 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C3E4 00079344 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8007C3E8 00079348 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C3E8 00079348 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C3EC 0007934C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007C3F0 00079350 90 81 00 08 */ stw r4, 8(r1) /* 8007C3F4 00079354 80 61 00 14 */ lwz r3, 0x14(r1) @@ -6241,9 +6241,9 @@ TryDodge__10CPatternedFR13CStateManageri: sub_8007c418: /* 8007C418 00079378 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C41C 0007937C 7C 08 02 A6 */ mflr r0 -/* 8007C420 00079380 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007C420 00079380 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007C424 00079384 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007C428 00079388 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8007C428 00079388 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8007C42C 0007938C 38 80 00 01 */ li r4, 1 /* 8007C430 00079390 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8007C434 00079394 80 E3 04 50 */ lwz r7, 0x450(r3) @@ -6262,9 +6262,9 @@ sub_8007c418: /* 8007C468 000793C8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C46C 000793CC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8007C470 000793D0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8007C474 000793D4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C474 000793D4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C478 000793D8 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8007C47C 000793DC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C47C 000793DC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C480 000793E0 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8007C484 000793E4 90 81 00 08 */ stw r4, 8(r1) /* 8007C488 000793E8 80 61 00 14 */ lwz r3, 0x14(r1) @@ -6281,10 +6281,10 @@ sub_8007c418: sub_8007c4ac: /* 8007C4AC 0007940C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C4B0 00079410 7C 08 02 A6 */ mflr r0 -/* 8007C4B4 00079414 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007C4B4 00079414 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007C4B8 00079418 38 E0 00 05 */ li r7, 5 /* 8007C4BC 0007941C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007C4C0 00079420 38 C4 AA 68 */ addi r6, r4, lbl_803DAA68@l +/* 8007C4C0 00079420 38 C4 AA 68 */ addi r6, r4, __vt__13CBodyStateCmd@l /* 8007C4C4 00079424 38 00 00 01 */ li r0, 1 /* 8007C4C8 00079428 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8007C4CC 0007942C 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -6308,9 +6308,9 @@ sub_8007c4ac: /* 8007C514 00079474 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C518 00079478 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8007C51C 0007947C 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8007C520 00079480 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C520 00079480 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C524 00079484 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8007C528 00079488 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C528 00079488 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C52C 0007948C 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007C530 00079490 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8007C534 00079494 90 7F 01 14 */ stw r3, 0x114(r31) @@ -6341,8 +6341,8 @@ __dt__17CBCMeleeAttackCmd: /* 8007C58C 000794EC 38 03 A9 D8 */ addi r0, r3, lbl_803DA9D8@l /* 8007C590 000794F0 90 1F 00 00 */ stw r0, 0(r31) /* 8007C594 000794F4 41 82 00 10 */ beq lbl_8007C5A4 -/* 8007C598 000794F8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007C59C 000794FC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C598 000794F8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007C59C 000794FC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C5A0 00079500 90 1F 00 00 */ stw r0, 0(r31) lbl_8007C5A4: /* 8007C5A4 00079504 7C 80 07 35 */ extsh. r0, r4 @@ -6361,10 +6361,10 @@ lbl_8007C5B4: TryMeleeAttack__10CPatternedFR13CStateManageri: /* 8007C5CC 0007952C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C5D0 00079530 7C 08 02 A6 */ mflr r0 -/* 8007C5D4 00079534 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8007C5D4 00079534 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8007C5D8 00079538 38 E0 00 05 */ li r7, 5 /* 8007C5DC 0007953C 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007C5E0 00079540 38 C6 AA 68 */ addi r6, r6, lbl_803DAA68@l +/* 8007C5E0 00079540 38 C6 AA 68 */ addi r6, r6, __vt__13CBodyStateCmd@l /* 8007C5E4 00079544 38 00 00 00 */ li r0, 0 /* 8007C5E8 00079548 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007C5EC 0007954C 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -6389,9 +6389,9 @@ TryMeleeAttack__10CPatternedFR13CStateManageri: /* 8007C638 00079598 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C63C 0007959C 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8007C640 000795A0 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8007C644 000795A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C644 000795A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C648 000795A8 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8007C64C 000795AC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C64C 000795AC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C650 000795B0 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007C654 000795B4 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8007C658 000795B8 90 7F 01 14 */ stw r3, 0x114(r31) @@ -6414,10 +6414,10 @@ TryMeleeAttack__10CPatternedFR13CStateManageri: TryProjectileAttack__10CPatternedFR13CStateManageri: /* 8007C694 000795F4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C698 000795F8 7C 08 02 A6 */ mflr r0 -/* 8007C69C 000795FC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8007C69C 000795FC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8007C6A0 00079600 38 E0 00 06 */ li r7, 6 /* 8007C6A4 00079604 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007C6A8 00079608 38 C4 AA 68 */ addi r6, r4, lbl_803DAA68@l +/* 8007C6A8 00079608 38 C4 AA 68 */ addi r6, r4, __vt__13CBodyStateCmd@l /* 8007C6AC 0007960C 38 00 00 00 */ li r0, 0 /* 8007C6B0 00079610 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha /* 8007C6B4 00079614 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -6441,9 +6441,9 @@ TryProjectileAttack__10CPatternedFR13CStateManageri: /* 8007C6FC 0007965C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8007C700 00079660 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8007C704 00079664 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 8007C708 00079668 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8007C708 00079668 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8007C70C 0007966C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8007C710 00079670 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C710 00079670 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C714 00079674 80 61 00 10 */ lwz r3, 0x10(r1) /* 8007C718 00079678 80 A1 00 14 */ lwz r5, 0x14(r1) /* 8007C71C 0007967C 90 7F 01 30 */ stw r3, 0x130(r31) @@ -6474,8 +6474,8 @@ __dt__22CBCProjectileAttackCmdFv: /* 8007C774 000796D4 38 03 A9 CC */ addi r0, r3, lbl_803DA9CC@l /* 8007C778 000796D8 90 1F 00 00 */ stw r0, 0(r31) /* 8007C77C 000796DC 41 82 00 10 */ beq lbl_8007C78C -/* 8007C780 000796E0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8007C784 000796E4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8007C780 000796E0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8007C784 000796E4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8007C788 000796E8 90 1F 00 00 */ stw r0, 0(r31) lbl_8007C78C: /* 8007C78C 000796EC 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index 2f256dd8..9ebe2a69 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -506,9 +506,9 @@ lbl_802950CC: /* 802950EC 0029204C 4B EA 58 ED */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 802950F0 00292050 48 00 00 8C */ b lbl_8029517C lbl_802950F4: -/* 802950F4 00292054 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802950F4 00292054 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802950F8 00292058 38 C0 00 01 */ li r6, 1 -/* 802950FC 0029205C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802950FC 0029205C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80295100 00292060 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80295104 00292064 90 01 00 08 */ stw r0, 8(r1) /* 80295108 00292068 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -524,9 +524,9 @@ lbl_802950F4: /* 80295130 00292090 80 01 00 0C */ lwz r0, 0xc(r1) /* 80295134 00292094 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80295138 00292098 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8029513C 0029209C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8029513C 0029209C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80295140 002920A0 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80295144 002920A4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80295144 002920A4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80295148 002920A8 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8029514C 002920AC 90 81 00 08 */ stw r4, 8(r1) /* 80295150 002920B0 80 61 00 14 */ lwz r3, 0x14(r1) @@ -589,9 +589,9 @@ lbl_802951FC: /* 80295210 00292170 90 03 05 88 */ stw r0, 0x588(r3) /* 80295214 00292174 48 00 00 8C */ b lbl_802952A0 lbl_80295218: -/* 80295218 00292178 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80295218 00292178 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8029521C 0029217C 38 00 00 00 */ li r0, 0 -/* 80295220 00292180 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80295220 00292180 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80295224 00292184 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80295228 00292188 90 81 00 08 */ stw r4, 8(r1) /* 8029522C 0029218C 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -607,9 +607,9 @@ lbl_80295218: /* 80295254 002921B4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80295258 002921B8 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8029525C 002921BC 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80295260 002921C0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80295260 002921C0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80295264 002921C4 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80295268 002921C8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80295268 002921C8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8029526C 002921CC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80295270 002921D0 90 81 00 08 */ stw r4, 8(r1) /* 80295274 002921D4 80 61 00 14 */ lwz r3, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index 159299f7..987a88a6 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -380,9 +380,9 @@ lbl_80146CB0: /* 80146CB4 00143C14 40 80 01 60 */ bge lbl_80146E14 /* 80146CB8 00143C18 48 00 01 54 */ b lbl_80146E0C lbl_80146CBC: -/* 80146CBC 00143C1C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146CBC 00143C1C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146CC0 00143C20 38 A0 00 00 */ li r5, 0 -/* 80146CC4 00143C24 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146CC4 00143C24 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146CC8 00143C28 80 7F 04 50 */ lwz r3, 0x450(r31) /* 80146CCC 00143C2C 3C 80 80 3E */ lis r4, lbl_803DAA20@ha /* 80146CD0 00143C30 90 01 00 14 */ stw r0, 0x14(r1) @@ -397,9 +397,9 @@ lbl_80146CBC: /* 80146CF4 00143C54 80 01 00 18 */ lwz r0, 0x18(r1) /* 80146CF8 00143C58 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 80146CFC 00143C5C 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 80146D00 00143C60 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146D00 00143C60 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146D04 00143C64 90 1E 00 BC */ stw r0, 0xbc(r30) -/* 80146D08 00143C68 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146D08 00143C68 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146D0C 00143C6C 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 80146D10 00143C70 7F E3 FB 78 */ mr r3, r31 /* 80146D14 00143C74 90 81 00 14 */ stw r4, 0x14(r1) @@ -428,9 +428,9 @@ lbl_80146D48: /* 80146D6C 00143CCC 40 80 00 08 */ bge lbl_80146D74 /* 80146D70 00143CD0 48 00 00 A4 */ b lbl_80146E14 lbl_80146D74: -/* 80146D74 00143CD4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146D74 00143CD4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146D78 00143CD8 38 A0 00 00 */ li r5, 0 -/* 80146D7C 00143CDC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146D7C 00143CDC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146D80 00143CE0 80 7F 04 50 */ lwz r3, 0x450(r31) /* 80146D84 00143CE4 3C 80 80 3E */ lis r4, lbl_803DAA20@ha /* 80146D88 00143CE8 90 01 00 08 */ stw r0, 8(r1) @@ -445,9 +445,9 @@ lbl_80146D74: /* 80146DAC 00143D0C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80146DB0 00143D10 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 80146DB4 00143D14 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 80146DB8 00143D18 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146DB8 00143D18 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146DBC 00143D1C 90 1E 00 BC */ stw r0, 0xbc(r30) -/* 80146DC0 00143D20 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146DC0 00143D20 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146DC4 00143D24 80 61 00 10 */ lwz r3, 0x10(r1) /* 80146DC8 00143D28 90 81 00 08 */ stw r4, 8(r1) /* 80146DCC 00143D2C 90 7E 00 C0 */ stw r3, 0xc0(r30) @@ -533,9 +533,9 @@ lbl_80146EC4: /* 80146EE4 00143E44 98 03 06 14 */ stb r0, 0x614(r3) /* 80146EE8 00143E48 48 00 00 C0 */ b lbl_80146FA8 lbl_80146EEC: -/* 80146EEC 00143E4C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146EEC 00143E4C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146EF0 00143E50 C0 02 9C 88 */ lfs f0, lbl_805AB9A8@sda21(r2) -/* 80146EF4 00143E54 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146EF4 00143E54 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146EF8 00143E58 C0 22 9C 98 */ lfs f1, lbl_805AB9B8@sda21(r2) /* 80146EFC 00143E5C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 80146F00 00143E60 90 01 00 08 */ stw r0, 8(r1) @@ -555,9 +555,9 @@ lbl_80146EEC: /* 80146F38 00143E98 80 01 00 0C */ lwz r0, 0xc(r1) /* 80146F3C 00143E9C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 80146F40 00143EA0 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 80146F44 00143EA4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80146F44 00143EA4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80146F48 00143EA8 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 80146F4C 00143EAC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80146F4C 00143EAC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80146F50 00143EB0 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80146F54 00143EB4 80 61 00 14 */ lwz r3, 0x14(r1) /* 80146F58 00143EB8 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -641,9 +641,9 @@ lbl_80147048: /* 80147068 00143FC8 98 1F 06 14 */ stb r0, 0x614(r31) /* 8014706C 00143FCC 48 00 00 D8 */ b lbl_80147144 lbl_80147070: -/* 80147070 00143FD0 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80147070 00143FD0 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80147074 00143FD4 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha -/* 80147078 00143FD8 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80147078 00143FD8 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8014707C 00143FDC 38 80 00 08 */ li r4, 8 /* 80147080 00143FE0 90 01 00 10 */ stw r0, 0x10(r1) /* 80147084 00143FE4 38 A3 AA 2C */ addi r5, r3, lbl_803DAA2C@l @@ -658,9 +658,9 @@ lbl_80147070: /* 801470A8 00144008 80 01 00 14 */ lwz r0, 0x14(r1) /* 801470AC 0014400C 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 801470B0 00144010 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 801470B4 00144014 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801470B4 00144014 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801470B8 00144018 90 1F 01 58 */ stw r0, 0x158(r31) -/* 801470BC 0014401C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801470BC 0014401C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801470C0 00144020 80 61 00 18 */ lwz r3, 0x18(r1) /* 801470C4 00144024 90 81 00 10 */ stw r4, 0x10(r1) /* 801470C8 00144028 90 7F 01 5C */ stw r3, 0x15c(r31) @@ -675,9 +675,9 @@ lbl_801470D4: /* 801470E8 00144048 90 1F 05 CC */ stw r0, 0x5cc(r31) /* 801470EC 0014404C 48 00 00 58 */ b lbl_80147144 lbl_801470F0: -/* 801470F0 00144050 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801470F0 00144050 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801470F4 00144054 38 00 00 0A */ li r0, 0xa -/* 801470F8 00144058 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801470F8 00144058 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801470FC 0014405C 90 01 00 0C */ stw r0, 0xc(r1) /* 80147100 00144060 38 81 00 08 */ addi r4, r1, 8 /* 80147104 00144064 90 61 00 08 */ stw r3, 8(r1) @@ -686,8 +686,8 @@ lbl_801470F0: /* 80147110 00144070 4B FE A6 A9 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 80147114 00144074 34 01 00 08 */ addic. r0, r1, 8 /* 80147118 00144078 41 82 00 10 */ beq lbl_80147128 -/* 8014711C 0014407C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80147120 00144080 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8014711C 0014407C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80147120 00144080 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80147124 00144084 90 01 00 08 */ stw r0, 8(r1) lbl_80147128: /* 80147128 00144088 38 60 00 00 */ li r3, 0 diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 514ee6b2..3c2dcea9 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -442,11 +442,11 @@ lbl_8014B6A4: /* 8014B6B0 00148610 80 7E 08 4C */ lwz r3, 0x84c(r30) /* 8014B6B4 00148614 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014B6B8 00148618 4B FC F5 E9 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 8014B6BC 0014861C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8014B6BC 0014861C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8014B6C0 00148620 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014B6C4 00148624 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8014B6C8 00148628 80 7D 04 50 */ lwz r3, 0x450(r29) -/* 8014B6CC 0014862C 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 8014B6CC 0014862C 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 8014B6D0 00148630 C0 44 00 00 */ lfs f2, 0(r4) /* 8014B6D4 00148634 C0 24 00 04 */ lfs f1, 4(r4) /* 8014B6D8 00148638 3C C0 80 3E */ lis r6, lbl_803DA9D8@ha @@ -470,11 +470,11 @@ lbl_8014B6A4: /* 8014B720 00148680 80 01 00 28 */ lwz r0, 0x28(r1) /* 8014B724 00148684 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8014B728 00148688 38 E3 A9 D8 */ addi r7, r3, lbl_803DA9D8@l -/* 8014B72C 0014868C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8014B72C 0014868C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8014B730 00148690 90 1F 01 10 */ stw r0, 0x110(r31) /* 8014B734 00148694 38 A0 00 00 */ li r5, 0 /* 8014B738 00148698 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8014B73C 0014869C 38 C3 AA 68 */ addi r6, r3, lbl_803DAA68@l +/* 8014B73C 0014869C 38 C3 AA 68 */ addi r6, r3, __vt__13CBodyStateCmd@l /* 8014B740 001486A0 80 61 00 30 */ lwz r3, 0x30(r1) /* 8014B744 001486A4 38 80 00 01 */ li r4, 1 /* 8014B748 001486A8 90 1F 01 14 */ stw r0, 0x114(r31) @@ -791,9 +791,9 @@ lbl_8014BBA8: /* 8014BBBC 00148B1C 90 03 05 68 */ stw r0, 0x568(r3) /* 8014BBC0 00148B20 48 00 00 A0 */ b lbl_8014BC60 lbl_8014BBC4: -/* 8014BBC4 00148B24 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8014BBC4 00148B24 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8014BBC8 00148B28 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha -/* 8014BBCC 00148B2C 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8014BBCC 00148B2C 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8014BBD0 00148B30 38 80 00 08 */ li r4, 8 /* 8014BBD4 00148B34 90 01 00 10 */ stw r0, 0x10(r1) /* 8014BBD8 00148B38 38 A3 AA 2C */ addi r5, r3, lbl_803DAA2C@l @@ -808,9 +808,9 @@ lbl_8014BBC4: /* 8014BBFC 00148B5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014BC00 00148B60 3C 60 80 3E */ lis r3, lbl_803DAA2C@ha /* 8014BC04 00148B64 38 83 AA 2C */ addi r4, r3, lbl_803DAA2C@l -/* 8014BC08 00148B68 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8014BC08 00148B68 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8014BC0C 00148B6C 90 1F 01 58 */ stw r0, 0x158(r31) -/* 8014BC10 00148B70 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8014BC10 00148B70 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8014BC14 00148B74 80 61 00 18 */ lwz r3, 0x18(r1) /* 8014BC18 00148B78 90 81 00 10 */ stw r4, 0x10(r1) /* 8014BC1C 00148B7C 90 7F 01 5C */ stw r3, 0x15c(r31) @@ -820,17 +820,17 @@ lbl_8014BC28: /* 8014BC28 00148B88 48 00 0B 51 */ bl sub_8014c778 /* 8014BC2C 00148B8C 48 00 00 34 */ b lbl_8014BC60 lbl_8014BC30: -/* 8014BC30 00148B90 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8014BC30 00148B90 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8014BC34 00148B94 38 00 00 0A */ li r0, 0xa -/* 8014BC38 00148B98 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 8014BC38 00148B98 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 8014BC3C 00148B9C 90 01 00 0C */ stw r0, 0xc(r1) /* 8014BC40 00148BA0 38 81 00 08 */ addi r4, r1, 8 /* 8014BC44 00148BA4 90 A1 00 08 */ stw r5, 8(r1) /* 8014BC48 00148BA8 80 63 04 50 */ lwz r3, 0x450(r3) /* 8014BC4C 00148BAC 38 63 00 04 */ addi r3, r3, 4 /* 8014BC50 00148BB0 4B FE 5B 69 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 8014BC54 00148BB4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 8014BC58 00148BB8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8014BC54 00148BB4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 8014BC58 00148BB8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8014BC5C 00148BBC 90 01 00 08 */ stw r0, 8(r1) lbl_8014BC60: /* 8014BC60 00148BC0 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 581f0ae2..6fb986e8 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -1524,9 +1524,9 @@ Hurled__7CRidleyFR13CStateManager9EStateMsgf: /* 8025322C 0025018C 48 00 00 98 */ b lbl_802532C4 lbl_80253230: /* 80253230 00250190 48 00 44 21 */ bl sub_80257650 -/* 80253234 00250194 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80253234 00250194 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80253238 00250198 38 A0 00 04 */ li r5, 4 -/* 8025323C 0025019C 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 8025323C 0025019C 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80253240 002501A0 C0 5F 00 58 */ lfs f2, 0x58(r31) /* 80253244 002501A4 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 80253248 002501A8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha @@ -1547,9 +1547,9 @@ lbl_80253230: /* 80253284 002501E4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80253288 002501E8 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8025328C 002501EC 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 80253290 002501F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80253290 002501F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80253294 002501F4 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 80253298 002501F8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80253298 002501F8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8025329C 002501FC 80 A1 00 10 */ lwz r5, 0x10(r1) /* 802532A0 00250200 80 61 00 14 */ lwz r3, 0x14(r1) /* 802532A4 00250204 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -3438,9 +3438,9 @@ lbl_80254DF0: /* 80254DFC 00251D5C 41 82 00 08 */ beq lbl_80254E04 /* 80254E00 00251D60 38 A0 00 02 */ li r5, 2 lbl_80254E04: -/* 80254E04 00251D64 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80254E04 00251D64 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80254E08 00251D68 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 80254E0C 00251D6C 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80254E0C 00251D6C 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80254E10 00251D70 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80254E14 00251D74 90 01 00 3C */ stw r0, 0x3c(r1) /* 80254E18 00251D78 38 04 A9 E4 */ addi r0, r4, lbl_803DA9E4@l @@ -3456,11 +3456,11 @@ lbl_80254E04: /* 80254E40 00251DA0 80 A1 00 40 */ lwz r5, 0x40(r1) /* 80254E44 00251DA4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80254E48 00251DA8 38 03 A9 E4 */ addi r0, r3, lbl_803DA9E4@l -/* 80254E4C 00251DAC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80254E4C 00251DAC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80254E50 00251DB0 90 BF 00 C8 */ stw r5, 0xc8(r31) /* 80254E54 00251DB4 38 60 00 01 */ li r3, 1 /* 80254E58 00251DB8 80 C1 00 44 */ lwz r6, 0x44(r1) -/* 80254E5C 00251DBC 38 84 AA 68 */ addi r4, r4, lbl_803DAA68@l +/* 80254E5C 00251DBC 38 84 AA 68 */ addi r4, r4, __vt__13CBodyStateCmd@l /* 80254E60 00251DC0 80 A1 00 48 */ lwz r5, 0x48(r1) /* 80254E64 00251DC4 90 DF 00 CC */ stw r6, 0xcc(r31) /* 80254E68 00251DC8 90 BF 00 D0 */ stw r5, 0xd0(r31) @@ -4403,17 +4403,17 @@ lbl_80255BB0: /* 80255BF0 00252B50 7F E3 FB 78 */ mr r3, r31 /* 80255BF4 00252B54 38 81 00 1C */ addi r4, r1, 0x1c /* 80255BF8 00252B58 4B DF D2 95 */ bl SetTranslation__6CActorFRC9CVector3f -/* 80255BFC 00252B5C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80255BFC 00252B5C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80255C00 00252B60 38 00 00 0C */ li r0, 0xc -/* 80255C04 00252B64 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80255C04 00252B64 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80255C08 00252B68 90 01 00 0C */ stw r0, 0xc(r1) /* 80255C0C 00252B6C 38 81 00 08 */ addi r4, r1, 8 /* 80255C10 00252B70 90 61 00 08 */ stw r3, 8(r1) /* 80255C14 00252B74 80 7F 04 50 */ lwz r3, 0x450(r31) /* 80255C18 00252B78 38 63 00 04 */ addi r3, r3, 4 /* 80255C1C 00252B7C 4B ED BB 9D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80255C20 00252B80 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80255C24 00252B84 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80255C20 00252B80 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80255C24 00252B84 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80255C28 00252B88 90 01 00 08 */ stw r0, 8(r1) lbl_80255C2C: /* 80255C2C 00252B8C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -8238,9 +8238,9 @@ lbl_802593A4: /* 802593BC 0025631C C0 1F 09 5C */ lfs f0, 0x95c(r31) /* 802593C0 00256320 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 802593C4 00256324 40 81 00 9C */ ble lbl_80259460 -/* 802593C8 00256328 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802593C8 00256328 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802593CC 0025632C C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 802593D0 00256330 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 802593D0 00256330 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 802593D4 00256334 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 802593D8 00256338 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 802593DC 0025633C 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -8263,9 +8263,9 @@ lbl_802593A4: /* 80259420 00256380 80 01 02 64 */ lwz r0, 0x264(r1) /* 80259424 00256384 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 80259428 00256388 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8025942C 0025638C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8025942C 0025638C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80259430 00256390 90 1C 00 F8 */ stw r0, 0xf8(r28) -/* 80259434 00256394 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80259434 00256394 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80259438 00256398 80 A1 02 68 */ lwz r5, 0x268(r1) /* 8025943C 0025639C 80 61 02 6C */ lwz r3, 0x26c(r1) /* 80259440 002563A0 90 BC 00 FC */ stw r5, 0xfc(r28) @@ -8417,9 +8417,9 @@ lbl_8025966C: /* 8025966C 002565CC C0 1F 0C BC */ lfs f0, 0xcbc(r31) /* 80259670 002565D0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80259674 002565D4 40 80 01 B4 */ bge lbl_80259828 -/* 80259678 002565D8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80259678 002565D8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8025967C 002565DC C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80259680 002565E0 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80259680 002565E0 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80259684 002565E4 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 80259688 002565E8 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 8025968C 002565EC 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -8442,9 +8442,9 @@ lbl_8025966C: /* 802596D0 00256630 80 01 02 4C */ lwz r0, 0x24c(r1) /* 802596D4 00256634 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 802596D8 00256638 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 802596DC 0025663C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802596DC 0025663C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802596E0 00256640 90 1A 00 F8 */ stw r0, 0xf8(r26) -/* 802596E4 00256644 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802596E4 00256644 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802596E8 00256648 80 A1 02 50 */ lwz r5, 0x250(r1) /* 802596EC 0025664C 80 61 02 54 */ lwz r3, 0x254(r1) /* 802596F0 00256650 90 BA 00 FC */ stw r5, 0xfc(r26) @@ -8484,9 +8484,9 @@ lbl_80259770: /* 80259770 002566D0 C0 1F 0C BC */ lfs f0, 0xcbc(r31) /* 80259774 002566D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80259778 002566D8 40 80 00 B0 */ bge lbl_80259828 -/* 8025977C 002566DC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8025977C 002566DC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80259780 002566E0 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80259784 002566E4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80259784 002566E4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80259788 002566E8 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 8025978C 002566EC C0 1F 00 38 */ lfs f0, 0x38(r31) /* 80259790 002566F0 3C 80 80 3E */ lis r4, lbl_803DAA44@ha @@ -8509,9 +8509,9 @@ lbl_80259770: /* 802597D4 00256734 80 01 02 34 */ lwz r0, 0x234(r1) /* 802597D8 00256738 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 802597DC 0025673C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 802597E0 00256740 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 802597E0 00256740 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 802597E4 00256744 90 1A 00 F8 */ stw r0, 0xf8(r26) -/* 802597E8 00256748 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 802597E8 00256748 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 802597EC 0025674C 80 A1 02 38 */ lwz r5, 0x238(r1) /* 802597F0 00256750 80 61 02 3C */ lwz r3, 0x23c(r1) /* 802597F4 00256754 90 BA 00 FC */ stw r5, 0xfc(r26) diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 0820c62c..4609b29a 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -596,9 +596,9 @@ KnockBack__7CRipperFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef /* 8015C324 00159284 7C 7E 1B 78 */ mr r30, r3 /* 8015C328 00159288 4B F1 E4 55 */ bl KnockBack__10CPatternedFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef /* 8015C32C 0015928C C0 5F 00 08 */ lfs f2, 8(r31) -/* 8015C330 00159290 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8015C330 00159290 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015C334 00159294 C0 3F 00 04 */ lfs f1, 4(r31) -/* 8015C338 00159298 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8015C338 00159298 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8015C33C 0015929C C0 1F 00 00 */ lfs f0, 0(r31) /* 8015C340 001592A0 FC 40 10 50 */ fneg f2, f2 /* 8015C344 001592A4 FC 20 08 50 */ fneg f1, f1 @@ -622,9 +622,9 @@ KnockBack__7CRipperFRC9CVector3fR13CStateManagerRC11CDamageInfo14EKnockBackTypef /* 8015C38C 001592EC 80 01 00 0C */ lwz r0, 0xc(r1) /* 8015C390 001592F0 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 8015C394 001592F4 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 8015C398 001592F8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8015C398 001592F8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015C39C 001592FC 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 8015C3A0 00159300 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8015C3A0 00159300 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8015C3A4 00159304 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8015C3A8 00159308 80 61 00 14 */ lwz r3, 0x14(r1) /* 8015C3AC 0015930C 90 BF 00 FC */ stw r5, 0xfc(r31) diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index bb142284..be5629b8 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -1674,9 +1674,9 @@ lbl_801210AC: /* 801210E0 0011E040 C0 3E 08 C4 */ lfs f1, 0x8c4(r30) /* 801210E4 0011E044 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801210E8 0011E048 40 82 01 10 */ bne lbl_801211F8 -/* 801210EC 0011E04C 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801210EC 0011E04C 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801210F0 0011E050 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 801210F4 0011E054 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801210F4 0011E054 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801210F8 0011E058 3C 80 80 3E */ lis r4, lbl_803E061C@ha /* 801210FC 0011E05C 90 01 00 14 */ stw r0, 0x14(r1) /* 80121100 0011E060 38 04 06 1C */ addi r0, r4, lbl_803E061C@l @@ -1690,9 +1690,9 @@ lbl_801210AC: /* 80121120 0011E080 3C 60 80 3E */ lis r3, lbl_803E061C@ha /* 80121124 0011E084 80 C1 00 18 */ lwz r6, 0x18(r1) /* 80121128 0011E088 38 03 06 1C */ addi r0, r3, lbl_803E061C@l -/* 8012112C 0011E08C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8012112C 0011E08C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80121130 0011E090 90 01 00 14 */ stw r0, 0x14(r1) -/* 80121134 0011E094 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80121134 0011E094 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80121138 0011E098 7F C4 F3 78 */ mr r4, r30 /* 8012113C 0011E09C 7F E5 FB 78 */ mr r5, r31 /* 80121140 0011E0A0 90 DD 02 74 */ stw r6, 0x274(r29) @@ -1730,17 +1730,17 @@ lbl_801211B0: /* 801211BC 0011E11C 88 1E 06 34 */ lbz r0, 0x634(r30) /* 801211C0 0011E120 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 801211C4 0011E124 40 82 00 34 */ bne lbl_801211F8 -/* 801211C8 0011E128 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801211C8 0011E128 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801211CC 0011E12C 38 00 00 17 */ li r0, 0x17 -/* 801211D0 0011E130 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801211D0 0011E130 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801211D4 0011E134 90 01 00 10 */ stw r0, 0x10(r1) /* 801211D8 0011E138 38 81 00 0C */ addi r4, r1, 0xc /* 801211DC 0011E13C 90 61 00 0C */ stw r3, 0xc(r1) /* 801211E0 0011E140 80 7E 04 50 */ lwz r3, 0x450(r30) /* 801211E4 0011E144 38 63 00 04 */ addi r3, r3, 4 /* 801211E8 0011E148 48 01 05 D1 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 801211EC 0011E14C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801211F0 0011E150 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801211EC 0011E14C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801211F0 0011E150 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801211F4 0011E154 90 01 00 0C */ stw r0, 0xc(r1) lbl_801211F8: /* 801211F8 0011E158 80 01 00 54 */ lwz r0, 0x54(r1) @@ -3292,10 +3292,10 @@ lbl_8012280C: TryJumpInLoop__10CPatternedFR13CStateManageri: /* 80122828 0011F788 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8012282C 0011F78C 7C 08 02 A6 */ mflr r0 -/* 80122830 0011F790 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 80122830 0011F790 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 80122834 0011F794 39 00 00 10 */ li r8, 0x10 /* 80122838 0011F798 90 01 00 44 */ stw r0, 0x44(r1) -/* 8012283C 0011F79C 39 27 AA 68 */ addi r9, r7, lbl_803DAA68@l +/* 8012283C 0011F79C 39 27 AA 68 */ addi r9, r7, __vt__13CBodyStateCmd@l /* 80122840 0011F7A0 3C E0 80 3E */ lis r7, lbl_803DA9FC@ha /* 80122844 0011F7A4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80122848 0011F7A8 93 E1 00 3C */ stw r31, 0x3c(r1) @@ -3332,9 +3332,9 @@ TryJumpInLoop__10CPatternedFR13CStateManageri: /* 801228C4 0011F824 80 01 00 0C */ lwz r0, 0xc(r1) /* 801228C8 0011F828 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 801228CC 0011F82C 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 801228D0 0011F830 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801228D0 0011F830 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801228D4 0011F834 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 801228D8 0011F838 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801228D8 0011F838 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801228DC 0011F83C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801228E0 0011F840 80 61 00 14 */ lwz r3, 0x14(r1) /* 801228E4 0011F844 90 BF 01 D8 */ stw r5, 0x1d8(r31) @@ -3509,12 +3509,12 @@ lbl_80122AEC: /* 80122B3C 0011FA9C 81 03 00 04 */ lwz r8, 4(r3) /* 80122B40 0011FAA0 28 08 00 00 */ cmplwi r8, 0 /* 80122B44 0011FAA4 41 82 01 20 */ beq lbl_80122C64 -/* 80122B48 0011FAA8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80122B48 0011FAA8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80122B4C 0011FAAC 88 A1 00 48 */ lbz r5, 0x48(r1) /* 80122B50 0011FAB0 38 00 00 01 */ li r0, 1 /* 80122B54 0011FAB4 80 FE 04 50 */ lwz r7, 0x450(r30) /* 80122B58 0011FAB8 50 05 3E 30 */ rlwimi r5, r0, 7, 0x18, 0x18 -/* 80122B5C 0011FABC 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80122B5C 0011FABC 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80122B60 0011FAC0 C0 A8 00 60 */ lfs f5, 0x60(r8) /* 80122B64 0011FAC4 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 80122B68 0011FAC8 C0 88 00 50 */ lfs f4, 0x50(r8) @@ -3546,9 +3546,9 @@ lbl_80122AEC: /* 80122BD0 0011FB30 80 01 00 28 */ lwz r0, 0x28(r1) /* 80122BD4 0011FB34 3C 60 80 3E */ lis r3, lbl_803DA9FC@ha /* 80122BD8 0011FB38 38 83 A9 FC */ addi r4, r3, lbl_803DA9FC@l -/* 80122BDC 0011FB3C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80122BDC 0011FB3C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80122BE0 0011FB40 90 1F 01 D4 */ stw r0, 0x1d4(r31) -/* 80122BE4 0011FB44 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80122BE4 0011FB44 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80122BE8 0011FB48 80 A1 00 2C */ lwz r5, 0x2c(r1) /* 80122BEC 0011FB4C 80 61 00 30 */ lwz r3, 0x30(r1) /* 80122BF0 0011FB50 90 BF 01 D8 */ stw r5, 0x1d8(r31) @@ -4240,9 +4240,9 @@ lbl_801235DC: /* 801235DC 0012053C 88 1E 06 39 */ lbz r0, 0x639(r30) /* 801235E0 00120540 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 801235E4 00120544 40 82 00 BC */ bne lbl_801236A0 -/* 801235E8 00120548 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801235E8 00120548 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801235EC 0012054C 38 C0 00 01 */ li r6, 1 -/* 801235F0 00120550 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801235F0 00120550 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801235F4 00120554 80 7E 04 50 */ lwz r3, 0x450(r30) /* 801235F8 00120558 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 801235FC 0012055C 90 01 00 20 */ stw r0, 0x20(r1) @@ -4259,9 +4259,9 @@ lbl_801235DC: /* 80123628 00120588 80 01 00 24 */ lwz r0, 0x24(r1) /* 8012362C 0012058C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80123630 00120590 38 C3 A9 E4 */ addi r6, r3, lbl_803DA9E4@l -/* 80123634 00120594 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80123634 00120594 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80123638 00120598 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 8012363C 0012059C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8012363C 0012059C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80123640 001205A0 80 61 00 28 */ lwz r3, 0x28(r1) /* 80123644 001205A4 7F C4 F3 78 */ mr r4, r30 /* 80123648 001205A8 80 E1 00 2C */ lwz r7, 0x2c(r1) @@ -4390,17 +4390,17 @@ lbl_801237DC: /* 801237E8 00120748 98 03 06 37 */ stb r0, 0x637(r3) /* 801237EC 0012074C 48 00 00 48 */ b lbl_80123834 lbl_801237F0: -/* 801237F0 00120750 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801237F0 00120750 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801237F4 00120754 38 00 00 0A */ li r0, 0xa -/* 801237F8 00120758 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 801237F8 00120758 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 801237FC 0012075C 90 01 00 0C */ stw r0, 0xc(r1) /* 80123800 00120760 38 81 00 08 */ addi r4, r1, 8 /* 80123804 00120764 90 A1 00 08 */ stw r5, 8(r1) /* 80123808 00120768 80 63 04 50 */ lwz r3, 0x450(r3) /* 8012380C 0012076C 38 63 00 04 */ addi r3, r3, 4 /* 80123810 00120770 48 00 DF A9 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80123814 00120774 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80123818 00120778 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80123814 00120774 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80123818 00120778 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8012381C 0012077C 90 01 00 08 */ stw r0, 8(r1) /* 80123820 00120780 48 00 00 14 */ b lbl_80123834 lbl_80123824: @@ -5150,9 +5150,9 @@ lbl_80124274: TryRollingDodge__10CPatternedFR13CStateManageri: /* 80124298 001211F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8012429C 001211FC 7C 08 02 A6 */ mflr r0 -/* 801242A0 00121200 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801242A0 00121200 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801242A4 00121204 90 01 00 24 */ stw r0, 0x24(r1) -/* 801242A8 00121208 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801242A8 00121208 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801242AC 0012120C 38 80 00 01 */ li r4, 1 /* 801242B0 00121210 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801242B4 00121214 80 E3 04 50 */ lwz r7, 0x450(r3) @@ -5171,9 +5171,9 @@ TryRollingDodge__10CPatternedFR13CStateManageri: /* 801242E8 00121248 80 01 00 0C */ lwz r0, 0xc(r1) /* 801242EC 0012124C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801242F0 00121250 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801242F4 00121254 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801242F4 00121254 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801242F8 00121258 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801242FC 0012125C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801242FC 0012125C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80124300 00121260 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80124304 00121264 90 81 00 08 */ stw r4, 8(r1) /* 80124308 00121268 80 61 00 14 */ lwz r3, 0x14(r1) @@ -6428,9 +6428,9 @@ lbl_80125554: /* 80125558 001224B8 80 06 02 B8 */ lwz r0, 0x2b8(r6) /* 8012555C 001224BC 2C 00 00 03 */ cmpwi r0, 3 /* 80125560 001224C0 41 82 00 88 */ beq lbl_801255E8 -/* 80125564 001224C4 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80125564 001224C4 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80125568 001224C8 80 E3 08 34 */ lwz r7, 0x834(r3) -/* 8012556C 001224CC 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8012556C 001224CC 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80125570 001224D0 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80125574 001224D4 90 01 00 08 */ stw r0, 8(r1) /* 80125578 001224D8 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -6447,9 +6447,9 @@ lbl_80125554: /* 801255A4 00122504 80 01 00 0C */ lwz r0, 0xc(r1) /* 801255A8 00122508 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801255AC 0012250C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801255B0 00122510 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801255B0 00122510 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801255B4 00122514 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801255B8 00122518 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801255B8 00122518 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801255BC 0012251C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801255C0 00122520 90 81 00 08 */ stw r4, 8(r1) /* 801255C4 00122524 80 61 00 14 */ lwz r3, 0x14(r1) @@ -7234,17 +7234,17 @@ Enraged__12CSpacePirateFR13CStateManager9EStateMsgf: /* 80126118 00123078 41 82 00 08 */ beq lbl_80126120 /* 8012611C 0012307C 48 00 00 34 */ b lbl_80126150 lbl_80126120: -/* 80126120 00123080 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80126120 00123080 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80126124 00123084 38 00 00 0A */ li r0, 0xa -/* 80126128 00123088 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 80126128 00123088 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 8012612C 0012308C 90 01 00 0C */ stw r0, 0xc(r1) /* 80126130 00123090 38 81 00 08 */ addi r4, r1, 8 /* 80126134 00123094 90 A1 00 08 */ stw r5, 8(r1) /* 80126138 00123098 80 63 04 50 */ lwz r3, 0x450(r3) /* 8012613C 0012309C 38 63 00 04 */ addi r3, r3, 4 /* 80126140 001230A0 48 00 B6 79 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 80126144 001230A4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80126148 001230A8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80126144 001230A4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80126148 001230A8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8012614C 001230AC 90 01 00 08 */ stw r0, 8(r1) lbl_80126150: /* 80126150 001230B0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -7270,9 +7270,9 @@ lbl_8012618C: /* 80126190 001230F0 40 80 00 6C */ bge lbl_801261FC /* 80126194 001230F4 48 00 00 58 */ b lbl_801261EC lbl_80126198: -/* 80126198 001230F8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80126198 001230F8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8012619C 001230FC 38 00 00 0B */ li r0, 0xb -/* 801261A0 00123100 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801261A0 00123100 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801261A4 00123104 90 01 00 0C */ stw r0, 0xc(r1) /* 801261A8 00123108 38 81 00 08 */ addi r4, r1, 8 /* 801261AC 0012310C 90 61 00 08 */ stw r3, 8(r1) @@ -7281,8 +7281,8 @@ lbl_80126198: /* 801261B8 00123118 48 00 B6 01 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801261BC 0012311C 34 01 00 08 */ addic. r0, r1, 8 /* 801261C0 00123120 41 82 00 10 */ beq lbl_801261D0 -/* 801261C4 00123124 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801261C8 00123128 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801261C4 00123124 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801261C8 00123128 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801261CC 0012312C 90 01 00 08 */ stw r0, 8(r1) lbl_801261D0: /* 801261D0 00123130 88 1F 06 36 */ lbz r0, 0x636(r31) @@ -9186,9 +9186,9 @@ Death__12CSpacePirateFRC9CVector3fR13CStateManager: /* 80127CB8 00124C18 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80127CBC 00124C1C 7C 03 00 40 */ cmplw r3, r0 /* 80127CC0 00124C20 41 82 00 98 */ beq lbl_80127D58 -/* 80127CC4 00124C24 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80127CC4 00124C24 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80127CC8 00124C28 C0 5F 00 58 */ lfs f2, 0x58(r31) -/* 80127CCC 00124C2C 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 80127CCC 00124C2C 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 80127CD0 00124C30 C0 3F 00 48 */ lfs f1, 0x48(r31) /* 80127CD4 00124C34 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 80127CD8 00124C38 3C 80 80 3E */ lis r4, lbl_803DAA50@ha @@ -9210,9 +9210,9 @@ Death__12CSpacePirateFRC9CVector3fR13CStateManager: /* 80127D18 00124C78 80 01 00 0C */ lwz r0, 0xc(r1) /* 80127D1C 00124C7C 3C 60 80 3E */ lis r3, lbl_803DAA50@ha /* 80127D20 00124C80 38 83 AA 50 */ addi r4, r3, lbl_803DAA50@l -/* 80127D24 00124C84 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80127D24 00124C84 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80127D28 00124C88 90 1F 00 E0 */ stw r0, 0xe0(r31) -/* 80127D2C 00124C8C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80127D2C 00124C8C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80127D30 00124C90 80 A1 00 10 */ lwz r5, 0x10(r1) /* 80127D34 00124C94 80 61 00 14 */ lwz r3, 0x14(r1) /* 80127D38 00124C98 90 BF 00 E4 */ stw r5, 0xe4(r31) @@ -9452,9 +9452,9 @@ TryWallHang__10CPatternedFR13CStateManageri: /* 8012809C 00124FFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801280A0 00125000 7C 08 02 A6 */ mflr r0 /* 801280A4 00125004 38 A0 00 15 */ li r5, 0x15 -/* 801280A8 00125008 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801280A8 00125008 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801280AC 0012500C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801280B0 00125010 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801280B0 00125010 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801280B4 00125014 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801280B8 00125018 A0 C3 02 DC */ lhz r6, 0x2dc(r3) /* 801280BC 0012501C 80 83 04 50 */ lwz r4, 0x450(r3) @@ -9472,9 +9472,9 @@ TryWallHang__10CPatternedFR13CStateManageri: /* 801280EC 0012504C 80 01 00 10 */ lwz r0, 0x10(r1) /* 801280F0 00125050 3C 60 80 3E */ lis r3, lbl_803E0B98@ha /* 801280F4 00125054 38 83 0B 98 */ addi r4, r3, lbl_803E0B98@l -/* 801280F8 00125058 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801280F8 00125058 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801280FC 0012505C 90 1F 02 58 */ stw r0, 0x258(r31) -/* 80128100 00125060 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80128100 00125060 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80128104 00125064 A0 61 00 14 */ lhz r3, 0x14(r1) /* 80128108 00125068 90 81 00 0C */ stw r4, 0xc(r1) /* 8012810C 0012506C B0 7F 02 5C */ sth r3, 0x25c(r31) @@ -9497,8 +9497,8 @@ __dt__14CBCWallHangCmdFv: /* 80128144 001250A4 38 03 0B 98 */ addi r0, r3, lbl_803E0B98@l /* 80128148 001250A8 90 1F 00 00 */ stw r0, 0(r31) /* 8012814C 001250AC 41 82 00 10 */ beq lbl_8012815C -/* 80128150 001250B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 80128154 001250B4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80128150 001250B0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 80128154 001250B4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80128158 001250B8 90 1F 00 00 */ stw r0, 0(r31) lbl_8012815C: /* 8012815C 001250BC 7C 80 07 35 */ extsh. r0, r4 @@ -9530,9 +9530,9 @@ TryCover__10CPatternedFR13CStateManageri: /* 801281B4 00125114 28 03 00 00 */ cmplwi r3, 0 /* 801281B8 00125118 41 82 00 C8 */ beq lbl_80128280 /* 801281BC 0012511C C0 43 00 58 */ lfs f2, 0x58(r3) -/* 801281C0 00125120 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801281C0 00125120 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801281C4 00125124 C0 23 00 48 */ lfs f1, 0x48(r3) -/* 801281C8 00125128 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801281C8 00125128 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801281CC 0012512C C0 03 00 38 */ lfs f0, 0x38(r3) /* 801281D0 00125130 FC 40 10 50 */ fneg f2, f2 /* 801281D4 00125134 FC 20 08 50 */ fneg f1, f1 @@ -9560,9 +9560,9 @@ TryCover__10CPatternedFR13CStateManageri: /* 8012822C 0012518C 3C 60 80 3E */ lis r3, lbl_803E0B8C@ha /* 80128230 00125190 38 83 0B 8C */ addi r4, r3, lbl_803E0B8C@l /* 80128234 00125194 80 A1 00 18 */ lwz r5, 0x18(r1) -/* 80128238 00125198 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80128238 00125198 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8012823C 0012519C 90 1F 02 34 */ stw r0, 0x234(r31) -/* 80128240 001251A0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80128240 001251A0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80128244 001251A4 7F C3 F3 78 */ mr r3, r30 /* 80128248 001251A8 90 81 00 0C */ stw r4, 0xc(r1) /* 8012824C 001251AC 90 7F 02 38 */ stw r3, 0x238(r31) @@ -9598,8 +9598,8 @@ __dt__11CBCCoverCmdFv: /* 801282B4 00125214 38 03 0B 8C */ addi r0, r3, lbl_803E0B8C@l /* 801282B8 00125218 90 1F 00 00 */ stw r0, 0(r31) /* 801282BC 0012521C 41 82 00 10 */ beq lbl_801282CC -/* 801282C0 00125220 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801282C4 00125224 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801282C0 00125220 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801282C4 00125224 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801282C8 00125228 90 1F 00 00 */ stw r0, 0(r31) lbl_801282CC: /* 801282CC 0012522C 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index 0c8adf38..728e3adf 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -550,10 +550,10 @@ lbl_80155080: /* 80155094 00151FF4 90 03 05 BC */ stw r0, 0x5bc(r3) /* 80155098 00151FF8 48 00 00 C0 */ b lbl_80155158 lbl_8015509C: -/* 8015509C 00151FFC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8015509C 00151FFC 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801550A0 00152000 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801550A4 00152004 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801550A8 00152008 38 A5 AA 68 */ addi r5, r5, lbl_803DAA68@l +/* 801550A8 00152008 38 A5 AA 68 */ addi r5, r5, __vt__13CBodyStateCmd@l /* 801550AC 0015200C 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801550B0 00152010 90 A1 00 08 */ stw r5, 8(r1) /* 801550B4 00152014 38 A4 AA 44 */ addi r5, r4, lbl_803DAA44@l @@ -574,9 +574,9 @@ lbl_8015509C: /* 801550F0 00152050 80 01 00 0C */ lwz r0, 0xc(r1) /* 801550F4 00152054 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801550F8 00152058 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801550FC 0015205C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801550FC 0015205C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80155100 00152060 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 80155104 00152064 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80155104 00152064 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80155108 00152068 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8015510C 0015206C 80 61 00 14 */ lwz r3, 0x14(r1) /* 80155110 00152070 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -791,10 +791,10 @@ lbl_801553E4: /* 801553E8 00152348 40 80 01 74 */ bge lbl_8015555C /* 801553EC 0015234C 48 00 01 68 */ b lbl_80155554 lbl_801553F0: -/* 801553F0 00152350 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801553F0 00152350 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801553F4 00152354 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801553F8 00152358 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801553FC 0015235C 38 E4 AA 68 */ addi r7, r4, lbl_803DAA68@l +/* 801553FC 0015235C 38 E4 AA 68 */ addi r7, r4, __vt__13CBodyStateCmd@l /* 80155400 00152360 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 80155404 00152364 90 E1 00 24 */ stw r7, 0x24(r1) /* 80155408 00152368 38 00 00 00 */ li r0, 0 @@ -817,9 +817,9 @@ lbl_801553F0: /* 8015544C 001523AC 80 01 00 28 */ lwz r0, 0x28(r1) /* 80155450 001523B0 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 80155454 001523B4 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 80155458 001523B8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80155458 001523B8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015545C 001523BC 90 1E 01 10 */ stw r0, 0x110(r30) -/* 80155460 001523C0 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 80155460 001523C0 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 80155464 001523C4 80 A1 00 2C */ lwz r5, 0x2c(r1) /* 80155468 001523C8 38 00 00 03 */ li r0, 3 /* 8015546C 001523CC 80 C1 00 30 */ lwz r6, 0x30(r1) @@ -840,10 +840,10 @@ lbl_801554A0: /* 801554A4 00152404 80 06 02 B8 */ lwz r0, 0x2b8(r6) /* 801554A8 00152408 2C 00 00 07 */ cmpwi r0, 7 /* 801554AC 0015240C 41 82 00 B0 */ beq lbl_8015555C -/* 801554B0 00152410 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801554B0 00152410 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801554B4 00152414 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801554B8 00152418 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801554BC 0015241C 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 801554BC 0015241C 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 801554C0 00152420 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801554C4 00152424 90 A1 00 08 */ stw r5, 8(r1) /* 801554C8 00152428 38 00 00 00 */ li r0, 0 @@ -865,9 +865,9 @@ lbl_801554A0: /* 80155508 00152468 80 01 00 0C */ lwz r0, 0xc(r1) /* 8015550C 0015246C 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 80155510 00152470 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 80155514 00152474 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80155514 00152474 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80155518 00152478 90 1E 01 10 */ stw r0, 0x110(r30) -/* 8015551C 0015247C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8015551C 0015247C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80155520 00152480 80 61 00 10 */ lwz r3, 0x10(r1) /* 80155524 00152484 80 A1 00 14 */ lwz r5, 0x14(r1) /* 80155528 00152488 90 7E 01 14 */ stw r3, 0x114(r30) @@ -1022,9 +1022,9 @@ lbl_80155708: /* 8015571C 0015267C 90 03 05 BC */ stw r0, 0x5bc(r3) /* 80155720 00152680 48 00 00 98 */ b lbl_801557B8 lbl_80155724: -/* 80155724 00152684 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80155724 00152684 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80155728 00152688 38 C0 00 01 */ li r6, 1 -/* 8015572C 0015268C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8015572C 0015268C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80155730 00152690 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80155734 00152694 90 01 00 08 */ stw r0, 8(r1) /* 80155738 00152698 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -1040,9 +1040,9 @@ lbl_80155724: /* 80155760 001526C0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80155764 001526C4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80155768 001526C8 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8015576C 001526CC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8015576C 001526CC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80155770 001526D0 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 80155774 001526D4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80155774 001526D4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80155778 001526D8 80 A1 00 10 */ lwz r5, 0x10(r1) /* 8015577C 001526DC 90 81 00 08 */ stw r4, 8(r1) /* 80155780 001526E0 80 61 00 14 */ lwz r3, 0x14(r1) @@ -1115,9 +1115,9 @@ lbl_8015584C: /* 80155860 001527C0 90 1F 05 BC */ stw r0, 0x5bc(r31) /* 80155864 001527C4 48 00 00 98 */ b lbl_801558FC lbl_80155868: -/* 80155868 001527C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80155868 001527C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8015586C 001527CC 38 00 00 00 */ li r0, 0 -/* 80155870 001527D0 38 83 AA 68 */ addi r4, r3, lbl_803DAA68@l +/* 80155870 001527D0 38 83 AA 68 */ addi r4, r3, __vt__13CBodyStateCmd@l /* 80155874 001527D4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80155878 001527D8 90 81 00 08 */ stw r4, 8(r1) /* 8015587C 001527DC 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -1133,9 +1133,9 @@ lbl_80155868: /* 801558A4 00152804 80 01 00 0C */ lwz r0, 0xc(r1) /* 801558A8 00152808 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801558AC 0015280C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801558B0 00152810 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801558B0 00152810 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801558B4 00152814 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 801558B8 00152818 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801558B8 00152818 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801558BC 0015281C 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801558C0 00152820 90 81 00 08 */ stw r4, 8(r1) /* 801558C4 00152824 80 61 00 14 */ lwz r3, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index a914831b..925d1950 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -1410,10 +1410,10 @@ lbl_801DB320: /* 801DB334 001D8294 90 1B 05 EC */ stw r0, 0x5ec(r27) /* 801DB338 001D8298 48 00 00 B4 */ b lbl_801DB3EC lbl_801DB33C: -/* 801DB33C 001D829C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801DB33C 001D829C 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801DB340 001D82A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DB344 001D82A4 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801DB348 001D82A8 38 A5 AA 68 */ addi r5, r5, lbl_803DAA68@l +/* 801DB348 001D82A8 38 A5 AA 68 */ addi r5, r5, __vt__13CBodyStateCmd@l /* 801DB34C 001D82AC 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801DB350 001D82B0 90 A1 00 10 */ stw r5, 0x10(r1) /* 801DB354 001D82B4 38 A4 AA 44 */ addi r5, r4, lbl_803DAA44@l @@ -1434,9 +1434,9 @@ lbl_801DB33C: /* 801DB390 001D82F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DB394 001D82F4 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801DB398 001D82F8 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801DB39C 001D82FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DB39C 001D82FC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DB3A0 001D8300 90 1F 00 F8 */ stw r0, 0xf8(r31) -/* 801DB3A4 001D8304 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DB3A4 001D8304 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DB3A8 001D8308 80 A1 00 18 */ lwz r5, 0x18(r1) /* 801DB3AC 001D830C 80 61 00 1C */ lwz r3, 0x1c(r1) /* 801DB3B0 001D8310 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -1864,9 +1864,9 @@ lbl_801DB94C: /* 801DB960 001D88C0 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DB964 001D88C4 48 00 00 A4 */ b lbl_801DBA08 lbl_801DB968: -/* 801DB968 001D88C8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DB968 001D88C8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DB96C 001D88CC 38 C0 00 01 */ li r6, 1 -/* 801DB970 001D88D0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DB970 001D88D0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DB974 001D88D4 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801DB978 001D88D8 90 01 00 0C */ stw r0, 0xc(r1) /* 801DB97C 001D88DC 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -1882,9 +1882,9 @@ lbl_801DB968: /* 801DB9A4 001D8904 80 01 00 10 */ lwz r0, 0x10(r1) /* 801DB9A8 001D8908 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801DB9AC 001D890C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801DB9B0 001D8910 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DB9B0 001D8910 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DB9B4 001D8914 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DB9B8 001D8918 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DB9B8 001D8918 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DB9BC 001D891C 80 A1 00 14 */ lwz r5, 0x14(r1) /* 801DB9C0 001D8920 90 81 00 0C */ stw r4, 0xc(r1) /* 801DB9C4 001D8924 80 61 00 18 */ lwz r3, 0x18(r1) @@ -3109,9 +3109,9 @@ lbl_801DCAD4: /* 801DCAE8 001D9A48 90 03 05 EC */ stw r0, 0x5ec(r3) /* 801DCAEC 001D9A4C 48 00 00 8C */ b lbl_801DCB78 lbl_801DCAF0: -/* 801DCAF0 001D9A50 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DCAF0 001D9A50 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DCAF4 001D9A54 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801DCAF8 001D9A58 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801DCAF8 001D9A58 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801DCAFC 001D9A5C 38 80 00 12 */ li r4, 0x12 /* 801DCB00 001D9A60 90 01 00 08 */ stw r0, 8(r1) /* 801DCB04 001D9A64 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -3126,9 +3126,9 @@ lbl_801DCAF0: /* 801DCB28 001D9A88 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DCB2C 001D9A8C 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 801DCB30 001D9A90 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 801DCB34 001D9A94 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DCB34 001D9A94 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DCB38 001D9A98 90 1F 02 14 */ stw r0, 0x214(r31) -/* 801DCB3C 001D9A9C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DCB3C 001D9A9C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DCB40 001D9AA0 80 61 00 10 */ lwz r3, 0x10(r1) /* 801DCB44 001D9AA4 90 81 00 08 */ stw r4, 8(r1) /* 801DCB48 001D9AA8 90 7F 02 18 */ stw r3, 0x218(r31) @@ -3207,9 +3207,9 @@ lbl_801DCC2C: /* 801DCC40 001D9BA0 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DCC44 001D9BA4 48 00 01 18 */ b lbl_801DCD5C lbl_801DCC48: -/* 801DCC48 001D9BA8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DCC48 001D9BA8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DCC4C 001D9BAC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha -/* 801DCC50 001D9BB0 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801DCC50 001D9BB0 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801DCC54 001D9BB4 38 80 00 01 */ li r4, 1 /* 801DCC58 001D9BB8 90 01 00 34 */ stw r0, 0x34(r1) /* 801DCC5C 001D9BBC 38 C3 A9 E4 */ addi r6, r3, lbl_803DA9E4@l @@ -3226,9 +3226,9 @@ lbl_801DCC48: /* 801DCC88 001D9BE8 80 01 00 38 */ lwz r0, 0x38(r1) /* 801DCC8C 001D9BEC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 801DCC90 001D9BF0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 801DCC94 001D9BF4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DCC94 001D9BF4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DCC98 001D9BF8 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 801DCC9C 001D9BFC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DCC9C 001D9BFC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DCCA0 001D9C00 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 801DCCA4 001D9C04 90 81 00 34 */ stw r4, 0x34(r1) /* 801DCCA8 001D9C08 80 61 00 40 */ lwz r3, 0x40(r1) @@ -3396,10 +3396,10 @@ lbl_801DCEC8: /* 801DCEDC 001D9E3C 90 1F 05 EC */ stw r0, 0x5ec(r31) /* 801DCEE0 001D9E40 48 00 00 B0 */ b lbl_801DCF90 lbl_801DCEE4: -/* 801DCEE4 001D9E44 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801DCEE4 001D9E44 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801DCEE8 001D9E48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DCEEC 001D9E4C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801DCEF0 001D9E50 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 801DCEF0 001D9E50 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 801DCEF4 001D9E54 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801DCEF8 001D9E58 90 01 00 10 */ stw r0, 0x10(r1) /* 801DCEFC 001D9E5C 38 04 AA 44 */ addi r0, r4, lbl_803DAA44@l @@ -3419,9 +3419,9 @@ lbl_801DCEE4: /* 801DCF34 001D9E94 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DCF38 001D9E98 3C 60 80 3E */ lis r3, lbl_803DAA44@ha /* 801DCF3C 001D9E9C 38 83 AA 44 */ addi r4, r3, lbl_803DAA44@l -/* 801DCF40 001D9EA0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DCF40 001D9EA0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DCF44 001D9EA4 90 1E 00 F8 */ stw r0, 0xf8(r30) -/* 801DCF48 001D9EA8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DCF48 001D9EA8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DCF4C 001D9EAC 80 A1 00 18 */ lwz r5, 0x18(r1) /* 801DCF50 001D9EB0 80 61 00 1C */ lwz r3, 0x1c(r1) /* 801DCF54 001D9EB4 90 BE 00 FC */ stw r5, 0xfc(r30) @@ -4589,9 +4589,9 @@ lbl_801DDFF4: /* 801DE008 001DAF68 90 03 05 EC */ stw r0, 0x5ec(r3) /* 801DE00C 001DAF6C 48 00 00 88 */ b lbl_801DE094 lbl_801DE010: -/* 801DE010 001DAF70 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DE010 001DAF70 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DE014 001DAF74 38 A0 00 00 */ li r5, 0 -/* 801DE018 001DAF78 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DE018 001DAF78 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DE01C 001DAF7C 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801DE020 001DAF80 90 01 00 08 */ stw r0, 8(r1) /* 801DE024 001DAF84 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -4605,9 +4605,9 @@ lbl_801DE010: /* 801DE044 001DAFA4 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DE048 001DAFA8 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 801DE04C 001DAFAC 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 801DE050 001DAFB0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DE050 001DAFB0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DE054 001DAFB4 90 1F 00 BC */ stw r0, 0xbc(r31) -/* 801DE058 001DAFB8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DE058 001DAFB8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DE05C 001DAFBC 80 61 00 10 */ lwz r3, 0x10(r1) /* 801DE060 001DAFC0 90 81 00 08 */ stw r4, 8(r1) /* 801DE064 001DAFC4 90 7F 00 C0 */ stw r3, 0xc0(r31) @@ -5718,10 +5718,10 @@ lbl_801DEF8C: /* 801DEF94 001DBEF4 C0 02 AC F8 */ lfs f0, lbl_805ACA18@sda21(r2) /* 801DEF98 001DBEF8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801DEF9C 001DBEFC 40 81 00 AC */ ble lbl_801DF048 -/* 801DEFA0 001DBF00 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DEFA0 001DBF00 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DEFA4 001DBF04 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DEFA8 001DBF08 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801DEFAC 001DBF0C 38 E4 AA 68 */ addi r7, r4, lbl_803DAA68@l +/* 801DEFAC 001DBF0C 38 E4 AA 68 */ addi r7, r4, __vt__13CBodyStateCmd@l /* 801DEFB0 001DBF10 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801DEFB4 001DBF14 90 E1 00 24 */ stw r7, 0x24(r1) /* 801DEFB8 001DBF18 38 00 00 00 */ li r0, 0 @@ -5744,9 +5744,9 @@ lbl_801DEF8C: /* 801DEFFC 001DBF5C 80 01 00 28 */ lwz r0, 0x28(r1) /* 801DF000 001DBF60 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801DF004 001DBF64 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801DF008 001DBF68 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF008 001DBF68 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF00C 001DBF6C 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801DF010 001DBF70 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DF010 001DBF70 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DF014 001DBF74 80 61 00 2C */ lwz r3, 0x2c(r1) /* 801DF018 001DBF78 80 A1 00 30 */ lwz r5, 0x30(r1) /* 801DF01C 001DBF7C 90 7F 01 14 */ stw r3, 0x114(r31) @@ -5761,11 +5761,11 @@ lbl_801DEF8C: /* 801DF040 001DBFA0 90 01 00 24 */ stw r0, 0x24(r1) /* 801DF044 001DBFA4 48 00 00 B0 */ b lbl_801DF0F4 lbl_801DF048: -/* 801DF048 001DBFA8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801DF048 001DBFA8 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801DF04C 001DBFAC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DF050 001DBFB0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801DF054 001DBFB4 80 7E 04 50 */ lwz r3, 0x450(r30) -/* 801DF058 001DBFB8 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l +/* 801DF058 001DBFB8 39 05 AA 68 */ addi r8, r5, __vt__13CBodyStateCmd@l /* 801DF05C 001DBFBC C0 44 00 00 */ lfs f2, 0(r4) /* 801DF060 001DBFC0 C0 24 00 04 */ lfs f1, 4(r4) /* 801DF064 001DBFC4 3C C0 80 3E */ lis r6, lbl_803DA9D8@ha @@ -5789,9 +5789,9 @@ lbl_801DF048: /* 801DF0AC 001DC00C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DF0B0 001DC010 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 801DF0B4 001DC014 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 801DF0B8 001DC018 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF0B8 001DC018 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF0BC 001DC01C 90 1F 01 10 */ stw r0, 0x110(r31) -/* 801DF0C0 001DC020 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DF0C0 001DC020 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DF0C4 001DC024 80 61 00 10 */ lwz r3, 0x10(r1) /* 801DF0C8 001DC028 80 A1 00 14 */ lwz r5, 0x14(r1) /* 801DF0CC 001DC02C 90 7F 01 14 */ stw r3, 0x114(r31) @@ -6088,9 +6088,9 @@ lbl_801DF4E8: /* 801DF524 001DC484 C0 01 00 34 */ lfs f0, 0x34(r1) /* 801DF528 001DC488 D0 1F 06 54 */ stfs f0, 0x654(r31) lbl_801DF52C: -/* 801DF52C 001DC48C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF52C 001DC48C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF530 001DC490 38 00 00 0D */ li r0, 0xd -/* 801DF534 001DC494 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801DF534 001DC494 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801DF538 001DC498 90 01 00 0C */ stw r0, 0xc(r1) /* 801DF53C 001DC49C 38 81 00 08 */ addi r4, r1, 8 /* 801DF540 001DC4A0 90 61 00 08 */ stw r3, 8(r1) @@ -6099,8 +6099,8 @@ lbl_801DF52C: /* 801DF54C 001DC4AC 4B F5 22 6D */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd /* 801DF550 001DC4B0 34 01 00 08 */ addic. r0, r1, 8 /* 801DF554 001DC4B4 41 82 00 10 */ beq lbl_801DF564 -/* 801DF558 001DC4B8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 801DF55C 001DC4BC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DF558 001DC4B8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 801DF55C 001DC4BC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DF560 001DC4C0 90 01 00 08 */ stw r0, 8(r1) lbl_801DF564: /* 801DF564 001DC4C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha @@ -6176,10 +6176,10 @@ lbl_801DF648: /* 801DF65C 001DC5BC 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DF660 001DC5C0 48 00 00 CC */ b lbl_801DF72C lbl_801DF664: -/* 801DF664 001DC5C4 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 801DF664 001DC5C4 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 801DF668 001DC5C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DF66C 001DC5CC C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801DF670 001DC5D0 38 C5 AA 68 */ addi r6, r5, lbl_803DAA68@l +/* 801DF670 001DC5D0 38 C5 AA 68 */ addi r6, r5, __vt__13CBodyStateCmd@l /* 801DF674 001DC5D4 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha /* 801DF678 001DC5D8 90 C1 00 08 */ stw r6, 8(r1) /* 801DF67C 001DC5DC 38 C4 A9 CC */ addi r6, r4, lbl_803DA9CC@l @@ -6202,9 +6202,9 @@ lbl_801DF664: /* 801DF6C0 001DC620 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DF6C4 001DC624 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801DF6C8 001DC628 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 801DF6CC 001DC62C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF6CC 001DC62C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF6D0 001DC630 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801DF6D4 001DC634 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801DF6D4 001DC634 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801DF6D8 001DC638 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801DF6DC 001DC63C 38 00 00 00 */ li r0, 0 /* 801DF6E0 001DC640 80 C1 00 14 */ lwz r6, 0x14(r1) @@ -6275,10 +6275,10 @@ lbl_801DF7AC: /* 801DF7C0 001DC720 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DF7C4 001DC724 48 00 00 C8 */ b lbl_801DF88C lbl_801DF7C8: -/* 801DF7C8 001DC728 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DF7C8 001DC728 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DF7CC 001DC72C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DF7D0 001DC730 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 801DF7D4 001DC734 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l +/* 801DF7D4 001DC734 38 A4 AA 68 */ addi r5, r4, __vt__13CBodyStateCmd@l /* 801DF7D8 001DC738 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha /* 801DF7DC 001DC73C 90 A1 00 08 */ stw r5, 8(r1) /* 801DF7E0 001DC740 38 00 00 00 */ li r0, 0 @@ -6300,9 +6300,9 @@ lbl_801DF7C8: /* 801DF820 001DC780 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DF824 001DC784 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 801DF828 001DC788 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 801DF82C 001DC78C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF82C 001DC78C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF830 001DC790 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 801DF834 001DC794 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 801DF834 001DC794 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 801DF838 001DC798 80 A1 00 10 */ lwz r5, 0x10(r1) /* 801DF83C 001DC79C 38 00 00 00 */ li r0, 0 /* 801DF840 001DC7A0 80 C1 00 14 */ lwz r6, 0x14(r1) @@ -6371,9 +6371,9 @@ lbl_801DF904: /* 801DF918 001DC878 90 03 05 EC */ stw r0, 0x5ec(r3) /* 801DF91C 001DC87C 48 00 00 80 */ b lbl_801DF99C lbl_801DF920: -/* 801DF920 001DC880 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DF920 001DC880 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DF924 001DC884 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801DF928 001DC888 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801DF928 001DC888 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801DF92C 001DC88C 38 80 00 12 */ li r4, 0x12 /* 801DF930 001DC890 90 01 00 08 */ stw r0, 8(r1) /* 801DF934 001DC894 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -6388,9 +6388,9 @@ lbl_801DF920: /* 801DF958 001DC8B8 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DF95C 001DC8BC 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 801DF960 001DC8C0 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 801DF964 001DC8C4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DF964 001DC8C4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DF968 001DC8C8 90 1F 02 14 */ stw r0, 0x214(r31) -/* 801DF96C 001DC8CC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DF96C 001DC8CC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DF970 001DC8D0 80 61 00 10 */ lwz r3, 0x10(r1) /* 801DF974 001DC8D4 90 81 00 08 */ stw r4, 8(r1) /* 801DF978 001DC8D8 90 7F 02 18 */ stw r3, 0x218(r31) @@ -6468,9 +6468,9 @@ lbl_801DFA60: /* 801DFA74 001DC9D4 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DFA78 001DC9D8 48 00 00 80 */ b lbl_801DFAF8 lbl_801DFA7C: -/* 801DFA7C 001DC9DC 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 801DFA7C 001DC9DC 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 801DFA80 001DC9E0 3C 60 80 3E */ lis r3, lbl_803DAA14@ha -/* 801DFA84 001DC9E4 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 801DFA84 001DC9E4 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 801DFA88 001DC9E8 38 80 00 12 */ li r4, 0x12 /* 801DFA8C 001DC9EC 90 01 00 10 */ stw r0, 0x10(r1) /* 801DFA90 001DC9F0 38 A3 AA 14 */ addi r5, r3, lbl_803DAA14@l @@ -6485,9 +6485,9 @@ lbl_801DFA7C: /* 801DFAB4 001DCA14 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DFAB8 001DCA18 3C 60 80 3E */ lis r3, lbl_803DAA14@ha /* 801DFABC 001DCA1C 38 83 AA 14 */ addi r4, r3, lbl_803DAA14@l -/* 801DFAC0 001DCA20 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801DFAC0 001DCA20 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801DFAC4 001DCA24 90 1F 02 14 */ stw r0, 0x214(r31) -/* 801DFAC8 001DCA28 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801DFAC8 001DCA28 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801DFACC 001DCA2C 80 61 00 18 */ lwz r3, 0x18(r1) /* 801DFAD0 001DCA30 90 81 00 10 */ stw r4, 0x10(r1) /* 801DFAD4 001DCA34 90 7F 02 18 */ stw r3, 0x218(r31) @@ -9010,9 +9010,9 @@ lbl_801E1F08: /* 801E1F78 001DEED8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801E1F7C 001DEEDC 4C 40 13 82 */ cror 2, 0, 2 /* 801E1F80 001DEEE0 40 82 00 84 */ bne lbl_801E2004 -/* 801E1F84 001DEEE4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801E1F84 001DEEE4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801E1F88 001DEEE8 C0 02 AC D8 */ lfs f0, lbl_805AC9F8@sda21(r2) -/* 801E1F8C 001DEEEC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801E1F8C 001DEEEC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801E1F90 001DEEF0 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 801E1F94 001DEEF4 90 01 01 D4 */ stw r0, 0x1d4(r1) /* 801E1F98 001DEEF8 38 C3 10 C8 */ addi r6, r3, lbl_803E10C8@l @@ -9031,9 +9031,9 @@ lbl_801E1F08: /* 801E1FCC 001DEF2C 80 01 01 D8 */ lwz r0, 0x1d8(r1) /* 801E1FD0 001DEF30 3C 60 80 3E */ lis r3, lbl_803E10C8@ha /* 801E1FD4 001DEF34 38 83 10 C8 */ addi r4, r3, lbl_803E10C8@l -/* 801E1FD8 001DEF38 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 801E1FD8 001DEF38 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 801E1FDC 001DEF3C 90 12 02 88 */ stw r0, 0x288(r18) -/* 801E1FE0 001DEF40 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 801E1FE0 001DEF40 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 801E1FE4 001DEF44 C0 01 01 DC */ lfs f0, 0x1dc(r1) /* 801E1FE8 001DEF48 80 A1 01 E0 */ lwz r5, 0x1e0(r1) /* 801E1FEC 001DEF4C D0 12 02 8C */ stfs f0, 0x28c(r18) diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 054e6936..84065758 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -1992,9 +1992,9 @@ lbl_80204FF0: /* 80205004 00201F64 90 1E 05 74 */ stw r0, 0x574(r30) /* 80205008 00201F68 48 00 00 7C */ b lbl_80205084 lbl_8020500C: -/* 8020500C 00201F6C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8020500C 00201F6C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80205010 00201F70 38 A0 00 00 */ li r5, 0 -/* 80205014 00201F74 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80205014 00201F74 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80205018 00201F78 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 8020501C 00201F7C 90 01 00 18 */ stw r0, 0x18(r1) /* 80205020 00201F80 38 03 AA 20 */ addi r0, r3, lbl_803DAA20@l @@ -2008,9 +2008,9 @@ lbl_8020500C: /* 80205040 00201FA0 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80205044 00201FA4 3C 60 80 3E */ lis r3, lbl_803DAA20@ha /* 80205048 00201FA8 38 83 AA 20 */ addi r4, r3, lbl_803DAA20@l -/* 8020504C 00201FAC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8020504C 00201FAC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80205050 00201FB0 90 1E 00 BC */ stw r0, 0xbc(r30) -/* 80205054 00201FB4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80205054 00201FB4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80205058 00201FB8 80 61 00 20 */ lwz r3, 0x20(r1) /* 8020505C 00201FBC 90 81 00 18 */ stw r4, 0x18(r1) /* 80205060 00201FC0 90 7E 00 C0 */ stw r3, 0xc0(r30) diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 99e40899..1918f1dd 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -735,9 +735,9 @@ lbl_80268CF4: /* 80268D4C 00265CAC 4B ED 1E 69 */ bl HasBodyState__15CBodyControllerCFQ23pas15EAnimationState /* 80268D50 00265CB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80268D54 00265CB4 41 82 00 7C */ beq lbl_80268DD0 -/* 80268D58 00265CB8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 80268D58 00265CB8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 80268D5C 00265CBC 80 74 04 50 */ lwz r3, 0x450(r20) -/* 80268D60 00265CC0 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 80268D60 00265CC0 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 80268D64 00265CC4 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 80268D68 00265CC8 90 01 00 0C */ stw r0, 0xc(r1) /* 80268D6C 00265CCC 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -755,9 +755,9 @@ lbl_80268CF4: /* 80268D9C 00265CFC 80 01 00 10 */ lwz r0, 0x10(r1) /* 80268DA0 00265D00 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 80268DA4 00265D04 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 80268DA8 00265D08 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 80268DA8 00265D08 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 80268DAC 00265D0C 90 15 00 C8 */ stw r0, 0xc8(r21) -/* 80268DB0 00265D10 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 80268DB0 00265D10 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 80268DB4 00265D14 80 A1 00 14 */ lwz r5, 0x14(r1) /* 80268DB8 00265D18 90 81 00 0C */ stw r4, 0xc(r1) /* 80268DBC 00265D1C 80 61 00 18 */ lwz r3, 0x18(r1) diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 125939a7..b84f9979 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -2779,9 +2779,9 @@ lbl_8010CEFC: /* 8010CF1C 00109E7C 48 0E 7D F1 */ bl GetStepDirection__10CPatternedFRC9CVector3f /* 8010CF20 00109E80 2C 03 00 00 */ cmpwi r3, 0 /* 8010CF24 00109E84 41 82 00 78 */ beq lbl_8010CF9C -/* 8010CF28 00109E88 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8010CF28 00109E88 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8010CF2C 00109E8C 80 9F 04 50 */ lwz r4, 0x450(r31) -/* 8010CF30 00109E90 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 8010CF30 00109E90 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 8010CF34 00109E94 3C A0 80 3E */ lis r5, lbl_803DA9E4@ha /* 8010CF38 00109E98 90 01 00 74 */ stw r0, 0x74(r1) /* 8010CF3C 00109E9C 38 A5 A9 E4 */ addi r5, r5, lbl_803DA9E4@l @@ -2798,9 +2798,9 @@ lbl_8010CEFC: /* 8010CF68 00109EC8 80 01 00 78 */ lwz r0, 0x78(r1) /* 8010CF6C 00109ECC 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010CF70 00109ED0 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010CF74 00109ED4 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010CF74 00109ED4 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010CF78 00109ED8 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8010CF7C 00109EDC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010CF7C 00109EDC 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010CF80 00109EE0 80 A1 00 7C */ lwz r5, 0x7c(r1) /* 8010CF84 00109EE4 90 81 00 74 */ stw r4, 0x74(r1) /* 8010CF88 00109EE8 80 61 00 80 */ lwz r3, 0x80(r1) @@ -2893,9 +2893,9 @@ lbl_8010D0D4: /* 8010D0D8 0010A038 40 80 01 84 */ bge lbl_8010D25C /* 8010D0DC 0010A03C 48 00 00 F4 */ b lbl_8010D1D0 lbl_8010D0E0: -/* 8010D0E0 0010A040 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8010D0E0 0010A040 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8010D0E4 0010A044 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 8010D0E8 0010A048 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8010D0E8 0010A048 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8010D0EC 0010A04C 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8010D0F0 0010A050 90 01 00 40 */ stw r0, 0x40(r1) /* 8010D0F4 0010A054 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -2913,9 +2913,9 @@ lbl_8010D0E0: /* 8010D124 0010A084 80 01 00 44 */ lwz r0, 0x44(r1) /* 8010D128 0010A088 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010D12C 0010A08C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010D130 0010A090 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010D130 0010A090 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010D134 0010A094 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8010D138 0010A098 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010D138 0010A098 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010D13C 0010A09C 80 A1 00 48 */ lwz r5, 0x48(r1) /* 8010D140 0010A0A0 90 81 00 40 */ stw r4, 0x40(r1) /* 8010D144 0010A0A4 80 61 00 4C */ lwz r3, 0x4c(r1) @@ -2924,9 +2924,9 @@ lbl_8010D0E0: /* 8010D150 0010A0B0 90 01 00 40 */ stw r0, 0x40(r1) /* 8010D154 0010A0B4 48 00 01 08 */ b lbl_8010D25C lbl_8010D158: -/* 8010D158 0010A0B8 3C 80 80 3E */ lis r4, lbl_803DAA68@ha +/* 8010D158 0010A0B8 3C 80 80 3E */ lis r4, __vt__13CBodyStateCmd@ha /* 8010D15C 0010A0BC 80 7F 04 50 */ lwz r3, 0x450(r31) -/* 8010D160 0010A0C0 38 04 AA 68 */ addi r0, r4, lbl_803DAA68@l +/* 8010D160 0010A0C0 38 04 AA 68 */ addi r0, r4, __vt__13CBodyStateCmd@l /* 8010D164 0010A0C4 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8010D168 0010A0C8 90 01 00 30 */ stw r0, 0x30(r1) /* 8010D16C 0010A0CC 38 C4 A9 E4 */ addi r6, r4, lbl_803DA9E4@l @@ -2944,9 +2944,9 @@ lbl_8010D158: /* 8010D19C 0010A0FC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8010D1A0 0010A100 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010D1A4 0010A104 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010D1A8 0010A108 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010D1A8 0010A108 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010D1AC 0010A10C 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8010D1B0 0010A110 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010D1B0 0010A110 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010D1B4 0010A114 80 A1 00 38 */ lwz r5, 0x38(r1) /* 8010D1B8 0010A118 90 81 00 30 */ stw r4, 0x30(r1) /* 8010D1BC 0010A11C 80 61 00 3C */ lwz r3, 0x3c(r1) @@ -3334,10 +3334,10 @@ lbl_8010D70C: /* 8010D720 0010A680 90 1F 05 68 */ stw r0, 0x568(r31) /* 8010D724 0010A684 48 00 01 70 */ b lbl_8010D894 lbl_8010D728: -/* 8010D728 0010A688 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8010D728 0010A688 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8010D72C 0010A68C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010D730 0010A690 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) -/* 8010D734 0010A694 38 C5 AA 68 */ addi r6, r5, lbl_803DAA68@l +/* 8010D734 0010A694 38 C5 AA 68 */ addi r6, r5, __vt__13CBodyStateCmd@l /* 8010D738 0010A698 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8010D73C 0010A69C 90 C1 00 14 */ stw r6, 0x14(r1) /* 8010D740 0010A6A0 38 C4 A9 D8 */ addi r6, r4, lbl_803DA9D8@l @@ -3360,9 +3360,9 @@ lbl_8010D728: /* 8010D784 0010A6E4 80 01 00 18 */ lwz r0, 0x18(r1) /* 8010D788 0010A6E8 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8010D78C 0010A6EC 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8010D790 0010A6F0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010D790 0010A6F0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010D794 0010A6F4 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8010D798 0010A6F8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010D798 0010A6F8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010D79C 0010A6FC 80 61 00 1C */ lwz r3, 0x1c(r1) /* 8010D7A0 0010A700 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8010D7A4 0010A704 90 7F 01 14 */ stw r3, 0x114(r31) @@ -3771,9 +3771,9 @@ lbl_8010DD7C: /* 8010DD7C 0010ACDC 80 DF 07 04 */ lwz r6, 0x704(r31) /* 8010DD80 0010ACE0 2C 06 FF FF */ cmpwi r6, -1 /* 8010DD84 0010ACE4 41 82 00 D8 */ beq lbl_8010DE5C -/* 8010DD88 0010ACE8 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010DD88 0010ACE8 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010DD8C 0010ACEC 38 A0 00 01 */ li r5, 1 -/* 8010DD90 0010ACF0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010DD90 0010ACF0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010DD94 0010ACF4 80 7F 04 50 */ lwz r3, 0x450(r31) /* 8010DD98 0010ACF8 3C 80 80 3E */ lis r4, lbl_803DA9E4@ha /* 8010DD9C 0010ACFC 90 01 00 08 */ stw r0, 8(r1) @@ -3789,9 +3789,9 @@ lbl_8010DD7C: /* 8010DDC4 0010AD24 80 01 00 0C */ lwz r0, 0xc(r1) /* 8010DDC8 0010AD28 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010DDCC 0010AD2C 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010DDD0 0010AD30 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010DDD0 0010AD30 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010DDD4 0010AD34 90 1E 00 C8 */ stw r0, 0xc8(r30) -/* 8010DDD8 0010AD38 38 63 AA 68 */ addi r3, r3, lbl_803DAA68@l +/* 8010DDD8 0010AD38 38 63 AA 68 */ addi r3, r3, __vt__13CBodyStateCmd@l /* 8010DDDC 0010AD3C 80 C1 00 10 */ lwz r6, 0x10(r1) /* 8010DDE0 0010AD40 38 00 00 02 */ li r0, 2 /* 8010DDE4 0010AD44 80 A1 00 14 */ lwz r5, 0x14(r1) @@ -3936,12 +3936,12 @@ lbl_8010DF9C: /* 8010DFE0 0010AF40 90 1D 05 68 */ stw r0, 0x568(r29) /* 8010DFE4 0010AF44 48 00 00 E8 */ b lbl_8010E0CC lbl_8010DFE8: -/* 8010DFE8 0010AF48 3C C0 80 3E */ lis r6, lbl_803DAA68@ha +/* 8010DFE8 0010AF48 3C C0 80 3E */ lis r6, __vt__13CBodyStateCmd@ha /* 8010DFEC 0010AF4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010DFF0 0010AF50 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8010DFF4 0010AF54 80 81 00 2C */ lwz r4, 0x2c(r1) /* 8010DFF8 0010AF58 38 60 00 00 */ li r3, 0 -/* 8010DFFC 0010AF5C 39 26 AA 68 */ addi r9, r6, lbl_803DAA68@l +/* 8010DFFC 0010AF5C 39 26 AA 68 */ addi r9, r6, __vt__13CBodyStateCmd@l /* 8010E000 0010AF60 50 64 F8 00 */ rlwimi r4, r3, 0x1f, 0, 0 /* 8010E004 0010AF64 C0 45 00 00 */ lfs f2, 0(r5) /* 8010E008 0010AF68 C0 25 00 04 */ lfs f1, 4(r5) @@ -3970,9 +3970,9 @@ lbl_8010DFE8: /* 8010E064 0010AFC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8010E068 0010AFC8 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8010E06C 0010AFCC 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8010E070 0010AFD0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010E070 0010AFD0 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010E074 0010AFD4 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8010E078 0010AFD8 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010E078 0010AFD8 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010E07C 0010AFDC 80 A1 00 18 */ lwz r5, 0x18(r1) /* 8010E080 0010AFE0 80 61 00 1C */ lwz r3, 0x1c(r1) /* 8010E084 0010AFE4 90 BF 01 94 */ stw r5, 0x194(r31) @@ -4199,9 +4199,9 @@ lbl_8010E380: /* 8010E394 0010B2F4 90 03 05 68 */ stw r0, 0x568(r3) /* 8010E398 0010B2F8 48 00 00 F0 */ b lbl_8010E488 lbl_8010E39C: -/* 8010E39C 0010B2FC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010E39C 0010B2FC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010E3A0 0010B300 38 C0 00 01 */ li r6, 1 -/* 8010E3A4 0010B304 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010E3A4 0010B304 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010E3A8 0010B308 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010E3AC 0010B30C 90 01 00 14 */ stw r0, 0x14(r1) /* 8010E3B0 0010B310 38 A3 A9 E4 */ addi r5, r3, lbl_803DA9E4@l @@ -4217,9 +4217,9 @@ lbl_8010E39C: /* 8010E3D8 0010B338 80 01 00 18 */ lwz r0, 0x18(r1) /* 8010E3DC 0010B33C 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010E3E0 0010B340 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010E3E4 0010B344 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010E3E4 0010B344 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010E3E8 0010B348 90 1F 00 C8 */ stw r0, 0xc8(r31) -/* 8010E3EC 0010B34C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010E3EC 0010B34C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010E3F0 0010B350 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 8010E3F4 0010B354 90 81 00 14 */ stw r4, 0x14(r1) /* 8010E3F8 0010B358 80 61 00 20 */ lwz r3, 0x20(r1) @@ -4396,9 +4396,9 @@ lbl_8010E63C: /* 8010E674 0010B5D4 48 0E 66 99 */ bl GetStepDirection__10CPatternedFRC9CVector3f /* 8010E678 0010B5D8 2C 03 00 00 */ cmpwi r3, 0 /* 8010E67C 0010B5DC 41 82 00 78 */ beq lbl_8010E6F4 -/* 8010E680 0010B5E0 3C A0 80 3E */ lis r5, lbl_803DAA68@ha +/* 8010E680 0010B5E0 3C A0 80 3E */ lis r5, __vt__13CBodyStateCmd@ha /* 8010E684 0010B5E4 80 9E 04 50 */ lwz r4, 0x450(r30) -/* 8010E688 0010B5E8 38 05 AA 68 */ addi r0, r5, lbl_803DAA68@l +/* 8010E688 0010B5E8 38 05 AA 68 */ addi r0, r5, __vt__13CBodyStateCmd@l /* 8010E68C 0010B5EC 3C A0 80 3E */ lis r5, lbl_803DA9E4@ha /* 8010E690 0010B5F0 90 01 00 20 */ stw r0, 0x20(r1) /* 8010E694 0010B5F4 38 A5 A9 E4 */ addi r5, r5, lbl_803DA9E4@l @@ -4415,9 +4415,9 @@ lbl_8010E63C: /* 8010E6C0 0010B620 80 01 00 24 */ lwz r0, 0x24(r1) /* 8010E6C4 0010B624 3C 60 80 3E */ lis r3, lbl_803DA9E4@ha /* 8010E6C8 0010B628 38 83 A9 E4 */ addi r4, r3, lbl_803DA9E4@l -/* 8010E6CC 0010B62C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010E6CC 0010B62C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010E6D0 0010B630 90 1D 00 C8 */ stw r0, 0xc8(r29) -/* 8010E6D4 0010B634 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010E6D4 0010B634 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010E6D8 0010B638 80 A1 00 28 */ lwz r5, 0x28(r1) /* 8010E6DC 0010B63C 90 81 00 20 */ stw r4, 0x20(r1) /* 8010E6E0 0010B640 80 61 00 2C */ lwz r3, 0x2c(r1) @@ -4702,9 +4702,9 @@ lbl_8010EAB0: /* 8010EAC4 0010BA24 7F E3 FB 78 */ mr r3, r31 /* 8010EAC8 0010BA28 38 81 00 20 */ addi r4, r1, 0x20 /* 8010EACC 0010BA2C 4B F6 E0 91 */ bl SetDestPos__10CPatternedFRC9CVector3f -/* 8010EAD0 0010BA30 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010EAD0 0010BA30 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010EAD4 0010BA34 C0 5F 02 E0 */ lfs f2, 0x2e0(r31) -/* 8010EAD8 0010BA38 38 C3 AA 68 */ addi r6, r3, lbl_803DAA68@l +/* 8010EAD8 0010BA38 38 C3 AA 68 */ addi r6, r3, __vt__13CBodyStateCmd@l /* 8010EADC 0010BA3C C0 3F 02 E4 */ lfs f1, 0x2e4(r31) /* 8010EAE0 0010BA40 C0 1F 02 E8 */ lfs f0, 0x2e8(r31) /* 8010EAE4 0010BA44 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha @@ -4728,9 +4728,9 @@ lbl_8010EAB0: /* 8010EB2C 0010BA8C 80 01 00 30 */ lwz r0, 0x30(r1) /* 8010EB30 0010BA90 3C 60 80 3E */ lis r3, lbl_803DA9CC@ha /* 8010EB34 0010BA94 38 83 A9 CC */ addi r4, r3, lbl_803DA9CC@l -/* 8010EB38 0010BA98 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010EB38 0010BA98 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010EB3C 0010BA9C 90 1F 01 2C */ stw r0, 0x12c(r31) -/* 8010EB40 0010BAA0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010EB40 0010BAA0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010EB44 0010BAA4 80 61 00 34 */ lwz r3, 0x34(r1) /* 8010EB48 0010BAA8 80 A1 00 38 */ lwz r5, 0x38(r1) /* 8010EB4C 0010BAAC 90 7F 01 30 */ stw r3, 0x130(r31) @@ -4904,9 +4904,9 @@ lbl_8010ED34: /* 8010EDB4 0010BD14 EF FF 08 2A */ fadds f31, f31, f1 /* 8010EDB8 0010BD18 EF DE 00 2A */ fadds f30, f30, f0 lbl_8010EDBC: -/* 8010EDBC 0010BD1C 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010EDBC 0010BD1C 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010EDC0 0010BD20 38 00 00 01 */ li r0, 1 -/* 8010EDC4 0010BD24 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 8010EDC4 0010BD24 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 8010EDC8 0010BD28 80 7F 04 50 */ lwz r3, 0x450(r31) /* 8010EDCC 0010BD2C 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8010EDD0 0010BD30 90 A1 00 44 */ stw r5, 0x44(r1) @@ -4926,9 +4926,9 @@ lbl_8010EDBC: /* 8010EE08 0010BD68 80 01 00 48 */ lwz r0, 0x48(r1) /* 8010EE0C 0010BD6C 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8010EE10 0010BD70 38 83 A9 D8 */ addi r4, r3, lbl_803DA9D8@l -/* 8010EE14 0010BD74 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010EE14 0010BD74 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010EE18 0010BD78 90 1F 01 10 */ stw r0, 0x110(r31) -/* 8010EE1C 0010BD7C 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010EE1C 0010BD7C 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010EE20 0010BD80 80 61 00 4C */ lwz r3, 0x4c(r1) /* 8010EE24 0010BD84 80 A1 00 50 */ lwz r5, 0x50(r1) /* 8010EE28 0010BD88 90 7F 01 14 */ stw r3, 0x114(r31) @@ -5129,13 +5129,13 @@ lbl_8010F0EC: /* 8010F100 0010C060 48 00 02 9C */ b lbl_8010F39C lbl_8010F104: /* 8010F104 0010C064 81 3F 03 88 */ lwz r9, 0x388(r31) -/* 8010F108 0010C068 3C E0 80 3E */ lis r7, lbl_803DAA68@ha +/* 8010F108 0010C068 3C E0 80 3E */ lis r7, __vt__13CBodyStateCmd@ha /* 8010F10C 0010C06C 38 C0 00 00 */ li r6, 0 /* 8010F110 0010C070 80 A1 00 C8 */ lwz r5, 0xc8(r1) /* 8010F114 0010C074 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8010F118 0010C078 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8010F11C 0010C07C 50 C5 F8 00 */ rlwimi r5, r6, 0x1f, 0, 0 -/* 8010F120 0010C080 38 E7 AA 68 */ addi r7, r7, lbl_803DAA68@l +/* 8010F120 0010C080 38 E7 AA 68 */ addi r7, r7, __vt__13CBodyStateCmd@l /* 8010F124 0010C084 C0 24 00 04 */ lfs f1, 4(r4) /* 8010F128 0010C088 20 69 FF FF */ subfic r3, r9, -1 /* 8010F12C 0010C08C C0 04 00 08 */ lfs f0, 8(r4) @@ -5162,9 +5162,9 @@ lbl_8010F104: /* 8010F180 0010C0E0 80 01 00 B0 */ lwz r0, 0xb0(r1) /* 8010F184 0010C0E4 3C 60 80 3E */ lis r3, lbl_803DA9F0@ha /* 8010F188 0010C0E8 38 83 A9 F0 */ addi r4, r3, lbl_803DA9F0@l -/* 8010F18C 0010C0EC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 8010F18C 0010C0EC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 8010F190 0010C0F0 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8010F194 0010C0F4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 8010F194 0010C0F4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 8010F198 0010C0F8 80 A1 00 B4 */ lwz r5, 0xb4(r1) /* 8010F19C 0010C0FC 80 61 00 B8 */ lwz r3, 0xb8(r1) /* 8010F1A0 0010C100 90 BF 01 94 */ stw r5, 0x194(r31) diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 80bee355..7e125f4c 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -15781,7 +15781,7 @@ lbl_800D36AC: /* 800D3700 000D0660 38 81 00 14 */ addi r4, r1, 0x14 /* 800D3704 000D0664 38 A1 00 68 */ addi r5, r1, 0x68 /* 800D3708 000D0668 39 20 00 00 */ li r9, 0 -/* 800D370C 000D066C 48 02 B0 A5 */ bl "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbUib" +/* 800D370C 000D066C 48 02 B0 A5 */ bl "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbibf" /* 800D3710 000D0670 7C 7B 1B 78 */ mr r27, r3 lbl_800D3714: /* 800D3714 000D0674 38 61 00 68 */ addi r3, r1, 0x68 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s index db64f624..64bd1f4b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActorKeyframe.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803DFE20 -lbl_803DFE20: +.global __vt__20CScriptActorKeyframe +__vt__20CScriptActorKeyframe: # ROM: 0x3DCE20 .4byte 0 .4byte 0 @@ -15,8 +15,8 @@ lbl_803DFE20: .4byte AcceptScriptMsg__20CScriptActorKeyframeF20EScriptObjectMessage9TUniqueIdR13CStateManager .4byte SetActive__7CEntityFUc -.global lbl_803DFE40 -lbl_803DFE40: +.global __vt__14CBCScriptedCmd +__vt__14CBCScriptedCmd: # ROM: 0x3DCE40 .4byte 0 .4byte 0 @@ -48,9 +48,9 @@ __dt__20CScriptActorKeyframeFv: /* 800FE050 000FAFB0 93 C1 00 08 */ stw r30, 8(r1) /* 800FE054 000FAFB4 7C 7E 1B 79 */ or. r30, r3, r3 /* 800FE058 000FAFB8 41 82 00 28 */ beq lbl_800FE080 -/* 800FE05C 000FAFBC 3C A0 80 3E */ lis r5, lbl_803DFE20@ha +/* 800FE05C 000FAFBC 3C A0 80 3E */ lis r5, __vt__20CScriptActorKeyframe@ha /* 800FE060 000FAFC0 38 80 00 00 */ li r4, 0 -/* 800FE064 000FAFC4 38 05 FE 20 */ addi r0, r5, lbl_803DFE20@l +/* 800FE064 000FAFC4 38 05 FE 20 */ addi r0, r5, __vt__20CScriptActorKeyframe@l /* 800FE068 000FAFC8 90 1E 00 00 */ stw r0, 0(r30) /* 800FE06C 000FAFCC 4B F5 32 09 */ bl __dt__7CEntityFv /* 800FE070 000FAFD0 7F E0 07 35 */ extsh. r0, r31 @@ -189,16 +189,16 @@ lbl_800FE244: /* 800FE260 000FB1C0 A8 03 02 08 */ lha r0, 0x208(r3) /* 800FE264 000FB1C4 7C 04 00 00 */ cmpw r4, r0 /* 800FE268 000FB1C8 40 82 00 30 */ bne lbl_800FE298 -/* 800FE26C 000FB1CC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800FE26C 000FB1CC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800FE270 000FB1D0 38 00 00 0A */ li r0, 0xa -/* 800FE274 000FB1D4 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 800FE274 000FB1D4 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 800FE278 000FB1D8 90 01 00 1C */ stw r0, 0x1c(r1) /* 800FE27C 000FB1DC 38 66 00 04 */ addi r3, r6, 4 /* 800FE280 000FB1E0 38 81 00 18 */ addi r4, r1, 0x18 /* 800FE284 000FB1E4 90 A1 00 18 */ stw r5, 0x18(r1) /* 800FE288 000FB1E8 48 03 35 31 */ bl DeliverCmd__16CBodyStateCmdMgrFRC13CBodyStateCmd -/* 800FE28C 000FB1EC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 800FE290 000FB1F0 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800FE28C 000FB1EC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 800FE290 000FB1F0 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800FE294 000FB1F4 90 01 00 18 */ stw r0, 0x18(r1) lbl_800FE298: /* 800FE298 000FB1F8 3B FF 00 0C */ addi r31, r31, 0xc @@ -363,17 +363,17 @@ lbl_800FE49C: /* 800FE4EC 000FB44C 48 00 00 9C */ b lbl_800FE588 lbl_800FE4F0: /* 800FE4F0 000FB450 88 DE 00 44 */ lbz r6, 0x44(r30) -/* 800FE4F4 000FB454 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800FE4F4 000FB454 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800FE4F8 000FB458 88 01 00 40 */ lbz r0, 0x40(r1) -/* 800FE4FC 000FB45C 38 A3 AA 68 */ addi r5, r3, lbl_803DAA68@l +/* 800FE4FC 000FB45C 38 A3 AA 68 */ addi r5, r3, __vt__13CBodyStateCmd@l /* 800FE500 000FB460 50 C0 06 30 */ rlwimi r0, r6, 0, 0x18, 0x18 /* 800FE504 000FB464 C0 1E 00 38 */ lfs f0, 0x38(r30) /* 800FE508 000FB468 81 1E 00 34 */ lwz r8, 0x34(r30) -/* 800FE50C 000FB46C 3C 60 80 3E */ lis r3, lbl_803DFE40@ha +/* 800FE50C 000FB46C 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha /* 800FE510 000FB470 80 FF 04 50 */ lwz r7, 0x450(r31) /* 800FE514 000FB474 38 80 00 13 */ li r4, 0x13 /* 800FE518 000FB478 90 A1 00 34 */ stw r5, 0x34(r1) -/* 800FE51C 000FB47C 38 A3 FE 40 */ addi r5, r3, lbl_803DFE40@l +/* 800FE51C 000FB47C 38 A3 FE 40 */ addi r5, r3, __vt__14CBCScriptedCmd@l /* 800FE520 000FB480 3B C7 00 04 */ addi r30, r7, 4 /* 800FE524 000FB484 98 01 00 40 */ stb r0, 0x40(r1) /* 800FE528 000FB488 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -387,11 +387,11 @@ lbl_800FE4F0: /* 800FE548 000FB4A8 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800FE54C 000FB4AC 48 03 2E ED */ bl DeliverCmd__16CBodyStateCmdMgrF13EBodyStateCmd /* 800FE550 000FB4B0 80 01 00 38 */ lwz r0, 0x38(r1) -/* 800FE554 000FB4B4 3C 60 80 3E */ lis r3, lbl_803DFE40@ha -/* 800FE558 000FB4B8 38 83 FE 40 */ addi r4, r3, lbl_803DFE40@l -/* 800FE55C 000FB4BC 3C 60 80 3E */ lis r3, lbl_803DAA68@ha +/* 800FE554 000FB4B4 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha +/* 800FE558 000FB4B8 38 83 FE 40 */ addi r4, r3, __vt__14CBCScriptedCmd@l +/* 800FE55C 000FB4BC 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha /* 800FE560 000FB4C0 90 1E 02 20 */ stw r0, 0x220(r30) -/* 800FE564 000FB4C4 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800FE564 000FB4C4 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800FE568 000FB4C8 80 A1 00 3C */ lwz r5, 0x3c(r1) /* 800FE56C 000FB4CC 88 61 00 40 */ lbz r3, 0x40(r1) /* 800FE570 000FB4D0 90 BE 02 24 */ stw r5, 0x224(r30) @@ -418,12 +418,12 @@ __dt__14CBCScriptedCmdFv: /* 800FE5B4 000FB514 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FE5B8 000FB518 7C 7F 1B 79 */ or. r31, r3, r3 /* 800FE5BC 000FB51C 41 82 00 30 */ beq lbl_800FE5EC -/* 800FE5C0 000FB520 3C 60 80 3E */ lis r3, lbl_803DFE40@ha -/* 800FE5C4 000FB524 38 03 FE 40 */ addi r0, r3, lbl_803DFE40@l +/* 800FE5C0 000FB520 3C 60 80 3E */ lis r3, __vt__14CBCScriptedCmd@ha +/* 800FE5C4 000FB524 38 03 FE 40 */ addi r0, r3, __vt__14CBCScriptedCmd@l /* 800FE5C8 000FB528 90 1F 00 00 */ stw r0, 0(r31) /* 800FE5CC 000FB52C 41 82 00 10 */ beq lbl_800FE5DC -/* 800FE5D0 000FB530 3C 60 80 3E */ lis r3, lbl_803DAA68@ha -/* 800FE5D4 000FB534 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l +/* 800FE5D0 000FB530 3C 60 80 3E */ lis r3, __vt__13CBodyStateCmd@ha +/* 800FE5D4 000FB534 38 03 AA 68 */ addi r0, r3, __vt__13CBodyStateCmd@l /* 800FE5D8 000FB538 90 1F 00 00 */ stw r0, 0(r31) lbl_800FE5DC: /* 800FE5DC 000FB53C 7C 80 07 35 */ extsh. r0, r4 @@ -562,8 +562,8 @@ lbl_800FE780: /* 800FE7A8 000FB708 38 21 00 50 */ addi r1, r1, 0x50 /* 800FE7AC 000FB70C 4E 80 00 20 */ blr -.global "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbUib" -"__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbUib": +.global "__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbibf" +"__ct__20CScriptActorKeyframeF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoibfbibf": /* 800FE7B0 000FB710 94 21 FF C0 */ stwu r1, -0x40(r1) /* 800FE7B4 000FB714 7C 08 02 A6 */ mflr r0 /* 800FE7B8 000FB718 7C AB 2B 78 */ mr r11, r5 @@ -586,9 +586,9 @@ lbl_800FE780: /* 800FE7FC 000FB75C 7C 86 23 78 */ mr r6, r4 /* 800FE800 000FB760 38 81 00 08 */ addi r4, r1, 8 /* 800FE804 000FB764 4B F5 2B 21 */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 800FE808 000FB768 3C 60 80 3E */ lis r3, lbl_803DFE20@ha +/* 800FE808 000FB768 3C 60 80 3E */ lis r3, __vt__20CScriptActorKeyframe@ha /* 800FE80C 000FB76C 38 80 00 00 */ li r4, 0 -/* 800FE810 000FB770 38 03 FE 20 */ addi r0, r3, lbl_803DFE20@l +/* 800FE810 000FB770 38 03 FE 20 */ addi r0, r3, __vt__20CScriptActorKeyframe@l /* 800FE814 000FB774 90 1F 00 00 */ stw r0, 0(r31) /* 800FE818 000FB778 7F E3 FB 78 */ mr r3, r31 /* 800FE81C 000FB77C 93 7F 00 34 */ stw r27, 0x34(r31) diff --git a/configure.py b/configure.py index fb20866b..ce0c4118 100755 --- a/configure.py +++ b/configure.py @@ -149,7 +149,7 @@ LIBS = [ "MetroidPrime/ScriptObjects/CScriptDamageableTrigger", "MetroidPrime/ScriptObjects/CScriptDebris", ["MetroidPrime/ScriptObjects/CScriptCameraShaker", True], - "MetroidPrime/ScriptObjects/CScriptActorKeyframe", + ["MetroidPrime/ScriptObjects/CScriptActorKeyframe", False], ["MetroidPrime/CConsoleOutputWindow", False], "MetroidPrime/ScriptObjects/CScriptWater", ["MetroidPrime/Weapons/CWeapon", False], diff --git a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp index 9dd3dd6a..21a75a1c 100644 --- a/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp +++ b/include/MetroidPrime/BodyState/CBodyStateCmdMgr.hpp @@ -393,6 +393,8 @@ public: void DeliverCmd(const CBCLocomotionCmd& cmd); void DeliverCmd(EBodyStateCmd cmd); + void DeliverCmd(const CBodyStateCmd& cmd); + void DeliverCmd(const CBCGenerateCmd& cmd) { DeliverCmd(kBSC_Generate); x18c_generate = cmd; @@ -401,6 +403,10 @@ public: DeliverCmd(kBSC_KnockDown); xdc_knockDown = cmd; } + void DeliverCmd(const CBCScriptedCmd& cmd) { + DeliverCmd(kBSC_Scripted); + x21c_scripted = cmd; + } void DeliverTargetVector(const CVector3f& t) { x18_target = t; } diff --git a/include/MetroidPrime/CAnimData.hpp b/include/MetroidPrime/CAnimData.hpp index fe42ef9f..635e4bd3 100644 --- a/include/MetroidPrime/CAnimData.hpp +++ b/include/MetroidPrime/CAnimData.hpp @@ -106,7 +106,7 @@ public: void SetPhase(float ph); void AddAdditiveAnimation(uint idx, float weight, bool active, bool fadeOut); void DelAdditiveAnimation(uint idx); - // IsAdditiveAnimationActive__9CAnimDataCFUi + bool IsAdditiveAnimation(uint idx) const; const rstl::rc_ptr& GetAdditiveAnimationTree(uint idx) const; // GetAnimationTree__9CAnimDataCFv // AnimationTree__9CAnimDataFv diff --git a/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp new file mode 100644 index 00000000..efc013f2 --- /dev/null +++ b/include/MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp @@ -0,0 +1,33 @@ +#ifndef _CSCRIPTACTORKEYFRAME +#define _CSCRIPTACTORKEYFRAME + +#include "MetroidPrime/CEntity.hpp" + +class CScriptActorKeyframe : public CEntity { + +public: + CScriptActorKeyframe(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, int animId, + bool looping, float lifetime, bool isPassive, int fadeOut, bool active, + float totalPlayback); + + void Accept(IVisitor& visitor) override; + void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; + void Think(float, CStateManager&) override; + void UpdateEntity(TUniqueId, CStateManager&); + bool IsPassive() const { return x44_25_isPassive; } + void SetIsPassive(bool b) { x44_25_isPassive = b; } + +private: + int x34_animationId; + float x38_initialLifetime; + float x3c_playbackRate; + float x40_lifetime; + bool x44_24_looping : 1; + bool x44_25_isPassive : 1; + bool x44_26_fadeOut : 1; + bool x44_27_timedLoop : 1; + bool x44_28_playing : 1; // false; + bool x44_29_ : 1; // false; +}; + +#endif // _CSCRIPTACTORKEYFRAME diff --git a/src/MetroidPrime/ScriptObjects/CScriptActorKeyframe.cpp b/src/MetroidPrime/ScriptObjects/CScriptActorKeyframe.cpp new file mode 100644 index 00000000..16ce6916 --- /dev/null +++ b/src/MetroidPrime/ScriptObjects/CScriptActorKeyframe.cpp @@ -0,0 +1,135 @@ +#include "MetroidPrime/ScriptObjects/CScriptActorKeyframe.hpp" + +#include "MetroidPrime/BodyState/CBodyController.hpp" +#include "MetroidPrime/BodyState/CBodyStateInfo.hpp" +#include "MetroidPrime/CAnimData.hpp" +#include "MetroidPrime/CStateManager.hpp" +#include "MetroidPrime/Enemies/CPatterned.hpp" +#include "MetroidPrime/ScriptObjects/CScriptActor.hpp" +#include "MetroidPrime/ScriptObjects/CScriptPlatform.hpp" + +CScriptActorKeyframe::CScriptActorKeyframe(TUniqueId uid, const rstl::string& name, + const CEntityInfo& info, int animId, bool looping, + float lifetime, bool isPassive, int fadeOut, bool active, + float totalPlayback) +: CEntity(uid, info, active, name) +, x34_animationId(animId) +, x38_initialLifetime(lifetime) +, x3c_playbackRate(totalPlayback) +, x40_lifetime(lifetime) +, x44_24_looping(looping) +, x44_25_isPassive(isPassive) +, x44_26_fadeOut((fadeOut << 5) & 0x20) +, x44_27_timedLoop((fadeOut << 3) & 0x10) +, x44_28_playing(false) {} + +void CScriptActorKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, + CStateManager& mgr) { + switch (msg) { + case kSM_Action: + if (GetActive()) { + if (!x44_25_isPassive) { + rstl::vector< SConnection >::const_iterator conn = GetConnectionList().begin(); + for (; conn != GetConnectionList().end(); ++conn) { + if (conn->x0_state != kSS_Play || conn->x4_msg != kSM_Play) { + continue; + } + + CStateManager::TIdListResult search = mgr.GetIdListForScript(conn->x8_objId); + for (CStateManager::TIdList::const_iterator it = search.first; it != search.second; + ++it) { + UpdateEntity(it->second, mgr); + } + } + } + + x44_28_playing = true; + x40_lifetime = x38_initialLifetime; + SendScriptMsgs(kSS_Play, mgr, kSM_None); + } + break; + case kSM_InitializedInArea: + if (x34_animationId == -1) + x34_animationId = 0; + break; + default: + break; + } + + CEntity::AcceptScriptMsg(msg, uid, mgr); +} + +void CScriptActorKeyframe::Accept(IVisitor& visitor) { visitor.Visit(*this); } + +void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr) { + CEntity* ent = mgr.ObjectById(uid); + CActor* act = TCastToPtr< CScriptActor >(ent); + if (!act) { + act = TCastToPtr< CScriptPlatform >(ent); + } + if (act) { + if (!act->GetActive()) { + mgr.SendScriptMsg(act, GetUniqueId(), kSM_Activate); + } + act->SetModelFlags(CModelFlags::Normal()); + if (act->HasAnimation()) { + if (act->AnimationData()->IsAdditiveAnimation(x34_animationId)) { + act->AnimationData()->AddAdditiveAnimation(x34_animationId, 1.f, x44_24_looping, + x44_26_fadeOut); + } else { + act->AnimationData()->SetAnimation(CAnimPlaybackParms(x34_animationId, -1, 1.f, true), + false); + act->ModelData()->EnableLooping(x44_24_looping); + act->AnimationData()->MultiplyPlaybackRate(x3c_playbackRate); + } + } + } else if (CPatterned* ai = TCastToPtr< CPatterned >(ent)) { + if (ai->AnimationData()->IsAdditiveAnimation(x34_animationId)) { + ai->AnimationData()->AddAdditiveAnimation(x34_animationId, 1.f, x44_24_looping, + x44_26_fadeOut); + } else { + ai->GetBodyCtrl()->CommandMgr().DeliverCmd( + CBCScriptedCmd(x34_animationId, x44_24_looping, x44_27_timedLoop, x38_initialLifetime)); + } + } +} + +void CScriptActorKeyframe::Think(float dt, CStateManager& mgr) { + if (!x44_25_isPassive && x44_24_looping && x44_27_timedLoop && x44_28_playing && + x40_lifetime > 0.f) { + + x40_lifetime -= dt; + if (x40_lifetime <= 0.f) { + + x44_28_playing = false; + rstl::vector< SConnection >::const_iterator conn = GetConnectionList().begin(); + for (; conn != GetConnectionList().end(); ++conn) { + if (conn->x0_state != kSS_Play || conn->x4_msg != kSM_Play) { + continue; + } + TUniqueId uid = mgr.GetIdForScript(conn->x8_objId); + CEntity* ent = mgr.ObjectById(uid); + if (CScriptActor* act = TCastToPtr< CScriptActor >(ent)) { + if (act->HasAnimation()) { + if (act->AnimationData()->IsAdditiveAnimation(x34_animationId)) { + act->AnimationData()->DelAdditiveAnimation(x34_animationId); + } else if (act->AnimationData()->GetDefaultAnimation() == x34_animationId) { + act->ModelData()->EnableLooping(false); + } + } + } else if (CPatterned* ai = TCastToPtr< CPatterned >(ent)) { + if (ai->AnimationData()->IsAdditiveAnimation(x34_animationId)) { + ai->AnimationData()->DelAdditiveAnimation(x34_animationId); + + } else if (ai->GetBodyCtrl()->GetBodyStateInfo().GetCurrentStateId() == + pas::kAS_Scripted && + ai->AnimationData()->GetDefaultAnimation() == x34_animationId) { + ai->GetBodyCtrl()->CommandMgr().DeliverCmd(CBodyStateCmd(kBSC_ExitState)); + } + } + } + } + } + + CEntity::Think(dt, mgr); +}