Merge branch 'main' of github.com:PrimeDecomp/prime

Former-commit-id: fb3a2950f9

.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:

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 := @

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

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
+/* 802D4994 002D18F4  3C 60 80 5A */	lis r3, sRightVector__9CVector3f@ha
-/* 802D4998 002D18F8  38 83 67 18 */	addi r4, r3, lbl_805A6718@l
+/* 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
+/* 802D4D64 002D1CC4  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 802D4D68 002D1CC8  C4 83 66 A0 */	lfsu f4, skZero3f@l(r3)
+/* 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)

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
+/* 802CE380 002CB2E0  3D 20 80 5A */	lis r9, sZeroVector__9CVector3f@ha
-/* 802CE384 002CB2E4  39 49 66 A0 */	addi r10, r9, skZero3f@l
+/* 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
+/* 802CE44C 002CB3AC  3D 00 80 5A */	lis r8, sZeroVector__9CVector3f@ha
-/* 802CE450 002CB3B0  39 28 66 A0 */	addi r9, r8, skZero3f@l
+/* 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

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
+/* 802D5E18 002D2D78  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 802D5E1C 002D2D7C  C4 E3 67 54 */	lfsu f7, lbl_805A6754@l(r3)
+/* 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)

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)

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
+/* 802C1F1C 002BEE7C  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802C1F20 002BEE80  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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

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

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)

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
+/* 802FE308 002FB268  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802FE30C 002FB26C  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 802D8208 002D5168  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802D820C 002D516C  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 802EBC40 002E8BA0  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802EBC44 002E8BA4  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 802ECFEC 002E9F4C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 802ECFF0 002E9F50  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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)

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
+/* 802EE39C 002EB2FC  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802EE3A0 002EB300  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802EE400 002EB360  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802EE404 002EB364  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802EE8A0 002EB800  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802EE8A4 002EB804  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802EF2AC 002EC20C  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802EF2B0 002EC210  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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)

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
+/* 802F57F0 002F2750  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 802F57F4 002F2754  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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)

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
+/* 802F5F50 002F2EB0  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802F5F54 002F2EB4  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802F60A8 002F3008  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 802F60AC 002F300C  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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
+/* 802F6308 002F3268  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802F630C 002F326C  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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)

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
+/* 802F82DC 002F523C  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802F82E0 002F5240  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 802F8DE4 002F5D44  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802F8DE8 002F5D48  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802F8E48 002F5DA8  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802F8E4C 002F5DAC  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802F9A4C 002F69AC  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802F9A50 002F69B0  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 802F9FAC 002F6F0C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 802F9FB0 002F6F10  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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)

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

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
+/* 802E5A0C 002E296C  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 802E5A10 002E2970  C7 E4 66 A0 */	lfsu f31, skZero3f@l(r4)
+/* 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

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
+/* 80353D8C 00350CEC  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 80353D90 00350CF0  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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
+/* 803540A8 00351008  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803540AC 0035100C  3B 43 66 A0 */	addi r26, r3, skZero3f@l
+/* 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

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

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)

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
+/* 80358D10 00355C70  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 80358D14 00355C74  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 802E7B5C 002E4ABC  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 802E7B60 002E4AC0  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 8034A258 003471B8  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 8034A25C 003471BC  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

asm/Kyoto/Audio/DolphinCAudioSys.s

@@ -3471,8 +3471,8 @@ __sinit_DolphinCAudioSys_cpp:
 
 .section .sdata2, "a"
 .balign 8
-.global lbl_805AE960
+.global kMaxVolume__9CAudioSys
-lbl_805AE960:
+kMaxVolume__9CAudioSys:
 	# ROM: 0x3FB200
 	.byte 0x7F
 

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
+/* 803650F0 00362050  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 803650F4 00362054  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 803459EC 0034294C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803459F0 00342950  C4 43 66 A0 */	lfsu f2, skZero3f@l(r3)
+/* 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
+/* 80345D1C 00342C7C  3C 60 80 5A */	lis r3, sRightVector__9CVector3f@ha
-/* 80345D20 00342C80  C4 43 67 18 */	lfsu f2, lbl_805A6718@l(r3)
+/* 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)

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)

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
+/* 8035584C 003527AC  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 80355850 003527B0  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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)

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)

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
+/* 8034547C 003423DC  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80345480 003423E0  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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
+/* 803454DC 0034243C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803454E0 00342440  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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
+/* 80345540 003424A0  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80345544 003424A4  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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
+/* 803455A0 00342500  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803455A4 00342504  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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

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)

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)

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
+/* 80313E2C 00310D8C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80313E30 00310D90  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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

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 sUpVector__9CVector3f, 0xC, 4
-.comm lbl_805A6700, 0xC, 4
+.comm sDownVector__9CVector3f, 0xC, 4
-.comm lbl_805A670C, 0xC, 4
+.comm sLeftVector__9CVector3f, 0xC, 4
-.comm lbl_805A6718, 0xC, 4
+.comm sRightVector__9CVector3f, 0xC, 4
-.comm lbl_805A6724, 0xC, 4
+.comm sForwardVector__9CVector3f, 0xC, 4
-.comm lbl_805A6730, 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
+/* 80314BD4 00311B34  3D 00 80 5A */	lis r8, sUpVector__9CVector3f@ha
-/* 80314BD8 00311B38  D4 49 66 A0 */	stfsu f2, skZero3f@l(r9)
+/* 80314BD8 00311B38  D4 49 66 A0 */	stfsu f2, sZeroVector__9CVector3f@l(r9)
-/* 80314BDC 00311B3C  3C E0 80 5A */	lis r7, lbl_805A6700@ha
+/* 80314BDC 00311B3C  3C E0 80 5A */	lis r7, sDownVector__9CVector3f@ha
-/* 80314BE0 00311B40  3C C0 80 5A */	lis r6, lbl_805A670C@ha
+/* 80314BE0 00311B40  3C C0 80 5A */	lis r6, sLeftVector__9CVector3f@ha
-/* 80314BE4 00311B44  3C 80 80 5A */	lis r4, lbl_805A6724@ha
+/* 80314BE4 00311B44  3C 80 80 5A */	lis r4, sForwardVector__9CVector3f@ha
-/* 80314BE8 00311B48  D4 47 67 00 */	stfsu f2, lbl_805A6700@l(r7)
+/* 80314BE8 00311B48  D4 47 67 00 */	stfsu f2, sDownVector__9CVector3f@l(r7)
-/* 80314BEC 00311B4C  3C 60 80 5A */	lis r3, lbl_805A6730@ha
+/* 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
+/* 80314BF4 00311B54  3C A0 80 5A */	lis r5, sRightVector__9CVector3f@ha
-/* 80314BF8 00311B58  D4 48 66 F4 */	stfsu f2, lbl_805A66F4@l(r8)
+/* 80314BF8 00311B58  D4 48 66 F4 */	stfsu f2, sUpVector__9CVector3f@l(r8)
-/* 80314BFC 00311B5C  D4 06 67 0C */	stfsu f0, lbl_805A670C@l(r6)
+/* 80314BFC 00311B5C  D4 06 67 0C */	stfsu f0, sLeftVector__9CVector3f@l(r6)
-/* 80314C00 00311B60  D4 25 67 18 */	stfsu f1, lbl_805A6718@l(r5)
+/* 80314C00 00311B60  D4 25 67 18 */	stfsu f1, sRightVector__9CVector3f@l(r5)
-/* 80314C04 00311B64  D4 44 67 24 */	stfsu f2, lbl_805A6724@l(r4)
+/* 80314C04 00311B64  D4 44 67 24 */	stfsu f2, sForwardVector__9CVector3f@l(r4)
-/* 80314C08 00311B68  D4 43 67 30 */	stfsu f2, lbl_805A6730@l(r3)
+/* 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)

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
+/* 80317C94 00314BF4  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 80317C98 00314BF8  38 83 67 54 */	addi r4, r3, lbl_805A6754@l
+/* 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
+/* 80318228 00315188  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8031822C 0031518C  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 803184E8 00315448  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803184EC 0031544C  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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
+/* 8031F454 0031C3B4  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8031F458 0031C3B8  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 8031F554 0031C4B4  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8031F558 0031C4B8  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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)

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
+/* 803571EC 0035414C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803571F0 00354150  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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)

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
+/* 8035F2E4 0035C244  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 8035F2E8 0035C248  38 83 67 54 */	addi r4, r3, lbl_805A6754@l
+/* 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
+/* 8035F320 0035C280  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 8035F324 0035C284  38 83 67 54 */	addi r4, r3, lbl_805A6754@l
+/* 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
+/* 803617E4 0035E744  3C 60 80 5A */	lis r3, sUpVector__9CVector3f@ha
-/* 803617E8 0035E748  38 83 66 F4 */	addi r4, r3, lbl_805A66F4@l
+/* 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
+/* 803618DC 0035E83C  3C 60 80 5A */	lis r3, sUpVector__9CVector3f@ha
-/* 803618E0 0035E840  38 C3 66 F4 */	addi r6, r3, lbl_805A66F4@l
+/* 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
+/* 803619A0 0035E900  3C 60 80 5A */	lis r3, sUpVector__9CVector3f@ha
-/* 803619A4 0035E904  38 C3 66 F4 */	addi r6, r3, lbl_805A66F4@l
+/* 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
+/* 803621E0 0035F140  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 803621E4 0035F144  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 803621E4 0035F144  38 83 66 70 */	addi r4, r3, sIdentity__12CTransform4f@l
-/* 803621E8 0035F148  3B 45 66 A0 */	addi r26, r5, skZero3f@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
+/* 80362228 0035F188  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8036222C 0035F18C  3C 80 80 5A */	lis r4, skIdentity4f@ha
+/* 8036222C 0035F18C  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 80362230 0035F190  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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
+/* 8036225C 0035F1BC  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80362260 0035F1C0  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 80362288 0035F1E8  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8036228C 0035F1EC  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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
+/* 803626A4 0035F604  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803626A8 0035F608  3B 43 66 A0 */	addi r26, r3, skZero3f@l
+/* 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
+/* 80362788 0035F6E8  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8036278C 0035F6EC  3B 43 66 A0 */	addi r26, r3, skZero3f@l
+/* 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)

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)

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
+/* 8032C1D4 00329134  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 8032C1D8 00329138  C2 24 66 A0 */	lfs f17, skZero3f@l(r4)
+/* 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
+/* 8032C77C 003296DC  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8032C780 003296E0  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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
+/* 8032C7F8 00329758  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8032C7FC 0032975C  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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
+/* 8032C874 003297D4  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8032C878 003297D8  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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
+/* 8032D424 0032A384  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8032D428 0032A388  C7 83 66 A0 */	lfsu f28, skZero3f@l(r3)
+/* 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
+/* 8032EE48 0032BDA8  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8032EE4C 0032BDAC  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 8032EE94 0032BDF4  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8032EE98 0032BDF8  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 8032EEB4 0032BE14  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8032EEB8 0032BE18  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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
+/* 8032F1FC 0032C15C  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 8032F200 0032C160  3C 60 80 5A */	lis r3, skIdentity4f@ha
+/* 8032F200 0032C160  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8032F204 0032C164  3B 84 66 A0 */	addi r28, r4, skZero3f@l
+/* 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)

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
+/* 8032FF98 0032CEF8  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 8032FF9C 0032CEFC  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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)

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
+/* 80335BE4 00332B44  3C 60 80 5A */	lis r3, sUpVector__9CVector3f@ha
-/* 80335BE8 00332B48  C4 43 66 F4 */	lfsu f2, lbl_805A66F4@l(r3)
+/* 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
+/* 803361DC 0033313C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 803361E0 00333140  39 23 66 A0 */	addi r9, r3, skZero3f@l
+/* 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)

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)

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)

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
+/* 802B66E8 002B3648  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802B66EC 002B364C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802B66F4 002B3654  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802B66F8 002B3658  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802B6BE8 002B3B48  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802B6BEC 002B3B4C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BA6B8 002B7618  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BA6BC 002B761C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BA6C4 002B7624  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BA6C8 002B7628  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BACC8 002B7C28  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BACCC 002B7C2C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BACD4 002B7C34  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BACD8 002B7C38  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BAF84 002B7EE4  3C 60 80 5A */	lis r3, sDownVector__9CVector3f@ha
-/* 802BAF88 002B7EE8  38 A4 66 F4 */	addi r5, r4, lbl_805A66F4@l
+/* 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
+/* 802BC180 002B90E0  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BC184 002B90E4  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BC18C 002B90EC  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BC190 002B90F0  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BCA18 002B9978  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BCA1C 002B997C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BCA24 002B9984  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BCA28 002B9988  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BD7B4 002BA714  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BD7B8 002BA718  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BD850 002BA7B0  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BD854 002BA7B4  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BDD44 002BACA4  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 802BDD48 002BACA8  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 802BF224 002BC184  3C 60 80 5A */	lis r3, sForwardVector__9CVector3f@ha
-/* 802BF228 002BC188  38 E3 67 24 */	addi r7, r3, lbl_805A6724@l
+/* 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

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
+/* 801354F0 00132450  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 801354F4 00132454  C4 23 66 A0 */	lfsu f1, skZero3f@l(r3)
+/* 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

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
+/* 80176310 00173270  3C 60 80 5A */	lis r3, sForwardVector__9CVector3f@ha
-/* 80176314 00173274  38 E3 67 24 */	addi r7, r3, lbl_805A6724@l
+/* 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

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
+/* 80144644 001415A4  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80144648 001415A8  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 80144E98 00141DF8  3C 60 80 5A */	lis r3, sDownVector__9CVector3f@ha
-/* 80144E9C 00141DFC  38 A3 67 00 */	addi r5, r3, lbl_805A6700@l
+/* 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)

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
+/* 80145E24 00142D84  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80145E28 00142D88  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 801463EC 0014334C  3C 80 80 5A */	lis r4, sUpVector__9CVector3f@ha
-/* 801463F0 00143350  38 84 66 F4 */	addi r4, r4, lbl_805A66F4@l
+/* 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

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

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
+/* 8018D5A0 0018A500  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 8018D5A4 0018A504  C4 04 66 A0 */	lfsu f0, skZero3f@l(r4)
+/* 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

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)

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
+/* 801314A8 0012E408  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 801314AC 0012E40C  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 801314E8 0012E448  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 801314EC 0012E44C  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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
+/* 8013180C 0012E76C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80131810 0012E770  C4 23 66 A0 */	lfsu f1, skZero3f@l(r3)
+/* 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

asm/MetroidPrime/CActor.s

@@ -3,8 +3,8 @@
 .section .data
 .balign 8
 
-.global lbl_803D9EB0
+.global __vt__6CActor
-lbl_803D9EB0:
+__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
+/* 80055714 00052674  3C 80 80 3E */	lis r4, __vt__6CActor@ha
-/* 80055718 00052678  38 04 9E B0 */	addi r0, r4, lbl_803D9EB0@l
+/* 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<c,Q24rstl14char_traits<c>,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

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
+/* 80103394 001002F4  38 83 66 A0 */	addi r4, r3, sZeroVector__9CVector3f@l
-/* 80103398 001002F8  3C 60 80 5A */	lis r3, lbl_805A6724@ha
+/* 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
+/* 801045E0 00101540  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 801045E4 00101544  38 84 66 A0 */	addi r4, r4, skZero3f@l
+/* 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
+/* 80104B90 00101AF0  3C E0 80 5A */	lis r7, sZeroVector__9CVector3f@ha
-/* 80104B94 00101AF4  C4 47 66 A0 */	lfsu f2, skZero3f@l(r7)
+/* 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)

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)

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
+/* 801E499C 001E18FC  3C 80 80 5A */	lis r4, sUpVector__9CVector3f@ha
-/* 801E49A0 001E1900  3C 60 80 5A */	lis r3, skZero3f@ha
+/* 801E49A0 001E1900  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 801E49A4 001E1904  38 C4 66 F4 */	addi r6, r4, lbl_805A66F4@l
+/* 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)

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
+/* 8002E0D4 0002B034  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 8002E0D8 0002B038  38 83 67 54 */	addi r4, r3, lbl_805A6754@l
+/* 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

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
+/* 8029D04C 00299FAC  3C 80 80 5A */	lis r4, sRightVector__9CVector3f@ha
-/* 8029D050 00299FB0  3C C0 80 5A */	lis r6, lbl_805A6700@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
+/* 8029D068 00299FC8  3B E4 67 24 */	addi r31, r4, sForwardVector__9CVector3f@l
-/* 8029D06C 00299FCC  38 C6 67 00 */	addi r6, r6, lbl_805A6700@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
+/* 8029D4EC 0029A44C  3C 60 80 5A */	lis r3, sForwardVector__9CVector3f@ha
-/* 8029D4F0 0029A450  38 83 67 24 */	addi r4, r3, lbl_805A6724@l
+/* 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

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
+/* 80099330 00096290  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80099334 00096294  3B A3 66 70 */	addi r29, r3, skIdentity4f@l
+/* 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

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
+/* 8001B5A0 00018500  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 8001B5A4 00018504  C4 44 66 A0 */	lfsu f2, skZero3f@l(r4)
+/* 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)

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
+/* 8017532C 0017228C  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80175330 00172290  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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<f>__5CMathFRCfRCf"
 /* 80175560 001724C0  C0 03 00 00 */	lfs f0, 0(r3)
