diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0721dbf3..0a572c63 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: cmake -B build cmake --build build - name: Build - run: make -j$(nproc) WINE=./tools/WiBo/build/wibo + run: make -j$(nproc) WINE=./tools/WiBo/build/wibo GENERATE_MAP=1 - name: Upload map uses: actions/upload-artifact@v2 with: diff --git a/Makefile b/Makefile index 1a2085fa..025c60be 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ endif VERBOSE ?= 0 # If GENERATE_MAP set to 1, tells LDFLAGS to generate a mapfile, which makes linking take several minutes. -GENERATE_MAP ?= 1 +GENERATE_MAP ?= 0 ifeq ($(VERBOSE),0) QUIET := @ diff --git a/asm/Collision/CCollidableAABox.s b/asm/Collision/CCollidableAABox.s index ed292585..c023e632 100644 --- a/asm/Collision/CCollidableAABox.s +++ b/asm/Collision/CCollidableAABox.s @@ -250,9 +250,9 @@ lbl_802CD7AC: lbl_802CD7C0: /* 802CD7C0 002CA720 C0 62 C4 88 */ lfs f3, lbl_805AE1A8@sda21(r2) lbl_802CD7C4: -/* 802CD7C4 002CA724 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802CD7C4 002CA724 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802CD7C8 002CA728 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 802CD7CC 002CA72C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802CD7CC 002CA72C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802CD7D0 002CA730 38 61 00 48 */ addi r3, r1, 0x48 /* 802CD7D4 002CA734 C0 44 00 00 */ lfs f2, 0(r4) /* 802CD7D8 002CA738 54 A0 10 3A */ slwi r0, r5, 2 @@ -386,9 +386,9 @@ CollideMovingSphere__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVecto /* 802CD9C0 002CA920 D0 01 00 8C */ stfs f0, 0x8c(r1) /* 802CD9C4 002CA924 48 00 69 91 */ bl Transform__17CCollidableSphereCFRC12CTransform4f /* 802CD9C8 002CA928 C0 C1 00 28 */ lfs f6, 0x28(r1) -/* 802CD9CC 002CA92C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802CD9CC 002CA92C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802CD9D0 002CA930 C0 A1 00 2C */ lfs f5, 0x2c(r1) -/* 802CD9D4 002CA934 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 802CD9D4 002CA934 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 802CD9D8 002CA938 C0 81 00 30 */ lfs f4, 0x30(r1) /* 802CD9DC 002CA93C 38 61 00 50 */ addi r3, r1, 0x50 /* 802CD9E0 002CA940 C0 61 00 34 */ lfs f3, 0x34(r1) @@ -558,9 +558,9 @@ CollideMovingAABox__16CCollidableAABoxFRC27CInternalCollisionStructureRC9CVector /* 802CDC5C 002CABBC D0 21 00 8C */ stfs f1, 0x8c(r1) /* 802CDC60 002CABC0 D0 01 00 90 */ stfs f0, 0x90(r1) /* 802CDC64 002CABC4 4B FF F8 79 */ bl Transform__16CCollidableAABoxCFRC12CTransform4f -/* 802CDC68 002CABC8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802CDC68 002CABC8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802CDC6C 002CABCC C0 A1 00 34 */ lfs f5, 0x34(r1) -/* 802CDC70 002CABD0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802CDC70 002CABD0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802CDC74 002CABD4 C0 81 00 38 */ lfs f4, 0x38(r1) /* 802CDC78 002CABD8 C0 C4 00 00 */ lfs f6, 0(r4) /* 802CDC7C 002CABDC 7F 65 DB 78 */ mr r5, r27 diff --git a/asm/Collision/CCollidableSphere.s b/asm/Collision/CCollidableSphere.s index 661fcb6d..5306a31b 100644 --- a/asm/Collision/CCollidableSphere.s +++ b/asm/Collision/CCollidableSphere.s @@ -306,9 +306,9 @@ CollideMovingAABox__17CCollidableSphereFRC27CInternalCollisionStructureRC9CVecto /* 802D41AC 002D110C D0 01 00 74 */ stfs f0, 0x74(r1) /* 802D41B0 002D1110 48 00 01 A5 */ bl Transform__17CCollidableSphereCFRC12CTransform4f /* 802D41B4 002D1114 C0 61 00 10 */ lfs f3, 0x10(r1) -/* 802D41B8 002D1118 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802D41B8 002D1118 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802D41BC 002D111C C0 41 00 14 */ lfs f2, 0x14(r1) -/* 802D41C0 002D1120 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 802D41C0 002D1120 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 802D41C4 002D1124 C0 21 00 18 */ lfs f1, 0x18(r1) /* 802D41C8 002D1128 7F 65 DB 78 */ mr r5, r27 /* 802D41CC 002D112C C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -838,8 +838,8 @@ Sphere_Sphere__7CollideFRC27CInternalCollisionStructureR18CCollisionInfoList: /* 802D498C 002D18EC D0 21 00 10 */ stfs f1, 0x10(r1) /* 802D4990 002D18F0 48 00 00 0C */ b lbl_802D499C lbl_802D4994: -/* 802D4994 002D18F4 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 802D4998 002D18F8 38 83 67 18 */ addi r4, r3, lbl_805A6718@l +/* 802D4994 002D18F4 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 802D4998 002D18F8 38 83 67 18 */ addi r4, r3, sRightVector__9CVector3f@l lbl_802D499C: /* 802D499C 002D18FC C0 04 00 00 */ lfs f0, 0(r4) /* 802D49A0 002D1900 7F E3 FB 78 */ mr r3, r31 @@ -1095,8 +1095,8 @@ lbl_802D4D50: /* 802D4D5C 002D1CBC 38 60 00 00 */ li r3, 0 /* 802D4D60 002D1CC0 48 00 03 6C */ b lbl_802D50CC lbl_802D4D64: -/* 802D4D64 002D1CC4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802D4D68 002D1CC8 C4 83 66 A0 */ lfsu f4, skZero3f@l(r3) +/* 802D4D64 002D1CC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802D4D68 002D1CC8 C4 83 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r3) /* 802D4D6C 002D1CCC 28 08 00 2A */ cmplwi r8, 0x2a /* 802D4D70 002D1CD0 C0 63 00 04 */ lfs f3, 4(r3) /* 802D4D74 002D1CD4 C0 43 00 08 */ lfs f2, 8(r3) diff --git a/asm/Collision/CCollisionInfo.s b/asm/Collision/CCollisionInfo.s index 3fb037f4..cf3c9b1c 100644 --- a/asm/Collision/CCollisionInfo.s +++ b/asm/Collision/CCollisionInfo.s @@ -197,8 +197,8 @@ __ct__14CCollisionInfoFRC6CAABoxRC13CMaterialListRC13CMaterialListRC9CVector3fRC .global __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3fRC9CVector3f: /* 802CE37C 002CB2DC C0 04 00 00 */ lfs f0, 0(r4) -/* 802CE380 002CB2E0 3D 20 80 5A */ lis r9, skZero3f@ha -/* 802CE384 002CB2E4 39 49 66 A0 */ addi r10, r9, skZero3f@l +/* 802CE380 002CB2E0 3D 20 80 5A */ lis r9, sZeroVector__9CVector3f@ha +/* 802CE384 002CB2E4 39 49 66 A0 */ addi r10, r9, sZeroVector__9CVector3f@l /* 802CE388 002CB2E8 39 20 00 01 */ li r9, 1 /* 802CE38C 002CB2EC D0 03 00 00 */ stfs f0, 0(r3) /* 802CE390 002CB2F0 38 00 00 00 */ li r0, 0 @@ -251,8 +251,8 @@ __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3 .global __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3f __ct__14CCollisionInfoFRC9CVector3fRC13CMaterialListRC13CMaterialListRC9CVector3f: /* 802CE448 002CB3A8 C0 04 00 00 */ lfs f0, 0(r4) -/* 802CE44C 002CB3AC 3D 00 80 5A */ lis r8, skZero3f@ha -/* 802CE450 002CB3B0 39 28 66 A0 */ addi r9, r8, skZero3f@l +/* 802CE44C 002CB3AC 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha +/* 802CE450 002CB3B0 39 28 66 A0 */ addi r9, r8, sZeroVector__9CVector3f@l /* 802CE454 002CB3B4 39 00 00 01 */ li r8, 1 /* 802CE458 002CB3B8 D0 03 00 00 */ stfs f0, 0(r3) /* 802CE45C 002CB3BC 38 00 00 00 */ li r0, 0 diff --git a/asm/Collision/COBBox.s b/asm/Collision/COBBox.s index 034d1706..1473b532 100644 --- a/asm/Collision/COBBox.s +++ b/asm/Collision/COBBox.s @@ -462,9 +462,9 @@ lbl_802D5ADC: AABoxIntersectsBox__6COBBoxFRC6CAABox: /* 802D5B74 002D2AD4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802D5B78 002D2AD8 7C 08 02 A6 */ mflr r0 -/* 802D5B7C 002D2ADC 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 802D5B7C 002D2ADC 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 802D5B80 002D2AE0 90 01 00 54 */ stw r0, 0x54(r1) -/* 802D5B84 002D2AE4 38 A5 66 70 */ addi r5, r5, skIdentity4f@l +/* 802D5B84 002D2AE4 38 A5 66 70 */ addi r5, r5, sIdentity__12CTransform4f@l /* 802D5B88 002D2AE8 93 E1 00 4C */ stw r31, 0x4c(r1) /* 802D5B8C 002D2AEC 7C 7F 1B 78 */ mr r31, r3 /* 802D5B90 002D2AF0 38 61 00 08 */ addi r3, r1, 8 @@ -512,9 +512,9 @@ LineIntersectsBox__6COBBoxCFRC5CMRayRf: /* 802D5C2C 002D2B8C 7F A5 EB 78 */ mr r5, r29 /* 802D5C30 002D2B90 38 61 00 38 */ addi r3, r1, 0x38 /* 802D5C34 002D2B94 48 00 03 B5 */ bl GetInvUnscaledTransformRay__5CMRayCFRC12CTransform4f -/* 802D5C38 002D2B98 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802D5C38 002D2B98 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802D5C3C 002D2B9C C3 A1 00 38 */ lfs f29, 0x38(r1) -/* 802D5C40 002D2BA0 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 802D5C40 002D2BA0 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 802D5C44 002D2BA4 C3 C1 00 3C */ lfs f30, 0x3c(r1) /* 802D5C48 002D2BA8 C3 E1 00 40 */ lfs f31, 0x40(r1) /* 802D5C4C 002D2BAC 7F E6 FB 78 */ mr r6, r31 @@ -638,8 +638,8 @@ CalculateAABox__6COBBoxCFRC12CTransform4f: /* 802D5E0C 002D2D6C 38 81 00 50 */ addi r4, r1, 0x50 /* 802D5E10 002D2D70 48 03 CD 65 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802D5E14 002D2D74 C0 82 C5 44 */ lfs f4, lbl_805AE264@sda21(r2) -/* 802D5E18 002D2D78 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 802D5E1C 002D2D7C C4 E3 67 54 */ lfsu f7, lbl_805A6754@l(r3) +/* 802D5E18 002D2D78 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 802D5E1C 002D2D7C C4 E3 67 54 */ lfsu f7, mskInvertedBox__6CAABox@l(r3) /* 802D5E20 002D2D80 3B E0 00 00 */ li r31, 0 /* 802D5E24 002D2D84 C0 3E 00 34 */ lfs f1, 0x34(r30) /* 802D5E28 002D2D88 C0 7E 00 38 */ lfs f3, 0x38(r30) diff --git a/asm/Collision/CollisionUtil.s b/asm/Collision/CollisionUtil.s index df37ecca..427cfff9 100644 --- a/asm/Collision/CollisionUtil.s +++ b/asm/Collision/CollisionUtil.s @@ -2432,10 +2432,10 @@ lbl_802D1F94: /* 802D1FB0 002CEF10 48 00 00 F0 */ b lbl_802D20A0 lbl_802D1FB4: /* 802D1FB4 002CEF14 D8 3D 00 00 */ stfd f1, 0(r29) -/* 802D1FB8 002CEF18 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802D1FB8 002CEF18 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802D1FBC 002CEF1C 54 A0 10 3A */ slwi r0, r5, 2 /* 802D1FC0 002CEF20 C0 02 C4 B8 */ lfs f0, lbl_805AE1D8@sda21(r2) -/* 802D1FC4 002CEF24 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 802D1FC4 002CEF24 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 802D1FC8 002CEF28 D0 3F 00 00 */ stfs f1, 0(r31) /* 802D1FCC 002CEF2C C0 23 00 04 */ lfs f1, 4(r3) /* 802D1FD0 002CEF30 D0 3F 00 04 */ stfs f1, 4(r31) @@ -3955,9 +3955,9 @@ lbl_802D350C: /* 802D350C 002D046C 38 60 00 00 */ li r3, 0 /* 802D3510 002D0470 48 00 00 54 */ b lbl_802D3564 lbl_802D3514: -/* 802D3514 002D0474 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802D3514 002D0474 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802D3518 002D0478 D8 7F 00 00 */ stfd f3, 0(r31) -/* 802D351C 002D047C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802D351C 002D047C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802D3520 002D0480 54 A0 10 3A */ slwi r0, r5, 2 /* 802D3524 002D0484 C0 04 00 00 */ lfs f0, 0(r4) /* 802D3528 002D0488 38 61 00 08 */ addi r3, r1, 8 @@ -3998,11 +3998,11 @@ RayAABoxIntersection__13CollisionUtilFRC5CMRayRC6CAABoxR9CVector3fRf: /* 802D359C 002D04FC C0 22 C4 B8 */ lfs f1, lbl_805AE1D8@sda21(r2) /* 802D35A0 002D0500 93 E1 00 3C */ stw r31, 0x3c(r1) /* 802D35A4 002D0504 39 27 6A 50 */ addi r9, r7, lbl_803D6A50@l -/* 802D35A8 002D0508 3C E0 80 5A */ lis r7, skZero3f@ha +/* 802D35A8 002D0508 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 802D35AC 002D050C 39 48 6A 5C */ addi r10, r8, lbl_803D6A5C@l /* 802D35B0 002D0510 93 C1 00 38 */ stw r30, 0x38(r1) /* 802D35B4 002D0514 3B C0 00 01 */ li r30, 1 -/* 802D35B8 002D0518 C4 87 66 A0 */ lfsu f4, skZero3f@l(r7) +/* 802D35B8 002D0518 C4 87 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r7) /* 802D35BC 002D051C C0 03 00 18 */ lfs f0, 0x18(r3) /* 802D35C0 002D0520 83 E9 00 00 */ lwz r31, 0(r9) /* 802D35C4 002D0524 81 89 00 04 */ lwz r12, 4(r9) @@ -4269,9 +4269,9 @@ lbl_802D396C: /* 802D3970 002D08D0 48 00 00 50 */ b lbl_802D39C0 lbl_802D3974: /* 802D3974 002D08D4 D0 66 00 00 */ stfs f3, 0(r6) -/* 802D3978 002D08D8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802D3978 002D08D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802D397C 002D08DC 55 00 10 3A */ slwi r0, r8, 2 -/* 802D3980 002D08E0 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 802D3980 002D08E0 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 802D3984 002D08E4 38 61 00 20 */ addi r3, r1, 0x20 /* 802D3988 002D08E8 7C 03 00 2E */ lwzx r0, r3, r0 /* 802D398C 002D08EC D0 05 00 00 */ stfs f0, 0(r5) diff --git a/asm/GuiSys/CGuiGroup.s b/asm/GuiSys/CGuiGroup.s index 275d6e48..22579846 100644 --- a/asm/GuiSys/CGuiGroup.s +++ b/asm/GuiSys/CGuiGroup.s @@ -1052,8 +1052,8 @@ lbl_802C1EB8: lbl_802C1F14: /* 802C1F14 002BEE74 28 1E 00 00 */ cmplwi r30, 0 /* 802C1F18 002BEE78 41 82 00 20 */ beq lbl_802C1F38 -/* 802C1F1C 002BEE7C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802C1F20 002BEE80 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802C1F1C 002BEE7C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802C1F20 002BEE80 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802C1F24 002BEE84 90 1E 00 00 */ stw r0, 0(r30) /* 802C1F28 002BEE88 41 82 00 10 */ beq lbl_802C1F38 /* 802C1F2C 002BEE8C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1105,11 +1105,11 @@ lbl_802C1F48: /* 802C1FC4 002BEF24 28 03 00 00 */ cmplwi r3, 0 /* 802C1FC8 002BEF28 41 82 00 38 */ beq lbl_802C2000 /* 802C1FCC 002BEF2C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802C1FD0 002BEF30 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802C1FD0 002BEF30 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802C1FD4 002BEF34 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802C1FD8 002BEF38 3C 80 80 3F */ lis r4, lbl_803EC7B8@ha /* 802C1FDC 002BEF3C 90 03 00 00 */ stw r0, 0(r3) -/* 802C1FE0 002BEF40 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802C1FE0 002BEF40 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802C1FE4 002BEF44 38 A0 00 00 */ li r5, 0 /* 802C1FE8 002BEF48 38 04 C7 B8 */ addi r0, r4, lbl_803EC7B8@l /* 802C1FEC 002BEF4C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/GuiSys/CGuiLight.s b/asm/GuiSys/CGuiLight.s index 296c144b..b4410e5b 100644 --- a/asm/GuiSys/CGuiLight.s +++ b/asm/GuiSys/CGuiLight.s @@ -46,9 +46,9 @@ BuildLight__9CGuiLightCFv: /* 802C3774 002C06D4 7C 7E 1B 78 */ mr r30, r3 /* 802C3778 002C06D8 38 61 00 08 */ addi r3, r1, 8 /* 802C377C 002C06DC 48 09 FC 71 */ bl __ct__6CColorFffff -/* 802C3780 002C06E0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802C3780 002C06E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802C3784 002C06E4 7C 65 1B 78 */ mr r5, r3 -/* 802C3788 002C06E8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802C3788 002C06E8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802C378C 002C06EC 38 61 01 74 */ addi r3, r1, 0x174 /* 802C3790 002C06F0 48 04 2D 15 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor /* 802C3794 002C06F4 38 61 01 C4 */ addi r3, r1, 0x1c4 @@ -477,9 +477,9 @@ lbl_802C3DCC: lbl_802C3DD8: /* 802C3DD8 002C0D38 7F E3 FB 78 */ mr r3, r31 /* 802C3DDC 002C0D3C 48 07 AE 4D */ bl ReadFloat__12CInputStreamFv -/* 802C3DE0 002C0D40 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802C3DE0 002C0D40 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802C3DE4 002C0D44 38 61 00 DC */ addi r3, r1, 0xdc -/* 802C3DE8 002C0D48 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802C3DE8 002C0D48 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802C3DEC 002C0D4C 38 C1 00 08 */ addi r6, r1, 8 /* 802C3DF0 002C0D50 7C 85 23 78 */ mr r5, r4 /* 802C3DF4 002C0D54 48 04 26 09 */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf @@ -512,9 +512,9 @@ lbl_802C3E5C: /* 802C3E5C 002C0DBC 7C 1B 03 78 */ mr r27, r0 /* 802C3E60 002C0DC0 48 00 00 C4 */ b lbl_802C3F24 lbl_802C3E64: -/* 802C3E64 002C0DC4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802C3E64 002C0DC4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802C3E68 002C0DC8 38 61 00 8C */ addi r3, r1, 0x8c -/* 802C3E6C 002C0DCC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802C3E6C 002C0DCC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802C3E70 002C0DD0 38 A1 00 08 */ addi r5, r1, 8 /* 802C3E74 002C0DD4 48 04 25 C1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 802C3E78 002C0DD8 38 61 01 7C */ addi r3, r1, 0x17c @@ -541,9 +541,9 @@ lbl_802C3EC8: /* 802C3EC8 002C0E28 7C 1B 03 78 */ mr r27, r0 /* 802C3ECC 002C0E2C 48 00 00 58 */ b lbl_802C3F24 lbl_802C3ED0: -/* 802C3ED0 002C0E30 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802C3ED0 002C0E30 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802C3ED4 002C0E34 38 61 00 3C */ addi r3, r1, 0x3c -/* 802C3ED8 002C0E38 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802C3ED8 002C0E38 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802C3EDC 002C0E3C 38 A1 00 08 */ addi r5, r1, 8 /* 802C3EE0 002C0E40 48 04 25 8D */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 802C3EE4 002C0E44 38 61 01 2C */ addi r3, r1, 0x12c diff --git a/asm/GuiSys/CGuiObject.s b/asm/GuiSys/CGuiObject.s index 15f647ac..24712de2 100644 --- a/asm/GuiSys/CGuiObject.s +++ b/asm/GuiSys/CGuiObject.s @@ -509,9 +509,9 @@ lbl_802C4DAC: lbl_802C4DB4: /* 802C4DB4 002C1D14 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 802C4DB8 002C1D18 41 82 02 3C */ beq lbl_802C4FF4 -/* 802C4DBC 002C1D1C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802C4DBC 002C1D1C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802C4DC0 002C1D20 83 FE 00 64 */ lwz r31, 0x64(r30) -/* 802C4DC4 002C1D24 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802C4DC4 002C1D24 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802C4DC8 002C1D28 38 61 01 58 */ addi r3, r1, 0x158 /* 802C4DCC 002C1D2C 48 04 DD A9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802C4DD0 002C1D30 C0 62 C3 98 */ lfs f3, lbl_805AE0B8@sda21(r2) @@ -758,9 +758,9 @@ RotateReset__10CGuiObjectFv: /* 802C5160 002C20C0 F3 A1 00 18 */ psq_st f29, 24(r1), 0, qr0 /* 802C5164 002C20C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C5168 002C20C8 7C 7F 1B 78 */ mr r31, r3 -/* 802C516C 002C20CC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802C516C 002C20CC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802C5170 002C20D0 C3 BF 00 30 */ lfs f29, 0x30(r31) -/* 802C5174 002C20D4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802C5174 002C20D4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802C5178 002C20D8 C3 DF 00 20 */ lfs f30, 0x20(r31) /* 802C517C 002C20DC 38 7F 00 04 */ addi r3, r31, 4 /* 802C5180 002C20E0 C3 FF 00 10 */ lfs f31, 0x10(r31) @@ -993,14 +993,14 @@ __ct__10CGuiObjectFv: /* 802C548C 002C23EC 38 04 C8 C8 */ addi r0, r4, lbl_803EC8C8@l /* 802C5490 002C23F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C5494 002C23F4 7C 7F 1B 78 */ mr r31, r3 -/* 802C5498 002C23F8 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802C5498 002C23F8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802C549C 002C23FC 90 1F 00 00 */ stw r0, 0(r31) -/* 802C54A0 002C2400 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802C54A0 002C2400 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802C54A4 002C2404 38 7F 00 04 */ addi r3, r31, 4 /* 802C54A8 002C2408 48 04 D6 CD */ bl __ct__12CTransform4fFRC12CTransform4f -/* 802C54AC 002C240C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802C54AC 002C240C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802C54B0 002C2410 38 7F 00 34 */ addi r3, r31, 0x34 -/* 802C54B4 002C2414 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802C54B4 002C2414 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802C54B8 002C2418 48 04 D6 BD */ bl __ct__12CTransform4fFRC12CTransform4f /* 802C54BC 002C241C 38 00 00 00 */ li r0, 0 /* 802C54C0 002C2420 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/GuiSys/CGuiWidget.s b/asm/GuiSys/CGuiWidget.s index 402e4d10..b5ecb674 100644 --- a/asm/GuiSys/CGuiWidget.s +++ b/asm/GuiSys/CGuiWidget.s @@ -81,9 +81,9 @@ ReapplyXform__10CGuiWidgetFv: /* 802CA670 002C75D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CA674 002C75D4 7C 7F 1B 78 */ mr r31, r3 /* 802CA678 002C75D8 4B FF AA C9 */ bl RotateReset__10CGuiObjectFv -/* 802CA67C 002C75DC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802CA67C 002C75DC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802CA680 002C75E0 7F E3 FB 78 */ mr r3, r31 -/* 802CA684 002C75E4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802CA684 002C75E4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802CA688 002C75E8 4B FF AB 41 */ bl SetLocalPosition__10CGuiObjectFRC9CVector3f /* 802CA68C 002C75EC 7F E3 FB 78 */ mr r3, r31 /* 802CA690 002C75F0 38 9F 00 74 */ addi r4, r31, 0x74 @@ -517,11 +517,11 @@ __ct__10CGuiWidgetFRCQ210CGuiWidget15CGuiWidgetParms: /* 802CAC3C 002C7B9C 7C 7E 1B 78 */ mr r30, r3 /* 802CAC40 002C7BA0 4B FF A8 3D */ bl __ct__10CGuiObjectFv /* 802CAC44 002C7BA4 3C 60 80 3F */ lis r3, lbl_803ECA10@ha -/* 802CAC48 002C7BA8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802CAC48 002C7BA8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802CAC4C 002C7BAC 38 03 CA 10 */ addi r0, r3, lbl_803ECA10@l /* 802CAC50 002C7BB0 90 1E 00 00 */ stw r0, 0(r30) /* 802CAC54 002C7BB4 38 7E 00 74 */ addi r3, r30, 0x74 -/* 802CAC58 002C7BB8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802CAC58 002C7BB8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802CAC5C 002C7BBC A8 1F 00 06 */ lha r0, 6(r31) /* 802CAC60 002C7BC0 B0 1E 00 70 */ sth r0, 0x70(r30) /* 802CAC64 002C7BC4 A8 1F 00 08 */ lha r0, 8(r31) diff --git a/asm/Kyoto/Animation/CAllFormatsAnimSource.s b/asm/Kyoto/Animation/CAllFormatsAnimSource.s index 99decda5..e7fd8b1f 100644 --- a/asm/Kyoto/Animation/CAllFormatsAnimSource.s +++ b/asm/Kyoto/Animation/CAllFormatsAnimSource.s @@ -288,8 +288,8 @@ lbl_802FE298: lbl_802FE300: /* 802FE300 002FB260 28 1E 00 00 */ cmplwi r30, 0 /* 802FE304 002FB264 41 82 00 20 */ beq lbl_802FE324 -/* 802FE308 002FB268 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802FE30C 002FB26C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802FE308 002FB268 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802FE30C 002FB26C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802FE310 002FB270 90 1E 00 00 */ stw r0, 0(r30) /* 802FE314 002FB274 41 82 00 10 */ beq lbl_802FE324 /* 802FE318 002FB278 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -341,11 +341,11 @@ lbl_802FE334: /* 802FE3B0 002FB310 28 03 00 00 */ cmplwi r3, 0 /* 802FE3B4 002FB314 41 82 00 38 */ beq lbl_802FE3EC /* 802FE3B8 002FB318 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802FE3BC 002FB31C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802FE3BC 002FB31C 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802FE3C0 002FB320 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802FE3C4 002FB324 3C 80 80 3F */ lis r4, lbl_803ED568@ha /* 802FE3C8 002FB328 90 03 00 00 */ stw r0, 0(r3) -/* 802FE3CC 002FB32C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802FE3CC 002FB32C 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802FE3D0 002FB330 38 A0 00 00 */ li r5, 0 /* 802FE3D4 002FB334 38 04 D5 68 */ addi r0, r4, lbl_803ED568@l /* 802FE3D8 002FB338 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Animation/CAnimCharacterSet.s b/asm/Kyoto/Animation/CAnimCharacterSet.s index e5291f84..965eb369 100644 --- a/asm/Kyoto/Animation/CAnimCharacterSet.s +++ b/asm/Kyoto/Animation/CAnimCharacterSet.s @@ -108,8 +108,8 @@ sub_802d81c0: lbl_802D8200: /* 802D8200 002D5160 28 1E 00 00 */ cmplwi r30, 0 /* 802D8204 002D5164 41 82 00 20 */ beq lbl_802D8224 -/* 802D8208 002D5168 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802D820C 002D516C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802D8208 002D5168 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802D820C 002D516C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802D8210 002D5170 90 1E 00 00 */ stw r0, 0(r30) /* 802D8214 002D5174 41 82 00 10 */ beq lbl_802D8224 /* 802D8218 002D5178 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -398,11 +398,11 @@ sub_802d85a0: /* 802D85D4 002D5534 28 03 00 00 */ cmplwi r3, 0 /* 802D85D8 002D5538 41 82 00 38 */ beq lbl_802D8610 /* 802D85DC 002D553C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802D85E0 002D5540 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802D85E0 002D5540 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802D85E4 002D5544 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802D85E8 002D5548 3C 80 80 3F */ lis r4, lbl_803ECBD0@ha /* 802D85EC 002D554C 90 03 00 00 */ stw r0, 0(r3) -/* 802D85F0 002D5550 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802D85F0 002D5550 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802D85F4 002D5554 38 A0 00 00 */ li r5, 0 /* 802D85F8 002D5558 38 04 CB D0 */ addi r0, r4, lbl_803ECBD0@l /* 802D85FC 002D555C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Animation/CAnimPOIData.s b/asm/Kyoto/Animation/CAnimPOIData.s index 70e6fadf..773fced9 100644 --- a/asm/Kyoto/Animation/CAnimPOIData.s +++ b/asm/Kyoto/Animation/CAnimPOIData.s @@ -136,8 +136,8 @@ sub_802ebbf8: lbl_802EBC38: /* 802EBC38 002E8B98 28 1E 00 00 */ cmplwi r30, 0 /* 802EBC3C 002E8B9C 41 82 00 20 */ beq lbl_802EBC5C -/* 802EBC40 002E8BA0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802EBC44 002E8BA4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802EBC40 002E8BA0 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802EBC44 002E8BA4 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802EBC48 002E8BA8 90 1E 00 00 */ stw r0, 0(r30) /* 802EBC4C 002E8BAC 41 82 00 10 */ beq lbl_802EBC5C /* 802EBC50 002E8BB0 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -324,11 +324,11 @@ lbl_802EBE40: /* 802EBEC4 002E8E24 28 03 00 00 */ cmplwi r3, 0 /* 802EBEC8 002E8E28 41 82 00 38 */ beq lbl_802EBF00 /* 802EBECC 002E8E2C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802EBED0 002E8E30 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802EBED0 002E8E30 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802EBED4 002E8E34 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802EBED8 002E8E38 3C 80 80 3F */ lis r4, lbl_803ECF48@ha /* 802EBEDC 002E8E3C 90 03 00 00 */ stw r0, 0(r3) -/* 802EBEE0 002E8E40 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802EBEE0 002E8E40 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802EBEE4 002E8E44 38 A0 00 00 */ li r5, 0 /* 802EBEE8 002E8E48 38 04 CF 48 */ addi r0, r4, lbl_803ECF48@l /* 802EBEEC 002E8E4C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Animation/CAnimSource.s b/asm/Kyoto/Animation/CAnimSource.s index d4303303..6d243947 100644 --- a/asm/Kyoto/Animation/CAnimSource.s +++ b/asm/Kyoto/Animation/CAnimSource.s @@ -629,8 +629,8 @@ lbl_802ECF18: /* 802ECFE4 002E9F44 D0 3D 00 08 */ stfs f1, 8(r29) /* 802ECFE8 002E9F48 48 00 00 20 */ b lbl_802ED008 lbl_802ECFEC: -/* 802ECFEC 002E9F4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802ECFF0 002E9F50 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 802ECFEC 002E9F4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802ECFF0 002E9F50 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 802ECFF4 002E9F54 D0 1D 00 00 */ stfs f0, 0(r29) /* 802ECFF8 002E9F58 C0 03 00 04 */ lfs f0, 4(r3) /* 802ECFFC 002E9F5C D0 1D 00 04 */ stfs f0, 4(r29) diff --git a/asm/Kyoto/Animation/CAnimSourceReader.s b/asm/Kyoto/Animation/CAnimSourceReader.s index c07d302c..30c345dd 100644 --- a/asm/Kyoto/Animation/CAnimSourceReader.s +++ b/asm/Kyoto/Animation/CAnimSourceReader.s @@ -117,8 +117,8 @@ VGetAdvancementResults__17CAnimSourceReaderCFRC13CCharAnimTimeRC13CCharAnimTime: /* 802EE390 002EB2F0 48 05 A0 AD */ bl __ge__13CCharAnimTimeCFRC13CCharAnimTime /* 802EE394 002EB2F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EE398 002EB2F8 41 82 00 58 */ beq lbl_802EE3F0 -/* 802EE39C 002EB2FC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802EE3A0 002EB300 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EE39C 002EB2FC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802EE3A0 002EB300 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EE3A4 002EB304 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EE3A8 002EB308 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802EE3AC 002EB30C C0 1D 00 00 */ lfs f0, 0(r29) @@ -143,8 +143,8 @@ lbl_802EE3F0: /* 802EE3F4 002EB354 48 05 9F BD */ bl EqualsZero__13CCharAnimTimeCFv /* 802EE3F8 002EB358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EE3FC 002EB35C 41 82 00 5C */ beq lbl_802EE458 -/* 802EE400 002EB360 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802EE404 002EB364 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EE400 002EB360 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802EE404 002EB364 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EE408 002EB368 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EE40C 002EB36C C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802EE410 002EB370 80 0D 9B C8 */ lwz r0, lbl_805A8788@sda21(r13) @@ -425,13 +425,13 @@ VReverseView__17CAnimSourceReaderFRC13CCharAnimTime: /* 802EE824 002EB784 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EE828 002EB788 41 82 00 68 */ beq lbl_802EE890 /* 802EE82C 002EB78C C0 1D 00 00 */ lfs f0, 0(r29) -/* 802EE830 002EB790 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802EE830 002EB790 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802EE834 002EB794 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EE838 002EB798 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 802EE83C 002EB79C 80 1D 00 04 */ lwz r0, 4(r29) /* 802EE840 002EB7A0 90 1F 00 10 */ stw r0, 0x10(r31) /* 802EE844 002EB7A4 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) -/* 802EE848 002EB7A8 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EE848 002EB7A8 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EE84C 002EB7AC C0 A3 00 04 */ lfs f5, 4(r3) /* 802EE850 002EB7B0 C0 44 00 04 */ lfs f2, 4(r4) /* 802EE854 002EB7B4 C0 64 00 08 */ lfs f3, 8(r4) @@ -454,8 +454,8 @@ lbl_802EE890: /* 802EE894 002EB7F4 48 05 9B 1D */ bl EqualsZero__13CCharAnimTimeCFv /* 802EE898 002EB7F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EE89C 002EB7FC 41 82 00 5C */ beq lbl_802EE8F8 -/* 802EE8A0 002EB800 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802EE8A4 002EB804 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EE8A0 002EB800 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802EE8A4 002EB804 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EE8A8 002EB808 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EE8AC 002EB80C C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802EE8B0 002EB810 80 0D 9B C8 */ lwz r0, lbl_805A8788@sda21(r13) @@ -1129,7 +1129,7 @@ VAdvanceView__17CAnimSourceReaderFRC13CCharAnimTime: /* 802EF220 002EC180 80 AD 9B C8 */ lwz r5, lbl_805A8788@sda21(r13) /* 802EF224 002EC184 38 00 00 00 */ li r0, 0 /* 802EF228 002EC188 C0 0D 9B CC */ lfs f0, lbl_805A878C@sda21(r13) -/* 802EF22C 002EC18C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802EF22C 002EC18C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802EF230 002EC190 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EF234 002EC194 90 A1 00 28 */ stw r5, 0x28(r1) /* 802EF238 002EC198 D0 1F 00 0C */ stfs f0, 0xc(r31) @@ -1139,7 +1139,7 @@ VAdvanceView__17CAnimSourceReaderFRC13CCharAnimTime: /* 802EF248 002EC1A8 90 1F 00 1C */ stw r0, 0x1c(r31) /* 802EF24C 002EC1AC 90 1F 00 20 */ stw r0, 0x20(r31) /* 802EF250 002EC1B0 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) -/* 802EF254 002EC1B4 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EF254 002EC1B4 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EF258 002EC1B8 C0 A3 00 04 */ lfs f5, 4(r3) /* 802EF25C 002EC1BC C0 44 00 04 */ lfs f2, 4(r4) /* 802EF260 002EC1C0 C0 64 00 08 */ lfs f3, 8(r4) @@ -1162,8 +1162,8 @@ lbl_802EF29C: /* 802EF2A0 002EC200 48 05 91 11 */ bl EqualsZero__13CCharAnimTimeCFv /* 802EF2A4 002EC204 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802EF2A8 002EC208 41 82 00 5C */ beq lbl_802EF304 -/* 802EF2AC 002EC20C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802EF2B0 002EC210 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802EF2AC 002EC20C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802EF2B0 002EC210 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802EF2B4 002EC214 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802EF2B8 002EC218 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802EF2BC 002EC21C 80 0D 9B C8 */ lwz r0, lbl_805A8788@sda21(r13) diff --git a/asm/Kyoto/Animation/CAnimTreeTimeScale.s b/asm/Kyoto/Animation/CAnimTreeTimeScale.s index 0fa8f83c..782642c7 100644 --- a/asm/Kyoto/Animation/CAnimTreeTimeScale.s +++ b/asm/Kyoto/Animation/CAnimTreeTimeScale.s @@ -1655,8 +1655,8 @@ lbl_802F57B8: /* 802F57E4 002F2744 38 61 00 38 */ addi r3, r1, 0x38 /* 802F57E8 002F2748 48 05 36 05 */ bl __ct__13CCharAnimTimeFf /* 802F57EC 002F274C C0 01 00 38 */ lfs f0, 0x38(r1) -/* 802F57F0 002F2750 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802F57F4 002F2754 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 802F57F0 002F2750 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802F57F4 002F2754 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 802F57F8 002F2758 80 01 00 3C */ lwz r0, 0x3c(r1) /* 802F57FC 002F275C 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F5800 002F2760 D0 01 00 88 */ stfs f0, 0x88(r1) diff --git a/asm/Kyoto/Animation/CAnimTreeTransition.s b/asm/Kyoto/Animation/CAnimTreeTransition.s index 43ce3484..f0099fbe 100644 --- a/asm/Kyoto/Animation/CAnimTreeTransition.s +++ b/asm/Kyoto/Animation/CAnimTreeTransition.s @@ -453,8 +453,8 @@ lbl_802F5F28: /* 802F5F48 002F2EA8 50 60 2E 74 */ rlwimi r0, r3, 5, 0x19, 0x1a /* 802F5F4C 002F2EAC 98 1E 00 20 */ stb r0, 0x20(r30) lbl_802F5F50: -/* 802F5F50 002F2EB0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802F5F54 002F2EB4 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F5F50 002F2EB0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802F5F54 002F2EB4 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F5F58 002F2EB8 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F5F5C 002F2EBC C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802F5F60 002F2EC0 80 0D 9C 08 */ lwz r0, lbl_805A87C8@sda21(r13) @@ -542,8 +542,8 @@ lbl_802F6094: /* 802F609C 002F2FFC 38 BE 00 2C */ addi r5, r30, 0x2c /* 802F60A0 002F3000 48 05 26 C5 */ bl __mi__13CCharAnimTimeCFRC13CCharAnimTime /* 802F60A4 002F3004 C0 01 00 18 */ lfs f0, 0x18(r1) -/* 802F60A8 002F3008 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802F60AC 002F300C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 802F60A8 002F3008 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802F60AC 002F300C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 802F60B0 002F3010 80 01 00 1C */ lwz r0, 0x1c(r1) /* 802F60B4 002F3014 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F60B8 002F3018 D0 01 00 40 */ stfs f0, 0x40(r1) @@ -699,8 +699,8 @@ AdvanceViewForTransitionalPeriod__19CAnimTreeTransitionFRC13CCharAnimTime: /* 802F62FC 002F325C 48 05 20 B5 */ bl EqualsZero__13CCharAnimTimeCFv /* 802F6300 002F3260 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F6304 002F3264 41 82 00 5C */ beq lbl_802F6360 -/* 802F6308 002F3268 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802F630C 002F326C C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F6308 002F3268 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802F630C 002F326C C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F6310 002F3270 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F6314 002F3274 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802F6318 002F3278 80 0D 9C 08 */ lwz r0, lbl_805A87C8@sda21(r13) diff --git a/asm/Kyoto/Animation/CCharLayoutInfo.s b/asm/Kyoto/Animation/CCharLayoutInfo.s index a3ae82d6..9dbb15f8 100644 --- a/asm/Kyoto/Animation/CCharLayoutInfo.s +++ b/asm/Kyoto/Animation/CCharLayoutInfo.s @@ -535,8 +535,8 @@ sub_802f8294: lbl_802F82D4: /* 802F82D4 002F5234 28 1E 00 00 */ cmplwi r30, 0 /* 802F82D8 002F5238 41 82 00 20 */ beq lbl_802F82F8 -/* 802F82DC 002F523C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802F82E0 002F5240 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802F82DC 002F523C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802F82E0 002F5240 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802F82E4 002F5244 90 1E 00 00 */ stw r0, 0(r30) /* 802F82E8 002F5248 41 82 00 10 */ beq lbl_802F82F8 /* 802F82EC 002F524C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -636,11 +636,11 @@ sub_802f83f4: /* 802F8428 002F5388 28 03 00 00 */ cmplwi r3, 0 /* 802F842C 002F538C 41 82 00 38 */ beq lbl_802F8464 /* 802F8430 002F5390 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802F8434 002F5394 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802F8434 002F5394 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802F8438 002F5398 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802F843C 002F539C 3C 80 80 3F */ lis r4, lbl_803ED420@ha /* 802F8440 002F53A0 90 03 00 00 */ stw r0, 0(r3) -/* 802F8444 002F53A4 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802F8444 002F53A4 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802F8448 002F53A8 38 A0 00 00 */ li r5, 0 /* 802F844C 002F53AC 38 04 D4 20 */ addi r0, r4, lbl_803ED420@l /* 802F8450 002F53B0 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Animation/CFBStreamedAnimReader.s b/asm/Kyoto/Animation/CFBStreamedAnimReader.s index 7d390842..ea53f219 100644 --- a/asm/Kyoto/Animation/CFBStreamedAnimReader.s +++ b/asm/Kyoto/Animation/CFBStreamedAnimReader.s @@ -117,8 +117,8 @@ VGetAdvancementResults__21CFBStreamedAnimReaderCFRC13CCharAnimTimeRC13CCharAnimT /* 802F8DD8 002F5D38 48 04 F6 65 */ bl __ge__13CCharAnimTimeCFRC13CCharAnimTime /* 802F8DDC 002F5D3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F8DE0 002F5D40 41 82 00 58 */ beq lbl_802F8E38 -/* 802F8DE4 002F5D44 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802F8DE8 002F5D48 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F8DE4 002F5D44 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802F8DE8 002F5D48 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F8DEC 002F5D4C 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F8DF0 002F5D50 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802F8DF4 002F5D54 C0 1E 00 00 */ lfs f0, 0(r30) @@ -143,8 +143,8 @@ lbl_802F8E38: /* 802F8E3C 002F5D9C 48 04 F5 75 */ bl EqualsZero__13CCharAnimTimeCFv /* 802F8E40 002F5DA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F8E44 002F5DA4 41 82 00 5C */ beq lbl_802F8EA0 -/* 802F8E48 002F5DA8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802F8E4C 002F5DAC C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F8E48 002F5DA8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802F8E4C 002F5DAC C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F8E50 002F5DB0 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F8E54 002F5DB4 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802F8E58 002F5DB8 80 0D 9C 18 */ lwz r0, lbl_805A87D8@sda21(r13) @@ -983,14 +983,14 @@ VAdvanceView__21CFBStreamedAnimReaderFRC13CCharAnimTime: /* 802F99CC 002F692C 90 1D 00 10 */ stw r0, 0x10(r29) /* 802F99D0 002F6930 4B FF FC BD */ bl sub_802f968c /* 802F99D4 002F6934 38 00 00 00 */ li r0, 0 -/* 802F99D8 002F6938 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802F99D8 002F6938 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802F99DC 002F693C 90 1D 00 14 */ stw r0, 0x14(r29) /* 802F99E0 002F6940 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F99E4 002F6944 90 1D 00 18 */ stw r0, 0x18(r29) /* 802F99E8 002F6948 90 1D 00 1C */ stw r0, 0x1c(r29) /* 802F99EC 002F694C 90 1D 00 20 */ stw r0, 0x20(r29) /* 802F99F0 002F6950 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) -/* 802F99F4 002F6954 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F99F4 002F6954 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F99F8 002F6958 C0 A3 00 04 */ lfs f5, 4(r3) /* 802F99FC 002F695C C0 44 00 04 */ lfs f2, 4(r4) /* 802F9A00 002F6960 C0 64 00 08 */ lfs f3, 8(r4) @@ -1013,8 +1013,8 @@ lbl_802F9A3C: /* 802F9A40 002F69A0 48 04 E9 71 */ bl EqualsZero__13CCharAnimTimeCFv /* 802F9A44 002F69A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F9A48 002F69A8 41 82 00 5C */ beq lbl_802F9AA4 -/* 802F9A4C 002F69AC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802F9A50 002F69B0 C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 802F9A4C 002F69AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802F9A50 002F69B0 C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 802F9A54 002F69B4 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 802F9A58 002F69B8 C4 83 66 60 */ lfsu f4, lbl_805A6660@l(r3) /* 802F9A5C 002F69BC 80 0D 9C 18 */ lwz r0, lbl_805A87D8@sda21(r13) @@ -1278,10 +1278,10 @@ lbl_802F9DD4: .global VReverseView__21CFBStreamedAnimReaderFRC13CCharAnimTime VReverseView__21CFBStreamedAnimReaderFRC13CCharAnimTime: /* 802F9DFC 002F6D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F9E00 002F6D60 3C A0 80 5A */ lis r5, skZero3f@ha +/* 802F9E00 002F6D60 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 802F9E04 002F6D64 3C 80 80 5A */ lis r4, lbl_805A6660@ha /* 802F9E08 002F6D68 C4 84 66 60 */ lfsu f4, lbl_805A6660@l(r4) -/* 802F9E0C 002F6D6C C4 25 66 A0 */ lfsu f1, skZero3f@l(r5) +/* 802F9E0C 002F6D6C C4 25 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r5) /* 802F9E10 002F6D70 80 0D 9C 18 */ lwz r0, lbl_805A87D8@sda21(r13) /* 802F9E14 002F6D74 C0 45 00 04 */ lfs f2, 4(r5) /* 802F9E18 002F6D78 C0 65 00 08 */ lfs f3, 8(r5) @@ -1400,8 +1400,8 @@ VGetOffset__21CFBStreamedAnimReaderCFRC6CSegId: /* 802F9FA0 002F6F00 3C 1E 00 01 */ addis r0, r30, 1 /* 802F9FA4 002F6F04 28 00 FF FF */ cmplwi r0, 0xffff /* 802F9FA8 002F6F08 40 82 00 24 */ bne lbl_802F9FCC -/* 802F9FAC 002F6F0C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802F9FB0 002F6F10 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 802F9FAC 002F6F0C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802F9FB0 002F6F10 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 802F9FB4 002F6F14 D0 1F 00 00 */ stfs f0, 0(r31) /* 802F9FB8 002F6F18 C0 03 00 04 */ lfs f0, 4(r3) /* 802F9FBC 002F6F1C D0 1F 00 04 */ stfs f0, 4(r31) diff --git a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s index 9359ee2c..858494c6 100644 --- a/asm/Kyoto/Animation/CHierarchyPoseBuilder.s +++ b/asm/Kyoto/Animation/CHierarchyPoseBuilder.s @@ -442,13 +442,13 @@ BuildNoScale__21CHierarchyPoseBuilderFR17CPoseAsTransforms: /* 802FC93C 002F989C 88 01 00 08 */ lbz r0, 8(r1) /* 802FC940 002F98A0 3C A0 80 5A */ lis r5, lbl_805A6660@ha /* 802FC944 002F98A4 3C 80 80 5A */ lis r4, lbl_805A65FC@ha -/* 802FC948 002F98A8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802FC948 002F98A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802FC94C 002F98AC 54 00 08 3C */ slwi r0, r0, 1 /* 802FC950 002F98B0 38 E5 66 60 */ addi r7, r5, lbl_805A6660@l /* 802FC954 002F98B4 7C BE 02 14 */ add r5, r30, r0 /* 802FC958 002F98B8 39 04 65 FC */ addi r8, r4, lbl_805A65FC@l /* 802FC95C 002F98BC 88 05 00 41 */ lbz r0, 0x41(r5) -/* 802FC960 002F98C0 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 802FC960 002F98C0 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 802FC964 002F98C4 80 BE 01 08 */ lwz r5, 0x108(r30) /* 802FC968 002F98C8 7F C3 F3 78 */ mr r3, r30 /* 802FC96C 002F98CC 54 00 2C F4 */ rlwinm r0, r0, 5, 0x13, 0x1a diff --git a/asm/Kyoto/Animation/CSequenceHelper.s b/asm/Kyoto/Animation/CSequenceHelper.s index f8c56c36..397e4263 100644 --- a/asm/Kyoto/Animation/CSequenceHelper.s +++ b/asm/Kyoto/Animation/CSequenceHelper.s @@ -60,8 +60,8 @@ ComputeSequenceFundamentals__15CSequenceHelperCFv: /* 802E5A00 002E2960 80 AD 9B 90 */ lwz r5, lbl_805A8750@sda21(r13) /* 802E5A04 002E2964 7C 9C 23 78 */ mr r28, r4 /* 802E5A08 002E2968 C0 0D 9B 94 */ lfs f0, lbl_805A8754@sda21(r13) -/* 802E5A0C 002E296C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802E5A10 002E2970 C7 E4 66 A0 */ lfsu f31, skZero3f@l(r4) +/* 802E5A0C 002E296C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802E5A10 002E2970 C7 E4 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r4) /* 802E5A14 002E2974 2C 1E 00 00 */ cmpwi r30, 0 /* 802E5A18 002E2978 90 A1 00 D8 */ stw r5, 0xd8(r1) /* 802E5A1C 002E297C 7C 6F 1B 78 */ mr r15, r3 diff --git a/asm/Kyoto/Animation/DolphinCSkinRules.s b/asm/Kyoto/Animation/DolphinCSkinRules.s index cb29499d..49fab3cc 100644 --- a/asm/Kyoto/Animation/DolphinCSkinRules.s +++ b/asm/Kyoto/Animation/DolphinCSkinRules.s @@ -411,8 +411,8 @@ lbl_80353D2C: lbl_80353D84: /* 80353D84 00350CE4 28 1E 00 00 */ cmplwi r30, 0 /* 80353D88 00350CE8 41 82 00 20 */ beq lbl_80353DA8 -/* 80353D8C 00350CEC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80353D90 00350CF0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80353D8C 00350CEC 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80353D90 00350CF0 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80353D94 00350CF4 90 1E 00 00 */ stw r0, 0(r30) /* 80353D98 00350CF8 41 82 00 10 */ beq lbl_80353DA8 /* 80353D9C 00350CFC 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -464,11 +464,11 @@ lbl_80353DB8: /* 80353E34 00350D94 28 03 00 00 */ cmplwi r3, 0 /* 80353E38 00350D98 41 82 00 38 */ beq lbl_80353E70 /* 80353E3C 00350D9C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80353E40 00350DA0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80353E40 00350DA0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80353E44 00350DA4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80353E48 00350DA8 3C 80 80 3F */ lis r4, lbl_803EF728@ha /* 80353E4C 00350DAC 90 03 00 00 */ stw r0, 0(r3) -/* 80353E50 00350DB0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80353E50 00350DB0 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80353E54 00350DB4 38 A0 00 00 */ li r5, 0 /* 80353E58 00350DB8 38 04 F7 28 */ addi r0, r4, lbl_803EF728@l /* 80353E5C 00350DBC 90 C3 00 00 */ stw r6, 0(r3) @@ -643,8 +643,8 @@ lbl_8035407C: /* 803540A0 00351000 7F 44 D2 14 */ add r26, r4, r26 /* 803540A4 00351004 48 00 00 0C */ b lbl_803540B0 lbl_803540A8: -/* 803540A8 00351008 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803540AC 0035100C 3B 43 66 A0 */ addi r26, r3, skZero3f@l +/* 803540A8 00351008 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803540AC 0035100C 3B 43 66 A0 */ addi r26, r3, sZeroVector__9CVector3f@l lbl_803540B0: /* 803540B0 00351010 7F 83 E3 78 */ mr r3, r28 /* 803540B4 00351014 38 81 00 08 */ addi r4, r1, 8 diff --git a/asm/Kyoto/Animation/DolphinCVirtualBone.s b/asm/Kyoto/Animation/DolphinCVirtualBone.s index 1ed17f0d..739eed68 100644 --- a/asm/Kyoto/Animation/DolphinCVirtualBone.s +++ b/asm/Kyoto/Animation/DolphinCVirtualBone.s @@ -444,9 +444,9 @@ lbl_80354C18: /* 80354D3C 00351C9C 4B FB DE 05 */ bl __as__12CTransform4fFRC12CTransform4f /* 80354D40 00351CA0 48 00 00 14 */ b lbl_80354D54 lbl_80354D44: -/* 80354D44 00351CA4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80354D44 00351CA4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80354D48 00351CA8 38 7D 00 20 */ addi r3, r29, 0x20 -/* 80354D4C 00351CAC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80354D4C 00351CAC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80354D50 00351CB0 4B FB DD F1 */ bl __as__12CTransform4fFRC12CTransform4f lbl_80354D54: /* 80354D54 00351CB4 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 @@ -590,9 +590,9 @@ lbl_80354F2C: /* 80354F30 00351E90 7F C3 F3 78 */ mr r3, r30 /* 80354F34 00351E94 90 01 00 08 */ stw r0, 8(r1) /* 80354F38 00351E98 4B FE 9D 4D */ bl ReadLong__12CInputStreamFv -/* 80354F3C 00351E9C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80354F3C 00351E9C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80354F40 00351EA0 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 80354F44 00351EA4 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80354F44 00351EA4 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80354F48 00351EA8 38 7F 00 20 */ addi r3, r31, 0x20 /* 80354F4C 00351EAC 4B FB DC 29 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80354F50 00351EB0 3C 80 80 5A */ lis r4, lbl_805A65FC@ha diff --git a/asm/Kyoto/Animation/IAnimReader.s b/asm/Kyoto/Animation/IAnimReader.s index 3b7d27ed..c75017e0 100644 --- a/asm/Kyoto/Animation/IAnimReader.s +++ b/asm/Kyoto/Animation/IAnimReader.s @@ -185,12 +185,12 @@ lbl_802FDE60: .global VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime VGetAdvancementResults__11IAnimReaderCFRC13CCharAnimTimeRC13CCharAnimTime: /* 802FDE74 002FADD4 C0 05 00 00 */ lfs f0, 0(r5) -/* 802FDE78 002FADD8 3C C0 80 5A */ lis r6, skZero3f@ha +/* 802FDE78 002FADD8 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 802FDE7C 002FADDC 3C 80 80 5A */ lis r4, lbl_805A6660@ha /* 802FDE80 002FADE0 D0 03 00 00 */ stfs f0, 0(r3) /* 802FDE84 002FADE4 80 05 00 04 */ lwz r0, 4(r5) /* 802FDE88 002FADE8 90 03 00 04 */ stw r0, 4(r3) -/* 802FDE8C 002FADEC C4 06 66 A0 */ lfsu f0, skZero3f@l(r6) +/* 802FDE8C 002FADEC C4 06 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r6) /* 802FDE90 002FADF0 D0 03 00 08 */ stfs f0, 8(r3) /* 802FDE94 002FADF4 C0 06 00 04 */ lfs f0, 4(r6) /* 802FDE98 002FADF8 D0 03 00 0C */ stfs f0, 0xc(r3) diff --git a/asm/Kyoto/Audio/CMidiManager.s b/asm/Kyoto/Audio/CMidiManager.s index e50a84bc..591e0c2c 100644 --- a/asm/Kyoto/Audio/CMidiManager.s +++ b/asm/Kyoto/Audio/CMidiManager.s @@ -144,8 +144,8 @@ lbl_80358D00: lbl_80358D08: /* 80358D08 00355C68 28 1D 00 00 */ cmplwi r29, 0 /* 80358D0C 00355C6C 41 82 00 20 */ beq lbl_80358D2C -/* 80358D10 00355C70 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80358D14 00355C74 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80358D10 00355C70 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80358D14 00355C74 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80358D18 00355C78 90 1D 00 00 */ stw r0, 0(r29) /* 80358D1C 00355C7C 41 82 00 10 */ beq lbl_80358D2C /* 80358D20 00355C80 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -198,11 +198,11 @@ lbl_80358D3C: /* 80358DBC 00355D1C 28 03 00 00 */ cmplwi r3, 0 /* 80358DC0 00355D20 41 82 00 38 */ beq lbl_80358DF8 /* 80358DC4 00355D24 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80358DC8 00355D28 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80358DC8 00355D28 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80358DCC 00355D2C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80358DD0 00355D30 3C 80 80 3F */ lis r4, lbl_803EF788@ha /* 80358DD4 00355D34 90 03 00 00 */ stw r0, 0(r3) -/* 80358DD8 00355D38 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80358DD8 00355D38 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80358DDC 00355D3C 38 A0 00 00 */ li r5, 0 /* 80358DE0 00355D40 38 04 F7 88 */ addi r0, r4, lbl_803EF788@l /* 80358DE4 00355D44 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Audio/CSfxManager.s b/asm/Kyoto/Audio/CSfxManager.s index 5932bee3..f1f85ccd 100644 --- a/asm/Kyoto/Audio/CSfxManager.s +++ b/asm/Kyoto/Audio/CSfxManager.s @@ -384,8 +384,8 @@ lbl_802E7B4C: lbl_802E7B54: /* 802E7B54 002E4AB4 28 1D 00 00 */ cmplwi r29, 0 /* 802E7B58 002E4AB8 41 82 00 20 */ beq lbl_802E7B78 -/* 802E7B5C 002E4ABC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802E7B60 002E4AC0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802E7B5C 002E4ABC 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802E7B60 002E4AC0 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802E7B64 002E4AC4 90 1D 00 00 */ stw r0, 0(r29) /* 802E7B68 002E4AC8 41 82 00 10 */ beq lbl_802E7B78 /* 802E7B6C 002E4ACC 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -438,11 +438,11 @@ lbl_802E7B88: /* 802E7C08 002E4B68 28 03 00 00 */ cmplwi r3, 0 /* 802E7C0C 002E4B6C 41 82 00 38 */ beq lbl_802E7C44 /* 802E7C10 002E4B70 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802E7C14 002E4B74 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802E7C14 002E4B74 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802E7C18 002E4B78 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802E7C1C 002E4B7C 3C 80 80 3F */ lis r4, lbl_803ECE74@ha /* 802E7C20 002E4B80 90 03 00 00 */ stw r0, 0(r3) -/* 802E7C24 002E4B84 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802E7C24 002E4B84 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802E7C28 002E4B88 38 A0 00 00 */ li r5, 0 /* 802E7C2C 002E4B8C 38 04 CE 74 */ addi r0, r4, lbl_803ECE74@l /* 802E7C30 002E4B90 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s index 9ae4460b..ab329c01 100644 --- a/asm/Kyoto/Audio/DolphinCAudioGroupSet.s +++ b/asm/Kyoto/Audio/DolphinCAudioGroupSet.s @@ -174,8 +174,8 @@ lbl_8034A248: lbl_8034A250: /* 8034A250 003471B0 28 1D 00 00 */ cmplwi r29, 0 /* 8034A254 003471B4 41 82 00 20 */ beq lbl_8034A274 -/* 8034A258 003471B8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8034A25C 003471BC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8034A258 003471B8 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8034A25C 003471BC 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8034A260 003471C0 90 1D 00 00 */ stw r0, 0(r29) /* 8034A264 003471C4 41 82 00 10 */ beq lbl_8034A274 /* 8034A268 003471C8 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -228,11 +228,11 @@ sub_8034a2d0: /* 8034A304 00347264 28 03 00 00 */ cmplwi r3, 0 /* 8034A308 00347268 41 82 00 38 */ beq lbl_8034A340 /* 8034A30C 0034726C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8034A310 00347270 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8034A310 00347270 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8034A314 00347274 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8034A318 00347278 3C 80 80 3F */ lis r4, lbl_803EF670@ha /* 8034A31C 0034727C 90 03 00 00 */ stw r0, 0(r3) -/* 8034A320 00347280 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8034A320 00347280 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8034A324 00347284 38 A0 00 00 */ li r5, 0 /* 8034A328 00347288 38 04 F6 70 */ addi r0, r4, lbl_803EF670@l /* 8034A32C 0034728C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Audio/DolphinCAudioSys.s b/asm/Kyoto/Audio/DolphinCAudioSys.s index ee2b9dd0..65a2b435 100644 --- a/asm/Kyoto/Audio/DolphinCAudioSys.s +++ b/asm/Kyoto/Audio/DolphinCAudioSys.s @@ -3471,8 +3471,8 @@ __sinit_DolphinCAudioSys_cpp: .section .sdata2, "a" .balign 8 -.global lbl_805AE960 -lbl_805AE960: +.global kMaxVolume__9CAudioSys +kMaxVolume__9CAudioSys: # ROM: 0x3FB200 .byte 0x7F diff --git a/asm/Kyoto/CDependencyGroup.s b/asm/Kyoto/CDependencyGroup.s index d8f3616c..310c1d38 100644 --- a/asm/Kyoto/CDependencyGroup.s +++ b/asm/Kyoto/CDependencyGroup.s @@ -130,8 +130,8 @@ lbl_803650E0: lbl_803650E8: /* 803650E8 00362048 28 1D 00 00 */ cmplwi r29, 0 /* 803650EC 0036204C 41 82 00 20 */ beq lbl_8036510C -/* 803650F0 00362050 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 803650F4 00362054 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 803650F0 00362050 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 803650F4 00362054 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 803650F8 00362058 90 1D 00 00 */ stw r0, 0(r29) /* 803650FC 0036205C 41 82 00 10 */ beq lbl_8036510C /* 80365100 00362060 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -184,11 +184,11 @@ sub_80365168: /* 8036519C 003620FC 28 03 00 00 */ cmplwi r3, 0 /* 803651A0 00362100 41 82 00 38 */ beq lbl_803651D8 /* 803651A4 00362104 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 803651A8 00362108 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 803651A8 00362108 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 803651AC 0036210C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 803651B0 00362110 3C 80 80 3F */ lis r4, lbl_803EF830@ha /* 803651B4 00362114 90 03 00 00 */ stw r0, 0(r3) -/* 803651B8 00362118 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 803651B8 00362118 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 803651BC 0036211C 38 A0 00 00 */ li r5, 0 /* 803651C0 00362120 38 04 F8 30 */ addi r0, r4, lbl_803EF830@l /* 803651C4 00362124 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Graphics/CCubeMaterial.s b/asm/Kyoto/Graphics/CCubeMaterial.s index 38b44d4d..f31e751a 100644 --- a/asm/Kyoto/Graphics/CCubeMaterial.s +++ b/asm/Kyoto/Graphics/CCubeMaterial.s @@ -301,8 +301,8 @@ lbl_803459A0: /* 803459E0 00342940 D0 41 00 10 */ stfs f2, 0x10(r1) /* 803459E4 00342944 D0 01 00 14 */ stfs f0, 0x14(r1) /* 803459E8 00342948 4B FC D0 3D */ bl TransposeRotate__12CTransform4fCFRC9CVector3f -/* 803459EC 0034294C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803459F0 00342950 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 803459EC 0034294C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803459F0 00342950 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 803459F4 00342954 C0 A1 00 3C */ lfs f5, 0x3c(r1) /* 803459F8 00342958 28 1E 00 00 */ cmplwi r30, 0 /* 803459FC 0034295C C0 81 00 40 */ lfs f4, 0x40(r1) @@ -511,8 +511,8 @@ lbl_80345C50: /* 80345D14 00342C74 4B FC EB E5 */ bl Normalize__9CVector3fFv /* 80345D18 00342C78 48 00 00 20 */ b lbl_80345D38 lbl_80345D1C: -/* 80345D1C 00342C7C 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 80345D20 00342C80 C4 43 67 18 */ lfsu f2, lbl_805A6718@l(r3) +/* 80345D1C 00342C7C 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 80345D20 00342C80 C4 43 67 18 */ lfsu f2, sRightVector__9CVector3f@l(r3) /* 80345D24 00342C84 C0 23 00 04 */ lfs f1, 4(r3) /* 80345D28 00342C88 C0 03 00 08 */ lfs f0, 8(r3) /* 80345D2C 00342C8C D0 41 00 48 */ stfs f2, 0x48(r1) @@ -2581,9 +2581,9 @@ lbl_80347A5C: /* 80347A80 003449E0 38 61 02 4C */ addi r3, r1, 0x24c /* 80347A84 003449E4 38 81 00 FC */ addi r4, r1, 0xfc /* 80347A88 003449E8 4B FC B0 ED */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80347A8C 003449EC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80347A8C 003449EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80347A90 003449F0 7F 64 DB 78 */ mr r4, r27 -/* 80347A94 003449F4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80347A94 003449F4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80347A98 003449F8 38 61 02 4C */ addi r3, r1, 0x24c /* 80347A9C 003449FC C0 46 00 00 */ lfs f2, 0(r6) /* 80347AA0 00344A00 38 A0 00 00 */ li r5, 0 @@ -2856,9 +2856,9 @@ lbl_80347E5C: /* 80347E94 00344DF4 38 A3 61 D4 */ addi r5, r3, lbl_805A61D4@l /* 80347E98 00344DF8 81 1F 00 C0 */ lwz r8, 0xc0(r31) /* 80347E9C 00344DFC C0 25 00 0C */ lfs f1, 0xc(r5) -/* 80347EA0 00344E00 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80347EA0 00344E00 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80347EA4 00344E04 C0 05 00 1C */ lfs f0, 0x1c(r5) -/* 80347EA8 00344E08 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 80347EA8 00344E08 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 80347EAC 00344E0C 83 5F 00 CC */ lwz r26, 0xcc(r31) /* 80347EB0 00344E10 7F 64 DB 78 */ mr r4, r27 /* 80347EB4 00344E14 EC 41 00 2A */ fadds f2, f1, f0 @@ -3120,13 +3120,13 @@ __sinit_CCubeMaterial_cpp: /* 8034825C 003451BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80348260 003451C0 7C 08 02 A6 */ mflr r0 /* 80348264 003451C4 3C 60 80 4C */ lis r3, lbl_804BFF5C@ha -/* 80348268 003451C8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80348268 003451C8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8034826C 003451CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80348270 003451D0 3C C0 80 4C */ lis r6, lbl_804BFF50@ha /* 80348274 003451D4 C0 02 CB DC */ lfs f0, lbl_805AE8FC@sda21(r2) /* 80348278 003451D8 3C A0 80 5A */ lis r5, lbl_805A67B4@ha /* 8034827C 003451DC 38 63 FF 5C */ addi r3, r3, lbl_804BFF5C@l -/* 80348280 003451E0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80348280 003451E0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80348284 003451E4 D4 06 FF 50 */ stfsu f0, lbl_804BFF50@l(r6) /* 80348288 003451E8 D4 05 67 B4 */ stfsu f0, lbl_805A67B4@l(r5) /* 8034828C 003451EC D0 06 00 04 */ stfs f0, 4(r6) diff --git a/asm/Kyoto/Graphics/DolphinCGraphics.s b/asm/Kyoto/Graphics/DolphinCGraphics.s index a80b4adf..4b1703af 100644 --- a/asm/Kyoto/Graphics/DolphinCGraphics.s +++ b/asm/Kyoto/Graphics/DolphinCGraphics.s @@ -3939,9 +3939,9 @@ SetIdentityModelMatrix__9CGraphicsFv: /* 8030C5A8 00309508 28 00 00 00 */ cmplwi r0, 0 /* 8030C5AC 0030950C 40 82 00 24 */ bne lbl_8030C5D0 /* 8030C5B0 00309510 3C 60 80 5A */ lis r3, lbl_805A6204@ha -/* 8030C5B4 00309514 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8030C5B4 00309514 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8030C5B8 00309518 38 63 62 04 */ addi r3, r3, lbl_805A6204@l -/* 8030C5BC 0030951C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8030C5BC 0030951C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8030C5C0 00309520 48 00 65 81 */ bl __as__12CTransform4fFRC12CTransform4f /* 8030C5C4 00309524 38 00 00 01 */ li r0, 1 /* 8030C5C8 00309528 98 0D 9C 80 */ stb r0, lbl_805A8840@sda21(r13) @@ -3956,9 +3956,9 @@ lbl_8030C5D0: SetModelMatrix__9CGraphicsFRC12CTransform4f: /* 8030C5E0 00309540 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030C5E4 00309544 7C 08 02 A6 */ mflr r0 -/* 8030C5E8 00309548 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8030C5E8 00309548 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8030C5EC 0030954C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030C5F0 00309550 38 04 66 70 */ addi r0, r4, skIdentity4f@l +/* 8030C5F0 00309550 38 04 66 70 */ addi r0, r4, sIdentity__12CTransform4f@l /* 8030C5F4 00309554 93 E1 00 0C */ stw r31, 0xc(r1) /* 8030C5F8 00309558 7C 7F 1B 78 */ mr r31, r3 /* 8030C5FC 0030955C 7C 1F 00 40 */ cmplw r31, r0 @@ -4019,17 +4019,17 @@ SetIdentityViewPointMatrix__9CGraphicsFv: /* 8030C6C4 00309624 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030C6C8 00309628 7C 08 02 A6 */ mflr r0 /* 8030C6CC 0030962C 3C 60 80 5A */ lis r3, lbl_805A61D4@ha -/* 8030C6D0 00309630 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8030C6D0 00309630 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8030C6D4 00309634 90 01 00 14 */ stw r0, 0x14(r1) /* 8030C6D8 00309638 38 63 61 D4 */ addi r3, r3, lbl_805A61D4@l -/* 8030C6DC 0030963C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8030C6DC 0030963C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8030C6E0 00309640 48 00 64 61 */ bl __as__12CTransform4fFRC12CTransform4f /* 8030C6E4 00309644 3C 60 80 5A */ lis r3, lbl_805A653C@ha /* 8030C6E8 00309648 38 63 65 3C */ addi r3, r3, lbl_805A653C@l /* 8030C6EC 0030964C 48 07 09 55 */ bl PSMTXIdentity -/* 8030C6F0 00309650 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8030C6F0 00309650 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8030C6F4 00309654 3C A0 80 5A */ lis r5, lbl_805A653C@ha -/* 8030C6F8 00309658 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8030C6F8 00309658 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8030C6FC 0030965C C0 A2 C7 F0 */ lfs f5, lbl_805AE510@sda21(r2) /* 8030C700 00309660 C0 44 00 00 */ lfs f2, 0(r4) /* 8030C704 00309664 38 A5 65 3C */ addi r5, r5, lbl_805A653C@l @@ -5551,11 +5551,11 @@ __sinit_DolphinCGraphics_cpp: /* 8030DDA4 0030AD04 C0 42 C8 10 */ lfs f2, lbl_805AE530@sda21(r2) /* 8030DDA8 0030AD08 3C 60 80 5A */ lis r3, lbl_805A61D4@ha /* 8030DDAC 0030AD0C 9C 05 61 B8 */ stbu r0, lbl_805A61B8@l(r5) -/* 8030DDB0 0030AD10 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8030DDB0 0030AD10 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8030DDB4 0030AD14 C0 22 C8 14 */ lfs f1, lbl_805AE534@sda21(r2) /* 8030DDB8 0030AD18 38 63 61 D4 */ addi r3, r3, lbl_805A61D4@l /* 8030DDBC 0030AD1C D4 66 61 AC */ stfsu f3, lbl_805A61AC@l(r6) -/* 8030DDC0 0030AD20 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8030DDC0 0030AD20 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8030DDC4 0030AD24 C0 02 C8 34 */ lfs f0, lbl_805AE554@sda21(r2) /* 8030DDC8 0030AD28 D0 67 00 04 */ stfs f3, 4(r7) /* 8030DDCC 0030AD2C D0 67 00 08 */ stfs f3, 8(r7) @@ -5569,9 +5569,9 @@ __sinit_DolphinCGraphics_cpp: /* 8030DDEC 0030AD4C D0 05 00 18 */ stfs f0, 0x18(r5) /* 8030DDF0 0030AD50 48 00 4D 85 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8030DDF4 0030AD54 3C 60 80 5A */ lis r3, lbl_805A6204@ha -/* 8030DDF8 0030AD58 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8030DDF8 0030AD58 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8030DDFC 0030AD5C 38 63 62 04 */ addi r3, r3, lbl_805A6204@l -/* 8030DE00 0030AD60 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8030DE00 0030AD60 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8030DE04 0030AD64 48 00 4D 71 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8030DE08 0030AD68 48 03 C1 AD */ bl Black__6CColorFv /* 8030DE0C 0030AD6C 80 03 00 00 */ lwz r0, 0(r3) diff --git a/asm/Kyoto/Graphics/DolphinCModel.s b/asm/Kyoto/Graphics/DolphinCModel.s index 05460f45..e3997c53 100644 --- a/asm/Kyoto/Graphics/DolphinCModel.s +++ b/asm/Kyoto/Graphics/DolphinCModel.s @@ -587,8 +587,8 @@ lbl_803557DC: lbl_80355844: /* 80355844 003527A4 28 1E 00 00 */ cmplwi r30, 0 /* 80355848 003527A8 41 82 00 20 */ beq lbl_80355868 -/* 8035584C 003527AC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80355850 003527B0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8035584C 003527AC 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80355850 003527B0 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80355854 003527B4 90 1E 00 00 */ stw r0, 0(r30) /* 80355858 003527B8 41 82 00 10 */ beq lbl_80355868 /* 8035585C 003527BC 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -640,11 +640,11 @@ lbl_80355878: /* 803558F4 00352854 28 03 00 00 */ cmplwi r3, 0 /* 803558F8 00352858 41 82 00 38 */ beq lbl_80355930 /* 803558FC 0035285C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80355900 00352860 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80355900 00352860 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80355904 00352864 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80355908 00352868 3C 80 80 3F */ lis r4, lbl_803EF738@ha /* 8035590C 0035286C 90 03 00 00 */ stw r0, 0(r3) -/* 80355910 00352870 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80355910 00352870 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80355914 00352874 38 A0 00 00 */ li r5, 0 /* 80355918 00352878 38 04 F7 38 */ addi r0, r4, lbl_803EF738@l /* 8035591C 0035287C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Graphics/DolphinCTexture.s b/asm/Kyoto/Graphics/DolphinCTexture.s index 9cc89a1c..fb7059b7 100644 --- a/asm/Kyoto/Graphics/DolphinCTexture.s +++ b/asm/Kyoto/Graphics/DolphinCTexture.s @@ -605,11 +605,11 @@ lbl_8030E83C: /* 8030E8B4 0030B814 28 03 00 00 */ cmplwi r3, 0 /* 8030E8B8 0030B818 41 82 00 38 */ beq lbl_8030E8F0 /* 8030E8BC 0030B81C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8030E8C0 0030B820 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8030E8C0 0030B820 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8030E8C4 0030B824 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8030E8C8 0030B828 3C 80 80 3E */ lis r4, lbl_803D8D84@ha /* 8030E8CC 0030B82C 90 03 00 00 */ stw r0, 0(r3) -/* 8030E8D0 0030B830 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8030E8D0 0030B830 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8030E8D4 0030B834 38 A0 00 00 */ li r5, 0 /* 8030E8D8 0030B838 38 04 8D 84 */ addi r0, r4, lbl_803D8D84@l /* 8030E8DC 0030B83C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Math/CAABox.s b/asm/Kyoto/Math/CAABox.s index 2af63c6b..02fcc44e 100644 --- a/asm/Kyoto/Math/CAABox.s +++ b/asm/Kyoto/Math/CAABox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.comm lbl_805A6754, 0x30, 4 +.comm mskInvertedBox__6CAABox, 0x30, 4 .comm lbl_805A6784, 0x18, 4 .section .ctors, "wa" @@ -421,16 +421,16 @@ Invalid__6CAABoxCFv: /* 803376C4 00334624 38 60 00 01 */ li r3, 1 /* 803376C8 00334628 48 00 00 48 */ b lbl_80337710 lbl_803376CC: -/* 803376CC 0033462C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 803376CC 0033462C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 803376D0 00334630 C0 22 CB 90 */ lfs f1, lbl_805AE8B0@sda21(r2) -/* 803376D4 00334634 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 803376D4 00334634 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 803376D8 00334638 7F E3 FB 78 */ mr r3, r31 /* 803376DC 0033463C 4B FD CE D5 */ bl IsEqu__9CVector3fCFRC9CVector3ff /* 803376E0 00334640 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803376E4 00334644 41 82 00 28 */ beq lbl_8033770C -/* 803376E8 00334648 3C 60 80 5A */ lis r3, skZero3f@ha +/* 803376E8 00334648 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 803376EC 0033464C C0 22 CB 90 */ lfs f1, lbl_805AE8B0@sda21(r2) -/* 803376F0 00334650 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 803376F0 00334650 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 803376F4 00334654 38 7F 00 0C */ addi r3, r31, 0xc /* 803376F8 00334658 4B FD CE B9 */ bl IsEqu__9CVector3fCFRC9CVector3ff /* 803376FC 0033465C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -450,13 +450,13 @@ lbl_80337710: GetBooleanIntersection__6CAABoxCFRC6CAABox: /* 80337724 00334684 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80337728 00334688 7C 08 02 A6 */ mflr r0 -/* 8033772C 0033468C 3C C0 80 5A */ lis r6, skZero3f@ha +/* 8033772C 0033468C 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 80337730 00334690 7C A7 2B 78 */ mr r7, r5 /* 80337734 00334694 90 01 00 24 */ stw r0, 0x24(r1) /* 80337738 00334698 38 00 00 03 */ li r0, 3 /* 8033773C 0033469C 7C 88 23 78 */ mr r8, r4 /* 80337740 003346A0 39 41 00 14 */ addi r10, r1, 0x14 -/* 80337744 003346A4 C4 06 66 A0 */ lfsu f0, skZero3f@l(r6) +/* 80337744 003346A4 C4 06 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r6) /* 80337748 003346A8 39 61 00 08 */ addi r11, r1, 8 /* 8033774C 003346AC 39 20 00 00 */ li r9, 0 /* 80337750 003346B0 C0 26 00 04 */ lfs f1, 4(r6) @@ -588,9 +588,9 @@ lbl_803378EC: GetTransformedAABox__6CAABoxCFRC12CTransform4f: /* 803378FC 0033485C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80337900 00334860 7C 08 02 A6 */ mflr r0 -/* 80337904 00334864 3C C0 80 5A */ lis r6, skIdentity4f@ha +/* 80337904 00334864 3C C0 80 5A */ lis r6, sIdentity__12CTransform4f@ha /* 80337908 00334868 90 01 00 24 */ stw r0, 0x24(r1) -/* 8033790C 0033486C 38 06 66 70 */ addi r0, r6, skIdentity4f@l +/* 8033790C 0033486C 38 06 66 70 */ addi r0, r6, sIdentity__12CTransform4f@l /* 80337910 00334870 7C 05 00 40 */ cmplw r5, r0 /* 80337914 00334874 40 82 00 38 */ bne lbl_8033794C /* 80337918 00334878 C0 04 00 00 */ lfs f0, 0(r4) @@ -1464,10 +1464,10 @@ __ct__6CAABoxFR12CInputStream: .global __sinit_CAABox_cpp __sinit_CAABox_cpp: /* 80338584 003354E4 C0 42 CB 94 */ lfs f2, lbl_805AE8B4@sda21(r2) -/* 80338588 003354E8 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 80338588 003354E8 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 8033858C 003354EC C0 02 CB 88 */ lfs f0, lbl_805AE8A8@sda21(r2) /* 80338590 003354F0 3C 60 80 5A */ lis r3, lbl_805A6784@ha -/* 80338594 003354F4 D4 44 67 54 */ stfsu f2, lbl_805A6754@l(r4) +/* 80338594 003354F4 D4 44 67 54 */ stfsu f2, mskInvertedBox__6CAABox@l(r4) /* 80338598 003354F8 C0 22 CB 98 */ lfs f1, lbl_805AE8B8@sda21(r2) /* 8033859C 003354FC D4 03 67 84 */ stfsu f0, lbl_805A6784@l(r3) /* 803385A0 00335500 D0 44 00 04 */ stfs f2, 4(r4) diff --git a/asm/Kyoto/Math/CFrustumPlanes.s b/asm/Kyoto/Math/CFrustumPlanes.s index 38466bf7..d16a16f1 100644 --- a/asm/Kyoto/Math/CFrustumPlanes.s +++ b/asm/Kyoto/Math/CFrustumPlanes.s @@ -338,8 +338,8 @@ __ct__14CFrustumPlanesFRC12CTransform4ffffbf: /* 80345474 003423D4 D0 03 00 0C */ stfs f0, 0xc(r3) lbl_80345478: /* 80345478 003423D8 80 DC 00 00 */ lwz r6, 0(r28) -/* 8034547C 003423DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80345480 003423E0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8034547C 003423DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80345480 003423E0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80345484 003423E4 7F E5 FB 78 */ mr r5, r31 /* 80345488 003423E8 38 06 00 01 */ addi r0, r6, 1 /* 8034548C 003423EC 38 61 00 2C */ addi r3, r1, 0x2c @@ -363,8 +363,8 @@ lbl_80345478: /* 803454D4 00342434 D0 03 00 0C */ stfs f0, 0xc(r3) lbl_803454D8: /* 803454D8 00342438 80 BC 00 00 */ lwz r5, 0(r28) -/* 803454DC 0034243C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803454E0 00342440 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 803454DC 0034243C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803454E0 00342440 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 803454E4 00342444 3B 61 00 B0 */ addi r27, r1, 0xb0 /* 803454E8 00342448 38 05 00 01 */ addi r0, r5, 1 /* 803454EC 0034244C 7F C6 F3 78 */ mr r6, r30 @@ -389,8 +389,8 @@ lbl_803454D8: /* 80345538 00342498 D0 03 00 0C */ stfs f0, 0xc(r3) lbl_8034553C: /* 8034553C 0034249C 80 BC 00 00 */ lwz r5, 0(r28) -/* 80345540 003424A0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80345544 003424A4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80345540 003424A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80345544 003424A4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80345548 003424A8 7F 66 DB 78 */ mr r6, r27 /* 8034554C 003424AC 38 05 00 01 */ addi r0, r5, 1 /* 80345550 003424B0 38 61 00 14 */ addi r3, r1, 0x14 @@ -414,8 +414,8 @@ lbl_8034553C: /* 80345598 003424F8 D0 03 00 0C */ stfs f0, 0xc(r3) lbl_8034559C: /* 8034559C 003424FC 80 DC 00 00 */ lwz r6, 0(r28) -/* 803455A0 00342500 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803455A4 00342504 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 803455A0 00342500 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803455A4 00342504 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 803455A8 00342508 7F C5 F3 78 */ mr r5, r30 /* 803455AC 0034250C 38 06 00 01 */ addi r0, r6, 1 /* 803455B0 00342510 7F E6 FB 78 */ mr r6, r31 diff --git a/asm/Kyoto/Math/CQuaternion.s b/asm/Kyoto/Math/CQuaternion.s index 7fcdd1b6..a469e729 100644 --- a/asm/Kyoto/Math/CQuaternion.s +++ b/asm/Kyoto/Math/CQuaternion.s @@ -823,9 +823,9 @@ lbl_80311488: /* 803114B0 0030E410 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 803114B4 0030E414 40 80 00 2C */ bge lbl_803114E0 /* 803114B8 0030E418 C0 02 C8 A0 */ lfs f0, lbl_805AE5C0@sda21(r2) -/* 803114BC 0030E41C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 803114BC 0030E41C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 803114C0 0030E420 D0 1E 00 00 */ stfs f0, 0(r30) -/* 803114C4 0030E424 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 803114C4 0030E424 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 803114C8 0030E428 D0 1E 00 04 */ stfs f0, 4(r30) /* 803114CC 0030E42C C0 03 00 04 */ lfs f0, 4(r3) /* 803114D0 0030E430 D0 1E 00 08 */ stfs f0, 8(r30) diff --git a/asm/Kyoto/Math/CTransform4f.s b/asm/Kyoto/Math/CTransform4f.s index 67b50217..09dc83d4 100644 --- a/asm/Kyoto/Math/CTransform4f.s +++ b/asm/Kyoto/Math/CTransform4f.s @@ -1,6 +1,6 @@ .include "macros.inc" -.comm skIdentity4f, 0x30, 4 +.comm sIdentity__12CTransform4f, 0x30, 4 .section .ctors, "wa" lbl_ctor: @@ -1373,9 +1373,9 @@ lbl_80313A38: /* 80313A98 003109F8 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80313A9C 003109FC 48 00 03 35 */ bl __ct__13CUnitVector3fFRC9CVector3f /* 80313AA0 00310A00 C0 61 00 24 */ lfs f3, 0x24(r1) -/* 80313AA4 00310A04 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80313AA4 00310A04 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80313AA8 00310A08 C0 BF 00 00 */ lfs f5, 0(r31) -/* 80313AAC 00310A0C 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 80313AAC 00310A0C 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 80313AB0 00310A10 C0 81 00 28 */ lfs f4, 0x28(r1) /* 80313AB4 00310A14 7F C3 F3 78 */ mr r3, r30 /* 80313AB8 00310A18 C0 3F 00 04 */ lfs f1, 4(r31) @@ -1571,9 +1571,9 @@ lbl_80313CE8: .global __sinit_CTransform4f_cpp __sinit_CTransform4f_cpp: /* 80313D90 00310CF0 C0 22 C8 D0 */ lfs f1, lbl_805AE5F0@sda21(r2) -/* 80313D94 00310CF4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80313D94 00310CF4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80313D98 00310CF8 C0 02 C8 D4 */ lfs f0, lbl_805AE5F4@sda21(r2) -/* 80313D9C 00310CFC D4 23 66 70 */ stfsu f1, skIdentity4f@l(r3) +/* 80313D9C 00310CFC D4 23 66 70 */ stfsu f1, sIdentity__12CTransform4f@l(r3) /* 80313DA0 00310D00 D0 03 00 04 */ stfs f0, 4(r3) /* 80313DA4 00310D04 D0 03 00 08 */ stfs f0, 8(r3) /* 80313DA8 00310D08 D0 03 00 0C */ stfs f0, 0xc(r3) diff --git a/asm/Kyoto/Math/CUnitVector3f.s b/asm/Kyoto/Math/CUnitVector3f.s index 06bf55dd..a15281fb 100644 --- a/asm/Kyoto/Math/CUnitVector3f.s +++ b/asm/Kyoto/Math/CUnitVector3f.s @@ -30,8 +30,8 @@ lbl_80313E14: /* 80313E24 00310D84 38 81 00 08 */ addi r4, r1, 8 /* 80313E28 00310D88 48 00 00 0C */ b lbl_80313E34 lbl_80313E2C: -/* 80313E2C 00310D8C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80313E30 00310D90 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80313E2C 00310D8C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80313E30 00310D90 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l lbl_80313E34: /* 80313E34 00310D94 C0 04 00 00 */ lfs f0, 0(r4) /* 80313E38 00310D98 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/Kyoto/Math/CVector3f.s b/asm/Kyoto/Math/CVector3f.s index 73b871c3..11ed36ec 100644 --- a/asm/Kyoto/Math/CVector3f.s +++ b/asm/Kyoto/Math/CVector3f.s @@ -1,13 +1,13 @@ .include "macros.inc" -.comm skZero3f, 0xC, 4 +.comm sZeroVector__9CVector3f, 0xC, 4 .comm lbl_805A66AC, 0x48, 4 # unreferenced, what's this? -.comm lbl_805A66F4, 0xC, 4 -.comm lbl_805A6700, 0xC, 4 -.comm lbl_805A670C, 0xC, 4 -.comm lbl_805A6718, 0xC, 4 -.comm lbl_805A6724, 0xC, 4 -.comm lbl_805A6730, 0xC, 4 +.comm sUpVector__9CVector3f, 0xC, 4 +.comm sDownVector__9CVector3f, 0xC, 4 +.comm sLeftVector__9CVector3f, 0xC, 4 +.comm sRightVector__9CVector3f, 0xC, 4 +.comm sForwardVector__9CVector3f, 0xC, 4 +.comm sBackVector__9CVector3f, 0xC, 4 .section .ctors, "wa" lbl_ctor: @@ -452,22 +452,22 @@ __ct__9CVector3fFR12CInputStream: .global __sinit_CVector3f_cpp __sinit_CVector3f_cpp: /* 80314BC8 00311B28 C0 42 C9 10 */ lfs f2, lbl_805AE630@sda21(r2) -/* 80314BCC 00311B2C 3D 20 80 5A */ lis r9, skZero3f@ha +/* 80314BCC 00311B2C 3D 20 80 5A */ lis r9, sZeroVector__9CVector3f@ha /* 80314BD0 00311B30 C0 02 C9 18 */ lfs f0, lbl_805AE638@sda21(r2) -/* 80314BD4 00311B34 3D 00 80 5A */ lis r8, lbl_805A66F4@ha -/* 80314BD8 00311B38 D4 49 66 A0 */ stfsu f2, skZero3f@l(r9) -/* 80314BDC 00311B3C 3C E0 80 5A */ lis r7, lbl_805A6700@ha -/* 80314BE0 00311B40 3C C0 80 5A */ lis r6, lbl_805A670C@ha -/* 80314BE4 00311B44 3C 80 80 5A */ lis r4, lbl_805A6724@ha -/* 80314BE8 00311B48 D4 47 67 00 */ stfsu f2, lbl_805A6700@l(r7) -/* 80314BEC 00311B4C 3C 60 80 5A */ lis r3, lbl_805A6730@ha +/* 80314BD4 00311B34 3D 00 80 5A */ lis r8, sUpVector__9CVector3f@ha +/* 80314BD8 00311B38 D4 49 66 A0 */ stfsu f2, sZeroVector__9CVector3f@l(r9) +/* 80314BDC 00311B3C 3C E0 80 5A */ lis r7, sDownVector__9CVector3f@ha +/* 80314BE0 00311B40 3C C0 80 5A */ lis r6, sLeftVector__9CVector3f@ha +/* 80314BE4 00311B44 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha +/* 80314BE8 00311B48 D4 47 67 00 */ stfsu f2, sDownVector__9CVector3f@l(r7) +/* 80314BEC 00311B4C 3C 60 80 5A */ lis r3, sBackVector__9CVector3f@ha /* 80314BF0 00311B50 C0 22 C9 1C */ lfs f1, lbl_805AE63C@sda21(r2) -/* 80314BF4 00311B54 3C A0 80 5A */ lis r5, lbl_805A6718@ha -/* 80314BF8 00311B58 D4 48 66 F4 */ stfsu f2, lbl_805A66F4@l(r8) -/* 80314BFC 00311B5C D4 06 67 0C */ stfsu f0, lbl_805A670C@l(r6) -/* 80314C00 00311B60 D4 25 67 18 */ stfsu f1, lbl_805A6718@l(r5) -/* 80314C04 00311B64 D4 44 67 24 */ stfsu f2, lbl_805A6724@l(r4) -/* 80314C08 00311B68 D4 43 67 30 */ stfsu f2, lbl_805A6730@l(r3) +/* 80314BF4 00311B54 3C A0 80 5A */ lis r5, sRightVector__9CVector3f@ha +/* 80314BF8 00311B58 D4 48 66 F4 */ stfsu f2, sUpVector__9CVector3f@l(r8) +/* 80314BFC 00311B5C D4 06 67 0C */ stfsu f0, sLeftVector__9CVector3f@l(r6) +/* 80314C00 00311B60 D4 25 67 18 */ stfsu f1, sRightVector__9CVector3f@l(r5) +/* 80314C04 00311B64 D4 44 67 24 */ stfsu f2, sForwardVector__9CVector3f@l(r4) +/* 80314C08 00311B68 D4 43 67 30 */ stfsu f2, sBackVector__9CVector3f@l(r3) /* 80314C0C 00311B6C D0 49 00 04 */ stfs f2, 4(r9) /* 80314C10 00311B70 D0 49 00 08 */ stfs f2, 8(r9) /* 80314C14 00311B74 D0 48 00 04 */ stfs f2, 4(r8) diff --git a/asm/Kyoto/Particles/CElementGen.s b/asm/Kyoto/Particles/CElementGen.s index 55b3fe58..3649de71 100644 --- a/asm/Kyoto/Particles/CElementGen.s +++ b/asm/Kyoto/Particles/CElementGen.s @@ -762,9 +762,9 @@ BuildParticleSystemBounds__11CElementGenFv: /* 80317A38 00314998 DB A1 01 50 */ stfd f29, 0x150(r1) /* 80317A3C 0031499C F3 A1 01 58 */ psq_st f29, 344(r1), 0, qr0 /* 80317A40 003149A0 BF 41 01 38 */ stmw r26, 0x138(r1) -/* 80317A44 003149A4 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 80317A44 003149A4 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 80317A48 003149A8 7C 7C 1B 78 */ mr r28, r3 -/* 80317A4C 003149AC 3B E4 67 54 */ addi r31, r4, lbl_805A6754@l +/* 80317A4C 003149AC 3B E4 67 54 */ addi r31, r4, mskInvertedBox__6CAABox@l /* 80317A50 003149B0 3B C1 00 C4 */ addi r30, r1, 0xc4 /* 80317A54 003149B4 C0 BF 00 00 */ lfs f5, 0(r31) /* 80317A58 003149B8 3B A0 00 00 */ li r29, 0 @@ -915,8 +915,8 @@ lbl_80317B30: /* 80317C8C 00314BEC 90 1C 03 04 */ stw r0, 0x304(r28) /* 80317C90 00314BF0 48 00 00 3C */ b lbl_80317CCC lbl_80317C94: -/* 80317C94 00314BF4 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 80317C98 00314BF8 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 80317C94 00314BF4 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 80317C98 00314BF8 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 80317C9C 00314BFC 80 64 00 00 */ lwz r3, 0(r4) /* 80317CA0 00314C00 80 04 00 04 */ lwz r0, 4(r4) /* 80317CA4 00314C04 90 7C 02 F0 */ stw r3, 0x2f0(r28) @@ -1312,8 +1312,8 @@ lbl_8031820C: /* 80318220 00315180 4B FF 20 99 */ bl SetTevOp__9CGraphicsF12ERglTevStageRCQ213CTevCombiners8CTevPass lbl_80318224: /* 80318224 00315184 C0 02 C9 E8 */ lfs f0, lbl_805AE708@sda21(r2) -/* 80318228 00315188 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8031822C 0031518C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80318228 00315188 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8031822C 0031518C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80318230 00315190 D0 01 00 EC */ stfs f0, 0xec(r1) /* 80318234 00315194 38 61 04 A4 */ addi r3, r1, 0x4a4 /* 80318238 00315198 D0 01 00 F0 */ stfs f0, 0xf0(r1) @@ -1355,9 +1355,9 @@ lbl_803182AC: /* 803182C0 00315220 38 81 03 B4 */ addi r4, r1, 0x3b4 /* 803182C4 00315224 38 BE 00 E8 */ addi r5, r30, 0xe8 /* 803182C8 00315228 4B FF A8 21 */ bl __ml__12CTransform4fCFRC9CVector3f -/* 803182CC 0031522C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 803182CC 0031522C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 803182D0 00315230 C3 E1 00 B0 */ lfs f31, 0xb0(r1) -/* 803182D4 00315234 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 803182D4 00315234 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 803182D8 00315238 C3 C1 00 B4 */ lfs f30, 0xb4(r1) /* 803182DC 0031523C C3 A1 00 B8 */ lfs f29, 0xb8(r1) /* 803182E0 00315240 38 61 04 74 */ addi r3, r1, 0x474 @@ -1494,8 +1494,8 @@ lbl_80318444: /* 803184DC 0031543C 2C 00 00 01 */ cmpwi r0, 1 /* 803184E0 00315440 40 82 00 8C */ bne lbl_8031856C /* 803184E4 00315444 80 1E 00 5C */ lwz r0, 0x5c(r30) -/* 803184E8 00315448 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803184EC 0031544C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 803184E8 00315448 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803184EC 0031544C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 803184F0 00315450 38 61 04 14 */ addi r3, r1, 0x414 /* 803184F4 00315454 7C 80 CA 14 */ add r4, r0, r25 /* 803184F8 00315458 4B FF AD 81 */ bl __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f @@ -1929,9 +1929,9 @@ RenderLines__11CElementGenFv: /* 80318B5C 00315ABC 38 61 02 34 */ addi r3, r1, 0x234 /* 80318B60 00315AC0 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l /* 80318B64 00315AC4 4B FF A0 11 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80318B68 00315AC8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80318B68 00315AC8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80318B6C 00315ACC 38 61 01 A4 */ addi r3, r1, 0x1a4 -/* 80318B70 00315AD0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80318B70 00315AD0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80318B74 00315AD4 38 81 02 34 */ addi r4, r1, 0x234 /* 80318B78 00315AD8 C0 45 00 00 */ lfs f2, 0(r5) /* 80318B7C 00315ADC C0 25 00 04 */ lfs f1, 4(r5) @@ -2459,9 +2459,9 @@ RenderParticlesIndirectTexture__11CElementGenFv: /* 80319340 003162A0 38 84 61 D4 */ addi r4, r4, lbl_805A61D4@l /* 80319344 003162A4 38 7F 02 8C */ addi r3, r31, 0x28c /* 80319348 003162A8 4B FF 98 2D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8031934C 003162AC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8031934C 003162AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80319350 003162B0 38 7F 01 FC */ addi r3, r31, 0x1fc -/* 80319354 003162B4 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80319354 003162B4 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80319358 003162B8 38 9F 02 8C */ addi r4, r31, 0x28c /* 8031935C 003162BC C0 45 00 00 */ lfs f2, 0(r5) /* 80319360 003162C0 C0 25 00 04 */ lfs f1, 4(r5) @@ -3205,9 +3205,9 @@ sub_80319e3c: /* 80319E94 00316DF4 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 80319E98 00316DF8 38 9F 00 F4 */ addi r4, r31, 0xf4 /* 80319E9C 00316DFC 4B FF 8C D9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80319EA0 00316E00 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80319EA0 00316E00 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80319EA4 00316E04 38 7F 00 64 */ addi r3, r31, 0x64 -/* 80319EA8 00316E08 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80319EA8 00316E08 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80319EAC 00316E0C 38 9F 00 C4 */ addi r4, r31, 0xc4 /* 80319EB0 00316E10 C0 45 00 00 */ lfs f2, 0(r5) /* 80319EB4 00316E14 C0 25 00 04 */ lfs f1, 4(r5) @@ -3747,9 +3747,9 @@ lbl_8031A688: /* 8031A6B4 00317614 38 7F 03 04 */ addi r3, r31, 0x304 /* 8031A6B8 00317618 38 9F 03 34 */ addi r4, r31, 0x334 /* 8031A6BC 0031761C 4B FF 84 B9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8031A6C0 00317620 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8031A6C0 00317620 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8031A6C4 00317624 38 7F 02 74 */ addi r3, r31, 0x274 -/* 8031A6C8 00317628 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8031A6C8 00317628 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8031A6CC 0031762C 38 9F 03 04 */ addi r4, r31, 0x304 /* 8031A6D0 00317630 C0 45 00 00 */ lfs f2, 0(r5) /* 8031A6D4 00317634 C0 25 00 04 */ lfs f1, 4(r5) @@ -7160,9 +7160,9 @@ lbl_8031D880: /* 8031D88C 0031A7EC 41 80 FF 2C */ blt lbl_8031D7B8 lbl_8031D890: /* 8031D890 0031A7F0 38 00 00 00 */ li r0, 0 -/* 8031D894 0031A7F4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8031D894 0031A7F4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8031D898 0031A7F8 90 0D A8 F0 */ stw r0, lbl_805A94B0@sda21(r13) -/* 8031D89C 0031A7FC 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 8031D89C 0031A7FC 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 8031D8A0 0031A800 3B 80 00 00 */ li r28, 0 /* 8031D8A4 0031A804 48 00 03 B8 */ b lbl_8031DC5C lbl_8031D8A8: @@ -7324,7 +7324,7 @@ lbl_8031DAE4: /* 8031DAFC 0031AA5C 38 BA 00 DC */ addi r5, r26, 0xdc /* 8031DB00 0031AA60 4B FF 4F E9 */ bl __ml__12CTransform4fCFRC9CVector3f /* 8031DB04 0031AA64 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 8031DB08 0031AA68 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8031DB08 0031AA68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8031DB0C 0031AA6C C0 1A 00 F4 */ lfs f0, 0xf4(r26) /* 8031DB10 0031AA70 C0 81 00 10 */ lfs f4, 0x10(r1) /* 8031DB14 0031AA74 C0 7A 00 F8 */ lfs f3, 0xf8(r26) @@ -7336,7 +7336,7 @@ lbl_8031DAE4: /* 8031DB2C 0031AA8C EC 02 08 2A */ fadds f0, f2, f1 /* 8031DB30 0031AA90 D0 7E 00 08 */ stfs f3, 8(r30) /* 8031DB34 0031AA94 D0 1E 00 0C */ stfs f0, 0xc(r30) -/* 8031DB38 0031AA98 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 8031DB38 0031AA98 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 8031DB3C 0031AA9C D0 1E 00 1C */ stfs f0, 0x1c(r30) /* 8031DB40 0031AAA0 C0 1F 00 04 */ lfs f0, 4(r31) /* 8031DB44 0031AAA4 D0 1E 00 20 */ stfs f0, 0x20(r30) @@ -9110,17 +9110,17 @@ lbl_8031F3C0: /* 8031F448 0031C3A8 7F C3 F3 78 */ mr r3, r30 /* 8031F44C 0031C3AC 48 02 19 C1 */ bl GetObj__6CTokenFv /* 8031F450 0031C3B0 80 03 00 04 */ lwz r0, 4(r3) -/* 8031F454 0031C3B4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8031F458 0031C3B8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8031F454 0031C3B4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8031F458 0031C3B8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8031F45C 0031C3BC 38 E0 00 00 */ li r7, 0 /* 8031F460 0031C3C0 90 1E 00 08 */ stw r0, 8(r30) -/* 8031F464 0031C3C4 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8031F464 0031C3C4 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8031F468 0031C3C8 C8 42 CA 20 */ lfd f2, lbl_805AE740@sda21(r2) /* 8031F46C 0031C3CC 38 C0 FF FF */ li r6, -1 /* 8031F470 0031C3D0 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8031F474 0031C3D4 38 00 00 01 */ li r0, 1 /* 8031F478 0031C3D8 C0 02 C9 E8 */ lfs f0, lbl_805AE708@sda21(r2) -/* 8031F47C 0031C3DC 3B C5 66 A0 */ addi r30, r5, skZero3f@l +/* 8031F47C 0031C3DC 3B C5 66 A0 */ addi r30, r5, sZeroVector__9CVector3f@l /* 8031F480 0031C3E0 90 7F 00 28 */ stw r3, 0x28(r31) /* 8031F484 0031C3E4 38 7F 01 0C */ addi r3, r31, 0x10c /* 8031F488 0031C3E8 C0 22 C9 F0 */ lfs f1, lbl_805AE710@sda21(r2) @@ -9169,33 +9169,33 @@ lbl_8031F3C0: /* 8031F534 0031C494 D0 3F 01 04 */ stfs f1, 0x104(r31) /* 8031F538 0031C498 D0 3F 01 08 */ stfs f1, 0x108(r31) /* 8031F53C 0031C49C 4B FF 36 39 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8031F540 0031C4A0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8031F540 0031C4A0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8031F544 0031C4A4 38 7F 01 3C */ addi r3, r31, 0x13c -/* 8031F548 0031C4A8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8031F548 0031C4A8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8031F54C 0031C4AC 4B FF 36 29 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8031F550 0031C4B0 C0 02 C9 F0 */ lfs f0, lbl_805AE710@sda21(r2) -/* 8031F554 0031C4B4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8031F558 0031C4B8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8031F554 0031C4B4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8031F558 0031C4B8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8031F55C 0031C4BC D0 1F 01 6C */ stfs f0, 0x16c(r31) /* 8031F560 0031C4C0 38 7F 01 78 */ addi r3, r31, 0x178 /* 8031F564 0031C4C4 D0 1F 01 70 */ stfs f0, 0x170(r31) /* 8031F568 0031C4C8 D0 1F 01 74 */ stfs f0, 0x174(r31) /* 8031F56C 0031C4CC 4B FF 36 09 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8031F570 0031C4D0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8031F570 0031C4D0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8031F574 0031C4D4 38 7F 01 A8 */ addi r3, r31, 0x1a8 -/* 8031F578 0031C4D8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8031F578 0031C4D8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8031F57C 0031C4DC 4B FF 35 F9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8031F580 0031C4E0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8031F580 0031C4E0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8031F584 0031C4E4 38 7F 01 D8 */ addi r3, r31, 0x1d8 -/* 8031F588 0031C4E8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8031F588 0031C4E8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8031F58C 0031C4EC 4B FF 35 E9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8031F590 0031C4F0 3C 80 80 5A */ lis r4, lbl_805A65FC@ha /* 8031F594 0031C4F4 38 7F 02 08 */ addi r3, r31, 0x208 /* 8031F598 0031C4F8 38 84 65 FC */ addi r4, r4, lbl_805A65FC@l /* 8031F59C 0031C4FC 4B FF 0A 89 */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 8031F5A0 0031C500 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8031F5A0 0031C500 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8031F5A4 0031C504 38 7F 02 2C */ addi r3, r31, 0x22c -/* 8031F5A8 0031C508 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8031F5A8 0031C508 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8031F5AC 0031C50C 4B FF 35 C9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8031F5B0 0031C510 38 C0 00 00 */ li r6, 0 /* 8031F5B4 0031C514 38 A0 00 01 */ li r5, 1 @@ -9228,13 +9228,13 @@ lbl_8031F3C0: /* 8031F620 0031C580 A8 9F 00 94 */ lha r4, 0x94(r31) /* 8031F624 0031C584 4B FF 2F C9 */ bl __ct__9CRandom16FUi /* 8031F628 0031C588 38 00 00 00 */ li r0, 0 -/* 8031F62C 0031C58C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8031F62C 0031C58C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8031F630 0031C590 90 1F 02 94 */ stw r0, 0x294(r31) -/* 8031F634 0031C594 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 8031F634 0031C594 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 8031F638 0031C598 C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) /* 8031F63C 0031C59C 90 1F 02 98 */ stw r0, 0x298(r31) /* 8031F640 0031C5A0 90 1F 02 9C */ stw r0, 0x29c(r31) -/* 8031F644 0031C5A4 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 8031F644 0031C5A4 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 8031F648 0031C5A8 D0 1F 02 B0 */ stfs f0, 0x2b0(r31) /* 8031F64C 0031C5AC C0 1E 00 04 */ lfs f0, 4(r30) /* 8031F650 0031C5B0 D0 1F 02 B4 */ stfs f0, 0x2b4(r31) @@ -9261,7 +9261,7 @@ lbl_8031F3C0: /* 8031F6A4 0031C604 C0 1E 00 08 */ lfs f0, 8(r30) /* 8031F6A8 0031C608 D0 1F 02 E8 */ stfs f0, 0x2e8(r31) /* 8031F6AC 0031C60C D0 3F 02 EC */ stfs f1, 0x2ec(r31) -/* 8031F6B0 0031C610 C4 03 67 54 */ lfsu f0, lbl_805A6754@l(r3) +/* 8031F6B0 0031C610 C4 03 67 54 */ lfsu f0, mskInvertedBox__6CAABox@l(r3) /* 8031F6B4 0031C614 D0 1F 02 F0 */ stfs f0, 0x2f0(r31) /* 8031F6B8 0031C618 C0 03 00 04 */ lfs f0, 4(r3) /* 8031F6BC 0031C61C D0 1F 02 F4 */ stfs f0, 0x2f4(r31) @@ -9276,9 +9276,9 @@ lbl_8031F3C0: /* 8031F6E0 0031C640 90 1F 03 08 */ stw r0, 0x308(r31) /* 8031F6E4 0031C644 48 02 A8 C9 */ bl White__6CColorFv /* 8031F6E8 0031C648 80 03 00 00 */ lwz r0, 0(r3) -/* 8031F6EC 0031C64C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8031F6EC 0031C64C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8031F6F0 0031C650 C0 62 C9 F0 */ lfs f3, lbl_805AE710@sda21(r2) -/* 8031F6F4 0031C654 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8031F6F4 0031C654 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8031F6F8 0031C658 90 1F 03 0C */ stw r0, 0x30c(r31) /* 8031F6FC 0031C65C 38 A0 00 01 */ li r5, 1 /* 8031F700 0031C660 C0 22 C9 E8 */ lfs f1, lbl_805AE708@sda21(r2) @@ -21464,11 +21464,11 @@ lbl_8032A0D0: /* 8032A14C 003270AC 28 03 00 00 */ cmplwi r3, 0 /* 8032A150 003270B0 41 82 00 38 */ beq lbl_8032A188 /* 8032A154 003270B4 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8032A158 003270B8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8032A158 003270B8 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8032A15C 003270BC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8032A160 003270C0 3C 80 80 3E */ lis r4, lbl_803DACB0@ha /* 8032A164 003270C4 90 03 00 00 */ stw r0, 0(r3) -/* 8032A168 003270C8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8032A168 003270C8 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8032A16C 003270CC 38 A0 00 00 */ li r5, 0 /* 8032A170 003270D0 38 04 AC B0 */ addi r0, r4, lbl_803DACB0@l /* 8032A174 003270D4 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Particles/CEmitterElement.s b/asm/Kyoto/Particles/CEmitterElement.s index 4dcc9f34..85c8e306 100644 --- a/asm/Kyoto/Particles/CEmitterElement.s +++ b/asm/Kyoto/Particles/CEmitterElement.s @@ -53,9 +53,9 @@ GetValue__14CVEAngleSphereCFiR9CVector3fR9CVector3f: /* 80356934 00353894 93 C1 00 58 */ stw r30, 0x58(r1) /* 80356938 00353898 93 A1 00 54 */ stw r29, 0x54(r1) /* 8035693C 0035389C 93 81 00 50 */ stw r28, 0x50(r1) -/* 80356940 003538A0 3C E0 80 5A */ lis r7, skZero3f@ha +/* 80356940 003538A0 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 80356944 003538A4 7C 7C 1B 78 */ mr r28, r3 -/* 80356948 003538A8 38 67 66 A0 */ addi r3, r7, skZero3f@l +/* 80356948 003538A8 38 67 66 A0 */ addi r3, r7, sZeroVector__9CVector3f@l /* 8035694C 003538AC 7C BE 2B 78 */ mr r30, r5 /* 80356950 003538B0 C0 43 00 00 */ lfs f2, 0(r3) /* 80356954 003538B4 7C 9D 23 78 */ mr r29, r4 @@ -374,9 +374,9 @@ GetValue__9CVESphereCFiR9CVector3fR9CVector3f: /* 80356DDC 00353D3C 93 C1 00 88 */ stw r30, 0x88(r1) /* 80356DE0 00353D40 93 A1 00 84 */ stw r29, 0x84(r1) /* 80356DE4 00353D44 93 81 00 80 */ stw r28, 0x80(r1) -/* 80356DE8 00353D48 3C E0 80 5A */ lis r7, skZero3f@ha +/* 80356DE8 00353D48 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 80356DEC 00353D4C 7C 7C 1B 78 */ mr r28, r3 -/* 80356DF0 00353D50 38 67 66 A0 */ addi r3, r7, skZero3f@l +/* 80356DF0 00353D50 38 67 66 A0 */ addi r3, r7, sZeroVector__9CVector3f@l /* 80356DF4 00353D54 7C BE 2B 78 */ mr r30, r5 /* 80356DF8 00353D58 C0 43 00 00 */ lfs f2, 0(r3) /* 80356DFC 00353D5C 7C 9D 23 78 */ mr r29, r4 @@ -650,8 +650,8 @@ GetValue__16CEESimpleEmitterCFiR9CVector3fR9CVector3f: /* 803571E4 00354144 4E 80 04 21 */ bctrl /* 803571E8 00354148 48 00 00 20 */ b lbl_80357208 lbl_803571EC: -/* 803571EC 0035414C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803571F0 00354150 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 803571EC 0035414C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803571F0 00354150 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 803571F4 00354154 D0 1F 00 00 */ stfs f0, 0(r31) /* 803571F8 00354158 C0 03 00 04 */ lfs f0, 4(r3) /* 803571FC 0035415C D0 1F 00 04 */ stfs f0, 4(r31) diff --git a/asm/Kyoto/Particles/CParticleElectric.s b/asm/Kyoto/Particles/CParticleElectric.s index 30c0c1b6..8d8f9fb2 100644 --- a/asm/Kyoto/Particles/CParticleElectric.s +++ b/asm/Kyoto/Particles/CParticleElectric.s @@ -828,8 +828,8 @@ BuildBounds__17CParticleElectricFv: /* 8035F2D8 0035C238 4E 80 04 21 */ bctrl /* 8035F2DC 0035C23C 2C 03 00 00 */ cmpwi r3, 0 /* 8035F2E0 0035C240 41 81 00 40 */ bgt lbl_8035F320 -/* 8035F2E4 0035C244 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 8035F2E8 0035C248 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 8035F2E4 0035C244 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 8035F2E8 0035C248 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 8035F2EC 0035C24C 80 64 00 00 */ lwz r3, 0(r4) /* 8035F2F0 0035C250 80 04 00 04 */ lwz r0, 4(r4) /* 8035F2F4 0035C254 90 7F 01 60 */ stw r3, 0x160(r31) @@ -844,8 +844,8 @@ BuildBounds__17CParticleElectricFv: /* 8035F318 0035C278 90 1F 01 74 */ stw r0, 0x174(r31) /* 8035F31C 0035C27C 48 00 03 C0 */ b lbl_8035F6DC lbl_8035F320: -/* 8035F320 0035C280 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 8035F324 0035C284 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 8035F320 0035C280 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 8035F324 0035C284 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 8035F328 0035C288 80 64 00 00 */ lwz r3, 0(r4) /* 8035F32C 0035C28C 80 04 00 04 */ lwz r0, 4(r4) /* 8035F330 0035C290 90 7F 01 60 */ stw r3, 0x160(r31) @@ -2932,9 +2932,9 @@ CalculatePoints__17CParticleElectricFv: /* 803610C8 0035E028 DB 41 01 90 */ stfd f26, 0x190(r1) /* 803610CC 0035E02C F3 41 01 98 */ psq_st f26, 408(r1), 0, qr0 /* 803610D0 0035E030 BF 01 01 70 */ stmw r24, 0x170(r1) -/* 803610D4 0035E034 3C 80 80 5A */ lis r4, skZero3f@ha +/* 803610D4 0035E034 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 803610D8 0035E038 38 00 00 00 */ li r0, 0 -/* 803610DC 0035E03C 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 803610DC 0035E03C 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 803610E0 0035E040 90 01 01 30 */ stw r0, 0x130(r1) /* 803610E4 0035E044 C0 1F 00 00 */ lfs f0, 0(r31) /* 803610E8 0035E048 7C 7E 1B 78 */ mr r30, r3 @@ -3069,10 +3069,10 @@ lbl_803612C0: /* 803612C4 0035E224 38 03 00 01 */ addi r0, r3, 1 /* 803612C8 0035E228 90 01 01 30 */ stw r0, 0x130(r1) lbl_803612CC: -/* 803612CC 0035E22C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 803612CC 0035E22C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 803612D0 0035E230 C0 82 CD 54 */ lfs f4, lbl_805AEA74@sda21(r2) /* 803612D4 0035E234 C0 62 CD 48 */ lfs f3, lbl_805AEA68@sda21(r2) -/* 803612D8 0035E238 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 803612D8 0035E238 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 803612DC 0035E23C C0 3F 00 04 */ lfs f1, 4(r31) /* 803612E0 0035E240 C0 1F 00 08 */ lfs f0, 8(r31) /* 803612E4 0035E244 D0 81 00 AC */ stfs f4, 0xac(r1) @@ -3418,8 +3418,8 @@ lbl_803617C4: /* 803617D8 0035E738 38 A5 FF FF */ addi r5, r5, -1 /* 803617DC 0035E73C 4B FF F7 19 */ bl CalculateFractal__17CParticleElectricFiiff /* 803617E0 0035E740 80 BE 04 2C */ lwz r5, 0x42c(r30) -/* 803617E4 0035E744 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 803617E8 0035E748 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 803617E4 0035E744 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 803617E8 0035E748 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 803617EC 0035E74C 38 61 00 94 */ addi r3, r1, 0x94 /* 803617F0 0035E750 C0 05 00 04 */ lfs f0, 4(r5) /* 803617F4 0035E754 C0 A5 00 10 */ lfs f5, 0x10(r5) @@ -3481,8 +3481,8 @@ lbl_803618C0: /* 803618D0 0035E830 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 803618D4 0035E834 40 80 00 2C */ bge lbl_80361900 /* 803618D8 0035E838 80 9E 04 2C */ lwz r4, 0x42c(r30) -/* 803618DC 0035E83C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 803618E0 0035E840 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 803618DC 0035E83C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 803618E0 0035E840 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 803618E4 0035E844 38 61 01 00 */ addi r3, r1, 0x100 /* 803618E8 0035E848 38 A4 00 0C */ addi r5, r4, 0xc /* 803618EC 0035E84C 4B FB 22 25 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -3533,8 +3533,8 @@ lbl_80361958: lbl_80361998: /* 80361998 0035E8F8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8036199C 0035E8FC 40 82 00 20 */ bne lbl_803619BC -/* 803619A0 0035E900 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 803619A4 0035E904 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 803619A0 0035E900 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 803619A4 0035E904 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 803619A8 0035E908 38 61 00 D0 */ addi r3, r1, 0xd0 /* 803619AC 0035E90C 4B FB 21 65 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f /* 803619B0 0035E910 C3 A1 00 D8 */ lfs f29, 0xd8(r1) @@ -4131,13 +4131,13 @@ lbl_8036214C: /* 803621C4 0035F124 7E E3 BB 78 */ mr r3, r23 /* 803621C8 0035F128 4B FD EC 45 */ bl GetObj__6CTokenFv /* 803621CC 0035F12C 80 83 00 04 */ lwz r4, 4(r3) -/* 803621D0 0035F130 3C A0 80 5A */ lis r5, skZero3f@ha +/* 803621D0 0035F130 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 803621D4 0035F134 38 00 00 00 */ li r0, 0 /* 803621D8 0035F138 C8 02 CD 90 */ lfd f0, lbl_805AEAB0@sda21(r2) /* 803621DC 0035F13C 90 97 00 08 */ stw r4, 8(r23) -/* 803621E0 0035F140 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 803621E4 0035F144 38 83 66 70 */ addi r4, r3, skIdentity4f@l -/* 803621E8 0035F148 3B 45 66 A0 */ addi r26, r5, skZero3f@l +/* 803621E0 0035F140 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 803621E4 0035F144 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l +/* 803621E8 0035F148 3B 45 66 A0 */ addi r26, r5, sZeroVector__9CVector3f@l /* 803621EC 0035F14C 90 1F 00 28 */ stw r0, 0x28(r31) /* 803621F0 0035F150 38 7F 00 44 */ addi r3, r31, 0x44 /* 803621F4 0035F154 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -4149,16 +4149,16 @@ lbl_8036214C: /* 8036220C 0035F16C C0 1A 00 08 */ lfs f0, 8(r26) /* 80362210 0035F170 D0 1F 00 40 */ stfs f0, 0x40(r31) /* 80362214 0035F174 4B FB 09 61 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80362218 0035F178 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80362218 0035F178 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8036221C 0035F17C 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80362220 0035F180 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80362220 0035F180 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80362224 0035F184 4B FB 09 51 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80362228 0035F188 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8036222C 0035F18C 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80362230 0035F190 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80362228 0035F188 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8036222C 0035F18C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80362230 0035F190 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80362234 0035F194 C0 05 00 00 */ lfs f0, 0(r5) /* 80362238 0035F198 38 7F 00 B0 */ addi r3, r31, 0xb0 -/* 8036223C 0035F19C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8036223C 0035F19C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80362240 0035F1A0 D0 1F 00 A4 */ stfs f0, 0xa4(r31) /* 80362244 0035F1A4 C0 1A 00 04 */ lfs f0, 4(r26) /* 80362248 0035F1A8 D0 1F 00 A8 */ stfs f0, 0xa8(r31) @@ -4166,8 +4166,8 @@ lbl_8036214C: /* 80362250 0035F1B0 D0 1F 00 AC */ stfs f0, 0xac(r31) /* 80362254 0035F1B4 4B FB 09 21 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80362258 0035F1B8 C0 02 CD 48 */ lfs f0, lbl_805AEA68@sda21(r2) -/* 8036225C 0035F1BC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80362260 0035F1C0 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8036225C 0035F1BC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80362260 0035F1C0 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80362264 0035F1C4 D0 1F 00 E0 */ stfs f0, 0xe0(r31) /* 80362268 0035F1C8 38 7F 00 F8 */ addi r3, r31, 0xf8 /* 8036226C 0035F1CC D0 1F 00 E4 */ stfs f0, 0xe4(r31) @@ -4177,8 +4177,8 @@ lbl_8036214C: /* 8036227C 0035F1DC D0 1F 00 F4 */ stfs f0, 0xf4(r31) /* 80362280 0035F1E0 4B FB 08 F5 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80362284 0035F1E4 C0 22 CD 54 */ lfs f1, lbl_805AEA74@sda21(r2) -/* 80362288 0035F1E8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8036228C 0035F1EC 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80362288 0035F1E8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8036228C 0035F1EC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80362290 0035F1F0 D0 3F 01 28 */ stfs f1, 0x128(r31) /* 80362294 0035F1F4 38 7F 01 4C */ addi r3, r31, 0x14c /* 80362298 0035F1F8 D0 3F 01 2C */ stfs f1, 0x12c(r31) @@ -4200,13 +4200,13 @@ lbl_8036214C: /* 803622D8 0035F238 B0 0D 9E 50 */ sth r0, lbl_805A8A10@sda21(r13) /* 803622DC 0035F23C 4B FB 03 11 */ bl __ct__9CRandom16FUi /* 803622E0 0035F240 38 00 00 08 */ li r0, 8 -/* 803622E4 0035F244 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 803622E4 0035F244 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 803622E8 0035F248 90 1F 01 50 */ stw r0, 0x150(r31) /* 803622EC 0035F24C 38 80 00 01 */ li r4, 1 /* 803622F0 0035F250 38 00 00 00 */ li r0, 0 /* 803622F4 0035F254 C0 02 CD 54 */ lfs f0, lbl_805AEA74@sda21(r2) /* 803622F8 0035F258 90 9F 01 54 */ stw r4, 0x154(r31) -/* 803622FC 0035F25C 3B C3 67 54 */ addi r30, r3, lbl_805A6754@l +/* 803622FC 0035F25C 3B C3 67 54 */ addi r30, r3, mskInvertedBox__6CAABox@l /* 80362300 0035F260 90 1F 01 58 */ stw r0, 0x158(r31) /* 80362304 0035F264 D0 1F 01 5C */ stfs f0, 0x15c(r31) /* 80362308 0035F268 C0 1E 00 00 */ lfs f0, 0(r30) @@ -4463,8 +4463,8 @@ lbl_80362694: /* 8036269C 0035F5FC 41 80 FE D8 */ blt lbl_80362574 lbl_803626A0: /* 803626A0 0035F600 80 9F 01 50 */ lwz r4, 0x150(r31) -/* 803626A4 0035F604 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803626A8 0035F608 3B 43 66 A0 */ addi r26, r3, skZero3f@l +/* 803626A4 0035F604 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803626A8 0035F608 3B 43 66 A0 */ addi r26, r3, sZeroVector__9CVector3f@l /* 803626AC 0035F60C 38 04 00 01 */ addi r0, r4, 1 /* 803626B0 0035F610 90 1F 01 50 */ stw r0, 0x150(r31) /* 803626B4 0035F614 83 7F 01 50 */ lwz r27, 0x150(r31) @@ -4527,8 +4527,8 @@ lbl_80362778: /* 8036277C 0035F6DC 40 82 FF F8 */ bne lbl_80362774 /* 80362780 0035F6E0 4B FB 31 B1 */ bl Free__7CMemoryFPCv /* 80362784 0035F6E4 83 7F 01 50 */ lwz r27, 0x150(r31) -/* 80362788 0035F6E8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8036278C 0035F6EC 3B 43 66 A0 */ addi r26, r3, skZero3f@l +/* 80362788 0035F6E8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8036278C 0035F6EC 3B 43 66 A0 */ addi r26, r3, sZeroVector__9CVector3f@l /* 80362790 0035F6F0 1C 7B 00 0C */ mulli r3, r27, 0xc /* 80362794 0035F6F4 93 61 00 8C */ stw r27, 0x8c(r1) /* 80362798 0035F6F8 93 61 00 90 */ stw r27, 0x90(r1) @@ -4883,9 +4883,9 @@ lbl_80362C24: /* 80362C7C 0035FBDC 90 17 00 20 */ stw r0, 0x20(r23) /* 80362C80 0035FBE0 4B FE 73 2D */ bl White__6CColorFv /* 80362C84 0035FBE4 80 03 00 00 */ lwz r0, 0(r3) -/* 80362C88 0035FBE8 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 80362C88 0035FBE8 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 80362C8C 0035FBEC 90 17 00 24 */ stw r0, 0x24(r23) -/* 80362C90 0035FBF0 C0 03 67 54 */ lfs f0, lbl_805A6754@l(r3) +/* 80362C90 0035FBF0 C0 03 67 54 */ lfs f0, mskInvertedBox__6CAABox@l(r3) /* 80362C94 0035FBF4 D0 17 00 28 */ stfs f0, 0x28(r23) /* 80362C98 0035FBF8 C0 1E 00 04 */ lfs f0, 4(r30) /* 80362C9C 0035FBFC D0 17 00 2C */ stfs f0, 0x2c(r23) diff --git a/asm/Kyoto/Particles/CParticleElectricDataFactory.s b/asm/Kyoto/Particles/CParticleElectricDataFactory.s index a3a41d25..07b755c4 100644 --- a/asm/Kyoto/Particles/CParticleElectricDataFactory.s +++ b/asm/Kyoto/Particles/CParticleElectricDataFactory.s @@ -699,11 +699,11 @@ lbl_8035E7F4: /* 8035E870 0035B7D0 28 03 00 00 */ cmplwi r3, 0 /* 8035E874 0035B7D4 41 82 00 38 */ beq lbl_8035E8AC /* 8035E878 0035B7D8 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8035E87C 0035B7DC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8035E87C 0035B7DC 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8035E880 0035B7E0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8035E884 0035B7E4 3C 80 80 3E */ lis r4, lbl_803DACA4@ha /* 8035E888 0035B7E8 90 03 00 00 */ stw r0, 0(r3) -/* 8035E88C 0035B7EC 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8035E88C 0035B7EC 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8035E890 0035B7F0 38 A0 00 00 */ li r5, 0 /* 8035E894 0035B7F4 38 04 AC A4 */ addi r0, r4, lbl_803DACA4@l /* 8035E898 0035B7F8 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Particles/CParticleSwoosh.s b/asm/Kyoto/Particles/CParticleSwoosh.s index 6823dd5f..81d21a1a 100644 --- a/asm/Kyoto/Particles/CParticleSwoosh.s +++ b/asm/Kyoto/Particles/CParticleSwoosh.s @@ -173,9 +173,9 @@ GetLight__15CParticleSwooshCFv: /* 8032A8F4 00327854 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032A8F8 00327858 7C 7F 1B 78 */ mr r31, r3 /* 8032A8FC 0032785C 48 01 F6 B1 */ bl White__6CColorFv -/* 8032A900 00327860 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8032A900 00327860 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8032A904 00327864 7C 65 1B 78 */ mr r5, r3 -/* 8032A908 00327868 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8032A908 00327868 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8032A90C 0032786C 7F E3 FB 78 */ mr r3, r31 /* 8032A910 00327870 4B FD BB 95 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor /* 8032A914 00327874 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1480,9 +1480,9 @@ Render3SidedSolidSpline__15CParticleSwooshFv: /* 8032BBD4 00328B34 39 00 00 7D */ li r8, 0x7d /* 8032BBD8 00328B38 4B FD CA F5 */ bl SetTexCoordGen__3CGXF13_GXTexCoordID13_GXTexGenType12_GXTexGenSrc9_GXTexMtxUc11_GXPTTexMtx /* 8032BBDC 00328B3C C0 15 01 E8 */ lfs f0, 0x1e8(r21) -/* 8032BBE0 00328B40 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032BBE0 00328B40 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032BBE4 00328B44 83 55 01 58 */ lwz r26, 0x158(r21) -/* 8032BBE8 00328B48 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8032BBE8 00328B48 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8032BBEC 00328B4C FC 00 00 50 */ fneg f0, f0 /* 8032BBF0 00328B50 3B 80 00 00 */ li r28, 0 /* 8032BBF4 00328B54 3B 60 00 00 */ li r27, 0 @@ -1872,8 +1872,8 @@ lbl_8032C108: /* 8032C1C8 00329128 D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 8032C1CC 0032912C 40 81 04 18 */ ble lbl_8032C5E4 /* 8032C1D0 00329130 80 75 01 B0 */ lwz r3, 0x1b0(r21) -/* 8032C1D4 00329134 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8032C1D8 00329138 C2 24 66 A0 */ lfs f17, skZero3f@l(r4) +/* 8032C1D4 00329134 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8032C1D8 00329138 C2 24 66 A0 */ lfs f17, sZeroVector__9CVector3f@l(r4) /* 8032C1DC 0032913C 3B 00 00 00 */ li r24, 0 /* 8032C1E0 00329140 C2 1E 00 04 */ lfs f16, 4(r30) /* 8032C1E4 00329144 38 03 00 01 */ addi r0, r3, 1 @@ -2229,11 +2229,11 @@ Render3SidedSolidNoSplineNoGaps__15CParticleSwooshFv: /* 8032C738 00329698 2C 00 00 02 */ cmpwi r0, 2 /* 8032C73C 0032969C 41 80 07 F0 */ blt lbl_8032CF2C /* 8032C740 003296A0 38 80 00 00 */ li r4, 0 -/* 8032C744 003296A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032C744 003296A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032C748 003296A8 1C 04 00 0C */ mulli r0, r4, 0xc /* 8032C74C 003296AC 3B E1 00 90 */ addi r31, r1, 0x90 /* 8032C750 003296B0 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8032C754 003296B4 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C754 003296B4 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C758 003296B8 7C 9F 02 15 */ add. r4, r31, r0 /* 8032C75C 003296BC 41 82 00 1C */ beq lbl_8032C778 /* 8032C760 003296C0 C0 03 00 00 */ lfs f0, 0(r3) @@ -2244,8 +2244,8 @@ Render3SidedSolidNoSplineNoGaps__15CParticleSwooshFv: /* 8032C774 003296D4 D0 04 00 08 */ stfs f0, 8(r4) lbl_8032C778: /* 8032C778 003296D8 80 81 00 8C */ lwz r4, 0x8c(r1) -/* 8032C77C 003296DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8032C780 003296E0 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C77C 003296DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8032C780 003296E0 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C784 003296E4 38 84 00 01 */ addi r4, r4, 1 /* 8032C788 003296E8 1C 04 00 0C */ mulli r0, r4, 0xc /* 8032C78C 003296EC 90 81 00 8C */ stw r4, 0x8c(r1) @@ -2264,10 +2264,10 @@ lbl_8032C7B0: /* 8032C7BC 0032971C 3B C1 00 74 */ addi r30, r1, 0x74 /* 8032C7C0 00329720 38 84 00 01 */ addi r4, r4, 1 /* 8032C7C4 00329724 90 61 00 70 */ stw r3, 0x70(r1) -/* 8032C7C8 00329728 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032C7C8 00329728 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032C7CC 0032972C 7C BE 02 15 */ add. r5, r30, r0 /* 8032C7D0 00329730 90 81 00 8C */ stw r4, 0x8c(r1) -/* 8032C7D4 00329734 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C7D4 00329734 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C7D8 00329738 41 82 00 1C */ beq lbl_8032C7F4 /* 8032C7DC 0032973C C0 03 00 00 */ lfs f0, 0(r3) /* 8032C7E0 00329740 C0 23 00 04 */ lfs f1, 4(r3) @@ -2277,8 +2277,8 @@ lbl_8032C7B0: /* 8032C7F0 00329750 D0 05 00 08 */ stfs f0, 8(r5) lbl_8032C7F4: /* 8032C7F4 00329754 80 81 00 70 */ lwz r4, 0x70(r1) -/* 8032C7F8 00329758 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8032C7FC 0032975C 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C7F8 00329758 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8032C7FC 0032975C 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C800 00329760 38 84 00 01 */ addi r4, r4, 1 /* 8032C804 00329764 1C 04 00 0C */ mulli r0, r4, 0xc /* 8032C808 00329768 90 81 00 70 */ stw r4, 0x70(r1) @@ -2297,10 +2297,10 @@ lbl_8032C82C: /* 8032C838 00329798 3B A1 00 58 */ addi r29, r1, 0x58 /* 8032C83C 0032979C 38 84 00 01 */ addi r4, r4, 1 /* 8032C840 003297A0 90 61 00 54 */ stw r3, 0x54(r1) -/* 8032C844 003297A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032C844 003297A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032C848 003297A8 7C BD 02 15 */ add. r5, r29, r0 /* 8032C84C 003297AC 90 81 00 70 */ stw r4, 0x70(r1) -/* 8032C850 003297B0 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C850 003297B0 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C854 003297B4 41 82 00 1C */ beq lbl_8032C870 /* 8032C858 003297B8 C0 03 00 00 */ lfs f0, 0(r3) /* 8032C85C 003297BC C0 23 00 04 */ lfs f1, 4(r3) @@ -2310,8 +2310,8 @@ lbl_8032C82C: /* 8032C86C 003297CC D0 05 00 08 */ stfs f0, 8(r5) lbl_8032C870: /* 8032C870 003297D0 80 81 00 54 */ lwz r4, 0x54(r1) -/* 8032C874 003297D4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8032C878 003297D8 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8032C874 003297D4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8032C878 003297D8 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8032C87C 003297DC 38 84 00 01 */ addi r4, r4, 1 /* 8032C880 003297E0 1C 04 00 0C */ mulli r0, r4, 0xc /* 8032C884 003297E4 90 81 00 54 */ stw r4, 0x54(r1) @@ -3102,8 +3102,8 @@ Render2SidedNoSplineNoGaps__15CParticleSwooshFv: /* 8032D418 0032A378 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8032D41C 0032A37C 38 81 00 D4 */ addi r4, r1, 0xd4 /* 8032D420 0032A380 4B FE 57 55 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8032D424 0032A384 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8032D428 0032A388 C7 83 66 A0 */ lfsu f28, skZero3f@l(r3) +/* 8032D424 0032A384 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8032D428 0032A388 C7 83 66 A0 */ lfsu f28, sZeroVector__9CVector3f@l(r3) /* 8032D42C 0032A38C C3 E1 01 D0 */ lfs f31, 0x1d0(r1) /* 8032D430 0032A390 3B 80 00 00 */ li r28, 0 /* 8032D434 0032A394 C3 C1 01 E0 */ lfs f30, 0x1e0(r1) @@ -4919,8 +4919,8 @@ lbl_8032EDC8: /* 8032EE3C 0032BD9C 7F 63 DB 78 */ mr r3, r27 /* 8032EE40 0032BDA0 48 01 1F CD */ bl GetObj__6CTokenFv /* 8032EE44 0032BDA4 80 A3 00 04 */ lwz r5, 4(r3) -/* 8032EE48 0032BDA8 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8032EE4C 0032BDAC 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8032EE48 0032BDA8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8032EE4C 0032BDAC 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8032EE50 0032BDB0 38 00 00 00 */ li r0, 0 /* 8032EE54 0032BDB4 90 BB 00 08 */ stw r5, 8(r27) /* 8032EE58 0032BDB8 38 7F 00 44 */ addi r3, r31, 0x44 @@ -4933,29 +4933,29 @@ lbl_8032EDC8: /* 8032EE74 0032BDD4 D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 8032EE78 0032BDD8 D0 1F 00 40 */ stfs f0, 0x40(r31) /* 8032EE7C 0032BDDC 4B FE 3C F9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8032EE80 0032BDE0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8032EE80 0032BDE0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8032EE84 0032BDE4 38 7F 00 74 */ addi r3, r31, 0x74 -/* 8032EE88 0032BDE8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8032EE88 0032BDE8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8032EE8C 0032BDEC 4B FE 3C E9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8032EE90 0032BDF0 C0 02 CA 94 */ lfs f0, lbl_805AE7B4@sda21(r2) -/* 8032EE94 0032BDF4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8032EE98 0032BDF8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8032EE94 0032BDF4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8032EE98 0032BDF8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8032EE9C 0032BDFC D0 1F 00 A4 */ stfs f0, 0xa4(r31) /* 8032EEA0 0032BE00 38 7F 00 B0 */ addi r3, r31, 0xb0 /* 8032EEA4 0032BE04 D0 1F 00 A8 */ stfs f0, 0xa8(r31) /* 8032EEA8 0032BE08 D0 1F 00 AC */ stfs f0, 0xac(r31) /* 8032EEAC 0032BE0C 4B FE 3C C9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8032EEB0 0032BE10 C0 02 CA 90 */ lfs f0, lbl_805AE7B0@sda21(r2) -/* 8032EEB4 0032BE14 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8032EEB8 0032BE18 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8032EEB4 0032BE14 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8032EEB8 0032BE18 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8032EEBC 0032BE1C D0 1F 00 E0 */ stfs f0, 0xe0(r31) /* 8032EEC0 0032BE20 38 7F 00 EC */ addi r3, r31, 0xec /* 8032EEC4 0032BE24 D0 1F 00 E4 */ stfs f0, 0xe4(r31) /* 8032EEC8 0032BE28 D0 1F 00 E8 */ stfs f0, 0xe8(r31) /* 8032EECC 0032BE2C 4B FE 3C A9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8032EED0 0032BE30 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8032EED0 0032BE30 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8032EED4 0032BE34 38 7F 01 1C */ addi r3, r31, 0x11c -/* 8032EED8 0032BE38 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8032EED8 0032BE38 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8032EEDC 0032BE3C 4B FE 3C 99 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8032EEE0 0032BE40 C0 02 CA 90 */ lfs f0, lbl_805AE7B0@sda21(r2) /* 8032EEE4 0032BE44 38 00 00 00 */ li r0, 0 @@ -5011,11 +5011,11 @@ lbl_8032EFA0: /* 8032EFA4 0032BF04 7C C4 07 34 */ extsh r4, r6 /* 8032EFA8 0032BF08 4B FE 36 45 */ bl __ct__9CRandom16FUi /* 8032EFAC 0032BF0C C0 22 CA 94 */ lfs f1, lbl_805AE7B4@sda21(r2) -/* 8032EFB0 0032BF10 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032EFB0 0032BF10 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032EFB4 0032BF14 39 00 00 01 */ li r8, 1 /* 8032EFB8 0032BF18 38 E0 00 00 */ li r7, 0 /* 8032EFBC 0032BF1C D0 3F 01 C4 */ stfs f1, 0x1c4(r31) -/* 8032EFC0 0032BF20 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8032EFC0 0032BF20 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8032EFC4 0032BF24 C0 02 CA 90 */ lfs f0, lbl_805AE7B0@sda21(r2) /* 8032EFC8 0032BF28 38 00 FF FF */ li r0, -1 /* 8032EFCC 0032BF2C D0 3F 01 C8 */ stfs f1, 0x1c8(r31) @@ -5167,11 +5167,11 @@ lbl_8032F1E0: /* 8032F1F0 0032C150 90 1F 01 60 */ stw r0, 0x160(r31) /* 8032F1F4 0032C154 80 9F 01 B4 */ lwz r4, 0x1b4(r31) /* 8032F1F8 0032C158 48 00 06 2D */ bl sub_8032f824 -/* 8032F1FC 0032C15C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8032F200 0032C160 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8032F204 0032C164 3B 84 66 A0 */ addi r28, r4, skZero3f@l +/* 8032F1FC 0032C15C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8032F200 0032C160 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8032F204 0032C164 3B 84 66 A0 */ addi r28, r4, sZeroVector__9CVector3f@l /* 8032F208 0032C168 3B 60 00 00 */ li r27, 0 -/* 8032F20C 0032C16C 3B A3 66 70 */ addi r29, r3, skIdentity4f@l +/* 8032F20C 0032C16C 3B A3 66 70 */ addi r29, r3, sIdentity__12CTransform4f@l /* 8032F210 0032C170 7F 9E E3 78 */ mr r30, r28 /* 8032F214 0032C174 48 00 00 60 */ b lbl_8032F274 lbl_8032F218: @@ -5203,10 +5203,10 @@ lbl_8032F274: /* 8032F278 0032C1D8 7C 1B 00 00 */ cmpw r27, r0 /* 8032F27C 0032C1DC 41 80 FF 9C */ blt lbl_8032F218 /* 8032F280 0032C1E0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8032F284 0032C1E4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8032F284 0032C1E4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8032F288 0032C1E8 7F E3 FB 78 */ mr r3, r31 /* 8032F28C 0032C1EC 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8032F290 0032C1F0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8032F290 0032C1F0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8032F294 0032C1F4 7D 89 03 A6 */ mtctr r12 /* 8032F298 0032C1F8 4E 80 04 21 */ bctrl /* 8032F29C 0032C1FC 80 1F 01 70 */ lwz r0, 0x170(r31) @@ -5228,9 +5228,9 @@ lbl_8032F2C4: /* 8032F2D4 0032C234 90 1F 01 70 */ stw r0, 0x170(r31) /* 8032F2D8 0032C238 80 9F 01 B8 */ lwz r4, 0x1b8(r31) /* 8032F2DC 0032C23C 4B D2 EA 1D */ bl "reserve__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Fi" -/* 8032F2E0 0032C240 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032F2E0 0032C240 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032F2E4 0032C244 3B 80 00 00 */ li r28, 0 -/* 8032F2E8 0032C248 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8032F2E8 0032C248 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8032F2EC 0032C24C 48 00 00 64 */ b lbl_8032F350 lbl_8032F2F0: /* 8032F2F0 0032C250 80 1F 01 70 */ lwz r0, 0x170(r31) @@ -5283,9 +5283,9 @@ lbl_8032F384: /* 8032F394 0032C2F4 90 1F 01 80 */ stw r0, 0x180(r31) /* 8032F398 0032C2F8 80 9F 01 B8 */ lwz r4, 0x1b8(r31) /* 8032F39C 0032C2FC 4B D2 E9 5D */ bl "reserve__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Fi" -/* 8032F3A0 0032C300 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032F3A0 0032C300 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032F3A4 0032C304 3B 80 00 00 */ li r28, 0 -/* 8032F3A8 0032C308 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8032F3A8 0032C308 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8032F3AC 0032C30C 48 00 00 64 */ b lbl_8032F410 lbl_8032F3B0: /* 8032F3B0 0032C310 80 1F 01 80 */ lwz r0, 0x180(r31) @@ -5338,9 +5338,9 @@ lbl_8032F444: /* 8032F454 0032C3B4 90 1F 01 90 */ stw r0, 0x190(r31) /* 8032F458 0032C3B8 80 9F 01 B8 */ lwz r4, 0x1b8(r31) /* 8032F45C 0032C3BC 4B D2 E8 9D */ bl "reserve__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Fi" -/* 8032F460 0032C3C0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032F460 0032C3C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032F464 0032C3C4 3B 80 00 00 */ li r28, 0 -/* 8032F468 0032C3C8 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8032F468 0032C3C8 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8032F46C 0032C3CC 48 00 00 64 */ b lbl_8032F4D0 lbl_8032F470: /* 8032F470 0032C3D0 80 1F 01 90 */ lwz r0, 0x190(r31) @@ -5393,9 +5393,9 @@ lbl_8032F504: /* 8032F514 0032C474 90 1F 01 A0 */ stw r0, 0x1a0(r31) /* 8032F518 0032C478 80 9F 01 B8 */ lwz r4, 0x1b8(r31) /* 8032F51C 0032C47C 4B D2 E7 DD */ bl "reserve__Q24rstl45vector<9CVector3f,Q24rstl17rmemory_allocator>Fi" -/* 8032F520 0032C480 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8032F520 0032C480 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8032F524 0032C484 3B 80 00 00 */ li r28, 0 -/* 8032F528 0032C488 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8032F528 0032C488 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8032F52C 0032C48C 48 00 00 64 */ b lbl_8032F590 lbl_8032F530: /* 8032F530 0032C490 80 1F 01 A0 */ lwz r0, 0x1a0(r31) diff --git a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s index 3c31e93e..5b16ad79 100644 --- a/asm/Kyoto/Particles/CParticleSwooshDataFactory.s +++ b/asm/Kyoto/Particles/CParticleSwooshDataFactory.s @@ -475,8 +475,8 @@ lbl_8032FF38: lbl_8032FF90: /* 8032FF90 0032CEF0 28 1E 00 00 */ cmplwi r30, 0 /* 8032FF94 0032CEF4 41 82 00 20 */ beq lbl_8032FFB4 -/* 8032FF98 0032CEF8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8032FF9C 0032CEFC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8032FF98 0032CEF8 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8032FF9C 0032CEFC 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8032FFA0 0032CF00 90 1E 00 00 */ stw r0, 0(r30) /* 8032FFA4 0032CF04 41 82 00 10 */ beq lbl_8032FFB4 /* 8032FFA8 0032CF08 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -588,11 +588,11 @@ sub_803300e8: /* 8033011C 0032D07C 28 03 00 00 */ cmplwi r3, 0 /* 80330120 0032D080 41 82 00 38 */ beq lbl_80330158 /* 80330124 0032D084 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80330128 0032D088 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80330128 0032D088 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8033012C 0032D08C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80330130 0032D090 3C 80 80 3F */ lis r4, lbl_803EDDF8@ha /* 80330134 0032D094 90 03 00 00 */ stw r0, 0(r3) -/* 80330138 0032D098 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80330138 0032D098 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8033013C 0032D09C 38 A0 00 00 */ li r5, 0 /* 80330140 0032D0A0 38 04 DD F8 */ addi r0, r4, lbl_803EDDF8@l /* 80330144 0032D0A4 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Particles/CRealElement.s b/asm/Kyoto/Particles/CRealElement.s index 9aef1c4d..305ac2cc 100644 --- a/asm/Kyoto/Particles/CRealElement.s +++ b/asm/Kyoto/Particles/CRealElement.s @@ -1628,12 +1628,12 @@ __ct__7CREISWTFP12CRealElementP12CRealElement: GetValue__18CREVectorMagnitudeCFiRf: /* 803312C4 0032E224 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803312C8 0032E228 7C 08 02 A6 */ mflr r0 -/* 803312CC 0032E22C 3C C0 80 5A */ lis r6, skZero3f@ha +/* 803312CC 0032E22C 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 803312D0 0032E230 90 01 00 24 */ stw r0, 0x24(r1) /* 803312D4 0032E234 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803312D8 0032E238 7C BF 2B 78 */ mr r31, r5 /* 803312DC 0032E23C 38 A1 00 08 */ addi r5, r1, 8 -/* 803312E0 0032E240 C4 46 66 A0 */ lfsu f2, skZero3f@l(r6) +/* 803312E0 0032E240 C4 46 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r6) /* 803312E4 0032E244 80 63 00 04 */ lwz r3, 4(r3) /* 803312E8 0032E248 C0 26 00 04 */ lfs f1, 4(r6) /* 803312EC 0032E24C C0 06 00 08 */ lfs f0, 8(r6) @@ -1718,12 +1718,12 @@ __ct__18CREVectorMagnitudeFP14CVectorElement: GetValue__16CREVectorZToRealCFiRf: /* 803313FC 0032E35C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80331400 0032E360 7C 08 02 A6 */ mflr r0 -/* 80331404 0032E364 3C C0 80 5A */ lis r6, skZero3f@ha +/* 80331404 0032E364 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 80331408 0032E368 90 01 00 24 */ stw r0, 0x24(r1) /* 8033140C 0032E36C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80331410 0032E370 7C BF 2B 78 */ mr r31, r5 /* 80331414 0032E374 38 A1 00 08 */ addi r5, r1, 8 -/* 80331418 0032E378 C4 46 66 A0 */ lfsu f2, skZero3f@l(r6) +/* 80331418 0032E378 C4 46 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r6) /* 8033141C 0032E37C 80 63 00 04 */ lwz r3, 4(r3) /* 80331420 0032E380 C0 26 00 04 */ lfs f1, 4(r6) /* 80331424 0032E384 C0 06 00 08 */ lfs f0, 8(r6) @@ -1807,12 +1807,12 @@ __ct__16CREVectorZToRealFP14CVectorElement: GetValue__16CREVectorYToRealCFiRf: /* 80331530 0032E490 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80331534 0032E494 7C 08 02 A6 */ mflr r0 -/* 80331538 0032E498 3C C0 80 5A */ lis r6, skZero3f@ha +/* 80331538 0032E498 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 8033153C 0032E49C 90 01 00 24 */ stw r0, 0x24(r1) /* 80331540 0032E4A0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80331544 0032E4A4 7C BF 2B 78 */ mr r31, r5 /* 80331548 0032E4A8 38 A1 00 08 */ addi r5, r1, 8 -/* 8033154C 0032E4AC C4 46 66 A0 */ lfsu f2, skZero3f@l(r6) +/* 8033154C 0032E4AC C4 46 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r6) /* 80331550 0032E4B0 80 63 00 04 */ lwz r3, 4(r3) /* 80331554 0032E4B4 C0 26 00 04 */ lfs f1, 4(r6) /* 80331558 0032E4B8 C0 06 00 08 */ lfs f0, 8(r6) @@ -1896,12 +1896,12 @@ __ct__16CREVectorYToRealFP14CVectorElement: GetValue__16CREVectorXToRealCFiRf: /* 80331664 0032E5C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80331668 0032E5C8 7C 08 02 A6 */ mflr r0 -/* 8033166C 0032E5CC 3C C0 80 5A */ lis r6, skZero3f@ha +/* 8033166C 0032E5CC 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 80331670 0032E5D0 90 01 00 24 */ stw r0, 0x24(r1) /* 80331674 0032E5D4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80331678 0032E5D8 7C BF 2B 78 */ mr r31, r5 /* 8033167C 0032E5DC 38 A1 00 08 */ addi r5, r1, 8 -/* 80331680 0032E5E0 C4 46 66 A0 */ lfsu f2, skZero3f@l(r6) +/* 80331680 0032E5E0 C4 46 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r6) /* 80331684 0032E5E4 80 63 00 04 */ lwz r3, 4(r3) /* 80331688 0032E5E8 C0 26 00 04 */ lfs f1, 4(r6) /* 8033168C 0032E5EC C0 06 00 08 */ lfs f0, 8(r6) @@ -3160,7 +3160,7 @@ __ct__9CRERandomFP12CRealElementP12CRealElement: GetValue__13CREDotProductCFiRf: /* 80332770 0032F6D0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80332774 0032F6D4 7C 08 02 A6 */ mflr r0 -/* 80332778 0032F6D8 3C C0 80 5A */ lis r6, skZero3f@ha +/* 80332778 0032F6D8 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 8033277C 0032F6DC 90 01 00 34 */ stw r0, 0x34(r1) /* 80332780 0032F6E0 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80332784 0032F6E4 7C BF 2B 78 */ mr r31, r5 @@ -3169,7 +3169,7 @@ GetValue__13CREDotProductCFiRf: /* 80332790 0032F6F0 7C 9E 23 78 */ mr r30, r4 /* 80332794 0032F6F4 93 A1 00 24 */ stw r29, 0x24(r1) /* 80332798 0032F6F8 7C 7D 1B 78 */ mr r29, r3 -/* 8033279C 0032F6FC 38 66 66 A0 */ addi r3, r6, skZero3f@l +/* 8033279C 0032F6FC 38 66 66 A0 */ addi r3, r6, sZeroVector__9CVector3f@l /* 803327A0 0032F700 C0 03 00 00 */ lfs f0, 0(r3) /* 803327A4 0032F704 C0 23 00 04 */ lfs f1, 4(r3) /* 803327A8 0032F708 C0 43 00 08 */ lfs f2, 8(r3) diff --git a/asm/Kyoto/Particles/CVectorElement.s b/asm/Kyoto/Particles/CVectorElement.s index 4e79af37..27695087 100644 --- a/asm/Kyoto/Particles/CVectorElement.s +++ b/asm/Kyoto/Particles/CVectorElement.s @@ -308,7 +308,7 @@ __ct__7CVECTVCFP13CColorElement: GetValue__11CVESubtractCFiR9CVector3f: /* 803349D8 00331938 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803349DC 0033193C 7C 08 02 A6 */ mflr r0 -/* 803349E0 00331940 3C C0 80 5A */ lis r6, skZero3f@ha +/* 803349E0 00331940 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 803349E4 00331944 90 01 00 34 */ stw r0, 0x34(r1) /* 803349E8 00331948 93 E1 00 2C */ stw r31, 0x2c(r1) /* 803349EC 0033194C 7C BF 2B 78 */ mr r31, r5 @@ -317,7 +317,7 @@ GetValue__11CVESubtractCFiR9CVector3f: /* 803349F8 00331958 7C 9E 23 78 */ mr r30, r4 /* 803349FC 0033195C 93 A1 00 24 */ stw r29, 0x24(r1) /* 80334A00 00331960 7C 7D 1B 78 */ mr r29, r3 -/* 80334A04 00331964 38 66 66 A0 */ addi r3, r6, skZero3f@l +/* 80334A04 00331964 38 66 66 A0 */ addi r3, r6, sZeroVector__9CVector3f@l /* 80334A08 00331968 C0 03 00 00 */ lfs f0, 0(r3) /* 80334A0C 0033196C C0 23 00 04 */ lfs f1, 4(r3) /* 80334A10 00331970 C0 43 00 08 */ lfs f2, 8(r3) @@ -1084,7 +1084,7 @@ __ct__8CVEPulseFP11CIntElementP11CIntElementP14CVectorElementP14CVectorElement: GetValue__11CVEMultiplyCFiR9CVector3f: /* 80335488 003323E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8033548C 003323EC 7C 08 02 A6 */ mflr r0 -/* 80335490 003323F0 3C C0 80 5A */ lis r6, skZero3f@ha +/* 80335490 003323F0 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 80335494 003323F4 90 01 00 34 */ stw r0, 0x34(r1) /* 80335498 003323F8 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8033549C 003323FC 7C BF 2B 78 */ mr r31, r5 @@ -1093,7 +1093,7 @@ GetValue__11CVEMultiplyCFiR9CVector3f: /* 803354A8 00332408 7C 9E 23 78 */ mr r30, r4 /* 803354AC 0033240C 93 A1 00 24 */ stw r29, 0x24(r1) /* 803354B0 00332410 7C 7D 1B 78 */ mr r29, r3 -/* 803354B4 00332414 38 66 66 A0 */ addi r3, r6, skZero3f@l +/* 803354B4 00332414 38 66 66 A0 */ addi r3, r6, sZeroVector__9CVector3f@l /* 803354B8 00332418 C0 03 00 00 */ lfs f0, 0(r3) /* 803354BC 0033241C C0 23 00 04 */ lfs f1, 4(r3) /* 803354C0 00332420 C0 43 00 08 */ lfs f2, 8(r3) @@ -1210,7 +1210,7 @@ __ct__11CVEMultiplyFP14CVectorElementP14CVectorElement: GetValue__6CVEAddCFiR9CVector3f: /* 8033564C 003325AC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80335650 003325B0 7C 08 02 A6 */ mflr r0 -/* 80335654 003325B4 3C C0 80 5A */ lis r6, skZero3f@ha +/* 80335654 003325B4 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 80335658 003325B8 90 01 00 34 */ stw r0, 0x34(r1) /* 8033565C 003325BC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80335660 003325C0 7C BF 2B 78 */ mr r31, r5 @@ -1219,7 +1219,7 @@ GetValue__6CVEAddCFiR9CVector3f: /* 8033566C 003325CC 7C 9E 23 78 */ mr r30, r4 /* 80335670 003325D0 93 A1 00 24 */ stw r29, 0x24(r1) /* 80335674 003325D4 7C 7D 1B 78 */ mr r29, r3 -/* 80335678 003325D8 38 66 66 A0 */ addi r3, r6, skZero3f@l +/* 80335678 003325D8 38 66 66 A0 */ addi r3, r6, sZeroVector__9CVector3f@l /* 8033567C 003325DC C0 03 00 00 */ lfs f0, 0(r3) /* 80335680 003325E0 C0 23 00 04 */ lfs f1, 4(r3) /* 80335684 003325E4 C0 43 00 08 */ lfs f2, 8(r3) @@ -1521,10 +1521,10 @@ __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRea /* 80335AC8 00332A28 3D 00 80 3F */ lis r8, lbl_803EE268@ha /* 80335ACC 00332A2C 90 1F 00 00 */ stw r0, 0(r31) /* 80335AD0 00332A30 38 08 E2 68 */ addi r0, r8, lbl_803EE268@l -/* 80335AD4 00332A34 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80335AD4 00332A34 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80335AD8 00332A38 7C DE 33 78 */ mr r30, r6 /* 80335ADC 00332A3C 90 1F 00 00 */ stw r0, 0(r31) -/* 80335AE0 00332A40 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80335AE0 00332A40 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80335AE4 00332A44 C0 02 CB 54 */ lfs f0, lbl_805AE874@sda21(r2) /* 80335AE8 00332A48 7F C3 F3 78 */ mr r3, r30 /* 80335AEC 00332A4C 90 9F 00 04 */ stw r4, 4(r31) @@ -1590,8 +1590,8 @@ __ct__16CVECircleClusterFP14CVectorElementP14CVectorElementP11CIntElementP12CRea /* 80335BDC 00332B3C D0 01 00 20 */ stfs f0, 0x20(r1) /* 80335BE0 00332B40 48 00 00 20 */ b lbl_80335C00 lbl_80335BE4: -/* 80335BE4 00332B44 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80335BE8 00332B48 C4 43 66 F4 */ lfsu f2, lbl_805A66F4@l(r3) +/* 80335BE4 00332B44 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80335BE8 00332B48 C4 43 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r3) /* 80335BEC 00332B4C C0 23 00 04 */ lfs f1, 4(r3) /* 80335BF0 00332B50 C0 03 00 08 */ lfs f0, 8(r3) /* 80335BF4 00332B54 D0 41 00 18 */ stfs f2, 0x18(r1) @@ -2008,8 +2008,8 @@ __ct__9CVECircleFP14CVectorElementP14CVectorElementP12CRealElementP12CRealElemen /* 803361D0 00333130 38 03 E2 90 */ addi r0, r3, lbl_803EE290@l /* 803361D4 00333134 38 A1 00 14 */ addi r5, r1, 0x14 /* 803361D8 00333138 90 1E 00 00 */ stw r0, 0(r30) -/* 803361DC 0033313C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 803361E0 00333140 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 803361DC 0033313C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 803361E0 00333140 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 803361E4 00333144 90 9E 00 04 */ stw r4, 4(r30) /* 803361E8 00333148 7F E3 FB 78 */ mr r3, r31 /* 803361EC 0033314C 38 80 00 00 */ li r4, 0 @@ -2489,7 +2489,7 @@ __ct__7CVEConeFP14CVectorElementP12CRealElement: /* 803368C8 00333828 3C 60 80 3F */ lis r3, lbl_803EC594@ha /* 803368CC 0033382C 90 1F 00 00 */ stw r0, 0(r31) /* 803368D0 00333830 38 03 C5 94 */ addi r0, r3, lbl_803EC594@l -/* 803368D4 00333834 3C 60 80 5A */ lis r3, skZero3f@ha +/* 803368D4 00333834 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 803368D8 00333838 7F E7 FB 78 */ mr r7, r31 /* 803368DC 0033383C 90 1F 00 00 */ stw r0, 0(r31) /* 803368E0 00333840 38 06 E2 B8 */ addi r0, r6, lbl_803EE2B8@l @@ -2498,7 +2498,7 @@ __ct__7CVEConeFP14CVectorElementP12CRealElement: /* 803368EC 0033384C 38 80 00 00 */ li r4, 0 /* 803368F0 00333850 90 BF 00 08 */ stw r5, 8(r31) /* 803368F4 00333854 38 A1 00 14 */ addi r5, r1, 0x14 -/* 803368F8 00333858 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 803368F8 00333858 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 803368FC 0033385C D0 3F 00 0C */ stfs f1, 0xc(r31) /* 80336900 00333860 C0 23 00 04 */ lfs f1, 4(r3) /* 80336904 00333864 D0 3F 00 10 */ stfs f1, 0x10(r31) diff --git a/asm/Kyoto/Text/CRasterFont.s b/asm/Kyoto/Text/CRasterFont.s index 7593e0e4..1daeb07e 100644 --- a/asm/Kyoto/Text/CRasterFont.s +++ b/asm/Kyoto/Text/CRasterFont.s @@ -247,11 +247,11 @@ sub_803001e8: /* 8030021C 002FD17C 28 03 00 00 */ cmplwi r3, 0 /* 80300220 002FD180 41 82 00 38 */ beq lbl_80300258 /* 80300224 002FD184 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80300228 002FD188 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80300228 002FD188 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8030022C 002FD18C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80300230 002FD190 3C 80 80 3E */ lis r4, lbl_803D8D60@ha /* 80300234 002FD194 90 03 00 00 */ stw r0, 0(r3) -/* 80300238 002FD198 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80300238 002FD198 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8030023C 002FD19C 38 A0 00 00 */ li r5, 0 /* 80300240 002FD1A0 38 04 8D 60 */ addi r0, r4, lbl_803D8D60@l /* 80300244 002FD1A4 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Kyoto/Text/CStringTable.s b/asm/Kyoto/Text/CStringTable.s index b5dec4fb..76c0d94a 100644 --- a/asm/Kyoto/Text/CStringTable.s +++ b/asm/Kyoto/Text/CStringTable.s @@ -130,11 +130,11 @@ lbl_80356618: /* 80356694 003535F4 28 03 00 00 */ cmplwi r3, 0 /* 80356698 003535F8 41 82 00 38 */ beq lbl_803566D0 /* 8035669C 003535FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 803566A0 00353600 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 803566A0 00353600 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 803566A4 00353604 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 803566A8 00353608 3C 80 80 3E */ lis r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@ha /* 803566AC 0035360C 90 03 00 00 */ stw r0, 0(r3) -/* 803566B0 00353610 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 803566B0 00353610 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 803566B4 00353614 38 A0 00 00 */ li r5, 0 /* 803566B8 00353618 38 04 9A 0C */ addi r0, r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@l /* 803566BC 0035361C 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetaRender/CCubeRenderer.s b/asm/MetaRender/CCubeRenderer.s index 2a777c5f..45eac493 100644 --- a/asm/MetaRender/CCubeRenderer.s +++ b/asm/MetaRender/CCubeRenderer.s @@ -923,11 +923,11 @@ lbl_802B6568: /* 802B66DC 002B363C C8 01 00 D0 */ lfd f0, 0xd0(r1) /* 802B66E0 002B3640 EC 80 20 28 */ fsubs f4, f0, f4 /* 802B66E4 002B3644 48 05 5E 71 */ bl SetOrtho__9CGraphicsFffffff -/* 802B66E8 002B3648 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802B66EC 002B364C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802B66E8 002B3648 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802B66EC 002B364C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802B66F0 002B3650 48 05 60 5D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 802B66F4 002B3654 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802B66F8 002B3658 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802B66F4 002B3654 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802B66F8 002B3658 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802B66FC 002B365C 48 05 5E E5 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802B6700 002B3660 38 60 00 00 */ li r3, 0 /* 802B6704 002B3664 38 80 00 07 */ li r4, 7 @@ -1250,14 +1250,14 @@ DoPhazonSuitIndirectAlphaBlur__13CCubeRendererFff: /* 802B6BDC 002B3B3C 7C 7C 1B 78 */ mr r28, r3 /* 802B6BE0 002B3B40 C0 A2 C2 A8 */ lfs f5, lbl_805ADFC8@sda21(r2) /* 802B6BE4 002B3B44 48 05 59 71 */ bl SetOrtho__9CGraphicsFffffff -/* 802B6BE8 002B3B48 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802B6BEC 002B3B4C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802B6BE8 002B3B48 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802B6BEC 002B3B4C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802B6BF0 002B3B50 48 05 5B 5D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 802B6BF4 002B3B54 81 9C 00 00 */ lwz r12, 0(r28) -/* 802B6BF8 002B3B58 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802B6BF8 002B3B58 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802B6BFC 002B3B5C 7F 83 E3 78 */ mr r3, r28 /* 802B6C00 002B3B60 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 802B6C04 002B3B64 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802B6C04 002B3B64 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802B6C08 002B3B68 7D 89 03 A6 */ mtctr r12 /* 802B6C0C 002B3B6C 4E 80 04 21 */ bctrl /* 802B6C10 002B3B70 38 60 00 00 */ li r3, 0 @@ -3082,9 +3082,9 @@ sub_802b85cc: /* 802B8658 002B55B8 38 61 00 6C */ addi r3, r1, 0x6c /* 802B865C 002B55BC 38 81 00 3C */ addi r4, r1, 0x3c /* 802B8660 002B55C0 48 05 A5 15 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 802B8664 002B55C4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802B8664 002B55C4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802B8668 002B55C8 38 61 00 6C */ addi r3, r1, 0x6c -/* 802B866C 002B55CC 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 802B866C 002B55CC 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 802B8670 002B55D0 38 80 00 1E */ li r4, 0x1e /* 802B8674 002B55D4 C0 46 00 00 */ lfs f2, 0(r6) /* 802B8678 002B55D8 38 A0 00 00 */ li r5, 0 @@ -4390,11 +4390,11 @@ lbl_802B9904: /* 802B9908 002B6868 38 80 00 01 */ li r4, 1 /* 802B990C 002B686C 48 04 E6 AD */ bl SetIndTexMtxSTPointFive__3CGXF14_GXIndTexMtxIDSc /* 802B9910 002B6870 55 D8 06 3E */ clrlwi r24, r14, 0x18 -/* 802B9914 002B6874 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802B9914 002B6874 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802B9918 002B6878 7C 18 00 D0 */ neg r0, r24 /* 802B991C 002B687C 3C 80 80 5A */ lis r4, lbl_805A61D4@ha /* 802B9920 002B6880 7C 00 C3 78 */ or r0, r0, r24 -/* 802B9924 002B6884 39 C3 66 70 */ addi r14, r3, skIdentity4f@l +/* 802B9924 002B6884 39 C3 66 70 */ addi r14, r3, sIdentity__12CTransform4f@l /* 802B9928 002B6888 54 03 0F FE */ srwi r3, r0, 0x1f /* 802B992C 002B688C CB C2 C2 A0 */ lfd f30, lbl_805ADFC0@sda21(r2) /* 802B9930 002B6890 38 04 61 D4 */ addi r0, r4, lbl_805A61D4@l @@ -5307,11 +5307,11 @@ DoThermalBlendHot__13CCubeRendererFv: /* 802BA6AC 002B760C C0 03 00 18 */ lfs f0, 0x18(r3) /* 802BA6B0 002B7610 D0 01 00 20 */ stfs f0, 0x20(r1) /* 802BA6B4 002B7614 48 05 1E A1 */ bl SetOrtho__9CGraphicsFffffff -/* 802BA6B8 002B7618 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BA6BC 002B761C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BA6B8 002B7618 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BA6BC 002B761C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BA6C0 002B7620 48 05 20 8D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 802BA6C4 002B7624 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BA6C8 002B7628 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BA6C4 002B7624 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BA6C8 002B7628 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BA6CC 002B762C 48 05 1F 15 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BA6D0 002B7630 48 0B DE 95 */ bl GXPixModeSync /* 802BA6D4 002B7634 38 60 00 A0 */ li r3, 0xa0 @@ -5702,11 +5702,11 @@ lbl_802BAA1C: /* 802BACBC 002B7C1C C0 03 00 18 */ lfs f0, 0x18(r3) /* 802BACC0 002B7C20 D0 01 00 48 */ stfs f0, 0x48(r1) /* 802BACC4 002B7C24 48 05 18 91 */ bl SetOrtho__9CGraphicsFffffff -/* 802BACC8 002B7C28 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BACCC 002B7C2C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BACC8 002B7C28 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BACCC 002B7C2C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BACD0 002B7C30 48 05 1A 7D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 802BACD4 002B7C34 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BACD8 002B7C38 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BACD4 002B7C34 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BACD8 002B7C38 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BACDC 002B7C3C 48 05 19 05 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BACE0 002B7C40 48 0B D8 85 */ bl GXPixModeSync /* 802BACE4 002B7C44 38 60 00 A0 */ li r3, 0xa0 @@ -5858,41 +5858,41 @@ RenderFogVolumeModel__13CCubeRendererFRC6CAABoxPC6CModelRC12CTransform4f12CTrans /* 802BAF20 002B7E80 D0 41 00 28 */ stfs f2, 0x28(r1) /* 802BAF24 002B7E84 48 05 8E AD */ bl __ct__13CUnitVector3fFRC9CVector3f /* 802BAF28 002B7E88 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 802BAF2C 002B7E8C 3C 60 80 5A */ lis r3, lbl_805A6718@ha +/* 802BAF2C 002B7E8C 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha /* 802BAF30 002B7E90 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 802BAF34 002B7E94 39 23 67 18 */ addi r9, r3, lbl_805A6718@l +/* 802BAF34 002B7E94 39 23 67 18 */ addi r9, r3, sRightVector__9CVector3f@l /* 802BAF38 002B7E98 C0 01 00 2C */ lfs f0, 0x2c(r1) -/* 802BAF3C 002B7E9C 3C 60 80 5A */ lis r3, lbl_805A670C@ha +/* 802BAF3C 002B7E9C 3C 60 80 5A */ lis r3, sLeftVector__9CVector3f@ha /* 802BAF40 002B7EA0 EC 62 00 72 */ fmuls f3, f2, f1 /* 802BAF44 002B7EA4 C0 9E 00 0C */ lfs f4, 0xc(r30) -/* 802BAF48 002B7EA8 39 03 67 0C */ addi r8, r3, lbl_805A670C@l +/* 802BAF48 002B7EA8 39 03 67 0C */ addi r8, r3, sLeftVector__9CVector3f@l /* 802BAF4C 002B7EAC C0 41 00 34 */ lfs f2, 0x34(r1) -/* 802BAF50 002B7EB0 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 802BAF50 002B7EB0 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 802BAF54 002B7EB4 C0 E1 00 5C */ lfs f7, 0x5c(r1) /* 802BAF58 002B7EB8 EC 84 18 3A */ fmadds f4, f4, f0, f3 /* 802BAF5C 002B7EBC C0 BE 00 2C */ lfs f5, 0x2c(r30) -/* 802BAF60 002B7EC0 38 E3 67 24 */ addi r7, r3, lbl_805A6724@l +/* 802BAF60 002B7EC0 38 E3 67 24 */ addi r7, r3, sForwardVector__9CVector3f@l /* 802BAF64 002B7EC4 C0 C1 00 60 */ lfs f6, 0x60(r1) /* 802BAF68 002B7EC8 C0 62 C2 EC */ lfs f3, lbl_805AE00C@sda21(r2) -/* 802BAF6C 002B7ECC 3C 60 80 5A */ lis r3, lbl_805A6730@ha +/* 802BAF6C 002B7ECC 3C 60 80 5A */ lis r3, sBackVector__9CVector3f@ha /* 802BAF70 002B7ED0 ED 05 20 BA */ fmadds f8, f5, f2, f4 -/* 802BAF74 002B7ED4 38 C3 67 30 */ addi r6, r3, lbl_805A6730@l +/* 802BAF74 002B7ED4 38 C3 67 30 */ addi r6, r3, sBackVector__9CVector3f@l /* 802BAF78 002B7ED8 C0 A1 00 64 */ lfs f5, 0x64(r1) -/* 802BAF7C 002B7EDC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 802BAF7C 002B7EDC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 802BAF80 002B7EE0 C0 82 C2 E8 */ lfs f4, lbl_805AE008@sda21(r2) -/* 802BAF84 002B7EE4 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 802BAF88 002B7EE8 38 A4 66 F4 */ addi r5, r4, lbl_805A66F4@l +/* 802BAF84 002B7EE4 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 802BAF88 002B7EE8 38 A4 66 F4 */ addi r5, r4, sUpVector__9CVector3f@l /* 802BAF8C 002B7EEC EC 63 40 2A */ fadds f3, f3, f8 /* 802BAF90 002B7EF0 FE C0 38 50 */ fneg f22, f7 -/* 802BAF94 002B7EF4 38 83 67 00 */ addi r4, r3, lbl_805A6700@l +/* 802BAF94 002B7EF4 38 83 67 00 */ addi r4, r3, sDownVector__9CVector3f@l /* 802BAF98 002B7EF8 FE A0 30 50 */ fneg f21, f6 /* 802BAF9C 002B7EFC C2 E9 00 00 */ lfs f23, 0(r9) /* 802BAFA0 002B7F00 FE 80 28 50 */ fneg f20, f5 /* 802BAFA4 002B7F04 EC 64 18 2A */ fadds f3, f4, f3 /* 802BAFA8 002B7F08 C3 09 00 04 */ lfs f24, 4(r9) -/* 802BAFAC 002B7F0C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802BAFAC 002B7F0C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802BAFB0 002B7F10 C3 29 00 08 */ lfs f25, 8(r9) -/* 802BAFB4 002B7F14 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BAFB4 002B7F14 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BAFB8 002B7F18 C3 41 00 50 */ lfs f26, 0x50(r1) /* 802BAFBC 002B7F1C C3 68 00 00 */ lfs f27, 0(r8) /* 802BAFC0 002B7F20 C3 88 00 04 */ lfs f28, 4(r8) @@ -7112,11 +7112,11 @@ lbl_802BBEB8: /* 802BC174 002B90D4 C8 01 01 10 */ lfd f0, 0x110(r1) /* 802BC178 002B90D8 EC 80 20 28 */ fsubs f4, f0, f4 /* 802BC17C 002B90DC 48 05 03 D9 */ bl SetOrtho__9CGraphicsFffffff -/* 802BC180 002B90E0 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BC184 002B90E4 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BC180 002B90E0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BC184 002B90E4 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BC188 002B90E8 48 05 05 C5 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 802BC18C 002B90EC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BC190 002B90F0 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BC18C 002B90EC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BC190 002B90F0 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BC194 002B90F4 48 05 04 4D */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BC198 002B90F8 38 60 00 00 */ li r3, 0 /* 802BC19C 002B90FC 38 80 00 07 */ li r4, 7 @@ -7744,11 +7744,11 @@ lbl_802BC9E8: /* 802BCA0C 002B996C EF 80 18 28 */ fsubs f28, f0, f3 /* 802BCA10 002B9970 FC 60 E0 90 */ fmr f3, f28 /* 802BCA14 002B9974 48 04 FB 41 */ bl SetOrtho__9CGraphicsFffffff -/* 802BCA18 002B9978 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BCA1C 002B997C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BCA18 002B9978 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BCA1C 002B997C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BCA20 002B9980 48 04 FD 2D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 802BCA24 002B9984 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BCA28 002B9988 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BCA24 002B9984 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BCA28 002B9988 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BCA2C 002B998C 48 04 FB B5 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BCA30 002B9990 FC 20 E8 90 */ fmr f1, f29 /* 802BCA34 002B9994 38 61 00 08 */ addi r3, r1, 8 @@ -7821,10 +7821,10 @@ SetAmbientColor__13CCubeRendererFRC6CColor: EndPrimitive__13CCubeRendererFv: /* 802BCB14 002B9A74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802BCB18 002B9A78 7C 08 02 A6 */ mflr r0 -/* 802BCB1C 002B9A7C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802BCB1C 002B9A7C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802BCB20 002B9A80 90 01 00 14 */ stw r0, 0x14(r1) /* 802BCB24 002B9A84 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802BCB28 002B9A88 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 802BCB28 002B9A88 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 802BCB2C 002B9A8C 93 C1 00 08 */ stw r30, 8(r1) /* 802BCB30 002B9A90 7C 7E 1B 78 */ mr r30, r3 /* 802BCB34 002B9A94 48 00 00 1C */ b lbl_802BCB50 @@ -8750,8 +8750,8 @@ SetupCGraphicsStates__13CCubeRendererFv: /* 802BD7A8 002BA708 80 02 C2 68 */ lwz r0, lbl_805ADF88@sda21(r2) /* 802BD7AC 002BA70C 90 01 00 0C */ stw r0, 0xc(r1) /* 802BD7B0 002BA710 48 04 F1 CD */ bl DisableAllLights__9CGraphicsFv -/* 802BD7B4 002BA714 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BD7B8 002BA718 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BD7B4 002BA714 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BD7B8 002BA718 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BD7BC 002BA71C 48 04 EE 25 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BD7C0 002BA720 48 04 B6 E9 */ bl ResetStates__13CTevCombinersFv /* 802BD7C4 002BA724 C0 22 C3 08 */ lfs f1, lbl_805AE028@sda21(r2) @@ -8792,8 +8792,8 @@ SetupRendererStates__13CCubeRendererFb: /* 802BD844 002BA7A4 93 C1 00 18 */ stw r30, 0x18(r1) /* 802BD848 002BA7A8 7C 7E 1B 78 */ mr r30, r3 /* 802BD84C 002BA7AC 48 04 F1 31 */ bl DisableAllLights__9CGraphicsFv -/* 802BD850 002BA7B0 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BD854 002BA7B4 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BD850 002BA7B0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BD854 002BA7B4 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BD858 002BA7B8 48 04 ED 89 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BD85C 002BA7BC 38 00 00 00 */ li r0, 0 /* 802BD860 002BA7C0 38 61 00 0C */ addi r3, r1, 0xc @@ -9141,8 +9141,8 @@ BeginScene__13CCubeRendererFv: /* 802BDD38 002BAC98 C0 62 C2 70 */ lfs f3, lbl_805ADF90@sda21(r2) /* 802BDD3C 002BAC9C C0 82 C2 94 */ lfs f4, lbl_805ADFB4@sda21(r2) /* 802BDD40 002BACA0 48 04 E7 51 */ bl SetPerspective__9CGraphicsFffff -/* 802BDD44 002BACA4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802BDD48 002BACA8 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802BDD44 002BACA4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802BDD48 002BACA8 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802BDD4C 002BACAC 48 04 E8 95 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802BDD50 002BACB0 48 04 C1 B1 */ bl TickRenderTimings__9CGraphicsFv /* 802BDD54 002BACB4 80 7F 03 10 */ lwz r3, 0x310(r31) @@ -10525,10 +10525,10 @@ __ct__13CCubeRendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory: /* 802BF0B8 002BC018 C0 42 C2 70 */ lfs f2, lbl_805ADF90@sda21(r2) /* 802BF0BC 002BC01C 90 DF 00 18 */ stw r6, 0x18(r31) /* 802BF0C0 002BC020 38 1F 00 28 */ addi r0, r31, 0x28 -/* 802BF0C4 002BC024 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802BF0C4 002BC024 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802BF0C8 002BC028 FC 60 10 90 */ fmr f3, f2 /* 802BF0CC 002BC02C 90 1F 00 20 */ stw r0, 0x20(r31) -/* 802BF0D0 002BC030 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802BF0D0 002BC030 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802BF0D4 002BC034 C0 22 C3 50 */ lfs f1, lbl_805AE070@sda21(r2) /* 802BF0D8 002BC038 38 7F 00 44 */ addi r3, r31, 0x44 /* 802BF0DC 002BC03C 90 1F 00 24 */ stw r0, 0x24(r31) @@ -10613,8 +10613,8 @@ __ct__13CCubeRendererFR12IObjectStoreR10COsContextR10CMemorySysR11CResFactory: /* 802BF218 002BC178 90 1F 02 DC */ stw r0, 0x2dc(r31) /* 802BF21C 002BC17C 48 08 AD 91 */ bl White__6CColorFv /* 802BF220 002BC180 80 03 00 00 */ lwz r0, 0(r3) -/* 802BF224 002BC184 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 802BF228 002BC188 38 E3 67 24 */ addi r7, r3, lbl_805A6724@l +/* 802BF224 002BC184 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 802BF228 002BC188 38 E3 67 24 */ addi r7, r3, sForwardVector__9CVector3f@l /* 802BF22C 002BC18C C0 02 C2 70 */ lfs f0, lbl_805ADF90@sda21(r2) /* 802BF230 002BC190 90 1F 02 E0 */ stw r0, 0x2e0(r31) /* 802BF234 002BC194 38 00 00 FF */ li r0, 0xff diff --git a/asm/MetroidPrime/BodyState/CBSAttack.s b/asm/MetroidPrime/BodyState/CBSAttack.s index ccd8d2c5..3f1e0bf2 100644 --- a/asm/MetroidPrime/BodyState/CBSAttack.s +++ b/asm/MetroidPrime/BodyState/CBSAttack.s @@ -542,8 +542,8 @@ lbl_801354E8: /* 801354E8 00132448 D0 3E 00 30 */ stfs f1, 0x30(r30) /* 801354EC 0013244C 48 00 00 2C */ b lbl_80135518 lbl_801354F0: -/* 801354F0 00132450 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801354F4 00132454 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 801354F0 00132450 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801354F4 00132454 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 801354F8 00132458 C0 02 99 A8 */ lfs f0, lbl_805AB6C8@sda21(r2) /* 801354FC 0013245C D0 3E 00 20 */ stfs f1, 0x20(r30) /* 80135500 00132460 C0 23 00 04 */ lfs f1, 4(r3) @@ -596,14 +596,14 @@ __ct__9CBSAttackFv: /* 80135598 001324F8 3C A0 80 3E */ lis r5, lbl_803E1318@ha /* 8013559C 001324FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801355A0 00132500 38 05 13 18 */ addi r0, r5, lbl_803E1318@l -/* 801355A4 00132504 3C C0 80 5A */ lis r6, skZero3f@ha +/* 801355A4 00132504 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 801355A8 00132508 3C 80 80 3E */ lis r4, lbl_803E1370@ha /* 801355AC 0013250C 90 03 00 00 */ stw r0, 0(r3) /* 801355B0 00132510 38 04 13 70 */ addi r0, r4, lbl_803E1370@l /* 801355B4 00132514 39 40 FF FF */ li r10, -1 /* 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, skZero3f@l +/* 801355C0 00132520 39 26 66 A0 */ addi r9, r6, sZeroVector__9CVector3f@l /* 801355C4 00132524 3C A0 80 3E */ lis r5, lbl_803DAA68@ha /* 801355C8 00132528 91 43 00 04 */ stw r10, 4(r3) /* 801355CC 0013252C 38 04 AA 08 */ addi r0, r4, lbl_803DAA08@l diff --git a/asm/MetroidPrime/BodyState/CBSCover.s b/asm/MetroidPrime/BodyState/CBSCover.s index 4c0b6a9d..1e5e0d65 100644 --- a/asm/MetroidPrime/BodyState/CBSCover.s +++ b/asm/MetroidPrime/BodyState/CBSCover.s @@ -473,8 +473,8 @@ Start__8CBSCoverFR15CBodyControllerR13CStateManager: /* 80176304 00173264 38 E0 FF FF */ li r7, -1 /* 80176308 00173268 48 16 ED 59 */ bl FindBestAnimation__12CPASDatabaseCFRC16CPASAnimParmDataR9CRandom16i /* 8017630C 0017326C 80 9F 00 00 */ lwz r4, 0(r31) -/* 80176310 00173270 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 80176314 00173274 38 E3 67 24 */ addi r7, r3, lbl_805A6724@l +/* 80176310 00173270 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 80176314 00173274 38 E3 67 24 */ addi r7, r3, sForwardVector__9CVector3f@l /* 80176318 00173278 C0 62 A1 A4 */ lfs f3, lbl_805ABEC4@sda21(r2) /* 8017631C 0017327C 81 04 00 64 */ lwz r8, 0x64(r4) /* 80176320 00173280 38 61 00 74 */ addi r3, r1, 0x74 diff --git a/asm/MetroidPrime/BodyState/CBSHurled.s b/asm/MetroidPrime/BodyState/CBSHurled.s index 505d249b..73df35dd 100644 --- a/asm/MetroidPrime/BodyState/CBSHurled.s +++ b/asm/MetroidPrime/BodyState/CBSHurled.s @@ -196,8 +196,8 @@ Recover__9CBSHurledFR13CStateManagerR15CBodyControllerQ23pas12EHurledState: /* 80144638 00141598 80 83 00 04 */ lwz r4, 4(r3) /* 8014463C 0014159C 28 04 00 00 */ cmplwi r4, 0 /* 80144640 001415A0 41 82 00 20 */ beq lbl_80144660 -/* 80144644 001415A4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80144648 001415A8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80144644 001415A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80144648 001415A8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8014464C 001415AC D0 04 01 50 */ stfs f0, 0x150(r4) /* 80144650 001415B0 C0 03 00 04 */ lfs f0, 4(r3) /* 80144654 001415B4 D0 04 01 54 */ stfs f0, 0x154(r4) @@ -781,8 +781,8 @@ lbl_80144E44: /* 80144E8C 00141DEC 7D 89 03 A6 */ mtctr r12 /* 80144E90 00141DF0 4E 80 04 21 */ bctrl /* 80144E94 00141DF4 C0 02 9C 2C */ lfs f0, lbl_805AB94C@sda21(r2) -/* 80144E98 00141DF8 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 80144E9C 00141DFC 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 80144E98 00141DF8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 80144E9C 00141DFC 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 80144EA0 00141E00 7F 83 E3 78 */ mr r3, r28 /* 80144EA4 00141E04 EC 80 07 F2 */ fmuls f4, f0, f31 /* 80144EA8 00141E08 C0 65 00 00 */ lfs f3, 0(r5) @@ -1110,9 +1110,9 @@ lbl_801451EC: /* 8014535C 001422BC B0 01 00 10 */ sth r0, 0x10(r1) /* 80145360 001422C0 38 C0 00 28 */ li r6, 0x28 /* 80145364 001422C4 4B EF EB 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage -/* 80145368 001422C8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80145368 001422C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014536C 001422CC C0 22 9C 24 */ lfs f1, lbl_805AB944@sda21(r2) -/* 80145370 001422D0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80145370 001422D0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80145374 001422D4 38 7F 00 14 */ addi r3, r31, 0x14 /* 80145378 001422D8 48 1C AB ED */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8014537C 001422DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1278,10 +1278,10 @@ __ct__9CBSHurledFv: /* 801455AC 0014250C C0 22 9C 28 */ lfs f1, lbl_805AB948@sda21(r2) /* 801455B0 00142510 90 03 00 00 */ stw r0, 0(r3) /* 801455B4 00142514 38 C5 1F B0 */ addi r6, r5, lbl_803E1FB0@l -/* 801455B8 00142518 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801455B8 00142518 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801455BC 0014251C 38 00 FF FF */ li r0, -1 /* 801455C0 00142520 90 C3 00 00 */ stw r6, 0(r3) -/* 801455C4 00142524 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801455C4 00142524 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801455C8 00142528 38 80 00 00 */ li r4, 0 /* 801455CC 0014252C 90 03 00 04 */ stw r0, 4(r3) /* 801455D0 00142530 D0 23 00 08 */ stfs f1, 8(r3) diff --git a/asm/MetroidPrime/BodyState/CBSJump.s b/asm/MetroidPrime/BodyState/CBSJump.s index 3b727f22..1824fa59 100644 --- a/asm/MetroidPrime/BodyState/CBSJump.s +++ b/asm/MetroidPrime/BodyState/CBSJump.s @@ -602,8 +602,8 @@ lbl_80145E04: /* 80145E18 00142D78 41 82 00 28 */ beq lbl_80145E40 /* 80145E1C 00142D7C 7F 63 DB 78 */ mr r3, r27 /* 80145E20 00142D80 4B FD 55 59 */ bl Stop__13CPhysicsActorFv -/* 80145E24 00142D84 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80145E28 00142D88 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80145E24 00142D84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80145E28 00142D88 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80145E2C 00142D8C D0 1B 01 50 */ stfs f0, 0x150(r27) /* 80145E30 00142D90 C0 03 00 04 */ lfs f0, 4(r3) /* 80145E34 00142D94 D0 1B 01 54 */ stfs f0, 0x154(r27) @@ -998,8 +998,8 @@ Start__7CBSJumpFR15CBodyControllerR13CStateManager: /* 801463E0 00143340 54 A0 D7 FF */ rlwinm. r0, r5, 0x1a, 0x1f, 0x1f /* 801463E4 00143344 41 82 00 90 */ beq lbl_80146474 /* 801463E8 00143348 80 DE 00 00 */ lwz r6, 0(r30) -/* 801463EC 0014334C 3C 80 80 5A */ lis r4, lbl_805A66F4@ha -/* 801463F0 00143350 38 84 66 F4 */ addi r4, r4, lbl_805A66F4@l +/* 801463EC 0014334C 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha +/* 801463F0 00143350 38 84 66 F4 */ addi r4, r4, sUpVector__9CVector3f@l /* 801463F4 00143354 C0 5D 00 0C */ lfs f2, 0xc(r29) /* 801463F8 00143358 C0 26 00 40 */ lfs f1, 0x40(r6) /* 801463FC 0014335C C0 1D 00 24 */ lfs f0, 0x24(r29) @@ -1155,10 +1155,10 @@ __ct__7CBSJumpFv: /* 80146600 00143560 3C C0 80 3E */ lis r6, lbl_803E1318@ha /* 80146604 00143564 3C A0 80 3E */ lis r5, lbl_803E2008@ha /* 80146608 00143568 38 06 13 18 */ addi r0, r6, lbl_803E1318@l -/* 8014660C 0014356C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014660C 0014356C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80146610 00143570 90 03 00 00 */ stw r0, 0(r3) /* 80146614 00143574 38 C5 20 08 */ addi r6, r5, lbl_803E2008@l -/* 80146618 00143578 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80146618 00143578 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8014661C 0014357C 38 00 FF FF */ li r0, -1 /* 80146620 00143580 90 C3 00 00 */ stw r6, 0(r3) /* 80146624 00143584 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/BodyState/CBSLocomotion.s b/asm/MetroidPrime/BodyState/CBSLocomotion.s index b38671a4..6349a1e8 100644 --- a/asm/MetroidPrime/BodyState/CBSLocomotion.s +++ b/asm/MetroidPrime/BodyState/CBSLocomotion.s @@ -1595,10 +1595,10 @@ lbl_80137DA8: IsStrafing__18CBSBiPedLocomotionCFR15CBodyController: /* 80137DD4 00134D34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80137DD8 00134D38 7C 08 02 A6 */ mflr r0 -/* 80137DDC 00134D3C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80137DDC 00134D3C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80137DE0 00134D40 38 64 00 04 */ addi r3, r4, 4 /* 80137DE4 00134D44 90 01 00 14 */ stw r0, 0x14(r1) -/* 80137DE8 00134D48 38 85 66 A0 */ addi r4, r5, skZero3f@l +/* 80137DE8 00134D48 38 85 66 A0 */ addi r4, r5, sZeroVector__9CVector3f@l /* 80137DEC 00134D4C C0 22 9A 4C */ lfs f1, lbl_805AB76C@sda21(r2) /* 80137DF0 00134D50 93 E1 00 0C */ stw r31, 0xc(r1) /* 80137DF4 00134D54 3B E0 00 00 */ li r31, 0 @@ -1607,9 +1607,9 @@ IsStrafing__18CBSBiPedLocomotionCFR15CBodyController: /* 80137E00 00134D60 48 1D 81 65 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 80137E04 00134D64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137E08 00134D68 40 82 00 24 */ bne lbl_80137E2C -/* 80137E0C 00134D6C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80137E0C 00134D6C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80137E10 00134D70 C0 22 9A 4C */ lfs f1, lbl_805AB76C@sda21(r2) -/* 80137E14 00134D74 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80137E14 00134D74 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80137E18 00134D78 7F C3 F3 78 */ mr r3, r30 /* 80137E1C 00134D7C 48 1D 81 49 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 80137E20 00134D80 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -2395,10 +2395,10 @@ ApplyLocomotionPhysics__13CBSLocomotionFfR15CBodyController: /* 801388A8 00135808 28 1F 00 00 */ cmplwi r31, 0 /* 801388AC 0013580C 41 82 02 1C */ beq lbl_80138AC8 /* 801388B0 00135810 3B DC 00 04 */ addi r30, r28, 4 -/* 801388B4 00135814 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801388B4 00135814 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801388B8 00135818 3B BE 00 0C */ addi r29, r30, 0xc /* 801388BC 0013581C C0 22 9A 4C */ lfs f1, lbl_805AB76C@sda21(r2) -/* 801388C0 00135820 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801388C0 00135820 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801388C4 00135824 7F A3 EB 78 */ mr r3, r29 /* 801388C8 00135828 48 1D 76 9D */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 801388CC 0013582C 54 60 06 3F */ clrlwi. r0, r3, 0x18 diff --git a/asm/MetroidPrime/BodyState/CBSWallHang.s b/asm/MetroidPrime/BodyState/CBSWallHang.s index 70b4b991..c06714c5 100644 --- a/asm/MetroidPrime/BodyState/CBSWallHang.s +++ b/asm/MetroidPrime/BodyState/CBSWallHang.s @@ -110,8 +110,8 @@ FixInPlace__11CBSWallHangFR15CBodyController: /* 8018D594 0018A4F4 80 63 00 04 */ lwz r3, 4(r3) /* 8018D598 0018A4F8 28 03 00 00 */ cmplwi r3, 0 /* 8018D59C 0018A4FC 41 82 00 24 */ beq lbl_8018D5C0 -/* 8018D5A0 0018A500 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8018D5A4 0018A504 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 8018D5A0 0018A500 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8018D5A4 0018A504 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 8018D5A8 0018A508 D0 03 00 FC */ stfs f0, 0xfc(r3) /* 8018D5AC 0018A50C C0 04 00 04 */ lfs f0, 4(r4) /* 8018D5B0 0018A510 D0 03 01 00 */ stfs f0, 0x100(r3) @@ -383,13 +383,13 @@ lbl_8018D910: /* 8018D994 0018A8F4 91 61 00 D8 */ stw r11, 0xd8(r1) /* 8018D998 0018A8F8 90 01 00 DC */ stw r0, 0xdc(r1) /* 8018D99C 0018A8FC 4B FA CF 81 */ bl SetCurrentAnimation__15CBodyControllerFRC18CAnimPlaybackParmsbb -/* 8018D9A0 0018A900 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8018D9A0 0018A900 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8018D9A4 0018A904 7F E3 FB 78 */ mr r3, r31 -/* 8018D9A8 0018A908 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8018D9A8 0018A908 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8018D9AC 0018A90C 4B F8 D2 F5 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 8018D9B0 0018A910 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8018D9B0 0018A910 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8018D9B4 0018A914 7F C3 F3 78 */ mr r3, r30 -/* 8018D9B8 0018A918 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8018D9B8 0018A918 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8018D9BC 0018A91C 7F E4 FB 78 */ mr r4, r31 /* 8018D9C0 0018A920 C0 07 00 00 */ lfs f0, 0(r7) /* 8018D9C4 0018A924 38 A1 00 10 */ addi r5, r1, 0x10 @@ -1637,10 +1637,10 @@ __ct__11CBSWallHangFv: /* 8018EB4C 0018BAAC 3C C0 80 3E */ lis r6, lbl_803E1318@ha /* 8018EB50 0018BAB0 3C A0 80 3E */ lis r5, lbl_803E43A0@ha /* 8018EB54 0018BAB4 38 06 13 18 */ addi r0, r6, lbl_803E1318@l -/* 8018EB58 0018BAB8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8018EB58 0018BAB8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8018EB5C 0018BABC 90 03 00 00 */ stw r0, 0(r3) /* 8018EB60 0018BAC0 38 C5 43 A0 */ addi r6, r5, lbl_803E43A0@l -/* 8018EB64 0018BAC4 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8018EB64 0018BAC4 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8018EB68 0018BAC8 38 00 FF FF */ li r0, -1 /* 8018EB6C 0018BACC 90 C3 00 00 */ stw r6, 0(r3) /* 8018EB70 0018BAD0 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/BodyState/CBodyController.s b/asm/MetroidPrime/BodyState/CBodyController.s index 16ca9e5c..9b3ec792 100644 --- a/asm/MetroidPrime/BodyState/CBodyController.s +++ b/asm/MetroidPrime/BodyState/CBodyController.s @@ -388,7 +388,7 @@ Freeze__15CBodyControllerFfff: /* 8013A280 001371E0 80 9F 00 00 */ lwz r4, 0(r31) /* 8013A284 001371E4 4B F7 24 CD */ bl "__ct__27TCastToPtr<13CPhysicsActor>FR7CEntity" /* 8013A288 001371E8 80 83 00 04 */ lwz r4, 4(r3) -/* 8013A28C 001371EC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8013A28C 001371EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8013A290 001371F0 C0 02 9A 78 */ lfs f0, lbl_805AB798@sda21(r2) /* 8013A294 001371F4 C0 24 00 FC */ lfs f1, 0xfc(r4) /* 8013A298 001371F8 D0 3F 03 14 */ stfs f1, 0x314(r31) @@ -396,7 +396,7 @@ Freeze__15CBodyControllerFfff: /* 8013A2A0 00137200 D0 3F 03 18 */ stfs f1, 0x318(r31) /* 8013A2A4 00137204 C0 24 01 04 */ lfs f1, 0x104(r4) /* 8013A2A8 00137208 D0 3F 03 1C */ stfs f1, 0x31c(r31) -/* 8013A2AC 0013720C C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 8013A2AC 0013720C C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 8013A2B0 00137210 D0 24 00 FC */ stfs f1, 0xfc(r4) /* 8013A2B4 00137214 C0 23 00 04 */ lfs f1, 4(r3) /* 8013A2B8 00137218 D0 24 01 00 */ stfs f1, 0x100(r4) @@ -1184,7 +1184,7 @@ __ct__15CBodyControllerFR6CActorf9EBodyType: /* 8013ADCC 00137D2C 38 7D 02 A4 */ addi r3, r29, 0x2a4 /* 8013ADD0 00137D30 4B FF 95 B5 */ bl __ct__14CBodyStateInfoFR6CActor9EBodyType /* 8013ADD4 00137D34 3C 80 80 5A */ lis r4, lbl_805A6660@ha -/* 8013ADD8 00137D38 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8013ADD8 00137D38 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8013ADDC 00137D3C 38 E4 66 60 */ addi r7, r4, lbl_805A6660@l /* 8013ADE0 00137D40 38 C0 00 01 */ li r6, 1 /* 8013ADE4 00137D44 C0 07 00 00 */ lfs f0, 0(r7) @@ -1192,7 +1192,7 @@ __ct__15CBodyControllerFR6CActorf9EBodyType: /* 8013ADEC 00137D4C 38 00 FF FF */ li r0, -1 /* 8013ADF0 00137D50 C0 22 9A 78 */ lfs f1, lbl_805AB798@sda21(r2) /* 8013ADF4 00137D54 D0 1D 02 DC */ stfs f0, 0x2dc(r29) -/* 8013ADF8 00137D58 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8013ADF8 00137D58 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8013ADFC 00137D5C 7F A3 EB 78 */ mr r3, r29 /* 8013AE00 00137D60 C0 07 00 04 */ lfs f0, 4(r7) /* 8013AE04 00137D64 D0 1D 02 E0 */ stfs f0, 0x2e0(r29) diff --git a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s index 105b44d8..63f53da1 100644 --- a/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s +++ b/asm/MetroidPrime/BodyState/CBodyStateCmdMgr.s @@ -68,8 +68,8 @@ lbl_801314A0: .global ClearLocomotionCmds__16CBodyStateCmdMgrFv ClearLocomotionCmds__16CBodyStateCmdMgrFv: -/* 801314A8 0012E408 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801314AC 0012E40C C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 801314A8 0012E408 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801314AC 0012E40C C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 801314B0 0012E410 C0 02 99 88 */ lfs f0, lbl_805AB6A8@sda21(r2) /* 801314B4 0012E414 D0 23 00 00 */ stfs f1, 0(r3) /* 801314B8 0012E418 C0 24 00 04 */ lfs f1, 4(r4) @@ -87,8 +87,8 @@ ClearLocomotionCmds__16CBodyStateCmdMgrFv: .global Reset__16CBodyStateCmdMgrFv Reset__16CBodyStateCmdMgrFv: -/* 801314E8 0012E448 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801314EC 0012E44C C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 801314E8 0012E448 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801314EC 0012E44C C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 801314F0 0012E450 C0 02 99 88 */ lfs f0, lbl_805AB6A8@sda21(r2) /* 801314F4 0012E454 38 00 00 00 */ li r0, 0 /* 801314F8 0012E458 D0 23 00 00 */ stfs f1, 0(r3) @@ -159,9 +159,9 @@ lbl_801315C8: /* 801315E8 0012E548 D0 1F 00 08 */ stfs f0, 8(r31) /* 801315EC 0012E54C 48 00 01 10 */ b lbl_801316FC lbl_801315F0: -/* 801315F0 0012E550 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801315F0 0012E550 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801315F4 0012E554 C0 22 99 94 */ lfs f1, lbl_805AB6B4@sda21(r2) -/* 801315F8 0012E558 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801315F8 0012E558 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801315FC 0012E55C 48 1D E9 69 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 80131600 0012E560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80131604 0012E564 40 82 00 F8 */ bne lbl_801316FC @@ -180,9 +180,9 @@ lbl_801315F0: /* 80131638 0012E598 48 00 00 C4 */ b lbl_801316FC lbl_8013163C: /* 8013163C 0012E59C C0 1F 00 00 */ lfs f0, 0(r31) -/* 80131640 0012E5A0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80131640 0012E5A0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80131644 0012E5A4 C0 22 99 94 */ lfs f1, lbl_805AB6B4@sda21(r2) -/* 80131648 0012E5A8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80131648 0012E5A8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8013164C 0012E5AC EC 00 00 B2 */ fmuls f0, f0, f2 /* 80131650 0012E5B0 D0 1F 00 00 */ stfs f0, 0(r31) /* 80131654 0012E5B4 C0 1F 00 04 */ lfs f0, 4(r31) @@ -309,8 +309,8 @@ __dt__16CBodyStateCmdMgrFv: /* 80131800 0012E760 93 E1 00 0C */ stw r31, 0xc(r1) /* 80131804 0012E764 7C 7F 1B 79 */ or. r31, r3, r3 /* 80131808 0012E768 41 82 04 8C */ beq lbl_80131C94 -/* 8013180C 0012E76C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80131810 0012E770 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 8013180C 0012E76C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80131810 0012E770 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 80131814 0012E774 34 1F 02 98 */ addic. r0, r31, 0x298 /* 80131818 0012E778 C0 02 99 88 */ lfs f0, lbl_805AB6A8@sda21(r2) /* 8013181C 0012E77C D0 3F 00 00 */ stfs f1, 0(r31) @@ -645,9 +645,9 @@ __ct__16CBodyStateCmdMgrFv: /* 80131CAC 0012EC0C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80131CB0 0012EC10 38 A0 00 00 */ li r5, 0 /* 80131CB4 0012EC14 39 03 00 44 */ addi r8, r3, 0x44 -/* 80131CB8 0012EC18 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80131CB8 0012EC18 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80131CBC 0012EC1C BD C1 00 38 */ stmw r14, 0x38(r1) -/* 80131CC0 0012EC20 39 C4 66 A0 */ addi r14, r4, skZero3f@l +/* 80131CC0 0012EC20 39 C4 66 A0 */ addi r14, r4, sZeroVector__9CVector3f@l /* 80131CC4 0012EC24 C0 22 99 88 */ lfs f1, lbl_805AB6A8@sda21(r2) /* 80131CC8 0012EC28 38 80 00 1C */ li r4, 0x1c /* 80131CCC 0012EC2C 38 00 00 04 */ li r0, 4 @@ -733,7 +733,7 @@ lbl_80131DA8: /* 80131DEC 0012ED4C 90 03 00 B8 */ stw r0, 0xb8(r3) /* 80131DF0 0012ED50 38 0B A9 E4 */ addi r0, r11, lbl_803DA9E4@l /* 80131DF4 0012ED54 3A 80 00 03 */ li r20, 3 -/* 80131DF8 0012ED58 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80131DF8 0012ED58 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80131DFC 0012ED5C 90 A3 00 C0 */ stw r5, 0xc0(r3) /* 80131E00 0012ED60 3A 40 00 04 */ li r18, 4 /* 80131E04 0012ED64 3E 00 80 3E */ lis r16, lbl_803DAA44@ha @@ -756,7 +756,7 @@ lbl_80131DA8: /* 80131E48 0012EDA8 90 C3 00 DC */ stw r6, 0xdc(r3) /* 80131E4C 0012EDAC 92 83 00 E0 */ stw r20, 0xe0(r3) /* 80131E50 0012EDB0 92 63 00 DC */ stw r19, 0xdc(r3) -/* 80131E54 0012EDB4 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80131E54 0012EDB4 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80131E58 0012EDB8 D0 03 00 E4 */ stfs f0, 0xe4(r3) /* 80131E5C 0012EDBC C0 0E 00 04 */ lfs f0, 4(r14) /* 80131E60 0012EDC0 D0 03 00 E8 */ stfs f0, 0xe8(r3) @@ -931,14 +931,14 @@ lbl_80131DA8: /* 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) -/* 80132110 0012F070 3E 60 80 5A */ lis r19, lbl_805A6724@ha +/* 80132110 0012F070 3E 60 80 5A */ lis r19, sForwardVector__9CVector3f@ha /* 80132114 0012F074 3A C3 02 10 */ addi r22, r3, 0x210 /* 80132118 0012F078 3A A3 02 1C */ addi r21, r3, 0x21c /* 8013211C 0012F07C 90 C3 02 10 */ stw r6, 0x210(r3) /* 80132120 0012F080 3A 83 02 30 */ addi r20, r3, 0x230 /* 80132124 0012F084 90 03 02 14 */ stw r0, 0x214(r3) /* 80132128 0012F088 38 10 0B 8C */ addi r0, r16, lbl_803E0B8C@l -/* 8013212C 0012F08C 3A 13 67 24 */ addi r16, r19, lbl_805A6724@l +/* 8013212C 0012F08C 3A 13 67 24 */ addi r16, r19, sForwardVector__9CVector3f@l /* 80132130 0012F090 3A 63 02 54 */ addi r19, r3, 0x254 /* 80132134 0012F094 91 E3 02 10 */ stw r15, 0x210(r3) /* 80132138 0012F098 3D E0 80 3E */ lis r15, lbl_803E0B98@ha diff --git a/asm/MetroidPrime/CActor.s b/asm/MetroidPrime/CActor.s index 0e6c2040..3c38247a 100644 --- a/asm/MetroidPrime/CActor.s +++ b/asm/MetroidPrime/CActor.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803D9EB0 -lbl_803D9EB0: +.global __vt__6CActor +__vt__6CActor: # ROM: 0x3D6EB0 .4byte 0 .4byte 0 @@ -209,11 +209,11 @@ UpdateSfxEmitters__6CActorFv: /* 80052C54 0004FBB4 90 01 00 34 */ stw r0, 0x34(r1) /* 80052C58 0004FBB8 BF 41 00 18 */ stmw r26, 0x18(r1) /* 80052C5C 0004FBBC 7C 7A 1B 78 */ mr r26, r3 -/* 80052C60 0004FBC0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80052C60 0004FBC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80052C64 0004FBC4 3B 60 00 00 */ li r27, 0 /* 80052C68 0004FBC8 3B BA 00 DC */ addi r29, r26, 0xdc /* 80052C6C 0004FBCC 3B E0 00 00 */ li r31, 0 -/* 80052C70 0004FBD0 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 80052C70 0004FBD0 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 80052C74 0004FBD4 83 9A 00 D8 */ lwz r28, 0xd8(r26) /* 80052C78 0004FBD8 48 00 00 40 */ b lbl_80052CB8 lbl_80052C7C: @@ -477,9 +477,9 @@ lbl_80052FCC: /* 80052FF0 0004FF50 60 A5 00 08 */ ori r5, r5, 8 lbl_80052FF4: /* 80052FF4 0004FF54 C0 02 86 3C */ lfs f0, lbl_805AA35C@sda21(r2) -/* 80052FF8 0004FF58 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80052FF8 0004FF58 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80052FFC 0004FF5C 38 80 00 00 */ li r4, 0 -/* 80053000 0004FF60 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 80053000 0004FF60 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 80053004 0004FF64 B0 81 00 64 */ sth r4, 0x64(r1) /* 80053008 0004FF68 3B A1 00 4C */ addi r29, r1, 0x4c /* 8005300C 0004FF6C 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) @@ -734,9 +734,9 @@ SetVolume__6CActorFUc: /* 80053394 000502F4 90 01 00 0C */ stw r0, 0xc(r1) /* 80053398 000502F8 41 82 00 38 */ beq lbl_800533D0 /* 8005339C 000502FC C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 800533A0 00050300 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800533A0 00050300 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800533A4 00050304 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 800533A8 00050308 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800533A8 00050308 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800533AC 0005030C C0 1E 00 40 */ lfs f0, 0x40(r30) /* 800533B0 00050310 7F E6 FB 78 */ mr r6, r31 /* 800533B4 00050314 38 61 00 08 */ addi r3, r1, 8 @@ -1180,9 +1180,9 @@ SetCalculateLighting__6CActorFb: /* 8005395C 000508BC 48 2C 1F 11 */ bl __nw__FUlPCcPCc /* 80053960 000508C0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80053964 000508C4 41 82 00 4C */ beq lbl_800539B0 -/* 80053968 000508C8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80053968 000508C8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8005396C 000508CC C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 80053970 000508D0 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 80053970 000508D0 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 80053974 000508D4 38 A1 00 08 */ addi r5, r1, 8 /* 80053978 000508D8 81 07 00 00 */ lwz r8, 0(r7) /* 8005397C 000508DC 38 80 00 08 */ li r4, 8 @@ -3303,8 +3303,8 @@ __dt__6CActorFv: /* 80055708 00052668 93 A1 00 14 */ stw r29, 0x14(r1) /* 8005570C 0005266C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80055710 00052670 41 82 00 F0 */ beq lbl_80055800 -/* 80055714 00052674 3C 80 80 3E */ lis r4, lbl_803D9EB0@ha -/* 80055718 00052678 38 04 9E B0 */ addi r0, r4, lbl_803D9EB0@l +/* 80055714 00052674 3C 80 80 3E */ lis r4, __vt__6CActor@ha +/* 80055718 00052678 38 04 9E B0 */ addi r0, r4, __vt__6CActor@l /* 8005571C 0005267C 90 1D 00 00 */ stw r0, 0(r29) /* 80055720 00052680 4B FF FB 25 */ bl RemoveEmitter__6CActorFv /* 80055724 00052684 34 1D 00 D8 */ addic. r0, r29, 0xd8 @@ -3403,9 +3403,9 @@ lbl_80055800: /* 80055860 000527C0 B0 01 00 08 */ sth r0, 8(r1) /* 80055864 000527C4 38 81 00 08 */ addi r4, r1, 8 /* 80055868 000527C8 4B FF BA BD */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" -/* 8005586C 000527CC 3C 60 80 3E */ lis r3, lbl_803D9EB0@ha +/* 8005586C 000527CC 3C 60 80 3E */ lis r3, __vt__6CActor@ha /* 80055870 000527D0 7F 24 CB 78 */ mr r4, r25 -/* 80055874 000527D4 38 03 9E B0 */ addi r0, r3, lbl_803D9EB0@l +/* 80055874 000527D4 38 03 9E B0 */ addi r0, r3, __vt__6CActor@l /* 80055878 000527D8 38 7F 00 34 */ addi r3, r31, 0x34 /* 8005587C 000527DC 90 1F 00 00 */ stw r0, 0(r31) /* 80055880 000527E0 48 2B D2 F5 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -3493,14 +3493,14 @@ lbl_800559AC: /* 800559AC 0005290C 38 A0 00 00 */ li r5, 0 /* 800559B0 00052910 C0 22 86 30 */ lfs f1, lbl_805AA350@sda21(r2) /* 800559B4 00052914 90 BF 00 94 */ stw r5, 0x94(r31) -/* 800559B8 00052918 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 800559B8 00052918 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 800559BC 0005291C FC 40 08 90 */ fmr f2, f1 /* 800559C0 00052920 38 00 00 03 */ li r0, 3 /* 800559C4 00052924 90 BF 00 98 */ stw r5, 0x98(r31) /* 800559C8 00052928 FC 60 08 90 */ fmr f3, f1 /* 800559CC 0005292C FC 80 08 90 */ fmr f4, f1 /* 800559D0 00052930 38 61 00 20 */ addi r3, r1, 0x20 -/* 800559D4 00052934 C4 04 67 54 */ lfsu f0, lbl_805A6754@l(r4) +/* 800559D4 00052934 C4 04 67 54 */ lfsu f0, mskInvertedBox__6CAABox@l(r4) /* 800559D8 00052938 D0 1F 00 9C */ stfs f0, 0x9c(r31) /* 800559DC 0005293C C0 04 00 04 */ lfs f0, 4(r4) /* 800559E0 00052940 D0 1F 00 A0 */ stfs f0, 0xa0(r31) @@ -3522,7 +3522,7 @@ lbl_800559AC: /* 80055A20 00052980 38 A0 FF FF */ li r5, -1 /* 80055A24 00052984 98 1F 00 B4 */ stb r0, 0xb4(r31) /* 80055A28 00052988 35 1F 00 DC */ addic. r8, r31, 0xdc -/* 80055A2C 0005298C 88 82 CC 40 */ lbz r4, lbl_805AE960@sda21(r2) +/* 80055A2C 0005298C 88 82 CC 40 */ lbz r4, kMaxVolume__9CAudioSys@sda21(r2) /* 80055A30 00052990 38 60 00 02 */ li r3, 2 /* 80055A34 00052994 88 E1 00 1D */ lbz r7, 0x1d(r1) /* 80055A38 00052998 38 00 00 00 */ li r0, 0 diff --git a/asm/MetroidPrime/CActorLights.s b/asm/MetroidPrime/CActorLights.s index 63d5fde8..d064e162 100644 --- a/asm/MetroidPrime/CActorLights.s +++ b/asm/MetroidPrime/CActorLights.s @@ -328,9 +328,9 @@ BuildFaceLightList__12CActorLightsFRC13CStateManagerRC9CGameAreaRC6CAABox: /* 80103308 00100268 38 60 00 01 */ li r3, 1 /* 8010330C 0010026C 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a /* 80103310 00100270 3B B9 01 48 */ addi r29, r25, 0x148 -/* 80103314 00100274 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80103314 00100274 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80103318 00100278 98 19 02 98 */ stb r0, 0x298(r25) -/* 8010331C 0010027C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8010331C 0010027C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80103320 00100280 C0 05 00 00 */ lfs f0, 0(r5) /* 80103324 00100284 38 60 00 00 */ li r3, 0 /* 80103328 00100288 D0 19 02 88 */ stfs f0, 0x288(r25) @@ -362,12 +362,12 @@ lbl_80103384: /* 80103384 001002E4 42 00 00 00 */ bdnz lbl_80103384 lbl_80103388: /* 80103388 001002E8 38 00 00 00 */ li r0, 0 -/* 8010338C 001002EC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8010338C 001002EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80103390 001002F0 90 19 01 44 */ stw r0, 0x144(r25) -/* 80103394 001002F4 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80103398 001002F8 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80103394 001002F4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80103398 001002F8 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8010339C 001002FC C3 E4 00 00 */ lfs f31, 0(r4) -/* 801033A0 00100300 3B E3 67 24 */ addi r31, r3, lbl_805A6724@l +/* 801033A0 00100300 3B E3 67 24 */ addi r31, r3, sForwardVector__9CVector3f@l /* 801033A4 00100304 C3 C5 00 04 */ lfs f30, 4(r5) /* 801033A8 00100308 C3 A5 00 08 */ lfs f29, 8(r5) /* 801033AC 0010030C AB 9E 20 08 */ lha r28, 0x2008(r30) @@ -433,11 +433,11 @@ lbl_801033B4: /* 80103498 001003F8 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8010349C 001003FC 48 20 F5 89 */ bl TransposeRotate__12CTransform4fCFRC9CVector3f /* 801034A0 00100400 C0 81 00 64 */ lfs f4, 0x64(r1) -/* 801034A4 00100404 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 801034A4 00100404 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 801034A8 00100408 C0 1F 00 04 */ lfs f0, 4(r31) /* 801034AC 0010040C C0 A1 00 60 */ lfs f5, 0x60(r1) /* 801034B0 00100410 EC 00 01 32 */ fmuls f0, f0, f4 -/* 801034B4 00100414 C0 23 67 24 */ lfs f1, lbl_805A6724@l(r3) +/* 801034B4 00100414 C0 23 67 24 */ lfs f1, sForwardVector__9CVector3f@l(r3) /* 801034B8 00100418 C0 61 00 68 */ lfs f3, 0x68(r1) /* 801034BC 0010041C C0 5F 00 08 */ lfs f2, 8(r31) /* 801034C0 00100420 EC 21 01 7A */ fmadds f1, f1, f5, f0 @@ -1119,9 +1119,9 @@ lbl_80103E54: /* 80103E5C 00100DBC 90 1C 02 9C */ stw r0, 0x29c(r28) /* 80103E60 00100DC0 48 00 0C E4 */ b lbl_80104B44 lbl_80103E64: -/* 80103E64 00100DC4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80103E64 00100DC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80103E68 00100DC8 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f -/* 80103E6C 00100DCC 3A 43 66 A0 */ addi r18, r3, skZero3f@l +/* 80103E6C 00100DCC 3A 43 66 A0 */ addi r18, r3, sZeroVector__9CVector3f@l /* 80103E70 00100DD0 C0 52 00 00 */ lfs f2, 0(r18) /* 80103E74 00100DD4 C0 32 00 04 */ lfs f1, 4(r18) /* 80103E78 00100DD8 C0 12 00 08 */ lfs f0, 8(r18) @@ -1259,10 +1259,10 @@ lbl_80104058: /* 80104064 00100FC4 7E 83 00 D0 */ neg r20, r3 /* 80104068 00100FC8 56 94 00 38 */ rlwinm r20, r20, 0, 0, 0x1c /* 8010406C 00100FCC 7C 01 A1 6E */ stwux r0, r1, r20 -/* 80104070 00100FD0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80104070 00100FD0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80104074 00100FD4 3A 60 00 00 */ li r19, 0 /* 80104078 00100FD8 3B 00 00 00 */ li r24, 0 -/* 8010407C 00100FDC C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 8010407C 00100FDC C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 80104080 00100FE0 3A 81 00 08 */ addi r20, r1, 8 /* 80104084 00100FE4 D0 1C 02 88 */ stfs f0, 0x288(r28) /* 80104088 00100FE8 C0 12 00 04 */ lfs f0, 4(r18) @@ -1625,17 +1625,17 @@ lbl_801045A8: /* 801045B4 00101514 38 84 FF E4 */ addi r4, r4, -28 /* 801045B8 00101518 42 00 FF F0 */ bdnz lbl_801045A8 lbl_801045BC: -/* 801045BC 0010151C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801045BC 0010151C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801045C0 00101520 C0 32 00 04 */ lfs f1, 4(r18) /* 801045C4 00101524 C0 12 00 08 */ lfs f0, 8(r18) -/* 801045C8 00101528 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 801045C8 00101528 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 801045CC 0010152C D0 3F 00 B0 */ stfs f1, 0xb0(r31) /* 801045D0 00101530 D0 5F 00 AC */ stfs f2, 0xac(r31) /* 801045D4 00101534 D0 1F 00 B4 */ stfs f0, 0xb4(r31) /* 801045D8 00101538 48 24 59 DD */ bl Black__6CColorFv /* 801045DC 0010153C C0 22 94 08 */ lfs f1, lbl_805AB128@sda21(r2) -/* 801045E0 00101540 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801045E4 00101544 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801045E0 00101540 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801045E4 00101544 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801045E8 00101548 7C 66 1B 78 */ mr r6, r3 /* 801045EC 0010154C FC 40 08 90 */ fmr f2, f1 /* 801045F0 00101550 38 7F 01 8C */ addi r3, r31, 0x18c @@ -1648,11 +1648,11 @@ lbl_801045BC: /* 8010460C 0010156C 38 7F 01 DC */ addi r3, r31, 0x1dc /* 80104610 00101570 38 9F 01 8C */ addi r4, r31, 0x18c /* 80104614 00101574 4B F3 6F 5D */ bl __ct__6CLightFCR6CLight -/* 80104618 00101578 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80104618 00101578 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010461C 0010157C C0 32 00 04 */ lfs f1, 4(r18) /* 80104620 00101580 C0 12 00 08 */ lfs f0, 8(r18) /* 80104624 00101584 39 C0 00 00 */ li r14, 0 -/* 80104628 00101588 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80104628 00101588 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 8010462C 0010158C D0 3F 00 A4 */ stfs f1, 0xa4(r31) /* 80104630 00101590 C3 E2 94 08 */ lfs f31, lbl_805AB128@sda21(r2) /* 80104634 00101594 D0 5F 00 A0 */ stfs f2, 0xa0(r31) @@ -2037,8 +2037,8 @@ MergeOverflowLight__12CActorLightsFR6CLightR9CVector3fRC6CLightf: /* 80104B84 00101AE4 93 E1 00 5C */ stw r31, 0x5c(r1) /* 80104B88 00101AE8 93 C1 00 58 */ stw r30, 0x58(r1) /* 80104B8C 00101AEC 93 A1 00 54 */ stw r29, 0x54(r1) -/* 80104B90 00101AF0 3C E0 80 5A */ lis r7, skZero3f@ha -/* 80104B94 00101AF4 C4 47 66 A0 */ lfsu f2, skZero3f@l(r7) +/* 80104B90 00101AF0 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha +/* 80104B94 00101AF4 C4 47 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r7) /* 80104B98 00101AF8 FF E0 08 90 */ fmr f31, f1 /* 80104B9C 00101AFC 7C BF 2B 78 */ mr r31, r5 /* 80104BA0 00101B00 C0 27 00 04 */ lfs f1, 4(r7) @@ -2488,7 +2488,7 @@ lbl_801051B4: .global __ct__12CActorLightsFUi9CVector3fiif __ct__12CActorLightsFUi9CVector3fiif: /* 801051CC 0010212C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801051D0 00102130 3D 60 80 5A */ lis r11, skZero3f@ha +/* 801051D0 00102130 3D 60 80 5A */ lis r11, sZeroVector__9CVector3f@ha /* 801051D4 00102134 55 40 06 3F */ clrlwi. r0, r10, 0x18 /* 801051D8 00102138 39 80 00 01 */ li r12, 1 /* 801051DC 0010213C 93 E1 00 1C */ stw r31, 0x1c(r1) @@ -2497,7 +2497,7 @@ __ct__12CActorLightsFUi9CVector3fiif: /* 801051E8 00102148 93 A1 00 14 */ stw r29, 0x14(r1) /* 801051EC 0010214C 93 C3 00 00 */ stw r30, 0(r3) /* 801051F0 00102150 93 C3 01 44 */ stw r30, 0x144(r3) -/* 801051F4 00102154 C4 0B 66 A0 */ lfsu f0, skZero3f@l(r11) +/* 801051F4 00102154 C4 0B 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r11) /* 801051F8 00102158 D0 03 02 88 */ stfs f0, 0x288(r3) /* 801051FC 0010215C C0 0B 00 04 */ lfs f0, 4(r11) /* 80105200 00102160 D0 03 02 8C */ stfs f0, 0x28c(r3) @@ -2535,7 +2535,7 @@ lbl_80105254: /* 8010527C 001021DC 39 40 00 00 */ li r10, 0 /* 80105280 001021E0 99 03 02 98 */ stb r8, 0x298(r3) /* 80105284 001021E4 38 00 FF FF */ li r0, -1 -/* 80105288 001021E8 3D 80 80 5A */ lis r12, skZero3f@ha +/* 80105288 001021E8 3D 80 80 5A */ lis r12, sZeroVector__9CVector3f@ha /* 8010528C 001021EC C0 22 94 08 */ lfs f1, lbl_805AB128@sda21(r2) /* 80105290 001021F0 89 23 02 98 */ lbz r9, 0x298(r3) /* 80105294 001021F4 53 A9 0F BC */ rlwimi r9, r29, 1, 0x1e, 0x1e @@ -2566,7 +2566,7 @@ lbl_80105254: /* 801052F8 00102258 D0 63 02 B4 */ stfs f3, 0x2b4(r3) /* 801052FC 0010225C 90 E3 02 B8 */ stw r7, 0x2b8(r3) /* 80105300 00102260 90 C3 02 BC */ stw r6, 0x2bc(r3) -/* 80105304 00102264 C0 6C 66 A0 */ lfs f3, skZero3f@l(r12) +/* 80105304 00102264 C0 6C 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r12) /* 80105308 00102268 D0 63 02 C0 */ stfs f3, 0x2c0(r3) /* 8010530C 0010226C C0 6B 00 04 */ lfs f3, 4(r11) /* 80105310 00102270 D0 63 02 C4 */ stfs f3, 0x2c4(r3) diff --git a/asm/MetroidPrime/CActorParameters.s b/asm/MetroidPrime/CActorParameters.s index 8bcf847b..5236055c 100644 --- a/asm/MetroidPrime/CActorParameters.s +++ b/asm/MetroidPrime/CActorParameters.s @@ -231,11 +231,11 @@ __ct__16CLightParametersFv: /* 80106688 001035E8 D0 1F 00 14 */ stfs f0, 0x14(r31) /* 8010668C 001035EC 48 24 39 21 */ bl White__6CColorFv /* 80106690 001035F0 80 03 00 00 */ lwz r0, 0(r3) -/* 80106694 001035F4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80106694 001035F4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80106698 001035F8 38 C0 00 00 */ li r6, 0 /* 8010669C 001035FC 38 A0 00 01 */ li r5, 1 /* 801066A0 00103600 90 1F 00 18 */ stw r0, 0x18(r31) -/* 801066A4 00103604 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801066A4 00103604 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801066A8 00103608 38 00 00 04 */ li r0, 4 /* 801066AC 0010360C 7F E3 FB 78 */ mr r3, r31 /* 801066B0 00103610 98 DF 00 1C */ stb r6, 0x1c(r31) diff --git a/asm/MetroidPrime/CActorParticles.s b/asm/MetroidPrime/CActorParticles.s index 40200297..ecd5282c 100644 --- a/asm/MetroidPrime/CActorParticles.s +++ b/asm/MetroidPrime/CActorParticles.s @@ -86,13 +86,13 @@ StartBurnDeath__20CActorModelParticlesFR5CActor: /* 801E3970 001E08D0 7F C3 F3 78 */ mr r3, r30 /* 801E3974 001E08D4 48 00 3B 05 */ bl IsMediumOrLarge__FRCActor /* 801E3978 001E08D8 54 64 06 3E */ clrlwi r4, r3, 0x18 -/* 801E397C 001E08DC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E397C 001E08DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E3980 001E08E0 7C 04 00 D0 */ neg r0, r4 /* 801E3984 001E08E4 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 801E3988 001E08E8 7C 00 23 78 */ or r0, r0, r4 /* 801E398C 001E08EC C0 3E 00 50 */ lfs f1, 0x50(r30) /* 801E3990 001E08F0 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 801E3994 001E08F4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801E3994 001E08F4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E3998 001E08F8 7C 03 FE 70 */ srawi r3, r0, 0x1f /* 801E399C 001E08FC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801E39A0 001E0900 38 03 04 7E */ addi r0, r3, 0x47e @@ -1206,10 +1206,10 @@ lbl_801E48A0: lbl_801E48E0: /* 801E48E0 001E1840 38 6D 92 2C */ addi r3, r13, lbl_805A7DEC@sda21 lbl_801E48E4: -/* 801E48E4 001E1844 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 801E48E4 001E1844 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 801E48E8 001E1848 83 E3 00 00 */ lwz r31, 0(r3) /* 801E48EC 001E184C 80 7A 00 80 */ lwz r3, 0x80(r26) -/* 801E48F0 001E1850 3B 24 66 F4 */ addi r25, r4, lbl_805A66F4@l +/* 801E48F0 001E1850 3B 24 66 F4 */ addi r25, r4, sUpVector__9CVector3f@l /* 801E48F4 001E1854 C3 E2 AD 80 */ lfs f31, lbl_805ACAA0@sda21(r2) /* 801E48F8 001E1858 3B C0 00 00 */ li r30, 0 /* 801E48FC 001E185C 48 00 01 2C */ b lbl_801E4A28 @@ -1253,12 +1253,12 @@ lbl_801E4900: /* 801E4990 001E18F0 41 82 00 84 */ beq lbl_801E4A14 /* 801E4994 001E18F4 38 61 00 5C */ addi r3, r1, 0x5c /* 801E4998 001E18F8 48 12 FF 61 */ bl Normalize__9CVector3fFv -/* 801E499C 001E18FC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha -/* 801E49A0 001E1900 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801E49A4 001E1904 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 801E499C 001E18FC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha +/* 801E49A0 001E1900 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801E49A4 001E1904 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 801E49A8 001E1908 C0 81 00 60 */ lfs f4, 0x60(r1) /* 801E49AC 001E190C C0 46 00 00 */ lfs f2, 0(r6) -/* 801E49B0 001E1910 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 801E49B0 001E1910 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 801E49B4 001E1914 C0 A1 00 64 */ lfs f5, 0x64(r1) /* 801E49B8 001E1918 38 61 00 98 */ addi r3, r1, 0x98 /* 801E49BC 001E191C EC 02 01 32 */ fmuls f0, f2, f4 @@ -2613,10 +2613,10 @@ lbl_801E5C7C: /* 801E5CA0 001E2C00 7C 00 1B 78 */ or r0, r0, r3 /* 801E5CA4 001E2C04 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 801E5CA8 001E2C08 7C 04 FE 70 */ srawi r4, r0, 0x1f -/* 801E5CAC 001E2C0C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E5CAC 001E2C0C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E5CB0 001E2C10 38 04 04 80 */ addi r0, r4, 0x480 /* 801E5CB4 001E2C14 D0 01 00 30 */ stfs f0, 0x30(r1) -/* 801E5CB8 001E2C18 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801E5CB8 001E2C18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E5CBC 001E2C1C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801E5CC0 001E2C20 D0 21 00 34 */ stfs f1, 0x34(r1) /* 801E5CC4 001E2C24 54 04 04 3E */ clrlwi r4, r0, 0x10 @@ -2713,9 +2713,9 @@ lbl_801E5DFC: /* 801E5E08 001E2D68 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801E5E0C 001E2D6C 41 82 00 40 */ beq lbl_801E5E4C /* 801E5E10 001E2D70 C0 5B 01 24 */ lfs f2, 0x124(r27) -/* 801E5E14 001E2D74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E5E14 001E2D74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E5E18 001E2D78 C0 3B 01 14 */ lfs f1, 0x114(r27) -/* 801E5E1C 001E2D7C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801E5E1C 001E2D7C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801E5E20 001E2D80 C0 1B 01 04 */ lfs f0, 0x104(r27) /* 801E5E24 001E2D84 38 61 00 0C */ addi r3, r1, 0xc /* 801E5E28 001E2D88 38 81 00 24 */ addi r4, r1, 0x24 @@ -4046,9 +4046,9 @@ lbl_801E7060: /* 801E70D0 001E4030 90 1E 00 D8 */ stw r0, 0xd8(r30) /* 801E70D4 001E4034 48 15 9D D5 */ bl __ct__6CTokenFRC6CToken /* 801E70D8 001E4038 38 00 00 00 */ li r0, 0 -/* 801E70DC 001E403C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801E70DC 001E403C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801E70E0 001E4040 98 1E 00 E4 */ stb r0, 0xe4(r30) -/* 801E70E4 001E4044 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 801E70E4 001E4044 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 801E70E8 001E4048 C0 02 AD 98 */ lfs f0, lbl_805ACAB8@sda21(r2) /* 801E70EC 001E404C 38 7E 00 F8 */ addi r3, r30, 0xf8 /* 801E70F0 001E4050 90 1E 00 E8 */ stw r0, 0xe8(r30) diff --git a/asm/MetroidPrime/CAnimData.s b/asm/MetroidPrime/CAnimData.s index 1e7b44ef..7c1b4ecc 100644 --- a/asm/MetroidPrime/CAnimData.s +++ b/asm/MetroidPrime/CAnimData.s @@ -2721,9 +2721,9 @@ lbl_8002B884: /* 8002B884 000287E4 88 1D 02 20 */ lbz r0, 0x220(r29) /* 8002B888 000287E8 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 8002B88C 000287EC 40 82 04 10 */ bne lbl_8002BC9C -/* 8002B890 000287F0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002B890 000287F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002B894 000287F4 80 0D 81 E0 */ lwz r0, lbl_805A6DA0@sda21(r13) -/* 8002B898 000287F8 3B 83 66 A0 */ addi r28, r3, skZero3f@l +/* 8002B898 000287F8 3B 83 66 A0 */ addi r28, r3, sZeroVector__9CVector3f@l /* 8002B89C 000287FC C0 0D 81 E4 */ lfs f0, lbl_805A6DA4@sda21(r13) /* 8002B8A0 00028800 C3 3C 00 00 */ lfs f25, 0(r28) /* 8002B8A4 00028804 3A E0 00 00 */ li r23, 0 @@ -2960,9 +2960,9 @@ lbl_8002BB40: /* 8002BC24 00028B84 98 1D 02 20 */ stb r0, 0x220(r29) /* 8002BC28 00028B88 48 00 04 C8 */ b lbl_8002C0F0 lbl_8002BC2C: -/* 8002BC2C 00028B8C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8002BC2C 00028B8C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8002BC30 00028B90 38 60 00 00 */ li r3, 0 -/* 8002BC34 00028B94 C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 8002BC34 00028B94 C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 8002BC38 00028B98 D0 1D 01 DC */ stfs f0, 0x1dc(r29) /* 8002BC3C 00028B9C C0 1C 00 04 */ lfs f0, 4(r28) /* 8002BC40 00028BA0 D0 1D 01 E0 */ stfs f0, 0x1e0(r29) @@ -2991,9 +2991,9 @@ lbl_8002BC68: /* 8002BC98 00028BF8 48 00 04 58 */ b lbl_8002C0F0 lbl_8002BC9C: /* 8002BC9C 00028BFC 83 3E 00 14 */ lwz r25, 0x14(r30) -/* 8002BCA0 00028C00 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002BCA0 00028C00 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002BCA4 00028C04 80 0D 81 E0 */ lwz r0, lbl_805A6DA0@sda21(r13) -/* 8002BCA8 00028C08 3B 83 66 A0 */ addi r28, r3, skZero3f@l +/* 8002BCA8 00028C08 3B 83 66 A0 */ addi r28, r3, sZeroVector__9CVector3f@l /* 8002BCAC 00028C0C C0 0D 81 E4 */ lfs f0, lbl_805A6DA4@sda21(r13) /* 8002BCB0 00028C10 28 19 00 00 */ cmplwi r25, 0 /* 8002BCB4 00028C14 C3 1C 00 00 */ lfs f24, 0(r28) @@ -3071,9 +3071,9 @@ lbl_8002BDB4: /* 8002BDC4 00028D24 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 8002BDC8 00028D28 80 FB 00 04 */ lwz r7, 4(r27) /* 8002BDCC 00028D2C C0 03 66 60 */ lfs f0, lbl_805A6660@l(r3) -/* 8002BDD0 00028D30 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002BDD0 00028D30 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002BDD4 00028D34 80 DB 00 08 */ lwz r6, 8(r27) -/* 8002BDD8 00028D38 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8002BDD8 00028D38 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8002BDDC 00028D3C 80 1B 00 0C */ lwz r0, 0xc(r27) /* 8002BDE0 00028D40 38 A0 00 01 */ li r5, 1 /* 8002BDE4 00028D44 D0 01 01 54 */ stfs f0, 0x154(r1) @@ -3248,9 +3248,9 @@ lbl_8002BF94: /* 8002C07C 00028FDC 98 1D 02 20 */ stb r0, 0x220(r29) /* 8002C080 00028FE0 48 00 00 70 */ b lbl_8002C0F0 lbl_8002C084: -/* 8002C084 00028FE4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8002C084 00028FE4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8002C088 00028FE8 38 60 00 00 */ li r3, 0 -/* 8002C08C 00028FEC C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 8002C08C 00028FEC C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 8002C090 00028FF0 D0 1D 01 DC */ stfs f0, 0x1dc(r29) /* 8002C094 00028FF4 C0 1C 00 04 */ lfs f0, 4(r28) /* 8002C098 00028FF8 D0 1D 01 E0 */ stfs f0, 0x1e0(r29) @@ -3382,9 +3382,9 @@ Inverse__9CMatrix3fCFv: GetLocatorTransform__9CAnimDataCF6CSegIdPC13CCharAnimTime: /* 8002C274 000291D4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8002C278 000291D8 7C 08 02 A6 */ mflr r0 -/* 8002C27C 000291DC 3C E0 80 5A */ lis r7, skIdentity4f@ha +/* 8002C27C 000291DC 3C E0 80 5A */ lis r7, sIdentity__12CTransform4f@ha /* 8002C280 000291E0 90 01 00 54 */ stw r0, 0x54(r1) -/* 8002C284 000291E4 38 07 66 70 */ addi r0, r7, skIdentity4f@l +/* 8002C284 000291E4 38 07 66 70 */ addi r0, r7, sIdentity__12CTransform4f@l /* 8002C288 000291E8 93 E1 00 4C */ stw r31, 0x4c(r1) /* 8002C28C 000291EC 7C BF 2B 78 */ mr r31, r5 /* 8002C290 000291F0 93 C1 00 48 */ stw r30, 0x48(r1) @@ -4650,7 +4650,7 @@ lbl_8002D464: /* 8002D494 0002A3F4 38 C5 A6 00 */ addi r6, r5, lbl_8056A600@l /* 8002D498 0002A3F8 38 A4 C2 B8 */ addi r5, r4, lbl_8056C2B8@l /* 8002D49C 0002A3FC 38 83 C9 EC */ addi r4, r3, lbl_8056C9EC@l -/* 8002D4A0 0002A400 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002D4A0 0002A400 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002D4A4 0002A404 C3 41 00 20 */ lfs f26, 0x20(r1) /* 8002D4A8 0002A408 C3 62 83 D0 */ lfs f27, lbl_805AA0F0@sda21(r2) /* 8002D4AC 0002A40C 3B 87 00 04 */ addi r28, r7, 4 @@ -4658,7 +4658,7 @@ lbl_8002D464: /* 8002D4B4 0002A414 3B A6 00 04 */ addi r29, r6, 4 /* 8002D4B8 0002A418 3B C5 00 04 */ addi r30, r5, 4 /* 8002D4BC 0002A41C 3B 64 00 04 */ addi r27, r4, 4 -/* 8002D4C0 0002A420 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 8002D4C0 0002A420 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 8002D4C4 0002A424 48 00 01 90 */ b lbl_8002D654 lbl_8002D4C8: /* 8002D4C8 0002A428 80 7A 01 F8 */ lwz r3, 0x1f8(r26) @@ -4750,9 +4750,9 @@ lbl_8002D5E4: /* 8002D610 0002A570 88 1A 02 20 */ lbz r0, 0x220(r26) /* 8002D614 0002A574 38 80 00 00 */ li r4, 0 /* 8002D618 0002A578 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 -/* 8002D61C 0002A57C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002D61C 0002A57C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002D620 0002A580 98 1A 02 20 */ stb r0, 0x220(r26) -/* 8002D624 0002A584 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 8002D624 0002A584 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 8002D628 0002A588 D0 1A 01 DC */ stfs f0, 0x1dc(r26) /* 8002D62C 0002A58C C0 1F 00 04 */ lfs f0, 4(r31) /* 8002D630 0002A590 D0 1A 01 E0 */ stfs f0, 0x1e0(r26) @@ -4968,11 +4968,11 @@ AdvanceAnim__9CAnimDataFR13CCharAnimTimeR9CVector3fR11CQuaternion: /* 8002D930 0002A890 DB 01 01 00 */ stfd f24, 0x100(r1) /* 8002D934 0002A894 F3 01 01 08 */ psq_st f24, 264(r1), 0, qr0 /* 8002D938 0002A898 BF 41 00 E8 */ stmw r26, 0xe8(r1) -/* 8002D93C 0002A89C 3D 00 80 5A */ lis r8, skZero3f@ha +/* 8002D93C 0002A89C 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 8002D940 0002A8A0 3C E0 80 5A */ lis r7, lbl_805A6660@ha /* 8002D944 0002A8A4 3B E7 66 60 */ addi r31, r7, lbl_805A6660@l /* 8002D948 0002A8A8 7C 9B 23 78 */ mr r27, r4 -/* 8002D94C 0002A8AC 3B C8 66 A0 */ addi r30, r8, skZero3f@l +/* 8002D94C 0002A8AC 3B C8 66 A0 */ addi r30, r8, sZeroVector__9CVector3f@l /* 8002D950 0002A8B0 C3 E4 00 00 */ lfs f31, 0(r4) /* 8002D954 0002A8B4 7C 7A 1B 78 */ mr r26, r3 /* 8002D958 0002A8B8 C3 DE 00 00 */ lfs f30, 0(r30) @@ -5176,9 +5176,9 @@ lbl_8002DC2C: /* 8002DC38 0002AB98 98 1A 02 20 */ stb r0, 0x220(r26) /* 8002DC3C 0002AB9C 48 00 00 74 */ b lbl_8002DCB0 lbl_8002DC40: -/* 8002DC40 0002ABA0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8002DC40 0002ABA0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8002DC44 0002ABA4 38 60 00 00 */ li r3, 0 -/* 8002DC48 0002ABA8 C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 8002DC48 0002ABA8 C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 8002DC4C 0002ABAC D0 1A 01 DC */ stfs f0, 0x1dc(r26) /* 8002DC50 0002ABB0 C0 1E 00 04 */ lfs f0, 4(r30) /* 8002DC54 0002ABB4 D0 1A 01 E0 */ stfs f0, 0x1e0(r26) @@ -5489,8 +5489,8 @@ lbl_8002E074: /* 8002E0C8 0002B028 90 1F 00 E0 */ stw r0, 0xe0(r31) /* 8002E0CC 0002B02C 80 7F 00 E0 */ lwz r3, 0xe0(r31) /* 8002E0D0 0002B030 48 32 4B 49 */ bl CalculateDefault__13CSkinnedModelFv -/* 8002E0D4 0002B034 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 8002E0D8 0002B038 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 8002E0D4 0002B034 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 8002E0D8 0002B038 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 8002E0DC 0002B03C 80 64 00 00 */ lwz r3, 0(r4) /* 8002E0E0 0002B040 80 04 00 04 */ lwz r0, 4(r4) /* 8002E0E4 0002B044 90 7F 01 08 */ stw r3, 0x108(r31) @@ -7311,7 +7311,7 @@ lbl_8002F978: lbl_8002F9A8: /* 8002F9A8 0002C908 90 7F 00 F8 */ stw r3, 0xf8(r31) /* 8002F9AC 0002C90C 38 00 00 00 */ li r0, 0 -/* 8002F9B0 0002C910 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 8002F9B0 0002C910 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 8002F9B4 0002C914 38 7F 01 20 */ addi r3, r31, 0x120 /* 8002F9B8 0002C918 80 BB 00 00 */ lwz r5, 0(r27) /* 8002F9BC 0002C91C 90 BF 00 FC */ stw r5, 0xfc(r31) @@ -7326,7 +7326,7 @@ lbl_8002F9A8: /* 8002F9E0 0002C940 38 A5 00 01 */ addi r5, r5, 1 /* 8002F9E4 0002C944 90 A6 00 04 */ stw r5, 4(r6) /* 8002F9E8 0002C948 90 1F 01 04 */ stw r0, 0x104(r31) -/* 8002F9EC 0002C94C C4 04 67 54 */ lfsu f0, lbl_805A6754@l(r4) +/* 8002F9EC 0002C94C C4 04 67 54 */ lfsu f0, mskInvertedBox__6CAABox@l(r4) /* 8002F9F0 0002C950 D0 1F 01 08 */ stfs f0, 0x108(r31) /* 8002F9F4 0002C954 C0 04 00 04 */ lfs f0, 4(r4) /* 8002F9F8 0002C958 D0 1F 01 0C */ stfs f0, 0x10c(r31) @@ -7339,9 +7339,9 @@ lbl_8002F9A8: /* 8002FA14 0002C974 C0 04 00 14 */ lfs f0, 0x14(r4) /* 8002FA18 0002C978 D0 1F 01 1C */ stfs f0, 0x11c(r31) /* 8002FA1C 0002C97C 48 08 AF B9 */ bl __ct__17CParticleDatabaseFv -/* 8002FA20 0002C980 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8002FA20 0002C980 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8002FA24 0002C984 92 BF 01 D8 */ stw r21, 0x1d8(r31) -/* 8002FA28 0002C988 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 8002FA28 0002C988 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 8002FA2C 0002C98C 38 0D A9 28 */ addi r0, r13, lbl_805A94E8@sda21 /* 8002FA30 0002C990 C0 27 00 00 */ lfs f1, 0(r7) /* 8002FA34 0002C994 3C 60 80 5A */ lis r3, lbl_805A6660@ha diff --git a/asm/MetroidPrime/CArtifactDoll.s b/asm/MetroidPrime/CArtifactDoll.s index 1008d650..49eb2c75 100644 --- a/asm/MetroidPrime/CArtifactDoll.s +++ b/asm/MetroidPrime/CArtifactDoll.s @@ -586,15 +586,15 @@ lbl_8029D028: UpdateActorLights__13CArtifactDollFv: /* 8029D044 00299FA4 94 21 FE F0 */ stwu r1, -0x110(r1) /* 8029D048 00299FA8 7C 08 02 A6 */ mflr r0 -/* 8029D04C 00299FAC 3C 80 80 5A */ lis r4, lbl_805A6718@ha -/* 8029D050 00299FB0 3C C0 80 5A */ lis r6, lbl_805A6700@ha +/* 8029D04C 00299FAC 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha +/* 8029D050 00299FB0 3C C0 80 5A */ lis r6, sDownVector__9CVector3f@ha /* 8029D054 00299FB4 90 01 01 14 */ stw r0, 0x114(r1) -/* 8029D058 00299FB8 38 A4 67 18 */ addi r5, r4, lbl_805A6718@l +/* 8029D058 00299FB8 38 A4 67 18 */ addi r5, r4, sRightVector__9CVector3f@l /* 8029D05C 00299FBC C0 62 C0 54 */ lfs f3, lbl_805ADD74@sda21(r2) -/* 8029D060 00299FC0 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8029D060 00299FC0 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8029D064 00299FC4 93 E1 01 0C */ stw r31, 0x10c(r1) -/* 8029D068 00299FC8 3B E4 67 24 */ addi r31, r4, lbl_805A6724@l -/* 8029D06C 00299FCC 38 C6 67 00 */ addi r6, r6, lbl_805A6700@l +/* 8029D068 00299FC8 3B E4 67 24 */ addi r31, r4, sForwardVector__9CVector3f@l +/* 8029D06C 00299FCC 38 C6 67 00 */ addi r6, r6, sDownVector__9CVector3f@l /* 8029D070 00299FD0 C0 C2 C0 8C */ lfs f6, lbl_805ADDAC@sda21(r2) /* 8029D074 00299FD4 93 C1 01 08 */ stw r30, 0x108(r1) /* 8029D078 00299FD8 7C 7E 1B 78 */ mr r30, r3 @@ -635,9 +635,9 @@ UpdateActorLights__13CArtifactDollFv: /* 8029D104 0029A064 D0 81 00 4C */ stfs f4, 0x4c(r1) /* 8029D108 0029A068 48 07 77 49 */ bl AsNormalized__9CVector3fCFv /* 8029D10C 0029A06C 38 00 00 FF */ li r0, 0xff -/* 8029D110 0029A070 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8029D110 0029A070 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8029D114 0029A074 98 01 00 10 */ stb r0, 0x10(r1) -/* 8029D118 0029A078 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 8029D118 0029A078 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8029D11C 0029A07C 38 61 00 AC */ addi r3, r1, 0xac /* 8029D120 0029A080 38 A1 00 10 */ addi r5, r1, 0x10 /* 8029D124 0029A084 98 01 00 11 */ stb r0, 0x11(r1) @@ -645,9 +645,9 @@ UpdateActorLights__13CArtifactDollFv: /* 8029D12C 0029A08C 98 01 00 13 */ stb r0, 0x13(r1) /* 8029D130 0029A090 48 06 93 3D */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 8029D134 0029A094 81 5E 00 1C */ lwz r10, 0x1c(r30) -/* 8029D138 0029A098 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8029D138 0029A098 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8029D13C 0029A09C 80 81 00 AC */ lwz r4, 0xac(r1) -/* 8029D140 0029A0A0 38 C3 67 24 */ addi r6, r3, lbl_805A6724@l +/* 8029D140 0029A0A0 38 C3 67 24 */ addi r6, r3, sForwardVector__9CVector3f@l /* 8029D144 0029A0A4 81 01 00 B0 */ lwz r8, 0xb0(r1) /* 8029D148 0029A0A8 38 E0 00 00 */ li r7, 0 /* 8029D14C 0029A0AC 38 00 00 FF */ li r0, 0xff @@ -907,8 +907,8 @@ __ct__13CArtifactDollFv: /* 8029D4E0 0029A440 93 C1 00 88 */ stw r30, 0x88(r1) /* 8029D4E4 0029A444 93 A1 00 84 */ stw r29, 0x84(r1) /* 8029D4E8 0029A448 90 C3 00 04 */ stw r6, 4(r3) -/* 8029D4EC 0029A44C 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 8029D4F0 0029A450 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 8029D4EC 0029A44C 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 8029D4F0 0029A450 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8029D4F4 0029A454 90 DF 00 08 */ stw r6, 8(r31) /* 8029D4F8 0029A458 38 61 00 2C */ addi r3, r1, 0x2c /* 8029D4FC 0029A45C 90 DF 00 0C */ stw r6, 0xc(r31) @@ -927,9 +927,9 @@ __ct__13CArtifactDollFv: /* 8029D530 0029A490 48 07 83 3D */ bl __nw__FUlPCcPCc /* 8029D534 0029A494 7C 60 1B 79 */ or. r0, r3, r3 /* 8029D538 0029A498 41 82 00 4C */ beq lbl_8029D584 -/* 8029D53C 0029A49C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8029D53C 0029A49C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8029D540 0029A4A0 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 8029D544 0029A4A4 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8029D544 0029A4A4 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8029D548 0029A4A8 38 A1 00 20 */ addi r5, r1, 0x20 /* 8029D54C 0029A4AC 81 07 00 00 */ lwz r8, 0(r7) /* 8029D550 0029A4B0 38 80 00 08 */ li r4, 8 diff --git a/asm/MetroidPrime/CAutoMapper.s b/asm/MetroidPrime/CAutoMapper.s index 90ffe121..3d0217de 100644 --- a/asm/MetroidPrime/CAutoMapper.s +++ b/asm/MetroidPrime/CAutoMapper.s @@ -915,9 +915,9 @@ GetDesiredMiniMapCameraDistance__11CAutoMapperCFRC13CStateManager: /* 80095E14 00092D74 81 8C 00 18 */ lwz r12, 0x18(r12) /* 80095E18 00092D78 7D 89 03 A6 */ mtctr r12 /* 80095E1C 00092D7C 4E 80 04 21 */ bctrl -/* 80095E20 00092D80 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 80095E20 00092D80 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 80095E24 00092D84 80 1D 00 A0 */ lwz r0, 0xa0(r29) -/* 80095E28 00092D88 38 A4 67 54 */ addi r5, r4, lbl_805A6754@l +/* 80095E28 00092D88 38 A4 67 54 */ addi r5, r4, mskInvertedBox__6CAABox@l /* 80095E2C 00092D8C 7C 7E 1B 78 */ mr r30, r3 /* 80095E30 00092D90 C0 A5 00 00 */ lfs f5, 0(r5) /* 80095E34 00092D94 38 81 00 38 */ addi r4, r1, 0x38 @@ -4589,8 +4589,8 @@ lbl_8009930C: /* 80099328 00096288 7F A0 EA 14 */ add r29, r0, r29 /* 8009932C 0009628C 48 00 00 0C */ b lbl_80099338 lbl_80099330: -/* 80099330 00096290 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80099334 00096294 3B A3 66 70 */ addi r29, r3, skIdentity4f@l +/* 80099330 00096290 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80099334 00096294 3B A3 66 70 */ addi r29, r3, sIdentity__12CTransform4f@l lbl_80099338: /* 80099338 00096298 80 8D A1 44 */ lwz r4, gpTweakAutoMapper@sda21(r13) /* 8009933C 0009629C 38 60 00 00 */ li r3, 0 @@ -4963,11 +4963,11 @@ lbl_8009987C: /* 800998B0 00096810 39 21 07 E4 */ addi r9, r1, 0x7e4 /* 800998B4 00096814 48 16 96 1D */ bl sub_80202ed0 /* 800998B8 00096818 C0 22 8B A8 */ lfs f1, lbl_805AA8C8@sda21(r2) -/* 800998BC 0009681C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 800998BC 0009681C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 800998C0 00096820 7C 64 1B 78 */ mr r4, r3 /* 800998C4 00096824 7F 63 DB 78 */ mr r3, r27 /* 800998C8 00096828 FC 40 08 90 */ fmr f2, f1 -/* 800998CC 0009682C 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 800998CC 0009682C 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 800998D0 00096830 48 16 89 A5 */ bl Draw__12CMapUniverseCFRCQ212CMapUniverse21CMapUniverseDrawParmsRC9CVector3fff lbl_800998D4: /* 800998D4 00096834 7F E3 FB 78 */ mr r3, r31 @@ -5177,9 +5177,9 @@ lbl_80099BC4: /* 80099BE4 00096B44 38 61 02 98 */ addi r3, r1, 0x298 /* 80099BE8 00096B48 38 81 07 E4 */ addi r4, r1, 0x7e4 /* 80099BEC 00096B4C 48 27 95 09 */ bl BuildMatrix3f__12CTransform4fCFv -/* 80099BF0 00096B50 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80099BF0 00096B50 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80099BF4 00096B54 38 61 06 94 */ addi r3, r1, 0x694 -/* 80099BF8 00096B58 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80099BF8 00096B58 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80099BFC 00096B5C 38 81 02 98 */ addi r4, r1, 0x298 /* 80099C00 00096B60 48 27 96 79 */ bl __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f /* 80099C04 00096B64 80 BF 00 24 */ lwz r5, 0x24(r31) @@ -5387,9 +5387,9 @@ lbl_80099EFC: /* 80099EFC 00096E5C C0 22 8B A8 */ lfs f1, lbl_805AA8C8@sda21(r2) /* 80099F00 00096E60 FC 40 08 90 */ fmr f2, f1 /* 80099F04 00096E64 48 27 04 DD */ bl SetDepthRange__9CGraphicsFff -/* 80099F08 00096E68 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80099F08 00096E68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80099F0C 00096E6C D3 41 00 58 */ stfs f26, 0x58(r1) -/* 80099F10 00096E70 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80099F10 00096E70 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80099F14 00096E74 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80099F18 00096E78 C0 45 00 00 */ lfs f2, 0(r5) /* 80099F1C 00096E7C 38 81 00 58 */ addi r4, r1, 0x58 diff --git a/asm/MetroidPrime/CAxisAngle.s b/asm/MetroidPrime/CAxisAngle.s index ba23f28e..26331e8d 100644 --- a/asm/MetroidPrime/CAxisAngle.s +++ b/asm/MetroidPrime/CAxisAngle.s @@ -141,8 +141,8 @@ __ct__10CAxisAngleFRC9CVector3f: .global __sinit_CAxisAngle_cpp __sinit_CAxisAngle_cpp: -/* 8001B5A0 00018500 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8001B5A4 00018504 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8001B5A0 00018500 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8001B5A4 00018504 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8001B5A8 00018508 3C 60 80 57 */ lis r3, lbl_8056A5E8@ha /* 8001B5AC 0001850C C0 24 00 04 */ lfs f1, 4(r4) /* 8001B5B0 00018510 D4 43 A5 E8 */ stfsu f2, lbl_8056A5E8@l(r3) diff --git a/asm/MetroidPrime/CBoneTracking.s b/asm/MetroidPrime/CBoneTracking.s index 1fe66697..ae6d6a62 100644 --- a/asm/MetroidPrime/CBoneTracking.s +++ b/asm/MetroidPrime/CBoneTracking.s @@ -123,8 +123,8 @@ lbl_80175300: /* 80175324 00172284 98 01 00 08 */ stb r0, 8(r1) lbl_80175328: /* 80175328 00172288 88 05 00 00 */ lbz r0, 0(r5) -/* 8017532C 0017228C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80175330 00172290 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8017532C 0017228C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80175330 00172290 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80175334 00172294 98 01 00 0C */ stb r0, 0xc(r1) /* 80175338 00172298 38 61 01 FC */ addi r3, r1, 0x1fc /* 8017533C 0017229C 48 19 D8 39 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -140,9 +140,9 @@ lbl_80175328: /* 80175364 001722C4 41 82 00 38 */ beq lbl_8017539C /* 80175368 001722C8 54 60 DF FF */ rlwinm. r0, r3, 0x1b, 0x1f, 0x1f /* 8017536C 001722CC 40 82 00 30 */ bne lbl_8017539C -/* 80175370 001722D0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80175370 001722D0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80175374 001722D4 38 61 01 CC */ addi r3, r1, 0x1cc -/* 80175378 001722D8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80175378 001722D8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8017537C 001722DC 48 19 D7 F9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80175380 001722E0 7F A3 EB 78 */ mr r3, r29 /* 80175384 001722E4 38 9E 00 14 */ addi r4, r30, 0x14 @@ -261,17 +261,17 @@ lbl_801754A4: /* 80175538 00172498 D0 01 01 68 */ stfs f0, 0x168(r1) /* 8017553C 0017249C 48 00 00 60 */ b lbl_8017559C lbl_80175540: -/* 80175540 001724A0 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80175540 001724A0 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80175544 001724A4 38 81 01 60 */ addi r4, r1, 0x160 -/* 80175548 001724A8 38 63 67 24 */ addi r3, r3, lbl_805A6724@l +/* 80175548 001724A8 38 63 67 24 */ addi r3, r3, sForwardVector__9CVector3f@l /* 8017554C 001724AC 48 19 F0 E5 */ bl GetAngleDiff__9CVector3fFRC9CVector3fRC9CVector3f /* 80175550 001724B0 D0 21 00 30 */ stfs f1, 0x30(r1) /* 80175554 001724B4 38 61 00 30 */ addi r3, r1, 0x30 /* 80175558 001724B8 38 9E 00 1C */ addi r4, r30, 0x1c /* 8017555C 001724BC 4B F0 88 85 */ bl "Min__5CMathFRCfRCf" /* 80175560 001724C0 C0 03 00 00 */ lfs f0, 0(r3) -/* 80175564 001724C4 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 80175568 001724C8 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 80175564 001724C4 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 80175568 001724C8 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8017556C 001724CC 38 A1 01 60 */ addi r5, r1, 0x160 /* 80175570 001724D0 D0 01 00 30 */ stfs f0, 0x30(r1) /* 80175574 001724D4 38 61 00 C8 */ addi r3, r1, 0xc8 @@ -285,9 +285,9 @@ lbl_80175540: /* 80175594 001724F4 D0 21 01 64 */ stfs f1, 0x164(r1) /* 80175598 001724F8 D0 01 01 68 */ stfs f0, 0x168(r1) lbl_8017559C: -/* 8017559C 001724FC 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8017559C 001724FC 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 801755A0 00172500 7F C4 F3 78 */ mr r4, r30 -/* 801755A4 00172504 38 A3 67 24 */ addi r5, r3, lbl_805A6724@l +/* 801755A4 00172504 38 A3 67 24 */ addi r5, r3, sForwardVector__9CVector3f@l /* 801755A8 00172508 38 61 00 BC */ addi r3, r1, 0xbc /* 801755AC 0017250C 48 19 BC B9 */ bl Transform__11CQuaternionCFRC9CVector3f /* 801755B0 00172510 C0 41 00 BC */ lfs f2, 0xbc(r1) @@ -316,9 +316,9 @@ lbl_8017559C: /* 8017560C 0017256C 38 81 01 60 */ addi r4, r1, 0x160 /* 80175610 00172570 D0 01 00 14 */ stfs f0, 0x14(r1) /* 80175614 00172574 48 19 E7 BD */ bl __ct__13CUnitVector3fFRC9CVector3f -/* 80175618 00172578 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 80175618 00172578 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8017561C 0017257C 7C 79 1B 78 */ mr r25, r3 -/* 80175620 00172580 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 80175620 00172580 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 80175624 00172584 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80175628 00172588 48 19 E7 A9 */ bl __ct__13CUnitVector3fFRC9CVector3f /* 8017562C 0017258C 7C 64 1B 78 */ mr r4, r3 @@ -373,15 +373,15 @@ lbl_801756E8: /* 801756E8 00172648 88 1E 00 36 */ lbz r0, 0x36(r30) /* 801756EC 0017264C 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 801756F0 00172650 41 82 01 A0 */ beq lbl_80175890 -/* 801756F4 00172654 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 801756F4 00172654 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 801756F8 00172658 7F C4 F3 78 */ mr r4, r30 -/* 801756FC 0017265C 38 A3 67 24 */ addi r5, r3, lbl_805A6724@l +/* 801756FC 0017265C 38 A3 67 24 */ addi r5, r3, sForwardVector__9CVector3f@l /* 80175700 00172660 38 61 00 78 */ addi r3, r1, 0x78 /* 80175704 00172664 48 19 BB 61 */ bl Transform__11CQuaternionCFRC9CVector3f /* 80175708 00172668 C0 41 00 78 */ lfs f2, 0x78(r1) -/* 8017570C 0017266C 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8017570C 0017266C 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80175710 00172670 C0 21 00 7C */ lfs f1, 0x7c(r1) -/* 80175714 00172674 38 A3 67 24 */ addi r5, r3, lbl_805A6724@l +/* 80175714 00172674 38 A3 67 24 */ addi r5, r3, sForwardVector__9CVector3f@l /* 80175718 00172678 C0 01 00 80 */ lfs f0, 0x80(r1) /* 8017571C 0017267C 3B 9D 00 40 */ addi r28, r29, 0x40 /* 80175720 00172680 D0 41 01 2C */ stfs f2, 0x12c(r1) diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index 42ea94fd..434e4a37 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1040,16 +1040,16 @@ __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff: /* 801A94CC 001A642C 4B E7 20 69 */ bl Identity__10CAxisAngleFv /* 801A94D0 001A6430 7C 7A 1B 78 */ mr r26, r3 /* 801A94D4 001A6434 4B E7 20 61 */ bl Identity__10CAxisAngleFv -/* 801A94D8 001A6438 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A94D8 001A6438 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A94DC 001A643C 3C A0 80 5A */ lis r5, lbl_805A6784@ha -/* 801A94E0 001A6440 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 801A94E0 001A6440 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 801A94E4 001A6444 A3 9C 00 00 */ lhz r28, 0(r28) /* 801A94E8 001A6448 C0 7F 00 00 */ lfs f3, 0(r31) /* 801A94EC 001A644C 39 85 67 84 */ addi r12, r5, lbl_805A6784@l /* 801A94F0 001A6450 C0 9F 00 04 */ lfs f4, 4(r31) -/* 801A94F4 001A6454 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801A94F4 001A6454 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801A94F8 001A6458 C0 BF 00 08 */ lfs f5, 8(r31) -/* 801A94FC 001A645C 39 04 66 70 */ addi r8, r4, skIdentity4f@l +/* 801A94FC 001A645C 39 04 66 70 */ addi r8, r4, sIdentity__12CTransform4f@l /* 801A9500 001A6460 D0 61 00 80 */ stfs f3, 0x80(r1) /* 801A9504 001A6464 39 61 00 80 */ addi r11, r1, 0x80 /* 801A9508 001A6468 38 01 00 B4 */ addi r0, r1, 0xb4 @@ -1113,13 +1113,13 @@ lbl_801A95E4: /* 801A95E4 001A6544 38 61 00 40 */ addi r3, r1, 0x40 /* 801A95E8 001A6548 48 19 44 F9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 801A95EC 001A654C 3C 60 80 3E */ lis r3, lbl_803E4B18@ha -/* 801A95F0 001A6550 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A95F0 001A6550 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A95F4 001A6554 38 03 4B 18 */ addi r0, r3, lbl_803E4B18@l /* 801A95F8 001A6558 3C 60 80 3D */ lis r3, lbl_803D14A0@ha /* 801A95FC 001A655C 90 1B 00 00 */ stw r0, 0(r27) /* 801A9600 001A6560 38 00 00 02 */ li r0, 2 /* 801A9604 001A6564 38 63 14 A0 */ addi r3, r3, lbl_803D14A0@l -/* 801A9608 001A6568 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 801A9608 001A6568 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 801A960C 001A656C 90 1B 02 58 */ stw r0, 0x258(r27) /* 801A9610 001A6570 38 00 00 00 */ li r0, 0 /* 801A9614 001A6574 38 83 00 0F */ addi r4, r3, 0xf @@ -1145,9 +1145,9 @@ lbl_801A95E4: /* 801A9664 001A65C4 48 16 C2 09 */ bl __nw__FUlPCcPCc /* 801A9668 001A65C8 7C 7E 1B 79 */ or. r30, r3, r3 /* 801A966C 001A65CC 41 82 00 9C */ beq lbl_801A9708 -/* 801A9670 001A65D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A9670 001A65D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A9674 001A65D4 38 00 00 00 */ li r0, 0 -/* 801A9678 001A65D8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801A9678 001A65D8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801A967C 001A65DC 80 AD 90 60 */ lwz r5, lbl_805A7C20@sda21(r13) /* 801A9680 001A65E0 C3 C4 00 00 */ lfs f30, 0(r4) /* 801A9684 001A65E4 38 60 00 00 */ li r3, 0 @@ -1185,8 +1185,8 @@ lbl_801A95E4: /* 801A9704 001A6664 D3 FE 00 1C */ stfs f31, 0x1c(r30) lbl_801A9708: /* 801A9708 001A6668 93 DB 02 84 */ stw r30, 0x284(r27) -/* 801A970C 001A666C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A9710 001A6670 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801A970C 001A666C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A9710 001A6670 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A9714 001A6674 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2) /* 801A9718 001A6678 D3 FB 02 88 */ stfs f31, 0x288(r27) /* 801A971C 001A667C 3C 80 80 57 */ lis r4, lbl_80570004@ha @@ -1337,16 +1337,16 @@ __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9954 001A68B4 4B E7 1B E1 */ bl Identity__10CAxisAngleFv /* 801A9958 001A68B8 7C 79 1B 78 */ mr r25, r3 /* 801A995C 001A68BC 4B E7 1B D9 */ bl Identity__10CAxisAngleFv -/* 801A9960 001A68C0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A9960 001A68C0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A9964 001A68C4 3C A0 80 5A */ lis r5, lbl_805A6784@ha -/* 801A9968 001A68C8 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 801A9968 001A68C8 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 801A996C 001A68CC A3 7B 00 00 */ lhz r27, 0(r27) /* 801A9970 001A68D0 C0 7F 00 00 */ lfs f3, 0(r31) /* 801A9974 001A68D4 39 85 67 84 */ addi r12, r5, lbl_805A6784@l /* 801A9978 001A68D8 C0 9F 00 04 */ lfs f4, 4(r31) -/* 801A997C 001A68DC 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801A997C 001A68DC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801A9980 001A68E0 C0 BF 00 08 */ lfs f5, 8(r31) -/* 801A9984 001A68E4 39 04 66 70 */ addi r8, r4, skIdentity4f@l +/* 801A9984 001A68E4 39 04 66 70 */ addi r8, r4, sIdentity__12CTransform4f@l /* 801A9988 001A68E8 D0 61 00 B0 */ stfs f3, 0xb0(r1) /* 801A998C 001A68EC 39 61 00 B0 */ addi r11, r1, 0xb0 /* 801A9990 001A68F0 38 01 00 E4 */ addi r0, r1, 0xe4 @@ -1410,13 +1410,13 @@ lbl_801A9A6C: /* 801A9A6C 001A69CC 38 61 00 58 */ addi r3, r1, 0x58 /* 801A9A70 001A69D0 48 19 40 71 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 801A9A74 001A69D4 3C 60 80 3E */ lis r3, lbl_803E4B18@ha -/* 801A9A78 001A69D8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A9A78 001A69D8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A9A7C 001A69DC 38 03 4B 18 */ addi r0, r3, lbl_803E4B18@l /* 801A9A80 001A69E0 3C 60 80 3D */ lis r3, lbl_803D14A0@ha /* 801A9A84 001A69E4 90 1A 00 00 */ stw r0, 0(r26) /* 801A9A88 001A69E8 38 00 00 01 */ li r0, 1 /* 801A9A8C 001A69EC 38 63 14 A0 */ addi r3, r3, lbl_803D14A0@l -/* 801A9A90 001A69F0 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 801A9A90 001A69F0 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 801A9A94 001A69F4 90 1A 02 58 */ stw r0, 0x258(r26) /* 801A9A98 001A69F8 38 00 00 00 */ li r0, 0 /* 801A9A9C 001A69FC 38 83 00 0F */ addi r4, r3, 0xf @@ -1506,10 +1506,10 @@ lbl_801A9A6C: lbl_801A9BEC: /* 801A9BEC 001A6B4C 93 3A 02 80 */ stw r25, 0x280(r26) /* 801A9BF0 001A6B50 38 00 00 00 */ li r0, 0 -/* 801A9BF4 001A6B54 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A9BF4 001A6B54 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A9BF8 001A6B58 C0 02 A8 30 */ lfs f0, lbl_805AC550@sda21(r2) /* 801A9BFC 001A6B5C 90 1A 02 84 */ stw r0, 0x284(r26) -/* 801A9C00 001A6B60 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801A9C00 001A6B60 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A9C04 001A6B64 3C 80 80 57 */ lis r4, lbl_80570004@ha /* 801A9C08 001A6B68 38 00 00 10 */ li r0, 0x10 /* 801A9C0C 001A6B6C D0 1A 02 88 */ stfs f0, 0x288(r26) @@ -1654,16 +1654,16 @@ __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9E2C 001A6D8C 4B E7 17 09 */ bl Identity__10CAxisAngleFv /* 801A9E30 001A6D90 7C 78 1B 78 */ mr r24, r3 /* 801A9E34 001A6D94 4B E7 17 01 */ bl Identity__10CAxisAngleFv -/* 801A9E38 001A6D98 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A9E38 001A6D98 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A9E3C 001A6D9C 3C A0 80 5A */ lis r5, lbl_805A6784@ha -/* 801A9E40 001A6DA0 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 801A9E40 001A6DA0 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 801A9E44 001A6DA4 A3 39 00 00 */ lhz r25, 0(r25) /* 801A9E48 001A6DA8 C0 7E 00 00 */ lfs f3, 0(r30) /* 801A9E4C 001A6DAC 39 85 67 84 */ addi r12, r5, lbl_805A6784@l /* 801A9E50 001A6DB0 C0 9E 00 04 */ lfs f4, 4(r30) -/* 801A9E54 001A6DB4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801A9E54 001A6DB4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801A9E58 001A6DB8 C0 BE 00 08 */ lfs f5, 8(r30) -/* 801A9E5C 001A6DBC 39 04 66 70 */ addi r8, r4, skIdentity4f@l +/* 801A9E5C 001A6DBC 39 04 66 70 */ addi r8, r4, sIdentity__12CTransform4f@l /* 801A9E60 001A6DC0 D0 61 00 78 */ stfs f3, 0x78(r1) /* 801A9E64 001A6DC4 39 61 00 78 */ addi r11, r1, 0x78 /* 801A9E68 001A6DC8 38 01 00 AC */ addi r0, r1, 0xac @@ -1778,10 +1778,10 @@ lbl_801A9FFC: /* 801AA008 001A6F68 3C 80 80 57 */ lis r4, lbl_80570004@ha /* 801AA00C 001A6F6C 90 BF 02 80 */ stw r5, 0x280(r31) /* 801AA010 001A6F70 38 00 00 10 */ li r0, 0x10 -/* 801AA014 001A6F74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801AA014 001A6F74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801AA018 001A6F78 C0 22 A8 20 */ lfs f1, lbl_805AC540@sda21(r2) /* 801AA01C 001A6F7C 90 BF 02 84 */ stw r5, 0x284(r31) -/* 801AA020 001A6F80 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801AA020 001A6F80 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801AA024 001A6F84 7F E3 FB 78 */ mr r3, r31 /* 801AA028 001A6F88 D0 1F 02 88 */ stfs f0, 0x288(r31) /* 801AA02C 001A6F8C D0 1F 02 8C */ stfs f0, 0x28c(r31) diff --git a/asm/MetroidPrime/CCollisionActorManager.s b/asm/MetroidPrime/CCollisionActorManager.s index df3e998f..775a4160 100644 --- a/asm/MetroidPrime/CCollisionActorManager.s +++ b/asm/MetroidPrime/CCollisionActorManager.s @@ -1285,9 +1285,9 @@ lbl_801A80D0: /* 801A8190 001A50F0 D0 01 01 98 */ stfs f0, 0x198(r1) /* 801A8194 001A50F4 D0 41 01 A0 */ stfs f2, 0x1a0(r1) lbl_801A8198: -/* 801A8198 001A50F8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A8198 001A50F8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A819C 001A50FC 38 61 01 C8 */ addi r3, r1, 0x1c8 -/* 801A81A0 001A5100 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801A81A0 001A5100 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801A81A4 001A5104 38 A1 01 8C */ addi r5, r1, 0x18c /* 801A81A8 001A5108 38 C1 01 98 */ addi r6, r1, 0x198 /* 801A81AC 001A510C 48 16 B9 65 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1588,10 +1588,10 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A85F0 001A5550 7C 7F 1B 78 */ mr r31, r3 /* 801A85F4 001A5554 89 45 00 00 */ lbz r10, 0(r5) /* 801A85F8 001A5558 38 00 00 03 */ li r0, 3 -/* 801A85FC 001A555C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A85FC 001A555C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A8600 001A5560 FF E0 08 90 */ fmr f31, f1 /* 801A8604 001A5564 90 1F 00 00 */ stw r0, 0(r31) -/* 801A8608 001A5568 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801A8608 001A5568 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A860C 001A556C C0 02 A7 F8 */ lfs f0, lbl_805AC518@sda21(r2) /* 801A8610 001A5570 7D 04 43 78 */ mr r4, r8 /* 801A8614 001A5574 90 FF 00 04 */ stw r7, 4(r31) @@ -1640,10 +1640,10 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A86B4 001A5614 7C 7F 1B 78 */ mr r31, r3 /* 801A86B8 001A5618 90 03 00 00 */ stw r0, 0(r3) /* 801A86BC 001A561C 38 00 00 00 */ li r0, 0 -/* 801A86C0 001A5620 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A86C0 001A5620 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A86C4 001A5624 FF E0 08 90 */ fmr f31, f1 /* 801A86C8 001A5628 90 1F 00 04 */ stw r0, 4(r31) -/* 801A86CC 001A562C 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 801A86CC 001A562C 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 801A86D0 001A5630 C0 02 A7 F8 */ lfs f0, lbl_805AC518@sda21(r2) /* 801A86D4 001A5634 7C C4 33 78 */ mr r4, r6 /* 801A86D8 001A5638 99 1F 00 08 */ stb r8, 8(r31) @@ -1690,10 +1690,10 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A8770 001A56D0 7C 7F 1B 78 */ mr r31, r3 /* 801A8774 001A56D4 89 25 00 00 */ lbz r9, 0(r5) /* 801A8778 001A56D8 38 00 00 01 */ li r0, 1 -/* 801A877C 001A56DC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A877C 001A56DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A8780 001A56E0 FF E0 18 90 */ fmr f31, f3 /* 801A8784 001A56E4 90 1F 00 00 */ stw r0, 0(r31) -/* 801A8788 001A56E8 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801A8788 001A56E8 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A878C 001A56EC 7C E4 3B 78 */ mr r4, r7 /* 801A8790 001A56F0 38 7F 00 2C */ addi r3, r31, 0x2c /* 801A8794 001A56F4 90 DF 00 04 */ stw r6, 4(r31) @@ -1740,8 +1740,8 @@ ScaleAllBounds__26CJointCollisionDescriptionFRC9CVector3f: /* 801A882C 001A578C 38 00 00 00 */ li r0, 0 /* 801A8830 001A5790 7C 7F 1B 78 */ mr r31, r3 /* 801A8834 001A5794 90 03 00 00 */ stw r0, 0(r3) -/* 801A8838 001A5798 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A883C 001A579C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801A8838 001A5798 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A883C 001A579C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801A8840 001A57A0 FF E0 10 90 */ fmr f31, f2 /* 801A8844 001A57A4 90 1F 00 04 */ stw r0, 4(r31) /* 801A8848 001A57A8 7C A4 2B 78 */ mr r4, r5 diff --git a/asm/MetroidPrime/CCredits.s b/asm/MetroidPrime/CCredits.s index 7feabd3f..ddbd2229 100644 --- a/asm/MetroidPrime/CCredits.s +++ b/asm/MetroidPrime/CCredits.s @@ -3266,8 +3266,8 @@ lbl_80027C70: lbl_80027C78: /* 80027C78 00024BD8 28 1D 00 00 */ cmplwi r29, 0 /* 80027C7C 00024BDC 41 82 00 20 */ beq lbl_80027C9C -/* 80027C80 00024BE0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80027C84 00024BE4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80027C80 00024BE0 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80027C84 00024BE4 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80027C88 00024BE8 90 1D 00 00 */ stw r0, 0(r29) /* 80027C8C 00024BEC 41 82 00 10 */ beq lbl_80027C9C /* 80027C90 00024BF0 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -3306,11 +3306,11 @@ sub_80027ccc: /* 80027D00 00024C60 28 03 00 00 */ cmplwi r3, 0 /* 80027D04 00024C64 41 82 00 2C */ beq lbl_80027D30 /* 80027D08 00024C68 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80027D0C 00024C6C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80027D0C 00024C6C 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80027D10 00024C70 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80027D14 00024C74 3C 80 80 3E */ lis r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@ha /* 80027D18 00024C78 90 03 00 00 */ stw r0, 0(r3) -/* 80027D1C 00024C7C 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80027D1C 00024C7C 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80027D20 00024C80 38 04 9A 0C */ addi r0, r4, "__vt__40TObjOwnerDerivedFromIObj<12CStringTable>"@l /* 80027D24 00024C84 90 A3 00 00 */ stw r5, 0(r3) /* 80027D28 00024C88 93 E3 00 04 */ stw r31, 4(r3) diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index d0b1f0d1..0f4972af 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -207,9 +207,9 @@ UpdateRainSounds__13CEnvFxManagerFR13CStateManager: /* 8020FFDC 0020CF3C 7C 7E 1B 78 */ mr r30, r3 /* 8020FFE0 0020CF40 28 00 00 00 */ cmplwi r0, 0 /* 8020FFE4 0020CF44 40 82 00 6C */ bne lbl_80210050 -/* 8020FFE8 0020CF48 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8020FFE8 0020CF48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8020FFEC 0020CF4C A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) -/* 8020FFF0 0020CF50 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8020FFF0 0020CF50 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8020FFF4 0020CF54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8020FFF8 0020CF58 38 61 00 24 */ addi r3, r1, 0x24 /* 8020FFFC 0020CF5C 38 80 09 F0 */ li r4, 0x9f0 @@ -218,8 +218,8 @@ UpdateRainSounds__13CEnvFxManagerFR13CStateManager: /* 80210008 0020CF68 39 00 00 01 */ li r8, 1 /* 8021000C 0020CF6C 48 0D A2 A5 */ bl AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi /* 80210010 0020CF70 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80210014 0020CF74 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80210018 0020CF78 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80210014 0020CF74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80210018 0020CF78 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8021001C 0020CF7C A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) /* 80210020 0020CF80 90 1F 0B 6C */ stw r0, 0xb6c(r31) /* 80210024 0020CF84 7C A6 2B 78 */ mr r6, r5 @@ -734,9 +734,9 @@ lbl_80210778: lbl_8021077C: /* 8021077C 0020D6DC 2C 1C FF FF */ cmpwi r28, -1 /* 80210780 0020D6E0 40 82 FF 10 */ bne lbl_80210690 -/* 80210784 0020D6E4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80210784 0020D6E4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80210788 0020D6E8 C0 61 00 0C */ lfs f3, 0xc(r1) -/* 8021078C 0020D6EC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8021078C 0020D6EC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80210790 0020D6F0 7F E4 FB 78 */ mr r4, r31 /* 80210794 0020D6F4 C0 46 00 00 */ lfs f2, 0(r6) /* 80210798 0020D6F8 38 61 00 24 */ addi r3, r1, 0x24 @@ -1145,9 +1145,9 @@ UpdateVisorSplash__13CEnvFxManagerFR13CStateManagerfRC12CTransform4f: /* 80210D88 0020DCE8 90 01 00 14 */ stw r0, 0x14(r1) /* 80210D8C 0020DCEC 4B E3 44 ED */ bl SetActorAreaId__13CStateManagerFR6CActor7TAreaId lbl_80210D90: -/* 80210D90 0020DCF0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80210D90 0020DCF0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80210D94 0020DCF4 C0 3C 00 14 */ lfs f1, 0x14(r28) -/* 80210D98 0020DCF8 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 80210D98 0020DCF8 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 80210D9C 0020DCFC C0 7C 00 04 */ lfs f3, 4(r28) /* 80210DA0 0020DD00 C0 03 00 04 */ lfs f0, 4(r3) /* 80210DA4 0020DD04 C0 43 00 00 */ lfs f2, 0(r3) @@ -1200,8 +1200,8 @@ lbl_80210DF8: /* 80210E50 0020DDB0 38 61 00 3C */ addi r3, r1, 0x3c /* 80210E54 0020DDB4 48 10 3A 65 */ bl Magnitude__9CVector3fCFv /* 80210E58 0020DDB8 C0 42 B2 64 */ lfs f2, lbl_805ACF84@sda21(r2) -/* 80210E5C 0020DDBC 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 80210E60 0020DDC0 38 63 67 24 */ addi r3, r3, lbl_805A6724@l +/* 80210E5C 0020DDBC 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 80210E60 0020DDC0 38 63 67 24 */ addi r3, r3, sForwardVector__9CVector3f@l /* 80210E64 0020DDC4 C0 02 B2 90 */ lfs f0, lbl_805ACFB0@sda21(r2) /* 80210E68 0020DDC8 ED 02 08 24 */ fdivs f8, f2, f1 /* 80210E6C 0020DDCC C0 81 00 40 */ lfs f4, 0x40(r1) @@ -1647,14 +1647,14 @@ lbl_80211440: /* 802114AC 0020E40C 7C 05 07 34 */ extsh r5, r0 /* 802114B0 0020E410 48 10 2E 9D */ bl __ct__9CVector2iFii /* 802114B4 0020E414 38 00 FF FF */ li r0, -1 -/* 802114B8 0020E418 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 802114B8 0020E418 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 802114BC 0020E41C 90 1C 00 2C */ stw r0, 0x2c(r28) /* 802114C0 0020E420 38 00 00 00 */ li r0, 0 -/* 802114C4 0020E424 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 802114C4 0020E424 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 802114C8 0020E428 3B 5C 00 54 */ addi r26, r28, 0x54 /* 802114CC 0020E42C 98 1C 00 24 */ stb r0, 0x24(r28) -/* 802114D0 0020E430 3B 64 66 F4 */ addi r27, r4, lbl_805A66F4@l -/* 802114D4 0020E434 3A E3 67 00 */ addi r23, r3, lbl_805A6700@l +/* 802114D0 0020E430 3B 64 66 F4 */ addi r27, r4, sUpVector__9CVector3f@l +/* 802114D4 0020E434 3A E3 67 00 */ addi r23, r3, sDownVector__9CVector3f@l /* 802114D8 0020E438 3B 21 02 AC */ addi r25, r1, 0x2ac /* 802114DC 0020E43C 90 01 02 A8 */ stw r0, 0x2a8(r1) /* 802114E0 0020E440 3B 01 02 74 */ addi r24, r1, 0x274 @@ -1726,11 +1726,11 @@ lbl_80211544: /* 802115E0 0020E540 81 21 00 50 */ lwz r9, 0x50(r1) /* 802115E4 0020E544 3C E0 43 30 */ lis r7, 0x4330 /* 802115E8 0020E548 81 01 00 54 */ lwz r8, 0x54(r1) -/* 802115EC 0020E54C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802115EC 0020E54C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802115F0 0020E550 7D 20 07 34 */ extsh r0, r9 /* 802115F4 0020E554 C0 62 B2 78 */ lfs f3, lbl_805ACF98@sda21(r2) /* 802115F8 0020E558 7D 04 07 34 */ extsh r4, r8 -/* 802115FC 0020E55C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802115FC 0020E55C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80211600 0020E560 6C 83 80 00 */ xoris r3, r4, 0x8000 /* 80211604 0020E564 6C 00 80 00 */ xoris r0, r0, 0x8000 /* 80211608 0020E568 90 61 0A BC */ stw r3, 0xabc(r1) @@ -1762,13 +1762,13 @@ lbl_80211544: /* 80211670 0020E5D0 D0 61 00 C8 */ stfs f3, 0xc8(r1) /* 80211674 0020E5D4 48 10 14 75 */ bl __ml__12CTransform4fCFRC9CVector3f /* 80211678 0020E5D8 C0 41 00 7C */ lfs f2, 0x7c(r1) -/* 8021167C 0020E5DC 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 8021167C 0020E5DC 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80211680 0020E5E0 C0 21 00 80 */ lfs f1, 0x80(r1) /* 80211684 0020E5E4 7F A4 EB 78 */ mr r4, r29 /* 80211688 0020E5E8 EC C2 F0 2A */ fadds f6, f2, f30 /* 8021168C 0020E5EC C0 01 00 78 */ lfs f0, 0x78(r1) /* 80211690 0020E5F0 EC A1 F8 2A */ fadds f5, f1, f31 -/* 80211694 0020E5F4 C0 63 67 00 */ lfs f3, lbl_805A6700@l(r3) +/* 80211694 0020E5F4 C0 63 67 00 */ lfs f3, sDownVector__9CVector3f@l(r3) /* 80211698 0020E5F8 EC 80 E8 2A */ fadds f4, f0, f29 /* 8021169C 0020E5FC C0 57 00 04 */ lfs f2, 4(r23) /* 802116A0 0020E600 C0 17 00 08 */ lfs f0, 8(r23) @@ -1897,8 +1897,8 @@ lbl_802117F8: /* 8021187C 0020E7DC D0 01 02 04 */ stfs f0, 0x204(r1) /* 80211880 0020E7E0 48 0C 47 ED */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff /* 80211884 0020E7E4 C0 02 B2 A8 */ lfs f0, lbl_805ACFC8@sda21(r2) -/* 80211888 0020E7E8 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8021188C 0020E7EC 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80211888 0020E7E8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8021188C 0020E7EC 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80211890 0020E7F0 D0 01 02 70 */ stfs f0, 0x270(r1) /* 80211894 0020E7F4 7F 03 C3 78 */ mr r3, r24 /* 80211898 0020E7F8 48 10 12 DD */ bl __ct__12CTransform4fFRC12CTransform4f @@ -2076,9 +2076,9 @@ lbl_80211AC4: /* 80211B0C 0020EA6C 20 06 00 01 */ subfic r0, r6, 1 /* 80211B10 0020EA70 7D 00 00 F8 */ nor r0, r8, r0 /* 80211B14 0020EA74 3D 00 80 47 */ lis r8, lbl_8046CB40@ha -/* 80211B18 0020EA78 3D 20 80 5A */ lis r9, skZero3f@ha +/* 80211B18 0020EA78 3D 20 80 5A */ lis r9, sZeroVector__9CVector3f@ha /* 80211B1C 0020EA7C 39 60 00 00 */ li r11, 0 -/* 80211B20 0020EA80 39 49 66 A0 */ addi r10, r9, skZero3f@l +/* 80211B20 0020EA80 39 49 66 A0 */ addi r10, r9, sZeroVector__9CVector3f@l /* 80211B24 0020EA84 7C 09 FE 70 */ srawi r9, r0, 0x1f /* 80211B28 0020EA88 38 08 CB 40 */ addi r0, r8, lbl_8046CB40@l /* 80211B2C 0020EA8C C0 EA 00 00 */ lfs f7, 0(r10) @@ -3280,9 +3280,9 @@ Render__17CEnvFxManagerGridFRC12CTransform4fRC12CTransform4fRC12CTransform4ff10E /* 80212C2C 0020FB8C 2C 1F 00 02 */ cmpwi r31, 2 /* 80212C30 0020FB90 40 82 00 B0 */ bne lbl_80212CE0 lbl_80212C34: -/* 80212C34 0020FB94 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80212C34 0020FB94 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80212C38 0020FB98 C0 7D 00 18 */ lfs f3, 0x18(r29) -/* 80212C3C 0020FB9C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80212C3C 0020FB9C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80212C40 0020FBA0 7F 84 E3 78 */ mr r4, r28 /* 80212C44 0020FBA4 C0 46 00 00 */ lfs f2, 0(r6) /* 80212C48 0020FBA8 38 61 00 14 */ addi r3, r1, 0x14 @@ -3582,9 +3582,9 @@ RenderRainParticles__17CEnvFxManagerGridFR12CTransform4f: /* 80213094 0020FFF4 F3 E1 00 28 */ psq_st f31, 40(r1), 0, qr0 /* 80213098 0020FFF8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8021309C 0020FFFC 93 C1 00 18 */ stw r30, 0x18(r1) -/* 802130A0 00210000 3C A0 80 5A */ lis r5, lbl_805A66F4@ha +/* 802130A0 00210000 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha /* 802130A4 00210004 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 802130A8 00210008 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 802130A8 00210008 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 802130AC 0021000C 83 C3 00 20 */ lwz r30, 0x20(r3) /* 802130B0 00210010 C0 06 00 04 */ lfs f0, 4(r6) /* 802130B4 00210014 7C 7F 1B 78 */ mr r31, r3 @@ -3733,9 +3733,9 @@ __ct__13CEnvFxManagerFv: /* 802132D4 00210234 D0 01 00 AC */ stfs f0, 0xac(r1) /* 802132D8 00210238 D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 802132DC 0021023C 48 12 52 2D */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f -/* 802132E0 00210240 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802132E0 00210240 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802132E4 00210244 3C 60 80 3D */ lis r3, lbl_803D2818@ha -/* 802132E8 00210248 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 802132E8 00210248 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 802132EC 0021024C 38 C0 00 00 */ li r6, 0 /* 802132F0 00210250 C0 27 00 00 */ lfs f1, 0(r7) /* 802132F4 00210254 38 83 28 18 */ addi r4, r3, lbl_803D2818@l diff --git a/asm/MetroidPrime/CErrorOutputWindow.s b/asm/MetroidPrime/CErrorOutputWindow.s index 2d35141d..2dbe13b3 100644 --- a/asm/MetroidPrime/CErrorOutputWindow.s +++ b/asm/MetroidPrime/CErrorOutputWindow.s @@ -467,11 +467,11 @@ lbl_80269730: /* 80269730 00266690 83 A1 00 40 */ lwz r29, 0x40(r1) /* 80269734 00266694 3C 00 43 30 */ lis r0, 0x4330 /* 80269738 00266698 90 01 03 E8 */ stw r0, 0x3e8(r1) -/* 8026973C 0026669C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8026973C 0026669C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80269740 002666A0 6F A0 80 00 */ xoris r0, r29, 0x8000 /* 80269744 002666A4 C8 22 BB 40 */ lfd f1, lbl_805AD860@sda21(r2) /* 80269748 002666A8 90 01 03 EC */ stw r0, 0x3ec(r1) -/* 8026974C 002666AC 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 8026974C 002666AC 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80269750 002666B0 C8 01 03 E8 */ lfd f0, 0x3e8(r1) /* 80269754 002666B4 EF E0 08 28 */ fsubs f31, f0, f1 /* 80269758 002666B8 48 0A 2F F5 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f @@ -519,17 +519,17 @@ lbl_80269730: /* 80269800 00266760 6F E3 80 00 */ xoris r3, r31, 0x8000 /* 80269804 00266764 3C 00 43 30 */ lis r0, 0x4330 /* 80269808 00266768 90 61 04 0C */ stw r3, 0x40c(r1) -/* 8026980C 0026676C 3C 80 80 5A */ lis r4, lbl_805A6718@ha +/* 8026980C 0026676C 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha /* 80269810 00266770 C0 42 BB 38 */ lfs f2, lbl_805AD858@sda21(r2) -/* 80269814 00266774 3C A0 80 5A */ lis r5, lbl_805A6724@ha +/* 80269814 00266774 3C A0 80 5A */ lis r5, sForwardVector__9CVector3f@ha /* 80269818 00266778 90 01 04 08 */ stw r0, 0x408(r1) -/* 8026981C 0026677C 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 8026981C 0026677C 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80269820 00266780 C8 22 BB 40 */ lfd f1, lbl_805AD860@sda21(r2) -/* 80269824 00266784 38 C3 67 00 */ addi r6, r3, lbl_805A6700@l +/* 80269824 00266784 38 C3 67 00 */ addi r6, r3, sDownVector__9CVector3f@l /* 80269828 00266788 C8 01 04 08 */ lfd f0, 0x408(r1) -/* 8026982C 0026678C 38 84 67 18 */ addi r4, r4, lbl_805A6718@l +/* 8026982C 0026678C 38 84 67 18 */ addi r4, r4, sRightVector__9CVector3f@l /* 80269830 00266790 D0 41 00 20 */ stfs f2, 0x20(r1) -/* 80269834 00266794 38 A5 67 24 */ addi r5, r5, lbl_805A6724@l +/* 80269834 00266794 38 A5 67 24 */ addi r5, r5, sForwardVector__9CVector3f@l /* 80269838 00266798 EC 00 08 28 */ fsubs f0, f0, f1 /* 8026983C 0026679C 38 61 00 54 */ addi r3, r1, 0x54 /* 80269840 002667A0 D0 41 00 24 */ stfs f2, 0x24(r1) diff --git a/asm/MetroidPrime/CFrontEndUI.s b/asm/MetroidPrime/CFrontEndUI.s index 563b2b70..2299be74 100644 --- a/asm/MetroidPrime/CFrontEndUI.s +++ b/asm/MetroidPrime/CFrontEndUI.s @@ -6489,9 +6489,9 @@ __ct__19SNewFileSelectFrameFv: /* 80020E68 0001DDC8 38 7E 00 58 */ addi r3, r30, 0x58 /* 80020E6C 0001DDCC 48 00 20 09 */ bl __ct__12SGuiTextPairFv /* 80020E70 0001DDD0 38 00 00 00 */ li r0, 0 -/* 80020E74 0001DDD4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80020E74 0001DDD4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80020E78 0001DDD8 90 1E 00 60 */ stw r0, 0x60(r30) -/* 80020E7C 0001DDDC 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80020E7C 0001DDDC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80020E80 0001DDE0 C0 02 82 9C */ lfs f0, lbl_805A9FBC@sda21(r2) /* 80020E84 0001DDE4 7F E3 FB 78 */ mr r3, r31 /* 80020E88 0001DDE8 90 1E 00 64 */ stw r0, 0x64(r30) diff --git a/asm/MetroidPrime/CGameArea.s b/asm/MetroidPrime/CGameArea.s index 0dac2c05..f5b6bbef 100644 --- a/asm/MetroidPrime/CGameArea.s +++ b/asm/MetroidPrime/CGameArea.s @@ -709,9 +709,9 @@ __ct__14CDummyGameAreaFR12CInputStreamii: /* 8005E3F8 0005B358 7C DF 33 78 */ mr r31, r6 /* 8005E3FC 0005B35C 90 1D 00 00 */ stw r0, 0(r29) /* 8005E400 0005B360 38 03 A2 08 */ addi r0, r3, lbl_803DA208@l -/* 8005E404 0005B364 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8005E404 0005B364 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8005E408 0005B368 90 1D 00 00 */ stw r0, 0(r29) -/* 8005E40C 0005B36C 38 03 66 70 */ addi r0, r3, skIdentity4f@l +/* 8005E40C 0005B36C 38 03 66 70 */ addi r0, r3, sIdentity__12CTransform4f@l /* 8005E410 0005B370 7C 04 03 78 */ mr r4, r0 /* 8005E414 0005B374 38 7D 00 14 */ addi r3, r29, 0x14 /* 8005E418 0005B378 90 BD 00 04 */ stw r5, 4(r29) diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s index f062600c..4df12ba9 100644 --- a/asm/MetroidPrime/CGameCollision.s +++ b/asm/MetroidPrime/CGameCollision.s @@ -246,9 +246,9 @@ sub_8017fb84: /* 8017FD94 0017CCF4 39 20 FF FF */ li r9, -1 /* 8017FD98 0017CCF8 39 00 00 00 */ li r8, 0 /* 8017FD9C 0017CCFC 38 00 00 02 */ li r0, 2 -/* 8017FDA0 0017CD00 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 8017FDA0 0017CD00 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 8017FDA4 0017CD04 90 81 00 EC */ stw r4, 0xec(r1) -/* 8017FDA8 0017CD08 38 C5 66 70 */ addi r6, r5, skIdentity4f@l +/* 8017FDA8 0017CD08 38 C5 66 70 */ addi r6, r5, sIdentity__12CTransform4f@l /* 8017FDAC 0017CD0C 38 81 01 A8 */ addi r4, r1, 0x1a8 /* 8017FDB0 0017CD10 38 A1 00 F8 */ addi r5, r1, 0xf8 /* 8017FDB4 0017CD14 90 61 00 E8 */ stw r3, 0xe8(r1) @@ -316,11 +316,11 @@ lbl_8017FE8C: /* 8017FE8C 0017CDEC 6F 40 80 00 */ xoris r0, r26, 0x8000 /* 8017FE90 0017CDF0 3F E0 43 30 */ lis r31, 0x4330 /* 8017FE94 0017CDF4 90 01 1C F4 */ stw r0, 0x1cf4(r1) -/* 8017FE98 0017CDF8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8017FE9C 0017CDFC 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 8017FEA0 0017CE00 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8017FE98 0017CDF8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8017FE9C 0017CDFC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 8017FEA0 0017CE00 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8017FEA4 0017CE04 93 E1 1C F0 */ stw r31, 0x1cf0(r1) -/* 8017FEA8 0017CE08 3A E3 66 70 */ addi r23, r3, skIdentity4f@l +/* 8017FEA8 0017CE08 3A E3 66 70 */ addi r23, r3, sIdentity__12CTransform4f@l /* 8017FEAC 0017CE0C CB C2 A2 B8 */ lfd f30, lbl_805ABFD8@sda21(r2) /* 8017FEB0 0017CE10 3B 60 00 00 */ li r27, 0 /* 8017FEB4 0017CE14 C8 01 1C F0 */ lfd f0, 0x1cf0(r1) @@ -738,9 +738,9 @@ lbl_801803AC: /* 801804CC 0017D42C 38 81 00 40 */ addi r4, r1, 0x40 /* 801804D0 0017D430 48 1B 71 3D */ bl GetCenterPoint__6CAABoxCFv /* 801804D4 0017D434 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 801804D8 0017D438 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801804D8 0017D438 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801804DC 0017D43C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 801804E0 0017D440 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 801804E0 0017D440 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 801804E4 0017D444 C0 01 00 30 */ lfs f0, 0x30(r1) /* 801804E8 0017D448 3B A0 00 02 */ li r29, 2 /* 801804EC 0017D44C D0 41 00 34 */ stfs f2, 0x34(r1) @@ -1042,11 +1042,11 @@ lbl_80180810: /* 80180898 0017D7F8 DB E1 02 A0 */ stfd f31, 0x2a0(r1) /* 8018089C 0017D7FC F3 E1 02 A8 */ psq_st f31, 680(r1), 0, qr0 /* 801808A0 0017D800 BF 21 02 84 */ stmw r25, 0x284(r1) -/* 801808A4 0017D804 3D 20 80 5A */ lis r9, skZero3f@ha +/* 801808A4 0017D804 3D 20 80 5A */ lis r9, sZeroVector__9CVector3f@ha /* 801808A8 0017D808 FF E0 08 90 */ fmr f31, f1 /* 801808AC 0017D80C 7C BD 2B 78 */ mr r29, r5 /* 801808B0 0017D810 7C 7B 1B 78 */ mr r27, r3 -/* 801808B4 0017D814 38 09 66 A0 */ addi r0, r9, skZero3f@l +/* 801808B4 0017D814 38 09 66 A0 */ addi r0, r9, sZeroVector__9CVector3f@l /* 801808B8 0017D818 7C 9C 23 78 */ mr r28, r4 /* 801808BC 0017D81C 7C DE 33 78 */ mr r30, r6 /* 801808C0 0017D820 7C FF 3B 78 */ mr r31, r7 @@ -1904,9 +1904,9 @@ lbl_8018151C: /* 80181590 0017E4F0 7C 64 1B 78 */ mr r4, r3 /* 80181594 0017E4F4 38 61 00 30 */ addi r3, r1, 0x30 /* 80181598 0017E4F8 4B F2 B1 4D */ bl "__ct__27TCastToPtr<13CPhysicsActor>FP7CEntity" -/* 8018159C 0017E4FC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8018159C 0017E4FC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801815A0 0017E500 82 C3 00 04 */ lwz r22, 4(r3) -/* 801815A4 0017E504 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801815A4 0017E504 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801815A8 0017E508 7F C3 F3 78 */ mr r3, r30 /* 801815AC 0017E50C 4B F9 94 8D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 801815B0 0017E510 38 00 00 00 */ li r0, 0 @@ -2119,9 +2119,9 @@ lbl_8018189C: /* 801818B4 0017E814 FF E0 D8 90 */ fmr f31, f27 /* 801818B8 0017E818 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801818BC 0017E81C 4B F9 99 65 */ bl ClearImpulses__13CPhysicsActorFv -/* 801818C0 0017E820 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801818C0 0017E820 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801818C4 0017E824 7F C3 F3 78 */ mr r3, r30 -/* 801818C8 0017E828 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801818C8 0017E828 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801818CC 0017E82C 4B F9 91 6D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f lbl_801818D0: /* 801818D0 0017E830 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -2221,9 +2221,9 @@ lbl_801819F4: lbl_80181A30: /* 80181A30 0017E990 7F C3 F3 78 */ mr r3, r30 /* 80181A34 0017E994 4B F9 98 81 */ bl ClearForcesAndTorques__13CPhysicsActorFv -/* 80181A38 0017E998 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80181A38 0017E998 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80181A3C 0017E99C 7F C3 F3 78 */ mr r3, r30 -/* 80181A40 0017E9A0 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80181A40 0017E9A0 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80181A44 0017E9A4 4B F9 8F F5 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 80181A48 0017E9A8 38 60 00 00 */ li r3, 0 /* 80181A4C 0017E9AC 4B F3 2A AD */ bl IsUser__Fi @@ -2883,13 +2883,13 @@ lbl_80182370: /* 801823B4 0017F314 4B F9 9F E5 */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 801823B8 0017F318 48 00 00 24 */ b lbl_801823DC lbl_801823BC: -/* 801823BC 0017F31C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801823BC 0017F31C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801823C0 0017F320 7F C3 F3 78 */ mr r3, r30 -/* 801823C4 0017F324 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801823C4 0017F324 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801823C8 0017F328 4B F9 88 D9 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 801823CC 0017F32C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801823CC 0017F32C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801823D0 0017F330 7F E3 FB 78 */ mr r3, r31 -/* 801823D4 0017F334 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801823D4 0017F334 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801823D8 0017F338 4B F9 88 C9 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f lbl_801823DC: /* 801823DC 0017F33C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/CGameCubeDoll.s b/asm/MetroidPrime/CGameCubeDoll.s index 14177ad9..4d77fb92 100644 --- a/asm/MetroidPrime/CGameCubeDoll.s +++ b/asm/MetroidPrime/CGameCubeDoll.s @@ -174,16 +174,16 @@ lbl_8029E898: UpdateActorLights__13CGameCubeDollFv: /* 8029E8AC 0029B80C 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 8029E8B0 0029B810 7C 08 02 A6 */ mflr r0 -/* 8029E8B4 0029B814 3C 80 80 5A */ lis r4, lbl_805A6718@ha -/* 8029E8B8 0029B818 3C C0 80 5A */ lis r6, lbl_805A6700@ha +/* 8029E8B4 0029B814 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha +/* 8029E8B8 0029B818 3C C0 80 5A */ lis r6, sDownVector__9CVector3f@ha /* 8029E8BC 0029B81C 90 01 00 B4 */ stw r0, 0xb4(r1) -/* 8029E8C0 0029B820 38 A4 67 18 */ addi r5, r4, lbl_805A6718@l -/* 8029E8C4 0029B824 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8029E8C0 0029B820 38 A4 67 18 */ addi r5, r4, sRightVector__9CVector3f@l +/* 8029E8C4 0029B824 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8029E8C8 0029B828 C0 62 C0 C4 */ lfs f3, lbl_805ADDE4@sda21(r2) /* 8029E8CC 0029B82C 93 E1 00 AC */ stw r31, 0xac(r1) /* 8029E8D0 0029B830 7C 7F 1B 78 */ mr r31, r3 -/* 8029E8D4 0029B834 38 84 67 24 */ addi r4, r4, lbl_805A6724@l -/* 8029E8D8 0029B838 38 C6 67 00 */ addi r6, r6, lbl_805A6700@l +/* 8029E8D4 0029B834 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l +/* 8029E8D8 0029B838 38 C6 67 00 */ addi r6, r6, sDownVector__9CVector3f@l /* 8029E8DC 0029B83C 93 C1 00 A8 */ stw r30, 0xa8(r1) /* 8029E8E0 0029B840 38 61 00 40 */ addi r3, r1, 0x40 /* 8029E8E4 0029B844 C0 C2 C0 E4 */ lfs f6, lbl_805ADE04@sda21(r2) @@ -223,9 +223,9 @@ UpdateActorLights__13CGameCubeDollFv: /* 8029E96C 0029B8CC D0 81 00 3C */ stfs f4, 0x3c(r1) /* 8029E970 0029B8D0 48 07 5E E1 */ bl AsNormalized__9CVector3fCFv /* 8029E974 0029B8D4 38 00 00 FF */ li r0, 0xff -/* 8029E978 0029B8D8 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8029E978 0029B8D8 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8029E97C 0029B8DC 98 01 00 0C */ stb r0, 0xc(r1) -/* 8029E980 0029B8E0 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 8029E980 0029B8E0 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8029E984 0029B8E4 38 61 00 4C */ addi r3, r1, 0x4c /* 8029E988 0029B8E8 38 A1 00 0C */ addi r5, r1, 0xc /* 8029E98C 0029B8EC 98 01 00 0D */ stb r0, 0xd(r1) @@ -407,9 +407,9 @@ __ct__13CGameCubeDollFv: /* 8029EBFC 0029BB5C 38 80 FF FF */ li r4, -1 /* 8029EC00 0029BB60 48 0A 22 41 */ bl __dt__6CTokenFv /* 8029EC04 0029BB64 38 00 FF FF */ li r0, -1 -/* 8029EC08 0029BB68 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8029EC08 0029BB68 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8029EC0C 0029BB6C 90 01 00 0C */ stw r0, 0xc(r1) -/* 8029EC10 0029BB70 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 8029EC10 0029BB70 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8029EC14 0029BB74 38 61 00 24 */ addi r3, r1, 0x24 /* 8029EC18 0029BB78 38 A1 00 0C */ addi r5, r1, 0xc /* 8029EC1C 0029BB7C 48 06 78 51 */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor @@ -426,9 +426,9 @@ __ct__13CGameCubeDollFv: /* 8029EC48 0029BBA8 48 07 6C 25 */ bl __nw__FUlPCcPCc /* 8029EC4C 0029BBAC 7C 60 1B 79 */ or. r0, r3, r3 /* 8029EC50 0029BBB0 41 82 00 4C */ beq lbl_8029EC9C -/* 8029EC54 0029BBB4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8029EC54 0029BBB4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8029EC58 0029BBB8 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 8029EC5C 0029BBBC 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8029EC5C 0029BBBC 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8029EC60 0029BBC0 38 A1 00 18 */ addi r5, r1, 0x18 /* 8029EC64 0029BBC4 81 07 00 00 */ lwz r8, 0(r7) /* 8029EC68 0029BBC8 38 80 00 08 */ li r4, 8 diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index c560baad..f2df6fae 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -1925,9 +1925,9 @@ lbl_80038CB0: /* 80038D40 00035CA0 D0 01 02 4C */ stfs f0, 0x24c(r1) /* 80038D44 00035CA4 90 E1 01 68 */ stw r7, 0x168(r1) /* 80038D48 00035CA8 48 29 D3 25 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 80038D4C 00035CAC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80038D4C 00035CAC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80038D50 00035CB0 D3 C1 03 20 */ stfs f30, 0x320(r1) -/* 80038D54 00035CB4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80038D54 00035CB4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80038D58 00035CB8 7F C3 F3 78 */ mr r3, r30 /* 80038D5C 00035CBC 48 2D 9E 19 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80038D60 00035CC0 3C 60 80 5A */ lis r3, lbl_8059FD18@ha diff --git a/asm/MetroidPrime/CGroundMovement.s b/asm/MetroidPrime/CGroundMovement.s index a06e1ee7..0450e732 100644 --- a/asm/MetroidPrime/CGroundMovement.s +++ b/asm/MetroidPrime/CGroundMovement.s @@ -124,8 +124,8 @@ lbl_805A903C: /* 80185A9C 001829FC 38 7C 00 3C */ addi r3, r28, 0x3c /* 80185AA0 00182A00 48 00 00 0C */ b lbl_80185AAC lbl_80185AA4: -/* 80185AA4 00182A04 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80185AA8 00182A08 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80185AA4 00182A04 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80185AA8 00182A08 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_80185AAC: /* 80185AAC 00182A0C C0 03 00 00 */ lfs f0, 0(r3) /* 80185AB0 00182A10 3A 41 02 28 */ addi r18, r1, 0x228 @@ -430,8 +430,8 @@ lbl_80185E88: /* 80185F14 00182E74 38 61 00 58 */ addi r3, r1, 0x58 /* 80185F18 00182E78 48 00 00 0C */ b lbl_80185F24 lbl_80185F1C: -/* 80185F1C 00182E7C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80185F20 00182E80 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80185F1C 00182E7C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80185F20 00182E80 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_80185F24: /* 80185F24 00182E84 C0 03 00 00 */ lfs f0, 0(r3) /* 80185F28 00182E88 56 C0 06 3F */ clrlwi. r0, r22, 0x18 @@ -2926,9 +2926,9 @@ lbl_80188278: /* 801882F0 00185250 4B F2 C2 09 */ bl IsUser__Fi /* 801882F4 00185254 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801882F8 00185258 41 82 00 20 */ beq lbl_80188318 -/* 801882FC 0018525C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801882FC 0018525C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80188300 00185260 7F C3 F3 78 */ mr r3, r30 -/* 80188304 00185264 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80188304 00185264 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80188308 00185268 4B F9 27 31 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 8018830C 0018526C 7F C3 F3 78 */ mr r3, r30 /* 80188310 00185270 38 81 02 0C */ addi r4, r1, 0x20c @@ -3083,13 +3083,13 @@ lbl_80188530: /* 80188534 00185494 D0 01 00 20 */ stfs f0, 0x20(r1) lbl_80188538: /* 80188538 00185498 FF A0 F8 90 */ fmr f29, f31 -/* 8018853C 0018549C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8018853C 0018549C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80188540 001854A0 C3 C2 A3 18 */ lfs f30, lbl_805AC038@sda21(r2) /* 80188544 001854A4 3A 01 01 00 */ addi r16, r1, 0x100 /* 80188548 001854A8 3A 21 02 A4 */ addi r17, r1, 0x2a4 /* 8018854C 001854AC 3B 21 02 80 */ addi r25, r1, 0x280 /* 80188550 001854B0 3B 01 02 78 */ addi r24, r1, 0x278 -/* 80188554 001854B4 3B 63 66 A0 */ addi r27, r3, skZero3f@l +/* 80188554 001854B4 3B 63 66 A0 */ addi r27, r3, sZeroVector__9CVector3f@l /* 80188558 001854B8 38 00 00 01 */ li r0, 1 /* 8018855C 001854BC 48 00 05 40 */ b lbl_80188A9C lbl_80188560: @@ -3412,8 +3412,8 @@ lbl_801889E8: /* 801889EC 0018594C 38 81 01 D8 */ addi r4, r1, 0x1d8 /* 801889F0 00185950 4B F9 2B 25 */ bl AddMotionState__13CPhysicsActorFRC12CMotionState /* 801889F4 00185954 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 801889F8 00185958 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801889FC 0018595C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801889F8 00185958 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801889FC 0018595C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80188A00 00185960 EC 00 F8 28 */ fsubs f0, f0, f31 /* 80188A04 00185964 7F C3 F3 78 */ mr r3, r30 /* 80188A08 00185968 FF E0 E8 90 */ fmr f31, f29 @@ -3477,9 +3477,9 @@ lbl_80188A9C: /* 80188AE8 00185A48 38 C0 00 1A */ li r6, 0x1a /* 80188AEC 00185A4C 4B EB B3 E5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage lbl_80188AF0: -/* 80188AF0 00185A50 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80188AF0 00185A50 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80188AF4 00185A54 7F C3 F3 78 */ mr r3, r30 -/* 80188AF8 00185A58 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80188AF8 00185A58 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80188AFC 00185A5C 4B F9 1F 3D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 80188B00 00185A60 38 60 00 00 */ li r3, 0 /* 80188B04 00185A64 4B F2 B9 F5 */ bl IsUser__Fi @@ -3567,8 +3567,8 @@ lbl_80188B8C: /* 80188C28 00185B88 38 81 00 54 */ addi r4, r1, 0x54 /* 80188C2C 00185B8C 4B F9 1E 0D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 80188C30 00185B90 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 80188C34 00185B94 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 80188C38 00185B98 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l +/* 80188C34 00185B94 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 80188C38 00185B98 38 A3 67 54 */ addi r5, r3, mskInvertedBox__6CAABox@l /* 80188C3C 00185B9C 7F 04 C3 78 */ mr r4, r24 /* 80188C40 00185BA0 B0 1D 00 00 */ sth r0, 0(r29) /* 80188C44 00185BA4 38 61 00 C0 */ addi r3, r1, 0xc0 @@ -3690,9 +3690,9 @@ lbl_80188D60: /* 80188E04 00185D64 D0 61 00 34 */ stfs f3, 0x34(r1) /* 80188E08 00185D68 D0 41 00 38 */ stfs f2, 0x38(r1) /* 80188E0C 00185D6C 4B EC A0 81 */ bl SetTranslation__6CActorFRC9CVector3f -/* 80188E10 00185D70 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80188E10 00185D70 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80188E14 00185D74 7F 03 C3 78 */ mr r3, r24 -/* 80188E18 00185D78 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80188E18 00185D78 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80188E1C 00185D7C 4B F9 1C 1D */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f lbl_80188E20: /* 80188E20 00185D80 3A 80 00 00 */ li r20, 0 @@ -3818,8 +3818,8 @@ lbl_80188F54: /* 80188FC0 00185F20 7C F8 3B 78 */ mr r24, r7 /* 80188FC4 00185F24 7D 19 43 78 */ mr r25, r8 /* 80188FC8 00185F28 40 81 02 A8 */ ble lbl_80189270 -/* 80188FCC 00185F2C 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 80188FD0 00185F30 C4 C3 67 54 */ lfsu f6, lbl_805A6754@l(r3) +/* 80188FCC 00185F2C 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 80188FD0 00185F30 C4 C3 67 54 */ lfsu f6, mskInvertedBox__6CAABox@l(r3) /* 80188FD4 00185F34 C0 02 A3 18 */ lfs f0, lbl_805AC038@sda21(r2) /* 80188FD8 00185F38 3B 7F 00 04 */ addi r27, r31, 4 /* 80188FDC 00185F3C C0 A3 00 04 */ lfs f5, 4(r3) @@ -3964,9 +3964,9 @@ lbl_80189148: /* 801891EC 0018614C D0 61 00 1C */ stfs f3, 0x1c(r1) /* 801891F0 00186150 D0 41 00 20 */ stfs f2, 0x20(r1) /* 801891F4 00186154 4B EC 9C 99 */ bl SetTranslation__6CActorFRC9CVector3f -/* 801891F8 00186158 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801891F8 00186158 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801891FC 0018615C 7F C3 F3 78 */ mr r3, r30 -/* 80189200 00186160 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80189200 00186160 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80189204 00186164 4B F9 18 35 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 80189208 00186168 3B 40 00 00 */ li r26, 0 /* 8018920C 0018616C 3B 80 00 00 */ li r28, 0 @@ -4534,9 +4534,9 @@ lbl_80189A38: lbl_80189A48: /* 80189A48 001869A8 7F A3 EB 78 */ mr r3, r29 /* 80189A4C 001869AC 4B F9 18 69 */ bl ClearForcesAndTorques__13CPhysicsActorFv -/* 80189A50 001869B0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80189A50 001869B0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80189A54 001869B4 7F A3 EB 78 */ mr r3, r29 -/* 80189A58 001869B8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80189A58 001869B8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80189A5C 001869BC 4B F9 0F DD */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 80189A60 001869C0 80 7D 00 68 */ lwz r3, 0x68(r29) /* 80189A64 001869C4 38 00 00 01 */ li r0, 1 @@ -4756,8 +4756,8 @@ lbl_80189CF0: /* 80189D58 00186CB8 D0 21 00 30 */ stfs f1, 0x30(r1) /* 80189D5C 00186CBC D0 01 00 34 */ stfs f0, 0x34(r1) /* 80189D60 00186CC0 4B F9 0F B9 */ bl SetVelocityOR__13CPhysicsActorFRC9CVector3f -/* 80189D64 00186CC4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80189D68 00186CC8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80189D64 00186CC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80189D68 00186CC8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80189D6C 00186CCC D0 1B 01 50 */ stfs f0, 0x150(r27) /* 80189D70 00186CD0 C0 03 00 04 */ lfs f0, 4(r3) /* 80189D74 00186CD4 D0 1B 01 54 */ stfs f0, 0x154(r27) diff --git a/asm/MetroidPrime/CInGameGuiManager.s b/asm/MetroidPrime/CInGameGuiManager.s index 17b4496e..4abb9c1d 100644 --- a/asm/MetroidPrime/CInGameGuiManager.s +++ b/asm/MetroidPrime/CInGameGuiManager.s @@ -2501,8 +2501,8 @@ lbl_80108C2C: /* 80108C2C 00105B8C C3 42 94 94 */ lfs f26, lbl_805AB1B4@sda21(r2) lbl_80108C30: /* 80108C30 00105B90 80 9F 00 34 */ lwz r4, 0x34(r31) -/* 80108C34 00105B94 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80108C38 00105B98 3B 63 66 A0 */ addi r27, r3, skZero3f@l +/* 80108C34 00105B94 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80108C38 00105B98 3B 63 66 A0 */ addi r27, r3, sZeroVector__9CVector3f@l /* 80108C3C 00105B9C C0 62 94 94 */ lfs f3, lbl_805AB1B4@sda21(r2) /* 80108C40 00105BA0 80 64 02 74 */ lwz r3, 0x274(r4) /* 80108C44 00105BA4 38 81 00 A8 */ addi r4, r1, 0xa8 @@ -2524,9 +2524,9 @@ lbl_80108C30: /* 80108C84 00105BE4 80 7F 01 48 */ lwz r3, 0x148(r31) /* 80108C88 00105BE8 38 80 00 01 */ li r4, 1 /* 80108C8C 00105BEC 48 1C 19 A1 */ bl SetIsVisible__10CGuiWidgetFb -/* 80108C90 00105BF0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80108C90 00105BF0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80108C94 00105BF4 C0 62 94 90 */ lfs f3, lbl_805AB1B0@sda21(r2) -/* 80108C98 00105BF8 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80108C98 00105BF8 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 80108C9C 00105BFC 38 81 00 98 */ addi r4, r1, 0x98 /* 80108CA0 00105C00 C0 3B 00 04 */ lfs f1, 4(r27) /* 80108CA4 00105C04 C0 1B 00 08 */ lfs f0, 8(r27) @@ -4054,15 +4054,15 @@ lbl_8010A1E8: /* 8010A220 00107180 90 1E 00 F4 */ stw r0, 0xf4(r30) /* 8010A224 00107184 4B FE 35 69 */ bl __ct__17CCameraFilterPassFv /* 8010A228 00107188 38 00 FF FF */ li r0, -1 -/* 8010A22C 0010718C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8010A22C 0010718C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8010A230 00107190 90 1E 01 24 */ stw r0, 0x124(r30) -/* 8010A234 00107194 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8010A234 00107194 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8010A238 00107198 C0 02 94 94 */ lfs f0, lbl_805AB1B4@sda21(r2) /* 8010A23C 0010719C 38 FE 01 38 */ addi r7, r30, 0x138 /* 8010A240 001071A0 38 00 00 00 */ li r0, 0 /* 8010A244 001071A4 3C C0 80 5A */ lis r6, lbl_805A6660@ha /* 8010A248 001071A8 D0 1E 01 28 */ stfs f0, 0x128(r30) -/* 8010A24C 001071AC 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8010A24C 001071AC 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8010A250 001071B0 38 7E 01 8C */ addi r3, r30, 0x18c /* 8010A254 001071B4 90 FE 01 30 */ stw r7, 0x130(r30) /* 8010A258 001071B8 90 FE 01 34 */ stw r7, 0x134(r30) @@ -4081,7 +4081,7 @@ lbl_8010A1E8: /* 8010A28C 001071EC D0 1E 01 5C */ stfs f0, 0x15c(r30) /* 8010A290 001071F0 C0 06 00 0C */ lfs f0, 0xc(r6) /* 8010A294 001071F4 D0 1E 01 60 */ stfs f0, 0x160(r30) -/* 8010A298 001071F8 C4 05 66 A0 */ lfsu f0, skZero3f@l(r5) +/* 8010A298 001071F8 C4 05 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r5) /* 8010A29C 001071FC D0 1E 01 64 */ stfs f0, 0x164(r30) /* 8010A2A0 00107200 C0 05 00 04 */ lfs f0, 4(r5) /* 8010A2A4 00107204 D0 1E 01 68 */ stfs f0, 0x168(r30) diff --git a/asm/MetroidPrime/CMapArea.s b/asm/MetroidPrime/CMapArea.s index 2b52cf64..a412432a 100644 --- a/asm/MetroidPrime/CMapArea.s +++ b/asm/MetroidPrime/CMapArea.s @@ -171,8 +171,8 @@ lbl_80080284: lbl_800802E4: /* 800802E4 0007D244 28 1E 00 00 */ cmplwi r30, 0 /* 800802E8 0007D248 41 82 00 20 */ beq lbl_80080308 -/* 800802EC 0007D24C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 800802F0 0007D250 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800802EC 0007D24C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 800802F0 0007D250 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800802F4 0007D254 90 1E 00 00 */ stw r0, 0(r30) /* 800802F8 0007D258 41 82 00 10 */ beq lbl_80080308 /* 800802FC 0007D25C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -224,11 +224,11 @@ lbl_80080318: /* 80080394 0007D2F4 28 03 00 00 */ cmplwi r3, 0 /* 80080398 0007D2F8 41 82 00 38 */ beq lbl_800803D0 /* 8008039C 0007D2FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 800803A0 0007D300 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 800803A0 0007D300 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 800803A4 0007D304 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 800803A8 0007D308 3C 80 80 3E */ lis r4, lbl_803DAB80@ha /* 800803AC 0007D30C 90 03 00 00 */ stw r0, 0(r3) -/* 800803B0 0007D310 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800803B0 0007D310 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800803B4 0007D314 38 A0 00 00 */ li r5, 0 /* 800803B8 0007D318 38 04 AB 80 */ addi r0, r4, lbl_803DAB80@l /* 800803BC 0007D31C 90 C3 00 00 */ stw r6, 0(r3) @@ -272,8 +272,8 @@ GetAreaPostTranslate__8CMapAreaFRC6IWorld7TAreaId: /* 80080444 0007D3A4 7C 60 1A 14 */ add r3, r0, r3 /* 80080448 0007D3A8 48 00 00 0C */ b lbl_80080454 lbl_8008044C: -/* 8008044C 0007D3AC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80080450 0007D3B0 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8008044C 0007D3AC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80080450 0007D3B0 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_80080454: /* 80080454 0007D3B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80080458 0007D3B8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/MetroidPrime/CMapUniverse.s b/asm/MetroidPrime/CMapUniverse.s index b2511ddd..626d7cf9 100644 --- a/asm/MetroidPrime/CMapUniverse.s +++ b/asm/MetroidPrime/CMapUniverse.s @@ -113,8 +113,8 @@ lbl_80201DF4: lbl_80201E50: /* 80201E50 001FEDB0 28 1E 00 00 */ cmplwi r30, 0 /* 80201E54 001FEDB4 41 82 00 20 */ beq lbl_80201E74 -/* 80201E58 001FEDB8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80201E5C 001FEDBC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80201E58 001FEDB8 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80201E5C 001FEDBC 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80201E60 001FEDC0 90 1E 00 00 */ stw r0, 0(r30) /* 80201E64 001FEDC4 41 82 00 10 */ beq lbl_80201E74 /* 80201E68 001FEDC8 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -166,11 +166,11 @@ lbl_80201E84: /* 80201F00 001FEE60 28 03 00 00 */ cmplwi r3, 0 /* 80201F04 001FEE64 41 82 00 38 */ beq lbl_80201F3C /* 80201F08 001FEE68 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80201F0C 001FEE6C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80201F0C 001FEE6C 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80201F10 001FEE70 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80201F14 001FEE74 3C 80 80 3E */ lis r4, lbl_803E6BD0@ha /* 80201F18 001FEE78 90 03 00 00 */ stw r0, 0(r3) -/* 80201F1C 001FEE7C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80201F1C 001FEE7C 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80201F20 001FEE80 38 A0 00 00 */ li r5, 0 /* 80201F24 001FEE84 38 04 6B D0 */ addi r0, r4, lbl_803E6BD0@l /* 80201F28 001FEE88 90 C3 00 00 */ stw r6, 0(r3) @@ -289,7 +289,7 @@ lbl_802020A8: /* 802020A8 001FF008 80 A3 00 00 */ lwz r5, 0(r3) /* 802020AC 001FF00C 38 80 00 FF */ li r4, 0xff /* 802020B0 001FF010 38 00 00 00 */ li r0, 0 -/* 802020B4 001FF014 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802020B4 001FF014 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802020B8 001FF018 90 BE 00 54 */ stw r5, 0x54(r30) /* 802020BC 001FF01C 28 1F 00 00 */ cmplwi r31, 0 /* 802020C0 001FF020 98 9E 00 58 */ stb r4, 0x58(r30) @@ -304,7 +304,7 @@ lbl_802020A8: /* 802020E4 001FF044 98 1E 00 61 */ stb r0, 0x61(r30) /* 802020E8 001FF048 98 9E 00 62 */ stb r4, 0x62(r30) /* 802020EC 001FF04C 98 9E 00 63 */ stb r4, 0x63(r30) -/* 802020F0 001FF050 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 802020F0 001FF050 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 802020F4 001FF054 D0 1E 00 64 */ stfs f0, 0x64(r30) /* 802020F8 001FF058 C0 03 00 04 */ lfs f0, 4(r3) /* 802020FC 001FF05C D0 1E 00 68 */ stfs f0, 0x68(r30) @@ -1107,9 +1107,9 @@ __ct__12CMapUniverseFR12CInputStream: /* 80202C4C 001FFBAC 38 80 FF FF */ li r4, -1 /* 80202C50 001FFBB0 48 13 E1 F1 */ bl __dt__6CTokenFv /* 80202C54 001FFBB4 38 00 00 00 */ li r0, 0 -/* 80202C58 001FFBB8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80202C58 001FFBB8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80202C5C 001FFBBC 90 1C 00 14 */ stw r0, 0x14(r28) -/* 80202C60 001FFBC0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80202C60 001FFBC0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80202C64 001FFBC4 C0 02 B0 70 */ lfs f0, lbl_805ACD90@sda21(r2) /* 80202C68 001FFBC8 7F A3 EB 78 */ mr r3, r29 /* 80202C6C 001FFBCC 90 1C 00 18 */ stw r0, 0x18(r28) diff --git a/asm/MetroidPrime/CMapWorld.s b/asm/MetroidPrime/CMapWorld.s index a634bf67..01a64bb4 100644 --- a/asm/MetroidPrime/CMapWorld.s +++ b/asm/MetroidPrime/CMapWorld.s @@ -1096,8 +1096,8 @@ lbl_8009F4BC: lbl_8009F514: /* 8009F514 0009C474 28 1E 00 00 */ cmplwi r30, 0 /* 8009F518 0009C478 41 82 00 20 */ beq lbl_8009F538 -/* 8009F51C 0009C47C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8009F520 0009C480 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8009F51C 0009C47C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8009F520 0009C480 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8009F524 0009C484 90 1E 00 00 */ stw r0, 0(r30) /* 8009F528 0009C488 41 82 00 10 */ beq lbl_8009F538 /* 8009F52C 0009C48C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1149,11 +1149,11 @@ lbl_8009F548: /* 8009F5C4 0009C524 28 03 00 00 */ cmplwi r3, 0 /* 8009F5C8 0009C528 41 82 00 38 */ beq lbl_8009F600 /* 8009F5CC 0009C52C 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8009F5D0 0009C530 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8009F5D0 0009C530 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8009F5D4 0009C534 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8009F5D8 0009C538 3C 80 80 3E */ lis r4, lbl_803DAF48@ha /* 8009F5DC 0009C53C 90 03 00 00 */ stw r0, 0(r3) -/* 8009F5E0 0009C540 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8009F5E0 0009C540 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8009F5E4 0009C544 38 A0 00 00 */ li r5, 0 /* 8009F5E8 0009C548 38 04 AF 48 */ addi r0, r4, lbl_803DAF48@l /* 8009F5EC 0009C54C 90 C3 00 00 */ stw r6, 0(r3) @@ -2298,9 +2298,9 @@ lbl_800A0600: /* 800A063C 0009D59C 38 81 02 C4 */ addi r4, r1, 0x2c4 /* 800A0640 0009D5A0 38 A1 02 E8 */ addi r5, r1, 0x2e8 /* 800A0644 0009D5A4 48 26 FA ED */ bl __ml__9CMatrix3fCFRC9CMatrix3f -/* 800A0648 0009D5A8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800A0648 0009D5A8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800A064C 0009D5AC 38 61 02 70 */ addi r3, r1, 0x270 -/* 800A0650 0009D5B0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 800A0650 0009D5B0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 800A0654 0009D5B4 38 81 02 A0 */ addi r4, r1, 0x2a0 /* 800A0658 0009D5B8 48 27 2C 21 */ bl __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f /* 800A065C 0009D5BC 7C 74 1B 78 */ mr r20, r3 @@ -3444,9 +3444,9 @@ lbl_800A15FC: /* 800A1604 0009E564 90 65 00 00 */ stw r3, 0(r5) lbl_800A1608: /* 800A1608 0009E568 38 00 00 00 */ li r0, 0 -/* 800A160C 0009E56C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800A160C 0009E56C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800A1610 0009E570 90 1B 00 24 */ stw r0, 0x24(r27) -/* 800A1614 0009E574 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800A1614 0009E574 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800A1618 0009E578 C0 02 8C 20 */ lfs f0, lbl_805AA940@sda21(r2) /* 800A161C 0009E57C 7F 83 E3 78 */ mr r3, r28 /* 800A1620 0009E580 90 1B 00 28 */ stw r0, 0x28(r27) diff --git a/asm/MetroidPrime/CMappableObject.s b/asm/MetroidPrime/CMappableObject.s index cfbf3015..282b172f 100644 --- a/asm/MetroidPrime/CMappableObject.s +++ b/asm/MetroidPrime/CMappableObject.s @@ -472,9 +472,9 @@ lbl_800E8B8C: /* 800E8B94 000E5AF4 40 80 00 CC */ bge lbl_800E8C60 /* 800E8B98 000E5AF8 48 00 00 84 */ b lbl_800E8C1C lbl_800E8B9C: -/* 800E8B9C 000E5AFC 3C A0 80 5A */ lis r5, skZero3f@ha +/* 800E8B9C 000E5AFC 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 800E8BA0 000E5B00 38 84 00 10 */ addi r4, r4, 0x10 -/* 800E8BA4 000E5B04 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 800E8BA4 000E5B04 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 800E8BA8 000E5B08 48 22 9F 41 */ bl __ml__12CTransform4fCFRC9CVector3f /* 800E8BAC 000E5B0C 48 00 00 D0 */ b lbl_800E8C7C lbl_800E8BB0: @@ -527,8 +527,8 @@ lbl_800E8C40: /* 800E8C58 000E5BB8 48 22 9E 91 */ bl __ml__12CTransform4fCFRC9CVector3f /* 800E8C5C 000E5BBC 48 00 00 20 */ b lbl_800E8C7C lbl_800E8C60: -/* 800E8C60 000E5BC0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E8C64 000E5BC4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800E8C60 000E5BC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E8C64 000E5BC4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800E8C68 000E5BC8 D0 1F 00 00 */ stfs f0, 0(r31) /* 800E8C6C 000E5BCC C0 03 00 04 */ lfs f0, 4(r3) /* 800E8C70 000E5BD0 D0 1F 00 04 */ stfs f0, 4(r31) @@ -1143,8 +1143,8 @@ ReadAutomapperTweaks__15CMappableObjectFRC16CTweakAutoMapper: .global __sinit_CMappableObject_cpp __sinit_CMappableObject_cpp: -/* 800E94F8 000E6458 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800E94FC 000E645C C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 800E94F8 000E6458 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800E94FC 000E645C C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 800E9500 000E6460 3C 60 80 47 */ lis r3, lbl_8046C498@ha /* 800E9504 000E6464 D4 03 C4 98 */ stfsu f0, lbl_8046C498@l(r3) /* 800E9508 000E6468 C0 24 00 04 */ lfs f1, 4(r4) diff --git a/asm/MetroidPrime/CMessageScreen.s b/asm/MetroidPrime/CMessageScreen.s index 2419b375..6ab45a07 100644 --- a/asm/MetroidPrime/CMessageScreen.s +++ b/asm/MetroidPrime/CMessageScreen.s @@ -34,9 +34,9 @@ Draw__14CMessageScreenCFv: /* 801EF610 001EC570 80 03 00 18 */ lwz r0, 0x18(r3) /* 801EF614 001EC574 28 00 00 00 */ cmplwi r0, 0 /* 801EF618 001EC578 41 82 00 38 */ beq lbl_801EF650 -/* 801EF61C 001EC57C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801EF61C 001EC57C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801EF620 001EC580 C0 63 00 70 */ lfs f3, 0x70(r3) -/* 801EF624 001EC584 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801EF624 001EC584 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801EF628 001EC588 7C 03 03 78 */ mr r3, r0 /* 801EF62C 001EC58C C0 45 00 00 */ lfs f2, 0(r5) /* 801EF630 001EC590 38 81 00 08 */ addi r4, r1, 8 @@ -684,9 +684,9 @@ __ct__14CMessageScreenFUif: /* 801EFFB0 001ECF10 38 80 FF FF */ li r4, -1 /* 801EFFB4 001ECF14 48 15 0E 8D */ bl __dt__6CTokenFv /* 801EFFB8 001ECF18 38 A0 00 00 */ li r5, 0 -/* 801EFFBC 001ECF1C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801EFFBC 001ECF1C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801EFFC0 001ECF20 90 BF 00 18 */ stw r5, 0x18(r31) -/* 801EFFC4 001ECF24 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801EFFC4 001ECF24 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801EFFC8 001ECF28 C0 22 AE 8C */ lfs f1, lbl_805ACBAC@sda21(r2) /* 801EFFCC 001ECF2C 7F C3 F3 78 */ mr r3, r30 /* 801EFFD0 001ECF30 C0 44 00 00 */ lfs f2, 0(r4) diff --git a/asm/MetroidPrime/CModelData.s b/asm/MetroidPrime/CModelData.s index 4103bf39..c73cf120 100644 --- a/asm/MetroidPrime/CModelData.s +++ b/asm/MetroidPrime/CModelData.s @@ -1039,8 +1039,8 @@ lbl_80115900: /* 80115A38 00112998 80 84 00 10 */ lwz r4, 0x10(r4) /* 80115A3C 0011299C 28 04 00 00 */ cmplwi r4, 0 /* 80115A40 001129A0 40 82 00 14 */ bne lbl_80115A54 -/* 80115A44 001129A4 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80115A48 001129A8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80115A44 001129A4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80115A48 001129A8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80115A4C 001129AC 48 1F D1 29 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80115A50 001129B0 48 00 00 08 */ b lbl_80115A58 lbl_80115A54: @@ -1062,8 +1062,8 @@ lbl_80115A58: /* 80115A80 001129E0 80 84 00 10 */ lwz r4, 0x10(r4) /* 80115A84 001129E4 28 04 00 00 */ cmplwi r4, 0 /* 80115A88 001129E8 40 82 00 14 */ bne lbl_80115A9C -/* 80115A8C 001129EC 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80115A90 001129F0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80115A8C 001129EC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80115A90 001129F0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80115A94 001129F4 48 1F D0 E1 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80115A98 001129F8 48 00 00 0C */ b lbl_80115AA4 lbl_80115A9C: @@ -2477,8 +2477,8 @@ lbl_80116E3C: .global __sinit_CModelData_cpp __sinit_CModelData_cpp: -/* 80116E7C 00113DDC 3C A0 80 5A */ lis r5, skZero3f@ha -/* 80116E80 00113DE0 C4 C5 66 A0 */ lfsu f6, skZero3f@l(r5) +/* 80116E7C 00113DDC 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 80116E80 00113DE0 C4 C5 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r5) /* 80116E84 00113DE4 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 80116E88 00113DE8 C4 63 66 60 */ lfsu f3, lbl_805A6660@l(r3) /* 80116E8C 00113DEC 3C 80 80 47 */ lis r4, lbl_8046C538@ha diff --git a/asm/MetroidPrime/CNESEmulator.s b/asm/MetroidPrime/CNESEmulator.s index 7d924506..3aabaca3 100644 --- a/asm/MetroidPrime/CNESEmulator.s +++ b/asm/MetroidPrime/CNESEmulator.s @@ -168,14 +168,14 @@ lbl_80293C38: /* 80293CE8 00290C48 38 E0 00 00 */ li r7, 0 /* 80293CEC 00290C4C 48 07 7D 3D */ bl SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc /* 80293CF0 00290C50 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80293CF4 00290C54 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80293CF8 00290C58 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80293CF4 00290C54 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80293CF8 00290C58 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80293CFC 00290C5C 81 83 00 00 */ lwz r12, 0(r3) /* 80293D00 00290C60 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80293D04 00290C64 7D 89 03 A6 */ mtctr r12 /* 80293D08 00290C68 4E 80 04 21 */ bctrl -/* 80293D0C 00290C6C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80293D10 00290C70 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80293D0C 00290C6C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80293D10 00290C70 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80293D14 00290C74 48 07 8A 39 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 80293D18 00290C78 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 80293D1C 00290C7C 81 83 00 00 */ lwz r12, 0(r3) @@ -333,8 +333,8 @@ sub_80293e2c: /* 80293F6C 00290ECC D0 E1 00 20 */ stfs f7, 0x20(r1) /* 80293F70 00290ED0 EC 80 20 28 */ fsubs f4, f0, f4 /* 80293F74 00290ED4 48 07 85 E1 */ bl SetOrtho__9CGraphicsFffffff -/* 80293F78 00290ED8 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80293F7C 00290EDC 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80293F78 00290ED8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80293F7C 00290EDC 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80293F80 00290EE0 48 07 86 61 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 80293F84 00290EE4 7C BF C8 50 */ subf r5, r31, r25 /* 80293F88 00290EE8 3C 80 43 30 */ lis r4, 0x4330 diff --git a/asm/MetroidPrime/CParticleGenInfo.s b/asm/MetroidPrime/CParticleGenInfo.s index 59654a4c..bad21bbc 100644 --- a/asm/MetroidPrime/CParticleGenInfo.s +++ b/asm/MetroidPrime/CParticleGenInfo.s @@ -217,8 +217,8 @@ lbl_800B7904: /* 800B7984 000B48E4 D0 1B 00 0C */ stfs f0, 0xc(r27) /* 800B7988 000B48E8 48 28 67 D9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" /* 800B798C 000B48EC C0 22 8D 10 */ lfs f1, lbl_805AAA30@sda21(r2) -/* 800B7990 000B48F0 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800B7994 000B48F4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800B7990 000B48F0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800B7994 000B48F4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800B7998 000B48F8 38 00 00 00 */ li r0, 0 /* 800B799C 000B48FC D0 3B 00 20 */ stfs f1, 0x20(r27) /* 800B79A0 000B4900 38 7B 00 44 */ addi r3, r27, 0x44 diff --git a/asm/MetroidPrime/CPauseScreen.s b/asm/MetroidPrime/CPauseScreen.s index 2fa762f2..0de75a9c 100644 --- a/asm/MetroidPrime/CPauseScreen.s +++ b/asm/MetroidPrime/CPauseScreen.s @@ -2298,7 +2298,7 @@ __ct__16CPauseScreenBaseFRC13CStateManagerRC9CGuiFrameRC12CStringTable: /* 80072860 0006F7C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80072864 0006F7C4 39 08 A3 CC */ addi r8, r8, lbl_803DA3CC@l /* 80072868 0006F7C8 38 00 FF FF */ li r0, -1 -/* 8007286C 0006F7CC 3C E0 80 5A */ lis r7, skZero3f@ha +/* 8007286C 0006F7CC 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 80072870 0006F7D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80072874 0006F7D4 7C 7F 1B 78 */ mr r31, r3 /* 80072878 0006F7D8 91 03 00 00 */ stw r8, 0(r3) @@ -2310,7 +2310,7 @@ __ct__16CPauseScreenBaseFRC13CStateManagerRC9CGuiFrameRC12CStringTable: /* 80072890 0006F7F0 D0 23 00 14 */ stfs f1, 0x14(r3) /* 80072894 0006F7F4 91 03 00 18 */ stw r8, 0x18(r3) /* 80072898 0006F7F8 91 03 00 1C */ stw r8, 0x1c(r3) -/* 8007289C 0006F7FC C4 07 66 A0 */ lfsu f0, skZero3f@l(r7) +/* 8007289C 0006F7FC C4 07 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r7) /* 800728A0 0006F800 D0 03 00 20 */ stfs f0, 0x20(r3) /* 800728A4 0006F804 C0 07 00 04 */ lfs f0, 4(r7) /* 800728A8 0006F808 D0 03 00 24 */ stfs f0, 0x24(r3) diff --git a/asm/MetroidPrime/CPauseScreenFrame.s b/asm/MetroidPrime/CPauseScreenFrame.s index 16080d45..41477753 100644 --- a/asm/MetroidPrime/CPauseScreenFrame.s +++ b/asm/MetroidPrime/CPauseScreenFrame.s @@ -232,9 +232,9 @@ Draw__21SOptionsFrontEndFrameFv: /* 80241BF8 0023EB58 88 03 01 34 */ lbz r0, 0x134(r3) /* 80241BFC 0023EB5C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 80241C00 0023EB60 41 82 00 38 */ beq lbl_80241C38 -/* 80241C04 0023EB64 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80241C04 0023EB64 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80241C08 0023EB68 C0 63 00 00 */ lfs f3, 0(r3) -/* 80241C0C 0023EB6C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80241C0C 0023EB6C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80241C10 0023EB70 7C C3 33 78 */ mr r3, r6 /* 80241C14 0023EB74 C0 45 00 00 */ lfs f2, 0(r5) /* 80241C18 0023EB78 38 81 00 08 */ addi r4, r1, 8 diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 7768f4fc..87d9092e 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -264,9 +264,9 @@ GetWeight__13CPhysicsActorCFv: SetBoundingBox__13CPhysicsActorFRC6CAABox: /* 8011A658 001175B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8011A65C 001175BC 7C 08 02 A6 */ mflr r0 -/* 8011A660 001175C0 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8011A660 001175C0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8011A664 001175C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8011A668 001175C8 38 05 66 A0 */ addi r0, r5, skZero3f@l +/* 8011A668 001175C8 38 05 66 A0 */ addi r0, r5, sZeroVector__9CVector3f@l /* 8011A66C 001175CC 80 E4 00 00 */ lwz r7, 0(r4) /* 8011A670 001175D0 80 C4 00 04 */ lwz r6, 4(r4) /* 8011A674 001175D4 90 E3 01 A4 */ stw r7, 0x1a4(r3) @@ -892,8 +892,8 @@ GetRotateToORAngularMomentumWR__13CPhysicsActorCFRC11CQuaternionf: /* 8011AF14 00117E74 7C 9E 23 78 */ mr r30, r4 /* 8011AF18 00117E78 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 8011AF1C 00117E7C 40 81 00 24 */ ble lbl_8011AF40 -/* 8011AF20 00117E80 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011AF24 00117E84 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8011AF20 00117E80 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011AF24 00117E84 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8011AF28 00117E88 D0 1D 00 00 */ stfs f0, 0(r29) /* 8011AF2C 00117E8C C0 03 00 04 */ lfs f0, 4(r3) /* 8011AF30 00117E90 D0 1D 00 04 */ stfs f0, 4(r29) @@ -1077,8 +1077,8 @@ UseCollisionImpulses__13CPhysicsActorFv: /* 8011B1C0 00118120 EC 01 00 2A */ fadds f0, f1, f0 /* 8011B1C4 00118124 D0 1F 01 04 */ stfs f0, 0x104(r31) /* 8011B1C8 00118128 4B F0 02 E9 */ bl __apl__10CAxisAngleFRC10CAxisAngle -/* 8011B1CC 0011812C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011B1D0 00118130 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8011B1CC 0011812C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011B1D0 00118130 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8011B1D4 00118134 D0 1F 01 68 */ stfs f0, 0x168(r31) /* 8011B1D8 00118138 C0 03 00 04 */ lfs f0, 4(r3) /* 8011B1DC 0011813C D0 1F 01 6C */ stfs f0, 0x16c(r31) @@ -1103,11 +1103,11 @@ UseCollisionImpulses__13CPhysicsActorFv: ClearImpulses__13CPhysicsActorFv: /* 8011B220 00118180 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8011B224 00118184 7C 08 02 A6 */ mflr r0 -/* 8011B228 00118188 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B228 00118188 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B22C 0011818C 90 01 00 14 */ stw r0, 0x14(r1) /* 8011B230 00118190 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B234 00118194 7C 7F 1B 78 */ mr r31, r3 -/* 8011B238 00118198 38 64 66 A0 */ addi r3, r4, skZero3f@l +/* 8011B238 00118198 38 64 66 A0 */ addi r3, r4, sZeroVector__9CVector3f@l /* 8011B23C 0011819C C0 03 00 00 */ lfs f0, 0(r3) /* 8011B240 001181A0 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 8011B244 001181A4 C0 03 00 04 */ lfs f0, 4(r3) @@ -1143,11 +1143,11 @@ ClearImpulses__13CPhysicsActorFv: ClearForcesAndTorques__13CPhysicsActorFv: /* 8011B2B4 00118214 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8011B2B8 00118218 7C 08 02 A6 */ mflr r0 -/* 8011B2BC 0011821C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B2BC 0011821C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B2C0 00118220 90 01 00 14 */ stw r0, 0x14(r1) /* 8011B2C4 00118224 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B2C8 00118228 7C 7F 1B 78 */ mr r31, r3 -/* 8011B2CC 0011822C 38 64 66 A0 */ addi r3, r4, skZero3f@l +/* 8011B2CC 0011822C 38 64 66 A0 */ addi r3, r4, sZeroVector__9CVector3f@l /* 8011B2D0 00118230 C0 03 00 00 */ lfs f0, 0(r3) /* 8011B2D4 00118234 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 8011B2D8 00118238 C0 03 00 04 */ lfs f0, 4(r3) @@ -1199,8 +1199,8 @@ Stop__13CPhysicsActorFv: /* 8011B384 001182E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B388 001182E8 7C 7F 1B 78 */ mr r31, r3 /* 8011B38C 001182EC 4B FF FF 29 */ bl ClearForcesAndTorques__13CPhysicsActorFv -/* 8011B390 001182F0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011B394 001182F4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8011B390 001182F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011B394 001182F4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8011B398 001182F8 D0 1F 00 FC */ stfs f0, 0xfc(r31) /* 8011B39C 001182FC C0 03 00 04 */ lfs f0, 4(r3) /* 8011B3A0 00118300 D0 1F 01 00 */ stfs f0, 0x100(r31) @@ -1225,68 +1225,68 @@ Stop__13CPhysicsActorFv: WillMove__13CPhysicsActorFRC13CStateManager: /* 8011B3E4 00118344 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8011B3E8 00118348 7C 08 02 A6 */ mflr r0 -/* 8011B3EC 0011834C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B3EC 0011834C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B3F0 00118350 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) /* 8011B3F4 00118354 90 01 00 24 */ stw r0, 0x24(r1) -/* 8011B3F8 00118358 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B3F8 00118358 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B3FC 0011835C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8011B400 00118360 7C 7F 1B 78 */ mr r31, r3 /* 8011B404 00118364 38 7F 01 38 */ addi r3, r31, 0x138 /* 8011B408 00118368 48 1F 4B 5D */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B40C 0011836C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B410 00118370 41 82 00 EC */ beq lbl_8011B4FC -/* 8011B414 00118374 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8011B414 00118374 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8011B418 00118378 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B41C 0011837C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8011B41C 0011837C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8011B420 00118380 38 7F 01 68 */ addi r3, r31, 0x168 /* 8011B424 00118384 48 1F 4B 41 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B428 00118388 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B42C 0011838C 41 82 00 D0 */ beq lbl_8011B4FC /* 8011B430 00118390 38 7F 01 74 */ addi r3, r31, 0x174 /* 8011B434 00118394 4B F0 00 FD */ bl GetVector__10CAxisAngleCFv -/* 8011B438 00118398 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B438 00118398 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B43C 0011839C C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B440 001183A0 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B440 001183A0 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B444 001183A4 48 1F 4B 21 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B448 001183A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B44C 001183AC 41 82 00 B0 */ beq lbl_8011B4FC -/* 8011B450 001183B0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8011B450 001183B0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8011B454 001183B4 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B458 001183B8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8011B458 001183B8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8011B45C 001183BC 38 7F 01 8C */ addi r3, r31, 0x18c /* 8011B460 001183C0 48 1F 4B 05 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B464 001183C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B468 001183C8 41 82 00 94 */ beq lbl_8011B4FC /* 8011B46C 001183CC 38 7F 01 44 */ addi r3, r31, 0x144 /* 8011B470 001183D0 4B F0 00 C1 */ bl GetVector__10CAxisAngleCFv -/* 8011B474 001183D4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B474 001183D4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B478 001183D8 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B47C 001183DC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B47C 001183DC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B480 001183E0 48 1F 4A E5 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B484 001183E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B488 001183E8 41 82 00 74 */ beq lbl_8011B4FC /* 8011B48C 001183EC 38 7F 01 80 */ addi r3, r31, 0x180 /* 8011B490 001183F0 4B F0 00 A1 */ bl GetVector__10CAxisAngleCFv -/* 8011B494 001183F4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B494 001183F4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B498 001183F8 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B49C 001183FC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B49C 001183FC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B4A0 00118400 48 1F 4A C5 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B4A4 00118404 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B4A8 00118408 41 82 00 54 */ beq lbl_8011B4FC /* 8011B4AC 0011840C 38 7F 01 98 */ addi r3, r31, 0x198 /* 8011B4B0 00118410 4B F0 00 81 */ bl GetVector__10CAxisAngleCFv -/* 8011B4B4 00118414 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B4B4 00118414 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B4B8 00118418 C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B4BC 0011841C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B4BC 0011841C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B4C0 00118420 48 1F 4A A5 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B4C4 00118424 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B4C8 00118428 41 82 00 34 */ beq lbl_8011B4FC /* 8011B4CC 0011842C 7F E4 FB 78 */ mr r4, r31 /* 8011B4D0 00118430 38 61 00 08 */ addi r3, r1, 8 /* 8011B4D4 00118434 4B FF F8 11 */ bl GetTotalForceWR__13CPhysicsActorCFv -/* 8011B4D8 00118438 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8011B4D8 00118438 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8011B4DC 0011843C C0 22 96 C4 */ lfs f1, lbl_805AB3E4@sda21(r2) -/* 8011B4E0 00118440 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8011B4E0 00118440 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8011B4E4 00118444 38 61 00 08 */ addi r3, r1, 8 /* 8011B4E8 00118448 48 1F 4A 7D */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 8011B4EC 0011844C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -1620,7 +1620,7 @@ PredictLinearMotion__13CPhysicsActorCFf: /* 8011B9C0 00118920 C3 41 00 20 */ lfs f26, 0x20(r1) /* 8011B9C4 00118924 4B EF FB 71 */ bl Identity__10CAxisAngleFv /* 8011B9C8 00118928 EC BF 07 32 */ fmuls f5, f31, f28 -/* 8011B9CC 0011892C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011B9CC 0011892C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011B9D0 00118930 EC 7F 07 72 */ fmuls f3, f31, f29 /* 8011B9D4 00118934 C0 3F 01 6C */ lfs f1, 0x16c(r31) /* 8011B9D8 00118938 EC 5F 07 B2 */ fmuls f2, f31, f30 @@ -1631,7 +1631,7 @@ PredictLinearMotion__13CPhysicsActorCFf: /* 8011B9EC 0011894C EF C5 20 2A */ fadds f30, f5, f4 /* 8011B9F0 00118950 EF 82 00 2A */ fadds f28, f2, f0 /* 8011B9F4 00118954 C0 22 96 A4 */ lfs f1, lbl_805AB3C4@sda21(r2) -/* 8011B9F8 00118958 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011B9F8 00118958 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011B9FC 0011895C 38 61 00 08 */ addi r3, r1, 8 /* 8011BA00 00118960 48 1F 56 01 */ bl __ct__13CNUQuaternionFfRC9CVector3f /* 8011BA04 00118964 EC 5F 06 72 */ fmuls f2, f31, f25 @@ -1768,8 +1768,8 @@ PredictAngularMotion__13CPhysicsActorCFf: /* 8011BC04 00118B64 38 61 00 24 */ addi r3, r1, 0x24 /* 8011BC08 00118B68 38 81 00 90 */ addi r4, r1, 0x90 /* 8011BC0C 00118B6C 48 1F 4E 89 */ bl __ml__FRC13CNUQuaternionf -/* 8011BC10 00118B70 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011BC14 00118B74 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8011BC10 00118B70 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011BC14 00118B74 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8011BC18 00118B78 D0 1D 00 00 */ stfs f0, 0(r29) /* 8011BC1C 00118B7C C0 03 00 04 */ lfs f0, 4(r3) /* 8011BC20 00118B80 D0 1D 00 04 */ stfs f0, 4(r29) @@ -2521,9 +2521,9 @@ lbl_8011C548: /* 8011C724 00119684 38 81 00 28 */ addi r4, r1, 0x28 /* 8011C728 00119688 48 1F 43 C9 */ bl BuildFromMatrix3f__13CNUQuaternionFRC9CMatrix3f /* 8011C72C 0011968C C0 9E 00 2C */ lfs f4, 0x2c(r30) -/* 8011C730 00119690 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8011C730 00119690 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8011C734 00119694 C0 7E 00 1C */ lfs f3, 0x1c(r30) -/* 8011C738 00119698 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8011C738 00119698 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8011C73C 0011969C C0 1E 00 0C */ lfs f0, 0xc(r30) /* 8011C740 001196A0 38 00 00 00 */ li r0, 0 /* 8011C744 001196A4 C0 42 96 C8 */ lfs f2, lbl_805AB3E8@sda21(r2) @@ -2563,9 +2563,9 @@ lbl_8011C548: /* 8011C7CC 0011972C 90 1D 02 50 */ stw r0, 0x250(r29) /* 8011C7D0 00119730 C0 3F 00 30 */ lfs f1, 0x30(r31) /* 8011C7D4 00119734 4B FF E2 B5 */ bl SetMass__13CPhysicsActorFf -/* 8011C7D8 00119738 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011C7D8 00119738 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011C7DC 0011973C 7F A3 EB 78 */ mr r3, r29 -/* 8011C7E0 00119740 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8011C7E0 00119740 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8011C7E4 00119744 4B FF E2 55 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 8011C7E8 00119748 7F A3 EB 78 */ mr r3, r29 /* 8011C7EC 0011974C 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/MetroidPrime/CProjectedShadow.s b/asm/MetroidPrime/CProjectedShadow.s index 0d2e7435..99494ee4 100644 --- a/asm/MetroidPrime/CProjectedShadow.s +++ b/asm/MetroidPrime/CProjectedShadow.s @@ -78,8 +78,8 @@ lbl_8029D724: /* 8029D790 0029A6F0 C0 1E 00 98 */ lfs f0, 0x98(r30) /* 8029D794 0029A6F4 EF E1 00 32 */ fmuls f31, f1, f0 /* 8029D798 0029A6F8 F3 E1 A0 09 */ psq_st f31, 9(r1), 1, qr2 -/* 8029D79C 0029A6FC 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 8029D7A0 0029A700 38 83 67 00 */ addi r4, r3, lbl_805A6700@l +/* 8029D79C 0029A6FC 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 8029D7A0 0029A700 38 83 67 00 */ addi r4, r3, sDownVector__9CVector3f@l /* 8029D7A4 0029A704 38 A1 00 1C */ addi r5, r1, 0x1c /* 8029D7A8 0029A708 88 01 00 09 */ lbz r0, 9(r1) /* 8029D7AC 0029A70C 38 61 02 48 */ addi r3, r1, 0x248 @@ -343,8 +343,8 @@ lbl_8029DB80: /* 8029DB98 0029AAF8 38 80 00 1E */ li r4, 0x1e /* 8029DB9C 0029AAFC 38 A0 00 00 */ li r5, 0 /* 8029DBA0 0029AB00 48 0D E8 F1 */ bl GXLoadTexMtxImm -/* 8029DBA4 0029AB04 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8029DBA8 0029AB08 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 8029DBA4 0029AB04 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8029DBA8 0029AB08 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 8029DBAC 0029AB0C 48 06 EA 35 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 8029DBB0 0029AB10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) /* 8029DBB4 0029AB14 38 81 00 68 */ addi r4, r1, 0x68 @@ -530,17 +530,17 @@ RenderShadowBuffer__16CProjectedShadowFR13CStateManagerRC10CModelDataRC12CTransf /* 8029DE54 0029ADB4 88 03 00 00 */ lbz r0, 0(r3) /* 8029DE58 0029ADB8 3C 80 80 3F */ lis r4, lbl_803ED910@ha /* 8029DE5C 0029ADBC 3B 84 D9 10 */ addi r28, r4, lbl_803ED910@l -/* 8029DE60 0029ADC0 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 8029DE60 0029ADC0 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 8029DE64 0029ADC4 98 01 00 58 */ stb r0, 0x58(r1) -/* 8029DE68 0029ADC8 3C 80 80 5A */ lis r4, lbl_805A6718@ha +/* 8029DE68 0029ADC8 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha /* 8029DE6C 0029ADCC 81 9C 00 00 */ lwz r12, 0(r28) -/* 8029DE70 0029ADD0 3C C0 80 5A */ lis r6, lbl_805A6724@ha +/* 8029DE70 0029ADD0 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha /* 8029DE74 0029ADD4 C0 03 00 04 */ lfs f0, 4(r3) -/* 8029DE78 0029ADD8 38 84 67 18 */ addi r4, r4, lbl_805A6718@l +/* 8029DE78 0029ADD8 38 84 67 18 */ addi r4, r4, sRightVector__9CVector3f@l /* 8029DE7C 0029ADDC 81 7C 00 04 */ lwz r11, 4(r28) -/* 8029DE80 0029ADE0 38 A5 67 00 */ addi r5, r5, lbl_805A6700@l +/* 8029DE80 0029ADE0 38 A5 67 00 */ addi r5, r5, sDownVector__9CVector3f@l /* 8029DE84 0029ADE4 D0 01 00 5C */ stfs f0, 0x5c(r1) -/* 8029DE88 0029ADE8 38 C6 67 24 */ addi r6, r6, lbl_805A6724@l +/* 8029DE88 0029ADE8 38 C6 67 24 */ addi r6, r6, sForwardVector__9CVector3f@l /* 8029DE8C 0029ADEC 81 5C 00 08 */ lwz r10, 8(r28) /* 8029DE90 0029ADF0 38 E1 00 1C */ addi r7, r1, 0x1c /* 8029DE94 0029ADF4 C0 03 00 08 */ lfs f0, 8(r3) @@ -908,12 +908,12 @@ __ct__16CProjectedShadowFv: /* 8029E404 0029B364 93 C1 00 08 */ stw r30, 8(r1) /* 8029E408 0029B368 7C 7E 1B 78 */ mr r30, r3 /* 8029E40C 0029B36C 48 07 1A 21 */ bl __ct__8CTextureF12ETexelFormatssi -/* 8029E410 0029B370 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 8029E410 0029B370 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 8029E414 0029B374 38 00 00 00 */ li r0, 0 -/* 8029E418 0029B378 38 A4 67 54 */ addi r5, r4, lbl_805A6754@l -/* 8029E41C 0029B37C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8029E418 0029B378 38 A4 67 54 */ addi r5, r4, mskInvertedBox__6CAABox@l +/* 8029E41C 0029B37C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8029E420 0029B380 C0 05 00 00 */ lfs f0, 0(r5) -/* 8029E424 0029B384 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8029E424 0029B384 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8029E428 0029B388 C0 42 C0 98 */ lfs f2, lbl_805ADDB8@sda21(r2) /* 8029E42C 0029B38C 7F C3 F3 78 */ mr r3, r30 /* 8029E430 0029B390 D0 1E 00 68 */ stfs f0, 0x68(r30) diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s index d69cdaf0..957ecb8e 100644 --- a/asm/MetroidPrime/CRagDoll.s +++ b/asm/MetroidPrime/CRagDoll.s @@ -474,10 +474,10 @@ lbl_8020CDE8: AddParticle__8CRagDollFRC6CSegIdRC9CVector3fRC9CVector3ff: /* 8020CE1C 00209D7C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8020CE20 00209D80 7C 08 02 A6 */ mflr r0 -/* 8020CE24 00209D84 3D 00 80 5A */ lis r8, skZero3f@ha +/* 8020CE24 00209D84 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 8020CE28 00209D88 C0 02 B1 C4 */ lfs f0, lbl_805ACEE4@sda21(r2) /* 8020CE2C 00209D8C 90 01 00 54 */ stw r0, 0x54(r1) -/* 8020CE30 00209D90 39 28 66 A0 */ addi r9, r8, skZero3f@l +/* 8020CE30 00209D90 39 28 66 A0 */ addi r9, r8, sZeroVector__9CVector3f@l /* 8020CE34 00209D94 39 00 00 00 */ li r8, 0 /* 8020CE38 00209D98 38 63 00 04 */ addi r3, r3, 4 /* 8020CE3C 00209D9C 88 E1 00 44 */ lbz r7, 0x44(r1) @@ -918,13 +918,13 @@ CheckStatic__8CRagDollFf: /* 8020D498 0020A3F8 93 A3 00 4C */ stw r29, 0x4c(r3) /* 8020D49C 0020A3FC 7C 7E 1B 78 */ mr r30, r3 /* 8020D4A0 0020A400 C0 02 B1 C4 */ lfs f0, lbl_805ACEE4@sda21(r2) -/* 8020D4A4 0020A404 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8020D4A4 0020A404 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8020D4A8 0020A408 C0 22 B1 D0 */ lfs f1, lbl_805ACEF0@sda21(r2) /* 8020D4AC 0020A40C D0 1E 00 54 */ stfs f0, 0x54(r30) /* 8020D4B0 0020A410 3B E0 00 01 */ li r31, 1 /* 8020D4B4 0020A414 EC 21 07 B2 */ fmuls f1, f1, f30 /* 8020D4B8 0020A418 3B 80 00 00 */ li r28, 0 -/* 8020D4BC 0020A41C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8020D4BC 0020A41C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8020D4C0 0020A420 D0 1E 00 58 */ stfs f0, 0x58(r30) /* 8020D4C4 0020A424 EF E1 00 72 */ fmuls f31, f1, f1 /* 8020D4C8 0020A428 C0 03 00 04 */ lfs f0, 4(r3) @@ -1050,9 +1050,9 @@ lbl_8020D650: .global ClearForces__8CRagDollFv ClearForces__8CRagDollFv: -/* 8020D68C 0020A5EC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8020D68C 0020A5EC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8020D690 0020A5F0 38 E0 00 00 */ li r7, 0 -/* 8020D694 0020A5F4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8020D694 0020A5F4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8020D698 0020A5F8 38 C0 00 00 */ li r6, 0 /* 8020D69C 0020A5FC 48 00 00 30 */ b lbl_8020D6CC lbl_8020D6A0: @@ -1167,9 +1167,9 @@ SatisfyWorldConstraints__8CRagDollFR13CStateManageri: /* 8020D80C 0020A76C DB 61 24 C0 */ stfd f27, 0x24c0(r1) /* 8020D810 0020A770 13 61 00 0E */ psq_stx f27, r1, r0, 0, qr0 /* 8020D814 0020A774 BF 01 24 A0 */ stmw r24, 0x24a0(r1) -/* 8020D818 0020A778 3C C0 80 5A */ lis r6, lbl_805A6754@ha +/* 8020D818 0020A778 3C C0 80 5A */ lis r6, mskInvertedBox__6CAABox@ha /* 8020D81C 0020A77C 7C 7D 1B 78 */ mr r29, r3 -/* 8020D820 0020A780 38 66 67 54 */ addi r3, r6, lbl_805A6754@l +/* 8020D820 0020A780 38 66 67 54 */ addi r3, r6, mskInvertedBox__6CAABox@l /* 8020D824 0020A784 7C 9E 23 78 */ mr r30, r4 /* 8020D828 0020A788 C0 A3 00 00 */ lfs f5, 0(r3) /* 8020D82C 0020A78C 7C BF 2B 78 */ mr r31, r5 @@ -1474,10 +1474,10 @@ lbl_8020DBF8: /* 8020DCB0 0020AC10 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 8020DCB4 0020AC14 83 21 00 88 */ lwz r25, 0x88(r1) /* 8020DCB8 0020AC18 81 81 00 8C */ lwz r12, 0x8c(r1) -/* 8020DCBC 0020AC1C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8020DCBC 0020AC1C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8020DCC0 0020AC20 90 01 00 90 */ stw r0, 0x90(r1) /* 8020DCC4 0020AC24 39 61 00 F8 */ addi r11, r1, 0xf8 -/* 8020DCC8 0020AC28 38 C3 66 70 */ addi r6, r3, skIdentity4f@l +/* 8020DCC8 0020AC28 38 C3 66 70 */ addi r6, r3, sIdentity__12CTransform4f@l /* 8020DCCC 0020AC2C 38 01 00 38 */ addi r0, r1, 0x38 /* 8020DCD0 0020AC30 D3 C1 00 A0 */ stfs f30, 0xa0(r1) /* 8020DCD4 0020AC34 7F C3 F3 78 */ mr r3, r30 @@ -1750,8 +1750,8 @@ lbl_8020E0A4: /* 8020E0AC 0020B00C EC 21 00 32 */ fmuls f1, f1, f0 /* 8020E0B0 0020B010 48 10 6D 41 */ bl FastSinR__5CMathFf /* 8020E0B4 0020B014 C0 02 B1 F4 */ lfs f0, lbl_805ACF14@sda21(r2) -/* 8020E0B8 0020B018 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8020E0BC 0020B01C 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8020E0B8 0020B018 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8020E0BC 0020B01C 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8020E0C0 0020B020 C0 42 B1 F8 */ lfs f2, lbl_805ACF18@sda21(r2) /* 8020E0C4 0020B024 EC 17 00 28 */ fsubs f0, f23, f0 /* 8020E0C8 0020B028 C3 BE 00 00 */ lfs f29, 0(r30) @@ -1863,11 +1863,11 @@ lbl_8020E258: /* 8020E25C 0020B1BC 7C 1B 00 00 */ cmpw r27, r0 /* 8020E260 0020B1C0 41 80 FE 90 */ blt lbl_8020E0F0 /* 8020E264 0020B1C4 C0 02 B1 C0 */ lfs f0, lbl_805ACEE0@sda21(r2) -/* 8020E268 0020B1C8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8020E268 0020B1C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8020E26C 0020B1CC C0 5E 00 04 */ lfs f2, 4(r30) /* 8020E270 0020B1D0 38 A0 00 00 */ li r5, 0 /* 8020E274 0020B1D4 EC 00 C0 24 */ fdivs f0, f0, f24 -/* 8020E278 0020B1D8 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8020E278 0020B1D8 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8020E27C 0020B1DC C0 3E 00 08 */ lfs f1, 8(r30) /* 8020E280 0020B1E0 38 80 00 00 */ li r4, 0 /* 8020E284 0020B1E4 D0 61 00 08 */ stfs f3, 8(r1) @@ -2009,10 +2009,10 @@ Verlet__8CRagDollFf: /* 8020E484 0020B3E4 F3 C1 00 58 */ psq_st f30, 88(r1), 0, qr0 /* 8020E488 0020B3E8 BF 61 00 3C */ stmw r27, 0x3c(r1) /* 8020E48C 0020B3EC FF C0 08 90 */ fmr f30, f1 -/* 8020E490 0020B3F0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8020E490 0020B3F0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8020E494 0020B3F4 C3 E2 B1 F0 */ lfs f31, lbl_805ACF10@sda21(r2) /* 8020E498 0020B3F8 7C 7D 1B 78 */ mr r29, r3 -/* 8020E49C 0020B3FC 3B 84 66 A0 */ addi r28, r4, skZero3f@l +/* 8020E49C 0020B3FC 3B 84 66 A0 */ addi r28, r4, sZeroVector__9CVector3f@l /* 8020E4A0 0020B400 3B C0 00 00 */ li r30, 0 /* 8020E4A4 0020B404 3B E0 00 00 */ li r31, 0 /* 8020E4A8 0020B408 48 00 01 FC */ b lbl_8020E6A4 @@ -2305,11 +2305,11 @@ lbl_8020E8B0: .global __ct__8CRagDollFfffUi __ct__8CRagDollFfffUi: /* 8020E8D0 0020B830 3C C0 80 3E */ lis r6, lbl_803E70D0@ha -/* 8020E8D4 0020B834 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8020E8D4 0020B834 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8020E8D8 0020B838 38 06 70 D0 */ addi r0, r6, lbl_803E70D0@l /* 8020E8DC 0020B83C 39 00 00 00 */ li r8, 0 /* 8020E8E0 0020B840 90 03 00 00 */ stw r0, 0(r3) -/* 8020E8E4 0020B844 38 E5 66 A0 */ addi r7, r5, skZero3f@l +/* 8020E8E4 0020B844 38 E5 66 A0 */ addi r7, r5, sZeroVector__9CVector3f@l /* 8020E8E8 0020B848 C0 82 B1 C4 */ lfs f4, lbl_805ACEE4@sda21(r2) /* 8020E8EC 0020B84C 91 03 00 08 */ stw r8, 8(r3) /* 8020E8F0 0020B850 91 03 00 0C */ stw r8, 0xc(r3) diff --git a/asm/MetroidPrime/CRainSplashGenerator.s b/asm/MetroidPrime/CRainSplashGenerator.s index 5871f0c6..7ed216d9 100644 --- a/asm/MetroidPrime/CRainSplashGenerator.s +++ b/asm/MetroidPrime/CRainSplashGenerator.s @@ -202,8 +202,8 @@ lbl_80269F10: /* 80269F30 00266E90 98 A7 00 15 */ stb r5, 0x15(r7) /* 80269F34 00266E94 99 07 00 16 */ stb r8, 0x16(r7) lbl_80269F38: -/* 80269F38 00266E98 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80269F3C 00266E9C C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 80269F38 00266E98 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80269F3C 00266E9C C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 80269F40 00266EA0 C0 02 BB 54 */ lfs f0, lbl_805AD874@sda21(r2) /* 80269F44 00266EA4 D0 23 00 64 */ stfs f1, 0x64(r3) /* 80269F48 00266EA8 C0 24 00 04 */ lfs f1, 4(r4) @@ -1005,7 +1005,7 @@ GetNextBestPt__20CRainSplashGeneratorFiPC9CVector3fPC9CVector3fiR9CRandom16f: /* 8026AA54 002679B4 C3 E2 BB 54 */ lfs f31, lbl_805AD874@sda21(r2) /* 8026AA58 002679B8 7C 9C 23 78 */ mr r28, r4 /* 8026AA5C 002679BC 1C 03 00 0C */ mulli r0, r3, 0xc -/* 8026AA60 002679C0 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8026AA60 002679C0 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8026AA64 002679C4 FF C0 08 90 */ fmr f30, f1 /* 8026AA68 002679C8 7C BD 2B 78 */ mr r29, r5 /* 8026AA6C 002679CC FF 80 F8 90 */ fmr f28, f31 @@ -1014,7 +1014,7 @@ GetNextBestPt__20CRainSplashGeneratorFiPC9CVector3fPC9CVector3fiR9CRandom16f: /* 8026AA78 002679D8 7C FF 3B 78 */ mr r31, r7 /* 8026AA7C 002679DC 7C 7A 1B 78 */ mr r26, r3 /* 8026AA80 002679E0 7F 3C 02 14 */ add r25, r28, r0 -/* 8026AA84 002679E4 3B 64 66 F4 */ addi r27, r4, lbl_805A66F4@l +/* 8026AA84 002679E4 3B 64 66 F4 */ addi r27, r4, sUpVector__9CVector3f@l /* 8026AA88 002679E8 3B 00 00 00 */ li r24, 0 lbl_8026AA8C: /* 8026AA8C 002679EC 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/CRippleManager.s b/asm/MetroidPrime/CRippleManager.s index c023e141..04bb5acd 100644 --- a/asm/MetroidPrime/CRippleManager.s +++ b/asm/MetroidPrime/CRippleManager.s @@ -155,10 +155,10 @@ sub_8011d110: Init__14CRippleManagerFi: /* 8011D114 0011A074 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8011D118 0011A078 7C 08 02 A6 */ mflr r0 -/* 8011D11C 0011A07C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8011D11C 0011A07C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8011D120 0011A080 C0 22 97 40 */ lfs f1, lbl_805AB460@sda21(r2) /* 8011D124 0011A084 90 01 00 64 */ stw r0, 0x64(r1) -/* 8011D128 0011A088 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 8011D128 0011A088 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 8011D12C 0011A08C 93 E1 00 5C */ stw r31, 0x5c(r1) /* 8011D130 0011A090 7C 9F 23 78 */ mr r31, r4 /* 8011D134 0011A094 38 81 00 08 */ addi r4, r1, 8 diff --git a/asm/MetroidPrime/CSamusDoll.s b/asm/MetroidPrime/CSamusDoll.s index 5bf8fdd5..37701bfb 100644 --- a/asm/MetroidPrime/CSamusDoll.s +++ b/asm/MetroidPrime/CSamusDoll.s @@ -643,7 +643,7 @@ lbl_800DAE4C: /* 800DAE90 000D7DF0 3B C0 00 01 */ li r30, 1 lbl_800DAE94: /* 800DAE94 000D7DF4 C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 800DAE98 000D7DF8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800DAE98 000D7DF8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800DAE9C 000D7DFC C0 9D 00 04 */ lfs f4, 4(r29) /* 800DAEA0 000D7E00 38 00 00 00 */ li r0, 0 /* 800DAEA4 000D7E04 EC 60 C8 28 */ fsubs f3, f0, f25 @@ -655,7 +655,7 @@ lbl_800DAE94: /* 800DAEBC 000D7E1C C3 7F 00 A8 */ lfs f27, 0xa8(r31) /* 800DAEC0 000D7E20 C3 5F 00 AC */ lfs f26, 0xac(r31) /* 800DAEC4 000D7E24 EC 59 00 B2 */ fmuls f2, f25, f2 -/* 800DAEC8 000D7E28 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 800DAEC8 000D7E28 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 800DAECC 000D7E2C EC 39 00 72 */ fmuls f1, f25, f1 /* 800DAED0 000D7E30 EC 19 00 32 */ fmuls f0, f25, f0 /* 800DAED4 000D7E34 EF BC 10 2A */ fadds f29, f28, f2 @@ -679,11 +679,11 @@ lbl_800DAE94: lbl_800DAF1C: /* 800DAF1C 000D7E7C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800DAF20 000D7E80 40 82 00 F8 */ bne lbl_800DB018 -/* 800DAF24 000D7E84 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800DAF24 000D7E84 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800DAF28 000D7E88 3C 60 80 47 */ lis r3, lbl_8046C47C@ha /* 800DAF2C 000D7E8C 38 A3 C4 7C */ addi r5, r3, lbl_8046C47C@l /* 800DAF30 000D7E90 C0 02 8E 94 */ lfs f0, lbl_805AABB4@sda21(r2) -/* 800DAF34 000D7E94 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800DAF34 000D7E94 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800DAF38 000D7E98 C0 65 00 00 */ lfs f3, 0(r5) /* 800DAF3C 000D7E9C C0 A4 00 04 */ lfs f5, 4(r4) /* 800DAF40 000D7EA0 38 61 00 34 */ addi r3, r1, 0x34 @@ -1368,11 +1368,11 @@ lbl_800DB8E8: /* 800DB90C 000D886C 48 2A 07 D5 */ bl GXSetDstAlpha lbl_800DB910: /* 800DB910 000D8870 C3 22 8E E4 */ lfs f25, lbl_805AAC04@sda21(r2) -/* 800DB914 000D8874 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800DB914 000D8874 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800DB918 000D8878 3B 1F 01 1C */ addi r24, r31, 0x11c /* 800DB91C 000D887C 3A A1 01 F4 */ addi r21, r1, 0x1f4 /* 800DB920 000D8880 EF 79 07 F2 */ fmuls f27, f25, f31 -/* 800DB924 000D8884 3A 83 66 70 */ addi r20, r3, skIdentity4f@l +/* 800DB924 000D8884 3A 83 66 70 */ addi r20, r3, sIdentity__12CTransform4f@l /* 800DB928 000D8888 3A C0 00 00 */ li r22, 0 /* 800DB92C 000D888C FF 80 D8 90 */ fmr f28, f27 /* 800DB930 000D8890 48 00 00 BC */ b lbl_800DB9EC @@ -1440,9 +1440,9 @@ lbl_800DB9EC: /* 800DBA1C 000D897C C0 22 8E E4 */ lfs f1, lbl_805AAC04@sda21(r2) /* 800DBA20 000D8980 EF A1 00 32 */ fmuls f29, f1, f0 /* 800DBA24 000D8984 F3 A1 A0 0D */ psq_st f29, 13(r1), 1, qr2 -/* 800DBA28 000D8988 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800DBA28 000D8988 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800DBA2C 000D898C 80 E3 00 00 */ lwz r7, 0(r3) -/* 800DBA30 000D8990 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 800DBA30 000D8990 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 800DBA34 000D8994 88 01 00 0D */ lbz r0, 0xd(r1) /* 800DBA38 000D8998 7E 66 9B 78 */ mr r6, r19 /* 800DBA3C 000D899C 50 E0 00 2E */ rlwimi r0, r7, 0, 0, 0x17 @@ -4301,10 +4301,10 @@ lbl_800DE350: /* 800DE384 000DB2E4 38 80 FF FF */ li r4, -1 /* 800DE388 000DB2E8 48 26 2A B9 */ bl __dt__6CTokenFv /* 800DE38C 000DB2EC 38 00 00 00 */ li r0, 0 -/* 800DE390 000DB2F0 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 800DE390 000DB2F0 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 800DE394 000DB2F4 90 1F 02 38 */ stw r0, 0x238(r31) /* 800DE398 000DB2F8 38 00 FF FF */ li r0, -1 -/* 800DE39C 000DB2FC 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 800DE39C 000DB2FC 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 800DE3A0 000DB300 38 61 00 D4 */ addi r3, r1, 0xd4 /* 800DE3A4 000DB304 90 01 00 0C */ stw r0, 0xc(r1) /* 800DE3A8 000DB308 38 A1 00 0C */ addi r5, r1, 0xc @@ -4322,9 +4322,9 @@ lbl_800DE350: /* 800DE3D8 000DB338 48 23 74 95 */ bl __nw__FUlPCcPCc /* 800DE3DC 000DB33C 7C 60 1B 79 */ or. r0, r3, r3 /* 800DE3E0 000DB340 41 82 00 4C */ beq lbl_800DE42C -/* 800DE3E4 000DB344 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800DE3E4 000DB344 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800DE3E8 000DB348 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 800DE3EC 000DB34C 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 800DE3EC 000DB34C 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 800DE3F0 000DB350 38 A1 00 88 */ addi r5, r1, 0x88 /* 800DE3F4 000DB354 81 07 00 00 */ lwz r8, 0(r7) /* 800DE3F8 000DB358 38 80 00 08 */ li r4, 8 diff --git a/asm/MetroidPrime/CSimpleShadow.s b/asm/MetroidPrime/CSimpleShadow.s index f07b8262..123bafe1 100644 --- a/asm/MetroidPrime/CSimpleShadow.s +++ b/asm/MetroidPrime/CSimpleShadow.s @@ -534,12 +534,12 @@ lbl_801061D8: /* 801061DC 0010313C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 801061E0 00103140 41 82 01 28 */ beq lbl_80106308 /* 801061E4 00103144 C0 1E 00 40 */ lfs f0, 0x40(r30) -/* 801061E8 00103148 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801061EC 0010314C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801061E8 00103148 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801061EC 0010314C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801061F0 00103150 C0 62 94 58 */ lfs f3, lbl_805AB178@sda21(r2) /* 801061F4 00103154 EC 1C 00 24 */ fdivs f0, f28, f0 -/* 801061F8 00103158 38 A4 66 A0 */ addi r5, r4, skZero3f@l -/* 801061FC 0010315C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801061F8 00103158 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l +/* 801061FC 0010315C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80106200 00103160 C0 41 01 38 */ lfs f2, 0x138(r1) /* 80106204 00103164 C0 21 01 3C */ lfs f1, 0x13c(r1) /* 80106208 00103168 38 61 00 68 */ addi r3, r1, 0x68 @@ -639,9 +639,9 @@ __ct__13CSimpleShadowFffff: /* 80106368 001032C8 F3 81 00 18 */ psq_st f28, 24(r1), 0, qr0 /* 8010636C 001032CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80106370 001032D0 FF 80 08 90 */ fmr f28, f1 -/* 80106374 001032D4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80106374 001032D4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80106378 001032D8 FF A0 10 90 */ fmr f29, f2 -/* 8010637C 001032DC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8010637C 001032DC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80106380 001032E0 FF C0 18 90 */ fmr f30, f3 /* 80106384 001032E4 7C 7F 1B 78 */ mr r31, r3 /* 80106388 001032E8 FF E0 20 90 */ fmr f31, f4 diff --git a/asm/MetroidPrime/CSlideShow.s b/asm/MetroidPrime/CSlideShow.s index bd2aea5b..eaced8b0 100644 --- a/asm/MetroidPrime/CSlideShow.s +++ b/asm/MetroidPrime/CSlideShow.s @@ -691,8 +691,8 @@ sub_802981c4: /* 8029821C 0029517C C0 42 C0 08 */ lfs f2, lbl_805ADD28@sda21(r2) /* 80298220 00295180 7D 89 03 A6 */ mtctr r12 /* 80298224 00295184 4E 80 04 21 */ bctrl -/* 80298228 00295188 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8029822C 0029518C 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80298228 00295188 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8029822C 0029518C 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80298230 00295190 48 07 45 1D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 80298234 00295194 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80298238 00295198 48 0A 8B D5 */ bl GetObj__6CTokenFv @@ -4915,8 +4915,8 @@ lbl_8029BE04: /* 8029BE78 00298DD8 C8 01 00 78 */ lfd f0, 0x78(r1) /* 8029BE7C 00298DDC EC 80 20 28 */ fsubs f4, f0, f4 /* 8029BE80 00298DE0 48 07 06 D5 */ bl SetOrtho__9CGraphicsFffffff -/* 8029BE84 00298DE4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8029BE88 00298DE8 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 8029BE84 00298DE4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8029BE88 00298DE8 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 8029BE8C 00298DEC 48 07 08 C1 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 8029BE90 00298DF0 7F A4 EB 78 */ mr r4, r29 /* 8029BE94 00298DF4 38 61 00 2C */ addi r3, r1, 0x2c @@ -4941,8 +4941,8 @@ lbl_8029BE04: /* 8029BEE0 00298E40 C0 22 BF F0 */ lfs f1, lbl_805ADD10@sda21(r2) /* 8029BEE4 00298E44 FC 40 08 90 */ fmr f2, f1 /* 8029BEE8 00298E48 48 06 F5 7D */ bl StreamTexcoord__9CGraphicsFff -/* 8029BEEC 00298E4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8029BEF0 00298E50 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8029BEEC 00298E4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8029BEF0 00298E50 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 8029BEF4 00298E54 48 06 F6 CD */ bl StreamVertex__9CGraphicsFRC9CVector3f /* 8029BEF8 00298E58 C0 22 C0 14 */ lfs f1, lbl_805ADD34@sda21(r2) /* 8029BEFC 00298E5C C0 42 BF F0 */ lfs f2, lbl_805ADD10@sda21(r2) diff --git a/asm/MetroidPrime/CSplashScreen.s b/asm/MetroidPrime/CSplashScreen.s index afb739bc..3830e975 100644 --- a/asm/MetroidPrime/CSplashScreen.s +++ b/asm/MetroidPrime/CSplashScreen.s @@ -234,14 +234,14 @@ lbl_8002832C: /* 8002833C 0002529C 38 E0 00 00 */ li r7, 0 /* 80028340 000252A0 48 2E 36 E9 */ bl SetAlphaCompare__9CGraphicsF13ERglAlphaFuncUc11ERglAlphaOp13ERglAlphaFuncUc /* 80028344 000252A4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80028348 000252A8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8002834C 000252AC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80028348 000252A8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8002834C 000252AC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80028350 000252B0 81 83 00 00 */ lwz r12, 0(r3) /* 80028354 000252B4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80028358 000252B8 7D 89 03 A6 */ mtctr r12 /* 8002835C 000252BC 4E 80 04 21 */ bctrl -/* 80028360 000252C0 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80028364 000252C4 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80028360 000252C0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80028364 000252C4 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80028368 000252C8 48 2E 43 E5 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 8002836C 000252CC 3C 80 80 5A */ lis r4, lbl_805A5EBC@ha /* 80028370 000252D0 38 60 00 00 */ li r3, 0 @@ -579,17 +579,17 @@ lbl_80028838: /* 80028880 000257E0 6F E3 80 00 */ xoris r3, r31, 0x8000 /* 80028884 000257E4 3C 00 43 30 */ lis r0, 0x4330 /* 80028888 000257E8 90 61 04 BC */ stw r3, 0x4bc(r1) -/* 8002888C 000257EC 3C 80 80 5A */ lis r4, lbl_805A6718@ha +/* 8002888C 000257EC 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha /* 80028890 000257F0 C0 42 83 A4 */ lfs f2, lbl_805AA0C4@sda21(r2) -/* 80028894 000257F4 3C A0 80 5A */ lis r5, lbl_805A6724@ha +/* 80028894 000257F4 3C A0 80 5A */ lis r5, sForwardVector__9CVector3f@ha /* 80028898 000257F8 90 01 04 B8 */ stw r0, 0x4b8(r1) -/* 8002889C 000257FC 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 8002889C 000257FC 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 800288A0 00025800 C8 22 83 B8 */ lfd f1, lbl_805AA0D8@sda21(r2) -/* 800288A4 00025804 38 C3 67 00 */ addi r6, r3, lbl_805A6700@l +/* 800288A4 00025804 38 C3 67 00 */ addi r6, r3, sDownVector__9CVector3f@l /* 800288A8 00025808 C8 01 04 B8 */ lfd f0, 0x4b8(r1) -/* 800288AC 0002580C 38 84 67 18 */ addi r4, r4, lbl_805A6718@l +/* 800288AC 0002580C 38 84 67 18 */ addi r4, r4, sRightVector__9CVector3f@l /* 800288B0 00025810 D0 41 00 2C */ stfs f2, 0x2c(r1) -/* 800288B4 00025814 38 A5 67 24 */ addi r5, r5, lbl_805A6724@l +/* 800288B4 00025814 38 A5 67 24 */ addi r5, r5, sForwardVector__9CVector3f@l /* 800288B8 00025818 EC 00 08 28 */ fsubs f0, f0, f1 /* 800288BC 0002581C 38 61 00 EC */ addi r3, r1, 0xec /* 800288C0 00025820 D0 41 00 30 */ stfs f2, 0x30(r1) diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index 0f4d1f35..bada97f0 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -680,10 +680,10 @@ sub_80044098: /* 800440CC 0004102C 7D 1B 43 78 */ mr r27, r8 /* 800440D0 00041030 7D 3C 4B 78 */ mr r28, r9 /* 800440D4 00041034 41 82 03 80 */ beq lbl_80044454 -/* 800440D8 00041038 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800440DC 0004103C 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 800440E0 00041040 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 800440E4 00041044 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 800440D8 00041038 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800440DC 0004103C 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 800440E0 00041040 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 800440E4 00041044 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 800440E8 00041048 38 61 00 94 */ addi r3, r1, 0x94 /* 800440EC 0004104C 38 BF 00 10 */ addi r5, r31, 0x10 /* 800440F0 00041050 48 2C FA 21 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -868,7 +868,7 @@ lbl_80044370: /* 80044394 000412F4 48 26 E0 5D */ bl GetAudibleFallOff__22CCollisionResponseDataCFv /* 80044398 000412F8 C0 82 85 68 */ lfs f4, lbl_805AA288@sda21(r2) /* 8004439C 000412FC 38 C0 00 00 */ li r6, 0 -/* 800443A0 00041300 88 A2 CC 40 */ lbz r5, lbl_805AE960@sda21(r2) +/* 800443A0 00041300 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 800443A4 00041304 38 E0 00 01 */ li r7, 1 /* 800443A8 00041308 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) /* 800443AC 0004130C 38 80 00 14 */ li r4, 0x14 @@ -4201,8 +4201,8 @@ SetupViewForDraw__13CStateManagerCFRCQ29CGraphics9CViewport: /* 8004721C 0004417C 7D 89 03 A6 */ mtctr r12 /* 80047220 00044180 4E 80 04 21 */ bctrl /* 80047224 00044184 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80047228 00044188 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8004722C 0004418C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80047228 00044188 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8004722C 0004418C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80047230 00044190 81 83 00 00 */ lwz r12, 0(r3) /* 80047234 00044194 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80047238 00044198 7D 89 03 A6 */ mtctr r12 @@ -6901,9 +6901,9 @@ lbl_80049768: /* 80049810 00046770 98 01 00 88 */ stb r0, 0x88(r1) /* 80049814 00046774 48 00 00 A8 */ b lbl_800498BC lbl_80049818: -/* 80049818 00046778 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80049818 00046778 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8004981C 0004677C 38 61 00 C4 */ addi r3, r1, 0xc4 -/* 80049820 00046780 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 80049820 00046780 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 80049824 00046784 38 81 00 70 */ addi r4, r1, 0x70 /* 80049828 00046788 C0 47 00 00 */ lfs f2, 0(r7) /* 8004982C 0004678C 38 A1 00 18 */ addi r5, r1, 0x18 @@ -9193,9 +9193,9 @@ lbl_8004B7D4: /* 8004B860 000487C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004B864 000487C4 41 82 00 60 */ beq lbl_8004B8C4 /* 8004B868 000487C8 C0 21 00 50 */ lfs f1, 0x50(r1) -/* 8004B86C 000487CC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8004B86C 000487CC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8004B870 000487D0 C0 01 00 44 */ lfs f0, 0x44(r1) -/* 8004B874 000487D4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8004B874 000487D4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8004B878 000487D8 C0 61 00 54 */ lfs f3, 0x54(r1) /* 8004B87C 000487DC 38 61 00 58 */ addi r3, r1, 0x58 /* 8004B880 000487E0 EC 81 00 2A */ fadds f4, f1, f0 @@ -9351,9 +9351,9 @@ CreateStandardGameObjects__13CStateManagerFv: /* 8004BAA0 00048A00 7F C4 F3 78 */ mr r4, r30 /* 8004BAA4 00048A04 38 61 00 0C */ addi r3, r1, 0xc /* 8004BAA8 00048A08 48 00 16 35 */ bl AllocateUniqueId__13CStateManagerFv -/* 8004BAAC 00048A0C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8004BAAC 00048A0C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8004BAB0 00048A10 C0 22 85 68 */ lfs f1, lbl_805AA288@sda21(r2) -/* 8004BAB4 00048A14 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8004BAB4 00048A14 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8004BAB8 00048A18 A0 01 00 0C */ lhz r0, 0xc(r1) /* 8004BABC 00048A1C C0 A4 00 00 */ lfs f5, 0(r4) /* 8004BAC0 00048A20 38 61 00 5C */ addi r3, r1, 0x5c @@ -10447,9 +10447,9 @@ lbl_8004C9B0: /* 8004C9B8 00049918 98 61 00 58 */ stb r3, 0x58(r1) /* 8004C9BC 0004991C 28 00 00 00 */ cmplwi r0, 0 /* 8004C9C0 00049920 41 82 00 D0 */ beq lbl_8004CA90 -/* 8004C9C4 00049924 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 8004C9C4 00049924 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 8004C9C8 00049928 3B E1 00 74 */ addi r31, r1, 0x74 -/* 8004C9CC 0004992C 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l +/* 8004C9CC 0004992C 38 A3 67 54 */ addi r5, r3, mskInvertedBox__6CAABox@l /* 8004C9D0 00049930 38 61 00 5C */ addi r3, r1, 0x5c /* 8004C9D4 00049934 C0 A5 00 00 */ lfs f5, 0(r5) /* 8004C9D8 00049938 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/MetroidPrime/CSteeringBehaviors.s b/asm/MetroidPrime/CSteeringBehaviors.s index 11039f89..28df323e 100644 --- a/asm/MetroidPrime/CSteeringBehaviors.s +++ b/asm/MetroidPrime/CSteeringBehaviors.s @@ -98,9 +98,9 @@ ProjectOrbitalPosition__18CSteeringBehaviorsFRC9CVector3fRC9CVector3fRC9CVector3 /* 8013CB78 00139AD8 C2 FF 00 08 */ lfs f23, 8(r31) /* 8013CB7C 00139ADC C2 C2 9A B8 */ lfs f22, lbl_805AB7D8@sda21(r2) /* 8013CB80 00139AE0 48 1D 7C D1 */ bl AsNormalized__9CVector3fCFv -/* 8013CB84 00139AE4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013CB84 00139AE4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013CB88 00139AE8 C0 C1 00 34 */ lfs f6, 0x34(r1) -/* 8013CB8C 00139AEC 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 8013CB8C 00139AEC 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 8013CB90 00139AF0 C1 01 00 30 */ lfs f8, 0x30(r1) /* 8013CB94 00139AF4 C0 BF 00 08 */ lfs f5, 8(r31) /* 8013CB98 00139AF8 EC 18 01 B2 */ fmuls f0, f24, f6 @@ -150,12 +150,12 @@ lbl_8013CBDC: /* 8013CC44 00139BA4 38 61 00 18 */ addi r3, r1, 0x18 /* 8013CC48 00139BA8 38 81 00 48 */ addi r4, r1, 0x48 /* 8013CC4C 00139BAC 48 1D 7C 05 */ bl AsNormalized__9CVector3fCFv -/* 8013CC50 00139BB0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013CC50 00139BB0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013CC54 00139BB4 C1 21 00 1C */ lfs f9, 0x1c(r1) /* 8013CC58 00139BB8 C1 41 00 20 */ lfs f10, 0x20(r1) /* 8013CC5C 00139BBC C0 BF 00 04 */ lfs f5, 4(r31) /* 8013CC60 00139BC0 EC 5D 02 72 */ fmuls f2, f29, f9 -/* 8013CC64 00139BC4 C1 03 66 F4 */ lfs f8, lbl_805A66F4@l(r3) +/* 8013CC64 00139BC4 C1 03 66 F4 */ lfs f8, sUpVector__9CVector3f@l(r3) /* 8013CC68 00139BC8 EC 1D 02 B2 */ fmuls f0, f29, f10 /* 8013CC6C 00139BCC C0 E1 00 18 */ lfs f7, 0x18(r1) /* 8013CC70 00139BD0 EC 65 02 B2 */ fmuls f3, f5, f10 @@ -321,9 +321,9 @@ ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVe /* 8013CED4 00139E34 38 81 00 54 */ addi r4, r1, 0x54 /* 8013CED8 00139E38 EE 00 90 28 */ fsubs f16, f0, f18 /* 8013CEDC 00139E3C 48 1D 79 75 */ bl AsNormalized__9CVector3fCFv -/* 8013CEE0 00139E40 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013CEE0 00139E40 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013CEE4 00139E44 C0 C1 00 34 */ lfs f6, 0x34(r1) -/* 8013CEE8 00139E48 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 8013CEE8 00139E48 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 8013CEEC 00139E4C C1 01 00 30 */ lfs f8, 0x30(r1) /* 8013CEF0 00139E50 C0 BF 00 08 */ lfs f5, 8(r31) /* 8013CEF4 00139E54 EC 14 01 B2 */ fmuls f0, f20, f6 @@ -592,9 +592,9 @@ ProjectOrbitalIntersection__18CSteeringBehaviorsFRC9CVector3ffRC9CVector3fRC9CVe /* 8013D2E8 0013A248 38 81 00 54 */ addi r4, r1, 0x54 /* 8013D2EC 0013A24C EE 20 98 28 */ fsubs f17, f0, f19 /* 8013D2F0 0013A250 48 1D 75 61 */ bl AsNormalized__9CVector3fCFv -/* 8013D2F4 0013A254 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013D2F4 0013A254 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013D2F8 0013A258 C0 C1 00 34 */ lfs f6, 0x34(r1) -/* 8013D2FC 0013A25C 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 8013D2FC 0013A25C 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 8013D300 0013A260 C1 01 00 30 */ lfs f8, 0x30(r1) /* 8013D304 0013A264 C0 BF 00 08 */ lfs f5, 8(r31) /* 8013D308 0013A268 EC 15 01 B2 */ fmuls f0, f21, f6 @@ -1951,9 +1951,9 @@ lbl_8013E604: /* 8013E62C 0013B58C DB E1 00 40 */ stfd f31, 0x40(r1) /* 8013E630 0013B590 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 8013E634 0013B594 BF 21 00 24 */ stmw r25, 0x24(r1) -/* 8013E638 0013B598 3D 00 80 5A */ lis r8, skZero3f@ha +/* 8013E638 0013B598 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 8013E63C 0013B59C 7C DC 33 78 */ mr r28, r6 -/* 8013E640 0013B5A0 38 C8 66 A0 */ addi r6, r8, skZero3f@l +/* 8013E640 0013B5A0 38 C8 66 A0 */ addi r6, r8, sZeroVector__9CVector3f@l /* 8013E644 0013B5A4 FF E0 08 90 */ fmr f31, f1 /* 8013E648 0013B5A8 C0 46 00 00 */ lfs f2, 0(r6) /* 8013E64C 0013B5AC 7C 79 1B 78 */ mr r25, r3 @@ -2042,14 +2042,14 @@ lbl_8013E760: "Alignment__18CSteeringBehaviorsCFRC13CPhysicsActorRQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager": /* 8013E77C 0013B6DC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8013E780 0013B6E0 7C 08 02 A6 */ mflr r0 -/* 8013E784 0013B6E4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8013E784 0013B6E4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8013E788 0013B6E8 90 01 00 54 */ stw r0, 0x54(r1) /* 8013E78C 0013B6EC BF 41 00 38 */ stmw r26, 0x38(r1) /* 8013E790 0013B6F0 7C DC 33 78 */ mr r28, r6 /* 8013E794 0013B6F4 7C 7A 1B 78 */ mr r26, r3 /* 8013E798 0013B6F8 7C BB 2B 78 */ mr r27, r5 /* 8013E79C 0013B6FC 7C FD 3B 78 */ mr r29, r7 -/* 8013E7A0 0013B700 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8013E7A0 0013B700 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8013E7A4 0013B704 C0 24 00 04 */ lfs f1, 4(r4) /* 8013E7A8 0013B708 C0 04 00 08 */ lfs f0, 8(r4) /* 8013E7AC 0013B70C D0 41 00 18 */ stfs f2, 0x18(r1) @@ -2150,7 +2150,7 @@ Separation__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff: /* 8013E90C 0013B86C C0 45 00 50 */ lfs f2, 0x50(r5) /* 8013E910 0013B870 EC A1 00 72 */ fmuls f5, f1, f1 /* 8013E914 0013B874 C0 06 00 04 */ lfs f0, 4(r6) -/* 8013E918 0013B878 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8013E918 0013B878 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8013E91C 0013B87C C0 25 00 40 */ lfs f1, 0x40(r5) /* 8013E920 0013B880 7C BF 2B 78 */ mr r31, r5 /* 8013E924 0013B884 EC 82 00 28 */ fsubs f4, f2, f0 @@ -2162,7 +2162,7 @@ Separation__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff: /* 8013E93C 0013B89C EC 04 01 32 */ fmuls f0, f4, f4 /* 8013E940 0013B8A0 D0 81 00 30 */ stfs f4, 0x30(r1) /* 8013E944 0013B8A4 EC 63 08 28 */ fsubs f3, f3, f1 -/* 8013E948 0013B8A8 C4 84 66 A0 */ lfsu f4, skZero3f@l(r4) +/* 8013E948 0013B8A8 C4 84 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r4) /* 8013E94C 0013B8AC EC 22 00 B2 */ fmuls f1, f2, f2 /* 8013E950 0013B8B0 D0 41 00 2C */ stfs f2, 0x2c(r1) /* 8013E954 0013B8B4 EC 43 00 F2 */ fmuls f2, f3, f3 @@ -2223,11 +2223,11 @@ lbl_8013E9F0: Pursuit__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3fRC9CVector3f: /* 8013EA1C 0013B97C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8013EA20 0013B980 7C 08 02 A6 */ mflr r0 -/* 8013EA24 0013B984 3D 00 80 5A */ lis r8, skZero3f@ha +/* 8013EA24 0013B984 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 8013EA28 0013B988 90 01 00 54 */ stw r0, 0x54(r1) /* 8013EA2C 0013B98C BF 61 00 3C */ stmw r27, 0x3c(r1) /* 8013EA30 0013B990 7C BD 2B 78 */ mr r29, r5 -/* 8013EA34 0013B994 38 A8 66 A0 */ addi r5, r8, skZero3f@l +/* 8013EA34 0013B994 38 A8 66 A0 */ addi r5, r8, sZeroVector__9CVector3f@l /* 8013EA38 0013B998 7C 7B 1B 78 */ mr r27, r3 /* 8013EA3C 0013B99C 7C 9C 23 78 */ mr r28, r4 /* 8013EA40 0013B9A0 7C DE 33 78 */ mr r30, r6 @@ -2343,8 +2343,8 @@ lbl_8013EBB4: /* 8013EBE0 0013BB40 D0 3F 00 08 */ stfs f1, 8(r31) /* 8013EBE4 0013BB44 48 00 00 20 */ b lbl_8013EC04 lbl_8013EBE8: -/* 8013EBE8 0013BB48 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013EBEC 0013BB4C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8013EBE8 0013BB48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013EBEC 0013BB4C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8013EBF0 0013BB50 D0 1F 00 00 */ stfs f0, 0(r31) /* 8013EBF4 0013BB54 C0 03 00 04 */ lfs f0, 4(r3) /* 8013EBF8 0013BB58 D0 1F 00 04 */ stfs f0, 4(r31) @@ -2387,8 +2387,8 @@ Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f: /* 8013EC7C 0013BBDC 48 1D 5B D5 */ bl AsNormalized__9CVector3fCFv /* 8013EC80 0013BBE0 48 00 00 20 */ b lbl_8013ECA0 lbl_8013EC84: -/* 8013EC84 0013BBE4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013EC88 0013BBE8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8013EC84 0013BBE4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013EC88 0013BBE8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8013EC8C 0013BBEC D0 1F 00 00 */ stfs f0, 0(r31) /* 8013EC90 0013BBF0 C0 03 00 04 */ lfs f0, 4(r3) /* 8013EC94 0013BBF4 D0 1F 00 04 */ stfs f0, 4(r31) diff --git a/asm/MetroidPrime/CTargetReticles.s b/asm/MetroidPrime/CTargetReticles.s index c39c4089..cd37f48d 100644 --- a/asm/MetroidPrime/CTargetReticles.s +++ b/asm/MetroidPrime/CTargetReticles.s @@ -761,7 +761,7 @@ __ct__17COrbitPointMarkerFv: /* 800BC974 000B98D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800BC978 000B98D8 7C 08 02 A6 */ mflr r0 /* 800BC97C 000B98DC C0 22 8D 30 */ lfs f1, lbl_805AAA50@sda21(r2) -/* 800BC980 000B98E0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800BC980 000B98E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800BC984 000B98E4 90 01 00 24 */ stw r0, 0x24(r1) /* 800BC988 000B98E8 38 00 00 00 */ li r0, 0 /* 800BC98C 000B98EC 93 E1 00 1C */ stw r31, 0x1c(r1) @@ -777,7 +777,7 @@ __ct__17COrbitPointMarkerFv: /* 800BC9B4 000B9914 38 61 00 08 */ addi r3, r1, 8 /* 800BC9B8 000B9918 D0 3E 00 08 */ stfs f1, 8(r30) /* 800BC9BC 000B991C D0 3E 00 0C */ stfs f1, 0xc(r30) -/* 800BC9C0 000B9920 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 800BC9C0 000B9920 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 800BC9C4 000B9924 D0 1E 00 10 */ stfs f0, 0x10(r30) /* 800BC9C8 000B9928 C0 04 00 04 */ lfs f0, 4(r4) /* 800BC9CC 000B992C D0 1E 00 14 */ stfs f0, 0x14(r30) @@ -2573,13 +2573,13 @@ lbl_800BE39C: /* 800BE3CC 000BB32C C0 1F 01 60 */ lfs f0, 0x160(r31) /* 800BE3D0 000BB330 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800BE3D4 000BB334 40 82 01 AC */ bne lbl_800BE580 -/* 800BE3D8 000BB338 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 800BE3DC 000BB33C 3C 80 80 5A */ lis r4, lbl_805A6724@ha -/* 800BE3E0 000BB340 38 E3 67 18 */ addi r7, r3, lbl_805A6718@l -/* 800BE3E4 000BB344 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 800BE3E8 000BB348 38 C4 67 24 */ addi r6, r4, lbl_805A6724@l +/* 800BE3D8 000BB338 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 800BE3DC 000BB33C 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha +/* 800BE3E0 000BB340 38 E3 67 18 */ addi r7, r3, sRightVector__9CVector3f@l +/* 800BE3E4 000BB344 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 800BE3E8 000BB348 38 C4 67 24 */ addi r6, r4, sForwardVector__9CVector3f@l /* 800BE3EC 000BB34C C1 07 00 00 */ lfs f8, 0(r7) -/* 800BE3F0 000BB350 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 800BE3F0 000BB350 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 800BE3F4 000BB354 C0 E7 00 04 */ lfs f7, 4(r7) /* 800BE3F8 000BB358 C0 C7 00 08 */ lfs f6, 8(r7) /* 800BE3FC 000BB35C 3C 80 38 E4 */ lis r4, 0x38E38E39@ha @@ -6507,10 +6507,10 @@ lbl_800C1CAC: __sinit_CTargetReticles_cpp: /* 800C1CC0 000BEC20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800C1CC4 000BEC24 7C 08 02 A6 */ mflr r0 -/* 800C1CC8 000BEC28 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800C1CC8 000BEC28 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800C1CCC 000BEC2C C0 22 8D 38 */ lfs f1, lbl_805AAA58@sda21(r2) /* 800C1CD0 000BEC30 90 01 00 24 */ stw r0, 0x24(r1) -/* 800C1CD4 000BEC34 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 800C1CD4 000BEC34 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800C1CD8 000BEC38 3C 60 80 47 */ lis r3, lbl_8046C450@ha /* 800C1CDC 000BEC3C FC 60 08 90 */ fmr f3, f1 /* 800C1CE0 000BEC40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) diff --git a/asm/MetroidPrime/CVisorFlare.s b/asm/MetroidPrime/CVisorFlare.s index 154190ae..ae1c37d0 100644 --- a/asm/MetroidPrime/CVisorFlare.s +++ b/asm/MetroidPrime/CVisorFlare.s @@ -521,9 +521,9 @@ lbl_80207D04: /* 80207D14 00204C74 54 1A D9 7E */ srwi r26, r0, 5 /* 80207D18 00204C78 4B FF F9 1D */ bl sub_80207634 /* 80207D1C 00204C7C C0 02 B0 E8 */ lfs f0, lbl_805ACE08@sda21(r2) -/* 80207D20 00204C80 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80207D20 00204C80 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80207D24 00204C84 C3 C2 B0 EC */ lfs f30, lbl_805ACE0C@sda21(r2) -/* 80207D28 00204C88 3B A3 66 F4 */ addi r29, r3, lbl_805A66F4@l +/* 80207D28 00204C88 3B A3 66 F4 */ addi r29, r3, sUpVector__9CVector3f@l /* 80207D2C 00204C8C EF 59 00 28 */ fsubs f26, f25, f0 /* 80207D30 00204C90 C3 E2 B1 04 */ lfs f31, lbl_805ACE24@sda21(r2) /* 80207D34 00204C94 3B 20 00 00 */ li r25, 0 diff --git a/asm/MetroidPrime/CWorldShadow.s b/asm/MetroidPrime/CWorldShadow.s index 86fa53e1..bb92ba6d 100644 --- a/asm/MetroidPrime/CWorldShadow.s +++ b/asm/MetroidPrime/CWorldShadow.s @@ -172,9 +172,9 @@ EnableModelProjectedShadow__12CWorldShadowCFRC12CTransform4fUif: /* 80111054 0010DFB4 D0 0D A3 60 */ stfs f0, lbl_805A8F20@sda21(r13) lbl_80111058: /* 80111058 0010DFB8 C0 5D 00 78 */ lfs f2, 0x78(r29) -/* 8011105C 0010DFBC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8011105C 0010DFBC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80111060 0010DFC0 C0 1D 00 6C */ lfs f0, 0x6c(r29) -/* 80111064 0010DFC4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80111064 0010DFC4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80111068 0010DFC8 C0 3D 00 7C */ lfs f1, 0x7c(r29) /* 8011106C 0010DFCC 38 61 01 70 */ addi r3, r1, 0x170 /* 80111070 0010DFD0 EC A2 00 28 */ fsubs f5, f2, f0 @@ -200,9 +200,9 @@ lbl_80111058: /* 801110C0 0010E020 7F C4 F3 78 */ mr r4, r30 /* 801110C4 0010E024 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 801110C8 0010E028 48 20 1A AD */ bl __ct__12CTransform4fFRC12CTransform4f -/* 801110CC 0010E02C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801110CC 0010E02C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801110D0 0010E030 38 61 01 10 */ addi r3, r1, 0x110 -/* 801110D4 0010E034 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801110D4 0010E034 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801110D8 0010E038 38 81 01 A0 */ addi r4, r1, 0x1a0 /* 801110DC 0010E03C C0 45 00 00 */ lfs f2, 0(r5) /* 801110E0 0010E040 C0 25 00 04 */ lfs f1, 4(r5) @@ -523,9 +523,9 @@ lbl_801113AC: /* 801115AC 0010E50C 7D 89 03 A6 */ mtctr r12 /* 801115B0 0010E510 4E 80 04 21 */ bctrl /* 801115B4 0010E514 C0 21 00 D0 */ lfs f1, 0xd0(r1) -/* 801115B8 0010E518 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801115B8 0010E518 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801115BC 0010E51C C0 62 95 88 */ lfs f3, lbl_805AB2A8@sda21(r2) -/* 801115C0 0010E520 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801115C0 0010E520 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801115C4 0010E524 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 801115C8 0010E528 38 61 01 14 */ addi r3, r1, 0x114 /* 801115CC 0010E52C EC 81 18 28 */ fsubs f4, f1, f3 @@ -632,8 +632,8 @@ lbl_801113AC: /* 80111760 0010E6C0 7D 89 03 A6 */ mtctr r12 /* 80111764 0010E6C4 4E 80 04 21 */ bctrl /* 80111768 0010E6C8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 8011176C 0010E6CC 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80111770 0010E6D0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011176C 0010E6CC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80111770 0010E6D0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80111774 0010E6D4 81 83 00 00 */ lwz r12, 0(r3) /* 80111778 0010E6D8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011177C 0010E6DC 7D 89 03 A6 */ mtctr r12 @@ -961,19 +961,19 @@ lbl_80111C20: /* 80111C2C 0010EB8C 48 1F E2 01 */ bl __ct__8CTextureF12ETexelFormatssi /* 80111C30 0010EB90 7C 60 1B 78 */ mr r0, r3 lbl_80111C34: -/* 80111C34 0010EB94 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80111C34 0010EB94 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80111C38 0010EB98 90 1F 00 00 */ stw r0, 0(r31) -/* 80111C3C 0010EB9C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80111C3C 0010EB9C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80111C40 0010EBA0 38 7F 00 04 */ addi r3, r31, 4 /* 80111C44 0010EBA4 48 20 0F 31 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80111C48 0010EBA8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80111C48 0010EBA8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80111C4C 0010EBAC 38 7F 00 34 */ addi r3, r31, 0x34 -/* 80111C50 0010EBB0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80111C50 0010EBB0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80111C54 0010EBB4 48 20 0F 21 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80111C58 0010EBB8 C0 22 95 8C */ lfs f1, lbl_805AB2AC@sda21(r2) -/* 80111C5C 0010EBBC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80111C5C 0010EBBC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80111C60 0010EBC0 C0 02 95 88 */ lfs f0, lbl_805AB2A8@sda21(r2) -/* 80111C64 0010EBC4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80111C64 0010EBC4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80111C68 0010EBC8 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 80111C6C 0010EBCC 38 80 FF FF */ li r4, -1 /* 80111C70 0010EBD0 38 00 00 01 */ li r0, 1 diff --git a/asm/MetroidPrime/CWorldTransManager.s b/asm/MetroidPrime/CWorldTransManager.s index c6411257..d45c4bad 100644 --- a/asm/MetroidPrime/CWorldTransManager.s +++ b/asm/MetroidPrime/CWorldTransManager.s @@ -1085,12 +1085,12 @@ lbl_80209B80: /* 80209C5C 00206BBC C8 01 00 18 */ lfd f0, 0x18(r1) /* 80209C60 00206BC0 EC 80 20 28 */ fsubs f4, f0, f4 /* 80209C64 00206BC4 48 10 28 F1 */ bl SetOrtho__9CGraphicsFffffff -/* 80209C68 00206BC8 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80209C6C 00206BCC 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80209C68 00206BC8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80209C6C 00206BCC 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80209C70 00206BD0 48 10 2A DD */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 80209C74 00206BD4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80209C78 00206BD8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80209C7C 00206BDC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80209C78 00206BD8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80209C7C 00206BDC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80209C80 00206BE0 81 83 00 00 */ lwz r12, 0(r3) /* 80209C84 00206BE4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80209C88 00206BE8 7D 89 03 A6 */ mtctr r12 @@ -1588,9 +1588,9 @@ lbl_8020A3C0: /* 8020A3E8 00207348 FC 80 08 90 */ fmr f4, f1 /* 8020A3EC 0020734C B0 01 00 1E */ sth r0, 0x1e(r1) /* 8020A3F0 00207350 48 15 8F FD */ bl __ct__6CColorFffff -/* 8020A3F4 00207354 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8020A3F4 00207354 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8020A3F8 00207358 38 7F 00 B4 */ addi r3, r31, 0xb4 -/* 8020A3FC 0020735C 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 8020A3FC 0020735C 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 8020A400 00207360 38 C1 01 08 */ addi r6, r1, 0x108 /* 8020A404 00207364 38 E1 00 1C */ addi r7, r1, 0x1c /* 8020A408 00207368 38 80 00 00 */ li r4, 0 @@ -1607,8 +1607,8 @@ lbl_8020A410: lbl_8020A430: /* 8020A430 00207390 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8020A434 00207394 40 82 00 D8 */ bne lbl_8020A50C -/* 8020A438 00207398 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8020A43C 0020739C 38 04 66 70 */ addi r0, r4, skIdentity4f@l +/* 8020A438 00207398 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8020A43C 0020739C 38 04 66 70 */ addi r0, r4, sIdentity__12CTransform4f@l /* 8020A440 002073A0 7C 1E 03 78 */ mr r30, r0 /* 8020A444 002073A4 4B E2 25 C1 */ bl PreRender__9CAnimDataFv /* 8020A448 002073A8 C0 22 B1 30 */ lfs f1, lbl_805ACE50@sda21(r2) @@ -1622,9 +1622,9 @@ lbl_8020A430: /* 8020A468 002073C8 FC 80 08 90 */ fmr f4, f1 /* 8020A46C 002073CC B0 01 00 16 */ sth r0, 0x16(r1) /* 8020A470 002073D0 48 15 8F 7D */ bl __ct__6CColorFffff -/* 8020A474 002073D4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8020A474 002073D4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8020A478 002073D8 38 7F 00 1C */ addi r3, r31, 0x1c -/* 8020A47C 002073DC 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 8020A47C 002073DC 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 8020A480 002073E0 38 C1 01 08 */ addi r6, r1, 0x108 /* 8020A484 002073E4 38 E1 00 14 */ addi r7, r1, 0x14 /* 8020A488 002073E8 38 80 00 00 */ li r4, 0 @@ -1708,9 +1708,9 @@ lbl_8020A588: /* 8020A5A4 00207504 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 8020A5A8 00207508 D0 21 00 40 */ stfs f1, 0x40(r1) /* 8020A5AC 0020750C 48 13 FA 01 */ bl White__6CColorFv -/* 8020A5B0 00207510 3C 80 80 5A */ lis r4, lbl_805A6730@ha +/* 8020A5B0 00207510 3C 80 80 5A */ lis r4, sBackVector__9CVector3f@ha /* 8020A5B4 00207514 C0 22 B1 78 */ lfs f1, lbl_805ACE98@sda21(r2) -/* 8020A5B8 00207518 38 A4 67 30 */ addi r5, r4, lbl_805A6730@l +/* 8020A5B8 00207518 38 A4 67 30 */ addi r5, r4, sBackVector__9CVector3f@l /* 8020A5BC 0020751C 7C 66 1B 78 */ mr r6, r3 /* 8020A5C0 00207520 38 61 00 44 */ addi r3, r1, 0x44 /* 8020A5C4 00207524 38 81 00 38 */ addi r4, r1, 0x38 @@ -2838,9 +2838,9 @@ sub_8020b4e4: /* 8020B5A8 00208508 38 80 FF FF */ li r4, -1 /* 8020B5AC 0020850C 4B F0 B4 A1 */ bl __dt__10CModelDataFv /* 8020B5B0 00208510 38 00 00 00 */ li r0, 0 -/* 8020B5B4 00208514 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8020B5B4 00208514 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8020B5B8 00208518 98 1F 01 54 */ stb r0, 0x154(r31) -/* 8020B5BC 0020851C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8020B5BC 0020851C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8020B5C0 00208520 38 7F 01 70 */ addi r3, r31, 0x170 /* 8020B5C4 00208524 98 1F 01 60 */ stb r0, 0x160(r31) /* 8020B5C8 00208528 98 1F 01 6C */ stb r0, 0x16c(r31) diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 6f46648d..0720df94 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -2119,9 +2119,9 @@ lbl_800822B8: /* 80082410 0007F370 D0 21 01 04 */ stfs f1, 0x104(r1) /* 80082414 0007F374 D0 01 01 08 */ stfs f0, 0x108(r1) lbl_80082418: -/* 80082418 0007F378 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80082418 0007F378 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8008241C 0007F37C 38 61 02 08 */ addi r3, r1, 0x208 -/* 80082420 0007F380 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80082420 0007F380 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80082424 0007F384 38 BD 01 D8 */ addi r5, r29, 0x1d8 /* 80082428 0007F388 38 81 01 00 */ addi r4, r1, 0x100 /* 8008242C 0007F38C 48 29 16 E5 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -2207,9 +2207,9 @@ lbl_80082518: /* 80082554 0007F4B4 48 00 01 78 */ b lbl_800826CC lbl_80082558: /* 80082558 0007F4B8 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8008255C 0007F4BC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8008255C 0007F4BC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80082560 0007F4C0 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80082564 0007F4C4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80082564 0007F4C4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80082568 0007F4C8 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8008256C 0007F4CC 38 61 01 78 */ addi r3, r1, 0x178 /* 80082570 0007F4D0 38 81 00 DC */ addi r4, r1, 0xdc @@ -2232,9 +2232,9 @@ lbl_800825A8: /* 800825AC 0007F50C 7F C4 F3 78 */ mr r4, r30 /* 800825B0 0007F510 48 00 A4 E1 */ bl ResetPosition__11CBallCameraFR13CStateManager /* 800825B4 0007F514 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 800825B8 0007F518 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800825B8 0007F518 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800825BC 0007F51C C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 800825C0 0007F520 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800825C0 0007F520 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800825C4 0007F524 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 800825C8 0007F528 38 61 01 48 */ addi r3, r1, 0x148 /* 800825CC 0007F52C 38 81 00 D0 */ addi r4, r1, 0xd0 @@ -2285,9 +2285,9 @@ lbl_80082604: /* 80082678 0007F5D8 90 01 00 30 */ stw r0, 0x30(r1) /* 8008267C 0007F5DC 48 00 76 39 */ bl FindDesiredPosition__11CBallCameraFffRC9CVector3fR13CStateManagerb /* 80082680 0007F5E0 C0 41 00 34 */ lfs f2, 0x34(r1) -/* 80082684 0007F5E4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80082684 0007F5E4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80082688 0007F5E8 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 8008268C 0007F5EC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8008268C 0007F5EC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80082690 0007F5F0 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80082694 0007F5F4 38 61 01 18 */ addi r3, r1, 0x118 /* 80082698 0007F5F8 D0 41 00 C4 */ stfs f2, 0xc4(r1) @@ -2469,15 +2469,15 @@ lbl_80082814: /* 8008292C 0007F88C 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 80082930 0007F890 98 1D 00 F8 */ stb r0, 0xf8(r29) /* 80082934 0007F894 4B F9 8C 01 */ bl Identity__10CAxisAngleFv -/* 80082938 0007F898 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 80082938 0007F898 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8008293C 0007F89C C0 22 89 B0 */ lfs f1, lbl_805AA6D0@sda21(r2) /* 80082940 0007F8A0 7C 7C 1B 78 */ mr r28, r3 /* 80082944 0007F8A4 38 61 00 24 */ addi r3, r1, 0x24 -/* 80082948 0007F8A8 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 80082948 0007F8A8 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 8008294C 0007F8AC 48 28 E3 F1 */ bl BuildFromAxisAngle__13CNUQuaternionFRC9CVector3ff /* 80082950 0007F8B0 C0 1F 00 40 */ lfs f0, 0x40(r31) -/* 80082954 0007F8B4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80082958 0007F8B8 C4 A3 66 A0 */ lfsu f5, skZero3f@l(r3) +/* 80082954 0007F8B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80082958 0007F8B8 C4 A3 66 A0 */ lfsu f5, sZeroVector__9CVector3f@l(r3) /* 8008295C 0007F8BC D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 80082960 0007F8C0 C0 3F 00 50 */ lfs f1, 0x50(r31) /* 80082964 0007F8C4 C1 5F 00 60 */ lfs f10, 0x60(r31) @@ -3615,9 +3615,9 @@ ActivateFailSafe__11CBallCameraFfR13CStateManager: /* 800839E0 00080940 7F C3 F3 78 */ mr r3, r30 /* 800839E4 00080944 7F E4 FB 78 */ mr r4, r31 /* 800839E8 00080948 48 00 90 A9 */ bl ResetPosition__11CBallCameraFR13CStateManager -/* 800839EC 0008094C 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 800839EC 0008094C 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 800839F0 00080950 38 61 00 3C */ addi r3, r1, 0x3c -/* 800839F4 00080954 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 800839F4 00080954 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 800839F8 00080958 38 BE 01 D8 */ addi r5, r30, 0x1d8 /* 800839FC 0008095C 38 81 00 30 */ addi r4, r1, 0x30 /* 80083A00 00080960 48 29 01 11 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -5286,10 +5286,10 @@ lbl_80085198: /* 80085278 000821D8 98 1D 00 E4 */ stb r0, 0xe4(r29) /* 8008527C 000821DC 48 00 00 54 */ b lbl_800852D0 lbl_80085280: -/* 80085280 000821E0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80085284 000821E4 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80085288 000821E8 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 8008528C 000821EC 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80085280 000821E0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80085284 000821E4 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80085288 000821E8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 8008528C 000821EC 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80085290 000821F0 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 80085294 000821F4 38 A1 01 80 */ addi r5, r1, 0x180 /* 80085298 000821F8 48 28 E8 79 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -5605,9 +5605,9 @@ lbl_800855E8: /* 80085734 00082694 48 28 EF C5 */ bl CanBeNormalized__9CVector3fCFv /* 80085738 00082698 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008573C 0008269C 41 82 00 54 */ beq lbl_80085790 -/* 80085740 000826A0 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80085740 000826A0 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80085744 000826A4 38 61 01 98 */ addi r3, r1, 0x198 -/* 80085748 000826A8 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80085748 000826A8 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8008574C 000826AC 38 A1 01 28 */ addi r5, r1, 0x128 /* 80085750 000826B0 38 81 01 64 */ addi r4, r1, 0x164 /* 80085754 000826B4 48 28 E3 BD */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -5847,9 +5847,9 @@ lbl_80085AAC: /* 80085ACC 00082A2C D0 21 02 18 */ stfs f1, 0x218(r1) lbl_80085AD0: /* 80085AD0 00082A30 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80085AD4 00082A34 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80085AD4 00082A34 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80085AD8 00082A38 C0 01 02 0C */ lfs f0, 0x20c(r1) -/* 80085ADC 00082A3C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80085ADC 00082A3C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80085AE0 00082A40 C0 7F 00 60 */ lfs f3, 0x60(r31) /* 80085AE4 00082A44 38 61 03 70 */ addi r3, r1, 0x370 /* 80085AE8 00082A48 EC 81 00 28 */ fsubs f4, f1, f0 @@ -5881,9 +5881,9 @@ lbl_80085AD0: /* 80085B50 00082AB0 48 28 EB A9 */ bl CanBeNormalized__9CVector3fCFv /* 80085B54 00082AB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80085B58 00082AB8 41 82 00 28 */ beq lbl_80085B80 -/* 80085B5C 00082ABC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80085B5C 00082ABC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80085B60 00082AC0 38 61 02 E0 */ addi r3, r1, 0x2e0 -/* 80085B64 00082AC4 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80085B64 00082AC4 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80085B68 00082AC8 38 A1 02 08 */ addi r5, r1, 0x208 /* 80085B6C 00082ACC 38 81 02 2C */ addi r4, r1, 0x22c /* 80085B70 00082AD0 48 28 DF A1 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -6460,9 +6460,9 @@ lbl_800863BC: /* 800863F0 00083350 D0 81 01 B8 */ stfs f4, 0x1b8(r1) /* 800863F4 00083354 D0 61 01 BC */ stfs f3, 0x1bc(r1) lbl_800863F8: -/* 800863F8 00083358 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 800863F8 00083358 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 800863FC 0008335C 38 61 02 80 */ addi r3, r1, 0x280 -/* 80086400 00083360 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80086400 00083360 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80086404 00083364 38 BF 01 D8 */ addi r5, r31, 0x1d8 /* 80086408 00083368 38 81 01 B4 */ addi r4, r1, 0x1b4 /* 8008640C 0008336C 48 28 D7 05 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -6470,9 +6470,9 @@ lbl_800863F8: /* 80086414 00083374 38 81 02 80 */ addi r4, r1, 0x280 /* 80086418 00083378 48 28 C7 5D */ bl __ct__12CTransform4fFRC12CTransform4f /* 8008641C 0008337C C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80086420 00083380 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80086420 00083380 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80086424 00083384 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80086428 00083388 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80086428 00083388 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8008642C 0008338C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80086430 00083390 38 61 02 50 */ addi r3, r1, 0x250 /* 80086434 00083394 38 81 00 F4 */ addi r4, r1, 0xf4 @@ -6490,8 +6490,8 @@ lbl_800863F8: /* 80086464 000833C4 38 61 03 40 */ addi r3, r1, 0x340 /* 80086468 000833C8 38 81 03 10 */ addi r4, r1, 0x310 /* 8008646C 000833CC 48 28 C6 D5 */ bl __as__12CTransform4fFRC12CTransform4f -/* 80086470 000833D0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80086474 000833D4 3B 83 66 A0 */ addi r28, r3, skZero3f@l +/* 80086470 000833D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80086474 000833D4 3B 83 66 A0 */ addi r28, r3, sZeroVector__9CVector3f@l /* 80086478 000833D8 C0 5C 00 00 */ lfs f2, 0(r28) /* 8008647C 000833DC C0 3C 00 04 */ lfs f1, 4(r28) /* 80086480 000833E0 C0 1C 00 08 */ lfs f0, 8(r28) @@ -6620,10 +6620,10 @@ lbl_80086658: /* 80086658 000835B8 C0 02 89 B8 */ lfs f0, lbl_805AA6D8@sda21(r2) /* 8008665C 000835BC FC 04 00 40 */ fcmpo cr0, f4, f0 /* 80086660 000835C0 40 80 00 20 */ bge lbl_80086680 -/* 80086664 000835C4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80086664 000835C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80086668 000835C8 C0 3C 00 04 */ lfs f1, 4(r28) /* 8008666C 000835CC C0 1C 00 08 */ lfs f0, 8(r28) -/* 80086670 000835D0 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80086670 000835D0 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 80086674 000835D4 D0 21 01 AC */ stfs f1, 0x1ac(r1) /* 80086678 000835D8 D0 41 01 A8 */ stfs f2, 0x1a8(r1) /* 8008667C 000835DC D0 01 01 B0 */ stfs f0, 0x1b0(r1) @@ -9139,9 +9139,9 @@ lbl_80088BD4: /* 80088C04 00085B64 48 00 00 84 */ b lbl_80088C88 lbl_80088C08: /* 80088C08 00085B68 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80088C0C 00085B6C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80088C0C 00085B6C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80088C10 00085B70 C0 01 00 B8 */ lfs f0, 0xb8(r1) -/* 80088C14 00085B74 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80088C14 00085B74 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80088C18 00085B78 C0 7F 00 08 */ lfs f3, 8(r31) /* 80088C1C 00085B7C 7F E4 FB 78 */ mr r4, r31 /* 80088C20 00085B80 EC 81 00 2A */ fadds f4, f1, f0 @@ -9196,9 +9196,9 @@ lbl_80088CCC: /* 80088CDC 00085C3C 4C 41 13 82 */ cror 2, 1, 2 /* 80088CE0 00085C40 40 82 00 84 */ bne lbl_80088D64 /* 80088CE4 00085C44 C0 3F 00 04 */ lfs f1, 4(r31) -/* 80088CE8 00085C48 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80088CE8 00085C48 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80088CEC 00085C4C C0 01 00 B8 */ lfs f0, 0xb8(r1) -/* 80088CF0 00085C50 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80088CF0 00085C50 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80088CF4 00085C54 C0 7F 00 08 */ lfs f3, 8(r31) /* 80088CF8 00085C58 7F E4 FB 78 */ mr r4, r31 /* 80088CFC 00085C5C EC 81 00 2A */ fadds f4, f1, f0 @@ -9238,9 +9238,9 @@ lbl_80088D64: /* 80088D80 00085CE0 EC 01 00 24 */ fdivs f0, f1, f0 /* 80088D84 00085CE4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80088D88 00085CE8 4B F8 35 2D */ bl "Clamp__5CMathFRCfRCfRCf" -/* 80088D8C 00085CEC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80088D8C 00085CEC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80088D90 00085CF0 C0 21 00 B8 */ lfs f1, 0xb8(r1) -/* 80088D94 00085CF4 38 84 66 F4 */ addi r4, r4, lbl_805A66F4@l +/* 80088D94 00085CF4 38 84 66 F4 */ addi r4, r4, sUpVector__9CVector3f@l /* 80088D98 00085CF8 C0 61 00 B4 */ lfs f3, 0xb4(r1) /* 80088D9C 00085CFC C0 04 00 04 */ lfs f0, 4(r4) /* 80088DA0 00085D00 C0 44 00 00 */ lfs f2, 0(r4) @@ -10244,9 +10244,9 @@ lbl_80089BE0: /* 80089C5C 00086BBC D0 41 00 2C */ stfs f2, 0x2c(r1) /* 80089C60 00086BC0 D0 01 00 30 */ stfs f0, 0x30(r1) /* 80089C64 00086BC4 4B FF 9E 01 */ bl UpdateLookAtPosition__11CBallCameraFfR13CStateManager -/* 80089C68 00086BC8 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80089C68 00086BC8 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80089C6C 00086BCC 38 61 00 40 */ addi r3, r1, 0x40 -/* 80089C70 00086BD0 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80089C70 00086BD0 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80089C74 00086BD4 38 BE 01 D8 */ addi r5, r30, 0x1d8 /* 80089C78 00086BD8 38 81 00 28 */ addi r4, r1, 0x28 /* 80089C7C 00086BDC 48 28 9E 95 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -10338,10 +10338,10 @@ lbl_80089D90: /* 80089DC4 00086D24 D0 01 02 24 */ stfs f0, 0x224(r1) /* 80089DC8 00086D28 D0 21 02 28 */ stfs f1, 0x228(r1) lbl_80089DCC: -/* 80089DCC 00086D2C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80089DD0 00086D30 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80089DD4 00086D34 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80089DD8 00086D38 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80089DCC 00086D2C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80089DD0 00086D30 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80089DD4 00086D34 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80089DD8 00086D38 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80089DDC 00086D3C 38 61 03 AC */ addi r3, r1, 0x3ac /* 80089DE0 00086D40 38 A1 02 20 */ addi r5, r1, 0x220 /* 80089DE4 00086D44 48 28 9D 2D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -11214,9 +11214,9 @@ DetectCollision__11CBallCameraFRC9CVector3fRC9CVector3ffRfR13CStateManager: /* 8008AAC8 00087A28 D0 41 00 58 */ stfs f2, 0x58(r1) /* 8008AACC 00087A2C D0 21 00 5C */ stfs f1, 0x5c(r1) /* 8008AAD0 00087A30 40 81 05 EC */ ble lbl_8008B0BC -/* 8008AAD4 00087A34 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 8008AAD4 00087A34 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 8008AAD8 00087A38 C0 02 89 E0 */ lfs f0, lbl_805AA700@sda21(r2) -/* 8008AADC 00087A3C 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l +/* 8008AADC 00087A3C 38 A3 67 54 */ addi r5, r3, mskInvertedBox__6CAABox@l /* 8008AAE0 00087A40 7F 64 DB 78 */ mr r4, r27 /* 8008AAE4 00087A44 C0 A5 00 00 */ lfs f5, 0(r5) /* 8008AAE8 00087A48 EF C0 07 72 */ fmuls f30, f0, f29 @@ -11296,9 +11296,9 @@ lbl_8008ABF8: /* 8008AC0C 00087B6C 90 01 00 20 */ stw r0, 0x20(r1) /* 8008AC10 00087B70 48 2F F2 E5 */ bl __shl2i /* 8008AC14 00087B74 80 01 00 20 */ lwz r0, 0x20(r1) -/* 8008AC18 00087B78 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8008AC18 00087B78 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8008AC1C 00087B7C 80 C1 00 24 */ lwz r6, 0x24(r1) -/* 8008AC20 00087B80 3B E5 66 A0 */ addi r31, r5, skZero3f@l +/* 8008AC20 00087B80 3B E5 66 A0 */ addi r31, r5, sZeroVector__9CVector3f@l /* 8008AC24 00087B84 7C 00 1B 78 */ or r0, r0, r3 /* 8008AC28 00087B88 C3 DF 00 00 */ lfs f30, 0(r31) /* 8008AC2C 00087B8C 7C C4 23 78 */ or r4, r6, r4 @@ -11460,10 +11460,10 @@ lbl_8008AE34: /* 8008AE68 00087DC8 90 01 00 18 */ stw r0, 0x18(r1) /* 8008AE6C 00087DCC 48 2F F0 89 */ bl __shl2i /* 8008AE70 00087DD0 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8008AE74 00087DD4 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8008AE74 00087DD4 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8008AE78 00087DD8 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8008AE7C 00087DDC 7C 00 1B 78 */ or r0, r0, r3 -/* 8008AE80 00087DE0 C3 65 66 A0 */ lfs f27, skZero3f@l(r5) +/* 8008AE80 00087DE0 C3 65 66 A0 */ lfs f27, sZeroVector__9CVector3f@l(r5) /* 8008AE84 00087DE4 7C C4 23 78 */ or r4, r6, r4 /* 8008AE88 00087DE8 90 01 00 18 */ stw r0, 0x18(r1) /* 8008AE8C 00087DEC C3 9F 00 04 */ lfs f28, 4(r31) @@ -11791,11 +11791,11 @@ lbl_8008B228: "CalculateCollidersBoundingBox__11CBallCameraCFRCQ24rstl52vector<15CCameraCollider,Q24rstl17rmemory_allocator>RC13CStateManager": /* 8008B31C 0008827C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8008B320 00088280 7C 08 02 A6 */ mflr r0 -/* 8008B324 00088284 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 8008B324 00088284 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 8008B328 00088288 90 01 00 54 */ stw r0, 0x54(r1) /* 8008B32C 0008828C BF 61 00 3C */ stmw r27, 0x3c(r1) /* 8008B330 00088290 7C 7B 1B 78 */ mr r27, r3 -/* 8008B334 00088294 38 64 67 54 */ addi r3, r4, lbl_805A6754@l +/* 8008B334 00088294 38 64 67 54 */ addi r3, r4, mskInvertedBox__6CAABox@l /* 8008B338 00088298 7C BC 2B 78 */ mr r28, r5 /* 8008B33C 0008829C 7C DD 33 78 */ mr r29, r6 /* 8008B340 000882A0 3B C0 00 00 */ li r30, 0 @@ -11928,8 +11928,8 @@ ApplyColliders__11CBallCameraFv: /* 8008B508 00088468 D3 BF 02 A8 */ stfs f29, 0x2a8(r31) /* 8008B50C 0008846C 48 00 00 20 */ b lbl_8008B52C lbl_8008B510: -/* 8008B510 00088470 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008B514 00088474 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8008B510 00088470 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008B514 00088474 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8008B518 00088478 D0 1F 02 A0 */ stfs f0, 0x2a0(r31) /* 8008B51C 0008847C C0 03 00 04 */ lfs f0, 4(r3) /* 8008B520 00088480 D0 1F 02 A4 */ stfs f0, 0x2a4(r31) @@ -11946,8 +11946,8 @@ lbl_8008B52C: /* 8008B548 000884A8 D3 5F 02 B4 */ stfs f26, 0x2b4(r31) /* 8008B54C 000884AC 48 00 00 20 */ b lbl_8008B56C lbl_8008B550: -/* 8008B550 000884B0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008B554 000884B4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8008B550 000884B0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008B554 000884B4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8008B558 000884B8 D0 1F 02 AC */ stfs f0, 0x2ac(r31) /* 8008B55C 000884BC C0 03 00 04 */ lfs f0, 4(r3) /* 8008B560 000884C0 D0 1F 02 B0 */ stfs f0, 0x2b0(r31) @@ -11966,8 +11966,8 @@ lbl_8008B56C: /* 8008B590 000884F0 D0 BF 02 C0 */ stfs f5, 0x2c0(r31) /* 8008B594 000884F4 48 00 00 20 */ b lbl_8008B5B4 lbl_8008B598: -/* 8008B598 000884F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008B59C 000884FC C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8008B598 000884F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008B59C 000884FC C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8008B5A0 00088500 D0 1F 02 B8 */ stfs f0, 0x2b8(r31) /* 8008B5A4 00088504 C0 03 00 04 */ lfs f0, 4(r3) /* 8008B5A8 00088508 D0 1F 02 BC */ stfs f0, 0x2bc(r31) @@ -12038,8 +12038,8 @@ lbl_8008B694: /* 8008B694 000885F4 88 1F 01 8C */ lbz r0, 0x18c(r31) /* 8008B698 000885F8 54 00 EF FF */ rlwinm. r0, r0, 0x1d, 0x1f, 0x1f /* 8008B69C 000885FC 40 82 00 24 */ bne lbl_8008B6C0 -/* 8008B6A0 00088600 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008B6A4 00088604 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8008B6A0 00088600 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008B6A4 00088604 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8008B6A8 00088608 D0 1E 00 00 */ stfs f0, 0(r30) /* 8008B6AC 0008860C C0 03 00 04 */ lfs f0, 4(r3) /* 8008B6B0 00088610 D0 1E 00 04 */ stfs f0, 4(r30) @@ -12228,9 +12228,9 @@ lbl_8008B8C4: /* 8008B940 000888A0 7D 3D 4B 78 */ mr r29, r9 /* 8008B944 000888A4 40 80 05 30 */ bge lbl_8008BE74 /* 8008B948 000888A8 80 ED A1 18 */ lwz r7, gpTweakPlayer@sda21(r13) -/* 8008B94C 000888AC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8008B94C 000888AC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8008B950 000888B0 80 AD A1 1C */ lwz r5, gpTweakBall@sda21(r13) -/* 8008B954 000888B4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8008B954 000888B4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8008B958 000888B8 81 1D 08 4C */ lwz r8, 0x84c(r29) /* 8008B95C 000888BC 38 61 01 50 */ addi r3, r1, 0x150 /* 8008B960 000888C0 C0 45 00 7C */ lfs f2, 0x7c(r5) @@ -12803,9 +12803,9 @@ Reset__11CBallCameraFRC12CTransform4fR13CStateManager: /* 8008C1F4 00089154 48 28 85 05 */ bl CanBeNormalized__9CVector3fCFv /* 8008C1F8 00089158 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C1FC 0008915C 41 82 00 30 */ beq lbl_8008C22C -/* 8008C200 00089160 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8008C200 00089160 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8008C204 00089164 38 61 00 98 */ addi r3, r1, 0x98 -/* 8008C208 00089168 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8008C208 00089168 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8008C20C 0008916C 38 BE 01 D8 */ addi r5, r30, 0x1d8 /* 8008C210 00089170 38 81 00 5C */ addi r4, r1, 0x5c /* 8008C214 00089174 48 28 78 FD */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -12840,8 +12840,8 @@ lbl_8008C22C: /* 8008C284 000891E4 4B F7 E5 C5 */ bl SetPlayerCamera__14CCameraManagerFR13CStateManager9TUniqueId lbl_8008C288: /* 8008C288 000891E8 C0 22 89 B0 */ lfs f1, lbl_805AA6D0@sda21(r2) -/* 8008C28C 000891EC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008C290 000891F0 3B A3 66 A0 */ addi r29, r3, skZero3f@l +/* 8008C28C 000891EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008C290 000891F0 3B A3 66 A0 */ addi r29, r3, sZeroVector__9CVector3f@l /* 8008C294 000891F4 38 A0 00 00 */ li r5, 0 /* 8008C298 000891F8 D0 3E 02 E8 */ stfs f1, 0x2e8(r30) /* 8008C29C 000891FC 7F 84 E3 78 */ mr r4, r28 @@ -12867,8 +12867,8 @@ lbl_8008C288: /* 8008C2EC 0008924C D0 3E 03 08 */ stfs f1, 0x308(r30) /* 8008C2F0 00089250 48 1F 8A 59 */ bl GetBallPosition__7CPlayerCFv /* 8008C2F4 00089254 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 8008C2F8 00089258 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8008C2FC 0008925C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8008C2F8 00089258 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8008C2FC 0008925C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8008C300 00089260 38 00 00 00 */ li r0, 0 /* 8008C304 00089264 D0 1E 02 DC */ stfs f0, 0x2dc(r30) /* 8008C308 00089268 38 A0 00 01 */ li r5, 1 @@ -13890,12 +13890,12 @@ lbl_8008D080: /* 8008D1C4 0008A124 C0 03 00 8C */ lfs f0, 0x8c(r3) /* 8008D1C8 0008A128 D0 1E 01 9C */ stfs f0, 0x19c(r30) /* 8008D1CC 0008A12C C0 22 8A 3C */ lfs f1, lbl_805AA75C@sda21(r2) -/* 8008D1D0 0008A130 3C A0 80 5A */ lis r5, skZero3f@ha -/* 8008D1D4 0008A134 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8008D1D0 0008A130 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 8008D1D4 0008A134 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8008D1D8 0008A138 C0 02 8A B0 */ lfs f0, lbl_805AA7D0@sda21(r2) /* 8008D1DC 0008A13C D0 3E 01 A0 */ stfs f1, 0x1a0(r30) -/* 8008D1E0 0008A140 3B E5 66 A0 */ addi r31, r5, skZero3f@l -/* 8008D1E4 0008A144 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8008D1E0 0008A140 3B E5 66 A0 */ addi r31, r5, sZeroVector__9CVector3f@l +/* 8008D1E4 0008A144 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8008D1E8 0008A148 C0 22 89 B0 */ lfs f1, lbl_805AA6D0@sda21(r2) /* 8008D1EC 0008A14C 80 AD A1 1C */ lwz r5, gpTweakBall@sda21(r13) /* 8008D1F0 0008A150 38 7E 01 E4 */ addi r3, r30, 0x1e4 @@ -13974,8 +13974,8 @@ lbl_8008D080: /* 8008D314 0008A274 D0 3E 02 50 */ stfs f1, 0x250(r30) /* 8008D318 0008A278 48 28 81 E9 */ bl SqrtF__5CMathFf /* 8008D31C 0008A27C C0 02 89 E0 */ lfs f0, lbl_805AA700@sda21(r2) -/* 8008D320 0008A280 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8008D324 0008A284 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 8008D320 0008A280 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8008D324 0008A284 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8008D328 0008A288 3C 60 80 5A */ lis r3, lbl_805A6784@ha /* 8008D32C 0008A28C EC 20 00 72 */ fmuls f1, f0, f1 /* 8008D330 0008A290 38 A3 67 84 */ addi r5, r3, lbl_805A6784@l @@ -14062,9 +14062,9 @@ lbl_8008D080: /* 8008D474 0008A3D4 80 AD 84 74 */ lwz r5, lbl_805A7034@sda21(r13) /* 8008D478 0008A3D8 48 2F CA 7D */ bl __shl2i /* 8008D47C 0008A3DC 80 1E 03 54 */ lwz r0, 0x354(r30) -/* 8008D480 0008A3E0 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8008D480 0008A3E0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8008D484 0008A3E4 80 FE 03 50 */ lwz r7, 0x350(r30) -/* 8008D488 0008A3E8 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 8008D488 0008A3E8 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8008D48C 0008A3EC 7C 00 23 78 */ or r0, r0, r4 /* 8008D490 0008A3F0 C0 22 89 B0 */ lfs f1, lbl_805AA6D0@sda21(r2) /* 8008D494 0008A3F4 90 1E 03 54 */ stw r0, 0x354(r30) @@ -14173,8 +14173,8 @@ lbl_8008D080: /* 8008D630 0008A590 D0 3E 04 48 */ stfs f1, 0x448(r30) /* 8008D634 0008A594 48 28 7E CD */ bl SqrtF__5CMathFf /* 8008D638 0008A598 C0 02 89 E0 */ lfs f0, lbl_805AA700@sda21(r2) -/* 8008D63C 0008A59C 3C A0 80 5A */ lis r5, skZero3f@ha -/* 8008D640 0008A5A0 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 8008D63C 0008A59C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 8008D640 0008A5A0 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8008D644 0008A5A4 3C 60 80 3D */ lis r3, lbl_803CD678@ha /* 8008D648 0008A5A8 EC 00 00 72 */ fmuls f0, f0, f1 /* 8008D64C 0008A5AC 38 83 D6 78 */ addi r4, r3, lbl_803CD678@l diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index dc1dec65..94f3219b 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -64,19 +64,19 @@ nullsub_19: __ct__Q211CBallCamera14SFailsafeStateFv: /* 8023E608 0023B568 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023E60C 0023B56C 7C 08 02 A6 */ mflr r0 -/* 8023E610 0023B570 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8023E610 0023B570 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8023E614 0023B574 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023E618 0023B578 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8023E618 0023B578 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8023E61C 0023B57C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023E620 0023B580 7C 7F 1B 78 */ mr r31, r3 /* 8023E624 0023B584 48 0D 45 51 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8023E628 0023B588 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8023E628 0023B588 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8023E62C 0023B58C 38 7F 00 30 */ addi r3, r31, 0x30 -/* 8023E630 0023B590 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8023E630 0023B590 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8023E634 0023B594 48 0D 45 41 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8023E638 0023B598 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8023E638 0023B598 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8023E63C 0023B59C 38 00 00 00 */ li r0, 0 -/* 8023E640 0023B5A0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8023E640 0023B5A0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8023E644 0023B5A4 7F E3 FB 78 */ mr r3, r31 /* 8023E648 0023B5A8 C0 04 00 00 */ lfs f0, 0(r4) /* 8023E64C 0023B5AC D0 1F 00 60 */ stfs f0, 0x60(r31) @@ -239,9 +239,9 @@ lbl_8023E740: /* 8023E8AC 0023B80C C0 02 B7 AC */ lfs f0, lbl_805AD4CC@sda21(r2) /* 8023E8B0 0023B810 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8023E8B4 0023B814 40 81 00 54 */ ble lbl_8023E908 -/* 8023E8B8 0023B818 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8023E8B8 0023B818 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8023E8BC 0023B81C 38 61 00 4C */ addi r3, r1, 0x4c -/* 8023E8C0 0023B820 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8023E8C0 0023B820 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8023E8C4 0023B824 38 A1 00 40 */ addi r5, r1, 0x40 /* 8023E8C8 0023B828 38 81 00 34 */ addi r4, r1, 0x34 /* 8023E8CC 0023B82C 48 0D 52 45 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -683,9 +683,9 @@ CheckTransitionLineOfSight__11CBallCameraFRC9CVector3fRC9CVector3fRffR13CStateMa /* 8023EF28 0023BE88 D0 41 00 50 */ stfs f2, 0x50(r1) /* 8023EF2C 0023BE8C D0 21 00 54 */ stfs f1, 0x54(r1) /* 8023EF30 0023BE90 40 81 03 B0 */ ble lbl_8023F2E0 -/* 8023EF34 0023BE94 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 8023EF34 0023BE94 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 8023EF38 0023BE98 C0 02 B7 C4 */ lfs f0, lbl_805AD4E4@sda21(r2) -/* 8023EF3C 0023BE9C 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l +/* 8023EF3C 0023BE9C 38 A3 67 54 */ addi r5, r3, mskInvertedBox__6CAABox@l /* 8023EF40 0023BEA0 7F 84 E3 78 */ mr r4, r28 /* 8023EF44 0023BEA4 C0 A5 00 00 */ lfs f5, 0(r5) /* 8023EF48 0023BEA8 EF C0 07 72 */ fmuls f30, f0, f29 @@ -773,8 +773,8 @@ lbl_8023F058: /* 8023F08C 0023BFEC 90 01 00 18 */ stw r0, 0x18(r1) /* 8023F090 0023BFF0 48 14 AE 65 */ bl __shl2i /* 8023F094 0023BFF4 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8023F098 0023BFF8 3C A0 80 5A */ lis r5, skZero3f@ha -/* 8023F09C 0023BFFC C7 C5 66 A0 */ lfsu f30, skZero3f@l(r5) +/* 8023F098 0023BFF8 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 8023F09C 0023BFFC C7 C5 66 A0 */ lfsu f30, sZeroVector__9CVector3f@l(r5) /* 8023F0A0 0023C000 7C 00 1B 78 */ or r0, r0, r3 /* 8023F0A4 0023C004 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8023F0A8 0023C008 90 01 00 18 */ stw r0, 0x18(r1) diff --git a/asm/MetroidPrime/Cameras/CCameraFilter.s b/asm/MetroidPrime/Cameras/CCameraFilter.s index c9ee918a..8f15f132 100644 --- a/asm/MetroidPrime/Cameras/CCameraFilter.s +++ b/asm/MetroidPrime/Cameras/CCameraFilter.s @@ -474,12 +474,12 @@ lbl_800EAC40: /* 800EACF4 000E7C54 81 8C 00 60 */ lwz r12, 0x60(r12) /* 800EACF8 000E7C58 7D 89 03 A6 */ mtctr r12 /* 800EACFC 000E7C5C 4E 80 04 21 */ bctrl -/* 800EAD00 000E7C60 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800EAD04 000E7C64 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 800EAD00 000E7C60 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800EAD04 000E7C64 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 800EAD08 000E7C68 48 22 1A 45 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 800EAD0C 000E7C6C 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 800EAD10 000E7C70 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800EAD14 000E7C74 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800EAD10 000E7C70 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800EAD14 000E7C74 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800EAD18 000E7C78 81 83 00 00 */ lwz r12, 0(r3) /* 800EAD1C 000E7C7C 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800EAD20 000E7C80 7D 89 03 A6 */ mtctr r12 @@ -2258,8 +2258,8 @@ DrawWideScreen__17CCameraFilterPassFRC6CColorPC8CTexturef: /* 800EC6D0 000E9630 7D 89 03 A6 */ mtctr r12 /* 800EC6D4 000E9634 4E 80 04 21 */ bctrl /* 800EC6D8 000E9638 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 800EC6DC 000E963C 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800EC6E0 000E9640 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800EC6DC 000E963C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800EC6E0 000E9640 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800EC6E4 000E9644 81 83 00 00 */ lwz r12, 0(r3) /* 800EC6E8 000E9648 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800EC6EC 000E964C 7D 89 03 A6 */ mtctr r12 @@ -2514,8 +2514,8 @@ DrawScanLines__17CCameraFilterPassFRC6CColorb: /* 800ECAAC 000E9A0C 7D 89 03 A6 */ mtctr r12 /* 800ECAB0 000E9A10 4E 80 04 21 */ bctrl /* 800ECAB4 000E9A14 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 800ECAB8 000E9A18 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800ECABC 000E9A1C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800ECAB8 000E9A18 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800ECABC 000E9A1C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800ECAC0 000E9A20 81 83 00 00 */ lwz r12, 0(r3) /* 800ECAC4 000E9A24 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800ECAC8 000E9A28 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Cameras/CCameraManager.s b/asm/MetroidPrime/Cameras/CCameraManager.s index c4d04673..310aa335 100644 --- a/asm/MetroidPrime/Cameras/CCameraManager.s +++ b/asm/MetroidPrime/Cameras/CCameraManager.s @@ -133,8 +133,8 @@ GetCameraBobMagnitude__14CCameraManagerCFv: /* 80009154 000060B4 DB E1 00 10 */ stfd f31, 0x10(r1) /* 80009158 000060B8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 8000915C 000060BC 80 83 00 7C */ lwz r4, 0x7c(r3) -/* 80009160 000060C0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80009164 000060C4 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 80009160 000060C0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80009164 000060C4 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 80009168 000060C8 C8 02 80 68 */ lfd f0, lbl_805A9D88@sda21(r2) /* 8000916C 000060CC C0 44 00 48 */ lfs f2, 0x48(r4) /* 80009170 000060D0 C0 23 00 04 */ lfs f1, 4(r3) @@ -1314,9 +1314,9 @@ lbl_8000A188: /* 8000A1A4 00007104 54 80 06 B5 */ rlwinm. r0, r4, 0, 0x1a, 0x1a /* 8000A1A8 00007108 41 82 00 48 */ beq lbl_8000A1F0 /* 8000A1AC 0000710C 80 9E 00 80 */ lwz r4, 0x80(r30) -/* 8000A1B0 00007110 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8000A1B0 00007110 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8000A1B4 00007114 C0 58 00 60 */ lfs f2, 0x60(r24) -/* 8000A1B8 00007118 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8000A1B8 00007118 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8000A1BC 0000711C C0 38 00 50 */ lfs f1, 0x50(r24) /* 8000A1C0 00007120 38 A4 01 D8 */ addi r5, r4, 0x1d8 /* 8000A1C4 00007124 C0 18 00 40 */ lfs f0, 0x40(r24) @@ -1984,9 +1984,9 @@ lbl_8000AAD4: /* 8000AB08 00007A68 80 81 01 0C */ lwz r4, 0x10c(r1) /* 8000AB0C 00007A6C 41 82 00 58 */ beq lbl_8000AB64 /* 8000AB10 00007A70 C0 5D 00 C4 */ lfs f2, 0xc4(r29) -/* 8000AB14 00007A74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8000AB14 00007A74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8000AB18 00007A78 C0 3D 00 C8 */ lfs f1, 0xc8(r29) -/* 8000AB1C 00007A7C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8000AB1C 00007A7C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8000AB20 00007A80 C0 1D 00 CC */ lfs f0, 0xcc(r29) /* 8000AB24 00007A84 54 87 06 3E */ clrlwi r7, r4, 0x18 /* 8000AB28 00007A88 D0 41 00 24 */ stfs f2, 0x24(r1) @@ -2959,9 +2959,9 @@ UpdateRumble__14CCameraManagerFfR13CStateManager: /* 8000B884 000087E4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8000B888 000087E8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 8000B88C 000087EC BF 61 00 1C */ stmw r27, 0x1c(r1) -/* 8000B890 000087F0 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8000B890 000087F0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8000B894 000087F4 7C 7D 1B 78 */ mr r29, r3 -/* 8000B898 000087F8 3B E5 66 A0 */ addi r31, r5, skZero3f@l +/* 8000B898 000087F8 3B E5 66 A0 */ addi r31, r5, sZeroVector__9CVector3f@l /* 8000B89C 000087FC FF E0 08 90 */ fmr f31, f1 /* 8000B8A0 00008800 C0 1F 00 00 */ lfs f0, 0(r31) /* 8000B8A4 00008804 7C 9E 23 78 */ mr r30, r4 @@ -3053,8 +3053,8 @@ lbl_8000B9D0: /* 8000B9E4 00008944 4B FF EF 1D */ bl IsInCinematicCamera__14CCameraManagerCFv /* 8000B9E8 00008948 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8000B9EC 0000894C 40 82 00 20 */ bne lbl_8000BA0C -/* 8000B9F0 00008950 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8000B9F4 00008954 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 8000B9F0 00008950 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8000B9F4 00008954 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 8000B9F8 00008958 D0 1D 00 30 */ stfs f0, 0x30(r29) /* 8000B9FC 0000895C C0 1F 00 04 */ lfs f0, 4(r31) /* 8000BA00 00008960 D0 1D 00 34 */ stfs f0, 0x34(r29) @@ -3082,9 +3082,9 @@ UpdateSfxListener__14CCameraManagerFR13CStateManager: /* 8000BA48 000089A8 38 81 00 2C */ addi r4, r1, 0x2c /* 8000BA4C 000089AC 48 30 71 29 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8000BA50 000089B0 C1 01 00 64 */ lfs f8, 0x64(r1) -/* 8000BA54 000089B4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8000BA54 000089B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8000BA58 000089B8 C0 E1 00 74 */ lfs f7, 0x74(r1) -/* 8000BA5C 000089BC 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8000BA5C 000089BC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8000BA60 000089C0 C0 C1 00 84 */ lfs f6, 0x84(r1) /* 8000BA64 000089C4 38 61 00 20 */ addi r3, r1, 0x20 /* 8000BA68 000089C8 C0 A1 00 60 */ lfs f5, 0x60(r1) @@ -3096,7 +3096,7 @@ UpdateSfxListener__14CCameraManagerFR13CStateManager: /* 8000BA80 000089E0 C0 21 00 78 */ lfs f1, 0x78(r1) /* 8000BA84 000089E4 C0 01 00 88 */ lfs f0, 0x88(r1) /* 8000BA88 000089E8 D1 01 00 08 */ stfs f8, 8(r1) -/* 8000BA8C 000089EC 88 E2 CC 40 */ lbz r7, lbl_805AE960@sda21(r2) +/* 8000BA8C 000089EC 88 E2 CC 40 */ lbz r7, kMaxVolume__9CAudioSys@sda21(r2) /* 8000BA90 000089F0 D0 E1 00 0C */ stfs f7, 0xc(r1) /* 8000BA94 000089F4 D0 C1 00 10 */ stfs f6, 0x10(r1) /* 8000BA98 000089F8 D0 A1 00 14 */ stfs f5, 0x14(r1) @@ -3398,10 +3398,10 @@ CreateStandardCameras__14CCameraManagerFR13CStateManager: /* 8000BE88 00008DE8 93 C1 00 88 */ stw r30, 0x88(r1) /* 8000BE8C 00008DEC 93 A1 00 84 */ stw r29, 0x84(r1) /* 8000BE90 00008DF0 7C 9F 23 78 */ mr r31, r4 -/* 8000BE94 00008DF4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8000BE94 00008DF4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8000BE98 00008DF8 80 BF 08 4C */ lwz r5, 0x84c(r31) /* 8000BE9C 00008DFC 7C 7E 1B 78 */ mr r30, r3 -/* 8000BEA0 00008E00 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8000BEA0 00008E00 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8000BEA4 00008E04 38 61 00 44 */ addi r3, r1, 0x44 /* 8000BEA8 00008E08 A0 05 00 08 */ lhz r0, 8(r5) /* 8000BEAC 00008E0C B0 01 00 34 */ sth r0, 0x34(r1) @@ -3572,9 +3572,9 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C0EC 0000904C 90 01 00 44 */ stw r0, 0x44(r1) /* 8000C0F0 00009050 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8000C0F4 00009054 7C 7F 1B 78 */ mr r31, r3 -/* 8000C0F8 00009058 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8000C0F8 00009058 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8000C0FC 0000905C A0 04 00 00 */ lhz r0, 0(r4) -/* 8000C100 00009060 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8000C100 00009060 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8000C104 00009064 38 7F 00 3C */ addi r3, r31, 0x3c /* 8000C108 00009068 B0 1F 00 00 */ sth r0, 0(r31) /* 8000C10C 0000906C 38 1F 00 20 */ addi r0, r31, 0x20 @@ -3595,9 +3595,9 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C148 000090A8 D0 1F 00 38 */ stfs f0, 0x38(r31) /* 8000C14C 000090AC 48 05 30 59 */ bl __ct__Q29CGameArea8CAreaFogFv /* 8000C150 000090B0 39 60 00 00 */ li r11, 0 -/* 8000C154 000090B4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8000C154 000090B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8000C158 000090B8 91 7F 00 74 */ stw r11, 0x74(r31) -/* 8000C15C 000090BC 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8000C15C 000090BC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8000C160 000090C0 C0 22 80 94 */ lfs f1, lbl_805A9DB4@sda21(r2) /* 8000C164 000090C4 39 40 FF FF */ li r10, -1 /* 8000C168 000090C8 A0 6D A3 8C */ lhz r3, kInvalidUniqueId@sda21(r13) @@ -3613,7 +3613,7 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C190 000090F0 38 E1 00 08 */ addi r7, r1, 8 /* 8000C194 000090F4 91 7F 00 80 */ stw r11, 0x80(r31) /* 8000C198 000090F8 38 60 00 01 */ li r3, 1 -/* 8000C19C 000090FC 89 22 CC 40 */ lbz r9, lbl_805AE960@sda21(r2) +/* 8000C19C 000090FC 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2) /* 8000C1A0 00009100 39 00 00 01 */ li r8, 1 /* 8000C1A4 00009104 91 7F 00 84 */ stw r11, 0x84(r31) /* 8000C1A8 00009108 91 7F 00 88 */ stw r11, 0x88(r31) diff --git a/asm/MetroidPrime/Cameras/CCameraShakeData.s b/asm/MetroidPrime/Cameras/CCameraShakeData.s index 6c4890ff..ce754f5a 100644 --- a/asm/MetroidPrime/Cameras/CCameraShakeData.s +++ b/asm/MetroidPrime/Cameras/CCameraShakeData.s @@ -309,9 +309,9 @@ lbl_8015CCA0: /* 8015CCAC 00159C0C 38 80 00 01 */ li r4, 1 /* 8015CCB0 00159C10 48 00 05 A1 */ bl __ct__22CCameraShakerComponentFiRC17SCameraShakePointRC17SCameraShakePoint /* 8015CCB4 00159C14 FC 20 E8 90 */ fmr f1, f29 -/* 8015CCB8 00159C18 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015CCB8 00159C18 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015CCBC 00159C1C C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015CCC0 00159C20 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015CCC0 00159C20 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015CCC4 00159C24 7F C3 F3 78 */ mr r3, r30 /* 8015CCC8 00159C28 38 C1 01 4C */ addi r6, r1, 0x14c /* 8015CCCC 00159C2C 38 E1 01 10 */ addi r7, r1, 0x110 @@ -1080,9 +1080,9 @@ BuildLandingCameraShake__16CCameraShakeDataFff: /* 8015D7A0 0015A700 38 61 00 68 */ addi r3, r1, 0x68 /* 8015D7A4 0015A704 4B FF F9 8D */ bl __ct__22CCameraShakerComponentFv /* 8015D7A8 0015A708 FC 20 F0 90 */ fmr f1, f30 -/* 8015D7AC 0015A70C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015D7AC 0015A70C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015D7B0 0015A710 C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015D7B4 0015A714 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015D7B4 0015A714 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015D7B8 0015A718 7F E3 FB 78 */ mr r3, r31 /* 8015D7BC 0015A71C 38 C1 00 E0 */ addi r6, r1, 0xe0 /* 8015D7C0 0015A720 38 E1 00 68 */ addi r7, r1, 0x68 @@ -1154,9 +1154,9 @@ __ct__16CCameraShakeDataFff: /* 8015D8B0 0015A810 38 61 00 38 */ addi r3, r1, 0x38 /* 8015D8B4 0015A814 4B FF F8 7D */ bl __ct__22CCameraShakerComponentFv /* 8015D8B8 0015A818 FC 20 F8 90 */ fmr f1, f31 -/* 8015D8BC 0015A81C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015D8BC 0015A81C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015D8C0 0015A820 C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015D8C4 0015A824 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015D8C4 0015A824 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015D8C8 0015A828 7F E3 FB 78 */ mr r3, r31 /* 8015D8CC 0015A82C 38 C1 00 74 */ addi r6, r1, 0x74 /* 8015D8D0 0015A830 38 E1 00 38 */ addi r7, r1, 0x38 @@ -1226,9 +1226,9 @@ BuildPatternedExplodeShakeData__16CCameraShakeDataFff: /* 8015D9B8 0015A918 38 61 00 38 */ addi r3, r1, 0x38 /* 8015D9BC 0015A91C 4B FF F7 75 */ bl __ct__22CCameraShakerComponentFv /* 8015D9C0 0015A920 FC 20 F8 90 */ fmr f1, f31 -/* 8015D9C4 0015A924 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015D9C4 0015A924 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015D9C8 0015A928 C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015D9CC 0015A92C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015D9CC 0015A92C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015D9D0 0015A930 7F E3 FB 78 */ mr r3, r31 /* 8015D9D4 0015A934 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 8015D9D8 0015A938 38 E1 00 74 */ addi r7, r1, 0x74 @@ -1321,9 +1321,9 @@ BuildPhazonCameraShakeData__16CCameraShakeDataFff: /* 8015DB1C 0015AA7C 38 61 00 68 */ addi r3, r1, 0x68 /* 8015DB20 0015AA80 4B FF F6 11 */ bl __ct__22CCameraShakerComponentFv /* 8015DB24 0015AA84 FC 20 E8 90 */ fmr f1, f29 -/* 8015DB28 0015AA88 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015DB28 0015AA88 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015DB2C 0015AA8C C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015DB30 0015AA90 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015DB30 0015AA90 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015DB34 0015AA94 7F E3 FB 78 */ mr r3, r31 /* 8015DB38 0015AA98 38 C1 00 E0 */ addi r6, r1, 0xe0 /* 8015DB3C 0015AA9C 38 E1 00 68 */ addi r7, r1, 0x68 @@ -1395,9 +1395,9 @@ BuildProjectileCameraShake__16CCameraShakeDataFff: /* 8015DC2C 0015AB8C 38 61 00 38 */ addi r3, r1, 0x38 /* 8015DC30 0015AB90 4B FF F5 01 */ bl __ct__22CCameraShakerComponentFv /* 8015DC34 0015AB94 FC 20 F8 90 */ fmr f1, f31 -/* 8015DC38 0015AB98 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015DC38 0015AB98 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015DC3C 0015AB9C C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) -/* 8015DC40 0015ABA0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015DC40 0015ABA0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8015DC44 0015ABA4 7F E3 FB 78 */ mr r3, r31 /* 8015DC48 0015ABA8 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 8015DC4C 0015ABAC 38 E1 00 74 */ addi r7, r1, 0x74 @@ -1476,8 +1476,8 @@ __sinit_CCameraShakeData_cpp: /* 8015DD58 0015ACB8 38 61 00 BC */ addi r3, r1, 0xbc /* 8015DD5C 0015ACBC 4B FF F3 D5 */ bl __ct__22CCameraShakerComponentFv /* 8015DD60 0015ACC0 3C 60 80 57 */ lis r3, lbl_805719E8@ha -/* 8015DD64 0015ACC4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8015DD68 0015ACC8 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8015DD64 0015ACC4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8015DD68 0015ACC8 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8015DD6C 0015ACCC C0 22 9F 18 */ lfs f1, lbl_805ABC38@sda21(r2) /* 8015DD70 0015ACD0 C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) /* 8015DD74 0015ACD4 38 63 19 E8 */ addi r3, r3, lbl_805719E8@l @@ -1518,8 +1518,8 @@ lbl_8015DDD8: /* 8015DDF4 0015AD54 38 61 00 08 */ addi r3, r1, 8 /* 8015DDF8 0015AD58 4B FF F3 39 */ bl __ct__22CCameraShakerComponentFv /* 8015DDFC 0015AD5C 3C 60 80 57 */ lis r3, lbl_80571B90@ha -/* 8015DE00 0015AD60 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8015DE04 0015AD64 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8015DE00 0015AD60 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8015DE04 0015AD64 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8015DE08 0015AD68 C0 22 9F 18 */ lfs f1, lbl_805ABC38@sda21(r2) /* 8015DE0C 0015AD6C C0 42 9E F4 */ lfs f2, lbl_805ABC14@sda21(r2) /* 8015DE10 0015AD70 38 63 1B 90 */ addi r3, r3, lbl_80571B90@l diff --git a/asm/MetroidPrime/Cameras/CCinematicCamera.s b/asm/MetroidPrime/Cameras/CCinematicCamera.s index 50afb44a..73af2aab 100644 --- a/asm/MetroidPrime/Cameras/CCinematicCamera.s +++ b/asm/MetroidPrime/Cameras/CCinematicCamera.s @@ -378,8 +378,8 @@ lbl_80092EC0: /* 80092F10 0008FE70 D0 1D 00 08 */ stfs f0, 8(r29) /* 80092F14 0008FE74 48 00 02 20 */ b lbl_80093134 lbl_80092F18: -/* 80092F18 0008FE78 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80092F1C 0008FE7C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80092F18 0008FE78 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80092F1C 0008FE7C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80092F20 0008FE80 2C 05 00 00 */ cmpwi r5, 0 /* 80092F24 0008FE84 C0 43 00 04 */ lfs f2, 4(r3) /* 80092F28 0008FE88 C0 63 00 08 */ lfs f3, 8(r3) @@ -512,9 +512,9 @@ lbl_800930F4: /* 8009310C 0009006C 48 00 00 28 */ b lbl_80093134 lbl_80093110: /* 80093110 00090070 38 00 00 00 */ li r0, 0 -/* 80093114 00090074 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80093114 00090074 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80093118 00090078 90 1C 00 00 */ stw r0, 0(r28) -/* 8009311C 0009007C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8009311C 0009007C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80093120 00090080 D0 1D 00 00 */ stfs f0, 0(r29) /* 80093124 00090084 C0 03 00 04 */ lfs f0, 4(r3) /* 80093128 00090088 D0 1D 00 04 */ stfs f0, 4(r29) @@ -2536,9 +2536,9 @@ lbl_80094D60: /* 80094D90 00091CF0 B0 01 00 14 */ sth r0, 0x14(r1) /* 80094D94 00091CF4 4B FF FB 65 */ bl SendArrivedMsg__16CCinematicCameraCF9TUniqueIdR13CStateManager lbl_80094D98: -/* 80094D98 00091CF8 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80094D98 00091CF8 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80094D9C 00091CFC 38 61 00 8C */ addi r3, r1, 0x8c -/* 80094DA0 00091D00 38 A4 66 F4 */ addi r5, r4, lbl_805A66F4@l +/* 80094DA0 00091D00 38 A4 66 F4 */ addi r5, r4, sUpVector__9CVector3f@l /* 80094DA4 00091D04 38 81 00 F0 */ addi r4, r1, 0xf0 /* 80094DA8 00091D08 48 27 C4 BD */ bl Transform__11CQuaternionCFRC9CVector3f /* 80094DAC 00091D0C C0 41 00 E8 */ lfs f2, 0xe8(r1) @@ -2651,9 +2651,9 @@ lbl_80094F24: /* 80094F48 00091EA8 D0 41 00 CC */ stfs f2, 0xcc(r1) /* 80094F4C 00091EAC D0 21 00 D0 */ stfs f1, 0xd0(r1) lbl_80094F50: -/* 80094F50 00091EB0 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80094F50 00091EB0 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80094F54 00091EB4 38 61 00 68 */ addi r3, r1, 0x68 -/* 80094F58 00091EB8 38 A4 66 F4 */ addi r5, r4, lbl_805A66F4@l +/* 80094F58 00091EB8 38 A4 66 F4 */ addi r5, r4, sUpVector__9CVector3f@l /* 80094F5C 00091EBC 38 81 00 F0 */ addi r4, r1, 0xf0 /* 80094F60 00091EC0 48 27 C3 05 */ bl Transform__11CQuaternionCFRC9CVector3f /* 80094F64 00091EC4 C0 41 00 D0 */ lfs f2, 0xd0(r1) @@ -3051,8 +3051,8 @@ lbl_800953D8: /* 800954F4 00092454 90 1D 01 F8 */ stw r0, 0x1f8(r29) /* 800954F8 00092458 48 27 CC 31 */ bl FromMatrix__11CQuaternionFRC12CTransform4f /* 800954FC 0009245C C0 01 00 18 */ lfs f0, 0x18(r1) -/* 80095500 00092460 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80095504 00092464 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80095500 00092460 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80095504 00092464 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80095508 00092468 38 80 00 00 */ li r4, 0 /* 8009550C 0009246C D0 1D 01 FC */ stfs f0, 0x1fc(r29) /* 80095510 00092470 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index cbf5038d..48e8f38e 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -359,8 +359,8 @@ lbl_8000E2F4: .global SkipCinematic__18CFirstPersonCameraFv SkipCinematic__18CFirstPersonCameraFv: -/* 8000E318 0000B278 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8000E31C 0000B27C C4 24 66 A0 */ lfsu f1, skZero3f@l(r4) +/* 8000E318 0000B278 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8000E31C 0000B27C C4 24 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r4) /* 8000E320 0000B280 C0 02 80 B0 */ lfs f0, lbl_805A9DD0@sda21(r2) /* 8000E324 0000B284 D0 23 01 C8 */ stfs f1, 0x1c8(r3) /* 8000E328 0000B288 C0 24 00 04 */ lfs f1, 4(r4) @@ -451,9 +451,9 @@ UpdateTransform__18CFirstPersonCameraFR13CStateManagerf: /* 8000E44C 0000B3AC 83 C3 00 04 */ lwz r30, 4(r3) /* 8000E450 0000B3B0 28 1E 00 00 */ cmplwi r30, 0 /* 8000E454 0000B3B4 40 82 00 40 */ bne lbl_8000E494 -/* 8000E458 0000B3B8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8000E458 0000B3B8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8000E45C 0000B3BC 38 7F 00 34 */ addi r3, r31, 0x34 -/* 8000E460 0000B3C0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8000E460 0000B3C0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8000E464 0000B3C4 48 30 46 DD */ bl __as__12CTransform4fFRC12CTransform4f /* 8000E468 0000B3C8 88 1F 00 E4 */ lbz r0, 0xe4(r31) /* 8000E46C 0000B3CC 38 60 00 01 */ li r3, 1 @@ -553,8 +553,8 @@ lbl_8000E574: /* 8000E5D4 0000B534 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8000E5D8 0000B538 41 82 00 30 */ beq lbl_8000E608 /* 8000E5DC 0000B53C C0 02 80 B0 */ lfs f0, lbl_805A9DD0@sda21(r2) -/* 8000E5E0 0000B540 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8000E5E4 0000B544 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8000E5E0 0000B540 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8000E5E4 0000B544 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8000E5E8 0000B548 C0 22 80 CC */ lfs f1, lbl_805A9DEC@sda21(r2) /* 8000E5EC 0000B54C D0 01 04 40 */ stfs f0, 0x440(r1) /* 8000E5F0 0000B550 38 61 04 40 */ addi r3, r1, 0x440 @@ -630,9 +630,9 @@ lbl_8000E694: /* 8000E700 0000B660 EF DE 08 2A */ fadds f30, f30, f1 /* 8000E704 0000B664 EF BD 00 2A */ fadds f29, f29, f0 /* 8000E708 0000B668 48 0D B4 25 */ bl ResetCameraBobTime__16CPlayerCameraBobFv -/* 8000E70C 0000B66C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8000E70C 0000B66C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8000E710 0000B670 38 7C 00 2C */ addi r3, r28, 0x2c -/* 8000E714 0000B674 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8000E714 0000B674 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8000E718 0000B678 48 30 44 29 */ bl __as__12CTransform4fFRC12CTransform4f lbl_8000E71C: /* 8000E71C 0000B67C 80 1E 03 04 */ lwz r0, 0x304(r30) @@ -1662,9 +1662,9 @@ lbl_8000F618: /* 8000F67C 0000C5DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8000F680 0000C5E0 40 81 00 20 */ ble lbl_8000F6A0 lbl_8000F684: -/* 8000F684 0000C5E4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8000F684 0000C5E4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8000F688 0000C5E8 38 61 08 18 */ addi r3, r1, 0x818 -/* 8000F68C 0000C5EC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8000F68C 0000C5EC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8000F690 0000C5F0 48 30 34 B1 */ bl __as__12CTransform4fFRC12CTransform4f /* 8000F694 0000C5F4 38 7C 00 2C */ addi r3, r28, 0x2c /* 8000F698 0000C5F8 38 81 08 18 */ addi r4, r1, 0x818 @@ -2058,7 +2058,7 @@ lbl_8000FC14: /* 8000FC3C 0000CB9C 48 30 2F 39 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8000FC40 0000CBA0 C0 22 80 B0 */ lfs f1, lbl_805A9DD0@sda21(r2) /* 8000FC44 0000CBA4 38 A0 00 00 */ li r5, 0 -/* 8000FC48 0000CBA8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8000FC48 0000CBA8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8000FC4C 0000CBAC 7F C3 F3 78 */ mr r3, r30 /* 8000FC50 0000CBB0 D0 3E 01 C0 */ stfs f1, 0x1c0(r30) /* 8000FC54 0000CBB4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -2066,7 +2066,7 @@ lbl_8000FC14: /* 8000FC5C 0000CBBC 88 1E 01 C6 */ lbz r0, 0x1c6(r30) /* 8000FC60 0000CBC0 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 /* 8000FC64 0000CBC4 98 1E 01 C6 */ stb r0, 0x1c6(r30) -/* 8000FC68 0000CBC8 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 8000FC68 0000CBC8 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 8000FC6C 0000CBCC D0 1E 01 C8 */ stfs f0, 0x1c8(r30) /* 8000FC70 0000CBD0 C0 04 00 04 */ lfs f0, 4(r4) /* 8000FC74 0000CBD4 D0 1E 01 CC */ stfs f0, 0x1cc(r30) diff --git a/asm/MetroidPrime/Cameras/CGameCamera.s b/asm/MetroidPrime/Cameras/CGameCamera.s index 0d23e621..705349f7 100644 --- a/asm/MetroidPrime/Cameras/CGameCamera.s +++ b/asm/MetroidPrime/Cameras/CGameCamera.s @@ -325,9 +325,9 @@ lbl_8005B098: /* 8005B098 00057FF8 38 61 01 40 */ addi r3, r1, 0x140 /* 8005B09C 00057FFC 48 2B 83 09 */ bl Orthonormalize__12CTransform4fFv lbl_8005B0A0: -/* 8005B0A0 00058000 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8005B0A0 00058000 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8005B0A4 00058004 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 8005B0A8 00058008 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 8005B0A8 00058008 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 8005B0AC 0005800C C0 7E 00 04 */ lfs f3, 4(r30) /* 8005B0B0 00058010 C0 03 00 04 */ lfs f0, 4(r3) /* 8005B0B4 00058014 C0 43 00 00 */ lfs f2, 0(r3) @@ -431,18 +431,18 @@ lbl_8005B1B4: /* 8005B230 00058190 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005B234 00058194 41 82 00 54 */ beq lbl_8005B288 /* 8005B238 00058198 C0 41 01 44 */ lfs f2, 0x144(r1) -/* 8005B23C 0005819C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8005B23C 0005819C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8005B240 000581A0 C0 21 01 54 */ lfs f1, 0x154(r1) -/* 8005B244 000581A4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8005B244 000581A4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8005B248 000581A8 C0 01 01 64 */ lfs f0, 0x164(r1) /* 8005B24C 000581AC 38 61 00 18 */ addi r3, r1, 0x18 /* 8005B250 000581B0 D0 41 00 0C */ stfs f2, 0xc(r1) /* 8005B254 000581B4 D0 21 00 10 */ stfs f1, 0x10(r1) /* 8005B258 000581B8 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8005B25C 000581BC 48 2B 8B 75 */ bl __ct__13CUnitVector3fFRC9CVector3f -/* 8005B260 000581C0 3C A0 80 5A */ lis r5, lbl_805A66F4@ha +/* 8005B260 000581C0 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha /* 8005B264 000581C4 7C 64 1B 78 */ mr r4, r3 -/* 8005B268 000581C8 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 8005B268 000581C8 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 8005B26C 000581CC 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8005B270 000581D0 38 A1 00 0C */ addi r5, r1, 0xc /* 8005B274 000581D4 48 2B 88 9D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1132,11 +1132,11 @@ lbl_8005BC40: /* 8005BC44 00058BA4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8005BC48 00058BA8 4C 41 13 82 */ cror 2, 1, 2 /* 8005BC4C 00058BAC 40 82 01 14 */ bne lbl_8005BD60 -/* 8005BC50 00058BB0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8005BC54 00058BB4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8005BC58 00058BB8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8005BC50 00058BB0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8005BC54 00058BB4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8005BC58 00058BB8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8005BC5C 00058BBC 7F C5 F3 78 */ mr r5, r30 -/* 8005BC60 00058BC0 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8005BC60 00058BC0 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8005BC64 00058BC4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8005BC68 00058BC8 48 2B 7E A9 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f /* 8005BC6C 00058BCC 38 61 01 08 */ addi r3, r1, 0x108 @@ -1238,13 +1238,13 @@ lbl_8005BD60: /* 8005BDC8 00058D28 D0 01 00 74 */ stfs f0, 0x74(r1) /* 8005BDCC 00058D2C 48 2B 54 99 */ bl Transform__11CQuaternionCFRC9CVector3f /* 8005BDD0 00058D30 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8005BDD4 00058D34 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8005BDD4 00058D34 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8005BDD8 00058D38 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 8005BDDC 00058D3C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8005BDDC 00058D3C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8005BDE0 00058D40 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 8005BDE4 00058D44 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8005BDE4 00058D44 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8005BDE8 00058D48 D0 41 00 5C */ stfs f2, 0x5c(r1) -/* 8005BDEC 00058D4C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8005BDEC 00058D4C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8005BDF0 00058D50 38 61 00 78 */ addi r3, r1, 0x78 /* 8005BDF4 00058D54 38 A1 00 5C */ addi r5, r1, 0x5c /* 8005BDF8 00058D58 D0 21 00 60 */ stfs f1, 0x60(r1) @@ -1370,9 +1370,9 @@ lbl_8005BF94: /* 8005BF94 00058EF4 38 00 00 00 */ li r0, 0 /* 8005BF98 00058EF8 90 01 01 6C */ stw r0, 0x16c(r1) lbl_8005BF9C: -/* 8005BF9C 00058EFC 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8005BF9C 00058EFC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8005BFA0 00058F00 7F A3 EB 78 */ mr r3, r29 -/* 8005BFA4 00058F04 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8005BFA4 00058F04 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8005BFA8 00058F08 48 2B 6B CD */ bl __ct__12CTransform4fFRC12CTransform4f lbl_8005BFAC: /* 8005BFAC 00058F0C E3 E1 01 B8 */ psq_l f31, 440(r1), 0, qr0 @@ -1542,8 +1542,8 @@ lbl_8005C1E8: /* 8005C1E8 00059148 38 00 00 00 */ li r0, 0 /* 8005C1EC 0005914C 90 01 00 3C */ stw r0, 0x3c(r1) lbl_8005C1F0: -/* 8005C1F0 00059150 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8005C1F4 00059154 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8005C1F0 00059150 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8005C1F4 00059154 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8005C1F8 00059158 D0 1F 00 00 */ stfs f0, 0(r31) /* 8005C1FC 0005915C C0 03 00 04 */ lfs f0, 4(r3) /* 8005C200 00059160 D0 1F 00 04 */ stfs f0, 4(r31) @@ -2587,8 +2587,8 @@ GetKnotPosition__11CBallCameraCFi: /* 8005D0B0 0005A010 D0 03 00 08 */ stfs f0, 8(r3) /* 8005D0B4 0005A014 4E 80 00 20 */ blr lbl_8005D0B8: -/* 8005D0B8 0005A018 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8005D0BC 0005A01C C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 8005D0B8 0005A018 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8005D0BC 0005A01C C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 8005D0C0 0005A020 D0 03 00 00 */ stfs f0, 0(r3) /* 8005D0C4 0005A024 C0 04 00 04 */ lfs f0, 4(r4) /* 8005D0C8 0005A028 D0 03 00 04 */ stfs f0, 4(r3) diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index e7b38610..b7dc9407 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -548,9 +548,9 @@ lbl_80265700: /* 80265700 00262660 D3 DC 01 DC */ stfs f30, 0x1dc(r28) lbl_80265704: /* 80265704 00262664 C0 21 00 90 */ lfs f1, 0x90(r1) -/* 80265708 00262668 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80265708 00262668 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8026570C 0026266C C0 01 00 84 */ lfs f0, 0x84(r1) -/* 80265710 00262670 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80265710 00262670 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80265714 00262674 C0 61 00 94 */ lfs f3, 0x94(r1) /* 80265718 00262678 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8026571C 0026267C EC 81 00 2A */ fadds f4, f1, f0 @@ -605,9 +605,9 @@ lbl_80265704: /* 802657E0 00262740 D0 01 00 70 */ stfs f0, 0x70(r1) /* 802657E4 00262744 48 0A BA 81 */ bl Transform__11CQuaternionCFRC9CVector3f /* 802657E8 00262748 C0 21 00 90 */ lfs f1, 0x90(r1) -/* 802657EC 0026274C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802657EC 0026274C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802657F0 00262750 C0 01 00 1C */ lfs f0, 0x1c(r1) -/* 802657F4 00262754 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802657F4 00262754 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802657F8 00262758 C0 61 00 94 */ lfs f3, 0x94(r1) /* 802657FC 0026275C 38 61 00 98 */ addi r3, r1, 0x98 /* 80265800 00262760 EC 81 00 2A */ fadds f4, f1, f0 @@ -897,9 +897,9 @@ lbl_80265BFC: /* 80265C30 00262B90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80265C34 00262B94 41 82 01 34 */ beq lbl_80265D68 /* 80265C38 00262B98 C0 21 00 84 */ lfs f1, 0x84(r1) -/* 80265C3C 00262B9C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80265C3C 00262B9C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80265C40 00262BA0 C0 01 00 6C */ lfs f0, 0x6c(r1) -/* 80265C44 00262BA4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80265C44 00262BA4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80265C48 00262BA8 C0 61 00 88 */ lfs f3, 0x88(r1) /* 80265C4C 00262BAC 38 61 01 28 */ addi r3, r1, 0x128 /* 80265C50 00262BB0 EC 81 00 2A */ fadds f4, f1, f0 @@ -1133,18 +1133,18 @@ lbl_80265F8C: /* 80265F94 00262EF4 3C 80 80 3F */ lis r4, lbl_803E9D80@ha /* 80265F98 00262EF8 C0 02 BA 9C */ lfs f0, lbl_805AD7BC@sda21(r2) /* 80265F9C 00262EFC 38 04 9D 80 */ addi r0, r4, lbl_803E9D80@l -/* 80265FA0 00262F00 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80265FA0 00262F00 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80265FA4 00262F04 90 1F 00 00 */ stw r0, 0(r31) -/* 80265FA8 00262F08 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80265FA8 00262F08 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80265FAC 00262F0C 38 7F 01 94 */ addi r3, r31, 0x194 /* 80265FB0 00262F10 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80265FB4 00262F14 B0 1F 01 88 */ sth r0, 0x188(r31) /* 80265FB8 00262F18 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 80265FBC 00262F1C D0 1F 01 90 */ stfs f0, 0x190(r31) /* 80265FC0 00262F20 48 0A CB B5 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80265FC4 00262F24 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80265FC4 00262F24 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80265FC8 00262F28 C0 22 BA 9C */ lfs f1, lbl_805AD7BC@sda21(r2) -/* 80265FCC 00262F2C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80265FCC 00262F2C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80265FD0 00262F30 38 80 00 00 */ li r4, 0 /* 80265FD4 00262F34 C0 45 00 00 */ lfs f2, 0(r5) /* 80265FD8 00262F38 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/Cameras/CPathCamera.s b/asm/MetroidPrime/Cameras/CPathCamera.s index 9b7905bd..77fe5207 100644 --- a/asm/MetroidPrime/Cameras/CPathCamera.s +++ b/asm/MetroidPrime/Cameras/CPathCamera.s @@ -294,9 +294,9 @@ lbl_8012DAA8: /* 8012DB64 0012AAC4 48 00 01 B4 */ b lbl_8012DD18 lbl_8012DB68: /* 8012DB68 0012AAC8 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8012DB6C 0012AACC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8012DB6C 0012AACC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8012DB70 0012AAD0 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8012DB74 0012AAD4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8012DB74 0012AAD4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8012DB78 0012AAD8 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8012DB7C 0012AADC 38 61 00 CC */ addi r3, r1, 0xcc /* 8012DB80 0012AAE0 38 81 00 24 */ addi r4, r1, 0x24 @@ -363,9 +363,9 @@ lbl_8012DC2C: /* 8012DC6C 0012ABCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012DC70 0012ABD0 41 82 00 68 */ beq lbl_8012DCD8 /* 8012DC74 0012ABD4 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8012DC78 0012ABD8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8012DC78 0012ABD8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8012DC7C 0012ABDC C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8012DC80 0012ABE0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8012DC80 0012ABE0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8012DC84 0012ABE4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8012DC88 0012ABE8 38 61 00 6C */ addi r3, r1, 0x6c /* 8012DC8C 0012ABEC 38 81 00 0C */ addi r4, r1, 0xc @@ -947,8 +947,8 @@ lbl_8012E44C: /* 8012E4F8 0012B458 38 A1 00 98 */ addi r5, r1, 0x98 /* 8012E4FC 0012B45C 38 C1 00 20 */ addi r6, r1, 0x20 /* 8012E500 0012B460 4B F1 EA 99 */ bl RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFilter -/* 8012E504 0012B464 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8012E508 0012B468 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 8012E504 0012B464 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8012E508 0012B468 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 8012E50C 0012B46C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8012E510 0012B470 C0 23 00 04 */ lfs f1, 4(r3) /* 8012E514 0012B474 C0 03 00 08 */ lfs f0, 8(r3) @@ -1005,8 +1005,8 @@ lbl_8012E5C8: /* 8012E5D4 0012B534 D3 41 00 70 */ stfs f26, 0x70(r1) lbl_8012E5D8: /* 8012E5D8 0012B538 80 9F 08 70 */ lwz r4, 0x870(r31) -/* 8012E5DC 0012B53C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8012E5E0 0012B540 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8012E5DC 0012B53C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8012E5E0 0012B540 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8012E5E4 0012B544 38 A1 00 5C */ addi r5, r1, 0x5c /* 8012E5E8 0012B548 80 E4 00 80 */ lwz r7, 0x80(r4) /* 8012E5EC 0012B54C 38 61 00 C8 */ addi r3, r1, 0xc8 diff --git a/asm/MetroidPrime/Enemies/CActorContraption.s b/asm/MetroidPrime/Enemies/CActorContraption.s index 8dcdc65f..f73c20da 100644 --- a/asm/MetroidPrime/Enemies/CActorContraption.s +++ b/asm/MetroidPrime/Enemies/CActorContraption.s @@ -414,10 +414,10 @@ lbl_8023F79C: /* 8023F838 0023C798 B0 01 00 2C */ sth r0, 0x2c(r1) /* 8023F83C 0023C79C 4B DC 54 7D */ bl string_l__4rstlFPCc /* 8023F840 0023C7A0 38 01 00 2C */ addi r0, r1, 0x2c -/* 8023F844 0023C7A4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8023F844 0023C7A4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8023F848 0023C7A8 90 01 00 08 */ stw r0, 8(r1) /* 8023F84C 0023C7AC 38 01 00 48 */ addi r0, r1, 0x48 -/* 8023F850 0023C7B0 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8023F850 0023C7B0 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8023F854 0023C7B4 38 61 00 34 */ addi r3, r1, 0x34 /* 8023F858 0023C7B8 90 01 00 0C */ stw r0, 0xc(r1) /* 8023F85C 0023C7BC 38 A0 00 00 */ li r5, 0 diff --git a/asm/MetroidPrime/Enemies/CAi.s b/asm/MetroidPrime/Enemies/CAi.s index cadb0ddb..5b172b9b 100644 --- a/asm/MetroidPrime/Enemies/CAi.s +++ b/asm/MetroidPrime/Enemies/CAi.s @@ -2101,9 +2101,9 @@ lbl_800A2DE4: /* 800A2E68 0009FDC8 4B F7 86 CD */ bl Identity__10CAxisAngleFv /* 800A2E6C 0009FDCC 7C 7D 1B 78 */ mr r29, r3 /* 800A2E70 0009FDD0 4B F7 86 C5 */ bl Identity__10CAxisAngleFv -/* 800A2E74 0009FDD4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800A2E74 0009FDD4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800A2E78 0009FDD8 80 AD 86 10 */ lwz r5, lbl_805A71D0@sda21(r13) -/* 800A2E7C 0009FDDC 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 800A2E7C 0009FDDC 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 800A2E80 0009FDE0 C0 26 00 00 */ lfs f1, 0(r6) /* 800A2E84 0009FDE4 38 80 00 01 */ li r4, 1 /* 800A2E88 0009FDE8 C0 46 00 04 */ lfs f2, 4(r6) diff --git a/asm/MetroidPrime/Enemies/CAmbientAI.s b/asm/MetroidPrime/Enemies/CAmbientAI.s index 847098f1..ed59fbef 100644 --- a/asm/MetroidPrime/Enemies/CAmbientAI.s +++ b/asm/MetroidPrime/Enemies/CAmbientAI.s @@ -619,8 +619,8 @@ __ct__10CAmbientAI: /* 8024C06C 00248FCC 4B DC F4 C9 */ bl Identity__10CAxisAngleFv /* 8024C070 00248FD0 7C 7F 1B 78 */ mr r31, r3 /* 8024C074 00248FD4 4B DC F4 C1 */ bl Identity__10CAxisAngleFv -/* 8024C078 00248FD8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8024C07C 00248FDC C4 64 66 A0 */ lfsu f3, skZero3f@l(r4) +/* 8024C078 00248FD8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8024C07C 00248FDC C4 64 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r4) /* 8024C080 00248FE0 A1 71 00 00 */ lhz r11, 0(r17) /* 8024C084 00248FE4 38 01 00 1C */ addi r0, r1, 0x1c /* 8024C088 00248FE8 C0 84 00 04 */ lfs f4, 4(r4) diff --git a/asm/MetroidPrime/Enemies/CAtomicAlpha.s b/asm/MetroidPrime/Enemies/CAtomicAlpha.s index c6703b36..83e1b5b8 100644 --- a/asm/MetroidPrime/Enemies/CAtomicAlpha.s +++ b/asm/MetroidPrime/Enemies/CAtomicAlpha.s @@ -371,8 +371,8 @@ lbl_80244DA0: /* 80244DCC 00241D2C D0 21 00 24 */ stfs f1, 0x24(r1) /* 80244DD0 00241D30 D0 01 00 28 */ stfs f0, 0x28(r1) /* 80244DD4 00241D34 4B EF 9E 4D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 80244DD8 00241D38 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80244DDC 00241D3C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80244DD8 00241D38 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80244DDC 00241D3C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80244DE0 00241D40 C0 C1 00 08 */ lfs f6, 8(r1) /* 80244DE4 00241D44 38 81 00 2C */ addi r4, r1, 0x2c /* 80244DE8 00241D48 C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -453,14 +453,14 @@ lbl_80244ED4: /* 80244EE4 00241E44 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80244EE8 00241E48 38 81 00 74 */ addi r4, r1, 0x74 /* 80244EEC 00241E4C 48 0C DC 89 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80244EF0 00241E50 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 80244EF0 00241E50 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80244EF4 00241E54 C0 A1 01 00 */ lfs f5, 0x100(r1) -/* 80244EF8 00241E58 38 83 67 00 */ addi r4, r3, lbl_805A6700@l +/* 80244EF8 00241E58 38 83 67 00 */ addi r4, r3, sDownVector__9CVector3f@l /* 80244EFC 00241E5C C0 81 00 E0 */ lfs f4, 0xe0(r1) /* 80244F00 00241E60 C0 61 00 F0 */ lfs f3, 0xf0(r1) -/* 80244F04 00241E64 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80244F04 00241E64 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80244F08 00241E68 C0 44 00 04 */ lfs f2, 4(r4) -/* 80244F0C 00241E6C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80244F0C 00241E6C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80244F10 00241E70 C0 24 00 08 */ lfs f1, 8(r4) /* 80244F14 00241E74 38 61 00 44 */ addi r3, r1, 0x44 /* 80244F18 00241E78 C0 04 00 00 */ lfs f0, 0(r4) diff --git a/asm/MetroidPrime/Enemies/CAtomicBeta.s b/asm/MetroidPrime/Enemies/CAtomicBeta.s index 57bf8093..b3d0dde2 100644 --- a/asm/MetroidPrime/Enemies/CAtomicBeta.s +++ b/asm/MetroidPrime/Enemies/CAtomicBeta.s @@ -303,11 +303,11 @@ Touch__11CAtomicBetaFR6CActorR13CStateManager: /* 80250BD4 0024DB34 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80250BD8 0024DB38 40 82 00 34 */ bne lbl_80250C0C /* 80250BDC 0024DB3C 81 9C 00 00 */ lwz r12, 0(r28) -/* 80250BE0 0024DB40 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 80250BE0 0024DB40 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 80250BE4 0024DB44 FC 20 00 90 */ fmr f1, f0 /* 80250BE8 0024DB48 7F 83 E3 78 */ mr r3, r28 /* 80250BEC 0024DB4C 81 8C 00 88 */ lwz r12, 0x88(r12) -/* 80250BF0 0024DB50 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 80250BF0 0024DB50 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 80250BF4 0024DB54 7F C5 F3 78 */ mr r5, r30 /* 80250BF8 0024DB58 38 DF 01 2C */ addi r6, r31, 0x12c /* 80250BFC 0024DB5C 38 E0 00 01 */ li r7, 1 @@ -411,8 +411,8 @@ sub_80250d1c: /* 80250D34 0024DC94 28 00 00 00 */ cmplwi r0, 0 /* 80250D38 0024DC98 40 82 00 40 */ bne lbl_80250D78 /* 80250D3C 0024DC9C 80 83 00 04 */ lwz r4, 4(r3) -/* 80250D40 0024DCA0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80250D44 0024DCA4 38 03 66 A0 */ addi r0, r3, skZero3f@l +/* 80250D40 0024DCA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80250D44 0024DCA4 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l /* 80250D48 0024DCA8 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 80250D4C 0024DCAC 90 81 00 08 */ stw r4, 8(r1) /* 80250D50 0024DCB0 7C A4 2B 78 */ mr r4, r5 @@ -427,8 +427,8 @@ sub_80250d1c: /* 80250D74 0024DCD4 48 00 00 24 */ b lbl_80250D98 lbl_80250D78: /* 80250D78 0024DCD8 80 1F 00 00 */ lwz r0, 0(r31) -/* 80250D7C 0024DCDC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80250D80 0024DCE0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80250D7C 0024DCDC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80250D80 0024DCE0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80250D84 0024DCE4 7C C4 33 78 */ mr r4, r6 /* 80250D88 0024DCE8 90 01 00 10 */ stw r0, 0x10(r1) /* 80250D8C 0024DCEC 7C E6 3B 78 */ mr r6, r7 @@ -656,9 +656,9 @@ lbl_80251068: /* 802510D0 0024E030 38 61 00 44 */ addi r3, r1, 0x44 /* 802510D4 0024E034 48 0E CA 0D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 802510D8 0024E038 C0 61 01 84 */ lfs f3, 0x184(r1) -/* 802510DC 0024E03C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802510DC 0024E03C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802510E0 0024E040 C0 41 01 94 */ lfs f2, 0x194(r1) -/* 802510E4 0024E044 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802510E4 0024E044 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802510E8 0024E048 C0 21 01 A4 */ lfs f1, 0x1a4(r1) /* 802510EC 0024E04C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 802510F0 0024E050 C0 81 01 9C */ lfs f4, 0x19c(r1) @@ -810,10 +810,10 @@ sub_802512d8: /* 802512FC 0024E25C 7C 03 00 40 */ cmplw r3, r0 /* 80251300 0024E260 41 82 01 80 */ beq lbl_80251480 /* 80251304 0024E264 3C 80 80 3F */ lis r4, lbl_803E8E40@ha -/* 80251308 0024E268 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80251308 0024E268 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8025130C 0024E26C 3B C4 8E 40 */ addi r30, r4, lbl_803E8E40@l /* 80251310 0024E270 3B B8 05 6C */ addi r29, r24, 0x56c -/* 80251314 0024E274 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 80251314 0024E274 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 80251318 0024E278 3B 80 00 00 */ li r28, 0 lbl_8025131C: /* 8025131C 0024E27C 80 9E 00 00 */ lwz r4, 0(r30) @@ -969,8 +969,8 @@ lbl_80251538: /* 80251554 0024E4B4 7C 64 1B 79 */ or. r4, r3, r3 /* 80251558 0024E4B8 41 82 00 64 */ beq lbl_802515BC /* 8025155C 0024E4BC A0 BC 00 08 */ lhz r5, 8(r28) -/* 80251560 0024E4C0 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80251564 0024E4C4 38 E4 66 70 */ addi r7, r4, skIdentity4f@l +/* 80251560 0024E4C0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80251564 0024E4C4 38 E4 66 70 */ addi r7, r4, sIdentity__12CTransform4f@l /* 80251568 0024E4C8 A3 61 00 28 */ lhz r27, 0x28(r1) /* 8025156C 0024E4CC B0 A1 00 20 */ sth r5, 0x20(r1) /* 80251570 0024E4D0 39 81 00 30 */ addi r12, r1, 0x30 diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index 40e9e883..7170578c 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -392,8 +392,8 @@ sub_8021d478: /* 8021D528 0021A488 39 00 00 00 */ li r8, 0 /* 8021D52C 0021A48C 39 40 00 03 */ li r10, 3 /* 8021D530 0021A490 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8021D534 0021A494 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8021D538 0021A498 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8021D534 0021A494 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8021D538 0021A498 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8021D53C 0021A49C A0 1D 00 00 */ lhz r0, 0(r29) /* 8021D540 0021A4A0 90 61 00 28 */ stw r3, 0x28(r1) /* 8021D544 0021A4A4 7F 83 E3 78 */ mr r3, r28 @@ -692,7 +692,7 @@ lbl_8021D938: /* 8021D948 0021A8A8 4B E2 F3 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence /* 8021D94C 0021A8AC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8021D950 0021A8B0 41 82 00 2C */ beq lbl_8021D97C -/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, lbl_805AE960@sda21(r2) +/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 8021D958 0021A8B8 7F A4 EB 78 */ mr r4, r29 /* 8021D95C 0021A8BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8021D960 0021A8C0 38 61 00 2C */ addi r3, r1, 0x2c @@ -704,9 +704,9 @@ lbl_8021D938: /* 8021D978 0021A8D8 48 00 00 44 */ b lbl_8021D9BC lbl_8021D97C: /* 8021D97C 0021A8DC 81 59 00 04 */ lwz r10, 4(r25) -/* 8021D980 0021A8E0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8021D980 0021A8E0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8021D984 0021A8E4 C0 59 00 60 */ lfs f2, 0x60(r25) -/* 8021D988 0021A8E8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8021D988 0021A8E8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8021D98C 0021A8EC C0 39 00 50 */ lfs f1, 0x50(r25) /* 8021D990 0021A8F0 7F A4 EB 78 */ mr r4, r29 /* 8021D994 0021A8F4 C0 19 00 40 */ lfs f0, 0x40(r25) @@ -893,9 +893,9 @@ lbl_8021DBE4: /* 8021DC10 0021AB70 3C 80 80 3E */ lis r4, lbl_803DAA68@ha /* 8021DC14 0021AB74 90 1F 05 68 */ stw r0, 0x568(r31) /* 8021DC18 0021AB78 38 C4 AA 68 */ addi r6, r4, lbl_803DAA68@l -/* 8021DC1C 0021AB7C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 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, skZero3f@l(r3) +/* 8021DC24 0021AB84 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 8021DC28 0021AB88 38 A0 00 01 */ li r5, 1 /* 8021DC2C 0021AB8C 38 00 00 00 */ li r0, 0 /* 8021DC30 0021AB90 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha @@ -1035,8 +1035,8 @@ sub_8021de08: /* 8021DE20 0021AD80 93 A1 00 54 */ stw r29, 0x54(r1) /* 8021DE24 0021AD84 93 81 00 50 */ stw r28, 0x50(r1) /* 8021DE28 0021AD88 83 A4 08 38 */ lwz r29, 0x838(r4) -/* 8021DE2C 0021AD8C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8021DE30 0021AD90 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 8021DE2C 0021AD8C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8021DE30 0021AD90 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 8021DE34 0021AD94 AB 9D 20 08 */ lha r28, 0x2008(r29) /* 8021DE38 0021AD98 48 00 01 04 */ b lbl_8021DF3C lbl_8021DE3C: @@ -1083,11 +1083,11 @@ lbl_8021DED4: lbl_8021DED8: /* 8021DED8 0021AE38 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8021DEDC 0021AE3C 41 82 00 44 */ beq lbl_8021DF20 -/* 8021DEE0 0021AE40 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8021DEE0 0021AE40 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8021DEE4 0021AE44 C0 5E 00 04 */ lfs f2, 4(r30) /* 8021DEE8 0021AE48 C0 3E 00 08 */ lfs f1, 8(r30) /* 8021DEEC 0021AE4C 38 81 00 28 */ addi r4, r1, 0x28 -/* 8021DEF0 0021AE50 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8021DEF0 0021AE50 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8021DEF4 0021AE54 C0 02 B4 18 */ lfs f0, lbl_805AD138@sda21(r2) /* 8021DEF8 0021AE58 D0 C1 00 28 */ stfs f6, 0x28(r1) /* 8021DEFC 0021AE5C D0 81 00 2C */ stfs f4, 0x2c(r1) @@ -1324,10 +1324,10 @@ sub_8021e160: /* 8021E22C 0021B18C B0 01 00 28 */ sth r0, 0x28(r1) /* 8021E230 0021B190 4B DE 6A 89 */ bl string_l__4rstlFPCc /* 8021E234 0021B194 38 01 00 28 */ addi r0, r1, 0x28 -/* 8021E238 0021B198 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8021E238 0021B198 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8021E23C 0021B19C 90 01 00 08 */ stw r0, 8(r1) /* 8021E240 0021B1A0 38 01 00 3C */ addi r0, r1, 0x3c -/* 8021E244 0021B1A4 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8021E244 0021B1A4 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8021E248 0021B1A8 38 81 00 30 */ addi r4, r1, 0x30 /* 8021E24C 0021B1AC 90 01 00 0C */ stw r0, 0xc(r1) /* 8021E250 0021B1B0 38 00 00 00 */ li r0, 0 @@ -1778,8 +1778,8 @@ lbl_8021E82C: /* 8021E8A4 0021B804 4C 40 13 82 */ cror 2, 0, 2 /* 8021E8A8 0021B808 40 82 00 6C */ bne lbl_8021E914 /* 8021E8AC 0021B80C 81 9D 00 00 */ lwz r12, 0(r29) -/* 8021E8B0 0021B810 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8021E8B4 0021B814 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8021E8B0 0021B810 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8021E8B4 0021B814 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8021E8B8 0021B818 7F A3 EB 78 */ mr r3, r29 /* 8021E8BC 0021B81C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8021E8C0 0021B820 7F C4 F3 78 */ mr r4, r30 @@ -2656,8 +2656,8 @@ sub_8021f4b4: /* 8021F564 0021C4C4 39 40 00 00 */ li r10, 0 /* 8021F568 0021C4C8 38 00 00 03 */ li r0, 3 /* 8021F56C 0021C4CC 90 81 00 84 */ stw r4, 0x84(r1) -/* 8021F570 0021C4D0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8021F574 0021C4D4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8021F570 0021C4D0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8021F574 0021C4D4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8021F578 0021C4D8 38 A1 00 2C */ addi r5, r1, 0x2c /* 8021F57C 0021C4DC 90 61 00 80 */ stw r3, 0x80(r1) /* 8021F580 0021C4E0 38 81 00 34 */ addi r4, r1, 0x34 @@ -2719,9 +2719,9 @@ lbl_8021F5E8: /* 8021F65C 0021C5BC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8021F660 0021C5C0 7D 89 03 A6 */ mtctr r12 /* 8021F664 0021C5C4 4E 80 04 21 */ bctrl -/* 8021F668 0021C5C8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8021F668 0021C5C8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8021F66C 0021C5CC 7F E3 FB 78 */ mr r3, r31 -/* 8021F670 0021C5D0 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8021F670 0021C5D0 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8021F674 0021C5D4 38 A1 00 14 */ addi r5, r1, 0x14 /* 8021F678 0021C5D8 38 81 00 1C */ addi r4, r1, 0x1c /* 8021F67C 0021C5DC 38 C1 00 0C */ addi r6, r1, 0xc @@ -2957,8 +2957,8 @@ lbl_8021F980: /* 8021F9D8 0021C938 38 61 00 10 */ addi r3, r1, 0x10 /* 8021F9DC 0021C93C 38 81 00 28 */ addi r4, r1, 0x28 /* 8021F9E0 0021C940 48 0F 4E 71 */ bl AsNormalized__9CVector3fCFv -/* 8021F9E4 0021C944 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8021F9E8 0021C948 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8021F9E4 0021C944 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8021F9E8 0021C948 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8021F9EC 0021C94C C0 61 00 10 */ lfs f3, 0x10(r1) /* 8021F9F0 0021C950 38 81 00 34 */ addi r4, r1, 0x34 /* 8021F9F4 0021C954 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -3114,8 +3114,8 @@ lbl_8021FBE8: /* 8021FC00 0021CB60 48 00 00 EC */ b lbl_8021FCEC lbl_8021FC04: /* 8021FC04 0021CB64 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8021FC08 0021CB68 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8021FC0C 0021CB6C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -3476,8 +3476,8 @@ lbl_80220110: /* 80220118 0021D078 38 61 00 08 */ addi r3, r1, 8 /* 8022011C 0021D07C 38 9F 04 5C */ addi r4, r31, 0x45c /* 80220120 0021D080 4B F1 E9 FD */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 80220124 0021D084 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220128 0021D088 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80220124 0021D084 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220128 0021D088 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8022012C 0021D08C C0 C1 00 08 */ lfs f6, 8(r1) /* 80220130 0021D090 38 81 00 5C */ addi r4, r1, 0x5c /* 80220134 0021D094 C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -3509,8 +3509,8 @@ lbl_80220174: /* 80220198 0021D0F8 C0 02 B4 40 */ lfs f0, lbl_805AD160@sda21(r2) /* 8022019C 0021D0FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802201A0 0021D100 40 81 00 54 */ ble lbl_802201F4 -/* 802201A4 0021D104 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802201A8 0021D108 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 802201A4 0021D104 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802201A8 0021D108 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 802201AC 0021D10C C0 02 B4 18 */ lfs f0, lbl_805AD138@sda21(r2) /* 802201B0 0021D110 38 81 00 40 */ addi r4, r1, 0x40 /* 802201B4 0021D114 C0 43 00 04 */ lfs f2, 4(r3) @@ -3546,8 +3546,8 @@ lbl_80220200: /* 80220224 0021D184 48 00 00 EC */ b lbl_80220310 lbl_80220228: /* 80220228 0021D188 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8022022C 0021D18C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220230 0021D190 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -3665,8 +3665,8 @@ lbl_802203D0: /* 802203D8 0021D338 39 27 AA 68 */ addi r9, r7, lbl_803DAA68@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, skZero3f@ha -/* 802203E8 0021D348 C4 45 66 A0 */ lfsu f2, skZero3f@l(r5) +/* 802203E4 0021D344 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 802203E8 0021D348 C4 45 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r5) /* 802203EC 0021D34C 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 802203F0 0021D350 7C 80 23 78 */ mr r0, r4 /* 802203F4 0021D354 90 81 00 24 */ stw r4, 0x24(r1) @@ -3838,8 +3838,8 @@ lbl_80220658: /* 80220664 0021D5C4 38 9D 04 5C */ addi r4, r29, 0x45c /* 80220668 0021D5C8 38 DD 08 B8 */ addi r6, r29, 0x8b8 /* 8022066C 0021D5CC 4B F1 E4 B1 */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 80220670 0021D5D0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220674 0021D5D4 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80220670 0021D5D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220674 0021D5D4 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80220678 0021D5D8 C0 C1 00 08 */ lfs f6, 8(r1) /* 8022067C 0021D5DC 38 81 00 14 */ addi r4, r1, 0x14 /* 80220680 0021D5E0 C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -4104,8 +4104,8 @@ lbl_802209E4: /* 80220A4C 0021D9AC 38 61 00 10 */ addi r3, r1, 0x10 /* 80220A50 0021D9B0 38 81 00 28 */ addi r4, r1, 0x28 /* 80220A54 0021D9B4 48 0F 3D FD */ bl AsNormalized__9CVector3fCFv -/* 80220A58 0021D9B8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220A5C 0021D9BC C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 80220A58 0021D9B8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220A5C 0021D9BC C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 80220A60 0021D9C0 C0 61 00 10 */ lfs f3, 0x10(r1) /* 80220A64 0021D9C4 38 81 00 34 */ addi r4, r1, 0x34 /* 80220A68 0021D9C8 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -4288,8 +4288,8 @@ lbl_80220BFC: /* 80220D08 0021DC68 38 81 00 7C */ addi r4, r1, 0x7c /* 80220D0C 0021DC6C 48 0F 3B 45 */ bl AsNormalized__9CVector3fCFv /* 80220D10 0021DC70 C0 01 00 30 */ lfs f0, 0x30(r1) -/* 80220D14 0021DC74 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220D18 0021DC78 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80220D14 0021DC74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220D18 0021DC78 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80220D1C 0021DC7C 38 81 00 C0 */ addi r4, r1, 0xc0 /* 80220D20 0021DC80 EC DF 00 32 */ fmuls f6, f31, f0 /* 80220D24 0021DC84 C0 21 00 28 */ lfs f1, 0x28(r1) @@ -4342,8 +4342,8 @@ lbl_80220D74: /* 80220DDC 0021DD3C 38 61 00 1C */ addi r3, r1, 0x1c /* 80220DE0 0021DD40 38 81 00 64 */ addi r4, r1, 0x64 /* 80220DE4 0021DD44 48 0F 3A 6D */ bl AsNormalized__9CVector3fCFv -/* 80220DE8 0021DD48 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220DEC 0021DD4C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 80220DE8 0021DD48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220DEC 0021DD4C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 80220DF0 0021DD50 C0 61 00 1C */ lfs f3, 0x1c(r1) /* 80220DF4 0021DD54 38 81 00 A4 */ addi r4, r1, 0xa4 /* 80220DF8 0021DD58 C0 41 00 20 */ lfs f2, 0x20(r1) @@ -4383,8 +4383,8 @@ lbl_80220E38: /* 80220E7C 0021DDDC 38 61 00 10 */ addi r3, r1, 0x10 /* 80220E80 0021DDE0 38 81 00 58 */ addi r4, r1, 0x58 /* 80220E84 0021DDE4 48 0F 39 CD */ bl AsNormalized__9CVector3fCFv -/* 80220E88 0021DDE8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80220E8C 0021DDEC C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 80220E88 0021DDE8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80220E8C 0021DDEC C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 80220E90 0021DDF0 C0 61 00 10 */ lfs f3, 0x10(r1) /* 80220E94 0021DDF4 38 81 00 88 */ addi r4, r1, 0x88 /* 80220E98 0021DDF8 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -4715,9 +4715,9 @@ lbl_80221338: /* 80221348 0021E2A8 80 7E 04 50 */ lwz r3, 0x450(r30) /* 8022134C 0021E2AC 38 63 00 04 */ addi r3, r3, 4 /* 80221350 0021E2B0 4B F1 04 99 */ bl SetSteeringSpeedRange__16CBodyStateCmdMgrFff -/* 80221354 0021E2B4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80221354 0021E2B4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80221358 0021E2B8 7F C3 F3 78 */ mr r3, r30 -/* 8022135C 0021E2BC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8022135C 0021E2BC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80221360 0021E2C0 7F E4 FB 78 */ mr r4, r31 /* 80221364 0021E2C4 4B FF DB BD */ bl sub_8021ef20 /* 80221368 0021E2C8 A1 1E 00 08 */ lhz r8, 8(r30) @@ -5750,14 +5750,14 @@ GetAimPosition__9CBabygothCFRC13CStateManagerf: /* 80222208 0021F168 80 1E 09 F8 */ lwz r0, 0x9f8(r30) /* 8022220C 0021F16C 2C 00 00 00 */ cmpwi r0, 0 /* 80222210 0021F170 41 82 02 28 */ beq lbl_80222438 -/* 80222214 0021F174 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80222214 0021F174 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80222218 0021F178 3B 5E 09 FC */ addi r26, r30, 0x9fc -/* 8022221C 0021F17C 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80222220 0021F180 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8022221C 0021F17C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80222220 0021F180 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80222224 0021F184 C3 E4 00 00 */ lfs f31, 0(r4) /* 80222228 0021F188 7F 59 D3 78 */ mr r25, r26 /* 8022222C 0021F18C C3 C4 00 04 */ lfs f30, 4(r4) -/* 80222230 0021F190 3B 83 66 F4 */ addi r28, r3, lbl_805A66F4@l +/* 80222230 0021F190 3B 83 66 F4 */ addi r28, r3, sUpVector__9CVector3f@l /* 80222234 0021F194 C3 A4 00 08 */ lfs f29, 8(r4) /* 80222238 0021F198 48 00 00 7C */ b lbl_802222B4 lbl_8022223C: @@ -5774,10 +5774,10 @@ lbl_8022223C: /* 80222264 0021F1C4 41 82 00 4C */ beq lbl_802222B0 /* 80222268 0021F1C8 7F 63 DB 78 */ mr r3, r27 /* 8022226C 0021F1CC 4B F8 69 11 */ bl GetSphereRadius__15CCollisionActorCFv -/* 80222270 0021F1D0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80222270 0021F1D0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80222274 0021F1D4 C0 5C 00 04 */ lfs f2, 4(r28) /* 80222278 0021F1D8 C0 1C 00 08 */ lfs f0, 8(r28) -/* 8022227C 0021F1DC C0 83 66 F4 */ lfs f4, lbl_805A66F4@l(r3) +/* 8022227C 0021F1DC C0 83 66 F4 */ lfs f4, sUpVector__9CVector3f@l(r3) /* 80222280 0021F1E0 EC 41 00 B2 */ fmuls f2, f1, f2 /* 80222284 0021F1E4 EC 01 00 32 */ fmuls f0, f1, f0 /* 80222288 0021F1E8 C0 7B 00 50 */ lfs f3, 0x50(r27) @@ -6065,9 +6065,9 @@ lbl_80222678: /* 802226B8 0021F618 D0 41 00 A8 */ stfs f2, 0xa8(r1) lbl_802226BC: /* 802226BC 0021F61C C0 41 01 54 */ lfs f2, 0x154(r1) -/* 802226C0 0021F620 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802226C0 0021F620 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802226C4 0021F624 C0 21 01 64 */ lfs f1, 0x164(r1) -/* 802226C8 0021F628 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802226C8 0021F628 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802226CC 0021F62C C0 01 01 74 */ lfs f0, 0x174(r1) /* 802226D0 0021F630 38 61 00 B8 */ addi r3, r1, 0xb8 /* 802226D4 0021F634 D0 41 00 40 */ stfs f2, 0x40(r1) @@ -6635,9 +6635,9 @@ lbl_80222E84: /* 80222E88 0021FDE8 48 00 03 F8 */ b lbl_80223280 .global lbl_80222E8C lbl_80222E8C: -/* 80222E8C 0021FDEC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80222E8C 0021FDEC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80222E90 0021FDF0 38 C0 00 01 */ li r6, 1 -/* 80222E94 0021FDF4 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 80222E94 0021FDF4 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 80222E98 0021FDF8 7F C5 F3 78 */ mr r5, r30 /* 80222E9C 0021FDFC C0 07 00 00 */ lfs f0, 0(r7) /* 80222EA0 0021FE00 38 80 00 25 */ li r4, 0x25 @@ -6766,11 +6766,11 @@ lbl_80222FE8: /* 8022306C 0021FFCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223070 0021FFD0 41 82 00 28 */ beq lbl_80223098 /* 80223074 0021FFD4 81 9B 00 00 */ lwz r12, 0(r27) -/* 80223078 0021FFD8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80223078 0021FFD8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8022307C 0021FFDC 7F 63 DB 78 */ mr r3, r27 /* 80223080 0021FFE0 C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 80223084 0021FFE4 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 80223088 0021FFE8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80223088 0021FFE8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8022308C 0021FFEC 7D 89 03 A6 */ mtctr r12 /* 80223090 0021FFF0 4E 80 04 21 */ bctrl /* 80223094 0021FFF4 48 00 00 8C */ b lbl_80223120 @@ -6781,11 +6781,11 @@ lbl_80223098: /* 802230A4 00220004 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802230A8 00220008 41 82 00 78 */ beq lbl_80223120 /* 802230AC 0022000C 81 9B 00 00 */ lwz r12, 0(r27) -/* 802230B0 00220010 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802230B0 00220010 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802230B4 00220014 7F 63 DB 78 */ mr r3, r27 /* 802230B8 00220018 C0 22 B4 04 */ lfs f1, lbl_805AD124@sda21(r2) /* 802230BC 0022001C 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 802230C0 00220020 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802230C0 00220020 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802230C4 00220024 7D 89 03 A6 */ mtctr r12 /* 802230C8 00220028 4E 80 04 21 */ bctrl /* 802230CC 0022002C 80 1B 05 6C */ lwz r0, 0x56c(r27) @@ -7324,9 +7324,9 @@ lbl_80223764: /* 8022384C 002207AC 38 A0 00 01 */ li r5, 1 /* 80223850 002207B0 4B FA 55 45 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 80223854 002207B4 38 00 00 00 */ li r0, 0 -/* 80223858 002207B8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80223858 002207B8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022385C 002207BC 90 1D 08 B4 */ stw r0, 0x8b4(r29) -/* 80223860 002207C0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80223860 002207C0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80223864 002207C4 3C 60 80 3D */ lis r3, lbl_803D31D0@ha /* 80223868 002207C8 C0 02 B4 04 */ lfs f0, lbl_805AD124@sda21(r2) /* 8022386C 002207CC C0 25 00 00 */ lfs f1, 0(r5) diff --git a/asm/MetroidPrime/Enemies/CBeetle.s b/asm/MetroidPrime/Enemies/CBeetle.s index 15d83e3b..09486e82 100644 --- a/asm/MetroidPrime/Enemies/CBeetle.s +++ b/asm/MetroidPrime/Enemies/CBeetle.s @@ -788,10 +788,10 @@ SeparateFromMelees__7CBeetleFR13CStateManager: /* 800E340C 000E036C F3 E1 00 78 */ psq_st f31, 120(r1), 0, qr0 /* 800E3410 000E0370 BF 41 00 58 */ stmw r26, 0x58(r1) /* 800E3414 000E0374 7C 9C 23 78 */ mr r28, r4 -/* 800E3418 000E0378 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800E3418 000E0378 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800E341C 000E037C 83 DC 08 38 */ lwz r30, 0x838(r28) /* 800E3420 000E0380 7C 7B 1B 78 */ mr r27, r3 -/* 800E3424 000E0384 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 800E3424 000E0384 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 800E3428 000E0388 AB BE 20 08 */ lha r29, 0x2008(r30) /* 800E342C 000E038C 48 00 01 48 */ b lbl_800E3574 lbl_800E3430: @@ -856,11 +856,11 @@ lbl_800E350C: lbl_800E3510: /* 800E3510 000E0470 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800E3514 000E0474 41 82 00 44 */ beq lbl_800E3558 -/* 800E3518 000E0478 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800E3518 000E0478 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E351C 000E047C C0 5F 00 04 */ lfs f2, 4(r31) /* 800E3520 000E0480 C0 3F 00 08 */ lfs f1, 8(r31) /* 800E3524 000E0484 38 81 00 34 */ addi r4, r1, 0x34 -/* 800E3528 000E0488 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 800E3528 000E0488 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 800E352C 000E048C C0 02 8F E8 */ lfs f0, lbl_805AAD08@sda21(r2) /* 800E3530 000E0490 D0 C1 00 34 */ stfs f6, 0x34(r1) /* 800E3534 000E0494 D0 81 00 38 */ stfs f4, 0x38(r1) @@ -2014,9 +2014,9 @@ lbl_800E4580: /* 800E45E8 000E1548 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l /* 800E45EC 000E154C 90 01 00 08 */ stw r0, 8(r1) lbl_800E45F0: -/* 800E45F0 000E1550 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800E45F0 000E1550 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800E45F4 000E1554 7F 43 D3 78 */ mr r3, r26 -/* 800E45F8 000E1558 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800E45F8 000E1558 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800E45FC 000E155C 48 03 66 A5 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f lbl_800E4600: /* 800E4600 000E1560 3B FF 00 60 */ addi r31, r31, 0x60 @@ -2290,8 +2290,8 @@ lbl_800E48E4: /* 800E49E8 000E1948 39 40 00 00 */ li r10, 0 /* 800E49EC 000E194C 38 00 00 03 */ li r0, 3 /* 800E49F0 000E1950 90 81 00 64 */ stw r4, 0x64(r1) -/* 800E49F4 000E1954 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800E49F8 000E1958 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 800E49F4 000E1954 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800E49F8 000E1958 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 800E49FC 000E195C 38 A1 00 14 */ addi r5, r1, 0x14 /* 800E4A00 000E1960 90 61 00 60 */ stw r3, 0x60(r1) /* 800E4A04 000E1964 38 81 00 1C */ addi r4, r1, 0x1c @@ -2433,8 +2433,8 @@ lbl_800E4BE0: /* 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 -/* 800E4BFC 000E1B5C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E4C00 000E1B60 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 800E4C08 000E1B68 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 800E4C0C 000E1B6C 80 81 00 E0 */ lwz r4, 0xe0(r1) @@ -2497,8 +2497,8 @@ lbl_800E4CC8: /* 800E4CEC 000E1C4C D0 21 00 58 */ stfs f1, 0x58(r1) /* 800E4CF0 000E1C50 D0 41 00 5C */ stfs f2, 0x5c(r1) /* 800E4CF4 000E1C54 48 05 9F 2D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 800E4CF8 000E1C58 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E4CFC 000E1C5C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 800E4CF8 000E1C58 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E4CFC 000E1C5C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 800E4D00 000E1C60 C0 C1 00 60 */ lfs f6, 0x60(r1) /* 800E4D04 000E1C64 38 81 00 A8 */ addi r4, r1, 0xa8 /* 800E4D08 000E1C68 C0 A1 00 64 */ lfs f5, 0x64(r1) @@ -2530,9 +2530,9 @@ lbl_800E4D48: /* 800E4D6C 000E1CCC D0 1F 08 30 */ stfs f0, 0x830(r31) /* 800E4D70 000E1CD0 48 03 5B BD */ bl GetBoundingBox__13CPhysicsActorCFv /* 800E4D74 000E1CD4 C0 21 00 A4 */ lfs f1, 0xa4(r1) -/* 800E4D78 000E1CD8 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 800E4D78 000E1CD8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 800E4D7C 000E1CDC C0 01 00 98 */ lfs f0, 0x98(r1) -/* 800E4D80 000E1CE0 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 800E4D80 000E1CE0 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 800E4D84 000E1CE4 C0 82 8F FC */ lfs f4, lbl_805AAD1C@sda21(r2) /* 800E4D88 000E1CE8 7F E3 FB 78 */ mr r3, r31 /* 800E4D8C 000E1CEC EC 61 00 28 */ fsubs f3, f1, f0 @@ -2584,9 +2584,9 @@ lbl_800E4E30: /* 800E4E34 000E1D94 38 61 00 78 */ addi r3, r1, 0x78 /* 800E4E38 000E1D98 48 03 5A F5 */ bl GetBoundingBox__13CPhysicsActorCFv /* 800E4E3C 000E1D9C C0 21 00 8C */ lfs f1, 0x8c(r1) -/* 800E4E40 000E1DA0 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 800E4E40 000E1DA0 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 800E4E44 000E1DA4 C0 01 00 80 */ lfs f0, 0x80(r1) -/* 800E4E48 000E1DA8 38 63 67 00 */ addi r3, r3, lbl_805A6700@l +/* 800E4E48 000E1DA8 38 63 67 00 */ addi r3, r3, sDownVector__9CVector3f@l /* 800E4E4C 000E1DAC C0 82 8F FC */ lfs f4, lbl_805AAD1C@sda21(r2) /* 800E4E50 000E1DB0 EC 01 00 28 */ fsubs f0, f1, f0 /* 800E4E54 000E1DB4 C0 63 00 08 */ lfs f3, 8(r3) @@ -2811,8 +2811,8 @@ lbl_800E513C: /* 800E518C 000E20EC 4C 40 13 82 */ cror 2, 0, 2 /* 800E5190 000E20F0 40 82 00 48 */ bne lbl_800E51D8 lbl_800E5194: -/* 800E5194 000E20F4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E5198 000E20F8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 800E5194 000E20F4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E5198 000E20F8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 800E519C 000E20FC C0 02 8F E8 */ lfs f0, lbl_805AAD08@sda21(r2) /* 800E51A0 000E2100 38 81 00 60 */ addi r4, r1, 0x60 /* 800E51A4 000E2104 C0 43 00 04 */ lfs f2, 4(r3) @@ -3210,11 +3210,11 @@ lbl_800E56B8: /* 800E570C 000E266C 38 81 00 08 */ addi r4, r1, 8 /* 800E5710 000E2670 48 00 00 0C */ b lbl_800E571C lbl_800E5714: -/* 800E5714 000E2674 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E5718 000E2678 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800E5714 000E2674 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E5718 000E2678 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l lbl_800E571C: -/* 800E571C 000E267C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E5720 000E2680 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 800E571C 000E267C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E5720 000E2680 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 800E5724 000E2684 C0 84 00 00 */ lfs f4, 0(r4) /* 800E5728 000E2688 C0 A4 00 04 */ lfs f5, 4(r4) /* 800E572C 000E268C C0 C4 00 08 */ lfs f6, 8(r4) @@ -3478,8 +3478,8 @@ lbl_800E5A70: /* 800E5AE4 000E2A44 4C 41 13 82 */ cror 2, 1, 2 /* 800E5AE8 000E2A48 40 82 00 48 */ bne lbl_800E5B30 lbl_800E5AEC: -/* 800E5AEC 000E2A4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E5AF0 000E2A50 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 800E5AEC 000E2A4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E5AF0 000E2A50 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 800E5AF4 000E2A54 C0 02 8F E8 */ lfs f0, lbl_805AAD08@sda21(r2) /* 800E5AF8 000E2A58 38 81 00 C4 */ addi r4, r1, 0xc4 /* 800E5AFC 000E2A5C C0 43 00 04 */ lfs f2, 4(r3) @@ -3633,8 +3633,8 @@ lbl_800E5CFC: /* 800E5D14 000E2C74 48 00 00 F4 */ b lbl_800E5E08 lbl_800E5D18: /* 800E5D18 000E2C78 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 800E5D1C 000E2C7C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E5D20 000E2C80 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 800E5D28 000E2C88 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 800E5D2C 000E2C8C 90 A1 00 08 */ stw r5, 8(r1) @@ -4807,8 +4807,8 @@ lbl_800E6DE0: /* 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 -/* 800E6DFC 000E3D5C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E6E00 000E3D60 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -4871,9 +4871,9 @@ lbl_800E6EC8: /* 800E6EEC 000E3E4C D0 21 00 4C */ stfs f1, 0x4c(r1) /* 800E6EF0 000E3E50 D0 41 00 50 */ stfs f2, 0x50(r1) /* 800E6EF4 000E3E54 48 05 7D 2D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 800E6EF8 000E3E58 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800E6EF8 000E3E58 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E6EFC 000E3E5C C0 C1 00 54 */ lfs f6, 0x54(r1) -/* 800E6F00 000E3E60 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800E6F00 000E3E60 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800E6F04 000E3E64 C0 A1 00 58 */ lfs f5, 0x58(r1) /* 800E6F08 000E3E68 C0 81 00 5C */ lfs f4, 0x5c(r1) /* 800E6F0C 000E3E6C 38 7F 00 04 */ addi r3, r31, 4 @@ -4903,9 +4903,9 @@ lbl_800E6F48: /* 800E6F68 000E3EC8 D0 1E 08 30 */ stfs f0, 0x830(r30) /* 800E6F6C 000E3ECC 48 03 39 C1 */ bl GetBoundingBox__13CPhysicsActorCFv /* 800E6F70 000E3ED0 C0 21 00 8C */ lfs f1, 0x8c(r1) -/* 800E6F74 000E3ED4 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 800E6F74 000E3ED4 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 800E6F78 000E3ED8 C0 01 00 80 */ lfs f0, 0x80(r1) -/* 800E6F7C 000E3EDC 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 800E6F7C 000E3EDC 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 800E6F80 000E3EE0 C0 82 8F FC */ lfs f4, lbl_805AAD1C@sda21(r2) /* 800E6F84 000E3EE4 7F C3 F3 78 */ mr r3, r30 /* 800E6F88 000E3EE8 EC 61 00 28 */ fsubs f3, f1, f0 @@ -4968,9 +4968,9 @@ lbl_800E7058: /* 800E705C 000E3FBC 38 61 00 60 */ addi r3, r1, 0x60 /* 800E7060 000E3FC0 48 03 38 CD */ bl GetBoundingBox__13CPhysicsActorCFv /* 800E7064 000E3FC4 C0 21 00 74 */ lfs f1, 0x74(r1) -/* 800E7068 000E3FC8 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 800E7068 000E3FC8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 800E706C 000E3FCC C0 01 00 68 */ lfs f0, 0x68(r1) -/* 800E7070 000E3FD0 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 800E7070 000E3FD0 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 800E7074 000E3FD4 C0 DE 00 60 */ lfs f6, 0x60(r30) /* 800E7078 000E3FD8 7F C3 F3 78 */ mr r3, r30 /* 800E707C 000E3FDC EC 21 00 28 */ fsubs f1, f1, f0 @@ -5053,8 +5053,8 @@ lbl_800E718C: /* 800E7194 000E40F4 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 800E71A4 000E4104 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 800E71A0 000E4100 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800E71A4 000E4104 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 800E71A8 000E4108 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 800E71AC 000E410C 7C 60 1B 78 */ mr r0, r3 /* 800E71B0 000E4110 39 00 00 0E */ li r8, 0xe @@ -5084,9 +5084,9 @@ lbl_800E718C: /* 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 -/* 800E721C 000E417C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 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, lbl_805A66F4@l +/* 800E7224 000E4184 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800E7228 000E4188 80 A1 00 DC */ lwz r5, 0xdc(r1) /* 800E722C 000E418C 38 61 01 20 */ addi r3, r1, 0x120 /* 800E7230 000E4190 81 21 00 E0 */ lwz r9, 0xe0(r1) @@ -5148,8 +5148,8 @@ lbl_800E7308: /* 800E730C 000E426C 3C E0 80 3E */ lis r7, lbl_803DAA68@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, skZero3f@ha -/* 800E731C 000E427C C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 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 /* 800E7328 000E4288 C0 24 00 04 */ lfs f1, 4(r4) @@ -5239,8 +5239,8 @@ lbl_800E7458: /* 800E7460 000E43C0 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 800E7470 000E43D0 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 800E746C 000E43CC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800E7470 000E43D0 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 800E7474 000E43D4 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 800E7478 000E43D8 7C 60 1B 78 */ mr r0, r3 /* 800E747C 000E43DC 39 00 00 0E */ li r8, 0xe @@ -5349,8 +5349,8 @@ lbl_800E7538: /* 800E7610 000E4570 2C 00 00 00 */ cmpwi r0, 0 /* 800E7614 000E4574 41 82 01 20 */ beq lbl_800E7734 /* 800E7618 000E4578 C0 02 90 00 */ lfs f0, lbl_805AAD20@sda21(r2) -/* 800E761C 000E457C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800E7620 000E4580 C7 E3 66 A0 */ lfsu f31, skZero3f@l(r3) +/* 800E761C 000E457C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800E7620 000E4580 C7 E3 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r3) /* 800E7624 000E4584 3B E1 01 84 */ addi r31, r1, 0x184 /* 800E7628 000E4588 EC 20 07 32 */ fmuls f1, f0, f28 /* 800E762C 000E458C C0 1C 05 A8 */ lfs f0, 0x5a8(r28) @@ -5557,8 +5557,8 @@ lbl_800E78EC: /* 800E78F8 000E4858 48 00 01 04 */ b lbl_800E79FC .global lbl_800E78FC lbl_800E78FC: -/* 800E78FC 000E485C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800E7900 000E4860 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 800E78FC 000E485C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800E7900 000E4860 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 800E7904 000E4864 38 60 00 01 */ li r3, 1 /* 800E7908 000E4868 3B E0 00 00 */ li r31, 0 /* 800E790C 000E486C D0 1B 01 50 */ stfs f0, 0x150(r27) @@ -6006,9 +6006,9 @@ lbl_800E7DB8: /* 800E7F5C 000E4EBC 90 9A 08 00 */ stw r4, 0x800(r26) /* 800E7F60 000E4EC0 90 7A 08 04 */ stw r3, 0x804(r26) /* 800E7F64 000E4EC4 80 BF 00 5C */ lwz r5, 0x5c(r31) -/* 800E7F68 000E4EC8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800E7F68 000E4EC8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800E7F6C 000E4ECC C0 22 90 14 */ lfs f1, lbl_805AAD34@sda21(r2) -/* 800E7F70 000E4ED0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800E7F70 000E4ED0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800E7F74 000E4ED4 90 BA 08 08 */ stw r5, 0x808(r26) /* 800E7F78 000E4ED8 38 61 00 64 */ addi r3, r1, 0x64 /* 800E7F7C 000E4EDC C0 02 8F E8 */ lfs f0, lbl_805AAD08@sda21(r2) diff --git a/asm/MetroidPrime/Enemies/CBloodFlower.s b/asm/MetroidPrime/Enemies/CBloodFlower.s index 13221b09..9874aff9 100644 --- a/asm/MetroidPrime/Enemies/CBloodFlower.s +++ b/asm/MetroidPrime/Enemies/CBloodFlower.s @@ -1131,8 +1131,8 @@ lbl_801197B8: /* 801197C0 00116720 48 00 01 84 */ b lbl_80119944 lbl_801197C4: /* 801197C4 00116724 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 801197C8 00116728 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801197CC 0011672C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801197D4 00116734 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801197D8 00116738 90 E1 00 6C */ stw r7, 0x6c(r1) @@ -1217,9 +1217,9 @@ lbl_8011989C: /* 80119910 00116870 B0 01 00 18 */ sth r0, 0x18(r1) /* 80119914 00116874 B0 01 00 1C */ sth r0, 0x1c(r1) /* 80119918 00116878 4B FA 9B 31 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 8011991C 0011687C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011991C 0011687C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80119920 00116880 7F E3 FB 78 */ mr r3, r31 -/* 80119924 00116884 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80119924 00116884 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80119928 00116888 38 A1 00 14 */ addi r5, r1, 0x14 /* 8011992C 0011688C 38 81 00 1C */ addi r4, r1, 0x1c /* 80119930 00116890 38 C1 00 0C */ addi r6, r1, 0xc @@ -1239,8 +1239,8 @@ lbl_80119944: /* 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 -/* 80119970 001168D0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80119974 001168D4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 80119980 001168E0 C0 44 00 00 */ lfs f2, 0(r4) diff --git a/asm/MetroidPrime/Enemies/CBouncyGrenade.s b/asm/MetroidPrime/Enemies/CBouncyGrenade.s index e1e2fa5f..6ea22140 100644 --- a/asm/MetroidPrime/Enemies/CBouncyGrenade.s +++ b/asm/MetroidPrime/Enemies/CBouncyGrenade.s @@ -201,11 +201,11 @@ sub_8022e424: /* 8022E444 0022B3A4 54 80 CF FF */ rlwinm. r0, r4, 0x19, 0x1f, 0x1f /* 8022E448 0022B3A8 40 82 04 3C */ bne lbl_8022E884 /* 8022E44C 0022B3AC 38 00 00 01 */ li r0, 1 -/* 8022E450 0022B3B0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8022E450 0022B3B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8022E454 0022B3B4 50 04 3E 30 */ rlwimi r4, r0, 7, 0x18, 0x18 /* 8022E458 0022B3B8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8022E45C 0022B3BC 98 9E 02 B4 */ stb r4, 0x2b4(r30) -/* 8022E460 0022B3C0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8022E460 0022B3C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8022E464 0022B3C4 38 61 00 3C */ addi r3, r1, 0x3c /* 8022E468 0022B3C8 38 A1 00 68 */ addi r5, r1, 0x68 /* 8022E46C 0022B3CC 81 5E 00 04 */ lwz r10, 4(r30) @@ -278,8 +278,8 @@ lbl_8022E548: /* 8022E574 0022B4D4 39 00 00 00 */ li r8, 0 /* 8022E578 0022B4D8 39 40 00 03 */ li r10, 3 /* 8022E57C 0022B4DC 90 81 00 B4 */ stw r4, 0xb4(r1) -/* 8022E580 0022B4E0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8022E584 0022B4E4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8022E580 0022B4E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8022E584 0022B4E4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8022E588 0022B4E8 A0 1B 00 00 */ lhz r0, 0(r27) /* 8022E58C 0022B4EC 90 61 00 B0 */ stw r3, 0xb0(r1) /* 8022E590 0022B4F0 7F E3 FB 78 */ mr r3, r31 @@ -427,8 +427,8 @@ lbl_8022E6FC: /* 8022E7BC 0022B71C 39 00 00 00 */ li r8, 0 /* 8022E7C0 0022B720 39 40 00 03 */ li r10, 3 /* 8022E7C4 0022B724 90 81 00 84 */ stw r4, 0x84(r1) -/* 8022E7C8 0022B728 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8022E7CC 0022B72C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8022E7C8 0022B728 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8022E7CC 0022B72C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8022E7D0 0022B730 A0 1B 00 00 */ lhz r0, 0(r27) /* 8022E7D4 0022B734 90 61 00 80 */ stw r3, 0x80(r1) /* 8022E7D8 0022B738 7F E3 FB 78 */ mr r3, r31 @@ -792,9 +792,9 @@ lbl_8022EC8C: /* 8022ECFC 0022BC5C D0 01 00 44 */ stfs f0, 0x44(r1) /* 8022ED00 0022BC60 4B EE D6 99 */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 8022ED04 0022BC64 81 5C 00 04 */ lwz r10, 4(r28) -/* 8022ED08 0022BC68 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8022ED08 0022BC68 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8022ED0C 0022BC6C C0 5C 00 60 */ lfs f2, 0x60(r28) -/* 8022ED10 0022BC70 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8022ED10 0022BC70 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8022ED14 0022BC74 C0 3C 00 50 */ lfs f1, 0x50(r28) /* 8022ED18 0022BC78 38 61 00 14 */ addi r3, r1, 0x14 /* 8022ED1C 0022BC7C C0 1C 00 40 */ lfs f0, 0x40(r28) @@ -1159,8 +1159,8 @@ __ct__14CBouncyGrenade: /* 8022F258 0022C1B8 4B DE C2 DD */ bl Identity__10CAxisAngleFv /* 8022F25C 0022C1BC 7C 76 1B 78 */ mr r22, r3 /* 8022F260 0022C1C0 4B DE C2 D5 */ bl Identity__10CAxisAngleFv -/* 8022F264 0022C1C4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8022F268 0022C1C8 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8022F264 0022C1C4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8022F268 0022C1C8 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8022F26C 0022C1CC C0 3F 00 00 */ lfs f1, 0(r31) /* 8022F270 0022C1D0 38 00 00 00 */ li r0, 0 /* 8022F274 0022C1D4 C0 64 00 04 */ lfs f3, 4(r4) diff --git a/asm/MetroidPrime/Enemies/CBurrower.s b/asm/MetroidPrime/Enemies/CBurrower.s index ba0fdc60..a3824a60 100644 --- a/asm/MetroidPrime/Enemies/CBurrower.s +++ b/asm/MetroidPrime/Enemies/CBurrower.s @@ -506,9 +506,9 @@ lbl_8026FE60: /* 8026FEF0 0026CE50 39 00 00 01 */ li r8, 1 /* 8026FEF4 0026CE54 4B FA BF F9 */ bl PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbf /* 8026FEF8 0026CE58 C0 41 00 1C */ lfs f2, 0x1c(r1) -/* 8026FEFC 0026CE5C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8026FEFC 0026CE5C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8026FF00 0026CE60 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 8026FF04 0026CE64 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8026FF04 0026CE64 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8026FF08 0026CE68 C0 01 00 24 */ lfs f0, 0x24(r1) /* 8026FF0C 0026CE6C 38 61 00 58 */ addi r3, r1, 0x58 /* 8026FF10 0026CE70 D0 41 00 34 */ stfs f2, 0x34(r1) @@ -1085,8 +1085,8 @@ lbl_80270658: /* 80270710 0026D670 38 80 00 01 */ li r4, 1 /* 80270714 0026D674 48 0A C1 AD */ bl ForceParticleCreation__11CElementGenFi /* 80270718 0026D678 80 7F 06 74 */ lwz r3, 0x674(r31) -/* 8027071C 0026D67C 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80270720 0026D680 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8027071C 0026D67C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80270720 0026D680 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80270724 0026D684 81 83 00 00 */ lwz r12, 0(r3) /* 80270728 0026D688 81 8C 00 14 */ lwz r12, 0x14(r12) /* 8027072C 0026D68C 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Enemies/CBurstFire.s b/asm/MetroidPrime/Enemies/CBurstFire.s index 3a51d390..762cb457 100644 --- a/asm/MetroidPrime/Enemies/CBurstFire.s +++ b/asm/MetroidPrime/Enemies/CBurstFire.s @@ -95,8 +95,8 @@ GetError__10CBurstFireCFff: /* 801AD24C 001AA1AC F3 61 00 28 */ psq_st f27, 40(r1), 0, qr0 /* 801AD250 001AA1B0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801AD254 001AA1B4 88 A4 00 14 */ lbz r5, 0x14(r4) -/* 801AD258 001AA1B8 3C C0 80 5A */ lis r6, skZero3f@ha -/* 801AD25C 001AA1BC C7 E6 66 A0 */ lfsu f31, skZero3f@l(r6) +/* 801AD258 001AA1B8 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha +/* 801AD25C 001AA1BC C7 E6 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r6) /* 801AD260 001AA1C0 FF 60 08 90 */ fmr f27, f1 /* 801AD264 001AA1C4 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f /* 801AD268 001AA1C8 FF 80 10 90 */ fmr f28, f2 diff --git a/asm/MetroidPrime/Enemies/CChozoGhost.s b/asm/MetroidPrime/Enemies/CChozoGhost.s index 49e0e8d4..ea99c524 100644 --- a/asm/MetroidPrime/Enemies/CChozoGhost.s +++ b/asm/MetroidPrime/Enemies/CChozoGhost.s @@ -518,8 +518,8 @@ lbl_8013F51C: lbl_8013F5A0: /* 8013F5A0 0013C500 7F E3 FB 78 */ mr r3, r31 /* 8013F5A4 0013C504 4B FD BD D5 */ bl Stop__13CPhysicsActorFv -/* 8013F5A8 0013C508 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013F5AC 0013C50C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8013F5A8 0013C508 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013F5AC 0013C50C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8013F5B0 0013C510 D0 1F 01 50 */ stfs f0, 0x150(r31) /* 8013F5B4 0013C514 C0 03 00 04 */ lfs f0, 4(r3) /* 8013F5B8 0013C518 D0 1F 01 54 */ stfs f0, 0x154(r31) @@ -575,9 +575,9 @@ lbl_8013F634: /* 8013F668 0013C5C8 7D 89 03 A6 */ mtctr r12 /* 8013F66C 0013C5CC 4E 80 04 21 */ bctrl /* 8013F670 0013C5D0 C0 A1 00 54 */ lfs f5, 0x54(r1) -/* 8013F674 0013C5D4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013F674 0013C5D4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013F678 0013C5D8 C0 81 00 58 */ lfs f4, 0x58(r1) -/* 8013F67C 0013C5DC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8013F67C 0013C5DC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8013F680 0013C5E0 C0 61 00 5C */ lfs f3, 0x5c(r1) /* 8013F684 0013C5E4 38 61 00 6C */ addi r3, r1, 0x6c /* 8013F688 0013C5E8 C0 41 01 08 */ lfs f2, 0x108(r1) @@ -686,8 +686,8 @@ lbl_8013F80C: /* 8013F810 0013C770 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 8013F814 0013C774 41 82 00 4C */ beq lbl_8013F860 /* 8013F818 0013C778 C0 02 9B 68 */ lfs f0, lbl_805AB888@sda21(r2) -/* 8013F81C 0013C77C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013F820 0013C780 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8013F81C 0013C77C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013F820 0013C780 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8013F824 0013C784 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8013F828 0013C788 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F82C 0013C78C 38 61 00 14 */ addi r3, r1, 0x14 @@ -723,8 +723,8 @@ lbl_8013F898: /* 8013F89C 0013C7FC 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f /* 8013F8A0 0013C800 41 82 00 4C */ beq lbl_8013F8EC /* 8013F8A4 0013C804 C0 02 9B 6C */ lfs f0, lbl_805AB88C@sda21(r2) -/* 8013F8A8 0013C808 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013F8AC 0013C80C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8013F8A8 0013C808 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013F8AC 0013C80C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8013F8B0 0013C810 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8013F8B4 0013C814 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F8B8 0013C818 38 61 00 10 */ addi r3, r1, 0x10 @@ -824,8 +824,8 @@ lbl_8013F9C0: /* 8013FA00 0013C960 48 00 00 24 */ b lbl_8013FA24 lbl_8013FA04: /* 8013FA04 0013C964 4B FD B9 75 */ bl Stop__13CPhysicsActorFv -/* 8013FA08 0013C968 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013FA0C 0013C96C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8013FA08 0013C968 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013FA0C 0013C96C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8013FA10 0013C970 D0 1F 01 50 */ stfs f0, 0x150(r31) /* 8013FA14 0013C974 C0 03 00 04 */ lfs f0, 4(r3) /* 8013FA18 0013C978 D0 1F 01 54 */ stfs f0, 0x154(r31) @@ -1021,13 +1021,13 @@ lbl_8013FC50: /* 8013FC84 0013CBE4 38 A0 00 00 */ li r5, 0 /* 8013FC88 0013CBE8 38 00 00 01 */ li r0, 1 /* 8013FC8C 0013CBEC 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8013FC90 0013CBF0 3C 80 80 5A */ lis r4, lbl_805A66F4@ha -/* 8013FC94 0013CBF4 38 E4 66 F4 */ addi r7, r4, lbl_805A66F4@l +/* 8013FC90 0013CBF0 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha +/* 8013FC94 0013CBF4 38 E4 66 F4 */ addi r7, r4, sUpVector__9CVector3f@l /* 8013FC98 0013CBF8 C0 22 9B 68 */ lfs f1, lbl_805AB888@sda21(r2) /* 8013FC9C 0013CBFC 90 61 00 28 */ stw r3, 0x28(r1) -/* 8013FCA0 0013CC00 3C 80 80 5A */ lis r4, lbl_805A6700@ha +/* 8013FCA0 0013CC00 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha /* 8013FCA4 0013CC04 C0 A7 00 04 */ lfs f5, 4(r7) -/* 8013FCA8 0013CC08 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 8013FCA8 0013CC08 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 8013FCAC 0013CC0C 90 A1 00 34 */ stw r5, 0x34(r1) /* 8013FCB0 0013CC10 7F C4 F3 78 */ mr r4, r30 /* 8013FCB4 0013CC14 C0 67 00 08 */ lfs f3, 8(r7) @@ -1058,9 +1058,9 @@ lbl_8013FC50: /* 8013FD18 0013CC78 88 1F 06 64 */ lbz r0, 0x664(r31) /* 8013FD1C 0013CC7C 38 60 00 01 */ li r3, 1 /* 8013FD20 0013CC80 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b -/* 8013FD24 0013CC84 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8013FD24 0013CC84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8013FD28 0013CC88 98 1F 06 64 */ stb r0, 0x664(r31) -/* 8013FD2C 0013CC8C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8013FD2C 0013CC8C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8013FD30 0013CC90 C0 02 9B 5C */ lfs f0, lbl_805AB87C@sda21(r2) /* 8013FD34 0013CC94 7F E3 FB 78 */ mr r3, r31 /* 8013FD38 0013CC98 C0 25 00 00 */ lfs f1, 0(r5) @@ -1117,8 +1117,8 @@ lbl_8013FDF4: /* 8013FDF8 0013CD58 38 60 00 01 */ li r3, 1 /* 8013FDFC 0013CD5C 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 8013FE00 0013CD60 98 1F 03 28 */ stb r0, 0x328(r31) -/* 8013FE04 0013CD64 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8013FE08 0013CD68 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8013FE04 0013CD64 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8013FE08 0013CD68 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8013FE0C 0013CD6C D0 1F 01 50 */ stfs f0, 0x150(r31) /* 8013FE10 0013CD70 C0 03 00 04 */ lfs f0, 4(r3) /* 8013FE14 0013CD74 D0 1F 01 54 */ stfs f0, 0x154(r31) @@ -1407,9 +1407,9 @@ lbl_801401D8: /* 801401E8 0013D148 38 60 00 00 */ li r3, 0 /* 801401EC 0013D14C 38 80 00 01 */ li r4, 1 /* 801401F0 0013D150 48 24 9D 05 */ bl __shl2i -/* 801401F4 0013D154 3C A0 80 5A */ lis r5, lbl_805A66F4@ha +/* 801401F4 0013D154 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha /* 801401F8 0013D158 39 00 00 00 */ li r8, 0 -/* 801401FC 0013D15C 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 801401FC 0013D15C 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80140200 0013D160 38 00 00 01 */ li r0, 1 /* 80140204 0013D164 C0 82 9B 80 */ lfs f4, lbl_805AB8A0@sda21(r2) /* 80140208 0013D168 38 A1 00 44 */ addi r5, r1, 0x44 @@ -1454,8 +1454,8 @@ lbl_801401D8: /* 801402A4 0013D204 38 A0 00 00 */ li r5, 0 /* 801402A8 0013D208 48 0F 3B 1D */ bl SetAvailableState__20CKnockBackControllerFib lbl_801402AC: -/* 801402AC 0013D20C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801402B0 0013D210 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801402AC 0013D20C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801402B0 0013D210 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801402B4 0013D214 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 801402B8 0013D218 C0 03 00 04 */ lfs f0, 4(r3) /* 801402BC 0013D21C D0 1E 01 54 */ stfs f0, 0x154(r30) @@ -1609,8 +1609,8 @@ lbl_801404B4: /* 801404BC 0013D41C 38 9F 06 88 */ addi r4, r31, 0x688 /* 801404C0 0013D420 38 DF 02 E0 */ addi r6, r31, 0x2e0 /* 801404C4 0013D424 4B FF E7 5D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 801404C8 0013D428 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801404CC 0013D42C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801404C8 0013D428 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801404CC 0013D42C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801404D0 0013D430 C0 C1 00 2C */ lfs f6, 0x2c(r1) /* 801404D4 0013D434 38 81 00 38 */ addi r4, r1, 0x38 /* 801404D8 0013D438 C0 A1 00 30 */ lfs f5, 0x30(r1) @@ -1901,8 +1901,8 @@ lbl_801408D4: /* 80140904 0013D864 39 00 00 00 */ li r8, 0 /* 80140908 0013D868 38 00 00 01 */ li r0, 1 /* 8014090C 0013D86C 90 81 00 54 */ stw r4, 0x54(r1) -/* 80140910 0013D870 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 80140914 0013D874 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 80140910 0013D870 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 80140914 0013D874 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 80140918 0013D878 C0 22 9B 88 */ lfs f1, lbl_805AB8A8@sda21(r2) /* 8014091C 0013D87C 90 61 00 50 */ stw r3, 0x50(r1) /* 80140920 0013D880 7F E4 FB 78 */ mr r4, r31 @@ -1945,9 +1945,9 @@ lbl_80140990: /* 801409AC 0013D90C C0 3E 05 6C */ lfs f1, 0x56c(r30) /* 801409B0 0013D910 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801409B4 0013D914 40 81 01 3C */ ble lbl_80140AF0 -/* 801409B8 0013D918 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 801409B8 0013D918 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 801409BC 0013D91C D0 3E 06 C8 */ stfs f1, 0x6c8(r30) -/* 801409C0 0013D920 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 801409C0 0013D920 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 801409C4 0013D924 7F E4 FB 78 */ mr r4, r31 /* 801409C8 0013D928 7F C3 F3 78 */ mr r3, r30 /* 801409CC 0013D92C 48 00 03 49 */ bl sub_80140d14 @@ -2072,9 +2072,9 @@ lbl_80140B50: /* 80140B80 0013DAE0 C0 3E 05 6C */ lfs f1, 0x56c(r30) /* 80140B84 0013DAE4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80140B88 0013DAE8 40 81 00 58 */ ble lbl_80140BE0 -/* 80140B8C 0013DAEC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80140B8C 0013DAEC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80140B90 0013DAF0 D0 3E 06 C8 */ stfs f1, 0x6c8(r30) -/* 80140B94 0013DAF4 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 80140B94 0013DAF4 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 80140B98 0013DAF8 7F E4 FB 78 */ mr r4, r31 /* 80140B9C 0013DAFC 7F C3 F3 78 */ mr r3, r30 /* 80140BA0 0013DB00 48 00 01 75 */ bl sub_80140d14 @@ -2163,8 +2163,8 @@ lbl_80140CB8: /* 80140CBC 0013DC1C 7F E5 FB 78 */ mr r5, r31 /* 80140CC0 0013DC20 38 80 00 13 */ li r4, 0x13 /* 80140CC4 0013DC24 4B F1 32 BD */ bl RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 80140CC8 0013DC28 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80140CCC 0013DC2C C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80140CC8 0013DC28 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80140CCC 0013DC2C C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80140CD0 0013DC30 38 60 00 01 */ li r3, 1 /* 80140CD4 0013DC34 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 80140CD8 0013DC38 C0 04 00 04 */ lfs f0, 4(r4) @@ -2687,9 +2687,9 @@ lbl_801413B8: /* 80141470 0013E3D0 48 24 8A 85 */ bl __shl2i /* 80141474 0013E3D4 39 00 00 00 */ li r8, 0 /* 80141478 0013E3D8 38 00 00 01 */ li r0, 1 -/* 8014147C 0013E3DC 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 8014147C 0013E3DC 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 80141480 0013E3E0 90 81 00 94 */ stw r4, 0x94(r1) -/* 80141484 0013E3E4 38 C5 67 00 */ addi r6, r5, lbl_805A6700@l +/* 80141484 0013E3E4 38 C5 67 00 */ addi r6, r5, sDownVector__9CVector3f@l /* 80141488 0013E3E8 C0 22 9B 90 */ lfs f1, lbl_805AB8B0@sda21(r2) /* 8014148C 0013E3EC 90 61 00 90 */ stw r3, 0x90(r1) /* 80141490 0013E3F0 7F 84 E3 78 */ mr r4, r28 @@ -3255,9 +3255,9 @@ Touch__11CChozoGhostFR6CActorR13CStateManager: /* 80141C64 0013EBC4 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80141C68 0013EBC8 7D 89 03 A6 */ mtctr r12 /* 80141C6C 0013EBCC 4E 80 04 21 */ bctrl -/* 80141C70 0013EBD0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80141C70 0013EBD0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80141C74 0013EBD4 7F C3 F3 78 */ mr r3, r30 -/* 80141C78 0013EBD8 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80141C78 0013EBD8 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80141C7C 0013EBDC 38 A1 00 14 */ addi r5, r1, 0x14 /* 80141C80 0013EBE0 38 81 00 1C */ addi r4, r1, 0x1c /* 80141C84 0013EBE4 38 C1 00 0C */ addi r6, r1, 0xc @@ -3617,9 +3617,9 @@ lbl_80142160: /* 801421A8 0013F108 38 61 01 24 */ addi r3, r1, 0x124 /* 801421AC 0013F10C 48 1F B9 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 801421B0 0013F110 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 801421B4 0013F114 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801421B4 0013F114 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801421B8 0013F118 C0 02 9B 5C */ lfs f0, lbl_805AB87C@sda21(r2) -/* 801421BC 0013F11C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801421BC 0013F11C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801421C0 0013F120 B0 18 06 C4 */ sth r0, 0x6c4(r24) /* 801421C4 0013F124 38 00 00 01 */ li r0, 1 /* 801421C8 0013F128 38 78 05 78 */ addi r3, r24, 0x578 diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 01bf1415..5a559010 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -1043,8 +1043,8 @@ sub_8015f510: /* 8015F590 0015C4F0 80 01 00 5C */ lwz r0, 0x5c(r1) /* 8015F594 0015C4F4 2C 00 00 00 */ cmpwi r0, 0 /* 8015F598 0015C4F8 40 81 02 60 */ ble lbl_8015F7F8 -/* 8015F59C 0015C4FC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8015F5A0 0015C500 C7 E3 66 A0 */ lfsu f31, skZero3f@l(r3) +/* 8015F59C 0015C4FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8015F5A0 0015C500 C7 E3 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r3) /* 8015F5A4 0015C504 C3 82 9F 84 */ lfs f28, lbl_805ABCA4@sda21(r2) /* 8015F5A8 0015C508 3B C1 00 60 */ addi r30, r1, 0x60 /* 8015F5AC 0015C50C C3 C3 00 04 */ lfs f30, 4(r3) @@ -1096,8 +1096,8 @@ lbl_8015F658: /* 8015F658 0015C5B8 80 01 00 5C */ lwz r0, 0x5c(r1) /* 8015F65C 0015C5BC 7C 1D 00 00 */ cmpw r29, r0 /* 8015F660 0015C5C0 41 80 FF 5C */ blt lbl_8015F5BC -/* 8015F664 0015C5C4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8015F668 0015C5C8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8015F664 0015C5C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8015F668 0015C5C8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8015F66C 0015C5CC 38 00 00 00 */ li r0, 0 /* 8015F670 0015C5D0 FC 1F 00 00 */ fcmpu cr0, f31, f0 /* 8015F674 0015C5D4 40 82 00 20 */ bne lbl_8015F694 @@ -1301,8 +1301,8 @@ lbl_8015F938: /* 8015F93C 0015C89C 40 80 03 E8 */ bge lbl_8015FD24 /* 8015F940 0015C8A0 48 00 03 C8 */ b lbl_8015FD08 lbl_8015F944: -/* 8015F944 0015C8A4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8015F948 0015C8A8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8015F944 0015C8A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8015F948 0015C8A8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8015F94C 0015C8AC C3 E2 9F 68 */ lfs f31, lbl_805ABC88@sda21(r2) /* 8015F950 0015C8B0 3B E0 00 00 */ li r31, 0 /* 8015F954 0015C8B4 D0 1D 06 7C */ stfs f0, 0x67c(r29) @@ -1578,10 +1578,10 @@ lbl_8015FD24: CoverCheck__6CDroneFR13CStateManagerf: /* 8015FD68 0015CCC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015FD6C 0015CCCC 7C 08 02 A6 */ mflr r0 -/* 8015FD70 0015CCD0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8015FD70 0015CCD0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8015FD74 0015CCD4 C0 22 9F A4 */ lfs f1, lbl_805ABCC4@sda21(r2) /* 8015FD78 0015CCD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015FD7C 0015CCDC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8015FD7C 0015CCDC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8015FD80 0015CCE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015FD84 0015CCE4 7C 7F 1B 78 */ mr r31, r3 /* 8015FD88 0015CCE8 38 7F 06 7C */ addi r3, r31, 0x67c @@ -3372,8 +3372,8 @@ lbl_80161780: /* 80161790 0015E6F0 4B FD 92 49 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 80161794 0015E6F4 48 00 01 98 */ b lbl_8016192C lbl_80161798: -/* 80161798 0015E6F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016179C 0015E6FC C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80161798 0015E6F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016179C 0015E6FC C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801617A0 0015E700 C0 DE 00 58 */ lfs f6, 0x58(r30) /* 801617A4 0015E704 38 81 00 68 */ addi r4, r1, 0x68 /* 801617A8 0015E708 C0 BE 00 48 */ lfs f5, 0x48(r30) @@ -4108,9 +4108,9 @@ Death__6CDroneFRC9CVector3fR13CStateManager: /* 8016224C 0015F1AC D0 61 00 24 */ stfs f3, 0x24(r1) /* 80162250 0015F1B0 D0 01 00 08 */ stfs f0, 8(r1) /* 80162254 0015F1B4 48 1B 16 ED */ bl RotateX__12CTransform4fFRC9CRelAngle -/* 80162258 0015F1B8 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80162258 0015F1B8 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8016225C 0015F1BC 38 61 00 64 */ addi r3, r1, 0x64 -/* 80162260 0015F1C0 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80162260 0015F1C0 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80162264 0015F1C4 38 A1 00 1C */ addi r5, r1, 0x1c /* 80162268 0015F1C8 38 81 00 28 */ addi r4, r1, 0x28 /* 8016226C 0015F1CC 48 1B 18 A5 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -4216,12 +4216,12 @@ lbl_80162398: lbl_801623DC: /* 801623DC 0015F33C 7F C3 F3 78 */ mr r3, r30 /* 801623E0 0015F340 4B FB 8F 99 */ bl Stop__13CPhysicsActorFv -/* 801623E4 0015F344 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801623E4 0015F344 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801623E8 0015F348 7F C3 F3 78 */ mr r3, r30 -/* 801623EC 0015F34C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801623EC 0015F34C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801623F0 0015F350 4B FB 88 B1 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 801623F4 0015F354 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801623F8 0015F358 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801623F4 0015F354 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801623F8 0015F358 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801623FC 0015F35C D0 1E 01 50 */ stfs f0, 0x150(r30) /* 80162400 0015F360 C0 03 00 04 */ lfs f0, 4(r3) /* 80162404 0015F364 D0 1E 01 54 */ stfs f0, 0x154(r30) @@ -4254,8 +4254,8 @@ lbl_80162460: /* 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 -/* 80162470 0015F3D0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80162474 0015F3D4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 @@ -4306,8 +4306,8 @@ lbl_80162460: /* 80162534 0015F494 48 00 00 B0 */ b lbl_801625E4 lbl_80162538: /* 80162538 0015F498 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 8016253C 0015F49C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80162540 0015F4A0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 8016254C 0015F4AC C0 44 00 00 */ lfs f2, 0(r4) @@ -5755,9 +5755,9 @@ lbl_801639C8: /* 80163A50 001609B0 D0 41 01 18 */ stfs f2, 0x118(r1) /* 80163A54 001609B4 D0 01 01 1C */ stfs f0, 0x11c(r1) /* 80163A58 001609B8 48 17 26 15 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 80163A5C 001609BC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80163A5C 001609BC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80163A60 001609C0 D3 E1 01 B8 */ stfs f31, 0x1b8(r1) -/* 80163A64 001609C4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80163A64 001609C4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80163A68 001609C8 7F C3 F3 78 */ mr r3, r30 /* 80163A6C 001609CC 48 1A F1 09 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80163A70 001609D0 3C 60 80 5A */ lis r3, lbl_8059FD18@ha @@ -5934,14 +5934,14 @@ lbl_80163CCC: /* 80163CF0 00160C50 48 1A EE 85 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80163CF4 00160C54 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80163CF8 00160C58 48 1D 9D E9 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 80163CFC 00160C5C 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 80163CFC 00160C5C 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 80163D00 00160C60 C3 E2 9F 7C */ lfs f31, lbl_805ABC9C@sda21(r2) /* 80163D04 00160C64 3B 9E 08 1C */ addi r28, r30, 0x81c /* 80163D08 00160C68 3A FE 08 28 */ addi r23, r30, 0x828 /* 80163D0C 00160C6C 3B 7E 08 00 */ addi r27, r30, 0x800 /* 80163D10 00160C70 3B 5E 07 E4 */ addi r26, r30, 0x7e4 /* 80163D14 00160C74 3B 3E 07 DC */ addi r25, r30, 0x7dc -/* 80163D18 00160C78 3B A3 67 54 */ addi r29, r3, lbl_805A6754@l +/* 80163D18 00160C78 3B A3 67 54 */ addi r29, r3, mskInvertedBox__6CAABox@l /* 80163D1C 00160C7C 3A C1 01 DC */ addi r22, r1, 0x1dc /* 80163D20 00160C80 3A A1 01 E8 */ addi r21, r1, 0x1e8 /* 80163D24 00160C84 3B 00 00 00 */ li r24, 0 @@ -5981,9 +5981,9 @@ lbl_80163D2C: /* 80163DA8 00160D08 D0 41 00 C4 */ stfs f2, 0xc4(r1) /* 80163DAC 00160D0C D0 01 00 BC */ stfs f0, 0xbc(r1) /* 80163DB0 00160D10 48 1B 0A A1 */ bl AsNormalized__9CVector3fCFv -/* 80163DB4 00160D14 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 80163DB4 00160D14 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 80163DB8 00160D18 C1 21 00 C8 */ lfs f9, 0xc8(r1) -/* 80163DBC 00160D1C 38 A3 67 54 */ addi r5, r3, lbl_805A6754@l +/* 80163DBC 00160D1C 38 A3 67 54 */ addi r5, r3, mskInvertedBox__6CAABox@l /* 80163DC0 00160D20 C1 01 00 CC */ lfs f8, 0xcc(r1) /* 80163DC4 00160D24 C0 E1 00 D0 */ lfs f7, 0xd0(r1) /* 80163DC8 00160D28 38 61 01 60 */ addi r3, r1, 0x160 @@ -6171,9 +6171,9 @@ lbl_80164000: /* 8016409C 00160FFC 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801640A0 00161000 7D 89 03 A6 */ mtctr r12 /* 801640A4 00161004 4E 80 04 21 */ bctrl -/* 801640A8 00161008 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801640A8 00161008 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801640AC 0016100C 7F E3 FB 78 */ mr r3, r31 -/* 801640B0 00161010 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801640B0 00161010 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801640B4 00161014 38 A1 00 20 */ addi r5, r1, 0x20 /* 801640B8 00161018 38 81 00 28 */ addi r4, r1, 0x28 /* 801640BC 0016101C 38 C1 00 18 */ addi r6, r1, 0x18 @@ -6670,9 +6670,9 @@ lbl_80164758: /* 801647C8 00161728 D0 41 00 10 */ stfs f2, 0x10(r1) /* 801647CC 0016172C D0 61 00 14 */ stfs f3, 0x14(r1) /* 801647D0 00161730 4B FD A1 21 */ bl Separation__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 801647D4 00161734 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801647D4 00161734 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801647D8 00161738 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801647DC 0016173C C4 A3 66 A0 */ lfsu f5, skZero3f@l(r3) +/* 801647DC 0016173C C4 A3 66 A0 */ lfsu f5, sZeroVector__9CVector3f@l(r3) /* 801647E0 00161740 38 00 00 00 */ li r0, 0 /* 801647E4 00161744 C0 61 00 1C */ lfs f3, 0x1c(r1) /* 801647E8 00161748 FC 01 28 00 */ fcmpu cr0, f1, f5 @@ -6688,9 +6688,9 @@ lbl_80164758: lbl_80164810: /* 80164810 00161770 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80164814 00161774 40 82 00 44 */ bne lbl_80164858 -/* 80164818 00161778 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80164818 00161778 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016481C 0016177C C0 02 9F 80 */ lfs f0, lbl_805ABCA0@sda21(r2) -/* 80164820 00161780 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80164820 00161780 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 80164824 00161784 D0 21 00 24 */ stfs f1, 0x24(r1) /* 80164828 00161788 C0 43 00 04 */ lfs f2, 4(r3) /* 8016482C 0016178C 38 81 00 24 */ addi r4, r1, 0x24 @@ -7237,9 +7237,9 @@ lbl_80164FC0: /* 80164FF4 00161F54 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 80164FF8 00161F58 41 82 00 74 */ beq lbl_8016506C /* 80164FFC 00161F5C 81 5E 00 04 */ lwz r10, 4(r30) -/* 80165000 00161F60 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80165000 00161F60 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80165004 00161F64 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80165008 00161F68 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80165008 00161F68 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8016500C 00161F6C C0 3E 00 50 */ lfs f1, 0x50(r30) /* 80165010 00161F70 38 61 00 34 */ addi r3, r1, 0x34 /* 80165014 00161F74 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -7306,8 +7306,8 @@ lbl_801650D8: /* 801650FC 0016205C 39 00 00 00 */ li r8, 0 /* 80165100 00162060 38 00 00 01 */ li r0, 1 /* 80165104 00162064 90 81 01 8C */ stw r4, 0x18c(r1) -/* 80165108 00162068 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 8016510C 0016206C 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 80165108 00162068 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 8016510C 0016206C 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 80165110 00162070 C0 22 9F EC */ lfs f1, lbl_805ABD0C@sda21(r2) /* 80165114 00162074 90 61 01 88 */ stw r3, 0x188(r1) /* 80165118 00162078 7F E4 FB 78 */ mr r4, r31 @@ -7344,9 +7344,9 @@ lbl_8016516C: /* 8016518C 001620EC 90 01 01 E8 */ stw r0, 0x1e8(r1) /* 80165190 001620F0 38 61 01 70 */ addi r3, r1, 0x170 /* 80165194 001620F4 4B FB 57 99 */ bl GetBoundingBox__13CPhysicsActorCFv -/* 80165198 001620F8 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 80165198 001620F8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 8016519C 001620FC C1 21 01 70 */ lfs f9, 0x170(r1) -/* 801651A0 00162100 3B A3 67 00 */ addi r29, r3, lbl_805A6700@l +/* 801651A0 00162100 3B A3 67 00 */ addi r29, r3, sDownVector__9CVector3f@l /* 801651A4 00162104 C1 01 01 74 */ lfs f8, 0x174(r1) /* 801651A8 00162108 C0 E1 01 78 */ lfs f7, 0x178(r1) /* 801651AC 0016210C 38 61 01 A0 */ addi r3, r1, 0x1a0 @@ -7439,9 +7439,9 @@ lbl_80165290: lbl_80165304: /* 80165304 00162264 C0 62 A0 14 */ lfs f3, lbl_805ABD34@sda21(r2) lbl_80165308: -/* 80165308 00162268 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 80165308 00162268 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 8016530C 0016226C C0 5D 00 04 */ lfs f2, 4(r29) -/* 80165310 00162270 C0 03 67 00 */ lfs f0, lbl_805A6700@l(r3) +/* 80165310 00162270 C0 03 67 00 */ lfs f0, sDownVector__9CVector3f@l(r3) /* 80165314 00162274 38 61 00 70 */ addi r3, r1, 0x70 /* 80165318 00162278 C0 3D 00 08 */ lfs f1, 8(r29) /* 8016531C 0016227C EC 5F 00 B2 */ fmuls f2, f31, f2 @@ -7515,9 +7515,9 @@ lbl_801653FC: /* 8016540C 0016236C C0 1E 06 64 */ lfs f0, 0x664(r30) /* 80165410 00162370 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80165414 00162374 40 80 00 90 */ bge lbl_801654A4 -/* 80165418 00162378 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80165418 00162378 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8016541C 0016237C C0 62 9F 7C */ lfs f3, lbl_805ABC9C@sda21(r2) -/* 80165420 00162380 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80165420 00162380 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80165424 00162384 38 61 00 58 */ addi r3, r1, 0x58 /* 80165428 00162388 C0 46 00 00 */ lfs f2, 0(r6) /* 8016542C 0016238C 38 9E 00 34 */ addi r4, r30, 0x34 @@ -7825,8 +7825,8 @@ lbl_80165750: /* 80165890 001627F0 39 00 00 00 */ li r8, 0 /* 80165894 001627F4 39 40 00 03 */ li r10, 3 /* 80165898 001627F8 90 81 00 5C */ stw r4, 0x5c(r1) -/* 8016589C 001627FC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801658A0 00162800 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8016589C 001627FC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801658A0 00162800 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801658A4 00162804 A0 01 00 20 */ lhz r0, 0x20(r1) /* 801658A8 00162808 90 61 00 58 */ stw r3, 0x58(r1) /* 801658AC 0016280C 7F E3 FB 78 */ mr r3, r31 @@ -7945,8 +7945,8 @@ sub_80165984: /* 80165A4C 001629AC EC 23 0F 7A */ fmadds f1, f3, f29, f1 /* 80165A50 001629B0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80165A54 001629B4 40 81 01 78 */ ble lbl_80165BCC -/* 80165A58 001629B8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80165A5C 001629BC C7 A4 66 A0 */ lfsu f29, skZero3f@l(r4) +/* 80165A58 001629B8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80165A5C 001629BC C7 A4 66 A0 */ lfsu f29, sZeroVector__9CVector3f@l(r4) /* 80165A60 001629C0 80 7E 09 00 */ lwz r3, 0x900(r30) /* 80165A64 001629C4 C3 C4 00 04 */ lfs f30, 4(r4) /* 80165A68 001629C8 C3 E4 00 08 */ lfs f31, 8(r4) @@ -7955,9 +7955,9 @@ sub_80165984: /* 80165A74 001629D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80165A78 001629D8 40 81 00 E0 */ ble lbl_80165B58 /* 80165A7C 001629DC C0 5F 00 2C */ lfs f2, 0x2c(r31) -/* 80165A80 001629E0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80165A80 001629E0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80165A84 001629E4 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 80165A88 001629E8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80165A88 001629E8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80165A8C 001629EC C0 1F 00 0C */ lfs f0, 0xc(r31) /* 80165A90 001629F0 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80165A94 001629F4 D0 21 00 50 */ stfs f1, 0x50(r1) @@ -8011,9 +8011,9 @@ sub_80165984: /* 80165B54 00162AB4 C3 E1 00 38 */ lfs f31, 0x38(r1) lbl_80165B58: /* 80165B58 00162AB8 C0 41 00 9C */ lfs f2, 0x9c(r1) -/* 80165B5C 00162ABC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80165B5C 00162ABC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80165B60 00162AC0 C0 21 00 A0 */ lfs f1, 0xa0(r1) -/* 80165B64 00162AC4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80165B64 00162AC4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80165B68 00162AC8 EC 62 F0 2A */ fadds f3, f2, f30 /* 80165B6C 00162ACC C0 01 00 98 */ lfs f0, 0x98(r1) /* 80165B70 00162AD0 EC 41 F8 2A */ fadds f2, f1, f31 @@ -8690,9 +8690,9 @@ lbl_80166498: /* 801664EC 0016344C A0 01 00 20 */ lhz r0, 0x20(r1) /* 801664F0 00163450 B0 1E 05 78 */ sth r0, 0x578(r30) /* 801664F4 00163454 48 1E 3A A9 */ bl Red__6CColorFv -/* 801664F8 00163458 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801664F8 00163458 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801664FC 0016345C 7C 65 1B 78 */ mr r5, r3 -/* 80166500 00163460 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80166500 00163460 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80166504 00163464 38 61 00 60 */ addi r3, r1, 0x60 /* 80166508 00163468 48 19 FF 2D */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 8016650C 0016346C 38 61 00 B0 */ addi r3, r1, 0xb0 @@ -8716,9 +8716,9 @@ lbl_80166498: /* 80166554 001634B4 B0 01 00 1C */ sth r0, 0x1c(r1) /* 80166558 001634B8 4B E9 E7 61 */ bl string_l__4rstlFPCc /* 8016655C 001634BC 88 1E 00 30 */ lbz r0, 0x30(r30) -/* 80166560 001634C0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80166560 001634C0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80166564 001634C4 80 9E 00 04 */ lwz r4, 4(r30) -/* 80166568 001634C8 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80166568 001634C8 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8016656C 001634CC 54 06 CF FE */ rlwinm r6, r0, 0x19, 0x1f, 0x1f /* 80166570 001634D0 38 00 00 00 */ li r0, 0 /* 80166574 001634D4 90 81 00 44 */ stw r4, 0x44(r1) @@ -8992,9 +8992,9 @@ lbl_8016689C: /* 8016695C 001638BC B0 1E 05 7A */ sth r0, 0x57a(r30) /* 80166960 001638C0 4B F6 7B 0D */ bl sub_800ce46c /* 80166964 001638C4 38 00 00 02 */ li r0, 2 -/* 80166968 001638C8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80166968 001638C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016696C 001638CC 90 1E 05 8C */ stw r0, 0x58c(r30) -/* 80166970 001638D0 3A 23 66 A0 */ addi r17, r3, skZero3f@l +/* 80166970 001638D0 3A 23 66 A0 */ addi r17, r3, sZeroVector__9CVector3f@l /* 80166974 001638D4 3A 5E 06 90 */ addi r18, r30, 0x690 /* 80166978 001638D8 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) /* 8016697C 001638DC 80 17 00 00 */ lwz r0, 0(r23) @@ -9112,7 +9112,7 @@ lbl_8016689C: /* 80166B3C 00163A9C 48 06 22 59 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 80166B40 00163AA0 4B EB 49 F5 */ bl Identity__10CAxisAngleFv /* 80166B44 00163AA4 C0 23 00 00 */ lfs f1, 0(r3) -/* 80166B48 00163AA8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80166B48 00163AA8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80166B4C 00163AAC C0 02 9F 68 */ lfs f0, lbl_805ABC88@sda21(r2) /* 80166B50 00163AB0 38 00 00 00 */ li r0, 0 /* 80166B54 00163AB4 D0 3E 07 94 */ stfs f1, 0x794(r30) @@ -9121,7 +9121,7 @@ lbl_8016689C: /* 80166B60 00163AC0 C0 23 00 08 */ lfs f1, 8(r3) /* 80166B64 00163AC4 57 83 04 3E */ clrlwi r3, r28, 0x10 /* 80166B68 00163AC8 D0 3E 07 9C */ stfs f1, 0x79c(r30) -/* 80166B6C 00163ACC C0 24 66 A0 */ lfs f1, skZero3f@l(r4) +/* 80166B6C 00163ACC C0 24 66 A0 */ lfs f1, sZeroVector__9CVector3f@l(r4) /* 80166B70 00163AD0 D0 3E 07 A0 */ stfs f1, 0x7a0(r30) /* 80166B74 00163AD4 C0 31 00 04 */ lfs f1, 4(r17) /* 80166B78 00163AD8 D0 3E 07 A4 */ stfs f1, 0x7a4(r30) @@ -9153,9 +9153,9 @@ lbl_80166BCC: lbl_80166BDC: /* 80166BDC 00163B3C 38 00 00 02 */ li r0, 2 /* 80166BE0 00163B40 34 9E 07 E4 */ addic. r4, r30, 0x7e4 -/* 80166BE4 00163B44 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80166BE4 00163B44 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80166BE8 00163B48 90 1E 07 E0 */ stw r0, 0x7e0(r30) -/* 80166BEC 00163B4C 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80166BEC 00163B4C 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 80166BF0 00163B50 41 82 00 1C */ beq lbl_80166C0C /* 80166BF4 00163B54 C0 03 00 00 */ lfs f0, 0(r3) /* 80166BF8 00163B58 D0 04 00 00 */ stfs f0, 0(r4) @@ -9175,9 +9175,9 @@ lbl_80166C0C: lbl_80166C2C: /* 80166C2C 00163B8C 38 00 00 02 */ li r0, 2 /* 80166C30 00163B90 34 9E 08 00 */ addic. r4, r30, 0x800 -/* 80166C34 00163B94 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80166C34 00163B94 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80166C38 00163B98 90 1E 07 FC */ stw r0, 0x7fc(r30) -/* 80166C3C 00163B9C 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80166C3C 00163B9C 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 80166C40 00163BA0 41 82 00 1C */ beq lbl_80166C5C /* 80166C44 00163BA4 C0 03 00 00 */ lfs f0, 0(r3) /* 80166C48 00163BA8 D0 04 00 00 */ stfs f0, 0(r4) @@ -9416,11 +9416,11 @@ sub_80166f10: /* 80166FB4 00163F14 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80166FB8 00163F18 48 1A D9 01 */ bl Magnitude__9CVector3fCFv /* 80166FBC 00163F1C C0 7C 00 60 */ lfs f3, 0x60(r28) -/* 80166FC0 00163F20 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80166FC0 00163F20 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80166FC4 00163F24 C0 5C 00 50 */ lfs f2, 0x50(r28) /* 80166FC8 00163F28 FF E0 08 90 */ fmr f31, f1 /* 80166FCC 00163F2C C0 1C 00 40 */ lfs f0, 0x40(r28) -/* 80166FD0 00163F30 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80166FD0 00163F30 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80166FD4 00163F34 D0 41 00 30 */ stfs f2, 0x30(r1) /* 80166FD8 00163F38 38 61 00 50 */ addi r3, r1, 0x50 /* 80166FDC 00163F3C 38 81 00 2C */ addi r4, r1, 0x2c @@ -9460,8 +9460,8 @@ lbl_8016705C: /* 8016705C 00163FBC 38 60 00 00 */ li r3, 0 /* 80167060 00163FC0 48 1A 4A 11 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 80167064 00163FC4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80167068 00163FC8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8016706C 00163FCC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80167068 00163FC8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8016706C 00163FCC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80167070 00163FD0 81 83 00 00 */ lwz r12, 0(r3) /* 80167074 00163FD4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80167078 00163FD8 7D 89 03 A6 */ mtctr r12 @@ -9654,8 +9654,8 @@ CalculateRenderBounds__11CDroneLaserFv: /* 80167334 00164294 DB E1 00 90 */ stfd f31, 0x90(r1) /* 80167338 00164298 F3 E1 00 98 */ psq_st f31, 152(r1), 0, qr0 /* 8016733C 0016429C 93 E1 00 8C */ stw r31, 0x8c(r1) -/* 80167340 001642A0 3C 80 80 5A */ lis r4, lbl_805A6754@ha -/* 80167344 001642A4 C4 A4 67 54 */ lfsu f5, lbl_805A6754@l(r4) +/* 80167340 001642A0 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha +/* 80167344 001642A4 C4 A4 67 54 */ lfsu f5, mskInvertedBox__6CAABox@l(r4) /* 80167348 001642A8 7C 7F 1B 78 */ mr r31, r3 /* 8016734C 001642AC 38 61 00 5C */ addi r3, r1, 0x5c /* 80167350 001642B0 C0 84 00 04 */ lfs f4, 4(r4) @@ -9839,9 +9839,9 @@ lbl_801675E4: /* 801675F0 00164550 A0 01 00 20 */ lhz r0, 0x20(r1) /* 801675F4 00164554 B0 1E 00 F4 */ sth r0, 0xf4(r30) /* 801675F8 00164558 48 1E 29 A5 */ bl Red__6CColorFv -/* 801675FC 0016455C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801675FC 0016455C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80167600 00164560 7C 65 1B 78 */ mr r5, r3 -/* 80167604 00164564 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80167604 00164564 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80167608 00164568 38 61 00 40 */ addi r3, r1, 0x40 /* 8016760C 0016456C 48 19 EE 29 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 80167610 00164570 38 61 00 90 */ addi r3, r1, 0x90 @@ -9865,9 +9865,9 @@ lbl_801675E4: /* 80167658 001645B8 B0 01 00 1C */ sth r0, 0x1c(r1) /* 8016765C 001645BC 4B E9 D6 5D */ bl string_l__4rstlFPCc /* 80167660 001645C0 88 1E 00 30 */ lbz r0, 0x30(r30) -/* 80167664 001645C4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80167664 001645C4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80167668 001645C8 80 9E 00 04 */ lwz r4, 4(r30) -/* 8016766C 001645CC 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8016766C 001645CC 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80167670 001645D0 54 06 CF FE */ rlwinm r6, r0, 0x19, 0x1f, 0x1f /* 80167674 001645D4 38 00 00 00 */ li r0, 0 /* 80167678 001645D8 90 81 00 2C */ stw r4, 0x2c(r1) @@ -10010,11 +10010,11 @@ sub_80167754: /* 80167874 001647D4 D0 21 00 28 */ stfs f1, 0x28(r1) /* 80167878 001647D8 4B EE B6 15 */ bl SetTranslation__6CActorFRC9CVector3f lbl_8016787C: -/* 8016787C 001647DC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80167880 001647E0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80167884 001647E4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8016787C 001647DC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80167880 001647E0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80167884 001647E4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80167888 001647E8 83 FC 01 04 */ lwz r31, 0x104(r28) -/* 8016788C 001647EC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8016788C 001647EC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80167890 001647F0 7F C5 F3 78 */ mr r5, r30 /* 80167894 001647F4 38 61 00 44 */ addi r3, r1, 0x44 /* 80167898 001647F8 48 1A C2 79 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -10140,13 +10140,13 @@ lbl_80167A60: /* 80167A60 001649C0 38 61 00 50 */ addi r3, r1, 0x50 /* 80167A64 001649C4 48 1D 60 7D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 80167A68 001649C8 3C 60 80 3E */ lis r3, lbl_803E3A58@ha -/* 80167A6C 001649CC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80167A6C 001649CC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80167A70 001649D0 38 03 3A 58 */ addi r0, r3, lbl_803E3A58@l /* 80167A74 001649D4 38 A1 00 40 */ addi r5, r1, 0x40 /* 80167A78 001649D8 90 1C 00 00 */ stw r0, 0(r28) /* 80167A7C 001649DC 3C 60 50 41 */ lis r3, 0x50415254@ha /* 80167A80 001649E0 38 03 52 54 */ addi r0, r3, 0x50415254@l -/* 80167A84 001649E4 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80167A84 001649E4 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80167A88 001649E8 38 61 00 38 */ addi r3, r1, 0x38 /* 80167A8C 001649EC D0 1C 00 E8 */ stfs f0, 0xe8(r28) /* 80167A90 001649F0 C0 04 00 04 */ lfs f0, 4(r4) diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 3d2cd777..bfd1e881 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -503,8 +503,8 @@ sub_80227464: /* 80227520 00224480 39 00 00 00 */ li r8, 0 /* 80227524 00224484 39 40 00 03 */ li r10, 3 /* 80227528 00224488 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8022752C 0022448C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80227530 00224490 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8022752C 0022448C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80227530 00224490 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80227534 00224494 A0 1D 00 00 */ lhz r0, 0(r29) /* 80227538 00224498 90 61 00 28 */ stw r3, 0x28(r1) /* 8022753C 0022449C 7F 83 E3 78 */ mr r3, r28 @@ -1223,10 +1223,10 @@ lbl_80227C68: /* 80227FE8 00224F48 48 0E C7 11 */ bl CanBeNormalized__9CVector3fCFv /* 80227FEC 00224F4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80227FF0 00224F50 41 82 00 BC */ beq lbl_802280AC -/* 80227FF4 00224F54 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80227FF8 00224F58 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80227FFC 00224F5C 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80228000 00224F60 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80227FF4 00224F54 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80227FF8 00224F58 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80227FFC 00224F5C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80228000 00224F60 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80228004 00224F64 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 80228008 00224F68 38 A1 01 1C */ addi r5, r1, 0x11c /* 8022800C 00224F6C 48 0E BB 05 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1459,9 +1459,9 @@ lbl_80228338: /* 80228344 002252A4 7F E4 FB 78 */ mr r4, r31 /* 80228348 002252A8 4B E2 49 AD */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence /* 8022834C 002252AC 81 5D 00 04 */ lwz r10, 4(r29) -/* 80228350 002252B0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80228350 002252B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80228354 002252B4 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 80228358 002252B8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80228358 002252B8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8022835C 002252BC C0 3D 00 50 */ lfs f1, 0x50(r29) /* 80228360 002252C0 38 61 00 28 */ addi r3, r1, 0x28 /* 80228364 002252C4 C0 1D 00 40 */ lfs f0, 0x40(r29) @@ -1595,8 +1595,8 @@ lbl_80228524: lbl_80228538: /* 80228538 00225498 C0 62 B5 F4 */ lfs f3, lbl_805AD314@sda21(r2) lbl_8022853C: -/* 8022853C 0022549C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80228540 002254A0 C4 43 66 F4 */ lfsu f2, lbl_805A66F4@l(r3) +/* 8022853C 0022549C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80228540 002254A0 C4 43 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r3) /* 80228544 002254A4 C0 9E 00 E8 */ lfs f4, 0xe8(r30) /* 80228548 002254A8 C0 23 00 04 */ lfs f1, 4(r3) /* 8022854C 002254AC EC 43 00 B2 */ fmuls f2, f3, f2 @@ -2324,8 +2324,8 @@ lbl_80228F98: /* 80228FBC 00225F1C 4C 40 13 82 */ cror 2, 0, 2 /* 80228FC0 00225F20 40 82 00 3C */ bne lbl_80228FFC /* 80228FC4 00225F24 81 9C 00 00 */ lwz r12, 0(r28) -/* 80228FC8 00225F28 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80228FCC 00225F2C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80228FC8 00225F28 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80228FCC 00225F2C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80228FD0 00225F30 7F 83 E3 78 */ mr r3, r28 /* 80228FD4 00225F34 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80228FD8 00225F38 7F A4 EB 78 */ mr r4, r29 @@ -3296,11 +3296,11 @@ lbl_80229D6C: /* 80229DB4 00226D14 4B DD AF 05 */ bl string_l__4rstlFPCc /* 80229DB8 00226D18 88 01 00 10 */ lbz r0, 0x10(r1) /* 80229DBC 00226D1C 3C 80 80 57 */ lis r4, lbl_805723F8@ha -/* 80229DC0 00226D20 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80229DC0 00226D20 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80229DC4 00226D24 C0 22 B5 F4 */ lfs f1, lbl_805AD314@sda21(r2) /* 80229DC8 00226D28 98 01 00 08 */ stb r0, 8(r1) /* 80229DCC 00226D2C 38 A4 23 F8 */ addi r5, r4, lbl_805723F8@l -/* 80229DD0 00226D30 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80229DD0 00226D30 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80229DD4 00226D34 38 61 00 90 */ addi r3, r1, 0x90 /* 80229DD8 00226D38 38 81 00 08 */ addi r4, r1, 8 /* 80229DDC 00226D3C 38 E1 00 44 */ addi r7, r1, 0x44 @@ -3506,8 +3506,8 @@ lbl_8022A0AC: /* 8022A0C4 00227024 48 00 01 00 */ b lbl_8022A1C4 lbl_8022A0C8: /* 8022A0C8 00227028 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8022A0CC 0022702C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022A0D0 00227030 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -3774,8 +3774,8 @@ lbl_8022A4B0: lbl_8022A4B4: /* 8022A4B4 00227414 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8022A4B8 00227418 41 82 01 34 */ beq lbl_8022A5EC -/* 8022A4BC 0022741C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022A4C0 00227420 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8022A4BC 0022741C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022A4C0 00227420 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8022A4C4 00227424 C0 02 B5 CC */ lfs f0, lbl_805AD2EC@sda21(r2) /* 8022A4C8 00227428 38 81 00 A4 */ addi r4, r1, 0xa4 /* 8022A4CC 0022742C D0 21 00 A4 */ stfs f1, 0xa4(r1) @@ -3832,8 +3832,8 @@ lbl_8022A500: /* 8022A594 002274F4 38 61 00 28 */ addi r3, r1, 0x28 /* 8022A598 002274F8 38 81 00 7C */ addi r4, r1, 0x7c /* 8022A59C 002274FC 48 0E A2 B5 */ bl AsNormalized__9CVector3fCFv -/* 8022A5A0 00227500 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022A5A4 00227504 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8022A5A0 00227500 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022A5A4 00227504 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8022A5A8 00227508 C0 61 00 28 */ lfs f3, 0x28(r1) /* 8022A5AC 0022750C 38 81 00 88 */ addi r4, r1, 0x88 /* 8022A5B0 00227510 C0 41 00 2C */ lfs f2, 0x2c(r1) @@ -3964,8 +3964,8 @@ lbl_8022A744: /* 8022A774 002276D4 48 00 02 F4 */ b lbl_8022AA68 lbl_8022A778: /* 8022A778 002276D8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 8022A77C 002276DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022A780 002276E0 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 8022A788 002276E8 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8022A78C 002276EC 90 C1 00 24 */ stw r6, 0x24(r1) @@ -4019,9 +4019,9 @@ lbl_8022A83C: /* 8022A844 002277A4 7C 05 00 00 */ cmpw r5, r0 /* 8022A848 002277A8 41 82 00 58 */ beq lbl_8022A8A0 /* 8022A84C 002277AC 38 00 00 02 */ li r0, 2 -/* 8022A850 002277B0 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8022A850 002277B0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8022A854 002277B4 90 1E 05 68 */ stw r0, 0x568(r30) -/* 8022A858 002277B8 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 8022A858 002277B8 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8022A85C 002277BC 38 A0 00 00 */ li r5, 0 /* 8022A860 002277C0 38 E0 00 01 */ li r7, 1 /* 8022A864 002277C4 88 1E 09 88 */ lbz r0, 0x988(r30) @@ -4061,8 +4061,8 @@ lbl_8022A8A0: /* 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 -/* 8022A8F4 00227854 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022A8F8 00227858 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 8022A904 00227864 C0 44 00 00 */ lfs f2, 0(r4) @@ -4132,10 +4132,10 @@ lbl_8022A9F4: /* 8022A9F8 00227958 88 1E 09 88 */ lbz r0, 0x988(r30) /* 8022A9FC 0022795C 39 00 00 00 */ li r8, 0 /* 8022AA00 00227960 51 00 3E 30 */ rlwimi r0, r8, 7, 0x18, 0x18 -/* 8022AA04 00227964 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8022AA04 00227964 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022AA08 00227968 98 1E 09 88 */ stb r0, 0x988(r30) /* 8022AA0C 0022796C 54 08 CF FE */ rlwinm r8, r0, 0x19, 0x1f, 0x1f -/* 8022AA10 00227970 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8022AA10 00227970 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8022AA14 00227974 38 00 FF FF */ li r0, -1 /* 8022AA18 00227978 88 BE 09 88 */ lbz r5, 0x988(r30) /* 8022AA1C 0022797C 51 05 2E B4 */ rlwimi r5, r8, 5, 0x1a, 0x1a @@ -4149,9 +4149,9 @@ lbl_8022A9F4: /* 8022AA3C 0022799C 98 FE 09 88 */ stb r7, 0x988(r30) /* 8022AA40 002279A0 90 1E 07 C8 */ stw r0, 0x7c8(r30) /* 8022AA44 002279A4 4B FF E9 05 */ bl sub_80229348 -/* 8022AA48 002279A8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8022AA48 002279A8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8022AA4C 002279AC 7F C3 F3 78 */ mr r3, r30 -/* 8022AA50 002279B0 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 8022AA50 002279B0 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8022AA54 002279B4 38 BE 07 88 */ addi r5, r30, 0x788 /* 8022AA58 002279B8 7F E4 FB 78 */ mr r4, r31 /* 8022AA5C 002279BC 4B FF E8 ED */ bl sub_80229348 @@ -4459,8 +4459,8 @@ lbl_8022AE28: /* 8022AE88 00227DE8 38 61 00 08 */ addi r3, r1, 8 /* 8022AE8C 00227DEC 38 81 00 14 */ addi r4, r1, 0x14 /* 8022AE90 00227DF0 48 0E 99 C1 */ bl AsNormalized__9CVector3fCFv -/* 8022AE94 00227DF4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022AE98 00227DF8 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8022AE94 00227DF4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022AE98 00227DF8 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8022AE9C 00227DFC C0 61 00 08 */ lfs f3, 8(r1) /* 8022AEA0 00227E00 38 81 00 40 */ addi r4, r1, 0x40 /* 8022AEA4 00227E04 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -4497,8 +4497,8 @@ lbl_8022AF0C: /* 8022AF14 00227E74 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 8022AF24 00227E84 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8022AF20 00227E80 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8022AF24 00227E84 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8022AF28 00227E88 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 8022AF2C 00227E8C 7C 60 1B 78 */ mr r0, r3 /* 8022AF30 00227E90 39 00 00 0E */ li r8, 0xe @@ -4701,8 +4701,8 @@ lbl_8022B1F4: /* 8022B200 00228160 38 9D 04 5C */ addi r4, r29, 0x45c /* 8022B204 00228164 38 DD 08 B4 */ addi r6, r29, 0x8b4 /* 8022B208 00228168 4B F1 39 15 */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 8022B20C 0022816C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022B210 00228170 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8022B20C 0022816C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022B210 00228170 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8022B214 00228174 C0 C1 00 08 */ lfs f6, 8(r1) /* 8022B218 00228178 38 81 00 14 */ addi r4, r1, 0x14 /* 8022B21C 0022817C C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -4990,8 +4990,8 @@ lbl_8022B628: lbl_8022B62C: /* 8022B62C 0022858C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8022B630 00228590 41 82 01 44 */ beq lbl_8022B774 -/* 8022B634 00228594 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022B638 00228598 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8022B634 00228594 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022B638 00228598 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8022B63C 0022859C C0 02 B5 CC */ lfs f0, lbl_805AD2EC@sda21(r2) /* 8022B640 002285A0 38 81 00 8C */ addi r4, r1, 0x8c /* 8022B644 002285A4 D0 21 00 8C */ stfs f1, 0x8c(r1) @@ -5048,8 +5048,8 @@ lbl_8022B678: /* 8022B70C 0022866C 38 61 00 10 */ addi r3, r1, 0x10 /* 8022B710 00228670 38 81 00 64 */ addi r4, r1, 0x64 /* 8022B714 00228674 48 0E 91 3D */ bl AsNormalized__9CVector3fCFv -/* 8022B718 00228678 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022B71C 0022867C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8022B718 00228678 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022B71C 0022867C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8022B720 00228680 C0 61 00 10 */ lfs f3, 0x10(r1) /* 8022B724 00228684 38 81 00 70 */ addi r4, r1, 0x70 /* 8022B728 00228688 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -5330,8 +5330,8 @@ lbl_8022BB2C: lbl_8022BB30: /* 8022BB30 00228A90 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8022BB34 00228A94 41 82 00 48 */ beq lbl_8022BB7C -/* 8022BB38 00228A98 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022BB3C 00228A9C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8022BB38 00228A98 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022BB3C 00228A9C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8022BB40 00228AA0 C0 02 B5 CC */ lfs f0, lbl_805AD2EC@sda21(r2) /* 8022BB44 00228AA4 38 81 00 8C */ addi r4, r1, 0x8c /* 8022BB48 00228AA8 D0 21 00 8C */ stfs f1, 0x8c(r1) @@ -5388,8 +5388,8 @@ lbl_8022BB7C: /* 8022BC10 00228B70 38 61 00 10 */ addi r3, r1, 0x10 /* 8022BC14 00228B74 38 81 00 64 */ addi r4, r1, 0x64 /* 8022BC18 00228B78 48 0E 8C 39 */ bl AsNormalized__9CVector3fCFv -/* 8022BC1C 00228B7C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8022BC20 00228B80 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8022BC1C 00228B7C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8022BC20 00228B80 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8022BC24 00228B84 C0 61 00 10 */ lfs f3, 0x10(r1) /* 8022BC28 00228B88 38 81 00 70 */ addi r4, r1, 0x70 /* 8022BC2C 00228B8C C0 41 00 14 */ lfs f2, 0x14(r1) @@ -6761,9 +6761,9 @@ lbl_8022CEE0: /* 8022CF40 00229EA0 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8022CF44 00229EA4 7D 89 03 A6 */ mtctr r12 /* 8022CF48 00229EA8 4E 80 04 21 */ bctrl -/* 8022CF4C 00229EAC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8022CF4C 00229EAC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8022CF50 00229EB0 7F E3 FB 78 */ mr r3, r31 -/* 8022CF54 00229EB4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8022CF54 00229EB4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8022CF58 00229EB8 38 A1 00 50 */ addi r5, r1, 0x50 /* 8022CF5C 00229EBC 38 81 00 58 */ addi r4, r1, 0x58 /* 8022CF60 00229EC0 38 C1 00 48 */ addi r6, r1, 0x48 @@ -6813,8 +6813,8 @@ lbl_8022CF8C: /* 8022D00C 00229F6C 39 40 00 00 */ li r10, 0 /* 8022D010 00229F70 38 00 00 03 */ li r0, 3 /* 8022D014 00229F74 90 81 00 E4 */ stw r4, 0xe4(r1) -/* 8022D018 00229F78 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8022D01C 00229F7C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8022D018 00229F78 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8022D01C 00229F7C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8022D020 00229F80 38 A1 00 38 */ addi r5, r1, 0x38 /* 8022D024 00229F84 90 61 00 E0 */ stw r3, 0xe0(r1) /* 8022D028 00229F88 38 81 00 40 */ addi r4, r1, 0x40 @@ -7616,9 +7616,9 @@ lbl_8022DB1C: /* 8022DB8C 0022AAEC 90 FD 07 CC */ stw r7, 0x7cc(r29) /* 8022DB90 0022AAF0 80 DE 01 0C */ lwz r6, 0x10c(r30) /* 8022DB94 0022AAF4 4B F9 B2 01 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff -/* 8022DB98 0022AAF8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8022DB98 0022AAF8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8022DB9C 0022AAFC C0 22 B5 FC */ lfs f1, lbl_805AD31C@sda21(r2) -/* 8022DBA0 0022AB00 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8022DBA0 0022AB00 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8022DBA4 0022AB04 38 7D 08 C0 */ addi r3, r29, 0x8c0 /* 8022DBA8 0022AB08 C0 04 00 00 */ lfs f0, 0(r4) /* 8022DBAC 0022AB0C D0 1D 08 B4 */ stfs f0, 0x8b4(r29) diff --git a/asm/MetroidPrime/Enemies/CEyeBall.s b/asm/MetroidPrime/Enemies/CEyeBall.s index f735259a..f6458fd2 100644 --- a/asm/MetroidPrime/Enemies/CEyeBall.s +++ b/asm/MetroidPrime/Enemies/CEyeBall.s @@ -415,8 +415,8 @@ FireBeam__8CEyeballFR13CStateManagerRC12CTransform4f: /* 80224900 00221860 C0 82 B4 74 */ lfs f4, lbl_805AD194@sda21(r2) /* 80224904 00221864 39 20 00 14 */ li r9, 0x14 /* 80224908 00221868 C0 62 B4 78 */ lfs f3, lbl_805AD198@sda21(r2) -/* 8022490C 0022186C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80224910 00221870 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8022490C 0022186C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80224910 00221870 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80224914 00221874 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) /* 80224918 00221878 D0 A1 00 10 */ stfs f5, 0x10(r1) /* 8022491C 0022187C 38 61 00 0C */ addi r3, r1, 0xc @@ -1347,10 +1347,10 @@ CreateBeam__8CEyeballFR13CStateManager: /* 80225618 00222578 B0 01 00 20 */ sth r0, 0x20(r1) /* 8022561C 0022257C 4B DD F6 9D */ bl string_l__4rstlFPCc /* 80225620 00222580 38 01 00 20 */ addi r0, r1, 0x20 -/* 80225624 00222584 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80225624 00222584 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80225628 00222588 90 01 00 08 */ stw r0, 8(r1) /* 8022562C 0022258C 38 01 00 34 */ addi r0, r1, 0x34 -/* 80225630 00222590 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80225630 00222590 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80225634 00222594 38 61 00 28 */ addi r3, r1, 0x28 /* 80225638 00222598 90 01 00 0C */ stw r0, 0xc(r1) /* 8022563C 0022259C 38 A1 00 50 */ addi r5, r1, 0x50 @@ -1476,9 +1476,9 @@ Accept__8CEyeBallFR8IVisitor: /* 802257F8 00222758 4B F5 01 C1 */ bl "__ct__13CBoneTrackingFRC9CAnimDataRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>ffb" /* 802257FC 0022275C 38 61 00 24 */ addi r3, r1, 0x24 /* 80225800 00222760 48 11 82 E1 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" -/* 80225804 00222764 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80225804 00222764 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80225808 00222768 7E 84 A3 78 */ mr r4, r20 -/* 8022580C 0022276C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8022580C 0022276C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80225810 00222770 7E A5 AB 78 */ mr r5, r21 /* 80225814 00222774 C0 06 00 00 */ lfs f0, 0(r6) /* 80225818 00222778 38 73 05 B4 */ addi r3, r19, 0x5b4 diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 76a62299..29b8d81c 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -445,9 +445,9 @@ lbl_80142B68: /* 80142B94 0013FAF4 80 03 00 CC */ lwz r0, 0xcc(r3) /* 80142B98 0013FAF8 2C 00 00 00 */ cmpwi r0, 0 /* 80142B9C 0013FAFC 41 82 01 04 */ beq lbl_80142CA0 -/* 80142BA0 0013FB00 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80142BA0 0013FB00 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80142BA4 0013FB04 7F A3 EB 78 */ mr r3, r29 -/* 80142BA8 0013FB08 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 80142BA8 0013FB08 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 80142BAC 0013FB0C C0 5F 00 00 */ lfs f2, 0(r31) /* 80142BB0 0013FB10 C0 3F 00 04 */ lfs f1, 4(r31) /* 80142BB4 0013FB14 C0 1F 00 08 */ lfs f0, 8(r31) @@ -486,12 +486,12 @@ lbl_80142B68: /* 80142C38 0013FB98 D0 21 00 3C */ stfs f1, 0x3c(r1) /* 80142C3C 0013FB9C D0 01 00 40 */ stfs f0, 0x40(r1) /* 80142C40 0013FBA0 48 00 03 F5 */ bl sub_80143034 -/* 80142C44 0013FBA4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80142C44 0013FBA4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80142C48 0013FBA8 C0 C1 00 14 */ lfs f6, 0x14(r1) /* 80142C4C 0013FBAC C0 A1 00 18 */ lfs f5, 0x18(r1) /* 80142C50 0013FBB0 38 81 00 6C */ addi r4, r1, 0x6c /* 80142C54 0013FBB4 C0 81 00 1C */ lfs f4, 0x1c(r1) -/* 80142C58 0013FBB8 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 80142C58 0013FBB8 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 80142C5C 0013FBBC C0 5F 00 04 */ lfs f2, 4(r31) /* 80142C60 0013FBC0 C0 3F 00 08 */ lfs f1, 8(r31) /* 80142C64 0013FBC4 C0 02 9B CC */ lfs f0, lbl_805AB8EC@sda21(r2) @@ -523,8 +523,8 @@ lbl_80142CB8: /* 80142CC4 0013FC24 38 9D 04 5C */ addi r4, r29, 0x45c /* 80142CC8 0013FC28 38 DD 0D 80 */ addi r6, r29, 0xd80 /* 80142CCC 0013FC2C 4B FF BE 51 */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 80142CD0 0013FC30 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80142CD4 0013FC34 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80142CD0 0013FC30 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80142CD4 0013FC34 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80142CD8 0013FC38 C0 C1 00 08 */ lfs f6, 8(r1) /* 80142CDC 0013FC3C 38 81 00 50 */ addi r4, r1, 0x50 /* 80142CE0 0013FC40 C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -649,7 +649,7 @@ lbl_80142E70: /* 80142E88 0013FDE8 38 DB 0D 74 */ addi r6, r27, 0xd74 /* 80142E8C 0013FDEC 48 00 01 A9 */ bl sub_80143034 /* 80142E90 0013FDF0 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80142E94 0013FDF4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80142E94 0013FDF4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80142E98 0013FDF8 C0 02 9B CC */ lfs f0, lbl_805AB8EC@sda21(r2) /* 80142E9C 0013FDFC 38 81 00 64 */ addi r4, r1, 0x64 /* 80142EA0 0013FE00 D0 3B 0D 74 */ stfs f1, 0xd74(r27) @@ -658,7 +658,7 @@ lbl_80142E70: /* 80142EAC 0013FE0C C0 21 00 38 */ lfs f1, 0x38(r1) /* 80142EB0 0013FE10 D0 3B 0D 7C */ stfs f1, 0xd7c(r27) /* 80142EB4 0013FE14 C0 3B 0D 74 */ lfs f1, 0xd74(r27) -/* 80142EB8 0013FE18 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80142EB8 0013FE18 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80142EBC 0013FE1C D0 21 00 64 */ stfs f1, 0x64(r1) /* 80142EC0 0013FE20 C0 43 00 04 */ lfs f2, 4(r3) /* 80142EC4 0013FE24 C0 9B 0D 78 */ lfs f4, 0xd78(r27) @@ -676,9 +676,9 @@ lbl_80142E70: /* 80142EF4 0013FE54 48 00 01 2C */ b lbl_80143020 lbl_80142EF8: /* 80142EF8 0013FE58 3B DB 05 74 */ addi r30, r27, 0x574 -/* 80142EFC 0013FE5C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80142EFC 0013FE5C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80142F00 0013FE60 7F DD F3 78 */ mr r29, r30 -/* 80142F04 0013FE64 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 80142F04 0013FE64 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 80142F08 0013FE68 48 00 00 F4 */ b lbl_80142FFC lbl_80142F0C: /* 80142F0C 0013FE6C A0 1D 00 00 */ lhz r0, 0(r29) @@ -711,7 +711,7 @@ lbl_80142F0C: /* 80142F78 0013FED8 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80142F7C 0013FEDC 48 00 00 B9 */ bl sub_80143034 /* 80142F80 0013FEE0 C0 61 00 0C */ lfs f3, 0xc(r1) -/* 80142F84 0013FEE4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80142F84 0013FEE4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80142F88 0013FEE8 C0 41 00 10 */ lfs f2, 0x10(r1) /* 80142F8C 0013FEEC 38 81 00 48 */ addi r4, r1, 0x48 /* 80142F90 0013FEF0 C0 21 00 14 */ lfs f1, 0x14(r1) @@ -727,7 +727,7 @@ lbl_80142F0C: /* 80142FB8 0013FF18 C0 C1 00 3C */ lfs f6, 0x3c(r1) /* 80142FBC 0013FF1C C0 A1 00 40 */ lfs f5, 0x40(r1) /* 80142FC0 0013FF20 C0 81 00 44 */ lfs f4, 0x44(r1) -/* 80142FC4 0013FF24 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 80142FC4 0013FF24 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 80142FC8 0013FF28 C0 5F 00 04 */ lfs f2, 4(r31) /* 80142FCC 0013FF2C C0 3F 00 08 */ lfs f1, 8(r31) /* 80142FD0 0013FF30 D0 C1 00 48 */ stfs f6, 0x48(r1) @@ -829,9 +829,9 @@ sub_80143034: /* 80143134 00140094 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80143138 00140098 41 82 03 64 */ beq lbl_8014349C lbl_8014313C: -/* 8014313C 0014009C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8014313C 0014009C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80143140 001400A0 C0 A1 00 9C */ lfs f5, 0x9c(r1) -/* 80143144 001400A4 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 80143144 001400A4 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 80143148 001400A8 C0 C1 00 A0 */ lfs f6, 0xa0(r1) /* 8014314C 001400AC C0 85 00 08 */ lfs f4, 8(r5) /* 80143150 001400B0 38 61 00 44 */ addi r3, r1, 0x44 @@ -1058,8 +1058,8 @@ lbl_8014349C: /* 801434B0 00140410 D0 1D 00 08 */ stfs f0, 8(r29) /* 801434B4 00140414 48 00 00 20 */ b lbl_801434D4 lbl_801434B8: -/* 801434B8 00140418 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801434BC 0014041C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801434B8 00140418 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801434BC 0014041C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801434C0 00140420 D0 1D 00 00 */ stfs f0, 0(r29) /* 801434C4 00140424 C0 03 00 04 */ lfs f0, 4(r3) /* 801434C8 00140428 D0 1D 00 04 */ stfs f0, 4(r29) @@ -1199,10 +1199,10 @@ Patrol__9CFireFleaFR13CStateManager9EStateMsgf: /* 80143694 001405F4 93 C1 00 28 */ stw r30, 0x28(r1) /* 80143698 001405F8 93 A1 00 24 */ stw r29, 0x24(r1) /* 8014369C 001405FC FF E0 08 90 */ fmr f31, f1 -/* 801436A0 00140600 3C C0 80 5A */ lis r6, skZero3f@ha +/* 801436A0 00140600 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 801436A4 00140604 7C 7D 1B 78 */ mr r29, r3 /* 801436A8 00140608 C0 22 9B D8 */ lfs f1, lbl_805AB8F8@sda21(r2) -/* 801436AC 0014060C 38 06 66 A0 */ addi r0, r6, skZero3f@l +/* 801436AC 0014060C 38 06 66 A0 */ addi r0, r6, sZeroVector__9CVector3f@l /* 801436B0 00140610 7C 9E 23 78 */ mr r30, r4 /* 801436B4 00140614 7C BF 2B 78 */ mr r31, r5 /* 801436B8 00140618 7C 04 03 78 */ mr r4, r0 @@ -1456,8 +1456,8 @@ Accept__9CFireFleaFR8IVisitor: /* 80143A30 00140990 38 03 1C 88 */ addi r0, r3, lbl_803E1C88@l /* 80143A34 00140994 38 80 00 00 */ li r4, 0 /* 80143A38 00140998 90 1F 00 00 */ stw r0, 0(r31) -/* 80143A3C 0014099C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80143A40 001409A0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80143A3C 0014099C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80143A40 001409A0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80143A44 001409A4 38 00 00 00 */ li r0, 0 /* 80143A48 001409A8 D0 3F 05 68 */ stfs f1, 0x568(r31) /* 80143A4C 001409AC FC 40 08 90 */ fmr f2, f1 diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 3f72c4ec..36040017 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -1416,8 +1416,8 @@ lbl_801AE2E8: /* 801AE2F8 001AB258 90 04 00 00 */ stw r0, 0(r4) /* 801AE2FC 001AB25C 48 00 00 74 */ b lbl_801AE370 lbl_801AE300: -/* 801AE300 001AB260 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 801AE304 001AB264 C4 43 66 F4 */ lfsu f2, lbl_805A66F4@l(r3) +/* 801AE300 001AB260 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 801AE304 001AB264 C4 43 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r3) /* 801AE308 001AB268 C0 62 A8 CC */ lfs f3, lbl_805AC5EC@sda21(r2) /* 801AE30C 001AB26C C0 23 00 04 */ lfs f1, 4(r3) /* 801AE310 001AB270 C0 03 00 08 */ lfs f0, 8(r3) @@ -2016,8 +2016,8 @@ lbl_801AEB04: /* 801AEB58 001ABAB8 38 AD A4 9C */ addi r5, r13, lbl_805A905C@sda21 /* 801AEB5C 001ABABC 48 1B 47 51 */ bl Lerp__6CColorFRC6CColorRC6CColorf /* 801AEB60 001ABAC0 80 01 00 0C */ lwz r0, 0xc(r1) -/* 801AEB64 001ABAC4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801AEB68 001ABAC8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801AEB64 001ABAC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801AEB68 001ABAC8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801AEB6C 001ABACC C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801AEB70 001ABAD0 90 1F 04 30 */ stw r0, 0x430(r31) /* 801AEB74 001ABAD4 7F E3 FB 78 */ mr r3, r31 @@ -2154,8 +2154,8 @@ lbl_801AED1C: /* 801AED40 001ABCA0 4C 40 13 82 */ cror 2, 0, 2 /* 801AED44 001ABCA4 40 82 00 3C */ bne lbl_801AED80 /* 801AED48 001ABCA8 81 9E 00 00 */ lwz r12, 0(r30) -/* 801AED4C 001ABCAC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801AED50 001ABCB0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801AED4C 001ABCAC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801AED50 001ABCB0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801AED54 001ABCB4 7F C3 F3 78 */ mr r3, r30 /* 801AED58 001ABCB8 81 8C 00 84 */ lwz r12, 0x84(r12) /* 801AED5C 001ABCBC 7F E4 FB 78 */ mr r4, r31 @@ -3146,9 +3146,9 @@ lbl_801AFB18: /* 801AFBCC 001ACB2C 48 00 01 08 */ b lbl_801AFCD4 lbl_801AFBD0: /* 801AFBD0 001ACB30 38 00 00 02 */ li r0, 2 -/* 801AFBD4 001ACB34 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801AFBD4 001ACB34 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801AFBD8 001ACB38 90 1E 05 68 */ stw r0, 0x568(r30) -/* 801AFBDC 001ACB3C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801AFBDC 001ACB3C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801AFBE0 001ACB40 38 61 00 4C */ addi r3, r1, 0x4c /* 801AFBE4 001ACB44 38 81 00 10 */ addi r4, r1, 0x10 /* 801AFBE8 001ACB48 C0 9E 00 50 */ lfs f4, 0x50(r30) @@ -3328,8 +3328,8 @@ lbl_801AFDB8: /* 801AFE74 001ACDD4 38 61 00 44 */ addi r3, r1, 0x44 /* 801AFE78 001ACDD8 38 81 00 5C */ addi r4, r1, 0x5c /* 801AFE7C 001ACDDC 48 16 49 D5 */ bl AsNormalized__9CVector3fCFv -/* 801AFE80 001ACDE0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801AFE84 001ACDE4 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801AFE80 001ACDE0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801AFE84 001ACDE4 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801AFE88 001ACDE8 C0 61 00 44 */ lfs f3, 0x44(r1) /* 801AFE8C 001ACDEC 38 81 00 84 */ addi r4, r1, 0x84 /* 801AFE90 001ACDF0 C0 41 00 48 */ lfs f2, 0x48(r1) @@ -3370,8 +3370,8 @@ lbl_801AFEF4: lbl_801AFF10: /* 801AFF10 001ACE70 80 1F 07 B0 */ lwz r0, 0x7b0(r31) /* 801AFF14 001ACE74 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801AFF18 001ACE78 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801AFF1C 001ACE7C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801AFF24 001ACE84 54 00 10 3A */ slwi r0, r0, 2 /* 801AFF28 001ACE88 38 C2 A8 A4 */ addi r6, r2, lbl_805AC5C4@sda21 @@ -4043,8 +4043,8 @@ lbl_801B0868: lbl_801B08A0: /* 801B08A0 001AD800 80 1E 07 A8 */ lwz r0, 0x7a8(r30) /* 801B08A4 001AD804 3C A0 80 3D */ lis r5, lbl_803D1568@ha -/* 801B08A8 001AD808 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801B08AC 001AD80C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801B08B4 001AD814 38 C5 15 68 */ addi r6, r5, lbl_803D1568@l /* 801B08B8 001AD818 38 A4 AA 68 */ addi r5, r4, lbl_803DAA68@l @@ -4124,8 +4124,8 @@ lbl_801B0990: /* 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, skZero3f@ha -/* 801B09E4 001AD944 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801B09EC 001AD94C 54 00 10 3A */ slwi r0, r0, 2 /* 801B09F0 001AD950 38 84 15 68 */ addi r4, r4, lbl_803D1568@l @@ -4185,13 +4185,13 @@ lbl_801B0AAC: /* 801B0AC0 001ADA20 D0 03 00 24 */ stfs f0, 0x24(r3) /* 801B0AC4 001ADA24 48 00 00 C4 */ b lbl_801B0B88 lbl_801B0AC8: -/* 801B0AC8 001ADA28 3C C0 80 5A */ lis r6, skZero3f@ha +/* 801B0AC8 001ADA28 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 801B0ACC 001ADA2C 38 BE 07 9C */ addi r5, r30, 0x79c -/* 801B0AD0 001ADA30 38 C6 66 A0 */ addi r6, r6, skZero3f@l +/* 801B0AD0 001ADA30 38 C6 66 A0 */ addi r6, r6, sZeroVector__9CVector3f@l /* 801B0AD4 001ADA34 4B FF D8 B5 */ bl sub_801ae388 -/* 801B0AD8 001ADA38 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801B0AD8 001ADA38 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801B0ADC 001ADA3C 7F C3 F3 78 */ mr r3, r30 -/* 801B0AE0 001ADA40 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 801B0AE0 001ADA40 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 801B0AE4 001ADA44 38 BE 07 A0 */ addi r5, r30, 0x7a0 /* 801B0AE8 001ADA48 7F E4 FB 78 */ mr r4, r31 /* 801B0AEC 001ADA4C 4B FF D8 9D */ bl sub_801ae388 @@ -4322,8 +4322,8 @@ lbl_801B0C6C: /* 801B0CBC 001ADC1C 38 61 00 10 */ addi r3, r1, 0x10 /* 801B0CC0 001ADC20 38 81 00 28 */ addi r4, r1, 0x28 /* 801B0CC4 001ADC24 48 16 3B 8D */ bl AsNormalized__9CVector3fCFv -/* 801B0CC8 001ADC28 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801B0CCC 001ADC2C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801B0CC8 001ADC28 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801B0CCC 001ADC2C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801B0CD0 001ADC30 C0 61 00 10 */ lfs f3, 0x10(r1) /* 801B0CD4 001ADC34 38 81 00 34 */ addi r4, r1, 0x34 /* 801B0CD8 001ADC38 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -4385,10 +4385,10 @@ lbl_801B0D7C: /* 801B0D9C 001ADCFC 3C 80 80 3E */ lis r4, lbl_803DA9F0@ha /* 801B0DA0 001ADD00 39 20 00 0E */ li r9, 0xe /* 801B0DA4 001ADD04 98 1E 08 E4 */ stb r0, 0x8e4(r30) -/* 801B0DA8 001ADD08 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B0DA8 001ADD08 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B0DAC 001ADD0C 7C A0 2B 78 */ mr r0, r5 /* 801B0DB0 001ADD10 38 E0 00 02 */ li r7, 2 -/* 801B0DB4 001ADD14 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 801B0DB4 001ADD14 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 801B0DB8 001ADD18 38 C0 FF FF */ li r6, -1 /* 801B0DBC 001ADD1C 39 04 A9 F0 */ addi r8, r4, lbl_803DA9F0@l /* 801B0DC0 001ADD20 91 41 00 14 */ stw r10, 0x14(r1) @@ -4644,10 +4644,10 @@ lbl_801B1148: lbl_801B114C: /* 801B114C 001AE0AC D0 1E 07 C0 */ stfs f0, 0x7c0(r30) /* 801B1150 001AE0B0 38 00 FF FF */ li r0, -1 -/* 801B1154 001AE0B4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B1154 001AE0B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B1158 001AE0B8 38 E0 00 00 */ li r7, 0 /* 801B115C 001AE0BC 90 1E 07 A8 */ stw r0, 0x7a8(r30) -/* 801B1160 001AE0C0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801B1160 001AE0C0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801B1164 001AE0C4 7F C3 F3 78 */ mr r3, r30 /* 801B1168 001AE0C8 7F E4 FB 78 */ mr r4, r31 /* 801B116C 001AE0CC 88 1E 08 E4 */ lbz r0, 0x8e4(r30) @@ -4658,9 +4658,9 @@ lbl_801B114C: /* 801B1180 001AE0E0 50 E0 17 7A */ rlwimi r0, r7, 2, 0x1d, 0x1d /* 801B1184 001AE0E4 98 1E 08 E4 */ stb r0, 0x8e4(r30) /* 801B1188 001AE0E8 4B FF D2 01 */ bl sub_801ae388 -/* 801B118C 001AE0EC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801B118C 001AE0EC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801B1190 001AE0F0 7F C3 F3 78 */ mr r3, r30 -/* 801B1194 001AE0F4 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 801B1194 001AE0F4 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 801B1198 001AE0F8 38 BE 07 A0 */ addi r5, r30, 0x7a0 /* 801B119C 001AE0FC 7F E4 FB 78 */ mr r4, r31 /* 801B11A0 001AE100 4B FF D1 E9 */ bl sub_801ae388 @@ -4896,10 +4896,10 @@ lbl_801B14CC: /* 801B14EC 001AE44C 3C 80 80 3E */ lis r4, lbl_803DA9F0@ha /* 801B14F0 001AE450 39 20 00 0E */ li r9, 0xe /* 801B14F4 001AE454 98 1E 08 E4 */ stb r0, 0x8e4(r30) -/* 801B14F8 001AE458 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B14F8 001AE458 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B14FC 001AE45C 7C A0 2B 78 */ mr r0, r5 /* 801B1500 001AE460 38 E0 00 02 */ li r7, 2 -/* 801B1504 001AE464 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 801B1504 001AE464 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 801B1508 001AE468 38 C0 FF FF */ li r6, -1 /* 801B150C 001AE46C 39 04 A9 F0 */ addi r8, r4, lbl_803DA9F0@l /* 801B1510 001AE470 91 41 00 34 */ stw r10, 0x34(r1) @@ -4973,8 +4973,8 @@ lbl_801B15FC: /* 801B1614 001AE574 48 00 01 D0 */ b lbl_801B17E4 lbl_801B1618: /* 801B1618 001AE578 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 801B161C 001AE57C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801B1620 001AE580 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -5151,8 +5151,8 @@ lbl_801B1890: /* 801B1898 001AE7F8 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 801B18A8 001AE808 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 801B18A4 001AE804 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801B18A8 001AE808 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 801B18AC 001AE80C 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 801B18B0 001AE810 7C 60 1B 78 */ mr r0, r3 /* 801B18B4 001AE814 39 00 00 0E */ li r8, 0xe @@ -6053,11 +6053,11 @@ lbl_801B2520: /* 801B2538 001AF498 1C 03 00 0C */ mulli r0, r3, 0xc /* 801B253C 001AF49C C0 41 04 B4 */ lfs f2, 0x4b4(r1) /* 801B2540 001AF4A0 C0 21 04 C4 */ lfs f1, 0x4c4(r1) -/* 801B2544 001AF4A4 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 801B2544 001AF4A4 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 801B2548 001AF4A8 C0 01 04 D4 */ lfs f0, 0x4d4(r1) /* 801B254C 001AF4AC 38 61 02 70 */ addi r3, r1, 0x270 /* 801B2550 001AF4B0 7C BB 02 14 */ add r5, r27, r0 -/* 801B2554 001AF4B4 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 801B2554 001AF4B4 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 801B2558 001AF4B8 D0 41 00 D4 */ stfs f2, 0xd4(r1) /* 801B255C 001AF4BC 38 81 00 D4 */ addi r4, r1, 0xd4 /* 801B2560 001AF4C0 38 A5 07 34 */ addi r5, r5, 0x734 @@ -6183,9 +6183,9 @@ lbl_801B26F8: /* 801B2738 001AF698 D0 41 01 60 */ stfs f2, 0x160(r1) lbl_801B273C: /* 801B273C 001AF69C C0 41 04 B4 */ lfs f2, 0x4b4(r1) -/* 801B2740 001AF6A0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801B2740 001AF6A0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801B2744 001AF6A4 C0 21 04 C4 */ lfs f1, 0x4c4(r1) -/* 801B2748 001AF6A8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801B2748 001AF6A8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801B274C 001AF6AC C0 01 04 D4 */ lfs f0, 0x4d4(r1) /* 801B2750 001AF6B0 38 61 02 40 */ addi r3, r1, 0x240 /* 801B2754 001AF6B4 D0 41 00 8C */ stfs f2, 0x8c(r1) @@ -6321,9 +6321,9 @@ lbl_801B28EC: /* 801B2930 001AF890 38 00 00 00 */ li r0, 0 /* 801B2934 001AF894 C0 41 03 8C */ lfs f2, 0x38c(r1) /* 801B2938 001AF898 C0 01 03 9C */ lfs f0, 0x39c(r1) -/* 801B293C 001AF89C 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 801B293C 001AF89C 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 801B2940 001AF8A0 90 81 01 9C */ stw r4, 0x19c(r1) -/* 801B2944 001AF8A4 38 C5 67 00 */ addi r6, r5, lbl_805A6700@l +/* 801B2944 001AF8A4 38 C5 67 00 */ addi r6, r5, sDownVector__9CVector3f@l /* 801B2948 001AF8A8 C0 22 A8 FC */ lfs f1, lbl_805AC61C@sda21(r2) /* 801B294C 001AF8AC 7F 84 E3 78 */ mr r4, r28 /* 801B2950 001AF8B0 90 61 01 98 */ stw r3, 0x198(r1) @@ -6805,8 +6805,8 @@ lbl_801B3000: /* 801B3010 001AFF70 39 40 00 00 */ li r10, 0 /* 801B3014 001AFF74 38 00 00 03 */ li r0, 3 /* 801B3018 001AFF78 90 81 00 E4 */ stw r4, 0xe4(r1) -/* 801B301C 001AFF7C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801B3020 001AFF80 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801B301C 001AFF7C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801B3020 001AFF80 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801B3024 001AFF84 38 A1 00 2C */ addi r5, r1, 0x2c /* 801B3028 001AFF88 90 61 00 E0 */ stw r3, 0xe0(r1) /* 801B302C 001AFF8C 38 81 00 34 */ addi r4, r1, 0x34 @@ -6894,11 +6894,11 @@ lbl_801B3138: /* 801B3168 001B00C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B316C 001B00CC 41 82 01 7C */ beq lbl_801B32E8 /* 801B3170 001B00D0 81 9F 00 00 */ lwz r12, 0(r31) -/* 801B3174 001B00D4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801B3174 001B00D4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801B3178 001B00D8 7F E3 FB 78 */ mr r3, r31 /* 801B317C 001B00DC C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801B3180 001B00E0 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 801B3184 001B00E4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801B3184 001B00E4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801B3188 001B00E8 7D 89 03 A6 */ mtctr r12 /* 801B318C 001B00EC 4E 80 04 21 */ bctrl /* 801B3190 001B00F0 C0 3F 06 AC */ lfs f1, 0x6ac(r31) @@ -6994,11 +6994,11 @@ lbl_801B32E8: /* 801B32EC 001B024C 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 801B32F0 001B0250 41 82 00 24 */ beq lbl_801B3314 /* 801B32F4 001B0254 81 9F 00 00 */ lwz r12, 0(r31) -/* 801B32F8 001B0258 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801B32F8 001B0258 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801B32FC 001B025C 7F E3 FB 78 */ mr r3, r31 /* 801B3300 001B0260 C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) /* 801B3304 001B0264 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 801B3308 001B0268 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801B3308 001B0268 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801B330C 001B026C 7D 89 03 A6 */ mtctr r12 /* 801B3310 001B0270 4E 80 04 21 */ bctrl lbl_801B3314: @@ -7181,8 +7181,8 @@ Think__9CFlaahgraFfR13CStateManager: /* 801B3570 001B04D0 7F C3 F3 78 */ mr r3, r30 /* 801B3574 001B04D4 7F E4 FB 78 */ mr r4, r31 /* 801B3578 001B04D8 4B FF AE C9 */ bl sub_801ae440 -/* 801B357C 001B04DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801B3580 001B04E0 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801B357C 001B04DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801B3580 001B04E0 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801B3584 001B04E4 D0 1E 01 5C */ stfs f0, 0x15c(r30) /* 801B3588 001B04E8 C0 03 00 04 */ lfs f0, 4(r3) /* 801B358C 001B04EC D0 1E 01 60 */ stfs f0, 0x160(r30) @@ -7600,11 +7600,11 @@ lbl_801B39AC: /* 801B3B30 001B0A90 38 BB 00 9C */ addi r5, r27, 0x9c /* 801B3B34 001B0A94 48 06 85 75 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo /* 801B3B38 001B0A98 38 E0 FF FF */ li r7, -1 -/* 801B3B3C 001B0A9C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B3B3C 001B0A9C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B3B40 001B0AA0 90 FC 07 2C */ stw r7, 0x72c(r28) /* 801B3B44 001B0AA4 38 C0 00 00 */ li r6, 0 /* 801B3B48 001B0AA8 38 00 00 01 */ li r0, 1 -/* 801B3B4C 001B0AAC 3B 63 66 A0 */ addi r27, r3, skZero3f@l +/* 801B3B4C 001B0AAC 3B 63 66 A0 */ addi r27, r3, sZeroVector__9CVector3f@l /* 801B3B50 001B0AB0 90 DC 07 30 */ stw r6, 0x730(r28) /* 801B3B54 001B0AB4 7F 84 E3 78 */ mr r4, r28 /* 801B3B58 001B0AB8 C0 22 A8 BC */ lfs f1, lbl_805AC5DC@sda21(r2) @@ -7646,7 +7646,7 @@ lbl_801B39AC: /* 801B3BE8 001B0B48 80 81 00 6C */ lwz r4, 0x6c(r1) /* 801B3BEC 001B0B4C 38 00 00 00 */ li r0, 0 /* 801B3BF0 001B0B50 C0 02 A8 BC */ lfs f0, lbl_805AC5DC@sda21(r2) -/* 801B3BF4 001B0B54 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B3BF4 001B0B54 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B3BF8 001B0B58 90 9C 07 DC */ stw r4, 0x7dc(r28) /* 801B3BFC 001B0B5C 88 81 00 70 */ lbz r4, 0x70(r1) /* 801B3C00 001B0B60 98 9C 07 E0 */ stb r4, 0x7e0(r28) @@ -7675,7 +7675,7 @@ lbl_801B39AC: /* 801B3C5C 001B0BBC D0 5C 08 28 */ stfs f2, 0x828(r28) /* 801B3C60 001B0BC0 90 1C 08 2C */ stw r0, 0x82c(r28) /* 801B3C64 001B0BC4 90 1C 08 60 */ stw r0, 0x860(r28) -/* 801B3C68 001B0BC8 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 801B3C68 001B0BC8 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 801B3C6C 001B0BCC D0 1C 08 94 */ stfs f0, 0x894(r28) /* 801B3C70 001B0BD0 C0 1B 00 04 */ lfs f0, 4(r27) /* 801B3C74 001B0BD4 D0 1C 08 98 */ stfs f0, 0x898(r28) diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index cdbcf72b..ab0ad52e 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -137,8 +137,8 @@ lbl_80208454: /* 802084EC 0020544C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802084F0 00205450 41 82 00 4C */ beq lbl_8020853C /* 802084F4 00205454 A0 1D 00 08 */ lhz r0, 8(r29) -/* 802084F8 00205458 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802084FC 0020545C 39 04 66 A0 */ addi r8, r4, skZero3f@l +/* 802084F8 00205458 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802084FC 0020545C 39 04 66 A0 */ addi r8, r4, sZeroVector__9CVector3f@l /* 80208500 00205460 C0 22 B1 1C */ lfs f1, lbl_805ACE3C@sda21(r2) /* 80208504 00205464 B0 01 00 14 */ sth r0, 0x14(r1) /* 80208508 00205468 38 81 00 0C */ addi r4, r1, 0xc @@ -382,9 +382,9 @@ Touch__15CFlaahgraPlantsFR6CActorR13CStateManager: /* 8020886C 002057CC 41 82 01 A4 */ beq lbl_80208A10 /* 80208870 002057D0 38 61 00 60 */ addi r3, r1, 0x60 /* 80208874 002057D4 4B F1 20 B9 */ bl GetBoundingBox__13CPhysicsActorCFv -/* 80208878 002057D8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80208878 002057D8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8020887C 002057DC 38 61 00 AC */ addi r3, r1, 0xac -/* 80208880 002057E0 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 80208880 002057E0 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 80208884 002057E4 38 81 00 60 */ addi r4, r1, 0x60 /* 80208888 002057E8 48 0C D4 95 */ bl FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f /* 8020888C 002057EC 38 61 00 E8 */ addi r3, r1, 0xe8 @@ -712,8 +712,8 @@ lbl_80208C98: /* 80208D50 00205CB0 7D 89 03 A6 */ mtctr r12 /* 80208D54 00205CB4 4E 80 04 21 */ bctrl /* 80208D58 00205CB8 80 98 00 EC */ lwz r4, 0xec(r24) -/* 80208D5C 00205CBC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80208D60 00205CC0 38 A3 66 70 */ addi r5, r3, skIdentity4f@l +/* 80208D5C 00205CBC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80208D60 00205CC0 38 A3 66 70 */ addi r5, r3, sIdentity__12CTransform4f@l /* 80208D64 00205CC4 38 60 00 01 */ li r3, 1 /* 80208D68 00205CC8 88 04 02 6D */ lbz r0, 0x26d(r4) /* 80208D6C 00205CCC 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a diff --git a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s index 3fc5262a..f1d4b519 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraTentacle.s @@ -345,8 +345,8 @@ RetractTentacle__17CFlaahgraTentacleFR13CStateManager: /* 801F0194 001ED0F4 83 E3 00 04 */ lwz r31, 4(r3) /* 801F0198 001ED0F8 28 1F 00 00 */ cmplwi r31, 0 /* 801F019C 001ED0FC 41 82 00 28 */ beq lbl_801F01C4 -/* 801F01A0 001ED100 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F01A4 001ED104 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F01A0 001ED100 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F01A4 001ED104 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F01A8 001ED108 D0 1F 01 1C */ stfs f0, 0x11c(r31) /* 801F01AC 001ED10C C0 03 00 04 */ lfs f0, 4(r3) /* 801F01B0 001ED110 D0 1F 01 20 */ stfs f0, 0x120(r31) @@ -731,8 +731,8 @@ lbl_801F071C: /* 801F071C 001ED67C 39 00 00 01 */ li r8, 1 lbl_801F0720: /* 801F0720 001ED680 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801F0724 001ED684 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F0728 001ED688 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 801F0734 001ED694 C0 44 00 00 */ lfs f2, 0(r4) @@ -1210,9 +1210,9 @@ lbl_801F0D10: /* 801F0DCC 001EDD2C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801F0DD0 001EDD30 7D 89 03 A6 */ mtctr r12 /* 801F0DD4 001EDD34 4E 80 04 21 */ bctrl -/* 801F0DD8 001EDD38 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801F0DD8 001EDD38 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801F0DDC 001EDD3C 7F E3 FB 78 */ mr r3, r31 -/* 801F0DE0 001EDD40 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801F0DE0 001EDD40 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801F0DE4 001EDD44 38 A1 00 18 */ addi r5, r1, 0x18 /* 801F0DE8 001EDD48 38 81 00 20 */ addi r4, r1, 0x20 /* 801F0DEC 001EDD4C 38 C1 00 10 */ addi r6, r1, 0x10 @@ -1385,13 +1385,13 @@ lbl_801F0FA0: /* 801F1018 001EDF78 90 01 00 1C */ stw r0, 0x1c(r1) /* 801F101C 001EDF7C 4B E8 C4 35 */ bl "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi" /* 801F1020 001EDF80 3C 80 80 3E */ lis r4, lbl_803E6408@ha -/* 801F1024 001EDF84 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801F1024 001EDF84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F1028 001EDF88 38 84 64 08 */ addi r4, r4, lbl_803E6408@l /* 801F102C 001EDF8C 38 00 FF FF */ li r0, -1 /* 801F1030 001EDF90 90 9F 00 00 */ stw r4, 0(r31) /* 801F1034 001EDF94 38 C0 00 00 */ li r6, 0 /* 801F1038 001EDF98 C0 02 AE B4 */ lfs f0, lbl_805ACBD4@sda21(r2) -/* 801F103C 001EDF9C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801F103C 001EDF9C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801F1040 001EDFA0 90 1F 05 68 */ stw r0, 0x568(r31) /* 801F1044 001EDFA4 38 7F 04 60 */ addi r3, r31, 0x460 /* 801F1048 001EDFA8 38 80 00 00 */ li r4, 0 diff --git a/asm/MetroidPrime/Enemies/CFlickerBat.s b/asm/MetroidPrime/Enemies/CFlickerBat.s index 0b69263c..3ec3fbe6 100644 --- a/asm/MetroidPrime/Enemies/CFlickerBat.s +++ b/asm/MetroidPrime/Enemies/CFlickerBat.s @@ -239,8 +239,8 @@ lbl_80130320: /* 80130370 0012D2D0 D0 41 00 28 */ stfs f2, 0x28(r1) /* 80130374 0012D2D4 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80130378 0012D2D8 48 1E 44 D9 */ bl AsNormalized__9CVector3fCFv -/* 8013037C 0012D2DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80130380 0012D2E0 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8013037C 0012D2DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80130380 0012D2E0 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80130384 0012D2E4 C0 C1 00 08 */ lfs f6, 8(r1) /* 80130388 0012D2E8 38 81 00 2C */ addi r4, r1, 0x2c /* 8013038C 0012D2EC C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -710,9 +710,9 @@ Touch__11CFlickerBatFR6CActorR13CStateManager: /* 80130A00 0012D960 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80130A04 0012D964 7D 89 03 A6 */ mtctr r12 /* 80130A08 0012D968 4E 80 04 21 */ bctrl -/* 80130A0C 0012D96C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80130A0C 0012D96C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80130A10 0012D970 7F C3 F3 78 */ mr r3, r30 -/* 80130A14 0012D974 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80130A14 0012D974 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80130A18 0012D978 38 A1 00 14 */ addi r5, r1, 0x14 /* 80130A1C 0012D97C 38 81 00 1C */ addi r4, r1, 0x1c /* 80130A20 0012D980 38 C1 00 0C */ addi r6, r1, 0xc diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index cdc19d83..2b590576 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -788,8 +788,8 @@ lbl_801F4498: /* 801F4558 001F14B8 D0 1C 03 70 */ stfs f0, 0x370(r28) /* 801F455C 001F14BC 48 00 00 20 */ b lbl_801F457C lbl_801F4560: -/* 801F4560 001F14C0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F4564 001F14C4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F4560 001F14C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F4564 001F14C4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F4568 001F14C8 D0 1C 03 68 */ stfs f0, 0x368(r28) /* 801F456C 001F14CC C0 03 00 04 */ lfs f0, 4(r3) /* 801F4570 001F14D0 D0 1C 03 6C */ stfs f0, 0x36c(r28) @@ -823,8 +823,8 @@ lbl_801F45D0: /* 801F45D4 001F1534 38 7C 03 8C */ addi r3, r28, 0x38c /* 801F45D8 001F1538 48 00 2A D1 */ bl "reserve__Q24rstl63vectorFi" /* 801F45DC 001F153C 80 1C 03 74 */ lwz r0, 0x374(r28) -/* 801F45E0 001F1540 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F45E4 001F1544 C7 E3 66 A0 */ lfsu f31, skZero3f@l(r3) +/* 801F45E0 001F1540 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F45E4 001F1544 C7 E3 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r3) /* 801F45E8 001F1548 2C 00 00 02 */ cmpwi r0, 2 /* 801F45EC 001F154C C3 C3 00 04 */ lfs f30, 4(r3) /* 801F45F0 001F1550 C3 A3 00 08 */ lfs f29, 8(r3) @@ -1264,8 +1264,8 @@ lbl_801F4C04: .global FindPatternDir__10CPatternedFR13CStateManager FindPatternDir__10CPatternedFR13CStateManager: /* 801F4C40 001F1BA0 80 04 03 78 */ lwz r0, 0x378(r4) -/* 801F4C44 001F1BA4 3C C0 80 5A */ lis r6, skZero3f@ha -/* 801F4C48 001F1BA8 C4 86 66 A0 */ lfsu f4, skZero3f@l(r6) +/* 801F4C44 001F1BA4 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha +/* 801F4C48 001F1BA8 C4 86 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r6) /* 801F4C4C 001F1BAC 2C 00 00 02 */ cmpwi r0, 2 /* 801F4C50 001F1BB0 C0 46 00 04 */ lfs f2, 4(r6) /* 801F4C54 001F1BB4 C0 06 00 08 */ lfs f0, 8(r6) @@ -1332,9 +1332,9 @@ GetStepDirection__10CPatternedFRC9CVector3f: /* 801F4D24 001F1C84 38 86 00 34 */ addi r4, r6, 0x34 /* 801F4D28 001F1C88 48 11 DC FD */ bl TransposeRotate__12CTransform4fCFRC9CVector3f /* 801F4D2C 001F1C8C C0 41 00 08 */ lfs f2, 8(r1) -/* 801F4D30 001F1C90 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 801F4D30 001F1C90 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 801F4D34 001F1C94 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801F4D38 001F1C98 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 801F4D38 001F1C98 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 801F4D3C 001F1C9C C0 01 00 10 */ lfs f0, 0x10(r1) /* 801F4D40 001F1CA0 38 61 00 14 */ addi r3, r1, 0x14 /* 801F4D44 001F1CA4 D0 41 00 14 */ stfs f2, 0x14(r1) @@ -1353,9 +1353,9 @@ lbl_801F4D68: /* 801F4D74 001F1CD4 38 60 00 01 */ li r3, 1 /* 801F4D78 001F1CD8 48 00 00 48 */ b lbl_801F4DC0 lbl_801F4D7C: -/* 801F4D7C 001F1CDC 3C 60 80 5A */ lis r3, lbl_805A6718@ha +/* 801F4D7C 001F1CDC 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha /* 801F4D80 001F1CE0 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 801F4D84 001F1CE4 38 63 67 18 */ addi r3, r3, lbl_805A6718@l +/* 801F4D84 001F1CE4 38 63 67 18 */ addi r3, r3, sRightVector__9CVector3f@l /* 801F4D88 001F1CE8 C0 61 00 14 */ lfs f3, 0x14(r1) /* 801F4D8C 001F1CEC C0 03 00 04 */ lfs f0, 4(r3) /* 801F4D90 001F1CF0 C0 43 00 00 */ lfs f2, 0(r3) @@ -1786,8 +1786,8 @@ UpdateDest__10CPatternedFR13CStateManager: /* 801F539C 001F22FC 39 06 AA 68 */ addi r8, r6, lbl_803DAA68@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, skZero3f@ha -/* 801F53AC 001F230C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 801F53A8 001F2308 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F53AC 001F230C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 801F53B0 001F2310 3C C0 80 3E */ lis r6, lbl_803DA9FC@ha /* 801F53B4 001F2314 C0 BE 00 60 */ lfs f5, 0x60(r30) /* 801F53B8 001F2318 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -2145,8 +2145,8 @@ lbl_801F58DC: /* 801F58F8 001F2858 40 82 00 54 */ bne lbl_801F594C lbl_801F58FC: /* 801F58FC 001F285C C0 3F 03 10 */ lfs f1, 0x310(r31) -/* 801F5900 001F2860 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F5904 001F2864 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801F5900 001F2860 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F5904 001F2864 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801F5908 001F2868 38 81 00 68 */ addi r4, r1, 0x68 /* 801F590C 001F286C D0 21 00 68 */ stfs f1, 0x68(r1) /* 801F5910 001F2870 C0 02 AF 34 */ lfs f0, lbl_805ACC54@sda21(r2) @@ -2201,8 +2201,8 @@ lbl_801F594C: /* 801F59D0 001F2930 48 00 00 50 */ b lbl_801F5A20 lbl_801F59D4: /* 801F59D4 001F2934 C0 3F 03 10 */ lfs f1, 0x310(r31) -/* 801F59D8 001F2938 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F59DC 001F293C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801F59D8 001F2938 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F59DC 001F293C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801F59E0 001F2940 38 81 00 4C */ addi r4, r1, 0x4c /* 801F59E4 001F2944 D0 21 00 4C */ stfs f1, 0x4c(r1) /* 801F59E8 001F2948 C0 02 AF 34 */ lfs f0, lbl_805ACC54@sda21(r2) @@ -2241,10 +2241,10 @@ lbl_801F5A40: /* 801F5A64 001F29C4 EC 81 E8 24 */ fdivs f4, f1, f29 /* 801F5A68 001F29C8 C0 5F 00 48 */ lfs f2, 0x48(r31) /* 801F5A6C 001F29CC C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 801F5A70 001F29D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801F5A70 001F29D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F5A74 001F29D4 C0 1F 00 38 */ lfs f0, 0x38(r31) /* 801F5A78 001F29D8 38 81 00 30 */ addi r4, r1, 0x30 -/* 801F5A7C 001F29DC C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801F5A7C 001F29DC C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801F5A80 001F29E0 EC C4 00 B2 */ fmuls f6, f4, f2 /* 801F5A84 001F29E4 EC A4 00 72 */ fmuls f5, f4, f1 /* 801F5A88 001F29E8 EC 84 00 32 */ fmuls f4, f4, f0 @@ -2514,9 +2514,9 @@ lbl_801F5DB8: /* 801F5DD8 001F2D38 88 1F 04 01 */ lbz r0, 0x401(r31) /* 801F5DDC 001F2D3C 54 00 D7 BF */ rlwinm. r0, r0, 0x1a, 0x1e, 0x1f /* 801F5DE0 001F2D40 40 82 00 D0 */ bne lbl_801F5EB0 -/* 801F5DE4 001F2D44 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801F5DE4 001F2D44 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801F5DE8 001F2D48 C0 A2 AF 40 */ lfs f5, lbl_805ACC60@sda21(r2) -/* 801F5DEC 001F2D4C 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 801F5DEC 001F2D4C 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 801F5DF0 001F2D50 C0 DF 00 40 */ lfs f6, 0x40(r31) /* 801F5DF4 001F2D54 C0 44 00 00 */ lfs f2, 0(r4) /* 801F5DF8 001F2D58 7F E3 FB 78 */ mr r3, r31 @@ -3235,9 +3235,9 @@ lbl_801F6824: /* 801F683C 001F379C 50 63 06 32 */ rlwimi r3, r3, 0, 0x18, 0x19 /* 801F6840 001F37A0 98 7E 04 01 */ stb r3, 0x401(r30) lbl_801F6844: -/* 801F6844 001F37A4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801F6844 001F37A4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801F6848 001F37A8 C0 A2 AF 40 */ lfs f5, lbl_805ACC60@sda21(r2) -/* 801F684C 001F37AC 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 801F684C 001F37AC 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 801F6850 001F37B0 C0 DE 00 50 */ lfs f6, 0x50(r30) /* 801F6854 001F37B4 C0 45 00 04 */ lfs f2, 4(r5) /* 801F6858 001F37B8 7F C3 F3 78 */ mr r3, r30 @@ -3349,8 +3349,8 @@ Dead__10CPatternedFR13CStateManager9EStateMsgf: /* 801F69F0 001F3950 40 80 00 08 */ bge lbl_801F69F8 /* 801F69F4 001F3954 48 00 00 D0 */ b lbl_801F6AC4 lbl_801F69F8: -/* 801F69F8 001F3958 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F69FC 001F395C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F69F8 001F3958 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F69FC 001F395C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F6A00 001F3960 D0 1E 03 1C */ stfs f0, 0x31c(r30) /* 801F6A04 001F3964 C0 03 00 04 */ lfs f0, 4(r3) /* 801F6A08 001F3968 D0 1E 03 20 */ stfs f0, 0x320(r30) @@ -4785,8 +4785,8 @@ lbl_801F7DC8: /* 801F7E34 001F4D94 4B F2 45 65 */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 801F7E38 001F4D98 48 00 00 38 */ b lbl_801F7E70 lbl_801F7E3C: -/* 801F7E3C 001F4D9C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F7E40 001F4DA0 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F7E3C 001F4D9C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F7E40 001F4DA0 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F7E44 001F4DA4 D0 1F 08 70 */ stfs f0, 0x870(r31) /* 801F7E48 001F4DA8 C0 03 00 04 */ lfs f0, 4(r3) /* 801F7E4C 001F4DAC D0 1F 08 74 */ stfs f0, 0x874(r31) @@ -4839,9 +4839,9 @@ lbl_801F7E70: /* 801F7F04 001F4E64 80 81 02 74 */ lwz r4, 0x274(r1) /* 801F7F08 001F4E68 48 0F 0F A5 */ bl PitchBend__11CSfxManagerF10CSfxHandlei lbl_801F7F0C: -/* 801F7F0C 001F4E6C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801F7F0C 001F4E6C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F7F10 001F4E70 C0 02 AF 78 */ lfs f0, lbl_805ACC98@sda21(r2) -/* 801F7F14 001F4E74 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801F7F14 001F4E74 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801F7F18 001F4E78 C0 21 00 08 */ lfs f1, 8(r1) /* 801F7F1C 001F4E7C C0 45 00 00 */ lfs f2, 0(r5) /* 801F7F20 001F4E80 7F E3 FB 78 */ mr r3, r31 @@ -4875,9 +4875,9 @@ lbl_801F7F74: /* 801F7F8C 001F4EEC D0 01 00 20 */ stfs f0, 0x20(r1) /* 801F7F90 001F4EF0 4B E8 5E 51 */ bl "Min__5CMathFRCfRCf" /* 801F7F94 001F4EF4 C0 63 00 00 */ lfs f3, 0(r3) -/* 801F7F98 001F4EF8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801F7F98 001F4EF8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801F7F9C 001F4EFC C0 41 01 BC */ lfs f2, 0x1bc(r1) -/* 801F7FA0 001F4F00 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 801F7FA0 001F4F00 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 801F7FA4 001F4F04 C0 21 01 C0 */ lfs f1, 0x1c0(r1) /* 801F7FA8 001F4F08 38 61 00 F8 */ addi r3, r1, 0xf8 /* 801F7FAC 001F4F0C C0 01 01 B8 */ lfs f0, 0x1b8(r1) @@ -5072,9 +5072,9 @@ lbl_801F824C: /* 801F8294 001F51F4 7D 89 03 A6 */ mtctr r12 /* 801F8298 001F51F8 4E 80 04 21 */ bctrl /* 801F829C 001F51FC C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 801F82A0 001F5200 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801F82A0 001F5200 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801F82A4 001F5204 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 801F82A8 001F5208 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 801F82A8 001F5208 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 801F82AC 001F520C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 801F82B0 001F5210 38 7F 00 34 */ addi r3, r31, 0x34 /* 801F82B4 001F5214 D0 01 01 70 */ stfs f0, 0x170(r1) @@ -5149,13 +5149,13 @@ lbl_801F8398: /* 801F83BC 001F531C 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b /* 801F83C0 001F5320 C0 02 AF 98 */ lfs f0, lbl_805ACCB8@sda21(r2) /* 801F83C4 001F5324 98 1F 04 00 */ stb r0, 0x400(r31) -/* 801F83C8 001F5328 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F83CC 001F532C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801F83C8 001F5328 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F83CC 001F532C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801F83D0 001F5330 D0 1F 03 E8 */ stfs f0, 0x3e8(r31) /* 801F83D4 001F5334 7F E3 FB 78 */ mr r3, r31 /* 801F83D8 001F5338 4B F2 28 C9 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 801F83DC 001F533C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F83E0 001F5340 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F83DC 001F533C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F83E0 001F5340 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F83E4 001F5344 D0 1F 01 50 */ stfs f0, 0x150(r31) /* 801F83E8 001F5348 C0 03 00 04 */ lfs f0, 4(r3) /* 801F83EC 001F534C D0 1F 01 54 */ stfs f0, 0x154(r31) @@ -5869,9 +5869,9 @@ lbl_801F8D88: /* 801F8E38 001F5D98 38 A1 00 A4 */ addi r5, r1, 0xa4 /* 801F8E3C 001F5D9C 48 11 9C 45 */ bl Rotate__12CTransform4fCFRC9CVector3f /* 801F8E40 001F5DA0 C0 61 01 14 */ lfs f3, 0x114(r1) -/* 801F8E44 001F5DA4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801F8E44 001F5DA4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801F8E48 001F5DA8 C0 41 00 B0 */ lfs f2, 0xb0(r1) -/* 801F8E4C 001F5DAC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801F8E4C 001F5DAC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801F8E50 001F5DB0 C0 21 01 18 */ lfs f1, 0x118(r1) /* 801F8E54 001F5DB4 38 61 01 20 */ addi r3, r1, 0x120 /* 801F8E58 001F5DB8 EC C3 10 2A */ fadds f6, f3, f2 @@ -5982,9 +5982,9 @@ lbl_801F8F24: /* 801F8FF4 001F5F54 4B E3 11 DD */ bl AddAdditiveAnimation__9CAnimDataFUifbb lbl_801F8FF8: /* 801F8FF8 001F5F58 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 801F8FFC 001F5F5C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801F8FFC 001F5F5C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F9000 001F5F60 C0 3D 00 50 */ lfs f1, 0x50(r29) -/* 801F9004 001F5F64 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801F9004 001F5F64 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801F9008 001F5F68 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 801F900C 001F5F6C 38 61 00 14 */ addi r3, r1, 0x14 /* 801F9010 001F5F70 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -6176,8 +6176,8 @@ lbl_801F929C: /* 801F92A8 001F6208 38 C0 00 25 */ li r6, 0x25 /* 801F92AC 001F620C 38 E0 00 13 */ li r7, 0x13 /* 801F92B0 001F6210 4B E5 AA 39 */ bl RemoveMaterial__6CActorF14EMaterialTypes14EMaterialTypes14EMaterialTypes14EMaterialTypesR13CStateManager -/* 801F92B4 001F6214 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F92B8 001F6218 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F92B4 001F6214 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F92B8 001F6218 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F92BC 001F621C D0 1E 01 50 */ stfs f0, 0x150(r30) /* 801F92C0 001F6220 C0 03 00 04 */ lfs f0, 4(r3) /* 801F92C4 001F6224 D0 1E 01 54 */ stfs f0, 0x154(r30) @@ -6293,8 +6293,8 @@ Enraged__13CFlyingPirateFR13CStateManager9EStateMsgf: /* 801F9440 001F63A0 48 00 01 08 */ b lbl_801F9548 lbl_801F9444: /* 801F9444 001F63A4 C0 5E 06 2C */ lfs f2, 0x62c(r30) -/* 801F9448 001F63A8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 801F944C 001F63AC 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 801F9448 001F63A8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 801F944C 001F63AC 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 801F9450 001F63B0 C0 02 AF B4 */ lfs f0, lbl_805ACCD4@sda21(r2) /* 801F9454 001F63B4 EC A1 00 B2 */ fmuls f5, f1, f2 /* 801F9458 001F63B8 C0 5F 00 00 */ lfs f2, 0(r31) @@ -6338,11 +6338,11 @@ lbl_801F9444: /* 801F94F0 001F6450 D0 21 00 18 */ stfs f1, 0x18(r1) /* 801F94F4 001F6454 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801F94F8 001F6458 48 11 B3 59 */ bl AsNormalized__9CVector3fCFv -/* 801F94FC 001F645C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801F94FC 001F645C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801F9500 001F6460 C0 BF 00 04 */ lfs f5, 4(r31) /* 801F9504 001F6464 C0 9F 00 08 */ lfs f4, 8(r31) /* 801F9508 001F6468 38 81 00 2C */ addi r4, r1, 0x2c -/* 801F950C 001F646C C0 C3 66 F4 */ lfs f6, lbl_805A66F4@l(r3) +/* 801F950C 001F646C C0 C3 66 F4 */ lfs f6, sUpVector__9CVector3f@l(r3) /* 801F9510 001F6470 C0 61 00 20 */ lfs f3, 0x20(r1) /* 801F9514 001F6474 C0 41 00 24 */ lfs f2, 0x24(r1) /* 801F9518 001F6478 C0 21 00 28 */ lfs f1, 0x28(r1) @@ -6463,9 +6463,9 @@ lbl_801F96A4: /* 801F96B0 001F6610 48 11 8E 95 */ bl Range__9CRandom16Fff /* 801F96B4 001F6614 FF E0 08 90 */ fmr f31, f1 lbl_801F96B8: -/* 801F96B8 001F6618 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 801F96B8 001F6618 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 801F96BC 001F661C 38 61 00 20 */ addi r3, r1, 0x20 -/* 801F96C0 001F6620 38 A4 66 F4 */ addi r5, r4, lbl_805A66F4@l +/* 801F96C0 001F6620 38 A4 66 F4 */ addi r5, r4, sUpVector__9CVector3f@l /* 801F96C4 001F6624 38 81 00 14 */ addi r4, r1, 0x14 /* 801F96C8 001F6628 C0 65 00 04 */ lfs f3, 4(r5) /* 801F96CC 001F662C C0 85 00 08 */ lfs f4, 8(r5) @@ -6680,8 +6680,8 @@ lbl_801F99B8: /* 801F99D0 001F6930 38 60 00 01 */ li r3, 1 /* 801F99D4 001F6934 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 801F99D8 001F6938 98 1E 03 28 */ stb r0, 0x328(r30) -/* 801F99DC 001F693C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801F99E0 001F6940 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801F99DC 001F693C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801F99E0 001F6940 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801F99E4 001F6944 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 801F99E8 001F6948 C0 03 00 04 */ lfs f0, 4(r3) /* 801F99EC 001F694C D0 1E 01 54 */ stfs f0, 0x154(r30) @@ -6854,9 +6854,9 @@ lbl_801F9C0C: /* 801F9C2C 001F6B8C 7F E5 FB 78 */ mr r5, r31 /* 801F9C30 001F6B90 38 80 00 25 */ li r4, 0x25 /* 801F9C34 001F6B94 4B E5 A3 4D */ bl RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 801F9C38 001F6B98 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801F9C38 001F6B98 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801F9C3C 001F6B9C C0 02 AF D0 */ lfs f0, lbl_805ACCF0@sda21(r2) -/* 801F9C40 001F6BA0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801F9C40 001F6BA0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801F9C44 001F6BA4 C0 22 AF 78 */ lfs f1, lbl_805ACC98@sda21(r2) /* 801F9C48 001F6BA8 C0 46 00 00 */ lfs f2, 0(r6) /* 801F9C4C 001F6BAC 7F C3 F3 78 */ mr r3, r30 @@ -6965,9 +6965,9 @@ ShouldSpecialAttack__13CFlyingPirateFR13CStateManagerf: /* 801F9DD4 001F6D34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F9DD8 001F6D38 41 82 00 88 */ beq lbl_801F9E60 lbl_801F9DDC: -/* 801F9DDC 001F6D3C 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 801F9DDC 001F6D3C 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 801F9DE0 001F6D40 C0 FE 00 60 */ lfs f7, 0x60(r30) -/* 801F9DE4 001F6D44 38 A3 67 00 */ addi r5, r3, lbl_805A6700@l +/* 801F9DE4 001F6D44 38 A3 67 00 */ addi r5, r3, sDownVector__9CVector3f@l /* 801F9DE8 001F6D48 C0 DE 00 50 */ lfs f6, 0x50(r30) /* 801F9DEC 001F6D4C C0 42 AF C0 */ lfs f2, lbl_805ACCE0@sda21(r2) /* 801F9DF0 001F6D50 7F E3 FB 78 */ mr r3, r31 @@ -7470,8 +7470,8 @@ lbl_801FA4CC: /* 801FA514 001F7474 48 00 36 D5 */ bl sub_801fdbe8 /* 801FA518 001F7478 48 00 02 C4 */ b lbl_801FA7DC lbl_801FA51C: -/* 801FA51C 001F747C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801FA520 001F7480 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 801FA51C 001F747C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801FA520 001F7480 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 801FA524 001F7484 C0 24 00 04 */ lfs f1, 4(r4) /* 801FA528 001F7488 C0 04 00 08 */ lfs f0, 8(r4) /* 801FA52C 001F748C D0 41 00 B0 */ stfs f2, 0xb0(r1) @@ -7803,8 +7803,8 @@ lbl_801FA9F8: /* 801FAA08 001F7968 48 00 31 E1 */ bl sub_801fdbe8 /* 801FAA0C 001F796C 48 00 02 F8 */ b lbl_801FAD04 lbl_801FAA10: -/* 801FAA10 001F7970 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801FAA14 001F7974 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 801FAA10 001F7970 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801FAA14 001F7974 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 801FAA18 001F7978 C0 24 00 04 */ lfs f1, 4(r4) /* 801FAA1C 001F797C C0 04 00 08 */ lfs f0, 8(r4) /* 801FAA20 001F7980 D0 41 00 84 */ stfs f2, 0x84(r1) @@ -9509,8 +9509,8 @@ lbl_801FC258: /* 801FC290 001F91F0 38 60 00 01 */ li r3, 1 /* 801FC294 001F91F4 50 60 0F BC */ rlwimi r0, r3, 1, 0x1e, 0x1e /* 801FC298 001F91F8 98 1A 06 A1 */ stb r0, 0x6a1(r26) -/* 801FC29C 001F91FC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801FC2A0 001F9200 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801FC29C 001F91FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801FC2A0 001F9200 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801FC2A4 001F9204 D0 1A 01 50 */ stfs f0, 0x150(r26) /* 801FC2A8 001F9208 C0 03 00 04 */ lfs f0, 4(r3) /* 801FC2AC 001F920C D0 1A 01 54 */ stfs f0, 0x154(r26) @@ -9572,15 +9572,15 @@ lbl_801FC368: /* 801FC380 001F92E0 7D 89 03 A6 */ mtctr r12 /* 801FC384 001F92E4 4E 80 04 21 */ bctrl /* 801FC388 001F92E8 C3 81 00 6C */ lfs f28, 0x6c(r1) -/* 801FC38C 001F92EC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801FC38C 001F92EC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801FC390 001F92F0 C0 3A 00 40 */ lfs f1, 0x40(r26) -/* 801FC394 001F92F4 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 801FC394 001F92F4 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 801FC398 001F92F8 C3 C1 00 70 */ lfs f30, 0x70(r1) -/* 801FC39C 001F92FC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FC39C 001F92FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FC3A0 001F9300 C0 1A 00 50 */ lfs f0, 0x50(r26) /* 801FC3A4 001F9304 EF FC 08 28 */ fsubs f31, f28, f1 /* 801FC3A8 001F9308 C3 A1 00 74 */ lfs f29, 0x74(r1) -/* 801FC3AC 001F930C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801FC3AC 001F930C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801FC3B0 001F9310 C0 3A 00 60 */ lfs f1, 0x60(r26) /* 801FC3B4 001F9314 EF 3E 00 28 */ fsubs f25, f30, f0 /* 801FC3B8 001F9318 C0 A5 00 08 */ lfs f5, 8(r5) @@ -9601,8 +9601,8 @@ lbl_801FC368: /* 801FC3F4 001F9354 48 11 3B 71 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 801FC3F8 001F9358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC3FC 001F935C 41 82 00 3C */ beq lbl_801FC438 -/* 801FC400 001F9360 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 801FC404 001F9364 38 63 67 24 */ addi r3, r3, lbl_805A6724@l +/* 801FC400 001F9360 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 801FC404 001F9364 38 63 67 24 */ addi r3, r3, sForwardVector__9CVector3f@l /* 801FC408 001F9368 C0 63 00 04 */ lfs f3, 4(r3) /* 801FC40C 001F936C C0 83 00 08 */ lfs f4, 8(r3) /* 801FC410 001F9370 C0 A3 00 00 */ lfs f5, 0(r3) @@ -9686,9 +9686,9 @@ lbl_801FC538: /* 801FC538 001F9498 88 1A 06 A1 */ lbz r0, 0x6a1(r26) /* 801FC53C 001F949C 38 A0 00 00 */ li r5, 0 /* 801FC540 001F94A0 50 A0 1F 38 */ rlwimi r0, r5, 3, 0x1c, 0x1c -/* 801FC544 001F94A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FC544 001F94A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FC548 001F94A8 98 1A 06 A1 */ stb r0, 0x6a1(r26) -/* 801FC54C 001F94AC 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801FC54C 001F94AC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FC550 001F94B0 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) /* 801FC554 001F94B4 38 61 00 20 */ addi r3, r1, 0x20 /* 801FC558 001F94B8 88 9A 03 28 */ lbz r4, 0x328(r26) @@ -9716,9 +9716,9 @@ lbl_801FC5A0: /* 801FC5AC 001F950C 48 00 00 AC */ b lbl_801FC658 lbl_801FC5B0: /* 801FC5B0 001F9510 C0 5A 00 60 */ lfs f2, 0x60(r26) -/* 801FC5B4 001F9514 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FC5B4 001F9514 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FC5B8 001F9518 C0 3A 00 50 */ lfs f1, 0x50(r26) -/* 801FC5BC 001F951C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801FC5BC 001F951C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FC5C0 001F9520 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 801FC5C4 001F9524 38 61 00 1C */ addi r3, r1, 0x1c /* 801FC5C8 001F9528 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) @@ -10367,14 +10367,14 @@ AvoidActors__13CFlyingPirateFR13CStateManager: /* 801FCF18 001F9E78 F3 A1 08 B8 */ psq_st f29, -1864(r1), 0, qr0 /* 801FCF1C 001F9E7C BF 61 08 9C */ stmw r27, 0x89c(r1) /* 801FCF20 001F9E80 7C 9C 23 78 */ mr r28, r4 -/* 801FCF24 001F9E84 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801FCF24 001F9E84 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801FCF28 001F9E88 C0 9C 00 50 */ lfs f4, 0x50(r28) /* 801FCF2C 001F9E8C 7C 7B 1B 78 */ mr r27, r3 /* 801FCF30 001F9E90 C0 62 AF EC */ lfs f3, lbl_805ACD0C@sda21(r2) /* 801FCF34 001F9E94 7C BD 2B 78 */ mr r29, r5 /* 801FCF38 001F9E98 C0 5C 00 60 */ lfs f2, 0x60(r28) /* 801FCF3C 001F9E9C 38 61 00 78 */ addi r3, r1, 0x78 -/* 801FCF40 001F9EA0 C7 E4 66 A0 */ lfsu f31, skZero3f@l(r4) +/* 801FCF40 001F9EA0 C7 E4 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r4) /* 801FCF44 001F9EA4 EC C4 18 2A */ fadds f6, f4, f3 /* 801FCF48 001F9EA8 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 801FCF4C 001F9EAC EC A2 18 2A */ fadds f5, f2, f3 @@ -11073,8 +11073,8 @@ lbl_801FD95C: /* 801FD96C 001FA8CC 39 00 00 00 */ li r8, 0 /* 801FD970 001FA8D0 38 00 00 01 */ li r0, 1 /* 801FD974 001FA8D4 90 81 00 64 */ stw r4, 0x64(r1) -/* 801FD978 001FA8D8 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 801FD97C 001FA8DC 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 801FD978 001FA8D8 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 801FD97C 001FA8DC 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 801FD980 001FA8E0 38 A1 00 3C */ addi r5, r1, 0x3c /* 801FD984 001FA8E4 90 61 00 60 */ stw r3, 0x60(r1) /* 801FD988 001FA8E8 7F E4 FB 78 */ mr r4, r31 @@ -11740,8 +11740,8 @@ lbl_801FE278: /* 801FE2F4 001FB254 D0 21 00 6C */ stfs f1, 0x6c(r1) /* 801FE2F8 001FB258 D0 01 00 70 */ stfs f0, 0x70(r1) /* 801FE2FC 001FB25C 4B F1 C9 A5 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 801FE300 001FB260 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801FE304 001FB264 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 801FE300 001FB260 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801FE304 001FB264 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 801FE308 001FB268 C0 02 AF 78 */ lfs f0, lbl_805ACC98@sda21(r2) /* 801FE30C 001FB26C D0 3D 08 70 */ stfs f1, 0x870(r29) /* 801FE310 001FB270 C0 23 00 04 */ lfs f1, 4(r3) @@ -11975,7 +11975,7 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE668 001FB5C8 C0 82 AF 7C */ lfs f4, lbl_805ACC9C@sda21(r2) /* 801FE66C 001FB5CC 38 C0 00 00 */ li r6, 0 /* 801FE670 001FB5D0 C0 02 B0 0C */ lfs f0, lbl_805ACD2C@sda21(r2) -/* 801FE674 001FB5D4 3C A0 80 5A */ lis r5, skZero3f@ha +/* 801FE674 001FB5D4 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 801FE678 001FB5D8 D0 9A 08 50 */ stfs f4, 0x850(r26) /* 801FE67C 001FB5DC 38 61 01 08 */ addi r3, r1, 0x108 /* 801FE680 001FB5E0 C0 42 AF C0 */ lfs f2, lbl_805ACCE0@sda21(r2) @@ -11990,7 +11990,7 @@ Accept__13CFlyingPirateFR8IVisitor: /* 801FE6A4 001FB604 D0 5A 08 60 */ stfs f2, 0x860(r26) /* 801FE6A8 001FB608 90 DA 08 64 */ stw r6, 0x864(r26) /* 801FE6AC 001FB60C D0 7A 08 6C */ stfs f3, 0x86c(r26) -/* 801FE6B0 001FB610 C4 45 66 A0 */ lfsu f2, skZero3f@l(r5) +/* 801FE6B0 001FB610 C4 45 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r5) /* 801FE6B4 001FB614 D0 5A 08 70 */ stfs f2, 0x870(r26) /* 801FE6B8 001FB618 C0 45 00 04 */ lfs f2, 4(r5) /* 801FE6BC 001FB61C D0 5A 08 74 */ stfs f2, 0x874(r26) @@ -13372,9 +13372,9 @@ lbl_801FF9FC: /* 801FFBB0 001FCB10 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801FFBB4 001FCB14 4B E7 E2 2D */ bl "Min__5CMathFRCfRCf" /* 801FFBB8 001FCB18 C0 02 AF 78 */ lfs f0, lbl_805ACC98@sda21(r2) -/* 801FFBBC 001FCB1C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801FFBBC 001FCB1C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801FFBC0 001FCB20 C0 A3 00 00 */ lfs f5, 0(r3) -/* 801FFBC4 001FCB24 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801FFBC4 001FCB24 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801FFBC8 001FCB28 EC C0 E8 24 */ fdivs f6, f0, f29 /* 801FFBCC 001FCB2C C0 41 00 C0 */ lfs f2, 0xc0(r1) /* 801FFBD0 001FCB30 C0 81 00 B0 */ lfs f4, 0xb0(r1) @@ -13485,9 +13485,9 @@ lbl_801FFD3C: /* 801FFD6C 001FCCCC D0 21 00 44 */ stfs f1, 0x44(r1) /* 801FFD70 001FCCD0 D0 41 00 48 */ stfs f2, 0x48(r1) /* 801FFD74 001FCCD4 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, qr2 -/* 801FFD78 001FCCD8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FFD78 001FCCD8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FFD7C 001FCCDC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) -/* 801FFD80 001FCCE0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801FFD80 001FCCE0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FFD84 001FCCE4 88 E1 00 10 */ lbz r7, 0x10(r1) /* 801FFD88 001FCCE8 38 61 00 14 */ addi r3, r1, 0x14 /* 801FFD8C 001FCCEC 90 01 00 08 */ stw r0, 8(r1) @@ -13515,9 +13515,9 @@ lbl_801FFD3C: /* 801FFDE4 001FCD44 D0 5E 00 98 */ stfs f2, 0x98(r30) /* 801FFDE8 001FCD48 48 00 00 2C */ b lbl_801FFE14 lbl_801FFDEC: -/* 801FFDEC 001FCD4C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FFDEC 001FCD4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FFDF0 001FCD50 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 801FFDF4 001FCD54 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801FFDF4 001FCD54 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801FFDF8 001FCD58 D0 04 01 50 */ stfs f0, 0x150(r4) /* 801FFDFC 001FCD5C C0 03 00 04 */ lfs f0, 4(r3) /* 801FFE00 001FCD60 D0 04 01 54 */ stfs f0, 0x154(r4) @@ -13560,9 +13560,9 @@ sub_801ffe50: /* 801FFE84 001FCDE4 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 801FFE88 001FCDE8 41 82 00 4C */ beq lbl_801FFED4 /* 801FFE8C 001FCDEC C0 44 00 60 */ lfs f2, 0x60(r4) -/* 801FFE90 001FCDF0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FFE90 001FCDF0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801FFE94 001FCDF4 C0 24 00 50 */ lfs f1, 0x50(r4) -/* 801FFE98 001FCDF8 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801FFE98 001FCDF8 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FFE9C 001FCDFC C0 04 00 40 */ lfs f0, 0x40(r4) /* 801FFEA0 001FCE00 38 61 00 08 */ addi r3, r1, 8 /* 801FFEA4 001FCE04 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -13655,15 +13655,15 @@ __ct__20CFlyingPirateRagDollFR13CStateManagerP13CFlyingPiratefUsUs: /* 801FFFE0 001FCF40 38 80 00 00 */ li r4, 0 /* 801FFFE4 001FCF44 48 00 E8 ED */ bl __ct__8CRagDollFfffUi /* 801FFFE8 001FCF48 3C 60 80 3E */ lis r3, lbl_803E6B98@ha -/* 801FFFEC 001FCF4C 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 801FFFEC 001FCF4C 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 801FFFF0 001FCF50 38 03 6B 98 */ addi r0, r3, lbl_803E6B98@l /* 801FFFF4 001FCF54 C0 42 AF 60 */ lfs f2, lbl_805ACC80@sda21(r2) /* 801FFFF8 001FCF58 90 1D 00 00 */ stw r0, 0(r29) -/* 801FFFFC 001FCF5C 39 24 66 F4 */ addi r9, r4, lbl_805A66F4@l -/* 80200000 001FCF60 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801FFFFC 001FCF5C 39 24 66 F4 */ addi r9, r4, sUpVector__9CVector3f@l +/* 80200000 001FCF60 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80200004 001FCF64 C0 02 AF E4 */ lfs f0, lbl_805ACD04@sda21(r2) /* 80200008 001FCF68 93 FD 00 6C */ stw r31, 0x6c(r29) -/* 8020000C 001FCF6C 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8020000C 001FCF6C 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80200010 001FCF70 38 00 00 00 */ li r0, 0 /* 80200014 001FCF74 38 60 00 01 */ li r3, 1 /* 80200018 001FCF78 D0 5D 00 70 */ stfs f2, 0x70(r29) diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index dfaa755b..76a7218a 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -336,7 +336,7 @@ lbl_8022F8D0: /* 8022F8E0 0022C840 4B E1 D4 15 */ bl AddObject__13CStateManagerFP7CEntityQ213CStateManager18EScriptPersistence /* 8022F8E4 0022C844 A0 9E 03 14 */ lhz r4, 0x314(r30) /* 8022F8E8 0022C848 38 61 00 28 */ addi r3, r1, 0x28 -/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, lbl_805AE960@sda21(r2) +/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 8022F8F0 0022C850 38 C0 00 40 */ li r6, 0x40 /* 8022F8F4 0022C854 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8022F8F8 0022C858 38 E0 00 00 */ li r7, 0 @@ -943,17 +943,17 @@ lbl_8023016C: /* 802301C8 0022D128 D0 01 01 28 */ stfs f0, 0x128(r1) lbl_802301CC: /* 802301CC 0022D12C C0 01 00 44 */ lfs f0, 0x44(r1) -/* 802301D0 0022D130 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 802301D4 0022D134 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 802301D0 0022D130 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 802301D4 0022D134 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 802301D8 0022D138 38 81 01 20 */ addi r4, r1, 0x120 /* 802301DC 0022D13C D0 01 00 38 */ stfs f0, 0x38(r1) /* 802301E0 0022D140 38 61 00 C8 */ addi r3, r1, 0xc8 /* 802301E4 0022D144 38 C1 00 38 */ addi r6, r1, 0x38 /* 802301E8 0022D148 48 0E 47 6D */ bl Slerp__9CVector3fFRC9CVector3fRC9CVector3fRC9CRelAngle /* 802301EC 0022D14C C0 21 01 54 */ lfs f1, 0x154(r1) -/* 802301F0 0022D150 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802301F0 0022D150 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802301F4 0022D154 C0 01 00 CC */ lfs f0, 0xcc(r1) -/* 802301F8 0022D158 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802301F8 0022D158 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802301FC 0022D15C C0 61 01 58 */ lfs f3, 0x158(r1) /* 80230200 0022D160 38 61 01 74 */ addi r3, r1, 0x174 /* 80230204 0022D164 EC 81 00 2A */ fadds f4, f1, f0 @@ -1941,8 +1941,8 @@ __ct__16CGrenadeLauncherF9TUniqueId: /* 80230FDC 0022DF3C 4B DE A5 59 */ bl Identity__10CAxisAngleFv /* 80230FE0 0022DF40 7C 79 1B 78 */ mr r25, r3 /* 80230FE4 0022DF44 4B DE A5 51 */ bl Identity__10CAxisAngleFv -/* 80230FE8 0022DF48 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80230FEC 0022DF4C C4 84 66 A0 */ lfsu f4, skZero3f@l(r4) +/* 80230FE8 0022DF48 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80230FEC 0022DF4C C4 84 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r4) /* 80230FF0 0022DF50 C0 02 B6 9C */ lfs f0, lbl_805AD3BC@sda21(r2) /* 80230FF4 0022DF54 38 01 00 AC */ addi r0, r1, 0xac /* 80230FF8 0022DF58 C0 A4 00 04 */ lfs f5, 4(r4) diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 9bbccd8e..e4999aa4 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -504,8 +504,8 @@ sub_8019e360: /* 8019E46C 0019B3CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019E470 0019B3D0 41 82 02 3C */ beq lbl_8019E6AC /* 8019E474 0019B3D4 80 DE 00 64 */ lwz r6, 0x64(r30) -/* 8019E478 0019B3D8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8019E47C 0019B3DC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8019E478 0019B3D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8019E47C 0019B3DC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8019E480 0019B3E0 C0 02 A7 58 */ lfs f0, lbl_805AC478@sda21(r2) /* 8019E484 0019B3E4 C0 A6 00 04 */ lfs f5, 4(r6) /* 8019E488 0019B3E8 FC 20 D0 90 */ fmr f1, f26 @@ -751,8 +751,8 @@ sub_8019e774: /* 8019E818 0019B778 39 00 00 00 */ li r8, 0 /* 8019E81C 0019B77C 39 40 00 03 */ li r10, 3 /* 8019E820 0019B780 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8019E824 0019B784 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8019E828 0019B788 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8019E824 0019B784 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8019E828 0019B788 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8019E82C 0019B78C A0 1E 00 00 */ lhz r0, 0(r30) /* 8019E830 0019B790 90 61 00 28 */ stw r3, 0x28(r1) /* 8019E834 0019B794 7F A3 EB 78 */ mr r3, r29 @@ -1552,9 +1552,9 @@ lbl_8019F344: /* 8019F3CC 0019C32C 28 00 00 00 */ cmplwi r0, 0 /* 8019F3D0 0019C330 40 82 00 74 */ bne lbl_8019F444 /* 8019F3D4 0019C334 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8019F3D8 0019C338 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8019F3D8 0019C338 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8019F3DC 0019C33C C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8019F3E0 0019C340 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8019F3E0 0019C340 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8019F3E4 0019C344 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8019F3E8 0019C348 38 61 00 14 */ addi r3, r1, 0x14 /* 8019F3EC 0019C34C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1647,10 +1647,10 @@ CreateFlameThrower__12CIceSheegothFR13CStateManager: /* 8019F534 0019C494 B0 01 00 28 */ sth r0, 0x28(r1) /* 8019F538 0019C498 4B E6 57 81 */ bl string_l__4rstlFPCc /* 8019F53C 0019C49C 38 01 00 28 */ addi r0, r1, 0x28 -/* 8019F540 0019C4A0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8019F540 0019C4A0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8019F544 0019C4A4 90 01 00 08 */ stw r0, 8(r1) /* 8019F548 0019C4A8 38 01 00 3C */ addi r0, r1, 0x3c -/* 8019F54C 0019C4AC 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8019F54C 0019C4AC 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8019F550 0019C4B0 38 81 00 30 */ addi r4, r1, 0x30 /* 8019F554 0019C4B4 90 01 00 0C */ stw r0, 0xc(r1) /* 8019F558 0019C4B8 38 00 00 00 */ li r0, 0 @@ -1887,8 +1887,8 @@ lbl_8019F81C: /* 8019F894 0019C7F4 4C 40 13 82 */ cror 2, 0, 2 /* 8019F898 0019C7F8 40 82 00 3C */ bne lbl_8019F8D4 /* 8019F89C 0019C7FC 81 9C 00 00 */ lwz r12, 0(r28) -/* 8019F8A0 0019C800 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8019F8A4 0019C804 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8019F8A0 0019C800 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8019F8A4 0019C804 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8019F8A8 0019C808 7F 83 E3 78 */ mr r3, r28 /* 8019F8AC 0019C80C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8019F8B0 0019C810 7F A4 EB 78 */ mr r4, r29 @@ -2804,8 +2804,8 @@ lbl_801A0580: /* 801A05B8 0019D518 39 40 00 00 */ li r10, 0 /* 801A05BC 0019D51C 38 00 00 03 */ li r0, 3 /* 801A05C0 0019D520 90 81 00 84 */ stw r4, 0x84(r1) -/* 801A05C4 0019D524 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801A05C8 0019D528 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801A05C4 0019D524 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801A05C8 0019D528 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801A05CC 0019D52C 38 A1 00 2C */ addi r5, r1, 0x2c /* 801A05D0 0019D530 90 61 00 80 */ stw r3, 0x80(r1) /* 801A05D4 0019D534 38 81 00 34 */ addi r4, r1, 0x34 @@ -2867,9 +2867,9 @@ lbl_801A063C: /* 801A06B0 0019D610 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801A06B4 0019D614 7D 89 03 A6 */ mtctr r12 /* 801A06B8 0019D618 4E 80 04 21 */ bctrl -/* 801A06BC 0019D61C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A06BC 0019D61C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A06C0 0019D620 7F E3 FB 78 */ mr r3, r31 -/* 801A06C4 0019D624 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801A06C4 0019D624 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801A06C8 0019D628 38 A1 00 14 */ addi r5, r1, 0x14 /* 801A06CC 0019D62C 38 81 00 1C */ addi r4, r1, 0x1c /* 801A06D0 0019D630 38 C1 00 0C */ addi r6, r1, 0xc @@ -3013,17 +3013,17 @@ lbl_801A08B4: lbl_801A08D0: /* 801A08D0 0019D830 C0 62 A7 98 */ lfs f3, lbl_805AC4B8@sda21(r2) lbl_801A08D4: -/* 801A08D4 0019D834 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801A08D4 0019D834 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801A08D8 0019D838 C0 1D 09 78 */ lfs f0, 0x978(r29) -/* 801A08DC 0019D83C 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 801A08DC 0019D83C 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 801A08E0 0019D840 C0 44 00 00 */ lfs f2, 0(r4) /* 801A08E4 0019D844 FC 1E 00 40 */ fcmpo cr0, f30, f0 /* 801A08E8 0019D848 C0 24 00 04 */ lfs f1, 4(r4) -/* 801A08EC 0019D84C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A08EC 0019D84C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A08F0 0019D850 C0 04 00 08 */ lfs f0, 8(r4) /* 801A08F4 0019D854 EC 43 00 B2 */ fmuls f2, f3, f2 /* 801A08F8 0019D858 EC 23 00 72 */ fmuls f1, f3, f1 -/* 801A08FC 0019D85C C7 63 66 A0 */ lfsu f27, skZero3f@l(r3) +/* 801A08FC 0019D85C C7 63 66 A0 */ lfsu f27, sZeroVector__9CVector3f@l(r3) /* 801A0900 0019D860 EC 03 00 32 */ fmuls f0, f3, f0 /* 801A0904 0019D864 EF 9F 00 B2 */ fmuls f28, f31, f2 /* 801A0908 0019D868 EF BF 00 72 */ fmuls f29, f31, f1 @@ -3884,10 +3884,10 @@ lbl_801A127C: /* 801A15B4 0019E514 48 17 31 45 */ bl CanBeNormalized__9CVector3fCFv /* 801A15B8 0019E518 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A15BC 0019E51C 41 82 00 BC */ beq lbl_801A1678 -/* 801A15C0 0019E520 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A15C4 0019E524 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 801A15C8 0019E528 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 801A15CC 0019E52C 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 801A15C0 0019E520 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A15C4 0019E524 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 801A15C8 0019E528 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 801A15CC 0019E52C 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 801A15D0 0019E530 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 801A15D4 0019E534 38 A1 01 10 */ addi r5, r1, 0x110 /* 801A15D8 0019E538 48 17 25 39 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -4249,8 +4249,8 @@ lbl_801A1A84: /* 801A1ADC 0019EA3C 38 61 00 10 */ addi r3, r1, 0x10 /* 801A1AE0 0019EA40 38 81 00 28 */ addi r4, r1, 0x28 /* 801A1AE4 0019EA44 48 17 2D 6D */ bl AsNormalized__9CVector3fCFv -/* 801A1AE8 0019EA48 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A1AEC 0019EA4C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801A1AE8 0019EA48 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A1AEC 0019EA4C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801A1AF0 0019EA50 C0 61 00 10 */ lfs f3, 0x10(r1) /* 801A1AF4 0019EA54 38 81 00 34 */ addi r4, r1, 0x34 /* 801A1AF8 0019EA58 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -4336,8 +4336,8 @@ lbl_801A1BF4: /* 801A1C0C 0019EB6C 48 00 00 EC */ b lbl_801A1CF8 lbl_801A1C10: /* 801A1C10 0019EB70 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 801A1C14 0019EB74 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A1C18 0019EB78 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -4604,8 +4604,8 @@ lbl_801A1FC0: /* 801A1FC8 0019EF28 38 61 00 08 */ addi r3, r1, 8 /* 801A1FCC 0019EF2C 38 9F 04 5C */ addi r4, r31, 0x45c /* 801A1FD0 0019EF30 4B F9 CB 4D */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 801A1FD4 0019EF34 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A1FD8 0019EF38 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A1FD4 0019EF34 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A1FD8 0019EF38 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A1FDC 0019EF3C C0 C1 00 08 */ lfs f6, 8(r1) /* 801A1FE0 0019EF40 38 81 00 5C */ addi r4, r1, 0x5c /* 801A1FE4 0019EF44 C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -4637,8 +4637,8 @@ lbl_801A2024: /* 801A2048 0019EFA8 C0 02 A7 CC */ lfs f0, lbl_805AC4EC@sda21(r2) /* 801A204C 0019EFAC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801A2050 0019EFB0 40 81 00 54 */ ble lbl_801A20A4 -/* 801A2054 0019EFB4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2058 0019EFB8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A2054 0019EFB4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2058 0019EFB8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A205C 0019EFBC C0 02 A7 60 */ lfs f0, lbl_805AC480@sda21(r2) /* 801A2060 0019EFC0 38 81 00 40 */ addi r4, r1, 0x40 /* 801A2064 0019EFC4 C0 43 00 04 */ lfs f2, 4(r3) @@ -4674,8 +4674,8 @@ lbl_801A20B0: /* 801A20D4 0019F034 48 00 00 EC */ b lbl_801A21C0 lbl_801A20D8: /* 801A20D8 0019F038 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 801A20DC 0019F03C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A20E0 0019F040 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -4795,8 +4795,8 @@ lbl_801A2280: /* 801A2290 0019F1F0 39 20 00 08 */ li r9, 8 lbl_801A2294: /* 801A2294 0019F1F4 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801A2298 0019F1F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A229C 0019F1FC C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801A22A4 0019F204 3C C0 80 3E */ lis r6, lbl_803DA9F0@ha /* 801A22A8 0019F208 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4966,8 +4966,8 @@ lbl_801A244C: /* 801A2518 0019F478 38 81 00 68 */ addi r4, r1, 0x68 /* 801A251C 0019F47C 48 17 23 35 */ bl AsNormalized__9CVector3fCFv /* 801A2520 0019F480 C0 01 00 34 */ lfs f0, 0x34(r1) -/* 801A2524 0019F484 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2528 0019F488 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A2524 0019F484 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2528 0019F488 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A252C 0019F48C 38 81 00 D4 */ addi r4, r1, 0xd4 /* 801A2530 0019F490 EC DF 00 32 */ fmuls f6, f31, f0 /* 801A2534 0019F494 C0 21 00 2C */ lfs f1, 0x2c(r1) @@ -4992,8 +4992,8 @@ lbl_801A244C: /* 801A2580 0019F4E0 4B F8 F1 99 */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd /* 801A2584 0019F4E4 48 00 01 E8 */ b lbl_801A276C lbl_801A2588: -/* 801A2588 0019F4E8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A258C 0019F4EC C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A2588 0019F4E8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A258C 0019F4EC C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A2590 0019F4F0 C0 C1 00 74 */ lfs f6, 0x74(r1) /* 801A2594 0019F4F4 38 81 00 B8 */ addi r4, r1, 0xb8 /* 801A2598 0019F4F8 C0 A1 00 78 */ lfs f5, 0x78(r1) @@ -5070,8 +5070,8 @@ lbl_801A25D8: /* 801A26B0 0019F610 38 81 00 50 */ addi r4, r1, 0x50 /* 801A26B4 0019F614 48 17 21 9D */ bl AsNormalized__9CVector3fCFv /* 801A26B8 0019F618 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 801A26BC 0019F61C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A26C0 0019F620 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A26BC 0019F61C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A26C0 0019F620 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A26C4 0019F624 38 81 00 9C */ addi r4, r1, 0x9c /* 801A26C8 0019F628 EC DF 00 32 */ fmuls f6, f31, f0 /* 801A26CC 0019F62C C0 21 00 08 */ lfs f1, 8(r1) @@ -5096,8 +5096,8 @@ lbl_801A25D8: /* 801A2718 0019F678 4B F8 F0 01 */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd /* 801A271C 0019F67C 48 00 00 50 */ b lbl_801A276C lbl_801A2720: -/* 801A2720 0019F680 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2724 0019F684 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801A2720 0019F680 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2724 0019F684 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801A2728 0019F688 C0 C1 00 5C */ lfs f6, 0x5c(r1) /* 801A272C 0019F68C 38 81 00 80 */ addi r4, r1, 0x80 /* 801A2730 0019F690 C0 A1 00 60 */ lfs f5, 0x60(r1) @@ -5331,8 +5331,8 @@ lbl_801A2A34: /* 801A2A90 0019F9F0 38 61 00 10 */ addi r3, r1, 0x10 /* 801A2A94 0019F9F4 38 81 00 34 */ addi r4, r1, 0x34 /* 801A2A98 0019F9F8 48 17 1D B9 */ bl AsNormalized__9CVector3fCFv -/* 801A2A9C 0019F9FC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2AA0 0019FA00 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801A2A9C 0019F9FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2AA0 0019FA00 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801A2AA4 0019FA04 C0 61 00 10 */ lfs f3, 0x10(r1) /* 801A2AA8 0019FA08 38 81 00 40 */ addi r4, r1, 0x40 /* 801A2AAC 0019FA0C C0 41 00 14 */ lfs f2, 0x14(r1) @@ -5510,8 +5510,8 @@ lbl_801A2C54: /* 801A2D30 0019FC90 38 61 00 1C */ addi r3, r1, 0x1c /* 801A2D34 0019FC94 38 81 00 34 */ addi r4, r1, 0x34 /* 801A2D38 0019FC98 48 17 1B 19 */ bl AsNormalized__9CVector3fCFv -/* 801A2D3C 0019FC9C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2D40 0019FCA0 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801A2D3C 0019FC9C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2D40 0019FCA0 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801A2D44 0019FCA4 C0 61 00 1C */ lfs f3, 0x1c(r1) /* 801A2D48 0019FCA8 38 81 00 5C */ addi r4, r1, 0x5c /* 801A2D4C 0019FCAC C0 41 00 20 */ lfs f2, 0x20(r1) @@ -5557,8 +5557,8 @@ lbl_801A2D8C: /* 801A2DE8 0019FD48 38 61 00 10 */ addi r3, r1, 0x10 /* 801A2DEC 0019FD4C 38 81 00 28 */ addi r4, r1, 0x28 /* 801A2DF0 0019FD50 48 17 1A 61 */ bl AsNormalized__9CVector3fCFv -/* 801A2DF4 0019FD54 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2DF8 0019FD58 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801A2DF4 0019FD54 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A2DF8 0019FD58 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801A2DFC 0019FD5C C0 61 00 10 */ lfs f3, 0x10(r1) /* 801A2E00 0019FD60 38 81 00 40 */ addi r4, r1, 0x40 /* 801A2E04 0019FD64 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -5662,8 +5662,8 @@ lbl_801A2F48: /* 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 -/* 801A2F64 0019FEC4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A2F68 0019FEC8 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801A2F70 0019FED0 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801A2F74 0019FED4 90 E1 00 08 */ stw r7, 8(r1) @@ -5960,8 +5960,8 @@ lbl_801A3350: /* 801A33A0 001A0300 39 00 00 02 */ li r8, 2 lbl_801A33A4: /* 801A33A4 001A0304 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801A33A8 001A0308 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A33AC 001A030C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 801A33B8 001A0318 C0 44 00 00 */ lfs f2, 0(r4) @@ -6085,9 +6085,9 @@ lbl_801A355C: /* 801A3578 001A04D8 EC 02 00 7A */ fmadds f0, f2, f1, f0 /* 801A357C 001A04DC D0 1E 09 54 */ stfs f0, 0x954(r30) lbl_801A3580: -/* 801A3580 001A04E0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A3580 001A04E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A3584 001A04E4 7F C3 F3 78 */ mr r3, r30 -/* 801A3588 001A04E8 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801A3588 001A04E8 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801A358C 001A04EC 7F E4 FB 78 */ mr r4, r31 /* 801A3590 001A04F0 4B FF C5 F9 */ bl sub_8019fb88 /* 801A3594 001A04F4 88 1E 0B 28 */ lbz r0, 0xb28(r30) @@ -7062,8 +7062,8 @@ GetAimPosition__12CIceSheegothCFRC13CStateManagerf: /* 801A430C 001A126C 4B EE D2 4D */ bl GetActiveVisor__12CPlayerStateCFRC13CStateManager /* 801A4310 001A1270 2C 03 00 03 */ cmpwi r3, 3 /* 801A4314 001A1274 40 82 00 E8 */ bne lbl_801A43FC -/* 801A4318 001A1278 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801A431C 001A127C C7 E3 66 A0 */ lfsu f31, skZero3f@l(r3) +/* 801A4318 001A1278 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801A431C 001A127C C7 E3 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r3) /* 801A4320 001A1280 3B 9E 0B 00 */ addi r28, r30, 0xb00 /* 801A4324 001A1284 C3 C3 00 04 */ lfs f30, 4(r3) /* 801A4328 001A1288 7F 9B E3 78 */ mr r27, r28 @@ -7343,9 +7343,9 @@ lbl_801A46F0: /* 801A4730 001A1690 D0 41 00 AC */ stfs f2, 0xac(r1) lbl_801A4734: /* 801A4734 001A1694 C0 41 01 58 */ lfs f2, 0x158(r1) -/* 801A4738 001A1698 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801A4738 001A1698 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801A473C 001A169C C0 21 01 68 */ lfs f1, 0x168(r1) -/* 801A4740 001A16A0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801A4740 001A16A0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801A4744 001A16A4 C0 01 01 78 */ lfs f0, 0x178(r1) /* 801A4748 001A16A8 38 61 00 BC */ addi r3, r1, 0xbc /* 801A474C 001A16AC D0 41 00 44 */ stfs f2, 0x44(r1) @@ -7836,8 +7836,8 @@ lbl_801A4E00: /* 801A4E08 001A1D68 38 00 00 00 */ li r0, 0 /* 801A4E0C 001A1D6C 98 01 00 3C */ stb r0, 0x3c(r1) lbl_801A4E10: -/* 801A4E10 001A1D70 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 801A4E14 001A1D74 C4 A3 67 54 */ lfsu f5, lbl_805A6754@l(r3) +/* 801A4E10 001A1D70 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 801A4E14 001A1D74 C4 A3 67 54 */ lfsu f5, mskInvertedBox__6CAABox@l(r3) /* 801A4E18 001A1D78 88 01 02 14 */ lbz r0, 0x214(r1) /* 801A4E1C 001A1D7C C0 83 00 04 */ lfs f4, 4(r3) /* 801A4E20 001A1D80 C0 63 00 08 */ lfs f3, 8(r3) @@ -8279,11 +8279,11 @@ lbl_801A5440: /* 801A5454 001A23B4 48 00 00 58 */ b lbl_801A54AC lbl_801A5458: /* 801A5458 001A23B8 81 9F 00 00 */ lwz r12, 0(r31) -/* 801A545C 001A23BC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801A545C 001A23BC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801A5460 001A23C0 7F E3 FB 78 */ mr r3, r31 /* 801A5464 001A23C4 C0 22 A7 5C */ lfs f1, lbl_805AC47C@sda21(r2) /* 801A5468 001A23C8 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 801A546C 001A23CC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801A546C 001A23CC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801A5470 001A23D0 7D 89 03 A6 */ mtctr r12 /* 801A5474 001A23D4 4E 80 04 21 */ bctrl /* 801A5478 001A23D8 7F E3 FB 78 */ mr r3, r31 @@ -9037,9 +9037,9 @@ lbl_801A5E20: /* 801A5F08 001A2E68 38 A0 00 01 */ li r5, 1 /* 801A5F0C 001A2E6C 48 02 2E 89 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 801A5F10 001A2E70 38 00 00 00 */ li r0, 0 -/* 801A5F14 001A2E74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801A5F14 001A2E74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801A5F18 001A2E78 90 1D 09 28 */ stw r0, 0x928(r29) -/* 801A5F1C 001A2E7C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801A5F1C 001A2E7C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801A5F20 001A2E80 3C 60 80 3D */ lis r3, lbl_803D13D8@ha /* 801A5F24 001A2E84 C0 42 A7 60 */ lfs f2, lbl_805AC480@sda21(r2) /* 801A5F28 001A2E88 C0 05 00 00 */ lfs f0, 0(r5) diff --git a/asm/MetroidPrime/Enemies/CKnockBackController.s b/asm/MetroidPrime/Enemies/CKnockBackController.s index 363f642d..0fce3b05 100644 --- a/asm/MetroidPrime/Enemies/CKnockBackController.s +++ b/asm/MetroidPrime/Enemies/CKnockBackController.s @@ -104,9 +104,9 @@ lbl_80232D44: /* 80232D68 0022FCC8 FF E0 08 90 */ fmr f31, f1 /* 80232D6C 0022FCCC 7F 63 DB 78 */ mr r3, r27 /* 80232D70 0022FCD0 48 0E 1B 49 */ bl Magnitude__9CVector3fCFv -/* 80232D74 0022FCD4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80232D74 0022FCD4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80232D78 0022FCD8 C0 DB 00 04 */ lfs f6, 4(r27) -/* 80232D7C 0022FCDC 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 80232D7C 0022FCDC 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 80232D80 0022FCE0 C0 9B 00 08 */ lfs f4, 8(r27) /* 80232D84 0022FCE4 C0 64 00 04 */ lfs f3, 4(r4) /* 80232D88 0022FCE8 38 61 00 68 */ addi r3, r1, 0x68 @@ -1307,7 +1307,7 @@ __ct__20CKnockBackController2F17EKnockBackVariant: /* 80233E18 00230D78 3C A0 80 3D */ lis r5, lbl_803D3490@ha /* 80233E1C 00230D7C 7C 7D 1B 78 */ mr r29, r3 /* 80233E20 00230D80 39 25 34 90 */ addi r9, r5, lbl_803D3490@l -/* 80233E24 00230D84 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80233E24 00230D84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80233E28 00230D88 90 9D 00 00 */ stw r4, 0(r29) /* 80233E2C 00230D8C 38 C0 FF FF */ li r6, -1 /* 80233E30 00230D90 80 89 00 00 */ lwz r4, 0(r9) @@ -1315,7 +1315,7 @@ __ct__20CKnockBackController2F17EKnockBackVariant: /* 80233E38 00230D98 80 E9 00 04 */ lwz r7, 4(r9) /* 80233E3C 00230D9C 38 00 00 04 */ li r0, 4 /* 80233E40 00230DA0 90 9D 00 04 */ stw r4, 4(r29) -/* 80233E44 00230DA4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80233E44 00230DA4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80233E48 00230DA8 81 09 00 08 */ lwz r8, 8(r9) /* 80233E4C 00230DAC 38 60 00 01 */ li r3, 1 /* 80233E50 00230DB0 90 FD 00 08 */ stw r7, 8(r29) diff --git a/asm/MetroidPrime/Enemies/CMagdolite.s b/asm/MetroidPrime/Enemies/CMagdolite.s index 24656caa..2a84b8dd 100644 --- a/asm/MetroidPrime/Enemies/CMagdolite.s +++ b/asm/MetroidPrime/Enemies/CMagdolite.s @@ -538,8 +538,8 @@ lbl_802348BC: /* 80234900 00231860 39 40 00 00 */ li r10, 0 /* 80234904 00231864 38 00 00 03 */ li r0, 3 /* 80234908 00231868 90 81 00 34 */ stw r4, 0x34(r1) -/* 8023490C 0023186C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80234910 00231870 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8023490C 0023186C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80234910 00231870 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80234914 00231874 38 A1 00 14 */ addi r5, r1, 0x14 /* 80234918 00231878 90 61 00 30 */ stw r3, 0x30(r1) /* 8023491C 0023187C 38 81 00 1C */ addi r4, r1, 0x1c @@ -726,10 +726,10 @@ sub_80234b20: /* 80234BB4 00231B14 B0 01 00 28 */ sth r0, 0x28(r1) /* 80234BB8 00231B18 4B DD 01 01 */ bl string_l__4rstlFPCc /* 80234BBC 00231B1C 38 01 00 28 */ addi r0, r1, 0x28 -/* 80234BC0 00231B20 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80234BC0 00231B20 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80234BC4 00231B24 90 01 00 08 */ stw r0, 8(r1) /* 80234BC8 00231B28 38 01 00 3C */ addi r0, r1, 0x3c -/* 80234BCC 00231B2C 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80234BCC 00231B2C 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80234BD0 00231B30 38 61 00 30 */ addi r3, r1, 0x30 /* 80234BD4 00231B34 90 01 00 0C */ stw r0, 0xc(r1) /* 80234BD8 00231B38 38 A0 00 00 */ li r5, 0 @@ -2224,8 +2224,8 @@ lbl_80236074: /* 80236108 00233068 38 61 00 10 */ addi r3, r1, 0x10 /* 8023610C 0023306C 38 81 00 34 */ addi r4, r1, 0x34 /* 80236110 00233070 48 0D E7 41 */ bl AsNormalized__9CVector3fCFv -/* 80236114 00233074 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80236118 00233078 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 80236114 00233074 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80236118 00233078 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8023611C 0023307C C0 61 00 10 */ lfs f3, 0x10(r1) /* 80236120 00233080 38 81 00 40 */ addi r4, r1, 0x40 /* 80236124 00233084 C0 41 00 14 */ lfs f2, 0x14(r1) @@ -3887,8 +3887,8 @@ lbl_802378D4: /* 80237958 002348B8 38 80 FF FF */ li r4, -1 /* 8023795C 002348BC 48 10 94 E5 */ bl __dt__6CTokenFv /* 80237960 002348C0 80 19 00 00 */ lwz r0, 0(r25) -/* 80237964 002348C4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80237968 002348C8 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 80237964 002348C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80237968 002348C8 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 8023796C 002348CC C0 02 B7 20 */ lfs f0, lbl_805AD440@sda21(r2) /* 80237970 002348D0 90 17 06 D4 */ stw r0, 0x6d4(r23) /* 80237974 002348D4 38 C0 00 00 */ li r6, 0 diff --git a/asm/MetroidPrime/Enemies/CMetaree.s b/asm/MetroidPrime/Enemies/CMetaree.s index 9a154be2..7bacc144 100644 --- a/asm/MetroidPrime/Enemies/CMetaree.s +++ b/asm/MetroidPrime/Enemies/CMetaree.s @@ -297,8 +297,8 @@ lbl_8014E210: /* 8014E220 0014B180 39 40 00 00 */ li r10, 0 /* 8014E224 0014B184 38 00 00 03 */ li r0, 3 /* 8014E228 0014B188 90 81 00 24 */ stw r4, 0x24(r1) -/* 8014E22C 0014B18C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8014E230 0014B190 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8014E22C 0014B18C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8014E230 0014B190 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8014E234 0014B194 38 A1 00 14 */ addi r5, r1, 0x14 /* 8014E238 0014B198 90 61 00 20 */ stw r3, 0x20(r1) /* 8014E23C 0014B19C 38 81 00 1C */ addi r4, r1, 0x1c @@ -568,9 +568,9 @@ lbl_8014E5A4: /* 8014E614 0014B574 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8014E618 0014B578 4B FC C6 89 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 8014E61C 0014B57C C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8014E620 0014B580 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8014E620 0014B580 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014E624 0014B584 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8014E628 0014B588 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8014E628 0014B588 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8014E62C 0014B58C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8014E630 0014B590 38 61 00 08 */ addi r3, r1, 8 /* 8014E634 0014B594 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -607,9 +607,9 @@ lbl_8014E688: lbl_8014E6AC: /* 8014E6AC 0014B60C 7F E3 FB 78 */ mr r3, r31 /* 8014E6B0 0014B610 4B FC CC C9 */ bl Stop__13CPhysicsActorFv -/* 8014E6B4 0014B614 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014E6B4 0014B614 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014E6B8 0014B618 7F E3 FB 78 */ mr r3, r31 -/* 8014E6BC 0014B61C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8014E6BC 0014B61C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014E6C0 0014B620 4B FC C5 E1 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f lbl_8014E6C4: /* 8014E6C4 0014B624 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 @@ -639,12 +639,12 @@ Halt__8CMetareeFR13CStateManager9EStateMsgf: /* 8014E718 0014B678 48 00 00 E0 */ b lbl_8014E7F8 lbl_8014E71C: /* 8014E71C 0014B67C 4B FC CC 5D */ bl Stop__13CPhysicsActorFv -/* 8014E720 0014B680 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014E720 0014B680 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014E724 0014B684 7F C3 F3 78 */ mr r3, r30 -/* 8014E728 0014B688 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8014E728 0014B688 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014E72C 0014B68C 4B FC C5 75 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 8014E730 0014B690 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8014E734 0014B694 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8014E730 0014B690 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8014E734 0014B694 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8014E738 0014B698 38 80 00 02 */ li r4, 2 /* 8014E73C 0014B69C D0 1E 01 50 */ stfs f0, 0x150(r30) /* 8014E740 0014B6A0 C0 03 00 04 */ lfs f0, 4(r3) @@ -654,8 +654,8 @@ lbl_8014E71C: /* 8014E750 0014B6B0 80 7E 04 50 */ lwz r3, 0x450(r30) /* 8014E754 0014B6B4 4B FE C2 85 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType /* 8014E758 0014B6B8 80 9F 08 4C */ lwz r4, 0x84c(r31) -/* 8014E75C 0014B6BC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8014E760 0014B6C0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8014E75C 0014B6BC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8014E760 0014B6C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8014E764 0014B6C4 C0 1E 05 74 */ lfs f0, 0x574(r30) /* 8014E768 0014B6C8 C0 24 00 40 */ lfs f1, 0x40(r4) /* 8014E76C 0014B6CC 38 61 00 14 */ addi r3, r1, 0x14 @@ -828,8 +828,8 @@ lbl_8014E988: /* 8014E9EC 0014B94C D0 03 00 24 */ stfs f0, 0x24(r3) /* 8014E9F0 0014B950 48 00 00 20 */ b lbl_8014EA10 lbl_8014E9F4: -/* 8014E9F4 0014B954 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8014E9F8 0014B958 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8014E9F4 0014B954 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8014E9F8 0014B958 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8014E9FC 0014B95C D0 1F 01 50 */ stfs f0, 0x150(r31) /* 8014EA00 0014B960 C0 03 00 04 */ lfs f0, 4(r3) /* 8014EA04 0014B964 D0 1F 01 54 */ stfs f0, 0x154(r31) @@ -1141,11 +1141,11 @@ Accept__8CMetareeFR8IVisitor: /* 8014EE28 0014BD88 38 80 00 12 */ li r4, 0x12 /* 8014EE2C 0014BD8C 4B F2 E6 25 */ bl "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi" /* 8014EE30 0014BD90 3C 80 80 3E */ lis r4, lbl_803E2878@ha -/* 8014EE34 0014BD94 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8014EE34 0014BD94 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014EE38 0014BD98 38 04 28 78 */ addi r0, r4, lbl_803E2878@l /* 8014EE3C 0014BD9C C0 02 9D 8C */ lfs f0, lbl_805ABAAC@sda21(r2) /* 8014EE40 0014BDA0 90 1F 00 00 */ stw r0, 0(r31) -/* 8014EE44 0014BDA4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8014EE44 0014BDA4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8014EE48 0014BDA8 38 C0 00 00 */ li r6, 0 /* 8014EE4C 0014BDAC 38 00 02 25 */ li r0, 0x225 /* 8014EE50 0014BDB0 D3 DF 05 68 */ stfs f30, 0x568(r31) diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index 520c738c..e8db816e 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -1214,15 +1214,15 @@ lbl_8016AACC: /* 8016AB50 00167AB0 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 8016AB54 00167AB4 38 81 02 68 */ addi r4, r1, 0x268 /* 8016AB58 00167AB8 48 1A 54 CD */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 8016AB5C 00167ABC 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8016AB5C 00167ABC 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8016AB60 00167AC0 38 61 01 CC */ addi r3, r1, 0x1cc -/* 8016AB64 00167AC4 38 A4 67 24 */ addi r5, r4, lbl_805A6724@l +/* 8016AB64 00167AC4 38 A4 67 24 */ addi r5, r4, sForwardVector__9CVector3f@l /* 8016AB68 00167AC8 38 81 02 B0 */ addi r4, r1, 0x2b0 /* 8016AB6C 00167ACC 48 1A 57 29 */ bl __ml__9CMatrix3fCFRC9CVector3f /* 8016AB70 00167AD0 C0 62 A0 98 */ lfs f3, lbl_805ABDB8@sda21(r2) -/* 8016AB74 00167AD4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8016AB74 00167AD4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8016AB78 00167AD8 C0 41 01 CC */ lfs f2, 0x1cc(r1) -/* 8016AB7C 00167ADC 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 8016AB7C 00167ADC 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 8016AB80 00167AE0 C0 21 01 D0 */ lfs f1, 0x1d0(r1) /* 8016AB84 00167AE4 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 8016AB88 00167AE8 C0 01 01 D4 */ lfs f0, 0x1d4(r1) @@ -1473,15 +1473,15 @@ lbl_8016AEBC: /* 8016AF4C 00167EAC 38 61 02 8C */ addi r3, r1, 0x28c /* 8016AF50 00167EB0 38 81 02 44 */ addi r4, r1, 0x244 /* 8016AF54 00167EB4 48 1A 50 D1 */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 8016AF58 00167EB8 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8016AF58 00167EB8 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8016AF5C 00167EBC 38 61 01 24 */ addi r3, r1, 0x124 -/* 8016AF60 00167EC0 38 A4 67 24 */ addi r5, r4, lbl_805A6724@l +/* 8016AF60 00167EC0 38 A4 67 24 */ addi r5, r4, sForwardVector__9CVector3f@l /* 8016AF64 00167EC4 38 81 02 8C */ addi r4, r1, 0x28c /* 8016AF68 00167EC8 48 1A 53 2D */ bl __ml__9CMatrix3fCFRC9CVector3f /* 8016AF6C 00167ECC C0 62 A0 98 */ lfs f3, lbl_805ABDB8@sda21(r2) -/* 8016AF70 00167ED0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8016AF70 00167ED0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8016AF74 00167ED4 C0 41 01 24 */ lfs f2, 0x124(r1) -/* 8016AF78 00167ED8 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 8016AF78 00167ED8 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 8016AF7C 00167EDC C0 21 01 28 */ lfs f1, 0x128(r1) /* 8016AF80 00167EE0 38 61 01 18 */ addi r3, r1, 0x118 /* 8016AF84 00167EE4 C0 01 01 2C */ lfs f0, 0x12c(r1) @@ -1549,9 +1549,9 @@ lbl_8016B078: /* 8016B078 00167FD8 80 7F 07 68 */ lwz r3, 0x768(r31) /* 8016B07C 00167FDC 4B F8 DD 89 */ bl GetBallRadius__10CMorphBallCFv /* 8016B080 00167FE0 C0 62 A0 84 */ lfs f3, lbl_805ABDA4@sda21(r2) -/* 8016B084 00167FE4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8016B084 00167FE4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8016B088 00167FE8 C0 42 A0 AC */ lfs f2, lbl_805ABDCC@sda21(r2) -/* 8016B08C 00167FEC C4 03 66 F4 */ lfsu f0, lbl_805A66F4@l(r3) +/* 8016B08C 00167FEC C4 03 66 F4 */ lfsu f0, sUpVector__9CVector3f@l(r3) /* 8016B090 00167FF0 EC 83 10 7A */ fmadds f4, f3, f1, f2 /* 8016B094 00167FF4 C0 3D 00 00 */ lfs f1, 0(r29) /* 8016B098 00167FF8 C0 63 00 04 */ lfs f3, 4(r3) @@ -2300,11 +2300,11 @@ sub_8016bb6c: /* 8016BB78 00168AD8 DB E1 00 C0 */ stfd f31, 0xc0(r1) /* 8016BB7C 00168ADC F3 E1 00 C8 */ psq_st f31, 200(r1), 0, qr0 /* 8016BB80 00168AE0 93 E1 00 BC */ stw r31, 0xbc(r1) -/* 8016BB84 00168AE4 3C C0 80 5A */ lis r6, skZero3f@ha +/* 8016BB84 00168AE4 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 8016BB88 00168AE8 3C A0 80 5A */ lis r5, lbl_805A6660@ha /* 8016BB8C 00168AEC 38 E5 66 60 */ addi r7, r5, lbl_805A6660@l /* 8016BB90 00168AF0 FF E0 08 90 */ fmr f31, f1 -/* 8016BB94 00168AF4 38 A6 66 A0 */ addi r5, r6, skZero3f@l +/* 8016BB94 00168AF4 38 A6 66 A0 */ addi r5, r6, sZeroVector__9CVector3f@l /* 8016BB98 00168AF8 C0 67 00 00 */ lfs f3, 0(r7) /* 8016BB9C 00168AFC C0 C5 00 00 */ lfs f6, 0(r5) /* 8016BBA0 00168B00 7C 7F 1B 78 */ mr r31, r3 @@ -2518,8 +2518,8 @@ lbl_8016BDD0: /* 8016BEC4 00168E24 39 40 00 00 */ li r10, 0 /* 8016BEC8 00168E28 38 00 00 03 */ li r0, 3 /* 8016BECC 00168E2C 90 81 00 EC */ stw r4, 0xec(r1) -/* 8016BED0 00168E30 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8016BED4 00168E34 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8016BED0 00168E30 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8016BED4 00168E34 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8016BED8 00168E38 38 A1 00 2C */ addi r5, r1, 0x2c /* 8016BEDC 00168E3C 90 61 00 E8 */ stw r3, 0xe8(r1) /* 8016BEE0 00168E40 38 81 00 34 */ addi r4, r1, 0x34 @@ -2583,8 +2583,8 @@ lbl_8016BF50: /* 8016BFC4 00168F24 39 40 00 00 */ li r10, 0 /* 8016BFC8 00168F28 38 00 00 03 */ li r0, 3 /* 8016BFCC 00168F2C 90 81 00 D4 */ stw r4, 0xd4(r1) -/* 8016BFD0 00168F30 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8016BFD4 00168F34 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8016BFD0 00168F30 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8016BFD4 00168F34 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8016BFD8 00168F38 38 A1 00 18 */ addi r5, r1, 0x18 /* 8016BFDC 00168F3C 90 61 00 D0 */ stw r3, 0xd0(r1) /* 8016BFE0 00168F40 38 81 00 20 */ addi r4, r1, 0x20 @@ -2617,11 +2617,11 @@ lbl_8016C024: /* 8016C048 00168FA8 48 00 00 24 */ b lbl_8016C06C lbl_8016C04C: /* 8016C04C 00168FAC 81 9D 00 00 */ lwz r12, 0(r29) -/* 8016C050 00168FB0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8016C050 00168FB0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8016C054 00168FB4 7F A3 EB 78 */ mr r3, r29 /* 8016C058 00168FB8 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016C05C 00168FBC 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 8016C060 00168FC0 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8016C060 00168FC0 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8016C064 00168FC4 7D 89 03 A6 */ mtctr r12 /* 8016C068 00168FC8 4E 80 04 21 */ bctrl lbl_8016C06C: @@ -3605,10 +3605,10 @@ lbl_8016CE60: sub_8016cebc: /* 8016CEBC 00169E1C 94 21 FE B0 */ stwu r1, -0x150(r1) /* 8016CEC0 00169E20 7C 08 02 A6 */ mflr r0 -/* 8016CEC4 00169E24 3C C0 80 5A */ lis r6, lbl_805A6724@ha -/* 8016CEC8 00169E28 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 8016CEC4 00169E24 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha +/* 8016CEC8 00169E28 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 8016CECC 00169E2C 90 01 01 54 */ stw r0, 0x154(r1) -/* 8016CED0 00169E30 38 05 66 70 */ addi r0, r5, skIdentity4f@l +/* 8016CED0 00169E30 38 05 66 70 */ addi r0, r5, sIdentity__12CTransform4f@l /* 8016CED4 00169E34 93 E1 01 4C */ stw r31, 0x14c(r1) /* 8016CED8 00169E38 3B E0 00 00 */ li r31, 0 /* 8016CEDC 00169E3C 93 C1 01 48 */ stw r30, 0x148(r1) @@ -3618,7 +3618,7 @@ sub_8016cebc: /* 8016CEEC 00169E4C 7C 7D 1B 78 */ mr r29, r3 /* 8016CEF0 00169E50 38 61 01 08 */ addi r3, r1, 0x108 /* 8016CEF4 00169E54 93 81 01 40 */ stw r28, 0x140(r1) -/* 8016CEF8 00169E58 C4 46 67 24 */ lfsu f2, lbl_805A6724@l(r6) +/* 8016CEF8 00169E58 C4 46 67 24 */ lfsu f2, sForwardVector__9CVector3f@l(r6) /* 8016CEFC 00169E5C C0 26 00 04 */ lfs f1, 4(r6) /* 8016CF00 00169E60 C0 06 00 08 */ lfs f0, 8(r6) /* 8016CF04 00169E64 D0 41 00 84 */ stfs f2, 0x84(r1) @@ -3680,9 +3680,9 @@ lbl_8016CF78: /* 8016CFE0 00169F40 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8016CFE4 00169F44 38 81 00 C0 */ addi r4, r1, 0xc0 /* 8016CFE8 00169F48 48 1A 30 3D */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 8016CFEC 00169F4C 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8016CFEC 00169F4C 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8016CFF0 00169F50 38 61 00 38 */ addi r3, r1, 0x38 -/* 8016CFF4 00169F54 38 A4 67 24 */ addi r5, r4, lbl_805A6724@l +/* 8016CFF4 00169F54 38 A4 67 24 */ addi r5, r4, sForwardVector__9CVector3f@l /* 8016CFF8 00169F58 38 81 00 E4 */ addi r4, r1, 0xe4 /* 8016CFFC 00169F5C 48 1A 32 99 */ bl __ml__9CMatrix3fCFRC9CVector3f /* 8016D000 00169F60 C0 41 00 38 */ lfs f2, 0x38(r1) @@ -4107,8 +4107,8 @@ sub_8016d57c: /* 8016D624 0016A584 EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 8016D628 0016A588 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016D62C 0016A58C 40 81 00 44 */ ble lbl_8016D670 -/* 8016D630 0016A590 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016D634 0016A594 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8016D630 0016A590 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016D634 0016A594 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8016D638 0016A598 C0 02 A0 D8 */ lfs f0, lbl_805ABDF8@sda21(r2) /* 8016D63C 0016A59C 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8016D640 0016A5A0 D0 41 00 C8 */ stfs f2, 0xc8(r1) @@ -4141,8 +4141,8 @@ lbl_8016D670: /* 8016D6A8 0016A608 38 9F 04 5C */ addi r4, r31, 0x45c /* 8016D6AC 0016A60C 38 E7 01 38 */ addi r7, r7, 0x138 /* 8016D6B0 0016A610 4B FD 13 6D */ bl Pursuit__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3fRC9CVector3f -/* 8016D6B4 0016A614 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016D6B8 0016A618 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8016D6B4 0016A614 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016D6B8 0016A618 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8016D6BC 0016A61C C0 C1 00 38 */ lfs f6, 0x38(r1) /* 8016D6C0 0016A620 38 81 00 AC */ addi r4, r1, 0xac /* 8016D6C4 0016A624 C0 A1 00 3C */ lfs f5, 0x3c(r1) @@ -4167,8 +4167,8 @@ lbl_8016D704: /* 8016D70C 0016A66C 38 61 00 2C */ addi r3, r1, 0x2c /* 8016D710 0016A670 38 9F 04 5C */ addi r4, r31, 0x45c /* 8016D714 0016A674 4B FD 15 0D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 8016D718 0016A678 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016D71C 0016A67C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8016D718 0016A678 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016D71C 0016A67C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8016D720 0016A680 C0 C1 00 2C */ lfs f6, 0x2c(r1) /* 8016D724 0016A684 38 81 00 90 */ addi r4, r1, 0x90 /* 8016D728 0016A688 C0 A1 00 30 */ lfs f5, 0x30(r1) @@ -4229,8 +4229,8 @@ lbl_8016D768: /* 8016D800 0016A760 38 61 00 20 */ addi r3, r1, 0x20 /* 8016D804 0016A764 38 81 00 5C */ addi r4, r1, 0x5c /* 8016D808 0016A768 48 1A 70 49 */ bl AsNormalized__9CVector3fCFv -/* 8016D80C 0016A76C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016D810 0016A770 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8016D80C 0016A76C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016D810 0016A770 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8016D814 0016A774 C0 61 00 20 */ lfs f3, 0x20(r1) /* 8016D818 0016A778 38 81 00 74 */ addi r4, r1, 0x74 /* 8016D81C 0016A77C C0 41 00 24 */ lfs f2, 0x24(r1) @@ -4283,9 +4283,9 @@ sub_8016d874: /* 8016D8C8 0016A828 28 00 00 00 */ cmplwi r0, 0 /* 8016D8CC 0016A82C 41 82 01 28 */ beq lbl_8016D9F4 /* 8016D8D0 0016A830 C0 02 A0 84 */ lfs f0, lbl_805ABDA4@sda21(r2) -/* 8016D8D4 0016A834 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8016D8D4 0016A834 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016D8D8 0016A838 83 BC 08 38 */ lwz r29, 0x838(r28) -/* 8016D8DC 0016A83C 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8016D8DC 0016A83C 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8016D8E0 0016A840 EF E0 07 F2 */ fmuls f31, f0, f31 /* 8016D8E4 0016A844 AB 9D 20 08 */ lha r28, 0x2008(r29) /* 8016D8E8 0016A848 48 00 01 04 */ b lbl_8016D9EC @@ -4333,11 +4333,11 @@ lbl_8016D984: lbl_8016D988: /* 8016D988 0016A8E8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8016D98C 0016A8EC 41 82 00 44 */ beq lbl_8016D9D0 -/* 8016D990 0016A8F0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8016D990 0016A8F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016D994 0016A8F4 C0 5E 00 04 */ lfs f2, 4(r30) /* 8016D998 0016A8F8 C0 3E 00 08 */ lfs f1, 8(r30) /* 8016D99C 0016A8FC 38 81 00 34 */ addi r4, r1, 0x34 -/* 8016D9A0 0016A900 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8016D9A0 0016A900 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8016D9A4 0016A904 C0 02 A0 98 */ lfs f0, lbl_805ABDB8@sda21(r2) /* 8016D9A8 0016A908 D0 C1 00 34 */ stfs f6, 0x34(r1) /* 8016D9AC 0016A90C D0 81 00 38 */ stfs f4, 0x38(r1) @@ -4414,8 +4414,8 @@ sub_8016da1c: /* 8016DAAC 0016AA0C 48 00 00 AC */ b lbl_8016DB58 lbl_8016DAB0: /* 8016DAB0 0016AA10 80 BF 08 4C */ lwz r5, 0x84c(r31) -/* 8016DAB4 0016AA14 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016DAB8 0016AA18 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8016DAB4 0016AA14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016DAB8 0016AA18 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 8016DABC 0016AA1C 39 20 FF FF */ li r9, -1 /* 8016DAC0 0016AA20 C0 85 00 60 */ lfs f4, 0x60(r5) /* 8016DAC4 0016AA24 38 00 00 00 */ li r0, 0 @@ -4591,9 +4591,9 @@ sub_8016dd08: /* 8016DD54 0016ACB4 D0 01 00 08 */ stfs f0, 8(r1) /* 8016DD58 0016ACB8 4B E9 E5 5D */ bl "Clamp__5CMathFRCfRCfRCf" /* 8016DD5C 0016ACBC C0 43 00 00 */ lfs f2, 0(r3) -/* 8016DD60 0016ACC0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8016DD60 0016ACC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016DD64 0016ACC4 C0 1F 07 EC */ lfs f0, 0x7ec(r31) -/* 8016DD68 0016ACC8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8016DD68 0016ACC8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8016DD6C 0016ACCC 7F E3 FB 78 */ mr r3, r31 /* 8016DD70 0016ACD0 C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) /* 8016DD74 0016ACD4 EC 02 07 FA */ fmadds f0, f2, f31, f0 @@ -4683,8 +4683,8 @@ sub_8016ddb0: /* 8016DEB8 0016AE18 39 40 00 00 */ li r10, 0 /* 8016DEBC 0016AE1C 38 00 00 03 */ li r0, 3 /* 8016DEC0 0016AE20 90 81 00 3C */ stw r4, 0x3c(r1) -/* 8016DEC4 0016AE24 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8016DEC8 0016AE28 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8016DEC4 0016AE24 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8016DEC8 0016AE28 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8016DECC 0016AE2C 38 A1 00 10 */ addi r5, r1, 0x10 /* 8016DED0 0016AE30 90 61 00 38 */ stw r3, 0x38(r1) /* 8016DED4 0016AE34 38 81 00 18 */ addi r4, r1, 0x18 @@ -5079,12 +5079,12 @@ lbl_8016E430: /* 8016E434 0016B394 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8016E438 0016B398 41 82 01 54 */ beq lbl_8016E58C /* 8016E43C 0016B39C 38 80 00 01 */ li r4, 1 -/* 8016E440 0016B3A0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8016E440 0016B3A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016E444 0016B3A4 90 9F 05 68 */ stw r4, 0x568(r31) /* 8016E448 0016B3A8 88 1F 09 BF */ lbz r0, 0x9bf(r31) /* 8016E44C 0016B3AC 50 80 0F BC */ rlwimi r0, r4, 1, 0x1e, 0x1e /* 8016E450 0016B3B0 98 1F 09 BF */ stb r0, 0x9bf(r31) -/* 8016E454 0016B3B4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8016E454 0016B3B4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8016E458 0016B3B8 D0 1F 08 0C */ stfs f0, 0x80c(r31) /* 8016E45C 0016B3BC C0 03 00 04 */ lfs f0, 4(r3) /* 8016E460 0016B3C0 D0 1F 08 10 */ stfs f0, 0x810(r31) @@ -5105,8 +5105,8 @@ lbl_8016E48C: /* 8016E494 0016B3F4 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 8016E4A4 0016B404 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8016E4A0 0016B400 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8016E4A4 0016B404 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8016E4A8 0016B408 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 8016E4AC 0016B40C 7C 60 1B 78 */ mr r0, r3 /* 8016E4B0 0016B410 39 00 00 0E */ li r8, 0xe @@ -5315,8 +5315,8 @@ lbl_8016E724: /* 8016E7A0 0016B700 38 61 00 38 */ addi r3, r1, 0x38 /* 8016E7A4 0016B704 38 81 00 5C */ addi r4, r1, 0x5c /* 8016E7A8 0016B708 48 1A 60 A9 */ bl AsNormalized__9CVector3fCFv -/* 8016E7AC 0016B70C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016E7B0 0016B710 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8016E7AC 0016B70C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016E7B0 0016B710 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8016E7B4 0016B714 C0 61 00 38 */ lfs f3, 0x38(r1) /* 8016E7B8 0016B718 38 81 00 90 */ addi r4, r1, 0x90 /* 8016E7BC 0016B71C C0 41 00 3C */ lfs f2, 0x3c(r1) @@ -5354,8 +5354,8 @@ lbl_8016E7FC: /* 8016E838 0016B798 D0 21 00 54 */ stfs f1, 0x54(r1) /* 8016E83C 0016B79C D0 01 00 58 */ stfs f0, 0x58(r1) /* 8016E840 0016B7A0 4B FD 03 E1 */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 8016E844 0016B7A4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016E848 0016B7A8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8016E844 0016B7A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016E848 0016B7A8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8016E84C 0016B7AC C0 C1 00 20 */ lfs f6, 0x20(r1) /* 8016E850 0016B7B0 38 81 00 74 */ addi r4, r1, 0x74 /* 8016E854 0016B7B4 C0 A1 00 24 */ lfs f5, 0x24(r1) @@ -5725,8 +5725,8 @@ lbl_8016ED08: /* 8016EDA8 0016BD08 38 61 00 14 */ addi r3, r1, 0x14 /* 8016EDAC 0016BD0C 38 81 00 20 */ addi r4, r1, 0x20 /* 8016EDB0 0016BD10 48 1A 5A A1 */ bl AsNormalized__9CVector3fCFv -/* 8016EDB4 0016BD14 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016EDB8 0016BD18 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8016EDB4 0016BD14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8016EDB8 0016BD18 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8016EDBC 0016BD1C C0 61 00 14 */ lfs f3, 0x14(r1) /* 8016EDC0 0016BD20 38 81 00 2C */ addi r4, r1, 0x2c /* 8016EDC4 0016BD24 C0 41 00 18 */ lfs f2, 0x18(r1) @@ -5848,9 +5848,9 @@ lbl_8016EF68: /* 8016EF70 0016BED0 38 61 00 28 */ addi r3, r1, 0x28 /* 8016EF74 0016BED4 4B FF F0 49 */ bl sub_8016dfbc /* 8016EF78 0016BED8 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 8016EF7C 0016BEDC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8016EF7C 0016BEDC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8016EF80 0016BEE0 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8016EF84 0016BEE4 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 8016EF84 0016BEE4 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 8016EF88 0016BEE8 C0 01 00 30 */ lfs f0, 0x30(r1) /* 8016EF8C 0016BEEC 39 00 FF FF */ li r8, -1 /* 8016EF90 0016BEF0 D0 41 00 34 */ stfs f2, 0x34(r1) @@ -6132,8 +6132,8 @@ lbl_8016F378: /* 8016F390 0016C2F0 48 00 01 60 */ b lbl_8016F4F0 lbl_8016F394: /* 8016F394 0016C2F4 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8016F398 0016C2F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016F39C 0016C2FC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -6328,8 +6328,8 @@ lbl_8016F64C: /* 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 -/* 8016F66C 0016C5CC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016F670 0016C5D0 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 8016F678 0016C5D8 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8016F67C 0016C5DC 80 81 00 4C */ lwz r4, 0x4c(r1) @@ -6381,8 +6381,8 @@ lbl_8016F64C: /* 8016F734 0016C694 48 00 02 C4 */ b lbl_8016F9F8 lbl_8016F738: /* 8016F738 0016C698 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8016F73C 0016C69C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8016F740 0016C6A0 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 8016F748 0016C6A8 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8016F74C 0016C6AC 80 81 00 2C */ lwz r4, 0x2c(r1) @@ -9198,9 +9198,9 @@ lbl_80171E4C: /* 80171F18 0016EE78 90 1A 05 68 */ stw r0, 0x568(r26) /* 80171F1C 0016EE7C 4B FF 99 15 */ bl sub_8016b830 /* 80171F20 0016EE80 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 80171F24 0016EE84 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80171F24 0016EE84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80171F28 0016EE88 C0 02 A1 08 */ lfs f0, lbl_805ABE28@sda21(r2) -/* 80171F2C 0016EE8C 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 80171F2C 0016EE8C 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 80171F30 0016EE90 B0 1A 06 98 */ sth r0, 0x698(r26) /* 80171F34 0016EE94 3B 3A 06 A0 */ addi r25, r26, 0x6a0 /* 80171F38 0016EE98 38 9A 00 68 */ addi r4, r26, 0x68 @@ -9231,9 +9231,9 @@ lbl_80171E4C: /* 80171F9C 0016EEFC D3 99 00 1C */ stfs f28, 0x1c(r25) /* 80171FA0 0016EF00 80 DC 01 0C */ lwz r6, 0x10c(r28) /* 80171FA4 0016EF04 48 05 6D F1 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff -/* 80171FA8 0016EF08 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80171FA8 0016EF08 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80171FAC 0016EF0C C0 22 A0 80 */ lfs f1, lbl_805ABDA0@sda21(r2) -/* 80171FB0 0016EF10 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 80171FB0 0016EF10 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80171FB4 0016EF14 38 7B FF FE */ addi r3, r27, -2 /* 80171FB8 0016EF18 C0 08 00 00 */ lfs f0, 0(r8) /* 80171FBC 0016EF1C 20 1B 00 02 */ subfic r0, r27, 2 diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index 1a69f18c..602f1746 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -470,8 +470,8 @@ sub_801c0e08: /* 801C0E78 001BDDD8 38 61 00 08 */ addi r3, r1, 8 /* 801C0E7C 001BDDDC 38 81 00 14 */ addi r4, r1, 0x14 /* 801C0E80 001BDDE0 48 15 39 D1 */ bl AsNormalized__9CVector3fCFv -/* 801C0E84 001BDDE4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C0E88 001BDDE8 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801C0E84 001BDDE4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C0E88 001BDDE8 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801C0E8C 001BDDEC C0 61 00 08 */ lfs f3, 8(r1) /* 801C0E90 001BDDF0 38 81 00 20 */ addi r4, r1, 0x20 /* 801C0E94 001BDDF4 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -543,8 +543,8 @@ sub_801c0ee4: /* 801C0F8C 001BDEEC EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 801C0F90 001BDEF0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801C0F94 001BDEF4 40 81 00 44 */ ble lbl_801C0FD8 -/* 801C0F98 001BDEF8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C0F9C 001BDEFC C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C0F98 001BDEF8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C0F9C 001BDEFC C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C0FA0 001BDF00 C0 02 AA B4 */ lfs f0, lbl_805AC7D4@sda21(r2) /* 801C0FA4 001BDF04 38 81 00 88 */ addi r4, r1, 0x88 /* 801C0FA8 001BDF08 D0 41 00 88 */ stfs f2, 0x88(r1) @@ -565,8 +565,8 @@ lbl_801C0FD8: /* 801C0FE0 001BDF40 38 61 00 14 */ addi r3, r1, 0x14 /* 801C0FE4 001BDF44 38 9D 04 5C */ addi r4, r29, 0x45c /* 801C0FE8 001BDF48 4B F7 DC 39 */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 801C0FEC 001BDF4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C0FF0 001BDF50 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C0FEC 001BDF4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C0FF0 001BDF50 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C0FF4 001BDF54 C0 C1 00 14 */ lfs f6, 0x14(r1) /* 801C0FF8 001BDF58 38 81 00 6C */ addi r4, r1, 0x6c /* 801C0FFC 001BDF5C C0 A1 00 18 */ lfs f5, 0x18(r1) @@ -613,8 +613,8 @@ lbl_801C103C: /* 801C109C 001BDFFC 38 61 00 08 */ addi r3, r1, 8 /* 801C10A0 001BE000 38 81 00 38 */ addi r4, r1, 0x38 /* 801C10A4 001BE004 48 15 37 AD */ bl AsNormalized__9CVector3fCFv -/* 801C10A8 001BE008 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C10AC 001BE00C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801C10A8 001BE008 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C10AC 001BE00C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801C10B0 001BE010 C0 61 00 08 */ lfs f3, 8(r1) /* 801C10B4 001BE014 38 81 00 50 */ addi r4, r1, 0x50 /* 801C10B8 001BE018 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -652,8 +652,8 @@ sub_801c1110: /* 801C1128 001BE088 93 A1 00 54 */ stw r29, 0x54(r1) /* 801C112C 001BE08C 93 81 00 50 */ stw r28, 0x50(r1) /* 801C1130 001BE090 83 A4 08 38 */ lwz r29, 0x838(r4) -/* 801C1134 001BE094 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C1138 001BE098 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 801C1134 001BE094 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C1138 001BE098 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 801C113C 001BE09C AB 9D 20 08 */ lha r28, 0x2008(r29) /* 801C1140 001BE0A0 48 00 01 04 */ b lbl_801C1244 lbl_801C1144: @@ -700,11 +700,11 @@ lbl_801C11DC: lbl_801C11E0: /* 801C11E0 001BE140 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 801C11E4 001BE144 41 82 00 44 */ beq lbl_801C1228 -/* 801C11E8 001BE148 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801C11E8 001BE148 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801C11EC 001BE14C C0 5E 00 04 */ lfs f2, 4(r30) /* 801C11F0 001BE150 C0 3E 00 08 */ lfs f1, 8(r30) /* 801C11F4 001BE154 38 81 00 28 */ addi r4, r1, 0x28 -/* 801C11F8 001BE158 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 801C11F8 001BE158 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 801C11FC 001BE15C C0 02 AA A4 */ lfs f0, lbl_805AC7C4@sda21(r2) /* 801C1200 001BE160 D0 C1 00 28 */ stfs f6, 0x28(r1) /* 801C1204 001BE164 D0 81 00 2C */ stfs f4, 0x2c(r1) @@ -921,9 +921,9 @@ sub_801c14b4: /* 801C1500 001BE460 D0 01 00 08 */ stfs f0, 8(r1) /* 801C1504 001BE464 4B E4 AD B1 */ bl "Clamp__5CMathFRCfRCfRCf" /* 801C1508 001BE468 C0 43 00 00 */ lfs f2, 0(r3) -/* 801C150C 001BE46C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801C150C 001BE46C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801C1510 001BE470 C0 1F 07 D0 */ lfs f0, 0x7d0(r31) -/* 801C1514 001BE474 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801C1514 001BE474 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801C1518 001BE478 7F E3 FB 78 */ mr r3, r31 /* 801C151C 001BE47C C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C1520 001BE480 EC 02 07 FA */ fmadds f0, f2, f31, f0 @@ -1146,8 +1146,8 @@ sub_801c1790: /* 801C1834 001BE794 39 40 00 00 */ li r10, 0 /* 801C1838 001BE798 38 00 00 03 */ li r0, 3 /* 801C183C 001BE79C 90 81 00 2C */ stw r4, 0x2c(r1) -/* 801C1840 001BE7A0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C1844 001BE7A4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801C1840 001BE7A0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C1844 001BE7A4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801C1848 001BE7A8 38 A1 00 14 */ addi r5, r1, 0x14 /* 801C184C 001BE7AC 90 61 00 28 */ stw r3, 0x28(r1) /* 801C1850 001BE7B0 38 81 00 1C */ addi r4, r1, 0x1c @@ -1271,8 +1271,8 @@ lbl_801C19E0: /* 801C1A04 001BE964 4C 40 13 82 */ cror 2, 0, 2 /* 801C1A08 001BE968 40 82 00 48 */ bne lbl_801C1A50 /* 801C1A0C 001BE96C 81 9D 00 00 */ lwz r12, 0(r29) -/* 801C1A10 001BE970 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C1A14 001BE974 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801C1A10 001BE970 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C1A14 001BE974 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801C1A18 001BE978 7F A3 EB 78 */ mr r3, r29 /* 801C1A1C 001BE97C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 801C1A20 001BE980 7F C4 F3 78 */ mr r4, r30 @@ -1842,13 +1842,13 @@ sub_801c21b4: /* 801C2280 001BF1E0 6F A3 80 00 */ xoris r3, r29, 0x8000 /* 801C2284 001BF1E4 3C 00 43 30 */ lis r0, 0x4330 /* 801C2288 001BF1E8 90 61 00 CC */ stw r3, 0xcc(r1) -/* 801C228C 001BF1EC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C2290 001BF1F0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801C228C 001BF1EC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C2290 001BF1F0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801C2294 001BF1F4 C8 42 AA E0 */ lfd f2, lbl_805AC800@sda21(r2) /* 801C2298 001BF1F8 90 01 00 C8 */ stw r0, 0xc8(r1) -/* 801C229C 001BF1FC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801C229C 001BF1FC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801C22A0 001BF200 C0 02 AA A4 */ lfs f0, lbl_805AC7C4@sda21(r2) -/* 801C22A4 001BF204 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801C22A4 001BF204 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801C22A8 001BF208 C8 21 00 C8 */ lfd f1, 0xc8(r1) /* 801C22AC 001BF20C 38 61 00 68 */ addi r3, r1, 0x68 /* 801C22B0 001BF210 C3 21 00 2C */ lfs f25, 0x2c(r1) @@ -1973,8 +1973,8 @@ lbl_801C2408: /* 801C2478 001BF3D8 38 61 00 14 */ addi r3, r1, 0x14 /* 801C247C 001BF3DC 48 00 00 0C */ b lbl_801C2488 lbl_801C2480: -/* 801C2480 001BF3E0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C2484 001BF3E4 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 801C2480 001BF3E0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C2484 001BF3E4 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_801C2488: /* 801C2488 001BF3E8 C0 43 00 04 */ lfs f2, 4(r3) /* 801C248C 001BF3EC 3A E0 00 00 */ li r23, 0 @@ -2169,8 +2169,8 @@ sub_801c2698: /* 801C2764 001BF6C4 39 40 00 00 */ li r10, 0 /* 801C2768 001BF6C8 38 00 00 03 */ li r0, 3 /* 801C276C 001BF6CC 90 81 00 34 */ stw r4, 0x34(r1) -/* 801C2770 001BF6D0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C2774 001BF6D4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801C2770 001BF6D0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C2774 001BF6D4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801C2778 001BF6D8 38 A1 00 1C */ addi r5, r1, 0x1c /* 801C277C 001BF6DC 90 61 00 30 */ stw r3, 0x30(r1) /* 801C2780 001BF6E0 38 81 00 24 */ addi r4, r1, 0x24 @@ -2426,8 +2426,8 @@ lbl_801C2B08: /* 801C2B10 001BFA70 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 801C2B20 001BFA80 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 801C2B1C 001BFA7C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C2B20 001BFA80 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 801C2B24 001BFA84 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 801C2B28 001BFA88 7C 60 1B 78 */ mr r0, r3 /* 801C2B2C 001BFA8C 39 00 00 0E */ li r8, 0xe @@ -2574,8 +2574,8 @@ lbl_801C2D14: /* 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 -/* 801C2D34 001BFC94 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C2D38 001BFC98 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801C2D40 001BFCA0 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 801C2D44 001BFCA4 80 81 00 58 */ lwz r4, 0x58(r1) @@ -2627,8 +2627,8 @@ lbl_801C2D14: /* 801C2DFC 001BFD5C 48 00 02 A0 */ b lbl_801C309C lbl_801C2E00: /* 801C2E00 001BFD60 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 801C2E04 001BFD64 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C2E08 001BFD68 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801C2E10 001BFD70 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 801C2E14 001BFD74 80 81 00 38 */ lwz r4, 0x38(r1) @@ -2869,8 +2869,8 @@ lbl_801C312C: /* 801C318C 001C00EC 38 61 00 08 */ addi r3, r1, 8 /* 801C3190 001C00F0 38 81 00 14 */ addi r4, r1, 0x14 /* 801C3194 001C00F4 48 15 16 BD */ bl AsNormalized__9CVector3fCFv -/* 801C3198 001C00F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C319C 001C00FC C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801C3198 001C00F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C319C 001C00FC C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801C31A0 001C0100 C0 61 00 08 */ lfs f3, 8(r1) /* 801C31A4 001C0104 38 81 00 20 */ addi r4, r1, 0x20 /* 801C31A8 001C0108 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -2940,8 +2940,8 @@ lbl_801C326C: /* 801C3284 001C01E4 48 00 01 24 */ b lbl_801C33A8 lbl_801C3288: /* 801C3288 001C01E8 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 801C328C 001C01EC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3290 001C01F0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -3115,8 +3115,8 @@ lbl_801C3504: /* 801C3510 001C0470 38 9D 04 5C */ addi r4, r29, 0x45c /* 801C3514 001C0474 38 DD 07 A8 */ addi r6, r29, 0x7a8 /* 801C3518 001C0478 4B F7 B6 05 */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 801C351C 001C047C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3520 001C0480 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C351C 001C047C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3520 001C0480 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C3524 001C0484 C0 C1 00 08 */ lfs f6, 8(r1) /* 801C3528 001C0488 38 81 00 14 */ addi r4, r1, 0x14 /* 801C352C 001C048C C0 A1 00 0C */ lfs f5, 0xc(r1) @@ -3289,8 +3289,8 @@ lbl_801C370C: /* 801C3788 001C06E8 38 9E 04 5C */ addi r4, r30, 0x45c /* 801C378C 001C06EC 38 C1 00 2C */ addi r6, r1, 0x2c /* 801C3790 001C06F0 4B F7 B4 91 */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 801C3794 001C06F4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3798 001C06F8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C3794 001C06F4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3798 001C06F8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C379C 001C06FC C0 C1 00 14 */ lfs f6, 0x14(r1) /* 801C37A0 001C0700 38 81 00 38 */ addi r4, r1, 0x38 /* 801C37A4 001C0704 C0 A1 00 18 */ lfs f5, 0x18(r1) @@ -3340,9 +3340,9 @@ lbl_801C3808: /* 801C3848 001C07A8 D0 1E 07 A4 */ stfs f0, 0x7a4(r30) /* 801C384C 001C07AC 80 7E 04 50 */ lwz r3, 0x450(r30) /* 801C3850 001C07B0 4B F7 71 89 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType -/* 801C3854 001C07B4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801C3854 001C07B4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801C3858 001C07B8 7F C3 F3 78 */ mr r3, r30 -/* 801C385C 001C07BC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801C385C 001C07BC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801C3860 001C07C0 7F E4 FB 78 */ mr r4, r31 /* 801C3864 001C07C4 4B FF E0 59 */ bl sub_801c18bc /* 801C3868 001C07C8 A1 1E 00 08 */ lhz r8, 8(r30) @@ -3481,8 +3481,8 @@ lbl_801C39A8: /* 801C3A60 001C09C0 D0 21 00 FC */ stfs f1, 0xfc(r1) /* 801C3A64 001C09C4 D0 01 01 00 */ stfs f0, 0x100(r1) /* 801C3A68 001C09C8 4B F7 B1 B9 */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 801C3A6C 001C09CC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3A70 001C09D0 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C3A6C 001C09CC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3A70 001C09D0 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C3A74 001C09D4 C0 C1 00 A8 */ lfs f6, 0xa8(r1) /* 801C3A78 001C09D8 38 81 01 10 */ addi r4, r1, 0x110 /* 801C3A7C 001C09DC C0 A1 00 AC */ lfs f5, 0xac(r1) @@ -3718,8 +3718,8 @@ lbl_801C3D8C: /* 801C3DEC 001C0D4C 38 61 00 4C */ addi r3, r1, 0x4c /* 801C3DF0 001C0D50 38 81 00 64 */ addi r4, r1, 0x64 /* 801C3DF4 001C0D54 48 15 0A 5D */ bl AsNormalized__9CVector3fCFv -/* 801C3DF8 001C0D58 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3DFC 001C0D5C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801C3DF8 001C0D58 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3DFC 001C0D5C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801C3E00 001C0D60 C0 61 00 4C */ lfs f3, 0x4c(r1) /* 801C3E04 001C0D64 38 81 00 8C */ addi r4, r1, 0x8c /* 801C3E08 001C0D68 C0 41 00 50 */ lfs f2, 0x50(r1) @@ -3754,8 +3754,8 @@ lbl_801C3E48: /* 801C3E78 001C0DD8 48 00 00 98 */ b lbl_801C3F10 lbl_801C3E7C: /* 801C3E7C 001C0DDC 80 BE 08 4C */ lwz r5, 0x84c(r30) -/* 801C3E80 001C0DE0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3E84 001C0DE4 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801C3E80 001C0DE0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3E84 001C0DE4 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801C3E88 001C0DE8 39 20 FF FF */ li r9, -1 /* 801C3E8C 001C0DEC C0 85 00 60 */ lfs f4, 0x60(r5) /* 801C3E90 001C0DF0 38 00 00 00 */ li r0, 0 @@ -3816,8 +3816,8 @@ lbl_801C3F10: /* 801C3F68 001C0EC8 EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 801C3F6C 001C0ECC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801C3F70 001C0ED0 40 81 00 44 */ ble lbl_801C3FB4 -/* 801C3F74 001C0ED4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C3F78 001C0ED8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801C3F74 001C0ED4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C3F78 001C0ED8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801C3F7C 001C0EDC C0 02 AA A4 */ lfs f0, lbl_805AC7C4@sda21(r2) /* 801C3F80 001C0EE0 38 81 00 70 */ addi r4, r1, 0x70 /* 801C3F84 001C0EE4 D0 41 00 70 */ stfs f2, 0x70(r1) @@ -3888,8 +3888,8 @@ lbl_801C4014: /* 801C4074 001C0FD4 48 00 00 AC */ b lbl_801C4120 lbl_801C4078: /* 801C4078 001C0FD8 80 BF 08 4C */ lwz r5, 0x84c(r31) -/* 801C407C 001C0FDC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C4080 001C0FE0 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801C407C 001C0FDC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C4080 001C0FE0 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801C4084 001C0FE4 39 20 FF FF */ li r9, -1 /* 801C4088 001C0FE8 C0 85 00 60 */ lfs f4, 0x60(r5) /* 801C408C 001C0FEC 38 00 00 00 */ li r0, 0 @@ -3994,8 +3994,8 @@ lbl_801C41C8: /* 801C420C 001C116C 48 00 00 AC */ b lbl_801C42B8 lbl_801C4210: /* 801C4210 001C1170 80 BF 08 4C */ lwz r5, 0x84c(r31) -/* 801C4214 001C1174 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801C4218 001C1178 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801C4214 001C1174 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801C4218 001C1178 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801C421C 001C117C 39 20 FF FF */ li r9, -1 /* 801C4220 001C1180 C0 85 00 60 */ lfs f4, 0x60(r5) /* 801C4224 001C1184 38 00 00 00 */ li r0, 0 @@ -5712,8 +5712,8 @@ lbl_801C59D8: /* 801C5A54 001C29B4 39 00 00 00 */ li r8, 0 /* 801C5A58 001C29B8 39 40 00 03 */ li r10, 3 /* 801C5A5C 001C29BC 90 81 01 04 */ stw r4, 0x104(r1) -/* 801C5A60 001C29C0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C5A64 001C29C4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801C5A60 001C29C0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C5A64 001C29C4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801C5A68 001C29C8 A0 1E 00 00 */ lhz r0, 0(r30) /* 801C5A6C 001C29CC 90 61 01 00 */ stw r3, 0x100(r1) /* 801C5A70 001C29D0 7F E3 FB 78 */ mr r3, r31 @@ -5832,8 +5832,8 @@ lbl_801C5C10: /* 801C5C20 001C2B80 39 40 00 00 */ li r10, 0 /* 801C5C24 001C2B84 38 00 00 03 */ li r0, 3 /* 801C5C28 001C2B88 90 81 00 B4 */ stw r4, 0xb4(r1) -/* 801C5C2C 001C2B8C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C5C30 001C2B90 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801C5C2C 001C2B8C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C5C30 001C2B90 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801C5C34 001C2B94 38 A1 00 20 */ addi r5, r1, 0x20 /* 801C5C38 001C2B98 90 61 00 B0 */ stw r3, 0xb0(r1) /* 801C5C3C 001C2B9C 38 81 00 28 */ addi r4, r1, 0x28 @@ -6215,7 +6215,7 @@ lbl_801C6070: /* 801C6180 001C30E0 3C 60 80 3F */ lis r3, lbl_803ECAD0@ha /* 801C6184 001C30E4 C0 22 AA 98 */ lfs f1, lbl_805AC7B8@sda21(r2) /* 801C6188 001C30E8 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l -/* 801C618C 001C30EC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801C618C 001C30EC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801C6190 001C30F0 90 1C 00 00 */ stw r0, 0(r28) /* 801C6194 001C30F4 3C 60 50 41 */ lis r3, 0x50415254@ha /* 801C6198 001C30F8 38 03 52 54 */ addi r0, r3, 0x50415254@l @@ -6240,7 +6240,7 @@ lbl_801C6070: /* 801C61E4 001C3144 D0 3E 07 9C */ stfs f1, 0x79c(r30) /* 801C61E8 001C3148 D0 3E 07 A0 */ stfs f1, 0x7a0(r30) /* 801C61EC 001C314C D0 3E 07 A4 */ stfs f1, 0x7a4(r30) -/* 801C61F0 001C3150 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 801C61F0 001C3150 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 801C61F4 001C3154 D0 1E 07 A8 */ stfs f0, 0x7a8(r30) /* 801C61F8 001C3158 C0 04 00 04 */ lfs f0, 4(r4) /* 801C61FC 001C315C D0 1E 07 AC */ stfs f0, 0x7ac(r30) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index d2043595..ee87256a 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -567,8 +567,8 @@ sub_8027cce0: /* 8027CD74 00279CD4 98 E1 00 38 */ stb r7, 0x38(r1) /* 8027CD78 00279CD8 98 01 00 39 */ stb r0, 0x39(r1) /* 8027CD7C 00279CDC 48 00 00 81 */ bl sub_8027cdfc -/* 8027CD80 00279CE0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8027CD84 00279CE4 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8027CD80 00279CE0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8027CD84 00279CE4 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8027CD88 00279CE8 C0 A3 00 2C */ lfs f5, 0x2c(r3) /* 8027CD8C 00279CEC 38 00 0B 67 */ li r0, 0xb67 /* 8027CD90 00279CF0 C0 83 00 1C */ lfs f4, 0x1c(r3) @@ -1001,9 +1001,9 @@ lbl_8027D304: /* 8027D3A8 0027A308 4E 80 04 21 */ bctrl lbl_8027D3AC: /* 8027D3AC 0027A30C C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 8027D3B0 0027A310 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8027D3B0 0027A310 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8027D3B4 0027A314 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 8027D3B8 0027A318 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8027D3B8 0027A318 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8027D3BC 0027A31C C0 1E 00 40 */ lfs f0, 0x40(r30) /* 8027D3C0 0027A320 7F 84 E3 78 */ mr r4, r28 /* 8027D3C4 0027A324 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1240,10 +1240,10 @@ lbl_8027D6F0: sub_8027d704: /* 8027D704 0027A664 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8027D708 0027A668 7C 08 02 A6 */ mflr r0 -/* 8027D70C 0027A66C 3C E0 80 5A */ lis r7, lbl_805A66F4@ha +/* 8027D70C 0027A66C 3C E0 80 5A */ lis r7, sUpVector__9CVector3f@ha /* 8027D710 0027A670 3C C0 80 5A */ lis r6, lbl_8059FD18@ha /* 8027D714 0027A674 90 01 00 34 */ stw r0, 0x34(r1) -/* 8027D718 0027A678 39 07 66 F4 */ addi r8, r7, lbl_805A66F4@l +/* 8027D718 0027A678 39 07 66 F4 */ addi r8, r7, sUpVector__9CVector3f@l /* 8027D71C 0027A67C 7C A0 2B 78 */ mr r0, r5 /* 8027D720 0027A680 38 E6 FD 18 */ addi r7, r6, lbl_8059FD18@l /* 8027D724 0027A684 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -2099,8 +2099,8 @@ lbl_8027E284: /* 8027E28C 0027B1EC 48 00 00 BC */ b lbl_8027E348 lbl_8027E290: /* 8027E290 0027B1F0 80 BF 08 4C */ lwz r5, 0x84c(r31) -/* 8027E294 0027B1F4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8027E298 0027B1F8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8027E294 0027B1F4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8027E298 0027B1F8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8027E29C 0027B1FC 38 81 00 10 */ addi r4, r1, 0x10 /* 8027E2A0 0027B200 C0 45 00 60 */ lfs f2, 0x60(r5) /* 8027E2A4 0027B204 38 61 00 34 */ addi r3, r1, 0x34 @@ -2432,9 +2432,9 @@ lbl_8027E618: /* 8027E760 0027B6C0 81 8C 00 4C */ lwz r12, 0x4c(r12) /* 8027E764 0027B6C4 7D 89 03 A6 */ mtctr r12 /* 8027E768 0027B6C8 4E 80 04 21 */ bctrl -/* 8027E76C 0027B6CC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8027E76C 0027B6CC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8027E770 0027B6D0 38 61 00 44 */ addi r3, r1, 0x44 -/* 8027E774 0027B6D4 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8027E774 0027B6D4 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8027E778 0027B6D8 38 A1 00 14 */ addi r5, r1, 0x14 /* 8027E77C 0027B6DC 38 81 00 38 */ addi r4, r1, 0x38 /* 8027E780 0027B6E0 48 09 53 91 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -2644,8 +2644,8 @@ sub_8027e870: /* 8027EA8C 0027B9EC 38 80 00 01 */ li r4, 1 /* 8027EA90 0027B9F0 48 10 B4 65 */ bl __shl2i /* 8027EA94 0027B9F4 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8027EA98 0027B9F8 3C A0 80 5A */ lis r5, skZero3f@ha -/* 8027EA9C 0027B9FC C7 85 66 A0 */ lfsu f28, skZero3f@l(r5) +/* 8027EA98 0027B9F8 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 8027EA9C 0027B9FC C7 85 66 A0 */ lfsu f28, sZeroVector__9CVector3f@l(r5) /* 8027EAA0 0027BA00 7C 00 1B 78 */ or r0, r0, r3 /* 8027EAA4 0027BA04 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8027EAA8 0027BA08 90 01 00 18 */ stw r0, 0x18(r1) @@ -3504,8 +3504,8 @@ lbl_8027F6A0: /* 8027F6C4 0027C624 4C 40 13 82 */ cror 2, 0, 2 /* 8027F6C8 0027C628 40 82 00 3C */ bne lbl_8027F704 /* 8027F6CC 0027C62C 81 9D 00 00 */ lwz r12, 0(r29) -/* 8027F6D0 0027C630 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8027F6D4 0027C634 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8027F6D0 0027C630 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8027F6D4 0027C634 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8027F6D8 0027C638 7F A3 EB 78 */ mr r3, r29 /* 8027F6DC 0027C63C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8027F6E0 0027C640 7F C4 F3 78 */ mr r4, r30 @@ -3995,9 +3995,9 @@ lbl_8027FD28: /* 8027FDE4 0027CD44 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8027FDE8 0027CD48 7D 89 03 A6 */ mtctr r12 /* 8027FDEC 0027CD4C 4E 80 04 21 */ bctrl -/* 8027FDF0 0027CD50 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8027FDF0 0027CD50 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8027FDF4 0027CD54 7F E3 FB 78 */ mr r3, r31 -/* 8027FDF8 0027CD58 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8027FDF8 0027CD58 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8027FDFC 0027CD5C 38 A1 00 34 */ addi r5, r1, 0x34 /* 8027FE00 0027CD60 38 81 00 3C */ addi r4, r1, 0x3c /* 8027FE04 0027CD64 38 C1 00 2C */ addi r6, r1, 0x2c @@ -4058,11 +4058,11 @@ lbl_8027FE20: /* 8027FED8 0027CE38 7F E4 FB 78 */ mr r4, r31 /* 8027FEDC 0027CE3C 4B FF D0 05 */ bl sub_8027cee0 /* 8027FEE0 0027CE40 81 9D 00 00 */ lwz r12, 0(r29) -/* 8027FEE4 0027CE44 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8027FEE4 0027CE44 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8027FEE8 0027CE48 7F A3 EB 78 */ mr r3, r29 /* 8027FEEC 0027CE4C C0 22 BD 3C */ lfs f1, lbl_805ADA5C@sda21(r2) /* 8027FEF0 0027CE50 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 8027FEF4 0027CE54 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 8027FEF4 0027CE54 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 8027FEF8 0027CE58 7D 89 03 A6 */ mtctr r12 /* 8027FEFC 0027CE5C 4E 80 04 21 */ bctrl /* 8027FF00 0027CE60 88 7D 07 0E */ lbz r3, 0x70e(r29) @@ -4130,8 +4130,8 @@ lbl_8027FFB8: /* 8027FFF4 0027CF54 39 00 00 00 */ li r8, 0 /* 8027FFF8 0027CF58 39 40 00 03 */ li r10, 3 /* 8027FFFC 0027CF5C 90 81 00 84 */ stw r4, 0x84(r1) -/* 80280000 0027CF60 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80280004 0027CF64 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80280000 0027CF60 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80280004 0027CF64 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80280008 0027CF68 A0 1E 00 00 */ lhz r0, 0(r30) /* 8028000C 0027CF6C 90 61 00 80 */ stw r3, 0x80(r1) /* 80280010 0027CF70 7F E3 FB 78 */ mr r3, r31 @@ -4326,9 +4326,9 @@ __ct__20CMetroidPrimeEssence: /* 802802B0 0027D210 38 A0 00 03 */ li r5, 3 /* 802802B4 0027D214 4B F4 8A E1 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 802802B8 0027D218 38 00 00 00 */ li r0, 0 -/* 802802BC 0027D21C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802802BC 0027D21C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802802C0 0027D220 90 1A 06 58 */ stw r0, 0x658(r26) -/* 802802C4 0027D224 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802802C4 0027D224 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802802C8 0027D228 38 7A 06 68 */ addi r3, r26, 0x668 /* 802802CC 0027D22C 90 1A 06 5C */ stw r0, 0x65c(r26) /* 802802D0 0027D230 93 9A 06 60 */ stw r28, 0x660(r26) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 36001e15..b385e0ad 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -4005,8 +4005,8 @@ sub_80273f10: /* 80273F54 00270EB4 28 1F 00 00 */ cmplwi r31, 0 /* 80273F58 00270EB8 41 82 00 E0 */ beq lbl_80274038 /* 80273F5C 00270EBC 80 BE 08 4C */ lwz r5, 0x84c(r30) -/* 80273F60 00270EC0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80273F64 00270EC4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80273F60 00270EC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80273F64 00270EC4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80273F68 00270EC8 C0 1F 00 50 */ lfs f0, 0x50(r31) /* 80273F6C 00270ECC C0 45 00 50 */ lfs f2, 0x50(r5) /* 80273F70 00270ED0 38 61 00 38 */ addi r3, r1, 0x38 @@ -4058,9 +4058,9 @@ lbl_80274000: /* 80274020 00270F80 4B EA 6C 81 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 80274024 00270F84 48 00 00 14 */ b lbl_80274038 lbl_80274028: -/* 80274028 00270F88 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80274028 00270F88 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8027402C 00270F8C 7F E3 FB 78 */ mr r3, r31 -/* 80274030 00270F90 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80274030 00270F90 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80274034 00270F94 4B EA 6C 6D */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f lbl_80274038: /* 80274038 00270F98 80 01 00 64 */ lwz r0, 0x64(r1) @@ -4223,8 +4223,8 @@ sub_80274230: /* 80274264 002711C4 4B DA 72 D1 */ bl Identity__10CAxisAngleFv /* 80274268 002711C8 7C 7A 1B 78 */ mr r26, r3 /* 8027426C 002711CC 4B DA 72 C9 */ bl Identity__10CAxisAngleFv -/* 80274270 002711D0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80274274 002711D4 C4 64 66 A0 */ lfsu f3, skZero3f@l(r4) +/* 80274270 002711D0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80274274 002711D4 C4 64 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r4) /* 80274278 002711D8 C0 22 BC 30 */ lfs f1, lbl_805AD950@sda21(r2) /* 8027427C 002711DC 38 00 00 00 */ li r0, 0 /* 80274280 002711E0 C0 84 00 04 */ lfs f4, 4(r4) @@ -4285,10 +4285,10 @@ sub_80274230: /* 8027435C 002712BC 48 0C 41 AD */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f /* 80274360 002712C0 90 61 00 08 */ stw r3, 8(r1) /* 80274364 002712C4 38 81 00 58 */ addi r4, r1, 0x58 -/* 80274368 002712C8 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80274368 002712C8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8027436C 002712CC 38 01 00 8C */ addi r0, r1, 0x8c /* 80274370 002712D0 90 81 00 0C */ stw r4, 0xc(r1) -/* 80274374 002712D4 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80274374 002712D4 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80274378 002712D8 C0 22 BC 68 */ lfs f1, lbl_805AD988@sda21(r2) /* 8027437C 002712DC 7F 63 DB 78 */ mr r3, r27 /* 80274380 002712E0 90 01 00 10 */ stw r0, 0x10(r1) @@ -4511,8 +4511,8 @@ sub_8027464c: /* 80274694 002715F4 38 E0 00 06 */ li r7, 6 /* 80274698 002715F8 48 00 24 A5 */ bl sub_80276b3c /* 8027469C 002715FC A0 01 00 10 */ lhz r0, 0x10(r1) -/* 802746A0 00271600 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802746A4 00271604 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 802746A0 00271600 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802746A4 00271604 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 802746A8 00271608 C3 82 BC 08 */ lfs f28, lbl_805AD928@sda21(r2) /* 802746AC 0027160C B0 01 00 14 */ sth r0, 0x14(r1) /* 802746B0 00271610 C3 FF 00 00 */ lfs f31, 0(r31) @@ -4563,8 +4563,8 @@ lbl_80274720: /* 80274758 002716B8 D0 1D 00 08 */ stfs f0, 8(r29) /* 8027475C 002716BC 48 00 00 20 */ b lbl_8027477C lbl_80274760: -/* 80274760 002716C0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80274764 002716C4 C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 80274760 002716C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80274764 002716C4 C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 80274768 002716C8 D0 1D 00 00 */ stfs f0, 0(r29) /* 8027476C 002716CC C0 1F 00 04 */ lfs f0, 4(r31) /* 80274770 002716D0 D0 1D 00 04 */ stfs f0, 4(r29) @@ -4617,9 +4617,9 @@ sub_802747b8: /* 8027481C 0027177C 38 60 00 00 */ li r3, 0 /* 80274820 00271780 38 80 00 01 */ li r4, 1 /* 80274824 00271784 48 11 56 D1 */ bl __shl2i -/* 80274828 00271788 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 80274828 00271788 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 8027482C 0027178C 7F BD 23 78 */ or r29, r29, r4 -/* 80274830 00271790 38 A5 67 00 */ addi r5, r5, lbl_805A6700@l +/* 80274830 00271790 38 A5 67 00 */ addi r5, r5, sDownVector__9CVector3f@l /* 80274834 00271794 7F DE 1B 78 */ or r30, r30, r3 /* 80274838 00271798 39 00 00 00 */ li r8, 0 /* 8027483C 0027179C 38 00 00 01 */ li r0, 1 @@ -4662,9 +4662,9 @@ sub_802747b8: /* 802748D0 00271830 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802748D4 00271834 40 82 00 5C */ bne lbl_80274930 /* 802748D8 00271838 C0 22 BC 70 */ lfs f1, lbl_805AD990@sda21(r2) -/* 802748DC 0027183C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802748DC 0027183C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802748E0 00271840 C0 1F 00 E8 */ lfs f0, 0xe8(r31) -/* 802748E4 00271844 C4 43 66 F4 */ lfsu f2, lbl_805A66F4@l(r3) +/* 802748E4 00271844 C4 43 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r3) /* 802748E8 00271848 EC 61 00 32 */ fmuls f3, f1, f0 /* 802748EC 0027184C C0 23 00 04 */ lfs f1, 4(r3) /* 802748F0 00271850 C0 03 00 08 */ lfs f0, 8(r3) @@ -4684,9 +4684,9 @@ sub_802747b8: /* 80274928 00271888 38 80 00 02 */ li r4, 2 /* 8027492C 0027188C 48 01 1A C1 */ bl SetMoveState__7CPlayerFQ27NPlayer20EPlayerMovementStateR13CStateManager lbl_80274930: -/* 80274930 00271890 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80274930 00271890 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80274934 00271894 C0 22 BC 5C */ lfs f1, lbl_805AD97C@sda21(r2) -/* 80274938 00271898 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80274938 00271898 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8027493C 0027189C 38 61 00 5C */ addi r3, r1, 0x5c /* 80274940 002718A0 48 09 B6 25 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 80274944 002718A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -4789,9 +4789,9 @@ sub_802749e8: /* 80274AB8 00271A18 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80274ABC 00271A1C 48 09 FD FD */ bl Magnitude__9CVector3fCFv /* 80274AC0 00271A20 FE E0 08 90 */ fmr f23, f1 -/* 80274AC4 00271A24 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80274AC4 00271A24 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80274AC8 00271A28 C3 C1 00 44 */ lfs f30, 0x44(r1) -/* 80274ACC 00271A2C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80274ACC 00271A2C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80274AD0 00271A30 C3 A1 00 48 */ lfs f29, 0x48(r1) /* 80274AD4 00271A34 38 61 00 44 */ addi r3, r1, 0x44 /* 80274AD8 00271A38 C3 81 00 4C */ lfs f28, 0x4c(r1) @@ -4799,12 +4799,12 @@ sub_802749e8: /* 80274AE0 00271A40 48 09 B4 85 */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 80274AE4 00271A44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80274AE8 00271A48 40 82 03 00 */ bne lbl_80274DE8 -/* 80274AEC 00271A4C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80274AF0 00271A50 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80274AF4 00271A54 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80274AEC 00271A4C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80274AF0 00271A50 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80274AF4 00271A54 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80274AF8 00271A58 C3 7D 00 00 */ lfs f27, 0(r29) /* 80274AFC 00271A5C C3 5D 00 04 */ lfs f26, 4(r29) -/* 80274B00 00271A60 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80274B00 00271A60 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80274B04 00271A64 C3 3D 00 08 */ lfs f25, 8(r29) /* 80274B08 00271A68 38 61 00 50 */ addi r3, r1, 0x50 /* 80274B0C 00271A6C 38 A1 00 44 */ addi r5, r1, 0x44 @@ -4880,8 +4880,8 @@ lbl_80274BC0: /* 80274C20 00271B80 38 A1 00 20 */ addi r5, r1, 0x20 /* 80274C24 00271B84 48 00 00 0C */ b lbl_80274C30 lbl_80274C28: -/* 80274C28 00271B88 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80274C2C 00271B8C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80274C28 00271B88 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80274C2C 00271B8C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l lbl_80274C30: /* 80274C30 00271B90 C0 45 00 04 */ lfs f2, 4(r5) /* 80274C34 00271B94 7F E3 FB 78 */ mr r3, r31 @@ -4969,8 +4969,8 @@ lbl_80274D14: /* 80274D74 00271CD4 38 61 00 08 */ addi r3, r1, 8 /* 80274D78 00271CD8 48 00 00 0C */ b lbl_80274D84 lbl_80274D7C: -/* 80274D7C 00271CDC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80274D80 00271CE0 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80274D7C 00271CDC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80274D80 00271CE0 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_80274D84: /* 80274D84 00271CE4 C0 03 00 00 */ lfs f0, 0(r3) /* 80274D88 00271CE8 38 81 00 80 */ addi r4, r1, 0x80 @@ -5079,14 +5079,14 @@ sub_80274e6c: /* 80274F10 00271E70 98 17 10 54 */ stb r0, 0x1054(r23) lbl_80274F14: /* 80274F14 00271E74 C0 02 BC 40 */ lfs f0, lbl_805AD960@sda21(r2) -/* 80274F18 00271E78 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80274F18 00271E78 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80274F1C 00271E7C C3 C2 BC 68 */ lfs f30, lbl_805AD988@sda21(r2) /* 80274F20 00271E80 3B D7 10 30 */ addi r30, r23, 0x1030 /* 80274F24 00271E84 EF 20 07 F2 */ fmuls f25, f0, f31 /* 80274F28 00271E88 3B B7 10 3C */ addi r29, r23, 0x103c /* 80274F2C 00271E8C 3B 77 10 04 */ addi r27, r23, 0x1004 /* 80274F30 00271E90 3B 57 0F F0 */ addi r26, r23, 0xff0 -/* 80274F34 00271E94 3B E3 66 F4 */ addi r31, r3, lbl_805A66F4@l +/* 80274F34 00271E94 3B E3 66 F4 */ addi r31, r3, sUpVector__9CVector3f@l /* 80274F38 00271E98 3B 20 00 00 */ li r25, 0 /* 80274F3C 00271E9C 3B 82 BB DC */ addi r28, r2, lbl_805AD8FC@sda21 lbl_80274F40: @@ -5441,11 +5441,11 @@ lbl_80275478: /* 80275478 002723D8 C0 02 BC 9C */ lfs f0, lbl_805AD9BC@sda21(r2) /* 8027547C 002723DC EC 20 06 32 */ fmuls f1, f0, f24 /* 80275480 002723E0 48 0A 00 81 */ bl SqrtF__5CMathFf -/* 80275484 002723E4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80275484 002723E4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80275488 002723E8 EC 77 00 72 */ fmuls f3, f23, f1 /* 8027548C 002723EC C0 5F 00 04 */ lfs f2, 4(r31) /* 80275490 002723F0 C0 3F 00 08 */ lfs f1, 8(r31) -/* 80275494 002723F4 C0 03 66 F4 */ lfs f0, lbl_805A66F4@l(r3) +/* 80275494 002723F4 C0 03 66 F4 */ lfs f0, sUpVector__9CVector3f@l(r3) /* 80275498 002723F8 EC 43 00 B2 */ fmuls f2, f3, f2 /* 8027549C 002723FC EC 23 00 72 */ fmuls f1, f3, f1 /* 802754A0 00272400 EC 03 00 32 */ fmuls f0, f3, f0 @@ -6210,9 +6210,9 @@ sub_80275e54: /* 80275F1C 00272E7C 28 00 00 00 */ cmplwi r0, 0 /* 80275F20 00272E80 41 82 00 3C */ beq lbl_80275F5C /* 80275F24 00272E84 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 80275F28 00272E88 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80275F28 00272E88 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80275F2C 00272E8C C0 3D 00 50 */ lfs f1, 0x50(r29) -/* 80275F30 00272E90 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80275F30 00272E90 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80275F34 00272E94 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80275F38 00272E98 38 61 00 20 */ addi r3, r1, 0x20 /* 80275F3C 00272E9C 38 81 00 44 */ addi r4, r1, 0x44 @@ -6389,9 +6389,9 @@ lbl_802761AC: /* 802761B0 00273110 28 00 00 00 */ cmplwi r0, 0 /* 802761B4 00273114 41 82 00 3C */ beq lbl_802761F0 /* 802761B8 00273118 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 802761BC 0027311C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802761BC 0027311C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802761C0 00273120 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 802761C4 00273124 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 802761C4 00273124 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 802761C8 00273128 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 802761CC 0027312C 38 61 00 08 */ addi r3, r1, 8 /* 802761D0 00273130 38 81 00 0C */ addi r4, r1, 0xc @@ -6438,9 +6438,9 @@ lbl_8027623C: /* 80276260 002731C0 48 07 3C 25 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle lbl_80276264: /* 80276264 002731C4 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80276268 002731C8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80276268 002731C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8027626C 002731CC C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80276270 002731D0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80276270 002731D0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80276274 002731D4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80276278 002731D8 38 61 00 14 */ addi r3, r1, 0x14 /* 8027627C 002731DC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) @@ -6566,9 +6566,9 @@ lbl_802763E0: /* 80276440 002733A0 48 07 3A 45 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle lbl_80276444: /* 80276444 002733A4 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80276448 002733A8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80276448 002733A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8027644C 002733AC C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80276450 002733B0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80276450 002733B0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80276454 002733B4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80276458 002733B8 38 61 00 14 */ addi r3, r1, 0x14 /* 8027645C 002733BC 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) @@ -7540,9 +7540,9 @@ PreRender__16CMetroidPrimeExoFR13CStateManagerRC14CFrustumPlanes: /* 802771C8 00274128 93 C1 00 08 */ stw r30, 8(r1) /* 802771CC 0027412C 7C 7E 1B 78 */ mr r30, r3 /* 802771D0 00274130 4B E0 11 0D */ bl PreRender__10CPatternedFR13CStateManagerRC14CFrustumPlanes -/* 802771D4 00274134 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802771D4 00274134 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802771D8 00274138 80 7E 14 3C */ lwz r3, 0x143c(r30) -/* 802771DC 0027413C 39 04 66 A0 */ addi r8, r4, skZero3f@l +/* 802771DC 0027413C 39 04 66 A0 */ addi r8, r4, sZeroVector__9CVector3f@l /* 802771E0 00274140 80 BE 00 64 */ lwz r5, 0x64(r30) /* 802771E4 00274144 C0 22 BC 30 */ lfs f1, lbl_805AD950@sda21(r2) /* 802771E8 00274148 7F E4 FB 78 */ mr r4, r31 @@ -7714,9 +7714,9 @@ lbl_80277414: /* 8027744C 002743AC 38 61 00 1C */ addi r3, r1, 0x1c /* 80277450 002743B0 48 00 04 75 */ bl sub_802778c4 /* 80277454 002743B4 C0 61 00 1C */ lfs f3, 0x1c(r1) -/* 80277458 002743B8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80277458 002743B8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8027745C 002743BC C0 21 00 20 */ lfs f1, 0x20(r1) -/* 80277460 002743C0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80277460 002743C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80277464 002743C4 C0 41 00 24 */ lfs f2, 0x24(r1) /* 80277468 002743C8 38 61 00 38 */ addi r3, r1, 0x38 /* 8027746C 002743CC C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) @@ -7878,9 +7878,9 @@ lbl_8027766C: /* 802776B8 00274618 38 A0 00 00 */ li r5, 0 /* 802776BC 0027461C 4B FF FC C5 */ bl sub_80277380 lbl_802776C0: -/* 802776C0 00274620 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802776C0 00274620 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802776C4 00274624 38 61 01 74 */ addi r3, r1, 0x174 -/* 802776C8 00274628 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802776C8 00274628 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802776CC 0027462C 48 09 B4 A9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802776D0 00274630 C0 1D 0C 5C */ lfs f0, 0xc5c(r29) /* 802776D4 00274634 38 81 00 10 */ addi r4, r1, 0x10 @@ -7936,9 +7936,9 @@ lbl_802776C0: /* 8027779C 002746FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802777A0 00274700 40 81 00 44 */ ble lbl_802777E4 /* 802777A4 00274704 C0 41 01 B0 */ lfs f2, 0x1b0(r1) -/* 802777A8 00274708 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802777A8 00274708 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802777AC 0027470C C0 21 01 C0 */ lfs f1, 0x1c0(r1) -/* 802777B0 00274710 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802777B0 00274710 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802777B4 00274714 C0 01 01 D0 */ lfs f0, 0x1d0(r1) /* 802777B8 00274718 38 61 00 E4 */ addi r3, r1, 0xe4 /* 802777BC 0027471C D0 41 00 68 */ stfs f2, 0x68(r1) @@ -8064,8 +8064,8 @@ sub_802778c4: /* 80277984 002748E4 98 0D A5 80 */ stb r0, lbl_805A9140@sda21(r13) lbl_80277988: /* 80277988 002748E8 80 9F 08 4C */ lwz r4, 0x84c(r31) -/* 8027798C 002748EC 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 80277990 002748F0 38 E3 67 00 */ addi r7, r3, lbl_805A6700@l +/* 8027798C 002748EC 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 80277990 002748F0 38 E3 67 00 */ addi r7, r3, sDownVector__9CVector3f@l /* 80277994 002748F4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80277998 002748F8 C0 A4 00 60 */ lfs f5, 0x60(r4) /* 8027799C 002748FC 38 C0 00 00 */ li r6, 0 @@ -8330,10 +8330,10 @@ lbl_80277D38: /* 80277D68 00274CC8 83 9A 00 0C */ lwz r28, 0xc(r26) /* 80277D6C 00274CCC 4B D8 CF 4D */ bl string_l__4rstlFPCc /* 80277D70 00274CD0 38 01 00 20 */ addi r0, r1, 0x20 -/* 80277D74 00274CD4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80277D74 00274CD4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80277D78 00274CD8 90 01 00 08 */ stw r0, 8(r1) /* 80277D7C 00274CDC 38 01 00 34 */ addi r0, r1, 0x34 -/* 80277D80 00274CE0 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80277D80 00274CE0 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80277D84 00274CE4 7F 86 E3 78 */ mr r6, r28 /* 80277D88 00274CE8 90 01 00 0C */ stw r0, 0xc(r1) /* 80277D8C 00274CEC 38 A1 00 28 */ addi r5, r1, 0x28 @@ -8498,9 +8498,9 @@ sub_80277e30: /* 80277FF0 00274F50 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80277FF4 00274F54 7D 89 03 A6 */ mtctr r12 /* 80277FF8 00274F58 4E 80 04 21 */ bctrl -/* 80277FFC 00274F5C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80277FFC 00274F5C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80278000 00274F60 7F C3 F3 78 */ mr r3, r30 -/* 80278004 00274F64 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80278004 00274F64 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80278008 00274F68 38 A1 00 14 */ addi r5, r1, 0x14 /* 8027800C 00274F6C 38 81 00 1C */ addi r4, r1, 0x1c /* 80278010 00274F70 38 C1 00 0C */ addi r6, r1, 0xc @@ -8802,9 +8802,9 @@ lbl_80278438: /* 80278444 002753A4 88 1E 01 30 */ lbz r0, 0x130(r30) /* 80278448 002753A8 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 8027844C 002753AC 41 82 00 A8 */ beq lbl_802784F4 -/* 80278450 002753B0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80278450 002753B0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80278454 002753B4 38 61 00 58 */ addi r3, r1, 0x58 -/* 80278458 002753B8 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80278458 002753B8 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8027845C 002753BC 38 81 00 4C */ addi r4, r1, 0x4c /* 80278460 002753C0 C0 45 00 00 */ lfs f2, 0(r5) /* 80278464 002753C4 C0 25 00 04 */ lfs f1, 4(r5) @@ -8885,8 +8885,8 @@ sub_80278508: /* 80278580 002754E0 C0 62 BC 6C */ lfs f3, lbl_805AD98C@sda21(r2) /* 80278584 002754E4 39 40 00 14 */ li r10, 0x14 /* 80278588 002754E8 89 22 CC 41 */ lbz r9, lbl_805AE961@sda21(r2) -/* 8027858C 002754EC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80278590 002754F0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8027858C 002754EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80278590 002754F0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80278594 002754F4 D0 A1 00 30 */ stfs f5, 0x30(r1) /* 80278598 002754F8 C0 45 00 00 */ lfs f2, 0(r5) /* 8027859C 002754FC 38 00 0B 9A */ li r0, 0xb9a @@ -9450,8 +9450,8 @@ lbl_80278D78: /* 80278D9C 00275CFC 39 00 00 00 */ li r8, 0 /* 80278DA0 00275D00 39 40 00 03 */ li r10, 3 /* 80278DA4 00275D04 90 81 00 74 */ stw r4, 0x74(r1) -/* 80278DA8 00275D08 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80278DAC 00275D0C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80278DA8 00275D08 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80278DAC 00275D0C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80278DB0 00275D10 A0 01 00 3C */ lhz r0, 0x3c(r1) /* 80278DB4 00275D14 90 61 00 70 */ stw r3, 0x70(r1) /* 80278DB8 00275D18 7F C3 F3 78 */ mr r3, r30 @@ -9514,8 +9514,8 @@ lbl_80278E08: /* 80278E98 00275DF8 39 00 00 00 */ li r8, 0 /* 80278E9C 00275DFC 39 40 00 03 */ li r10, 3 /* 80278EA0 00275E00 90 81 00 5C */ stw r4, 0x5c(r1) -/* 80278EA4 00275E04 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80278EA8 00275E08 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80278EA4 00275E04 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80278EA8 00275E08 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80278EAC 00275E0C A0 01 00 3C */ lhz r0, 0x3c(r1) /* 80278EB0 00275E10 90 61 00 58 */ stw r3, 0x58(r1) /* 80278EB4 00275E14 7F C3 F3 78 */ mr r3, r30 @@ -10295,9 +10295,9 @@ lbl_802799D8: /* 802799EC 0027694C 38 81 04 04 */ addi r4, r1, 0x404 /* 802799F0 00276950 48 09 91 85 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802799F4 00276954 C0 81 05 30 */ lfs f4, 0x530(r1) -/* 802799F8 00276958 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802799F8 00276958 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802799FC 0027695C 80 BE 08 4C */ lwz r5, 0x84c(r30) -/* 80279A00 00276960 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80279A00 00276960 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80279A04 00276964 C0 61 05 40 */ lfs f3, 0x540(r1) /* 80279A08 00276968 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 80279A0C 0027696C C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) @@ -10507,9 +10507,9 @@ lbl_80279CF4: /* 80279D1C 00276C7C 38 81 03 A4 */ addi r4, r1, 0x3a4 /* 80279D20 00276C80 48 09 8E 55 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80279D24 00276C84 C1 BF 00 58 */ lfs f13, 0x58(r31) -/* 80279D28 00276C88 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80279D28 00276C88 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80279D2C 00276C8C C1 9F 00 48 */ lfs f12, 0x48(r31) -/* 80279D30 00276C90 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80279D30 00276C90 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80279D34 00276C94 C0 02 BC 9C */ lfs f0, lbl_805AD9BC@sda21(r2) /* 80279D38 00276C98 38 61 03 74 */ addi r3, r1, 0x374 /* 80279D3C 00276C9C C0 DF 00 38 */ lfs f6, 0x38(r31) @@ -10693,9 +10693,9 @@ lbl_80279FE0: /* 80279FF4 00276F54 38 81 03 44 */ addi r4, r1, 0x344 /* 80279FF8 00276F58 48 09 8B 7D */ bl __ct__12CTransform4fFRC12CTransform4f /* 80279FFC 00276F5C C1 BF 00 58 */ lfs f13, 0x58(r31) -/* 8027A000 00276F60 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8027A000 00276F60 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8027A004 00276F64 C1 9F 00 48 */ lfs f12, 0x48(r31) -/* 8027A008 00276F68 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8027A008 00276F68 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8027A00C 00276F6C C0 02 BC 9C */ lfs f0, lbl_805AD9BC@sda21(r2) /* 8027A010 00276F70 38 61 03 14 */ addi r3, r1, 0x314 /* 8027A014 00276F74 C0 DF 00 38 */ lfs f6, 0x38(r31) @@ -11292,8 +11292,8 @@ lbl_8027A834: /* 8027A908 00277868 39 40 00 00 */ li r10, 0 /* 8027A90C 0027786C 38 00 00 03 */ li r0, 3 /* 8027A910 00277870 90 81 02 6C */ stw r4, 0x26c(r1) -/* 8027A914 00277874 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8027A918 00277878 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8027A914 00277874 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8027A918 00277878 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8027A91C 0027787C 38 A1 00 44 */ addi r5, r1, 0x44 /* 8027A920 00277880 90 61 02 68 */ stw r3, 0x268(r1) /* 8027A924 00277884 38 81 00 4C */ addi r4, r1, 0x4c @@ -11887,8 +11887,8 @@ lbl_8027B128: /* 8027B1A8 00278108 38 61 01 14 */ addi r3, r1, 0x114 /* 8027B1AC 0027810C 48 0C 29 35 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 8027B1B0 00278110 C0 62 BC 08 */ lfs f3, lbl_805AD928@sda21(r2) -/* 8027B1B4 00278114 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8027B1B8 00278118 39 E4 66 A0 */ addi r15, r4, skZero3f@l +/* 8027B1B4 00278114 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8027B1B8 00278118 39 E4 66 A0 */ addi r15, r4, sZeroVector__9CVector3f@l /* 8027B1BC 0027811C 38 00 00 00 */ li r0, 0 /* 8027B1C0 00278120 D0 70 08 EC */ stfs f3, 0x8ec(r16) /* 8027B1C4 00278124 38 A0 FF FF */ li r5, -1 @@ -12040,9 +12040,9 @@ lbl_8027B3D4: /* 8027B3F8 00278358 48 0C 5A 49 */ bl __dt__6CTokenFv lbl_8027B3FC: /* 8027B3FC 0027835C 38 00 FF FF */ li r0, -1 -/* 8027B400 00278360 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8027B400 00278360 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8027B404 00278364 90 10 0C 58 */ stw r0, 0xc58(r16) -/* 8027B408 00278368 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8027B408 00278368 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8027B40C 0027836C C0 02 BC 08 */ lfs f0, lbl_805AD928@sda21(r2) /* 8027B410 00278370 7E A4 AB 78 */ mr r4, r21 /* 8027B414 00278374 7E C5 B3 78 */ mr r5, r22 @@ -13120,8 +13120,8 @@ BuildCameraShakeData__FRC21SPrimeCameraShakeData: /* 8027C3AC 0027930C 38 9F 00 54 */ addi r4, r31, 0x54 /* 8027C3B0 00279310 48 00 00 8D */ bl BuildCameraShakerComponent__FRC27SPrimeCameraShakerComponent /* 8027C3B4 00279314 88 9F 00 00 */ lbz r4, 0(r31) -/* 8027C3B8 00279318 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8027C3BC 0027931C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8027C3B8 00279318 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8027C3BC 0027931C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8027C3C0 00279320 C0 3F 00 04 */ lfs f1, 4(r31) /* 8027C3C4 00279324 7C 04 00 D0 */ neg r0, r4 /* 8027C3C8 00279328 C0 5F 00 08 */ lfs f2, 8(r31) diff --git a/asm/MetroidPrime/Enemies/CNewIntroBoss.s b/asm/MetroidPrime/Enemies/CNewIntroBoss.s index 56ae6beb..a3ddae1e 100644 --- a/asm/MetroidPrime/Enemies/CNewIntroBoss.s +++ b/asm/MetroidPrime/Enemies/CNewIntroBoss.s @@ -652,10 +652,10 @@ lbl_8018A148: /* 8018A3FC 0018735C B0 01 00 64 */ sth r0, 0x64(r1) /* 8018A400 00187360 4B E7 A8 B9 */ bl string_l__4rstlFPCc /* 8018A404 00187364 38 01 00 64 */ addi r0, r1, 0x64 -/* 8018A408 00187368 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8018A408 00187368 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8018A40C 0018736C 90 01 00 08 */ stw r0, 8(r1) /* 8018A410 00187370 38 01 00 98 */ addi r0, r1, 0x98 -/* 8018A414 00187374 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8018A414 00187374 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8018A418 00187378 38 61 00 6C */ addi r3, r1, 0x6c /* 8018A41C 0018737C 90 01 00 0C */ stw r0, 0xc(r1) /* 8018A420 00187380 38 A1 01 D0 */ addi r5, r1, 0x1d0 @@ -716,10 +716,10 @@ lbl_8018A478: /* 8018A4F4 00187454 B0 01 00 58 */ sth r0, 0x58(r1) /* 8018A4F8 00187458 4B E7 A7 C1 */ bl string_l__4rstlFPCc /* 8018A4FC 0018745C 38 01 00 58 */ addi r0, r1, 0x58 -/* 8018A500 00187460 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8018A500 00187460 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8018A504 00187464 90 01 00 08 */ stw r0, 8(r1) /* 8018A508 00187468 38 01 00 90 */ addi r0, r1, 0x90 -/* 8018A50C 0018746C 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8018A50C 0018746C 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8018A510 00187470 38 61 00 60 */ addi r3, r1, 0x60 /* 8018A514 00187474 90 01 00 0C */ stw r0, 0xc(r1) /* 8018A518 00187478 38 A1 01 AC */ addi r5, r1, 0x1ac @@ -797,10 +797,10 @@ lbl_8018A570: /* 8018A630 00187590 B0 01 00 4C */ sth r0, 0x4c(r1) /* 8018A634 00187594 4B E7 A6 85 */ bl string_l__4rstlFPCc /* 8018A638 00187598 38 01 00 4C */ addi r0, r1, 0x4c -/* 8018A63C 0018759C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8018A63C 0018759C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8018A640 001875A0 90 01 00 08 */ stw r0, 8(r1) /* 8018A644 001875A4 38 01 00 88 */ addi r0, r1, 0x88 -/* 8018A648 001875A8 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8018A648 001875A8 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8018A64C 001875AC 38 61 00 54 */ addi r3, r1, 0x54 /* 8018A650 001875B0 90 01 00 0C */ stw r0, 0xc(r1) /* 8018A654 001875B4 38 A1 01 88 */ addi r5, r1, 0x188 @@ -1201,11 +1201,11 @@ lbl_8018AC24: /* 8018AC3C 00187B9C 40 82 00 24 */ bne lbl_8018AC60 lbl_8018AC40: /* 8018AC40 00187BA0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8018AC44 00187BA4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8018AC44 00187BA4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8018AC48 00187BA8 7F E3 FB 78 */ mr r3, r31 /* 8018AC4C 00187BAC C0 22 A3 C0 */ lfs f1, lbl_805AC0E0@sda21(r2) /* 8018AC50 00187BB0 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 8018AC54 00187BB4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8018AC54 00187BB4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8018AC58 00187BB8 7D 89 03 A6 */ mtctr r12 /* 8018AC5C 00187BBC 4E 80 04 21 */ bctrl lbl_8018AC60: @@ -1287,8 +1287,8 @@ lbl_8018AD4C: lbl_8018AD68: /* 8018AD68 00187CC8 48 00 13 F1 */ bl GetGenerateForHealth__13CNewIntroBossCFRC13CStateManager /* 8018AD6C 00187CCC 3C E0 80 3E */ lis r7, lbl_803DAA68@ha -/* 8018AD70 00187CD0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8018AD74 00187CD4 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 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 /* 8018AD7C 00187CDC 3D 00 80 3E */ lis r8, lbl_803DA9F0@ha /* 8018AD80 00187CE0 80 A1 00 24 */ lwz r5, 0x24(r1) @@ -1672,8 +1672,8 @@ lbl_8018B270: /* 8018B2CC 0018822C D0 41 00 34 */ stfs f2, 0x34(r1) /* 8018B2D0 00188230 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8018B2D4 00188234 48 18 95 7D */ bl AsNormalized__9CVector3fCFv -/* 8018B2D8 00188238 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8018B2DC 0018823C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8018B2D8 00188238 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8018B2DC 0018823C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8018B2E0 00188240 C0 61 00 08 */ lfs f3, 8(r1) /* 8018B2E4 00188244 38 81 00 38 */ addi r4, r1, 0x38 /* 8018B2E8 00188248 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -2256,9 +2256,9 @@ lbl_8018BB74: /* 8018BB78 00188AD8 B0 1C 06 76 */ sth r0, 0x676(r28) lbl_8018BB7C: /* 8018BB7C 00188ADC C0 41 00 C4 */ lfs f2, 0xc4(r1) -/* 8018BB80 00188AE0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8018BB80 00188AE0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8018BB84 00188AE4 C0 21 00 D4 */ lfs f1, 0xd4(r1) -/* 8018BB88 00188AE8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8018BB88 00188AE8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8018BB8C 00188AEC C0 01 00 E4 */ lfs f0, 0xe4(r1) /* 8018BB90 00188AF0 38 61 00 28 */ addi r3, r1, 0x28 /* 8018BB94 00188AF4 D0 41 00 10 */ stfs f2, 0x10(r1) @@ -2379,9 +2379,9 @@ PlayerPos__13CNewIntroBossCFRC13CStateManager: /* 8018BD40 00188CA0 48 1F E1 B5 */ bl __shl2i /* 8018BD44 00188CA4 39 00 00 00 */ li r8, 0 /* 8018BD48 00188CA8 38 00 00 01 */ li r0, 1 -/* 8018BD4C 00188CAC 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 8018BD4C 00188CAC 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 8018BD50 00188CB0 90 81 00 1C */ stw r4, 0x1c(r1) -/* 8018BD54 00188CB4 38 C5 67 00 */ addi r6, r5, lbl_805A6700@l +/* 8018BD54 00188CB4 38 C5 67 00 */ addi r6, r5, sDownVector__9CVector3f@l /* 8018BD58 00188CB8 C0 22 A3 D8 */ lfs f1, lbl_805AC0F8@sda21(r2) /* 8018BD5C 00188CBC 90 61 00 18 */ stw r3, 0x18(r1) /* 8018BD60 00188CC0 7F E4 FB 78 */ mr r4, r31 @@ -2527,11 +2527,11 @@ ProjectileInfo__13CNewIntroBossFv: /* 8018BF70 00188ED0 38 78 05 AC */ addi r3, r24, 0x5ac /* 8018BF74 00188ED4 48 09 01 35 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo /* 8018BF78 00188ED8 A0 8D A3 8C */ lhz r4, kInvalidUniqueId@sda21(r13) -/* 8018BF7C 00188EDC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8018BF7C 00188EDC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8018BF80 00188EE0 38 CD A9 18 */ addi r6, r13, "_EmptyString__Q24rstl66basic_string,Q24rstl17rmemory_allocator>"@sda21 /* 8018BF84 00188EE4 38 00 00 00 */ li r0, 0 /* 8018BF88 00188EE8 B0 98 05 D4 */ sth r4, 0x5d4(r24) -/* 8018BF8C 00188EEC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8018BF8C 00188EEC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8018BF90 00188EF0 C0 62 A3 C0 */ lfs f3, lbl_805AC0E0@sda21(r2) /* 8018BF94 00188EF4 7F 24 CB 78 */ mr r4, r25 /* 8018BF98 00188EF8 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) diff --git a/asm/MetroidPrime/Enemies/COmegaPirate.s b/asm/MetroidPrime/Enemies/COmegaPirate.s index 2fb2c2f3..9947c38c 100644 --- a/asm/MetroidPrime/Enemies/COmegaPirate.s +++ b/asm/MetroidPrime/Enemies/COmegaPirate.s @@ -851,9 +851,9 @@ lbl_8028BAB4: /* 8028BAC4 00288A24 EC 94 00 32 */ fmuls f4, f20, f0 /* 8028BAC8 00288A28 C0 24 00 00 */ lfs f1, 0(r4) /* 8028BACC 00288A2C C0 04 00 10 */ lfs f0, 0x10(r4) -/* 8028BAD0 00288A30 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8028BAD0 00288A30 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8028BAD4 00288A34 C0 64 00 20 */ lfs f3, 0x20(r4) -/* 8028BAD8 00288A38 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 8028BAD8 00288A38 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 8028BADC 00288A3C C0 44 00 08 */ lfs f2, 8(r4) /* 8028BAE0 00288A40 EF A4 00 72 */ fmuls f29, f4, f1 /* 8028BAE4 00288A44 C0 24 00 18 */ lfs f1, 0x18(r4) @@ -4193,9 +4193,9 @@ lbl_8028E914: /* 8028E938 0028B898 38 80 00 27 */ li r4, 0x27 /* 8028E93C 0028B89C 4B DC 56 45 */ bl RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager /* 8028E940 0028B8A0 38 00 00 00 */ li r0, 0 -/* 8028E944 0028B8A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8028E944 0028B8A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8028E948 0028B8A8 98 1E 0B 6C */ stb r0, 0xb6c(r30) -/* 8028E94C 0028B8AC 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8028E94C 0028B8AC 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 8028E950 0028B8B0 C0 22 BE A0 */ lfs f1, lbl_805ADBC0@sda21(r2) /* 8028E954 0028B8B4 7F C3 F3 78 */ mr r3, r30 /* 8028E958 0028B8B8 98 1E 0B 6D */ stb r0, 0xb6d(r30) @@ -4280,9 +4280,9 @@ lbl_8028EA70: /* 8028EA84 0028B9E4 38 80 00 33 */ li r4, 0x33 /* 8028EA88 0028B9E8 4B DC 58 C9 */ bl AddMaterial__6CActorF14EMaterialTypesR13CStateManager /* 8028EA8C 0028B9EC 81 5F 08 CC */ lwz r10, 0x8cc(r31) -/* 8028EA90 0028B9F0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8028EA90 0028B9F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8028EA94 0028B9F4 C0 9E 00 60 */ lfs f4, 0x60(r30) -/* 8028EA98 0028B9F8 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8028EA98 0028B9F8 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 8028EA9C 0028B9FC C0 7E 00 50 */ lfs f3, 0x50(r30) /* 8028EAA0 0028BA00 38 00 00 00 */ li r0, 0 /* 8028EAA4 0028BA04 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -4692,10 +4692,10 @@ sub_8028efc4: /* 8028F01C 0028BF7C F2 C1 01 C8 */ psq_st f22, 456(r1), 0, qr0 /* 8028F020 0028BF80 BF 21 01 A4 */ stmw r25, 0x1a4(r1) /* 8028F024 0028BF84 7C 9F 23 78 */ mr r31, r4 -/* 8028F028 0028BF88 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8028F028 0028BF88 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8028F02C 0028BF8C 80 BF 08 4C */ lwz r5, 0x84c(r31) /* 8028F030 0028BF90 7C 7E 1B 78 */ mr r30, r3 -/* 8028F034 0028BF94 C7 24 66 A0 */ lfsu f25, skZero3f@l(r4) +/* 8028F034 0028BF94 C7 24 66 A0 */ lfsu f25, sZeroVector__9CVector3f@l(r4) /* 8028F038 0028BF98 3B 80 00 00 */ li r28, 0 /* 8028F03C 0028BF9C C2 C2 BE 9C */ lfs f22, lbl_805ADBBC@sda21(r2) /* 8028F040 0028BFA0 3B 40 00 00 */ li r26, 0 @@ -4915,9 +4915,9 @@ sub_8028f348: /* 8028F37C 0028C2DC 48 0F AB 79 */ bl __shl2i /* 8028F380 0028C2E0 39 00 00 00 */ li r8, 0 /* 8028F384 0028C2E4 38 00 00 01 */ li r0, 1 -/* 8028F388 0028C2E8 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 8028F388 0028C2E8 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 8028F38C 0028C2EC 90 81 00 0C */ stw r4, 0xc(r1) -/* 8028F390 0028C2F0 38 C5 67 00 */ addi r6, r5, lbl_805A6700@l +/* 8028F390 0028C2F0 38 C5 67 00 */ addi r6, r5, sDownVector__9CVector3f@l /* 8028F394 0028C2F4 C0 22 BE F4 */ lfs f1, lbl_805ADC14@sda21(r2) /* 8028F398 0028C2F8 90 61 00 08 */ stw r3, 8(r1) /* 8028F39C 0028C2FC 7F E4 FB 78 */ mr r4, r31 @@ -7116,9 +7116,9 @@ lbl_80291218: /* 802912F4 0028E254 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 802912F8 0028E258 7D 89 03 A6 */ mtctr r12 /* 802912FC 0028E25C 4E 80 04 21 */ bctrl -/* 80291300 0028E260 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80291300 0028E260 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80291304 0028E264 7F C3 F3 78 */ mr r3, r30 -/* 80291308 0028E268 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80291308 0028E268 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8029130C 0028E26C 38 A1 00 30 */ addi r5, r1, 0x30 /* 80291310 0028E270 38 81 00 38 */ addi r4, r1, 0x38 /* 80291314 0028E274 38 C1 00 28 */ addi r6, r1, 0x28 @@ -7217,8 +7217,8 @@ lbl_8029142C: /* 80291474 0028E3D4 39 00 00 00 */ li r8, 0 /* 80291478 0028E3D8 39 40 00 03 */ li r10, 3 /* 8029147C 0028E3DC 90 81 01 5C */ stw r4, 0x15c(r1) -/* 80291480 0028E3E0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80291484 0028E3E4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80291480 0028E3E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80291484 0028E3E4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80291488 0028E3E8 A0 14 00 00 */ lhz r0, 0(r20) /* 8029148C 0028E3EC 90 61 01 58 */ stw r3, 0x158(r1) /* 80291490 0028E3F0 7F C3 F3 78 */ mr r3, r30 @@ -7275,8 +7275,8 @@ lbl_80291518: /* 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 -/* 8029153C 0028E49C 3C 60 80 5A */ lis r3, lbl_805A670C@ha -/* 80291540 0028E4A0 38 83 67 0C */ addi r4, r3, lbl_805A670C@l +/* 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 /* 8029154C 0028E4AC C0 44 00 00 */ lfs f2, 0(r4) @@ -7325,8 +7325,8 @@ lbl_802915D8: /* 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 -/* 802915FC 0028E55C 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 80291600 0028E560 38 83 67 18 */ addi r4, r3, lbl_805A6718@l +/* 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 /* 8029160C 0028E56C C0 44 00 00 */ lfs f2, 0(r4) @@ -7656,8 +7656,8 @@ lbl_8029186C: /* 80291A90 0028E9F0 38 80 FF FF */ li r4, -1 /* 80291A94 0028E9F4 48 0A F3 AD */ bl __dt__6CTokenFv /* 80291A98 0028E9F8 C0 02 BE 9C */ lfs f0, lbl_805ADBBC@sda21(r2) -/* 80291A9C 0028E9FC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80291AA0 0028EA00 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80291A9C 0028E9FC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80291AA0 0028EA00 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80291AA4 0028EA04 38 A0 00 00 */ li r5, 0 /* 80291AA8 0028EA08 D0 1F 0A 2C */ stfs f0, 0xa2c(r31) /* 80291AAC 0028EA0C 38 00 00 01 */ li r0, 1 diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index c42aac9b..b429ff46 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -987,8 +987,8 @@ lbl_801572DC: /* 80157364 001542C4 D0 3A 06 30 */ stfs f1, 0x630(r26) /* 80157368 001542C8 48 00 00 20 */ b lbl_80157388 lbl_8015736C: -/* 8015736C 001542CC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80157370 001542D0 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8015736C 001542CC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80157370 001542D0 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80157374 001542D4 D0 1A 06 28 */ stfs f0, 0x628(r26) /* 80157378 001542D8 C0 03 00 04 */ lfs f0, 4(r3) /* 8015737C 001542DC D0 1A 06 2C */ stfs f0, 0x62c(r26) @@ -1093,12 +1093,12 @@ lbl_80157460: /* 801574F0 00154450 38 A1 01 48 */ addi r5, r1, 0x148 /* 801574F4 00154454 48 11 1C A9 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f /* 801574F8 00154458 C0 41 00 AC */ lfs f2, 0xac(r1) -/* 801574FC 0015445C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801574FC 0015445C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157500 00154460 C0 21 00 B0 */ lfs f1, 0xb0(r1) /* 80157504 00154464 38 81 01 FC */ addi r4, r1, 0x1fc /* 80157508 00154468 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 8015750C 0015446C EC BF 00 B2 */ fmuls f5, f31, f2 -/* 80157510 00154470 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 80157510 00154470 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 80157514 00154474 EC 9F 00 72 */ fmuls f4, f31, f1 /* 80157518 00154478 C0 DA 07 04 */ lfs f6, 0x704(r26) /* 8015751C 0015447C EC 7F 00 32 */ fmuls f3, f31, f0 @@ -1115,9 +1115,9 @@ lbl_80157460: /* 80157548 001544A8 38 63 00 04 */ addi r3, r3, 4 /* 8015754C 001544AC 4B FD A1 CD */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd lbl_80157550: -/* 80157550 001544B0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157550 001544B0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157554 001544B4 C0 3A 06 28 */ lfs f1, 0x628(r26) -/* 80157558 001544B8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80157558 001544B8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8015755C 001544BC 38 00 00 00 */ li r0, 0 /* 80157560 001544C0 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80157564 001544C4 40 82 00 28 */ bne lbl_8015758C @@ -1138,8 +1138,8 @@ lbl_8015758C: /* 8015759C 001544FC 38 9A 06 28 */ addi r4, r26, 0x628 /* 801575A0 00154500 38 A1 01 48 */ addi r5, r1, 0x148 /* 801575A4 00154504 48 11 1B F9 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 801575A8 00154508 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801575AC 0015450C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 801575A8 00154508 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801575AC 0015450C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 801575B0 00154510 C0 A1 00 88 */ lfs f5, 0x88(r1) /* 801575B4 00154514 38 81 01 E0 */ addi r4, r1, 0x1e0 /* 801575B8 00154518 C0 81 00 8C */ lfs f4, 0x8c(r1) @@ -1157,9 +1157,9 @@ lbl_8015758C: /* 801575E8 00154548 38 63 00 04 */ addi r3, r3, 4 /* 801575EC 0015454C 4B FD A1 2D */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd lbl_801575F0: -/* 801575F0 00154550 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801575F0 00154550 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801575F4 00154554 83 7A 05 E4 */ lwz r27, 0x5e4(r26) -/* 801575F8 00154558 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 801575F8 00154558 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 801575FC 0015455C 48 00 00 F4 */ b lbl_801576F0 lbl_80157600: /* 80157600 00154560 C0 5B 00 04 */ lfs f2, 4(r27) @@ -1202,12 +1202,12 @@ lbl_80157600: /* 80157694 001545F4 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 80157698 001545F8 D0 21 01 44 */ stfs f1, 0x144(r1) /* 8015769C 001545FC 48 11 1B 01 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 801576A0 00154600 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801576A0 00154600 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801576A4 00154604 C0 C1 00 64 */ lfs f6, 0x64(r1) /* 801576A8 00154608 C0 A1 00 68 */ lfs f5, 0x68(r1) /* 801576AC 0015460C 38 81 01 C4 */ addi r4, r1, 0x1c4 /* 801576B0 00154610 C0 81 00 6C */ lfs f4, 0x6c(r1) -/* 801576B4 00154614 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 801576B4 00154614 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 801576B8 00154618 C0 5F 00 04 */ lfs f2, 4(r31) /* 801576BC 0015461C C0 3F 00 08 */ lfs f1, 8(r31) /* 801576C0 00154620 C0 02 9E 60 */ lfs f0, lbl_805ABB80@sda21(r2) @@ -1240,12 +1240,12 @@ lbl_801576F0: /* 80157724 00154684 38 9A 06 34 */ addi r4, r26, 0x634 /* 80157728 00154688 38 A1 01 48 */ addi r5, r1, 0x148 /* 8015772C 0015468C 48 11 1A 71 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 80157730 00154690 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157730 00154690 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157734 00154694 C0 A1 00 58 */ lfs f5, 0x58(r1) /* 80157738 00154698 C0 81 00 5C */ lfs f4, 0x5c(r1) /* 8015773C 0015469C 38 81 01 A8 */ addi r4, r1, 0x1a8 /* 80157740 001546A0 C0 61 00 60 */ lfs f3, 0x60(r1) -/* 80157744 001546A4 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80157744 001546A4 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 80157748 001546A8 C0 3F 00 04 */ lfs f1, 4(r31) /* 8015774C 001546AC C0 1F 00 08 */ lfs f0, 8(r31) /* 80157750 001546B0 D0 A1 01 A8 */ stfs f5, 0x1a8(r1) @@ -1263,12 +1263,12 @@ lbl_801576F0: /* 80157780 001546E0 38 9A 06 40 */ addi r4, r26, 0x640 /* 80157784 001546E4 38 A1 01 48 */ addi r5, r1, 0x148 /* 80157788 001546E8 48 11 1A 15 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 8015778C 001546EC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015778C 001546EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157790 001546F0 C0 A1 00 4C */ lfs f5, 0x4c(r1) /* 80157794 001546F4 C0 81 00 50 */ lfs f4, 0x50(r1) /* 80157798 001546F8 38 81 01 8C */ addi r4, r1, 0x18c /* 8015779C 001546FC C0 61 00 54 */ lfs f3, 0x54(r1) -/* 801577A0 00154700 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 801577A0 00154700 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 801577A4 00154704 C0 3F 00 04 */ lfs f1, 4(r31) /* 801577A8 00154708 C0 1F 00 08 */ lfs f0, 8(r31) /* 801577AC 0015470C D0 A1 01 8C */ stfs f5, 0x18c(r1) @@ -1305,12 +1305,12 @@ lbl_801576F0: /* 80157828 00154788 D0 01 01 38 */ stfs f0, 0x138(r1) /* 8015782C 0015478C C3 FA 06 F8 */ lfs f31, 0x6f8(r26) /* 80157830 00154790 48 11 19 6D */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 80157834 00154794 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157834 00154794 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157838 00154798 C0 A1 00 28 */ lfs f5, 0x28(r1) /* 8015783C 0015479C C0 81 00 2C */ lfs f4, 0x2c(r1) /* 80157840 001547A0 38 81 01 70 */ addi r4, r1, 0x170 /* 80157844 001547A4 C0 61 00 30 */ lfs f3, 0x30(r1) -/* 80157848 001547A8 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80157848 001547A8 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 8015784C 001547AC C0 3F 00 04 */ lfs f1, 4(r31) /* 80157850 001547B0 C0 1F 00 08 */ lfs f0, 8(r31) /* 80157854 001547B4 D0 A1 01 70 */ stfs f5, 0x170(r1) @@ -1324,7 +1324,7 @@ lbl_801576F0: /* 80157874 001547D4 38 63 00 04 */ addi r3, r3, 4 /* 80157878 001547D8 4B FD 9E A1 */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd /* 8015787C 001547DC C1 3A 00 58 */ lfs f9, 0x58(r26) -/* 80157880 001547E0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157880 001547E0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157884 001547E4 C0 1A 06 04 */ lfs f0, 0x604(r26) /* 80157888 001547E8 38 81 01 54 */ addi r4, r1, 0x154 /* 8015788C 001547EC C1 1A 00 48 */ lfs f8, 0x48(r26) @@ -1333,7 +1333,7 @@ lbl_801576F0: /* 80157898 001547F8 C0 FA 06 FC */ lfs f7, 0x6fc(r26) /* 8015789C 001547FC EC C0 02 32 */ fmuls f6, f0, f8 /* 801578A0 00154800 EC 60 01 32 */ fmuls f3, f0, f4 -/* 801578A4 00154804 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 801578A4 00154804 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 801578A8 00154808 C0 3F 00 04 */ lfs f1, 4(r31) /* 801578AC 0015480C C0 1F 00 08 */ lfs f0, 8(r31) /* 801578B0 00154810 D0 61 01 54 */ stfs f3, 0x154(r1) @@ -1418,9 +1418,9 @@ GetUp__9CParasiteFR13CStateManager9EStateMsgf: /* 801579B4 00154914 2C 00 00 02 */ cmpwi r0, 2 /* 801579B8 00154918 40 82 00 44 */ bne lbl_801579FC /* 801579BC 0015491C C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 801579C0 00154920 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801579C0 00154920 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801579C4 00154924 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 801579C8 00154928 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801579C8 00154928 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801579CC 0015492C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 801579D0 00154930 38 61 00 08 */ addi r3, r1, 8 /* 801579D4 00154934 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1456,9 +1456,9 @@ Crouch__9CParasiteFR13CStateManager9EStateMsgf: /* 80157A3C 0015499C 2C 00 00 02 */ cmpwi r0, 2 /* 80157A40 001549A0 40 82 00 44 */ bne lbl_80157A84 /* 80157A44 001549A4 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80157A48 001549A8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157A48 001549A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157A4C 001549AC C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80157A50 001549B0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80157A50 001549B0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80157A54 001549B4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80157A58 001549B8 38 61 00 08 */ addi r3, r1, 8 /* 80157A5C 001549BC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1510,9 +1510,9 @@ lbl_80157AD0: /* 80157AFC 00154A5C 2C 00 00 02 */ cmpwi r0, 2 /* 80157B00 00154A60 40 82 00 E4 */ bne lbl_80157BE4 /* 80157B04 00154A64 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80157B08 00154A68 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80157B08 00154A68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80157B0C 00154A6C C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 80157B10 00154A70 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80157B10 00154A70 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80157B14 00154A74 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80157B18 00154A78 38 61 00 08 */ addi r3, r1, 8 /* 80157B1C 00154A7C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1876,7 +1876,7 @@ lbl_80157FC8: /* 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, skZero3f@ha +/* 8015804C 00154FAC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80158050 00154FB0 39 05 AA 68 */ addi r8, r5, lbl_803DAA68@l /* 80158054 00154FB4 98 1F 07 42 */ stb r0, 0x742(r31) /* 80158058 00154FB8 3C C0 80 3E */ lis r6, lbl_803DA9FC@ha @@ -1884,7 +1884,7 @@ lbl_80157FC8: /* 80158060 00154FC0 38 E0 00 10 */ li r7, 0x10 /* 80158064 00154FC4 89 5F 07 42 */ lbz r10, 0x742(r31) /* 80158068 00154FC8 51 6A 1F 38 */ rlwimi r10, r11, 3, 0x1c, 0x1c -/* 8015806C 00154FCC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8015806C 00154FCC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80158070 00154FD0 91 01 00 2C */ stw r8, 0x2c(r1) /* 80158074 00154FD4 38 C6 A9 FC */ addi r6, r6, lbl_803DA9FC@l /* 80158078 00154FD8 51 60 36 72 */ rlwimi r0, r11, 6, 0x19, 0x19 @@ -2130,8 +2130,8 @@ lbl_801583CC: /* 80158404 00155364 39 06 AA 68 */ addi r8, r6, lbl_803DAA68@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, skZero3f@ha -/* 80158414 00155374 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 80158410 00155370 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80158414 00155374 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 80158418 00155378 3C C0 80 3E */ lis r6, lbl_803DA9FC@ha /* 8015841C 0015537C C0 BF 05 F8 */ lfs f5, 0x5f8(r31) /* 80158420 00155380 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -2218,9 +2218,9 @@ FaceTarget__9CParasiteF9CVector3f: /* 80158550 001554B0 90 01 00 A4 */ stw r0, 0xa4(r1) /* 80158554 001554B4 93 E1 00 9C */ stw r31, 0x9c(r1) /* 80158558 001554B8 7C 7F 1B 78 */ mr r31, r3 -/* 8015855C 001554BC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8015855C 001554BC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80158560 001554C0 C0 24 00 08 */ lfs f1, 8(r4) -/* 80158564 001554C4 38 A3 66 70 */ addi r5, r3, skIdentity4f@l +/* 80158564 001554C4 38 A3 66 70 */ addi r5, r3, sIdentity__12CTransform4f@l /* 80158568 001554C8 C0 1F 00 60 */ lfs f0, 0x60(r31) /* 8015856C 001554CC 38 61 00 18 */ addi r3, r1, 0x18 /* 80158570 001554D0 C0 64 00 04 */ lfs f3, 4(r4) @@ -2324,8 +2324,8 @@ lbl_801586AC: /* 801586E4 00155644 38 80 00 02 */ li r4, 2 /* 801586E8 00155648 4B FE 22 F1 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType lbl_801586EC: -/* 801586EC 0015564C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801586F0 00155650 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 801586EC 0015564C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801586F0 00155650 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 801586F4 00155654 38 60 00 00 */ li r3, 0 /* 801586F8 00155658 D0 1F 01 50 */ stfs f0, 0x150(r31) /* 801586FC 0015565C C0 04 00 04 */ lfs f0, 4(r4) @@ -2406,9 +2406,9 @@ TargetPatrol__9CParasiteFR13CStateManager9EStateMsgf: /* 80158808 00155768 41 80 00 4C */ blt lbl_80158854 /* 8015880C 0015576C 48 00 00 48 */ b lbl_80158854 lbl_80158810: -/* 80158810 00155770 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80158810 00155770 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80158814 00155774 7F E4 FB 78 */ mr r4, r31 -/* 80158818 00155778 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 80158818 00155778 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 8015881C 0015577C 38 A0 00 0D */ li r5, 0xd /* 80158820 00155780 C0 07 00 00 */ lfs f0, 0(r7) /* 80158824 00155784 38 61 00 08 */ addi r3, r1, 8 @@ -2491,9 +2491,9 @@ lbl_80158938: /* 80158938 00155898 7C 85 23 78 */ mr r5, r4 /* 8015893C 0015589C 38 80 00 25 */ li r4, 0x25 /* 80158940 001558A0 4B EF B6 41 */ bl RemoveMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 80158944 001558A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80158944 001558A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80158948 001558A8 38 80 00 01 */ li r4, 1 -/* 8015894C 001558AC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8015894C 001558AC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80158950 001558B0 38 60 00 00 */ li r3, 0 /* 80158954 001558B4 C0 05 00 00 */ lfs f0, 0(r5) /* 80158958 001558B8 D0 1F 01 50 */ stfs f0, 0x150(r31) @@ -2551,8 +2551,8 @@ lbl_801589E4: /* 80158A10 00155970 38 80 00 02 */ li r4, 2 /* 80158A14 00155974 4B FE 1F C5 */ bl SetLocomotionType__15CBodyControllerFQ23pas15ELocomotionType lbl_80158A18: -/* 80158A18 00155978 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80158A1C 0015597C C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80158A18 00155978 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80158A1C 0015597C C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80158A20 00155980 38 60 00 00 */ li r3, 0 /* 80158A24 00155984 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 80158A28 00155988 C0 04 00 04 */ lfs f0, 4(r4) @@ -2638,8 +2638,8 @@ lbl_80158B20: /* 80158B38 00155A98 48 00 00 D0 */ b lbl_80158C08 lbl_80158B3C: /* 80158B3C 00155A9C 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 80158B40 00155AA0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80158B44 00155AA4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -2735,8 +2735,8 @@ lbl_80158C90: /* 80158C98 00155BF8 39 25 AA 68 */ addi r9, r5, lbl_803DAA68@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, skZero3f@ha -/* 80158CA8 00155C08 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 80158CA4 00155C04 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80158CA8 00155C08 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 80158CAC 00155C0C 3C E0 80 3E */ lis r7, lbl_803DA9F0@ha /* 80158CB0 00155C10 7C 60 1B 78 */ mr r0, r3 /* 80158CB4 00155C14 39 00 00 0E */ li r8, 0xe @@ -3154,9 +3154,9 @@ lbl_80159230: /* 8015928C 001561EC 48 10 FC 31 */ bl OrientToSurfaceNormal__11CWallWalkerFRC9CVector3ff /* 80159290 001561F0 7F A3 EB 78 */ mr r3, r29 /* 80159294 001561F4 4B FC 20 E5 */ bl Stop__13CPhysicsActorFv -/* 80159298 001561F8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80159298 001561F8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8015929C 001561FC 7F A3 EB 78 */ mr r3, r29 -/* 801592A0 00156200 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801592A0 00156200 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801592A4 00156204 4B FC 19 FD */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 801592A8 00156208 88 1D 07 42 */ lbz r0, 0x742(r29) /* 801592AC 0015620C 38 60 00 01 */ li r3, 1 @@ -3248,11 +3248,11 @@ lbl_80159364: /* 801593E8 00156348 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 801593EC 0015634C C0 81 00 54 */ lfs f4, 0x54(r1) /* 801593F0 00156350 C0 61 00 58 */ lfs f3, 0x58(r1) -/* 801593F4 00156354 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801593F4 00156354 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801593F8 00156358 C0 41 00 5C */ lfs f2, 0x5c(r1) /* 801593FC 0015635C 3C 60 80 47 */ lis r3, lbl_8046C770@ha /* 80159400 00156360 C0 21 00 60 */ lfs f1, 0x60(r1) -/* 80159404 00156364 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 80159404 00156364 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 80159408 00156368 C0 01 00 64 */ lfs f0, 0x64(r1) /* 8015940C 0015636C 38 C3 C7 70 */ addi r6, r3, lbl_8046C770@l /* 80159410 00156370 90 01 00 68 */ stw r0, 0x68(r1) @@ -3365,11 +3365,11 @@ UpdateJumpVelocity__9CParasiteFv: /* 8015956C 001564CC 4E 80 04 21 */ bctrl /* 80159570 001564D0 C0 02 9E 50 */ lfs f0, lbl_805ABB70@sda21(r2) /* 80159574 001564D4 FC 20 08 50 */ fneg f1, f1 -/* 80159578 001564D8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80159578 001564D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015957C 001564DC D0 1E 01 50 */ stfs f0, 0x150(r30) /* 80159580 001564E0 D0 1E 01 54 */ stfs f0, 0x154(r30) /* 80159584 001564E4 D0 3E 01 58 */ stfs f1, 0x158(r30) -/* 80159588 001564E8 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 80159588 001564E8 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 8015958C 001564EC C0 23 00 04 */ lfs f1, 4(r3) /* 80159590 001564F0 C0 03 00 08 */ lfs f0, 8(r3) /* 80159594 001564F4 D0 41 00 28 */ stfs f2, 0x28(r1) @@ -3828,9 +3828,9 @@ lbl_80159BC8: /* 80159C38 00156B98 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80159C3C 00156B9C 7D 89 03 A6 */ mtctr r12 /* 80159C40 00156BA0 4E 80 04 21 */ bctrl -/* 80159C44 00156BA4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80159C44 00156BA4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80159C48 00156BA8 7F C3 F3 78 */ mr r3, r30 -/* 80159C4C 00156BAC 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80159C4C 00156BAC 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80159C50 00156BB0 38 A1 00 14 */ addi r5, r1, 0x14 /* 80159C54 00156BB4 38 81 00 1C */ addi r4, r1, 0x1c /* 80159C58 00156BB8 38 C1 00 0C */ addi r6, r1, 0xc @@ -4494,7 +4494,7 @@ Accept__9CParasiteFR8IVisitor: /* 8015A5E0 00157540 90 1F 00 00 */ stw r0, 0(r31) /* 8015A5E4 00157544 38 80 00 00 */ li r4, 0 /* 8015A5E8 00157548 38 00 FF FF */ li r0, -1 -/* 8015A5EC 0015754C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015A5EC 0015754C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015A5F0 00157550 90 9F 05 DC */ stw r4, 0x5dc(r31) /* 8015A5F4 00157554 90 9F 05 E0 */ stw r4, 0x5e0(r31) /* 8015A5F8 00157558 90 9F 05 E4 */ stw r4, 0x5e4(r31) @@ -4508,7 +4508,7 @@ Accept__9CParasiteFR8IVisitor: /* 8015A618 00157578 D0 1F 06 04 */ stfs f0, 0x604(r31) /* 8015A61C 0015757C D0 5F 06 08 */ stfs f2, 0x608(r31) /* 8015A620 00157580 D0 5F 06 0C */ stfs f2, 0x60c(r31) -/* 8015A624 00157584 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8015A624 00157584 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8015A628 00157588 D0 1F 06 14 */ stfs f0, 0x614(r31) /* 8015A62C 0015758C C0 03 00 04 */ lfs f0, 4(r3) /* 8015A630 00157590 D0 1F 06 18 */ stfs f0, 0x618(r31) @@ -4898,11 +4898,11 @@ sub_8015abb8: /* 8015ABEC 00157B4C 28 03 00 00 */ cmplwi r3, 0 /* 8015ABF0 00157B50 41 82 00 2C */ beq lbl_8015AC1C /* 8015ABF4 00157B54 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8015ABF8 00157B58 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8015ABF8 00157B58 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8015ABFC 00157B5C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8015AC00 00157B60 3C 80 80 3E */ lis r4, lbl_803D9BC8@ha /* 8015AC04 00157B64 90 03 00 00 */ stw r0, 0(r3) -/* 8015AC08 00157B68 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8015AC08 00157B68 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8015AC0C 00157B6C 38 04 9B C8 */ addi r0, r4, lbl_803D9BC8@l /* 8015AC10 00157B70 90 A3 00 00 */ stw r5, 0(r3) /* 8015AC14 00157B74 93 E3 00 04 */ stw r31, 4(r3) diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index d54168a7..921d1ac1 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -1917,8 +1917,8 @@ GetAimPosition__10CPatternedCFRC13CStateManagerf: /* 80078610 00075570 93 C1 01 A8 */ stw r30, 0x1a8(r1) /* 80078614 00075574 93 A1 01 A4 */ stw r29, 0x1a4(r1) /* 80078618 00075578 C0 02 89 08 */ lfs f0, lbl_805AA628@sda21(r2) -/* 8007861C 0007557C 3C A0 80 5A */ lis r5, skZero3f@ha -/* 80078620 00075580 C7 E5 66 A0 */ lfsu f31, skZero3f@l(r5) +/* 8007861C 0007557C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 80078620 00075580 C7 E5 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r5) /* 80078624 00075584 7C 7D 1B 78 */ mr r29, r3 /* 80078628 00075588 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8007862C 0007558C 7C 9E 23 78 */ mr r30, r4 @@ -2371,9 +2371,9 @@ lbl_80078C94: /* 80078CA0 00075C00 41 82 00 08 */ beq lbl_80078CA8 /* 80078CA4 00075C04 38 80 07 01 */ li r4, 0x701 lbl_80078CA8: -/* 80078CA8 00075C08 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80078CA8 00075C08 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80078CAC 00075C0C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) -/* 80078CB0 00075C10 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 80078CB0 00075C10 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 80078CB4 00075C14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80078CB8 00075C18 7F A5 EB 78 */ mr r5, r29 /* 80078CBC 00075C1C 38 E0 00 01 */ li r7, 1 @@ -2593,9 +2593,9 @@ lbl_80078F20: /* 80078FCC 00075F2C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80078FD0 00075F30 40 81 00 B8 */ ble lbl_80079088 /* 80078FD4 00075F34 C0 41 02 00 */ lfs f2, 0x200(r1) -/* 80078FD8 00075F38 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80078FD8 00075F38 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80078FDC 00075F3C C0 21 02 10 */ lfs f1, 0x210(r1) -/* 80078FE0 00075F40 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80078FE0 00075F40 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80078FE4 00075F44 C0 01 02 20 */ lfs f0, 0x220(r1) /* 80078FE8 00075F48 38 61 01 64 */ addi r3, r1, 0x164 /* 80078FEC 00075F4C D0 41 00 84 */ stfs f2, 0x84(r1) @@ -2755,9 +2755,9 @@ lbl_80079100: /* 80079240 000761A0 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 80079244 000761A4 7D 89 03 A6 */ mtctr r12 /* 80079248 000761A8 4E 80 04 21 */ bctrl -/* 8007924C 000761AC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007924C 000761AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80079250 000761B0 7F A3 EB 78 */ mr r3, r29 -/* 80079254 000761B4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80079254 000761B4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80079258 000761B8 38 A1 00 1C */ addi r5, r1, 0x1c /* 8007925C 000761BC 38 81 00 24 */ addi r4, r1, 0x24 /* 80079260 000761C0 38 C1 00 14 */ addi r6, r1, 0x14 @@ -2861,8 +2861,8 @@ ThinkAboutMove__10CPatternedFf: /* 800793AC 0007630C 40 82 00 2C */ bne lbl_800793D8 /* 800793B0 00076310 54 60 E7 FF */ rlwinm. r0, r3, 0x1c, 0x1f, 0x1f /* 800793B4 00076314 40 82 00 24 */ bne lbl_800793D8 -/* 800793B8 00076318 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800793BC 0007631C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800793B8 00076318 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800793BC 0007631C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800793C0 00076320 3B E0 00 00 */ li r31, 0 /* 800793C4 00076324 D0 1E 03 10 */ stfs f0, 0x310(r30) /* 800793C8 00076328 C0 03 00 04 */ lfs f0, 4(r3) @@ -2974,9 +2974,9 @@ lbl_80079514: /* 80079544 000764A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80079548 000764A8 41 82 00 B8 */ beq lbl_80079600 /* 8007954C 000764AC C0 5E 02 E4 */ lfs f2, 0x2e4(r30) -/* 80079550 000764B0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80079550 000764B0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80079554 000764B4 C0 1E 00 50 */ lfs f0, 0x50(r30) -/* 80079558 000764B8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80079558 000764B8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8007955C 000764BC C0 7E 02 E8 */ lfs f3, 0x2e8(r30) /* 80079560 000764C0 38 61 00 14 */ addi r3, r1, 0x14 /* 80079564 000764C4 EC 82 00 28 */ fsubs f4, f2, f0 @@ -3172,8 +3172,8 @@ lbl_800797FC: /* 80079828 00076788 39 40 00 00 */ li r10, 0 /* 8007982C 0007678C 38 00 00 03 */ li r0, 3 /* 80079830 00076790 90 81 00 54 */ stw r4, 0x54(r1) -/* 80079834 00076794 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80079838 00076798 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80079834 00076794 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80079838 00076798 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8007983C 0007679C 38 A1 00 14 */ addi r5, r1, 0x14 /* 80079840 000767A0 90 61 00 50 */ stw r3, 0x50(r1) /* 80079844 000767A4 38 81 00 1C */ addi r4, r1, 0x1c @@ -3661,9 +3661,9 @@ lbl_80079E34: /* 80079F50 00076EB0 B0 01 00 28 */ sth r0, 0x28(r1) /* 80079F54 00076EB4 B0 A1 00 2C */ sth r5, 0x2c(r1) /* 80079F58 00076EB8 48 04 94 F1 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 80079F5C 00076EBC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80079F5C 00076EBC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80079F60 00076EC0 7F E3 FB 78 */ mr r3, r31 -/* 80079F64 00076EC4 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80079F64 00076EC4 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80079F68 00076EC8 38 A1 00 28 */ addi r5, r1, 0x28 /* 80079F6C 00076ECC 38 81 00 2C */ addi r4, r1, 0x2c /* 80079F70 00076ED0 38 C1 00 20 */ addi r6, r1, 0x20 @@ -3746,9 +3746,9 @@ lbl_80079FA8: /* 8007A09C 00076FFC B0 01 00 18 */ sth r0, 0x18(r1) /* 8007A0A0 00077000 B0 A1 00 1C */ sth r5, 0x1c(r1) /* 8007A0A4 00077004 48 04 93 A5 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 8007A0A8 00077008 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007A0A8 00077008 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007A0AC 0007700C 7F E3 FB 78 */ mr r3, r31 -/* 8007A0B0 00077010 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8007A0B0 00077010 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8007A0B4 00077014 38 A1 00 18 */ addi r5, r1, 0x18 /* 8007A0B8 00077018 38 81 00 1C */ addi r4, r1, 0x1c /* 8007A0BC 0007701C 38 C1 00 10 */ addi r6, r1, 0x10 @@ -3911,9 +3911,9 @@ lbl_8007A2EC: /* 8007A304 00077264 88 03 03 00 */ lbz r0, 0x300(r3) /* 8007A308 00077268 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8007A30C 0007726C 40 82 00 FC */ bne lbl_8007A408 -/* 8007A310 00077270 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007A310 00077270 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007A314 00077274 C0 3E 03 A0 */ lfs f1, 0x3a0(r30) -/* 8007A318 00077278 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8007A318 00077278 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8007A31C 0007727C 38 00 00 00 */ li r0, 0 /* 8007A320 00077280 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 8007A324 00077284 40 82 00 28 */ bne lbl_8007A34C @@ -4365,8 +4365,8 @@ lbl_8007A928: /* 8007A93C 0007789C 7D 89 03 A6 */ mtctr r12 /* 8007A940 000778A0 4E 80 04 21 */ bctrl /* 8007A944 000778A4 81 9E 00 00 */ lwz r12, 0(r30) -/* 8007A948 000778A8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8007A94C 000778AC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8007A948 000778A8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8007A94C 000778AC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8007A950 000778B0 7F C3 F3 78 */ mr r3, r30 /* 8007A954 000778B4 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007A958 000778B8 7F E4 FB 78 */ mr r4, r31 @@ -4417,8 +4417,8 @@ lbl_8007A928: .global lbl_8007AA0C lbl_8007AA0C: /* 8007AA0C 0007796C 81 9E 00 00 */ lwz r12, 0(r30) -/* 8007AA10 00077970 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8007AA14 00077974 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8007AA10 00077970 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8007AA14 00077974 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8007AA18 00077978 7F C3 F3 78 */ mr r3, r30 /* 8007AA1C 0007797C 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007AA20 00077980 7F E4 FB 78 */ mr r4, r31 @@ -4429,8 +4429,8 @@ lbl_8007AA0C: .global lbl_8007AA34 lbl_8007AA34: /* 8007AA34 00077994 81 9E 00 00 */ lwz r12, 0(r30) -/* 8007AA38 00077998 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8007AA3C 0007799C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8007AA38 00077998 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8007AA3C 0007799C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8007AA40 000779A0 7F C3 F3 78 */ mr r3, r30 /* 8007AA44 000779A4 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007AA48 000779A8 7F E4 FB 78 */ mr r4, r31 @@ -4466,8 +4466,8 @@ lbl_8007AAA0: .global lbl_8007AAB8 lbl_8007AAB8: /* 8007AAB8 00077A18 81 9E 00 00 */ lwz r12, 0(r30) -/* 8007AABC 00077A1C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8007AAC0 00077A20 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8007AABC 00077A1C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8007AAC0 00077A20 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8007AAC4 00077A24 7F C3 F3 78 */ mr r3, r30 /* 8007AAC8 00077A28 81 8C 00 84 */ lwz r12, 0x84(r12) /* 8007AACC 00077A2C 7F E4 FB 78 */ mr r4, r31 @@ -4517,9 +4517,9 @@ MassiveFrozenDeath__10CPatternedFR13CStateManager: /* 8007AB64 00077AC4 90 1E 04 58 */ stw r0, 0x458(r30) lbl_8007AB68: /* 8007AB68 00077AC8 80 1E 04 58 */ lwz r0, 0x458(r30) -/* 8007AB6C 00077ACC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007AB6C 00077ACC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007AB70 00077AD0 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 8007AB74 00077AD4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8007AB74 00077AD4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8007AB78 00077AD8 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 8007AB7C 00077ADC 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 8007AB80 00077AE0 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -4630,9 +4630,9 @@ MassiveDeath__10CPatternedFR13CStateManager: /* 8007AD0C 00077C6C 7C 9F 23 78 */ mr r31, r4 /* 8007AD10 00077C70 93 C1 00 18 */ stw r30, 0x18(r1) /* 8007AD14 00077C74 7C 7E 1B 78 */ mr r30, r3 -/* 8007AD18 00077C78 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007AD18 00077C78 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007AD1C 00077C7C 80 1E 04 54 */ lwz r0, 0x454(r30) -/* 8007AD20 00077C80 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8007AD20 00077C80 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8007AD24 00077C84 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8007AD28 00077C88 38 61 00 08 */ addi r3, r1, 8 /* 8007AD2C 00077C8C C0 3E 00 50 */ lfs f1, 0x50(r30) @@ -5198,9 +5198,9 @@ lbl_8007B50C: /* 8007B558 000784B8 D0 61 00 24 */ stfs f3, 0x24(r1) /* 8007B55C 000784BC D0 01 00 08 */ stfs f0, 8(r1) /* 8007B560 000784C0 48 29 83 E1 */ bl RotateX__12CTransform4fFRC9CRelAngle -/* 8007B564 000784C4 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8007B564 000784C4 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8007B568 000784C8 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 8007B56C 000784CC 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8007B56C 000784CC 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8007B570 000784D0 38 A1 00 1C */ addi r5, r1, 0x1c /* 8007B574 000784D4 38 81 00 28 */ addi r4, r1, 0x28 /* 8007B578 000784D8 48 29 85 99 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -5269,8 +5269,8 @@ lbl_8007B62C: /* 8007B66C 000785CC 38 84 AA 68 */ addi r4, r4, lbl_803DAA68@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, skZero3f@ha -/* 8007B67C 000785DC C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 8007B678 000785D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8007B67C 000785DC C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 8007B680 000785E0 FC 80 08 50 */ fneg f4, f1 /* 8007B684 000785E4 90 81 00 4C */ stw r4, 0x4c(r1) /* 8007B688 000785E8 FC 60 00 50 */ fneg f3, f0 @@ -5649,9 +5649,9 @@ TryTurn__10CPatternedFR13CStateManageri: /* 8007BBB8 00078B18 D0 41 00 10 */ stfs f2, 0x10(r1) /* 8007BBBC 00078B1C D0 01 00 08 */ stfs f0, 8(r1) /* 8007BBC0 00078B20 48 29 8C 91 */ bl AsNormalized__9CVector3fCFv -/* 8007BBC4 00078B24 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007BBC4 00078B24 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007BBC8 00078B28 C0 61 00 14 */ lfs f3, 0x14(r1) -/* 8007BBCC 00078B2C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8007BBCC 00078B2C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8007BBD0 00078B30 C0 41 00 18 */ lfs f2, 0x18(r1) /* 8007BBD4 00078B34 C0 C5 00 00 */ lfs f6, 0(r5) /* 8007BBD8 00078B38 7F E3 FB 78 */ mr r3, r31 @@ -5882,11 +5882,11 @@ lbl_8007BEDC: 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, skZero3f@ha +/* 8007BEFC 00078E5C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007BF00 00078E60 3D 00 80 3E */ lis r8, lbl_803DAA68@ha /* 8007BF04 00078E64 90 01 00 44 */ stw r0, 0x44(r1) /* 8007BF08 00078E68 39 48 AA 68 */ addi r10, r8, lbl_803DAA68@l -/* 8007BF0C 00078E6C 38 E4 66 A0 */ addi r7, r4, skZero3f@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) /* 8007BF18 00078E78 38 C0 00 00 */ li r6, 0 @@ -6071,10 +6071,10 @@ lbl_8007C190: 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, skZero3f@ha +/* 8007C1B0 00079110 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007C1B4 00079114 3D 00 80 3E */ lis r8, lbl_803DAA68@ha /* 8007C1B8 00079118 90 01 00 34 */ stw r0, 0x34(r1) -/* 8007C1BC 0007911C 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8007C1BC 0007911C 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8007C1C0 00079120 39 08 AA 68 */ addi r8, r8, lbl_803DAA68@l /* 8007C1C4 00079124 39 20 00 0E */ li r9, 0xe /* 8007C1C8 00079128 93 E1 00 2C */ stw r31, 0x2c(r1) @@ -6366,9 +6366,9 @@ TryMeleeAttack__10CPatternedFR13CStateManageri: /* 8007C5DC 0007953C 90 01 00 34 */ stw r0, 0x34(r1) /* 8007C5E0 00079540 38 C6 AA 68 */ addi r6, r6, lbl_803DAA68@l /* 8007C5E4 00079544 38 00 00 00 */ li r0, 0 -/* 8007C5E8 00079548 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007C5E8 00079548 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007C5EC 0007954C 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8007C5F0 00079550 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8007C5F0 00079550 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8007C5F4 00079554 81 03 04 50 */ lwz r8, 0x450(r3) /* 8007C5F8 00079558 3C 60 80 3E */ lis r3, lbl_803DA9D8@ha /* 8007C5FC 0007955C C0 24 00 04 */ lfs f1, 4(r4) @@ -6931,9 +6931,9 @@ lbl_8007CDCC: /* 8007CDCC 00079D2C 88 1E 03 28 */ lbz r0, 0x328(r30) /* 8007CDD0 00079D30 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 8007CDD4 00079D34 40 82 00 34 */ bne lbl_8007CE08 -/* 8007CDD8 00079D38 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007CDD8 00079D38 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007CDDC 00079D3C 7F C3 F3 78 */ mr r3, r30 -/* 8007CDE0 00079D40 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 8007CDE0 00079D40 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8007CDE4 00079D44 7F E5 FB 78 */ mr r5, r31 /* 8007CDE8 00079D48 C0 06 00 00 */ lfs f0, 0(r6) /* 8007CDEC 00079D4C 38 80 00 25 */ li r4, 0x25 @@ -7447,11 +7447,11 @@ lbl_8007D494: /* 8007D52C 0007A48C 3C 60 80 3E */ lis r3, lbl_803DA5C8@ha /* 8007D530 0007A490 20 19 00 01 */ subfic r0, r25, 1 /* 8007D534 0007A494 38 83 A5 C8 */ addi r4, r3, lbl_803DA5C8@l -/* 8007D538 0007A498 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007D538 0007A498 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007D53C 0007A49C 90 9F 00 00 */ stw r4, 0(r31) /* 8007D540 0007A4A0 38 80 FF FF */ li r4, -1 /* 8007D544 0007A4A4 7C 00 00 34 */ cntlzw r0, r0 -/* 8007D548 0007A4A8 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8007D548 0007A4A8 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8007D54C 0007A4AC 90 9F 02 D8 */ stw r4, 0x2d8(r31) /* 8007D550 0007A4B0 38 E0 00 00 */ li r7, 0 /* 8007D554 0007A4B4 C0 02 89 08 */ lfs f0, lbl_805AA628@sda21(r2) @@ -7527,9 +7527,9 @@ lbl_8007D494: /* 8007D66C 0007A5CC 98 1F 03 29 */ stb r0, 0x329(r31) /* 8007D670 0007A5D0 90 FF 03 2C */ stw r7, 0x32c(r31) /* 8007D674 0007A5D4 48 00 25 65 */ bl __ct__18CStateMachineStateFv -/* 8007D678 0007A5D8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8007D678 0007A5D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8007D67C 0007A5DC 92 DF 03 4C */ stw r22, 0x34c(r31) -/* 8007D680 0007A5E0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8007D680 0007A5E0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8007D684 0007A5E4 38 80 00 00 */ li r4, 0 /* 8007D688 0007A5E8 C0 25 00 00 */ lfs f1, 0(r5) /* 8007D68C 0007A5EC 38 60 00 02 */ li r3, 2 @@ -7717,11 +7717,11 @@ lbl_8007D494: /* 8007D964 0007A8C4 D0 1F 04 28 */ stfs f0, 0x428(r31) /* 8007D968 0007A8C8 48 2E 5A 85 */ bl __ct__6CColorFffff /* 8007D96C 0007A8CC 80 AD A2 50 */ lwz r5, lbl_805A8E10@sda21(r13) -/* 8007D970 0007A8D0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007D970 0007A8D0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007D974 0007A8D4 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 8007D978 0007A8D8 38 00 00 00 */ li r0, 0 /* 8007D97C 0007A8DC 90 BF 04 30 */ stw r5, 0x430(r31) -/* 8007D980 0007A8E0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8007D980 0007A8E0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8007D984 0007A8E4 38 83 66 60 */ addi r4, r3, lbl_805A6660@l /* 8007D988 0007A8E8 38 7F 04 5C */ addi r3, r31, 0x45c /* 8007D98C 0007A8EC C0 05 00 00 */ lfs f0, 0(r5) @@ -7747,9 +7747,9 @@ lbl_8007D494: /* 8007D9DC 0007A93C 7F A4 EB 78 */ mr r4, r29 /* 8007D9E0 0007A940 38 7F 04 60 */ addi r3, r31, 0x460 /* 8007D9E4 0007A944 48 1B 64 15 */ bl __ct__20CKnockBackController2F17EKnockBackVariant -/* 8007D9E8 0007A948 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8007D9E8 0007A948 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8007D9EC 0007A94C C0 22 89 08 */ lfs f1, lbl_805AA628@sda21(r2) -/* 8007D9F0 0007A950 C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 8007D9F0 0007A950 C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 8007D9F4 0007A954 3C 60 80 3D */ lis r3, lbl_803CD600@ha /* 8007D9F8 0007A958 38 83 D6 00 */ addi r4, r3, lbl_803CD600@l /* 8007D9FC 0007A95C 38 A0 00 00 */ li r5, 0 diff --git a/asm/MetroidPrime/Enemies/CPatternedInfo.s b/asm/MetroidPrime/Enemies/CPatternedInfo.s index 23679498..2d5f6b84 100644 --- a/asm/MetroidPrime/Enemies/CPatternedInfo.s +++ b/asm/MetroidPrime/Enemies/CPatternedInfo.s @@ -158,8 +158,8 @@ __ct__14CPatternedInfoFR12CInputStreamUi: /* 80105A74 001029D4 48 20 F1 19 */ bl __ct__9CVector3fFR12CInputStream /* 80105A78 001029D8 48 00 00 0C */ b lbl_80105A84 lbl_80105A7C: -/* 80105A7C 001029DC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80105A80 001029E0 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 80105A7C 001029DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80105A80 001029E0 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_80105A84: /* 80105A84 001029E4 C0 03 00 00 */ lfs f0, 0(r3) /* 80105A88 001029E8 28 1F 00 25 */ cmplwi r31, 0x25 diff --git a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s index a822e650..1c21063a 100644 --- a/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s +++ b/asm/MetroidPrime/Enemies/CPhazonHealingNodule.s @@ -289,10 +289,10 @@ KnockBack__20CPhazonHealingNoduleFRC9CVector3fR13CStateManagerRC11CDamageInfo14E sub_80294dfc: /* 80294DFC 00291D5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80294E00 00291D60 7C 08 02 A6 */ mflr r0 -/* 80294E04 00291D64 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80294E04 00291D64 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80294E08 00291D68 38 C0 00 0E */ li r6, 0xe /* 80294E0C 00291D6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80294E10 00291D70 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 80294E10 00291D70 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 80294E14 00291D74 81 83 00 00 */ lwz r12, 0(r3) /* 80294E18 00291D78 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E1C 00291D7C 7D 89 03 A6 */ mtctr r12 @@ -306,10 +306,10 @@ sub_80294dfc: sub_80294e34: /* 80294E34 00291D94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80294E38 00291D98 7C 08 02 A6 */ mflr r0 -/* 80294E3C 00291D9C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80294E3C 00291D9C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80294E40 00291DA0 38 C0 00 0E */ li r6, 0xe /* 80294E44 00291DA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80294E48 00291DA8 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 80294E48 00291DA8 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 80294E4C 00291DAC 81 83 00 00 */ lwz r12, 0(r3) /* 80294E50 00291DB0 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E54 00291DB4 7D 89 03 A6 */ mtctr r12 @@ -323,10 +323,10 @@ sub_80294e34: sub_80294e6c: /* 80294E6C 00291DCC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80294E70 00291DD0 7C 08 02 A6 */ mflr r0 -/* 80294E74 00291DD4 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80294E74 00291DD4 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80294E78 00291DD8 38 C0 00 0E */ li r6, 0xe /* 80294E7C 00291DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80294E80 00291DE0 38 A5 66 A0 */ addi r5, r5, skZero3f@l +/* 80294E80 00291DE0 38 A5 66 A0 */ addi r5, r5, sZeroVector__9CVector3f@l /* 80294E84 00291DE4 81 83 00 00 */ lwz r12, 0(r3) /* 80294E88 00291DE8 81 8C 00 84 */ lwz r12, 0x84(r12) /* 80294E8C 00291DEC 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index ea45c868..f6a1dc1e 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -900,9 +900,9 @@ UpdateBoundingState__12CPuddleSporeFRC6CAABoxR13CStateManager: /* 801473EC 0014434C C0 9C 00 08 */ lfs f4, 8(r28) /* 801473F0 00144350 3C A0 80 3E */ lis r5, lbl_803D97E4@ha /* 801473F4 00144354 C0 7C 00 0C */ lfs f3, 0xc(r28) -/* 801473F8 00144358 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801473F8 00144358 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801473FC 0014435C C0 5C 00 10 */ lfs f2, 0x10(r28) -/* 80147400 00144360 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80147400 00144360 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80147404 00144364 C0 3C 00 14 */ lfs f1, 0x14(r28) /* 80147408 00144368 38 05 97 E4 */ addi r0, r5, lbl_803D97E4@l /* 8014740C 0014436C 91 01 00 90 */ stw r8, 0x90(r1) diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index a852753b..4df4c267 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -438,13 +438,13 @@ lbl_8014B698: lbl_8014B6A4: /* 8014B6A4 00148604 80 7E 08 4C */ lwz r3, 0x84c(r30) /* 8014B6A8 00148608 4B FC FC D1 */ bl Stop__13CPhysicsActorFv -/* 8014B6AC 0014860C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014B6AC 0014860C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014B6B0 00148610 80 7E 08 4C */ lwz r3, 0x84c(r30) -/* 8014B6B4 00148614 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 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 -/* 8014B6C0 00148620 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8014B6C4 00148624 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 8014B6D0 00148630 C0 44 00 00 */ lfs f2, 0(r4) @@ -603,9 +603,9 @@ lbl_8014B8E8: /* 8014B910 00148870 98 1E 05 E8 */ stb r0, 0x5e8(r30) /* 8014B914 00148874 80 7F 08 4C */ lwz r3, 0x84c(r31) /* 8014B918 00148878 4B FC FA 61 */ bl Stop__13CPhysicsActorFv -/* 8014B91C 0014887C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014B91C 0014887C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014B920 00148880 80 7F 08 4C */ lwz r3, 0x84c(r31) -/* 8014B924 00148884 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8014B924 00148884 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014B928 00148888 4B FC F3 79 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 8014B92C 0014888C 7F C3 F3 78 */ mr r3, r30 /* 8014B930 00148890 7F E5 FB 78 */ mr r5, r31 @@ -1049,9 +1049,9 @@ sub_8014bf10: /* 8014BF38 00148E98 C3 E3 05 00 */ lfs f31, 0x500(r3) /* 8014BF3C 00148E9C 7F E3 FB 78 */ mr r3, r31 /* 8014BF40 00148EA0 4B FC F4 39 */ bl Stop__13CPhysicsActorFv -/* 8014BF44 00148EA4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014BF44 00148EA4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014BF48 00148EA8 7F E3 FB 78 */ mr r3, r31 -/* 8014BF4C 00148EAC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8014BF4C 00148EAC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014BF50 00148EB0 4B FC ED 51 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 8014BF54 00148EB4 80 7F 00 68 */ lwz r3, 0x68(r31) /* 8014BF58 00148EB8 38 00 00 20 */ li r0, 0x20 @@ -1415,9 +1415,9 @@ ShootPlayer__16CPuddleToadGammaFR13CStateManagerf: /* 8014C474 001493D4 7F E3 FB 78 */ mr r3, r31 /* 8014C478 001493D8 98 1D 05 E8 */ stb r0, 0x5e8(r29) /* 8014C47C 001493DC 4B FC EE FD */ bl Stop__13CPhysicsActorFv -/* 8014C480 001493E0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8014C480 001493E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8014C484 001493E4 7F E3 FB 78 */ mr r3, r31 -/* 8014C488 001493E8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8014C488 001493E8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8014C48C 001493EC 4B FC E8 15 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 8014C490 001493F0 C0 1F 00 E8 */ lfs f0, 0xe8(r31) /* 8014C494 001493F4 EC 60 07 F2 */ fmuls f3, f0, f31 @@ -1448,8 +1448,8 @@ ShootPlayer__16CPuddleToadGammaFR13CStateManagerf: /* 8014C4F8 00149458 39 40 00 00 */ li r10, 0 /* 8014C4FC 0014945C 38 00 00 03 */ li r0, 3 /* 8014C500 00149460 90 81 00 94 */ stw r4, 0x94(r1) -/* 8014C504 00149464 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8014C508 00149468 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8014C504 00149464 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8014C508 00149468 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8014C50C 0014946C 38 A1 00 18 */ addi r5, r1, 0x18 /* 8014C510 00149470 90 61 00 90 */ stw r3, 0x90(r1) /* 8014C514 00149474 38 81 00 20 */ addi r4, r1, 0x20 @@ -2035,10 +2035,10 @@ lbl_8014CC14: /* 8014CD98 00149CF8 D3 5D 05 A8 */ stfs f26, 0x5a8(r29) /* 8014CD9C 00149CFC 48 24 76 55 */ bl cos /* 8014CDA0 00149D00 FC 00 08 18 */ frsp f0, f1 -/* 8014CDA4 00149D04 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8014CDA4 00149D04 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014CDA8 00149D08 3C 1F 00 01 */ addis r0, r31, 1 /* 8014CDAC 00149D0C 38 80 00 00 */ li r4, 0 -/* 8014CDB0 00149D10 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8014CDB0 00149D10 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8014CDB4 00149D14 38 60 00 01 */ li r3, 1 /* 8014CDB8 00149D18 D0 1D 05 AC */ stfs f0, 0x5ac(r29) /* 8014CDBC 00149D1C 28 00 FF FF */ cmplwi r0, 0xffff diff --git a/asm/MetroidPrime/Enemies/CPuffer.s b/asm/MetroidPrime/Enemies/CPuffer.s index 1b56a0c7..f86e8f57 100644 --- a/asm/MetroidPrime/Enemies/CPuffer.s +++ b/asm/MetroidPrime/Enemies/CPuffer.s @@ -416,8 +416,8 @@ Think__7CPufferFfR13CStateManager: /* 8025C298 002591F8 7C 00 18 40 */ cmplw r0, r3 /* 8025C29C 002591FC 41 82 00 48 */ beq lbl_8025C2E4 /* 8025C2A0 00259200 B0 7E 05 CC */ sth r3, 0x5cc(r30) -/* 8025C2A4 00259204 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8025C2A8 00259208 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8025C2A4 00259204 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8025C2A8 00259208 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8025C2AC 0025920C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8025C2B0 00259210 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8025C2B4 00259214 38 61 00 08 */ addi r3, r1, 8 @@ -1015,8 +1015,8 @@ __ct__7CPuffer: /* 8025CB54 00259AB4 98 17 05 98 */ stb r0, 0x598(r23) /* 8025CB58 00259AB8 48 08 BE 59 */ bl TranslateSFXID__11CSfxManagerFUs /* 8025CB5C 00259ABC B0 77 05 9A */ sth r3, 0x59a(r23) -/* 8025CB60 00259AC0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8025CB64 00259AC4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8025CB60 00259AC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8025CB64 00259AC4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8025CB68 00259AC8 38 00 00 00 */ li r0, 0 /* 8025CB6C 00259ACC 80 DF 00 00 */ lwz r6, 0(r31) /* 8025CB70 00259AD0 7E E3 BB 78 */ mr r3, r23 diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index 03ea258a..d42e6136 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -2292,8 +2292,8 @@ lbl_80253C78: /* 80253C7C 00250BDC 81 8C 02 BC */ lwz r12, 0x2bc(r12) /* 80253C80 00250BE0 7D 89 03 A6 */ mtctr r12 /* 80253C84 00250BE4 4E 80 04 21 */ bctrl -/* 80253C88 00250BE8 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 80253C8C 00250BEC C4 03 67 00 */ lfsu f0, lbl_805A6700@l(r3) +/* 80253C88 00250BE8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 80253C8C 00250BEC C4 03 67 00 */ lfsu f0, sDownVector__9CVector3f@l(r3) /* 80253C90 00250BF0 C0 63 00 04 */ lfs f3, 4(r3) /* 80253C94 00250BF4 EC 01 00 32 */ fmuls f0, f1, f0 /* 80253C98 00250BF8 C0 43 00 08 */ lfs f2, 8(r3) @@ -2348,8 +2348,8 @@ lbl_80253CCC: /* 80253D58 00250CB8 D0 81 00 10 */ stfs f4, 0x10(r1) /* 80253D5C 00250CBC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80253D60 00250CC0 40 80 00 44 */ bge lbl_80253DA4 -/* 80253D64 00250CC4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80253D68 00250CC8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80253D64 00250CC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80253D68 00250CC8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80253D6C 00250CCC C0 02 B9 28 */ lfs f0, lbl_805AD648@sda21(r2) /* 80253D70 00250CD0 38 81 00 38 */ addi r4, r1, 0x38 /* 80253D74 00250CD4 C0 43 00 04 */ lfs f2, 4(r3) @@ -2399,9 +2399,9 @@ lbl_80253E08: /* 80253E10 00250D70 48 00 03 80 */ b lbl_80254190 lbl_80253E14: /* 80253E14 00250D74 38 C0 00 01 */ li r6, 1 -/* 80253E18 00250D78 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80253E18 00250D78 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80253E1C 00250D7C 90 DF 03 2C */ stw r6, 0x32c(r31) -/* 80253E20 00250D80 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80253E20 00250D80 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80253E24 00250D84 C0 02 B9 18 */ lfs f0, lbl_805AD638@sda21(r2) /* 80253E28 00250D88 38 81 00 B4 */ addi r4, r1, 0xb4 /* 80253E2C 00250D8C C0 25 00 00 */ lfs f1, 0(r5) @@ -3339,9 +3339,9 @@ lbl_80254BEC: /* 80254BFC 00251B5C 28 00 00 00 */ cmplwi r0, 0 /* 80254C00 00251B60 41 82 00 3C */ beq lbl_80254C3C /* 80254C04 00251B64 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80254C08 00251B68 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80254C08 00251B68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80254C0C 00251B6C C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 80254C10 00251B70 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80254C10 00251B70 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80254C14 00251B74 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80254C18 00251B78 38 61 00 24 */ addi r3, r1, 0x24 /* 80254C1C 00251B7C 38 81 00 58 */ addi r4, r1, 0x58 @@ -3630,9 +3630,9 @@ lbl_80254FE0: /* 80255044 00251FA4 38 81 00 34 */ addi r4, r1, 0x34 /* 80255048 00251FA8 48 0B F0 39 */ bl AsNormalized__9CVector2fCFv /* 8025504C 00251FAC C0 C1 00 3C */ lfs f6, 0x3c(r1) -/* 80255050 00251FB0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80255050 00251FB0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80255054 00251FB4 C0 81 00 40 */ lfs f4, 0x40(r1) -/* 80255058 00251FB8 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 80255058 00251FB8 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 8025505C 00251FBC C0 62 B9 18 */ lfs f3, lbl_805AD638@sda21(r2) /* 80255060 00251FC0 3C 60 80 3D */ lis r3, lbl_803D4D5C@ha /* 80255064 00251FC4 C0 02 B9 68 */ lfs f0, lbl_805AD688@sda21(r2) @@ -3708,9 +3708,9 @@ lbl_80254FE0: /* 8025517C 002520DC A0 01 00 10 */ lhz r0, 0x10(r1) /* 80255180 002520E0 B0 01 00 14 */ sth r0, 0x14(r1) /* 80255184 002520E4 48 0F 4E 29 */ bl White__6CColorFv -/* 80255188 002520E8 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80255188 002520E8 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8025518C 002520EC 7C 7C 1B 78 */ mr r28, r3 -/* 80255190 002520F0 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 80255190 002520F0 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80255194 002520F4 38 61 00 CC */ addi r3, r1, 0xcc /* 80255198 002520F8 38 81 00 90 */ addi r4, r1, 0x90 /* 8025519C 002520FC 38 A1 00 A8 */ addi r5, r1, 0xa8 @@ -3921,9 +3921,9 @@ lbl_802553F8: /* 80255494 002523F4 D0 21 00 44 */ stfs f1, 0x44(r1) /* 80255498 002523F8 D0 01 00 48 */ stfs f0, 0x48(r1) /* 8025549C 002523FC 48 0B F3 B5 */ bl AsNormalized__9CVector3fCFv -/* 802554A0 00252400 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802554A0 00252400 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802554A4 00252404 C0 A1 00 4C */ lfs f5, 0x4c(r1) -/* 802554A8 00252408 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802554A8 00252408 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802554AC 0025240C C0 81 00 50 */ lfs f4, 0x50(r1) /* 802554B0 00252410 C0 61 00 54 */ lfs f3, 0x54(r1) /* 802554B4 00252414 38 61 00 A0 */ addi r3, r1, 0xa0 @@ -4244,8 +4244,8 @@ lbl_80255928: /* 80255930 00252890 48 00 01 94 */ b lbl_80255AC4 lbl_80255934: /* 80255934 00252894 80 BF 08 4C */ lwz r5, 0x84c(r31) -/* 80255938 00252898 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8025593C 0025289C 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 80255938 00252898 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8025593C 0025289C 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 80255940 002528A0 C0 82 B9 7C */ lfs f4, lbl_805AD69C@sda21(r2) /* 80255944 002528A4 C0 1E 00 34 */ lfs f0, 0x34(r30) /* 80255948 002528A8 38 60 00 01 */ li r3, 1 @@ -4864,16 +4864,16 @@ lbl_80256190: /* 80256204 00253164 4B EC 61 95 */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 80256208 00253168 48 00 00 20 */ b lbl_80256228 lbl_8025620C: -/* 8025620C 0025316C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80256210 00253170 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8025620C 0025316C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80256210 00253170 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80256214 00253174 D0 1F 0A EC */ stfs f0, 0xaec(r31) /* 80256218 00253178 C0 03 00 04 */ lfs f0, 4(r3) /* 8025621C 0025317C D0 1F 0A F0 */ stfs f0, 0xaf0(r31) /* 80256220 00253180 C0 03 00 08 */ lfs f0, 8(r3) /* 80256224 00253184 D0 1F 0A F4 */ stfs f0, 0xaf4(r31) lbl_80256228: -/* 80256228 00253188 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8025622C 0025318C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80256228 00253188 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8025622C 0025318C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80256230 00253190 D0 1F 0A F8 */ stfs f0, 0xaf8(r31) /* 80256234 00253194 C0 03 00 04 */ lfs f0, 4(r3) /* 80256238 00253198 D0 1F 0A FC */ stfs f0, 0xafc(r31) @@ -5328,9 +5328,9 @@ lbl_802568AC: /* 802568B0 00253810 28 00 00 00 */ cmplwi r0, 0 /* 802568B4 00253814 41 82 00 3C */ beq lbl_802568F0 /* 802568B8 00253818 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 802568BC 0025381C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802568BC 0025381C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802568C0 00253820 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 802568C4 00253824 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 802568C4 00253824 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 802568C8 00253828 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 802568CC 0025382C 38 61 00 10 */ addi r3, r1, 0x10 /* 802568D0 00253830 38 81 00 1C */ addi r4, r1, 0x1c @@ -5396,9 +5396,9 @@ lbl_80256974: /* 802569A4 00253904 39 40 00 7F */ li r10, 0x7f /* 802569A8 00253908 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) /* 802569AC 0025390C 39 20 00 3F */ li r9, 0x3f -/* 802569B0 00253910 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802569B0 00253910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802569B4 00253914 D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 802569B8 00253918 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 802569B8 00253918 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 802569BC 0025391C A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 802569C0 00253920 D0 A1 00 10 */ stfs f5, 0x10(r1) /* 802569C4 00253924 38 61 00 08 */ addi r3, r1, 8 @@ -5536,9 +5536,9 @@ sub_80256b14: /* 80256BB0 00253B10 48 00 01 9C */ b lbl_80256D4C lbl_80256BB4: /* 80256BB4 00253B14 C0 41 00 F4 */ lfs f2, 0xf4(r1) -/* 80256BB8 00253B18 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80256BB8 00253B18 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80256BBC 00253B1C C0 21 01 04 */ lfs f1, 0x104(r1) -/* 80256BC0 00253B20 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80256BC0 00253B20 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80256BC4 00253B24 C0 01 01 14 */ lfs f0, 0x114(r1) /* 80256BC8 00253B28 38 61 00 58 */ addi r3, r1, 0x58 /* 80256BCC 00253B2C D0 41 00 3C */ stfs f2, 0x3c(r1) @@ -5559,8 +5559,8 @@ lbl_80256BB4: /* 80256C08 00253B68 7D 89 03 A6 */ mtctr r12 /* 80256C0C 00253B6C 4E 80 04 21 */ bctrl /* 80256C10 00253B70 80 9E 08 4C */ lwz r4, 0x84c(r30) -/* 80256C14 00253B74 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80256C18 00253B78 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 80256C14 00253B74 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80256C18 00253B78 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 80256C1C 00253B7C C1 3D 0B F0 */ lfs f9, 0xbf0(r29) /* 80256C20 00253B80 C1 83 00 08 */ lfs f12, 8(r3) /* 80256C24 00253B84 C1 63 00 04 */ lfs f11, 4(r3) @@ -5645,9 +5645,9 @@ lbl_80256D4C: /* 80256D50 00253CB0 28 00 00 00 */ cmplwi r0, 0 /* 80256D54 00253CB4 41 82 00 3C */ beq lbl_80256D90 /* 80256D58 00253CB8 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 80256D5C 00253CBC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80256D5C 00253CBC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80256D60 00253CC0 C0 3D 00 50 */ lfs f1, 0x50(r29) -/* 80256D64 00253CC4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80256D64 00253CC4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80256D68 00253CC8 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80256D6C 00253CCC 38 61 00 0C */ addi r3, r1, 0xc /* 80256D70 00253CD0 38 81 00 14 */ addi r4, r1, 0x14 @@ -5721,10 +5721,10 @@ sub_80256db4: /* 80256E70 00253DD0 38 84 00 8C */ addi r4, r4, 0x8c /* 80256E74 00253DD4 4B DA DE 45 */ bl string_l__4rstlFPCc /* 80256E78 00253DD8 38 01 00 28 */ addi r0, r1, 0x28 -/* 80256E7C 00253DDC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80256E7C 00253DDC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80256E80 00253DE0 90 01 00 08 */ stw r0, 8(r1) /* 80256E84 00253DE4 38 01 00 3C */ addi r0, r1, 0x3c -/* 80256E88 00253DE8 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80256E88 00253DE8 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80256E8C 00253DEC 38 61 00 30 */ addi r3, r1, 0x30 /* 80256E90 00253DF0 90 01 00 0C */ stw r0, 0xc(r1) /* 80256E94 00253DF4 38 A1 00 80 */ addi r5, r1, 0x80 @@ -5791,8 +5791,8 @@ lbl_80256F04: /* 80256F7C 00253EDC C0 62 B9 94 */ lfs f3, lbl_805AD6B4@sda21(r2) /* 80256F80 00253EE0 39 20 00 3F */ li r9, 0x3f /* 80256F84 00253EE4 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) -/* 80256F88 00253EE8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80256F8C 00253EEC 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80256F88 00253EE8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80256F8C 00253EEC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80256F90 00253EF0 D0 A1 00 A4 */ stfs f5, 0xa4(r1) /* 80256F94 00253EF4 C0 46 00 00 */ lfs f2, 0(r6) /* 80256F98 00253EF8 38 61 00 34 */ addi r3, r1, 0x34 @@ -6972,10 +6972,10 @@ lbl_802580B4: /* 802580D4 00255034 C0 02 B9 2C */ lfs f0, lbl_805AD64C@sda21(r2) /* 802580D8 00255038 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 802580DC 0025503C 7C 04 00 D0 */ neg r0, r4 -/* 802580E0 00255040 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802580E0 00255040 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802580E4 00255044 EC 40 F8 2A */ fadds f2, f0, f31 /* 802580E8 00255048 7C 00 23 78 */ or r0, r0, r4 -/* 802580EC 0025504C 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 802580EC 0025504C 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 802580F0 00255050 80 7D 0D 10 */ lwz r3, 0xd10(r29) /* 802580F4 00255054 80 BD 00 64 */ lwz r5, 0x64(r29) /* 802580F8 00255058 7F C4 F3 78 */ mr r4, r30 @@ -7217,9 +7217,9 @@ lbl_80258428: /* 80258448 002553A8 39 40 00 7F */ li r10, 0x7f /* 8025844C 002553AC 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) /* 80258450 002553B0 39 20 00 3F */ li r9, 0x3f -/* 80258454 002553B4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80258454 002553B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80258458 002553B8 D0 A1 03 30 */ stfs f5, 0x330(r1) -/* 8025845C 002553BC 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8025845C 002553BC 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80258460 002553C0 A8 C2 C5 F8 */ lha r6, lbl_805AE318@sda21(r2) /* 80258464 002553C4 D0 A1 03 34 */ stfs f5, 0x334(r1) /* 80258468 002553C8 38 61 00 A4 */ addi r3, r1, 0xa4 @@ -7515,9 +7515,9 @@ lbl_80258828: /* 802588A8 00255808 38 A1 01 4C */ addi r5, r1, 0x14c /* 802588AC 0025580C 48 0B A2 3D */ bl __ml__12CTransform4fCFRC9CVector3f /* 802588B0 00255810 C0 21 00 F4 */ lfs f1, 0xf4(r1) -/* 802588B4 00255814 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802588B4 00255814 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802588B8 00255818 C0 81 00 F8 */ lfs f4, 0xf8(r1) -/* 802588BC 0025581C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802588BC 0025581C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802588C0 00255820 C0 61 00 FC */ lfs f3, 0xfc(r1) /* 802588C4 00255824 38 61 01 80 */ addi r3, r1, 0x180 /* 802588C8 00255828 D0 21 01 40 */ stfs f1, 0x140(r1) @@ -7662,11 +7662,11 @@ lbl_80258A9C: /* 80258ADC 00255A3C 48 00 01 C4 */ b lbl_80258CA0 .global lbl_80258AE0 lbl_80258AE0: -/* 80258AE0 00255A40 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 80258AE4 00255A44 38 84 67 00 */ addi r4, r4, lbl_805A6700@l +/* 80258AE0 00255A40 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 80258AE4 00255A44 38 84 67 00 */ addi r4, r4, sDownVector__9CVector3f@l /* 80258AE8 00255A48 4B EC 21 B9 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f -/* 80258AEC 00255A4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80258AF0 00255A50 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80258AEC 00255A4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80258AF0 00255A50 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80258AF4 00255A54 D0 1C 0A EC */ stfs f0, 0xaec(r28) /* 80258AF8 00255A58 C0 03 00 04 */ lfs f0, 4(r3) /* 80258AFC 00255A5C D0 1C 0A F0 */ stfs f0, 0xaf0(r28) @@ -7713,8 +7713,8 @@ lbl_80258B24: /* 80258B98 00255AF8 39 40 00 00 */ li r10, 0 /* 80258B9C 00255AFC 38 00 00 03 */ li r0, 3 /* 80258BA0 00255B00 90 81 01 6C */ stw r4, 0x16c(r1) -/* 80258BA4 00255B04 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80258BA8 00255B08 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80258BA4 00255B04 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80258BA8 00255B08 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80258BAC 00255B0C 38 A1 00 3C */ addi r5, r1, 0x3c /* 80258BB0 00255B10 90 61 01 68 */ stw r3, 0x168(r1) /* 80258BB4 00255B14 38 81 00 44 */ addi r4, r1, 0x44 @@ -8359,11 +8359,11 @@ lbl_8025947C: /* 8025950C 0025646C 48 00 03 1C */ b lbl_80259828 lbl_80259510: /* 80259510 00256470 81 9F 00 00 */ lwz r12, 0(r31) -/* 80259514 00256474 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 80259514 00256474 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 80259518 00256478 7F E3 FB 78 */ mr r3, r31 /* 8025951C 0025647C C0 22 B9 28 */ lfs f1, lbl_805AD648@sda21(r2) /* 80259520 00256480 81 8C 00 90 */ lwz r12, 0x90(r12) -/* 80259524 00256484 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 80259524 00256484 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 80259528 00256488 7D 89 03 A6 */ mtctr r12 /* 8025952C 0025648C 4E 80 04 21 */ bctrl /* 80259530 00256490 C0 02 88 F0 */ lfs f0, lbl_805AA610@sda21(r2) @@ -8688,8 +8688,8 @@ lbl_802599A0: /* 802599F8 00256958 38 E0 00 00 */ li r7, 0 /* 802599FC 0025695C 39 60 00 03 */ li r11, 3 /* 80259A00 00256960 90 81 02 1C */ stw r4, 0x21c(r1) -/* 80259A04 00256964 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80259A08 00256968 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80259A04 00256964 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80259A08 00256968 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80259A0C 0025696C A1 41 00 9C */ lhz r10, 0x9c(r1) /* 80259A10 00256970 90 61 02 18 */ stw r3, 0x218(r1) /* 80259A14 00256974 7F C3 F3 78 */ mr r3, r30 @@ -8787,9 +8787,9 @@ lbl_80259A58: /* 80259B7C 00256ADC 55 4C 06 3E */ clrlwi r12, r10, 0x18 /* 80259B80 00256AE0 93 41 01 F8 */ stw r26, 0x1f8(r1) /* 80259B84 00256AE4 50 6C 2E B4 */ rlwimi r12, r3, 5, 0x1a, 0x1a -/* 80259B88 00256AE8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80259B88 00256AE8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80259B8C 00256AEC 98 C1 00 E4 */ stb r6, 0xe4(r1) -/* 80259B90 00256AF0 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 80259B90 00256AF0 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 80259B94 00256AF4 7F C3 F3 78 */ mr r3, r30 /* 80259B98 00256AF8 38 81 00 38 */ addi r4, r1, 0x38 /* 80259B9C 00256AFC 99 41 00 E4 */ stb r10, 0xe4(r1) @@ -8836,8 +8836,8 @@ lbl_80259BF8: /* 80259C3C 00256B9C 39 40 00 00 */ li r10, 0 /* 80259C40 00256BA0 38 00 00 03 */ li r0, 3 /* 80259C44 00256BA4 90 81 01 CC */ stw r4, 0x1cc(r1) -/* 80259C48 00256BA8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80259C4C 00256BAC 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80259C48 00256BA8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80259C4C 00256BAC 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80259C50 00256BB0 38 A1 00 14 */ addi r5, r1, 0x14 /* 80259C54 00256BB4 90 61 01 C8 */ stw r3, 0x1c8(r1) /* 80259C58 00256BB8 38 81 00 1C */ addi r4, r1, 0x1c @@ -9105,18 +9105,18 @@ Accept__7CRidleyFR8IVisitor: /* 8025A044 00256FA4 D0 A1 00 E8 */ stfs f5, 0xe8(r1) /* 8025A048 00256FA8 D0 21 00 EC */ stfs f1, 0xec(r1) /* 8025A04C 00256FAC 4B EB CD 11 */ bl __ct__10CModelDataFRC10CStaticRes -/* 8025A050 00256FB0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8025A050 00256FB0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8025A054 00256FB4 38 7F 0A 84 */ addi r3, r31, 0xa84 -/* 8025A058 00256FB8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8025A058 00256FB8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8025A05C 00256FBC 48 0B 8B 19 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8025A060 00256FC0 C0 C2 B9 68 */ lfs f6, lbl_805AD688@sda21(r2) -/* 8025A064 00256FC4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8025A068 00256FC8 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 8025A064 00256FC4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8025A068 00256FC8 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 8025A06C 00256FCC 3C 60 80 57 */ lis r3, lbl_80572534@ha /* 8025A070 00256FD0 D0 DF 0A B4 */ stfs f6, 0xab4(r31) /* 8025A074 00256FD4 38 A3 25 34 */ addi r5, r3, lbl_80572534@l /* 8025A078 00256FD8 C0 02 B9 CC */ lfs f0, lbl_805AD6EC@sda21(r2) -/* 8025A07C 00256FDC 3C C0 80 5A */ lis r6, lbl_805A6754@ha +/* 8025A07C 00256FDC 3C C0 80 5A */ lis r6, mskInvertedBox__6CAABox@ha /* 8025A080 00256FE0 C0 22 B9 78 */ lfs f1, lbl_805AD698@sda21(r2) /* 8025A084 00256FE4 38 80 00 02 */ li r4, 2 /* 8025A088 00256FE8 D0 1F 0A B8 */ stfs f0, 0xab8(r31) @@ -9127,7 +9127,7 @@ Accept__7CRidleyFR8IVisitor: /* 8025A09C 00256FFC C0 42 B9 D0 */ lfs f2, lbl_805AD6F0@sda21(r2) /* 8025A0A0 00257000 D0 1F 0A C0 */ stfs f0, 0xac0(r31) /* 8025A0A4 00257004 C0 02 B9 D4 */ lfs f0, lbl_805AD6F4@sda21(r2) -/* 8025A0A8 00257008 C4 66 67 54 */ lfsu f3, lbl_805A6754@l(r6) +/* 8025A0A8 00257008 C4 66 67 54 */ lfsu f3, mskInvertedBox__6CAABox@l(r6) /* 8025A0AC 0025700C C0 22 B9 18 */ lfs f1, lbl_805AD638@sda21(r2) /* 8025A0B0 00257010 D0 7F 0A C4 */ stfs f3, 0xac4(r31) /* 8025A0B4 00257014 C0 66 00 04 */ lfs f3, 4(r6) @@ -9229,12 +9229,12 @@ Accept__7CRidleyFR8IVisitor: /* 8025A234 00257194 38 7F 0B 94 */ addi r3, r31, 0xb94 /* 8025A238 00257198 38 81 01 44 */ addi r4, r1, 0x144 /* 8025A23C 0025719C 48 0B 89 39 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8025A240 002571A0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8025A244 002571A4 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 8025A248 002571A8 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 8025A240 002571A0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8025A244 002571A4 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 8025A248 002571A8 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8025A24C 002571AC C0 22 B9 18 */ lfs f1, lbl_805AD638@sda21(r2) /* 8025A250 002571B0 C0 46 00 00 */ lfs f2, 0(r6) -/* 8025A254 002571B4 38 83 67 24 */ addi r4, r3, lbl_805A6724@l +/* 8025A254 002571B4 38 83 67 24 */ addi r4, r3, sForwardVector__9CVector3f@l /* 8025A258 002571B8 C0 02 B9 54 */ lfs f0, lbl_805AD674@sda21(r2) /* 8025A25C 002571BC 38 7F 0C 14 */ addi r3, r31, 0xc14 /* 8025A260 002571C0 D0 5F 0B C4 */ stfs f2, 0xbc4(r31) @@ -9277,12 +9277,12 @@ Accept__7CRidleyFR8IVisitor: /* 8025A2F4 00257254 38 BF 07 0C */ addi r5, r31, 0x70c /* 8025A2F8 00257258 4B FC 1D B1 */ bl __ct__15CProjectileInfoFUiRC11CDamageInfo /* 8025A2FC 0025725C 38 00 00 02 */ li r0, 2 -/* 8025A300 00257260 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8025A300 00257260 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8025A304 00257264 90 1F 0C 64 */ stw r0, 0xc64(r31) /* 8025A308 00257268 38 A0 00 00 */ li r5, 0 /* 8025A30C 0025726C C0 02 B9 18 */ lfs f0, lbl_805AD638@sda21(r2) /* 8025A310 00257270 38 00 00 04 */ li r0, 4 -/* 8025A314 00257274 C0 23 66 A0 */ lfs f1, skZero3f@l(r3) +/* 8025A314 00257274 C0 23 66 A0 */ lfs f1, sZeroVector__9CVector3f@l(r3) /* 8025A318 00257278 7F E4 FB 78 */ mr r4, r31 /* 8025A31C 0025727C 38 61 01 28 */ addi r3, r1, 0x128 /* 8025A320 00257280 D0 3F 0C 68 */ stfs f1, 0xc68(r31) diff --git a/asm/MetroidPrime/Enemies/CSeedling.s b/asm/MetroidPrime/Enemies/CSeedling.s index 14fd89d3..c35c862e 100644 --- a/asm/MetroidPrime/Enemies/CSeedling.s +++ b/asm/MetroidPrime/Enemies/CSeedling.s @@ -687,9 +687,9 @@ lbl_80266694: /* 802666A0 00263600 88 1F 05 D6 */ lbz r0, 0x5d6(r31) /* 802666A4 00263604 38 60 00 01 */ li r3, 1 /* 802666A8 00263608 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 -/* 802666AC 0026360C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802666AC 0026360C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802666B0 00263610 98 1F 05 D6 */ stb r0, 0x5d6(r31) -/* 802666B4 00263614 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802666B4 00263614 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802666B8 00263618 38 60 00 00 */ li r3, 0 /* 802666BC 0026361C C0 04 00 00 */ lfs f0, 0(r4) /* 802666C0 00263620 D0 1F 01 50 */ stfs f0, 0x150(r31) @@ -750,9 +750,9 @@ lbl_80266738: /* 80266790 002636F0 38 81 00 60 */ addi r4, r1, 0x60 /* 80266794 002636F4 38 A1 00 6C */ addi r5, r1, 0x6c /* 80266798 002636F8 48 00 2A 05 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 8026679C 002636FC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8026679C 002636FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802667A0 00263700 C0 C1 00 48 */ lfs f6, 0x48(r1) -/* 802667A4 00263704 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 802667A4 00263704 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 802667A8 00263708 C0 A1 00 4C */ lfs f5, 0x4c(r1) /* 802667AC 0026370C C0 81 00 50 */ lfs f4, 0x50(r1) /* 802667B0 00263710 38 81 00 B0 */ addi r4, r1, 0xb0 @@ -793,12 +793,12 @@ lbl_80266738: /* 8026683C 0026379C D0 21 00 58 */ stfs f1, 0x58(r1) /* 80266840 002637A0 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 80266844 002637A4 48 00 29 59 */ bl ProjectVectorToPlane__11CWallWalkerFRC9CVector3fRC9CVector3f -/* 80266848 002637A8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80266848 002637A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8026684C 002637AC C0 C1 00 24 */ lfs f6, 0x24(r1) /* 80266850 002637B0 C0 A1 00 28 */ lfs f5, 0x28(r1) /* 80266854 002637B4 38 81 00 94 */ addi r4, r1, 0x94 /* 80266858 002637B8 C0 81 00 2C */ lfs f4, 0x2c(r1) -/* 8026685C 002637BC C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8026685C 002637BC C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 80266860 002637C0 C0 5E 00 04 */ lfs f2, 4(r30) /* 80266864 002637C4 C0 3E 00 08 */ lfs f1, 8(r30) /* 80266868 002637C8 C0 02 BA CC */ lfs f0, lbl_805AD7EC@sda21(r2) @@ -813,13 +813,13 @@ lbl_80266738: /* 8026688C 002637EC 38 63 00 04 */ addi r3, r3, 4 /* 80266890 002637F0 4B EC AE 89 */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd /* 80266894 002637F4 C1 3F 00 58 */ lfs f9, 0x58(r31) -/* 80266898 002637F8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80266898 002637F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8026689C 002637FC C1 1F 00 48 */ lfs f8, 0x48(r31) /* 802668A0 00263800 38 81 00 78 */ addi r4, r1, 0x78 /* 802668A4 00263804 C0 02 BA CC */ lfs f0, lbl_805AD7EC@sda21(r2) /* 802668A8 00263808 C0 BF 00 38 */ lfs f5, 0x38(r31) /* 802668AC 0026380C EC E0 02 32 */ fmuls f7, f0, f8 -/* 802668B0 00263810 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 802668B0 00263810 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 802668B4 00263814 EC C0 02 72 */ fmuls f6, f0, f9 /* 802668B8 00263818 C0 5E 00 04 */ lfs f2, 4(r30) /* 802668BC 0026381C EC 80 01 72 */ fmuls f4, f0, f5 diff --git a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s index f9cf11a2..a6655739 100644 --- a/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s +++ b/asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s @@ -1657,9 +1657,9 @@ lbl_8023CAF8: /* 8023CB1C 00239A7C 48 00 18 51 */ bl sub_8023e36c /* 8023CB20 00239A80 7F E3 FB 78 */ mr r3, r31 /* 8023CB24 00239A84 48 00 18 79 */ bl nullsub_21 -/* 8023CB28 00239A88 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8023CB28 00239A88 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8023CB2C 00239A8C A0 9C 01 D2 */ lhz r4, 0x1d2(r28) -/* 8023CB30 00239A90 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 8023CB30 00239A90 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8023CB34 00239A94 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8023CB38 00239A98 7C 65 1B 78 */ mr r5, r3 /* 8023CB3C 00239A9C 81 5C 00 04 */ lwz r10, 4(r28) @@ -1983,9 +1983,9 @@ lbl_8023CF9C: /* 8023CFD0 00239F30 48 00 13 D9 */ bl sub_8023e3a8 /* 8023CFD4 00239F34 7F 83 E3 78 */ mr r3, r28 /* 8023CFD8 00239F38 48 00 13 C5 */ bl nullsub_21 -/* 8023CFDC 00239F3C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8023CFDC 00239F3C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8023CFE0 00239F40 A0 9D 01 D4 */ lhz r4, 0x1d4(r29) -/* 8023CFE4 00239F44 38 C5 66 A0 */ addi r6, r5, skZero3f@l +/* 8023CFE4 00239F44 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8023CFE8 00239F48 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8023CFEC 00239F4C 7C 65 1B 78 */ mr r5, r3 /* 8023CFF0 00239F50 81 5D 00 04 */ lwz r10, 4(r29) @@ -2047,9 +2047,9 @@ lbl_8023D0A0: /* 8023D0C4 0023A024 28 00 00 00 */ cmplwi r0, 0 /* 8023D0C8 0023A028 40 82 00 74 */ bne lbl_8023D13C /* 8023D0CC 0023A02C 81 5D 00 04 */ lwz r10, 4(r29) -/* 8023D0D0 0023A030 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8023D0D0 0023A030 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8023D0D4 0023A034 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 8023D0D8 0023A038 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8023D0D8 0023A038 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8023D0DC 0023A03C C0 3D 00 50 */ lfs f1, 0x50(r29) /* 8023D0E0 0023A040 38 61 00 28 */ addi r3, r1, 0x28 /* 8023D0E4 0023A044 C0 1D 00 40 */ lfs f0, 0x40(r29) @@ -2104,9 +2104,9 @@ lbl_8023D13C: /* 8023D1A0 0023A100 B0 01 00 1C */ sth r0, 0x1c(r1) /* 8023D1A4 0023A104 B0 01 00 20 */ sth r0, 0x20(r1) /* 8023D1A8 0023A108 4B E8 62 A1 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 8023D1AC 0023A10C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8023D1AC 0023A10C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8023D1B0 0023A110 7F C3 F3 78 */ mr r3, r30 -/* 8023D1B4 0023A114 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8023D1B4 0023A114 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8023D1B8 0023A118 38 A1 00 18 */ addi r5, r1, 0x18 /* 8023D1BC 0023A11C 38 81 00 20 */ addi r4, r1, 0x20 /* 8023D1C0 0023A120 38 C1 00 10 */ addi r6, r1, 0x10 @@ -2142,8 +2142,8 @@ sub_8023d204: /* 8023D224 0023A184 80 03 01 34 */ lwz r0, 0x134(r3) /* 8023D228 0023A188 2C 00 00 00 */ cmpwi r0, 0 /* 8023D22C 0023A18C 40 81 00 D8 */ ble lbl_8023D304 -/* 8023D230 0023A190 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 8023D234 0023A194 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 8023D230 0023A190 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 8023D234 0023A194 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 8023D238 0023A198 80 64 00 00 */ lwz r3, 0(r4) /* 8023D23C 0023A19C 80 04 00 04 */ lwz r0, 4(r4) /* 8023D240 0023A1A0 90 7F 01 44 */ stw r3, 0x144(r31) @@ -2658,11 +2658,11 @@ __ct__15CSnakeWeedSwarm: /* 8023D9A0 0023A900 D3 7F 01 18 */ stfs f27, 0x118(r31) /* 8023D9A4 0023A904 48 15 6A 4D */ bl cos /* 8023D9A8 0023A908 FC 00 08 18 */ frsp f0, f1 -/* 8023D9AC 0023A90C 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 8023D9AC 0023A90C 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 8023D9B0 0023A910 3C 60 80 3D */ lis r3, lbl_803D4388@ha /* 8023D9B4 0023A914 38 E0 00 00 */ li r7, 0 /* 8023D9B8 0023A918 38 63 43 88 */ addi r3, r3, lbl_803D4388@l -/* 8023D9BC 0023A91C 38 C4 67 54 */ addi r6, r4, lbl_805A6754@l +/* 8023D9BC 0023A91C 38 C4 67 54 */ addi r6, r4, mskInvertedBox__6CAABox@l /* 8023D9C0 0023A920 D0 1F 01 1C */ stfs f0, 0x11c(r31) /* 8023D9C4 0023A924 38 83 00 0B */ addi r4, r3, 0xb /* 8023D9C8 0023A928 38 60 00 10 */ li r3, 0x10 diff --git a/asm/MetroidPrime/Enemies/CSpacePirate.s b/asm/MetroidPrime/Enemies/CSpacePirate.s index 28ac43f9..ae9e8950 100644 --- a/asm/MetroidPrime/Enemies/CSpacePirate.s +++ b/asm/MetroidPrime/Enemies/CSpacePirate.s @@ -1409,9 +1409,9 @@ lbl_80120CCC: /* 80120CFC 0011DC5C 90 01 00 28 */ stw r0, 0x28(r1) /* 80120D00 0011DC60 41 82 00 38 */ beq lbl_80120D38 /* 80120D04 0011DC64 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80120D08 0011DC68 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80120D08 0011DC68 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80120D0C 0011DC6C C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 80120D10 0011DC70 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80120D10 0011DC70 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80120D14 0011DC74 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80120D18 0011DC78 38 61 00 10 */ addi r3, r1, 0x10 /* 80120D1C 0011DC7C 38 81 00 34 */ addi r4, r1, 0x34 @@ -1436,9 +1436,9 @@ lbl_80120D38: /* 80120D64 0011DCC4 7D 89 03 A6 */ mtctr r12 /* 80120D68 0011DCC8 4E 80 04 21 */ bctrl /* 80120D6C 0011DCCC C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80120D70 0011DCD0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80120D70 0011DCD0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80120D74 0011DCD4 C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 80120D78 0011DCD8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80120D78 0011DCD8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80120D7C 0011DCDC C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80120D80 0011DCE0 38 7E 00 34 */ addi r3, r30, 0x34 /* 80120D84 0011DCE4 D0 01 00 50 */ stfs f0, 0x50(r1) @@ -1525,9 +1525,9 @@ lbl_80120E70: /* 80120EBC 0011DE1C 88 1E 06 38 */ lbz r0, 0x638(r30) /* 80120EC0 0011DE20 38 60 00 01 */ li r3, 1 /* 80120EC4 0011DE24 50 60 0F BC */ rlwimi r0, r3, 1, 0x1e, 0x1e -/* 80120EC8 0011DE28 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80120EC8 0011DE28 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80120ECC 0011DE2C 98 1E 06 38 */ stb r0, 0x638(r30) -/* 80120ED0 0011DE30 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80120ED0 0011DE30 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80120ED4 0011DE34 7F C3 F3 78 */ mr r3, r30 /* 80120ED8 0011DE38 C0 04 00 00 */ lfs f0, 0(r4) /* 80120EDC 0011DE3C D0 1E 01 50 */ stfs f0, 0x150(r30) @@ -3022,9 +3022,9 @@ lbl_801223B0: /* 80122460 0011F3C0 38 A1 00 A4 */ addi r5, r1, 0xa4 /* 80122464 0011F3C4 48 1F 06 1D */ bl Rotate__12CTransform4fCFRC9CVector3f /* 80122468 0011F3C8 C0 61 01 44 */ lfs f3, 0x144(r1) -/* 8012246C 0011F3CC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8012246C 0011F3CC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80122470 0011F3D0 C0 41 00 B0 */ lfs f2, 0xb0(r1) -/* 80122474 0011F3D4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80122474 0011F3D4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80122478 0011F3D8 C0 21 01 48 */ lfs f1, 0x148(r1) /* 8012247C 0011F3DC 38 61 01 50 */ addi r3, r1, 0x150 /* 80122480 0011F3E0 EC C3 10 2A */ fadds f6, f3, f2 @@ -3135,9 +3135,9 @@ lbl_8012254C: /* 8012261C 0011F57C 4B F0 7B B5 */ bl AddAdditiveAnimation__9CAnimDataFUifbb lbl_80122620: /* 80122620 0011F580 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 80122624 0011F584 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80122624 0011F584 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80122628 0011F588 C0 3D 00 50 */ lfs f1, 0x50(r29) -/* 8012262C 0011F58C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8012262C 0011F58C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80122630 0011F590 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80122634 0011F594 38 61 00 14 */ addi r3, r1, 0x14 /* 80122638 0011F598 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -3240,10 +3240,10 @@ lbl_8012276C: /* 80122774 0011F6D4 48 00 00 90 */ b lbl_80122804 lbl_80122778: /* 80122778 0011F6D8 38 00 00 01 */ li r0, 1 -/* 8012277C 0011F6DC 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 8012277C 0011F6DC 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80122780 0011F6E0 90 1F 03 2C */ stw r0, 0x32c(r31) /* 80122784 0011F6E4 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) -/* 80122788 0011F6E8 C4 23 67 00 */ lfsu f1, lbl_805A6700@l(r3) +/* 80122788 0011F6E8 C4 23 67 00 */ lfsu f1, sDownVector__9CVector3f@l(r3) /* 8012278C 0011F6EC C0 5F 00 40 */ lfs f2, 0x40(r31) /* 80122790 0011F6F0 C0 BF 00 50 */ lfs f5, 0x50(r31) /* 80122794 0011F6F4 C0 83 00 04 */ lfs f4, 4(r3) @@ -3296,12 +3296,12 @@ TryJumpInLoop__10CPatternedFR13CStateManageri: /* 80122838 0011F798 90 01 00 44 */ stw r0, 0x44(r1) /* 8012283C 0011F79C 39 27 AA 68 */ addi r9, r7, lbl_803DAA68@l /* 80122840 0011F7A0 3C E0 80 3E */ lis r7, lbl_803DA9FC@ha -/* 80122844 0011F7A4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80122844 0011F7A4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80122848 0011F7A8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8012284C 0011F7AC 38 00 00 00 */ li r0, 0 /* 80122850 0011F7B0 88 C1 00 2C */ lbz r6, 0x2c(r1) /* 80122854 0011F7B4 50 06 3E 30 */ rlwimi r6, r0, 7, 0x18, 0x18 -/* 80122858 0011F7B8 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 80122858 0011F7B8 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8012285C 0011F7BC 38 E7 A9 FC */ addi r7, r7, lbl_803DA9FC@l /* 80122860 0011F7C0 81 43 04 50 */ lwz r10, 0x450(r3) /* 80122864 0011F7C4 54 C0 06 3E */ clrlwi r0, r6, 0x18 @@ -3450,8 +3450,8 @@ lbl_80122A28: /* 80122A68 0011F9C8 7F C5 F3 78 */ mr r5, r30 /* 80122A6C 0011F9CC 38 80 00 12 */ li r4, 0x12 /* 80122A70 0011F9D0 4B F3 18 E1 */ bl AddMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 80122A74 0011F9D4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80122A78 0011F9D8 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80122A74 0011F9D4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80122A78 0011F9D8 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80122A7C 0011F9DC 7F A3 EB 78 */ mr r3, r29 /* 80122A80 0011F9E0 D0 1D 01 50 */ stfs f0, 0x150(r29) /* 80122A84 0011F9E4 C0 04 00 04 */ lfs f0, 4(r4) @@ -5498,8 +5498,8 @@ lbl_8012467C: /* 801247C0 00121720 48 00 01 80 */ b lbl_80124940 lbl_801247C4: /* 801247C4 00121724 80 9E 08 4C */ lwz r4, 0x84c(r30) -/* 801247C8 00121728 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 801247CC 0012172C 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 801247C8 00121728 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 801247CC 0012172C 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 801247D0 00121730 C0 7D 00 50 */ lfs f3, 0x50(r29) /* 801247D4 00121734 C0 44 00 50 */ lfs f2, 0x50(r4) /* 801247D8 00121738 C0 3D 00 60 */ lfs f1, 0x60(r29) @@ -5734,7 +5734,7 @@ lbl_80124B24: lbl_80124B30: /* 80124B30 00121A90 C0 26 00 00 */ lfs f1, 0(r6) /* 80124B34 00121A94 38 A0 00 00 */ li r5, 0 -/* 80124B38 00121A98 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80124B38 00121A98 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80124B3C 00121A9C C0 02 97 D8 */ lfs f0, lbl_805AB4F8@sda21(r2) /* 80124B40 00121AA0 D0 3A 02 E0 */ stfs f1, 0x2e0(r26) /* 80124B44 00121AA4 38 81 01 34 */ addi r4, r1, 0x134 @@ -5753,7 +5753,7 @@ lbl_80124B30: /* 80124B78 00121AD8 C0 5A 02 E0 */ lfs f2, 0x2e0(r26) /* 80124B7C 00121ADC C0 3A 00 40 */ lfs f1, 0x40(r26) /* 80124B80 00121AE0 EC A4 18 28 */ fsubs f5, f4, f3 -/* 80124B84 00121AE4 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80124B84 00121AE4 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80124B88 00121AE8 EC 82 08 28 */ fsubs f4, f2, f1 /* 80124B8C 00121AEC D0 C1 01 38 */ stfs f6, 0x138(r1) /* 80124B90 00121AF0 C0 43 00 04 */ lfs f2, 4(r3) @@ -6025,7 +6025,7 @@ lbl_80124F30: /* 80124F90 00121EF0 28 04 00 00 */ cmplwi r4, 0 /* 80124F94 00121EF4 41 82 00 70 */ beq lbl_80125004 /* 80124F98 00121EF8 C0 64 00 60 */ lfs f3, 0x60(r4) -/* 80124F9C 00121EFC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80124F9C 00121EFC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80124FA0 00121F00 C0 44 00 50 */ lfs f2, 0x50(r4) /* 80124FA4 00121F04 C0 24 00 40 */ lfs f1, 0x40(r4) /* 80124FA8 00121F08 38 81 01 18 */ addi r4, r1, 0x118 @@ -6034,7 +6034,7 @@ lbl_80124F30: /* 80124FB4 00121F14 D0 5A 08 2C */ stfs f2, 0x82c(r26) /* 80124FB8 00121F18 D0 7A 08 30 */ stfs f3, 0x830(r26) /* 80124FBC 00121F1C C0 3A 02 E0 */ lfs f1, 0x2e0(r26) -/* 80124FC0 00121F20 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80124FC0 00121F20 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80124FC4 00121F24 D0 21 01 18 */ stfs f1, 0x118(r1) /* 80124FC8 00121F28 C0 43 00 04 */ lfs f2, 4(r3) /* 80124FCC 00121F2C C0 9A 02 E4 */ lfs f4, 0x2e4(r26) @@ -7129,8 +7129,8 @@ lbl_80125F60: /* 80125F9C 00122EFC D0 A1 00 28 */ stfs f5, 0x28(r1) /* 80125FA0 00122F00 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80125FA4 00122F04 40 80 00 50 */ bge lbl_80125FF4 -/* 80125FA8 00122F08 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80125FAC 00122F0C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80125FA8 00122F08 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80125FAC 00122F0C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80125FB0 00122F10 C0 02 97 D8 */ lfs f0, lbl_805AB4F8@sda21(r2) /* 80125FB4 00122F14 38 81 00 44 */ addi r4, r1, 0x44 /* 80125FB8 00122F18 C0 43 00 04 */ lfs f2, 4(r3) @@ -8486,9 +8486,9 @@ lbl_801272F8: /* 80127300 00124260 48 00 00 B8 */ b lbl_801273B8 lbl_80127304: /* 80127304 00124264 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 80127308 00124268 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80127308 00124268 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012730C 0012426C C0 3E 00 50 */ lfs f1, 0x50(r30) -/* 80127310 00124270 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80127310 00124270 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80127314 00124274 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80127318 00124278 38 61 00 1C */ addi r3, r1, 0x1c /* 8012731C 0012427C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -8961,8 +8961,8 @@ lbl_80127984: /* 8012798C 001248EC 88 1E 06 34 */ lbz r0, 0x634(r30) /* 80127990 001248F0 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 80127994 001248F4 41 82 00 5C */ beq lbl_801279F0 -/* 80127998 001248F8 3C 60 80 5A */ lis r3, lbl_805A6700@ha -/* 8012799C 001248FC C4 03 67 00 */ lfsu f0, lbl_805A6700@l(r3) +/* 80127998 001248F8 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha +/* 8012799C 001248FC C4 03 67 00 */ lfsu f0, sDownVector__9CVector3f@l(r3) /* 801279A0 00124900 C0 3E 00 40 */ lfs f1, 0x40(r30) /* 801279A4 00124904 C0 BE 00 50 */ lfs f5, 0x50(r30) /* 801279A8 00124908 C0 83 00 04 */ lfs f4, 4(r3) @@ -9390,9 +9390,9 @@ lbl_80127F8C: /* 80127FC0 00124F20 38 61 00 30 */ addi r3, r1, 0x30 /* 80127FC4 00124F24 48 21 5B 1D */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 80127FC8 00124F28 C0 5A 00 60 */ lfs f2, 0x60(r26) -/* 80127FCC 00124F2C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80127FCC 00124F2C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80127FD0 00124F30 C0 3A 00 50 */ lfs f1, 0x50(r26) -/* 80127FD4 00124F34 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80127FD4 00124F34 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80127FD8 00124F38 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 80127FDC 00124F3C 38 61 00 14 */ addi r3, r1, 0x14 /* 80127FE0 00124F40 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) @@ -9420,9 +9420,9 @@ lbl_80128024: /* 80128030 00124F90 2C 00 00 08 */ cmpwi r0, 8 /* 80128034 00124F94 41 82 00 4C */ beq lbl_80128080 /* 80128038 00124F98 C0 5A 00 60 */ lfs f2, 0x60(r26) -/* 8012803C 00124F9C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012803C 00124F9C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80128040 00124FA0 C0 3A 00 50 */ lfs f1, 0x50(r26) -/* 80128044 00124FA4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80128044 00124FA4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80128048 00124FA8 C0 1A 00 40 */ lfs f0, 0x40(r26) /* 8012804C 00124FAC 38 61 00 10 */ addi r3, r1, 0x10 /* 80128050 00124FB0 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) @@ -9844,8 +9844,8 @@ CheckBlade__12CSpacePirateFR13CStateManager: /* 8012864C 001255AC 39 40 00 00 */ li r10, 0 /* 80128650 001255B0 38 00 00 03 */ li r0, 3 /* 80128654 001255B4 90 81 00 4C */ stw r4, 0x4c(r1) -/* 80128658 001255B8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8012865C 001255BC 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80128658 001255B8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8012865C 001255BC 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80128660 001255C0 38 A1 00 14 */ addi r5, r1, 0x14 /* 80128664 001255C4 90 61 00 48 */ stw r3, 0x48(r1) /* 80128668 001255C8 38 81 00 1C */ addi r4, r1, 0x1c @@ -10099,10 +10099,10 @@ CantJumpBack__12CSpacePirateFR13CStateManagerR9CVector3ff: /* 801289F8 00125958 41 82 01 B4 */ beq lbl_80128BAC /* 801289FC 0012595C C0 02 97 D0 */ lfs f0, lbl_805AB4F0@sda21(r2) /* 80128A00 00125960 38 00 00 00 */ li r0, 0 -/* 80128A04 00125964 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 80128A04 00125964 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80128A08 00125968 C0 5D 00 00 */ lfs f2, 0(r29) /* 80128A0C 0012596C EC 60 07 F2 */ fmuls f3, f0, f31 -/* 80128A10 00125970 3B E3 67 00 */ addi r31, r3, lbl_805A6700@l +/* 80128A10 00125970 3B E3 67 00 */ addi r31, r3, sDownVector__9CVector3f@l /* 80128A14 00125974 C0 3D 00 04 */ lfs f1, 4(r29) /* 80128A18 00125978 7F 63 DB 78 */ mr r3, r27 /* 80128A1C 0012597C C0 1D 00 08 */ lfs f0, 8(r29) @@ -10155,11 +10155,11 @@ CantJumpBack__12CSpacePirateFR13CStateManagerR9CVector3ff: /* 80128AD8 00125A38 C0 1D 00 04 */ lfs f0, 4(r29) /* 80128ADC 00125A3C 38 00 00 00 */ li r0, 0 /* 80128AE0 00125A40 C0 3D 00 08 */ lfs f1, 8(r29) -/* 80128AE4 00125A44 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 80128AE4 00125A44 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 80128AE8 00125A48 EC BF 00 32 */ fmuls f5, f31, f0 /* 80128AEC 00125A4C C0 1D 00 00 */ lfs f0, 0(r29) /* 80128AF0 00125A50 EC 9F 00 72 */ fmuls f4, f31, f1 -/* 80128AF4 00125A54 38 83 67 00 */ addi r4, r3, lbl_805A6700@l +/* 80128AF4 00125A54 38 83 67 00 */ addi r4, r3, sDownVector__9CVector3f@l /* 80128AF8 00125A58 EC 3F 00 32 */ fmuls f1, f31, f0 /* 80128AFC 00125A5C C0 01 00 D4 */ lfs f0, 0xd4(r1) /* 80128B00 00125A60 C0 41 00 D8 */ lfs f2, 0xd8(r1) @@ -10225,8 +10225,8 @@ AvoidActors__12CSpacePirateFR13CStateManager: /* 80128BDC 00125B3C BF 61 00 6C */ stmw r27, 0x6c(r1) /* 80128BE0 00125B40 7C 7F 1B 78 */ mr r31, r3 /* 80128BE4 00125B44 83 A4 08 38 */ lwz r29, 0x838(r4) -/* 80128BE8 00125B48 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80128BEC 00125B4C 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 80128BE8 00125B48 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80128BEC 00125B4C 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 80128BF0 00125B50 AB 7D 20 08 */ lha r27, 0x2008(r29) /* 80128BF4 00125B54 48 00 01 CC */ b lbl_80128DC0 lbl_80128BF8: @@ -10273,11 +10273,11 @@ lbl_80128C90: lbl_80128C94: /* 80128C94 00125BF4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80128C98 00125BF8 41 82 01 0C */ beq lbl_80128DA4 -/* 80128C9C 00125BFC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80128C9C 00125BFC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80128CA0 00125C00 C0 5E 00 04 */ lfs f2, 4(r30) /* 80128CA4 00125C04 C0 3E 00 08 */ lfs f1, 8(r30) /* 80128CA8 00125C08 38 81 00 44 */ addi r4, r1, 0x44 -/* 80128CAC 00125C0C C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 80128CAC 00125C0C C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 80128CB0 00125C10 C0 02 97 D8 */ lfs f0, lbl_805AB4F8@sda21(r2) /* 80128CB4 00125C14 D0 C1 00 44 */ stfs f6, 0x44(r1) /* 80128CB8 00125C18 D0 81 00 48 */ stfs f4, 0x48(r1) @@ -10591,9 +10591,9 @@ lbl_8012911C: /* 80129140 001260A0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80129144 001260A4 D0 21 00 2C */ stfs f1, 0x2c(r1) /* 80129148 001260A8 48 1E B7 09 */ bl AsNormalized__9CVector3fCFv -/* 8012914C 001260AC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8012914C 001260AC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80129150 001260B0 C1 01 00 34 */ lfs f8, 0x34(r1) -/* 80129154 001260B4 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 80129154 001260B4 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 80129158 001260B8 C1 21 00 38 */ lfs f9, 0x38(r1) /* 8012915C 001260BC C0 63 00 04 */ lfs f3, 4(r3) /* 80129160 001260C0 C1 43 00 00 */ lfs f10, 0(r3) @@ -11111,8 +11111,8 @@ SetVelocityForJump__12CSpacePirateFv: /* 801298A0 00126800 7C 7D 1B 78 */ mr r29, r3 /* 801298A4 00126804 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f /* 801298A8 00126808 40 82 00 F0 */ bne lbl_80129998 -/* 801298AC 0012680C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801298B0 00126810 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 801298AC 0012680C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801298B0 00126810 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 801298B4 00126814 3B E1 00 10 */ addi r31, r1, 0x10 /* 801298B8 00126818 C0 24 00 04 */ lfs f1, 4(r4) /* 801298BC 0012681C C0 04 00 08 */ lfs f0, 8(r4) @@ -11406,8 +11406,8 @@ lbl_80129C88: lbl_80129CD4: /* 80129CD4 00126C34 7F 83 E3 78 */ mr r3, r28 /* 80129CD8 00126C38 4B FF 16 A1 */ bl Stop__13CPhysicsActorFv -/* 80129CDC 00126C3C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80129CE0 00126C40 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80129CDC 00126C3C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80129CE0 00126C40 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80129CE4 00126C44 D0 1C 01 50 */ stfs f0, 0x150(r28) /* 80129CE8 00126C48 C0 03 00 04 */ lfs f0, 4(r3) /* 80129CEC 00126C4C D0 1C 01 54 */ stfs f0, 0x154(r28) @@ -12036,15 +12036,15 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A5C8 00127528 98 7D 06 38 */ stb r3, 0x638(r29) /* 8012A5CC 0012752C 88 7D 06 38 */ lbz r3, 0x638(r29) /* 8012A5D0 00127530 50 03 1F 38 */ rlwimi r3, r0, 3, 0x1c, 0x1c -/* 8012A5D4 00127534 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8012A5D4 00127534 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8012A5D8 00127538 C0 22 97 D8 */ lfs f1, lbl_805AB4F8@sda21(r2) /* 8012A5DC 0012753C 98 7D 06 38 */ stb r3, 0x638(r29) -/* 8012A5E0 00127540 38 C4 67 24 */ addi r6, r4, lbl_805A6724@l -/* 8012A5E4 00127544 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012A5E0 00127540 38 C4 67 24 */ addi r6, r4, sForwardVector__9CVector3f@l +/* 8012A5E4 00127544 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012A5E8 00127548 FC 40 08 90 */ fmr f2, f1 /* 8012A5EC 0012754C 88 9D 06 38 */ lbz r4, 0x638(r29) /* 8012A5F0 00127550 50 04 17 7A */ rlwimi r4, r0, 2, 0x1d, 0x1d -/* 8012A5F4 00127554 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 8012A5F4 00127554 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 8012A5F8 00127558 38 7D 06 60 */ addi r3, r29, 0x660 /* 8012A5FC 0012755C 98 9D 06 38 */ stb r4, 0x638(r29) /* 8012A600 00127560 38 80 00 00 */ li r4, 0 @@ -12152,8 +12152,8 @@ Accept__12CSpacePirateFR8IVisitor: /* 8012A798 001276F8 80 BD 06 14 */ lwz r5, 0x614(r29) /* 8012A79C 001276FC 48 08 2D 69 */ bl __ct__10CBurstFireFPPC6SBursti /* 8012A7A0 00127700 C0 62 98 24 */ lfs f3, lbl_805AB544@sda21(r2) -/* 8012A7A4 00127704 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8012A7A8 00127708 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 8012A7A4 00127704 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8012A7A8 00127708 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 8012A7AC 0012770C 38 A0 FF FF */ li r5, -1 /* 8012A7B0 00127710 D0 7D 08 24 */ stfs f3, 0x824(r29) /* 8012A7B4 00127714 38 00 00 00 */ li r0, 0 @@ -12690,15 +12690,15 @@ lbl_8012AF78: .global __ct__8CIkChainFv __ct__8CIkChainFv: /* 8012AF9C 00127EFC 38 00 00 FF */ li r0, 0xff -/* 8012AFA0 00127F00 3C C0 80 5A */ lis r6, lbl_805A6724@ha +/* 8012AFA0 00127F00 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha /* 8012AFA4 00127F04 98 03 00 00 */ stb r0, 0(r3) /* 8012AFA8 00127F08 3C A0 80 5A */ lis r5, lbl_805A6660@ha -/* 8012AFAC 00127F0C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8012AFB0 00127F10 38 E6 67 24 */ addi r7, r6, lbl_805A6724@l +/* 8012AFAC 00127F0C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8012AFB0 00127F10 38 E6 67 24 */ addi r7, r6, sForwardVector__9CVector3f@l /* 8012AFB4 00127F14 98 03 00 01 */ stb r0, 1(r3) /* 8012AFB8 00127F18 38 C5 66 60 */ addi r6, r5, lbl_805A6660@l /* 8012AFBC 00127F1C C0 22 97 D8 */ lfs f1, lbl_805AB4F8@sda21(r2) -/* 8012AFC0 00127F20 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8012AFC0 00127F20 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8012AFC4 00127F24 98 03 00 02 */ stb r0, 2(r3) /* 8012AFC8 00127F28 38 80 00 00 */ li r4, 0 /* 8012AFCC 00127F2C C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) @@ -13606,9 +13606,9 @@ lbl_8012BC54: /* 8012BD60 00128CC0 D0 1E 00 8C */ stfs f0, 0x8c(r30) lbl_8012BD64: /* 8012BD64 00128CC4 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 8012BD68 00128CC8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012BD68 00128CC8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012BD6C 00128CCC 80 DE 00 10 */ lwz r6, 0x10(r30) -/* 8012BD70 00128CD0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8012BD70 00128CD0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8012BD74 00128CD4 C0 62 97 D8 */ lfs f3, lbl_805AB4F8@sda21(r2) /* 8012BD78 00128CD8 FC 20 E8 90 */ fmr f1, f29 /* 8012BD7C 00128CDC C0 04 00 E8 */ lfs f0, 0xe8(r4) @@ -13749,9 +13749,9 @@ lbl_8012BEB8: /* 8012BF8C 00128EEC D0 01 00 20 */ stfs f0, 0x20(r1) /* 8012BF90 00128EF0 4B F5 1E 51 */ bl "Min__5CMathFRCfRCf" /* 8012BF94 00128EF4 C0 02 97 D8 */ lfs f0, lbl_805AB4F8@sda21(r2) -/* 8012BF98 00128EF8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8012BF98 00128EF8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8012BF9C 00128EFC C0 A3 00 00 */ lfs f5, 0(r3) -/* 8012BFA0 00128F00 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8012BFA0 00128F00 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8012BFA4 00128F04 EC C0 E8 24 */ fdivs f6, f0, f29 /* 8012BFA8 00128F08 C0 41 00 64 */ lfs f2, 0x64(r1) /* 8012BFAC 00128F0C C0 81 00 54 */ lfs f4, 0x54(r1) @@ -13833,9 +13833,9 @@ lbl_8012C0A8: /* 8012C0D8 00129038 D0 21 00 3C */ stfs f1, 0x3c(r1) /* 8012C0DC 0012903C D0 41 00 40 */ stfs f2, 0x40(r1) /* 8012C0E0 00129040 F3 E1 A0 10 */ psq_st f31, 16(r1), 1, qr2 -/* 8012C0E4 00129044 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012C0E4 00129044 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012C0E8 00129048 80 02 C6 00 */ lwz r0, lbl_805AE320@sda21(r2) -/* 8012C0EC 0012904C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8012C0EC 0012904C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8012C0F0 00129050 88 E1 00 10 */ lbz r7, 0x10(r1) /* 8012C0F4 00129054 38 61 00 18 */ addi r3, r1, 0x18 /* 8012C0F8 00129058 90 01 00 08 */ stw r0, 8(r1) @@ -13863,9 +13863,9 @@ lbl_8012C0A8: /* 8012C150 001290B0 D0 5E 00 80 */ stfs f2, 0x80(r30) /* 8012C154 001290B4 48 00 00 2C */ b lbl_8012C180 lbl_8012C158: -/* 8012C158 001290B8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012C158 001290B8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012C15C 001290BC 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 8012C160 001290C0 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8012C160 001290C0 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8012C164 001290C4 D0 04 01 50 */ stfs f0, 0x150(r4) /* 8012C168 001290C8 C0 03 00 04 */ lfs f0, 4(r3) /* 8012C16C 001290CC D0 04 01 54 */ stfs f0, 0x154(r4) @@ -13963,11 +13963,11 @@ __ct__14CPirateRagDollFR13CStateManagerP12CSpacePiratefUsUi: /* 8012C2C0 00129220 7F 24 CB 78 */ mr r4, r25 /* 8012C2C4 00129224 48 0E 26 0D */ bl __ct__8CRagDollFfffUi /* 8012C2C8 00129228 3C 80 80 3E */ lis r4, lbl_803E0BE0@ha -/* 8012C2CC 0012922C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8012C2CC 0012922C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8012C2D0 00129230 38 04 0B E0 */ addi r0, r4, lbl_803E0BE0@l /* 8012C2D4 00129234 C0 02 97 BC */ lfs f0, lbl_805AB4DC@sda21(r2) /* 8012C2D8 00129238 90 1D 00 00 */ stw r0, 0(r29) -/* 8012C2DC 0012923C 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 8012C2DC 0012923C 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 8012C2E0 00129240 38 00 00 00 */ li r0, 0 /* 8012C2E4 00129244 38 60 00 01 */ li r3, 1 /* 8012C2E8 00129248 93 7D 00 6C */ stw r27, 0x6c(r29) diff --git a/asm/MetroidPrime/Enemies/CSpankWeed.s b/asm/MetroidPrime/Enemies/CSpankWeed.s index 1ca9839a..5634a398 100644 --- a/asm/MetroidPrime/Enemies/CSpankWeed.s +++ b/asm/MetroidPrime/Enemies/CSpankWeed.s @@ -407,8 +407,8 @@ GetAimPosition__10CSpankWeedCFRC13CStateManagerf: /* 80154E84 00151DE4 93 C1 01 08 */ stw r30, 0x108(r1) /* 80154E88 00151DE8 93 A1 01 04 */ stw r29, 0x104(r1) /* 80154E8C 00151DEC C0 02 9E 30 */ lfs f0, lbl_805ABB50@sda21(r2) -/* 80154E90 00151DF0 3C A0 80 5A */ lis r5, skZero3f@ha -/* 80154E94 00151DF4 C7 E5 66 A0 */ lfsu f31, skZero3f@l(r5) +/* 80154E90 00151DF0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 80154E94 00151DF4 C7 E5 66 A0 */ lfsu f31, sZeroVector__9CVector3f@l(r5) /* 80154E98 00151DF8 7C 7D 1B 78 */ mr r29, r3 /* 80154E9C 00151DFC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80154EA0 00151E00 7C 9E 23 78 */ mr r30, r4 @@ -551,8 +551,8 @@ lbl_80155080: /* 80155098 00151FF8 48 00 00 C0 */ b lbl_80155158 lbl_8015509C: /* 8015509C 00151FFC 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801550A0 00152000 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801550A4 00152004 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801550AC 0015200C 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801550B0 00152010 90 A1 00 08 */ stw r5, 8(r1) @@ -792,8 +792,8 @@ lbl_801553E4: /* 801553EC 0015234C 48 00 01 68 */ b lbl_80155554 lbl_801553F0: /* 801553F0 00152350 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 801553F4 00152354 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801553F8 00152358 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 80155400 00152360 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 80155404 00152364 90 E1 00 24 */ stw r7, 0x24(r1) @@ -841,8 +841,8 @@ lbl_801554A0: /* 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 -/* 801554B4 00152414 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801554B8 00152418 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801554C0 00152420 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801554C4 00152424 90 A1 00 08 */ stw r5, 8(r1) @@ -1695,9 +1695,9 @@ lbl_80155FFC: /* 801560EC 0015304C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 801560F0 00153050 7D 89 03 A6 */ mtctr r12 /* 801560F4 00153054 4E 80 04 21 */ bctrl -/* 801560F8 00153058 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801560F8 00153058 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801560FC 0015305C 7F C3 F3 78 */ mr r3, r30 -/* 80156100 00153060 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80156100 00153060 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80156104 00153064 38 A1 00 2C */ addi r5, r1, 0x2c /* 80156108 00153068 38 81 00 34 */ addi r4, r1, 0x34 /* 8015610C 0015306C 38 C1 00 24 */ addi r6, r1, 0x24 @@ -1960,13 +1960,13 @@ Accept__10CSpankWeedFR8IVisitor: /* 801564A8 00153408 91 61 00 1C */ stw r11, 0x1c(r1) /* 801564AC 0015340C 4B F2 6F A5 */ bl "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi" /* 801564B0 00153410 3C 80 80 3E */ lis r4, lbl_803E2D28@ha -/* 801564B4 00153414 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801564B4 00153414 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801564B8 00153418 38 04 2D 28 */ addi r0, r4, lbl_803E2D28@l /* 801564BC 0015341C 39 00 00 00 */ li r8, 0 /* 801564C0 00153420 90 1F 00 00 */ stw r0, 0(r31) /* 801564C4 00153424 38 C0 00 01 */ li r6, 1 /* 801564C8 00153428 C0 02 9E 30 */ lfs f0, lbl_805ABB50@sda21(r2) -/* 801564CC 0015342C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801564CC 0015342C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801564D0 00153430 D3 9F 05 68 */ stfs f28, 0x568(r31) /* 801564D4 00153434 38 00 FF FF */ li r0, -1 /* 801564D8 00153438 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/Enemies/CTeamAiMgr.s b/asm/MetroidPrime/Enemies/CTeamAiMgr.s index 1e070f12..cfa098e6 100644 --- a/asm/MetroidPrime/Enemies/CTeamAiMgr.s +++ b/asm/MetroidPrime/Enemies/CTeamAiMgr.s @@ -1503,8 +1503,8 @@ IsPartOfTeam__10CTeamAiMgrCF9TUniqueId: /* 80239008 00235F68 93 E1 00 5C */ stw r31, 0x5c(r1) /* 8023900C 00235F6C 7C 7F 1B 78 */ mr r31, r3 /* 80239010 00235F70 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80239014 00235F74 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80239018 00235F78 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80239014 00235F74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80239018 00235F78 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8023901C 00235F7C A1 44 00 00 */ lhz r10, 0(r4) /* 80239020 00235F80 1C 00 00 28 */ mulli r0, r0, 0x28 /* 80239024 00235F84 80 FF 00 64 */ lwz r7, 0x64(r31) @@ -1577,8 +1577,8 @@ HasTeamAiRole__10CTeamAiMgrCF9TUniqueId: /* 8023911C 0023607C 93 E1 00 5C */ stw r31, 0x5c(r1) /* 80239120 00236080 7C 7F 1B 78 */ mr r31, r3 /* 80239124 00236084 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80239128 00236088 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8023912C 0023608C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80239128 00236088 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8023912C 0023608C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80239130 00236090 A1 44 00 00 */ lhz r10, 0(r4) /* 80239134 00236094 1C 00 00 28 */ mulli r0, r0, 0x28 /* 80239138 00236098 80 FF 00 64 */ lwz r7, 0x64(r31) @@ -1654,7 +1654,7 @@ lbl_80239224: ClearTeamAiRole__10CTeamAiMgrF9TUniqueId: /* 80239238 00236198 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8023923C 0023619C 7C 08 02 A6 */ mflr r0 -/* 80239240 002361A0 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80239240 002361A0 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80239244 002361A4 38 E0 FF FF */ li r7, -1 /* 80239248 002361A8 90 01 00 64 */ stw r0, 0x64(r1) /* 8023924C 002361AC 38 00 00 00 */ li r0, 0 @@ -1662,7 +1662,7 @@ ClearTeamAiRole__10CTeamAiMgrF9TUniqueId: /* 80239254 002361B4 93 E1 00 5C */ stw r31, 0x5c(r1) /* 80239258 002361B8 7C 7F 1B 78 */ mr r31, r3 /* 8023925C 002361BC 38 61 00 10 */ addi r3, r1, 0x10 -/* 80239260 002361C0 C4 45 66 A0 */ lfsu f2, skZero3f@l(r5) +/* 80239260 002361C0 C4 45 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r5) /* 80239264 002361C4 A1 04 00 00 */ lhz r8, 0(r4) /* 80239268 002361C8 38 81 00 14 */ addi r4, r1, 0x14 /* 8023926C 002361CC C0 25 00 04 */ lfs f1, 4(r5) @@ -1736,8 +1736,8 @@ GetTeamAiRole__10CTeamAiMgrCF9TUniqueId: /* 80239364 002362C4 93 E1 00 5C */ stw r31, 0x5c(r1) /* 80239368 002362C8 7C 7F 1B 78 */ mr r31, r3 /* 8023936C 002362CC 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 80239370 002362D0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80239374 002362D4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80239370 002362D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80239374 002362D4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80239378 002362D8 A1 44 00 00 */ lhz r10, 0(r4) /* 8023937C 002362DC 1C 00 00 28 */ mulli r0, r0, 0x28 /* 80239380 002362E0 80 FF 00 64 */ lwz r7, 0x64(r31) @@ -1885,9 +1885,9 @@ lbl_8023953C: /* 80239564 002364C4 B0 01 00 0C */ sth r0, 0xc(r1) /* 80239568 002364C8 4B FF EF 7D */ bl RemoveProjectileAttacker__10CTeamAiMgrF9TUniqueId lbl_8023956C: -/* 8023956C 002364CC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8023956C 002364CC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80239570 002364D0 38 E0 FF FF */ li r7, -1 -/* 80239574 002364D4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80239574 002364D4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80239578 002364D8 A1 1E 00 00 */ lhz r8, 0(r30) /* 8023957C 002364DC C0 44 00 00 */ lfs f2, 0(r4) /* 80239580 002364E0 38 00 00 00 */ li r0, 0 @@ -2047,14 +2047,14 @@ lbl_80239780: AssignTeamAiRole__10CTeamAiMgrFRC3CAiiii: /* 802397AC 0023670C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802397B0 00236710 7C 08 02 A6 */ mflr r0 -/* 802397B4 00236714 3D 00 80 5A */ lis r8, skZero3f@ha +/* 802397B4 00236714 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 802397B8 00236718 90 01 00 84 */ stw r0, 0x84(r1) /* 802397BC 0023671C 38 00 00 00 */ li r0, 0 /* 802397C0 00236720 93 E1 00 7C */ stw r31, 0x7c(r1) /* 802397C4 00236724 7C 7F 1B 78 */ mr r31, r3 /* 802397C8 00236728 38 61 00 14 */ addi r3, r1, 0x14 /* 802397CC 0023672C A1 24 00 08 */ lhz r9, 8(r4) -/* 802397D0 00236730 38 88 66 A0 */ addi r4, r8, skZero3f@l +/* 802397D0 00236730 38 88 66 A0 */ addi r4, r8, sZeroVector__9CVector3f@l /* 802397D4 00236734 C0 44 00 00 */ lfs f2, 0(r4) /* 802397D8 00236738 39 00 FF FF */ li r8, -1 /* 802397DC 0023673C C0 24 00 04 */ lfs f1, 4(r4) diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index b0f80833..abe233e9 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -1173,9 +1173,9 @@ lbl_801DAFD4: /* 801DAFE8 001D7F48 7F E5 FB 78 */ mr r5, r31 /* 801DAFEC 001D7F4C 48 00 0C 71 */ bl sub_801dbc5c /* 801DAFF0 001D7F50 C0 9F 00 60 */ lfs f4, 0x60(r31) -/* 801DAFF4 001D7F54 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801DAFF4 001D7F54 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DAFF8 001D7F58 C0 7F 00 50 */ lfs f3, 0x50(r31) -/* 801DAFFC 001D7F5C 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801DAFFC 001D7F5C 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801DB000 001D7F60 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 801DB004 001D7F64 38 00 00 01 */ li r0, 1 /* 801DB008 001D7F68 C0 22 AC D8 */ lfs f1, lbl_805AC9F8@sda21(r2) @@ -1411,8 +1411,8 @@ lbl_801DB320: /* 801DB338 001D8298 48 00 00 B4 */ b lbl_801DB3EC lbl_801DB33C: /* 801DB33C 001D829C 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801DB340 001D82A0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DB344 001D82A4 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801DB34C 001D82AC 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801DB350 001D82B0 90 A1 00 10 */ stw r5, 0x10(r1) @@ -1681,17 +1681,17 @@ lbl_801DB6CC: /* 801DB6D4 001D8634 88 1F 09 C4 */ lbz r0, 0x9c4(r31) /* 801DB6D8 001D8638 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801DB6DC 001D863C 40 82 01 08 */ bne lbl_801DB7E4 -/* 801DB6E0 001D8640 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801DB6E0 001D8640 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801DB6E4 001D8644 C0 02 AD 00 */ lfs f0, lbl_805ACA20@sda21(r2) -/* 801DB6E8 001D8648 38 83 66 F4 */ addi r4, r3, lbl_805A66F4@l +/* 801DB6E8 001D8648 38 83 66 F4 */ addi r4, r3, sUpVector__9CVector3f@l /* 801DB6EC 001D864C C0 62 AC FC */ lfs f3, lbl_805ACA1C@sda21(r2) /* 801DB6F0 001D8650 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801DB6F4 001D8654 C0 44 00 00 */ lfs f2, 0(r4) /* 801DB6F8 001D8658 C0 24 00 04 */ lfs f1, 4(r4) -/* 801DB6FC 001D865C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801DB6FC 001D865C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DB700 001D8660 C0 04 00 08 */ lfs f0, 8(r4) /* 801DB704 001D8664 EC 43 00 B2 */ fmuls f2, f3, f2 -/* 801DB708 001D8668 C7 63 66 A0 */ lfsu f27, skZero3f@l(r3) +/* 801DB708 001D8668 C7 63 66 A0 */ lfsu f27, sZeroVector__9CVector3f@l(r3) /* 801DB70C 001D866C EC 23 00 72 */ fmuls f1, f3, f1 /* 801DB710 001D8670 EC 03 00 32 */ fmuls f0, f3, f0 /* 801DB714 001D8674 EF 9F 00 B2 */ fmuls f28, f31, f2 @@ -2244,8 +2244,8 @@ lbl_801DBEB8: /* 801DBEB8 001D8E18 38 00 00 00 */ li r0, 0 /* 801DBEBC 001D8E1C 98 1E 08 D4 */ stb r0, 0x8d4(r30) lbl_801DBEC0: -/* 801DBEC0 001D8E20 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DBEC4 001D8E24 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801DBEC0 001D8E20 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801DBEC4 001D8E24 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801DBEC8 001D8E28 C0 DE 06 54 */ lfs f6, 0x654(r30) /* 801DBECC 001D8E2C 38 81 00 68 */ addi r4, r1, 0x68 /* 801DBED0 001D8E30 C0 BE 06 50 */ lfs f5, 0x650(r30) @@ -2778,9 +2778,9 @@ sub_801dc60c: /* 801DC640 001D95A0 7C 9D 23 78 */ mr r29, r4 /* 801DC644 001D95A4 7C 7C 1B 78 */ mr r28, r3 /* 801DC648 001D95A8 7F A3 EB 78 */ mr r3, r29 -/* 801DC64C 001D95AC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801DC64C 001D95AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801DC650 001D95B0 81 9D 00 00 */ lwz r12, 0(r29) -/* 801DC654 001D95B4 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 801DC654 001D95B4 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 801DC658 001D95B8 FF A0 08 90 */ fmr f29, f1 /* 801DC65C 001D95BC 7C BE 2B 78 */ mr r30, r5 /* 801DC660 001D95C0 81 8C 02 AC */ lwz r12, 0x2ac(r12) @@ -2798,9 +2798,9 @@ sub_801dc60c: /* 801DC690 001D95F0 80 03 00 CC */ lwz r0, 0xcc(r3) /* 801DC694 001D95F4 2C 00 00 00 */ cmpwi r0, 0 /* 801DC698 001D95F8 41 82 00 88 */ beq lbl_801DC720 -/* 801DC69C 001D95FC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801DC69C 001D95FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DC6A0 001D9600 C0 3F 00 04 */ lfs f1, 4(r31) -/* 801DC6A4 001D9604 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801DC6A4 001D9604 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801DC6A8 001D9608 7F A3 EB 78 */ mr r3, r29 /* 801DC6AC 001D960C C0 44 00 00 */ lfs f2, 0(r4) /* 801DC6B0 001D9610 C0 04 00 08 */ lfs f0, 8(r4) @@ -3397,8 +3397,8 @@ lbl_801DCEC8: /* 801DCEE0 001D9E40 48 00 00 B0 */ b lbl_801DCF90 lbl_801DCEE4: /* 801DCEE4 001D9E44 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801DCEE8 001D9E48 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DCEEC 001D9E4C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801DCEF4 001D9E54 3C 80 80 3E */ lis r4, lbl_803DAA44@ha /* 801DCEF8 001D9E58 90 01 00 10 */ stw r0, 0x10(r1) @@ -3602,10 +3602,10 @@ lbl_801DD1D0: lbl_801DD1E4: /* 801DD1E4 001DA144 93 61 00 08 */ stw r27, 8(r1) /* 801DD1E8 001DA148 38 00 00 01 */ li r0, 1 -/* 801DD1EC 001DA14C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801DD1EC 001DA14C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DD1F0 001DA150 C0 22 AC D8 */ lfs f1, lbl_805AC9F8@sda21(r2) /* 801DD1F4 001DA154 90 01 00 0C */ stw r0, 0xc(r1) -/* 801DD1F8 001DA158 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801DD1F8 001DA158 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801DD1FC 001DA15C C0 42 AC E8 */ lfs f2, lbl_805ACA08@sda21(r2) /* 801DD200 001DA160 7F 43 D3 78 */ mr r3, r26 /* 801DD204 001DA164 80 9A 07 58 */ lwz r4, 0x758(r26) @@ -4956,8 +4956,8 @@ sub_801de434: /* 801DE50C 001DB46C D0 5C 00 08 */ stfs f2, 8(r28) /* 801DE510 001DB470 48 00 00 20 */ b lbl_801DE530 lbl_801DE514: -/* 801DE514 001DB474 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DE518 001DB478 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801DE514 001DB474 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801DE518 001DB478 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801DE51C 001DB47C D0 1C 00 00 */ stfs f0, 0(r28) /* 801DE520 001DB480 C0 03 00 04 */ lfs f0, 4(r3) /* 801DE524 001DB484 D0 1C 00 04 */ stfs f0, 4(r28) @@ -5272,8 +5272,8 @@ lbl_801DE940: /* 801DE9A8 001DB908 D0 5D 00 08 */ stfs f2, 8(r29) /* 801DE9AC 001DB90C 48 00 00 20 */ b lbl_801DE9CC lbl_801DE9B0: -/* 801DE9B0 001DB910 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DE9B4 001DB914 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801DE9B0 001DB910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801DE9B4 001DB914 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801DE9B8 001DB918 D0 1D 00 00 */ stfs f0, 0(r29) /* 801DE9BC 001DB91C C0 03 00 04 */ lfs f0, 4(r3) /* 801DE9C0 001DB920 D0 1D 00 04 */ stfs f0, 4(r29) @@ -5719,8 +5719,8 @@ lbl_801DEF8C: /* 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 -/* 801DEFA4 001DBF04 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DEFA8 001DBF08 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801DEFB0 001DBF10 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 801DEFB4 001DBF14 90 E1 00 24 */ stw r7, 0x24(r1) @@ -5762,8 +5762,8 @@ lbl_801DEF8C: /* 801DF044 001DBFA4 48 00 00 B0 */ b lbl_801DF0F4 lbl_801DF048: /* 801DF048 001DBFA8 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801DF04C 001DBFAC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DF050 001DBFB0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 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 /* 801DF05C 001DBFBC C0 44 00 00 */ lfs f2, 0(r4) @@ -6103,8 +6103,8 @@ lbl_801DF52C: /* 801DF55C 001DC4BC 38 03 AA 68 */ addi r0, r3, lbl_803DAA68@l /* 801DF560 001DC4C0 90 01 00 08 */ stw r0, 8(r1) lbl_801DF564: -/* 801DF564 001DC4C4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DF568 001DC4C8 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 801DF564 001DC4C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801DF568 001DC4C8 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 801DF56C 001DC4CC C0 DF 06 54 */ lfs f6, 0x654(r31) /* 801DF570 001DC4D0 38 81 00 EC */ addi r4, r1, 0xec /* 801DF574 001DC4D4 C0 BF 06 50 */ lfs f5, 0x650(r31) @@ -6177,8 +6177,8 @@ lbl_801DF648: /* 801DF660 001DC5C0 48 00 00 CC */ b lbl_801DF72C lbl_801DF664: /* 801DF664 001DC5C4 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 801DF668 001DC5C8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DF66C 001DC5CC C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801DF674 001DC5D4 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha /* 801DF678 001DC5D8 90 C1 00 08 */ stw r6, 8(r1) @@ -6276,8 +6276,8 @@ lbl_801DF7AC: /* 801DF7C4 001DC724 48 00 00 C8 */ b lbl_801DF88C lbl_801DF7C8: /* 801DF7C8 001DC728 3C 80 80 3E */ lis r4, lbl_803DAA68@ha -/* 801DF7CC 001DC72C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DF7D0 001DC730 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 801DF7D8 001DC738 3C 80 80 3E */ lis r4, lbl_803DA9CC@ha /* 801DF7DC 001DC73C 90 A1 00 08 */ stw r5, 8(r1) @@ -6609,8 +6609,8 @@ lbl_801DFB78: /* 801DFC84 001DCBE4 38 81 00 B4 */ addi r4, r1, 0xb4 /* 801DFC88 001DCBE8 38 A1 00 70 */ addi r5, r1, 0x70 /* 801DFC8C 001DCBEC 48 13 06 09 */ bl __ml__9CMatrix3fCFRC9CVector3f -/* 801DFC90 001DCBF0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801DFC94 001DCBF4 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 801DFC90 001DCBF0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801DFC94 001DCBF4 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 801DFC98 001DCBF8 C0 61 00 70 */ lfs f3, 0x70(r1) /* 801DFC9C 001DCBFC 38 81 00 98 */ addi r4, r1, 0x98 /* 801DFCA0 001DCC00 C0 41 00 74 */ lfs f2, 0x74(r1) @@ -6752,11 +6752,11 @@ lbl_801DFD94: /* 801DFEA8 001DCE08 39 21 00 88 */ addi r9, r1, 0x88 /* 801DFEAC 001DCE0C 4B E6 A1 F5 */ bl ApplyDamage__13CStateManagerF9TUniqueId9TUniqueId9TUniqueIdRC11CDamageInfoRC15CMaterialFilterRC9CVector3f /* 801DFEB0 001DCE10 38 00 00 01 */ li r0, 1 -/* 801DFEB4 001DCE14 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801DFEB4 001DCE14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801DFEB8 001DCE18 98 1A 06 88 */ stb r0, 0x688(r26) /* 801DFEBC 001DCE1C 38 00 00 00 */ li r0, 0 /* 801DFEC0 001DCE20 98 1A 07 C8 */ stb r0, 0x7c8(r26) -/* 801DFEC4 001DCE24 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801DFEC4 001DCE24 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801DFEC8 001DCE28 D0 1A 07 CC */ stfs f0, 0x7cc(r26) /* 801DFECC 001DCE2C C0 03 00 04 */ lfs f0, 4(r3) /* 801DFED0 001DCE30 D0 1A 07 D0 */ stfs f0, 0x7d0(r26) @@ -6857,8 +6857,8 @@ lbl_801DFFD4: /* 801E0030 001DCF90 7C 03 00 40 */ cmplw r3, r0 /* 801E0034 001DCF94 41 80 00 28 */ blt lbl_801E005C /* 801E0038 001DCF98 81 9A 00 00 */ lwz r12, 0(r26) -/* 801E003C 001DCF9C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801E0040 001DCFA0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801E003C 001DCF9C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801E0040 001DCFA0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801E0044 001DCFA4 7F 43 D3 78 */ mr r3, r26 /* 801E0048 001DCFA8 81 8C 00 84 */ lwz r12, 0x84(r12) /* 801E004C 001DCFAC 7F 64 DB 78 */ mr r4, r27 @@ -7637,9 +7637,9 @@ lbl_801E0B30: /* 801E0B88 001DDAE8 C0 41 04 B0 */ lfs f2, 0x4b0(r1) /* 801E0B8C 001DDAEC 38 00 00 01 */ li r0, 1 /* 801E0B90 001DDAF0 C0 01 04 C0 */ lfs f0, 0x4c0(r1) -/* 801E0B94 001DDAF4 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 801E0B94 001DDAF4 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 801E0B98 001DDAF8 90 81 01 EC */ stw r4, 0x1ec(r1) -/* 801E0B9C 001DDAFC 38 C5 67 00 */ addi r6, r5, lbl_805A6700@l +/* 801E0B9C 001DDAFC 38 C5 67 00 */ addi r6, r5, sDownVector__9CVector3f@l /* 801E0BA0 001DDB00 C0 22 AD 44 */ lfs f1, lbl_805ACA64@sda21(r2) /* 801E0BA4 001DDB04 7F E4 FB 78 */ mr r4, r31 /* 801E0BA8 001DDB08 90 61 01 E8 */ stw r3, 0x1e8(r1) @@ -7654,9 +7654,9 @@ lbl_801E0B30: /* 801E0BCC 001DDB2C D0 01 01 54 */ stfs f0, 0x154(r1) /* 801E0BD0 001DDB30 4B E6 C3 C9 */ bl RayStaticIntersection__13CStateManagerCFRC9CVector3fRC9CVector3ffRC15CMaterialFilter /* 801E0BD4 001DDB34 C0 01 02 F4 */ lfs f0, 0x2f4(r1) -/* 801E0BD8 001DDB38 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801E0BD8 001DDB38 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801E0BDC 001DDB3C C0 82 AC DC */ lfs f4, lbl_805AC9FC@sda21(r2) -/* 801E0BE0 001DDB40 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801E0BE0 001DDB40 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801E0BE4 001DDB44 C0 41 02 F8 */ lfs f2, 0x2f8(r1) /* 801E0BE8 001DDB48 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 801E0BEC 001DDB4C EC 60 20 2A */ fadds f3, f0, f4 @@ -7937,9 +7937,9 @@ lbl_801E0F44: .global lbl_801E1010 lbl_801E1010: /* 801E1010 001DDF70 38 00 00 00 */ li r0, 0 -/* 801E1014 001DDF74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E1014 001DDF74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E1018 001DDF78 98 1E 07 C8 */ stb r0, 0x7c8(r30) -/* 801E101C 001DDF7C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801E101C 001DDF7C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801E1020 001DDF80 D0 1E 07 CC */ stfs f0, 0x7cc(r30) /* 801E1024 001DDF84 C0 03 00 04 */ lfs f0, 4(r3) /* 801E1028 001DDF88 D0 1E 07 D0 */ stfs f0, 0x7d0(r30) @@ -8183,10 +8183,10 @@ lbl_801E119C: /* 801E1388 001DE2E8 4B F2 15 AD */ bl __ct__20CDamageVulnerabilityF14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability14EVulnerability15EDeflectionType /* 801E138C 001DE2EC 90 61 00 08 */ stw r3, 8(r1) /* 801E1390 001DE2F0 38 1F 00 68 */ addi r0, r31, 0x68 -/* 801E1394 001DE2F4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801E1394 001DE2F4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801E1398 001DE2F8 38 A1 03 AC */ addi r5, r1, 0x3ac /* 801E139C 001DE2FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 801E13A0 001DE300 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 801E13A0 001DE300 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 801E13A4 001DE304 38 00 00 00 */ li r0, 0 /* 801E13A8 001DE308 C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801E13AC 001DE30C 80 9F 06 30 */ lwz r4, 0x630(r31) @@ -8312,15 +8312,15 @@ lbl_801E14FC: /* 801E155C 001DE4BC 90 61 00 F0 */ stw r3, 0xf0(r1) /* 801E1560 001DE4C0 B0 01 00 9C */ sth r0, 0x9c(r1) /* 801E1564 001DE4C4 48 16 8A 31 */ bl Blue__6CColorFv -/* 801E1568 001DE4C8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801E1568 001DE4C8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801E156C 001DE4CC 7C 65 1B 78 */ mr r5, r3 -/* 801E1570 001DE4D0 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801E1570 001DE4D0 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801E1574 001DE4D4 38 61 02 F4 */ addi r3, r1, 0x2f4 /* 801E1578 001DE4D8 48 12 4E BD */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 801E157C 001DE4DC 38 00 00 00 */ li r0, 0 -/* 801E1580 001DE4E0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801E1580 001DE4E0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801E1584 001DE4E4 90 01 00 08 */ stw r0, 8(r1) -/* 801E1588 001DE4E8 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 801E1588 001DE4E8 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 801E158C 001DE4EC C0 22 AC DC */ lfs f1, lbl_805AC9FC@sda21(r2) /* 801E1590 001DE4F0 7E 63 9B 78 */ mr r3, r19 /* 801E1594 001DE4F4 90 01 00 0C */ stw r0, 0xc(r1) @@ -8783,8 +8783,8 @@ lbl_801E1BA4: /* 801E1C18 001DEB78 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801E1C1C 001DEB7C 4C 40 13 82 */ cror 2, 0, 2 /* 801E1C20 001DEB80 40 82 05 B0 */ bne lbl_801E21D0 -/* 801E1C24 001DEB84 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 801E1C28 001DEB88 C4 43 67 24 */ lfsu f2, lbl_805A6724@l(r3) +/* 801E1C24 001DEB84 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 801E1C28 001DEB88 C4 43 67 24 */ lfsu f2, sForwardVector__9CVector3f@l(r3) /* 801E1C2C 001DEB8C C3 E2 AC D8 */ lfs f31, lbl_805AC9F8@sda21(r2) /* 801E1C30 001DEB90 C0 23 00 04 */ lfs f1, 4(r3) /* 801E1C34 001DEB94 C0 03 00 08 */ lfs f0, 8(r3) @@ -8802,8 +8802,8 @@ lbl_801E1BA4: /* 801E1C64 001DEBC4 7C 00 22 78 */ xor r0, r0, r4 /* 801E1C68 001DEBC8 7C 04 00 51 */ subf. r0, r4, r0 /* 801E1C6C 001DEBCC 41 82 00 24 */ beq lbl_801E1C90 -/* 801E1C70 001DEBD0 3C 60 80 5A */ lis r3, lbl_805A670C@ha -/* 801E1C74 001DEBD4 C4 43 67 0C */ lfsu f2, lbl_805A670C@l(r3) +/* 801E1C70 001DEBD0 3C 60 80 5A */ lis r3, sLeftVector__9CVector3f@ha +/* 801E1C74 001DEBD4 C4 43 67 0C */ lfsu f2, sLeftVector__9CVector3f@l(r3) /* 801E1C78 001DEBD8 C0 23 00 04 */ lfs f1, 4(r3) /* 801E1C7C 001DEBDC C0 03 00 08 */ lfs f0, 8(r3) /* 801E1C80 001DEBE0 D0 41 01 A8 */ stfs f2, 0x1a8(r1) @@ -8811,8 +8811,8 @@ lbl_801E1BA4: /* 801E1C88 001DEBE8 D0 01 01 B0 */ stfs f0, 0x1b0(r1) /* 801E1C8C 001DEBEC 48 00 00 20 */ b lbl_801E1CAC lbl_801E1C90: -/* 801E1C90 001DEBF0 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 801E1C94 001DEBF4 C4 43 67 18 */ lfsu f2, lbl_805A6718@l(r3) +/* 801E1C90 001DEBF0 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 801E1C94 001DEBF4 C4 43 67 18 */ lfsu f2, sRightVector__9CVector3f@l(r3) /* 801E1C98 001DEBF8 C0 23 00 04 */ lfs f1, 4(r3) /* 801E1C9C 001DEBFC C0 03 00 08 */ lfs f0, 8(r3) /* 801E1CA0 001DEC00 D0 41 01 A8 */ stfs f2, 0x1a8(r1) @@ -8847,9 +8847,9 @@ lbl_801E1CC8: /* 801E1D0C 001DEC6C 7D 89 03 A6 */ mtctr r12 /* 801E1D10 001DEC70 4E 80 04 21 */ bctrl /* 801E1D14 001DEC74 80 1F 06 44 */ lwz r0, 0x644(r31) -/* 801E1D18 001DEC78 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E1D18 001DEC78 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E1D1C 001DEC7C 80 81 02 1C */ lwz r4, 0x21c(r1) -/* 801E1D20 001DEC80 3A 83 66 A0 */ addi r20, r3, skZero3f@l +/* 801E1D20 001DEC80 3A 83 66 A0 */ addi r20, r3, sZeroVector__9CVector3f@l /* 801E1D24 001DEC84 88 61 02 20 */ lbz r3, 0x220(r1) /* 801E1D28 001DEC88 2C 00 00 01 */ cmpwi r0, 1 /* 801E1D2C 001DEC8C C0 61 02 24 */ lfs f3, 0x224(r1) @@ -9080,10 +9080,10 @@ lbl_801E207C: /* 801E2084 001DEFE4 41 82 00 48 */ beq lbl_801E20CC /* 801E2088 001DEFE8 93 C1 00 08 */ stw r30, 8(r1) /* 801E208C 001DEFEC 38 00 00 00 */ li r0, 0 -/* 801E2090 001DEFF0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E2090 001DEFF0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E2094 001DEFF4 C0 22 AC D8 */ lfs f1, lbl_805AC9F8@sda21(r2) /* 801E2098 001DEFF8 90 01 00 0C */ stw r0, 0xc(r1) -/* 801E209C 001DEFFC 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801E209C 001DEFFC 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801E20A0 001DF000 C0 42 AC E8 */ lfs f2, lbl_805ACA08@sda21(r2) /* 801E20A4 001DF004 7F E3 FB 78 */ mr r3, r31 /* 801E20A8 001DF008 C0 62 AC EC */ lfs f3, lbl_805ACA0C@sda21(r2) @@ -9098,10 +9098,10 @@ lbl_801E207C: lbl_801E20CC: /* 801E20CC 001DF02C 93 C1 00 08 */ stw r30, 8(r1) /* 801E20D0 001DF030 38 00 00 01 */ li r0, 1 -/* 801E20D4 001DF034 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E20D4 001DF034 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E20D8 001DF038 C0 22 AC D8 */ lfs f1, lbl_805AC9F8@sda21(r2) /* 801E20DC 001DF03C 90 01 00 0C */ stw r0, 0xc(r1) -/* 801E20E0 001DF040 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 801E20E0 001DF040 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 801E20E4 001DF044 C0 42 AC E8 */ lfs f2, lbl_805ACA08@sda21(r2) /* 801E20E8 001DF048 7F E3 FB 78 */ mr r3, r31 /* 801E20EC 001DF04C 80 9F 07 5C */ lwz r4, 0x75c(r31) @@ -9116,8 +9116,8 @@ lbl_801E20CC: .global lbl_801E2110 lbl_801E2110: /* 801E2110 001DF070 81 9F 00 00 */ lwz r12, 0(r31) -/* 801E2114 001DF074 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801E2118 001DF078 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801E2114 001DF074 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801E2118 001DF078 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801E211C 001DF07C 7F E3 FB 78 */ mr r3, r31 /* 801E2120 001DF080 81 8C 00 84 */ lwz r12, 0x84(r12) /* 801E2124 001DF084 7F C4 F3 78 */ mr r4, r30 @@ -9355,12 +9355,12 @@ Accept__8CThardusFR8IVisitor: /* 801E2488 001DF3E8 38 E0 00 04 */ li r7, 4 /* 801E248C 001DF3EC D0 0F 06 F8 */ stfs f0, 0x6f8(r15) /* 801E2490 001DF3F0 48 1A 72 BD */ bl __construct_array -/* 801E2494 001DF3F4 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 801E2498 001DF3F8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801E249C 001DF3FC 38 A3 67 24 */ addi r5, r3, lbl_805A6724@l +/* 801E2494 001DF3F4 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 801E2498 001DF3F8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801E249C 001DF3FC 38 A3 67 24 */ addi r5, r3, sForwardVector__9CVector3f@l /* 801E24A0 001DF400 C0 05 00 00 */ lfs f0, 0(r5) /* 801E24A4 001DF404 38 6F 07 64 */ addi r3, r15, 0x764 -/* 801E24A8 001DF408 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801E24A8 001DF408 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801E24AC 001DF40C D0 0F 07 4C */ stfs f0, 0x74c(r15) /* 801E24B0 001DF410 C0 05 00 04 */ lfs f0, 4(r5) /* 801E24B4 001DF414 D0 0F 07 50 */ stfs f0, 0x750(r15) @@ -9371,9 +9371,9 @@ Accept__8CThardusFR8IVisitor: /* 801E24C8 001DF428 91 CF 07 60 */ stw r14, 0x760(r15) /* 801E24CC 001DF42C 48 13 06 A9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 801E24D0 001DF430 38 00 00 00 */ li r0, 0 -/* 801E24D4 001DF434 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E24D4 001DF434 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E24D8 001DF438 90 0F 07 94 */ stw r0, 0x794(r15) -/* 801E24DC 001DF43C 39 C3 66 A0 */ addi r14, r3, skZero3f@l +/* 801E24DC 001DF43C 39 C3 66 A0 */ addi r14, r3, sZeroVector__9CVector3f@l /* 801E24E0 001DF440 C0 22 AC D8 */ lfs f1, lbl_805AC9F8@sda21(r2) /* 801E24E4 001DF444 38 6F 07 F0 */ addi r3, r15, 0x7f0 /* 801E24E8 001DF448 90 0F 07 9C */ stw r0, 0x79c(r15) @@ -9412,9 +9412,9 @@ Accept__8CThardusFR8IVisitor: /* 801E256C 001DF4CC 80 D0 01 0C */ lwz r6, 0x10c(r16) /* 801E2570 001DF4D0 4B FE 68 25 */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 801E2574 001DF4D4 38 00 00 00 */ li r0, 0 -/* 801E2578 001DF4D8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E2578 001DF4D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E257C 001DF4DC 98 0F 08 D4 */ stb r0, 0x8d4(r15) -/* 801E2580 001DF4E0 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801E2580 001DF4E0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E2584 001DF4E4 3C 80 80 3D */ lis r4, lbl_803D1CB8@ha /* 801E2588 001DF4E8 38 61 00 64 */ addi r3, r1, 0x64 /* 801E258C 001DF4EC C0 06 00 00 */ lfs f0, 0(r6) @@ -9456,8 +9456,8 @@ Accept__8CThardusFR8IVisitor: /* 801E261C 001DF57C 38 80 FF FF */ li r4, -1 /* 801E2620 001DF580 48 15 E8 21 */ bl __dt__6CTokenFv /* 801E2624 001DF584 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 801E2628 001DF588 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801E262C 001DF58C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801E2628 001DF588 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801E262C 001DF58C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E2630 001DF590 38 A0 00 00 */ li r5, 0 /* 801E2634 001DF594 B0 0F 09 28 */ sth r0, 0x928(r15) /* 801E2638 001DF598 38 80 00 01 */ li r4, 1 @@ -10007,8 +10007,8 @@ lbl_801E2DB8: .global sub_801e2dd0 sub_801e2dd0: /* 801E2DD0 001DFD30 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 801E2DD4 001DFD34 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801E2DD8 001DFD38 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801E2DD4 001DFD34 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801E2DD8 001DFD38 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801E2DDC 001DFD3C 38 80 00 00 */ li r4, 0 /* 801E2DE0 001DFD40 B0 03 00 00 */ sth r0, 0(r3) /* 801E2DE4 001DFD44 C0 05 00 00 */ lfs f0, 0(r5) @@ -10419,9 +10419,9 @@ sub_801e32a0: /* 801E3340 001E02A0 EC 80 05 32 */ fmuls f4, f0, f20 /* 801E3344 001E02A4 C0 24 00 00 */ lfs f1, 0(r4) /* 801E3348 001E02A8 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 801E334C 001E02AC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801E334C 001E02AC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801E3350 001E02B0 C0 64 00 20 */ lfs f3, 0x20(r4) -/* 801E3354 001E02B4 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 801E3354 001E02B4 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 801E3358 001E02B8 C0 44 00 08 */ lfs f2, 8(r4) /* 801E335C 001E02BC EF 84 00 72 */ fmuls f28, f4, f1 /* 801E3360 001E02C0 C0 24 00 18 */ lfs f1, 0x18(r4) diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 26445fb8..07296af5 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -640,9 +640,9 @@ sub_80203a94: /* 80203C98 00200BF8 4B E4 64 09 */ bl ApplyDamage__13CStateManagerF9TUniqueId9TUniqueId9TUniqueIdRC11CDamageInfoRC15CMaterialFilterRC9CVector3f lbl_80203C9C: /* 80203C9C 00200BFC 81 5E 08 CC */ lwz r10, 0x8cc(r30) -/* 80203CA0 00200C00 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80203CA0 00200C00 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80203CA4 00200C04 C0 9D 00 60 */ lfs f4, 0x60(r29) -/* 80203CA8 00200C08 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 80203CA8 00200C08 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80203CAC 00200C0C C0 7D 00 50 */ lfs f3, 0x50(r29) /* 80203CB0 00200C10 38 00 00 01 */ li r0, 1 /* 80203CB4 00200C14 C0 1D 00 40 */ lfs f0, 0x40(r29) @@ -1487,8 +1487,8 @@ lbl_80204868: /* 8020489C 002017FC D0 41 00 1C */ stfs f2, 0x1c(r1) /* 802048A0 00201800 D0 01 00 14 */ stfs f0, 0x14(r1) /* 802048A4 00201804 48 10 FF AD */ bl AsNormalized__9CVector3fCFv -/* 802048A8 00201808 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802048AC 0020180C C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 802048A8 00201808 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802048AC 0020180C C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 802048B0 00201810 C0 61 00 08 */ lfs f3, 8(r1) /* 802048B4 00201814 38 81 00 20 */ addi r4, r1, 0x20 /* 802048B8 00201818 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -1639,8 +1639,8 @@ lbl_80204AA4: /* 80204AC8 00201A28 39 00 00 00 */ li r8, 0 /* 80204ACC 00201A2C 38 00 00 01 */ li r0, 1 /* 80204AD0 00201A30 90 81 00 8C */ stw r4, 0x8c(r1) -/* 80204AD4 00201A34 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 80204AD8 00201A38 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 80204AD4 00201A34 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 80204AD8 00201A38 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 80204ADC 00201A3C C0 22 B0 A8 */ lfs f1, lbl_805ACDC8@sda21(r2) /* 80204AE0 00201A40 90 61 00 88 */ stw r3, 0x88(r1) /* 80204AE4 00201A44 7F C4 F3 78 */ mr r4, r30 @@ -1710,8 +1710,8 @@ lbl_80204AA4: /* 80204BE4 00201B44 C3 C1 00 24 */ lfs f30, 0x24(r1) /* 80204BE8 00201B48 C3 A1 00 28 */ lfs f29, 0x28(r1) lbl_80204BEC: -/* 80204BEC 00201B4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80204BF0 00201B50 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 80204BEC 00201B4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80204BF0 00201B50 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 80204BF4 00201B54 C0 02 B0 88 */ lfs f0, lbl_805ACDA8@sda21(r2) /* 80204BF8 00201B58 38 81 00 68 */ addi r4, r1, 0x68 /* 80204BFC 00201B5C C0 43 00 04 */ lfs f2, 4(r3) @@ -1771,8 +1771,8 @@ lbl_80204C8C: /* 80204CC0 00201C20 D0 41 00 1C */ stfs f2, 0x1c(r1) /* 80204CC4 00201C24 D0 01 00 14 */ stfs f0, 0x14(r1) /* 80204CC8 00201C28 48 10 FB 89 */ bl AsNormalized__9CVector3fCFv -/* 80204CCC 00201C2C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80204CD0 00201C30 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 80204CCC 00201C2C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80204CD0 00201C30 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 80204CD4 00201C34 C0 61 00 08 */ lfs f3, 8(r1) /* 80204CD8 00201C38 38 81 00 20 */ addi r4, r1, 0x20 /* 80204CDC 00201C3C C0 41 00 0C */ lfs f2, 0xc(r1) @@ -1826,8 +1826,8 @@ lbl_80204D74: /* 80204D84 00201CE4 39 00 00 00 */ li r8, 0 /* 80204D88 00201CE8 38 00 00 01 */ li r0, 1 /* 80204D8C 00201CEC 90 81 00 74 */ stw r4, 0x74(r1) -/* 80204D90 00201CF0 3C 80 80 5A */ lis r4, lbl_805A6700@ha -/* 80204D94 00201CF4 38 C4 67 00 */ addi r6, r4, lbl_805A6700@l +/* 80204D90 00201CF0 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha +/* 80204D94 00201CF4 38 C4 67 00 */ addi r6, r4, sDownVector__9CVector3f@l /* 80204D98 00201CF8 C0 22 B0 9C */ lfs f1, lbl_805ACDBC@sda21(r2) /* 80204D9C 00201CFC 90 61 00 70 */ stw r3, 0x70(r1) /* 80204DA0 00201D00 7F E4 FB 78 */ mr r4, r31 @@ -1950,9 +1950,9 @@ lbl_80204EF0: /* 80204F68 00201EC8 80 BE 05 CC */ lwz r5, 0x5cc(r30) /* 80204F6C 00201ECC 4B FF E8 B9 */ bl sub_80203824 /* 80204F70 00201ED0 81 5F 08 CC */ lwz r10, 0x8cc(r31) -/* 80204F74 00201ED4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80204F74 00201ED4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80204F78 00201ED8 C0 9E 00 60 */ lfs f4, 0x60(r30) -/* 80204F7C 00201EDC 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 80204F7C 00201EDC 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80204F80 00201EE0 C0 7E 00 50 */ lfs f3, 0x50(r30) /* 80204F84 00201EE4 38 00 00 00 */ li r0, 0 /* 80204F88 00201EE8 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -2311,8 +2311,8 @@ lbl_80205314: /* 802054B8 00202418 38 A0 FF FF */ li r5, -1 /* 802054BC 0020241C 48 13 8C D9 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" /* 802054C0 00202420 A0 01 00 80 */ lhz r0, 0x80(r1) -/* 802054C4 00202424 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802054C8 00202428 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 802054C4 00202424 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802054C8 00202428 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 802054CC 0020242C 7E 29 8B 78 */ mr r9, r17 /* 802054D0 00202430 3C A0 80 57 */ lis r5, lbl_8056D578@ha /* 802054D4 00202434 B0 01 00 64 */ sth r0, 0x64(r1) @@ -2569,9 +2569,9 @@ lbl_80205824: /* 80205870 002027D0 4B FF DF B5 */ bl sub_80203824 lbl_80205874: /* 80205874 002027D4 81 5E 08 CC */ lwz r10, 0x8cc(r30) -/* 80205878 002027D8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80205878 002027D8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8020587C 002027DC C0 91 00 60 */ lfs f4, 0x60(r17) -/* 80205880 002027E0 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 80205880 002027E0 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 80205884 002027E4 C0 71 00 50 */ lfs f3, 0x50(r17) /* 80205888 002027E8 38 00 00 01 */ li r0, 1 /* 8020588C 002027EC C0 11 00 40 */ lfs f0, 0x40(r17) @@ -2657,9 +2657,9 @@ lbl_802058D0: /* 802059C8 00202928 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 802059CC 0020292C 7D 89 03 A6 */ mtctr r12 /* 802059D0 00202930 4E 80 04 21 */ bctrl -/* 802059D4 00202934 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802059D4 00202934 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802059D8 00202938 7F C3 F3 78 */ mr r3, r30 -/* 802059DC 0020293C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 802059DC 0020293C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 802059E0 00202940 38 A1 00 34 */ addi r5, r1, 0x34 /* 802059E4 00202944 38 81 00 3C */ addi r4, r1, 0x3c /* 802059E8 00202948 38 C1 00 2C */ addi r6, r1, 0x2c diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index da7a4bc6..8cd2e0bf 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -420,9 +420,9 @@ lbl_8025DC90: /* 8025DDA0 0025AD00 38 81 01 B0 */ addi r4, r1, 0x1b0 /* 8025DDA4 0025AD04 38 C1 00 48 */ addi r6, r1, 0x48 /* 8025DDA8 0025AD08 4B DE E9 55 */ bl "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" -/* 8025DDAC 0025AD0C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8025DDAC 0025AD0C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8025DDB0 0025AD10 7F 63 DB 78 */ mr r3, r27 -/* 8025DDB4 0025AD14 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 8025DDB4 0025AD14 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 8025DDB8 0025AD18 38 C1 00 98 */ addi r6, r1, 0x98 /* 8025DDBC 0025AD1C 38 81 00 78 */ addi r4, r1, 0x78 /* 8025DDC0 0025AD20 4B F2 55 E1 */ bl DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter @@ -502,9 +502,9 @@ lbl_8025DE54: /* 8025DED0 0025AE30 48 0B 4C A5 */ bl __ct__12CTransform4fFRC12CTransform4f /* 8025DED4 0025AE34 38 81 00 78 */ addi r4, r1, 0x78 /* 8025DED8 0025AE38 38 01 00 98 */ addi r0, r1, 0x98 -/* 8025DEDC 0025AE3C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8025DEDC 0025AE3C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8025DEE0 0025AE40 90 81 01 18 */ stw r4, 0x118(r1) -/* 8025DEE4 0025AE44 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8025DEE4 0025AE44 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8025DEE8 0025AE48 90 01 01 1C */ stw r0, 0x11c(r1) /* 8025DEEC 0025AE4C 7F C3 F3 78 */ mr r3, r30 /* 8025DEF0 0025AE50 48 0B 4C 85 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -801,8 +801,8 @@ sub_8025e2e0: /* 8025E2F8 0025B258 93 A1 00 54 */ stw r29, 0x54(r1) /* 8025E2FC 0025B25C 93 81 00 50 */ stw r28, 0x50(r1) /* 8025E300 0025B260 83 A4 08 38 */ lwz r29, 0x838(r4) -/* 8025E304 0025B264 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8025E308 0025B268 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 8025E304 0025B264 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8025E308 0025B268 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 8025E30C 0025B26C AB 9D 20 08 */ lha r28, 0x2008(r29) /* 8025E310 0025B270 48 00 01 04 */ b lbl_8025E414 lbl_8025E314: @@ -849,11 +849,11 @@ lbl_8025E3AC: lbl_8025E3B0: /* 8025E3B0 0025B310 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8025E3B4 0025B314 41 82 00 44 */ beq lbl_8025E3F8 -/* 8025E3B8 0025B318 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8025E3B8 0025B318 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8025E3BC 0025B31C C0 5E 00 04 */ lfs f2, 4(r30) /* 8025E3C0 0025B320 C0 3E 00 08 */ lfs f1, 8(r30) /* 8025E3C4 0025B324 38 81 00 28 */ addi r4, r1, 0x28 -/* 8025E3C8 0025B328 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8025E3C8 0025B328 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8025E3CC 0025B32C C0 02 BA 3C */ lfs f0, lbl_805AD75C@sda21(r2) /* 8025E3D0 0025B330 D0 C1 00 28 */ stfs f6, 0x28(r1) /* 8025E3D4 0025B334 D0 81 00 2C */ stfs f4, 0x2c(r1) @@ -1715,9 +1715,9 @@ sub_8025ee28: /* 8025EFF8 0025BF58 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8025EFFC 0025BF5C 7D 89 03 A6 */ mtctr r12 /* 8025F000 0025BF60 4E 80 04 21 */ bctrl -/* 8025F004 0025BF64 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8025F004 0025BF64 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8025F008 0025BF68 7F A3 EB 78 */ mr r3, r29 -/* 8025F00C 0025BF6C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8025F00C 0025BF6C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8025F010 0025BF70 38 A1 00 14 */ addi r5, r1, 0x14 /* 8025F014 0025BF74 38 81 00 1C */ addi r4, r1, 0x1c /* 8025F018 0025BF78 38 C1 00 0C */ addi r6, r1, 0xc @@ -2192,8 +2192,8 @@ sub_8025f648: /* 8025F6C4 0025C624 38 61 00 08 */ addi r3, r1, 8 /* 8025F6C8 0025C628 38 81 00 14 */ addi r4, r1, 0x14 /* 8025F6CC 0025C62C 48 0B 51 85 */ bl AsNormalized__9CVector3fCFv -/* 8025F6D0 0025C630 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8025F6D4 0025C634 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8025F6D0 0025C630 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8025F6D4 0025C634 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8025F6D8 0025C638 C0 61 00 08 */ lfs f3, 8(r1) /* 8025F6DC 0025C63C 38 81 00 20 */ addi r4, r1, 0x20 /* 8025F6E0 0025C640 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -3822,9 +3822,9 @@ __ct__9CTryclops: /* 80260E20 0025DD80 38 A0 00 01 */ li r5, 1 /* 80260E24 0025DD84 80 DE 01 0C */ lwz r6, 0x10c(r30) /* 80260E28 0025DD88 4B F6 7F 6D */ bl __ct__15CPathFindSearchFP7CPFAreaUiff -/* 80260E2C 0025DD8C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80260E2C 0025DD8C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80260E30 0025DD90 38 7F 06 4C */ addi r3, r31, 0x64c -/* 80260E34 0025DD94 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80260E34 0025DD94 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80260E38 0025DD98 48 0B 1D 3D */ bl __ct__12CTransform4fFRC12CTransform4f /* 80260E3C 0025DD9C C0 02 BA 60 */ lfs f0, lbl_805AD780@sda21(r2) /* 80260E40 0025DDA0 C0 22 BA 5C */ lfs f1, lbl_805AD77C@sda21(r2) diff --git a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s index 359b4910..18d19e8d 100644 --- a/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s +++ b/asm/MetroidPrime/Enemies/CWallCrawlerSwarm.s @@ -178,9 +178,9 @@ UpdateEffects__17CWallCrawlerSwarmFR13CStateManagerR9CAnimData: /* 801E75A4 001E4504 40 81 01 90 */ ble lbl_801E7734 /* 801E75A8 001E4508 28 1C 00 00 */ cmplwi r28, 0 /* 801E75AC 001E450C 41 82 01 88 */ beq lbl_801E7734 -/* 801E75B0 001E4510 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E75B0 001E4510 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E75B4 001E4514 3B 40 00 00 */ li r26, 0 -/* 801E75B8 001E4518 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 801E75B8 001E4518 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 801E75BC 001E451C 48 00 01 70 */ b lbl_801E772C lbl_801E75C0: /* 801E75C0 001E4520 A0 1C 00 18 */ lhz r0, 0x18(r28) @@ -235,10 +235,10 @@ lbl_801E7670: /* 801E7678 001E45D8 38 AD 92 60 */ addi r5, r13, lbl_805A7E20@sda21 /* 801E767C 001E45DC 4B E7 29 E9 */ bl "Clamp__5CMathFRCiRCiRCi" /* 801E7680 001E45E0 81 83 00 00 */ lwz r12, 0(r3) -/* 801E7684 001E45E4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801E7684 001E45E4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801E7688 001E45E8 C0 A2 AD A0 */ lfs f5, lbl_805ACAC0@sda21(r2) /* 801E768C 001E45EC 39 40 00 00 */ li r10, 0 -/* 801E7690 001E45F0 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801E7690 001E45F0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801E7694 001E45F4 B1 41 00 4C */ sth r10, 0x4c(r1) /* 801E7698 001E45F8 C0 8D A4 D4 */ lfs f4, lbl_805A9094@sda21(r13) /* 801E769C 001E45FC 39 60 00 01 */ li r11, 1 @@ -310,9 +310,9 @@ FindClosestCell__17CWallCrawlerSwarmCFRC9CVector3f: /* 801E778C 001E46EC DB 61 00 90 */ stfd f27, 0x90(r1) /* 801E7790 001E46F0 F3 61 00 98 */ psq_st f27, 152(r1), 0, qr0 /* 801E7794 001E46F4 BE C1 00 68 */ stmw r22, 0x68(r1) -/* 801E7798 001E46F8 3C C0 80 5A */ lis r6, skZero3f@ha +/* 801E7798 001E46F8 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha /* 801E779C 001E46FC 7C 97 23 78 */ mr r23, r4 -/* 801E77A0 001E4700 38 86 66 A0 */ addi r4, r6, skZero3f@l +/* 801E77A0 001E4700 38 86 66 A0 */ addi r4, r6, sZeroVector__9CVector3f@l /* 801E77A4 001E4704 C3 82 AD A4 */ lfs f28, lbl_805ACAC4@sda21(r2) /* 801E77A8 001E4708 C3 E4 00 00 */ lfs f31, 0(r4) /* 801E77AC 001E470C 7C 76 1B 78 */ mr r22, r3 @@ -1355,10 +1355,10 @@ lbl_801E85D0: /* 801E86CC 001E562C 3B 40 00 03 */ li r26, 3 /* 801E86D0 001E5630 50 EB 2E B4 */ rlwimi r11, r7, 5, 0x1a, 0x1a /* 801E86D4 001E5634 90 81 00 F4 */ stw r4, 0xf4(r1) -/* 801E86D8 001E5638 3C A0 80 5A */ lis r5, skZero3f@ha +/* 801E86D8 001E5638 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 801E86DC 001E563C 38 81 00 34 */ addi r4, r1, 0x34 /* 801E86E0 001E5640 90 61 00 F0 */ stw r3, 0xf0(r1) -/* 801E86E4 001E5644 39 25 66 A0 */ addi r9, r5, skZero3f@l +/* 801E86E4 001E5644 39 25 66 A0 */ addi r9, r5, sZeroVector__9CVector3f@l /* 801E86E8 001E5648 7F A3 EB 78 */ mr r3, r29 /* 801E86EC 001E564C 38 A1 00 2C */ addi r5, r1, 0x2c /* 801E86F0 001E5650 99 81 00 3C */ stb r12, 0x3c(r1) @@ -1418,8 +1418,8 @@ lbl_801E879C: /* 801E87C0 001E5720 39 40 00 00 */ li r10, 0 /* 801E87C4 001E5724 38 00 00 03 */ li r0, 3 /* 801E87C8 001E5728 90 81 00 DC */ stw r4, 0xdc(r1) -/* 801E87CC 001E572C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801E87D0 001E5730 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801E87CC 001E572C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801E87D0 001E5730 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801E87D4 001E5734 38 A1 00 14 */ addi r5, r1, 0x14 /* 801E87D8 001E5738 90 61 00 D8 */ stw r3, 0xd8(r1) /* 801E87DC 001E573C 38 81 00 1C */ addi r4, r1, 0x1c @@ -2798,9 +2798,9 @@ SoftwareLight__17CWallCrawlerSwarmCFRC13CStateManagerRC6CAABox: /* 801E9B90 001E6AF0 93 C1 03 38 */ stw r30, 0x338(r1) /* 801E9B94 001E6AF4 93 A1 03 34 */ stw r29, 0x334(r1) /* 801E9B98 001E6AF8 93 81 03 30 */ stw r28, 0x330(r1) -/* 801E9B9C 001E6AFC 3C E0 80 5A */ lis r7, skZero3f@ha +/* 801E9B9C 001E6AFC 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 801E9BA0 001E6B00 7C 7F 1B 78 */ mr r31, r3 -/* 801E9BA4 001E6B04 38 67 66 A0 */ addi r3, r7, skZero3f@l +/* 801E9BA4 001E6B04 38 67 66 A0 */ addi r3, r7, sZeroVector__9CVector3f@l /* 801E9BA8 001E6B08 7C 9E 23 78 */ mr r30, r4 /* 801E9BAC 001E6B0C 80 83 00 00 */ lwz r4, 0(r3) /* 801E9BB0 001E6B10 7C BD 2B 78 */ mr r29, r5 @@ -3521,8 +3521,8 @@ lbl_801EA5E4: /* 801EA620 001E7580 D0 01 00 38 */ stfs f0, 0x38(r1) /* 801EA624 001E7584 48 12 A2 95 */ bl Magnitude__9CVector3fCFv /* 801EA628 001E7588 FF E0 08 90 */ fmr f31, f1 -/* 801EA62C 001E758C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 801EA630 001E7590 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 801EA62C 001E758C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 801EA630 001E7590 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 801EA634 001E7594 7F E3 FB 78 */ mr r3, r31 /* 801EA638 001E7598 48 12 85 71 */ bl SetRotation__12CTransform4fFRC12CTransform4f /* 801EA63C 001E759C C0 02 AD DC */ lfs f0, lbl_805ACAFC@sda21(r2) @@ -3615,8 +3615,8 @@ lbl_801EA754: /* 801EA78C 001E76EC EF 61 06 7C */ fnmsubs f27, f1, f25, f0 lbl_801EA790: /* 801EA790 001E76F0 D3 BF 00 30 */ stfs f29, 0x30(r31) -/* 801EA794 001E76F4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801EA798 001E76F8 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801EA794 001E76F4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801EA798 001E76F8 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801EA79C 001E76FC 38 80 00 01 */ li r4, 1 /* 801EA7A0 001E7700 D3 9F 00 34 */ stfs f28, 0x34(r31) /* 801EA7A4 001E7704 38 61 00 08 */ addi r3, r1, 8 @@ -3671,11 +3671,11 @@ sub_801ea83c: /* 801EA85C 001E77BC 93 C1 00 A8 */ stw r30, 0xa8(r1) /* 801EA860 001E77C0 93 A1 00 A4 */ stw r29, 0xa4(r1) /* 801EA864 001E77C4 7C 9E 23 78 */ mr r30, r4 -/* 801EA868 001E77C8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801EA868 001E77C8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 801EA86C 001E77CC C0 5E 00 24 */ lfs f2, 0x24(r30) /* 801EA870 001E77D0 7C 7D 1B 78 */ mr r29, r3 /* 801EA874 001E77D4 C0 3E 00 14 */ lfs f1, 0x14(r30) -/* 801EA878 001E77D8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801EA878 001E77D8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801EA87C 001E77DC C0 1E 00 04 */ lfs f0, 4(r30) /* 801EA880 001E77E0 7C BF 2B 78 */ mr r31, r5 /* 801EA884 001E77E4 7F C3 F3 78 */ mr r3, r30 @@ -3703,8 +3703,8 @@ sub_801ea83c: /* 801EA8DC 001E783C 7F C3 F3 78 */ mr r3, r30 /* 801EA8E0 001E7840 38 81 00 64 */ addi r4, r1, 0x64 /* 801EA8E4 001E7844 48 12 82 5D */ bl __as__12CTransform4fFRC12CTransform4f -/* 801EA8E8 001E7848 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801EA8EC 001E784C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 801EA8E8 001E7848 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801EA8EC 001E784C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 801EA8F0 001E7850 D0 1E 00 30 */ stfs f0, 0x30(r30) /* 801EA8F4 001E7854 C0 03 00 04 */ lfs f0, 4(r3) /* 801EA8F8 001E7858 D0 1E 00 34 */ stfs f0, 0x34(r30) @@ -3725,8 +3725,8 @@ sub_801ea83c: /* 801EA934 001E7894 D0 1E 00 30 */ stfs f0, 0x30(r30) /* 801EA938 001E7898 48 12 A4 B9 */ bl FastSinR__5CMathFf /* 801EA93C 001E789C EC 1E 00 72 */ fmuls f0, f30, f1 -/* 801EA940 001E78A0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801EA944 001E78A4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801EA940 001E78A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801EA944 001E78A4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801EA948 001E78A8 38 E0 00 01 */ li r7, 1 /* 801EA94C 001E78AC 38 80 00 05 */ li r4, 5 /* 801EA950 001E78B0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -4257,8 +4257,8 @@ lbl_801EB080: /* 801EB0C0 001E8020 90 01 00 18 */ stw r0, 0x18(r1) /* 801EB0C4 001E8024 80 84 00 00 */ lwz r4, 0(r4) /* 801EB0C8 001E8028 4B F2 AA 6D */ bl AdvanceAnimation__10CModelDataFfR13CStateManager7TAreaIdb -/* 801EB0CC 001E802C 3C C0 80 5A */ lis r6, skZero3f@ha -/* 801EB0D0 001E8030 C4 06 66 A0 */ lfsu f0, skZero3f@l(r6) +/* 801EB0CC 001E802C 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha +/* 801EB0D0 001E8030 C4 06 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r6) /* 801EB0D4 001E8034 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 801EB0D8 001E8038 80 A2 D7 48 */ lwz r5, lbl_805AF468@sda21(r2) /* 801EB0DC 001E803C 38 83 66 60 */ addi r4, r3, lbl_805A6660@l @@ -5197,8 +5197,8 @@ lbl_801EBDFC: /* 801EBEA8 001E8E08 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b /* 801EBEAC 001E8E0C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801EBEB0 001E8E10 98 1E 00 80 */ stb r0, 0x80(r30) -/* 801EBEB4 001E8E14 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801EBEB8 001E8E18 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801EBEB4 001E8E14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801EBEB8 001E8E18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801EBEBC 001E8E1C 38 A1 00 C8 */ addi r5, r1, 0xc8 /* 801EBEC0 001E8E20 C0 1B 01 5C */ lfs f0, 0x15c(r27) /* 801EBEC4 001E8E24 38 61 00 14 */ addi r3, r1, 0x14 @@ -6508,8 +6508,8 @@ CreateBoid__17CWallCrawlerSwarmFR13CStateManageri: /* 801ED1B0 001EA110 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801ED1B4 001EA114 40 80 00 5C */ bge lbl_801ED210 /* 801ED1B8 001EA118 D0 A1 00 38 */ stfs f5, 0x38(r1) -/* 801ED1BC 001EA11C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801ED1C0 001EA120 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 801ED1BC 001EA11C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801ED1C0 001EA120 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 801ED1C4 001EA124 38 81 00 50 */ addi r4, r1, 0x50 /* 801ED1C8 001EA128 D0 A1 00 3C */ stfs f5, 0x3c(r1) /* 801ED1CC 001EA12C 38 61 00 F8 */ addi r3, r1, 0xf8 @@ -6551,11 +6551,11 @@ lbl_801ED210: lbl_801ED258: /* 801ED258 001EA1B8 80 9E 01 14 */ lwz r4, 0x114(r30) /* 801ED25C 001EA1BC 39 3F 00 80 */ addi r9, r31, 0x80 -/* 801ED260 001EA1C0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801ED260 001EA1C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801ED264 001EA1C4 38 A0 00 01 */ li r5, 1 /* 801ED268 001EA1C8 7C 04 48 AE */ lbzx r0, r4, r9 /* 801ED26C 001EA1CC 50 A0 3E 30 */ rlwimi r0, r5, 7, 0x18, 0x18 -/* 801ED270 001EA1D0 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 801ED270 001EA1D0 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 801ED274 001EA1D4 39 5F 00 30 */ addi r10, r31, 0x30 /* 801ED278 001EA1D8 7C 04 49 AE */ stbx r0, r4, r9 /* 801ED27C 001EA1DC 38 BF 00 3C */ addi r5, r31, 0x3c @@ -6824,9 +6824,9 @@ lbl_801ED63C: /* 801ED63C 001EA59C 80 9C 05 48 */ lwz r4, 0x548(r28) /* 801ED640 001EA5A0 38 7C 01 08 */ addi r3, r28, 0x108 /* 801ED644 001EA5A4 48 00 19 59 */ bl sub_801eef9c -/* 801ED648 001EA5A8 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801ED648 001EA5A8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801ED64C 001EA5AC 3B C0 00 00 */ li r30, 0 -/* 801ED650 001EA5B0 3B E3 66 70 */ addi r31, r3, skIdentity4f@l +/* 801ED650 001EA5B0 3B E3 66 70 */ addi r31, r3, sIdentity__12CTransform4f@l /* 801ED654 001EA5B4 48 00 00 24 */ b lbl_801ED678 lbl_801ED658: /* 801ED658 001EA5B8 7F E4 FB 78 */ mr r4, r31 @@ -7370,10 +7370,10 @@ lbl_801EDB60: /* 801EDDE0 001EAD40 48 14 A7 29 */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f /* 801EDDE4 001EAD44 C0 02 AD D4 */ lfs f0, lbl_805ACAF4@sda21(r2) /* 801EDDE8 001EAD48 38 A0 00 00 */ li r5, 0 -/* 801EDDEC 001EAD4C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801EDDEC 001EAD4C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801EDDF0 001EAD50 C0 22 AD A0 */ lfs f1, lbl_805ACAC0@sda21(r2) /* 801EDDF4 001EAD54 D0 0F 01 04 */ stfs f0, 0x104(r15) -/* 801EDDF8 001EAD58 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801EDDF8 001EAD58 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801EDDFC 001EAD5C C0 02 AE 20 */ lfs f0, lbl_805ACB40@sda21(r2) /* 801EDE00 001EAD60 38 60 00 7D */ li r3, 0x7d /* 801EDE04 001EAD64 90 AF 01 0C */ stw r5, 0x10c(r15) @@ -8462,8 +8462,8 @@ LookAt__F9CVector3f9CVector3ff: /* 801EEDF8 001EBD58 FC 20 0A 10 */ fabs f1, f1 /* 801EEDFC 001EBD5C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801EEE00 001EBD60 40 80 00 14 */ bge lbl_801EEE14 -/* 801EEE04 001EBD64 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801EEE08 001EBD68 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801EEE04 001EBD64 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801EEE08 001EBD68 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801EEE0C 001EBD6C 48 12 3D 69 */ bl __ct__12CTransform4fFRC12CTransform4f /* 801EEE10 001EBD70 48 00 01 74 */ b lbl_801EEF84 lbl_801EEE14: @@ -8477,8 +8477,8 @@ lbl_801EEE14: /* 801EEE30 001EBD90 48 12 31 89 */ bl BuildTransform4f__11CQuaternionCFv /* 801EEE34 001EBD94 48 00 01 50 */ b lbl_801EEF84 lbl_801EEE38: -/* 801EEE38 001EBD98 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 801EEE3C 001EBD9C C5 03 67 18 */ lfsu f8, lbl_805A6718@l(r3) +/* 801EEE38 001EBD98 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 801EEE3C 001EBD9C C5 03 67 18 */ lfsu f8, sRightVector__9CVector3f@l(r3) /* 801EEE40 001EBDA0 38 00 00 00 */ li r0, 0 /* 801EEE44 001EBDA4 FC 04 40 00 */ fcmpu cr0, f4, f8 /* 801EEE48 001EBDA8 40 82 00 20 */ bne lbl_801EEE68 @@ -8493,8 +8493,8 @@ lbl_801EEE68: /* 801EEE68 001EBDC8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 801EEE6C 001EBDCC 40 82 00 B0 */ bne lbl_801EEF1C /* 801EEE70 001EBDD0 C0 05 00 00 */ lfs f0, 0(r5) -/* 801EEE74 001EBDD4 3C 60 80 5A */ lis r3, lbl_805A6718@ha -/* 801EEE78 001EBDD8 38 63 67 18 */ addi r3, r3, lbl_805A6718@l +/* 801EEE74 001EBDD4 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha +/* 801EEE78 001EBDD8 38 63 67 18 */ addi r3, r3, sRightVector__9CVector3f@l /* 801EEE7C 001EBDDC 38 00 00 00 */ li r0, 0 /* 801EEE80 001EBDE0 FC 00 40 00 */ fcmpu cr0, f0, f8 /* 801EEE84 001EBDE4 40 82 00 28 */ bne lbl_801EEEAC @@ -8510,9 +8510,9 @@ lbl_801EEE68: lbl_801EEEAC: /* 801EEEAC 001EBE0C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 801EEEB0 001EBE10 40 82 00 6C */ bne lbl_801EEF1C -/* 801EEEB4 001EBE14 3C 60 80 5A */ lis r3, lbl_805A6718@ha +/* 801EEEB4 001EBE14 3C 60 80 5A */ lis r3, sRightVector__9CVector3f@ha /* 801EEEB8 001EBE18 C0 64 00 04 */ lfs f3, 4(r4) -/* 801EEEBC 001EBE1C 38 63 67 18 */ addi r3, r3, lbl_805A6718@l +/* 801EEEBC 001EBE1C 38 63 67 18 */ addi r3, r3, sRightVector__9CVector3f@l /* 801EEEC0 001EBE20 C0 A4 00 08 */ lfs f5, 8(r4) /* 801EEEC4 001EBE24 C0 C3 00 04 */ lfs f6, 4(r3) /* 801EEEC8 001EBE28 EC 08 00 F2 */ fmuls f0, f8, f3 @@ -8537,9 +8537,9 @@ lbl_801EEEAC: /* 801EEF14 001EBE74 48 12 30 A5 */ bl BuildTransform4f__11CQuaternionCFv /* 801EEF18 001EBE78 48 00 00 6C */ b lbl_801EEF84 lbl_801EEF1C: -/* 801EEF1C 001EBE7C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801EEF1C 001EBE7C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801EEF20 001EBE80 C0 64 00 04 */ lfs f3, 4(r4) -/* 801EEF24 001EBE84 38 A3 66 F4 */ addi r5, r3, lbl_805A66F4@l +/* 801EEF24 001EBE84 38 A3 66 F4 */ addi r5, r3, sUpVector__9CVector3f@l /* 801EEF28 001EBE88 C0 A4 00 08 */ lfs f5, 8(r4) /* 801EEF2C 001EBE8C C0 C5 00 04 */ lfs f6, 4(r5) /* 801EEF30 001EBE90 38 61 00 14 */ addi r3, r1, 0x14 diff --git a/asm/MetroidPrime/Enemies/CWallWalker.s b/asm/MetroidPrime/Enemies/CWallWalker.s index 30f42900..be7a7997 100644 --- a/asm/MetroidPrime/Enemies/CWallWalker.s +++ b/asm/MetroidPrime/Enemies/CWallWalker.s @@ -508,9 +508,9 @@ PreThink__11CWallWalkerFfR13CStateManager: /* 80268A0C 0026596C D0 01 00 10 */ stfs f0, 0x10(r1) /* 80268A10 00265970 4B DE A4 7D */ bl SetTranslation__6CActorFRC9CVector3f lbl_80268A14: -/* 80268A14 00265974 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80268A14 00265974 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80268A18 00265978 7F E3 FB 78 */ mr r3, r31 -/* 80268A1C 0026597C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80268A1C 0026597C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80268A20 00265980 4B EB 20 19 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f lbl_80268A24: /* 80268A24 00265984 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 @@ -1131,20 +1131,20 @@ ProjectPointToPlane__11CWallWalkerFRC9CVector3fRC9CVector3fRC9CVector3f: /* 80269304 00266264 8B E1 00 F7 */ lbz r31, 0xf7(r1) /* 80269308 00266268 4B E1 41 49 */ bl "__ct__10CPatternedFUi9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>Q210CPatterned11EFlavorTypeRC11CEntityInfoRC12CTransform4fRC10CModelDataRC14CPatternedInfoQ210CPatterned13EMovementTypeQ210CPatterned13EColliderType9EBodyTypeRC16CActorParametersUi" /* 8026930C 0026626C 3C 60 80 3F */ lis r3, lbl_803EA0F0@ha -/* 80269310 00266270 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80269310 00266270 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80269314 00266274 38 03 A0 F0 */ addi r0, r3, lbl_803EA0F0@l -/* 80269318 00266278 3C A0 80 5A */ lis r5, lbl_805A6718@ha -/* 8026931C 0026627C 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80269318 00266278 3C A0 80 5A */ lis r5, sRightVector__9CVector3f@ha +/* 8026931C 0026627C 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80269320 00266280 90 1C 00 00 */ stw r0, 0(r28) -/* 80269324 00266284 38 C3 67 24 */ addi r6, r3, lbl_805A6724@l -/* 80269328 00266288 38 84 66 A0 */ addi r4, r4, skZero3f@l -/* 8026932C 0026628C 38 A5 67 18 */ addi r5, r5, lbl_805A6718@l +/* 80269324 00266284 38 C3 67 24 */ addi r6, r3, sForwardVector__9CVector3f@l +/* 80269328 00266288 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l +/* 8026932C 0026628C 38 A5 67 18 */ addi r5, r5, sRightVector__9CVector3f@l /* 80269330 00266290 38 7C 05 68 */ addi r3, r28, 0x568 /* 80269334 00266294 38 E0 FF FF */ li r7, -1 /* 80269338 00266298 48 03 93 F1 */ bl __ct__17CCollisionSurfaceFRC9CVector3fRC9CVector3fRC9CVector3fUi -/* 8026933C 0026629C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8026933C 0026629C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80269340 002662A0 3B 7C 05 90 */ addi r27, r28, 0x590 -/* 80269344 002662A4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80269344 002662A4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80269348 002662A8 C3 9D 00 C4 */ lfs f28, 0xc4(r29) /* 8026934C 002662AC C3 E5 00 00 */ lfs f31, 0(r5) /* 80269350 002662B0 38 9C 00 68 */ addi r4, r28, 0x68 diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 72835b51..af2b951c 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -1570,8 +1570,8 @@ CalcShuffleDest__8CWarWaspFR13CStateManager: /* 8010BD40 00108CA0 38 A1 00 08 */ addi r5, r1, 8 /* 8010BD44 00108CA4 48 00 00 0C */ b lbl_8010BD50 lbl_8010BD48: -/* 8010BD48 00108CA8 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 8010BD4C 00108CAC 38 A3 67 24 */ addi r5, r3, lbl_805A6724@l +/* 8010BD48 00108CA8 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 8010BD4C 00108CAC 38 A3 67 24 */ addi r5, r3, sForwardVector__9CVector3f@l lbl_8010BD50: /* 8010BD50 00108CB0 C0 45 00 00 */ lfs f2, 0(r5) /* 8010BD54 00108CB4 7F C3 F3 78 */ mr r3, r30 @@ -1806,9 +1806,9 @@ ApplyDamage__8CWarWaspFR13CStateManager: /* 8010C0AC 0010900C 81 8C 02 B0 */ lwz r12, 0x2b0(r12) /* 8010C0B0 00109010 7D 89 03 A6 */ mtctr r12 /* 8010C0B4 00109014 4E 80 04 21 */ bctrl -/* 8010C0B8 00109018 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8010C0B8 00109018 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8010C0BC 0010901C 7F C3 F3 78 */ mr r3, r30 -/* 8010C0C0 00109020 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8010C0C0 00109020 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8010C0C4 00109024 38 A1 00 18 */ addi r5, r1, 0x18 /* 8010C0C8 00109028 38 81 00 20 */ addi r4, r1, 0x20 /* 8010C0CC 0010902C 38 C1 00 10 */ addi r6, r1, 0x10 @@ -1883,9 +1883,9 @@ UpdateTouchBounds__8CWarWaspFv: /* 8010C1D0 00109130 D0 21 00 14 */ stfs f1, 0x14(r1) /* 8010C1D4 00109134 D0 3F 05 8C */ stfs f1, 0x58c(r31) /* 8010C1D8 00109138 48 20 6F 1D */ bl BuildMatrix3f__12CTransform4fCFv -/* 8010C1DC 0010913C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8010C1DC 0010913C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8010C1E0 00109140 38 61 00 90 */ addi r3, r1, 0x90 -/* 8010C1E4 00109144 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8010C1E4 00109144 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8010C1E8 00109148 38 81 00 6C */ addi r4, r1, 0x6c /* 8010C1EC 0010914C 48 20 70 8D */ bl __ct__12CTransform4fFRC9CMatrix3fRC9CVector3f /* 8010C1F0 00109150 38 61 00 24 */ addi r3, r1, 0x24 @@ -2487,8 +2487,8 @@ lbl_8010CA0C: /* 8010CAC0 00109A20 48 0E 9C 0D */ bl PathFind__10CPatternedFR13CStateManager9EStateMsgf /* 8010CAC4 00109A24 48 00 01 3C */ b lbl_8010CC00 lbl_8010CAC8: -/* 8010CAC8 00109A28 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010CACC 00109A2C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010CAC8 00109A28 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010CACC 00109A2C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010CAD0 00109A30 C0 02 94 DC */ lfs f0, lbl_805AB1FC@sda21(r2) /* 8010CAD4 00109A34 38 81 01 40 */ addi r4, r1, 0x140 /* 8010CAD8 00109A38 C0 43 00 04 */ lfs f2, 4(r3) @@ -2534,8 +2534,8 @@ lbl_8010CB0C: /* 8010CB74 00109AD4 EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 8010CB78 00109AD8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010CB7C 00109ADC 40 81 00 44 */ ble lbl_8010CBC0 -/* 8010CB80 00109AE0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010CB84 00109AE4 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010CB80 00109AE0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010CB84 00109AE4 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010CB88 00109AE8 C0 02 94 F8 */ lfs f0, lbl_805AB218@sda21(r2) /* 8010CB8C 00109AEC 38 81 01 24 */ addi r4, r1, 0x124 /* 8010CB90 00109AF0 D0 41 01 24 */ stfs f2, 0x124(r1) @@ -2551,8 +2551,8 @@ lbl_8010CB0C: /* 8010CBB8 00109B18 38 63 00 04 */ addi r3, r3, 4 /* 8010CBBC 00109B1C 48 02 4B 5D */ bl DeliverCmd__16CBodyStateCmdMgrFRC16CBCLocomotionCmd lbl_8010CBC0: -/* 8010CBC0 00109B20 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010CBC4 00109B24 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010CBC0 00109B20 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010CBC4 00109B24 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010CBC8 00109B28 C0 02 94 DC */ lfs f0, lbl_805AB1FC@sda21(r2) /* 8010CBCC 00109B2C 38 81 01 08 */ addi r4, r1, 0x108 /* 8010CBD0 00109B30 C0 43 00 04 */ lfs f2, 4(r3) @@ -2815,9 +2815,9 @@ lbl_8010CF9C: /* 8010CFA8 00109F08 38 9F 04 5C */ addi r4, r31, 0x45c /* 8010CFAC 00109F0C 38 C1 00 C0 */ addi r6, r1, 0xc0 /* 8010CFB0 00109F10 48 03 1B 6D */ bl Arrival__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3ff -/* 8010CFB4 00109F14 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8010CFB4 00109F14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010CFB8 00109F18 C0 C1 00 68 */ lfs f6, 0x68(r1) -/* 8010CFBC 00109F1C 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 8010CFBC 00109F1C 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 8010CFC0 00109F20 C0 A1 00 6C */ lfs f5, 0x6c(r1) /* 8010CFC4 00109F24 C0 81 00 70 */ lfs f4, 0x70(r1) /* 8010CFC8 00109F28 38 81 01 10 */ addi r4, r1, 0x110 @@ -2860,11 +2860,11 @@ lbl_8010CF9C: /* 8010D05C 00109FBC EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 8010D060 00109FC0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010D064 00109FC4 40 81 01 F8 */ ble lbl_8010D25C -/* 8010D068 00109FC8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8010D068 00109FC8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010D06C 00109FCC C0 5E 00 04 */ lfs f2, 4(r30) /* 8010D070 00109FD0 C0 3E 00 08 */ lfs f1, 8(r30) /* 8010D074 00109FD4 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 8010D078 00109FD8 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8010D078 00109FD8 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8010D07C 00109FDC C0 02 94 F8 */ lfs f0, lbl_805AB218@sda21(r2) /* 8010D080 00109FE0 D0 C1 00 F4 */ stfs f6, 0xf4(r1) /* 8010D084 00109FE4 D0 81 00 F8 */ stfs f4, 0xf8(r1) @@ -2971,8 +2971,8 @@ lbl_8010D1D0: /* 8010D204 0010A164 38 61 00 24 */ addi r3, r1, 0x24 /* 8010D208 0010A168 38 81 00 CC */ addi r4, r1, 0xcc /* 8010D20C 0010A16C 48 20 76 45 */ bl AsNormalized__9CVector3fCFv -/* 8010D210 0010A170 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010D214 0010A174 C4 C3 66 A0 */ lfsu f6, skZero3f@l(r3) +/* 8010D210 0010A170 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010D214 0010A174 C4 C3 66 A0 */ lfsu f6, sZeroVector__9CVector3f@l(r3) /* 8010D218 0010A178 C0 61 00 24 */ lfs f3, 0x24(r1) /* 8010D21C 0010A17C 38 81 00 D8 */ addi r4, r1, 0xd8 /* 8010D220 0010A180 C0 41 00 28 */ lfs f2, 0x28(r1) @@ -3018,11 +3018,11 @@ ApplySeparationBehavior__8CWarWaspFR13CStateManagerf: /* 8010D2B0 0010A210 F3 C1 00 78 */ psq_st f30, 120(r1), 0, qr0 /* 8010D2B4 0010A214 BF 41 00 58 */ stmw r26, 0x58(r1) /* 8010D2B8 0010A218 7C 9C 23 78 */ mr r28, r4 -/* 8010D2BC 0010A21C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8010D2BC 0010A21C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8010D2C0 0010A220 83 DC 08 38 */ lwz r30, 0x838(r28) /* 8010D2C4 0010A224 FF C0 08 90 */ fmr f30, f1 /* 8010D2C8 0010A228 7C 7B 1B 78 */ mr r27, r3 -/* 8010D2CC 0010A22C 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 8010D2CC 0010A22C 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 8010D2D0 0010A230 AB BE 20 08 */ lha r29, 0x2008(r30) /* 8010D2D4 0010A234 48 00 01 50 */ b lbl_8010D424 lbl_8010D2D8: @@ -3090,11 +3090,11 @@ lbl_8010D3BC: lbl_8010D3C0: /* 8010D3C0 0010A320 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8010D3C4 0010A324 41 82 00 44 */ beq lbl_8010D408 -/* 8010D3C8 0010A328 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8010D3C8 0010A328 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8010D3CC 0010A32C C0 5F 00 04 */ lfs f2, 4(r31) /* 8010D3D0 0010A330 C0 3F 00 08 */ lfs f1, 8(r31) /* 8010D3D4 0010A334 38 81 00 34 */ addi r4, r1, 0x34 -/* 8010D3D8 0010A338 C0 63 66 A0 */ lfs f3, skZero3f@l(r3) +/* 8010D3D8 0010A338 C0 63 66 A0 */ lfs f3, sZeroVector__9CVector3f@l(r3) /* 8010D3DC 0010A33C C0 02 94 DC */ lfs f0, lbl_805AB1FC@sda21(r2) /* 8010D3E0 0010A340 D0 C1 00 34 */ stfs f6, 0x34(r1) /* 8010D3E4 0010A344 D0 81 00 38 */ stfs f4, 0x38(r1) @@ -3335,8 +3335,8 @@ lbl_8010D70C: /* 8010D724 0010A684 48 00 01 70 */ b lbl_8010D894 lbl_8010D728: /* 8010D728 0010A688 3C A0 80 3E */ lis r5, lbl_803DAA68@ha -/* 8010D72C 0010A68C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010D730 0010A690 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 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 /* 8010D738 0010A698 3C 80 80 3E */ lis r4, lbl_803DA9D8@ha /* 8010D73C 0010A69C 90 C1 00 14 */ stw r6, 0x14(r1) @@ -3538,8 +3538,8 @@ lbl_8010D9B4: /* 8010DA1C 0010A97C 38 61 00 28 */ addi r3, r1, 0x28 /* 8010DA20 0010A980 38 81 00 34 */ addi r4, r1, 0x34 /* 8010DA24 0010A984 48 20 6E 2D */ bl AsNormalized__9CVector3fCFv -/* 8010DA28 0010A988 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 8010DA2C 0010A98C C5 23 66 F4 */ lfsu f9, lbl_805A66F4@l(r3) +/* 8010DA28 0010A988 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 8010DA2C 0010A98C C5 23 66 F4 */ lfsu f9, sUpVector__9CVector3f@l(r3) /* 8010DA30 0010A990 C0 A1 00 2C */ lfs f5, 0x2c(r1) /* 8010DA34 0010A994 C0 E1 00 30 */ lfs f7, 0x30(r1) /* 8010DA38 0010A998 C0 63 00 04 */ lfs f3, 4(r3) @@ -3603,8 +3603,8 @@ lbl_8010DAA0: /* 8010DB1C 0010AA7C EF 5F 00 72 */ fmuls f26, f31, f1 /* 8010DB20 0010AA80 EF 7F 00 32 */ fmuls f27, f31, f0 lbl_8010DB24: -/* 8010DB24 0010AA84 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010DB28 0010AA88 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010DB24 0010AA84 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010DB28 0010AA88 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010DB2C 0010AA8C C0 02 94 DC */ lfs f0, lbl_805AB1FC@sda21(r2) /* 8010DB30 0010AA90 38 81 00 40 */ addi r4, r1, 0x40 /* 8010DB34 0010AA94 C0 43 00 04 */ lfs f2, 4(r3) @@ -3937,8 +3937,8 @@ lbl_8010DF9C: /* 8010DFE4 0010AF44 48 00 00 E8 */ b lbl_8010E0CC lbl_8010DFE8: /* 8010DFE8 0010AF48 3C C0 80 3E */ lis r6, lbl_803DAA68@ha -/* 8010DFEC 0010AF4C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010DFF0 0010AF50 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 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 @@ -4122,8 +4122,8 @@ lbl_8010E258: /* 8010E284 0010B1E4 38 9F 04 5C */ addi r4, r31, 0x45c /* 8010E288 0010B1E8 38 C1 00 08 */ addi r6, r1, 8 /* 8010E28C 0010B1EC 48 03 02 D1 */ bl Flee2D__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector2f -/* 8010E290 0010B1F0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010E294 0010B1F4 C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010E290 0010B1F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010E294 0010B1F4 C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010E298 0010B1F8 C0 C1 00 10 */ lfs f6, 0x10(r1) /* 8010E29C 0010B1FC 38 81 00 24 */ addi r4, r1, 0x24 /* 8010E2A0 0010B200 C0 A1 00 14 */ lfs f5, 0x14(r1) @@ -4361,8 +4361,8 @@ lbl_8010E530: /* 8010E5EC 0010B54C EC 25 09 7A */ fmadds f1, f5, f5, f1 /* 8010E5F0 0010B550 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010E5F4 0010B554 40 81 01 7C */ ble lbl_8010E770 -/* 8010E5F8 0010B558 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010E5FC 0010B55C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010E5F8 0010B558 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010E5FC 0010B55C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010E600 0010B560 C0 02 94 DC */ lfs f0, lbl_805AB1FC@sda21(r2) /* 8010E604 0010B564 38 81 00 AC */ addi r4, r1, 0xac /* 8010E608 0010B568 D0 41 00 AC */ stfs f2, 0xac(r1) @@ -4431,8 +4431,8 @@ lbl_8010E6F4: /* 8010E6FC 0010B65C 38 9E 04 5C */ addi r4, r30, 0x45c /* 8010E700 0010B660 38 C1 00 84 */ addi r6, r1, 0x84 /* 8010E704 0010B664 48 03 05 1D */ bl Seek__18CSteeringBehaviorsCFRC13CPhysicsActorRC9CVector3f -/* 8010E708 0010B668 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010E70C 0010B66C C4 63 66 A0 */ lfsu f3, skZero3f@l(r3) +/* 8010E708 0010B668 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010E70C 0010B66C C4 63 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r3) /* 8010E710 0010B670 C0 C1 00 14 */ lfs f6, 0x14(r1) /* 8010E714 0010B674 38 81 00 90 */ addi r4, r1, 0x90 /* 8010E718 0010B678 C0 A1 00 18 */ lfs f5, 0x18(r1) @@ -5132,8 +5132,8 @@ lbl_8010F104: /* 8010F108 0010C068 3C E0 80 3E */ lis r7, lbl_803DAA68@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, skZero3f@ha -/* 8010F118 0010C078 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 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 /* 8010F124 0010C084 C0 24 00 04 */ lfs f1, 4(r4) @@ -5188,8 +5188,8 @@ lbl_8010F1D4: /* 8010F1E4 0010C144 90 1F 05 68 */ stw r0, 0x568(r31) /* 8010F1E8 0010C148 48 00 01 B4 */ b lbl_8010F39C lbl_8010F1EC: -/* 8010F1EC 0010C14C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8010F1F0 0010C150 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 8010F1EC 0010C14C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8010F1F0 0010C150 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 8010F1F4 0010C154 C0 02 95 40 */ lfs f0, lbl_805AB260@sda21(r2) /* 8010F1F8 0010C158 C0 23 00 04 */ lfs f1, 4(r3) /* 8010F1FC 0010C15C EF E0 07 B2 */ fmuls f31, f0, f30 @@ -6580,9 +6580,9 @@ lbl_801105B4: /* 801105FC 0010D55C 39 00 00 01 */ li r8, 1 /* 80110600 0010D560 48 10 B8 ED */ bl PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbf /* 80110604 0010D564 C0 A1 00 40 */ lfs f5, 0x40(r1) -/* 80110608 0010D568 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80110608 0010D568 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8011060C 0010D56C C0 81 00 44 */ lfs f4, 0x44(r1) -/* 80110610 0010D570 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80110610 0010D570 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80110614 0010D574 C0 61 00 48 */ lfs f3, 0x48(r1) /* 80110618 0010D578 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8011061C 0010D57C C0 41 01 CC */ lfs f2, 0x1cc(r1) @@ -7081,11 +7081,11 @@ lbl_80110BE0: /* 80110CE4 0010DC44 80 D9 01 0C */ lwz r6, 0x10c(r25) /* 80110CE8 0010DC48 48 0B 80 AD */ bl __ct__15CPathFindSearchFP7CPFAreaUiff /* 80110CEC 0010DC4C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 80110CF0 0010DC50 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80110CF0 0010DC50 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80110CF4 0010DC54 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 80110CF8 0010DC58 C0 02 94 F0 */ lfs f0, lbl_805AB210@sda21(r2) /* 80110CFC 0010DC5C B0 18 06 74 */ sth r0, 0x674(r24) -/* 80110D00 0010DC60 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 80110D00 0010DC60 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 80110D04 0010DC64 38 C3 66 60 */ addi r6, r3, lbl_805A6660@l /* 80110D08 0010DC68 7F 84 E3 78 */ mr r4, r28 /* 80110D0C 0010DC6C C0 27 00 00 */ lfs f1, 0(r7) diff --git a/asm/MetroidPrime/Enemies/SPositionHistory.s b/asm/MetroidPrime/Enemies/SPositionHistory.s index 975252b5..2d34825c 100644 --- a/asm/MetroidPrime/Enemies/SPositionHistory.s +++ b/asm/MetroidPrime/Enemies/SPositionHistory.s @@ -16,9 +16,9 @@ sub_802a07f0: /* 802A0814 0029D774 DB 81 00 40 */ stfd f28, 0x40(r1) /* 802A0818 0029D778 F3 81 00 48 */ psq_st f28, 72(r1), 0, qr0 /* 802A081C 0029D77C BF 61 00 2C */ stmw r27, 0x2c(r1) -/* 802A0820 0029D780 3C E0 80 5A */ lis r7, skZero3f@ha +/* 802A0820 0029D780 3C E0 80 5A */ lis r7, sZeroVector__9CVector3f@ha /* 802A0824 0029D784 7C 9C 23 78 */ mr r28, r4 -/* 802A0828 0029D788 38 87 66 A0 */ addi r4, r7, skZero3f@l +/* 802A0828 0029D788 38 87 66 A0 */ addi r4, r7, sZeroVector__9CVector3f@l /* 802A082C 0029D78C C3 82 C1 18 */ lfs f28, lbl_805ADE38@sda21(r2) /* 802A0830 0029D790 C3 E4 00 00 */ lfs f31, 0(r4) /* 802A0834 0029D794 7C 7B 1B 78 */ mr r27, r3 diff --git a/asm/MetroidPrime/Factories/CAssetFactory.s b/asm/MetroidPrime/Factories/CAssetFactory.s index 1820a189..6aa46070 100644 --- a/asm/MetroidPrime/Factories/CAssetFactory.s +++ b/asm/MetroidPrime/Factories/CAssetFactory.s @@ -348,8 +348,8 @@ sub_80034c54: lbl_80034CA4: /* 80034CA4 00031C04 28 1E 00 00 */ cmplwi r30, 0 /* 80034CA8 00031C08 41 82 00 20 */ beq lbl_80034CC8 -/* 80034CAC 00031C0C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80034CB0 00031C10 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80034CAC 00031C0C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80034CB0 00031C10 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80034CB4 00031C14 90 1E 00 00 */ stw r0, 0(r30) /* 80034CB8 00031C18 41 82 00 10 */ beq lbl_80034CC8 /* 80034CBC 00031C1C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -401,11 +401,11 @@ sub_80034d20: /* 80034D54 00031CB4 28 03 00 00 */ cmplwi r3, 0 /* 80034D58 00031CB8 41 82 00 38 */ beq lbl_80034D90 /* 80034D5C 00031CBC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80034D60 00031CC0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80034D60 00031CC0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80034D64 00031CC4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80034D68 00031CC8 3C 80 80 3E */ lis r4, lbl_803D9CA8@ha /* 80034D6C 00031CCC 90 03 00 00 */ stw r0, 0(r3) -/* 80034D70 00031CD0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80034D70 00031CD0 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80034D74 00031CD4 38 A0 00 00 */ li r5, 0 /* 80034D78 00031CD8 38 04 9C A8 */ addi r0, r4, lbl_803D9CA8@l /* 80034D7C 00031CDC 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/Factories/CCharacterFactory.s b/asm/MetroidPrime/Factories/CCharacterFactory.s index 85ef4181..3a7304af 100644 --- a/asm/MetroidPrime/Factories/CCharacterFactory.s +++ b/asm/MetroidPrime/Factories/CCharacterFactory.s @@ -1739,8 +1739,8 @@ sub_80033068: lbl_800330A8: /* 800330A8 00030008 28 1E 00 00 */ cmplwi r30, 0 /* 800330AC 0003000C 41 82 00 20 */ beq lbl_800330CC -/* 800330B0 00030010 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 800330B4 00030014 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800330B0 00030010 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 800330B4 00030014 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800330B8 00030018 90 1E 00 00 */ stw r0, 0(r30) /* 800330BC 0003001C 41 82 00 10 */ beq lbl_800330CC /* 800330C0 00030020 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1939,11 +1939,11 @@ sub_80033320: /* 80033354 000302B4 28 03 00 00 */ cmplwi r3, 0 /* 80033358 000302B8 41 82 00 2C */ beq lbl_80033384 /* 8003335C 000302BC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80033360 000302C0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80033360 000302C0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80033364 000302C4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80033368 000302C8 3C 80 80 3E */ lis r4, lbl_803D9C14@ha /* 8003336C 000302CC 90 03 00 00 */ stw r0, 0(r3) -/* 80033370 000302D0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033370 000302D0 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033374 000302D4 38 04 9C 14 */ addi r0, r4, lbl_803D9C14@l /* 80033378 000302D8 90 A3 00 00 */ stw r5, 0(r3) /* 8003337C 000302DC 93 E3 00 04 */ stw r31, 4(r3) @@ -1982,8 +1982,8 @@ sub_800333b0: lbl_800333F0: /* 800333F0 00030350 28 1E 00 00 */ cmplwi r30, 0 /* 800333F4 00030354 41 82 00 20 */ beq lbl_80033414 -/* 800333F8 00030358 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 800333FC 0003035C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800333F8 00030358 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 800333FC 0003035C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033400 00030360 90 1E 00 00 */ stw r0, 0(r30) /* 80033404 00030364 41 82 00 10 */ beq lbl_80033414 /* 80033408 00030368 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -2095,11 +2095,11 @@ lbl_8003351C: /* 80033574 000304D4 28 03 00 00 */ cmplwi r3, 0 /* 80033578 000304D8 41 82 00 2C */ beq lbl_800335A4 /* 8003357C 000304DC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80033580 000304E0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80033580 000304E0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80033584 000304E4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80033588 000304E8 3C 80 80 3E */ lis r4, lbl_803D9BFC@ha /* 8003358C 000304EC 90 03 00 00 */ stw r0, 0(r3) -/* 80033590 000304F0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033590 000304F0 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033594 000304F4 38 04 9B FC */ addi r0, r4, lbl_803D9BFC@l /* 80033598 000304F8 90 A3 00 00 */ stw r5, 0(r3) /* 8003359C 000304FC 93 E3 00 04 */ stw r31, 4(r3) @@ -2678,8 +2678,8 @@ lbl_80033DAC: lbl_80033DC0: /* 80033DC0 00030D20 28 1D 00 00 */ cmplwi r29, 0 /* 80033DC4 00030D24 41 82 00 20 */ beq lbl_80033DE4 -/* 80033DC8 00030D28 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80033DCC 00030D2C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033DC8 00030D28 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80033DCC 00030D2C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033DD0 00030D30 90 1D 00 00 */ stw r0, 0(r29) /* 80033DD4 00030D34 41 82 00 10 */ beq lbl_80033DE4 /* 80033DD8 00030D38 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -2732,11 +2732,11 @@ sub_80033e40: /* 80033E74 00030DD4 28 03 00 00 */ cmplwi r3, 0 /* 80033E78 00030DD8 41 82 00 38 */ beq lbl_80033EB0 /* 80033E7C 00030DDC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80033E80 00030DE0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80033E80 00030DE0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80033E84 00030DE4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80033E88 00030DE8 3C 80 80 3E */ lis r4, lbl_803D9BD4@ha /* 80033E8C 00030DEC 90 03 00 00 */ stw r0, 0(r3) -/* 80033E90 00030DF0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033E90 00030DF0 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033E94 00030DF4 38 A0 00 00 */ li r5, 0 /* 80033E98 00030DF8 38 04 9B D4 */ addi r0, r4, lbl_803D9BD4@l /* 80033E9C 00030DFC 90 C3 00 00 */ stw r6, 0(r3) @@ -2782,8 +2782,8 @@ sub_80033edc: lbl_80033F2C: /* 80033F2C 00030E8C 28 1E 00 00 */ cmplwi r30, 0 /* 80033F30 00030E90 41 82 00 20 */ beq lbl_80033F50 -/* 80033F34 00030E94 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80033F38 00030E98 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033F34 00030E94 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80033F38 00030E98 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033F3C 00030E9C 90 1E 00 00 */ stw r0, 0(r30) /* 80033F40 00030EA0 41 82 00 10 */ beq lbl_80033F50 /* 80033F44 00030EA4 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -2835,11 +2835,11 @@ sub_80033fa8: /* 80033FDC 00030F3C 28 03 00 00 */ cmplwi r3, 0 /* 80033FE0 00030F40 41 82 00 38 */ beq lbl_80034018 /* 80033FE4 00030F44 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80033FE8 00030F48 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80033FE8 00030F48 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80033FEC 00030F4C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80033FF0 00030F50 3C 80 80 3E */ lis r4, lbl_803D9BC8@ha /* 80033FF4 00030F54 90 03 00 00 */ stw r0, 0(r3) -/* 80033FF8 00030F58 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80033FF8 00030F58 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80033FFC 00030F5C 38 A0 00 00 */ li r5, 0 /* 80034000 00030F60 38 04 9B C8 */ addi r0, r4, lbl_803D9BC8@l /* 80034004 00030F64 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/Factories/CSaveWorldFactory.s b/asm/MetroidPrime/Factories/CSaveWorldFactory.s index 734c3463..aabca854 100644 --- a/asm/MetroidPrime/Factories/CSaveWorldFactory.s +++ b/asm/MetroidPrime/Factories/CSaveWorldFactory.s @@ -97,8 +97,8 @@ sub_8026ae68: lbl_8026AEA8: /* 8026AEA8 00267E08 28 1E 00 00 */ cmplwi r30, 0 /* 8026AEAC 00267E0C 41 82 00 20 */ beq lbl_8026AECC -/* 8026AEB0 00267E10 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8026AEB4 00267E14 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8026AEB0 00267E10 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8026AEB4 00267E14 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8026AEB8 00267E18 90 1E 00 00 */ stw r0, 0(r30) /* 8026AEBC 00267E1C 41 82 00 10 */ beq lbl_8026AECC /* 8026AEC0 00267E20 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -278,11 +278,11 @@ sub_8026b0d8: /* 8026B10C 0026806C 28 03 00 00 */ cmplwi r3, 0 /* 8026B110 00268070 41 82 00 38 */ beq lbl_8026B148 /* 8026B114 00268074 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8026B118 00268078 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8026B118 00268078 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8026B11C 0026807C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8026B120 00268080 3C 80 80 3F */ lis r4, lbl_803EA790@ha /* 8026B124 00268084 90 03 00 00 */ stw r0, 0(r3) -/* 8026B128 00268088 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8026B128 00268088 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8026B12C 0026808C 38 A0 00 00 */ li r5, 0 /* 8026B130 00268090 38 04 A7 90 */ addi r0, r4, lbl_803EA790@l /* 8026B134 00268094 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/Factories/CScannableObjectInfo.s b/asm/MetroidPrime/Factories/CScannableObjectInfo.s index 02b793e8..e3b40c0d 100644 --- a/asm/MetroidPrime/Factories/CScannableObjectInfo.s +++ b/asm/MetroidPrime/Factories/CScannableObjectInfo.s @@ -158,8 +158,8 @@ lbl_80169B08: lbl_80169B0C: /* 80169B0C 00166A6C 28 1E 00 00 */ cmplwi r30, 0 /* 80169B10 00166A70 41 82 00 20 */ beq lbl_80169B30 -/* 80169B14 00166A74 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80169B18 00166A78 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80169B14 00166A74 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80169B18 00166A78 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80169B1C 00166A7C 90 1E 00 00 */ stw r0, 0(r30) /* 80169B20 00166A80 41 82 00 10 */ beq lbl_80169B30 /* 80169B24 00166A84 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -211,11 +211,11 @@ sub_80169b88: /* 80169BBC 00166B1C 28 03 00 00 */ cmplwi r3, 0 /* 80169BC0 00166B20 41 82 00 38 */ beq lbl_80169BF8 /* 80169BC4 00166B24 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80169BC8 00166B28 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80169BC8 00166B28 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80169BCC 00166B2C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80169BD0 00166B30 3C 80 80 3E */ lis r4, lbl_803E3AC8@ha /* 80169BD4 00166B34 90 03 00 00 */ stw r0, 0(r3) -/* 80169BD8 00166B38 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80169BD8 00166B38 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80169BDC 00166B3C 38 A0 00 00 */ li r5, 0 /* 80169BE0 00166B40 38 04 3A C8 */ addi r0, r4, lbl_803E3AC8@l /* 80169BE4 00166B44 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/Factories/CStateMachineFactory.s b/asm/MetroidPrime/Factories/CStateMachineFactory.s index 1c1cb8e4..79d95bc3 100644 --- a/asm/MetroidPrime/Factories/CStateMachineFactory.s +++ b/asm/MetroidPrime/Factories/CStateMachineFactory.s @@ -108,8 +108,8 @@ sub_800de904: lbl_800DE944: /* 800DE944 000DB8A4 28 1E 00 00 */ cmplwi r30, 0 /* 800DE948 000DB8A8 41 82 00 20 */ beq lbl_800DE968 -/* 800DE94C 000DB8AC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 800DE950 000DB8B0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800DE94C 000DB8AC 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 800DE950 000DB8B0 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800DE954 000DB8B4 90 1E 00 00 */ stw r0, 0(r30) /* 800DE958 000DB8B8 41 82 00 10 */ beq lbl_800DE968 /* 800DE95C 000DB8BC 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -226,11 +226,11 @@ lbl_800DEA54: /* 800DEAD0 000DBA30 28 03 00 00 */ cmplwi r3, 0 /* 800DEAD4 000DBA34 41 82 00 38 */ beq lbl_800DEB0C /* 800DEAD8 000DBA38 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 800DEADC 000DBA3C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 800DEADC 000DBA3C 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 800DEAE0 000DBA40 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 800DEAE4 000DBA44 3C 80 80 3E */ lis r4, lbl_803DF700@ha /* 800DEAE8 000DBA48 90 03 00 00 */ stw r0, 0(r3) -/* 800DEAEC 000DBA4C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800DEAEC 000DBA4C 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800DEAF0 000DBA50 38 A0 00 00 */ li r5, 0 /* 800DEAF4 000DBA54 38 04 F7 00 */ addi r0, r4, lbl_803DF700@l /* 800DEAF8 000DBA58 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/HUD/CHudBallInterface.s b/asm/MetroidPrime/HUD/CHudBallInterface.s index 69ce30ff..66e12942 100644 --- a/asm/MetroidPrime/HUD/CHudBallInterface.s +++ b/asm/MetroidPrime/HUD/CHudBallInterface.s @@ -248,8 +248,8 @@ __ct__17CHudBallInterfaceFR9CGuiFrameiiibb: /* 801CD7E4 001CA744 7C 94 23 78 */ mr r20, r4 /* 801CD7E8 001CA748 7D 17 43 78 */ mr r23, r8 /* 801CD7EC 001CA74C 90 03 00 14 */ stw r0, 0x14(r3) -/* 801CD7F0 001CA750 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801CD7F4 001CA754 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 801CD7F0 001CA750 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801CD7F4 001CA754 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 801CD7F8 001CA758 90 13 00 24 */ stw r0, 0x24(r19) /* 801CD7FC 001CA75C 3C 60 80 3D */ lis r3, lbl_803D1AD8@ha /* 801CD800 001CA760 3B C3 1A D8 */ addi r30, r3, lbl_803D1AD8@l diff --git a/asm/MetroidPrime/HUD/CHudDecoInterface.s b/asm/MetroidPrime/HUD/CHudDecoInterface.s index d1d06f78..3a3e797c 100644 --- a/asm/MetroidPrime/HUD/CHudDecoInterface.s +++ b/asm/MetroidPrime/HUD/CHudDecoInterface.s @@ -1632,16 +1632,16 @@ __ct__21CHudFreeLookInterfaceFR9CGuiFrame8EHudTypebbb: /* 801904D4 0018D434 3B A9 0A 48 */ addi r29, r9, lbl_803D0A48@l /* 801904D8 0018D438 90 1E 00 00 */ stw r0, 0(r30) /* 801904DC 0018D43C 38 03 44 70 */ addi r0, r3, lbl_803E4470@l -/* 801904E0 0018D440 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801904E0 0018D440 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801904E4 0018D444 90 1E 00 00 */ stw r0, 0(r30) -/* 801904E8 0018D448 38 03 66 70 */ addi r0, r3, skIdentity4f@l +/* 801904E8 0018D448 38 03 66 70 */ addi r0, r3, sIdentity__12CTransform4f@l /* 801904EC 0018D44C 7C 04 03 78 */ mr r4, r0 /* 801904F0 0018D450 38 7E 00 08 */ addi r3, r30, 8 /* 801904F4 0018D454 93 3E 00 04 */ stw r25, 4(r30) /* 801904F8 0018D458 48 18 26 7D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 801904FC 0018D45C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 801904FC 0018D45C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80190500 0018D460 38 7E 00 38 */ addi r3, r30, 0x38 -/* 80190504 0018D464 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80190504 0018D464 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80190508 0018D468 48 18 26 6D */ bl __ct__12CTransform4fFRC12CTransform4f /* 8019050C 0018D46C C0 02 A4 FC */ lfs f0, lbl_805AC21C@sda21(r2) /* 80190510 0018D470 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -1942,10 +1942,10 @@ __ct__25CHudFreeLookInterfaceXRayFR9CGuiFramebbUi: /* 80190930 0018D890 38 9F 00 00 */ addi r4, r31, 0 /* 80190934 0018D894 93 A1 00 24 */ stw r29, 0x24(r1) /* 80190938 0018D898 7C 7D 1B 78 */ mr r29, r3 -/* 8019093C 0018D89C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8019093C 0018D89C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80190940 0018D8A0 90 1D 00 00 */ stw r0, 0(r29) /* 80190944 0018D8A4 38 07 44 8C */ addi r0, r7, lbl_803E448C@l -/* 80190948 0018D8A8 39 03 66 A0 */ addi r8, r3, skZero3f@l +/* 80190948 0018D8A8 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 8019094C 0018D8AC 38 E0 00 01 */ li r7, 1 /* 80190950 0018D8B0 90 1D 00 00 */ stw r0, 0(r29) /* 80190954 0018D8B4 7F C3 F3 78 */ mr r3, r30 @@ -2312,9 +2312,9 @@ __ct__19CHudHelmetInterfaceFR9CGuiFrame: /* 80190E6C 0018DDCC 93 A1 00 54 */ stw r29, 0x54(r1) /* 80190E70 0018DDD0 7C 7D 1B 78 */ mr r29, r3 /* 80190E74 0018DDD4 48 17 F1 B1 */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 80190E78 0018DDD8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80190E78 0018DDD8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80190E7C 0018DDDC 38 C0 00 01 */ li r6, 1 -/* 80190E80 0018DDE0 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 80190E80 0018DDE0 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 80190E84 0018DDE4 38 A0 00 00 */ li r5, 0 /* 80190E88 0018DDE8 C0 07 00 00 */ lfs f0, 0(r7) /* 80190E8C 0018DDEC 38 61 00 38 */ addi r3, r1, 0x38 @@ -3131,12 +3131,12 @@ __ct__20CHudMissileInterfaceFR9CGuiFrameiifbUiRC13CStateManager: /* 80191A0C 0018E96C 7C 7C 1B 78 */ mr r28, r3 /* 80191A10 0018E970 7D 1D 43 78 */ mr r29, r8 /* 80191A14 0018E974 93 A3 00 00 */ stw r29, 0(r3) -/* 80191A18 0018E978 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80191A18 0018E978 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80191A1C 0018E97C 3D 00 80 3D */ lis r8, lbl_803D0C28@ha /* 80191A20 0018E980 C0 02 A5 20 */ lfs f0, lbl_805AC240@sda21(r2) /* 80191A24 0018E984 90 BC 00 04 */ stw r5, 4(r28) /* 80191A28 0018E988 FF E0 08 90 */ fmr f31, f1 -/* 80191A2C 0018E98C 38 03 66 70 */ addi r0, r3, skIdentity4f@l +/* 80191A2C 0018E98C 38 03 66 70 */ addi r0, r3, sIdentity__12CTransform4f@l /* 80191A30 0018E990 7C 9A 23 78 */ mr r26, r4 /* 80191A34 0018E994 90 DC 00 08 */ stw r6, 8(r28) /* 80191A38 0018E998 7C FB 3B 78 */ mr r27, r7 @@ -3775,16 +3775,16 @@ lbl_8019235C: /* 80192378 0018F2D8 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8019237C 0018F2DC 48 18 07 F9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80192380 0018F2E0 80 B9 08 4C */ lwz r5, 0x84c(r25) -/* 80192384 0018F2E4 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80192388 0018F2E8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80192384 0018F2E4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80192388 0018F2E8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8019238C 0018F2EC C3 85 00 60 */ lfs f28, 0x60(r5) /* 80192390 0018F2F0 38 61 01 00 */ addi r3, r1, 0x100 /* 80192394 0018F2F4 C3 A5 00 50 */ lfs f29, 0x50(r5) /* 80192398 0018F2F8 C3 C5 00 40 */ lfs f30, 0x40(r5) /* 8019239C 0018F2FC 48 18 07 D9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 801923A0 0018F300 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801923A0 0018F300 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801923A4 0018F304 C0 62 A5 84 */ lfs f3, lbl_805AC2A4@sda21(r2) -/* 801923A8 0018F308 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801923A8 0018F308 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801923AC 0018F30C 80 78 00 44 */ lwz r3, 0x44(r24) /* 801923B0 0018F310 C0 45 00 00 */ lfs f2, 0(r5) /* 801923B4 0018F314 38 81 00 4C */ addi r4, r1, 0x4c @@ -3867,9 +3867,9 @@ lbl_8019235C: /* 801924E8 0018F448 7F 9C 23 78 */ or r28, r28, r4 /* 801924EC 0018F44C FC 00 D0 50 */ fneg f0, f26 /* 801924F0 0018F450 7F 7B 1B 78 */ or r27, r27, r3 -/* 801924F4 0018F454 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 801924F4 0018F454 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 801924F8 0018F458 38 00 00 03 */ li r0, 3 -/* 801924FC 0018F45C 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 801924FC 0018F45C 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 80192500 0018F460 EC 5E 08 2A */ fadds f2, f30, f1 /* 80192504 0018F464 EC 3D 08 2A */ fadds f1, f29, f1 /* 80192508 0018F468 C1 04 00 00 */ lfs f8, 0(r4) @@ -4235,9 +4235,9 @@ __ct__18CHudRadarInterfaceFR9CGuiFrameRC13CStateManager: /* 80192A2C 0018F98C 90 1E 00 08 */ stw r0, 8(r30) /* 80192A30 0018F990 38 80 FF FF */ li r4, -1 /* 80192A34 0018F994 48 1A E4 0D */ bl __dt__6CTokenFv -/* 80192A38 0018F998 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80192A38 0018F998 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80192A3C 0018F99C 38 7E 00 0C */ addi r3, r30, 0xc -/* 80192A40 0018F9A0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80192A40 0018F9A0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80192A44 0018F9A4 48 18 01 31 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80192A48 0018F9A8 88 1E 00 3C */ lbz r0, 0x3c(r30) /* 80192A4C 0018F9AC 38 A0 00 01 */ li r5, 1 @@ -4941,9 +4941,9 @@ __ct__19CHudThreatInterfaceFR9CGuiFramef: /* 80193408 00190368 7C 9C 23 78 */ mr r28, r4 /* 8019340C 0019036C 90 1D 00 00 */ stw r0, 0(r29) /* 80193410 00190370 38 03 44 A8 */ addi r0, r3, lbl_803E44A8@l -/* 80193414 00190374 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80193414 00190374 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80193418 00190378 90 1D 00 00 */ stw r0, 0(r29) -/* 8019341C 0019037C 38 03 66 70 */ addi r0, r3, skIdentity4f@l +/* 8019341C 0019037C 38 03 66 70 */ addi r0, r3, sIdentity__12CTransform4f@l /* 80193420 00190380 7C 04 03 78 */ mr r4, r0 /* 80193424 00190384 38 7D 00 18 */ addi r3, r29, 0x18 /* 80193428 00190388 93 DD 00 04 */ stw r30, 4(r29) @@ -6798,11 +6798,11 @@ __ct__24CHudDecoInterfaceThermalFR9CGuiFrame: /* 80194DDC 00191D3C 3C A0 80 3E */ lis r5, lbl_803DA2A4@ha /* 80194DE0 00191D40 90 01 00 C4 */ stw r0, 0xc4(r1) /* 80194DE4 00191D44 38 05 A2 A4 */ addi r0, r5, lbl_803DA2A4@l -/* 80194DE8 00191D48 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80194DE8 00191D48 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80194DEC 00191D4C BF 61 00 AC */ stmw r27, 0xac(r1) /* 80194DF0 00191D50 7C 7D 1B 78 */ mr r29, r3 /* 80194DF4 00191D54 3C 60 80 3E */ lis r3, lbl_803E44C8@ha -/* 80194DF8 00191D58 3B E5 66 A0 */ addi r31, r5, skZero3f@l +/* 80194DF8 00191D58 3B E5 66 A0 */ addi r31, r5, sZeroVector__9CVector3f@l /* 80194DFC 00191D5C 7C 9E 23 78 */ mr r30, r4 /* 80194E00 00191D60 90 1D 00 00 */ stw r0, 0(r29) /* 80194E04 00191D64 38 03 44 C8 */ addi r0, r3, lbl_803E44C8@l @@ -6840,9 +6840,9 @@ __ct__24CHudDecoInterfaceThermalFR9CGuiFrame: /* 80194E84 00191DE4 C0 1F 00 08 */ lfs f0, 8(r31) /* 80194E88 00191DE8 D0 1D 00 34 */ stfs f0, 0x34(r29) /* 80194E8C 00191DEC 48 17 B1 99 */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 80194E90 00191DF0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80194E90 00191DF0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80194E94 00191DF4 C0 22 A6 84 */ lfs f1, lbl_805AC3A4@sda21(r2) -/* 80194E98 00191DF8 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 80194E98 00191DF8 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 80194E9C 00191DFC 38 A0 00 01 */ li r5, 1 /* 80194EA0 00191E00 C0 02 A6 6C */ lfs f0, lbl_805AC38C@sda21(r2) /* 80194EA4 00191E04 38 00 00 00 */ li r0, 0 @@ -8066,8 +8066,8 @@ __ct__21CHudDecoInterfaceScanFR9CGuiFrame: /* 80195FD0 00192F30 38 C4 66 60 */ addi r6, r4, lbl_805A6660@l /* 80195FD4 00192F34 38 00 00 00 */ li r0, 0 /* 80195FD8 00192F38 B0 BD 01 D0 */ sth r5, 0x1d0(r29) -/* 80195FDC 00192F3C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80195FE0 00192F40 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80195FDC 00192F3C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80195FE0 00192F40 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80195FE4 00192F44 C0 22 A6 6C */ lfs f1, lbl_805AC38C@sda21(r2) /* 80195FE8 00192F48 A0 ED A3 8C */ lhz r7, kInvalidUniqueId@sda21(r13) /* 80195FEC 00192F4C 38 80 00 01 */ li r4, 1 @@ -8802,14 +8802,14 @@ __ct__21CHudDecoInterfaceXRayFR9CGuiFrame: /* 80196A2C 0019398C 90 01 00 34 */ stw r0, 0x34(r1) /* 80196A30 00193990 38 05 A2 A4 */ addi r0, r5, lbl_803DA2A4@l /* 80196A34 00193994 3C C0 80 5A */ lis r6, lbl_805A6660@ha -/* 80196A38 00193998 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80196A38 00193998 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80196A3C 0019399C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80196A40 001939A0 7C 9F 23 78 */ mr r31, r4 /* 80196A44 001939A4 93 C1 00 28 */ stw r30, 0x28(r1) /* 80196A48 001939A8 7C 7E 1B 78 */ mr r30, r3 /* 80196A4C 001939AC 3C 60 80 3E */ lis r3, lbl_803E4550@ha /* 80196A50 001939B0 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80196A54 001939B4 3B A5 66 A0 */ addi r29, r5, skZero3f@l +/* 80196A54 001939B4 3B A5 66 A0 */ addi r29, r5, sZeroVector__9CVector3f@l /* 80196A58 001939B8 90 1E 00 00 */ stw r0, 0(r30) /* 80196A5C 001939BC 38 03 45 50 */ addi r0, r3, lbl_803E4550@l /* 80196A60 001939C0 3C 60 80 5A */ lis r3, lbl_805A65FC@ha @@ -8845,9 +8845,9 @@ __ct__21CHudDecoInterfaceXRayFR9CGuiFrame: /* 80196AD8 00193A38 C0 1D 00 08 */ lfs f0, 8(r29) /* 80196ADC 00193A3C D0 1E 00 38 */ stfs f0, 0x38(r30) /* 80196AE0 00193A40 48 17 95 45 */ bl __ct__9CMatrix3fFRC9CMatrix3f -/* 80196AE4 00193A44 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80196AE4 00193A44 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80196AE8 00193A48 3C 80 80 5A */ lis r4, lbl_805A65FC@ha -/* 80196AEC 00193A4C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80196AEC 00193A4C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80196AF0 00193A50 C0 05 00 00 */ lfs f0, 0(r5) /* 80196AF4 00193A54 38 7E 00 78 */ addi r3, r30, 0x78 /* 80196AF8 00193A58 38 84 65 FC */ addi r4, r4, lbl_805A65FC@l @@ -9253,7 +9253,7 @@ __ct__23CHudDecoInterfaceCombatFR9CGuiFrame: /* 8019708C 00193FEC 3C E0 80 3D */ lis r7, lbl_803D0F10@ha /* 80197090 00193FF0 90 01 00 54 */ stw r0, 0x54(r1) /* 80197094 00193FF4 38 05 A2 A4 */ addi r0, r5, lbl_803DA2A4@l -/* 80197098 00193FF8 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80197098 00193FF8 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8019709C 00193FFC 93 E1 00 4C */ stw r31, 0x4c(r1) /* 801970A0 00194000 7C 7F 1B 78 */ mr r31, r3 /* 801970A4 00194004 3C 60 80 3E */ lis r3, lbl_803E4594@ha @@ -9278,7 +9278,7 @@ __ct__23CHudDecoInterfaceCombatFR9CGuiFrame: /* 801970F0 00194050 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 801970F4 00194054 C0 06 00 0C */ lfs f0, 0xc(r6) /* 801970F8 00194058 D0 1F 00 10 */ stfs f0, 0x10(r31) -/* 801970FC 0019405C C4 05 66 A0 */ lfsu f0, skZero3f@l(r5) +/* 801970FC 0019405C C4 05 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r5) /* 80197100 00194060 D0 1F 00 14 */ stfs f0, 0x14(r31) /* 80197104 00194064 C0 05 00 04 */ lfs f0, 4(r5) /* 80197108 00194068 D0 1F 00 18 */ stfs f0, 0x18(r31) diff --git a/asm/MetroidPrime/HUD/CSamusHud.s b/asm/MetroidPrime/HUD/CSamusHud.s index e773dae8..2d714564 100644 --- a/asm/MetroidPrime/HUD/CSamusHud.s +++ b/asm/MetroidPrime/HUD/CSamusHud.s @@ -822,9 +822,9 @@ ApplyClassicLag__9CSamusHudFRC13CUnitVector3fR11CQuaternionRC13CStateManagerfb: /* 80064BB8 00061B18 93 C1 01 38 */ stw r30, 0x138(r1) /* 80064BBC 00061B1C 93 A1 01 34 */ stw r29, 0x134(r1) /* 80064BC0 00061B20 93 81 01 30 */ stw r28, 0x130(r1) -/* 80064BC4 00061B24 3C C0 80 5A */ lis r6, lbl_805A6724@ha +/* 80064BC4 00061B24 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha /* 80064BC8 00061B28 C0 C2 87 38 */ lfs f6, lbl_805AA458@sda21(r2) -/* 80064BCC 00061B2C 3B C6 67 24 */ addi r30, r6, lbl_805A6724@l +/* 80064BCC 00061B2C 3B C6 67 24 */ addi r30, r6, sForwardVector__9CVector3f@l /* 80064BD0 00061B30 C0 44 00 00 */ lfs f2, 0(r4) /* 80064BD4 00061B34 C0 BE 00 00 */ lfs f5, 0(r30) /* 80064BD8 00061B38 7C 7C 1B 78 */ mr r28, r3 @@ -857,9 +857,9 @@ ApplyClassicLag__9CSamusHudFRC13CUnitVector3fR11CQuaternionRC13CStateManagerfb: /* 80064C44 00061BA4 D0 21 00 E0 */ stfs f1, 0xe0(r1) /* 80064C48 00061BA8 D0 01 00 E4 */ stfs f0, 0xe4(r1) /* 80064C4C 00061BAC 41 82 00 60 */ beq lbl_80064CAC -/* 80064C50 00061BB0 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80064C50 00061BB0 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80064C54 00061BB4 C0 62 87 38 */ lfs f3, lbl_805AA458@sda21(r2) -/* 80064C58 00061BB8 C0 43 67 24 */ lfs f2, lbl_805A6724@l(r3) +/* 80064C58 00061BB8 C0 43 67 24 */ lfs f2, sForwardVector__9CVector3f@l(r3) /* 80064C5C 00061BBC 38 61 00 88 */ addi r3, r1, 0x88 /* 80064C60 00061BC0 C0 3E 00 04 */ lfs f1, 4(r30) /* 80064C64 00061BC4 38 81 00 D8 */ addi r4, r1, 0xd8 @@ -881,9 +881,9 @@ ApplyClassicLag__9CSamusHudFRC13CUnitVector3fR11CQuaternionRC13CStateManagerfb: /* 80064CA4 00061C04 38 C1 00 6C */ addi r6, r1, 0x6c /* 80064CA8 00061C08 48 00 00 5C */ b lbl_80064D04 lbl_80064CAC: -/* 80064CAC 00061C0C 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80064CAC 00061C0C 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80064CB0 00061C10 C0 62 87 38 */ lfs f3, lbl_805AA458@sda21(r2) -/* 80064CB4 00061C14 C0 43 67 24 */ lfs f2, lbl_805A6724@l(r3) +/* 80064CB4 00061C14 C0 43 67 24 */ lfs f2, sForwardVector__9CVector3f@l(r3) /* 80064CB8 00061C18 38 61 00 60 */ addi r3, r1, 0x60 /* 80064CBC 00061C1C C0 3E 00 04 */ lfs f1, 4(r30) /* 80064CC0 00061C20 38 81 00 D8 */ addi r4, r1, 0xd8 @@ -1038,9 +1038,9 @@ lbl_80064EDC: /* 80064EF8 00061E58 3C 80 80 5A */ lis r4, lbl_805A65FC@ha /* 80064EFC 00061E5C 38 84 65 FC */ addi r4, r4, lbl_805A65FC@l /* 80064F00 00061E60 48 12 BC 89 */ bl SetHudLagRotation__19CHudHelmetInterfaceFRC9CMatrix3f -/* 80064F04 00061E64 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80064F04 00061E64 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80064F08 00061E68 80 7E 02 A0 */ lwz r3, 0x2a0(r30) -/* 80064F0C 00061E6C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80064F0C 00061E6C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80064F10 00061E70 48 12 BC 4D */ bl SetHudLagOffset__19CHudHelmetInterfaceFRC9CVector3f lbl_80064F14: /* 80064F14 00061E74 80 7E 02 9C */ lwz r3, 0x29c(r30) @@ -1060,8 +1060,8 @@ lbl_80064F14: /* 80064F4C 00061EAC 7D 89 03 A6 */ mtctr r12 /* 80064F50 00061EB0 4E 80 04 21 */ bctrl /* 80064F54 00061EB4 80 7E 02 9C */ lwz r3, 0x29c(r30) -/* 80064F58 00061EB8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80064F5C 00061EBC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80064F58 00061EB8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80064F5C 00061EBC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80064F60 00061EC0 81 83 00 00 */ lwz r12, 0(r3) /* 80064F64 00061EC4 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80064F68 00061EC8 7D 89 03 A6 */ mtctr r12 @@ -1876,10 +1876,10 @@ lbl_80065AE0: /* 80065B28 00062A88 D0 01 00 08 */ stfs f0, 8(r1) /* 80065B2C 00062A8C 4B FA 67 89 */ bl "Clamp__5CMathFRCfRCfRCf" /* 80065B30 00062A90 C0 23 00 00 */ lfs f1, 0(r3) -/* 80065B34 00062A94 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80065B34 00062A94 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80065B38 00062A98 C0 1F 02 C8 */ lfs f0, 0x2c8(r31) /* 80065B3C 00062A9C 38 81 00 2C */ addi r4, r1, 0x2c -/* 80065B40 00062AA0 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 80065B40 00062AA0 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 80065B44 00062AA4 EC 60 00 72 */ fmuls f3, f0, f1 /* 80065B48 00062AA8 C0 23 00 04 */ lfs f1, 4(r3) /* 80065B4C 00062AAC C0 03 00 08 */ lfs f0, 8(r3) @@ -1891,9 +1891,9 @@ lbl_80065AE0: /* 80065B64 00062AC4 48 25 CB D1 */ bl Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms /* 80065B68 00062AC8 48 00 00 68 */ b lbl_80065BD0 lbl_80065B6C: -/* 80065B6C 00062ACC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80065B6C 00062ACC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80065B70 00062AD0 C0 7F 02 C8 */ lfs f3, 0x2c8(r31) -/* 80065B74 00062AD4 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80065B74 00062AD4 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80065B78 00062AD8 C0 45 00 00 */ lfs f2, 0(r5) /* 80065B7C 00062ADC 38 81 00 1C */ addi r4, r1, 0x1c /* 80065B80 00062AE0 C0 25 00 04 */ lfs f1, 4(r5) @@ -1905,9 +1905,9 @@ lbl_80065B6C: /* 80065B98 00062AF8 48 25 CB 9D */ bl Draw__9CGuiFrameCFRC19CGuiWidgetDrawParms /* 80065B9C 00062AFC 48 00 00 34 */ b lbl_80065BD0 lbl_80065BA0: -/* 80065BA0 00062B00 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80065BA0 00062B00 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80065BA4 00062B04 C0 7F 02 C8 */ lfs f3, 0x2c8(r31) -/* 80065BA8 00062B08 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 80065BA8 00062B08 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 80065BAC 00062B0C C0 45 00 00 */ lfs f2, 0(r5) /* 80065BB0 00062B10 38 81 00 0C */ addi r4, r1, 0xc /* 80065BB4 00062B14 C0 25 00 04 */ lfs f1, 4(r5) @@ -4399,10 +4399,10 @@ lbl_80067DAC: /* 80067E88 00064DE8 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 80067E8C 00064DEC 3C 80 38 E4 */ lis r4, 0x38E38E39@ha /* 80067E90 00064DF0 3C 60 55 55 */ lis r3, 0x55555556@ha -/* 80067E94 00064DF4 3C E0 80 5A */ lis r7, lbl_805A6718@ha +/* 80067E94 00064DF4 3C E0 80 5A */ lis r7, sRightVector__9CVector3f@ha /* 80067E98 00064DF8 D0 1D 04 4C */ stfs f0, 0x44c(r29) -/* 80067E9C 00064DFC 3C C0 80 5A */ lis r6, lbl_805A6724@ha -/* 80067EA0 00064E00 3C A0 80 5A */ lis r5, lbl_805A66F4@ha +/* 80067E9C 00064DFC 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha +/* 80067EA0 00064E00 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha /* 80067EA4 00064E04 CB E2 87 B8 */ lfd f31, lbl_805AA4D8@sda21(r2) /* 80067EA8 00064E08 81 01 00 70 */ lwz r8, 0x70(r1) /* 80067EAC 00064E0C 3B E4 8E 39 */ addi r31, r4, 0x38E38E39@l @@ -4417,9 +4417,9 @@ lbl_80067DAC: /* 80067ED0 00064E30 90 1D 04 54 */ stw r0, 0x454(r29) /* 80067ED4 00064E34 80 01 00 78 */ lwz r0, 0x78(r1) /* 80067ED8 00064E38 90 1D 04 58 */ stw r0, 0x458(r29) -/* 80067EDC 00064E3C C5 07 67 18 */ lfsu f8, lbl_805A6718@l(r7) -/* 80067EE0 00064E40 C4 A6 67 24 */ lfsu f5, lbl_805A6724@l(r6) -/* 80067EE4 00064E44 C4 45 66 F4 */ lfsu f2, lbl_805A66F4@l(r5) +/* 80067EDC 00064E3C C5 07 67 18 */ lfsu f8, sRightVector__9CVector3f@l(r7) +/* 80067EE0 00064E40 C4 A6 67 24 */ lfsu f5, sForwardVector__9CVector3f@l(r6) +/* 80067EE4 00064E44 C4 45 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r5) /* 80067EE8 00064E48 C0 E7 00 04 */ lfs f7, 4(r7) /* 80067EEC 00064E4C C0 C7 00 08 */ lfs f6, 8(r7) /* 80067EF0 00064E50 C0 86 00 04 */ lfs f4, 4(r6) @@ -4941,18 +4941,18 @@ lbl_800685DC: /* 80068670 000655D0 48 2F AC 3D */ bl Lerp__6CColorFRC6CColorRC6CColorf /* 80068674 000655D4 80 01 00 64 */ lwz r0, 0x64(r1) /* 80068678 000655D8 3B 3E 05 DC */ addi r25, r30, 0x5dc -/* 8006867C 000655DC 3C A0 80 5A */ lis r5, lbl_805A6724@ha -/* 80068680 000655E0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80068684 000655E4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8006867C 000655DC 3C A0 80 5A */ lis r5, sForwardVector__9CVector3f@ha +/* 80068680 000655E0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80068684 000655E4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80068688 000655E8 90 01 00 84 */ stw r0, 0x84(r1) /* 8006868C 000655EC C3 42 87 34 */ lfs f26, lbl_805AA454@sda21(r2) /* 80068690 000655F0 7F 36 CB 78 */ mr r22, r25 /* 80068694 000655F4 C3 C2 87 28 */ lfs f30, lbl_805AA448@sda21(r2) -/* 80068698 000655F8 3B A5 67 24 */ addi r29, r5, lbl_805A6724@l +/* 80068698 000655F8 3B A5 67 24 */ addi r29, r5, sForwardVector__9CVector3f@l /* 8006869C 000655FC C3 E2 87 48 */ lfs f31, lbl_805AA468@sda21(r2) -/* 800686A0 00065600 3A E4 66 A0 */ addi r23, r4, skZero3f@l +/* 800686A0 00065600 3A E4 66 A0 */ addi r23, r4, sZeroVector__9CVector3f@l /* 800686A4 00065604 C2 A2 87 2C */ lfs f21, lbl_805AA44C@sda21(r2) -/* 800686A8 00065608 3B 03 66 F4 */ addi r24, r3, lbl_805A66F4@l +/* 800686A8 00065608 3B 03 66 F4 */ addi r24, r3, sUpVector__9CVector3f@l /* 800686AC 0006560C C2 C2 87 A8 */ lfs f22, lbl_805AA4C8@sda21(r2) /* 800686B0 00065610 3B 40 00 00 */ li r26, 0 /* 800686B4 00065614 C2 E2 87 94 */ lfs f23, lbl_805AA4B4@sda21(r2) @@ -5122,9 +5122,9 @@ lbl_80068920: /* 80068928 00065888 41 80 FD 9C */ blt lbl_800686C4 /* 8006892C 0006588C 82 FF 08 30 */ lwz r23, 0x830(r31) /* 80068930 00065890 48 2E 16 85 */ bl Black__6CColorFv -/* 80068934 00065894 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80068934 00065894 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80068938 00065898 7C 65 1B 78 */ mr r5, r3 -/* 8006893C 0006589C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8006893C 0006589C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80068940 000658A0 38 61 02 9C */ addi r3, r1, 0x29c /* 80068944 000658A4 48 29 DA F1 */ bl BuildPoint__6CLightFRC9CVector3fRC6CColor /* 80068948 000658A8 38 61 02 EC */ addi r3, r1, 0x2ec @@ -5376,17 +5376,17 @@ lbl_80068CA8: /* 80068CF0 00065C50 38 A1 00 18 */ addi r5, r1, 0x18 /* 80068CF4 00065C54 48 2F A3 BD */ bl Add__6CColorFRC6CColorRC6CColor /* 80068CF8 00065C58 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80068CFC 00065C5C 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 80068D00 00065C60 38 E3 67 24 */ addi r7, r3, lbl_805A6724@l -/* 80068D04 00065C64 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80068CFC 00065C5C 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 80068D00 00065C60 38 E3 67 24 */ addi r7, r3, sForwardVector__9CVector3f@l +/* 80068D04 00065C64 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80068D08 00065C68 90 01 00 88 */ stw r0, 0x88(r1) /* 80068D0C 00065C6C 57 40 10 3A */ slwi r0, r26, 2 -/* 80068D10 00065C70 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80068D10 00065C70 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80068D14 00065C74 C0 62 87 48 */ lfs f3, lbl_805AA468@sda21(r2) /* 80068D18 00065C78 7E 79 00 2E */ lwzx r19, r25, r0 -/* 80068D1C 00065C7C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80068D1C 00065C7C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80068D20 00065C80 C0 FD 00 04 */ lfs f7, 4(r29) -/* 80068D24 00065C84 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80068D24 00065C84 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80068D28 00065C88 C0 13 00 48 */ lfs f0, 0x48(r19) /* 80068D2C 00065C8C 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 80068D30 00065C90 C0 33 00 38 */ lfs f1, 0x38(r19) @@ -7546,7 +7546,7 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006AAC0 00067A20 4B FA 5F F1 */ bl IsEnergyLow__7CPlayerCFRC13CStateManager /* 8006AAC4 00067A24 88 1F 02 E0 */ lbz r0, 0x2e0(r31) /* 8006AAC8 00067A28 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b -/* 8006AACC 00067A2C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8006AACC 00067A2C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8006AAD0 00067A30 3C 80 80 5A */ lis r4, lbl_805A6660@ha /* 8006AAD4 00067A34 98 1F 02 E0 */ stb r0, 0x2e0(r31) /* 8006AAD8 00067A38 38 00 00 00 */ li r0, 0 @@ -7554,7 +7554,7 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006AAE0 00067A40 C0 02 87 28 */ lfs f0, lbl_805AA448@sda21(r2) /* 8006AAE4 00067A44 90 1F 02 E4 */ stw r0, 0x2e4(r31) /* 8006AAE8 00067A48 38 63 D0 C0 */ addi r3, r3, lbl_803CD0C0@l -/* 8006AAEC 00067A4C 3B 85 66 A0 */ addi r28, r5, skZero3f@l +/* 8006AAEC 00067A4C 3B 85 66 A0 */ addi r28, r5, sZeroVector__9CVector3f@l /* 8006AAF0 00067A50 3B A4 66 60 */ addi r29, r4, lbl_805A6660@l /* 8006AAF4 00067A54 90 1F 02 E8 */ stw r0, 0x2e8(r31) /* 8006AAF8 00067A58 38 83 01 3B */ addi r4, r3, 0x13b @@ -7601,9 +7601,9 @@ __ct__9CSamusHudFRC13CStateManager: /* 8006AB9C 00067AFC 48 2A AC D1 */ bl __nw__FUlPCcPCc /* 8006ABA0 00067B00 7C 60 1B 79 */ or. r0, r3, r3 /* 8006ABA4 00067B04 41 82 00 4C */ beq lbl_8006ABF0 -/* 8006ABA8 00067B08 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8006ABA8 00067B08 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8006ABAC 00067B0C C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 8006ABB0 00067B10 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8006ABB0 00067B10 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8006ABB4 00067B14 38 A1 00 34 */ addi r5, r1, 0x34 /* 8006ABB8 00067B18 81 07 00 00 */ lwz r8, 0(r7) /* 8006ABBC 00067B1C 38 80 00 08 */ li r4, 8 @@ -7622,9 +7622,9 @@ __ct__9CSamusHudFRC13CStateManager: lbl_8006ABF0: /* 8006ABF0 00067B50 90 1F 03 3C */ stw r0, 0x33c(r31) /* 8006ABF4 00067B54 48 2D F3 B9 */ bl White__6CColorFv -/* 8006ABF8 00067B58 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8006ABF8 00067B58 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8006ABFC 00067B5C C0 5C 00 04 */ lfs f2, 4(r28) -/* 8006AC00 00067B60 C0 24 66 A0 */ lfs f1, skZero3f@l(r4) +/* 8006AC00 00067B60 C0 24 66 A0 */ lfs f1, sZeroVector__9CVector3f@l(r4) /* 8006AC04 00067B64 34 BF 03 44 */ addic. r5, r31, 0x344 /* 8006AC08 00067B68 C0 7C 00 08 */ lfs f3, 8(r28) /* 8006AC0C 00067B6C 38 00 00 03 */ li r0, 3 @@ -7672,7 +7672,7 @@ lbl_8006AC90: /* 8006ACA8 00067C08 90 1F 03 D4 */ stw r0, 0x3d4(r31) /* 8006ACAC 00067C0C 38 83 65 FC */ addi r4, r3, lbl_805A65FC@l /* 8006ACB0 00067C10 C0 22 87 34 */ lfs f1, lbl_805AA454@sda21(r2) -/* 8006ACB4 00067C14 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8006ACB4 00067C14 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8006ACB8 00067C18 90 1F 03 DC */ stw r0, 0x3dc(r31) /* 8006ACBC 00067C1C 38 7F 04 28 */ addi r3, r31, 0x428 /* 8006ACC0 00067C20 C0 02 87 28 */ lfs f0, lbl_805AA448@sda21(r2) @@ -7686,7 +7686,7 @@ lbl_8006AC90: /* 8006ACE0 00067C40 D0 3F 03 FC */ stfs f1, 0x3fc(r31) /* 8006ACE4 00067C44 D0 3F 04 00 */ stfs f1, 0x400(r31) /* 8006ACE8 00067C48 D0 3F 04 04 */ stfs f1, 0x404(r31) -/* 8006ACEC 00067C4C C4 05 66 A0 */ lfsu f0, skZero3f@l(r5) +/* 8006ACEC 00067C4C C4 05 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r5) /* 8006ACF0 00067C50 D0 1F 04 08 */ stfs f0, 0x408(r31) /* 8006ACF4 00067C54 C0 1C 00 04 */ lfs f0, 4(r28) /* 8006ACF8 00067C58 D0 1F 04 0C */ stfs f0, 0x40c(r31) @@ -7706,11 +7706,11 @@ lbl_8006AC90: /* 8006AD30 00067C90 38 83 66 60 */ addi r4, r3, lbl_805A6660@l /* 8006AD34 00067C94 3B 60 00 00 */ li r27, 0 /* 8006AD38 00067C98 C0 24 00 00 */ lfs f1, 0(r4) -/* 8006AD3C 00067C9C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8006AD3C 00067C9C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8006AD40 00067CA0 38 00 00 03 */ li r0, 3 /* 8006AD44 00067CA4 3B 9F 04 70 */ addi r28, r31, 0x470 /* 8006AD48 00067CA8 D0 3F 04 4C */ stfs f1, 0x44c(r31) -/* 8006AD4C 00067CAC 3B 43 66 70 */ addi r26, r3, skIdentity4f@l +/* 8006AD4C 00067CAC 3B 43 66 70 */ addi r26, r3, sIdentity__12CTransform4f@l /* 8006AD50 00067CB0 C0 3D 00 04 */ lfs f1, 4(r29) /* 8006AD54 00067CB4 D0 3F 04 50 */ stfs f1, 0x450(r31) /* 8006AD58 00067CB8 C0 3D 00 08 */ lfs f1, 8(r29) @@ -8452,9 +8452,9 @@ lbl_8006B7D0: /* 8006B80C 0006876C 90 61 01 00 */ stw r3, 0x100(r1) /* 8006B810 00068770 90 01 01 04 */ stw r0, 0x104(r1) lbl_8006B814: -/* 8006B814 00068774 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 8006B814 00068774 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 8006B818 00068778 80 AD A1 38 */ lwz r5, gpTweakGui@sda21(r13) -/* 8006B81C 0006877C 38 C3 67 54 */ addi r6, r3, lbl_805A6754@l +/* 8006B81C 0006877C 38 C3 67 54 */ addi r6, r3, mskInvertedBox__6CAABox@l /* 8006B820 00068780 38 61 00 BC */ addi r3, r1, 0xbc /* 8006B824 00068784 C0 A6 00 00 */ lfs f5, 0(r6) /* 8006B828 00068788 38 81 00 28 */ addi r4, r1, 0x28 @@ -9796,12 +9796,12 @@ InitializeDamageLight__9CSamusHudFv: /* 8006CB18 00069A78 48 25 E4 19 */ bl __ct__Q210CGuiWidget15CGuiWidgetParmsFP9CGuiFramebssbbbRC6CColorQ210CGuiWidget18EGuiModelDrawFlagsbb /* 8006CB1C 00069A7C 48 2D D4 91 */ bl White__6CColorFv /* 8006CB20 00069A80 80 AD A1 38 */ lwz r5, gpTweakGui@sda21(r13) -/* 8006CB24 00069A84 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8006CB28 00069A88 3C C0 80 5A */ lis r6, lbl_805A6724@ha +/* 8006CB24 00069A84 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8006CB28 00069A88 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha /* 8006CB2C 00069A8C C0 25 00 54 */ lfs f1, 0x54(r5) -/* 8006CB30 00069A90 38 A6 67 24 */ addi r5, r6, lbl_805A6724@l +/* 8006CB30 00069A90 38 A6 67 24 */ addi r5, r6, sForwardVector__9CVector3f@l /* 8006CB34 00069A94 7C 66 1B 78 */ mr r6, r3 -/* 8006CB38 00069A98 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8006CB38 00069A98 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8006CB3C 00069A9C 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 8006CB40 00069AA0 48 29 98 BD */ bl BuildSpot__6CLightFRC9CVector3fRC9CVector3fRC6CColorf /* 8006CB44 00069AA4 38 61 06 28 */ addi r3, r1, 0x628 @@ -9848,9 +9848,9 @@ lbl_8006CB80: /* 8006CBE4 00069B44 EC 63 00 32 */ fmuls f3, f3, f0 /* 8006CBE8 00069B48 48 2F 68 05 */ bl __ct__6CColorFffff /* 8006CBEC 00069B4C 80 C1 00 58 */ lwz r6, 0x58(r1) -/* 8006CBF0 00069B50 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8006CBF0 00069B50 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8006CBF4 00069B54 80 BF 03 D4 */ lwz r5, 0x3d4(r31) -/* 8006CBF8 00069B58 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8006CBF8 00069B58 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8006CBFC 00069B5C C0 22 87 28 */ lfs f1, lbl_805AA448@sda21(r2) /* 8006CC00 00069B60 38 00 00 04 */ li r0, 4 /* 8006CC04 00069B64 90 C5 00 DC */ stw r6, 0xdc(r5) @@ -10676,8 +10676,8 @@ lbl_8006D7D4: .global __sinit_CSamusHud_cpp __sinit_CSamusHud_cpp: -/* 8006D7E8 0006A748 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8006D7EC 0006A74C C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8006D7E8 0006A748 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8006D7EC 0006A74C C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8006D7F0 0006A750 3C 60 80 47 */ lis r3, lbl_8046C3C8@ha /* 8006D7F4 0006A754 C0 24 00 04 */ lfs f1, 4(r4) /* 8006D7F8 0006A758 D4 43 C3 C8 */ stfsu f2, lbl_8046C3C8@l(r3) diff --git a/asm/MetroidPrime/PathFinding/CPathFindArea.s b/asm/MetroidPrime/PathFinding/CPathFindArea.s index 7911a033..b3b8688c 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindArea.s +++ b/asm/MetroidPrime/PathFinding/CPathFindArea.s @@ -112,8 +112,8 @@ sub_801ca284: lbl_801CA2C4: /* 801CA2C4 001C7224 28 1E 00 00 */ cmplwi r30, 0 /* 801CA2C8 001C7228 41 82 00 20 */ beq lbl_801CA2E8 -/* 801CA2CC 001C722C 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 801CA2D0 001C7230 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 801CA2CC 001C722C 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 801CA2D0 001C7230 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 801CA2D4 001C7234 90 1E 00 00 */ stw r0, 0(r30) /* 801CA2D8 001C7238 41 82 00 10 */ beq lbl_801CA2E8 /* 801CA2DC 001C723C 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -235,11 +235,11 @@ lbl_801CA3E4: /* 801CA460 001C73C0 28 03 00 00 */ cmplwi r3, 0 /* 801CA464 001C73C4 41 82 00 38 */ beq lbl_801CA49C /* 801CA468 001C73C8 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 801CA46C 001C73CC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 801CA46C 001C73CC 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 801CA470 001C73D0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 801CA474 001C73D4 3C 80 80 3E */ lis r4, lbl_803E5718@ha /* 801CA478 001C73D8 90 03 00 00 */ stw r0, 0(r3) -/* 801CA47C 001C73DC 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 801CA47C 001C73DC 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 801CA480 001C73E0 38 A0 00 00 */ li r5, 0 /* 801CA484 001C73E4 38 04 57 18 */ addi r0, r4, lbl_803E5718@l /* 801CA488 001C73E8 90 C3 00 00 */ stw r6, 0(r3) @@ -346,14 +346,14 @@ lbl_801CA5C8: .global "FindClosestReachablePoint__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUi" "FindClosestReachablePoint__7CPFAreaFRQ24rstl30reserved_vectorRC9CVector3fUi": /* 801CA5E4 001C7544 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 801CA5E8 001C7548 3D 20 80 5A */ lis r9, skZero3f@ha +/* 801CA5E8 001C7548 3D 20 80 5A */ lis r9, sZeroVector__9CVector3f@ha /* 801CA5EC 001C754C C1 62 AB 50 */ lfs f11, lbl_805AC870@sda21(r2) /* 801CA5F0 001C7550 54 E0 07 7A */ rlwinm r0, r7, 0, 0x1d, 0x1d /* 801CA5F4 001C7554 BF 21 00 24 */ stmw r25, 0x24(r1) /* 801CA5F8 001C7558 54 EC 07 BC */ rlwinm r12, r7, 0, 0x1e, 0x1e /* 801CA5FC 001C755C 3B E0 00 00 */ li r31, 0 /* 801CA600 001C7560 39 60 00 00 */ li r11, 0 -/* 801CA604 001C7564 C5 09 66 A0 */ lfsu f8, skZero3f@l(r9) +/* 801CA604 001C7564 C5 09 66 A0 */ lfsu f8, sZeroVector__9CVector3f@l(r9) /* 801CA608 001C7568 C1 29 00 04 */ lfs f9, 4(r9) /* 801CA60C 001C756C C1 49 00 08 */ lfs f10, 8(r9) /* 801CA610 001C7570 48 00 01 68 */ b lbl_801CA778 @@ -784,10 +784,10 @@ lbl_801CABA4: /* 801CAC00 001C7B60 BF 01 00 50 */ stmw r24, 0x50(r1) /* 801CAC04 001C7B64 C0 02 AB 50 */ lfs f0, lbl_805AC870@sda21(r2) /* 801CAC08 001C7B68 7C 7F 1B 78 */ mr r31, r3 -/* 801CAC0C 001C7B6C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801CAC0C 001C7B6C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801CAC10 001C7B70 38 00 00 00 */ li r0, 0 /* 801CAC14 001C7B74 D0 1F 00 00 */ stfs f0, 0(r31) -/* 801CAC18 001C7B78 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801CAC18 001C7B78 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801CAC1C 001C7B7C 7C 98 23 78 */ mr r24, r4 /* 801CAC20 001C7B80 38 7F 00 78 */ addi r3, r31, 0x78 /* 801CAC24 001C7B84 C0 05 00 00 */ lfs f0, 0(r5) @@ -826,9 +826,9 @@ lbl_801CABA4: /* 801CACA8 001C7C08 90 1F 00 74 */ stw r0, 0x74(r31) /* 801CACAC 001C7C0C 4B FF E1 1D */ bl __ct__11CPFOpenListFv /* 801CACB0 001C7C10 38 A0 00 00 */ li r5, 0 -/* 801CACB4 001C7C14 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801CACB4 001C7C14 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801CACB8 001C7C18 98 B8 00 00 */ stb r5, 0(r24) -/* 801CACBC 001C7C1C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 801CACBC 001C7C1C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 801CACC0 001C7C20 38 7F 01 88 */ addi r3, r31, 0x188 /* 801CACC4 001C7C24 80 18 00 04 */ lwz r0, 4(r24) /* 801CACC8 001C7C28 90 1F 01 3C */ stw r0, 0x13c(r31) diff --git a/asm/MetroidPrime/PathFinding/CPathFindRegion.s b/asm/MetroidPrime/PathFinding/CPathFindRegion.s index 2fd40cd9..653c4a32 100644 --- a/asm/MetroidPrime/PathFinding/CPathFindRegion.s +++ b/asm/MetroidPrime/PathFinding/CPathFindRegion.s @@ -1167,9 +1167,9 @@ lbl_801C9F48: /* 801C9F94 001C6EF4 FC 00 18 40 */ fcmpo cr0, f0, f3 /* 801C9F98 001C6EF8 4C 41 13 82 */ cror 2, 1, 2 /* 801C9F9C 001C6EFC 40 82 00 50 */ bne lbl_801C9FEC -/* 801C9FA0 001C6F00 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801C9FA0 001C6F00 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801C9FA4 001C6F04 C1 5D 00 14 */ lfs f10, 0x14(r29) -/* 801C9FA8 001C6F08 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 801C9FA8 001C6F08 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 801C9FAC 001C6F0C C0 03 00 04 */ lfs f0, 4(r3) /* 801C9FB0 001C6F10 C0 43 00 00 */ lfs f2, 0(r3) /* 801C9FB4 001C6F14 EC 2A 00 32 */ fmuls f1, f10, f0 @@ -1201,14 +1201,14 @@ __ct__9CPFRegionFv: /* 801CA00C 001C6F6C 38 00 00 00 */ li r0, 0 /* 801CA010 001C6F70 C0 02 AB 4C */ lfs f0, lbl_805AC86C@sda21(r2) /* 801CA014 001C6F74 90 03 00 00 */ stw r0, 0(r3) -/* 801CA018 001C6F78 3C A0 80 5A */ lis r5, skZero3f@ha -/* 801CA01C 001C6F7C 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 801CA018 001C6F78 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 801CA01C 001C6F7C 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 801CA020 001C6F80 90 03 00 04 */ stw r0, 4(r3) /* 801CA024 001C6F84 90 03 00 08 */ stw r0, 8(r3) /* 801CA028 001C6F88 90 03 00 0C */ stw r0, 0xc(r3) /* 801CA02C 001C6F8C 90 03 00 10 */ stw r0, 0x10(r3) /* 801CA030 001C6F90 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 801CA034 001C6F94 C4 05 66 A0 */ lfsu f0, skZero3f@l(r5) +/* 801CA034 001C6F94 C4 05 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r5) /* 801CA038 001C6F98 D0 03 00 18 */ stfs f0, 0x18(r3) /* 801CA03C 001C6F9C C0 05 00 04 */ lfs f0, 4(r5) /* 801CA040 001C6FA0 D0 03 00 1C */ stfs f0, 0x1c(r3) @@ -1221,7 +1221,7 @@ __ct__9CPFRegionFv: /* 801CA05C 001C6FBC D0 03 00 2C */ stfs f0, 0x2c(r3) /* 801CA060 001C6FC0 C0 05 00 08 */ lfs f0, 8(r5) /* 801CA064 001C6FC4 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 801CA068 001C6FC8 C4 04 67 54 */ lfsu f0, lbl_805A6754@l(r4) +/* 801CA068 001C6FC8 C4 04 67 54 */ lfsu f0, mskInvertedBox__6CAABox@l(r4) /* 801CA06C 001C6FCC D0 03 00 34 */ stfs f0, 0x34(r3) /* 801CA070 001C6FD0 C0 04 00 04 */ lfs f0, 4(r4) /* 801CA074 001C6FD4 D0 03 00 38 */ stfs f0, 0x38(r3) @@ -1276,8 +1276,8 @@ lbl_801CA0E8: .global __ct__13CPFRegionDataFv __ct__13CPFRegionDataFv: /* 801CA118 001C7078 C0 22 AB 4C */ lfs f1, lbl_805AC86C@sda21(r2) -/* 801CA11C 001C707C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801CA120 001C7080 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801CA11C 001C707C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801CA120 001C7080 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801CA124 001C7084 38 80 FF FF */ li r4, -1 /* 801CA128 001C7088 D0 23 00 00 */ stfs f1, 0(r3) /* 801CA12C 001C708C 38 00 00 00 */ li r0, 0 diff --git a/asm/MetroidPrime/Player/CGameHintInfo.s b/asm/MetroidPrime/Player/CGameHintInfo.s index 9d4dddad..d1980a61 100644 --- a/asm/MetroidPrime/Player/CGameHintInfo.s +++ b/asm/MetroidPrime/Player/CGameHintInfo.s @@ -125,8 +125,8 @@ sub_8026726c: lbl_802672AC: /* 802672AC 0026420C 28 1E 00 00 */ cmplwi r30, 0 /* 802672B0 00264210 41 82 00 20 */ beq lbl_802672D0 -/* 802672B4 00264214 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802672B8 00264218 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802672B4 00264214 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802672B8 00264218 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802672BC 0026421C 90 1E 00 00 */ stw r0, 0(r30) /* 802672C0 00264220 41 82 00 10 */ beq lbl_802672D0 /* 802672C4 00264224 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -329,11 +329,11 @@ sub_80267520: /* 80267554 002644B4 28 03 00 00 */ cmplwi r3, 0 /* 80267558 002644B8 41 82 00 38 */ beq lbl_80267590 /* 8026755C 002644BC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80267560 002644C0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80267560 002644C0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80267564 002644C4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80267568 002644C8 3C 80 80 3F */ lis r4, lbl_803EA0E0@ha /* 8026756C 002644CC 90 03 00 00 */ stw r0, 0(r3) -/* 80267570 002644D0 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80267570 002644D0 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80267574 002644D4 38 A0 00 00 */ li r5, 0 /* 80267578 002644D8 38 04 A0 E0 */ addi r0, r4, lbl_803EA0E0@l /* 8026757C 002644DC 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/MetroidPrime/Player/CGrappleArm.s b/asm/MetroidPrime/Player/CGrappleArm.s index aa83257c..a06d6c36 100644 --- a/asm/MetroidPrime/Player/CGrappleArm.s +++ b/asm/MetroidPrime/Player/CGrappleArm.s @@ -840,11 +840,11 @@ ResetAuxParams__11CGrappleArmFb: /* 8011DDCC 0011AD2C 7C 9F 23 78 */ mr r31, r4 /* 8011DDD0 0011AD30 93 C1 00 08 */ stw r30, 8(r1) /* 8011DDD4 0011AD34 7C 7E 1B 78 */ mr r30, r3 -/* 8011DDD8 0011AD38 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8011DDD8 0011AD38 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8011DDDC 0011AD3C 88 1E 03 B2 */ lbz r0, 0x3b2(r30) /* 8011DDE0 0011AD40 50 E0 3E 30 */ rlwimi r0, r7, 7, 0x18, 0x18 /* 8011DDE4 0011AD44 98 1E 03 B2 */ stb r0, 0x3b2(r30) -/* 8011DDE8 0011AD48 38 03 66 70 */ addi r0, r3, skIdentity4f@l +/* 8011DDE8 0011AD48 38 03 66 70 */ addi r0, r3, sIdentity__12CTransform4f@l /* 8011DDEC 0011AD4C 38 7E 02 E0 */ addi r3, r30, 0x2e0 /* 8011DDF0 0011AD50 88 DE 03 B2 */ lbz r6, 0x3b2(r30) /* 8011DDF4 0011AD54 50 E6 26 F6 */ rlwimi r6, r7, 4, 0x1b, 0x1b @@ -1303,7 +1303,7 @@ lbl_8011E408: /* 8011E42C 0011B38C 40 82 00 44 */ bne lbl_8011E470 lbl_8011E430: /* 8011E430 0011B390 38 01 00 24 */ addi r0, r1, 0x24 -/* 8011E434 0011B394 89 22 CC 40 */ lbz r9, lbl_805AE960@sda21(r2) +/* 8011E434 0011B394 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2) /* 8011E438 0011B398 90 01 00 08 */ stw r0, 8(r1) /* 8011E43C 0011B39C 38 7E 03 4C */ addi r3, r30, 0x34c /* 8011E440 0011B3A0 38 9E 03 AC */ addi r4, r30, 0x3ac @@ -1368,7 +1368,7 @@ lbl_8011E4FC: /* 8011E510 0011B470 38 9E 03 AC */ addi r4, r30, 0x3ac /* 8011E514 0011B474 93 A1 00 0C */ stw r29, 0xc(r1) /* 8011E518 0011B478 39 41 00 18 */ addi r10, r1, 0x18 -/* 8011E51C 0011B47C 89 22 CC 40 */ lbz r9, lbl_805AE960@sda21(r2) +/* 8011E51C 0011B47C 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2) /* 8011E520 0011B480 38 A0 00 00 */ li r5, 0 /* 8011E524 0011B484 93 E1 00 10 */ stw r31, 0x10(r1) /* 8011E528 0011B488 39 00 00 14 */ li r8, 0x14 @@ -1717,8 +1717,8 @@ lbl_8011E9A8: /* 8011EA08 0011B968 38 61 00 20 */ addi r3, r1, 0x20 /* 8011EA0C 0011B96C 48 00 00 0C */ b lbl_8011EA18 lbl_8011EA10: -/* 8011EA10 0011B970 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011EA14 0011B974 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8011EA10 0011B970 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011EA14 0011B974 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_8011EA18: /* 8011EA18 0011B978 C0 43 00 04 */ lfs f2, 4(r3) /* 8011EA1C 0011B97C 38 81 00 38 */ addi r4, r1, 0x38 @@ -1797,8 +1797,8 @@ lbl_8011EAD8: /* 8011EB38 0011BA98 38 61 00 08 */ addi r3, r1, 8 /* 8011EB3C 0011BA9C 48 00 00 0C */ b lbl_8011EB48 lbl_8011EB40: -/* 8011EB40 0011BAA0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8011EB44 0011BAA4 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 8011EB40 0011BAA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8011EB44 0011BAA4 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l lbl_8011EB48: /* 8011EB48 0011BAA8 C0 03 00 00 */ lfs f0, 0(r3) /* 8011EB4C 0011BAAC 3B BD 00 01 */ addi r29, r29, 1 @@ -2527,8 +2527,8 @@ lbl_8011F540: /* 8011F5A8 0011C508 38 61 00 38 */ addi r3, r1, 0x38 /* 8011F5AC 0011C50C 48 1E D1 A1 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 8011F5B0 0011C510 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 8011F5B4 0011C514 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8011F5B8 0011C518 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011F5B4 0011C514 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8011F5B8 0011C518 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8011F5BC 0011C51C 81 83 00 00 */ lwz r12, 0(r3) /* 8011F5C0 0011C520 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8011F5C4 0011C524 7D 89 03 A6 */ mtctr r12 @@ -3174,33 +3174,33 @@ __ct__11CGrappleArmFRC9CVector3f: /* 8011FEC0 0011CE20 38 80 FF FF */ li r4, -1 /* 8011FEC4 0011CE24 48 22 0F 7D */ bl __dt__6CTokenFv /* 8011FEC8 0011CE28 38 00 00 00 */ li r0, 0 -/* 8011FECC 0011CE2C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8011FECC 0011CE2C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8011FED0 0011CE30 90 1F 01 90 */ stw r0, 0x190(r31) -/* 8011FED4 0011CE34 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8011FED4 0011CE34 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8011FED8 0011CE38 38 7F 02 20 */ addi r3, r31, 0x220 /* 8011FEDC 0011CE3C 90 1F 01 94 */ stw r0, 0x194(r31) /* 8011FEE0 0011CE40 90 1F 01 98 */ stw r0, 0x198(r31) /* 8011FEE4 0011CE44 90 1F 01 9C */ stw r0, 0x19c(r31) /* 8011FEE8 0011CE48 48 1F 2C 8D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8011FEEC 0011CE4C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8011FEEC 0011CE4C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8011FEF0 0011CE50 38 7F 02 50 */ addi r3, r31, 0x250 -/* 8011FEF4 0011CE54 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011FEF4 0011CE54 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8011FEF8 0011CE58 48 1F 2C 7D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8011FEFC 0011CE5C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8011FEFC 0011CE5C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8011FF00 0011CE60 38 7F 02 80 */ addi r3, r31, 0x280 -/* 8011FF04 0011CE64 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011FF04 0011CE64 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8011FF08 0011CE68 48 1F 2C 6D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8011FF0C 0011CE6C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8011FF0C 0011CE6C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8011FF10 0011CE70 38 7F 02 B0 */ addi r3, r31, 0x2b0 -/* 8011FF14 0011CE74 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011FF14 0011CE74 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8011FF18 0011CE78 48 1F 2C 5D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8011FF1C 0011CE7C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8011FF1C 0011CE7C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8011FF20 0011CE80 38 7F 02 E0 */ addi r3, r31, 0x2e0 -/* 8011FF24 0011CE84 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8011FF24 0011CE84 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8011FF28 0011CE88 48 1F 2C 4D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8011FF2C 0011CE8C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8011FF2C 0011CE8C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8011FF30 0011CE90 3C 60 50 41 */ lis r3, 0x50415254@ha -/* 8011FF34 0011CE94 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8011FF34 0011CE94 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8011FF38 0011CE98 38 C0 00 00 */ li r6, 0 /* 8011FF3C 0011CE9C C0 27 00 00 */ lfs f1, 0(r7) /* 8011FF40 0011CEA0 38 80 00 0A */ li r4, 0xa diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index e4a70b25..cef08137 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -2087,8 +2087,8 @@ lbl_800EE988: /* 800EE9A4 000EB904 28 04 FF FF */ cmplwi r4, 0xffff /* 800EE9A8 000EB908 41 82 00 4C */ beq lbl_800EE9F4 /* 800EE9AC 000EB90C 80 BF 00 00 */ lwz r5, 0(r31) -/* 800EE9B0 000EB910 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800EE9B4 000EB914 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 800EE9B0 000EB910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800EE9B4 000EB914 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800EE9B8 000EB918 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 800EE9BC 000EB91C C0 45 00 60 */ lfs f2, 0x60(r5) /* 800EE9C0 000EB920 38 61 00 34 */ addi r3, r1, 0x34 @@ -2137,9 +2137,9 @@ lbl_800EEA08: /* 800EEA64 000EB9C4 4B F1 D8 51 */ bl "Clamp__5CMathFRCfRCfRCf" /* 800EEA68 000EB9C8 C3 E3 00 00 */ lfs f31, 0(r3) /* 800EEA6C 000EB9CC F3 E1 A0 08 */ psq_st f31, 8(r1), 1, qr2 -/* 800EEA70 000EB9D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800EEA70 000EB9D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800EEA74 000EB9D4 80 FF 00 00 */ lwz r7, 0(r31) -/* 800EEA78 000EB9D8 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800EEA78 000EB9D8 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800EEA7C 000EB9DC 88 C1 00 08 */ lbz r6, 8(r1) /* 800EEA80 000EB9E0 38 61 00 20 */ addi r3, r1, 0x20 /* 800EEA84 000EB9E4 C0 47 00 60 */ lfs f2, 0x60(r7) @@ -2171,8 +2171,8 @@ lbl_800EEAD4: /* 800EEAE4 000EBA44 28 00 00 00 */ cmplwi r0, 0 /* 800EEAE8 000EBA48 40 82 00 64 */ bne lbl_800EEB4C /* 800EEAEC 000EBA4C 80 9F 00 00 */ lwz r4, 0(r31) -/* 800EEAF0 000EBA50 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800EEAF4 000EBA54 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 800EEAF0 000EBA50 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800EEAF4 000EBA54 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800EEAF8 000EBA58 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800EEAFC 000EBA5C C0 44 00 60 */ lfs f2, 0x60(r4) /* 800EEB00 000EBA60 38 61 00 18 */ addi r3, r1, 0x18 @@ -2196,8 +2196,8 @@ lbl_800EEAD4: /* 800EEB48 000EBAA8 4B F2 26 45 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle lbl_800EEB4C: /* 800EEB4C 000EBAAC 80 DF 00 00 */ lwz r6, 0(r31) -/* 800EEB50 000EBAB0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800EEB54 000EBAB4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800EEB50 000EBAB0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800EEB54 000EBAB4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800EEB58 000EBAB8 38 81 00 38 */ addi r4, r1, 0x38 /* 800EEB5C 000EBABC C0 46 00 60 */ lfs f2, 0x60(r6) /* 800EEB60 000EBAC0 38 61 00 10 */ addi r3, r1, 0x10 @@ -2656,8 +2656,8 @@ UpdateSpiderBallElectricalEffects__10CMorphBallFv: /* 800EF178 000EC0D8 38 61 00 48 */ addi r3, r1, 0x48 /* 800EF17C 000EC0DC 38 81 00 18 */ addi r4, r1, 0x18 /* 800EF180 000EC0E0 48 22 39 F5 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 800EF184 000EC0E4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800EF188 000EC0E8 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 800EF184 000EC0E4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800EF188 000EC0E8 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 800EF18C 000EC0EC C0 61 00 54 */ lfs f3, 0x54(r1) /* 800EF190 000EC0F0 3B DD 19 E8 */ addi r30, r29, 0x19e8 /* 800EF194 000EC0F4 C0 A1 00 74 */ lfs f5, 0x74(r1) @@ -2868,16 +2868,16 @@ lbl_800EF410: /* 800EF498 000EC3F8 48 22 59 59 */ bl FastSinR__5CMathFf /* 800EF49C 000EC3FC FC 00 08 50 */ fneg f0, f1 /* 800EF4A0 000EC400 C0 42 91 C0 */ lfs f2, lbl_805AAEE0@sda21(r2) -/* 800EF4A4 000EC404 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800EF4A8 000EC408 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800EF4A4 000EC404 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800EF4A8 000EC408 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800EF4AC 000EC40C EC C2 07 B2 */ fmuls f6, f2, f30 -/* 800EF4B0 000EC410 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800EF4B0 000EC410 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800EF4B4 000EC414 EC 60 07 72 */ fmuls f3, f0, f29 /* 800EF4B8 000EC418 C0 A2 91 C4 */ lfs f5, lbl_805AAEE4@sda21(r2) /* 800EF4BC 000EC41C EC 3F 07 32 */ fmuls f1, f31, f28 /* 800EF4C0 000EC420 C0 42 91 50 */ lfs f2, lbl_805AAE70@sda21(r2) /* 800EF4C4 000EC424 EC 1F 06 F2 */ fmuls f0, f31, f27 -/* 800EF4C8 000EC428 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800EF4C8 000EC428 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800EF4CC 000EC42C EC 9F 00 F2 */ fmuls f4, f31, f3 /* 800EF4D0 000EC430 C0 62 91 C8 */ lfs f3, lbl_805AAEE8@sda21(r2) /* 800EF4D4 000EC434 EC 25 00 72 */ fmuls f1, f5, f1 @@ -3480,10 +3480,10 @@ lbl_800EFD68: /* 800EFD8C 000ECCEC 38 00 00 03 */ li r0, 3 /* 800EFD90 000ECCF0 90 81 00 3C */ stw r4, 0x3c(r1) /* 800EFD94 000ECCF4 3C A0 80 47 */ lis r5, lbl_8046C504@ha -/* 800EFD98 000ECCF8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800EFD98 000ECCF8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800EFD9C 000ECCFC 90 61 00 38 */ stw r3, 0x38(r1) /* 800EFDA0 000ECD00 38 E5 C5 04 */ addi r7, r5, lbl_8046C504@l -/* 800EFDA4 000ECD04 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 800EFDA4 000ECD04 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 800EFDA8 000ECD08 7F E3 FB 78 */ mr r3, r31 /* 800EFDAC 000ECD0C 90 C1 00 44 */ stw r6, 0x44(r1) /* 800EFDB0 000ECD10 38 81 00 14 */ addi r4, r1, 0x14 @@ -3882,11 +3882,11 @@ lbl_800F01D8: /* 800F034C 000ED2AC 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 800F0350 000ED2B0 C0 81 00 EC */ lfs f4, 0xec(r1) /* 800F0354 000ED2B4 C0 61 00 F0 */ lfs f3, 0xf0(r1) -/* 800F0358 000ED2B8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800F0358 000ED2B8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800F035C 000ED2BC C0 41 00 F4 */ lfs f2, 0xf4(r1) /* 800F0360 000ED2C0 3C 60 80 5A */ lis r3, lbl_8059FD18@ha /* 800F0364 000ED2C4 C0 21 00 F8 */ lfs f1, 0xf8(r1) -/* 800F0368 000ED2C8 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 800F0368 000ED2C8 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 800F036C 000ED2CC C0 01 00 FC */ lfs f0, 0xfc(r1) /* 800F0370 000ED2D0 38 C3 FD 18 */ addi r6, r3, lbl_8059FD18@l /* 800F0374 000ED2D4 90 01 01 30 */ stw r0, 0x130(r1) @@ -4001,9 +4001,9 @@ lbl_800F049C: /* 800F0520 000ED480 D0 A1 00 30 */ stfs f5, 0x30(r1) /* 800F0524 000ED484 D0 61 00 34 */ stfs f3, 0x34(r1) /* 800F0528 000ED488 4B F2 B0 19 */ bl FromVector__10CAxisAngleFRC9CVector3f -/* 800F052C 000ED48C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F052C 000ED48C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F0530 000ED490 80 7D 00 00 */ lwz r3, 0(r29) -/* 800F0534 000ED494 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800F0534 000ED494 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800F0538 000ED498 38 A1 00 38 */ addi r5, r1, 0x38 /* 800F053C 000ED49C 48 02 BE 5D */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle lbl_800F0540: @@ -4637,8 +4637,8 @@ lbl_800F0DE4: /* 800F0E34 000EDD94 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F0E38 000EDD98 40 80 00 58 */ bge lbl_800F0E90 /* 800F0E3C 000EDD9C D0 DD 1E 08 */ stfs f6, 0x1e08(r29) -/* 800F0E40 000EDDA0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F0E44 000EDDA4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800F0E40 000EDDA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F0E44 000EDDA4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800F0E48 000EDDA8 C0 22 92 40 */ lfs f1, lbl_805AAF60@sda21(r2) /* 800F0E4C 000EDDAC C0 1D 1E 18 */ lfs f0, 0x1e18(r29) /* 800F0E50 000EDDB0 38 7D 1E 08 */ addi r3, r29, 0x1e08 @@ -5213,9 +5213,9 @@ BallCloseToCollision__10CMorphBallCFRC13CStateManagerfRC15CMaterialFilter: /* 800F1670 000EE5D0 38 81 00 F8 */ addi r4, r1, 0xf8 /* 800F1674 000EE5D4 38 C1 00 20 */ addi r6, r1, 0x20 /* 800F1678 000EE5D8 4B F5 B0 85 */ bl "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" -/* 800F167C 000EE5DC 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800F167C 000EE5DC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800F1680 000EE5E0 7F A3 EB 78 */ mr r3, r29 -/* 800F1684 000EE5E4 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 800F1684 000EE5E4 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 800F1688 000EE5E8 7F C6 F3 78 */ mr r6, r30 /* 800F168C 000EE5EC 38 81 00 38 */ addi r4, r1, 0x38 /* 800F1690 000EE5F0 48 09 1D 11 */ bl DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter @@ -5291,9 +5291,9 @@ lbl_800F1724: /* 800F1790 000EE6F0 38 81 00 58 */ addi r4, r1, 0x58 /* 800F1794 000EE6F4 48 22 13 E1 */ bl __ct__12CTransform4fFRC12CTransform4f /* 800F1798 000EE6F8 38 01 00 38 */ addi r0, r1, 0x38 -/* 800F179C 000EE6FC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800F179C 000EE6FC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800F17A0 000EE700 90 01 00 C0 */ stw r0, 0xc0(r1) -/* 800F17A4 000EE704 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800F17A4 000EE704 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800F17A8 000EE708 7F 63 DB 78 */ mr r3, r27 /* 800F17AC 000EE70C 93 C1 00 C4 */ stw r30, 0xc4(r1) /* 800F17B0 000EE710 48 22 13 C5 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -5410,8 +5410,8 @@ DisableHalfPipeStatus__10CMorphBallFv: /* 800F1934 000EE894 D0 1F 1E 00 */ stfs f0, 0x1e00(r31) /* 800F1938 000EE898 80 7F 00 00 */ lwz r3, 0(r31) /* 800F193C 000EE89C 48 02 8B 95 */ bl SetCollisionAccuracyModifier__13CPhysicsActorFf -/* 800F1940 000EE8A0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F1944 000EE8A4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800F1940 000EE8A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F1944 000EE8A4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800F1948 000EE8A8 D0 1F 1E 08 */ stfs f0, 0x1e08(r31) /* 800F194C 000EE8AC C0 03 00 04 */ lfs f0, 4(r3) /* 800F1950 000EE8B0 D0 1F 1E 0C */ stfs f0, 0x1e0c(r31) @@ -5546,8 +5546,8 @@ lbl_800F1AA8: /* 800F1AEC 000EEA4C 4B FF FE C9 */ bl GetIsInHalfPipeModeInAir__10CMorphBallCFv /* 800F1AF0 000EEA50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1AF4 000EEA54 41 82 00 50 */ beq lbl_800F1B44 -/* 800F1AF8 000EEA58 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F1AFC 000EEA5C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800F1AF8 000EEA58 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F1AFC 000EEA5C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800F1B00 000EEA60 D0 1F 1E 08 */ stfs f0, 0x1e08(r31) /* 800F1B04 000EEA64 C0 03 00 04 */ lfs f0, 4(r3) /* 800F1B08 000EEA68 D0 1F 1E 0C */ stfs f0, 0x1e0c(r31) @@ -6907,11 +6907,11 @@ PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes: /* 800F2ED4 000EFE34 98 1E 02 98 */ stb r0, 0x298(r30) /* 800F2ED8 000EFE38 3C A0 80 3E */ lis r5, lbl_803D97E4@ha /* 800F2EDC 000EFE3C 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F2EE0 000EFE40 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F2EE0 000EFE40 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F2EE4 000EFE44 D0 1E 02 D0 */ stfs f0, 0x2d0(r30) /* 800F2EE8 000EFE48 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F2EEC 000EFE4C 38 E0 00 01 */ li r7, 1 -/* 800F2EF0 000EFE50 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 800F2EF0 000EFE50 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 800F2EF4 000EFE54 88 DE 02 98 */ lbz r6, 0x298(r30) /* 800F2EF8 000EFE58 50 E6 3E 30 */ rlwimi r6, r7, 7, 0x18, 0x18 /* 800F2EFC 000EFE5C 38 A5 97 E4 */ addi r5, r5, lbl_803D97E4@l @@ -7005,11 +7005,11 @@ lbl_800F3020: /* 800F3058 000EFFB8 90 01 00 80 */ stw r0, 0x80(r1) /* 800F305C 000EFFBC 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 800F3060 000EFFC0 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l -/* 800F3064 000EFFC4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F3064 000EFFC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F3068 000EFFC8 80 BC 00 40 */ lwz r5, 0x40(r28) /* 800F306C 000EFFCC 7F 84 E3 78 */ mr r4, r28 /* 800F3070 000EFFD0 80 DC 00 44 */ lwz r6, 0x44(r28) -/* 800F3074 000EFFD4 C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 800F3074 000EFFD4 C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 800F3078 000EFFD8 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800F307C 000EFFDC 90 C1 00 8C */ stw r6, 0x8c(r1) /* 800F3080 000EFFE0 90 A1 00 88 */ stw r5, 0x88(r1) @@ -7396,8 +7396,8 @@ ApplyFriction__10CMorphBallFf: /* 800F35E0 000F0540 D0 01 00 18 */ stfs f0, 0x18(r1) /* 800F35E4 000F0544 48 00 00 20 */ b lbl_800F3604 lbl_800F35E8: -/* 800F35E8 000F0548 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F35EC 000F054C C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 800F35E8 000F0548 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F35EC 000F054C C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 800F35F0 000F0550 C0 23 00 04 */ lfs f1, 4(r3) /* 800F35F4 000F0554 C0 03 00 08 */ lfs f0, 8(r3) /* 800F35F8 000F0558 D0 41 00 14 */ stfs f2, 0x14(r1) @@ -8469,8 +8469,8 @@ lbl_800F450C: /* 800F458C 000F14EC 4C 41 13 82 */ cror 2, 1, 2 /* 800F4590 000F14F0 40 82 00 48 */ bne lbl_800F45D8 /* 800F4594 000F14F4 80 9E 00 00 */ lwz r4, 0(r30) -/* 800F4598 000F14F8 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F459C 000F14FC 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 800F4598 000F14F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F459C 000F14FC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800F45A0 000F1500 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800F45A4 000F1504 C0 44 00 60 */ lfs f2, 0x60(r4) /* 800F45A8 000F1508 38 61 00 08 */ addi r3, r1, 8 @@ -8525,9 +8525,9 @@ lbl_800F462C: /* 800F4660 000F15C0 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 800F4664 000F15C4 D0 21 00 64 */ stfs f1, 0x64(r1) /* 800F4668 000F15C8 4B F2 6E D9 */ bl FromVector__10CAxisAngleFRC9CVector3f -/* 800F466C 000F15CC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F466C 000F15CC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F4670 000F15D0 80 7E 00 00 */ lwz r3, 0(r30) -/* 800F4674 000F15D4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800F4674 000F15D4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800F4678 000F15D8 38 A1 00 68 */ addi r5, r1, 0x68 /* 800F467C 000F15DC 48 02 7D 1D */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 800F4680 000F15E0 7F C3 F3 78 */ mr r3, r30 @@ -8542,9 +8542,9 @@ lbl_800F468C: /* 800F46A0 000F1600 38 61 00 80 */ addi r3, r1, 0x80 /* 800F46A4 000F1604 48 00 20 51 */ bl GetBallToWorld__10CMorphBallCFv /* 800F46A8 000F1608 80 9E 00 00 */ lwz r4, 0(r30) -/* 800F46AC 000F160C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800F46AC 000F160C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800F46B0 000F1610 C0 A1 00 A4 */ lfs f5, 0xa4(r1) -/* 800F46B4 000F1614 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800F46B4 000F1614 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800F46B8 000F1618 C0 E4 00 60 */ lfs f7, 0x60(r4) /* 800F46BC 000F161C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 800F46C0 000F1620 C0 01 00 94 */ lfs f0, 0x94(r1) @@ -8600,9 +8600,9 @@ lbl_800F468C: /* 800F4788 000F16E8 D0 01 00 14 */ stfs f0, 0x14(r1) /* 800F478C 000F16EC D0 21 00 1C */ stfs f1, 0x1c(r1) /* 800F4790 000F16F0 4B F2 6D B1 */ bl FromVector__10CAxisAngleFRC9CVector3f -/* 800F4794 000F16F4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F4794 000F16F4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F4798 000F16F8 80 7E 00 00 */ lwz r3, 0(r30) -/* 800F479C 000F16FC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800F479C 000F16FC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800F47A0 000F1700 38 A1 00 20 */ addi r5, r1, 0x20 /* 800F47A4 000F1704 48 02 7B F5 */ bl ApplyImpulseWR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle /* 800F47A8 000F1708 7F C3 F3 78 */ mr r3, r30 @@ -8995,8 +8995,8 @@ lbl_800F4D34: /* 800F4D80 000F1CE0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 800F4D84 000F1CE4 41 82 00 8C */ beq lbl_800F4E10 /* 800F4D88 000F1CE8 80 FD 00 00 */ lwz r7, 0(r29) -/* 800F4D8C 000F1CEC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 800F4D90 000F1CF0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800F4D8C 000F1CEC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 800F4D90 000F1CF0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800F4D94 000F1CF4 38 81 00 9C */ addi r4, r1, 0x9c /* 800F4D98 000F1CF8 C0 A7 00 60 */ lfs f5, 0x60(r7) /* 800F4D9C 000F1CFC 38 61 01 50 */ addi r3, r1, 0x150 @@ -10039,11 +10039,11 @@ UpdateBallDynamics__10CMorphBallFR13CStateManagerf: /* 800F5C68 000F2BC8 93 E1 01 9C */ stw r31, 0x19c(r1) /* 800F5C6C 000F2BCC 93 C1 01 98 */ stw r30, 0x198(r1) /* 800F5C70 000F2BD0 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) -/* 800F5C74 000F2BD4 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 800F5C74 000F2BD4 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 800F5C78 000F2BD8 FF E0 08 90 */ fmr f31, f1 /* 800F5C7C 000F2BDC 7C 7E 1B 78 */ mr r30, r3 /* 800F5C80 000F2BE0 D0 01 00 54 */ stfs f0, 0x54(r1) -/* 800F5C84 000F2BE4 38 05 66 70 */ addi r0, r5, skIdentity4f@l +/* 800F5C84 000F2BE4 38 05 66 70 */ addi r0, r5, sIdentity__12CTransform4f@l /* 800F5C88 000F2BE8 7C 9F 23 78 */ mr r31, r4 /* 800F5C8C 000F2BEC 38 61 01 50 */ addi r3, r1, 0x150 /* 800F5C90 000F2BF0 D0 01 00 58 */ stfs f0, 0x58(r1) @@ -10757,9 +10757,9 @@ CalculateSurfaceToWorld__10CMorphBallCFRC9CVector3fRC9CVector3fRC9CVector3f: /* 800F66BC 000F361C 48 21 C7 A1 */ bl __ct__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f_0 /* 800F66C0 000F3620 48 00 00 14 */ b lbl_800F66D4 lbl_800F66C4: -/* 800F66C4 000F3624 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800F66C4 000F3624 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800F66C8 000F3628 7F 83 E3 78 */ mr r3, r28 -/* 800F66CC 000F362C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800F66CC 000F362C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800F66D0 000F3630 48 21 C4 A5 */ bl __ct__12CTransform4fFRC12CTransform4f lbl_800F66D4: /* 800F66D4 000F3634 80 01 00 74 */ lwz r0, 0x74(r1) @@ -10898,8 +10898,8 @@ ComputeMarioMovement__10CMorphBallFRC11CFinalInputR13CStateManagerf: /* 800F68C4 000F3824 93 E1 01 7C */ stw r31, 0x17c(r1) /* 800F68C8 000F3828 93 C1 01 78 */ stw r30, 0x178(r1) /* 800F68CC 000F382C 93 A1 01 74 */ stw r29, 0x174(r1) -/* 800F68D0 000F3830 3C C0 80 5A */ lis r6, skZero3f@ha -/* 800F68D4 000F3834 C4 06 66 A0 */ lfsu f0, skZero3f@l(r6) +/* 800F68D0 000F3830 3C C0 80 5A */ lis r6, sZeroVector__9CVector3f@ha +/* 800F68D4 000F3834 C4 06 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r6) /* 800F68D8 000F3838 FF 60 08 90 */ fmr f27, f1 /* 800F68DC 000F383C 7C 7E 1B 78 */ mr r30, r3 /* 800F68E0 000F3840 D0 03 00 1C */ stfs f0, 0x1c(r3) @@ -11004,13 +11004,13 @@ lbl_800F6A1C: /* 800F6A58 000F39B8 38 63 01 38 */ addi r3, r3, 0x138 /* 800F6A5C 000F39BC 48 21 DE 5D */ bl Magnitude__9CVector3fCFv /* 800F6A60 000F39C0 C3 82 91 50 */ lfs f28, lbl_805AAE70@sda21(r2) -/* 800F6A64 000F39C4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F6A64 000F39C4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F6A68 000F39C8 80 BE 00 00 */ lwz r5, 0(r30) -/* 800F6A6C 000F39CC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800F6A6C 000F39CC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800F6A70 000F39D0 FF E0 08 90 */ fmr f31, f1 -/* 800F6A74 000F39D4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800F6A74 000F39D4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800F6A78 000F39D8 FF 60 E0 90 */ fmr f27, f28 -/* 800F6A7C 000F39DC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800F6A7C 000F39DC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800F6A80 000F39E0 38 61 01 04 */ addi r3, r1, 0x104 /* 800F6A84 000F39E4 38 A5 05 4C */ addi r5, r5, 0x54c /* 800F6A88 000F39E8 48 21 D0 89 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -11861,10 +11861,10 @@ FindClosestSpiderBallWaypoint__10CMorphBallCFR13CStateManagerRC9CVector3fR9CVect /* 800F76BC 000F461C 38 E0 00 00 */ li r7, 0 /* 800F76C0 000F4620 4B F5 50 61 */ bl "BuildNearList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CAABoxRC15CMaterialFilterPC6CActor" /* 800F76C4 000F4624 3B 61 02 84 */ addi r27, r1, 0x284 -/* 800F76C8 000F4628 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F76C8 000F4628 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F76CC 000F462C 7F 72 DB 78 */ mr r18, r27 /* 800F76D0 000F4630 3A 61 00 F8 */ addi r19, r1, 0xf8 -/* 800F76D4 000F4634 3A 83 66 A0 */ addi r20, r3, skZero3f@l +/* 800F76D4 000F4634 3A 83 66 A0 */ addi r20, r3, sZeroVector__9CVector3f@l /* 800F76D8 000F4638 48 00 02 EC */ b lbl_800F79C4 lbl_800F76DC: /* 800F76DC 000F463C A0 12 00 00 */ lhz r0, 0(r18) @@ -11901,9 +11901,9 @@ lbl_800F76DC: /* 800F7758 000F46B8 D0 01 00 74 */ stfs f0, 0x74(r1) /* 800F775C 000F46BC 48 21 C6 75 */ bl __ct__13CUnitVector3fFRC9CVector3f /* 800F7760 000F46C0 C0 31 00 50 */ lfs f1, 0x50(r17) -/* 800F7764 000F46C4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F7764 000F46C4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F7768 000F46C8 C1 01 00 7C */ lfs f8, 0x7c(r1) -/* 800F776C 000F46CC 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800F776C 000F46CC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800F7770 000F46D0 C0 02 92 EC */ lfs f0, lbl_805AB00C@sda21(r2) /* 800F7774 000F46D4 38 61 00 60 */ addi r3, r1, 0x60 /* 800F7778 000F46D8 EC 21 02 32 */ fmuls f1, f1, f8 @@ -12074,9 +12074,9 @@ lbl_800F79E0: /* 800F7A00 000F4960 80 63 00 04 */ lwz r3, 4(r3) /* 800F7A04 000F4964 28 03 00 00 */ cmplwi r3, 0 /* 800F7A08 000F4968 41 82 01 50 */ beq lbl_800F7B58 -/* 800F7A0C 000F496C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F7A0C 000F496C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F7A10 000F4970 C0 74 00 04 */ lfs f3, 4(r20) -/* 800F7A14 000F4974 C0 44 66 A0 */ lfs f2, skZero3f@l(r4) +/* 800F7A14 000F4974 C0 44 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r4) /* 800F7A18 000F4978 38 00 00 00 */ li r0, 0 /* 800F7A1C 000F497C C0 14 00 08 */ lfs f0, 8(r20) /* 800F7A20 000F4980 7F 84 E3 78 */ mr r4, r28 @@ -12226,13 +12226,13 @@ lbl_800F7C28: /* 800F7C38 000F4B98 88 1E 18 BE */ lbz r0, 0x18be(r30) /* 800F7C3C 000F4B9C 28 00 00 00 */ cmplwi r0, 0 /* 800F7C40 000F4BA0 41 82 00 E0 */ beq lbl_800F7D20 -/* 800F7C44 000F4BA4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F7C44 000F4BA4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F7C48 000F4BA8 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) -/* 800F7C4C 000F4BAC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800F7C4C 000F4BAC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800F7C50 000F4BB0 C0 25 00 00 */ lfs f1, 0(r5) -/* 800F7C54 000F4BB4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800F7C54 000F4BB4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800F7C58 000F4BB8 C0 45 00 04 */ lfs f2, 4(r5) -/* 800F7C5C 000F4BBC 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800F7C5C 000F4BBC 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800F7C60 000F4BC0 C0 65 00 08 */ lfs f3, 8(r5) /* 800F7C64 000F4BC4 38 61 00 84 */ addi r3, r1, 0x84 /* 800F7C68 000F4BC8 D0 21 00 48 */ stfs f1, 0x48(r1) @@ -12486,8 +12486,8 @@ lbl_800F7FE0: /* 800F8004 000F4F64 3B E0 00 00 */ li r31, 0 lbl_800F8008: /* 800F8008 000F4F68 88 1C 18 BD */ lbz r0, 0x18bd(r28) -/* 800F800C 000F4F6C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800F8010 000F4F70 C7 63 66 A0 */ lfsu f27, skZero3f@l(r3) +/* 800F800C 000F4F6C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800F8010 000F4F70 C7 63 66 A0 */ lfsu f27, sZeroVector__9CVector3f@l(r3) /* 800F8014 000F4F74 28 00 00 00 */ cmplwi r0, 0 /* 800F8018 000F4F78 C3 83 00 04 */ lfs f28, 4(r3) /* 800F801C 000F4F7C C3 23 00 08 */ lfs f25, 8(r3) @@ -14014,10 +14014,10 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9584 000F64E4 F3 E1 01 58 */ psq_st f31, 344(r1), 0, qr0 /* 800F9588 000F64E8 BF 41 01 38 */ stmw r26, 0x138(r1) /* 800F958C 000F64EC 7C 7F 1B 78 */ mr r31, r3 -/* 800F9590 000F64F0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800F9590 000F64F0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F9594 000F64F4 90 9F 00 00 */ stw r4, 0(r31) /* 800F9598 000F64F8 38 80 FF FF */ li r4, -1 -/* 800F959C 000F64FC 3B C3 66 A0 */ addi r30, r3, skZero3f@l +/* 800F959C 000F64FC 3B C3 66 A0 */ addi r30, r3, sZeroVector__9CVector3f@l /* 800F95A0 000F6500 FF E0 08 90 */ fmr f31, f1 /* 800F95A4 000F6504 90 9F 00 04 */ stw r4, 4(r31) /* 800F95A8 000F6508 38 00 00 00 */ li r0, 0 @@ -14126,17 +14126,17 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F9744 000F66A4 38 61 00 EC */ addi r3, r1, 0xec /* 800F9748 000F66A8 48 24 43 99 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 800F974C 000F66AC 38 C0 00 00 */ li r6, 0 -/* 800F9750 000F66B0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800F9750 000F66B0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800F9754 000F66B4 90 DF 00 74 */ stw r6, 0x74(r31) -/* 800F9758 000F66B8 38 83 66 70 */ addi r4, r3, skIdentity4f@l -/* 800F975C 000F66BC 3C A0 80 5A */ lis r5, skZero3f@ha +/* 800F9758 000F66B8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l +/* 800F975C 000F66BC 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 800F9760 000F66C0 C0 22 91 5C */ lfs f1, lbl_805AAE7C@sda21(r2) /* 800F9764 000F66C4 90 DF 0C 78 */ stw r6, 0xc78(r31) /* 800F9768 000F66C8 38 00 00 01 */ li r0, 1 /* 800F976C 000F66CC C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F9770 000F66D0 38 7F 18 C4 */ addi r3, r31, 0x18c4 /* 800F9774 000F66D4 90 DF 18 7C */ stw r6, 0x187c(r31) -/* 800F9778 000F66D8 C4 45 66 A0 */ lfsu f2, skZero3f@l(r5) +/* 800F9778 000F66D8 C4 45 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r5) /* 800F977C 000F66DC D0 5F 18 80 */ stfs f2, 0x1880(r31) /* 800F9780 000F66E0 C0 5E 00 04 */ lfs f2, 4(r30) /* 800F9784 000F66E4 D0 5F 18 84 */ stfs f2, 0x1884(r31) @@ -14180,8 +14180,8 @@ __ct__10CMorphBallFR7CPlayerf: /* 800F981C 000F677C D0 3F 19 08 */ stfs f1, 0x1908(r31) /* 800F9820 000F6780 48 21 A9 E1 */ bl __ct__9CVector2fFff /* 800F9824 000F6784 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) -/* 800F9828 000F6788 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800F982C 000F678C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800F9828 000F6788 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800F982C 000F678C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800F9830 000F6790 38 00 00 00 */ li r0, 0 /* 800F9834 000F6794 D0 1F 19 14 */ stfs f0, 0x1914(r31) /* 800F9838 000F6798 38 7F 19 24 */ addi r3, r31, 0x1924 @@ -14625,9 +14625,9 @@ lbl_800F9EAC: /* 800F9EC4 000F6E24 48 21 B9 A9 */ bl __nw__FUlPCcPCc /* 800F9EC8 000F6E28 7C 60 1B 79 */ or. r0, r3, r3 /* 800F9ECC 000F6E2C 41 82 00 4C */ beq lbl_800F9F18 -/* 800F9ED0 000F6E30 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800F9ED0 000F6E30 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800F9ED4 000F6E34 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 800F9ED8 000F6E38 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 800F9ED8 000F6E38 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 800F9EDC 000F6E3C 38 A1 00 E0 */ addi r5, r1, 0xe0 /* 800F9EE0 000F6E40 81 07 00 00 */ lwz r8, 0(r7) /* 800F9EE4 000F6E44 38 80 00 08 */ li r4, 8 @@ -14715,8 +14715,8 @@ lbl_800FA014: /* 800FA014 000F6F74 38 DF 1C 90 */ addi r6, r31, 0x1c90 /* 800FA018 000F6F78 38 00 00 00 */ li r0, 0 /* 800FA01C 000F6F7C 90 1F 1C 90 */ stw r0, 0x1c90(r31) -/* 800FA020 000F6F80 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FA024 000F6F84 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 800FA020 000F6F80 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FA024 000F6F84 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 800FA028 000F6F88 80 9F 1C 90 */ lwz r4, 0x1c90(r31) /* 800FA02C 000F6F8C 2C 04 00 05 */ cmpwi r4, 5 /* 800FA030 000F6F90 40 80 00 50 */ bge lbl_800FA080 @@ -14771,8 +14771,8 @@ lbl_800FA0D4: /* 800FA0D4 000F7034 38 DF 1D 10 */ addi r6, r31, 0x1d10 /* 800FA0D8 000F7038 38 00 00 00 */ li r0, 0 /* 800FA0DC 000F703C 90 1F 1D 10 */ stw r0, 0x1d10(r31) -/* 800FA0E0 000F7040 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FA0E4 000F7044 38 63 66 A0 */ addi r3, r3, skZero3f@l +/* 800FA0E0 000F7040 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FA0E4 000F7044 38 63 66 A0 */ addi r3, r3, sZeroVector__9CVector3f@l /* 800FA0E8 000F7048 80 9F 1D 10 */ lwz r4, 0x1d10(r31) /* 800FA0EC 000F704C 2C 04 00 0F */ cmpwi r4, 0xf /* 800FA0F0 000F7050 40 80 00 50 */ bge lbl_800FA140 @@ -14800,9 +14800,9 @@ lbl_800FA138: /* 800FA13C 000F709C 90 06 00 00 */ stw r0, 0(r6) lbl_800FA140: /* 800FA140 000F70A0 38 E0 00 00 */ li r7, 0 -/* 800FA144 000F70A4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800FA144 000F70A4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800FA148 000F70A8 90 FF 1D C8 */ stw r7, 0x1dc8(r31) -/* 800FA14C 000F70AC 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 800FA14C 000F70AC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800FA150 000F70B0 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 800FA154 000F70B4 38 A0 00 01 */ li r5, 1 /* 800FA158 000F70B8 C0 06 00 00 */ lfs f0, 0(r6) diff --git a/asm/MetroidPrime/Player/CMorphBallShadow.s b/asm/MetroidPrime/Player/CMorphBallShadow.s index 8627f4b1..b9e833a9 100644 --- a/asm/MetroidPrime/Player/CMorphBallShadow.s +++ b/asm/MetroidPrime/Player/CMorphBallShadow.s @@ -191,9 +191,9 @@ lbl_80295D78: /* 80295D94 00292CF4 FC 40 08 90 */ fmr f2, f1 /* 80295D98 00292CF8 FC 60 08 90 */ fmr f3, f1 /* 80295D9C 00292CFC 48 0C D6 51 */ bl __ct__6CColorFffff -/* 80295DA0 00292D00 3C 80 80 5A */ lis r4, lbl_805A6700@ha +/* 80295DA0 00292D00 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha /* 80295DA4 00292D04 7C 65 1B 78 */ mr r5, r3 -/* 80295DA8 00292D08 38 84 67 00 */ addi r4, r4, lbl_805A6700@l +/* 80295DA8 00292D08 38 84 67 00 */ addi r4, r4, sDownVector__9CVector3f@l /* 80295DAC 00292D0C 38 61 02 00 */ addi r3, r1, 0x200 /* 80295DB0 00292D10 48 07 06 BD */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 80295DB4 00292D14 38 61 02 50 */ addi r3, r1, 0x250 @@ -470,8 +470,8 @@ lbl_802961C8: /* 802961DC 0029313C 38 A0 00 00 */ li r5, 0 /* 802961E0 00293140 48 0E 62 B1 */ bl GXLoadTexMtxImm /* 802961E4 00293144 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 802961E8 00293148 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 802961EC 0029314C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802961E8 00293148 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 802961EC 0029314C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802961F0 00293150 81 83 00 00 */ lwz r12, 0(r3) /* 802961F4 00293154 81 8C 00 30 */ lwz r12, 0x30(r12) /* 802961F8 00293158 7D 89 03 A6 */ mtctr r12 @@ -609,17 +609,17 @@ lbl_802963B0: /* 802963D8 00293338 88 03 00 00 */ lbz r0, 0(r3) /* 802963DC 0029333C 3C 80 80 3F */ lis r4, lbl_803ED910@ha /* 802963E0 00293340 3A C4 D9 10 */ addi r22, r4, lbl_803ED910@l -/* 802963E4 00293344 3C A0 80 5A */ lis r5, lbl_805A6700@ha +/* 802963E4 00293344 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha /* 802963E8 00293348 98 01 00 94 */ stb r0, 0x94(r1) -/* 802963EC 0029334C 3C 80 80 5A */ lis r4, lbl_805A6718@ha +/* 802963EC 0029334C 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha /* 802963F0 00293350 81 96 00 00 */ lwz r12, 0(r22) -/* 802963F4 00293354 3C C0 80 5A */ lis r6, lbl_805A6724@ha +/* 802963F4 00293354 3C C0 80 5A */ lis r6, sForwardVector__9CVector3f@ha /* 802963F8 00293358 C0 03 00 04 */ lfs f0, 4(r3) -/* 802963FC 0029335C 38 84 67 18 */ addi r4, r4, lbl_805A6718@l +/* 802963FC 0029335C 38 84 67 18 */ addi r4, r4, sRightVector__9CVector3f@l /* 80296400 00293360 81 76 00 04 */ lwz r11, 4(r22) -/* 80296404 00293364 38 A5 67 00 */ addi r5, r5, lbl_805A6700@l +/* 80296404 00293364 38 A5 67 00 */ addi r5, r5, sDownVector__9CVector3f@l /* 80296408 00293368 D0 01 00 98 */ stfs f0, 0x98(r1) -/* 8029640C 0029336C 38 C6 67 24 */ addi r6, r6, lbl_805A6724@l +/* 8029640C 0029336C 38 C6 67 24 */ addi r6, r6, sForwardVector__9CVector3f@l /* 80296410 00293370 81 56 00 08 */ lwz r10, 8(r22) /* 80296414 00293374 38 E1 00 60 */ addi r7, r1, 0x60 /* 80296418 00293378 C0 03 00 08 */ lfs f0, 8(r3) @@ -659,8 +659,8 @@ lbl_802963B0: /* 802964A0 00293400 38 61 01 70 */ addi r3, r1, 0x170 /* 802964A4 00293404 38 81 01 10 */ addi r4, r1, 0x110 /* 802964A8 00293408 48 07 C6 CD */ bl __ct__12CTransform4fFRC12CTransform4f -/* 802964AC 0029340C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802964B0 00293410 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802964AC 0029340C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802964B0 00293410 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802964B4 00293414 48 07 61 2D */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 802964B8 00293418 C0 22 BF 9C */ lfs f1, lbl_805ADCBC@sda21(r2) /* 802964BC 0029341C C0 42 BF A0 */ lfs f2, lbl_805ADCC0@sda21(r2) @@ -721,8 +721,8 @@ lbl_802963B0: /* 80296598 002934F8 48 07 22 E5 */ bl SetZMode__3CGXFb10_GXCompareb /* 8029659C 002934FC 38 60 00 00 */ li r3, 0 /* 802965A0 00293500 48 07 54 D1 */ bl SetCullMode__9CGraphicsF12ERglCullMode -/* 802965A4 00293504 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802965A8 00293508 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 802965A4 00293504 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802965A8 00293508 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 802965AC 0029350C 48 07 61 A1 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 802965B0 00293510 38 60 00 07 */ li r3, 7 /* 802965B4 00293514 38 80 00 00 */ li r4, 0 @@ -913,8 +913,8 @@ lbl_8029686C: /* 80296880 002937E0 2C 17 00 40 */ cmpwi r23, 0x40 /* 80296884 002937E4 41 80 FE A4 */ blt lbl_80296728 lbl_80296888: -/* 80296888 002937E8 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8029688C 002937EC 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 80296888 002937E8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8029688C 002937EC 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80296890 002937F0 48 07 5D 51 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 80296894 002937F4 7F 63 DB 78 */ mr r3, r27 /* 80296898 002937F8 7F C5 F3 78 */ mr r5, r30 @@ -1138,8 +1138,8 @@ lbl_80296B1C: /* 80296BC0 00293B20 38 7C 00 A8 */ addi r3, r28, 0xa8 /* 80296BC4 00293B24 48 0A A2 E5 */ bl __ct__6CTokenFRC6CToken /* 80296BC8 00293B28 93 BC 00 B0 */ stw r29, 0xb0(r28) -/* 80296BCC 00293B2C 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 80296BD0 00293B30 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 80296BCC 00293B2C 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 80296BD0 00293B30 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 80296BD4 00293B34 38 00 00 00 */ li r0, 0 /* 80296BD8 00293B38 93 DC 00 B4 */ stw r30, 0xb4(r28) /* 80296BDC 00293B3C 38 7C 00 A8 */ addi r3, r28, 0xa8 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 1bede048..bbbd9db3 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -2243,9 +2243,9 @@ lbl_800112F8: /* 800113E0 0000E340 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 800113E4 0000E344 38 C1 00 78 */ addi r6, r1, 0x78 /* 800113E8 0000E348 48 03 B3 15 */ bl "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" -/* 800113EC 0000E34C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800113EC 0000E34C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800113F0 0000E350 7F E3 FB 78 */ mr r3, r31 -/* 800113F4 0000E354 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 800113F4 0000E354 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 800113F8 0000E358 38 C1 01 00 */ addi r6, r1, 0x100 /* 800113FC 0000E35C 38 81 00 E0 */ addi r4, r1, 0xe0 /* 80011400 0000E360 48 17 1F A1 */ bl DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter @@ -2291,9 +2291,9 @@ lbl_80011428: /* 80011498 0000E3F8 48 30 16 DD */ bl __ct__12CTransform4fFRC12CTransform4f /* 8001149C 0000E3FC 38 81 00 E0 */ addi r4, r1, 0xe0 /* 800114A0 0000E400 38 01 01 00 */ addi r0, r1, 0x100 -/* 800114A4 0000E404 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800114A4 0000E404 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800114A8 0000E408 90 81 01 80 */ stw r4, 0x180(r1) -/* 800114AC 0000E40C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800114AC 0000E40C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800114B0 0000E410 90 01 01 84 */ stw r0, 0x184(r1) /* 800114B4 0000E414 7F 83 E3 78 */ mr r3, r28 /* 800114B8 0000E418 48 30 16 BD */ bl __ct__12CTransform4fFRC12CTransform4f @@ -2406,10 +2406,10 @@ lbl_800115CC: /* 80011638 0000E598 39 00 00 00 */ li r8, 0 /* 8001163C 0000E59C 38 00 00 03 */ li r0, 3 /* 80011640 0000E5A0 90 81 00 64 */ stw r4, 0x64(r1) -/* 80011644 0000E5A4 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80011644 0000E5A4 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80011648 0000E5A8 38 81 00 18 */ addi r4, r1, 0x18 /* 8001164C 0000E5AC 90 61 00 60 */ stw r3, 0x60(r1) -/* 80011650 0000E5B0 39 25 66 A0 */ addi r9, r5, skZero3f@l +/* 80011650 0000E5B0 39 25 66 A0 */ addi r9, r5, sZeroVector__9CVector3f@l /* 80011654 0000E5B4 7F E3 FB 78 */ mr r3, r31 /* 80011658 0000E5B8 38 A1 00 14 */ addi r5, r1, 0x14 /* 8001165C 0000E5BC 91 01 00 6C */ stw r8, 0x6c(r1) @@ -2947,9 +2947,9 @@ GetDamageVulnerability__7CPlayerCFv: /* 80011D50 0000ECB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80011D54 0000ECB4 7C 08 02 A6 */ mflr r0 /* 80011D58 0000ECB8 39 00 00 00 */ li r8, 0 -/* 80011D5C 0000ECBC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80011D5C 0000ECBC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80011D60 0000ECC0 90 01 00 34 */ stw r0, 0x34(r1) -/* 80011D64 0000ECC4 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80011D64 0000ECC4 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80011D68 0000ECC8 88 A1 00 0C */ lbz r5, 0xc(r1) /* 80011D6C 0000ECCC 51 05 3E 30 */ rlwimi r5, r8, 7, 0x18, 0x18 /* 80011D70 0000ECD0 C0 02 81 0C */ lfs f0, lbl_805A9E2C@sda21(r2) @@ -2961,8 +2961,8 @@ GetDamageVulnerability__7CPlayerCFv: /* 80011D88 0000ECE8 91 01 00 10 */ stw r8, 0x10(r1) /* 80011D8C 0000ECEC 51 07 2E B4 */ rlwimi r7, r8, 5, 0x1a, 0x1a /* 80011D90 0000ECF0 98 A1 00 0C */ stb r5, 0xc(r1) -/* 80011D94 0000ECF4 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80011D98 0000ECF8 38 A5 66 F4 */ addi r5, r5, lbl_805A66F4@l +/* 80011D94 0000ECF4 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80011D98 0000ECF8 38 A5 66 F4 */ addi r5, r5, sUpVector__9CVector3f@l /* 80011D9C 0000ECFC 98 C1 00 0C */ stb r6, 0xc(r1) /* 80011DA0 0000ED00 38 C1 00 10 */ addi r6, r1, 0x10 /* 80011DA4 0000ED04 98 E1 00 14 */ stb r7, 0x14(r1) @@ -3996,14 +3996,14 @@ lbl_80012B20: /* 80012C0C 0000FB6C 48 03 9A F1 */ bl "BuildColliderList__13CStateManagerCFRQ24rstl32reserved_vector<9TUniqueId,1024>RC6CActorRC6CAABox" /* 80012C10 0000FB70 7F 23 CB 78 */ mr r3, r25 /* 80012C14 0000FB74 48 10 7D AD */ bl GetBaseBoundingBox__13CPhysicsActorCFv -/* 80012C18 0000FB78 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80012C18 0000FB78 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80012C1C 0000FB7C C0 79 00 60 */ lfs f3, 0x60(r25) -/* 80012C20 0000FB80 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 80012C20 0000FB80 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 80012C24 0000FB84 C0 59 00 50 */ lfs f2, 0x50(r25) /* 80012C28 0000FB88 C0 39 00 40 */ lfs f1, 0x40(r25) /* 80012C2C 0000FB8C 3C C0 80 3F */ lis r6, lbl_803ECAD0@ha /* 80012C30 0000FB90 C0 07 00 00 */ lfs f0, 0(r7) -/* 80012C34 0000FB94 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 80012C34 0000FB94 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 80012C38 0000FB98 3C 80 80 3E */ lis r4, lbl_803D97E4@ha /* 80012C3C 0000FB9C FF 80 10 18 */ frsp f28, f2 /* 80012C40 0000FBA0 D0 1F 00 00 */ stfs f0, 0(r31) @@ -4015,7 +4015,7 @@ lbl_80012B20: /* 80012C58 0000FBB8 7C 7A 1B 78 */ mr r26, r3 /* 80012C5C 0000FBBC 3B 66 CA D0 */ addi r27, r6, lbl_803ECAD0@l /* 80012C60 0000FBC0 D0 1F 00 04 */ stfs f0, 4(r31) -/* 80012C64 0000FBC4 3B 85 66 70 */ addi r28, r5, skIdentity4f@l +/* 80012C64 0000FBC4 3B 85 66 70 */ addi r28, r5, sIdentity__12CTransform4f@l /* 80012C68 0000FBC8 3B A4 97 E4 */ addi r29, r4, lbl_803D97E4@l /* 80012C6C 0000FBCC 3B 20 00 00 */ li r25, 0 /* 80012C70 0000FBD0 C0 07 00 08 */ lfs f0, 8(r7) @@ -6295,9 +6295,9 @@ lbl_80014C30: /* 80014C64 00011BC4 4B FF C5 29 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle /* 80014C68 00011BC8 48 00 00 D4 */ b lbl_80014D3C lbl_80014C6C: -/* 80014C6C 00011BCC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80014C6C 00011BCC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80014C70 00011BD0 7F C3 F3 78 */ mr r3, r30 -/* 80014C74 00011BD4 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 80014C74 00011BD4 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 80014C78 00011BD8 7F E4 FB 78 */ mr r4, r31 /* 80014C7C 00011BDC C0 46 00 00 */ lfs f2, 0(r6) /* 80014C80 00011BE0 38 A1 00 24 */ addi r5, r1, 0x24 @@ -7892,14 +7892,14 @@ lbl_80016310: /* 80016364 000132C4 38 61 00 30 */ addi r3, r1, 0x30 /* 80016368 000132C8 38 81 00 24 */ addi r4, r1, 0x24 /* 8001636C 000132CC 48 2F DA 65 */ bl __ct__13CUnitVector3fFRC9CVector3f -/* 80016370 000132D0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80016370 000132D0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80016374 000132D4 7C 7B 1B 78 */ mr r27, r3 -/* 80016378 000132D8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80016378 000132D8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8001637C 000132DC 38 61 00 3C */ addi r3, r1, 0x3c /* 80016380 000132E0 48 2F DA 51 */ bl __ct__13CUnitVector3fFRC9CVector3f -/* 80016384 000132E4 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80016384 000132E4 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80016388 000132E8 7F 65 DB 78 */ mr r5, r27 -/* 8001638C 000132EC 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8001638C 000132EC 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80016390 000132F0 7C 64 1B 78 */ mr r4, r3 /* 80016394 000132F4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80016398 000132F8 48 2F D7 79 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -7918,9 +7918,9 @@ lbl_80016310: /* 800163CC 0001332C 98 1D 00 E4 */ stb r0, 0xe4(r29) /* 800163D0 00013330 48 00 00 3C */ b lbl_8001640C lbl_800163D4: -/* 800163D4 00013334 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800163D4 00013334 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800163D8 00013338 38 7D 00 34 */ addi r3, r29, 0x34 -/* 800163DC 0001333C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800163DC 0001333C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800163E0 00013340 48 2F C7 61 */ bl __as__12CTransform4fFRC12CTransform4f /* 800163E4 00013344 88 1D 00 E4 */ lbz r0, 0xe4(r29) /* 800163E8 00013348 38 60 00 01 */ li r3, 1 @@ -8025,10 +8025,10 @@ PreThink__7CPlayerFfR13CStateManager: /* 80016540 000134A0 38 00 00 00 */ li r0, 0 /* 80016544 000134A4 C0 02 81 0C */ lfs f0, lbl_805A9E2C@sda21(r2) /* 80016548 000134A8 98 03 05 58 */ stb r0, 0x558(r3) -/* 8001654C 000134AC 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8001654C 000134AC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80016550 000134B0 D0 03 05 5C */ stfs f0, 0x55c(r3) /* 80016554 000134B4 D0 03 05 60 */ stfs f0, 0x560(r3) -/* 80016558 000134B8 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80016558 000134B8 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 8001655C 000134BC D0 03 05 64 */ stfs f0, 0x564(r3) /* 80016560 000134C0 C0 04 00 04 */ lfs f0, 4(r4) /* 80016564 000134C4 D0 03 05 68 */ stfs f0, 0x568(r3) @@ -9166,9 +9166,9 @@ lbl_8001751C: /* 80017548 000144A8 40 80 00 08 */ bge lbl_80017550 /* 8001754C 000144AC 48 00 01 08 */ b lbl_80017654 lbl_80017550: -/* 80017550 000144B0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80017550 000144B0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80017554 000144B4 7F C3 F3 78 */ mr r3, r30 -/* 80017558 000144B8 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 80017558 000144B8 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8001755C 000144BC 7F E4 FB 78 */ mr r4, r31 /* 80017560 000144C0 C0 46 00 00 */ lfs f2, 0(r6) /* 80017564 000144C4 38 A1 00 14 */ addi r5, r1, 0x14 @@ -9270,9 +9270,9 @@ SetSpawnedMorphBallState__7CPlayerFQ27CPlayer21EPlayerMorphBallStateR13CStateMan /* 800176D0 00014630 40 80 00 08 */ bge lbl_800176D8 /* 800176D4 00014634 48 00 00 F8 */ b lbl_800177CC lbl_800176D8: -/* 800176D8 00014638 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800176D8 00014638 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800176DC 0001463C 7F E3 FB 78 */ mr r3, r31 -/* 800176E0 00014640 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 800176E0 00014640 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 800176E4 00014644 7F C4 F3 78 */ mr r4, r30 /* 800176E8 00014648 C0 46 00 00 */ lfs f2, 0(r6) /* 800176EC 0001464C 38 A1 00 14 */ addi r5, r1, 0x14 @@ -11008,8 +11008,8 @@ UpdateArmAndGunTransforms__7CPlayerFfR13CStateManager: /* 80018F7C 00015EDC F3 81 00 78 */ psq_st f28, 120(r1), 0, qr0 /* 80018F80 00015EE0 93 E1 00 6C */ stw r31, 0x6c(r1) /* 80018F84 00015EE4 93 C1 00 68 */ stw r30, 0x68(r1) -/* 80018F88 00015EE8 3C A0 80 5A */ lis r5, skZero3f@ha -/* 80018F8C 00015EEC C4 45 66 A0 */ lfsu f2, skZero3f@l(r5) +/* 80018F88 00015EE8 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha +/* 80018F8C 00015EEC C4 45 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r5) /* 80018F90 00015EF0 FF 80 08 90 */ fmr f28, f1 /* 80018F94 00015EF4 7C 7E 1B 78 */ mr r30, r3 /* 80018F98 00015EF8 C0 25 00 04 */ lfs f1, 4(r5) @@ -11628,13 +11628,13 @@ lbl_80019848: /* 800198A0 00016800 D0 21 00 54 */ stfs f1, 0x54(r1) /* 800198A4 00016804 48 2F 91 DD */ bl Rotate__12CTransform4fCFRC9CVector3f /* 800198A8 00016808 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 800198AC 0001680C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800198AC 0001680C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800198B0 00016810 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 800198B4 00016814 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800198B4 00016814 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800198B8 00016818 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 800198BC 0001681C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800198BC 0001681C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800198C0 00016820 D0 41 00 54 */ stfs f2, 0x54(r1) -/* 800198C4 00016824 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800198C4 00016824 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800198C8 00016828 38 61 00 60 */ addi r3, r1, 0x60 /* 800198CC 0001682C 38 A1 00 54 */ addi r5, r1, 0x54 /* 800198D0 00016830 D0 21 00 58 */ stfs f1, 0x58(r1) @@ -11769,9 +11769,9 @@ UpdateAimTargetPrediction__7CPlayerFRC12CTransform4fR13CStateManager: /* 80019AC4 00016A24 C0 02 81 40 */ lfs f0, lbl_805A9E60@sda21(r2) /* 80019AC8 00016A28 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80019ACC 00016A2C 40 80 00 18 */ bge lbl_80019AE4 -/* 80019AD0 00016A30 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80019AD0 00016A30 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80019AD4 00016A34 38 7F 04 04 */ addi r3, r31, 0x404 -/* 80019AD8 00016A38 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80019AD8 00016A38 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80019ADC 00016A3C 48 00 01 6D */ bl sub_80019c48 /* 80019AE0 00016A40 48 00 00 20 */ b lbl_80019B00 lbl_80019AE4: @@ -12365,9 +12365,9 @@ __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialL /* 8001A2F8 00017258 48 00 12 3D */ bl Identity__10CAxisAngleFv /* 8001A2FC 0001725C 7C 77 1B 78 */ mr r23, r3 /* 8001A300 00017260 48 00 12 35 */ bl Identity__10CAxisAngleFv -/* 8001A304 00017264 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8001A304 00017264 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8001A308 00017268 A1 98 00 00 */ lhz r12, 0(r24) -/* 8001A30C 0001726C 3B A4 66 A0 */ addi r29, r4, skZero3f@l +/* 8001A30C 0001726C 3B A4 66 A0 */ addi r29, r4, sZeroVector__9CVector3f@l /* 8001A310 00017270 39 61 01 10 */ addi r11, r1, 0x110 /* 8001A314 00017274 C0 7D 00 00 */ lfs f3, 0(r29) /* 8001A318 00017278 FC 20 E8 90 */ fmr f1, f29 @@ -12515,13 +12515,13 @@ lbl_8001A404: /* 8001A544 000174A4 91 1F 03 6C */ stw r8, 0x36c(r31) /* 8001A548 000174A8 91 1F 03 70 */ stw r8, 0x370(r31) /* 8001A54C 000174AC 99 1F 03 74 */ stb r8, 0x374(r31) -/* 8001A550 000174B0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8001A550 000174B0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8001A554 000174B4 3C 60 80 3D */ lis r3, lbl_803CC4F8@ha /* 8001A558 000174B8 C0 42 82 44 */ lfs f2, lbl_805A9F64@sda21(r2) /* 8001A55C 000174BC D0 9F 03 78 */ stfs f4, 0x378(r31) /* 8001A560 000174C0 38 63 C4 F8 */ addi r3, r3, lbl_803CC4F8@l /* 8001A564 000174C4 C0 22 81 68 */ lfs f1, lbl_805A9E88@sda21(r2) -/* 8001A568 000174C8 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 8001A568 000174C8 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 8001A56C 000174CC 99 1F 03 7C */ stb r8, 0x37c(r31) /* 8001A570 000174D0 38 83 00 1D */ addi r4, r3, 0x1d /* 8001A574 000174D4 C0 02 81 B4 */ lfs f0, lbl_805A9ED4@sda21(r2) @@ -12605,12 +12605,12 @@ lbl_8001A660: lbl_8001A6A8: /* 8001A6A8 00017608 90 1F 04 A0 */ stw r0, 0x4a0(r31) /* 8001A6AC 0001760C 39 00 00 00 */ li r8, 0 -/* 8001A6B0 00017610 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8001A6B0 00017610 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8001A6B4 00017614 3C 60 80 3D */ lis r3, lbl_803CC4F8@ha /* 8001A6B8 00017618 91 1F 04 A4 */ stw r8, 0x4a4(r31) /* 8001A6BC 0001761C 38 63 C4 F8 */ addi r3, r3, lbl_803CC4F8@l /* 8001A6C0 00017620 C0 42 81 0C */ lfs f2, lbl_805A9E2C@sda21(r2) -/* 8001A6C4 00017624 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8001A6C4 00017624 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8001A6C8 00017628 38 C0 FF FF */ li r6, -1 /* 8001A6CC 0001762C C0 02 81 00 */ lfs f0, lbl_805A9E20@sda21(r2) /* 8001A6D0 00017630 D0 5F 04 F8 */ stfs f2, 0x4f8(r31) @@ -12714,9 +12714,9 @@ lbl_8001A854: /* 8001A854 000177B4 92 FF 07 6C */ stw r23, 0x76c(r31) /* 8001A858 000177B8 38 00 00 00 */ li r0, 0 /* 8001A85C 000177BC C0 22 81 0C */ lfs f1, lbl_805A9E2C@sda21(r2) -/* 8001A860 000177C0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8001A860 000177C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8001A864 000177C4 90 1F 07 70 */ stw r0, 0x770(r31) -/* 8001A868 000177C8 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8001A868 000177C8 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8001A86C 000177CC FC 40 08 90 */ fmr f2, f1 /* 8001A870 000177D0 38 7F 07 A0 */ addi r3, r31, 0x7a0 /* 8001A874 000177D4 D0 3F 07 74 */ stfs f1, 0x774(r31) @@ -12737,9 +12737,9 @@ lbl_8001A854: /* 8001A8B0 00017810 D0 1F 07 9C */ stfs f0, 0x79c(r31) /* 8001A8B4 00017814 4B FF D4 01 */ bl __ct__Q27CPlayer11CVisorSteamFv /* 8001A8B8 00017818 38 00 FF FF */ li r0, -1 -/* 8001A8BC 0001781C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8001A8BC 0001781C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8001A8C0 00017820 90 1F 07 CC */ stw r0, 0x7cc(r31) -/* 8001A8C4 00017824 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 8001A8C4 00017824 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 8001A8C8 00017828 80 C2 83 F0 */ lwz r6, lbl_805AA110@sda21(r2) /* 8001A8CC 0001782C 38 A0 00 01 */ li r5, 1 /* 8001A8D0 00017830 93 7F 07 D0 */ stw r27, 0x7d0(r31) @@ -12978,9 +12978,9 @@ lbl_8001ABA8: /* 8001AC64 00017BC4 48 2F 7E DD */ bl __as__12CTransform4fFRC12CTransform4f /* 8001AC68 00017BC8 7F E3 FB 78 */ mr r3, r31 /* 8001AC6C 00017BCC 48 26 80 1D */ bl InitializeBallTransition__7CPlayerFv -/* 8001AC70 00017BD0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8001AC70 00017BD0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8001AC74 00017BD4 80 9F 00 64 */ lwz r4, 0x64(r31) -/* 8001AC78 00017BD8 38 A3 66 70 */ addi r5, r3, skIdentity4f@l +/* 8001AC78 00017BD8 38 A3 66 70 */ addi r5, r3, sIdentity__12CTransform4f@l /* 8001AC7C 00017BDC 38 61 00 60 */ addi r3, r1, 0x60 /* 8001AC80 00017BE0 48 0F AB 35 */ bl GetBounds__10CModelDataCFRC12CTransform4f /* 8001AC84 00017BE4 C0 21 00 74 */ lfs f1, 0x74(r1) diff --git a/asm/MetroidPrime/Player/CPlayerCameraBob.s b/asm/MetroidPrime/Player/CPlayerCameraBob.s index 228e47e6..e813a4b1 100644 --- a/asm/MetroidPrime/Player/CPlayerCameraBob.s +++ b/asm/MetroidPrime/Player/CPlayerCameraBob.s @@ -330,9 +330,9 @@ UpdateViewWander__16CPlayerCameraBobFfR13CStateManager: /* 800E96F0 000E6650 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800E96F4 000E6654 D0 01 00 20 */ stfs f0, 0x20(r1) /* 800E96F8 000E6658 48 22 A1 B1 */ bl RotateY__12CTransform4fFRC9CRelAngle -/* 800E96FC 000E665C 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 800E96FC 000E665C 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 800E9700 000E6660 38 61 00 6C */ addi r3, r1, 0x6c -/* 800E9704 000E6664 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 800E9704 000E6664 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 800E9708 000E6668 38 A1 00 30 */ addi r5, r1, 0x30 /* 800E970C 000E666C 38 81 00 18 */ addi r4, r1, 0x18 /* 800E9710 000E6670 48 22 A4 01 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1039,13 +1039,13 @@ lbl_800EA0C4: /* 800EA0E4 000E7044 D0 1E 00 14 */ stfs f0, 0x14(r30) /* 800EA0E8 000E7048 4B FF F4 91 */ bl UpdateViewWander__16CPlayerCameraBobFfR13CStateManager /* 800EA0EC 000E704C C0 5E 00 78 */ lfs f2, 0x78(r30) -/* 800EA0F0 000E7050 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800EA0F0 000E7050 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800EA0F4 000E7054 C0 22 90 78 */ lfs f1, lbl_805AAD98@sda21(r2) -/* 800EA0F8 000E7058 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800EA0F8 000E7058 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800EA0FC 000E705C C0 0D 88 00 */ lfs f0, lbl_805A73C0@sda21(r13) -/* 800EA100 000E7060 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800EA100 000E7060 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800EA104 000E7064 D0 21 00 08 */ stfs f1, 8(r1) -/* 800EA108 000E7068 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800EA108 000E7068 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800EA10C 000E706C 38 61 00 14 */ addi r3, r1, 0x14 /* 800EA110 000E7070 38 A1 00 08 */ addi r5, r1, 8 /* 800EA114 000E7074 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -1141,9 +1141,9 @@ __ct__16CPlayerCameraBobFQ216CPlayerCameraBob14ECameraBobTypeRC9CVector2ff: /* 800EA264 000E71C4 38 00 00 00 */ li r0, 0 /* 800EA268 000E71C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EA26C 000E71CC 7C 7F 1B 78 */ mr r31, r3 -/* 800EA270 000E71D0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800EA270 000E71D0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800EA274 000E71D4 90 9F 00 00 */ stw r4, 0(r31) -/* 800EA278 000E71D8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800EA278 000E71D8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800EA27C 000E71DC 38 7F 00 2C */ addi r3, r31, 0x2c /* 800EA280 000E71E0 C0 45 00 00 */ lfs f2, 0(r5) /* 800EA284 000E71E4 D0 5F 00 04 */ stfs f2, 4(r31) @@ -1160,8 +1160,8 @@ __ct__16CPlayerCameraBobFQ216CPlayerCameraBob14ECameraBobTypeRC9CVector2ff: /* 800EA2B0 000E7210 98 1F 00 29 */ stb r0, 0x29(r31) /* 800EA2B4 000E7214 48 22 88 C1 */ bl __ct__12CTransform4fFRC12CTransform4f /* 800EA2B8 000E7218 C0 02 90 78 */ lfs f0, lbl_805AAD98@sda21(r2) -/* 800EA2BC 000E721C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800EA2C0 000E7220 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800EA2BC 000E721C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800EA2C0 000E7220 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800EA2C4 000E7224 38 00 00 00 */ li r0, 0 /* 800EA2C8 000E7228 D0 1F 00 5C */ stfs f0, 0x5c(r31) /* 800EA2CC 000E722C 38 7F 00 D0 */ addi r3, r31, 0xd0 diff --git a/asm/MetroidPrime/Player/CPlayerDynamics.s b/asm/MetroidPrime/Player/CPlayerDynamics.s index 5d17bc05..ec5af122 100644 --- a/asm/MetroidPrime/Player/CPlayerDynamics.s +++ b/asm/MetroidPrime/Player/CPlayerDynamics.s @@ -788,8 +788,8 @@ lbl_80282714: /* 80282714 0027F674 38 7C 08 24 */ addi r3, r28, 0x824 lbl_80282718: /* 80282718 0027F678 C0 03 00 00 */ lfs f0, 0(r3) -/* 8028271C 0027F67C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80282720 0027F680 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8028271C 0027F67C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80282720 0027F680 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80282724 0027F684 7F 83 E3 78 */ mr r3, r28 /* 80282728 0027F688 D0 1C 08 24 */ stfs f0, 0x824(r28) /* 8028272C 0027F68C 7F A4 EB 78 */ mr r4, r29 @@ -1253,9 +1253,9 @@ lbl_80282D88: /* 80282D9C 0027FCFC 7F E5 FB 78 */ mr r5, r31 /* 80282DA0 0027FD00 38 80 00 25 */ li r4, 0x25 /* 80282DA4 0027FD04 4B DD 15 AD */ bl AddMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 80282DA8 0027FD08 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80282DA8 0027FD08 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80282DAC 0027FD0C 7F C3 F3 78 */ mr r3, r30 -/* 80282DB0 0027FD10 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 80282DB0 0027FD10 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 80282DB4 0027FD14 7F E5 FB 78 */ mr r5, r31 /* 80282DB8 0027FD18 C0 06 00 00 */ lfs f0, 0(r6) /* 80282DBC 0027FD1C 38 80 00 00 */ li r4, 0 @@ -1736,9 +1736,9 @@ lbl_802834B8: /* 802834D4 00280434 41 82 00 90 */ beq lbl_80283564 lbl_802834D8: /* 802834D8 00280438 C0 7D 00 50 */ lfs f3, 0x50(r29) -/* 802834DC 0028043C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802834DC 0028043C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802834E0 00280440 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 802834E4 00280444 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802834E4 00280444 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802834E8 00280448 C0 3D 00 40 */ lfs f1, 0x40(r29) /* 802834EC 0028044C EC A3 F0 2A */ fadds f5, f3, f30 /* 802834F0 00280450 EC 82 E8 2A */ fadds f4, f2, f29 @@ -1772,9 +1772,9 @@ lbl_802834D8: /* 80283560 002804C0 48 00 00 EC */ b lbl_8028364C lbl_80283564: /* 80283564 002804C4 C0 9D 00 50 */ lfs f4, 0x50(r29) -/* 80283568 002804C8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80283568 002804C8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8028356C 002804CC C0 01 01 38 */ lfs f0, 0x138(r1) -/* 80283570 002804D0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80283570 002804D0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80283574 002804D4 C0 7D 00 60 */ lfs f3, 0x60(r29) /* 80283578 002804D8 38 61 01 AC */ addi r3, r1, 0x1ac /* 8028357C 002804DC C0 3D 00 40 */ lfs f1, 0x40(r29) @@ -1922,9 +1922,9 @@ lbl_8028364C: /* 802837AC 0028070C 4C 41 13 82 */ cror 2, 1, 2 /* 802837B0 00280710 40 82 00 80 */ bne lbl_80283830 /* 802837B4 00280714 C0 7D 00 50 */ lfs f3, 0x50(r29) -/* 802837B8 00280718 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802837B8 00280718 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802837BC 0028071C C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 802837C0 00280720 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802837C0 00280720 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802837C4 00280724 C0 3D 00 40 */ lfs f1, 0x40(r29) /* 802837C8 00280728 EC A3 38 2A */ fadds f5, f3, f7 /* 802837CC 0028072C EC 82 40 2A */ fadds f4, f2, f8 @@ -1975,9 +1975,9 @@ lbl_80283830: /* 8028387C 002807DC 7F C5 F3 78 */ mr r5, r30 /* 80283880 002807E0 38 80 00 25 */ li r4, 0x25 /* 80283884 002807E4 4B DD 0A CD */ bl AddMaterial__6CActorF14EMaterialTypesR13CStateManager -/* 80283888 002807E8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80283888 002807E8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8028388C 002807EC 7F A3 EB 78 */ mr r3, r29 -/* 80283890 002807F0 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 80283890 002807F0 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 80283894 002807F4 7F C5 F3 78 */ mr r5, r30 /* 80283898 002807F8 C0 06 00 00 */ lfs f0, 0(r6) /* 8028389C 002807FC 38 80 00 03 */ li r4, 3 @@ -2084,8 +2084,8 @@ lbl_80283A08: /* 80283A18 00280978 7F E4 FB 78 */ mr r4, r31 /* 80283A1C 0028097C 38 A0 00 00 */ li r5, 0 /* 80283A20 00280980 4B E9 22 F1 */ bl Touch__10CModelDataCFRC13CStateManageri -/* 80283A24 00280984 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80283A28 00280988 C4 04 66 A0 */ lfsu f0, skZero3f@l(r4) +/* 80283A24 00280984 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80283A28 00280988 C4 04 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r4) /* 80283A2C 0028098C 7F C3 F3 78 */ mr r3, r30 /* 80283A30 00280990 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 80283A34 00280994 C0 04 00 04 */ lfs f0, 4(r4) @@ -3716,10 +3716,10 @@ Teleport__7CPlayerFRC12CTransform4fR13CStateManagerb: /* 802850F8 00282058 41 82 01 78 */ beq lbl_80285270 /* 802850FC 0028205C 38 61 00 2C */ addi r3, r1, 0x2c /* 80285100 00282060 48 08 F7 F9 */ bl Normalize__9CVector3fFv -/* 80285104 00282064 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80285108 00282068 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 8028510C 0028206C 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80285110 00282070 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80285104 00282064 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80285108 00282068 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 8028510C 0028206C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80285110 00282070 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80285114 00282074 38 61 00 6C */ addi r3, r1, 0x6c /* 80285118 00282078 38 A1 00 2C */ addi r5, r1, 0x2c /* 8028511C 0028207C 48 08 E9 F5 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -4088,9 +4088,9 @@ lbl_80285638: /* 8028566C 002825CC 90 1F 09 D4 */ stw r0, 0x9d4(r31) lbl_80285670: /* 80285670 002825D0 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80285674 002825D4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80285674 002825D4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80285678 002825D8 C0 3F 00 50 */ lfs f1, 0x50(r31) -/* 8028567C 002825DC 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8028567C 002825DC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80285680 002825E0 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80285684 002825E4 38 61 00 08 */ addi r3, r1, 8 /* 80285688 002825E8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -4149,9 +4149,9 @@ lbl_80285738: /* 80285748 002826A8 D0 21 00 28 */ stfs f1, 0x28(r1) lbl_8028574C: /* 8028574C 002826AC C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80285750 002826B0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80285750 002826B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80285754 002826B4 C0 61 00 24 */ lfs f3, 0x24(r1) -/* 80285758 002826B8 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80285758 002826B8 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8028575C 002826BC FC 40 00 50 */ fneg f2, f0 /* 80285760 002826C0 C0 22 BD A0 */ lfs f1, lbl_805ADAC0@sda21(r2) /* 80285764 002826C4 C0 BF 00 60 */ lfs f5, 0x60(r31) @@ -6347,9 +6347,9 @@ lbl_80287590: /* 802875E4 00284544 38 61 00 1C */ addi r3, r1, 0x1c /* 802875E8 00284548 38 81 00 10 */ addi r4, r1, 0x10 /* 802875EC 0028454C 4B D9 3F 71 */ bl __ct__10CAxisAngleFRC13CUnitVector3ff -/* 802875F0 00284550 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802875F0 00284550 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802875F4 00284554 7C 65 1B 78 */ mr r5, r3 -/* 802875F8 00284558 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802875F8 00284558 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802875FC 0028455C 7F A3 EB 78 */ mr r3, r29 /* 80287600 00284560 4B E9 4B 45 */ bl ApplyForceOR__13CPhysicsActorFRC9CVector3fRC10CAxisAngle lbl_80287604: @@ -6411,9 +6411,9 @@ lbl_802876B8: /* 802876C4 00284624 80 1D 02 58 */ lwz r0, 0x258(r29) /* 802876C8 00284628 2C 00 00 00 */ cmpwi r0, 0 /* 802876CC 0028462C 40 82 00 F4 */ bne lbl_802877C0 -/* 802876D0 00284630 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802876D0 00284630 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802876D4 00284634 C0 1D 01 3C */ lfs f0, 0x13c(r29) -/* 802876D8 00284638 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802876D8 00284638 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802876DC 0028463C C0 42 BD A0 */ lfs f2, lbl_805ADAC0@sda21(r2) /* 802876E0 00284640 C0 84 00 04 */ lfs f4, 4(r4) /* 802876E4 00284644 38 61 00 C4 */ addi r3, r1, 0xc4 diff --git a/asm/MetroidPrime/Player/CPlayerGun.s b/asm/MetroidPrime/Player/CPlayerGun.s index ae8ca903..667f4e96 100644 --- a/asm/MetroidPrime/Player/CPlayerGun.s +++ b/asm/MetroidPrime/Player/CPlayerGun.s @@ -492,9 +492,9 @@ clear_transform__FRC12CTransform4f: /* 8003A7D4 00037734 7C 7F 1B 78 */ mr r31, r3 /* 8003A7D8 00037738 38 61 00 08 */ addi r3, r1, 8 /* 8003A7DC 0003773C 48 2D 83 99 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8003A7E0 00037740 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8003A7E0 00037740 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8003A7E4 00037744 7F E3 FB 78 */ mr r3, r31 -/* 8003A7E8 00037748 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8003A7E8 00037748 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8003A7EC 0003774C 38 81 00 08 */ addi r4, r1, 8 /* 8003A7F0 00037750 C0 45 00 00 */ lfs f2, 0(r5) /* 8003A7F4 00037754 C0 25 00 04 */ lfs f1, 4(r5) @@ -1656,9 +1656,9 @@ CreateGunLight__10CPlayerGunFR13CStateManager: /* 8003B864 000387C4 A0 1E 05 3C */ lhz r0, 0x53c(r30) /* 8003B868 000387C8 B0 01 00 10 */ sth r0, 0x10(r1) /* 8003B86C 000387CC 48 30 E7 49 */ bl Black__6CColorFv -/* 8003B870 000387D0 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 8003B870 000387D0 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 8003B874 000387D4 7C 65 1B 78 */ mr r5, r3 -/* 8003B878 000387D8 38 84 67 24 */ addi r4, r4, lbl_805A6724@l +/* 8003B878 000387D8 38 84 67 24 */ addi r4, r4, sForwardVector__9CVector3f@l /* 8003B87C 000387DC 38 61 00 30 */ addi r3, r1, 0x30 /* 8003B880 000387E0 48 2C AB ED */ bl BuildDirectional__6CLightFRC9CVector3fRC6CColor /* 8003B884 000387E4 93 A1 00 08 */ stw r29, 8(r1) @@ -1984,9 +1984,9 @@ UpdateLeftArmTransform__10CPlayerGunFRC10CModelDataRC13CStateManager: /* 8003BD0C 00038C6C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 8003BD10 00038C70 3B E3 02 E0 */ addi r31, r3, 0x2e0 /* 8003BD14 00038C74 41 82 00 18 */ beq lbl_8003BD2C -/* 8003BD18 00038C78 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8003BD18 00038C78 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8003BD1C 00038C7C 7F E3 FB 78 */ mr r3, r31 -/* 8003BD20 00038C80 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8003BD20 00038C80 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8003BD24 00038C84 48 2D 6E 1D */ bl __as__12CTransform4fFRC12CTransform4f /* 8003BD28 00038C88 48 00 00 3C */ b lbl_8003BD64 lbl_8003BD2C: @@ -2320,7 +2320,7 @@ lbl_8003C198: /* 8003C1B8 00039118 40 82 00 44 */ bne lbl_8003C1FC lbl_8003C1BC: /* 8003C1BC 0003911C 38 01 00 24 */ addi r0, r1, 0x24 -/* 8003C1C0 00039120 89 22 CC 40 */ lbz r9, lbl_805AE960@sda21(r2) +/* 8003C1C0 00039120 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2) /* 8003C1C4 00039124 90 01 00 08 */ stw r0, 8(r1) /* 8003C1C8 00039128 38 7E 06 70 */ addi r3, r30, 0x670 /* 8003C1CC 0003912C 38 9E 03 28 */ addi r4, r30, 0x328 @@ -2384,7 +2384,7 @@ lbl_8003C284: /* 8003C298 000391F8 38 9E 03 28 */ addi r4, r30, 0x328 /* 8003C29C 000391FC 93 A1 00 0C */ stw r29, 0xc(r1) /* 8003C2A0 00039200 39 41 00 18 */ addi r10, r1, 0x18 -/* 8003C2A4 00039204 89 22 CC 40 */ lbz r9, lbl_805AE960@sda21(r2) +/* 8003C2A4 00039204 89 22 CC 40 */ lbz r9, kMaxVolume__9CAudioSys@sda21(r2) /* 8003C2A8 00039208 38 A0 00 00 */ li r5, 0 /* 8003C2AC 0003920C 93 E1 00 10 */ stw r31, 0x10(r1) /* 8003C2B0 00039210 39 00 00 14 */ li r8, 0x14 @@ -3140,9 +3140,9 @@ lbl_8003CD38: /* 8003CD58 00039CB8 48 0E 10 D9 */ bl EnterStruck__11CGrappleArmFR13CStateManagerf lbl_8003CD5C: /* 8003CD5C 00039CBC C0 02 84 6C */ lfs f0, lbl_805AA18C@sda21(r2) -/* 8003CD60 00039CC0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8003CD60 00039CC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8003CD64 00039CC4 D0 1C 03 98 */ stfs f0, 0x398(r28) -/* 8003CD68 00039CC8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 8003CD68 00039CC8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 8003CD6C 00039CCC D0 1C 03 DC */ stfs f0, 0x3dc(r28) /* 8003CD70 00039CD0 C0 03 00 04 */ lfs f0, 4(r3) /* 8003CD74 00039CD4 D0 1C 03 E0 */ stfs f0, 0x3e0(r28) @@ -8665,8 +8665,8 @@ lbl_80041C1C: /* 80041C4C 0003EBAC 38 61 02 04 */ addi r3, r1, 0x204 /* 80041C50 0003EBB0 48 2C AA FD */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 80041C54 0003EBB4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 80041C58 0003EBB8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80041C5C 0003EBBC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80041C58 0003EBB8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80041C5C 0003EBBC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80041C60 0003EBC0 81 83 00 00 */ lwz r12, 0(r3) /* 80041C64 0003EBC4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 80041C68 0003EBC8 7D 89 03 A6 */ mtctr r12 @@ -8968,8 +8968,8 @@ lbl_80042090: /* 800420BC 0003F01C 38 61 00 84 */ addi r3, r1, 0x84 /* 800420C0 0003F020 48 2C A6 8D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 800420C4 0003F024 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 800420C8 0003F028 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800420CC 0003F02C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800420C8 0003F028 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800420CC 0003F02C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800420D0 0003F030 81 83 00 00 */ lwz r12, 0(r3) /* 800420D4 0003F034 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800420D8 0003F038 7D 89 03 A6 */ mtctr r12 @@ -9296,12 +9296,12 @@ DrawScreenTex__Ff: /* 80042560 0003F4C0 D0 E1 00 38 */ stfs f7, 0x38(r1) /* 80042564 0003F4C4 EC 80 20 28 */ fsubs f4, f0, f4 /* 80042568 0003F4C8 48 2C 9F ED */ bl SetOrtho__9CGraphicsFffffff -/* 8004256C 0003F4CC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80042570 0003F4D0 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 8004256C 0003F4CC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80042570 0003F4D0 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 80042574 0003F4D4 48 2C A1 D9 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 80042578 0003F4D8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 8004257C 0003F4DC 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80042580 0003F4E0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8004257C 0003F4DC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80042580 0003F4E0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80042584 0003F4E4 81 83 00 00 */ lwz r12, 0(r3) /* 80042588 0003F4E8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8004258C 0003F4EC 7D 89 03 A6 */ mtctr r12 @@ -10283,41 +10283,41 @@ __ct__10CPlayerGunF9TUniqueId: /* 8004331C 0004027C D0 5F 03 9C */ stfs f2, 0x39c(r31) /* 80043320 00040280 D0 5F 03 A0 */ stfs f2, 0x3a0(r31) /* 80043324 00040284 48 11 18 8D */ bl __ct__7CFidgetFv -/* 80043328 00040288 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8004332C 0004028C 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 80043330 00040290 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80043328 00040288 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8004332C 0004028C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 80043330 00040290 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80043334 00040294 C0 05 00 00 */ lfs f0, 0(r5) /* 80043338 00040298 38 7F 03 E8 */ addi r3, r31, 0x3e8 -/* 8004333C 0004029C 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8004333C 0004029C 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80043340 000402A0 D0 1F 03 DC */ stfs f0, 0x3dc(r31) /* 80043344 000402A4 C0 05 00 04 */ lfs f0, 4(r5) /* 80043348 000402A8 D0 1F 03 E0 */ stfs f0, 0x3e0(r31) /* 8004334C 000402AC C0 05 00 08 */ lfs f0, 8(r5) /* 80043350 000402B0 D0 1F 03 E4 */ stfs f0, 0x3e4(r31) /* 80043354 000402B4 48 2C F8 21 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80043358 000402B8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80043358 000402B8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8004335C 000402BC 38 7F 04 18 */ addi r3, r31, 0x418 -/* 80043360 000402C0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80043360 000402C0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80043364 000402C4 48 2C F8 11 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80043368 000402C8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80043368 000402C8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8004336C 000402CC 38 7F 04 48 */ addi r3, r31, 0x448 -/* 80043370 000402D0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80043370 000402D0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80043374 000402D4 48 2C F8 01 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80043378 000402D8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80043378 000402D8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8004337C 000402DC 38 7F 04 78 */ addi r3, r31, 0x478 -/* 80043380 000402E0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80043380 000402E0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80043384 000402E4 48 2C F7 F1 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80043388 000402E8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80043388 000402E8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8004338C 000402EC 38 7F 04 A8 */ addi r3, r31, 0x4a8 -/* 80043390 000402F0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 80043390 000402F0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 80043394 000402F4 48 2C F7 E1 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 80043398 000402F8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 80043398 000402F8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8004339C 000402FC 38 7F 04 D8 */ addi r3, r31, 0x4d8 -/* 800433A0 00040300 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800433A0 00040300 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800433A4 00040304 48 2C F7 D1 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 800433A8 00040308 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800433A8 00040308 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800433AC 0004030C 38 7F 05 08 */ addi r3, r31, 0x508 -/* 800433B0 00040310 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800433B0 00040310 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800433B4 00040314 48 2C F7 C1 */ bl __ct__12CTransform4fFRC12CTransform4f /* 800433B8 00040318 A0 9E 00 00 */ lhz r4, 0(r30) /* 800433BC 0004031C 38 00 00 00 */ li r0, 0 @@ -10805,9 +10805,9 @@ lbl_800438EC: /* 80043B00 00040A60 4B FF A8 45 */ bl InitCTData__10CPlayerGunFv /* 80043B04 00040A64 7F E3 FB 78 */ mr r3, r31 /* 80043B08 00040A68 4B FF 78 7D */ bl LoadHandAnimTokens__10CPlayerGunFv -/* 80043B0C 00040A6C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80043B0C 00040A6C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80043B10 00040A70 38 7F 05 50 */ addi r3, r31, 0x550 -/* 80043B14 00040A74 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80043B14 00040A74 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80043B18 00040A78 48 0A 5F 01 */ bl SetPlayerVelocity__16CPlayerCameraBobFRC9CVector3f /* 80043B1C 00040A7C C0 22 84 6C */ lfs f1, lbl_805AA18C@sda21(r2) /* 80043B20 00040A80 38 7F 05 50 */ addi r3, r31, 0x550 diff --git a/asm/MetroidPrime/Player/CPlayerInputFilter.s b/asm/MetroidPrime/Player/CPlayerInputFilter.s index 81cf493f..7d53efe9 100644 --- a/asm/MetroidPrime/Player/CPlayerInputFilter.s +++ b/asm/MetroidPrime/Player/CPlayerInputFilter.s @@ -356,9 +356,9 @@ lbl_802972B0: /* 80297328 00294288 38 61 01 28 */ addi r3, r1, 0x128 /* 8029732C 0029428C 38 81 01 40 */ addi r4, r1, 0x140 /* 80297330 00294290 48 0A 11 D9 */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f -/* 80297334 00294294 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80297334 00294294 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80297338 00294298 38 61 01 28 */ addi r3, r1, 0x128 -/* 8029733C 0029429C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 8029733C 0029429C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80297340 002942A0 48 0A 07 C9 */ bl AccumulateBounds__6CAABoxFRC9CVector3f /* 80297344 002942A4 C0 21 01 34 */ lfs f1, 0x134(r1) /* 80297348 002942A8 38 61 00 2C */ addi r3, r1, 0x2c diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index 8a84c103..f8df41ef 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -288,10 +288,10 @@ lbl_8017952C: /* 80179628 00176588 D0 01 00 88 */ stfs f0, 0x88(r1) /* 8017962C 0017658C D0 41 00 8C */ stfs f2, 0x8c(r1) lbl_80179630: -/* 80179630 00176590 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80179634 00176594 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80179638 00176598 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 8017963C 0017659C 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80179630 00176590 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80179634 00176594 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80179638 00176598 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 8017963C 0017659C 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80179640 001765A0 38 61 00 9C */ addi r3, r1, 0x9c /* 80179644 001765A4 38 A1 00 84 */ addi r5, r1, 0x84 /* 80179648 001765A8 48 19 A4 C9 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1279,9 +1279,9 @@ ValidateFPPosition__7CPlayerF9CVector3fR13CStateManager: /* 8017A510 00177470 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 8017A514 00177474 C0 81 00 5C */ lfs f4, 0x5c(r1) /* 8017A518 00177478 C0 61 00 60 */ lfs f3, 0x60(r1) -/* 8017A51C 0017747C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 8017A51C 0017747C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8017A520 00177480 C0 41 00 64 */ lfs f2, 0x64(r1) -/* 8017A524 00177484 38 A3 66 70 */ addi r5, r3, skIdentity4f@l +/* 8017A524 00177484 38 A3 66 70 */ addi r5, r3, sIdentity__12CTransform4f@l /* 8017A528 00177488 C0 21 00 68 */ lfs f1, 0x68(r1) /* 8017A52C 0017748C 7F E3 FB 78 */ mr r3, r31 /* 8017A530 00177490 C0 01 00 6C */ lfs f0, 0x6c(r1) @@ -6206,10 +6206,10 @@ lbl_8017EB88: /* 8017EB94 0017BAF4 48 19 5B 65 */ bl CanBeNormalized__9CVector3fCFv /* 8017EB98 0017BAF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017EB9C 0017BAFC 41 82 00 78 */ beq lbl_8017EC14 -/* 8017EBA0 0017BB00 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8017EBA4 0017BB04 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 8017EBA8 0017BB08 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 8017EBAC 0017BB0C 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 8017EBA0 0017BB00 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8017EBA4 0017BB04 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 8017EBA8 0017BB08 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 8017EBAC 0017BB0C 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 8017EBB0 0017BB10 38 61 00 14 */ addi r3, r1, 0x14 /* 8017EBB4 0017BB14 38 A1 00 08 */ addi r5, r1, 8 /* 8017EBB8 0017BB18 48 19 4F 59 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f diff --git a/asm/MetroidPrime/Player/CSamusFaceReflection.s b/asm/MetroidPrime/Player/CSamusFaceReflection.s index 805e3570..51c51b76 100644 --- a/asm/MetroidPrime/Player/CSamusFaceReflection.s +++ b/asm/MetroidPrime/Player/CSamusFaceReflection.s @@ -434,9 +434,9 @@ Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16: /* 8015B3D8 00158338 D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 8015B3DC 0015833C D0 41 00 A8 */ stfs f2, 0xa8(r1) /* 8015B3E0 00158340 48 1B 89 F1 */ bl __ct__13CUnitVector3fFRC9CVector3f -/* 8015B3E4 00158344 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8015B3E4 00158344 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8015B3E8 00158348 C0 C2 9E B8 */ lfs f6, lbl_805ABBD8@sda21(r2) -/* 8015B3EC 0015834C 3B C3 67 24 */ addi r30, r3, lbl_805A6724@l +/* 8015B3EC 0015834C 3B C3 67 24 */ addi r30, r3, sForwardVector__9CVector3f@l /* 8015B3F0 00158350 C0 41 00 E4 */ lfs f2, 0xe4(r1) /* 8015B3F4 00158354 C0 BE 00 00 */ lfs f5, 0(r30) /* 8015B3F8 00158358 38 61 00 90 */ addi r3, r1, 0x90 @@ -455,9 +455,9 @@ Update__20CSamusFaceReflectionFfRC13CStateManagerR9CRandom16: /* 8015B42C 0015838C D0 21 00 88 */ stfs f1, 0x88(r1) /* 8015B430 00158390 D0 01 00 8C */ stfs f0, 0x8c(r1) /* 8015B434 00158394 48 1B 62 61 */ bl LookAt__11CQuaternionFRC13CUnitVector3fRC13CUnitVector3fRC9CRelAngle -/* 8015B438 00158398 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8015B438 00158398 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8015B43C 0015839C C0 E1 00 90 */ lfs f7, 0x90(r1) -/* 8015B440 001583A0 38 C3 67 24 */ addi r6, r3, lbl_805A6724@l +/* 8015B440 001583A0 38 C3 67 24 */ addi r6, r3, sForwardVector__9CVector3f@l /* 8015B444 001583A4 C0 C1 00 94 */ lfs f6, 0x94(r1) /* 8015B448 001583A8 C0 A1 00 98 */ lfs f5, 0x98(r1) /* 8015B44C 001583AC 38 61 00 44 */ addi r3, r1, 0x44 @@ -635,9 +635,9 @@ __ct__20CSamusFaceReflectionFRC13CStateManager: /* 8015B6E4 00158644 48 1B A1 89 */ bl __nw__FUlPCcPCc /* 8015B6E8 00158648 7C 60 1B 79 */ or. r0, r3, r3 /* 8015B6EC 0015864C 41 82 00 4C */ beq lbl_8015B738 -/* 8015B6F0 00158650 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8015B6F0 00158650 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8015B6F4 00158654 C0 22 94 04 */ lfs f1, lbl_805AB124@sda21(r2) -/* 8015B6F8 00158658 38 E4 66 A0 */ addi r7, r4, skZero3f@l +/* 8015B6F8 00158658 38 E4 66 A0 */ addi r7, r4, sZeroVector__9CVector3f@l /* 8015B6FC 0015865C 38 A1 00 08 */ addi r5, r1, 8 /* 8015B700 00158660 81 07 00 00 */ lwz r8, 0(r7) /* 8015B704 00158664 38 80 00 08 */ li r4, 8 @@ -657,9 +657,9 @@ lbl_8015B738: /* 8015B738 00158698 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 8015B73C 0015869C 90 1F 00 4C */ stw r0, 0x4c(r31) /* 8015B740 001586A0 39 03 66 60 */ addi r8, r3, lbl_805A6660@l -/* 8015B744 001586A4 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 8015B744 001586A4 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 8015B748 001586A8 C0 08 00 00 */ lfs f0, 0(r8) -/* 8015B74C 001586AC 38 E3 67 24 */ addi r7, r3, lbl_805A6724@l +/* 8015B74C 001586AC 38 E3 67 24 */ addi r7, r3, sForwardVector__9CVector3f@l /* 8015B750 001586B0 38 C0 00 00 */ li r6, 0 /* 8015B754 001586B4 38 60 00 01 */ li r3, 1 /* 8015B758 001586B8 D0 1F 00 50 */ stfs f0, 0x50(r31) diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index aa5f5798..10498a56 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -3745,9 +3745,9 @@ lbl_800C8664: /* 800C8690 000C55F0 98 01 00 90 */ stb r0, 0x90(r1) /* 800C8694 000C55F4 93 41 00 94 */ stw r26, 0x94(r1) /* 800C8698 000C55F8 48 04 E4 BD */ bl __ct__10CModelDataFRC8CAnimRes -/* 800C869C 000C55FC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800C869C 000C55FC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800C86A0 000C5600 C0 21 00 58 */ lfs f1, 0x58(r1) -/* 800C86A4 000C5604 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800C86A4 000C5604 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800C86A8 000C5608 38 00 00 00 */ li r0, 0 /* 800C86AC 000C560C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800C86B0 000C5610 40 82 00 28 */ bne lbl_800C86D8 @@ -3923,9 +3923,9 @@ lbl_800C8844: /* 800C8934 000C5894 A3 62 C5 FC */ lhz r27, lbl_805AE31C@sda21(r2) /* 800C8938 000C5898 B0 01 00 34 */ sth r0, 0x34(r1) /* 800C893C 000C589C 48 28 16 79 */ bl Black__6CColorFv -/* 800C8940 000C58A0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800C8940 000C58A0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800C8944 000C58A4 7C 78 1B 78 */ mr r24, r3 -/* 800C8948 000C58A8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800C8948 000C58A8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800C894C 000C58AC 38 61 00 88 */ addi r3, r1, 0x88 /* 800C8950 000C58B0 38 A1 00 50 */ addi r5, r1, 0x50 /* 800C8954 000C58B4 48 01 1C 91 */ bl ConvertEditorEulerToTransform4f__FRC9CVector3fRC9CVector3f @@ -3935,10 +3935,10 @@ lbl_800C8844: /* 800C8964 000C58C4 6F CB 80 00 */ xoris r11, r30, 0x8000 /* 800C8968 000C58C8 90 61 00 0C */ stw r3, 0xc(r1) /* 800C896C 000C58CC 38 A1 00 6C */ addi r5, r1, 0x6c -/* 800C8970 000C58D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800C8970 000C58D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800C8974 000C58D4 38 80 FF FF */ li r4, -1 /* 800C8978 000C58D8 90 A1 00 10 */ stw r5, 0x10(r1) -/* 800C897C 000C58DC 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 800C897C 000C58DC 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 800C8980 000C58E0 C8 42 8E 40 */ lfd f2, lbl_805AAB60@sda21(r2) /* 800C8984 000C58E4 FC 20 F8 90 */ fmr f1, f31 /* 800C8988 000C58E8 90 81 00 14 */ stw r4, 0x14(r1) @@ -4748,9 +4748,9 @@ lbl_800C9550: /* 800C957C 000C64DC 98 01 00 AC */ stb r0, 0xac(r1) /* 800C9580 000C64E0 93 61 00 B0 */ stw r27, 0xb0(r1) /* 800C9584 000C64E4 48 04 D5 D1 */ bl __ct__10CModelDataFRC8CAnimRes -/* 800C9588 000C64E8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800C9588 000C64E8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800C958C 000C64EC C0 21 00 58 */ lfs f1, 0x58(r1) -/* 800C9590 000C64F0 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800C9590 000C64F0 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800C9594 000C64F4 38 00 00 00 */ li r0, 0 /* 800C9598 000C64F8 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800C959C 000C64FC 40 82 00 28 */ bne lbl_800C95C4 @@ -5544,12 +5544,12 @@ lbl_800CA054: /* 800CA144 000C70A4 C0 62 8E 28 */ lfs f3, lbl_805AAB48@sda21(r2) /* 800CA148 000C70A8 93 C1 00 0C */ stw r30, 0xc(r1) /* 800CA14C 000C70AC 38 A1 00 60 */ addi r5, r1, 0x60 -/* 800CA150 000C70B0 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800CA154 000C70B4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800CA150 000C70B0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800CA154 000C70B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800CA158 000C70B8 90 A1 00 10 */ stw r5, 0x10(r1) /* 800CA15C 000C70BC 38 A0 FF FF */ li r5, -1 -/* 800CA160 000C70C0 38 E4 66 70 */ addi r7, r4, skIdentity4f@l -/* 800CA164 000C70C4 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 800CA160 000C70C0 38 E4 66 70 */ addi r7, r4, sIdentity__12CTransform4f@l +/* 800CA164 000C70C4 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 800CA168 000C70C8 90 A1 00 14 */ stw r5, 0x14(r1) /* 800CA16C 000C70CC FC 20 F8 90 */ fmr f1, f31 /* 800CA170 000C70D0 C8 42 8E 40 */ lfd f2, lbl_805AAB60@sda21(r2) @@ -5888,19 +5888,19 @@ lbl_800CA580: /* 800CA644 000C75A4 A3 42 C5 FC */ lhz r26, lbl_805AE31C@sda21(r2) /* 800CA648 000C75A8 B0 01 00 34 */ sth r0, 0x34(r1) /* 800CA64C 000C75AC 48 27 F9 69 */ bl Black__6CColorFv -/* 800CA650 000C75B0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800CA650 000C75B0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800CA654 000C75B4 7C 7D 1B 78 */ mr r29, r3 -/* 800CA658 000C75B8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800CA658 000C75B8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800CA65C 000C75BC 38 61 00 9C */ addi r3, r1, 0x9c /* 800CA660 000C75C0 38 A1 00 48 */ addi r5, r1, 0x48 /* 800CA664 000C75C4 48 00 FF 81 */ bl ConvertEditorEulerToTransform4f__FRC9CVector3fRC9CVector3f /* 800CA668 000C75C8 93 A1 00 08 */ stw r29, 8(r1) /* 800CA66C 000C75CC 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 800CA670 000C75D0 C0 42 8E 28 */ lfs f2, lbl_805AAB48@sda21(r2) -/* 800CA674 000C75D4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800CA674 000C75D4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800CA678 000C75D8 90 01 00 0C */ stw r0, 0xc(r1) /* 800CA67C 000C75DC 38 81 00 80 */ addi r4, r1, 0x80 -/* 800CA680 000C75E0 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 800CA680 000C75E0 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 800CA684 000C75E4 38 00 FF FF */ li r0, -1 /* 800CA688 000C75E8 90 81 00 10 */ stw r4, 0x10(r1) /* 800CA68C 000C75EC FC 20 F8 90 */ fmr f1, f31 @@ -6410,8 +6410,8 @@ lbl_800CADE4: lbl_800CADF8: /* 800CADF8 000C7D58 38 80 00 00 */ li r4, 0 lbl_800CADFC: -/* 800CADFC 000C7D5C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800CAE00 000C7D60 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800CADFC 000C7D5C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800CAE00 000C7D60 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800CAE04 000C7D64 38 00 00 00 */ li r0, 0 /* 800CAE08 000C7D68 FC 07 00 00 */ fcmpu cr0, f7, f0 /* 800CAE0C 000C7D6C 40 82 00 28 */ bne lbl_800CAE34 @@ -11007,8 +11007,8 @@ lbl_800CF118: /* 800CF118 000CC078 3C 1F BE B2 */ addis r0, r31, 0xbeb2 /* 800CF11C 000CC07C 28 00 43 53 */ cmplwi r0, 0x4353 /* 800CF120 000CC080 40 82 01 B4 */ bne lbl_800CF2D4 -/* 800CF124 000CC084 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800CF128 000CC088 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800CF124 000CC084 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800CF128 000CC088 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800CF12C 000CC08C C0 61 02 B4 */ lfs f3, 0x2b4(r1) /* 800CF130 000CC090 38 00 00 04 */ li r0, 4 /* 800CF134 000CC094 C0 41 02 B8 */ lfs f2, 0x2b8(r1) @@ -15277,8 +15277,8 @@ lbl_800D2E70: /* 800D2FA0 000CFF00 3B 40 00 01 */ li r26, 1 /* 800D2FA4 000CFF04 4B F7 A1 39 */ bl AllocateUniqueId__13CStateManagerFv /* 800D2FA8 000CFF08 A0 01 00 30 */ lhz r0, 0x30(r1) -/* 800D2FAC 000CFF0C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800D2FB0 000CFF10 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800D2FAC 000CFF0C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800D2FB0 000CFF10 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800D2FB4 000CFF14 A3 82 C5 FC */ lhz r28, lbl_805AE31C@sda21(r2) /* 800D2FB8 000CFF18 B0 01 00 34 */ sth r0, 0x34(r1) /* 800D2FBC 000CFF1C 38 61 00 98 */ addi r3, r1, 0x98 @@ -15451,8 +15451,8 @@ lbl_800D31AC: /* 800D3234 000D0194 B0 01 00 38 */ sth r0, 0x38(r1) /* 800D3238 000D0198 48 27 6D 7D */ bl Black__6CColorFv /* 800D323C 000D019C 90 61 00 08 */ stw r3, 8(r1) -/* 800D3240 000D01A0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800D3244 000D01A4 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 800D3240 000D01A0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800D3244 000D01A4 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 800D3248 000D01A8 38 01 00 54 */ addi r0, r1, 0x54 /* 800D324C 000D01AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D3250 000D01B0 FC 20 F8 90 */ fmr f1, f31 @@ -18242,9 +18242,9 @@ lbl_800D5B40: /* 800D5B78 000D2AD8 38 80 FF FF */ li r4, -1 /* 800D5B7C 000D2ADC 48 04 0E D1 */ bl __dt__10CModelDataFv lbl_800D5B80: -/* 800D5B80 000D2AE0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800D5B80 000D2AE0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800D5B84 000D2AE4 C0 21 00 94 */ lfs f1, 0x94(r1) -/* 800D5B88 000D2AE8 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800D5B88 000D2AE8 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800D5B8C 000D2AEC 38 00 00 00 */ li r0, 0 /* 800D5B90 000D2AF0 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800D5B94 000D2AF4 40 82 00 28 */ bne lbl_800D5BBC @@ -19220,9 +19220,9 @@ lbl_800D698C: /* 800D69BC 000D391C 98 01 00 8C */ stb r0, 0x8c(r1) /* 800D69C0 000D3920 90 01 00 90 */ stw r0, 0x90(r1) /* 800D69C4 000D3924 48 04 01 91 */ bl __ct__10CModelDataFRC8CAnimRes -/* 800D69C8 000D3928 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800D69C8 000D3928 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800D69CC 000D392C C0 21 00 48 */ lfs f1, 0x48(r1) -/* 800D69D0 000D3930 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800D69D0 000D3930 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800D69D4 000D3934 38 00 00 00 */ li r0, 0 /* 800D69D8 000D3938 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800D69DC 000D393C 40 82 00 28 */ bne lbl_800D6A04 @@ -20043,9 +20043,9 @@ lbl_800D75A4: /* 800D75DC 000D453C 38 80 FF FF */ li r4, -1 /* 800D75E0 000D4540 48 03 F4 6D */ bl __dt__10CModelDataFv lbl_800D75E4: -/* 800D75E4 000D4544 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800D75E4 000D4544 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800D75E8 000D4548 C0 21 00 58 */ lfs f1, 0x58(r1) -/* 800D75EC 000D454C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800D75EC 000D454C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800D75F0 000D4550 38 00 00 00 */ li r0, 0 /* 800D75F4 000D4554 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800D75F8 000D4558 40 82 00 28 */ bne lbl_800D7620 @@ -20376,9 +20376,9 @@ lbl_800D7A8C: /* 800D7AC4 000D4A24 38 80 FF FF */ li r4, -1 /* 800D7AC8 000D4A28 48 03 EF 85 */ bl __dt__10CModelDataFv lbl_800D7ACC: -/* 800D7ACC 000D4A2C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800D7ACC 000D4A2C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800D7AD0 000D4A30 C0 21 00 78 */ lfs f1, 0x78(r1) -/* 800D7AD4 000D4A34 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800D7AD4 000D4A34 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800D7AD8 000D4A38 38 00 00 00 */ li r0, 0 /* 800D7ADC 000D4A3C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800D7AE0 000D4A40 40 82 00 28 */ bne lbl_800D7B08 @@ -20716,9 +20716,9 @@ lbl_800D7FA8: /* 800D7FA8 000D4F08 7F 44 D3 78 */ mr r4, r26 /* 800D7FAC 000D4F0C 38 61 00 50 */ addi r3, r1, 0x50 /* 800D7FB0 000D4F10 48 23 CB DD */ bl __ct__9CVector3fFR12CInputStream -/* 800D7FB4 000D4F14 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800D7FB4 000D4F14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800D7FB8 000D4F18 7F 44 D3 78 */ mr r4, r26 -/* 800D7FBC 000D4F1C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800D7FBC 000D4F1C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800D7FC0 000D4F20 38 61 00 38 */ addi r3, r1, 0x38 /* 800D7FC4 000D4F24 C0 45 00 00 */ lfs f2, 0(r5) /* 800D7FC8 000D4F28 C0 25 00 04 */ lfs f1, 4(r5) @@ -22190,9 +22190,9 @@ TransformDamageableTriggerFlags__FR13CStateManager7TAreaIdUi: /* 800D9558 000D64B8 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 800D955C 000D64BC 3B E0 00 00 */ li r31, 0 /* 800D9560 000D64C0 41 82 00 24 */ beq lbl_800D9584 -/* 800D9564 000D64C4 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 800D9564 000D64C4 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 800D9568 000D64C8 38 61 00 48 */ addi r3, r1, 0x48 -/* 800D956C 000D64CC 38 A4 67 24 */ addi r5, r4, lbl_805A6724@l +/* 800D956C 000D64CC 38 A4 67 24 */ addi r5, r4, sForwardVector__9CVector3f@l /* 800D9570 000D64D0 38 81 00 84 */ addi r4, r1, 0x84 /* 800D9574 000D64D4 48 23 95 75 */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D9578 000D64D8 38 61 00 48 */ addi r3, r1, 0x48 @@ -22201,9 +22201,9 @@ TransformDamageableTriggerFlags__FR13CStateManager7TAreaIdUi: lbl_800D9584: /* 800D9584 000D64E4 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 800D9588 000D64E8 41 82 00 24 */ beq lbl_800D95AC -/* 800D958C 000D64EC 3C 80 80 5A */ lis r4, lbl_805A6730@ha +/* 800D958C 000D64EC 3C 80 80 5A */ lis r4, sBackVector__9CVector3f@ha /* 800D9590 000D64F0 38 61 00 3C */ addi r3, r1, 0x3c -/* 800D9594 000D64F4 38 A4 67 30 */ addi r5, r4, lbl_805A6730@l +/* 800D9594 000D64F4 38 A4 67 30 */ addi r5, r4, sBackVector__9CVector3f@l /* 800D9598 000D64F8 38 81 00 84 */ addi r4, r1, 0x84 /* 800D959C 000D64FC 48 23 95 4D */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D95A0 000D6500 38 61 00 3C */ addi r3, r1, 0x3c @@ -22212,9 +22212,9 @@ lbl_800D9584: lbl_800D95AC: /* 800D95AC 000D650C 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d /* 800D95B0 000D6510 41 82 00 24 */ beq lbl_800D95D4 -/* 800D95B4 000D6514 3C 80 80 5A */ lis r4, lbl_805A670C@ha +/* 800D95B4 000D6514 3C 80 80 5A */ lis r4, sLeftVector__9CVector3f@ha /* 800D95B8 000D6518 38 61 00 30 */ addi r3, r1, 0x30 -/* 800D95BC 000D651C 38 A4 67 0C */ addi r5, r4, lbl_805A670C@l +/* 800D95BC 000D651C 38 A4 67 0C */ addi r5, r4, sLeftVector__9CVector3f@l /* 800D95C0 000D6520 38 81 00 84 */ addi r4, r1, 0x84 /* 800D95C4 000D6524 48 23 95 25 */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D95C8 000D6528 38 61 00 30 */ addi r3, r1, 0x30 @@ -22223,9 +22223,9 @@ lbl_800D95AC: lbl_800D95D4: /* 800D95D4 000D6534 57 C0 07 39 */ rlwinm. r0, r30, 0, 0x1c, 0x1c /* 800D95D8 000D6538 41 82 00 24 */ beq lbl_800D95FC -/* 800D95DC 000D653C 3C 80 80 5A */ lis r4, lbl_805A6718@ha +/* 800D95DC 000D653C 3C 80 80 5A */ lis r4, sRightVector__9CVector3f@ha /* 800D95E0 000D6540 38 61 00 24 */ addi r3, r1, 0x24 -/* 800D95E4 000D6544 38 A4 67 18 */ addi r5, r4, lbl_805A6718@l +/* 800D95E4 000D6544 38 A4 67 18 */ addi r5, r4, sRightVector__9CVector3f@l /* 800D95E8 000D6548 38 81 00 84 */ addi r4, r1, 0x84 /* 800D95EC 000D654C 48 23 94 FD */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D95F0 000D6550 38 61 00 24 */ addi r3, r1, 0x24 @@ -22234,9 +22234,9 @@ lbl_800D95D4: lbl_800D95FC: /* 800D95FC 000D655C 57 C0 06 F7 */ rlwinm. r0, r30, 0, 0x1b, 0x1b /* 800D9600 000D6560 41 82 00 24 */ beq lbl_800D9624 -/* 800D9604 000D6564 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 800D9604 000D6564 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 800D9608 000D6568 38 61 00 18 */ addi r3, r1, 0x18 -/* 800D960C 000D656C 38 A4 66 F4 */ addi r5, r4, lbl_805A66F4@l +/* 800D960C 000D656C 38 A4 66 F4 */ addi r5, r4, sUpVector__9CVector3f@l /* 800D9610 000D6570 38 81 00 84 */ addi r4, r1, 0x84 /* 800D9614 000D6574 48 23 94 D5 */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D9618 000D6578 38 61 00 18 */ addi r3, r1, 0x18 @@ -22245,9 +22245,9 @@ lbl_800D95FC: lbl_800D9624: /* 800D9624 000D6584 57 C0 06 B5 */ rlwinm. r0, r30, 0, 0x1a, 0x1a /* 800D9628 000D6588 41 82 00 24 */ beq lbl_800D964C -/* 800D962C 000D658C 3C 80 80 5A */ lis r4, lbl_805A6700@ha +/* 800D962C 000D658C 3C 80 80 5A */ lis r4, sDownVector__9CVector3f@ha /* 800D9630 000D6590 38 61 00 0C */ addi r3, r1, 0xc -/* 800D9634 000D6594 38 A4 67 00 */ addi r5, r4, lbl_805A6700@l +/* 800D9634 000D6594 38 A4 67 00 */ addi r5, r4, sDownVector__9CVector3f@l /* 800D9638 000D6598 38 81 00 84 */ addi r4, r1, 0x84 /* 800D963C 000D659C 48 23 94 AD */ bl __ml__12CTransform4fCFRC9CVector3f /* 800D9640 000D65A0 38 61 00 0C */ addi r3, r1, 0xc @@ -22405,9 +22405,9 @@ lbl_800D97F4: /* 800D985C 000D67BC 7F 24 CB 78 */ mr r4, r25 /* 800D9860 000D67C0 38 61 00 A0 */ addi r3, r1, 0xa0 /* 800D9864 000D67C4 48 23 93 DD */ bl GetRotation__12CTransform4fCFv -/* 800D9868 000D67C8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800D9868 000D67C8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800D986C 000D67CC 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 800D9870 000D67D0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800D9870 000D67D0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800D9874 000D67D4 48 23 94 B5 */ bl sub_80312d28 /* 800D9878 000D67D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D987C 000D67DC 41 82 01 3C */ beq lbl_800D99B8 @@ -22467,8 +22467,8 @@ lbl_800D97F4: /* 800D9954 000D68B4 D0 01 00 38 */ stfs f0, 0x38(r1) /* 800D9958 000D68B8 4B F7 37 85 */ bl AllocateUniqueId__13CStateManagerFv /* 800D995C 000D68BC A0 01 00 20 */ lhz r0, 0x20(r1) -/* 800D9960 000D68C0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800D9964 000D68C4 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 800D9960 000D68C0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800D9964 000D68C4 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 800D9968 000D68C8 38 80 00 01 */ li r4, 1 /* 800D996C 000D68CC B0 01 00 24 */ sth r0, 0x24(r1) /* 800D9970 000D68D0 57 E0 06 3E */ clrlwi r0, r31, 0x18 diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index 74031638..bac5e23f 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -1304,9 +1304,9 @@ lbl_802A01C8: /* 802A0220 0029D180 B0 01 00 18 */ sth r0, 0x18(r1) /* 802A0224 0029D184 B0 01 00 1C */ sth r0, 0x1c(r1) /* 802A0228 0029D188 4B E2 32 21 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 802A022C 0029D18C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802A022C 0029D18C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802A0230 0029D190 7F E3 FB 78 */ mr r3, r31 -/* 802A0234 0029D194 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 802A0234 0029D194 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 802A0238 0029D198 38 A1 00 14 */ addi r5, r1, 0x14 /* 802A023C 0029D19C 38 81 00 1C */ addi r4, r1, 0x1c /* 802A0240 0029D1A0 38 C1 00 0C */ addi r6, r1, 0xc diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index 264fb031..6d2560e3 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -382,8 +382,8 @@ Touch__5CFireFR6CActorR13CStateManager: /* 8025D0C0 0025A020 39 40 00 00 */ li r10, 0 /* 8025D0C4 0025A024 38 00 00 03 */ li r0, 3 /* 8025D0C8 0025A028 90 81 00 24 */ stw r4, 0x24(r1) -/* 8025D0CC 0025A02C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8025D0D0 0025A030 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8025D0CC 0025A02C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8025D0D0 0025A030 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8025D0D4 0025A034 38 A1 00 14 */ addi r5, r1, 0x14 /* 8025D0D8 0025A038 90 61 00 20 */ stw r3, 0x20(r1) /* 8025D0DC 0025A03C 38 81 00 1C */ addi r4, r1, 0x1c diff --git a/asm/MetroidPrime/ScriptObjects/CFishCloud.s b/asm/MetroidPrime/ScriptObjects/CFishCloud.s index 2b8ca78e..2ca13fbe 100644 --- a/asm/MetroidPrime/ScriptObjects/CFishCloud.s +++ b/asm/MetroidPrime/ScriptObjects/CFishCloud.s @@ -1081,9 +1081,9 @@ sub_801cef10: /* 801CEF98 001CBEF8 38 61 00 2C */ addi r3, r1, 0x2c /* 801CEF9C 001CBEFC 38 81 00 50 */ addi r4, r1, 0x50 /* 801CEFA0 001CBF00 48 14 58 B1 */ bl AsNormalized__9CVector3fCFv -/* 801CEFA4 001CBF04 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801CEFA4 001CBF04 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801CEFA8 001CBF08 C0 61 00 30 */ lfs f3, 0x30(r1) -/* 801CEFAC 001CBF0C 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 801CEFAC 001CBF0C 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 801CEFB0 001CBF10 C0 81 00 34 */ lfs f4, 0x34(r1) /* 801CEFB4 001CBF14 C0 A3 00 04 */ lfs f5, 4(r3) /* 801CEFB8 001CBF18 38 81 00 20 */ addi r4, r1, 0x20 @@ -1102,8 +1102,8 @@ sub_801cef10: /* 801CEFEC 001CBF4C 48 00 00 6C */ b lbl_801CF058 lbl_801CEFF0: /* 801CEFF0 001CBF50 C0 02 AB B4 */ lfs f0, lbl_805AC8D4@sda21(r2) -/* 801CEFF4 001CBF54 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 801CEFF8 001CBF58 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 801CEFF4 001CBF54 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 801CEFF8 001CBF58 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 801CEFFC 001CBF5C C0 41 00 54 */ lfs f2, 0x54(r1) /* 801CF000 001CBF60 EC 60 F8 24 */ fdivs f3, f0, f31 /* 801CF004 001CBF64 C0 21 00 58 */ lfs f1, 0x58(r1) @@ -1958,9 +1958,9 @@ sub_801cfbd4: /* 801CFC14 001CCB74 C0 62 AB E4 */ lfs f3, lbl_805AC904@sda21(r2) /* 801CFC18 001CCB78 39 20 00 14 */ li r9, 0x14 /* 801CFC1C 001CCB7C 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) -/* 801CFC20 001CCB80 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801CFC20 001CCB80 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801CFC24 001CCB84 D0 A1 00 0C */ stfs f5, 0xc(r1) -/* 801CFC28 001CCB88 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801CFC28 001CCB88 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801CFC2C 001CCB8C C0 46 00 00 */ lfs f2, 0(r6) /* 801CFC30 001CCB90 38 61 00 08 */ addi r3, r1, 8 /* 801CFC34 001CCB94 D0 A1 00 10 */ stfs f5, 0x10(r1) @@ -2117,8 +2117,8 @@ lbl_801CFE50: /* 801CFE6C 001CCDCC 4E 80 04 21 */ bctrl /* 801CFE70 001CCDD0 48 13 CB 0D */ bl DisableAllLights__9CGraphicsFv /* 801CFE74 001CCDD4 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 801CFE78 001CCDD8 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801CFE7C 001CCDDC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801CFE78 001CCDD8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801CFE7C 001CCDDC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801CFE80 001CCDE0 81 83 00 00 */ lwz r12, 0(r3) /* 801CFE84 001CCDE4 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801CFE88 001CCDE8 7D 89 03 A6 */ mtctr r12 @@ -2130,8 +2130,8 @@ lbl_801CFE98: /* 801CFE9C 001CCDFC 28 00 00 00 */ cmplwi r0, 0 /* 801CFEA0 001CCE00 41 82 00 74 */ beq lbl_801CFF14 /* 801CFEA4 001CCE04 C0 1C 00 18 */ lfs f0, 0x18(r28) -/* 801CFEA8 001CCE08 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 801CFEAC 001CCE0C 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801CFEA8 001CCE08 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 801CFEAC 001CCE0C 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801CFEB0 001CCE10 7F 84 E3 78 */ mr r4, r28 /* 801CFEB4 001CCE14 D0 1F 00 00 */ stfs f0, 0(r31) /* 801CFEB8 001CCE18 38 61 00 2C */ addi r3, r1, 0x2c @@ -2219,9 +2219,9 @@ sub_801cff50: /* 801CFFE8 001CCF48 4B EA 7C A5 */ bl sub_80077c8c lbl_801CFFEC: /* 801CFFEC 001CCF4C C0 38 00 04 */ lfs f1, 4(r24) -/* 801CFFF0 001CCF50 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801CFFF0 001CCF50 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801CFFF4 001CCF54 C0 18 00 10 */ lfs f0, 0x10(r24) -/* 801CFFF8 001CCF58 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801CFFF8 001CCF58 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801CFFFC 001CCF5C C0 78 00 08 */ lfs f3, 8(r24) /* 801D0000 001CCF60 7F 04 C3 78 */ mr r4, r24 /* 801D0004 001CCF64 EC 81 00 2A */ fadds f4, f1, f0 @@ -4718,8 +4718,8 @@ lbl_801D23CC: /* 801D23CC 001CF32C 54 03 04 3E */ clrlwi r3, r0, 0x10 /* 801D23D0 001CF330 48 11 65 E1 */ bl TranslateSFXID__11CSfxManagerFUs /* 801D23D4 001CF334 B0 6F 02 34 */ sth r3, 0x234(r15) -/* 801D23D8 001CF338 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801D23DC 001CF33C 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 801D23D8 001CF338 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801D23DC 001CF33C 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 801D23E0 001CF340 38 C0 00 00 */ li r6, 0 /* 801D23E4 001CF344 C0 05 00 00 */ lfs f0, 0(r5) /* 801D23E8 001CF348 38 6F 01 08 */ addi r3, r15, 0x108 diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index c5c907d8..71c88a0c 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -438,8 +438,8 @@ lbl_8012FEDC: /* 8012FF60 0012CEC0 38 C1 00 1C */ addi r6, r1, 0x1c /* 8012FF64 0012CEC4 4B F2 15 21 */ bl "__ct__11CEntityInfoF7TAreaIdRCQ24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>9TEditorId" /* 8012FF68 0012CEC8 A0 16 00 00 */ lhz r0, 0(r22) -/* 8012FF6C 0012CECC 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 8012FF70 0012CED0 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 8012FF6C 0012CECC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 8012FF70 0012CED0 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 8012FF74 0012CED4 7E E6 BB 78 */ mr r6, r23 /* 8012FF78 0012CED8 B0 01 00 08 */ sth r0, 8(r1) /* 8012FF7C 0012CEDC 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptActor.s b/asm/MetroidPrime/ScriptObjects/CScriptActor.s index 8a737ea7..3c9e05f5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptActor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptActor.s @@ -778,8 +778,8 @@ lbl_80075890: /* 80075924 00072884 4B FA 5C 11 */ bl Identity__10CAxisAngleFv /* 80075928 00072888 7C 7F 1B 78 */ mr r31, r3 /* 8007592C 0007288C 4B FA 5C 09 */ bl Identity__10CAxisAngleFv -/* 80075930 00072890 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80075934 00072894 C4 64 66 A0 */ lfsu f3, skZero3f@l(r4) +/* 80075930 00072890 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80075934 00072894 C4 64 66 A0 */ lfsu f3, sZeroVector__9CVector3f@l(r4) /* 80075938 00072898 A1 70 00 00 */ lhz r11, 0(r16) /* 8007593C 0007289C 38 01 00 1C */ addi r0, r1, 0x1c /* 80075940 000728A0 C0 84 00 04 */ lfs f4, 4(r4) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s index e72f15b5..12da7c3e 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptBallTrigger.s @@ -394,9 +394,9 @@ lbl_80176910: /* 801769D8 00173938 B0 01 00 18 */ sth r0, 0x18(r1) /* 801769DC 0017393C 48 00 00 FD */ bl calculate_ball_aabox__Fv /* 801769E0 00173940 38 00 10 00 */ li r0, 0x1000 -/* 801769E4 00173944 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801769E4 00173944 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801769E8 00173948 90 01 00 08 */ stw r0, 8(r1) -/* 801769EC 0017394C 39 43 66 A0 */ addi r10, r3, skZero3f@l +/* 801769EC 0017394C 39 43 66 A0 */ addi r10, r3, sZeroVector__9CVector3f@l /* 801769F0 00173950 38 00 00 00 */ li r0, 0 /* 801769F4 00173954 7F A3 EB 78 */ mr r3, r29 /* 801769F8 00173958 93 81 00 0C */ stw r28, 0xc(r1) @@ -410,11 +410,11 @@ lbl_80176910: /* 80176A18 00173978 90 01 00 14 */ stw r0, 0x14(r1) /* 80176A1C 0017397C 4B F0 03 3D */ bl "__ct__14CScriptTriggerF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC9CVector3fRC6CAABoxRC11CDamageInfoRC9CVector3fUibbb" /* 80176A20 00173980 3C 80 80 3E */ lis r4, lbl_803E3E80@ha -/* 80176A24 00173984 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80176A24 00173984 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80176A28 00173988 38 04 3E 80 */ addi r0, r4, lbl_803E3E80@l /* 80176A2C 0017398C 38 80 00 00 */ li r4, 0 /* 80176A30 00173990 90 1D 00 00 */ stw r0, 0(r29) -/* 80176A34 00173994 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 80176A34 00173994 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 80176A38 00173998 7F C3 F3 78 */ mr r3, r30 /* 80176A3C 0017399C D3 BD 01 50 */ stfs f29, 0x150(r29) /* 80176A40 001739A0 D3 DD 01 54 */ stfs f30, 0x154(r29) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s index 05548142..13409e52 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHint.s @@ -209,9 +209,9 @@ lbl_800C4884: /* 800C4898 000C17F8 D0 41 00 70 */ stfs f2, 0x70(r1) lbl_800C489C: /* 800C489C 000C17FC C0 9A 00 60 */ lfs f4, 0x60(r26) -/* 800C48A0 000C1800 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800C48A0 000C1800 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800C48A4 000C1804 C0 7A 00 50 */ lfs f3, 0x50(r26) -/* 800C48A8 000C1808 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 800C48A8 000C1808 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 800C48AC 000C180C C0 5A 00 40 */ lfs f2, 0x40(r26) /* 800C48B0 000C1810 38 61 00 74 */ addi r3, r1, 0x74 /* 800C48B4 000C1814 C0 01 00 68 */ lfs f0, 0x68(r1) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s index 3221d111..9879237a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraHintTrigger.s @@ -198,9 +198,9 @@ lbl_8024B5B0: /* 8024B5B8 00248518 98 61 00 28 */ stb r3, 0x28(r1) /* 8024B5BC 0024851C 28 00 00 00 */ cmplwi r0, 0 /* 8024B5C0 00248520 41 82 00 54 */ beq lbl_8024B614 -/* 8024B5C4 00248524 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8024B5C4 00248524 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 8024B5C8 00248528 38 61 00 48 */ addi r3, r1, 0x48 -/* 8024B5CC 0024852C 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 8024B5CC 0024852C 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 8024B5D0 00248530 38 81 00 2C */ addi r4, r1, 0x2c /* 8024B5D4 00248534 48 08 A7 49 */ bl FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f /* 8024B5D8 00248538 38 61 00 84 */ addi r3, r1, 0x84 @@ -233,10 +233,10 @@ lbl_8024B61C: GetTouchBounds__24CScriptCameraHintTriggerCFv: /* 8024B634 00248594 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8024B638 00248598 7C 08 02 A6 */ mflr r0 -/* 8024B63C 0024859C 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 8024B63C 0024859C 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 8024B640 002485A0 38 84 00 E8 */ addi r4, r4, 0xe8 /* 8024B644 002485A4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8024B648 002485A8 38 A5 66 70 */ addi r5, r5, skIdentity4f@l +/* 8024B648 002485A8 38 A5 66 70 */ addi r5, r5, sIdentity__12CTransform4f@l /* 8024B64C 002485AC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8024B650 002485B0 7C 7F 1B 78 */ mr r31, r3 /* 8024B654 002485B4 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s index 97b4f676..5364d1f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptCameraPitchVolume.s @@ -196,9 +196,9 @@ lbl_802266B0: /* 802266B8 00223618 98 61 00 28 */ stb r3, 0x28(r1) /* 802266BC 0022361C 28 00 00 00 */ cmplwi r0, 0 /* 802266C0 00223620 41 82 00 54 */ beq lbl_80226714 -/* 802266C4 00223624 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802266C4 00223624 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802266C8 00223628 38 61 00 48 */ addi r3, r1, 0x48 -/* 802266CC 0022362C 38 A4 66 70 */ addi r5, r4, skIdentity4f@l +/* 802266CC 0022362C 38 A4 66 70 */ addi r5, r4, sIdentity__12CTransform4f@l /* 802266D0 00223630 38 81 00 2C */ addi r4, r1, 0x2c /* 802266D4 00223634 48 0A F6 49 */ bl FromAABox__6COBBoxFRC6CAABoxRC12CTransform4f /* 802266D8 00223638 38 61 00 84 */ addi r3, r1, 0x84 @@ -231,10 +231,10 @@ lbl_8022671C: GetTouchBounds__24CScriptCameraPitchVolumeCFv: /* 80226734 00223694 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80226738 00223698 7C 08 02 A6 */ mflr r0 -/* 8022673C 0022369C 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 8022673C 0022369C 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 80226740 002236A0 38 84 00 E8 */ addi r4, r4, 0xe8 /* 80226744 002236A4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80226748 002236A8 38 A5 66 70 */ addi r5, r5, skIdentity4f@l +/* 80226748 002236A8 38 A5 66 70 */ addi r5, r5, sIdentity__12CTransform4f@l /* 8022674C 002236AC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80226750 002236B0 7C 7F 1B 78 */ mr r31, r3 /* 80226754 002236B4 38 61 00 08 */ addi r3, r1, 8 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s index 1f88b954..aad522f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDamageableTrigger.s @@ -249,10 +249,10 @@ Render__24CScriptDamageableTriggerCFRC13CStateManager: /* 800FA7AC 000F770C 38 BE 01 E4 */ addi r5, r30, 0x1e4 /* 800FA7B0 000F7710 48 21 81 A1 */ bl __ml__12CTransform4fCFRC12CTransform4f /* 800FA7B4 000F7714 38 01 00 20 */ addi r0, r1, 0x20 -/* 800FA7B8 000F7718 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800FA7B8 000F7718 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800FA7BC 000F771C 90 01 00 08 */ stw r0, 8(r1) /* 800FA7C0 000F7720 39 00 00 00 */ li r8, 0 -/* 800FA7C4 000F7724 38 E3 66 70 */ addi r7, r3, skIdentity4f@l +/* 800FA7C4 000F7724 38 E3 66 70 */ addi r7, r3, sIdentity__12CTransform4f@l /* 800FA7C8 000F7728 38 01 00 24 */ addi r0, r1, 0x24 /* 800FA7CC 000F772C 91 01 00 0C */ stw r8, 0xc(r1) /* 800FA7D0 000F7730 38 7E 02 54 */ addi r3, r30, 0x254 @@ -1210,8 +1210,8 @@ lbl_800FB468: /* 800FB52C 000F848C D0 61 00 54 */ stfs f3, 0x54(r1) /* 800FB530 000F8490 48 23 CF D9 */ bl __ct__6CAABoxFRC9CVector3fRC9CVector3f /* 800FB534 000F8494 C0 3C 00 00 */ lfs f1, 0(r28) -/* 800FB538 000F8498 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800FB53C 000F849C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800FB538 000F8498 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800FB53C 000F849C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800FB540 000F84A0 C0 02 93 48 */ lfs f0, lbl_805AB068@sda21(r2) /* 800FB544 000F84A4 D0 3F 01 64 */ stfs f1, 0x164(r31) /* 800FB548 000F84A8 38 7F 01 E4 */ addi r3, r31, 0x1e4 @@ -1276,9 +1276,9 @@ lbl_800FB468: /* 800FB634 000F8594 92 BF 01 DC */ stw r21, 0x1dc(r31) /* 800FB638 000F8598 D0 1F 01 E0 */ stfs f0, 0x1e0(r31) /* 800FB63C 000F859C 48 21 75 39 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 800FB640 000F85A0 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800FB640 000F85A0 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800FB644 000F85A4 38 7F 02 14 */ addi r3, r31, 0x214 -/* 800FB648 000F85A8 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800FB648 000F85A8 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800FB64C 000F85AC 48 21 75 29 */ bl __ct__12CTransform4fFRC12CTransform4f /* 800FB650 000F85B0 C0 42 93 38 */ lfs f2, lbl_805AB058@sda21(r2) /* 800FB654 000F85B4 38 61 01 A8 */ addi r3, r1, 0x1a8 @@ -1413,9 +1413,9 @@ lbl_800FB838: /* 800FB838 000F8798 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b /* 800FB83C 000F879C 41 82 00 2C */ beq lbl_800FB868 /* 800FB840 000F87A0 C0 3F 01 60 */ lfs f1, 0x160(r31) -/* 800FB844 000F87A4 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800FB844 000F87A4 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800FB848 000F87A8 C0 02 93 38 */ lfs f0, lbl_805AB058@sda21(r2) -/* 800FB84C 000F87AC 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800FB84C 000F87AC 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800FB850 000F87B0 38 7F 01 E4 */ addi r3, r31, 0x1e4 /* 800FB854 000F87B4 D0 1F 02 44 */ stfs f0, 0x244(r31) /* 800FB858 000F87B8 D0 1F 02 48 */ stfs f0, 0x248(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s index f0fbfaee..f9c7ca70 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDebris.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDebris.s @@ -271,8 +271,8 @@ CollidedWith__13CScriptDebrisFRC9TUniqueIdRC18CCollisionInfoListR13CStateManager /* 800FB900 000F8860 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 800FB904 000F8864 41 82 00 18 */ beq lbl_800FB91C /* 800FB908 000F8868 C0 1E 02 70 */ lfs f0, 0x270(r30) -/* 800FB90C 000F886C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800FB910 000F8870 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800FB90C 000F886C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800FB910 000F8870 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800FB914 000F8874 D0 1E 02 74 */ stfs f0, 0x274(r30) /* 800FB918 000F8878 48 01 F3 89 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f lbl_800FB91C: @@ -961,8 +961,8 @@ lbl_800FC2E4: /* 800FC2F8 000F9258 D0 21 00 8C */ stfs f1, 0x8c(r1) lbl_800FC2FC: /* 800FC2FC 000F925C C0 07 00 00 */ lfs f0, 0(r7) -/* 800FC300 000F9260 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FC304 000F9264 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800FC300 000F9260 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FC304 000F9264 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800FC308 000F9268 38 A1 00 FC */ addi r5, r1, 0xfc /* 800FC30C 000F926C D0 01 00 F0 */ stfs f0, 0xf0(r1) /* 800FC310 000F9270 38 61 02 40 */ addi r3, r1, 0x240 @@ -1102,8 +1102,8 @@ lbl_800FC4F0: /* 800FC504 000F9464 D0 21 00 50 */ stfs f1, 0x50(r1) lbl_800FC508: /* 800FC508 000F9468 C0 07 00 00 */ lfs f0, 0(r7) -/* 800FC50C 000F946C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FC510 000F9470 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800FC50C 000F946C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FC510 000F9470 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800FC514 000F9474 38 A1 00 E4 */ addi r5, r1, 0xe4 /* 800FC518 000F9478 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 800FC51C 000F947C 38 61 01 E0 */ addi r3, r1, 0x1e0 @@ -1222,8 +1222,8 @@ lbl_800FC6B4: /* 800FC6C8 000F9628 D0 21 00 20 */ stfs f1, 0x20(r1) lbl_800FC6CC: /* 800FC6CC 000F962C C0 07 00 00 */ lfs f0, 0(r7) -/* 800FC6D0 000F9630 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FC6D4 000F9634 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800FC6D0 000F9630 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FC6D4 000F9634 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800FC6D8 000F9638 38 A1 00 CC */ addi r5, r1, 0xcc /* 800FC6DC 000F963C D0 01 00 C0 */ stfs f0, 0xc0(r1) /* 800FC6E0 000F9640 38 61 01 80 */ addi r3, r1, 0x180 @@ -1269,20 +1269,20 @@ lbl_800FC750: /* 800FC778 000F96D8 EC 02 00 2A */ fadds f0, f2, f0 /* 800FC77C 000F96DC FC 03 00 00 */ fcmpu cr0, f3, f0 /* 800FC780 000F96E0 40 82 00 20 */ bne lbl_800FC7A0 -/* 800FC784 000F96E4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 800FC788 000F96E8 C4 03 66 F4 */ lfsu f0, lbl_805A66F4@l(r3) +/* 800FC784 000F96E4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 800FC788 000F96E8 C4 03 66 F4 */ lfsu f0, sUpVector__9CVector3f@l(r3) /* 800FC78C 000F96EC D0 1D 02 C8 */ stfs f0, 0x2c8(r29) /* 800FC790 000F96F0 C0 03 00 04 */ lfs f0, 4(r3) /* 800FC794 000F96F4 D0 1D 02 CC */ stfs f0, 0x2cc(r29) /* 800FC798 000F96F8 C0 03 00 08 */ lfs f0, 8(r3) /* 800FC79C 000F96FC D0 1D 02 D0 */ stfs f0, 0x2d0(r29) lbl_800FC7A0: -/* 800FC7A0 000F9700 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 800FC7A0 000F9700 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 800FC7A4 000F9704 C0 1D 02 CC */ lfs f0, 0x2cc(r29) -/* 800FC7A8 000F9708 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l -/* 800FC7AC 000F970C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800FC7A8 000F9708 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l +/* 800FC7AC 000F970C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800FC7B0 000F9710 C0 26 00 04 */ lfs f1, 4(r6) -/* 800FC7B4 000F9714 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800FC7B4 000F9714 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800FC7B8 000F9718 C0 46 00 00 */ lfs f2, 0(r6) /* 800FC7BC 000F971C 38 61 01 20 */ addi r3, r1, 0x120 /* 800FC7C0 000F9720 EC 01 00 32 */ fmuls f0, f1, f0 @@ -1297,8 +1297,8 @@ lbl_800FC7A0: /* 800FC7E4 000F9744 FC 20 08 18 */ frsp f1, f1 /* 800FC7E8 000F9748 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FC7EC 000F974C 40 81 00 0C */ ble lbl_800FC7F8 -/* 800FC7F0 000F9750 3C C0 80 5A */ lis r6, lbl_805A6718@ha -/* 800FC7F4 000F9754 38 C6 67 18 */ addi r6, r6, lbl_805A6718@l +/* 800FC7F0 000F9750 3C C0 80 5A */ lis r6, sRightVector__9CVector3f@ha +/* 800FC7F4 000F9754 38 C6 67 18 */ addi r6, r6, sRightVector__9CVector3f@l lbl_800FC7F8: /* 800FC7F8 000F9758 48 21 73 19 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f /* 800FC7FC 000F975C 38 61 02 70 */ addi r3, r1, 0x270 @@ -1387,9 +1387,9 @@ lbl_800FC920: /* 800FC928 000F9888 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FC92C 000F988C 4C 41 13 82 */ cror 2, 1, 2 /* 800FC930 000F9890 40 82 00 D4 */ bne lbl_800FCA04 -/* 800FC934 000F9894 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800FC934 000F9894 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800FC938 000F9898 38 60 00 00 */ li r3, 0 -/* 800FC93C 000F989C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 800FC93C 000F989C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 800FC940 000F98A0 C0 05 00 00 */ lfs f0, 0(r5) /* 800FC944 000F98A4 38 80 00 01 */ li r4, 1 /* 800FC948 000F98A8 D0 1D 01 50 */ stfs f0, 0x150(r29) @@ -1728,9 +1728,9 @@ lbl_800FCD04: /* 800FCE00 000F9D60 4B F1 E7 35 */ bl Identity__10CAxisAngleFv /* 800FCE04 000F9D64 7C 6F 1B 78 */ mr r15, r3 /* 800FCE08 000F9D68 4B F1 E7 2D */ bl Identity__10CAxisAngleFv -/* 800FCE0C 000F9D6C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800FCE0C 000F9D6C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800FCE10 000F9D70 80 16 00 10 */ lwz r0, 0x10(r22) -/* 800FCE14 000F9D74 3A 04 66 A0 */ addi r16, r4, skZero3f@l +/* 800FCE14 000F9D74 3A 04 66 A0 */ addi r16, r4, sZeroVector__9CVector3f@l /* 800FCE18 000F9D78 C0 02 93 60 */ lfs f0, lbl_805AB080@sda21(r2) /* 800FCE1C 000F9D7C C0 50 00 00 */ lfs f2, 0(r16) /* 800FCE20 000F9D80 28 00 00 00 */ cmplwi r0, 0 @@ -1833,10 +1833,10 @@ lbl_800FCEF0: /* 800FCF98 000F9EF8 38 03 FD 78 */ addi r0, r3, lbl_803DFD78@l /* 800FCF9C 000F9EFC C0 62 93 64 */ lfs f3, lbl_805AB084@sda21(r2) /* 800FCFA0 000F9F00 90 11 00 00 */ stw r0, 0(r17) -/* 800FCFA4 000F9F04 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800FCFA4 000F9F04 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800FCFA8 000F9F08 38 00 00 00 */ li r0, 0 /* 800FCFAC 000F9F0C 38 A0 00 01 */ li r5, 1 -/* 800FCFB0 000F9F10 C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 800FCFB0 000F9F10 C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 800FCFB4 000F9F14 EC 5B 00 24 */ fdivs f2, f27, f0 /* 800FCFB8 000F9F18 D0 31 02 58 */ stfs f1, 0x258(r17) /* 800FCFBC 000F9F1C C0 30 00 04 */ lfs f1, 4(r16) @@ -2334,9 +2334,9 @@ lbl_800FD60C: /* 800FD718 000FA678 4B F1 DE 1D */ bl Identity__10CAxisAngleFv /* 800FD71C 000FA67C 7C 70 1B 78 */ mr r16, r3 /* 800FD720 000FA680 4B F1 DE 15 */ bl Identity__10CAxisAngleFv -/* 800FD724 000FA684 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800FD724 000FA684 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800FD728 000FA688 38 00 00 00 */ li r0, 0 -/* 800FD72C 000FA68C 3B 84 66 A0 */ addi r28, r4, skZero3f@l +/* 800FD72C 000FA68C 3B 84 66 A0 */ addi r28, r4, sZeroVector__9CVector3f@l /* 800FD730 000FA690 80 AD 89 1C */ lwz r5, lbl_805A74DC@sda21(r13) /* 800FD734 000FA694 C0 3C 00 00 */ lfs f1, 0(r28) /* 800FD738 000FA698 38 80 00 01 */ li r4, 1 @@ -2502,8 +2502,8 @@ lbl_800FD8AC: lbl_800FD9B0: /* 800FD9B0 000FA910 2C 19 00 01 */ cmpwi r25, 1 /* 800FD9B4 000FA914 40 82 00 10 */ bne lbl_800FD9C4 -/* 800FD9B8 000FA918 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800FD9BC 000FA91C 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800FD9B8 000FA918 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800FD9BC 000FA91C 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800FD9C0 000FA920 48 00 00 18 */ b lbl_800FD9D8 lbl_800FD9C4: /* 800FD9C4 000FA924 C0 02 93 94 */ lfs f0, lbl_805AB0B4@sda21(r2) @@ -2513,7 +2513,7 @@ lbl_800FD9C4: /* 800FD9D4 000FA934 D0 01 00 50 */ stfs f0, 0x50(r1) lbl_800FD9D8: /* 800FD9D8 000FA938 C0 04 00 00 */ lfs f0, 0(r4) -/* 800FD9DC 000FA93C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800FD9DC 000FA93C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800FD9E0 000FA940 38 00 00 00 */ li r0, 0 /* 800FD9E4 000FA944 38 BD 02 E0 */ addi r5, r29, 0x2e0 /* 800FD9E8 000FA948 D0 1D 02 BC */ stfs f0, 0x2bc(r29) @@ -2521,7 +2521,7 @@ lbl_800FD9D8: /* 800FD9F0 000FA950 D0 1D 02 C0 */ stfs f0, 0x2c0(r29) /* 800FD9F4 000FA954 C0 04 00 08 */ lfs f0, 8(r4) /* 800FD9F8 000FA958 D0 1D 02 C4 */ stfs f0, 0x2c4(r29) -/* 800FD9FC 000FA95C C0 03 66 A0 */ lfs f0, skZero3f@l(r3) +/* 800FD9FC 000FA95C C0 03 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r3) /* 800FDA00 000FA960 D0 1D 02 C8 */ stfs f0, 0x2c8(r29) /* 800FDA04 000FA964 C0 1C 00 04 */ lfs f0, 4(r28) /* 800FDA08 000FA968 D0 1D 02 CC */ stfs f0, 0x2cc(r29) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDock.s b/asm/MetroidPrime/ScriptObjects/CScriptDock.s index 22424b63..229c11f2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDock.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDock.s @@ -1102,8 +1102,8 @@ lbl_800C4410: /* 800C4478 000C13D8 4B F5 70 BD */ bl Identity__10CAxisAngleFv /* 800C447C 000C13DC 7C 75 1B 78 */ mr r21, r3 /* 800C4480 000C13E0 4B F5 70 B5 */ bl Identity__10CAxisAngleFv -/* 800C4484 000C13E4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800C4488 000C13E8 C5 04 66 A0 */ lfsu f8, skZero3f@l(r4) +/* 800C4484 000C13E4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800C4488 000C13E8 C5 04 66 A0 */ lfsu f8, sZeroVector__9CVector3f@l(r4) /* 800C448C 000C13EC C0 42 8E 14 */ lfs f2, lbl_805AAB34@sda21(r2) /* 800C4490 000C13F0 38 00 00 00 */ li r0, 0 /* 800C4494 000C13F4 C1 24 00 04 */ lfs f9, 4(r4) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s index daa058bf..4f49aecf 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptDoor.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptDoor.s @@ -1473,8 +1473,8 @@ lbl_8007F208: /* 8007F26C 0007C1CC 4B F9 C2 C9 */ bl Identity__10CAxisAngleFv /* 8007F270 0007C1D0 7C 71 1B 78 */ mr r17, r3 /* 8007F274 0007C1D4 4B F9 C2 C1 */ bl Identity__10CAxisAngleFv -/* 8007F278 0007C1D8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8007F27C 0007C1DC C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8007F278 0007C1D8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8007F27C 0007C1DC C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8007F280 0007C1E0 C0 02 89 70 */ lfs f0, lbl_805AA690@sda21(r2) /* 8007F284 0007C1E4 28 1C 00 00 */ cmplwi r28, 0 /* 8007F288 0007C1E8 C0 64 00 04 */ lfs f3, 4(r4) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s index 82291d67..aa9c5a6f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptEffect.s @@ -360,8 +360,8 @@ lbl_8008DDB4: /* 8008DDC4 0008AD24 28 00 00 00 */ cmplwi r0, 0 /* 8008DDC8 0008AD28 41 82 00 C8 */ beq lbl_8008DE90 lbl_8008DDCC: -/* 8008DDCC 0008AD2C 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 8008DDD0 0008AD30 C4 A3 67 54 */ lfsu f5, lbl_805A6754@l(r3) +/* 8008DDCC 0008AD2C 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 8008DDD0 0008AD30 C4 A3 67 54 */ lfsu f5, mskInvertedBox__6CAABox@l(r3) /* 8008DDD4 0008AD34 28 04 00 00 */ cmplwi r4, 0 /* 8008DDD8 0008AD38 C0 83 00 04 */ lfs f4, 4(r3) /* 8008DDDC 0008AD3C C0 63 00 08 */ lfs f3, 8(r3) @@ -1079,9 +1079,9 @@ lbl_8008E7C4: /* 8008E7C4 0008B724 38 61 01 2C */ addi r3, r1, 0x12c /* 8008E7C8 0008B728 38 9F 00 34 */ addi r4, r31, 0x34 /* 8008E7CC 0008B72C 48 28 43 A9 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008E7D0 0008B730 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008E7D0 0008B730 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008E7D4 0008B734 38 61 01 8C */ addi r3, r1, 0x18c -/* 8008E7D8 0008B738 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008E7D8 0008B738 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008E7DC 0008B73C 38 81 01 2C */ addi r4, r1, 0x12c /* 8008E7E0 0008B740 C0 45 00 00 */ lfs f2, 0(r5) /* 8008E7E4 0008B744 C0 25 00 04 */ lfs f1, 4(r5) @@ -1184,9 +1184,9 @@ lbl_8008E958: /* 8008E958 0008B8B8 38 61 00 FC */ addi r3, r1, 0xfc /* 8008E95C 0008B8BC 38 9F 00 34 */ addi r4, r31, 0x34 /* 8008E960 0008B8C0 48 28 42 15 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008E964 0008B8C4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008E964 0008B8C4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008E968 0008B8C8 38 61 01 5C */ addi r3, r1, 0x15c -/* 8008E96C 0008B8CC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008E96C 0008B8CC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008E970 0008B8D0 38 81 00 FC */ addi r4, r1, 0xfc /* 8008E974 0008B8D4 C0 45 00 00 */ lfs f2, 0(r5) /* 8008E978 0008B8D8 C0 25 00 04 */ lfs f1, 4(r5) @@ -1473,9 +1473,9 @@ Think__13CScriptEffectFfR13CStateManager: /* 8008ED6C 0008BCCC 38 61 00 84 */ addi r3, r1, 0x84 /* 8008ED70 0008BCD0 38 9E 00 34 */ addi r4, r30, 0x34 /* 8008ED74 0008BCD4 48 28 3E 01 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008ED78 0008BCD8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008ED78 0008BCD8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008ED7C 0008BCDC 38 61 00 E4 */ addi r3, r1, 0xe4 -/* 8008ED80 0008BCE0 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008ED80 0008BCE0 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008ED84 0008BCE4 38 81 00 84 */ addi r4, r1, 0x84 /* 8008ED88 0008BCE8 C0 45 00 00 */ lfs f2, 0(r5) /* 8008ED8C 0008BCEC C0 25 00 04 */ lfs f1, 4(r5) @@ -1509,9 +1509,9 @@ lbl_8008EDEC: /* 8008EDF8 0008BD58 38 61 00 54 */ addi r3, r1, 0x54 /* 8008EDFC 0008BD5C 38 9E 00 34 */ addi r4, r30, 0x34 /* 8008EE00 0008BD60 48 28 3D 75 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008EE04 0008BD64 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008EE04 0008BD64 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008EE08 0008BD68 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 8008EE0C 0008BD6C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008EE0C 0008BD6C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008EE10 0008BD70 38 81 00 54 */ addi r4, r1, 0x54 /* 8008EE14 0008BD74 C0 45 00 00 */ lfs f2, 0(r5) /* 8008EE18 0008BD78 C0 25 00 04 */ lfs f1, 4(r5) @@ -2025,9 +2025,9 @@ lbl_8008F5A8: /* 8008F5A8 0008C508 7E 64 9B 78 */ mr r4, r19 /* 8008F5AC 0008C50C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8008F5B0 0008C510 48 28 35 C5 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008F5B4 0008C514 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008F5B4 0008C514 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008F5B8 0008C518 38 61 01 28 */ addi r3, r1, 0x128 -/* 8008F5BC 0008C51C 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008F5BC 0008C51C 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008F5C0 0008C520 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8008F5C4 0008C524 C0 45 00 00 */ lfs f2, 0(r5) /* 8008F5C8 0008C528 C0 25 00 04 */ lfs f1, 4(r5) @@ -2149,9 +2149,9 @@ lbl_8008F788: /* 8008F788 0008C6E8 7E 64 9B 78 */ mr r4, r19 /* 8008F78C 0008C6EC 38 61 00 98 */ addi r3, r1, 0x98 /* 8008F790 0008C6F0 48 28 33 E5 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8008F794 0008C6F4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8008F794 0008C6F4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8008F798 0008C6F8 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8008F79C 0008C6FC 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 8008F79C 0008C6FC 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 8008F7A0 0008C700 38 81 00 98 */ addi r4, r1, 0x98 /* 8008F7A4 0008C704 C0 45 00 00 */ lfs f2, 0(r5) /* 8008F7A8 0008C708 C0 25 00 04 */ lfs f1, 4(r5) @@ -2243,8 +2243,8 @@ lbl_8008F850: lbl_8008F8F0: /* 8008F8F0 0008C850 28 1E 00 00 */ cmplwi r30, 0 /* 8008F8F4 0008C854 41 82 00 20 */ beq lbl_8008F914 -/* 8008F8F8 0008C858 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8008F8FC 0008C85C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8008F8F8 0008C858 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8008F8FC 0008C85C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8008F900 0008C860 90 1E 00 00 */ stw r0, 0(r30) /* 8008F904 0008C864 41 82 00 10 */ beq lbl_8008F914 /* 8008F908 0008C868 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -2282,11 +2282,11 @@ lbl_8008F924: /* 8008F974 0008C8D4 28 03 00 00 */ cmplwi r3, 0 /* 8008F978 0008C8D8 41 82 00 2C */ beq lbl_8008F9A4 /* 8008F97C 0008C8DC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8008F980 0008C8E0 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8008F980 0008C8E0 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8008F984 0008C8E4 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8008F988 0008C8E8 3C 80 80 3E */ lis r4, lbl_803DACB0@ha /* 8008F98C 0008C8EC 90 03 00 00 */ stw r0, 0(r3) -/* 8008F990 0008C8F0 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8008F990 0008C8F0 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8008F994 0008C8F4 38 04 AC B0 */ addi r0, r4, lbl_803DACB0@l /* 8008F998 0008C8F8 90 A3 00 00 */ stw r5, 0(r3) /* 8008F99C 0008C8FC 93 E3 00 04 */ stw r31, 4(r3) @@ -2325,8 +2325,8 @@ lbl_8008F9A4: lbl_8008FA10: /* 8008FA10 0008C970 28 1E 00 00 */ cmplwi r30, 0 /* 8008FA14 0008C974 41 82 00 20 */ beq lbl_8008FA34 -/* 8008FA18 0008C978 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 8008FA1C 0008C97C 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8008FA18 0008C978 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 8008FA1C 0008C97C 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8008FA20 0008C980 90 1E 00 00 */ stw r0, 0(r30) /* 8008FA24 0008C984 41 82 00 10 */ beq lbl_8008FA34 /* 8008FA28 0008C988 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -2364,11 +2364,11 @@ lbl_8008FA44: /* 8008FA94 0008C9F4 28 03 00 00 */ cmplwi r3, 0 /* 8008FA98 0008C9F8 41 82 00 2C */ beq lbl_8008FAC4 /* 8008FA9C 0008C9FC 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 8008FAA0 0008CA00 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 8008FAA0 0008CA00 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 8008FAA4 0008CA04 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 8008FAA8 0008CA08 3C 80 80 3E */ lis r4, lbl_803DACA4@ha /* 8008FAAC 0008CA0C 90 03 00 00 */ stw r0, 0(r3) -/* 8008FAB0 0008CA10 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 8008FAB0 0008CA10 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 8008FAB4 0008CA14 38 04 AC A4 */ addi r0, r4, lbl_803DACA4@l /* 8008FAB8 0008CA18 90 A3 00 00 */ stw r5, 0(r3) /* 8008FABC 0008CA1C 93 E3 00 04 */ stw r31, 4(r3) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s index f7b48701..21503009 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s @@ -338,9 +338,9 @@ UpdateFrozenState__16CScriptGunTurretFfR13CStateManager: /* 80215A50 002129B0 38 C0 FF FF */ li r6, -1 /* 80215A54 002129B4 4B E3 B6 6D */ bl SendScriptMsgs__7CEntityF18EScriptObjectStateR13CStateManager20EScriptObjectMessage /* 80215A58 002129B8 81 5F 00 04 */ lwz r10, 4(r31) -/* 80215A5C 002129BC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80215A5C 002129BC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80215A60 002129C0 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80215A64 002129C4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80215A64 002129C4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80215A68 002129C8 C0 3F 00 50 */ lfs f1, 0x50(r31) /* 80215A6C 002129CC 38 61 00 08 */ addi r3, r1, 8 /* 80215A70 002129D0 C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -946,9 +946,9 @@ lbl_80216348: /* 8021634C 002132AC 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 80216350 002132B0 40 82 00 44 */ bne lbl_80216394 /* 80216354 002132B4 81 5F 00 04 */ lwz r10, 4(r31) -/* 80216358 002132B8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80216358 002132B8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8021635C 002132BC C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 80216360 002132C0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80216360 002132C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80216364 002132C4 C0 3F 00 50 */ lfs f1, 0x50(r31) /* 80216368 002132C8 38 61 00 20 */ addi r3, r1, 0x20 /* 8021636C 002132CC C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -992,9 +992,9 @@ lbl_802163E0: /* 802163F8 00213358 28 00 00 00 */ cmplwi r0, 0 /* 802163FC 0021335C 40 82 00 58 */ bne lbl_80216454 /* 80216400 00213360 81 5F 00 04 */ lwz r10, 4(r31) -/* 80216404 00213364 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80216404 00213364 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80216408 00213368 C0 5F 00 60 */ lfs f2, 0x60(r31) -/* 8021640C 0021336C 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8021640C 0021336C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80216410 00213370 C0 3F 00 50 */ lfs f1, 0x50(r31) /* 80216414 00213374 38 61 00 1C */ addi r3, r1, 0x1c /* 80216418 00213378 C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -2247,9 +2247,9 @@ lbl_80217660: /* 80217698 002145F8 D0 41 01 0C */ stfs f2, 0x10c(r1) /* 8021769C 002145FC D0 01 01 04 */ stfs f0, 0x104(r1) lbl_802176A0: -/* 802176A0 00214600 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 802176A0 00214600 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 802176A4 00214604 38 61 01 44 */ addi r3, r1, 0x144 -/* 802176A8 00214608 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 802176A8 00214608 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 802176AC 0021460C 38 A1 01 04 */ addi r5, r1, 0x104 /* 802176B0 00214610 38 81 01 10 */ addi r4, r1, 0x110 /* 802176B4 00214614 48 0F C4 5D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -2462,9 +2462,9 @@ InDetectionRange__16CScriptGunTurretCFR13CStateManager: /* 802179B4 00214914 7C 9F 23 78 */ mr r31, r4 /* 802179B8 00214918 93 C1 00 28 */ stw r30, 0x28(r1) /* 802179BC 0021491C 7C 7E 1B 78 */ mr r30, r3 -/* 802179C0 00214920 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 802179C0 00214920 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 802179C4 00214924 80 84 08 4C */ lwz r4, 0x84c(r4) -/* 802179C8 00214928 38 63 67 00 */ addi r3, r3, lbl_805A6700@l +/* 802179C8 00214928 38 63 67 00 */ addi r3, r3, sDownVector__9CVector3f@l /* 802179CC 0021492C C0 1E 00 50 */ lfs f0, 0x50(r30) /* 802179D0 00214930 C0 24 00 50 */ lfs f1, 0x50(r4) /* 802179D4 00214934 C0 44 00 40 */ lfs f2, 0x40(r4) @@ -2600,9 +2600,9 @@ lbl_80217B9C: lbl_80217BBC: /* 80217BBC 00214B1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80217BC0 00214B20 41 82 00 48 */ beq lbl_80217C08 -/* 80217BC4 00214B24 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80217BC4 00214B24 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80217BC8 00214B28 38 81 00 1C */ addi r4, r1, 0x1c -/* 80217BCC 00214B2C 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 80217BCC 00214B2C 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 80217BD0 00214B30 48 0F CA 61 */ bl GetAngleDiff__9CVector3fFRC9CVector3fRC9CVector3f /* 80217BD4 00214B34 C0 42 B3 84 */ lfs f2, lbl_805AD0A4@sda21(r2) /* 80217BD8 00214B38 38 00 00 00 */ li r0, 0 @@ -2772,9 +2772,9 @@ lbl_80217E1C: .global UpdateExtensionModelState__16CScriptGunTurretFf UpdateExtensionModelState__16CScriptGunTurretFf: /* 80217E34 00214D94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80217E38 00214D98 3C A0 80 5A */ lis r5, skZero3f@ha +/* 80217E38 00214D98 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80217E3C 00214D9C 88 04 04 F0 */ lbz r0, 0x4f0(r4) -/* 80217E40 00214DA0 C4 85 66 A0 */ lfsu f4, skZero3f@l(r5) +/* 80217E40 00214DA0 C4 85 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r5) /* 80217E44 00214DA4 28 00 00 00 */ cmplwi r0, 0 /* 80217E48 00214DA8 C0 45 00 04 */ lfs f2, 4(r5) /* 80217E4C 00214DAC C0 05 00 08 */ lfs f0, 8(r5) @@ -2823,8 +2823,8 @@ lbl_80217EE0: /* 80217EE0 00214E40 C0 05 00 00 */ lfs f0, 0(r5) /* 80217EE4 00214E44 D0 04 04 F8 */ stfs f0, 0x4f8(r4) lbl_80217EE8: -/* 80217EE8 00214E48 3C A0 80 5A */ lis r5, lbl_805A6700@ha -/* 80217EEC 00214E4C C4 45 67 00 */ lfsu f2, lbl_805A6700@l(r5) +/* 80217EE8 00214E48 3C A0 80 5A */ lis r5, sDownVector__9CVector3f@ha +/* 80217EEC 00214E4C C4 45 67 00 */ lfsu f2, sDownVector__9CVector3f@l(r5) /* 80217EF0 00214E50 C0 64 04 F8 */ lfs f3, 0x4f8(r4) /* 80217EF4 00214E54 C0 25 00 04 */ lfs f1, 4(r5) /* 80217EF8 00214E58 C0 05 00 08 */ lfs f0, 8(r5) @@ -3001,9 +3001,9 @@ lbl_8021811C: /* 80218178 002150D8 48 0F C5 81 */ bl CanBeNormalized__9CVector3fCFv /* 8021817C 002150DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80218180 002150E0 41 82 00 24 */ beq lbl_802181A4 -/* 80218184 002150E4 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 80218184 002150E4 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 80218188 002150E8 38 61 02 EC */ addi r3, r1, 0x2ec -/* 8021818C 002150EC 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8021818C 002150EC 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 80218190 002150F0 38 BE 04 04 */ addi r5, r30, 0x404 /* 80218194 002150F4 38 81 02 38 */ addi r4, r1, 0x238 /* 80218198 002150F8 48 0F B9 79 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -3500,9 +3500,9 @@ lbl_802188A0: /* 802188CC 0021582C 2C 00 00 0A */ cmpwi r0, 0xa /* 802188D0 00215830 41 82 00 C8 */ beq lbl_80218998 /* 802188D4 00215834 81 5E 00 04 */ lwz r10, 4(r30) -/* 802188D8 00215838 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802188D8 00215838 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802188DC 0021583C C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 802188E0 00215840 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802188E0 00215840 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802188E4 00215844 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 802188E8 00215848 38 61 00 08 */ addi r3, r1, 8 /* 802188EC 0021584C C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -4307,9 +4307,9 @@ lbl_80219478: /* 802194A4 00216404 38 80 00 09 */ li r4, 9 /* 802194A8 00216408 48 00 06 71 */ bl SetTurretState__16CScriptGunTurretFQ216CScriptGunTurret12ETurretState /* 802194AC 0021640C 81 5E 00 04 */ lwz r10, 4(r30) -/* 802194B0 00216410 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 802194B0 00216410 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 802194B4 00216414 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 802194B8 00216418 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 802194B8 00216418 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 802194BC 0021641C C0 3E 00 50 */ lfs f1, 0x50(r30) /* 802194C0 00216420 38 61 00 08 */ addi r3, r1, 8 /* 802194C4 00216424 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -4421,9 +4421,9 @@ lbl_802195FC: /* 80219648 002165A8 38 80 00 09 */ li r4, 9 /* 8021964C 002165AC 48 00 04 CD */ bl SetTurretState__16CScriptGunTurretFQ216CScriptGunTurret12ETurretState /* 80219650 002165B0 81 5E 00 04 */ lwz r10, 4(r30) -/* 80219654 002165B4 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80219654 002165B4 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80219658 002165B8 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 8021965C 002165BC 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8021965C 002165BC 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80219660 002165C0 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 80219664 002165C4 38 61 00 08 */ addi r3, r1, 8 /* 80219668 002165C8 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -5210,9 +5210,9 @@ lbl_8021A10C: /* 8021A130 00217090 38 61 00 10 */ addi r3, r1, 0x10 /* 8021A134 00217094 38 9E 00 34 */ addi r4, r30, 0x34 /* 8021A138 00217098 48 0F 8A 3D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 8021A13C 0021709C 3C 60 80 5A */ lis r3, lbl_805A6700@ha +/* 8021A13C 0021709C 3C 60 80 5A */ lis r3, sDownVector__9CVector3f@ha /* 8021A140 002170A0 C0 22 B3 68 */ lfs f1, lbl_805AD088@sda21(r2) -/* 8021A144 002170A4 38 63 67 00 */ addi r3, r3, lbl_805A6700@l +/* 8021A144 002170A4 38 63 67 00 */ addi r3, r3, sDownVector__9CVector3f@l /* 8021A148 002170A8 38 80 00 00 */ li r4, 0 /* 8021A14C 002170AC C0 C2 B3 78 */ lfs f6, lbl_805AD098@sda21(r2) /* 8021A150 002170B0 38 00 00 03 */ li r0, 3 @@ -6076,9 +6076,9 @@ lbl_8021AD10: /* 8021AD6C 00217CCC 4B E0 07 C9 */ bl Identity__10CAxisAngleFv /* 8021AD70 00217CD0 7C 72 1B 78 */ mr r18, r3 /* 8021AD74 00217CD4 4B E0 07 C1 */ bl Identity__10CAxisAngleFv -/* 8021AD78 00217CD8 3C 80 80 5A */ lis r4, skZero3f@ha +/* 8021AD78 00217CD8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 8021AD7C 00217CDC C0 02 B3 6C */ lfs f0, lbl_805AD08C@sda21(r2) -/* 8021AD80 00217CE0 3B 84 66 A0 */ addi r28, r4, skZero3f@l +/* 8021AD80 00217CE0 3B 84 66 A0 */ addi r28, r4, sZeroVector__9CVector3f@l /* 8021AD84 00217CE4 2C 1D 00 00 */ cmpwi r29, 0 /* 8021AD88 00217CE8 C0 5C 00 00 */ lfs f2, 0(r28) /* 8021AD8C 00217CEC 38 A1 00 E8 */ addi r5, r1, 0xe8 @@ -6200,9 +6200,9 @@ lbl_8021ADF0: /* 8021AF58 00217EB8 38 84 71 D0 */ addi r4, r4, lbl_803E71D0@l /* 8021AF5C 00217EBC 38 A0 00 01 */ li r5, 1 /* 8021AF60 00217EC0 4B F9 25 A5 */ bl __ct__10CBurstFireFPPC6SBursti -/* 8021AF64 00217EC4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8021AF64 00217EC4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8021AF68 00217EC8 3C 80 50 41 */ lis r4, 0x50415254@ha -/* 8021AF6C 00217ECC 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8021AF6C 00217ECC 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8021AF70 00217ED0 38 61 00 AC */ addi r3, r1, 0xac /* 8021AF74 00217ED4 C0 05 00 00 */ lfs f0, 0(r5) /* 8021AF78 00217ED8 38 04 52 54 */ addi r0, r4, 0x50415254@l diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index 41d46759..51018be5 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -643,9 +643,9 @@ lbl_800C2D40: /* 800C2D40 000BFCA0 88 7E 02 8C */ lbz r3, 0x28c(r30) /* 800C2D44 000BFCA4 54 60 D7 FF */ rlwinm. r0, r3, 0x1a, 0x1f, 0x1f /* 800C2D48 000BFCA8 41 82 01 54 */ beq lbl_800C2E9C -/* 800C2D4C 000BFCAC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 800C2D4C 000BFCAC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 800C2D50 000BFCB0 80 9F 08 4C */ lwz r4, 0x84c(r31) -/* 800C2D54 000BFCB4 38 63 66 F4 */ addi r3, r3, lbl_805A66F4@l +/* 800C2D54 000BFCB4 38 63 66 F4 */ addi r3, r3, sUpVector__9CVector3f@l /* 800C2D58 000BFCB8 C0 A2 8D D8 */ lfs f5, lbl_805AAAF8@sda21(r2) /* 800C2D5C 000BFCBC C0 43 00 04 */ lfs f2, 4(r3) /* 800C2D60 000BFCC0 C0 23 00 08 */ lfs f1, 8(r3) @@ -716,12 +716,12 @@ lbl_800C2E48: /* 800C2E54 000BFDB4 88 1E 02 8C */ lbz r0, 0x28c(r30) /* 800C2E58 000BFDB8 38 80 00 00 */ li r4, 0 /* 800C2E5C 000BFDBC 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a -/* 800C2E60 000BFDC0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800C2E60 000BFDC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800C2E64 000BFDC4 98 1E 02 8C */ stb r0, 0x28c(r30) /* 800C2E68 000BFDC8 88 1E 02 8C */ lbz r0, 0x28c(r30) /* 800C2E6C 000BFDCC 50 80 36 72 */ rlwimi r0, r4, 6, 0x19, 0x19 /* 800C2E70 000BFDD0 98 1E 02 8C */ stb r0, 0x28c(r30) -/* 800C2E74 000BFDD4 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 800C2E74 000BFDD4 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 800C2E78 000BFDD8 C0 23 00 04 */ lfs f1, 4(r3) /* 800C2E7C 000BFDDC C0 03 00 08 */ lfs f0, 8(r3) /* 800C2E80 000BFDE0 D0 41 00 54 */ stfs f2, 0x54(r1) @@ -929,8 +929,8 @@ lbl_800C30D8: /* 800C3168 000C00C8 4B F5 83 CD */ bl Identity__10CAxisAngleFv /* 800C316C 000C00CC 7C 7F 1B 78 */ mr r31, r3 /* 800C3170 000C00D0 4B F5 83 C5 */ bl Identity__10CAxisAngleFv -/* 800C3174 000C00D4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800C3178 000C00D8 C4 84 66 A0 */ lfsu f4, skZero3f@l(r4) +/* 800C3174 000C00D4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800C3178 000C00D8 C4 84 66 A0 */ lfsu f4, sZeroVector__9CVector3f@l(r4) /* 800C317C 000C00DC C0 02 8D D0 */ lfs f0, lbl_805AAAF0@sda21(r2) /* 800C3180 000C00E0 39 80 00 00 */ li r12, 0 /* 800C3184 000C00E4 C0 A4 00 04 */ lfs f5, 4(r4) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 8a3f1f3b..c8340eb2 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -612,10 +612,10 @@ lbl_800B11FC: /* 800B122C 000AE18C D0 1E 00 0C */ stfs f0, 0xc(r30) /* 800B1230 000AE190 48 00 09 A8 */ b lbl_800B1BD8 lbl_800B1234: -/* 800B1234 000AE194 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800B1234 000AE194 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800B1238 000AE198 3B 81 09 7C */ addi r28, r1, 0x97c /* 800B123C 000AE19C 3B 61 01 78 */ addi r27, r1, 0x178 -/* 800B1240 000AE1A0 3B A3 66 A0 */ addi r29, r3, skZero3f@l +/* 800B1240 000AE1A0 3B A3 66 A0 */ addi r29, r3, sZeroVector__9CVector3f@l /* 800B1244 000AE1A4 48 00 09 58 */ b lbl_800B1B9C lbl_800B1248: /* 800B1248 000AE1A8 A0 01 00 54 */ lhz r0, 0x54(r1) @@ -706,9 +706,9 @@ lbl_800B1368: /* 800B1390 000AE2F0 B0 01 00 1C */ sth r0, 0x1c(r1) /* 800B1394 000AE2F4 4B F9 2B 3D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage lbl_800B1398: -/* 800B1398 000AE2F8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800B1398 000AE2F8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800B139C 000AE2FC C0 22 8C B8 */ lfs f1, lbl_805AA9D8@sda21(r2) -/* 800B13A0 000AE300 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 800B13A0 000AE300 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 800B13A4 000AE304 38 61 00 A0 */ addi r3, r1, 0xa0 /* 800B13A8 000AE308 48 25 EB BD */ bl close_enough__FRC9CVector3fRC9CVector3ff /* 800B13AC 000AE30C 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -915,9 +915,9 @@ lbl_800B15E0: /* 800B16B4 000AE614 38 81 00 DC */ addi r4, r1, 0xdc /* 800B16B8 000AE618 38 A1 01 74 */ addi r5, r1, 0x174 /* 800B16BC 000AE61C 48 0D 29 11 */ bl "DetectDynamicCollisionBoolean__14CGameCollisionFRC19CCollisionPrimitiveRC12CTransform4fRCQ24rstl32reserved_vector<9TUniqueId,1024>RC13CStateManager" -/* 800B16C0 000AE620 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B16C0 000AE620 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B16C4 000AE624 7C 7A 1B 78 */ mr r26, r3 -/* 800B16C8 000AE628 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800B16C8 000AE628 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800B16CC 000AE62C 7F E3 FB 78 */ mr r3, r31 /* 800B16D0 000AE630 48 06 93 69 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 800B16D4 000AE634 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -1320,9 +1320,9 @@ IsSlave__15CScriptPlatformCF9TUniqueId: /* 800B1C14 000AEB74 7C 7E 1B 78 */ mr r30, r3 /* 800B1C18 000AEB78 93 A1 00 A4 */ stw r29, 0xa4(r1) /* 800B1C1C 000AEB7C 80 03 03 2C */ lwz r0, 0x32c(r3) -/* 800B1C20 000AEB80 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800B1C20 000AEB80 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800B1C24 000AEB84 80 DE 03 34 */ lwz r6, 0x334(r30) -/* 800B1C28 000AEB88 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800B1C28 000AEB88 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800B1C2C 000AEB8C 1C A0 00 38 */ mulli r5, r0, 0x38 /* 800B1C30 000AEB90 A0 1F 00 00 */ lhz r0, 0(r31) /* 800B1C34 000AEB94 90 C1 00 28 */ stw r6, 0x28(r1) @@ -1358,9 +1358,9 @@ lbl_800B1C90: /* 800B1CA0 000AEC00 54 03 0F FF */ rlwinm. r3, r0, 1, 0x1f, 0x1f /* 800B1CA4 000AEC04 40 82 00 90 */ bne lbl_800B1D34 /* 800B1CA8 000AEC08 80 1E 03 3C */ lwz r0, 0x33c(r30) -/* 800B1CAC 000AEC0C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800B1CAC 000AEC0C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800B1CB0 000AEC10 80 DE 03 44 */ lwz r6, 0x344(r30) -/* 800B1CB4 000AEC14 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800B1CB4 000AEC14 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800B1CB8 000AEC18 1C A0 00 38 */ mulli r5, r0, 0x38 /* 800B1CBC 000AEC1C A0 1F 00 00 */ lhz r0, 0(r31) /* 800B1CC0 000AEC20 C0 02 8C CC */ lfs f0, lbl_805AA9EC@sda21(r2) @@ -1408,10 +1408,10 @@ lbl_800B1D34: IsRider__15CScriptPlatformCF9TUniqueId: /* 800B1D50 000AECB0 94 21 FF A0 */ stwu r1, -0x60(r1) /* 800B1D54 000AECB4 7C 08 02 A6 */ mflr r0 -/* 800B1D58 000AECB8 3C A0 80 5A */ lis r5, skIdentity4f@ha +/* 800B1D58 000AECB8 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha /* 800B1D5C 000AECBC C0 02 8C CC */ lfs f0, lbl_805AA9EC@sda21(r2) /* 800B1D60 000AECC0 90 01 00 64 */ stw r0, 0x64(r1) -/* 800B1D64 000AECC4 38 05 66 70 */ addi r0, r5, skIdentity4f@l +/* 800B1D64 000AECC4 38 05 66 70 */ addi r0, r5, sIdentity__12CTransform4f@l /* 800B1D68 000AECC8 93 E1 00 5C */ stw r31, 0x5c(r1) /* 800B1D6C 000AECCC 80 C3 03 1C */ lwz r6, 0x31c(r3) /* 800B1D70 000AECD0 80 E3 03 24 */ lwz r7, 0x324(r3) @@ -1555,9 +1555,9 @@ AddSlave__15CScriptPlatformF9TUniqueIdR13CStateManager: /* 800B1F54 000AEEB4 7C 7D 1B 78 */ mr r29, r3 /* 800B1F58 000AEEB8 93 81 01 30 */ stw r28, 0x130(r1) /* 800B1F5C 000AEEBC 80 03 03 3C */ lwz r0, 0x33c(r3) -/* 800B1F60 000AEEC0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800B1F60 000AEEC0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800B1F64 000AEEC4 80 DD 03 44 */ lwz r6, 0x344(r29) -/* 800B1F68 000AEEC8 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800B1F68 000AEEC8 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800B1F6C 000AEECC 1C 60 00 38 */ mulli r3, r0, 0x38 /* 800B1F70 000AEED0 A0 1E 00 00 */ lhz r0, 0(r30) /* 800B1F74 000AEED4 90 C1 00 20 */ stw r6, 0x20(r1) @@ -1900,8 +1900,8 @@ lbl_800B2420: /* 800B2420 000AF380 38 00 00 00 */ li r0, 0 /* 800B2424 000AF384 90 01 00 84 */ stw r0, 0x84(r1) lbl_800B2428: -/* 800B2428 000AF388 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800B242C 000AF38C C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 800B2428 000AF388 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800B242C 000AF38C C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 800B2430 000AF390 D0 1C 02 70 */ stfs f0, 0x270(r28) /* 800B2434 000AF394 C0 03 00 04 */ lfs f0, 4(r3) /* 800B2438 000AF398 D0 1C 02 74 */ stfs f0, 0x274(r28) @@ -2534,9 +2534,9 @@ PreThink__15CScriptPlatformFfR13CStateManager: /* 800B2CE0 000AFC40 C0 3D 02 60 */ lfs f1, 0x260(r29) /* 800B2CE4 000AFC44 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B2CE8 000AFC48 41 81 04 D0 */ bgt lbl_800B31B8 -/* 800B2CEC 000AFC4C 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B2CEC 000AFC4C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B2CF0 000AFC50 38 61 01 6C */ addi r3, r1, 0x16c -/* 800B2CF4 000AFC54 3B E4 66 A0 */ addi r31, r4, skZero3f@l +/* 800B2CF4 000AFC54 3B E4 66 A0 */ addi r31, r4, sZeroVector__9CVector3f@l /* 800B2CF8 000AFC58 38 9D 00 34 */ addi r4, r29, 0x34 /* 800B2CFC 000AFC5C C0 1F 00 00 */ lfs f0, 0(r31) /* 800B2D00 000AFC60 D0 1D 02 70 */ stfs f0, 0x270(r29) @@ -2799,9 +2799,9 @@ lbl_800B2FC8: /* 800B30D8 000B0038 54 04 CF FE */ rlwinm r4, r0, 0x19, 0x1f, 0x1f /* 800B30DC 000B003C D0 C1 00 2C */ stfs f6, 0x2c(r1) /* 800B30E0 000B0040 48 00 01 05 */ bl "MoveRiders__15CScriptPlatformFR13CStateManagerfbRQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RQ24rstl43vector<7SRiders,Q24rstl17rmemory_allocator>RC12CTransform4fRC12CTransform4fRC9CVector3f11CQuaternion" -/* 800B30E4 000B0044 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B30E4 000B0044 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B30E8 000B0048 7F A3 EB 78 */ mr r3, r29 -/* 800B30EC 000B004C C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 800B30EC 000B004C C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 800B30F0 000B0050 7F C5 F3 78 */ mr r5, r30 /* 800B30F4 000B0054 38 80 00 19 */ li r4, 0x19 /* 800B30F8 000B0058 38 C0 FF FF */ li r6, -1 @@ -2982,9 +2982,9 @@ lbl_800B3274: /* 800B3378 000B02D8 7E C6 B3 78 */ mr r6, r22 /* 800B337C 000B02DC 38 A1 00 D4 */ addi r5, r1, 0xd4 /* 800B3380 000B02E0 48 0D 00 21 */ bl DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter -/* 800B3384 000B02E4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B3384 000B02E4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B3388 000B02E8 7C 76 1B 78 */ mr r22, r3 -/* 800B338C 000B02EC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 800B338C 000B02EC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 800B3390 000B02F0 7F C3 F3 78 */ mr r3, r30 /* 800B3394 000B02F4 48 06 76 A5 */ bl MoveCollisionPrimitive__13CPhysicsActorFRC9CVector3f /* 800B3398 000B02F8 56 C0 06 3F */ clrlwi. r0, r22, 0x18 @@ -3298,9 +3298,9 @@ lbl_800B37B4: /* 800B37F0 000B0750 7C DE 33 78 */ mr r30, r6 /* 800B37F4 000B0754 38 61 00 54 */ addi r3, r1, 0x54 /* 800B37F8 000B0758 A0 04 00 00 */ lhz r0, 0(r4) -/* 800B37FC 000B075C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 800B37FC 000B075C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 800B3800 000B0760 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 800B3804 000B0764 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800B3804 000B0764 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800B3808 000B0768 B0 01 00 18 */ sth r0, 0x18(r1) /* 800B380C 000B076C B0 01 00 4C */ sth r0, 0x4c(r1) /* 800B3810 000B0770 48 25 F3 65 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -3330,11 +3330,11 @@ lbl_800B3860: /* 800B3864 000B07C4 7C 03 28 40 */ cmplw r3, r5 /* 800B3868 000B07C8 40 82 01 48 */ bne lbl_800B39B0 /* 800B386C 000B07CC A0 1C 00 00 */ lhz r0, 0(r28) -/* 800B3870 000B07D0 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800B3870 000B07D0 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800B3874 000B07D4 C0 02 8C CC */ lfs f0, lbl_805AA9EC@sda21(r2) /* 800B3878 000B07D8 3B E1 00 8C */ addi r31, r1, 0x8c /* 800B387C 000B07DC B0 01 00 14 */ sth r0, 0x14(r1) -/* 800B3880 000B07E0 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 800B3880 000B07E0 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 800B3884 000B07E4 7F E3 FB 78 */ mr r3, r31 /* 800B3888 000B07E8 B0 01 00 84 */ sth r0, 0x84(r1) /* 800B388C 000B07EC D0 01 00 88 */ stfs f0, 0x88(r1) @@ -3764,9 +3764,9 @@ lbl_800B3DE8: /* 800B3E68 000B0DC8 4B F6 76 CD */ bl Identity__10CAxisAngleFv /* 800B3E6C 000B0DCC 7C 70 1B 78 */ mr r16, r3 /* 800B3E70 000B0DD0 4B F6 76 C5 */ bl Identity__10CAxisAngleFv -/* 800B3E74 000B0DD4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B3E74 000B0DD4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B3E78 000B0DD8 C0 02 8C D4 */ lfs f0, lbl_805AA9F4@sda21(r2) -/* 800B3E7C 000B0DDC 3B 44 66 A0 */ addi r26, r4, skZero3f@l +/* 800B3E7C 000B0DDC 3B 44 66 A0 */ addi r26, r4, sZeroVector__9CVector3f@l /* 800B3E80 000B0DE0 38 00 00 00 */ li r0, 0 /* 800B3E84 000B0DE4 C0 5A 00 00 */ lfs f2, 0(r26) /* 800B3E88 000B0DE8 38 80 00 01 */ li r4, 1 @@ -3852,7 +3852,7 @@ lbl_800B3DE8: /* 800B3FC8 000B0F28 3C 60 80 3E */ lis r3, lbl_803DF220@ha /* 800B3FCC 000B0F2C C0 02 8C AC */ lfs f0, lbl_805AA9CC@sda21(r2) /* 800B3FD0 000B0F30 38 03 F2 20 */ addi r0, r3, lbl_803DF220@l -/* 800B3FD4 000B0F34 3C 80 80 5A */ lis r4, skZero3f@ha +/* 800B3FD4 000B0F34 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 800B3FD8 000B0F38 90 1F 00 00 */ stw r0, 0(r31) /* 800B3FDC 000B0F3C 3C 60 80 5A */ lis r3, lbl_805A6660@ha /* 800B3FE0 000B0F40 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) @@ -3866,7 +3866,7 @@ lbl_800B3DE8: /* 800B4000 000B0F60 D0 1F 02 68 */ stfs f0, 0x268(r31) /* 800B4004 000B0F64 C0 14 00 60 */ lfs f0, 0x60(r20) /* 800B4008 000B0F68 D0 1F 02 6C */ stfs f0, 0x26c(r31) -/* 800B400C 000B0F6C C0 04 66 A0 */ lfs f0, skZero3f@l(r4) +/* 800B400C 000B0F6C C0 04 66 A0 */ lfs f0, sZeroVector__9CVector3f@l(r4) /* 800B4010 000B0F70 D0 1F 02 70 */ stfs f0, 0x270(r31) /* 800B4014 000B0F74 C0 1A 00 04 */ lfs f0, 4(r26) /* 800B4018 000B0F78 D0 1F 02 74 */ stfs f0, 0x274(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSound.s b/asm/MetroidPrime/ScriptObjects/CScriptSound.s index 6457b8c0..240c9270 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSound.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSound.s @@ -794,8 +794,8 @@ lbl_800B061C: /* 800B0640 000AD5A0 4C 40 13 82 */ cror 2, 0, 2 /* 800B0644 000AD5A4 40 82 00 4C */ bne lbl_800B0690 /* 800B0648 000AD5A8 C0 02 8C A0 */ lfs f0, lbl_805AA9C0@sda21(r2) -/* 800B064C 000AD5AC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 800B0650 000AD5B0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800B064C 000AD5AC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 800B0650 000AD5B0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800B0654 000AD5B4 38 81 00 44 */ addi r4, r1, 0x44 /* 800B0658 000AD5B8 D0 1E 00 F8 */ stfs f0, 0xf8(r30) /* 800B065C 000AD5BC 38 61 00 24 */ addi r3, r1, 0x24 @@ -923,9 +923,9 @@ lbl_800B0808: /* 800B0824 000AD784 B0 7E 00 F2 */ sth r3, 0xf2(r30) lbl_800B0828: /* 800B0828 000AD788 A8 1E 00 F2 */ lha r0, 0xf2(r30) -/* 800B082C 000AD78C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 800B082C 000AD78C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800B0830 000AD790 C0 5E 00 60 */ lfs f2, 0x60(r30) -/* 800B0834 000AD794 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 800B0834 000AD794 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 800B0838 000AD798 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 800B083C 000AD79C 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 800B0840 000AD7A0 C0 1E 00 40 */ lfs f0, 0x40(r30) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s index e4cbcbbd..efcf29fd 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s @@ -362,8 +362,8 @@ sub_8014f3f0: /* 8014F414 0014C374 28 00 00 00 */ cmplwi r0, 0 /* 8014F418 0014C378 40 82 00 40 */ bne lbl_8014F458 /* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, lbl_805AE320@sda21(r2) -/* 8014F420 0014C380 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, skZero3f@l +/* 8014F420 0014C380 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l /* 8014F428 0014C388 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8014F42C 0014C38C 90 81 00 08 */ stw r4, 8(r1) /* 8014F430 0014C390 7C A4 2B 78 */ mr r4, r5 @@ -378,8 +378,8 @@ sub_8014f3f0: /* 8014F454 0014C3B4 48 00 00 4C */ b lbl_8014F4A0 lbl_8014F458: /* 8014F458 0014C3B8 80 1F 00 00 */ lwz r0, 0(r31) -/* 8014F45C 0014C3BC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 8014F460 0014C3C0 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 8014F45C 0014C3BC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 8014F460 0014C3C0 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 8014F464 0014C3C4 7C C4 33 78 */ mr r4, r6 /* 8014F468 0014C3C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8014F46C 0014C3CC 7C E6 3B 78 */ mr r6, r7 @@ -681,8 +681,8 @@ lbl_8014F83C: /* 8014F8B0 0014C810 39 40 00 00 */ li r10, 0 /* 8014F8B4 0014C814 38 00 00 03 */ li r0, 3 /* 8014F8B8 0014C818 90 81 00 2C */ stw r4, 0x2c(r1) -/* 8014F8BC 0014C81C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8014F8C0 0014C820 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8014F8BC 0014C81C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8014F8C0 0014C820 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 8014F8C4 0014C824 38 A1 00 14 */ addi r5, r1, 0x14 /* 8014F8C8 0014C828 90 61 00 28 */ stw r3, 0x28(r1) /* 8014F8CC 0014C82C 38 81 00 1C */ addi r4, r1, 0x1c @@ -1629,9 +1629,9 @@ lbl_80150638: /* 80150670 0014D5D0 7C 04 00 40 */ cmplw r4, r0 /* 80150674 0014D5D4 41 82 00 40 */ beq lbl_801506B4 /* 80150678 0014D5D8 C0 58 00 60 */ lfs f2, 0x60(r24) -/* 8015067C 0014D5DC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015067C 0014D5DC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80150680 0014D5E0 C0 38 00 50 */ lfs f1, 0x50(r24) -/* 80150684 0014D5E4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80150684 0014D5E4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80150688 0014D5E8 C0 18 00 40 */ lfs f0, 0x40(r24) /* 8015068C 0014D5EC 38 61 00 14 */ addi r3, r1, 0x14 /* 80150690 0014D5F0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1677,9 +1677,9 @@ lbl_801506F0: /* 80150720 0014D680 7C 04 00 40 */ cmplw r4, r0 /* 80150724 0014D684 41 82 00 40 */ beq lbl_80150764 /* 80150728 0014D688 C0 58 00 60 */ lfs f2, 0x60(r24) -/* 8015072C 0014D68C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8015072C 0014D68C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80150730 0014D690 C0 38 00 50 */ lfs f1, 0x50(r24) -/* 80150734 0014D694 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80150734 0014D694 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80150738 0014D698 C0 18 00 40 */ lfs f0, 0x40(r24) /* 8015073C 0014D69C 38 61 00 10 */ addi r3, r1, 0x10 /* 80150740 0014D6A0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -2360,9 +2360,9 @@ lbl_80151048: /* 8015108C 0014DFEC 88 1D 00 E4 */ lbz r0, 0xe4(r29) /* 80151090 0014DFF0 38 A0 00 01 */ li r5, 1 /* 80151094 0014DFF4 50 A0 26 F6 */ rlwimi r0, r5, 4, 0x1b, 0x1b -/* 80151098 0014DFF8 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80151098 0014DFF8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8015109C 0014DFFC 98 1D 00 E4 */ stb r0, 0xe4(r29) -/* 801510A0 0014E000 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801510A0 0014E000 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801510A4 0014E004 7F A3 EB 78 */ mr r3, r29 /* 801510A8 0014E008 88 1D 00 E4 */ lbz r0, 0xe4(r29) /* 801510AC 0014E00C 50 A0 1F 38 */ rlwimi r0, r5, 3, 0x1c, 0x1c @@ -2693,10 +2693,10 @@ lbl_80151528: /* 80151560 0014E4C0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80151564 0014E4C4 4C 40 13 82 */ cror 2, 0, 2 /* 80151568 0014E4C8 40 82 00 B8 */ bne lbl_80151620 -/* 8015156C 0014E4CC 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80151570 0014E4D0 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 80151574 0014E4D4 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80151578 0014E4D8 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 8015156C 0014E4CC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80151570 0014E4D0 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 80151574 0014E4D4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80151578 0014E4D8 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 8015157C 0014E4DC 38 61 00 BC */ addi r3, r1, 0xbc /* 80151580 0014E4E0 38 BB 01 AC */ addi r5, r27, 0x1ac /* 80151584 0014E4E4 48 1C 25 8D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -3255,9 +3255,9 @@ lbl_80151D08: /* 80151D08 0014EC68 38 7F 01 98 */ addi r3, r31, 0x198 /* 80151D0C 0014EC6C 38 80 00 03 */ li r4, 3 /* 80151D10 0014EC70 48 00 16 CD */ bl "reserve__Q24rstl78vectorFi" -/* 80151D14 0014EC74 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80151D14 0014EC74 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80151D18 0014EC78 83 9F 00 2C */ lwz r28, 0x2c(r31) -/* 80151D1C 0014EC7C 3B A3 66 A0 */ addi r29, r3, skZero3f@l +/* 80151D1C 0014EC7C 3B A3 66 A0 */ addi r29, r3, sZeroVector__9CVector3f@l /* 80151D20 0014EC80 48 00 01 38 */ b lbl_80151E58 lbl_80151D24: /* 80151D24 0014EC84 80 1C 00 00 */ lwz r0, 0(r28) @@ -3301,11 +3301,11 @@ lbl_80151D7C: /* 80151DB8 0014ED18 38 84 00 01 */ addi r4, r4, 1 /* 80151DBC 0014ED1C 48 00 16 21 */ bl "reserve__Q24rstl78vectorFi" /* 80151DC0 0014ED20 80 1F 01 9C */ lwz r0, 0x19c(r31) -/* 80151DC4 0014ED24 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80151DC4 0014ED24 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80151DC8 0014ED28 80 BF 01 A0 */ lwz r5, 0x1a0(r31) /* 80151DCC 0014ED2C A0 9A 00 14 */ lhz r4, 0x14(r26) /* 80151DD0 0014ED30 7C 00 28 00 */ cmpw r0, r5 -/* 80151DD4 0014ED34 C3 E3 66 A0 */ lfs f31, skZero3f@l(r3) +/* 80151DD4 0014ED34 C3 E3 66 A0 */ lfs f31, sZeroVector__9CVector3f@l(r3) /* 80151DD8 0014ED38 B0 81 00 2C */ sth r4, 0x2c(r1) /* 80151DDC 0014ED3C C3 DD 00 04 */ lfs f30, 4(r29) /* 80151DE0 0014ED40 C3 BD 00 08 */ lfs f29, 8(r29) @@ -3399,9 +3399,9 @@ lbl_80151F0C: /* 80151F18 0014EE78 7F C4 F3 78 */ mr r4, r30 /* 80151F1C 0014EE7C 4B FF F8 01 */ bl RingScramble__22CScriptSpecialFunctionFR13CStateManager lbl_80151F20: -/* 80151F20 0014EE80 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80151F20 0014EE80 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80151F24 0014EE84 3B 40 00 00 */ li r26, 0 -/* 80151F28 0014EE88 3B 63 67 24 */ addi r27, r3, lbl_805A6724@l +/* 80151F28 0014EE88 3B 63 67 24 */ addi r27, r3, sForwardVector__9CVector3f@l /* 80151F2C 0014EE8C 3B 80 00 00 */ li r28, 0 /* 80151F30 0014EE90 48 00 00 8C */ b lbl_80151FBC lbl_80151F34: @@ -3428,10 +3428,10 @@ lbl_80151F34: /* 80151F84 0014EEE4 D0 43 00 08 */ stfs f2, 8(r3) /* 80151F88 0014EEE8 48 00 00 2C */ b lbl_80151FB4 lbl_80151F8C: -/* 80151F8C 0014EEEC 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 80151F8C 0014EEEC 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 80151F90 0014EEF0 80 1F 01 A4 */ lwz r0, 0x1a4(r31) /* 80151F94 0014EEF4 38 9C 00 0C */ addi r4, r28, 0xc -/* 80151F98 0014EEF8 C0 03 67 24 */ lfs f0, lbl_805A6724@l(r3) +/* 80151F98 0014EEF8 C0 03 67 24 */ lfs f0, sForwardVector__9CVector3f@l(r3) /* 80151F9C 0014EEFC 7C 80 22 14 */ add r4, r0, r4 /* 80151FA0 0014EF00 D0 04 00 00 */ stfs f0, 0(r4) /* 80151FA4 0014EF04 C0 1B 00 04 */ lfs f0, 4(r27) @@ -4404,8 +4404,8 @@ lbl_80152BA8: /* 80152CD0 0014FC30 93 FA 00 E8 */ stw r31, 0xe8(r26) /* 80152CD4 0014FC34 48 1E B4 8D */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" /* 80152CD8 0014FC38 D3 9A 00 FC */ stfs f28, 0xfc(r26) -/* 80152CDC 0014FC3C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80152CE0 0014FC40 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80152CDC 0014FC3C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80152CE0 0014FC40 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80152CE4 0014FC44 C0 02 9D 9C */ lfs f0, lbl_805ABABC@sda21(r2) /* 80152CE8 0014FC48 D3 BA 01 00 */ stfs f29, 0x100(r26) /* 80152CEC 0014FC4C 38 7A 01 3C */ addi r3, r26, 0x13c @@ -4455,11 +4455,11 @@ lbl_80152BA8: /* 80152D9C 0014FCFC D0 1A 01 80 */ stfs f0, 0x180(r26) /* 80152DA0 0014FD00 48 00 01 B5 */ bl "__ct__Q24rstl36vectorFRCQ24rstl17rmemory_allocator" /* 80152DA4 0014FD04 C0 02 9D 9C */ lfs f0, lbl_805ABABC@sda21(r2) -/* 80152DA8 0014FD08 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80152DA8 0014FD08 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80152DAC 0014FD0C 38 A0 00 00 */ li r5, 0 /* 80152DB0 0014FD10 38 00 00 02 */ li r0, 2 /* 80152DB4 0014FD14 D0 1A 01 94 */ stfs f0, 0x194(r26) -/* 80152DB8 0014FD18 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 80152DB8 0014FD18 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80152DBC 0014FD1C 38 60 00 01 */ li r3, 1 /* 80152DC0 0014FD20 90 BA 01 9C */ stw r5, 0x19c(r26) /* 80152DC4 0014FD24 90 BA 01 A0 */ stw r5, 0x1a0(r26) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s index dff27bfc..b45d862f 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpiderBallWaypoint.s @@ -182,8 +182,8 @@ lbl_80117DE0: /* 80117DF8 00114D58 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 80117DFC 00114D5C 7C 03 00 40 */ cmplw r3, r0 /* 80117E00 00114D60 40 82 FF B4 */ bne lbl_80117DB4 -/* 80117E04 00114D64 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80117E08 00114D68 C4 43 66 A0 */ lfsu f2, skZero3f@l(r3) +/* 80117E04 00114D64 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80117E08 00114D68 C4 43 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r3) /* 80117E0C 00114D6C EE D5 05 72 */ fmuls f22, f21, f21 /* 80117E10 00114D70 C3 3F 00 40 */ lfs f25, 0x40(r31) /* 80117E14 00114D74 C3 1F 00 50 */ lfs f24, 0x50(r31) diff --git a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s index 2371772f..6c97c470 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptSpindleCamera.s @@ -1399,9 +1399,9 @@ lbl_80240EAC: /* 80240EC0 0023DE20 38 81 01 B4 */ addi r4, r1, 0x1b4 /* 80240EC4 0023DE24 48 0D 39 8D */ bl AsNormalized__9CVector3fCFv /* 80240EC8 0023DE28 C0 21 02 04 */ lfs f1, 0x204(r1) -/* 80240ECC 0023DE2C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80240ECC 0023DE2C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80240ED0 0023DE30 C0 01 00 3C */ lfs f0, 0x3c(r1) -/* 80240ED4 0023DE34 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80240ED4 0023DE34 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80240ED8 0023DE38 C0 61 02 08 */ lfs f3, 0x208(r1) /* 80240EDC 0023DE3C 38 61 02 3C */ addi r3, r1, 0x23c /* 80240EE0 0023DE40 EC 81 00 2A */ fadds f4, f1, f0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s index dd9e31b5..f76feee6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptTrigger.s @@ -393,8 +393,8 @@ lbl_80076080: /* 80076090 00072FF0 39 40 00 00 */ li r10, 0 /* 80076094 00072FF4 38 00 00 03 */ li r0, 3 /* 80076098 00072FF8 90 81 00 AC */ stw r4, 0xac(r1) -/* 8007609C 00072FFC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 800760A0 00073000 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 8007609C 00072FFC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 800760A0 00073000 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 800760A4 00073004 38 A1 00 30 */ addi r5, r1, 0x30 /* 800760A8 00073008 90 61 00 A8 */ stw r3, 0xa8(r1) /* 800760AC 0007300C 38 81 00 38 */ addi r4, r1, 0x38 @@ -1099,8 +1099,8 @@ lbl_80076A18: /* 80076AC0 00073A20 39 40 00 00 */ li r10, 0 /* 80076AC4 00073A24 38 00 00 03 */ li r0, 3 /* 80076AC8 00073A28 90 81 00 A4 */ stw r4, 0xa4(r1) -/* 80076ACC 00073A2C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80076AD0 00073A30 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80076ACC 00073A2C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80076AD0 00073A30 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80076AD4 00073A34 38 A1 00 2C */ addi r5, r1, 0x2c /* 80076AD8 00073A38 90 61 00 A0 */ stw r3, 0xa0(r1) /* 80076ADC 00073A3C 38 81 00 34 */ addi r4, r1, 0x34 @@ -1175,8 +1175,8 @@ lbl_80076B94: /* 80076BE8 00073B48 39 40 00 00 */ li r10, 0 /* 80076BEC 00073B4C 38 00 00 03 */ li r0, 3 /* 80076BF0 00073B50 90 81 00 8C */ stw r4, 0x8c(r1) -/* 80076BF4 00073B54 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80076BF8 00073B58 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80076BF4 00073B54 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80076BF8 00073B58 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80076BFC 00073B5C 38 A1 00 14 */ addi r5, r1, 0x14 /* 80076C00 00073B60 90 61 00 88 */ stw r3, 0x88(r1) /* 80076C04 00073B64 38 81 00 1C */ addi r4, r1, 0x1c diff --git a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s index 543a95de..e98eb0e6 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptWorldTeleporter.s @@ -274,13 +274,13 @@ lbl_801D6BA8: /* 801D6C34 001D3B94 38 81 00 08 */ addi r4, r1, 8 /* 801D6C38 001D3B98 4B E7 A6 ED */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" /* 801D6C3C 001D3B9C 3C 80 80 3E */ lis r4, lbl_803E58A0@ha -/* 801D6C40 001D3BA0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801D6C40 001D3BA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801D6C44 001D3BA4 38 04 58 A0 */ addi r0, r4, lbl_803E58A0@l /* 801D6C48 001D3BA8 38 A0 00 02 */ li r5, 2 /* 801D6C4C 001D3BAC 90 17 00 00 */ stw r0, 0(r23) /* 801D6C50 001D3BB0 38 C0 00 00 */ li r6, 0 /* 801D6C54 001D3BB4 38 00 FF FF */ li r0, -1 -/* 801D6C58 001D3BB8 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801D6C58 001D3BB8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801D6C5C 001D3BBC 93 17 00 34 */ stw r24, 0x34(r23) /* 801D6C60 001D3BC0 57 43 04 3E */ clrlwi r3, r26, 0x10 /* 801D6C64 001D3BC4 93 37 00 38 */ stw r25, 0x38(r23) @@ -446,13 +446,13 @@ lbl_801D6BA8: /* 801D6ECC 001D3E2C 38 81 00 08 */ addi r4, r1, 8 /* 801D6ED0 001D3E30 4B E7 A4 55 */ bl "__ct__7CEntityF9TUniqueIdRC11CEntityInfobRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>" /* 801D6ED4 001D3E34 3C 80 80 3E */ lis r4, lbl_803E58A0@ha -/* 801D6ED8 001D3E38 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801D6ED8 001D3E38 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801D6EDC 001D3E3C 38 04 58 A0 */ addi r0, r4, lbl_803E58A0@l /* 801D6EE0 001D3E40 38 E0 00 00 */ li r7, 0 /* 801D6EE4 001D3E44 90 1D 00 00 */ stw r0, 0(r29) /* 801D6EE8 001D3E48 38 A0 FF FF */ li r5, -1 /* 801D6EEC 001D3E4C C0 42 AC 40 */ lfs f2, lbl_805AC960@sda21(r2) -/* 801D6EF0 001D3E50 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 801D6EF0 001D3E50 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 801D6EF4 001D3E54 93 DD 00 34 */ stw r30, 0x34(r29) /* 801D6EF8 001D3E58 7F A3 EB 78 */ mr r3, r29 /* 801D6EFC 001D3E5C C0 22 AC 44 */ lfs f1, lbl_805AC964@sda21(r2) diff --git a/asm/MetroidPrime/Tweaks/CTweakBall.s b/asm/MetroidPrime/Tweaks/CTweakBall.s index 9e29bf16..d211488a 100644 --- a/asm/MetroidPrime/Tweaks/CTweakBall.s +++ b/asm/MetroidPrime/Tweaks/CTweakBall.s @@ -58,7 +58,7 @@ __ct__10CTweakBallFR12CInputStream: /* 80090B70 0008DAD0 C0 22 8A F0 */ lfs f1, lbl_805AA810@sda21(r2) /* 80090B74 0008DAD4 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80090B78 0008DAD8 7C 7F 1B 78 */ mr r31, r3 -/* 80090B7C 0008DADC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 80090B7C 0008DADC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80090B80 0008DAE0 93 C1 00 38 */ stw r30, 0x38(r1) /* 80090B84 0008DAE4 3B C0 00 00 */ li r30, 0 /* 80090B88 0008DAE8 93 A1 00 34 */ stw r29, 0x34(r1) @@ -67,7 +67,7 @@ __ct__10CTweakBallFR12CInputStream: /* 80090B94 0008DAF4 7C 9C 23 78 */ mr r28, r4 /* 80090B98 0008DAF8 90 DF 00 00 */ stw r6, 0(r31) /* 80090B9C 0008DAFC 90 1F 00 00 */ stw r0, 0(r31) -/* 80090BA0 0008DB00 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 80090BA0 0008DB00 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 80090BA4 0008DB04 D0 1F 00 78 */ stfs f0, 0x78(r31) /* 80090BA8 0008DB08 C0 03 00 04 */ lfs f0, 4(r3) /* 80090BAC 0008DB0C D0 1F 00 7C */ stfs f0, 0x7c(r31) diff --git a/asm/MetroidPrime/Weapons/CBeamProjectile.s b/asm/MetroidPrime/Weapons/CBeamProjectile.s index 39d82164..b46c1bf7 100644 --- a/asm/MetroidPrime/Weapons/CBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CBeamProjectile.s @@ -618,21 +618,21 @@ lbl_80199614: /* 80199614 00196574 C0 1A 02 EC */ lfs f0, 0x2ec(r26) lbl_80199618: /* 80199618 00196578 D0 1A 03 00 */ stfs f0, 0x300(r26) -/* 8019961C 0019657C 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80199620 00196580 38 83 66 70 */ addi r4, r3, skIdentity4f@l -/* 80199624 00196584 3C C0 80 5A */ lis r6, lbl_805A66F4@ha +/* 8019961C 0019657C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80199620 00196580 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l +/* 80199624 00196584 3C C0 80 5A */ lis r6, sUpVector__9CVector3f@ha /* 80199628 00196588 C0 1A 02 EC */ lfs f0, 0x2ec(r26) -/* 8019962C 0019658C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 8019962C 0019658C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80199630 00196590 38 7A 03 24 */ addi r3, r26, 0x324 /* 80199634 00196594 D0 1A 03 04 */ stfs f0, 0x304(r26) /* 80199638 00196598 D3 FA 03 08 */ stfs f31, 0x308(r26) -/* 8019963C 0019659C C4 06 66 F4 */ lfsu f0, lbl_805A66F4@l(r6) +/* 8019963C 0019659C C4 06 66 F4 */ lfsu f0, sUpVector__9CVector3f@l(r6) /* 80199640 001965A0 D0 1A 03 0C */ stfs f0, 0x30c(r26) /* 80199644 001965A4 C0 06 00 04 */ lfs f0, 4(r6) /* 80199648 001965A8 D0 1A 03 10 */ stfs f0, 0x310(r26) /* 8019964C 001965AC C0 06 00 08 */ lfs f0, 8(r6) /* 80199650 001965B0 D0 1A 03 14 */ stfs f0, 0x314(r26) -/* 80199654 001965B4 C4 05 66 A0 */ lfsu f0, skZero3f@l(r5) +/* 80199654 001965B4 C4 05 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r5) /* 80199658 001965B8 D0 1A 03 18 */ stfs f0, 0x318(r26) /* 8019965C 001965BC C0 05 00 04 */ lfs f0, 4(r5) /* 80199660 001965C0 D0 1A 03 1C */ stfs f0, 0x31c(r26) @@ -640,12 +640,12 @@ lbl_80199618: /* 80199668 001965C8 D0 1A 03 20 */ stfs f0, 0x320(r26) /* 8019966C 001965CC 48 17 95 09 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80199670 001965D0 3C 60 80 5A */ lis r3, lbl_805A6784@ha -/* 80199674 001965D4 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80199674 001965D4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80199678 001965D8 38 A3 67 84 */ addi r5, r3, lbl_805A6784@l /* 8019967C 001965DC 38 60 00 0A */ li r3, 0xa /* 80199680 001965E0 C0 05 00 00 */ lfs f0, 0(r5) /* 80199684 001965E4 38 00 00 02 */ li r0, 2 -/* 80199688 001965E8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80199688 001965E8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8019968C 001965EC 38 FA 03 88 */ addi r7, r26, 0x388 /* 80199690 001965F0 D0 1A 03 54 */ stfs f0, 0x354(r26) /* 80199694 001965F4 38 C0 00 00 */ li r6, 0 @@ -722,11 +722,11 @@ lbl_80199798: /* 80199798 001966F8 38 C6 00 04 */ addi r6, r6, 4 /* 8019979C 001966FC 38 E7 00 0C */ addi r7, r7, 0xc /* 801997A0 00196700 42 00 FF 58 */ bdnz lbl_801996F8 -/* 801997A4 00196704 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801997A4 00196704 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801997A8 00196708 38 60 00 08 */ li r3, 8 /* 801997AC 0019670C 38 00 00 02 */ li r0, 2 /* 801997B0 00196710 90 7A 04 00 */ stw r3, 0x400(r26) -/* 801997B4 00196714 38 64 66 A0 */ addi r3, r4, skZero3f@l +/* 801997B4 00196714 38 64 66 A0 */ addi r3, r4, sZeroVector__9CVector3f@l /* 801997B8 00196718 38 BA 04 04 */ addi r5, r26, 0x404 /* 801997BC 0019671C 38 80 00 00 */ li r4, 0 /* 801997C0 00196720 7C 09 03 A6 */ mtctr r0 diff --git a/asm/MetroidPrime/Weapons/CBomb.s b/asm/MetroidPrime/Weapons/CBomb.s index 5a9b6158..f8d8e193 100644 --- a/asm/MetroidPrime/Weapons/CBomb.s +++ b/asm/MetroidPrime/Weapons/CBomb.s @@ -415,9 +415,9 @@ lbl_8008FEBC: /* 8008FED0 0008CE30 B0 01 00 24 */ sth r0, 0x24(r1) /* 8008FED4 0008CE34 4B FB 4E 35 */ bl AddWeaponId__13CStateManagerF9TUniqueId11EWeaponType /* 8008FED8 0008CE38 C0 5C 00 60 */ lfs f2, 0x60(r28) -/* 8008FEDC 0008CE3C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8008FEDC 0008CE3C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8008FEE0 0008CE40 C0 3C 00 50 */ lfs f1, 0x50(r28) -/* 8008FEE4 0008CE44 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8008FEE4 0008CE44 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8008FEE8 0008CE48 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 8008FEEC 0008CE4C 38 61 00 38 */ addi r3, r1, 0x38 /* 8008FEF0 0008CE50 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -928,9 +928,9 @@ Explode__5CBombFRC9CVector3fR13CStateManager: /* 80090650 0008D5B0 B0 01 00 14 */ sth r0, 0x14(r1) /* 80090654 0008D5B4 4B FB 86 59 */ bl ApplyDamageToWorld__13CStateManagerF9TUniqueIdRC6CActorRC9CVector3fRC11CDamageInfoRC15CMaterialFilter /* 80090658 0008D5B8 C0 5D 00 60 */ lfs f2, 0x60(r29) -/* 8009065C 0008D5BC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8009065C 0008D5BC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80090660 0008D5C0 C0 3D 00 50 */ lfs f1, 0x50(r29) -/* 80090664 0008D5C4 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 80090664 0008D5C4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80090668 0008D5C8 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 8009066C 0008D5CC 38 61 00 18 */ addi r3, r1, 0x18 /* 80090670 0008D5D0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) @@ -1130,11 +1130,11 @@ lbl_80090788: /* 80090954 0008D8B4 38 61 00 68 */ addi r3, r1, 0x68 /* 80090958 0008D8B8 48 2A D1 89 */ bl "internal_dereference__Q24rstl66basic_string,Q24rstl17rmemory_allocator>Fv" /* 8009095C 0008D8BC 3C 60 80 3E */ lis r3, lbl_803DACC0@ha -/* 80090960 0008D8C0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80090960 0008D8C0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80090964 0008D8C4 38 03 AC C0 */ addi r0, r3, lbl_803DACC0@l /* 80090968 0008D8C8 3A 80 00 00 */ li r20, 0 /* 8009096C 0008D8CC 90 1E 00 00 */ stw r0, 0(r30) -/* 80090970 0008D8D0 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 80090970 0008D8D0 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 80090974 0008D8D4 3C 60 80 3D */ lis r3, lbl_803CD6A8@ha /* 80090978 0008D8D8 38 A0 00 00 */ li r5, 0 /* 8009097C 0008D8DC C0 06 00 00 */ lfs f0, 0(r6) diff --git a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s index b9a366bb..79db5971 100644 --- a/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s +++ b/asm/MetroidPrime/Weapons/CElectricBeamProjectile.s @@ -367,11 +367,11 @@ lbl_80251FB4: /* 8025200C 0024EF6C 7C 00 1B 78 */ or r0, r0, r3 /* 80252010 0024EF70 54 1E 0F FF */ rlwinm. r30, r0, 1, 0x1f, 0x1f /* 80252014 0024EF74 41 82 00 A0 */ beq lbl_802520B4 -/* 80252018 0024EF78 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8025201C 0024EF7C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80252020 0024EF80 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80252018 0024EF78 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8025201C 0024EF7C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80252020 0024EF80 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80252024 0024EF84 83 BF 04 78 */ lwz r29, 0x478(r31) -/* 80252028 0024EF88 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80252028 0024EF88 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8025202C 0024EF8C 38 61 00 38 */ addi r3, r1, 0x38 /* 80252030 0024EF90 38 BF 03 0C */ addi r5, r31, 0x30c /* 80252034 0024EF94 48 0C 1A DD */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index 16a7ed1e..31f4cb69 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -187,7 +187,7 @@ PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes /* 80213CC4 00210C24 48 09 B4 9D */ bl GetAudibleFallOff__17CProjectileWeaponCFv /* 80213CC8 00210C28 C0 82 B3 10 */ lfs f4, lbl_805AD030@sda21(r2) /* 80213CCC 00210C2C 38 C0 00 00 */ li r6, 0 -/* 80213CD0 00210C30 88 A2 CC 40 */ lbz r5, lbl_805AE960@sda21(r2) +/* 80213CD0 00210C30 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 80213CD4 00210C34 38 E0 00 01 */ li r7, 1 /* 80213CD8 00210C38 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) /* 80213CDC 00210C3C 38 80 00 14 */ li r4, 0x14 @@ -877,12 +877,12 @@ lbl_802146E0: /* 802146FC 0021165C 54 00 DF FF */ rlwinm. r0, r0, 0x1b, 0x1f, 0x1f /* 80214700 00211660 41 82 00 58 */ beq lbl_80214758 /* 80214704 00211664 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) -/* 80214708 00211668 3C A0 80 5A */ lis r5, lbl_805A66F4@ha +/* 80214708 00211668 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha /* 8021470C 0021166C 3C 80 80 57 */ lis r4, lbl_8056D578@ha /* 80214710 00211670 7F A3 EB 78 */ mr r3, r29 /* 80214714 00211674 B0 01 00 20 */ sth r0, 0x20(r1) /* 80214718 00211678 39 04 D5 78 */ addi r8, r4, lbl_8056D578@l -/* 8021471C 0021167C 38 A5 66 F4 */ addi r5, r5, lbl_805A66F4@l +/* 8021471C 0021167C 38 A5 66 F4 */ addi r5, r5, sUpVector__9CVector3f@l /* 80214720 00211680 7F C7 F3 78 */ mr r7, r30 /* 80214724 00211684 C0 5D 00 60 */ lfs f2, 0x60(r29) /* 80214728 00211688 38 81 00 64 */ addi r4, r1, 0x64 @@ -1232,7 +1232,7 @@ Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseT /* 80214C18 00211B78 C0 62 B3 2C */ lfs f3, lbl_805AD04C@sda21(r2) /* 80214C1C 00211B7C 7C 96 23 78 */ mr r22, r4 /* 80214C20 00211B80 C0 45 00 04 */ lfs f2, 4(r5) -/* 80214C24 00211B84 3C 80 80 5A */ lis r4, skZero3f@ha +/* 80214C24 00211B84 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 80214C28 00211B88 C0 25 00 08 */ lfs f1, 8(r5) /* 80214C2C 00211B8C 7C 7F 1B 78 */ mr r31, r3 /* 80214C30 00211B90 C0 05 00 00 */ lfs f0, 0(r5) @@ -1244,7 +1244,7 @@ Explode__17CEnergyProjectileFRC9CVector3fRC9CVector3f29EWeaponCollisionResponseT /* 80214C48 00211BA8 EC A5 10 2A */ fadds f5, f5, f2 /* 80214C4C 00211BAC C0 76 00 00 */ lfs f3, 0(r22) /* 80214C50 00211BB0 EC 84 08 2A */ fadds f4, f4, f1 -/* 80214C54 00211BB4 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 80214C54 00211BB4 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 80214C58 00211BB8 EC 63 00 2A */ fadds f3, f3, f0 /* 80214C5C 00211BBC 7D 15 43 78 */ mr r21, r8 /* 80214C60 00211BC0 C0 24 00 04 */ lfs f1, 4(r4) @@ -1464,11 +1464,11 @@ lbl_80214F78: /* 80214F80 00211EE0 98 61 00 C8 */ stb r3, 0xc8(r1) /* 80214F84 00211EE4 28 00 00 00 */ cmplwi r0, 0 /* 80214F88 00211EE8 41 82 06 1C */ beq lbl_802155A4 -/* 80214F8C 00211EEC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80214F90 00211EF0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80214F94 00211EF4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80214F8C 00211EEC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80214F90 00211EF0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80214F94 00211EF4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80214F98 00211EF8 7E E5 BB 78 */ mr r5, r23 -/* 80214F9C 00211EFC 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80214F9C 00211EFC 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 80214FA0 00211F00 38 61 01 88 */ addi r3, r1, 0x188 /* 80214FA4 00211F04 48 0F EB 6D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f /* 80214FA8 00211F08 38 61 01 B8 */ addi r3, r1, 0x1b8 diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 29973dec..f51ee3e5 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -239,7 +239,7 @@ DoCollisionCheck__13CFlameThrowerFR9TUniqueIdRC6CAABoxR13CStateManager: /* 80197774 001946D4 6C 03 80 00 */ xoris r3, r0, 0x8000 /* 80197778 001946D8 3C 00 43 30 */ lis r0, 0x4330 /* 8019777C 001946DC 90 61 0B 14 */ stw r3, 0xb14(r1) -/* 80197780 001946E0 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 80197780 001946E0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 80197784 001946E4 C0 7F 03 E0 */ lfs f3, 0x3e0(r31) /* 80197788 001946E8 3B 01 02 D4 */ addi r24, r1, 0x2d4 /* 8019778C 001946EC 90 01 0B 10 */ stw r0, 0xb10(r1) @@ -253,7 +253,7 @@ DoCollisionCheck__13CFlameThrowerFR9TUniqueIdRC6CAABoxR13CStateManager: /* 801977AC 0019470C C3 E2 A6 A8 */ lfs f31, lbl_805AC3C8@sda21(r2) /* 801977B0 00194710 3A E1 01 C4 */ addi r23, r1, 0x1c4 /* 801977B4 00194714 EC 00 08 28 */ fsubs f0, f0, f1 -/* 801977B8 00194718 3B A3 66 F4 */ addi r29, r3, lbl_805A66F4@l +/* 801977B8 00194718 3B A3 66 F4 */ addi r29, r3, sUpVector__9CVector3f@l /* 801977BC 0019471C 3A C0 00 01 */ li r22, 1 /* 801977C0 00194720 EC 02 00 24 */ fdivs f0, f2, f0 /* 801977C4 00194724 EF DF 00 32 */ fmuls f30, f31, f0 @@ -482,9 +482,9 @@ lbl_80197A00: /* 80197B24 00194A84 D0 41 00 34 */ stfs f2, 0x34(r1) /* 80197B28 00194A88 D0 61 00 38 */ stfs f3, 0x38(r1) /* 80197B2C 00194A8C 48 13 E5 41 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 80197B30 00194A90 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80197B30 00194A90 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80197B34 00194A94 D3 81 02 D0 */ stfs f28, 0x2d0(r1) -/* 80197B38 00194A98 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80197B38 00194A98 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80197B3C 00194A9C 7F 03 C3 78 */ mr r3, r24 /* 80197B40 00194AA0 48 17 B0 35 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80197B44 00194AA4 3C 60 80 5A */ lis r3, lbl_8059FD18@ha diff --git a/asm/MetroidPrime/Weapons/CGunWeapon.s b/asm/MetroidPrime/Weapons/CGunWeapon.s index 81116884..f2da95c9 100644 --- a/asm/MetroidPrime/Weapons/CGunWeapon.s +++ b/asm/MetroidPrime/Weapons/CGunWeapon.s @@ -3127,15 +3127,15 @@ LoadProjectileData__10CGunWeaponFR13CStateManager: /* 801BC804 001B9764 38 81 00 0C */ addi r4, r1, 0xc /* 801BC808 001B9768 48 15 5E 79 */ bl __ct__13CGlobalRandomFR9CRandom16 /* 801BC80C 001B976C 3B 16 01 D4 */ addi r24, r22, 0x1d4 -/* 801BC810 001B9770 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801BC814 001B9774 3C 60 80 5A */ lis r3, lbl_805A6724@ha +/* 801BC810 001B9770 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801BC814 001B9774 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha /* 801BC818 001B9778 C3 E2 A9 DC */ lfs f31, lbl_805AC6FC@sda21(r2) /* 801BC81C 001B977C 7F 1B C3 78 */ mr r27, r24 /* 801BC820 001B9780 3B 96 01 48 */ addi r28, r22, 0x148 -/* 801BC824 001B9784 3B C4 66 A0 */ addi r30, r4, skZero3f@l +/* 801BC824 001B9784 3B C4 66 A0 */ addi r30, r4, sZeroVector__9CVector3f@l /* 801BC828 001B9788 3B 56 01 F8 */ addi r26, r22, 0x1f8 /* 801BC82C 001B978C 3B 36 01 F0 */ addi r25, r22, 0x1f0 -/* 801BC830 001B9790 3B E3 67 24 */ addi r31, r3, lbl_805A6724@l +/* 801BC830 001B9790 3B E3 67 24 */ addi r31, r3, sForwardVector__9CVector3f@l /* 801BC834 001B9794 3A E0 00 00 */ li r23, 0 lbl_801BC838: /* 801BC838 001B9798 83 BC 00 08 */ lwz r29, 8(r28) @@ -3214,8 +3214,8 @@ lbl_801BC90C: /* 801BC948 001B98A8 D0 1B 00 08 */ stfs f0, 8(r27) /* 801BC94C 001B98AC 48 00 00 20 */ b lbl_801BC96C lbl_801BC950: -/* 801BC950 001B98B0 3C 60 80 5A */ lis r3, lbl_805A6724@ha -/* 801BC954 001B98B4 C0 03 67 24 */ lfs f0, lbl_805A6724@l(r3) +/* 801BC950 001B98B0 3C 60 80 5A */ lis r3, sForwardVector__9CVector3f@ha +/* 801BC954 001B98B4 C0 03 67 24 */ lfs f0, sForwardVector__9CVector3f@l(r3) /* 801BC958 001B98B8 D0 1B 00 00 */ stfs f0, 0(r27) /* 801BC95C 001B98BC C0 1F 00 04 */ lfs f0, 4(r31) /* 801BC960 001B98C0 D0 1B 00 04 */ stfs f0, 4(r27) diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index e0735727..f759abdd 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -211,11 +211,11 @@ lbl_801B5C64: lbl_801B5D7C: /* 801B5D7C 001B2CDC C0 16 01 04 */ lfs f0, 0x104(r22) /* 801B5D80 001B2CE0 3C 00 43 30 */ lis r0, 0x4330 -/* 801B5D84 001B2CE4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B5D84 001B2CE4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B5D88 001B2CE8 90 01 01 18 */ stw r0, 0x118(r1) /* 801B5D8C 001B2CEC EC 00 08 2A */ fadds f0, f0, f1 /* 801B5D90 001B2CF0 C8 22 A9 78 */ lfd f1, lbl_805AC698@sda21(r2) -/* 801B5D94 001B2CF4 3B E3 66 A0 */ addi r31, r3, skZero3f@l +/* 801B5D94 001B2CF4 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 801B5D98 001B2CF8 3B A0 00 00 */ li r29, 0 /* 801B5D9C 001B2CFC D0 16 01 04 */ stfs f0, 0x104(r22) /* 801B5DA0 001B2D00 C0 56 01 04 */ lfs f2, 0x104(r22) @@ -290,11 +290,11 @@ lbl_801B5DCC: /* 801B5EB0 001B2E10 38 E0 00 01 */ li r7, 1 /* 801B5EB4 001B2E14 80 C1 00 08 */ lwz r6, 8(r1) /* 801B5EB8 001B2E18 48 00 23 85 */ bl SetValue__11CMarkerGridFUiUiUiUi -/* 801B5EBC 001B2E1C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801B5EBC 001B2E1C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801B5EC0 001B2E20 C0 3F 00 04 */ lfs f1, 4(r31) /* 801B5EC4 001B2E24 C0 1F 00 08 */ lfs f0, 8(r31) /* 801B5EC8 001B2E28 38 80 00 00 */ li r4, 0 -/* 801B5ECC 001B2E2C C0 43 66 A0 */ lfs f2, skZero3f@l(r3) +/* 801B5ECC 001B2E2C C0 43 66 A0 */ lfs f2, sZeroVector__9CVector3f@l(r3) /* 801B5ED0 001B2E30 38 A0 00 02 */ li r5, 2 /* 801B5ED4 001B2E34 D0 21 00 90 */ stfs f1, 0x90(r1) /* 801B5ED8 001B2E38 D0 41 00 8C */ stfs f2, 0x8c(r1) @@ -449,9 +449,9 @@ lbl_801B6064: /* 801B6118 001B3078 EC 02 00 7A */ fmadds f0, f2, f1, f0 /* 801B611C 001B307C D0 01 00 88 */ stfs f0, 0x88(r1) /* 801B6120 001B3080 48 15 E7 31 */ bl AsNormalized__9CVector3fCFv -/* 801B6124 001B3084 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801B6124 001B3084 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801B6128 001B3088 38 61 00 B0 */ addi r3, r1, 0xb0 -/* 801B612C 001B308C 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801B612C 001B308C 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801B6130 001B3090 38 A1 00 14 */ addi r5, r1, 0x14 /* 801B6134 001B3094 38 C1 00 8C */ addi r6, r1, 0x8c /* 801B6138 001B3098 48 15 D9 D9 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -1371,10 +1371,10 @@ lbl_801B6CC0: /* 801B6E70 001B3DD0 39 00 00 00 */ li r8, 0 /* 801B6E74 001B3DD4 39 40 00 03 */ li r10, 3 /* 801B6E78 001B3DD8 90 81 00 84 */ stw r4, 0x84(r1) -/* 801B6E7C 001B3DDC 3C A0 80 5A */ lis r5, skZero3f@ha +/* 801B6E7C 001B3DDC 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 801B6E80 001B3DE0 38 81 00 2C */ addi r4, r1, 0x2c /* 801B6E84 001B3DE4 90 61 00 80 */ stw r3, 0x80(r1) -/* 801B6E88 001B3DE8 39 25 66 A0 */ addi r9, r5, skZero3f@l +/* 801B6E88 001B3DE8 39 25 66 A0 */ addi r9, r5, sZeroVector__9CVector3f@l /* 801B6E8C 001B3DEC 7F E3 FB 78 */ mr r3, r31 /* 801B6E90 001B3DF0 38 A1 00 24 */ addi r5, r1, 0x24 /* 801B6E94 001B3DF4 91 01 00 8C */ stw r8, 0x8c(r1) @@ -1416,10 +1416,10 @@ lbl_801B6ECC: /* 801B6F20 001B3E80 39 00 00 00 */ li r8, 0 /* 801B6F24 001B3E84 39 40 00 03 */ li r10, 3 /* 801B6F28 001B3E88 90 81 00 6C */ stw r4, 0x6c(r1) -/* 801B6F2C 001B3E8C 3C A0 80 5A */ lis r5, skZero3f@ha +/* 801B6F2C 001B3E8C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 801B6F30 001B3E90 38 81 00 18 */ addi r4, r1, 0x18 /* 801B6F34 001B3E94 90 61 00 68 */ stw r3, 0x68(r1) -/* 801B6F38 001B3E98 39 25 66 A0 */ addi r9, r5, skZero3f@l +/* 801B6F38 001B3E98 39 25 66 A0 */ addi r9, r5, sZeroVector__9CVector3f@l /* 801B6F3C 001B3E9C 7F E3 FB 78 */ mr r3, r31 /* 801B6F40 001B3EA0 38 A1 00 10 */ addi r5, r1, 0x10 /* 801B6F44 001B3EA4 91 01 00 74 */ stw r8, 0x74(r1) @@ -1851,8 +1851,8 @@ lbl_801B754C: /* 801B7554 001B44B4 41 80 FE 50 */ blt lbl_801B73A4 lbl_801B7558: /* 801B7558 001B44B8 80 7A 00 E8 */ lwz r3, 0xe8(r26) -/* 801B755C 001B44BC 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801B7560 001B44C0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801B755C 001B44BC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801B7560 001B44C0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801B7564 001B44C4 81 83 00 00 */ lwz r12, 0(r3) /* 801B7568 001B44C8 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801B756C 001B44CC 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index e0355187..6d8eb947 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -292,9 +292,9 @@ lbl_801F1C6C: /* 801F1D54 001EECB4 D0 21 00 4C */ stfs f1, 0x4c(r1) /* 801F1D58 001EECB8 D0 01 00 50 */ stfs f0, 0x50(r1) /* 801F1D5C 001EECBC 48 12 2A F5 */ bl AsNormalized__9CVector3fCFv -/* 801F1D60 001EECC0 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801F1D60 001EECC0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801F1D64 001EECC4 38 61 00 60 */ addi r3, r1, 0x60 -/* 801F1D68 001EECC8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 801F1D68 001EECC8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 801F1D6C 001EECCC 38 A1 00 24 */ addi r5, r1, 0x24 /* 801F1D70 001EECD0 38 C1 00 48 */ addi r6, r1, 0x48 /* 801F1D74 001EECD4 48 12 1D 9D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -340,8 +340,8 @@ lbl_801F1C6C: /* 801F1E14 001EED74 38 80 00 01 */ li r4, 1 /* 801F1E18 001EED78 48 12 AA A9 */ bl ForceParticleCreation__11CElementGenFi /* 801F1E1C 001EED7C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801F1E20 001EED80 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801F1E24 001EED84 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801F1E20 001EED80 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801F1E24 001EED84 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801F1E28 001EED88 81 83 00 00 */ lwz r12, 0(r3) /* 801F1E2C 001EED8C 81 8C 00 14 */ lwz r12, 0x14(r12) /* 801F1E30 001EED90 7D 89 03 A6 */ mtctr r12 @@ -2090,8 +2090,8 @@ Touch__20CIceAttackProjectileFR6CActorR13CStateManager: /* 801F3770 001F06D0 39 40 00 00 */ li r10, 0 /* 801F3774 001F06D4 38 00 00 03 */ li r0, 3 /* 801F3778 001F06D8 90 81 00 24 */ stw r4, 0x24(r1) -/* 801F377C 001F06DC 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801F3780 001F06E0 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801F377C 001F06DC 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801F3780 001F06E0 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801F3784 001F06E4 38 A1 00 14 */ addi r5, r1, 0x14 /* 801F3788 001F06E8 90 61 00 20 */ stw r3, 0x20(r1) /* 801F378C 001F06EC 38 81 00 1C */ addi r4, r1, 0x1c diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index a00e1c3b..86da5837 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -1082,10 +1082,10 @@ lbl_80261D70: /* 80261E10 0025ED70 4E 80 04 21 */ bctrl /* 80261E14 0025ED74 93 21 00 08 */ stw r25, 8(r1) /* 80261E18 0025ED78 38 00 00 00 */ li r0, 0 -/* 80261E1C 0025ED7C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80261E1C 0025ED7C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 80261E20 0025ED80 C0 22 BA 6C */ lfs f1, lbl_805AD78C@sda21(r2) /* 80261E24 0025ED84 90 01 00 0C */ stw r0, 0xc(r1) -/* 80261E28 0025ED88 39 03 66 70 */ addi r8, r3, skIdentity4f@l +/* 80261E28 0025ED88 39 03 66 70 */ addi r8, r3, sIdentity__12CTransform4f@l /* 80261E2C 0025ED8C 7F 63 DB 78 */ mr r3, r27 /* 80261E30 0025ED90 38 81 00 10 */ addi r4, r1, 0x10 /* 80261E34 0025ED94 38 A1 00 28 */ addi r5, r1, 0x28 @@ -1253,10 +1253,10 @@ lbl_80261FF4: /* 8026207C 0025EFDC 92 A1 01 2C */ stw r21, 0x12c(r1) /* 80262080 0025EFE0 48 0B 0A F5 */ bl __ct__12CTransform4fFRC12CTransform4f /* 80262084 0025EFE4 3C 80 80 47 */ lis r4, lbl_8046DCA8@ha -/* 80262088 0025EFE8 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 80262088 0025EFE8 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 8026208C 0025EFEC 38 04 DC A8 */ addi r0, r4, lbl_8046DCA8@l /* 80262090 0025EFF0 93 01 01 60 */ stw r24, 0x160(r1) -/* 80262094 0025EFF4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80262094 0025EFF4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80262098 0025EFF8 7F C3 F3 78 */ mr r3, r30 /* 8026209C 0025EFFC 90 01 01 64 */ stw r0, 0x164(r1) /* 802620A0 0025F000 48 0B 0A D5 */ bl __ct__12CTransform4fFRC12CTransform4f @@ -1327,8 +1327,8 @@ lbl_8026212C: /* 8026219C 0025F0FC C0 21 00 54 */ lfs f1, 0x54(r1) /* 802621A0 0025F100 38 A1 00 60 */ addi r5, r1, 0x60 /* 802621A4 0025F104 C0 01 00 58 */ lfs f0, 0x58(r1) -/* 802621A8 0025F108 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 802621AC 0025F10C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802621A8 0025F108 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 802621AC 0025F10C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802621B0 0025F110 90 C1 00 60 */ stw r6, 0x60(r1) /* 802621B4 0025F114 7F A3 EB 78 */ mr r3, r29 /* 802621B8 0025F118 D0 A1 00 70 */ stfs f5, 0x70(r1) @@ -1341,10 +1341,10 @@ lbl_8026212C: /* 802621D4 0025F134 90 01 00 8C */ stw r0, 0x8c(r1) /* 802621D8 0025F138 48 0B 09 9D */ bl __ct__12CTransform4fFRC12CTransform4f /* 802621DC 0025F13C 3C 80 80 47 */ lis r4, lbl_8046DCA8@ha -/* 802621E0 0025F140 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802621E0 0025F140 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802621E4 0025F144 38 04 DC A8 */ addi r0, r4, lbl_8046DCA8@l /* 802621E8 0025F148 93 01 00 C0 */ stw r24, 0xc0(r1) -/* 802621EC 0025F14C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802621EC 0025F14C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802621F0 0025F150 7F 83 E3 78 */ mr r3, r28 /* 802621F4 0025F154 90 01 00 C4 */ stw r0, 0xc4(r1) /* 802621F8 0025F158 48 0B 09 7D */ bl __ct__12CTransform4fFRC12CTransform4f @@ -1480,9 +1480,9 @@ lbl_802623C8: /* 802623D0 0025F330 3A 83 00 04 */ addi r20, r3, 4 /* 802623D4 0025F334 80 05 00 00 */ lwz r0, 0(r5) /* 802623D8 0025F338 80 C4 01 60 */ lwz r6, 0x160(r4) -/* 802623DC 0025F33C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802623DC 0025F33C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802623E0 0025F340 80 84 01 58 */ lwz r4, 0x158(r4) -/* 802623E4 0025F344 3B 83 66 A0 */ addi r28, r3, skZero3f@l +/* 802623E4 0025F344 3B 83 66 A0 */ addi r28, r3, sZeroVector__9CVector3f@l /* 802623E8 0025F348 90 01 49 F8 */ stw r0, 0x49f8(r1) /* 802623EC 0025F34C 3A C1 41 F8 */ addi r22, r1, 0x41f8 /* 802623F0 0025F350 7C 66 22 14 */ add r3, r6, r4 @@ -1523,8 +1523,8 @@ lbl_8026245C: /* 80262470 0025F3D0 88 01 02 40 */ lbz r0, 0x240(r1) /* 80262474 0025F3D4 28 00 00 00 */ cmplwi r0, 0 /* 80262478 0025F3D8 40 82 00 84 */ bne lbl_802624FC -/* 8026247C 0025F3DC 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 80262480 0025F3E0 39 03 67 54 */ addi r8, r3, lbl_805A6754@l +/* 8026247C 0025F3DC 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 80262480 0025F3E0 39 03 67 54 */ addi r8, r3, mskInvertedBox__6CAABox@l /* 80262484 0025F3E4 40 82 00 48 */ bne lbl_802624CC /* 80262488 0025F3E8 34 61 02 28 */ addic. r3, r1, 0x228 /* 8026248C 0025F3EC 41 82 00 34 */ beq lbl_802624C0 @@ -1707,10 +1707,10 @@ lbl_802626B0: /* 80262720 0025F680 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 80262724 0025F684 38 A3 CA F8 */ addi r5, r3, lbl_803ECAF8@l /* 80262728 0025F688 38 00 00 00 */ li r0, 0 -/* 8026272C 0025F68C 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 8026272C 0025F68C 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 80262730 0025F690 3C 60 80 47 */ lis r3, lbl_8046DCA8@ha /* 80262734 0025F694 90 A1 02 08 */ stw r5, 0x208(r1) -/* 80262738 0025F698 38 C4 66 70 */ addi r6, r4, skIdentity4f@l +/* 80262738 0025F698 38 C4 66 70 */ addi r6, r4, sIdentity__12CTransform4f@l /* 8026273C 0025F69C 38 E3 DC A8 */ addi r7, r3, lbl_8046DCA8@l /* 80262740 0025F6A0 7F C3 F3 78 */ mr r3, r30 /* 80262744 0025F6A4 D3 A1 02 18 */ stfs f29, 0x218(r1) @@ -1744,11 +1744,11 @@ lbl_802626B0: /* 802627B4 0025F714 3A 60 00 01 */ li r19, 1 /* 802627B8 0025F718 90 01 0E A8 */ stw r0, 0xea8(r1) /* 802627BC 0025F71C 4B F2 2C 81 */ bl sub_8018543c -/* 802627C0 0025F720 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802627C0 0025F720 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802627C4 0025F724 C3 1C 00 04 */ lfs f24, 4(r28) /* 802627C8 0025F728 C2 FC 00 08 */ lfs f23, 8(r28) /* 802627CC 0025F72C 7D D8 73 78 */ mr r24, r14 -/* 802627D0 0025F730 C3 23 66 A0 */ lfs f25, skZero3f@l(r3) +/* 802627D0 0025F730 C3 23 66 A0 */ lfs f25, sZeroVector__9CVector3f@l(r3) /* 802627D4 0025F734 39 E0 00 00 */ li r15, 0 /* 802627D8 0025F738 48 00 01 9C */ b lbl_80262974 lbl_802627DC: @@ -1784,10 +1784,10 @@ lbl_802627FC: /* 80262848 0025F7A8 7F 04 C3 78 */ mr r4, r24 /* 8026284C 0025F7AC 38 A0 00 0A */ li r5, 0xa /* 80262850 0025F7B0 4B FF F0 89 */ bl sub_802618d8 -/* 80262854 0025F7B4 3C 60 80 5A */ lis r3, skZero3f@ha -/* 80262858 0025F7B8 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 8026285C 0025F7BC 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 80262860 0025F7C0 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 80262854 0025F7B4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 80262858 0025F7B8 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 8026285C 0025F7BC 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 80262860 0025F7C0 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 80262864 0025F7C4 38 61 02 44 */ addi r3, r1, 0x244 /* 80262868 0025F7C8 38 B8 00 48 */ addi r5, r24, 0x48 /* 8026286C 0025F7CC 48 0B 12 A5 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f diff --git a/asm/MetroidPrime/Weapons/CPhazonBeam.s b/asm/MetroidPrime/Weapons/CPhazonBeam.s index c0028807..ce30cbd4 100644 --- a/asm/MetroidPrime/Weapons/CPhazonBeam.s +++ b/asm/MetroidPrime/Weapons/CPhazonBeam.s @@ -896,8 +896,8 @@ PreRenderGunFx__11CPhazonBeamFRC13CStateManagerRC12CTransform4f: /* 8018CE60 00189DC0 38 61 00 38 */ addi r3, r1, 0x38 /* 8018CE64 00189DC4 48 17 F8 E9 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 8018CE68 00189DC8 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 8018CE6C 00189DCC 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 8018CE70 00189DD0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 8018CE6C 00189DCC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 8018CE70 00189DD0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 8018CE74 00189DD4 81 83 00 00 */ lwz r12, 0(r3) /* 8018CE78 00189DD8 81 8C 00 30 */ lwz r12, 0x30(r12) /* 8018CE7C 00189DDC 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s index 671d76fa..c7cef5ef 100644 --- a/asm/MetroidPrime/Weapons/CPlasmaProjectile.s +++ b/asm/MetroidPrime/Weapons/CPlasmaProjectile.s @@ -376,8 +376,8 @@ lbl_80176F70: /* 80176F94 00173EF4 28 1D 00 00 */ cmplwi r29, 0 /* 80176F98 00173EF8 41 82 00 74 */ beq lbl_8017700C /* 80176F9C 00173EFC C0 02 A1 C0 */ lfs f0, lbl_805ABEE0@sda21(r2) -/* 80176FA0 00173F00 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 80176FA4 00173F04 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 80176FA0 00173F00 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 80176FA4 00173F04 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 80176FA8 00173F08 D3 C1 00 28 */ stfs f30, 0x28(r1) /* 80176FAC 00173F0C 38 7D 00 34 */ addi r3, r29, 0x34 /* 80176FB0 00173F10 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -815,8 +815,8 @@ RenderMotionBlur__17CPlasmaProjectileCFv: /* 801775C8 00174528 38 60 00 00 */ li r3, 0 /* 801775CC 0017452C 48 19 44 A5 */ bl SetCullMode__9CGraphicsF12ERglCullMode /* 801775D0 00174530 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 801775D4 00174534 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 801775D8 00174538 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 801775D4 00174534 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 801775D8 00174538 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 801775DC 0017453C 81 83 00 00 */ lwz r12, 0(r3) /* 801775E0 00174540 81 8C 00 30 */ lwz r12, 0x30(r12) /* 801775E4 00174544 7D 89 03 A6 */ mtctr r12 @@ -1815,11 +1815,11 @@ lbl_80178434: /* 8017845C 001753BC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80178460 001753C0 4C 40 13 82 */ cror 2, 0, 2 /* 80178464 001753C4 40 82 00 C4 */ bne lbl_80178528 -/* 80178468 001753C8 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8017846C 001753CC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha -/* 80178470 001753D0 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 80178468 001753C8 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8017846C 001753CC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha +/* 80178470 001753D0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 80178474 001753D4 83 DD 05 18 */ lwz r30, 0x518(r29) -/* 80178478 001753D8 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 80178478 001753D8 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 8017847C 001753DC 38 61 00 20 */ addi r3, r1, 0x20 /* 80178480 001753E0 38 BD 03 0C */ addi r5, r29, 0x30c /* 80178484 001753E4 48 19 B6 8D */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -2121,9 +2121,9 @@ lbl_8017887C: /* 801788D8 00175838 B0 01 00 18 */ sth r0, 0x18(r1) /* 801788DC 0017583C B0 01 00 1C */ sth r0, 0x1c(r1) /* 801788E0 00175840 4B F4 AB 69 */ bl __ct__11CDamageInfoFRC11CDamageInfof -/* 801788E4 00175844 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801788E4 00175844 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801788E8 00175848 7F C3 F3 78 */ mr r3, r30 -/* 801788EC 0017584C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 801788EC 0017584C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 801788F0 00175850 38 A1 00 14 */ addi r5, r1, 0x14 /* 801788F4 00175854 38 81 00 1C */ addi r4, r1, 0x1c /* 801788F8 00175858 38 C1 00 0C */ addi r6, r1, 0xc diff --git a/asm/MetroidPrime/Weapons/CPowerBeam.s b/asm/MetroidPrime/Weapons/CPowerBeam.s index 3a59f2a3..f0a4e822 100644 --- a/asm/MetroidPrime/Weapons/CPowerBeam.s +++ b/asm/MetroidPrime/Weapons/CPowerBeam.s @@ -557,8 +557,8 @@ PreRenderGunFx__10CPowerBeamFRC13CStateManagerRC12CTransform4f: /* 800DFDA8 000DCD08 38 61 00 38 */ addi r3, r1, 0x38 /* 800DFDAC 000DCD0C 48 22 C9 A1 */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f /* 800DFDB0 000DCD10 80 6D A0 68 */ lwz r3, gpRender@sda21(r13) -/* 800DFDB4 000DCD14 3C 80 80 5A */ lis r4, skIdentity4f@ha -/* 800DFDB8 000DCD18 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 800DFDB4 000DCD14 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha +/* 800DFDB8 000DCD18 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 800DFDBC 000DCD1C 81 83 00 00 */ lwz r12, 0(r3) /* 800DFDC0 000DCD20 81 8C 00 30 */ lwz r12, 0x30(r12) /* 800DFDC4 000DCD24 7D 89 03 A6 */ mtctr r12 diff --git a/asm/MetroidPrime/Weapons/CPowerBomb.s b/asm/MetroidPrime/Weapons/CPowerBomb.s index 78c0f543..feedb1e4 100644 --- a/asm/MetroidPrime/Weapons/CPowerBomb.s +++ b/asm/MetroidPrime/Weapons/CPowerBomb.s @@ -123,9 +123,9 @@ lbl_8014D98C: /* 8014D9BC 0014A91C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f /* 8014D9C0 0014A920 41 82 00 70 */ beq lbl_8014DA30 /* 8014D9C4 0014A924 C0 5C 00 60 */ lfs f2, 0x60(r28) -/* 8014D9C8 0014A928 3C 60 80 5A */ lis r3, skZero3f@ha +/* 8014D9C8 0014A928 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014D9CC 0014A92C C0 3C 00 50 */ lfs f1, 0x50(r28) -/* 8014D9D0 0014A930 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 8014D9D0 0014A930 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8014D9D4 0014A934 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 8014D9D8 0014A938 38 61 00 24 */ addi r3, r1, 0x24 /* 8014D9DC 0014A93C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) diff --git a/asm/MetroidPrime/Weapons/CProjectileInfo.s b/asm/MetroidPrime/Weapons/CProjectileInfo.s index 7bb4efe6..7df37c70 100644 --- a/asm/MetroidPrime/Weapons/CProjectileInfo.s +++ b/asm/MetroidPrime/Weapons/CProjectileInfo.s @@ -12,9 +12,9 @@ PredictInterceptPos__15CProjectileInfoFRC9CVector3fRC9CVector3fRC7CPlayerbff: /* 8021BCAC 00218C0C DB C1 00 80 */ stfd f30, 0x80(r1) /* 8021BCB0 00218C10 F3 C1 00 88 */ psq_st f30, 136(r1), 0, qr0 /* 8021BCB4 00218C14 BF 61 00 6C */ stmw r27, 0x6c(r1) -/* 8021BCB8 00218C18 3D 00 80 5A */ lis r8, skZero3f@ha +/* 8021BCB8 00218C18 3D 00 80 5A */ lis r8, sZeroVector__9CVector3f@ha /* 8021BCBC 00218C1C 7C 7E 1B 78 */ mr r30, r3 -/* 8021BCC0 00218C20 38 68 66 A0 */ addi r3, r8, skZero3f@l +/* 8021BCC0 00218C20 38 68 66 A0 */ addi r3, r8, sZeroVector__9CVector3f@l /* 8021BCC4 00218C24 FF C0 08 90 */ fmr f30, f1 /* 8021BCC8 00218C28 C0 63 00 00 */ lfs f3, 0(r3) /* 8021BCCC 00218C2C FF E0 10 90 */ fmr f31, f2 @@ -207,8 +207,8 @@ GetProjectileSpeed__15CProjectileInfoCFv: /* 8021BF84 00218EE4 80 03 00 04 */ lwz r0, 4(r3) /* 8021BF88 00218EE8 28 00 00 00 */ cmplwi r0, 0 /* 8021BF8C 00218EEC 41 82 00 5C */ beq lbl_8021BFE8 -/* 8021BF90 00218EF0 3C 80 80 5A */ lis r4, skZero3f@ha -/* 8021BF94 00218EF4 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 8021BF90 00218EF0 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 8021BF94 00218EF4 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 8021BF98 00218EF8 38 61 00 08 */ addi r3, r1, 8 /* 8021BF9C 00218EFC C0 24 00 04 */ lfs f1, 4(r4) /* 8021BFA0 00218F00 C0 04 00 08 */ lfs f0, 8(r4) diff --git a/asm/MetroidPrime/Weapons/CShockWave.s b/asm/MetroidPrime/Weapons/CShockWave.s index 48831010..19996969 100644 --- a/asm/MetroidPrime/Weapons/CShockWave.s +++ b/asm/MetroidPrime/Weapons/CShockWave.s @@ -571,8 +571,8 @@ lbl_80231D88: /* 80231DC0 0022ED20 39 40 00 00 */ li r10, 0 /* 80231DC4 0022ED24 38 00 00 03 */ li r0, 3 /* 80231DC8 0022ED28 90 81 00 DC */ stw r4, 0xdc(r1) -/* 80231DCC 0022ED2C 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80231DD0 0022ED30 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80231DCC 0022ED2C 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80231DD0 0022ED30 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80231DD4 0022ED34 38 A1 00 3C */ addi r5, r1, 0x3c /* 80231DD8 0022ED38 90 61 00 D8 */ stw r3, 0xd8(r1) /* 80231DDC 0022ED3C 38 81 00 44 */ addi r4, r1, 0x44 @@ -709,8 +709,8 @@ lbl_80231FB4: /* 80231FCC 0022EF2C 39 40 00 00 */ li r10, 0 /* 80231FD0 0022EF30 38 00 00 03 */ li r0, 3 /* 80231FD4 0022EF34 90 81 00 C4 */ stw r4, 0xc4(r1) -/* 80231FD8 0022EF38 3C 80 80 5A */ lis r4, skZero3f@ha -/* 80231FDC 0022EF3C 39 24 66 A0 */ addi r9, r4, skZero3f@l +/* 80231FD8 0022EF38 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 80231FDC 0022EF3C 39 24 66 A0 */ addi r9, r4, sZeroVector__9CVector3f@l /* 80231FE0 0022EF40 38 A1 00 1C */ addi r5, r1, 0x1c /* 80231FE4 0022EF44 90 61 00 C0 */ stw r3, 0xc0(r1) /* 80231FE8 0022EF48 38 81 00 24 */ addi r4, r1, 0x24 diff --git a/asm/MetroidPrime/Weapons/CTargetableProjectile.s b/asm/MetroidPrime/Weapons/CTargetableProjectile.s index e019e545..a9a2d060 100644 --- a/asm/MetroidPrime/Weapons/CTargetableProjectile.s +++ b/asm/MetroidPrime/Weapons/CTargetableProjectile.s @@ -157,9 +157,9 @@ ResolveCollisionWithActor__21CTargetableProjectileFRC14CRayCastResultR6CActorR13 /* 8013B9E0 00138940 7D 89 03 A6 */ mtctr r12 /* 8013B9E4 00138944 4E 80 04 21 */ bctrl /* 8013B9E8 00138948 C0 41 00 14 */ lfs f2, 0x14(r1) -/* 8013B9EC 0013894C 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8013B9EC 0013894C 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8013B9F0 00138950 C0 21 00 18 */ lfs f1, 0x18(r1) -/* 8013B9F4 00138954 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 8013B9F4 00138954 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8013B9F8 00138958 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8013B9FC 0013895C 38 61 00 2C */ addi r3, r1, 0x2c /* 8013BA00 00138960 D0 41 00 20 */ stfs f2, 0x20(r1) @@ -400,9 +400,9 @@ Think__21CTargetableProjectileFfR13CStateManager: /* 8013BD90 00138CF0 83 3C 00 F0 */ lwz r25, 0xf0(r28) /* 8013BD94 00138CF4 7D 89 03 A6 */ mtctr r12 /* 8013BD98 00138CF8 4E 80 04 21 */ bctrl -/* 8013BD9C 00138CFC 3C 80 80 5A */ lis r4, lbl_805A66F4@ha +/* 8013BD9C 00138CFC 3C 80 80 5A */ lis r4, sUpVector__9CVector3f@ha /* 8013BDA0 00138D00 38 61 00 B4 */ addi r3, r1, 0xb4 -/* 8013BDA4 00138D04 38 C4 66 F4 */ addi r6, r4, lbl_805A66F4@l +/* 8013BDA4 00138D04 38 C4 66 F4 */ addi r6, r4, sUpVector__9CVector3f@l /* 8013BDA8 00138D08 38 A1 00 A8 */ addi r5, r1, 0xa8 /* 8013BDAC 00138D0C 38 81 00 74 */ addi r4, r1, 0x74 /* 8013BDB0 00138D10 48 1D 7D 61 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index f3a420d7..98e045b0 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -604,9 +604,9 @@ lbl_801BDD98: /* 801BDE50 001BADB0 80 18 01 08 */ lwz r0, 0x108(r24) /* 801BDE54 001BADB4 90 01 00 48 */ stw r0, 0x48(r1) /* 801BDE58 001BADB8 48 11 82 15 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 801BDE5C 001BADBC 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 801BDE5C 001BADBC 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 801BDE60 001BADC0 D3 C1 02 80 */ stfs f30, 0x280(r1) -/* 801BDE64 001BADC4 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 801BDE64 001BADC4 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 801BDE68 001BADC8 7E E3 BB 78 */ mr r3, r23 /* 801BDE6C 001BADCC 48 15 4D 09 */ bl __ct__12CTransform4fFRC12CTransform4f /* 801BDE70 001BADD0 38 01 00 38 */ addi r0, r1, 0x38 @@ -2195,9 +2195,9 @@ sub_801bf598: /* 801BF600 001BC560 80 A3 00 04 */ lwz r5, 4(r3) /* 801BF604 001BC564 28 05 00 00 */ cmplwi r5, 0 /* 801BF608 001BC568 41 82 00 CC */ beq lbl_801BF6D4 -/* 801BF60C 001BC56C 3C 80 80 5A */ lis r4, lbl_805A6724@ha +/* 801BF60C 001BC56C 3C 80 80 5A */ lis r4, sForwardVector__9CVector3f@ha /* 801BF610 001BC570 7F E3 FB 78 */ mr r3, r31 -/* 801BF614 001BC574 38 C4 67 24 */ addi r6, r4, lbl_805A6724@l +/* 801BF614 001BC574 38 C4 67 24 */ addi r6, r4, sForwardVector__9CVector3f@l /* 801BF618 001BC578 C0 46 00 00 */ lfs f2, 0(r6) /* 801BF61C 001BC57C 38 81 00 20 */ addi r4, r1, 0x20 /* 801BF620 001BC580 C0 26 00 04 */ lfs f1, 4(r6) @@ -2369,9 +2369,9 @@ sub_801bf6ec: /* 801BF8A0 001BC800 38 60 00 01 */ li r3, 1 /* 801BF8A4 001BC804 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a /* 801BF8A8 001BC808 A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) -/* 801BF8AC 001BC80C 3C 60 80 5A */ lis r3, skZero3f@ha +/* 801BF8AC 001BC80C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801BF8B0 001BC810 98 1F 03 D0 */ stb r0, 0x3d0(r31) -/* 801BF8B4 001BC814 38 C3 66 A0 */ addi r6, r3, skZero3f@l +/* 801BF8B4 001BC814 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801BF8B8 001BC818 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801BF8BC 001BC81C 38 61 00 0C */ addi r3, r1, 0xc /* 801BF8C0 001BC820 38 80 06 FF */ li r4, 0x6ff @@ -2519,8 +2519,8 @@ sub_801bf9bc: /* 801BFAD0 001BCA30 90 01 00 90 */ stw r0, 0x90(r1) /* 801BFAD4 001BCA34 4B F0 39 75 */ bl __ct__11CDamageInfoFRC11CDamageInfof /* 801BFAD8 001BCA38 A0 1F 00 EC */ lhz r0, 0xec(r31) -/* 801BFADC 001BCA3C 3C 60 80 5A */ lis r3, skZero3f@ha -/* 801BFAE0 001BCA40 39 23 66 A0 */ addi r9, r3, skZero3f@l +/* 801BFADC 001BCA3C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 801BFAE0 001BCA40 39 23 66 A0 */ addi r9, r3, sZeroVector__9CVector3f@l /* 801BFAE4 001BCA44 38 81 00 20 */ addi r4, r1, 0x20 /* 801BFAE8 001BCA48 B0 01 00 10 */ sth r0, 0x10(r1) /* 801BFAEC 001BCA4C 7F A3 EB 78 */ mr r3, r29 @@ -2548,9 +2548,9 @@ lbl_801BFB24: /* 801BFB40 001BCAA0 D0 41 00 3C */ stfs f2, 0x3c(r1) /* 801BFB44 001BCAA4 48 15 4D 0D */ bl AsNormalized__9CVector3fCFv /* 801BFB48 001BCAA8 C0 62 AA 48 */ lfs f3, lbl_805AC768@sda21(r2) -/* 801BFB4C 001BCAAC 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 801BFB4C 001BCAAC 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 801BFB50 001BCAB0 C0 41 00 48 */ lfs f2, 0x48(r1) -/* 801BFB54 001BCAB4 38 C3 66 F4 */ addi r6, r3, lbl_805A66F4@l +/* 801BFB54 001BCAB4 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 801BFB58 001BCAB8 C0 21 00 40 */ lfs f1, 0x40(r1) /* 801BFB5C 001BCABC 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801BFB60 001BCAC0 EC A3 00 B2 */ fmuls f5, f3, f2 @@ -2622,9 +2622,9 @@ sub_801bfc34: /* 801BFC58 001BCBB8 93 E1 00 AC */ stw r31, 0xac(r1) /* 801BFC5C 001BCBBC 93 C1 00 A8 */ stw r30, 0xa8(r1) /* 801BFC60 001BCBC0 93 A1 00 A4 */ stw r29, 0xa4(r1) -/* 801BFC64 001BCBC4 3C A0 80 5A */ lis r5, lbl_805A6724@ha +/* 801BFC64 001BCBC4 3C A0 80 5A */ lis r5, sForwardVector__9CVector3f@ha /* 801BFC68 001BCBC8 7C 9E 23 78 */ mr r30, r4 -/* 801BFC6C 001BCBCC 38 85 67 24 */ addi r4, r5, lbl_805A6724@l +/* 801BFC6C 001BCBCC 38 85 67 24 */ addi r4, r5, sForwardVector__9CVector3f@l /* 801BFC70 001BCBD0 7C 7D 1B 78 */ mr r29, r3 /* 801BFC74 001BCBD4 C0 44 00 00 */ lfs f2, 0(r4) /* 801BFC78 001BCBD8 FF C0 08 90 */ fmr f30, f1 @@ -2912,8 +2912,8 @@ SetNewTarget__11CWaveBusterF9TUniqueId: /* 801C0094 001BCFF4 50 80 2E B4 */ rlwimi r0, r4, 5, 0x1a, 0x1a /* 801C0098 001BCFF8 C0 02 AA 04 */ lfs f0, lbl_805AC724@sda21(r2) /* 801C009C 001BCFFC 98 03 03 D0 */ stb r0, 0x3d0(r3) -/* 801C00A0 001BD000 3C 80 80 5A */ lis r4, skZero3f@ha -/* 801C00A4 001BD004 38 C4 66 A0 */ addi r6, r4, skZero3f@l +/* 801C00A0 001BD000 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 801C00A4 001BD004 38 C4 66 A0 */ addi r6, r4, sZeroVector__9CVector3f@l /* 801C00A8 001BD008 A9 22 C5 F8 */ lha r9, lbl_805AE318@sda21(r2) /* 801C00AC 001BD00C D0 03 03 A0 */ stfs f0, 0x3a0(r3) /* 801C00B0 001BD010 38 A1 00 10 */ addi r5, r1, 0x10 @@ -3061,9 +3061,9 @@ lbl_801C0290: /* 801C02AC 001BD20C 38 7F 02 E8 */ addi r3, r31, 0x2e8 /* 801C02B0 001BD210 90 1F 00 00 */ stw r0, 0(r31) /* 801C02B4 001BD214 48 15 28 C1 */ bl __ct__12CTransform4fFRC12CTransform4f -/* 801C02B8 001BD218 3C 80 80 5A */ lis r4, skZero3f@ha +/* 801C02B8 001BD218 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 801C02BC 001BD21C 38 61 00 8C */ addi r3, r1, 0x8c -/* 801C02C0 001BD220 38 A4 66 A0 */ addi r5, r4, skZero3f@l +/* 801C02C0 001BD220 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l /* 801C02C4 001BD224 38 81 00 80 */ addi r4, r1, 0x80 /* 801C02C8 001BD228 C0 05 00 00 */ lfs f0, 0(r5) /* 801C02CC 001BD22C D0 1F 03 18 */ stfs f0, 0x318(r31) diff --git a/asm/MetroidPrime/Weapons/WeaponTypes.s b/asm/MetroidPrime/Weapons/WeaponTypes.s index 3160eaa2..ba3e63e5 100644 --- a/asm/MetroidPrime/Weapons/WeaponTypes.s +++ b/asm/MetroidPrime/Weapons/WeaponTypes.s @@ -178,10 +178,10 @@ lbl_8028AC3C: /* 8028AC3C 00287B9C C0 62 BE 68 */ lfs f3, lbl_805ADB88@sda21(r2) /* 8028AC40 00287BA0 38 80 00 00 */ li r4, 0 /* 8028AC44 00287BA4 88 02 CC 41 */ lbz r0, lbl_805AE961@sda21(r2) -/* 8028AC48 00287BA8 3C 60 80 5A */ lis r3, lbl_805A66F4@ha +/* 8028AC48 00287BA8 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8028AC4C 00287BAC D0 61 00 40 */ stfs f3, 0x40(r1) /* 8028AC50 00287BB0 3B E1 00 4C */ addi r31, r1, 0x4c -/* 8028AC54 00287BB4 C4 43 66 F4 */ lfsu f2, lbl_805A66F4@l(r3) +/* 8028AC54 00287BB4 C4 43 66 F4 */ lfsu f2, sUpVector__9CVector3f@l(r3) /* 8028AC58 00287BB8 57 BE 04 3E */ clrlwi r30, r29, 0x10 /* 8028AC5C 00287BBC D0 61 00 44 */ stfs f3, 0x44(r1) /* 8028AC60 00287BC0 C0 23 00 04 */ lfs f1, 4(r3) diff --git a/asm/MetroidPrime/main.s b/asm/MetroidPrime/main.s index a40f0126..a0e8507e 100644 --- a/asm/MetroidPrime/main.s +++ b/asm/MetroidPrime/main.s @@ -26,8 +26,8 @@ __vt__4IObj: .4byte 0 .4byte 0 -.global __vt__31TObjOwnerDerivedFromIObjUntyped -__vt__31TObjOwnerDerivedFromIObjUntyped: +.global __vt__31CObjOwnerDerivedFromIObjUntyped +__vt__31CObjOwnerDerivedFromIObjUntyped: # ROM: 0x3D5D78 .4byte 0 .4byte 0 @@ -4077,14 +4077,14 @@ GetResourceIdByName__11CResFactoryCFPCc: AddPaksAndFactories__18CGameGlobalObjectsFv: /* 800060B4 00003014 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 800060B8 00003018 7C 08 02 A6 */ mflr r0 -/* 800060BC 0000301C 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 800060BC 0000301C 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 800060C0 00003020 90 01 00 C4 */ stw r0, 0xc4(r1) -/* 800060C4 00003024 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 800060C4 00003024 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 800060C8 00003028 93 E1 00 BC */ stw r31, 0xbc(r1) /* 800060CC 0000302C 83 ED A0 60 */ lwz r31, gpResourceFactory@sda21(r13) /* 800060D0 00003030 48 30 66 7D */ bl SetViewPointMatrix__9CGraphicsFRC12CTransform4f -/* 800060D4 00003034 3C 60 80 5A */ lis r3, skIdentity4f@ha -/* 800060D8 00003038 38 63 66 70 */ addi r3, r3, skIdentity4f@l +/* 800060D4 00003034 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha +/* 800060D8 00003038 38 63 66 70 */ addi r3, r3, sIdentity__12CTransform4f@l /* 800060DC 0000303C 48 30 65 05 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f /* 800060E0 00003040 3C 80 80 3D */ lis r4, lbl_803CBE74@ha /* 800060E4 00003044 38 61 00 88 */ addi r3, r1, 0x88 @@ -5831,8 +5831,8 @@ sub_8000799c: lbl_800079DC: /* 800079DC 0000493C 28 1E 00 00 */ cmplwi r30, 0 /* 800079E0 00004940 41 82 00 20 */ beq lbl_80007A00 -/* 800079E4 00004944 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 800079E8 00004948 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 800079E4 00004944 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 800079E8 00004948 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 800079EC 0000494C 90 1E 00 00 */ stw r0, 0(r30) /* 800079F0 00004950 41 82 00 10 */ beq lbl_80007A00 /* 800079F4 00004954 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -5870,11 +5870,11 @@ lbl_80007A10: /* 80007A60 000049C0 28 03 00 00 */ cmplwi r3, 0 /* 80007A64 000049C4 41 82 00 2C */ beq lbl_80007A90 /* 80007A68 000049C8 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80007A6C 000049CC 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80007A6C 000049CC 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80007A70 000049D0 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80007A74 000049D4 3C 80 80 3E */ lis r4, lbl_803D8D84@ha /* 80007A78 000049D8 90 03 00 00 */ stw r0, 0(r3) -/* 80007A7C 000049DC 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80007A7C 000049DC 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80007A80 000049E0 38 04 8D 84 */ addi r0, r4, lbl_803D8D84@l /* 80007A84 000049E4 90 A3 00 00 */ stw r5, 0(r3) /* 80007A88 000049E8 93 E3 00 04 */ stw r31, 4(r3) @@ -6012,8 +6012,8 @@ sub_80007c30: lbl_80007C70: /* 80007C70 00004BD0 28 1E 00 00 */ cmplwi r30, 0 /* 80007C74 00004BD4 41 82 00 20 */ beq lbl_80007C94 -/* 80007C78 00004BD8 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 80007C7C 00004BDC 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80007C78 00004BD8 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 80007C7C 00004BDC 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80007C80 00004BE0 90 1E 00 00 */ stw r0, 0(r30) /* 80007C84 00004BE4 41 82 00 10 */ beq lbl_80007C94 /* 80007C88 00004BE8 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -6134,11 +6134,11 @@ sub_80007dd8: /* 80007E0C 00004D6C 28 03 00 00 */ cmplwi r3, 0 /* 80007E10 00004D70 41 82 00 2C */ beq lbl_80007E3C /* 80007E14 00004D74 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 80007E18 00004D78 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 80007E18 00004D78 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 80007E1C 00004D7C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 80007E20 00004D80 3C 80 80 3E */ lis r4, lbl_803D8D60@ha /* 80007E24 00004D84 90 03 00 00 */ stw r0, 0(r3) -/* 80007E28 00004D88 38 A5 8D 78 */ addi r5, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 80007E28 00004D88 38 A5 8D 78 */ addi r5, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 80007E2C 00004D8C 38 04 8D 60 */ addi r0, r4, lbl_803D8D60@l /* 80007E30 00004D90 90 A3 00 00 */ stw r5, 0(r3) /* 80007E34 00004D94 93 E3 00 04 */ stw r31, 4(r3) diff --git a/asm/Weapons/CCollisionResponseData.s b/asm/Weapons/CCollisionResponseData.s index 237859ba..7bc9adea 100644 --- a/asm/Weapons/CCollisionResponseData.s +++ b/asm/Weapons/CCollisionResponseData.s @@ -109,8 +109,8 @@ lbl_802B2248: lbl_802B22AC: /* 802B22AC 002AF20C 28 1E 00 00 */ cmplwi r30, 0 /* 802B22B0 002AF210 41 82 00 20 */ beq lbl_802B22D0 -/* 802B22B4 002AF214 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802B22B8 002AF218 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B22B4 002AF214 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802B22B8 002AF218 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B22BC 002AF21C 90 1E 00 00 */ stw r0, 0(r30) /* 802B22C0 002AF220 41 82 00 10 */ beq lbl_802B22D0 /* 802B22C4 002AF224 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -162,11 +162,11 @@ lbl_802B22E0: /* 802B235C 002AF2BC 28 03 00 00 */ cmplwi r3, 0 /* 802B2360 002AF2C0 41 82 00 38 */ beq lbl_802B2398 /* 802B2364 002AF2C4 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802B2368 002AF2C8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802B2368 002AF2C8 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802B236C 002AF2CC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802B2370 002AF2D0 3C 80 80 3F */ lis r4, lbl_803EC518@ha /* 802B2374 002AF2D4 90 03 00 00 */ stw r0, 0(r3) -/* 802B2378 002AF2D8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B2378 002AF2D8 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B237C 002AF2DC 38 A0 00 00 */ li r5, 0 /* 802B2380 002AF2E0 38 04 C5 18 */ addi r0, r4, lbl_803EC518@l /* 802B2384 002AF2E4 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Weapons/CDecal.s b/asm/Weapons/CDecal.s index 28f5cc09..d7104a89 100644 --- a/asm/Weapons/CDecal.s +++ b/asm/Weapons/CDecal.s @@ -136,12 +136,12 @@ RenderMdl__6CDecalCFv: /* 802B49BC 002B191C 7C 7F 1B 78 */ mr r31, r3 /* 802B49C0 002B1920 93 C1 03 38 */ stw r30, 0x338(r1) /* 802B49C4 002B1924 48 09 55 E9 */ bl White__6CColorFv -/* 802B49C8 002B1928 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802B49C8 002B1928 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802B49CC 002B192C 80 03 00 00 */ lwz r0, 0(r3) -/* 802B49D0 002B1930 38 A4 66 A0 */ addi r5, r4, skZero3f@l -/* 802B49D4 002B1934 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802B49D0 002B1930 38 A4 66 A0 */ addi r5, r4, sZeroVector__9CVector3f@l +/* 802B49D4 002B1934 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802B49D8 002B1938 C0 45 00 00 */ lfs f2, 0(r5) -/* 802B49DC 002B193C 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802B49DC 002B193C 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802B49E0 002B1940 C0 25 00 04 */ lfs f1, 4(r5) /* 802B49E4 002B1944 38 61 03 04 */ addi r3, r1, 0x304 /* 802B49E8 002B1948 C0 05 00 08 */ lfs f0, 8(r5) @@ -174,9 +174,9 @@ lbl_802B4A28: /* 802B4A50 002B19B0 41 82 00 08 */ beq lbl_802B4A58 /* 802B4A54 002B19B4 3B C0 00 01 */ li r30, 1 lbl_802B4A58: -/* 802B4A58 002B19B8 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802B4A58 002B19B8 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802B4A5C 002B19BC 38 61 02 D4 */ addi r3, r1, 0x2d4 -/* 802B4A60 002B19C0 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802B4A60 002B19C0 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802B4A64 002B19C4 48 05 E1 11 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802B4A68 002B19C8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802B4A6C 002B19CC 41 82 00 84 */ beq lbl_802B4AF0 @@ -454,8 +454,8 @@ RenderQuad__6CDecalCFRQ26CDecal10CQuadDecalRCQ217CDecalDescription10SQuadDescr: /* 802B4E78 002B1DD8 7C 9D 23 78 */ mr r29, r4 /* 802B4E7C 002B1DDC 7C BE 2B 78 */ mr r30, r5 /* 802B4E80 002B1DE0 48 09 51 2D */ bl White__6CColorFv -/* 802B4E84 002B1DE4 3C 80 80 5A */ lis r4, skZero3f@ha -/* 802B4E88 002B1DE8 C4 44 66 A0 */ lfsu f2, skZero3f@l(r4) +/* 802B4E84 002B1DE4 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha +/* 802B4E88 002B1DE8 C4 44 66 A0 */ lfsu f2, sZeroVector__9CVector3f@l(r4) /* 802B4E8C 002B1DEC 80 BE 00 10 */ lwz r5, 0x10(r30) /* 802B4E90 002B1DF0 80 03 00 00 */ lwz r0, 0(r3) /* 802B4E94 002B1DF4 C0 62 C2 58 */ lfs f3, lbl_805ADF78@sda21(r2) @@ -858,11 +858,11 @@ lbl_802B5408: /* 802B5478 002B23D8 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 802B547C 002B23DC 38 E0 00 01 */ li r7, 1 /* 802B5480 002B23E0 50 E0 3E 30 */ rlwimi r0, r7, 7, 0x18, 0x18 -/* 802B5484 002B23E4 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802B5484 002B23E4 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802B5488 002B23E8 98 1F 00 3C */ stb r0, 0x3c(r31) /* 802B548C 002B23EC 38 C0 00 00 */ li r6, 0 /* 802B5490 002B23F0 C0 02 C2 54 */ lfs f0, lbl_805ADF74@sda21(r2) -/* 802B5494 002B23F4 38 A3 66 A0 */ addi r5, r3, skZero3f@l +/* 802B5494 002B23F4 38 A3 66 A0 */ addi r5, r3, sZeroVector__9CVector3f@l /* 802B5498 002B23F8 90 DF 00 40 */ stw r6, 0x40(r31) /* 802B549C 002B23FC 38 61 00 10 */ addi r3, r1, 0x10 /* 802B54A0 002B2400 38 8D A5 E8 */ addi r4, r13, sDecalRandom__6CDecal@sda21 diff --git a/asm/Weapons/CDecalDataFactory.s b/asm/Weapons/CDecalDataFactory.s index d019fe44..b491f895 100644 --- a/asm/Weapons/CDecalDataFactory.s +++ b/asm/Weapons/CDecalDataFactory.s @@ -868,8 +868,8 @@ sub_802b4218: lbl_802B4258: /* 802B4258 002B11B8 28 1E 00 00 */ cmplwi r30, 0 /* 802B425C 002B11BC 41 82 00 20 */ beq lbl_802B427C -/* 802B4260 002B11C0 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802B4264 002B11C4 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B4260 002B11C0 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802B4264 002B11C4 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B4268 002B11C8 90 1E 00 00 */ stw r0, 0(r30) /* 802B426C 002B11CC 41 82 00 10 */ beq lbl_802B427C /* 802B4270 002B11D0 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1224,11 +1224,11 @@ lbl_802B46C8: /* 802B474C 002B16AC 28 03 00 00 */ cmplwi r3, 0 /* 802B4750 002B16B0 41 82 00 38 */ beq lbl_802B4788 /* 802B4754 002B16B4 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802B4758 002B16B8 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802B4758 002B16B8 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802B475C 002B16BC 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802B4760 002B16C0 3C 80 80 3F */ lis r4, lbl_803EC548@ha /* 802B4764 002B16C4 90 03 00 00 */ stw r0, 0(r3) -/* 802B4768 002B16C8 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B4768 002B16C8 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B476C 002B16CC 38 A0 00 00 */ li r5, 0 /* 802B4770 002B16D0 38 04 C5 48 */ addi r0, r4, lbl_803EC548@l /* 802B4774 002B16D4 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/Weapons/CProjectileWeapon.s b/asm/Weapons/CProjectileWeapon.s index a5bc314e..3e051ab7 100644 --- a/asm/Weapons/CProjectileWeapon.s +++ b/asm/Weapons/CProjectileWeapon.s @@ -47,9 +47,9 @@ GetBounds__17CProjectileWeaponCFv: /* 802AED18 002ABC78 3B E0 00 00 */ li r31, 0 /* 802AED1C 002ABC7C 93 C1 01 48 */ stw r30, 0x148(r1) /* 802AED20 002ABC80 7C 9E 23 78 */ mr r30, r4 -/* 802AED24 002ABC84 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 802AED24 002ABC84 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 802AED28 002ABC88 93 A1 01 44 */ stw r29, 0x144(r1) -/* 802AED2C 002ABC8C 38 A4 67 54 */ addi r5, r4, lbl_805A6754@l +/* 802AED2C 002ABC8C 38 A4 67 54 */ addi r5, r4, mskInvertedBox__6CAABox@l /* 802AED30 002ABC90 7C 7D 1B 78 */ mr r29, r3 /* 802AED34 002ABC94 80 9E 00 FC */ lwz r4, 0xfc(r30) /* 802AED38 002ABC98 C0 A5 00 00 */ lfs f5, 0(r5) @@ -564,10 +564,10 @@ CollisionOccured__17CProjectileWeaponF29EWeaponCollisionResponseTypesbbRC9CVecto /* 802AF444 002AC3A4 38 61 00 34 */ addi r3, r1, 0x34 /* 802AF448 002AC3A8 38 81 00 64 */ addi r4, r1, 0x64 /* 802AF44C 002AC3AC 48 06 54 05 */ bl AsNormalized__9CVector3fCFv -/* 802AF450 002AC3B0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802AF454 002AC3B4 3C A0 80 5A */ lis r5, lbl_805A66F4@ha -/* 802AF458 002AC3B8 38 83 66 A0 */ addi r4, r3, skZero3f@l -/* 802AF45C 002AC3BC 38 C5 66 F4 */ addi r6, r5, lbl_805A66F4@l +/* 802AF450 002AC3B0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802AF454 002AC3B4 3C A0 80 5A */ lis r5, sUpVector__9CVector3f@ha +/* 802AF458 002AC3B8 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l +/* 802AF45C 002AC3BC 38 C5 66 F4 */ addi r6, r5, sUpVector__9CVector3f@l /* 802AF460 002AC3C0 38 61 00 D0 */ addi r3, r1, 0xd0 /* 802AF464 002AC3C4 38 A1 00 34 */ addi r5, r1, 0x34 /* 802AF468 002AC3C8 48 06 46 A9 */ bl LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f @@ -580,9 +580,9 @@ lbl_802AF47C: /* 802AF480 002AC3E0 38 61 00 A0 */ addi r3, r1, 0xa0 /* 802AF484 002AC3E4 48 00 11 55 */ bl GetTransform__17CProjectileWeaponFv /* 802AF488 002AC3E8 C0 A1 00 B4 */ lfs f5, 0xb4(r1) -/* 802AF48C 002AC3EC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802AF48C 002AC3EC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802AF490 002AC3F0 C0 FB 00 04 */ lfs f7, 4(r27) -/* 802AF494 002AC3F4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802AF494 002AC3F4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802AF498 002AC3F8 C0 81 00 A4 */ lfs f4, 0xa4(r1) /* 802AF49C 002AC3FC 7F 66 DB 78 */ mr r6, r27 /* 802AF4A0 002AC400 EC 07 01 72 */ fmuls f0, f7, f5 @@ -907,9 +907,9 @@ Render__17CProjectileWeaponCFv: /* 802AF924 002AC884 48 06 30 2D */ bl __ml__12CTransform4fCFRC12CTransform4f /* 802AF928 002AC888 38 61 00 C4 */ addi r3, r1, 0xc4 /* 802AF92C 002AC88C 48 05 CC B5 */ bl SetModelMatrix__9CGraphicsFRC12CTransform4f -/* 802AF930 002AC890 3C 80 80 5A */ lis r4, skZero3f@ha +/* 802AF930 002AC890 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha /* 802AF934 002AC894 38 61 02 14 */ addi r3, r1, 0x214 -/* 802AF938 002AC898 38 84 66 A0 */ addi r4, r4, skZero3f@l +/* 802AF938 002AC898 38 84 66 A0 */ addi r4, r4, sZeroVector__9CVector3f@l /* 802AF93C 002AC89C 38 BF 00 C8 */ addi r5, r31, 0xc8 /* 802AF940 002AC8A0 48 05 6B 65 */ bl BuildLocalAmbient__6CLightFRC9CVector3fRC6CColor /* 802AF944 002AC8A4 38 61 02 64 */ addi r3, r1, 0x264 @@ -2114,19 +2114,19 @@ lbl_802B09D0: /* 802B0A50 002AD9B0 7F A4 EB 78 */ mr r4, r29 /* 802B0A54 002AD9B4 38 7F 00 14 */ addi r3, r31, 0x14 /* 802B0A58 002AD9B8 48 06 21 1D */ bl __ct__12CTransform4fFRC12CTransform4f -/* 802B0A5C 002AD9BC 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802B0A5C 002AD9BC 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802B0A60 002AD9C0 38 7F 00 44 */ addi r3, r31, 0x44 -/* 802B0A64 002AD9C4 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802B0A64 002AD9C4 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802B0A68 002AD9C8 48 06 21 0D */ bl __ct__12CTransform4fFRC12CTransform4f /* 802B0A6C 002AD9CC C0 3B 00 00 */ lfs f1, 0(r27) -/* 802B0A70 002AD9D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802B0A70 002AD9D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802B0A74 002AD9D4 C0 02 C1 F8 */ lfs f0, lbl_805ADF18@sda21(r2) /* 802B0A78 002AD9D8 D0 3F 00 74 */ stfs f1, 0x74(r31) /* 802B0A7C 002AD9DC C0 3B 00 04 */ lfs f1, 4(r27) /* 802B0A80 002AD9E0 D0 3F 00 78 */ stfs f1, 0x78(r31) /* 802B0A84 002AD9E4 C0 3B 00 08 */ lfs f1, 8(r27) /* 802B0A88 002AD9E8 D0 3F 00 7C */ stfs f1, 0x7c(r31) -/* 802B0A8C 002AD9EC C4 23 66 A0 */ lfsu f1, skZero3f@l(r3) +/* 802B0A8C 002AD9EC C4 23 66 A0 */ lfsu f1, sZeroVector__9CVector3f@l(r3) /* 802B0A90 002AD9F0 D0 3F 00 80 */ stfs f1, 0x80(r31) /* 802B0A94 002AD9F4 C0 23 00 04 */ lfs f1, 4(r3) /* 802B0A98 002AD9F8 D0 3F 00 84 */ stfs f1, 0x84(r31) @@ -2448,9 +2448,9 @@ lbl_802B0F34: /* 802B0F38 002ADE98 80 03 00 00 */ lwz r0, 0(r3) /* 802B0F3C 002ADE9C 28 00 00 00 */ cmplwi r0, 0 /* 802B0F40 002ADEA0 41 82 00 A8 */ beq lbl_802B0FE8 -/* 802B0F44 002ADEA4 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802B0F44 002ADEA4 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802B0F48 002ADEA8 38 61 00 54 */ addi r3, r1, 0x54 -/* 802B0F4C 002ADEAC 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802B0F4C 002ADEAC 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802B0F50 002ADEB0 48 06 1C 25 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802B0F54 002ADEB4 C0 02 C1 F0 */ lfs f0, lbl_805ADF10@sda21(r2) /* 802B0F58 002ADEB8 38 A1 00 3C */ addi r5, r1, 0x3c @@ -2490,9 +2490,9 @@ lbl_802B0F34: /* 802B0FE0 002ADF40 4B FF F5 21 */ bl SetRelativeOrientation__17CProjectileWeaponFRC12CTransform4f /* 802B0FE4 002ADF44 48 00 00 14 */ b lbl_802B0FF8 lbl_802B0FE8: -/* 802B0FE8 002ADF48 3C 80 80 5A */ lis r4, skIdentity4f@ha +/* 802B0FE8 002ADF48 3C 80 80 5A */ lis r4, sIdentity__12CTransform4f@ha /* 802B0FEC 002ADF4C 7F E3 FB 78 */ mr r3, r31 -/* 802B0FF0 002ADF50 38 84 66 70 */ addi r4, r4, skIdentity4f@l +/* 802B0FF0 002ADF50 38 84 66 70 */ addi r4, r4, sIdentity__12CTransform4f@l /* 802B0FF4 002ADF54 4B FF F5 0D */ bl SetRelativeOrientation__17CProjectileWeaponFRC12CTransform4f lbl_802B0FF8: /* 802B0FF8 002ADF58 80 7F 00 0C */ lwz r3, 0xc(r31) diff --git a/asm/Weapons/CProjectileWeaponDataFactory.s b/asm/Weapons/CProjectileWeaponDataFactory.s index db9d30ae..3e18e159 100644 --- a/asm/Weapons/CProjectileWeaponDataFactory.s +++ b/asm/Weapons/CProjectileWeaponDataFactory.s @@ -1035,8 +1035,8 @@ lbl_802B1F0C: lbl_802B1F64: /* 802B1F64 002AEEC4 28 1E 00 00 */ cmplwi r30, 0 /* 802B1F68 002AEEC8 41 82 00 20 */ beq lbl_802B1F88 -/* 802B1F6C 002AEECC 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802B1F70 002AEED0 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B1F6C 002AEECC 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802B1F70 002AEED0 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B1F74 002AEED4 90 1E 00 00 */ stw r0, 0(r30) /* 802B1F78 002AEED8 41 82 00 10 */ beq lbl_802B1F88 /* 802B1F7C 002AEEDC 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1148,11 +1148,11 @@ lbl_802B2074: /* 802B20F0 002AF050 28 03 00 00 */ cmplwi r3, 0 /* 802B20F4 002AF054 41 82 00 38 */ beq lbl_802B212C /* 802B20F8 002AF058 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802B20FC 002AF05C 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802B20FC 002AF05C 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802B2100 002AF060 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802B2104 002AF064 3C 80 80 3F */ lis r4, lbl_803EC508@ha /* 802B2108 002AF068 90 03 00 00 */ stw r0, 0(r3) -/* 802B210C 002AF06C 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802B210C 002AF06C 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802B2110 002AF070 38 A0 00 00 */ li r5, 0 /* 802B2114 002AF074 38 04 C5 08 */ addi r0, r4, lbl_803EC508@l /* 802B2118 002AF078 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/WorldFormat/CCollidableOBBTree.s b/asm/WorldFormat/CCollidableOBBTree.s index f1a94fb9..ec3f3e30 100644 --- a/asm/WorldFormat/CCollidableOBBTree.s +++ b/asm/WorldFormat/CCollidableOBBTree.s @@ -490,9 +490,9 @@ LineIntersectsTree__18CCollidableOBBTreeCFRC5CMRayRC15CMaterialFilterfRC12CTrans /* 802A9F40 002A6EA0 D0 21 00 18 */ stfs f1, 0x18(r1) /* 802A9F44 002A6EA4 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 802A9F48 002A6EA8 48 06 A9 B1 */ bl Normalize__9CVector3fFv -/* 802A9F4C 002A6EAC 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802A9F4C 002A6EAC 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802A9F50 002A6EB0 38 00 00 00 */ li r0, 0 -/* 802A9F54 002A6EB4 38 83 66 A0 */ addi r4, r3, skZero3f@l +/* 802A9F54 002A6EB4 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 802A9F58 002A6EB8 C0 61 00 18 */ lfs f3, 0x18(r1) /* 802A9F5C 002A6EBC C0 04 00 04 */ lfs f0, 4(r4) /* 802A9F60 002A6EC0 7F 83 E3 78 */ mr r3, r28 @@ -1768,9 +1768,9 @@ AABoxCollideWithLeafMoving__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTr /* 802AB29C 002A81FC DB A1 02 90 */ stfd f29, 0x290(r1) /* 802AB2A0 002A8200 F3 A1 02 98 */ psq_st f29, 664(r1), 0, qr0 /* 802AB2A4 002A8204 BD C1 02 48 */ stmw r14, 0x248(r1) -/* 802AB2A8 002A8208 3D 60 80 5A */ lis r11, skZero3f@ha +/* 802AB2A8 002A8208 3D 60 80 5A */ lis r11, sZeroVector__9CVector3f@ha /* 802AB2AC 002A820C 7D 32 4B 78 */ mr r18, r9 -/* 802AB2B0 002A8210 39 2B 66 A0 */ addi r9, r11, skZero3f@l +/* 802AB2B0 002A8210 39 2B 66 A0 */ addi r9, r11, sZeroVector__9CVector3f@l /* 802AB2B4 002A8214 C0 12 06 E8 */ lfs f0, 0x6e8(r18) /* 802AB2B8 002A8218 C0 29 00 00 */ lfs f1, 0(r9) /* 802AB2BC 002A821C 7C 6F 1B 78 */ mr r15, r3 @@ -2650,11 +2650,11 @@ lbl_802ABFB0: SphereCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransform4fRC7CSphereRC13CMaterialListRC15CMaterialFilterR18CCollisionInfoList: /* 802ABFC4 002A8F24 94 21 FE F0 */ stwu r1, -0x110(r1) /* 802ABFC8 002A8F28 7C 08 02 A6 */ mflr r0 -/* 802ABFCC 002A8F2C 3D 40 80 5A */ lis r10, skZero3f@ha +/* 802ABFCC 002A8F2C 3D 40 80 5A */ lis r10, sZeroVector__9CVector3f@ha /* 802ABFD0 002A8F30 90 01 01 14 */ stw r0, 0x114(r1) /* 802ABFD4 002A8F34 BE 61 00 DC */ stmw r19, 0xdc(r1) /* 802ABFD8 002A8F38 7C 94 23 78 */ mr r20, r4 -/* 802ABFDC 002A8F3C 38 8A 66 A0 */ addi r4, r10, skZero3f@l +/* 802ABFDC 002A8F3C 38 8A 66 A0 */ addi r4, r10, sZeroVector__9CVector3f@l /* 802ABFE0 002A8F40 3B 81 00 5C */ addi r28, r1, 0x5c /* 802ABFE4 002A8F44 3B A1 00 68 */ addi r29, r1, 0x68 /* 802ABFE8 002A8F48 7C 73 1B 78 */ mr r19, r3 @@ -2852,7 +2852,7 @@ AABoxCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransfor /* 802AC2B4 002A9214 38 61 00 2C */ addi r3, r1, 0x2c /* 802AC2B8 002A9218 48 08 B3 55 */ bl GetCenterPoint__6CAABoxCFv /* 802AC2BC 002A921C C0 79 00 10 */ lfs f3, 0x10(r25) -/* 802AC2C0 002A9220 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802AC2C0 002A9220 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802AC2C4 002A9224 C0 59 00 04 */ lfs f2, 4(r25) /* 802AC2C8 002A9228 3B 61 00 AC */ addi r27, r1, 0xac /* 802AC2CC 002A922C C0 39 00 14 */ lfs f1, 0x14(r25) @@ -2860,7 +2860,7 @@ AABoxCollideWithLeaf__18CCollidableOBBTreeCFRCQ28COBBTree9CLeafDataRC12CTransfor /* 802AC2D4 002A9234 C0 19 00 08 */ lfs f0, 8(r25) /* 802AC2D8 002A9238 EC 63 10 28 */ fsubs f3, f3, f2 /* 802AC2DC 002A923C C0 82 C1 BC */ lfs f4, lbl_805ADEDC@sda21(r2) -/* 802AC2E0 002A9240 3B E3 67 54 */ addi r31, r3, lbl_805A6754@l +/* 802AC2E0 002A9240 3B E3 67 54 */ addi r31, r3, mskInvertedBox__6CAABox@l /* 802AC2E4 002A9244 EC 41 00 28 */ fsubs f2, f1, f0 /* 802AC2E8 002A9248 C0 39 00 0C */ lfs f1, 0xc(r25) /* 802AC2EC 002A924C C0 19 00 00 */ lfs f0, 0(r25) @@ -2933,9 +2933,9 @@ lbl_802AC338: /* 802AC3F4 002A9354 48 02 50 ED */ bl TriBoxOverlap__13CollisionUtilFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3f /* 802AC3F8 002A9358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AC3FC 002A935C 41 82 00 D0 */ beq lbl_802AC4CC -/* 802AC400 002A9360 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802AC400 002A9360 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802AC404 002A9364 80 92 00 1C */ lwz r4, 0x1c(r18) -/* 802AC408 002A9368 C0 A3 67 54 */ lfs f5, lbl_805A6754@l(r3) +/* 802AC408 002A9368 C0 A3 67 54 */ lfs f5, mskInvertedBox__6CAABox@l(r3) /* 802AC40C 002A936C 7E E3 BB 78 */ mr r3, r23 /* 802AC410 002A9370 38 04 00 01 */ addi r0, r4, 1 /* 802AC414 002A9374 C0 9F 00 04 */ lfs f4, 4(r31) @@ -3120,9 +3120,9 @@ CalculateAABox__18CCollidableOBBTreeCFRC12CTransform4f: /* 802AC698 002A95F8 38 81 00 20 */ addi r4, r1, 0x20 /* 802AC69C 002A95FC 48 06 64 D9 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802AC6A0 002A9600 C0 41 00 50 */ lfs f2, 0x50(r1) -/* 802AC6A4 002A9604 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802AC6A4 002A9604 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802AC6A8 002A9608 C0 21 00 54 */ lfs f1, 0x54(r1) -/* 802AC6AC 002A960C 38 A3 66 70 */ addi r5, r3, skIdentity4f@l +/* 802AC6AC 002A960C 38 A3 66 70 */ addi r5, r3, sIdentity__12CTransform4f@l /* 802AC6B0 002A9610 C0 01 00 58 */ lfs f0, 0x58(r1) /* 802AC6B4 002A9614 7F C3 F3 78 */ mr r3, r30 /* 802AC6B8 002A9618 D0 41 00 8C */ stfs f2, 0x8c(r1) diff --git a/asm/WorldFormat/CCollidableOBBTreeGroup.s b/asm/WorldFormat/CCollidableOBBTreeGroup.s index ca4d77aa..122f1420 100644 --- a/asm/WorldFormat/CCollidableOBBTreeGroup.s +++ b/asm/WorldFormat/CCollidableOBBTreeGroup.s @@ -1105,9 +1105,9 @@ lbl_802AD69C: /* 802AD6F4 002AA654 38 61 01 10 */ addi r3, r1, 0x110 /* 802AD6F8 002AA658 38 81 00 A8 */ addi r4, r1, 0xa8 /* 802AD6FC 002AA65C 48 02 89 71 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 802AD700 002AA660 3C 60 80 5A */ lis r3, skIdentity4f@ha +/* 802AD700 002AA660 3C 60 80 5A */ lis r3, sIdentity__12CTransform4f@ha /* 802AD704 002AA664 D3 E1 01 48 */ stfs f31, 0x148(r1) -/* 802AD708 002AA668 38 83 66 70 */ addi r4, r3, skIdentity4f@l +/* 802AD708 002AA668 38 83 66 70 */ addi r4, r3, sIdentity__12CTransform4f@l /* 802AD70C 002AA66C 7F A3 EB 78 */ mr r3, r29 /* 802AD710 002AA670 48 06 54 65 */ bl __ct__12CTransform4fFRC12CTransform4f /* 802AD714 002AA674 92 C1 01 7C */ stw r22, 0x17c(r1) @@ -1310,13 +1310,13 @@ SetStaticTableIndex__23CCollidableOBBTreeGroupFUi: __ct__23CCollidableOBBTreeGroupFRC9CVector3fRC9CVector3f: /* 802AD9D8 002AA938 94 21 FF 70 */ stwu r1, -0x90(r1) /* 802AD9DC 002AA93C 7C 08 02 A6 */ mflr r0 -/* 802AD9E0 002AA940 3C C0 80 5A */ lis r6, lbl_805A6754@ha +/* 802AD9E0 002AA940 3C C0 80 5A */ lis r6, mskInvertedBox__6CAABox@ha /* 802AD9E4 002AA944 90 01 00 94 */ stw r0, 0x94(r1) /* 802AD9E8 002AA948 38 00 00 00 */ li r0, 0 /* 802AD9EC 002AA94C BF 61 00 7C */ stmw r27, 0x7c(r1) /* 802AD9F0 002AA950 7C BB 2B 78 */ mr r27, r5 /* 802AD9F4 002AA954 7C 9C 23 78 */ mr r28, r4 -/* 802AD9F8 002AA958 38 A6 67 54 */ addi r5, r6, lbl_805A6754@l +/* 802AD9F8 002AA958 38 A6 67 54 */ addi r5, r6, mskInvertedBox__6CAABox@l /* 802AD9FC 002AA95C 7C 7D 1B 78 */ mr r29, r3 /* 802ADA00 002AA960 38 80 00 01 */ li r4, 1 /* 802ADA04 002AA964 90 03 00 04 */ stw r0, 4(r3) @@ -1488,8 +1488,8 @@ __ct__23CCollidableOBBTreeGroupFR12CInputStream: /* 802ADC68 002AABC8 7C 7B 1B 78 */ mr r27, r3 /* 802ADC6C 002AABCC 7C 9C 23 78 */ mr r28, r4 /* 802ADC70 002AABD0 90 03 00 04 */ stw r0, 4(r3) -/* 802ADC74 002AABD4 3C 60 80 5A */ lis r3, lbl_805A6754@ha -/* 802ADC78 002AABD8 38 83 67 54 */ addi r4, r3, lbl_805A6754@l +/* 802ADC74 002AABD4 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha +/* 802ADC78 002AABD8 38 83 67 54 */ addi r4, r3, mskInvertedBox__6CAABox@l /* 802ADC7C 002AABDC 90 1B 00 08 */ stw r0, 8(r27) /* 802ADC80 002AABE0 7F 83 E3 78 */ mr r3, r28 /* 802ADC84 002AABE4 90 1B 00 0C */ stw r0, 0xc(r27) @@ -1756,8 +1756,8 @@ lbl_802ADFD8: lbl_802AE03C: /* 802AE03C 002AAF9C 28 1E 00 00 */ cmplwi r30, 0 /* 802AE040 002AAFA0 41 82 00 20 */ beq lbl_802AE060 -/* 802AE044 002AAFA4 3C 60 80 3E */ lis r3, __vt__31TObjOwnerDerivedFromIObjUntyped@ha -/* 802AE048 002AAFA8 38 03 8D 78 */ addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802AE044 002AAFA4 3C 60 80 3E */ lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha +/* 802AE048 002AAFA8 38 03 8D 78 */ addi r0, r3, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802AE04C 002AAFAC 90 1E 00 00 */ stw r0, 0(r30) /* 802AE050 002AAFB0 41 82 00 10 */ beq lbl_802AE060 /* 802AE054 002AAFB4 3C 60 80 3E */ lis r3, __vt__4IObj@ha @@ -1809,11 +1809,11 @@ lbl_802AE070: /* 802AE0EC 002AB04C 28 03 00 00 */ cmplwi r3, 0 /* 802AE0F0 002AB050 41 82 00 38 */ beq lbl_802AE128 /* 802AE0F4 002AB054 3C 80 80 3E */ lis r4, __vt__4IObj@ha -/* 802AE0F8 002AB058 3C A0 80 3E */ lis r5, __vt__31TObjOwnerDerivedFromIObjUntyped@ha +/* 802AE0F8 002AB058 3C A0 80 3E */ lis r5, __vt__31CObjOwnerDerivedFromIObjUntyped@ha /* 802AE0FC 002AB05C 38 04 8D 6C */ addi r0, r4, __vt__4IObj@l /* 802AE100 002AB060 3C 80 80 3F */ lis r4, lbl_803EC498@ha /* 802AE104 002AB064 90 03 00 00 */ stw r0, 0(r3) -/* 802AE108 002AB068 38 C5 8D 78 */ addi r6, r5, __vt__31TObjOwnerDerivedFromIObjUntyped@l +/* 802AE108 002AB068 38 C5 8D 78 */ addi r6, r5, __vt__31CObjOwnerDerivedFromIObjUntyped@l /* 802AE10C 002AB06C 38 A0 00 00 */ li r5, 0 /* 802AE110 002AB070 38 04 C4 98 */ addi r0, r4, lbl_803EC498@l /* 802AE114 002AB074 90 C3 00 00 */ stw r6, 0(r3) diff --git a/asm/WorldFormat/CMetroidAreaCollider.s b/asm/WorldFormat/CMetroidAreaCollider.s index b7de49eb..842d3c6a 100644 --- a/asm/WorldFormat/CMetroidAreaCollider.s +++ b/asm/WorldFormat/CMetroidAreaCollider.s @@ -197,9 +197,9 @@ lbl_802A32A8: /* 802A32B0 002A0210 42 00 FF 2C */ bdnz lbl_802A31DC /* 802A32B4 002A0214 28 1F 00 01 */ cmplwi r31, 1 /* 802A32B8 002A0218 40 82 00 AC */ bne lbl_802A3364 -/* 802A32BC 002A021C 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802A32BC 002A021C 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802A32C0 002A0220 7F A4 EB 78 */ mr r4, r29 -/* 802A32C4 002A0224 38 C3 67 54 */ addi r6, r3, lbl_805A6754@l +/* 802A32C4 002A0224 38 C3 67 54 */ addi r6, r3, mskInvertedBox__6CAABox@l /* 802A32C8 002A0228 38 61 00 34 */ addi r3, r1, 0x34 /* 802A32CC 002A022C 80 A6 00 00 */ lwz r5, 0(r6) /* 802A32D0 002A0230 80 06 00 04 */ lwz r0, 4(r6) @@ -1243,9 +1243,9 @@ MovingAABoxCollisionCheck_TriVertexBox__20CMetroidAreaColliderFRC9CVector3fRC6CA /* 802A4164 002A10C4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 802A4168 002A10C8 D0 41 00 14 */ stfs f2, 0x14(r1) /* 802A416C 002A10CC 48 03 1F 01 */ bl __ct__5CMRayFRC9CVector3fRC9CVector3ff -/* 802A4170 002A10D0 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802A4170 002A10D0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802A4174 002A10D4 7F 64 DB 78 */ mr r4, r27 -/* 802A4178 002A10D8 38 E3 66 A0 */ addi r7, r3, skZero3f@l +/* 802A4178 002A10D8 38 E3 66 A0 */ addi r7, r3, sZeroVector__9CVector3f@l /* 802A417C 002A10DC 38 61 00 28 */ addi r3, r1, 0x28 /* 802A4180 002A10E0 C0 47 00 00 */ lfs f2, 0(r7) /* 802A4184 002A10E4 38 A1 00 1C */ addi r5, r1, 0x1c @@ -1360,13 +1360,13 @@ MovingAABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaColli /* 802A4328 002A1288 38 81 00 DC */ addi r4, r1, 0xdc /* 802A432C 002A128C 48 09 32 E1 */ bl GetCenterPoint__6CAABoxCFv /* 802A4330 002A1290 C0 61 00 EC */ lfs f3, 0xec(r1) -/* 802A4334 002A1294 3C 60 80 5A */ lis r3, skZero3f@ha +/* 802A4334 002A1294 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802A4338 002A1298 C0 41 00 E0 */ lfs f2, 0xe0(r1) /* 802A433C 002A129C 3B 00 00 00 */ li r24, 0 /* 802A4340 002A12A0 C0 21 00 F0 */ lfs f1, 0xf0(r1) /* 802A4344 002A12A4 C0 01 00 E4 */ lfs f0, 0xe4(r1) /* 802A4348 002A12A8 EC 63 10 28 */ fsubs f3, f3, f2 -/* 802A434C 002A12AC C4 E3 66 A0 */ lfsu f7, skZero3f@l(r3) +/* 802A434C 002A12AC C4 E3 66 A0 */ lfsu f7, sZeroVector__9CVector3f@l(r3) /* 802A4350 002A12B0 EC 41 00 28 */ fsubs f2, f1, f0 /* 802A4354 002A12B4 C0 82 C1 60 */ lfs f4, lbl_805ADE80@sda21(r2) /* 802A4358 002A12B8 C1 03 00 04 */ lfs f8, 4(r3) @@ -3301,8 +3301,8 @@ SphereCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16 /* 802A6054 002A2FB4 7C FE 3B 78 */ mr r30, r7 /* 802A6058 002A2FB8 7D 1F 43 78 */ mr r31, r8 /* 802A605C 002A2FBC 48 00 0F E5 */ bl ResetInternalCounters__20CMetroidAreaColliderFv -/* 802A6060 002A2FC0 3C 60 80 5A */ lis r3, skZero3f@ha -/* 802A6064 002A2FC4 C4 03 66 A0 */ lfsu f0, skZero3f@l(r3) +/* 802A6060 002A2FC0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha +/* 802A6064 002A2FC4 C4 03 66 A0 */ lfsu f0, sZeroVector__9CVector3f@l(r3) /* 802A6068 002A2FC8 3A FA 00 08 */ addi r23, r26, 8 /* 802A606C 002A2FCC 3A A0 00 00 */ li r21, 0 /* 802A6070 002A2FD0 C0 23 00 04 */ lfs f1, 4(r3) @@ -3404,11 +3404,11 @@ lbl_802A61A8: SphereCollisionCheck_Internal__20CMetroidAreaColliderFRCQ212CAreaOctTree4NodeR16CSphereAreaCache: /* 802A61CC 002A312C 94 21 FE D0 */ stwu r1, -0x130(r1) /* 802A61D0 002A3130 7C 08 02 A6 */ mflr r0 -/* 802A61D4 002A3134 3C A0 80 5A */ lis r5, skZero3f@ha +/* 802A61D4 002A3134 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 802A61D8 002A3138 90 01 01 34 */ stw r0, 0x134(r1) /* 802A61DC 002A313C BE A1 01 04 */ stmw r21, 0x104(r1) /* 802A61E0 002A3140 7C 76 1B 78 */ mr r22, r3 -/* 802A61E4 002A3144 38 65 66 A0 */ addi r3, r5, skZero3f@l +/* 802A61E4 002A3144 38 65 66 A0 */ addi r3, r5, sZeroVector__9CVector3f@l /* 802A61E8 002A3148 7C 97 23 78 */ mr r23, r4 /* 802A61EC 002A314C 3B 60 00 00 */ li r27, 0 /* 802A61F0 002A3150 3B 40 00 00 */ li r26, 0 @@ -4053,11 +4053,11 @@ AABoxCollisionCheck_Cached__20CMetroidAreaColliderFRCQ220CMetroidAreaCollider16C /* 802A6B44 002A3AA4 38 61 00 34 */ addi r3, r1, 0x34 /* 802A6B48 002A3AA8 48 09 0A C5 */ bl GetCenterPoint__6CAABoxCFv /* 802A6B4C 002A3AAC C0 7C 00 10 */ lfs f3, 0x10(r28) -/* 802A6B50 002A3AB0 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802A6B50 002A3AB0 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802A6B54 002A3AB4 C0 5C 00 04 */ lfs f2, 4(r28) /* 802A6B58 002A3AB8 3A FB 00 08 */ addi r23, r27, 8 /* 802A6B5C 002A3ABC C0 3C 00 14 */ lfs f1, 0x14(r28) -/* 802A6B60 002A3AC0 3B 23 67 54 */ addi r25, r3, lbl_805A6754@l +/* 802A6B60 002A3AC0 3B 23 67 54 */ addi r25, r3, mskInvertedBox__6CAABox@l /* 802A6B64 002A3AC4 C0 1C 00 08 */ lfs f0, 8(r28) /* 802A6B68 002A3AC8 EC 63 10 28 */ fsubs f3, f3, f2 /* 802A6B6C 002A3ACC C0 82 C1 60 */ lfs f4, lbl_805ADE80@sda21(r2) @@ -4134,9 +4134,9 @@ lbl_802A6C2C: /* 802A6C7C 002A3BDC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802A6C80 002A3BE0 28 00 00 01 */ cmplwi r0, 1 /* 802A6C84 002A3BE4 40 82 00 C4 */ bne lbl_802A6D48 -/* 802A6C88 002A3BE8 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802A6C88 002A3BE8 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802A6C8C 002A3BEC C0 99 00 04 */ lfs f4, 4(r25) -/* 802A6C90 002A3BF0 C0 A3 67 54 */ lfs f5, lbl_805A6754@l(r3) +/* 802A6C90 002A3BF0 C0 A3 67 54 */ lfs f5, mskInvertedBox__6CAABox@l(r3) /* 802A6C94 002A3BF4 7E 24 8B 78 */ mr r4, r17 /* 802A6C98 002A3BF8 C0 79 00 08 */ lfs f3, 8(r25) /* 802A6C9C 002A3BFC 38 61 01 08 */ addi r3, r1, 0x108 @@ -4281,11 +4281,11 @@ lbl_802A6E90: /* 802A6E94 002A3DF4 38 61 00 08 */ addi r3, r1, 8 /* 802A6E98 002A3DF8 4B FF BE A5 */ bl GetTriangleArray__Q212CAreaOctTree4NodeCFv /* 802A6E9C 002A3DFC 83 81 00 08 */ lwz r28, 8(r1) -/* 802A6EA0 002A3E00 3C 80 80 5A */ lis r4, lbl_805A6754@ha +/* 802A6EA0 002A3E00 3C 80 80 5A */ lis r4, mskInvertedBox__6CAABox@ha /* 802A6EA4 002A3E04 3C 60 80 59 */ lis r3, lbl_80597BAC@ha /* 802A6EA8 002A3E08 83 B7 00 1C */ lwz r29, 0x1c(r23) /* 802A6EAC 002A3E0C A3 5C 00 18 */ lhz r26, 0x18(r28) -/* 802A6EB0 002A3E10 3B C4 67 54 */ addi r30, r4, lbl_805A6754@l +/* 802A6EB0 002A3E10 3B C4 67 54 */ addi r30, r4, mskInvertedBox__6CAABox@l /* 802A6EB4 002A3E14 83 35 00 08 */ lwz r25, 8(r21) /* 802A6EB8 002A3E18 3B E3 7B AC */ addi r31, r3, lbl_80597BAC@l /* 802A6EBC 002A3E1C 83 15 00 04 */ lwz r24, 4(r21) @@ -4329,9 +4329,9 @@ lbl_802A6EFC: /* 802A6F4C 002A3EAC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802A6F50 002A3EB0 28 00 00 01 */ cmplwi r0, 1 /* 802A6F54 002A3EB4 40 82 00 C4 */ bne lbl_802A7018 -/* 802A6F58 002A3EB8 3C 60 80 5A */ lis r3, lbl_805A6754@ha +/* 802A6F58 002A3EB8 3C 60 80 5A */ lis r3, mskInvertedBox__6CAABox@ha /* 802A6F5C 002A3EBC C0 9E 00 04 */ lfs f4, 4(r30) -/* 802A6F60 002A3EC0 C0 A3 67 54 */ lfs f5, lbl_805A6754@l(r3) +/* 802A6F60 002A3EC0 C0 A3 67 54 */ lfs f5, mskInvertedBox__6CAABox@l(r3) /* 802A6F64 002A3EC4 7F 03 C3 78 */ mr r3, r24 /* 802A6F68 002A3EC8 C0 7E 00 08 */ lfs f3, 8(r30) /* 802A6F6C 002A3ECC 7E C4 B3 78 */ mr r4, r22 diff --git a/asm/WorldFormat/COBBTree.s b/asm/WorldFormat/COBBTree.s index 669f96f2..3692c326 100644 --- a/asm/WorldFormat/COBBTree.s +++ b/asm/WorldFormat/COBBTree.s @@ -1466,8 +1466,8 @@ CalculateLocalAABox__8COBBTreeCFv: /* 802A8CC4 002A5C24 80 84 00 88 */ lwz r4, 0x88(r4) /* 802A8CC8 002A5C28 28 04 00 00 */ cmplwi r4, 0 /* 802A8CCC 002A5C2C 41 82 00 14 */ beq lbl_802A8CE0 -/* 802A8CD0 002A5C30 3C A0 80 5A */ lis r5, skIdentity4f@ha -/* 802A8CD4 002A5C34 38 A5 66 70 */ addi r5, r5, skIdentity4f@l +/* 802A8CD0 002A5C30 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha +/* 802A8CD4 002A5C34 38 A5 66 70 */ addi r5, r5, sIdentity__12CTransform4f@l /* 802A8CD8 002A5C38 48 02 D1 01 */ bl CalculateAABox__6COBBoxCFRC12CTransform4f /* 802A8CDC 002A5C3C 48 00 00 20 */ b lbl_802A8CFC lbl_802A8CE0: diff --git a/include/Collision/CMaterialFilter.hpp b/include/Collision/CMaterialFilter.hpp new file mode 100644 index 00000000..c4eb1fca --- /dev/null +++ b/include/Collision/CMaterialFilter.hpp @@ -0,0 +1,32 @@ +#ifndef _CMATERIALFILTER_HPP +#define _CMATERIALFILTER_HPP + +#include "types.h" + +#include "Collision/CMaterialList.hpp" + +class CMaterialFilter { +public: + enum EFilterType { + kFT_Always, + kFT_Include, + kFT_Exclude, + kFT_IncludeExclude, + }; + + CMaterialFilter() : type(kFT_Always) {} + CMaterialFilter(const CMaterialList& include, const CMaterialList& exclude, EFilterType type) + : include(include), exclude(exclude), type(type) {} + + static CMaterialFilter MakeIncludeExclude(const CMaterialList& include, const CMaterialList& exclude) { + return CMaterialFilter(include, exclude, kFT_IncludeExclude); + } + +private: + CMaterialList include; + CMaterialList exclude; + EFilterType type; +}; +CHECK_SIZEOF(CMaterialFilter, 0x18) + +#endif \ No newline at end of file diff --git a/include/Collision/CMaterialList.hpp b/include/Collision/CMaterialList.hpp new file mode 100644 index 00000000..e0db5203 --- /dev/null +++ b/include/Collision/CMaterialList.hpp @@ -0,0 +1,91 @@ +#ifndef _CMATERIALLIST_HPP +#define _CMATERIALLIST_HPP + +#include "types.h" + +enum EMaterialTypes { + kMT_NoStepLogic = 0, + kMT_Stone = 1, + kMT_Metal = 2, + kMT_Grass = 3, + kMT_Ice = 4, + kMT_Pillar = 5, + kMT_MetalGrating = 6, + kMT_Phazon = 7, + kMT_Dirt = 8, + kMT_Lava = 9, + kMT_LavaStone = 10, + kMT_Snow = 11, + kMT_MudSlow = 12, + kMT_HalfPipe = 13, + kMT_Mud = 14, + kMT_Glass = 15, + kMT_Shield = 16, + kMT_Sand = 17, + kMT_ProjectilePassthrough = 18, + kMT_Solid = 19, + kMT_NoPlatformCollision = 20, + kMT_CameraPassthrough = 21, + kMT_Wood = 22, + kMT_Organic = 23, + kMT_NoEdgeCollision = 24, + kMT_RedundantEdgeOrFlippedTri = 25, + kMT_SeeThrough = 26, + kMT_ScanPassthrough = 27, + kMT_AIPassthrough = 28, + kMT_Ceiling = 29, + kMT_Wall = 30, + kMT_Floor = 31, + kMT_Player = 32, + kMT_Character = 33, + kMT_Trigger = 34, + kMT_Projectile = 35, + kMT_Bomb = 36, + kMT_GroundCollider = 37, + kMT_NoStaticCollision = 38, + kMT_Scannable = 39, + kMT_Target = 40, + kMT_Orbit = 41, + kMT_Occluder = 42, + kMT_Immovable = 43, + kMT_Debris = 44, + kMT_PowerBomb = 45, + kMT_Unknown46 = 46, + kMT_CollisionActor = 47, + kMT_AIBlock = 48, + kMT_Platform = 49, + kMT_NonSolidDamageable = 50, + kMT_RadarObject = 51, + kMT_PlatformSlave = 52, + kMT_AIJoint = 53, + kMT_Unknown54 = 54, + kMT_SolidCharacter = 55, + kMT_ExcludeFromLineOfSightTest = 56, + kMT_ExcludeFromRadar = 57, + kMT_NoPlayerCollision = 58, + kMT_SixtyThree = 63 +}; + +// TODO: how else would they end up in .data? +static EMaterialTypes SolidMaterial = kMT_Solid; + +class CMaterialList { +public: + CMaterialList() : value(0) {} + CMaterialList(EMaterialTypes material) : value(u64(1) << material) {} + CMaterialList(u64 value) : value(value) {} + + void Add(EMaterialTypes material) { + value |= u64(1) << material; + } + const CMaterialList& Union(const CMaterialList& other) { + value |= other.value; + return *this; + } + +private: + u64 value; +}; +CHECK_SIZEOF(CMaterialList, 0x8) + +#endif \ No newline at end of file diff --git a/include/Kyoto/Audio/CAudioSys.hpp b/include/Kyoto/Audio/CAudioSys.hpp new file mode 100644 index 00000000..ee9c0b91 --- /dev/null +++ b/include/Kyoto/Audio/CAudioSys.hpp @@ -0,0 +1,11 @@ +#ifndef _CAUDIOSYS_HPP +#define _CAUDIOSYS_HPP + +#include "types.h" + +class CAudioSys { +public: + static const u8 kMaxVolume; +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/CFactoryMgr.hpp b/include/Kyoto/CFactoryMgr.hpp index 4a104f5c..f8d78d0b 100644 --- a/include/Kyoto/CFactoryMgr.hpp +++ b/include/Kyoto/CFactoryMgr.hpp @@ -3,7 +3,7 @@ #include "types.h" -#include "Kyoto/CToken.hpp" +#include "Kyoto/TToken.hpp" #include "Kyoto/IObjectStore.hpp" #include "Kyoto/Streams/CInputStream.hpp" @@ -21,7 +21,7 @@ public: // : obj(TToken< T >::GetIObjObjectFor(ptr).release()) {} private: - rstl::auto_ptr< TObjOwnerDerivedFromIObjUntyped > obj; + rstl::auto_ptr< CObjOwnerDerivedFromIObjUntyped > obj; }; CFactoryFnReturn FStringTableFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& xfer); diff --git a/include/Kyoto/CSimplePool.hpp b/include/Kyoto/CSimplePool.hpp index c6e57148..c08ad1d9 100644 --- a/include/Kyoto/CSimplePool.hpp +++ b/include/Kyoto/CSimplePool.hpp @@ -5,11 +5,20 @@ #include "rstl/map.hpp" +#include "Kyoto/CToken.hpp" #include "Kyoto/IObjectStore.hpp" class CSimplePool { public: - virtual ~CSimplePool() {} + virtual CToken GetObj(const SObjectTag& tag, CVParamTransfer xfer); + virtual CToken GetObj(const SObjectTag& tag); + virtual CToken GetObj(const char* name); + virtual CToken GetObj(const char* name, CVParamTransfer xfer); + virtual bool HasObject(const SObjectTag& tag); + virtual bool ObjectIsLive(const SObjectTag& tag); + virtual unkptr GetFactory(); + virtual void Flush(); + virtual void ObjectUnreferenced(const SObjectTag& tag); private: u8 x4_; diff --git a/include/Kyoto/CToken.hpp b/include/Kyoto/CToken.hpp index 98e62024..b2dfa94b 100644 --- a/include/Kyoto/CToken.hpp +++ b/include/Kyoto/CToken.hpp @@ -5,58 +5,18 @@ #include "Kyoto/IObjectStore.hpp" -#include "rstl/auto_ptr.hpp" - class CToken { public: + CToken() {} + CToken(IObj* obj) : x0_objRef(new CObjectReference(obj)), x4_lockHeld(false) {} + CToken(const CToken& other); ~CToken(); + void Lock(); + private: CObjectReference* x0_objRef; bool x4_lockHeld; }; -class IObj { -public: - virtual ~IObj() {} -}; - -class TObjOwnerDerivedFromIObjUntyped : public IObj { -public: - template < typename T > - TObjOwnerDerivedFromIObjUntyped(const rstl::auto_ptr< T >& obj) : m_objPtr(obj.release()) {} - -protected: - void* m_objPtr; -}; - -template < typename T > -class TObjOwnerDerivedFromIObj : public TObjOwnerDerivedFromIObjUntyped { - TObjOwnerDerivedFromIObj(const rstl::auto_ptr< T >& obj) : TObjOwnerDerivedFromIObjUntyped(obj) {} - -public: - static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetNewDerivedObject(const rstl::auto_ptr< T >& obj) { - return new TObjOwnerDerivedFromIObj< T >(obj); - } - ~TObjOwnerDerivedFromIObj() override { delete Owned(); } - T* Owned() { return static_cast< T* >(m_objPtr); } -}; - -template < typename T > -class TToken : public CToken { -public: - static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetIObjObjectFor(const rstl::auto_ptr< T >& obj) { - return TObjOwnerDerivedFromIObj< T >::GetNewDerivedObject(obj); - } -}; - -template < typename T > -class TCachedToken : public TToken< T > { -private: - T* x8_item; -}; - -template < typename T > -class TLockedToken : public TCachedToken< T > {}; - #endif diff --git a/include/Kyoto/Graphics/CGraphics.hpp b/include/Kyoto/Graphics/CGraphics.hpp index 7a3b0d01..772fd18f 100644 --- a/include/Kyoto/Graphics/CGraphics.hpp +++ b/include/Kyoto/Graphics/CGraphics.hpp @@ -3,7 +3,7 @@ #include "types.h" -#include "Kyoto/Math/CColor.hpp" +#include "Kyoto/Graphics/CColor.hpp" #include "Kyoto/Math/CVector3f.hpp" #include "Kyoto/Graphics/CTevCombiners.hpp" diff --git a/include/Kyoto/IObj.hpp b/include/Kyoto/IObj.hpp new file mode 100644 index 00000000..3905ed48 --- /dev/null +++ b/include/Kyoto/IObj.hpp @@ -0,0 +1,38 @@ +#ifndef _IOBJ_HPP +#define _IOBJ_HPP + +#include "types.h" + +#include "rstl/auto_ptr.hpp" + +class IObj { +public: + virtual ~IObj() {} +}; + +class CObjOwnerDerivedFromIObjUntyped : public IObj { +public: + template < typename T > + CObjOwnerDerivedFromIObjUntyped(T* obj) : m_objPtr(obj) {} + template < typename T > + CObjOwnerDerivedFromIObjUntyped(const rstl::auto_ptr< T >& obj) : m_objPtr(obj.release()) {} + +protected: + void* m_objPtr; +}; + +template < typename T > +class TObjOwnerDerivedFromIObj : public CObjOwnerDerivedFromIObjUntyped { + TObjOwnerDerivedFromIObj(T* obj) : CObjOwnerDerivedFromIObjUntyped(obj) {} + TObjOwnerDerivedFromIObj(const rstl::auto_ptr< T >& obj) : CObjOwnerDerivedFromIObjUntyped(obj) {} + +public: + static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetNewDerivedObject(T* obj) { return new TObjOwnerDerivedFromIObj< T >(obj); } + static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetNewDerivedObject(const rstl::auto_ptr< T >& obj) { + return new TObjOwnerDerivedFromIObj< T >(obj); + } + ~TObjOwnerDerivedFromIObj() override { delete Owned(); } + T* Owned() { return static_cast< T* >(m_objPtr); } +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/IObjectStore.hpp b/include/Kyoto/IObjectStore.hpp index 1405ecf2..73f70224 100644 --- a/include/Kyoto/IObjectStore.hpp +++ b/include/Kyoto/IObjectStore.hpp @@ -3,8 +3,11 @@ #include "types.h" +#include "rstl/auto_ptr.hpp" #include "rstl/rc_ptr.hpp" +#define kInvalidAssetId 0xFFFFFFFFu + typedef u32 CAssetId; typedef u32 FourCC; @@ -12,17 +15,36 @@ struct SObjectTag { FourCC type; CAssetId id; + SObjectTag() {} + SObjectTag(FourCC type, CAssetId id) : type(type), id(id) {} SObjectTag(const SObjectTag& other) : type(other.type), id(other.id) {} }; class IObjectStore; class IObj; class CVParamTransfer { +public: + static CVParamTransfer Null(); + +private: rstl::rc_ptr< void > x0_; }; class CObjectReference { +public: + CObjectReference(const rstl::auto_ptr< IObj >& obj); + // : x0_refCount(0) + // , x2_locked(false) + // , x2_lockCount(0) + // , xc_objectStore(nullptr) + // , x10_object(obj.release()) + // , x14_params(CVParamTransfer::Null()) {} + + CObjectReference(IObjectStore* store, const rstl::auto_ptr< IObj >& obj, SObjectTag tag, CVParamTransfer xfer); + +private: u16 x0_refCount; - u16 x2_lockCount; + bool x2_locked : 1; + u16 x2_lockCount : 15; SObjectTag x4_objTag; IObjectStore* xc_objectStore; IObj* x10_object; diff --git a/include/Kyoto/Input/CRumbleGenerator.hpp b/include/Kyoto/Input/CRumbleGenerator.hpp new file mode 100644 index 00000000..22869299 --- /dev/null +++ b/include/Kyoto/Input/CRumbleGenerator.hpp @@ -0,0 +1,23 @@ +#ifndef _CRUMBLEGENERATOR_HPP +#define _CRUMBLEGENERATOR_HPP + +#include "types.h" + +#include "Kyoto/Input/CRumbleVoice.hpp" + +enum EMotorState { + kMS_Stop, // = PAD_MOTOR_STOP, + kMS_Rumble, // = PAD_MOTOR_RUMBLE, + kMS_StopHard, // = PAD_MOTOR_STOP_HARD, +}; + +class CRumbleGenerator { +private: + CRumbleVoice x0_voices[4]; + f32 xc0_periodTime[4]; + f32 xd0_onTime[4]; + EMotorState xe0_commandArray[4]; + bool xf0_24_disabled : 1; +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/Input/CRumbleVoice.hpp b/include/Kyoto/Input/CRumbleVoice.hpp new file mode 100644 index 00000000..ea55875a --- /dev/null +++ b/include/Kyoto/Input/CRumbleVoice.hpp @@ -0,0 +1,57 @@ +#ifndef _CRUMBLEVOICE_HPP +#define _CRUMBLEVOICE_HPP + +#include "types.h" + +#include "rstl/reserved_vector.hpp" +#include "rstl/vector.hpp" + +enum ERumblePriority { + kRP_None, + kRP_One, + kRP_Two, + kRP_Three, +}; + +struct SAdsrData { + f32 x0_attackGain; + f32 x4_autoReleaseDur; + f32 x8_attackDur; + f32 xc_decayDur; + f32 x10_sustainGain; + f32 x14_releaseDur; + bool x18_24_hasSustain : 1; + bool x18_25_autoRelease : 1; +}; + +struct SAdsrDelta { + enum EPhase { + kP_Stop, + kP_PrePulse, + kP_Attack, + kP_Decay, + kP_Sustain, + kP_Release, + }; + + f32 x0_curIntensity; + f32 x4_attackTime; + f32 x8_decayTime; + f32 xc_releaseTime; + f32 x10_autoReleaseTime; + f32 x14_attackIntensity; + f32 x18_sustainIntensity; + ERumblePriority x1c_priority; + EPhase x20_phase; +}; + +class CRumbleVoice { +private: + rstl::vector< SAdsrData > x0_datas; + rstl::vector< SAdsrDelta > x10_deltas; + rstl::reserved_vector< s16, 4 > x20_handleIds; + s16 x2c_usedChannels; + u8 x2e_lastId; +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/Math/CAABox.hpp b/include/Kyoto/Math/CAABox.hpp index 6f987ffe..b0c38fb1 100644 --- a/include/Kyoto/Math/CAABox.hpp +++ b/include/Kyoto/Math/CAABox.hpp @@ -4,8 +4,18 @@ #include "Kyoto/Math/CVector3f.hpp" class CAABox { - CVector3f min; - CVector3f max; +public: + CAABox() { + // TODO + } + + static CAABox mskInvertedBox; + static CAABox mskNullBox; + +private: + CVector3f min; + CVector3f max; }; +CHECK_SIZEOF(CAABox, 0x18) #endif // __CAABOX_HPP__ diff --git a/include/Kyoto/Math/CMatrix4f.hpp b/include/Kyoto/Math/CMatrix4f.hpp new file mode 100644 index 00000000..4988df76 --- /dev/null +++ b/include/Kyoto/Math/CMatrix4f.hpp @@ -0,0 +1,27 @@ +#ifndef _CMATRIX4F_HPP +#define _CMATRIX4F_HPP + +#include "types.h" + +class CMatrix4f { +private: + f32 m00; + f32 m01; + f32 m02; + f32 m03; + f32 m10; + f32 m11; + f32 m12; + f32 m13; + f32 m20; + f32 m21; + f32 m22; + f32 m23; + f32 m30; + f32 m31; + f32 m32; + f32 m33; +}; +CHECK_SIZEOF(CMatrix4f, 0x40); + +#endif \ No newline at end of file diff --git a/include/Kyoto/Math/CQuaternion.hpp b/include/Kyoto/Math/CQuaternion.hpp new file mode 100644 index 00000000..3cf0a543 --- /dev/null +++ b/include/Kyoto/Math/CQuaternion.hpp @@ -0,0 +1,14 @@ +#ifndef _CQUATERNION_HPP +#define _CQUATERNION_HPP + +#include "types.h" + +class CQuaternion { +private: + f32 w; + f32 x; + f32 y; + f32 z; +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/Math/CTransform4f.hpp b/include/Kyoto/Math/CTransform4f.hpp index 4de46228..bb09fb5b 100644 --- a/include/Kyoto/Math/CTransform4f.hpp +++ b/include/Kyoto/Math/CTransform4f.hpp @@ -5,8 +5,93 @@ #include "Kyoto/Math/CVector3f.hpp" +class CInputStream; +class CMatrix3f; + class CTransform4f { public: + CTransform4f() { + // TODO + } + CTransform4f(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); + CTransform4f(const CInputStream& in); + CTransform4f(const CMatrix3f& rotation, const CVector3f& translation); + CTransform4f(const CTransform4f& other); + CTransform4f& operator=(const CTransform4f& other); + + CVector3f GetTranslation() const { return CVector3f(posX, posY, posZ); } + CVector3f GetRight() const { return CVector3f(m0.GetX(), m1.GetX(), m2.GetX()); } + CVector3f GetForward() const { return CVector3f(m0.GetY(), m1.GetY(), m2.GetY()); } + CVector3f GetUp() const { return CVector3f(m0.GetZ(), m1.GetZ(), m2.GetZ()); } + + CMatrix3f BuildMatrix3f() const; + // Get00__12CTransform4fCFv + // Get01__12CTransform4fCFv + // Get02__12CTransform4fCFv + // Get03__12CTransform4fCFv + // Get10__12CTransform4fCFv + // Get11__12CTransform4fCFv + // Get12__12CTransform4fCFv + // Get13__12CTransform4fCFv + // Get20__12CTransform4fCFv + // Get21__12CTransform4fCFv + // Get22__12CTransform4fCFv + // Get23__12CTransform4fCFv + // GetColumn__12CTransform4fCF5EDimX + // GetColumn__12CTransform4fCF5EDimY + // GetColumn__12CTransform4fCF5EDimZ + // GetColumn__12CTransform4fCFi + // GetCStyleMatrix__12CTransform4fCFv + // GetInverse__12CTransform4fCFv + // GetQuickInverse__12CTransform4fCFv + // GetRotation__12CTransform4fCFv + // GetRow__12CTransform4fCF5EDimX + // GetRow__12CTransform4fCF5EDimY + // GetRow__12CTransform4fCF5EDimZ + // GetRow__12CTransform4fCFi + // GetUp__12CTransform4fCFv + // LookAt__12CTransform4fFRC9CVector3fRC9CVector3fRC9CVector3f + // MakeRotationsBasedOnY__12CTransform4fFRC13CUnitVector3f + // MultiplyIgnoreTranslation__12CTransform4fCFRC12CTransform4f + // Orthonormalize__12CTransform4fFv + // Rotate__12CTransform4fCFRC9CVector3f + // RotateLocalX__12CTransform4fFRC9CRelAngle + // RotateLocalY__12CTransform4fFRC9CRelAngle + // RotateLocalZ__12CTransform4fFRC9CRelAngle + // RotateX__12CTransform4fFRC9CRelAngle + // RotateY__12CTransform4fFRC9CRelAngle + // RotateZ__12CTransform4fFRC9CRelAngle + // Scale__12CTransform4fFf + // Scale__12CTransform4fFfff + // Scale__12CTransform4fFRC9CVector3f + // ScaleBy__12CTransform4fFf + // SetRotation__12CTransform4fFRC12CTransform4f + // SetRotation__12CTransform4fFRC9CMatrix3f + // Translate__12CTransform4fFfff + // Translate__12CTransform4fFRC9CVector3f + // TransposeMultiply__12CTransform4fCFRC9CVector3f + // TransposeRotate__12CTransform4fCFRC9CVector3f + + void SetTranslation(const CVector3f& vec) { + posX = vec.GetX(); + posY = vec.GetY(); + posZ = vec.GetZ(); + } + void AddTranslation(const CVector3f& vec) { + posX += vec.GetX(); + posY += vec.GetY(); + posZ += vec.GetZ(); + } + void AddTranslationZ(f32 z) { posZ += z; } + + CTransform4f& operator*=(const CTransform4f& other); + CTransform4f& operator*(const CTransform4f& vec); + CTransform4f& operator*(const CVector3f& vec); + + static CTransform4f FromColumns(const CVector3f&, const CVector3f&, const CVector3f&, const CVector3f&); + static CTransform4f sIdentity; + +private: CVector3f m0; f32 posX; CVector3f m1; @@ -15,6 +100,8 @@ public: f32 posZ; }; -extern CTransform4f skIdentity4f; +inline bool operator==(const CTransform4f& lhs, const CTransform4f& rhs); + +CHECK_SIZEOF(CTransform4f, 0x30) #endif // __CTRANSFORM4F_HPP__ diff --git a/include/Kyoto/Math/CVector2i.hpp b/include/Kyoto/Math/CVector2i.hpp new file mode 100644 index 00000000..950571bc --- /dev/null +++ b/include/Kyoto/Math/CVector2i.hpp @@ -0,0 +1,12 @@ +#ifndef _CVECTOR2I_HPP +#define _CVECTOR2I_HPP + +#include "types.h" + +class CVector2i { +private: + s32 x; + s32 y; +}; + +#endif \ No newline at end of file diff --git a/include/Kyoto/Math/CVector3f.hpp b/include/Kyoto/Math/CVector3f.hpp index 8df20dbe..6af34198 100644 --- a/include/Kyoto/Math/CVector3f.hpp +++ b/include/Kyoto/Math/CVector3f.hpp @@ -3,18 +3,109 @@ #include "types.h" +#include "Kyoto/Math/CVector2f.hpp" + +class CInputStream; +class COutputStream; + class CVector3f { public: + CVector3f() : mX(0.f), mY(0.f), mZ(0.f) {} explicit CVector3f(f32 x, f32 y, f32 z) : mX(x), mY(y), mZ(z) {} + CVector3f(const CVector2f& v, f32 z) : mX(v.GetX()), mY(v.GetY()), mZ(z) {} + + CVector3f(CInputStream& in); + void PutTo(COutputStream& out) const; f32 GetX() const { return mX; } f32 GetY() const { return mY; } f32 GetZ() const { return mZ; } -// private: + void SetX(f32 x) { mX = x; } + void SetY(f32 y) { mY = y; } + void SetZ(f32 z) { mZ = z; } + + // ByElementMultiply__9CVector3fFRC9CVector3fRC9CVector3f + // Slerp__9CVector3fFRC9CVector3fRC9CVector3fRC9CRelAngle + // Normalize__9CVector3fFv + // Magnitude__9CVector3fCFv + // AsNormalized__9CVector3fCFv + // CanBeNormalized__9CVector3fCFv + // GetAngleDiff__9CVector3fFRC9CVector3fRC9CVector3f + // IsEqu__9CVector3fCFRC9CVector3ff + // Lerp__9CVector3fFRC9CVector3fRC9CVector3ff + + f32& operator[](s32 i) { return *(&mX + i); } + f32 operator[](s32 i) const { return *(&mX + i); } + bool IsNonZero() const { return mX != 0.f || mY != 0.f || mZ != 0.f; } + + void DropZ() { mZ = 0.f; } + + CVector3f& operator+=(const CVector3f& other) { + mX += other.mX; + mY += other.mY; + mZ += other.mZ; + return *this; + } + CVector3f& operator-=(const CVector3f& other) { + mX -= other.mX; + mY -= other.mY; + mZ -= other.mZ; + return *this; + } + CVector3f& operator*=(f32 v) { + mX *= v; + mY *= v; + mZ *= v; + return *this; + } + CVector3f& operator/=(f32 v) { + mX /= v; + mY /= v; + mZ /= v; + return *this; + } + + static const CVector3f& Zero() { return sZeroVector; } + static const CVector3f& Up() { return sUpVector; } + static const CVector3f& Down() { return sDownVector; } + static const CVector3f& Left() { return sLeftVector; } + static const CVector3f& Right() { return sRightVector; } + static const CVector3f& Forward() { return sForwardVector; } + static const CVector3f& Back() { return sBackVector; } + +private: f32 mX; f32 mY; f32 mZ; + + static CVector3f sZeroVector; + static CVector3f sUpVector; + static CVector3f sDownVector; + static CVector3f sLeftVector; + static CVector3f sRightVector; + static CVector3f sForwardVector; + static CVector3f sBackVector; }; +// ClassifyVector__FRC9CVector3f +// TGetType<9CVector3f>__FRC9CVector3f +// close_enough__FRC9CVector3fRC9CVector3ff in CloseEnough.cpp + +inline bool operator==(const CVector3f& lhs, const CVector3f& rhs) { + return lhs.GetX() == rhs.GetX() && lhs.GetY() == rhs.GetY() && lhs.GetZ() == rhs.GetZ(); +} +inline bool operator!=(const CVector3f& lhs, const CVector3f& rhs) { + return lhs.GetX() != rhs.GetX() || lhs.GetY() != rhs.GetY() || lhs.GetZ() != rhs.GetZ(); +} +inline CVector3f operator-(const CVector3f& lhs, const CVector3f& rhs) { + return CVector3f(lhs.GetX() - rhs.GetX(), lhs.GetY() - rhs.GetY(), lhs.GetZ() - rhs.GetZ()); +} +inline CVector3f operator+(const CVector3f& lhs, const CVector3f& rhs) { + return CVector3f(lhs.GetX() + rhs.GetX(), lhs.GetY() + rhs.GetY(), lhs.GetZ() + rhs.GetZ()); +} +inline CVector3f operator*(const CVector3f& vec, f32 f) { return CVector3f(vec.GetX() * f, vec.GetY() * f, vec.GetZ() * f); } +inline CVector3f operator/(const CVector3f& vec, f32 f) { return CVector3f(vec.GetX() / f, vec.GetY() / f, vec.GetZ() / f); } +inline CVector3f operator-(const CVector3f& vec) { return CVector3f(-vec.GetX(), -vec.GetY(), -vec.GetZ()); } + #endif // __CVECTOR3F_HPP__ diff --git a/include/Kyoto/Particles/CParticleGen.hpp b/include/Kyoto/Particles/CParticleGen.hpp index 4059d3e1..f13b1d71 100644 --- a/include/Kyoto/Particles/CParticleGen.hpp +++ b/include/Kyoto/Particles/CParticleGen.hpp @@ -1,11 +1,11 @@ #ifndef _CPARTICLEGEN_HPP #define _CPARTICLEGEN_HPP -#include "Kyoto/Math/CTransform4f.hpp" -#include "Kyoto/Math/CVector3f.hpp" -#include "Kyoto/Math/CAABox.hpp" #include "Kyoto/Graphics/CColor.hpp" #include "Kyoto/Graphics/CLight.hpp" +#include "Kyoto/Math/CAABox.hpp" +#include "Kyoto/Math/CTransform4f.hpp" +#include "Kyoto/Math/CVector3f.hpp" class CWarp; class CParticleGen { diff --git a/include/Kyoto/TToken.hpp b/include/Kyoto/TToken.hpp new file mode 100644 index 00000000..a24a30f1 --- /dev/null +++ b/include/Kyoto/TToken.hpp @@ -0,0 +1,45 @@ +#ifndef _TTOKEN_HPP +#define _TTOKEN_HPP + +#include "types.h" + +#include "Kyoto/CSimplePool.hpp" +#include "Kyoto/CToken.hpp" +#include "Kyoto/IObj.hpp" + +#include "rstl/auto_ptr.hpp" + +template < typename T > +class TToken : public CToken { +public: + TToken() {} + TToken(const CToken& token) : CToken(token) {} + TToken(T* obj) : CToken(GetIObjObjectFor(obj).release()) {} + TToken(const rstl::auto_ptr< T >& obj) : CToken(GetIObjObjectFor(obj).release()) {} + + static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetIObjObjectFor(T* obj) { + return TObjOwnerDerivedFromIObj< T >::GetNewDerivedObject(obj); + } + static rstl::auto_ptr< TObjOwnerDerivedFromIObj< T > > GetIObjObjectFor(const rstl::auto_ptr< T >& obj) { + return TObjOwnerDerivedFromIObj< T >::GetNewDerivedObject(obj); + } +}; + +template < typename T > +class TCachedToken : public TToken< T > { +public: + TCachedToken() {} + TCachedToken(const CToken& token) : TToken(token), x8_item(nullptr) {} + +private: + T* x8_item; +}; + +template < typename T > +class TLockedToken : public TCachedToken< T > { +public: + TLockedToken() {} + TLockedToken(const CToken& token) : TCachedToken(token) { Lock(); } +}; + +#endif \ No newline at end of file diff --git a/include/MetaRender/CCubeRenderer.hpp b/include/MetaRender/CCubeRenderer.hpp index d4eb856d..f974bdb8 100644 --- a/include/MetaRender/CCubeRenderer.hpp +++ b/include/MetaRender/CCubeRenderer.hpp @@ -4,7 +4,7 @@ #include "gx_enum.h" #include "types.h" -#include "Kyoto/Math/CColor.hpp" +#include "Kyoto/Graphics/CColor.hpp" #include "Kyoto/Math/CTransform4f.hpp" #include "Kyoto/Math/CVector2f.hpp" #include "rstl/pair.hpp" diff --git a/include/MetroidPrime/CActor.hpp b/include/MetroidPrime/CActor.hpp new file mode 100644 index 00000000..83fdde26 --- /dev/null +++ b/include/MetroidPrime/CActor.hpp @@ -0,0 +1,103 @@ +#ifndef _CACTOR_HPP +#define _CACTOR_HPP + +#include "types.h" + +#include "Collision/CMaterialFilter.hpp" +#include "Collision/CMaterialList.hpp" + +#include "MetroidPrime/CEntity.hpp" +#include "MetroidPrime/CModelFlags.hpp" +#include "MetroidPrime/CSfxHandle.hpp" + +#include "Kyoto/Graphics/CColor.hpp" +#include "Kyoto/Math/CAABox.hpp" +#include "Kyoto/Math/CTransform4f.hpp" +#include "Kyoto/Math/CQuaternion.hpp" +#include "Kyoto/TToken.hpp" + +#include "rstl/pair.hpp" +#include "rstl/reserved_vector.hpp" +#include "rstl/single_ptr.hpp" + +class CActorLights; +class CActorParameters; +class CModelData; +class CScannableObjectInfo; +class CSimpleShadow; + +// TODO move +struct SAdvancementDeltas { + CVector3f x0_posDelta; + CQuaternion xc_rotDelta; +}; +CHECK_SIZEOF(SAdvancementDeltas, 0x1c) + +class CActor : public CEntity { +public: + enum EThermalFlags { + kTF_None = 0, + kTF_Cold = 1, + kTF_Hot = 2, + }; + + CActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf, const CModelData& mData, + const CMaterialList& list, const CActorParameters& params, TUniqueId nextDrawNode); + ~CActor(); + + SAdvancementDeltas UpdateAnimation(float dt, CStateManager& mgr, bool advTree); + + void UpdateSfxEmitters(); + void RemoveEmitter(); + + const CTransform4f& GetTransform() const { return x34_transform; } + +protected: + CTransform4f x34_transform; + rstl::single_ptr< CModelData > x64_modelData; + CMaterialList x68_material; + CMaterialFilter x70_materialFilter; + TSfxId x88_sfxId; + CSfxHandle x8c_loopingSfxHandle; + rstl::single_ptr< CActorLights > x90_actorLights; + rstl::single_ptr< CSimpleShadow > x94_simpleShadow; + rstl::single_ptr< TCachedToken< CScannableObjectInfo > > x98_scanObjectInfo; + CAABox x9c_renderBounds; + CModelFlags xb4_drawFlags; + f32 xbc_time; + u32 xc0_pitchBend; + TUniqueId xc4_fluidId; + TUniqueId xc6_nextDrawNode; + s32 xc8_drawnToken; + s32 xcc_addedToken; + f32 xd0_damageMag; + u8 xd4_maxVol; + rstl::reserved_vector< CSfxHandle, 2 > xd8_nonLoopingSfxHandles; + u32 xe4_24_nextNonLoopingSfxHandle : 3; + u32 xe4_27_notInSortedLists : 1; + u32 xe4_28_transformDirty : 1; + u32 xe4_29_actorLightsDirty : 1; + u32 xe4_30_outOfFrustum : 1; + u32 xe4_31_calculateLighting : 1; + u32 xe5_24_shadowEnabled : 1; + u32 xe5_25_shadowDirty : 1; + u32 xe5_26_muted : 1; + u32 xe5_27_useInSortedLists : 1; + u32 xe5_28_callTouch : 1; + u32 xe5_29_globalTimeProvider : 1; + u32 xe5_30_renderUnsorted : 1; + u32 xe5_31_pointGeneratorParticles : 1; + u32 xe6_24_fluidCounter : 3; + EThermalFlags xe6_27_thermalVisorFlags : 2; + u32 xe6_29_renderParticleDBInside : 1; + u32 xe6_30_enablePitchBend : 1; + u32 xe6_31_targetableVisorFlags : 4; + u32 xe7_27_enableRender : 1; + u32 xe7_28_worldLightingDirty : 1; + u32 xe7_29_drawEnabled : 1; + u32 xe7_30_doTargetDistanceTest : 1; + u32 xe7_31_targetable : 1; +}; +CHECK_SIZEOF(CActor, 0xe8) + +#endif diff --git a/include/MetroidPrime/CActorLights.hpp b/include/MetroidPrime/CActorLights.hpp new file mode 100644 index 00000000..e955aee8 --- /dev/null +++ b/include/MetroidPrime/CActorLights.hpp @@ -0,0 +1,11 @@ +#ifndef _CACTORLIGHTS_HPP +#define _CACTORLIGHTS_HPP + +#include "types.h" + +class CActorLights { +public: + ~CActorLights(); +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CActorModelParticles.hpp b/include/MetroidPrime/CActorModelParticles.hpp new file mode 100644 index 00000000..38a17451 --- /dev/null +++ b/include/MetroidPrime/CActorModelParticles.hpp @@ -0,0 +1,11 @@ +#ifndef _CACTORMODELPARTICLES_HPP +#define _CACTORMODELPARTICLES_HPP + +#include "types.h" + +class CActorModelParticles { +private: + // TODO +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CActorParameters.hpp b/include/MetroidPrime/CActorParameters.hpp new file mode 100644 index 00000000..9f359f69 --- /dev/null +++ b/include/MetroidPrime/CActorParameters.hpp @@ -0,0 +1,132 @@ +#ifndef _CACTORPARAMETERS_HPP +#define _CACTORPARAMETERS_HPP + +#include "types.h" + +#include "Kyoto/IObjectStore.hpp" +#include "Kyoto/Graphics/CColor.hpp" +#include "Kyoto/Math/CVector3f.hpp" + +#include "rstl/auto_ptr.hpp" +#include "rstl/pair.hpp" + +class CActorLights; + +class CLightParameters { +public: + enum EShadowTesselation { + kST_Invalid = -1, + kST_Zero, + }; + + enum EWorldLightingOptions { + kLO_Zero, + kLO_NormalWorld, + kLO_NoShadowCast, + kLO_DisableWorld, + }; + + enum ELightRecalculationOptions { + kLR_LargeFrameCount, + kLR_EightFrames, + kLR_FourFrames, + kLR_OneFrame, + }; + + CLightParameters() { + // TODO + } + + virtual ~CLightParameters(); + + const CColor& GetAmbientColor() const { return x18_noLightsAmbient; } + bool ShouldMakeLights() const { return x1c_makeLights; } + s32 GetMaxAreaLights() const { return x3c_maxAreaLights; } + + rstl::auto_ptr< CActorLights > MakeActorLights() const; + +private: + bool x4_castShadow; + f32 x8_shadowScale; + EShadowTesselation xc_shadowTesselation; + f32 x10_shadowAlpha; + f32 x14_maxShadowHeight; + CColor x18_noLightsAmbient; + bool x1c_makeLights; + bool x1d_ambientChannelOverflow; + EWorldLightingOptions x20_worldLightingOptions; + ELightRecalculationOptions x24_lightRecalcOpts; + s32 x28_layerIdx; + CVector3f x2c_actorPosBias; + s32 x38_maxDynamicLights; + s32 x3c_maxAreaLights; +}; +CHECK_SIZEOF(CLightParameters, 0x40) + +class CScannableParameters { +public: + CScannableParameters() {} + CScannableParameters(CAssetId scanId) : x0_scanId(scanId) {} + + CAssetId GetScannableObject0() const { return x0_scanId; } + +private: + CAssetId x0_scanId; +}; +CHECK_SIZEOF(CScannableParameters, 0x4) + +class CVisorParameters { +public: + CVisorParameters() { + // TODO + } + CVisorParameters(u8 mask, bool b1, bool scanPassthrough) : x0_mask(mask), x0_4_b1(b1), x0_5_scanPassthrough(scanPassthrough) {} + + u8 GetMask() const { return x0_mask; } + // TODO: GetIsBlockXRay__16CVisorParametersCFv? + bool GetBool1() const { return x0_4_b1; } + bool GetScanPassthrough() const { return x0_5_scanPassthrough; } + + static CVisorParameters None(); + +private: + u32 x0_mask : 4; + u32 x0_4_b1 : 1; + u32 x0_5_scanPassthrough : 1; +}; +CHECK_SIZEOF(CVisorParameters, 0x4) + +class CActorParameters { +public: + CActorParameters() { + // TODO + } + + const CLightParameters& GetLighting() const { return x0_lightParams; } + const CScannableParameters& GetScannable() const { return x40_scanParams; } + const rstl::pair< CAssetId, CAssetId >& GetXRay() const { return x44_xrayAssets; } + const rstl::pair< CAssetId, CAssetId >& GetInfra() const { return x4c_thermalAssets; } + const CVisorParameters& GetVisorParameters() const { return x54_visorParams; } + f32 GetThermalMag() const { return x64_thermalMag; } + bool GetUseGlobalRenderTime() const { return x58_24_globalTimeProvider; } + bool IsHotInThermal() const { return x58_25_thermalHeat; } + bool ForceRenderUnsorted() const { return x58_26_renderUnsorted; } + bool NoSortThermal() const { return x58_27_noSortThermal; } + +private: + CLightParameters x0_lightParams; + CScannableParameters x40_scanParams; + rstl::pair< CAssetId, CAssetId > x44_xrayAssets; + rstl::pair< CAssetId, CAssetId > x4c_thermalAssets; + CVisorParameters x54_visorParams; + bool x58_24_globalTimeProvider : 1; + bool x58_25_thermalHeat : 1; + bool x58_26_renderUnsorted : 1; + bool x58_27_noSortThermal : 1; + f32 x5c_fadeInTime; + f32 x60_fadeOutTime; + f32 x64_thermalMag; +}; +CHECK_SIZEOF(CActorParameters, 0x68) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CAnimData.hpp b/include/MetroidPrime/CAnimData.hpp new file mode 100644 index 00000000..08b97981 --- /dev/null +++ b/include/MetroidPrime/CAnimData.hpp @@ -0,0 +1,10 @@ +#ifndef _CANIMDATA_HPP +#define _CANIMDATA_HPP + +#include "types.h" + +class CAnimData { + // TODO +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CAreaFog.hpp b/include/MetroidPrime/CAreaFog.hpp new file mode 100644 index 00000000..671580b3 --- /dev/null +++ b/include/MetroidPrime/CAreaFog.hpp @@ -0,0 +1,29 @@ +#ifndef _CAREAFOG_HPP +#define _CAREAFOG_HPP + +#include "types.h" + +#include "Kyoto/Graphics/CColor.hpp" +#include "Kyoto/Math/CVector2f.hpp" + +enum ERglFogMode { + // TODO +}; + +class CAreaFog { +private: + ERglFogMode x0_fogMode; + CVector2f x4_rangeCur; + CVector2f xc_rangeTarget; + CVector2f x14_rangeDelta; + CColor x1c_colorCur; + unkptr x20_; + unkptr x24_; + CColor x28_colorTarget; + unkptr x2c_; + unkptr x30_; + f32 x34_colorDelta; +}; +CHECK_SIZEOF(CAreaFog, 0x38) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CEntity.hpp b/include/MetroidPrime/CEntity.hpp index b3b83e58..31d893a5 100644 --- a/include/MetroidPrime/CEntity.hpp +++ b/include/MetroidPrime/CEntity.hpp @@ -40,4 +40,6 @@ protected: bool x30_27_notInArea : 1; }; +CHECK_SIZEOF(CEntity, 0x34) + #endif diff --git a/include/MetroidPrime/CEnvFxManager.hpp b/include/MetroidPrime/CEnvFxManager.hpp new file mode 100644 index 00000000..28b88667 --- /dev/null +++ b/include/MetroidPrime/CEnvFxManager.hpp @@ -0,0 +1,64 @@ +#ifndef _CENVFXMANAGER_HPP +#define _CENVFXMANAGER_HPP + +#include "types.h" + +#include "MetroidPrime/CSfxHandle.hpp" +#include "MetroidPrime/TGameTypes.hpp" + +#include "Kyoto/Math/CAABox.hpp" +#include "Kyoto/Math/CVector2i.hpp" +#include "Kyoto/Math/CVector3f.hpp" +#include "Kyoto/TToken.hpp" + +#include "rstl/pair.hpp" +#include "rstl/reserved_vector.hpp" +#include "rstl/vector.hpp" + +class CGenDescription; +class CTexture; + +class CVectorFixed8_8 { +private: + s16 x; + s16 y; + s16 z; +}; + +class CEnvFxManagerGrid { +private: + bool x0_24_blockDirty; + CVector2i x4_position; /* 8.8 fixed point */ + CVector2i xc_extent; /* 8.8 fixed point */ + rstl::pair< bool, f32 > x14_block; /* Blocked-bool, Z-coordinate */ + rstl::vector< CVectorFixed8_8 > x1c_particles; +}; + +class CEnvFxManager { +private: + CAABox x0_particleBounds; + CVector3f x18_focusCellPosition; + bool x24_enableSplash; + f32 x28_firstSnowForce; + s32 x2c_lastBlockedGridIdx; + f32 x30_fxDensity; + f32 x34_targetFxDensity; + f32 x38_maxDensityDeltaSpeed; + bool x3c_snowflakeTextureMipBlanked; + TLockedToken< CTexture > x40_txtrEnvGradient; + rstl::reserved_vector< CEnvFxManagerGrid, 64 > x50_grids; + f32 xb54_baseSplashRate; + TLockedToken< CGenDescription > xb58_envRainSplash; + bool xb64_ = true; + TUniqueId xb68_envRainSplashId = kInvalidUniqueId; + bool xb6a_rainSoundActive; + CSfxHandle xb6c_leftRainSound; + CSfxHandle xb70_rightRainSound; + TLockedToken< CTexture > xb74_txtrSnowFlake; + bool xb80_; + rstl::reserved_vector< CVector3f, 16 > xb84_snowZDeltas; + TLockedToken< CTexture > xc48_underwaterFlake; + bool xc54_; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CFluidPlaneManager.hpp b/include/MetroidPrime/CFluidPlaneManager.hpp new file mode 100644 index 00000000..d708fcf2 --- /dev/null +++ b/include/MetroidPrime/CFluidPlaneManager.hpp @@ -0,0 +1,25 @@ +#ifndef _CFLUIDPLANEMANAGER_HPP +#define _CFLUIDPLANEMANAGER_HPP + +#include "types.h" + +#include "MetroidPrime/CRippleManager.hpp" +#include "MetroidPrime/TGameTypes.hpp" + +#include "rstl/reserved_vector.hpp" + +class CFluidPlaneManager { +private: + class CSplashRecord { + f32 x0_time; + TUniqueId x4_id; + }; + + CRippleManager x0_rippleManager; + rstl::reserved_vector< CSplashRecord, 32 > x18_splashes; + float x11c_uvT; + bool x120_; + bool x121_; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CModelData.hpp b/include/MetroidPrime/CModelData.hpp new file mode 100644 index 00000000..4a39d323 --- /dev/null +++ b/include/MetroidPrime/CModelData.hpp @@ -0,0 +1,51 @@ +#ifndef _CMODELDATA_HPP +#define _CMODELDATA_HPP + +#include "types.h" + +#include "MetroidPrime/TGameTypes.hpp" + +#include "Kyoto/Graphics/CColor.hpp" +#include "Kyoto/Math/CVector3f.hpp" +#include "Kyoto/Math/CTransform4f.hpp" +#include "Kyoto/TToken.hpp" + +#include "rstl/auto_ptr.hpp" +#include "rstl/optional_object.hpp" +#include "rstl/pair.hpp" + +class CAnimData; +class CModel; + +class CModelData { +public: + bool IsStaticModel() const { return xc_animData.get() == nullptr && !x1c_normalModel; } + + CModelData() { + // TODO + } + CModelData(const CModelData& other); + ~CModelData(); + + SAdvancementDeltas AdvanceAnimation(float dt, CStateManager& mgr, TAreaId aid, bool advTree); + void AdvanceParticles(const CTransform4f& xf, float dt, CStateManager& mgr); + + rstl::auto_ptr< CAnimData >& GetAnimData() { return xc_animData; } + + void SetXRayModel(const rstl::pair< CAssetId, CAssetId >& assets); + void SetInfraModel(const rstl::pair< CAssetId, CAssetId >& assets); + void SetAmbientColor(const CColor& color) { x18_ambientColor = color; } + void SetSortThermal(bool b) { x14_25_sortThermal = b; } + +private: + CVector3f x0_scale; + rstl::auto_ptr< CAnimData > xc_animData; + bool x14_24_renderSorted : 1; + bool x14_25_sortThermal : 1; + CColor x18_ambientColor; + rstl::optional_object< TCachedToken< CModel > > x1c_normalModel; + rstl::optional_object< TCachedToken< CModel > > x2c_xrayModel; + rstl::optional_object< TCachedToken< CModel > > x3c_infraModel; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CModelFlags.hpp b/include/MetroidPrime/CModelFlags.hpp new file mode 100644 index 00000000..556466b8 --- /dev/null +++ b/include/MetroidPrime/CModelFlags.hpp @@ -0,0 +1,73 @@ +#ifndef _CMODELFLAGS_HPP +#define _CMODELFLAGS_HPP + +#include "types.h" + +#include "Kyoto/Graphics/CColor.hpp" + +class CModelFlags { +public: + enum ETrans { + kT_Opaque = 0, + kT_Blend = 5, + kT_Additive = 7, + }; + enum EFlags { + kF_DepthCompare = 0x1, + kF_DepthUpdate = 0x2, + kF_NoTextureLock = 0x4, + kF_DepthGreater = 0x8, + kF_DepthNonInclusive = 0x10, + kF_DrawNormal = 0x20, + kF_ThermalUnsortedOnly = 0x40, + }; + + CModelFlags(ETrans trans, f32 rgba) + : x0_blendMode(trans), x1_matSetIdx(0), x2_flags(kF_DepthCompare | kF_DepthUpdate), x4_color(rgba, rgba, rgba, rgba) {} + CModelFlags(ETrans trans, CColor color) + : x0_blendMode(trans), x1_matSetIdx(0), x2_flags(kF_DepthCompare | kF_DepthUpdate), x4_color(color) {} + CModelFlags(const CModelFlags& flags, u32 otherFlags) + : x0_blendMode(flags.x0_blendMode), x1_matSetIdx(flags.x1_matSetIdx), x2_flags(otherFlags), x4_color(flags.x4_color) {} + CModelFlags(const CModelFlags& flags, bool b /* TODO what's this? */, s32 shaderSet) + : x0_blendMode(flags.x0_blendMode), x1_matSetIdx(shaderSet), x2_flags(flags.x2_flags), x4_color(flags.x4_color) {} + + CModelFlags UseShaderSet(s32 matSet) { return CModelFlags(*this, false, matSet); } + CModelFlags DontLoadTextures() { return CModelFlags(*this, GetOtherFlags() | kF_NoTextureLock); } + CModelFlags DepthCompareUpdate(bool compare, bool update) { + u32 flags = GetOtherFlags(); + if (compare) { + flags |= kF_DepthCompare; + } else { + flags &= ~kF_DepthCompare; + } + if (update) { + flags |= kF_DepthUpdate; + } else { + flags &= ~kF_DepthUpdate; + } + return CModelFlags(*this, flags); + } + CModelFlags DepthBackwards() { return CModelFlags(*this, GetOtherFlags() | kF_DepthGreater); } + + ETrans GetTrans() const { return static_cast< ETrans >(x0_blendMode); } + s32 GetShaderSet() const { return x1_matSetIdx; } + u32 GetOtherFlags() const { return x2_flags; } + CColor GetColor() const { return x4_color; } + + static CModelFlags Normal() { return CModelFlags(kT_Opaque, 1.f); } + static CModelFlags AlphaBlended(f32 f); + static CModelFlags AlphaBlended(const CColor& color); + static CModelFlags Additive(f32 f); + static CModelFlags Additive(const CColor& color); + static CModelFlags AdditiveRGB(const CColor& color); + static CModelFlags ColorModulate(const CColor& color); + +private: + u8 x0_blendMode; + u8 x1_matSetIdx; + u16 x2_flags; + CColor x4_color; +}; +CHECK_SIZEOF(CModelFlags, 0x8) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CObjectList.hpp b/include/MetroidPrime/CObjectList.hpp index 3f9fe24e..d574b3f7 100644 --- a/include/MetroidPrime/CObjectList.hpp +++ b/include/MetroidPrime/CObjectList.hpp @@ -1,7 +1,12 @@ #ifndef __COBJECTLIST_HPP__ #define __COBJECTLIST_HPP__ +#include "types.h" + +#include "MetroidPrime/TGameTypes.hpp" + #define kMaxObjects 1024 + enum EGameObjectList { kGOL_Invalid = -1, kGOL_All, @@ -25,7 +30,7 @@ class CObjectList { public: CObjectList(EGameObjectList list); - bool IsQualified(CEntity& ent); + bool IsQualified(CEntity& ent); void AddObject(CEntity& ent); void RemoveObject(TUniqueId uid); CEntity* GetObjectById(); @@ -36,11 +41,12 @@ public: const CEntity* operator[](s32 idx) const; const CEntity* GetValidObjectByIndex(s32 idx) const; s32 size() const { return mCount; } + private: SObjectListEntry mObjects[1024]; EGameObjectList mListType; s16 mFirstId = -1; s16 mCount = 0; -} +}; #endif // __COBJECTLIST_HPP__ diff --git a/include/MetroidPrime/CRippleManager.hpp b/include/MetroidPrime/CRippleManager.hpp new file mode 100644 index 00000000..bbc546d3 --- /dev/null +++ b/include/MetroidPrime/CRippleManager.hpp @@ -0,0 +1,17 @@ +#ifndef _CRIPPLEMANAGER_HPP +#define _CRIPPLEMANAGER_HPP + +#include "types.h" + +#include "rstl/vector.hpp" + +class CRipple; + +class CRippleManager { +private: + f32 x0_maxTimeFalloff; + rstl::vector< CRipple > x4_ripples; + f32 x14_alpha; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CRumbleManager.hpp b/include/MetroidPrime/CRumbleManager.hpp new file mode 100644 index 00000000..5827c36f --- /dev/null +++ b/include/MetroidPrime/CRumbleManager.hpp @@ -0,0 +1,13 @@ +#ifndef _CRUMBLEMANAGER_HPP +#define _CRUMBLEMANAGER_HPP + +#include "types.h" + +#include "Kyoto/Input/CRumbleGenerator.hpp" + +class CRumbleManager { +private: + CRumbleGenerator x0_rumbleGenerator; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CSfxHandle.hpp b/include/MetroidPrime/CSfxHandle.hpp new file mode 100644 index 00000000..f8799e46 --- /dev/null +++ b/include/MetroidPrime/CSfxHandle.hpp @@ -0,0 +1,16 @@ +#ifndef _CSFXHANDLE_HPP +#define _CSFXHANDLE_HPP + +#include "types.h" + +class CSfxHandle { +public: + CSfxHandle() : value(0) {} + CSfxHandle(u32 value) : value(value) {} + +private: + u32 value; +}; +CHECK_SIZEOF(CSfxHandle, 0x4) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CSortedLists.hpp b/include/MetroidPrime/CSortedLists.hpp new file mode 100644 index 00000000..22e1213d --- /dev/null +++ b/include/MetroidPrime/CSortedLists.hpp @@ -0,0 +1,35 @@ +#ifndef _CSORTEDLISTS_HPP +#define _CSORTEDLISTS_HPP + +#include "types.h" + +#include "MetroidPrime/CObjectList.hpp" + +#include "Kyoto/Math/CAABox.hpp" + +class CActor; + +namespace SL { +struct SNode { + CActor* x0_actor; + CAABox x4_box; + s16 x1c_selfIdxs[6]; + s16 x28_next; + bool x2a_populated; +}; +CHECK_SIZEOF(SNode, 0x2c); + +struct SSortedList { + s16 x0_ids[kMaxObjects]; + u32 x800_size; +}; +CHECK_SIZEOF(SSortedList, 0x804); + +class CSortedListManager { + SNode x0_nodes[kMaxObjects]; + SSortedList xb000_sortedLists[6]; +}; +CHECK_SIZEOF(CSortedListManager, 0xe018); +} // namespace SL + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CStateManager.hpp b/include/MetroidPrime/CStateManager.hpp index d36e3504..2df37c08 100644 --- a/include/MetroidPrime/CStateManager.hpp +++ b/include/MetroidPrime/CStateManager.hpp @@ -3,9 +3,50 @@ #include "types.h" +#include "MetroidPrime/CEntityInfo.hpp" +#include "MetroidPrime/TGameTypes.hpp" + +#include "rstl/auto_ptr.hpp" +#include "rstl/list.hpp" +#include "rstl/reserved_vector.hpp" +#include "rstl/single_ptr.hpp" + +class CActorModelParticles; +class CCameraManager; +class CEnvFxManager; +class CFluidPlaneManager; +class CObjectList; +class CPlayer; +class CRumbleManager; +class CStateManagerContainer; +class CWeaponMgr; +class CWorld; + +namespace SL { +class CSortedListManager; +} // namespace SL + class CStateManager { public: void SendScriptMsg(TUniqueId uid, TEditorId target, EScriptObjectMessage msg, EScriptObjectState state); + + CCameraManager& GetCameraManager() { return *x870_cameraManager; } + +private: + u16 x0_nextFreeIndex; + rstl::reserved_vector< u16, 1024 > x8_objectIndexArray; + rstl::reserved_vector< rstl::auto_ptr< CObjectList >, 8 > x808_objectLists; + CPlayer* x84c_player; + rstl::single_ptr< CWorld > x850_world; + rstl::list< rstl::reserved_vector< TUniqueId, 32 > > x854_graveyard; + rstl::single_ptr< CStateManagerContainer > x86c_stateManagerContainer; + CCameraManager* x870_cameraManager; + SL::CSortedListManager* x874_sortedListManager; + CWeaponMgr* x878_weaponMgr; + CFluidPlaneManager* x87c_fluidPlaneManager; + CEnvFxManager* x880_envFxManager; + rstl::auto_ptr< CActorModelParticles > x884_actorModelParticles; + CRumbleManager* x88c_rumbleManager; }; #endif diff --git a/include/MetroidPrime/CStateManagerContainer.hpp b/include/MetroidPrime/CStateManagerContainer.hpp new file mode 100644 index 00000000..73eba8ad --- /dev/null +++ b/include/MetroidPrime/CStateManagerContainer.hpp @@ -0,0 +1,30 @@ +#ifndef _CSTATEMANAGERCONTAINER_HPP +#define _CSTATEMANAGERCONTAINER_HPP + +#include "types.h" + +#include "MetroidPrime/CActorModelParticles.hpp" +#include "MetroidPrime/CEnvFxManager.hpp" +#include "MetroidPrime/CFluidPlaneManager.hpp" +#include "MetroidPrime/CRumbleManager.hpp" +#include "MetroidPrime/CSortedLists.hpp" +#include "MetroidPrime/CWeaponMgr.hpp" +#include "MetroidPrime/Cameras/CCameraManager.hpp" +#include "MetroidPrime/TGameTypes.hpp" + +#include "rstl/reserved_vector.hpp" + +class CStateManagerContainer { + CCameraManager x0_cameraManager; + SL::CSortedListManager x3c0_sortedListManager; + CWeaponMgr xe3d8_weaponManager; + CFluidPlaneManager xe3ec_fluidPlaneManager; + CEnvFxManager xe510_envFxManager; + CActorModelParticles xf168_actorModelParticles; + CRumbleManager xf250_rumbleManager; + rstl::reserved_vector< TUniqueId, 20 > xf344_; + rstl::reserved_vector< TUniqueId, 20 > xf370_; + rstl::reserved_vector< TUniqueId, 20 > xf39c_renderLast; +}; + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/CWeaponMgr.hpp b/include/MetroidPrime/CWeaponMgr.hpp new file mode 100644 index 00000000..e9bbd833 --- /dev/null +++ b/include/MetroidPrime/CWeaponMgr.hpp @@ -0,0 +1,17 @@ +#ifndef _CWEAPONMANAGER_HPP +#define _CWEAPONMANAGER_HPP + +#include "types.h" + +#include "MetroidPrime/TGameTypes.hpp" + +#include "rstl/map.hpp" +#include "rstl/reserved_vector.hpp" + +class CWeaponMgr { +private: + rstl::map< TUniqueId, rstl::reserved_vector< s32, 15 > > x0_weapons; +}; +CHECK_SIZEOF(CWeaponMgr, 0x14); + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/Cameras/CCameraFilterPass.hpp b/include/MetroidPrime/Cameras/CCameraFilterPass.hpp index 98509343..c3717c82 100644 --- a/include/MetroidPrime/Cameras/CCameraFilterPass.hpp +++ b/include/MetroidPrime/Cameras/CCameraFilterPass.hpp @@ -3,7 +3,7 @@ #include "types.h" -#include "Kyoto/Math/CColor.hpp" +#include "Kyoto/Graphics/CColor.hpp" #include "CTexture.hpp" diff --git a/include/MetroidPrime/Cameras/CCameraManager.hpp b/include/MetroidPrime/Cameras/CCameraManager.hpp new file mode 100644 index 00000000..752b9619 --- /dev/null +++ b/include/MetroidPrime/Cameras/CCameraManager.hpp @@ -0,0 +1,61 @@ +#ifndef _CCAMERAMANAGER_HPP +#define _CCAMERAMANAGER_HPP + +#include "types.h" + +#include "MetroidPrime/CAreaFog.hpp" +#include "MetroidPrime/TGameTypes.hpp" + +#include "Kyoto/Math/CVector3f.hpp" + +#include "rstl/list.hpp" +#include "rstl/pair.hpp" +#include "rstl/reserved_vector.hpp" +#include "rstl/vector.hpp" + +class CBallCamera; +class CCameraShakeData; +class CFirstPersonCamera; +class CGameCamera; +class CInterpolationCamera; +class CStateManager; + +class CCameraManager { +public: + CGameCamera* GetCurrentCamera(CStateManager& mgr); + +private: + TUniqueId x0_curCameraId; + rstl::vector< TUniqueId > x4_cineCameras; + rstl::list< CCameraShakeData > x14_shakers; + u32 x2c_lastShakeId; + CVector3f x30_shakeOffset; + CAreaFog x3c_fog; + s32 x74_fluidCounter; + TUniqueId x78_fluidId; + CFirstPersonCamera* x7c_fpCamera; + CBallCamera* x80_ballCamera; + s32 x84_rumbleId; + CInterpolationCamera* x88_interpCamera; + s16 x8c_; + f32 x90_rumbleCooldown; + f32 x94_fogDensityFactor; + f32 x98_fogDensitySpeed; + f32 x9c_fogDensityFactorTarget; + bool xa0_24_pendingRumble : 1; + bool xa0_25_rumbling : 1; + bool xa0_26_inWater : 1; + TUniqueId xa2_spindleCamId; + TUniqueId xa4_pathCamId; + TUniqueId xa6_camHintId; + s32 xa8_hintPriority; + rstl::reserved_vector< rstl::pair< s32, TUniqueId >, 64 > xac_cameraHints; + rstl::reserved_vector< TUniqueId, 64 > x2b0_inactiveCameraHints; + rstl::reserved_vector< TUniqueId, 64 > x334_activeCameraHints; + bool x3b8_24_ : 1; + bool x3b8_25_ : 1; + f32 x3bc_curFov; +}; +CHECK_SIZEOF(CCameraManager, 0x3c0) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/Cameras/CCameraShakeData.hpp b/include/MetroidPrime/Cameras/CCameraShakeData.hpp new file mode 100644 index 00000000..9ffa78f3 --- /dev/null +++ b/include/MetroidPrime/Cameras/CCameraShakeData.hpp @@ -0,0 +1,44 @@ +#ifndef _CCAMERASHAKEDATA_HPP +#define _CCAMERASHAKEDATA_HPP + +#include "types.h" + +#include "Kyoto/Math/CVector3f.hpp" + +struct SCameraShakePoint { + bool x0_useEnvelope; + f32 x4_value; + f32 x8_magnitude; + f32 xc_attackTime; + f32 x10_sustainTime; + f32 x14_duration; +}; +CHECK_SIZEOF(SCameraShakePoint, 0x18) + +class CCameraShakerComponent { +public: + virtual ~CCameraShakerComponent(); + +private: + bool x4_useModulation; + SCameraShakePoint x8_am; + SCameraShakePoint x20_fm; + f32 x38_value; +}; +CHECK_SIZEOF(CCameraShakerComponent, 0x3c) + +class CCameraShakeData { +private: + f32 x0_duration; + f32 x4_curTime; + CCameraShakerComponent x8_shakerX; + CCameraShakerComponent x44_shakerY; + CCameraShakerComponent x80_shakerZ; + u32 xbc_shakerId; + u32 xc0_flags; + CVector3f xc4_sfxPos; + f32 xd0_sfxDist; +}; +CHECK_SIZEOF(CCameraShakeData, 0xd4) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/Cameras/CGameCamera.hpp b/include/MetroidPrime/Cameras/CGameCamera.hpp new file mode 100644 index 00000000..d5e66297 --- /dev/null +++ b/include/MetroidPrime/Cameras/CGameCamera.hpp @@ -0,0 +1,31 @@ +#ifndef _CGAMECAMERA_HPP +#define _CGAMECAMERA_HPP + +#include "types.h" + +#include "MetroidPrime/CActor.hpp" + +#include "Kyoto/Math/CTransform4f.hpp" +#include "Kyoto/Math/CMatrix4f.hpp" + +class CGameCamera : public CActor { +private: + TUniqueId xe8_watchedObject; + mutable CMatrix4f xec_perspectiveMatrix; + CTransform4f x12c_origXf; + f32 x15c_currentFov; + f32 x160_znear; + f32 x164_zfar; + f32 x168_aspect; + u32 x16c_controllerIdx; + mutable bool x170_24_perspDirty : 1; + bool x170_25_disablesInput : 1; + f32 x174_delayTime; + f32 x178_perspInterpRemTime; + f32 x17c_perspInterpDur; + f32 x180_perspInterpStartFov; + f32 x184_perspInterpEndFov; +}; +CHECK_SIZEOF(CGameCamera, 0x188) + +#endif \ No newline at end of file diff --git a/include/MetroidPrime/TGameTypes.hpp b/include/MetroidPrime/TGameTypes.hpp index 6c9bf974..709c5507 100644 --- a/include/MetroidPrime/TGameTypes.hpp +++ b/include/MetroidPrime/TGameTypes.hpp @@ -21,6 +21,7 @@ struct TAreaId { bool operator==(const TAreaId& other) const { return value == other.value; } bool operator!=(const TAreaId& other) const { return value != other.value; } }; +CHECK_SIZEOF(TAreaId, 0x4) struct TEditorId { u32 value; @@ -32,6 +33,7 @@ struct TEditorId { bool operator==(const TEditorId& other) const { return value == other.value; } bool operator!=(const TEditorId& other) const { return value != other.value; } }; +CHECK_SIZEOF(TEditorId, 0x4) struct TUniqueId { union { @@ -49,5 +51,9 @@ struct TUniqueId { bool operator==(const TUniqueId& other) const { return value == other.value; } bool operator!=(const TUniqueId& other) const { return value != other.value; } }; +CHECK_SIZEOF(TUniqueId, 0x2) + +typedef u16 TSfxId; +static TSfxId InvalidSfxId = 0xFFFFu; #endif diff --git a/include/rstl/auto_ptr.hpp b/include/rstl/auto_ptr.hpp index 56404b9e..ee6f6cf4 100644 --- a/include/rstl/auto_ptr.hpp +++ b/include/rstl/auto_ptr.hpp @@ -28,11 +28,14 @@ public: // other.x0_has = false; // } T* get() { return x4_item; } + const T* get() const { return x4_item; } T* operator->() { return get(); } + const T* operator->() const { return get(); } T* release() const { x0_has = false; return x4_item; } + operator bool() const { return x0_has; } }; } // namespace rstl diff --git a/include/rstl/construct.hpp b/include/rstl/construct.hpp index 72ef98b2..a61a9c63 100644 --- a/include/rstl/construct.hpp +++ b/include/rstl/construct.hpp @@ -72,6 +72,13 @@ inline void uninitialized_copy_n(D* dest, S* src, size_t count) { } // destroy(src, src + count); ?? } + +template < typename D, typename S > +inline void uninitialized_fill_n(D dest, int count, const S& value) { + for (int i = 0; i < count; ++dest, ++i) { + construct(dest, value); + } +} } // namespace rstl #endif diff --git a/include/rstl/map.hpp b/include/rstl/map.hpp index 0a4eb5ce..59729ece 100644 --- a/include/rstl/map.hpp +++ b/include/rstl/map.hpp @@ -6,7 +6,10 @@ #include "rstl/rmemory_allocator.hpp" namespace rstl { -template < typename K, typename V, typename Alloc = rmemory_allocator > +template < typename T > +struct less {}; + +template < typename K, typename V, typename Cmp = less< K >, typename Alloc = rmemory_allocator > class map { u8 pad[0x10]; }; diff --git a/include/rstl/reserved_vector.hpp b/include/rstl/reserved_vector.hpp index c360e464..bc7d53b3 100644 --- a/include/rstl/reserved_vector.hpp +++ b/include/rstl/reserved_vector.hpp @@ -10,17 +10,19 @@ namespace rstl { template < typename T, size_t N > class reserved_vector { size_t x0_count; - T x4_items[N]; + u8 x4_data[N * sizeof(T)]; public: typedef pointer_iterator< T, reserved_vector< T, N >, void > iterator; typedef const_pointer_iterator< T, reserved_vector< T, N >, void > const_iterator; - inline iterator begin() { return iterator(x4_items); } - inline const_iterator begin() const { return const_iterator(x4_items); } - inline iterator end() { return iterator(x4_items + x0_count); } - inline const_iterator end() const { return const_iterator(x4_items + x0_count); } + inline iterator begin() { return iterator(data()); } + inline const_iterator begin() const { return const_iterator(data()); } + inline iterator end() { return iterator(data() + x0_count); } + inline const_iterator end() const { return const_iterator(data() + x0_count); } + reserved_vector() : x0_count(0) {} + reserved_vector(const T& value) : x0_count(N) { rstl::uninitialized_fill_n(data(), N, value); } reserved_vector(const reserved_vector& other) { x0_count = other.size(); rstl::uninitialized_copy_n(data(), other.data(), size()); @@ -35,14 +37,12 @@ public: } void clear() { for (size_t i = 0; i < x0_count; ++i) { - rstl::destroy(&x4_items[i]); + rstl::destroy(&data()[i]); } x0_count = 0; } - ~reserved_vector() { - clear(); - } + ~reserved_vector() { clear(); } void push_back(const T& in) { if (x0_count < N) { @@ -52,14 +52,14 @@ public: } } - inline T* data() { return x4_items; } - inline const T* data() const { return x4_items; } + inline T* data() { return reinterpret_cast< T* >(x4_data); } + inline const T* data() const { return reinterpret_cast< const T* >(x4_data); } inline size_t size() const { return x0_count; } inline size_t capacity() const { return N; } - inline T& front() { return x4_items[0]; } - inline const T& front() const { return x4_items[0]; } - inline T& back() { return x4_items[x0_count - 1]; } - inline const T& back() const { return x4_items[x0_count - 1]; } + inline T& front() { return data()[0]; } + inline const T& front() const { return data()[0]; } + inline T& back() { return data()[x0_count - 1]; } + inline const T& back() const { return data()[x0_count - 1]; } inline T& operator[](size_t idx) { return data()[idx]; } inline const T& operator[](size_t idx) const { return data()[idx]; } }; diff --git a/include/rstl/single_ptr.hpp b/include/rstl/single_ptr.hpp index 4f79c173..6ed8ebf2 100644 --- a/include/rstl/single_ptr.hpp +++ b/include/rstl/single_ptr.hpp @@ -19,7 +19,13 @@ public: delete x0_ptr; x0_ptr = ptr; } + operator bool() const { return x0_ptr != nullptr; } + T& operator*() { return *x0_ptr; } + const T& operator*() const { return *x0_ptr; } }; + +typedef single_ptr unk_singleptr; +CHECK_SIZEOF(unk_singleptr, 0x4); } // namespace rstl #endif diff --git a/include/rstl/string.hpp b/include/rstl/string.hpp index 2cd88e03..7b64da2b 100644 --- a/include/rstl/string.hpp +++ b/include/rstl/string.hpp @@ -115,6 +115,8 @@ string string_l(const char* data); // { // return string(string::literal_t(), data); // } + +CHECK_SIZEOF(string, 0x10) } // namespace rstl #endif diff --git a/include/rstl/vector.hpp b/include/rstl/vector.hpp index e081bf3a..b223de0c 100644 --- a/include/rstl/vector.hpp +++ b/include/rstl/vector.hpp @@ -106,6 +106,9 @@ void vector< T, Alloc >::reserve(size_t size) { xc_items = newData; x8_capacity = size; } + +typedef vector unk_vector; +CHECK_SIZEOF(unk_vector, 0x10) } // namespace rstl #endif diff --git a/include/static_assert.hpp b/include/static_assert.hpp new file mode 100644 index 00000000..d6af1242 --- /dev/null +++ b/include/static_assert.hpp @@ -0,0 +1,33 @@ +// C++98 static assert + +template < bool expr > +struct do_static_assert; + +template <> +struct do_static_assert< true > { + static const char test; +}; + +struct false_type { + static const bool value = false; +}; + +struct true_type { + static const bool value = true; +}; + +template < int A, int B > +struct _n_is_equal : false_type {}; + +template < int A > +struct _n_is_equal< A, A > : true_type {}; + +template < class T, int N > +struct check_sizeof : _n_is_equal< sizeof(T), N > {}; + +#ifdef __MWERKS__ +#define CHECK_SIZEOF(cls, size) \ + static void cls##_check() { do_static_assert< check_sizeof< cls, size >::value >::test; } +#else +#define CHECK_SIZEOF(cls, size) +#endif \ No newline at end of file diff --git a/include/types.h b/include/types.h index 293f918c..4908f75d 100644 --- a/include/types.h +++ b/include/types.h @@ -2,6 +2,8 @@ #define __TYPES_H__ #ifdef __cplusplus +#include "static_assert.hpp" + extern "C" { #endif diff --git a/obj_files.mk b/obj_files.mk index 831a106e..33d7a313 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -33,7 +33,7 @@ METROIDPRIME :=\ $(BUILD_DIR)/asm/MetroidPrime/CGameProjectile.o\ $(BUILD_DIR)/asm/MetroidPrime/Player/CPlayerGun.o\ $(BUILD_DIR)/asm/MetroidPrime/CStateManager.o\ - $(BUILD_DIR)/asm/MetroidPrime/CEntity.o\ + $(BUILD_DIR)/src/MetroidPrime/CEntity.o\ $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmInt32.o\ $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmInt32Int32VoidPtr.o\ $(BUILD_DIR)/asm/MetroidPrime/CArchMsgParmNull.o\ diff --git a/src/Kyoto/Text/CStringTable.cpp b/src/Kyoto/Text/CStringTable.cpp index 452b4d77..4c2b8eb2 100644 --- a/src/Kyoto/Text/CStringTable.cpp +++ b/src/Kyoto/Text/CStringTable.cpp @@ -43,6 +43,7 @@ const wchar_t* CStringTable::GetString(s32 idx) const { } template <> -CFactoryFnReturn::CFactoryFnReturn(CStringTable* ptr) : obj(TToken< CStringTable >::GetIObjObjectFor(ptr).release()) {} +CFactoryFnReturn::CFactoryFnReturn(CStringTable* ptr) +: obj(TToken< CStringTable >::GetIObjObjectFor(rstl::auto_ptr< CStringTable >(ptr)).release()) {} CFactoryFnReturn FStringTableFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& xfer) { return new CStringTable(in); } diff --git a/src/MetroidPrime/CActor.cpp b/src/MetroidPrime/CActor.cpp new file mode 100644 index 00000000..4af58573 --- /dev/null +++ b/src/MetroidPrime/CActor.cpp @@ -0,0 +1,94 @@ +#include "MetroidPrime/CActor.hpp" +#include "MetroidPrime/CActorLights.hpp" +#include "MetroidPrime/CActorParameters.hpp" +#include "MetroidPrime/CModelData.hpp" + +#include "Kyoto/Audio/CAudioSys.hpp" + +static CMaterialList MakeActorMaterialList(const CMaterialList& in, const CActorParameters& params) { + CMaterialList ret = in; + if (params.GetVisorParameters().GetBool1()) { + ret.Add(kMT_Unknown46); + } + if (params.GetVisorParameters().GetScanPassthrough()) { + ret.Add(kMT_ScanPassthrough); + } + return ret; +} + +CActor::CActor(TUniqueId uid, bool active, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf, + const CModelData& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId nextDrawNode) +: CEntity(uid, info, active, name) +, x34_transform(xf) +, x64_modelData(mData.IsStaticModel() ? nullptr : new CModelData(mData)) +, x68_material(MakeActorMaterialList(list, params)) +, x70_materialFilter(CMaterialFilter::MakeIncludeExclude(CMaterialList().Union(SolidMaterial), CMaterialList(0))) +, x88_sfxId(InvalidSfxId) +, x8c_loopingSfxHandle(0) +, x90_actorLights(mData.IsStaticModel() ? nullptr : params.GetLighting().MakeActorLights().release()) +, x9c_renderBounds(CAABox::mskInvertedBox) +, xb4_drawFlags(CModelFlags::Normal()) +, xbc_time(0.f) +, xc0_pitchBend(8192) +, xc4_fluidId(kInvalidUniqueId) +, xc6_nextDrawNode(nextDrawNode) +, xc8_drawnToken(-1) +, xcc_addedToken(-1) +, xd0_damageMag(params.GetThermalMag()) +, xd4_maxVol(CAudioSys::kMaxVolume) +, xd8_nonLoopingSfxHandles(CSfxHandle(0)) +, xe4_24_nextNonLoopingSfxHandle(0) +, xe4_27_notInSortedLists(true) +, xe4_28_transformDirty(true) +, xe4_29_actorLightsDirty(true) +, xe4_30_outOfFrustum(false) +, xe4_31_calculateLighting(true) +, xe5_24_shadowEnabled(false) +, xe5_25_shadowDirty(false) +, xe5_26_muted(false) +, xe5_27_useInSortedLists(true) +, xe5_28_callTouch(true) +, xe5_29_globalTimeProvider(params.GetUseGlobalRenderTime()) +, xe5_30_renderUnsorted(params.ForceRenderUnsorted()) +, xe5_31_pointGeneratorParticles(false) +, xe6_24_fluidCounter(0) +, xe6_27_thermalVisorFlags(params.IsHotInThermal() ? kTF_Hot : kTF_Cold) +, xe6_29_renderParticleDBInside(true) +, xe6_30_enablePitchBend(false) +, xe6_31_targetableVisorFlags(params.GetVisorParameters().GetMask()) +, xe7_27_enableRender(true) +, xe7_28_worldLightingDirty(false) +, xe7_29_drawEnabled(active) +, xe7_30_doTargetDistanceTest(true) +, xe7_31_targetable(true) { + if (x64_modelData) { + if (params.GetXRay().first != 0) { + x64_modelData->SetXRayModel(params.GetXRay()); + } + if (params.GetInfra().first != 0) { + x64_modelData->SetInfraModel(params.GetInfra()); + } + const CLightParameters& lighting = params.GetLighting(); + if (!lighting.ShouldMakeLights() || lighting.GetMaxAreaLights() == 0) { + x64_modelData->SetAmbientColor(lighting.GetAmbientColor()); + } + x64_modelData->SetSortThermal(!params.NoSortThermal()); + } + const CAssetId scanId = params.GetScannable().GetScannableObject0(); + if (scanId != kInvalidAssetId) { + x98_scanObjectInfo = new TCachedToken< CScannableObjectInfo >(gpSimplePool->GetObj(SObjectTag('SCAN', scanId))); + x98_scanObjectInfo->Lock(); + } +} + +CActor::~CActor() { RemoveEmitter(); } + +// TODO nonmatching +SAdvancementDeltas CActor::UpdateAnimation(float dt, CStateManager& mgr, bool advTree) { + SAdvancementDeltas result = x64_modelData->AdvanceAnimation(dt, mgr, GetAreaId(), advTree); + x64_modelData->AdvanceParticles(GetTransform(), dt, mgr); + UpdateSfxEmitters(); + if (x64_modelData && x64_modelData->GetAnimData().get() != nullptr) { + } + return result; +} diff --git a/src/MetroidPrime/Cameras/CCameraFilter.cpp b/src/MetroidPrime/Cameras/CCameraFilter.cpp index 29072e69..5ebda873 100644 --- a/src/MetroidPrime/Cameras/CCameraFilter.cpp +++ b/src/MetroidPrime/Cameras/CCameraFilter.cpp @@ -11,7 +11,7 @@ void CCameraFilterPass::DrawWideScreen(const CColor& color, const CTexture* tex, f32 right = vp.second.mX; f32 top = vp.second.mY; gpRender->SetDepthReadWrite(false, false); - gpRender->SetModelMatrix(skIdentity4f); + gpRender->SetModelMatrix(CTransform4f::sIdentity); if (tex != nullptr) { tex->Load(GX_TEXMAP0, CTexture::Repeat); }