-/* 80175564 001724C4  3C 60 80 5A */	lis r3, lbl_805A6724@ha
+/* 80175564 001724C4  3C 60 80 5A */	lis r3, sForwardVector__9CVector3f@ha
-/* 80175568 001724C8  38 83 67 24 */	addi r4, r3, lbl_805A6724@l
+/* 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)

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<c,Q24rstl14char_traits<c>,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
+/* 801A970C 001A666C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 801A9710 001A6670  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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<c,Q24rstl14char_traits<c>,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)

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
+/* 801A8838 001A5798  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 801A883C 001A579C  38 C3 66 A0 */	addi r6, r3, skZero3f@l
+/* 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

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
+/* 80027C80 00024BE0  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 80027C84 00024BE4  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 80210014 0020CF74  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80210018 0020CF78  38 A3 66 A0 */	addi r5, r3, skZero3f@l
+/* 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
+/* 80210E5C 0020DDBC  3C 60 80 5A */	lis r3, sForwardVector__9CVector3f@ha
-/* 80210E60 0020DDC0  38 63 67 24 */	addi r3, r3, lbl_805A6724@l
+/* 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
+/* 802114D0 0020E430  3B 64 66 F4 */	addi r27, r4, sUpVector__9CVector3f@l
-/* 802114D4 0020E434  3A E3 67 00 */	addi r23, r3, lbl_805A6700@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
+/* 80211888 0020E7E8  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8021188C 0020E7EC  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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

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)

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)

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)

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
+/* 8017FE98 0017CDF8  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8017FE9C 0017CDFC  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 8017FE9C 0017CDFC  38 83 66 A0 */	addi r4, r3, sZeroVector__9CVector3f@l
-/* 8017FEA0 0017CE00  3C 60 80 5A */	lis r3, skIdentity4f@ha
+/* 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

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
+/* 8029E8B4 0029B814  3C 80 80 5A */	lis r4, sRightVector__9CVector3f@ha
-/* 8029E8B8 0029B818  3C C0 80 5A */	lis r6, lbl_805A6700@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
+/* 8029E8C0 0029B820  38 A4 67 18 */	addi r5, r4, sRightVector__9CVector3f@l
-/* 8029E8C4 0029B824  3C 80 80 5A */	lis r4, lbl_805A6724@ha
+/* 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
+/* 8029E8D4 0029B834  38 84 67 24 */	addi r4, r4, sForwardVector__9CVector3f@l
-/* 8029E8D8 0029B838  38 C6 67 00 */	addi r6, r6, lbl_805A6700@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

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

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
+/* 80185AA4 00182A04  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80185AA8 00182A08  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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
+/* 80185F1C 00182E7C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80185F20 00182E80  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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
+/* 801889F8 00185958  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 801889FC 0018595C  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 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
+/* 80188C34 00185B94  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 80188C38 00185B98  38 A3 67 54 */	addi r5, r3, lbl_805A6754@l
+/* 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
+/* 80188FCC 00185F2C  3C 60 80 5A */	lis r3, mskInvertedBox__6CAABox@ha
-/* 80188FD0 00185F30  C4 C3 67 54 */	lfsu f6, lbl_805A6754@l(r3)
+/* 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
+/* 80189D64 00186CC4  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80189D68 00186CC8  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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)

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
+/* 80108C34 00105B94  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80108C38 00105B98  3B 63 66 A0 */	addi r27, r3, skZero3f@l
+/* 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)

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
+/* 800802EC 0007D24C  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 800802F0 0007D250  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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
+/* 8008044C 0007D3AC  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 80080450 0007D3B0  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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)

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
+/* 80201E58 001FEDB8  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 80201E5C 001FEDBC  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 8009F51C 0009C47C  3C 60 80 3E */	lis r3, __vt__31CObjOwnerDerivedFromIObjUntyped@ha
-/* 8009F520 0009C480  38 03 8D 78 */	addi r0, r3, __vt__31TObjOwnerDerivedFromIObjUntyped@l
+/* 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)

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
+/* 800E8C60 000E5BC0  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 800E8C64 000E5BC4  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 800E94F8 000E6458  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 800E94FC 000E645C  C4 04 66 A0 */	lfsu f0, skZero3f@l(r4)
+/* 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)

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)

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
+/* 80115A44 001129A4  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 80115A48 001129A8  38 84 66 70 */	addi r4, r4, skIdentity4f@l
+/* 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
+/* 80115A8C 001129EC  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 80115A90 001129F0  38 84 66 70 */	addi r4, r4, skIdentity4f@l
+/* 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
+/* 80116E7C 00113DDC  3C A0 80 5A */	lis r5, sZeroVector__9CVector3f@ha
-/* 80116E80 00113DE0  C4 C5 66 A0 */	lfsu f6, skZero3f@l(r5)
+/* 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

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
+/* 80293CF4 00290C54  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 80293CF8 00290C58  38 84 66 70 */	addi r4, r4, skIdentity4f@l
+/* 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
+/* 80293D0C 00290C6C  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80293D10 00290C70  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 80293F78 00290ED8  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80293F7C 00290EDC  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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

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<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>FRCQ24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>"
 /* 800B798C 000B48EC  C0 22 8D 10 */	lfs f1, lbl_805AAA30@sda21(r2)
-/* 800B7990 000B48F0  3C 60 80 5A */	lis r3, skIdentity4f@ha
+/* 800B7990 000B48F0  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 800B7994 000B48F4  38 83 66 70 */	addi r4, r3, skIdentity4f@l
+/* 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

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)

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

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
+/* 8011AF20 00117E80  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8011AF24 00117E84  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 8011B1CC 0011812C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8011B1D0 00118130  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 8011B390 001182F0  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8011B394 001182F4  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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
+/* 8011BC10 00118B70  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8011BC14 00118B74  C4 03 66 A0 */	lfsu f0, skZero3f@l(r3)
+/* 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

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
+/* 8029D79C 0029A6FC  3C 60 80 5A */	lis r3, sDownVector__9CVector3f@ha
-/* 8029D7A0 0029A700  38 83 67 00 */	addi r4, r3, lbl_805A6700@l
+/* 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
+/* 8029DBA4 0029AB04  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8029DBA8 0029AB08  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 8029E418 0029B378  38 A4 67 54 */	addi r5, r4, mskInvertedBox__6CAABox@l
-/* 8029E41C 0029B37C  3C 60 80 5A */	lis r3, skZero3f@ha
+/* 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)

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
+/* 8020E0B8 0020B018  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8020E0BC 0020B01C  3B C3 66 A0 */	addi r30, r3, skZero3f@l
+/* 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)

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
+/* 80269F38 00266E98  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 80269F3C 00266E9C  C4 24 66 A0 */	lfsu f1, skZero3f@l(r4)
+/* 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

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

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

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
+/* 801061E8 00103148  3C 80 80 5A */	lis r4, sZeroVector__9CVector3f@ha
-/* 801061EC 0010314C  3C 60 80 5A */	lis r3, lbl_805A66F4@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
+/* 801061F8 00103158  38 A4 66 A0 */	addi r5, r4, sZeroVector__9CVector3f@l
-/* 801061FC 0010315C  38 C3 66 F4 */	addi r6, r3, lbl_805A66F4@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

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
+/* 80298228 00295188  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8029822C 0029518C  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 8029BE84 00298DE4  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 8029BE88 00298DE8  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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
+/* 8029BEEC 00298E4C  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 8029BEF0 00298E50  38 63 66 A0 */	addi r3, r3, skZero3f@l
+/* 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)

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
+/* 80028348 000252A8  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 8002834C 000252AC  38 84 66 70 */	addi r4, r4, skIdentity4f@l
+/* 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
+/* 80028360 000252C0  3C 60 80 5A */	lis r3, sIdentity__12CTransform4f@ha
-/* 80028364 000252C4  38 63 66 70 */	addi r3, r3, skIdentity4f@l
+/* 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)

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
+/* 800440D8 00041038  3C 60 80 5A */	lis r3, sZeroVector__9CVector3f@ha
-/* 800440DC 0004103C  3C A0 80 5A */	lis r5, lbl_805A66F4@ha
+/* 800440DC 0004103C  3C A0 80 5A */	lis r5, sUpVector__9CVector3f@ha
-/* 800440E0 00041040  38 83 66 A0 */	addi r4, r3, skZero3f@l
+/* 800440E0 00041040  38 83 66 A0 */	addi r4, r3, sZeroVector__9CVector3f@l
-/* 800440E4 00041044  38 C5 66 F4 */	addi r6, r5, lbl_805A66F4@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
+/* 80047228 00044188  3C 80 80 5A */	lis r4, sIdentity__12CTransform4f@ha
-/* 8004722C 0004418C  38 84 66 70 */	addi r4, r4, skIdentity4f@l
+/* 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