From ad6fd10f21067d92eb76d29e7bb8b295b35b20bf Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 18 Sep 2022 01:52:19 -0400 Subject: [PATCH] Symbol renaming Former-commit-id: be9f7f1dc435de73145bdea25a83bdfe278e07ef --- asm/Collision/CCollisionPrimitive.s | 4 +- asm/Dolphin/gx/GXAttr.s | 148 +++++++++--------- asm/Dolphin/gx/GXBump.s | 32 ++-- asm/Dolphin/gx/GXDisplayList.s | 4 +- asm/Dolphin/gx/GXFifo.s | 24 +-- asm/Dolphin/gx/GXFrameBuf.s | 52 +++--- asm/Dolphin/gx/GXGeometry.s | 46 +++--- asm/Dolphin/gx/GXInit.s | 34 ++-- asm/Dolphin/gx/GXLight.s | 26 +-- asm/Dolphin/gx/GXMisc.s | 12 +- asm/Dolphin/gx/GXPerf.s | 10 +- asm/Dolphin/gx/GXPixel.s | 30 ++-- asm/Dolphin/gx/GXTev.s | 46 +++--- asm/Dolphin/gx/GXTexture.s | 32 ++-- asm/Dolphin/gx/GXTransform.s | 24 +-- asm/MetroidPrime/CCollisionActor.s | 2 +- asm/MetroidPrime/CEnvFxManager.s | 4 +- asm/MetroidPrime/CGameCollision.s | 4 +- asm/MetroidPrime/CGameProjectile.s | 12 +- asm/MetroidPrime/CPhysicsActor.s | 4 +- asm/MetroidPrime/CRagDoll.s | 4 +- asm/MetroidPrime/CStateManager.s | 16 +- asm/MetroidPrime/Cameras/CBallCamera.s | 8 +- .../Cameras/CBallCameraFailsafeState.s | 4 +- asm/MetroidPrime/Enemies/CBabygoth.s | 4 +- asm/MetroidPrime/Enemies/CDrone.s | 12 +- asm/MetroidPrime/Enemies/CElitePirate.s | 4 +- asm/MetroidPrime/Enemies/CGrenadeLauncher.s | 4 +- asm/MetroidPrime/Enemies/CIceSheegoth.s | 4 +- asm/MetroidPrime/Enemies/CMetroid.s | 4 +- asm/MetroidPrime/Enemies/CMetroidBeta.s | 4 +- .../Enemies/CMetroidPrimeEssence.s | 12 +- asm/MetroidPrime/Enemies/CMetroidPrimeExo.s | 2 +- asm/MetroidPrime/Enemies/CParasite.s | 8 +- asm/MetroidPrime/Enemies/CPuddleSpore.s | 8 +- asm/MetroidPrime/Enemies/CPuddleToadGamma.s | 2 +- .../Enemies/CRipperControlledPlatform.s | 2 +- asm/MetroidPrime/Enemies/CThardus.s | 2 +- asm/MetroidPrime/Enemies/CTryclops.s | 12 +- asm/MetroidPrime/Enemies/CWarWasp.s | 4 +- asm/MetroidPrime/Player/CMorphBall.s | 36 ++--- asm/MetroidPrime/Player/CPlayer.s | 32 ++-- asm/MetroidPrime/Player/CPlayerOrbit.s | 8 +- asm/MetroidPrime/ScriptLoader.s | 2 +- .../ScriptObjects/CScriptGenerator.s | 2 +- .../ScriptObjects/CScriptMazeNode.s | 36 ++--- .../ScriptObjects/CScriptPickupGenerator.s | 2 +- .../ScriptObjects/CScriptPlatform.s | 18 +-- asm/MetroidPrime/Weapons/CFlameThrower.s | 12 +- asm/MetroidPrime/Weapons/CNewFlameThrower.s | 16 +- asm/MetroidPrime/Weapons/CWaveBuster.s | 12 +- asm/WorldFormat/CCollidableOBBTree.s | 4 +- asm/WorldFormat/CCollidableOBBTreeGroup.s | 56 +++---- 53 files changed, 453 insertions(+), 453 deletions(-) diff --git a/asm/Collision/CCollisionPrimitive.s b/asm/Collision/CCollisionPrimitive.s index 47692e73..a306055b 100644 --- a/asm/Collision/CCollisionPrimitive.s +++ b/asm/Collision/CCollisionPrimitive.s @@ -1392,8 +1392,8 @@ lbl_802CF880: .global __ct__19CCollisionPrimitiveFRC13CMaterialList __ct__19CCollisionPrimitiveFRC13CMaterialList: -/* 802CF8B4 002CC814 3C A0 80 3E */ lis r5, lbl_803D97E4@ha -/* 802CF8B8 002CC818 38 05 97 E4 */ addi r0, r5, lbl_803D97E4@l +/* 802CF8B4 002CC814 3C A0 80 3E */ lis r5, __vt__19CCollisionPrimitive@ha +/* 802CF8B8 002CC818 38 05 97 E4 */ addi r0, r5, __vt__19CCollisionPrimitive@l /* 802CF8BC 002CC81C 90 03 00 00 */ stw r0, 0(r3) /* 802CF8C0 002CC820 80 04 00 00 */ lwz r0, 0(r4) /* 802CF8C4 002CC824 80 84 00 04 */ lwz r4, 4(r4) diff --git a/asm/Dolphin/gx/GXAttr.s b/asm/Dolphin/gx/GXAttr.s index 6ab96c06..7e52fb1e 100644 --- a/asm/Dolphin/gx/GXAttr.s +++ b/asm/Dolphin/gx/GXAttr.s @@ -164,7 +164,7 @@ lbl_805A8AD8: .global __GXXfVtxSpecs __GXXfVtxSpecs: -/* 80376DC0 00373D20 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80376DC0 00373D20 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80376DC4 00373D24 80 85 00 14 */ lwz r4, 0x14(r5) /* 80376DC8 00373D28 54 80 9F BF */ rlwinm. r0, r4, 0x13, 0x1e, 0x1f /* 80376DCC 00373D2C 41 82 00 0C */ beq lbl_80376DD8 @@ -259,7 +259,7 @@ lbl_80376ED8: /* 80376ED8 00373E38 38 C0 00 00 */ li r6, 0 lbl_80376EDC: /* 80376EDC 00373E3C 38 00 00 10 */ li r0, 0x10 -/* 80376EE0 00373E40 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376EE0 00373E40 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376EE4 00373E44 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80376EE8 00373E48 7D 08 32 14 */ add r8, r8, r6 /* 80376EEC 00373E4C 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -285,14 +285,14 @@ GXSetVtxDesc: /* 80376F30 00373E90 7C 09 03 A6 */ mtctr r0 /* 80376F34 00373E94 4E 80 04 20 */ bctr lbl_80376F38: -/* 80376F38 00373E98 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376F38 00373E98 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376F3C 00373E9C 84 03 00 14 */ lwzu r0, 0x14(r3) /* 80376F40 00373EA0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80376F44 00373EA4 7C 00 23 78 */ or r0, r0, r4 /* 80376F48 00373EA8 90 03 00 00 */ stw r0, 0(r3) /* 80376F4C 00373EAC 48 00 02 C0 */ b lbl_8037720C lbl_80376F50: -/* 80376F50 00373EB0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376F50 00373EB0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376F54 00373EB4 54 80 08 3C */ slwi r0, r4, 1 /* 80376F58 00373EB8 38 83 00 14 */ addi r4, r3, 0x14 /* 80376F5C 00373EBC 80 63 00 14 */ lwz r3, 0x14(r3) @@ -301,7 +301,7 @@ lbl_80376F50: /* 80376F68 00373EC8 90 04 00 00 */ stw r0, 0(r4) /* 80376F6C 00373ECC 48 00 02 A0 */ b lbl_8037720C lbl_80376F70: -/* 80376F70 00373ED0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376F70 00373ED0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376F74 00373ED4 54 80 10 3A */ slwi r0, r4, 2 /* 80376F78 00373ED8 38 83 00 14 */ addi r4, r3, 0x14 /* 80376F7C 00373EDC 80 63 00 14 */ lwz r3, 0x14(r3) @@ -310,7 +310,7 @@ lbl_80376F70: /* 80376F88 00373EE8 90 04 00 00 */ stw r0, 0(r4) /* 80376F8C 00373EEC 48 00 02 80 */ b lbl_8037720C lbl_80376F90: -/* 80376F90 00373EF0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376F90 00373EF0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376F94 00373EF4 54 80 18 38 */ slwi r0, r4, 3 /* 80376F98 00373EF8 38 83 00 14 */ addi r4, r3, 0x14 /* 80376F9C 00373EFC 80 63 00 14 */ lwz r3, 0x14(r3) @@ -319,7 +319,7 @@ lbl_80376F90: /* 80376FA8 00373F08 90 04 00 00 */ stw r0, 0(r4) /* 80376FAC 00373F0C 48 00 02 60 */ b lbl_8037720C lbl_80376FB0: -/* 80376FB0 00373F10 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376FB0 00373F10 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376FB4 00373F14 54 80 20 36 */ slwi r0, r4, 4 /* 80376FB8 00373F18 38 83 00 14 */ addi r4, r3, 0x14 /* 80376FBC 00373F1C 80 63 00 14 */ lwz r3, 0x14(r3) @@ -328,7 +328,7 @@ lbl_80376FB0: /* 80376FC8 00373F28 90 04 00 00 */ stw r0, 0(r4) /* 80376FCC 00373F2C 48 00 02 40 */ b lbl_8037720C lbl_80376FD0: -/* 80376FD0 00373F30 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376FD0 00373F30 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376FD4 00373F34 54 80 28 34 */ slwi r0, r4, 5 /* 80376FD8 00373F38 38 83 00 14 */ addi r4, r3, 0x14 /* 80376FDC 00373F3C 80 63 00 14 */ lwz r3, 0x14(r3) @@ -337,7 +337,7 @@ lbl_80376FD0: /* 80376FE8 00373F48 90 04 00 00 */ stw r0, 0(r4) /* 80376FEC 00373F4C 48 00 02 20 */ b lbl_8037720C lbl_80376FF0: -/* 80376FF0 00373F50 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376FF0 00373F50 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376FF4 00373F54 54 80 30 32 */ slwi r0, r4, 6 /* 80376FF8 00373F58 38 83 00 14 */ addi r4, r3, 0x14 /* 80376FFC 00373F5C 80 63 00 14 */ lwz r3, 0x14(r3) @@ -346,7 +346,7 @@ lbl_80376FF0: /* 80377008 00373F68 90 04 00 00 */ stw r0, 0(r4) /* 8037700C 00373F6C 48 00 02 00 */ b lbl_8037720C lbl_80377010: -/* 80377010 00373F70 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377010 00373F70 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377014 00373F74 54 80 38 30 */ slwi r0, r4, 7 /* 80377018 00373F78 38 83 00 14 */ addi r4, r3, 0x14 /* 8037701C 00373F7C 80 63 00 14 */ lwz r3, 0x14(r3) @@ -355,7 +355,7 @@ lbl_80377010: /* 80377028 00373F88 90 04 00 00 */ stw r0, 0(r4) /* 8037702C 00373F8C 48 00 01 E0 */ b lbl_8037720C lbl_80377030: -/* 80377030 00373F90 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377030 00373F90 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377034 00373F94 54 80 40 2E */ slwi r0, r4, 8 /* 80377038 00373F98 38 83 00 14 */ addi r4, r3, 0x14 /* 8037703C 00373F9C 80 63 00 14 */ lwz r3, 0x14(r3) @@ -364,7 +364,7 @@ lbl_80377030: /* 80377048 00373FA8 90 04 00 00 */ stw r0, 0(r4) /* 8037704C 00373FAC 48 00 01 C0 */ b lbl_8037720C lbl_80377050: -/* 80377050 00373FB0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377050 00373FB0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377054 00373FB4 54 80 48 2C */ slwi r0, r4, 9 /* 80377058 00373FB8 38 83 00 14 */ addi r4, r3, 0x14 /* 8037705C 00373FBC 80 63 00 14 */ lwz r3, 0x14(r3) @@ -375,7 +375,7 @@ lbl_80377050: lbl_80377070: /* 80377070 00373FD0 2C 04 00 00 */ cmpwi r4, 0 /* 80377074 00373FD4 41 82 00 20 */ beq lbl_80377094 -/* 80377078 00373FD8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377078 00373FD8 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037707C 00373FDC 38 A0 00 01 */ li r5, 1 /* 80377080 00373FE0 38 00 00 00 */ li r0, 0 /* 80377084 00373FE4 98 A3 04 1C */ stb r5, 0x41c(r3) @@ -383,14 +383,14 @@ lbl_80377070: /* 8037708C 00373FEC 90 83 04 18 */ stw r4, 0x418(r3) /* 80377090 00373FF0 48 00 01 7C */ b lbl_8037720C lbl_80377094: -/* 80377094 00373FF4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377094 00373FF4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377098 00373FF8 38 00 00 00 */ li r0, 0 /* 8037709C 00373FFC 98 03 04 1C */ stb r0, 0x41c(r3) /* 803770A0 00374000 48 00 01 6C */ b lbl_8037720C lbl_803770A4: /* 803770A4 00374004 2C 04 00 00 */ cmpwi r4, 0 /* 803770A8 00374008 41 82 00 20 */ beq lbl_803770C8 -/* 803770AC 0037400C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803770AC 0037400C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803770B0 00374010 38 A0 00 01 */ li r5, 1 /* 803770B4 00374014 38 00 00 00 */ li r0, 0 /* 803770B8 00374018 98 A3 04 1D */ stb r5, 0x41d(r3) @@ -398,12 +398,12 @@ lbl_803770A4: /* 803770C0 00374020 90 83 04 18 */ stw r4, 0x418(r3) /* 803770C4 00374024 48 00 01 48 */ b lbl_8037720C lbl_803770C8: -/* 803770C8 00374028 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803770C8 00374028 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803770CC 0037402C 38 00 00 00 */ li r0, 0 /* 803770D0 00374030 98 03 04 1D */ stb r0, 0x41d(r3) /* 803770D4 00374034 48 00 01 38 */ b lbl_8037720C lbl_803770D8: -/* 803770D8 00374038 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803770D8 00374038 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803770DC 0037403C 54 80 68 24 */ slwi r0, r4, 0xd /* 803770E0 00374040 38 83 00 14 */ addi r4, r3, 0x14 /* 803770E4 00374044 80 63 00 14 */ lwz r3, 0x14(r3) @@ -412,7 +412,7 @@ lbl_803770D8: /* 803770F0 00374050 90 04 00 00 */ stw r0, 0(r4) /* 803770F4 00374054 48 00 01 18 */ b lbl_8037720C lbl_803770F8: -/* 803770F8 00374058 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803770F8 00374058 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803770FC 0037405C 54 80 78 20 */ slwi r0, r4, 0xf /* 80377100 00374060 38 83 00 14 */ addi r4, r3, 0x14 /* 80377104 00374064 80 63 00 14 */ lwz r3, 0x14(r3) @@ -421,14 +421,14 @@ lbl_803770F8: /* 80377110 00374070 90 04 00 00 */ stw r0, 0(r4) /* 80377114 00374074 48 00 00 F8 */ b lbl_8037720C lbl_80377118: -/* 80377118 00374078 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377118 00374078 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037711C 0037407C 84 03 00 18 */ lwzu r0, 0x18(r3) /* 80377120 00374080 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d /* 80377124 00374084 7C 00 23 78 */ or r0, r0, r4 /* 80377128 00374088 90 03 00 00 */ stw r0, 0(r3) /* 8037712C 0037408C 48 00 00 E0 */ b lbl_8037720C lbl_80377130: -/* 80377130 00374090 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377130 00374090 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377134 00374094 54 80 10 3A */ slwi r0, r4, 2 /* 80377138 00374098 38 83 00 18 */ addi r4, r3, 0x18 /* 8037713C 0037409C 80 63 00 18 */ lwz r3, 0x18(r3) @@ -437,7 +437,7 @@ lbl_80377130: /* 80377148 003740A8 90 04 00 00 */ stw r0, 0(r4) /* 8037714C 003740AC 48 00 00 C0 */ b lbl_8037720C lbl_80377150: -/* 80377150 003740B0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377150 003740B0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377154 003740B4 54 80 20 36 */ slwi r0, r4, 4 /* 80377158 003740B8 38 83 00 18 */ addi r4, r3, 0x18 /* 8037715C 003740BC 80 63 00 18 */ lwz r3, 0x18(r3) @@ -446,7 +446,7 @@ lbl_80377150: /* 80377168 003740C8 90 04 00 00 */ stw r0, 0(r4) /* 8037716C 003740CC 48 00 00 A0 */ b lbl_8037720C lbl_80377170: -/* 80377170 003740D0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377170 003740D0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377174 003740D4 54 80 30 32 */ slwi r0, r4, 6 /* 80377178 003740D8 38 83 00 18 */ addi r4, r3, 0x18 /* 8037717C 003740DC 80 63 00 18 */ lwz r3, 0x18(r3) @@ -455,7 +455,7 @@ lbl_80377170: /* 80377188 003740E8 90 04 00 00 */ stw r0, 0(r4) /* 8037718C 003740EC 48 00 00 80 */ b lbl_8037720C lbl_80377190: -/* 80377190 003740F0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377190 003740F0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377194 003740F4 54 80 40 2E */ slwi r0, r4, 8 /* 80377198 003740F8 38 83 00 18 */ addi r4, r3, 0x18 /* 8037719C 003740FC 80 63 00 18 */ lwz r3, 0x18(r3) @@ -464,7 +464,7 @@ lbl_80377190: /* 803771A8 00374108 90 04 00 00 */ stw r0, 0(r4) /* 803771AC 0037410C 48 00 00 60 */ b lbl_8037720C lbl_803771B0: -/* 803771B0 00374110 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803771B0 00374110 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803771B4 00374114 54 80 50 2A */ slwi r0, r4, 0xa /* 803771B8 00374118 38 83 00 18 */ addi r4, r3, 0x18 /* 803771BC 0037411C 80 63 00 18 */ lwz r3, 0x18(r3) @@ -473,7 +473,7 @@ lbl_803771B0: /* 803771C8 00374128 90 04 00 00 */ stw r0, 0(r4) /* 803771CC 0037412C 48 00 00 40 */ b lbl_8037720C lbl_803771D0: -/* 803771D0 00374130 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803771D0 00374130 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803771D4 00374134 54 80 60 26 */ slwi r0, r4, 0xc /* 803771D8 00374138 38 83 00 18 */ addi r4, r3, 0x18 /* 803771DC 0037413C 80 63 00 18 */ lwz r3, 0x18(r3) @@ -482,7 +482,7 @@ lbl_803771D0: /* 803771E8 00374148 90 04 00 00 */ stw r0, 0(r4) /* 803771EC 0037414C 48 00 00 20 */ b lbl_8037720C lbl_803771F0: -/* 803771F0 00374150 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803771F0 00374150 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803771F4 00374154 54 80 70 22 */ slwi r0, r4, 0xe /* 803771F8 00374158 38 83 00 18 */ addi r4, r3, 0x18 /* 803771FC 0037415C 80 63 00 18 */ lwz r3, 0x18(r3) @@ -490,7 +490,7 @@ lbl_803771F0: /* 80377204 00374164 7C 60 03 78 */ or r0, r3, r0 /* 80377208 00374168 90 04 00 00 */ stw r0, 0(r4) lbl_8037720C: -/* 8037720C 0037416C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037720C 0037416C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377210 00374170 88 03 04 1C */ lbz r0, 0x41c(r3) /* 80377214 00374174 28 00 00 00 */ cmplwi r0, 0 /* 80377218 00374178 40 82 00 10 */ bne lbl_80377228 @@ -511,7 +511,7 @@ lbl_80377248: /* 8037724C 003741AC 54 00 05 64 */ rlwinm r0, r0, 0, 0x15, 0x12 /* 80377250 003741B0 90 03 00 00 */ stw r0, 0(r3) lbl_80377254: -/* 80377254 003741B4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377254 003741B4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377258 003741B8 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037725C 003741BC 60 00 00 08 */ ori r0, r0, 8 /* 80377260 003741C0 90 03 04 F4 */ stw r0, 0x4f4(r3) @@ -532,7 +532,7 @@ lbl_80377274: /* 8037728C 003741EC 7C A9 03 A6 */ mtctr r5 /* 80377290 003741F0 4E 80 04 20 */ bctr lbl_80377294: -/* 80377294 003741F4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377294 003741F4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377298 003741F8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037729C 003741FC 80 A5 00 14 */ lwz r5, 0x14(r5) /* 803772A0 00374200 54 A5 00 3C */ rlwinm r5, r5, 0, 0, 0x1e @@ -540,7 +540,7 @@ lbl_80377294: /* 803772A8 00374208 90 06 00 00 */ stw r0, 0(r6) /* 803772AC 0037420C 48 00 02 C4 */ b lbl_80377570 lbl_803772B0: -/* 803772B0 00374210 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803772B0 00374210 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803772B4 00374214 54 00 08 3C */ slwi r0, r0, 1 /* 803772B8 00374218 38 C5 00 14 */ addi r6, r5, 0x14 /* 803772BC 0037421C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -549,7 +549,7 @@ lbl_803772B0: /* 803772C8 00374228 90 06 00 00 */ stw r0, 0(r6) /* 803772CC 0037422C 48 00 02 A4 */ b lbl_80377570 lbl_803772D0: -/* 803772D0 00374230 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803772D0 00374230 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803772D4 00374234 54 00 10 3A */ slwi r0, r0, 2 /* 803772D8 00374238 38 C5 00 14 */ addi r6, r5, 0x14 /* 803772DC 0037423C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -558,7 +558,7 @@ lbl_803772D0: /* 803772E8 00374248 90 06 00 00 */ stw r0, 0(r6) /* 803772EC 0037424C 48 00 02 84 */ b lbl_80377570 lbl_803772F0: -/* 803772F0 00374250 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803772F0 00374250 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803772F4 00374254 54 00 18 38 */ slwi r0, r0, 3 /* 803772F8 00374258 38 C5 00 14 */ addi r6, r5, 0x14 /* 803772FC 0037425C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -567,7 +567,7 @@ lbl_803772F0: /* 80377308 00374268 90 06 00 00 */ stw r0, 0(r6) /* 8037730C 0037426C 48 00 02 64 */ b lbl_80377570 lbl_80377310: -/* 80377310 00374270 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377310 00374270 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377314 00374274 54 00 20 36 */ slwi r0, r0, 4 /* 80377318 00374278 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037731C 0037427C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -576,7 +576,7 @@ lbl_80377310: /* 80377328 00374288 90 06 00 00 */ stw r0, 0(r6) /* 8037732C 0037428C 48 00 02 44 */ b lbl_80377570 lbl_80377330: -/* 80377330 00374290 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377330 00374290 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377334 00374294 54 00 28 34 */ slwi r0, r0, 5 /* 80377338 00374298 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037733C 0037429C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -585,7 +585,7 @@ lbl_80377330: /* 80377348 003742A8 90 06 00 00 */ stw r0, 0(r6) /* 8037734C 003742AC 48 00 02 24 */ b lbl_80377570 lbl_80377350: -/* 80377350 003742B0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377350 003742B0 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377354 003742B4 54 00 30 32 */ slwi r0, r0, 6 /* 80377358 003742B8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037735C 003742BC 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -594,7 +594,7 @@ lbl_80377350: /* 80377368 003742C8 90 06 00 00 */ stw r0, 0(r6) /* 8037736C 003742CC 48 00 02 04 */ b lbl_80377570 lbl_80377370: -/* 80377370 003742D0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377370 003742D0 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377374 003742D4 54 00 38 30 */ slwi r0, r0, 7 /* 80377378 003742D8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037737C 003742DC 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -603,7 +603,7 @@ lbl_80377370: /* 80377388 003742E8 90 06 00 00 */ stw r0, 0(r6) /* 8037738C 003742EC 48 00 01 E4 */ b lbl_80377570 lbl_80377390: -/* 80377390 003742F0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377390 003742F0 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377394 003742F4 54 00 40 2E */ slwi r0, r0, 8 /* 80377398 003742F8 38 C5 00 14 */ addi r6, r5, 0x14 /* 8037739C 003742FC 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -612,7 +612,7 @@ lbl_80377390: /* 803773A8 00374308 90 06 00 00 */ stw r0, 0(r6) /* 803773AC 0037430C 48 00 01 C4 */ b lbl_80377570 lbl_803773B0: -/* 803773B0 00374310 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803773B0 00374310 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803773B4 00374314 54 00 48 2C */ slwi r0, r0, 9 /* 803773B8 00374318 38 C5 00 14 */ addi r6, r5, 0x14 /* 803773BC 0037431C 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -623,7 +623,7 @@ lbl_803773B0: lbl_803773D0: /* 803773D0 00374330 2C 00 00 00 */ cmpwi r0, 0 /* 803773D4 00374334 41 82 00 20 */ beq lbl_803773F4 -/* 803773D8 00374338 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 803773D8 00374338 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 803773DC 0037433C 38 E0 00 01 */ li r7, 1 /* 803773E0 00374340 38 A0 00 00 */ li r5, 0 /* 803773E4 00374344 98 E6 04 1C */ stb r7, 0x41c(r6) @@ -631,14 +631,14 @@ lbl_803773D0: /* 803773EC 0037434C 90 06 04 18 */ stw r0, 0x418(r6) /* 803773F0 00374350 48 00 01 80 */ b lbl_80377570 lbl_803773F4: -/* 803773F4 00374354 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803773F4 00374354 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803773F8 00374358 38 00 00 00 */ li r0, 0 /* 803773FC 0037435C 98 05 04 1C */ stb r0, 0x41c(r5) /* 80377400 00374360 48 00 01 70 */ b lbl_80377570 lbl_80377404: /* 80377404 00374364 2C 00 00 00 */ cmpwi r0, 0 /* 80377408 00374368 41 82 00 20 */ beq lbl_80377428 -/* 8037740C 0037436C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037740C 0037436C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80377410 00374370 38 E0 00 01 */ li r7, 1 /* 80377414 00374374 38 A0 00 00 */ li r5, 0 /* 80377418 00374378 98 E6 04 1D */ stb r7, 0x41d(r6) @@ -646,12 +646,12 @@ lbl_80377404: /* 80377420 00374380 90 06 04 18 */ stw r0, 0x418(r6) /* 80377424 00374384 48 00 01 4C */ b lbl_80377570 lbl_80377428: -/* 80377428 00374388 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377428 00374388 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037742C 0037438C 38 00 00 00 */ li r0, 0 /* 80377430 00374390 98 05 04 1D */ stb r0, 0x41d(r5) /* 80377434 00374394 48 00 01 3C */ b lbl_80377570 lbl_80377438: -/* 80377438 00374398 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377438 00374398 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037743C 0037439C 54 00 68 24 */ slwi r0, r0, 0xd /* 80377440 003743A0 38 C5 00 14 */ addi r6, r5, 0x14 /* 80377444 003743A4 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -660,7 +660,7 @@ lbl_80377438: /* 80377450 003743B0 90 06 00 00 */ stw r0, 0(r6) /* 80377454 003743B4 48 00 01 1C */ b lbl_80377570 lbl_80377458: -/* 80377458 003743B8 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377458 003743B8 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037745C 003743BC 54 00 78 20 */ slwi r0, r0, 0xf /* 80377460 003743C0 38 C5 00 14 */ addi r6, r5, 0x14 /* 80377464 003743C4 80 A5 00 14 */ lwz r5, 0x14(r5) @@ -669,7 +669,7 @@ lbl_80377458: /* 80377470 003743D0 90 06 00 00 */ stw r0, 0(r6) /* 80377474 003743D4 48 00 00 FC */ b lbl_80377570 lbl_80377478: -/* 80377478 003743D8 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377478 003743D8 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037747C 003743DC 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377480 003743E0 80 A5 00 18 */ lwz r5, 0x18(r5) /* 80377484 003743E4 54 A5 00 3A */ rlwinm r5, r5, 0, 0, 0x1d @@ -677,7 +677,7 @@ lbl_80377478: /* 8037748C 003743EC 90 06 00 00 */ stw r0, 0(r6) /* 80377490 003743F0 48 00 00 E0 */ b lbl_80377570 lbl_80377494: -/* 80377494 003743F4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377494 003743F4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377498 003743F8 54 00 10 3A */ slwi r0, r0, 2 /* 8037749C 003743FC 38 C5 00 18 */ addi r6, r5, 0x18 /* 803774A0 00374400 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -686,7 +686,7 @@ lbl_80377494: /* 803774AC 0037440C 90 06 00 00 */ stw r0, 0(r6) /* 803774B0 00374410 48 00 00 C0 */ b lbl_80377570 lbl_803774B4: -/* 803774B4 00374414 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803774B4 00374414 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803774B8 00374418 54 00 20 36 */ slwi r0, r0, 4 /* 803774BC 0037441C 38 C5 00 18 */ addi r6, r5, 0x18 /* 803774C0 00374420 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -695,7 +695,7 @@ lbl_803774B4: /* 803774CC 0037442C 90 06 00 00 */ stw r0, 0(r6) /* 803774D0 00374430 48 00 00 A0 */ b lbl_80377570 lbl_803774D4: -/* 803774D4 00374434 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803774D4 00374434 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803774D8 00374438 54 00 30 32 */ slwi r0, r0, 6 /* 803774DC 0037443C 38 C5 00 18 */ addi r6, r5, 0x18 /* 803774E0 00374440 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -704,7 +704,7 @@ lbl_803774D4: /* 803774EC 0037444C 90 06 00 00 */ stw r0, 0(r6) /* 803774F0 00374450 48 00 00 80 */ b lbl_80377570 lbl_803774F4: -/* 803774F4 00374454 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803774F4 00374454 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803774F8 00374458 54 00 40 2E */ slwi r0, r0, 8 /* 803774FC 0037445C 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377500 00374460 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -713,7 +713,7 @@ lbl_803774F4: /* 8037750C 0037446C 90 06 00 00 */ stw r0, 0(r6) /* 80377510 00374470 48 00 00 60 */ b lbl_80377570 lbl_80377514: -/* 80377514 00374474 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377514 00374474 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377518 00374478 54 00 50 2A */ slwi r0, r0, 0xa /* 8037751C 0037447C 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377520 00374480 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -722,7 +722,7 @@ lbl_80377514: /* 8037752C 0037448C 90 06 00 00 */ stw r0, 0(r6) /* 80377530 00374490 48 00 00 40 */ b lbl_80377570 lbl_80377534: -/* 80377534 00374494 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377534 00374494 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377538 00374498 54 00 60 26 */ slwi r0, r0, 0xc /* 8037753C 0037449C 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377540 003744A0 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -731,7 +731,7 @@ lbl_80377534: /* 8037754C 003744AC 90 06 00 00 */ stw r0, 0(r6) /* 80377550 003744B0 48 00 00 20 */ b lbl_80377570 lbl_80377554: -/* 80377554 003744B4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377554 003744B4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377558 003744B8 54 00 70 22 */ slwi r0, r0, 0xe /* 8037755C 003744BC 38 C5 00 18 */ addi r6, r5, 0x18 /* 80377560 003744C0 80 A5 00 18 */ lwz r5, 0x18(r5) @@ -744,7 +744,7 @@ lbl_80377574: /* 80377574 003744D4 80 03 00 00 */ lwz r0, 0(r3) /* 80377578 003744D8 2C 00 00 FF */ cmpwi r0, 0xff /* 8037757C 003744DC 40 82 FC F8 */ bne lbl_80377274 -/* 80377580 003744E0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377580 003744E0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377584 003744E4 88 03 04 1C */ lbz r0, 0x41c(r3) /* 80377588 003744E8 28 00 00 00 */ cmplwi r0, 0 /* 8037758C 003744EC 40 82 00 10 */ bne lbl_8037759C @@ -765,7 +765,7 @@ lbl_803775BC: /* 803775C0 00374520 54 00 05 64 */ rlwinm r0, r0, 0, 0x15, 0x12 /* 803775C4 00374524 90 03 00 00 */ stw r0, 0(r3) lbl_803775C8: -/* 803775C8 00374528 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803775C8 00374528 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803775CC 0037452C 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 803775D0 00374530 60 00 00 08 */ ori r0, r0, 8 /* 803775D4 00374534 90 03 04 F4 */ stw r0, 0x4f4(r3) @@ -781,7 +781,7 @@ __GXSetVCD: /* 803775F0 00374550 94 21 FF F8 */ stwu r1, -8(r1) /* 803775F4 00374554 38 00 00 60 */ li r0, 0x60 /* 803775F8 00374558 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) -/* 803775FC 0037455C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 803775FC 0037455C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80377600 00374560 98 65 80 00 */ stb r3, 0xCC008000@l(r5) /* 80377604 00374564 80 64 00 14 */ lwz r3, 0x14(r4) /* 80377608 00374568 90 65 80 00 */ stw r3, 0xCC008000@l(r5) @@ -797,7 +797,7 @@ __GXSetVCD: .global __GXCalculateVLim __GXCalculateVLim: -/* 80377630 00374590 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377630 00374590 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377634 00374594 A0 03 00 04 */ lhz r0, 4(r3) /* 80377638 00374598 28 00 00 00 */ cmplwi r0, 0 /* 8037763C 0037459C 4D 82 00 20 */ beqlr @@ -875,7 +875,7 @@ lbl_803776B8: .global GXClearVtxDesc GXClearVtxDesc: -/* 80377754 003746B4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377754 003746B4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377758 003746B8 38 80 00 00 */ li r4, 0 /* 8037775C 003746BC 90 83 00 14 */ stw r4, 0x14(r3) /* 80377760 003746C0 80 03 00 14 */ lwz r0, 0x14(r3) @@ -893,7 +893,7 @@ GXClearVtxDesc: .global GXSetVtxAttrFmt GXSetVtxAttrFmt: /* 8037778C 003746EC 38 04 FF F7 */ addi r0, r4, -9 -/* 80377790 003746F0 81 02 CE 08 */ lwz r8, lbl_805AEB28@sda21(r2) +/* 80377790 003746F0 81 02 CE 08 */ lwz r8, __GXData@sda21(r2) /* 80377794 003746F4 54 64 10 3A */ slwi r4, r3, 2 /* 80377798 003746F8 7D 28 22 14 */ add r9, r8, r4 /* 8037779C 003746FC 28 00 00 10 */ cmplwi r0, 0x10 @@ -1108,7 +1108,7 @@ lbl_80377A7C: /* 80377AAC 00374A0C 50 E0 D8 08 */ rlwimi r0, r7, 0x1b, 0, 4 /* 80377AB0 00374A10 90 09 00 00 */ stw r0, 0(r9) lbl_80377AB4: -/* 80377AB4 00374A14 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377AB4 00374A14 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377AB8 00374A18 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80377ABC 00374A1C 38 60 00 01 */ li r3, 1 /* 80377AC0 00374A20 80 85 04 F4 */ lwz r4, 0x4f4(r5) @@ -1123,7 +1123,7 @@ lbl_80377AB4: .global GXSetVtxAttrFmtv GXSetVtxAttrFmtv: -/* 80377AE4 00374A44 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80377AE4 00374A44 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80377AE8 00374A48 54 60 10 3A */ slwi r0, r3, 2 /* 80377AEC 00374A4C 3C A0 80 3F */ lis r5, lbl_803F082C@ha /* 80377AF0 00374A50 7C C6 02 14 */ add r6, r6, r0 @@ -1349,7 +1349,7 @@ lbl_80377E20: /* 80377E20 00374D80 80 04 00 00 */ lwz r0, 0(r4) /* 80377E24 00374D84 2C 00 00 FF */ cmpwi r0, 0xff /* 80377E28 00374D88 40 82 FC E0 */ bne lbl_80377B08 -/* 80377E2C 00374D8C 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80377E2C 00374D8C 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80377E30 00374D90 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80377E34 00374D94 38 60 00 01 */ li r3, 1 /* 80377E38 00374D98 80 85 04 F4 */ lwz r4, 0x4f4(r5) @@ -1364,7 +1364,7 @@ lbl_80377E20: .global __GXSetVAT __GXSetVAT: -/* 80377E5C 00374DBC 81 42 CE 08 */ lwz r10, lbl_805AEB28@sda21(r2) +/* 80377E5C 00374DBC 81 42 CE 08 */ lwz r10, __GXData@sda21(r2) /* 80377E60 00374DC0 39 80 00 00 */ li r12, 0 /* 80377E64 00374DC4 39 60 00 00 */ li r11, 0 /* 80377E68 00374DC8 3C E0 CC 01 */ lis r7, 0xcc01 @@ -1402,7 +1402,7 @@ lbl_80377EDC: /* 80377EDC 00374E3C 55 80 06 3E */ clrlwi r0, r12, 0x18 /* 80377EE0 00374E40 28 00 00 08 */ cmplwi r0, 8 /* 80377EE4 00374E44 41 80 FF 8C */ blt lbl_80377E70 -/* 80377EE8 00374E48 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377EE8 00374E48 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377EEC 00374E4C 38 00 00 00 */ li r0, 0 /* 80377EF0 00374E50 98 03 04 F2 */ stb r0, 0x4f2(r3) /* 80377EF4 00374E54 4E 80 00 20 */ blr @@ -1425,7 +1425,7 @@ lbl_80377F04: /* 80377F28 00374E88 41 80 00 1C */ blt lbl_80377F44 /* 80377F2C 00374E8C 2C 00 00 04 */ cmpwi r0, 4 /* 80377F30 00374E90 40 80 00 14 */ bge lbl_80377F44 -/* 80377F34 00374E94 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377F34 00374E94 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377F38 00374E98 54 00 10 3A */ slwi r0, r0, 2 /* 80377F3C 00374E9C 7C 63 02 14 */ add r3, r3, r0 /* 80377F40 00374EA0 90 83 00 88 */ stw r4, 0x88(r3) @@ -1441,7 +1441,7 @@ lbl_80377F44: /* 80377F64 00374EC4 4D 80 00 20 */ bltlr /* 80377F68 00374EC8 2C 00 00 04 */ cmpwi r0, 4 /* 80377F6C 00374ECC 4C 80 00 20 */ bgelr -/* 80377F70 00374ED0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80377F70 00374ED0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80377F74 00374ED4 54 00 10 3A */ slwi r0, r0, 2 /* 80377F78 00374ED8 7C 63 02 14 */ add r3, r3, r0 /* 80377F7C 00374EDC 90 83 00 98 */ stw r4, 0x98(r3) @@ -1593,7 +1593,7 @@ lbl_80378100: /* 80378150 003750B0 7C 09 03 A6 */ mtctr r0 /* 80378154 003750B4 4E 80 04 20 */ bctr lbl_80378158: -/* 80378158 003750B8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378158 003750B8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037815C 003750BC 54 C0 30 32 */ slwi r0, r6, 6 /* 80378160 003750C0 38 A4 00 80 */ addi r5, r4, 0x80 /* 80378164 003750C4 80 84 00 80 */ lwz r4, 0x80(r4) @@ -1602,7 +1602,7 @@ lbl_80378158: /* 80378170 003750D0 90 05 00 00 */ stw r0, 0(r5) /* 80378174 003750D4 48 00 00 D8 */ b lbl_8037824C lbl_80378178: -/* 80378178 003750D8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378178 003750D8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037817C 003750DC 54 C0 60 26 */ slwi r0, r6, 0xc /* 80378180 003750E0 38 A4 00 80 */ addi r5, r4, 0x80 /* 80378184 003750E4 80 84 00 80 */ lwz r4, 0x80(r4) @@ -1611,7 +1611,7 @@ lbl_80378178: /* 80378190 003750F0 90 05 00 00 */ stw r0, 0(r5) /* 80378194 003750F4 48 00 00 B8 */ b lbl_8037824C lbl_80378198: -/* 80378198 003750F8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378198 003750F8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037819C 003750FC 54 C0 90 1A */ slwi r0, r6, 0x12 /* 803781A0 00375100 38 A4 00 80 */ addi r5, r4, 0x80 /* 803781A4 00375104 80 84 00 80 */ lwz r4, 0x80(r4) @@ -1620,7 +1620,7 @@ lbl_80378198: /* 803781B0 00375110 90 05 00 00 */ stw r0, 0(r5) /* 803781B4 00375114 48 00 00 98 */ b lbl_8037824C lbl_803781B8: -/* 803781B8 00375118 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 803781B8 00375118 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 803781BC 0037511C 54 C0 C0 0E */ slwi r0, r6, 0x18 /* 803781C0 00375120 38 A4 00 80 */ addi r5, r4, 0x80 /* 803781C4 00375124 80 84 00 80 */ lwz r4, 0x80(r4) @@ -1629,14 +1629,14 @@ lbl_803781B8: /* 803781D0 00375130 90 05 00 00 */ stw r0, 0(r5) /* 803781D4 00375134 48 00 00 78 */ b lbl_8037824C lbl_803781D8: -/* 803781D8 00375138 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 803781D8 00375138 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 803781DC 0037513C 84 04 00 84 */ lwzu r0, 0x84(r4) /* 803781E0 00375140 54 00 00 32 */ rlwinm r0, r0, 0, 0, 0x19 /* 803781E4 00375144 7C 00 33 78 */ or r0, r0, r6 /* 803781E8 00375148 90 04 00 00 */ stw r0, 0(r4) /* 803781EC 0037514C 48 00 00 60 */ b lbl_8037824C lbl_803781F0: -/* 803781F0 00375150 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 803781F0 00375150 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 803781F4 00375154 54 C0 30 32 */ slwi r0, r6, 6 /* 803781F8 00375158 38 A4 00 84 */ addi r5, r4, 0x84 /* 803781FC 0037515C 80 84 00 84 */ lwz r4, 0x84(r4) @@ -1645,7 +1645,7 @@ lbl_803781F0: /* 80378208 00375168 90 05 00 00 */ stw r0, 0(r5) /* 8037820C 0037516C 48 00 00 40 */ b lbl_8037824C lbl_80378210: -/* 80378210 00375170 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378210 00375170 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378214 00375174 54 C0 60 26 */ slwi r0, r6, 0xc /* 80378218 00375178 38 A4 00 84 */ addi r5, r4, 0x84 /* 8037821C 0037517C 80 84 00 84 */ lwz r4, 0x84(r4) @@ -1654,7 +1654,7 @@ lbl_80378210: /* 80378228 00375188 90 05 00 00 */ stw r0, 0(r5) /* 8037822C 0037518C 48 00 00 20 */ b lbl_8037824C lbl_80378230: -/* 80378230 00375190 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378230 00375190 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378234 00375194 54 C0 90 1A */ slwi r0, r6, 0x12 /* 80378238 00375198 38 A4 00 84 */ addi r5, r4, 0x84 /* 8037823C 0037519C 80 84 00 84 */ lwz r4, 0x84(r4) @@ -1671,7 +1671,7 @@ lbl_8037824C: .global GXSetNumTexGens GXSetNumTexGens: -/* 80378264 003751C4 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80378264 003751C4 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80378268 003751C8 54 68 06 3E */ clrlwi r8, r3, 0x18 /* 8037826C 003751CC 38 80 00 10 */ li r4, 0x10 /* 80378270 003751D0 80 A6 02 04 */ lwz r5, 0x204(r6) diff --git a/asm/Dolphin/gx/GXBump.s b/asm/Dolphin/gx/GXBump.s index 2bf67286..8619b3bb 100644 --- a/asm/Dolphin/gx/GXBump.s +++ b/asm/Dolphin/gx/GXBump.s @@ -21,7 +21,7 @@ GXSetTevIndirect: /* 8037AE40 00377DA0 54 05 07 30 */ rlwinm r5, r0, 0, 0x1c, 0x18 /* 8037AE44 00377DA4 89 81 00 33 */ lbz r12, 0x33(r1) /* 8037AE48 00377DA8 54 C0 20 36 */ slwi r0, r6, 4 -/* 8037AE4C 00377DAC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037AE4C 00377DAC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037AE50 00377DB0 7C A0 03 78 */ or r0, r5, r0 /* 8037AE54 00377DB4 54 05 06 6C */ rlwinm r5, r0, 0, 0x19, 0x16 /* 8037AE58 00377DB8 55 60 38 30 */ slwi r0, r11, 7 @@ -102,7 +102,7 @@ lbl_8037AF18: /* 8037AF60 00377EC0 38 A3 00 08 */ addi r5, r3, 8 /* 8037AF64 00377EC4 81 01 00 74 */ lwz r8, 0x74(r1) /* 8037AF68 00377EC8 80 E1 00 6C */ lwz r7, 0x6c(r1) -/* 8037AF6C 00377ECC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AF6C 00377ECC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AF70 00377ED0 54 E7 5A A8 */ rlwinm r7, r7, 0xb, 0xa, 0x14 /* 8037AF74 00377ED4 51 07 05 7E */ rlwimi r7, r8, 0, 0x15, 0x1f /* 8037AF78 00377ED8 54 E7 02 8E */ rlwinm r7, r7, 0, 0xa, 7 @@ -164,7 +164,7 @@ lbl_8037B044: /* 8037B048 00377FA8 40 80 01 4C */ bge lbl_8037B194 /* 8037B04C 00377FAC 48 00 00 F8 */ b lbl_8037B144 lbl_8037B050: -/* 8037B050 00377FB0 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B050 00377FB0 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B054 00377FB4 54 A5 20 36 */ slwi r5, r5, 4 /* 8037B058 00377FB8 38 00 00 61 */ li r0, 0x61 /* 8037B05C 00377FBC 80 C7 01 28 */ lwz r6, 0x128(r7) @@ -185,7 +185,7 @@ lbl_8037B050: /* 8037B098 00377FF8 90 03 80 00 */ stw r0, 0xCC008000@l(r3) /* 8037B09C 00377FFC 48 00 00 F8 */ b lbl_8037B194 lbl_8037B0A0: -/* 8037B0A0 00378000 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B0A0 00378000 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B0A4 00378004 54 86 40 2E */ slwi r6, r4, 8 /* 8037B0A8 00378008 54 A4 60 26 */ slwi r4, r5, 0xc /* 8037B0AC 0037800C 80 A7 01 28 */ lwz r5, 0x128(r7) @@ -207,7 +207,7 @@ lbl_8037B0A0: /* 8037B0EC 0037804C 90 03 80 00 */ stw r0, 0xCC008000@l(r3) /* 8037B0F0 00378050 48 00 00 A4 */ b lbl_8037B194 lbl_8037B0F4: -/* 8037B0F4 00378054 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B0F4 00378054 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B0F8 00378058 54 A5 20 36 */ slwi r5, r5, 4 /* 8037B0FC 0037805C 38 00 00 61 */ li r0, 0x61 /* 8037B100 00378060 80 C7 01 2C */ lwz r6, 0x12c(r7) @@ -228,7 +228,7 @@ lbl_8037B0F4: /* 8037B13C 0037809C 90 03 80 00 */ stw r0, 0xCC008000@l(r3) /* 8037B140 003780A0 48 00 00 54 */ b lbl_8037B194 lbl_8037B144: -/* 8037B144 003780A4 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B144 003780A4 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B148 003780A8 54 86 40 2E */ slwi r6, r4, 8 /* 8037B14C 003780AC 54 A4 60 26 */ slwi r4, r5, 0xc /* 8037B150 003780B0 80 A7 01 2C */ lwz r5, 0x12c(r7) @@ -249,7 +249,7 @@ lbl_8037B144: /* 8037B18C 003780EC 80 07 01 2C */ lwz r0, 0x12c(r7) /* 8037B190 003780F0 90 03 80 00 */ stw r0, 0xCC008000@l(r3) lbl_8037B194: -/* 8037B194 003780F4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B194 003780F4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B198 003780F8 38 00 00 00 */ li r0, 0 /* 8037B19C 003780FC B0 03 00 02 */ sth r0, 2(r3) /* 8037B1A0 00378100 4E 80 00 20 */ blr @@ -268,7 +268,7 @@ lbl_8037B1C0: /* 8037B1C4 00378124 40 80 00 C4 */ bge lbl_8037B288 /* 8037B1C8 00378128 48 00 00 94 */ b lbl_8037B25C lbl_8037B1CC: -/* 8037B1CC 0037812C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B1CC 0037812C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B1D0 00378130 54 80 18 38 */ slwi r0, r4, 3 /* 8037B1D4 00378134 38 83 01 20 */ addi r4, r3, 0x120 /* 8037B1D8 00378138 80 63 01 20 */ lwz r3, 0x120(r3) @@ -281,7 +281,7 @@ lbl_8037B1CC: /* 8037B1F4 00378154 90 04 00 00 */ stw r0, 0(r4) /* 8037B1F8 00378158 48 00 00 90 */ b lbl_8037B288 lbl_8037B1FC: -/* 8037B1FC 0037815C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037B1FC 0037815C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037B200 00378160 54 80 48 2C */ slwi r0, r4, 9 /* 8037B204 00378164 54 A3 30 32 */ slwi r3, r5, 6 /* 8037B208 00378168 80 86 01 20 */ lwz r4, 0x120(r6) @@ -294,7 +294,7 @@ lbl_8037B1FC: /* 8037B224 00378184 90 06 01 20 */ stw r0, 0x120(r6) /* 8037B228 00378188 48 00 00 60 */ b lbl_8037B288 lbl_8037B22C: -/* 8037B22C 0037818C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037B22C 0037818C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037B230 00378190 54 80 78 20 */ slwi r0, r4, 0xf /* 8037B234 00378194 54 A3 60 26 */ slwi r3, r5, 0xc /* 8037B238 00378198 80 86 01 20 */ lwz r4, 0x120(r6) @@ -307,7 +307,7 @@ lbl_8037B22C: /* 8037B254 003781B4 90 06 01 20 */ stw r0, 0x120(r6) /* 8037B258 003781B8 48 00 00 30 */ b lbl_8037B288 lbl_8037B25C: -/* 8037B25C 003781BC 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037B25C 003781BC 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037B260 003781C0 54 80 A8 14 */ slwi r0, r4, 0x15 /* 8037B264 003781C4 54 A3 90 1A */ slwi r3, r5, 0x12 /* 8037B268 003781C8 80 86 01 20 */ lwz r4, 0x120(r6) @@ -320,7 +320,7 @@ lbl_8037B25C: /* 8037B284 003781E4 90 06 01 20 */ stw r0, 0x120(r6) lbl_8037B288: /* 8037B288 003781E8 38 00 00 61 */ li r0, 0x61 -/* 8037B28C 003781EC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B28C 003781EC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B290 003781F0 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B294 003781F4 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B298 003781F8 38 00 00 00 */ li r0, 0 @@ -334,7 +334,7 @@ lbl_8037B288: .global GXSetNumIndStages GXSetNumIndStages: -/* 8037B2B8 00378218 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B2B8 00378218 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B2BC 0037821C 54 60 82 1E */ rlwinm r0, r3, 0x10, 8, 0xf /* 8037B2C0 00378220 80 64 02 04 */ lwz r3, 0x204(r4) /* 8037B2C4 00378224 54 63 04 18 */ rlwinm r3, r3, 0, 0x10, 0xc @@ -368,7 +368,7 @@ GXSetTevDirect: .global __GXUpdateBPMask __GXUpdateBPMask: -/* 8037B328 00378288 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B328 00378288 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B32C 0037828C 38 C0 00 00 */ li r6, 0 /* 8037B330 00378290 38 80 00 00 */ li r4, 0 /* 8037B334 00378294 80 03 02 04 */ lwz r0, 0x204(r3) @@ -422,7 +422,7 @@ lbl_8037B3B0: /* 8037B3D4 00378334 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B3D8 00378338 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B3DC 0037833C 38 00 00 00 */ li r0, 0 -/* 8037B3E0 00378340 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B3E0 00378340 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B3E4 00378344 80 64 01 24 */ lwz r3, 0x124(r4) /* 8037B3E8 00378348 90 65 80 00 */ stw r3, 0xCC008000@l(r5) /* 8037B3EC 0037834C B0 04 00 02 */ sth r0, 2(r4) @@ -431,7 +431,7 @@ lbl_8037B3B0: .global __GXFlushTextureState __GXFlushTextureState: /* 8037B3F4 00378354 38 00 00 61 */ li r0, 0x61 -/* 8037B3F8 00378358 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B3F8 00378358 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B3FC 0037835C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B400 00378360 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B404 00378364 38 00 00 00 */ li r0, 0 diff --git a/asm/Dolphin/gx/GXDisplayList.s b/asm/Dolphin/gx/GXDisplayList.s index d2cf9087..d5a944dc 100644 --- a/asm/Dolphin/gx/GXDisplayList.s +++ b/asm/Dolphin/gx/GXDisplayList.s @@ -11,13 +11,13 @@ GXCallDisplayList: /* 8037C1E4 00379144 3B E4 00 00 */ addi r31, r4, 0 /* 8037C1E8 00379148 93 C1 00 10 */ stw r30, 0x10(r1) /* 8037C1EC 0037914C 3B C3 00 00 */ addi r30, r3, 0 -/* 8037C1F0 00379150 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C1F0 00379150 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C1F4 00379154 80 05 04 F4 */ lwz r0, 0x4f4(r5) /* 8037C1F8 00379158 28 00 00 00 */ cmplwi r0, 0 /* 8037C1FC 0037915C 41 82 00 08 */ beq lbl_8037C204 /* 8037C200 00379160 4B FF C6 55 */ bl __GXSetDirtyState lbl_8037C204: -/* 8037C204 00379164 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C204 00379164 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C208 00379168 80 03 00 00 */ lwz r0, 0(r3) /* 8037C20C 0037916C 28 00 00 00 */ cmplwi r0, 0 /* 8037C210 00379170 40 82 00 08 */ bne lbl_8037C218 diff --git a/asm/Dolphin/gx/GXFifo.s b/asm/Dolphin/gx/GXFifo.s index 287dc8fc..d9fca0b7 100644 --- a/asm/Dolphin/gx/GXFifo.s +++ b/asm/Dolphin/gx/GXFifo.s @@ -29,7 +29,7 @@ GXCPInterruptHandler: /* 80376288 003731E8 93 E1 02 DC */ stw r31, 0x2dc(r1) /* 8037628C 003731EC 7C 9F 23 78 */ mr r31, r4 /* 80376290 003731F0 80 AD AC 7C */ lwz r5, lbl_805A983C@sda21(r13) -/* 80376294 003731F4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376294 003731F4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376298 003731F8 A0 05 00 00 */ lhz r0, 0(r5) /* 8037629C 003731FC 90 03 00 0C */ stw r0, 0xc(r3) /* 803762A0 00373200 80 03 00 08 */ lwz r0, 8(r3) @@ -49,7 +49,7 @@ GXCPInterruptHandler: /* 803762D8 00373238 38 80 00 00 */ li r4, 0 /* 803762DC 0037323C 48 00 06 D1 */ bl __GXWriteFifoIntEnable lbl_803762E0: -/* 803762E0 00373240 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803762E0 00373240 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803762E4 00373244 80 03 00 08 */ lwz r0, 8(r3) /* 803762E8 00373248 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f /* 803762EC 0037324C 41 82 00 44 */ beq lbl_80376330 @@ -70,7 +70,7 @@ lbl_803762E0: /* 80376328 00373288 90 0D AC 98 */ stw r0, lbl_805A9858@sda21(r13) /* 8037632C 0037328C 48 00 EC 71 */ bl OSSuspendThread lbl_80376330: -/* 80376330 00373290 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376330 00373290 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376334 00373294 80 83 00 08 */ lwz r4, 8(r3) /* 80376338 00373298 38 A3 00 08 */ addi r5, r3, 8 /* 8037633C 0037329C 54 80 DF FF */ rlwinm. r0, r4, 0x1b, 0x1f, 0x1f @@ -425,7 +425,7 @@ GXEnableBreakPt: /* 80376828 00373788 B3 C3 00 3C */ sth r30, 0x3c(r3) /* 8037682C 0037378C 80 6D AC 7C */ lwz r3, lbl_805A983C@sda21(r13) /* 80376830 00373790 B0 03 00 3E */ sth r0, 0x3e(r3) -/* 80376834 00373794 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376834 00373794 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376838 00373798 80 03 00 08 */ lwz r0, 8(r3) /* 8037683C 0037379C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 80376840 003737A0 60 00 00 02 */ ori r0, r0, 2 @@ -454,7 +454,7 @@ GXDisableBreakPt: /* 80376890 003737F0 90 01 00 04 */ stw r0, 4(r1) /* 80376894 003737F4 94 21 FF F8 */ stwu r1, -8(r1) /* 80376898 003737F8 48 00 AD C9 */ bl OSDisableInterrupts -/* 8037689C 003737FC 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037689C 003737FC 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803768A0 00373800 38 00 00 00 */ li r0, 0 /* 803768A4 00373804 80 85 00 08 */ lwz r4, 8(r5) /* 803768A8 00373808 54 84 07 FA */ rlwinm r4, r4, 0, 0x1f, 0x1d @@ -496,7 +496,7 @@ __GXFifoInit: .global __GXFifoReadEnable __GXFifoReadEnable: -/* 8037692C 0037388C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037692C 0037388C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376930 00373890 80 03 00 08 */ lwz r0, 8(r3) /* 80376934 00373894 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80376938 00373898 60 00 00 01 */ ori r0, r0, 1 @@ -508,7 +508,7 @@ __GXFifoReadEnable: .global __GXFifoReadDisable __GXFifoReadDisable: -/* 80376950 003738B0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80376950 003738B0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80376954 003738B4 80 03 00 08 */ lwz r0, 8(r3) /* 80376958 003738B8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 8037695C 003738BC 90 03 00 08 */ stw r0, 8(r3) @@ -526,7 +526,7 @@ __GXFifoLink: lbl_80376980: /* 80376980 003738E0 38 00 00 00 */ li r0, 0 lbl_80376984: -/* 80376984 003738E4 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80376984 003738E4 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80376988 003738E8 54 00 20 36 */ slwi r0, r0, 4 /* 8037698C 003738EC 80 64 00 08 */ lwz r3, 8(r4) /* 80376990 003738F0 54 63 07 34 */ rlwinm r3, r3, 0, 0x1c, 0x1a @@ -539,7 +539,7 @@ lbl_80376984: .global __GXWriteFifoIntEnable __GXWriteFifoIntEnable: -/* 803769AC 0037390C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 803769AC 0037390C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 803769B0 00373910 54 63 15 BA */ rlwinm r3, r3, 2, 0x16, 0x1d /* 803769B4 00373914 54 80 1D 78 */ rlwinm r0, r4, 3, 0x15, 0x1c /* 803769B8 00373918 80 A6 00 08 */ lwz r5, 8(r6) @@ -557,7 +557,7 @@ __GXWriteFifoIntEnable: .global __GXWriteFifoIntReset __GXWriteFifoIntReset: -/* 803769E8 00373948 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 803769E8 00373948 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 803769EC 0037394C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 803769F0 00373950 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e /* 803769F4 00373954 80 A6 00 10 */ lwz r5, 0x10(r6) @@ -676,7 +676,7 @@ lbl_80376B58: /* 80376B70 00373AD0 88 0D AC 94 */ lbz r0, lbl_805A9854@sda21(r13) /* 80376B74 00373AD4 28 00 00 00 */ cmplwi r0, 0 /* 80376B78 00373AD8 41 82 00 44 */ beq lbl_80376BBC -/* 80376B7C 00373ADC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80376B7C 00373ADC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80376B80 00373AE0 80 04 00 08 */ lwz r0, 8(r4) /* 80376B84 00373AE4 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a /* 80376B88 00373AE8 90 04 00 08 */ stw r0, 8(r4) @@ -791,7 +791,7 @@ lbl_80376CC8: /* 80376D20 00373C80 88 0D AC 94 */ lbz r0, lbl_805A9854@sda21(r13) /* 80376D24 00373C84 28 00 00 00 */ cmplwi r0, 0 /* 80376D28 00373C88 41 82 00 78 */ beq lbl_80376DA0 -/* 80376D2C 00373C8C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80376D2C 00373C8C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80376D30 00373C90 80 04 00 10 */ lwz r0, 0x10(r4) /* 80376D34 00373C94 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80376D38 00373C98 60 00 00 01 */ ori r0, r0, 1 diff --git a/asm/Dolphin/gx/GXFrameBuf.s b/asm/Dolphin/gx/GXFrameBuf.s index fb6bd837..1d5a36bd 100644 --- a/asm/Dolphin/gx/GXFrameBuf.s +++ b/asm/Dolphin/gx/GXFrameBuf.s @@ -170,7 +170,7 @@ lbl_80378CF0: .global GXSetDispCopySrc GXSetDispCopySrc: -/* 80378D24 00375C84 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 80378D24 00375C84 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 80378D28 00375C88 39 40 00 00 */ li r10, 0 /* 80378D2C 00375C8C 54 A7 04 3E */ clrlwi r7, r5, 0x10 /* 80378D30 00375C90 91 49 01 E0 */ stw r10, 0x1e0(r9) @@ -209,7 +209,7 @@ GXSetDispCopySrc: .global GXSetTexCopySrc GXSetTexCopySrc: -/* 80378DB4 00375D14 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 80378DB4 00375D14 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 80378DB8 00375D18 39 40 00 00 */ li r10, 0 /* 80378DBC 00375D1C 54 A7 04 3E */ clrlwi r7, r5, 0x10 /* 80378DC0 00375D20 91 49 01 F0 */ stw r10, 0x1f0(r9) @@ -248,7 +248,7 @@ GXSetTexCopySrc: .global GXSetDispCopyDst GXSetDispCopyDst: -/* 80378E44 00375DA4 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378E44 00375DA4 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378E48 00375DA8 38 00 00 00 */ li r0, 0 /* 80378E4C 00375DAC 90 04 01 E8 */ stw r0, 0x1e8(r4) /* 80378E50 00375DB0 38 A4 01 E8 */ addi r5, r4, 0x1e8 @@ -276,7 +276,7 @@ GXSetTexCopyDst: /* 80378E9C 00375DFC 54 BF 07 3E */ clrlwi r31, r5, 0x1c /* 80378EA0 00375E00 93 C1 00 28 */ stw r30, 0x28(r1) /* 80378EA4 00375E04 3B C6 00 00 */ addi r30, r6, 0 -/* 80378EA8 00375E08 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 80378EA8 00375E08 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 80378EAC 00375E0C 98 07 02 00 */ stb r0, 0x200(r7) /* 80378EB0 00375E10 38 E4 00 00 */ addi r7, r4, 0 /* 80378EB4 00375E14 40 82 00 08 */ bne lbl_80378EBC @@ -291,7 +291,7 @@ lbl_80378EBC: /* 80378ED4 00375E34 40 80 00 08 */ bge lbl_80378EDC /* 80378ED8 00375E38 48 00 00 20 */ b lbl_80378EF8 lbl_80378EDC: -/* 80378EDC 00375E3C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378EDC 00375E3C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378EE0 00375E40 84 03 01 FC */ lwzu r0, 0x1fc(r3) /* 80378EE4 00375E44 54 00 04 5C */ rlwinm r0, r0, 0, 0x11, 0xe /* 80378EE8 00375E48 64 00 00 01 */ oris r0, r0, 1 @@ -299,14 +299,14 @@ lbl_80378EDC: /* 80378EF0 00375E50 90 03 00 00 */ stw r0, 0(r3) /* 80378EF4 00375E54 48 00 00 18 */ b lbl_80378F0C lbl_80378EF8: -/* 80378EF8 00375E58 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378EF8 00375E58 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378EFC 00375E5C 84 03 01 FC */ lwzu r0, 0x1fc(r3) /* 80378F00 00375E60 54 00 04 5C */ rlwinm r0, r0, 0, 0x11, 0xe /* 80378F04 00375E64 64 00 00 01 */ oris r0, r0, 1 /* 80378F08 00375E68 90 03 00 00 */ stw r0, 0(r3) lbl_80378F0C: /* 80378F0C 00375E6C 54 A4 06 F6 */ rlwinm r4, r5, 0, 0x1b, 0x1b -/* 80378F10 00375E70 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378F10 00375E70 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378F14 00375E74 38 04 FF F0 */ addi r0, r4, -16 /* 80378F18 00375E78 7C 00 00 34 */ cntlzw r0, r0 /* 80378F1C 00375E7C 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f @@ -323,7 +323,7 @@ lbl_80378F0C: /* 80378F48 00375EA8 57 FF 07 7E */ clrlwi r31, r31, 0x1d /* 80378F4C 00375EAC 38 E1 00 1C */ addi r7, r1, 0x1c /* 80378F50 00375EB0 48 00 0E 4D */ bl __GetImageTileCount -/* 80378F54 00375EB4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378F54 00375EB4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378F58 00375EB8 38 00 00 00 */ li r0, 0 /* 80378F5C 00375EBC 90 03 01 F8 */ stw r0, 0x1f8(r3) /* 80378F60 00375EC0 38 E3 01 F8 */ addi r7, r3, 0x1f8 @@ -358,7 +358,7 @@ lbl_80378F0C: .global GXSetDispCopyFrame2Field GXSetDispCopyFrame2Field: -/* 80378FD4 00375F34 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378FD4 00375F34 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378FD8 00375F38 54 60 60 26 */ slwi r0, r3, 0xc /* 80378FDC 00375F3C 80 64 01 EC */ lwz r3, 0x1ec(r4) /* 80378FE0 00375F40 54 63 05 22 */ rlwinm r3, r3, 0, 0x14, 0x11 @@ -371,7 +371,7 @@ GXSetDispCopyFrame2Field: .global GXSetCopyClamp GXSetCopyClamp: -/* 80378FFC 00375F5C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80378FFC 00375F5C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80379000 00375F60 54 64 07 FE */ clrlwi r4, r3, 0x1f /* 80379004 00375F64 38 04 FF FF */ addi r0, r4, -1 /* 80379008 00375F68 80 86 01 EC */ lwz r4, 0x1ec(r6) @@ -407,7 +407,7 @@ GXSetDispCopyYScale: /* 80379074 00375FD4 EC 20 08 24 */ fdivs f1, f0, f1 /* 80379078 00375FD8 48 01 08 DD */ bl __cvt_fp2unsigned /* 8037907C 00375FDC 54 66 05 FE */ clrlwi r6, r3, 0x17 -/* 80379080 00375FE0 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80379080 00375FE0 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80379084 00375FE4 38 00 00 61 */ li r0, 0x61 /* 80379088 00375FE8 3C 60 CC 01 */ lis r3, 0xCC008000@ha /* 8037908C 00375FEC 98 03 80 00 */ stb r0, 0xCC008000@l(r3) @@ -462,7 +462,7 @@ GXSetCopyClear: /* 80379134 00376094 88 A3 00 00 */ lbz r5, 0(r3) /* 80379138 00376098 38 C0 00 61 */ li r6, 0x61 /* 8037913C 0037609C 54 87 40 2E */ slwi r7, r4, 8 -/* 80379140 003760A0 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80379140 003760A0 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80379144 003760A4 50 A7 06 3E */ rlwimi r7, r5, 0, 0x18, 0x1f /* 80379148 003760A8 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037914C 003760AC 54 E7 02 3E */ clrlwi r7, r7, 8 @@ -617,7 +617,7 @@ lbl_8037937C: /* 80379388 003762E8 38 E3 00 15 */ addi r7, r3, 0x54000015@l lbl_8037938C: /* 8037938C 003762EC 38 A0 00 61 */ li r5, 0x61 -/* 80379390 003762F0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379390 003762F0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379394 003762F4 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 80379398 003762F8 98 A4 80 00 */ stb r5, 0xCC008000@l(r4) /* 8037939C 003762FC 38 00 00 00 */ li r0, 0 @@ -631,7 +631,7 @@ lbl_8037938C: .global GXSetDispCopyGamma GXSetDispCopyGamma: -/* 803793BC 0037631C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 803793BC 0037631C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 803793C0 00376320 54 60 38 30 */ slwi r0, r3, 7 /* 803793C4 00376324 84 64 01 EC */ lwzu r3, 0x1ec(r4) /* 803793C8 00376328 54 63 06 6C */ rlwinm r3, r3, 0, 0x19, 0x16 @@ -643,7 +643,7 @@ GXSetDispCopyGamma: GXCopyDisp: /* 803793D8 00376338 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 803793DC 0037633C 41 82 00 3C */ beq lbl_80379418 -/* 803793E0 00376340 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 803793E0 00376340 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 803793E4 00376344 38 00 00 61 */ li r0, 0x61 /* 803793E8 00376348 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 803793EC 0037634C 80 C7 01 D8 */ lwz r6, 0x1d8(r7) @@ -661,13 +661,13 @@ lbl_80379418: /* 80379418 00376378 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8037941C 0037637C 38 00 00 00 */ li r0, 0 /* 80379420 00376380 40 82 00 18 */ bne lbl_80379438 -/* 80379424 00376384 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80379424 00376384 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80379428 00376388 80 A5 01 DC */ lwz r5, 0x1dc(r5) /* 8037942C 0037638C 54 A5 07 7E */ clrlwi r5, r5, 0x1d /* 80379430 00376390 28 05 00 03 */ cmplwi r5, 3 /* 80379434 00376394 40 82 00 30 */ bne lbl_80379464 lbl_80379438: -/* 80379438 00376398 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80379438 00376398 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037943C 0037639C 80 E5 01 DC */ lwz r7, 0x1dc(r5) /* 80379440 003763A0 54 E5 D7 FE */ rlwinm r5, r7, 0x1a, 0x1f, 0x1f /* 80379444 003763A4 28 05 00 01 */ cmplwi r5, 1 @@ -680,7 +680,7 @@ lbl_80379438: /* 80379460 003763C0 90 A6 80 00 */ stw r5, 0xCC008000@l(r6) lbl_80379464: /* 80379464 003763C4 39 20 00 61 */ li r9, 0x61 -/* 80379468 003763C8 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 80379468 003763C8 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037946C 003763CC 3D 00 CC 01 */ lis r8, 0xCC008000@ha /* 80379470 003763D0 99 28 80 00 */ stb r9, 0xCC008000@l(r8) /* 80379474 003763D4 54 63 DA 3E */ rlwinm r3, r3, 0x1b, 8, 0x1f @@ -723,13 +723,13 @@ lbl_80379504: /* 80379504 00376464 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80379508 00376468 41 82 00 1C */ beq lbl_80379524 /* 8037950C 0037646C 38 00 00 61 */ li r0, 0x61 -/* 80379510 00376470 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379510 00376470 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379514 00376474 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 80379518 00376478 98 04 80 00 */ stb r0, 0xCC008000@l(r4) /* 8037951C 0037647C 80 03 01 DC */ lwz r0, 0x1dc(r3) /* 80379520 00376480 90 04 80 00 */ stw r0, 0xCC008000@l(r4) lbl_80379524: -/* 80379524 00376484 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379524 00376484 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379528 00376488 38 00 00 00 */ li r0, 0 /* 8037952C 0037648C B0 03 00 02 */ sth r0, 2(r3) /* 80379530 00376490 4E 80 00 20 */ blr @@ -738,7 +738,7 @@ lbl_80379524: GXCopyTex: /* 80379534 00376494 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 80379538 00376498 41 82 00 3C */ beq lbl_80379574 -/* 8037953C 0037649C 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037953C 0037649C 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 80379540 003764A0 38 00 00 61 */ li r0, 0x61 /* 80379544 003764A4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80379548 003764A8 80 C7 01 D8 */ lwz r6, 0x1d8(r7) @@ -753,7 +753,7 @@ GXCopyTex: /* 8037956C 003764CC 54 C0 00 3A */ rlwinm r0, r6, 0, 0, 0x1d /* 80379570 003764D0 90 05 80 00 */ stw r0, 0xCC008000@l(r5) lbl_80379574: -/* 80379574 003764D4 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80379574 003764D4 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80379578 003764D8 38 00 00 00 */ li r0, 0 /* 8037957C 003764DC 88 A6 02 00 */ lbz r5, 0x200(r6) /* 80379580 003764E0 80 E6 01 DC */ lwz r7, 0x1dc(r6) @@ -786,7 +786,7 @@ lbl_803795CC: /* 803795E0 00376540 90 E5 80 00 */ stw r7, 0xCC008000@l(r5) lbl_803795E4: /* 803795E4 00376544 39 20 00 61 */ li r9, 0x61 -/* 803795E8 00376548 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 803795E8 00376548 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 803795EC 0037654C 3D 00 CC 01 */ lis r8, 0xCC008000@ha /* 803795F0 00376550 99 28 80 00 */ stb r9, 0xCC008000@l(r8) /* 803795F4 00376554 54 63 DA 3E */ rlwinm r3, r3, 0x1b, 8, 0x1f @@ -828,13 +828,13 @@ lbl_80379680: /* 80379680 003765E0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80379684 003765E4 41 82 00 1C */ beq lbl_803796A0 /* 80379688 003765E8 38 00 00 61 */ li r0, 0x61 -/* 8037968C 003765EC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037968C 003765EC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379690 003765F0 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 80379694 003765F4 98 04 80 00 */ stb r0, 0xCC008000@l(r4) /* 80379698 003765F8 80 03 01 DC */ lwz r0, 0x1dc(r3) /* 8037969C 003765FC 90 04 80 00 */ stw r0, 0xCC008000@l(r4) lbl_803796A0: -/* 803796A0 00376600 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803796A0 00376600 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803796A4 00376604 38 00 00 00 */ li r0, 0 /* 803796A8 00376608 B0 03 00 02 */ sth r0, 2(r3) /* 803796AC 0037660C 4E 80 00 20 */ blr @@ -842,7 +842,7 @@ lbl_803796A0: .global GXClearBoundingBox GXClearBoundingBox: /* 803796B0 00376610 38 C0 00 61 */ li r6, 0x61 -/* 803796B4 00376614 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803796B4 00376614 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803796B8 00376618 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 803796BC 0037661C 3C 80 55 00 */ lis r4, 0x550003FF@ha /* 803796C0 00376620 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) diff --git a/asm/Dolphin/gx/GXGeometry.s b/asm/Dolphin/gx/GXGeometry.s index d59d4dca..5e25d46e 100644 --- a/asm/Dolphin/gx/GXGeometry.s +++ b/asm/Dolphin/gx/GXGeometry.s @@ -7,43 +7,43 @@ __GXSetDirtyState: /* 80378854 003757B4 7C 08 02 A6 */ mflr r0 /* 80378858 003757B8 90 01 00 04 */ stw r0, 4(r1) /* 8037885C 003757BC 94 21 FF F8 */ stwu r1, -8(r1) -/* 80378860 003757C0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378860 003757C0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378864 003757C4 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378868 003757C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8037886C 003757CC 41 82 00 08 */ beq lbl_80378874 /* 80378870 003757D0 48 00 22 01 */ bl __GXSetSUTexRegs lbl_80378874: -/* 80378874 003757D4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378874 003757D4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378878 003757D8 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037887C 003757DC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80378880 003757E0 41 82 00 08 */ beq lbl_80378888 /* 80378884 003757E4 48 00 2A A5 */ bl __GXUpdateBPMask lbl_80378888: -/* 80378888 003757E8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378888 003757E8 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037888C 003757EC 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378890 003757F0 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80378894 003757F4 41 82 00 08 */ beq lbl_8037889C /* 80378898 003757F8 48 00 03 49 */ bl __GXSetGenMode lbl_8037889C: -/* 8037889C 003757FC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037889C 003757FC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803788A0 00375800 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 803788A4 00375804 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 803788A8 00375808 41 82 00 08 */ beq lbl_803788B0 /* 803788AC 0037580C 4B FF ED 31 */ bl __GXSetVCD lbl_803788B0: -/* 803788B0 00375810 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803788B0 00375810 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803788B4 00375814 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 803788B8 00375818 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 803788BC 0037581C 41 82 00 08 */ beq lbl_803788C4 /* 803788C0 00375820 4B FF F5 9D */ bl __GXSetVAT lbl_803788C4: -/* 803788C4 00375824 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803788C4 00375824 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803788C8 00375828 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 803788CC 0037582C 54 00 06 F9 */ rlwinm. r0, r0, 0, 0x1b, 0x1c /* 803788D0 00375830 41 82 00 08 */ beq lbl_803788D8 /* 803788D4 00375834 4B FF ED 5D */ bl __GXCalculateVLim lbl_803788D8: -/* 803788D8 00375838 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803788D8 00375838 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803788DC 0037583C 38 00 00 00 */ li r0, 0 /* 803788E0 00375840 90 03 04 F4 */ stw r0, 0x4f4(r3) /* 803788E4 00375844 80 01 00 0C */ lwz r0, 0xc(r1) @@ -62,7 +62,7 @@ GXBegin: /* 8037890C 0037586C 3B C4 00 00 */ addi r30, r4, 0 /* 80378910 00375870 93 A1 00 1C */ stw r29, 0x1c(r1) /* 80378914 00375874 3B A3 00 00 */ addi r29, r3, 0 -/* 80378918 00375878 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80378918 00375878 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037891C 0037587C 80 06 04 F4 */ lwz r0, 0x4f4(r6) /* 80378920 00375880 28 00 00 00 */ cmplwi r0, 0 /* 80378924 00375884 41 82 00 80 */ beq lbl_803789A4 @@ -70,41 +70,41 @@ GXBegin: /* 8037892C 0037588C 41 82 00 08 */ beq lbl_80378934 /* 80378930 00375890 48 00 21 41 */ bl __GXSetSUTexRegs lbl_80378934: -/* 80378934 00375894 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378934 00375894 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378938 00375898 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037893C 0037589C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80378940 003758A0 41 82 00 08 */ beq lbl_80378948 /* 80378944 003758A4 48 00 29 E5 */ bl __GXUpdateBPMask lbl_80378948: -/* 80378948 003758A8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378948 003758A8 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037894C 003758AC 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378950 003758B0 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80378954 003758B4 41 82 00 08 */ beq lbl_8037895C /* 80378958 003758B8 48 00 02 89 */ bl __GXSetGenMode lbl_8037895C: -/* 8037895C 003758BC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037895C 003758BC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378960 003758C0 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378964 003758C4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80378968 003758C8 41 82 00 08 */ beq lbl_80378970 /* 8037896C 003758CC 4B FF EC 71 */ bl __GXSetVCD lbl_80378970: -/* 80378970 003758D0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378970 003758D0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378974 003758D4 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378978 003758D8 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8037897C 003758DC 41 82 00 08 */ beq lbl_80378984 /* 80378980 003758E0 4B FF F4 DD */ bl __GXSetVAT lbl_80378984: -/* 80378984 003758E4 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378984 003758E4 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378988 003758E8 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 8037898C 003758EC 54 00 06 F9 */ rlwinm. r0, r0, 0, 0x1b, 0x1c /* 80378990 003758F0 41 82 00 08 */ beq lbl_80378998 /* 80378994 003758F4 4B FF EC 9D */ bl __GXCalculateVLim lbl_80378998: -/* 80378998 003758F8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378998 003758F8 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037899C 003758FC 38 00 00 00 */ li r0, 0 /* 803789A0 00375900 90 03 04 F4 */ stw r0, 0x4f4(r3) lbl_803789A4: -/* 803789A4 00375904 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803789A4 00375904 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803789A8 00375908 80 03 00 00 */ lwz r0, 0(r3) /* 803789AC 0037590C 28 00 00 00 */ cmplwi r0, 0 /* 803789B0 00375910 40 82 00 08 */ bne lbl_803789B8 @@ -124,7 +124,7 @@ lbl_803789B8: .global __GXSendFlushPrim __GXSendFlushPrim: -/* 803789E4 00375944 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803789E4 00375944 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803789E8 00375948 38 00 00 98 */ li r0, 0x98 /* 803789EC 0037594C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 803789F0 00375950 A0 C3 00 04 */ lhz r6, 4(r3) @@ -158,14 +158,14 @@ lbl_80378A54: /* 80378A54 003759B4 90 85 80 00 */ stw r4, 0xCC008000@l(r5) /* 80378A58 003759B8 42 00 FF FC */ bdnz lbl_80378A54 lbl_80378A5C: -/* 80378A5C 003759BC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80378A5C 003759BC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378A60 003759C0 38 00 00 01 */ li r0, 1 /* 80378A64 003759C4 B0 03 00 02 */ sth r0, 2(r3) /* 80378A68 003759C8 4E 80 00 20 */ blr .global GXSetLineWidth GXSetLineWidth: -/* 80378A6C 003759CC 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 80378A6C 003759CC 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 80378A70 003759D0 54 86 80 1E */ slwi r6, r4, 0x10 /* 80378A74 003759D4 38 A0 00 61 */ li r5, 0x61 /* 80378A78 003759D8 80 07 00 7C */ lwz r0, 0x7c(r7) @@ -186,7 +186,7 @@ GXSetLineWidth: .global GXSetPointSize GXSetPointSize: -/* 80378AB4 00375A14 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 80378AB4 00375A14 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 80378AB8 00375A18 54 86 98 18 */ slwi r6, r4, 0x13 /* 80378ABC 00375A1C 38 A0 00 61 */ li r5, 0x61 /* 80378AC0 00375A20 80 07 00 7C */ lwz r0, 0x7c(r7) @@ -207,7 +207,7 @@ GXSetPointSize: .global GXEnableTexOffsets GXEnableTexOffsets: -/* 80378AFC 00375A5C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80378AFC 00375A5C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80378B00 00375A60 54 68 10 3A */ slwi r8, r3, 2 /* 80378B04 00375A64 7C E6 42 14 */ add r7, r6, r8 /* 80378B08 00375A68 80 07 00 B8 */ lwz r0, 0xb8(r7) @@ -245,7 +245,7 @@ lbl_80378B70: lbl_80378B78: /* 80378B78 00375AD8 38 60 00 01 */ li r3, 1 lbl_80378B7C: -/* 80378B7C 00375ADC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378B7C 00375ADC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378B80 00375AE0 54 60 70 22 */ slwi r0, r3, 0xe /* 80378B84 00375AE4 80 64 02 04 */ lwz r3, 0x204(r4) /* 80378B88 00375AE8 54 63 04 9E */ rlwinm r3, r3, 0, 0x12, 0xf @@ -258,7 +258,7 @@ lbl_80378B7C: .global GXSetCoPlanar GXSetCoPlanar: -/* 80378BA4 00375B04 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80378BA4 00375B04 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80378BA8 00375B08 54 60 99 58 */ rlwinm r0, r3, 0x13, 5, 0xc /* 80378BAC 00375B0C 38 80 00 61 */ li r4, 0x61 /* 80378BB0 00375B10 80 A6 02 04 */ lwz r5, 0x204(r6) @@ -277,7 +277,7 @@ GXSetCoPlanar: .global __GXSetGenMode __GXSetGenMode: /* 80378BE0 00375B40 38 00 00 61 */ li r0, 0x61 -/* 80378BE4 00375B44 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378BE4 00375B44 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378BE8 00375B48 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80378BEC 00375B4C 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 80378BF0 00375B50 38 00 00 00 */ li r0, 0 diff --git a/asm/Dolphin/gx/GXInit.s b/asm/Dolphin/gx/GXInit.s index 69cfc024..566d989c 100644 --- a/asm/Dolphin/gx/GXInit.s +++ b/asm/Dolphin/gx/GXInit.s @@ -33,8 +33,8 @@ lbl_805A8AC8: .section .sdata2 .balign 8 -.global lbl_805AEB28 -lbl_805AEB28: +.global __GXData +__GXData: # ROM: 0x3FB3C8 .4byte lbl_80540C88 @@ -165,7 +165,7 @@ __GXDefaultTexRegionCallback: /* 803750C8 00372028 41 82 00 30 */ beq lbl_803750F8 /* 803750CC 0037202C 2C 03 00 0A */ cmpwi r3, 0xa /* 803750D0 00372030 41 82 00 28 */ beq lbl_803750F8 -/* 803750D4 00372034 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803750D4 00372034 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803750D8 00372038 80 65 02 C8 */ lwz r3, 0x2c8(r5) /* 803750DC 0037203C 54 60 07 7E */ clrlwi r0, r3, 0x1d /* 803750E0 00372040 38 83 00 01 */ addi r4, r3, 1 @@ -175,7 +175,7 @@ __GXDefaultTexRegionCallback: /* 803750F0 00372050 7C 65 1A 14 */ add r3, r5, r3 /* 803750F4 00372054 48 00 00 24 */ b lbl_80375118 lbl_803750F8: -/* 803750F8 00372058 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803750F8 00372058 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803750FC 0037205C 80 65 02 CC */ lwz r3, 0x2cc(r5) /* 80375100 00372060 54 60 07 BE */ clrlwi r0, r3, 0x1e /* 80375104 00372064 38 83 00 01 */ addi r4, r3, 1 @@ -197,7 +197,7 @@ __GXDefaultTlutRegionCallback: /* 80375134 00372094 48 00 00 14 */ b sub_80375148 lbl_80375138: /* 80375138 00372098 54 63 20 36 */ slwi r3, r3, 4 -/* 8037513C 0037209C 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 8037513C 0037209C 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 80375140 003720A0 38 63 02 D0 */ addi r3, r3, 0x2d0 /* 80375144 003720A4 7C 60 1A 14 */ add r3, r0, r3 @@ -217,7 +217,7 @@ GXInit: /* 80375168 003720C8 80 6D 9F 08 */ lwz r3, lbl_805A8AC8@sda21(r13) /* 8037516C 003720CC 3B C4 0C 88 */ addi r30, r4, lbl_80540C88@l /* 80375170 003720D0 48 00 8E C9 */ bl OSRegisterVersion -/* 80375174 003720D4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 80375174 003720D4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 80375178 003720D8 3B E0 00 00 */ li r31, 0 /* 8037517C 003720DC 38 00 00 01 */ li r0, 1 /* 80375180 003720E0 9B E5 04 F0 */ stb r31, 0x4f0(r5) @@ -252,7 +252,7 @@ GXInit: /* 803751F4 00372154 4B FF A6 99 */ bl PPCMtwpar /* 803751F8 00372158 67 43 40 00 */ oris r3, r26, 0x4000 /* 803751FC 0037215C 4B FF A6 7D */ bl PPCMthid2 -/* 80375200 00372160 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80375200 00372160 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80375204 00372164 38 00 00 FF */ li r0, 0xff /* 80375208 00372168 39 00 00 00 */ li r8, 0 /* 8037520C 0037216C 93 E6 02 04 */ stw r31, 0x204(r6) @@ -282,7 +282,7 @@ lbl_8037525C: lbl_80375268: /* 80375268 003721C8 48 00 00 04 */ b lbl_8037526C lbl_8037526C: -/* 8037526C 003721CC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037526C 003721CC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80375270 003721D0 55 06 F8 7E */ srwi r6, r8, 1 /* 80375274 003721D4 3B 9F 01 30 */ addi r28, r31, 0x130 /* 80375278 003721D8 38 00 00 00 */ li r0, 0 @@ -385,7 +385,7 @@ lbl_803753EC: lbl_803753F8: /* 803753F8 00372358 48 00 00 04 */ b lbl_803753FC lbl_803753FC: -/* 803753FC 0037235C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803753FC 0037235C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80375400 00372360 39 09 00 B8 */ addi r8, r9, 0xb8 /* 80375404 00372364 38 E9 00 D8 */ addi r7, r9, 0xd8 /* 80375408 00372368 7C 03 41 2E */ stwx r0, r3, r8 @@ -533,7 +533,7 @@ lbl_8037562C: lbl_8037563C: /* 8037563C 0037259C 48 00 00 04 */ b lbl_80375640 lbl_80375640: -/* 80375640 003725A0 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80375640 003725A0 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80375644 003725A4 39 07 00 1C */ addi r8, r7, 0x1c /* 80375648 003725A8 39 27 00 3C */ addi r9, r7, 0x3c /* 8037564C 003725AC 7D 06 42 14 */ add r8, r6, r8 @@ -642,7 +642,7 @@ lbl_803757E0: lbl_803757E4: /* 803757E4 00372744 48 00 00 04 */ b lbl_803757E8 lbl_803757E8: -/* 803757E8 00372748 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 803757E8 00372748 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 803757EC 0037274C 38 7B 02 08 */ addi r3, r27, 0x208 /* 803757F0 00372750 7F 25 CB 78 */ mr r5, r25 /* 803757F4 00372754 7F 47 D3 78 */ mr r7, r26 @@ -670,7 +670,7 @@ lbl_80375844: lbl_80375848: /* 80375848 003727A8 48 00 00 04 */ b lbl_8037584C lbl_8037584C: -/* 8037584C 003727AC 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 8037584C 003727AC 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 80375850 003727B0 38 7C 02 88 */ addi r3, r28, 0x288 /* 80375854 003727B4 57 65 78 20 */ slwi r5, r27, 0xf /* 80375858 003727B8 7C 60 1A 14 */ add r3, r0, r3 @@ -695,7 +695,7 @@ lbl_8037589C: lbl_803758A0: /* 803758A0 00372800 48 00 00 04 */ b lbl_803758A4 lbl_803758A4: -/* 803758A4 00372804 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 803758A4 00372804 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 803758A8 00372808 38 7B 02 D0 */ addi r3, r27, 0x2d0 /* 803758AC 0037280C 7F 44 D3 78 */ mr r4, r26 /* 803758B0 00372810 7C 60 1A 14 */ add r3, r0, r3 @@ -716,7 +716,7 @@ lbl_803758E4: /* 803758E4 00372844 48 00 00 04 */ b lbl_803758E8 lbl_803758E8: /* 803758E8 00372848 38 19 00 10 */ addi r0, r25, 0x10 -/* 803758EC 0037284C 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803758EC 0037284C 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803758F0 00372850 54 03 20 36 */ slwi r3, r0, 4 /* 803758F4 00372854 38 63 02 D0 */ addi r3, r3, 0x2d0 /* 803758F8 00372858 7F 44 D3 78 */ mr r4, r26 @@ -734,7 +734,7 @@ lbl_803758E8: /* 80375928 00372888 B1 84 00 06 */ sth r12, 6(r4) /* 8037592C 0037288C 3D 40 CC 01 */ lis r10, 0xCC008000@ha /* 80375930 00372890 39 20 00 20 */ li r9, 0x20 -/* 80375934 00372894 81 62 CE 08 */ lwz r11, lbl_805AEB28@sda21(r2) +/* 80375934 00372894 81 62 CE 08 */ lwz r11, __GXData@sda21(r2) /* 80375938 00372898 39 00 00 10 */ li r8, 0x10 /* 8037593C 0037289C 38 E0 10 06 */ li r7, 0x1006 /* 80375940 003728A0 38 8B 04 EC */ addi r4, r11, 0x4ec @@ -892,7 +892,7 @@ lbl_80375B70: lbl_80375B74: /* 80375B74 00372AD4 48 00 00 04 */ b lbl_80375B78 lbl_80375B78: -/* 80375B78 00372AD8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80375B78 00372AD8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80375B7C 00372ADC 7F A3 EB 78 */ mr r3, r29 /* 80375B80 00372AE0 38 A0 00 00 */ li r5, 0 /* 80375B84 00372AE4 48 00 23 75 */ bl GXSetArray @@ -1055,7 +1055,7 @@ lbl_80375BAC: /* 80375DEC 00372D4C 90 01 00 0C */ stw r0, 0xc(r1) /* 80375DF0 00372D50 48 00 3C 4D */ bl GXSetChanMatColor /* 80375DF4 00372D54 48 00 4A 4D */ bl GXInvalidateTexAll -/* 80375DF8 00372D58 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80375DF8 00372D58 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80375DFC 00372D5C 3B C0 00 00 */ li r30, 0 /* 80375E00 00372D60 3C 60 80 37 */ lis r3, __GXDefaultTexRegionCallback@ha /* 80375E04 00372D64 93 C4 02 C8 */ stw r30, 0x2c8(r4) diff --git a/asm/Dolphin/gx/GXLight.s b/asm/Dolphin/gx/GXLight.s index 79a4bac9..3ce2832c 100644 --- a/asm/Dolphin/gx/GXLight.s +++ b/asm/Dolphin/gx/GXLight.s @@ -251,7 +251,7 @@ GXLoadLightObjImm: /* 8037992C 0037688C F0 44 00 00 */ psq_st f2, 0(r4), 0, qr0 /* 80379930 00376890 F0 24 00 00 */ psq_st f1, 0(r4), 0, qr0 /* 80379934 00376894 F0 04 00 00 */ psq_st f0, 0(r4), 0, qr0 -/* 80379938 00376898 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379938 00376898 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037993C 0037689C 38 00 00 01 */ li r0, 1 /* 80379940 003768A0 B0 03 00 02 */ sth r0, 2(r3) /* 80379944 003768A4 4E 80 00 20 */ blr @@ -273,7 +273,7 @@ lbl_8037996C: /* 80379974 003768D4 4C 80 00 20 */ bgelr /* 80379978 003768D8 48 00 00 74 */ b lbl_803799EC lbl_8037997C: -/* 8037997C 003768DC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037997C 003768DC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379980 003768E0 38 A0 00 00 */ li r5, 0 /* 80379984 003768E4 80 04 00 00 */ lwz r0, 0(r4) /* 80379988 003768E8 80 63 00 A8 */ lwz r3, 0xa8(r3) @@ -282,7 +282,7 @@ lbl_8037997C: /* 80379994 003768F4 50 67 06 3E */ rlwimi r7, r3, 0, 0x18, 0x1f /* 80379998 003768F8 48 00 00 70 */ b lbl_80379A08 lbl_8037999C: -/* 8037999C 003768FC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037999C 003768FC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803799A0 00376900 38 A0 00 01 */ li r5, 1 /* 803799A4 00376904 80 04 00 00 */ lwz r0, 0(r4) /* 803799A8 00376908 80 63 00 AC */ lwz r3, 0xac(r3) @@ -291,14 +291,14 @@ lbl_8037999C: /* 803799B4 00376914 50 67 06 3E */ rlwimi r7, r3, 0, 0x18, 0x1f /* 803799B8 00376918 48 00 00 50 */ b lbl_80379A08 lbl_803799BC: -/* 803799BC 0037691C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803799BC 0037691C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803799C0 00376920 38 A0 00 00 */ li r5, 0 /* 803799C4 00376924 88 E4 00 03 */ lbz r7, 3(r4) /* 803799C8 00376928 80 63 00 A8 */ lwz r3, 0xa8(r3) /* 803799CC 0037692C 50 67 00 2E */ rlwimi r7, r3, 0, 0, 0x17 /* 803799D0 00376930 48 00 00 38 */ b lbl_80379A08 lbl_803799D4: -/* 803799D4 00376934 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803799D4 00376934 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803799D8 00376938 38 A0 00 01 */ li r5, 1 /* 803799DC 0037693C 88 E4 00 03 */ lbz r7, 3(r4) /* 803799E0 00376940 80 63 00 AC */ lwz r3, 0xac(r3) @@ -315,7 +315,7 @@ lbl_803799F8: /* 80379A04 00376964 4E 80 00 20 */ blr lbl_80379A08: /* 80379A08 00376968 38 00 00 10 */ li r0, 0x10 -/* 80379A0C 0037696C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80379A0C 0037696C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80379A10 00376970 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 80379A14 00376974 98 06 80 00 */ stb r0, 0xCC008000@l(r6) /* 80379A18 00376978 38 65 10 0A */ addi r3, r5, 0x100a @@ -345,7 +345,7 @@ lbl_80379A60: /* 80379A68 003769C8 4C 80 00 20 */ bgelr /* 80379A6C 003769CC 48 00 00 74 */ b lbl_80379AE0 lbl_80379A70: -/* 80379A70 003769D0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379A70 003769D0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379A74 003769D4 38 A0 00 00 */ li r5, 0 /* 80379A78 003769D8 80 04 00 00 */ lwz r0, 0(r4) /* 80379A7C 003769DC 80 63 00 B0 */ lwz r3, 0xb0(r3) @@ -354,7 +354,7 @@ lbl_80379A70: /* 80379A88 003769E8 50 67 06 3E */ rlwimi r7, r3, 0, 0x18, 0x1f /* 80379A8C 003769EC 48 00 00 70 */ b lbl_80379AFC lbl_80379A90: -/* 80379A90 003769F0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379A90 003769F0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379A94 003769F4 38 A0 00 01 */ li r5, 1 /* 80379A98 003769F8 80 04 00 00 */ lwz r0, 0(r4) /* 80379A9C 003769FC 80 63 00 B4 */ lwz r3, 0xb4(r3) @@ -363,14 +363,14 @@ lbl_80379A90: /* 80379AA8 00376A08 50 67 06 3E */ rlwimi r7, r3, 0, 0x18, 0x1f /* 80379AAC 00376A0C 48 00 00 50 */ b lbl_80379AFC lbl_80379AB0: -/* 80379AB0 00376A10 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379AB0 00376A10 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379AB4 00376A14 38 A0 00 00 */ li r5, 0 /* 80379AB8 00376A18 88 E4 00 03 */ lbz r7, 3(r4) /* 80379ABC 00376A1C 80 63 00 B0 */ lwz r3, 0xb0(r3) /* 80379AC0 00376A20 50 67 00 2E */ rlwimi r7, r3, 0, 0, 0x17 /* 80379AC4 00376A24 48 00 00 38 */ b lbl_80379AFC lbl_80379AC8: -/* 80379AC8 00376A28 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379AC8 00376A28 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379ACC 00376A2C 38 A0 00 01 */ li r5, 1 /* 80379AD0 00376A30 88 E4 00 03 */ lbz r7, 3(r4) /* 80379AD4 00376A34 80 63 00 B4 */ lwz r3, 0xb4(r3) @@ -387,7 +387,7 @@ lbl_80379AEC: /* 80379AF8 00376A58 4E 80 00 20 */ blr lbl_80379AFC: /* 80379AFC 00376A5C 38 00 00 10 */ li r0, 0x10 -/* 80379B00 00376A60 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80379B00 00376A60 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80379B04 00376A64 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 80379B08 00376A68 98 06 80 00 */ stb r0, 0xCC008000@l(r6) /* 80379B0C 00376A6C 38 65 10 0C */ addi r3, r5, 0x100c @@ -402,7 +402,7 @@ lbl_80379AFC: .global GXSetNumChans GXSetNumChans: -/* 80379B30 00376A90 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 80379B30 00376A90 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 80379B34 00376A94 54 60 25 36 */ rlwinm r0, r3, 4, 0x14, 0x1b /* 80379B38 00376A98 54 68 06 3E */ clrlwi r8, r3, 0x18 /* 80379B3C 00376A9C 80 A6 02 04 */ lwz r5, 0x204(r6) @@ -472,7 +472,7 @@ lbl_80379C18: /* 80379C28 00376B88 90 04 80 00 */ stw r0, 0xCC008000@l(r4) /* 80379C2C 00376B8C 90 C4 80 00 */ stw r6, 0xCC008000@l(r4) lbl_80379C30: -/* 80379C30 00376B90 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 80379C30 00376B90 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80379C34 00376B94 38 00 00 01 */ li r0, 1 /* 80379C38 00376B98 B0 03 00 02 */ sth r0, 2(r3) /* 80379C3C 00376B9C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXMisc.s b/asm/Dolphin/gx/GXMisc.s index c5c7439d..b50d6f61 100644 --- a/asm/Dolphin/gx/GXMisc.s +++ b/asm/Dolphin/gx/GXMisc.s @@ -27,7 +27,7 @@ GXSetMisc: /* 803782B4 00375214 4C 80 00 20 */ bgelr /* 803782B8 00375218 48 00 00 40 */ b lbl_803782F8 lbl_803782BC: -/* 803782BC 0037521C 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 803782BC 0037521C 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 803782C0 00375220 38 00 00 01 */ li r0, 1 /* 803782C4 00375224 B0 85 00 04 */ sth r4, 4(r5) /* 803782C8 00375228 A0 65 00 04 */ lhz r3, 4(r5) @@ -44,7 +44,7 @@ lbl_803782BC: /* 803782F4 00375254 4E 80 00 20 */ blr lbl_803782F8: /* 803782F8 00375258 7C 84 00 D0 */ neg r4, r4 -/* 803782FC 0037525C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803782FC 0037525C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378300 00375260 30 04 FF FF */ addic r0, r4, -1 /* 80378304 00375264 7C 00 21 10 */ subfe r0, r0, r4 /* 80378308 00375268 98 03 04 F1 */ stb r0, 0x4f1(r3) @@ -55,7 +55,7 @@ GXFlush: /* 80378310 00375270 7C 08 02 A6 */ mflr r0 /* 80378314 00375274 90 01 00 04 */ stw r0, 4(r1) /* 80378318 00375278 94 21 FF F8 */ stwu r1, -8(r1) -/* 8037831C 0037527C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037831C 0037527C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 80378320 00375280 80 03 04 F4 */ lwz r0, 0x4f4(r3) /* 80378324 00375284 28 00 00 00 */ cmplwi r0, 0 /* 80378328 00375288 41 82 00 08 */ beq lbl_80378330 @@ -137,7 +137,7 @@ GXSetDrawSync: /* 80378434 00375394 7C 7E 1B 78 */ mr r30, r3 /* 80378438 00375398 48 00 92 29 */ bl OSDisableInterrupts /* 8037843C 0037539C 38 C0 00 61 */ li r6, 0x61 -/* 80378440 003753A0 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378440 003753A0 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 80378444 003753A4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80378448 003753A8 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 8037844C 003753AC 98 C5 80 00 */ stb r6, 0xCC008000@l(r5) @@ -168,7 +168,7 @@ lbl_80378484: /* 803784AC 0037540C 4B FF 73 61 */ bl PPCSync /* 803784B0 00375410 7F C3 F3 78 */ mr r3, r30 /* 803784B4 00375414 48 00 91 D5 */ bl OSRestoreInterrupts -/* 803784B8 00375418 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 803784B8 00375418 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 803784BC 0037541C B3 E3 00 02 */ sth r31, 2(r3) /* 803784C0 00375420 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803784C4 00375424 83 E1 00 14 */ lwz r31, 0x14(r1) @@ -223,7 +223,7 @@ lbl_8037853C: .global GXPixModeSync GXPixModeSync: /* 80378564 003754C4 38 00 00 61 */ li r0, 0x61 -/* 80378568 003754C8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 80378568 003754C8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037856C 003754CC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80378570 003754D0 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 80378574 003754D4 38 00 00 00 */ li r0, 0 diff --git a/asm/Dolphin/gx/GXPerf.s b/asm/Dolphin/gx/GXPerf.s index 4a93a508..0f1cb744 100644 --- a/asm/Dolphin/gx/GXPerf.s +++ b/asm/Dolphin/gx/GXPerf.s @@ -73,7 +73,7 @@ lbl_803F0D0C: .global GXSetGPMetric GXSetGPMetric: -/* 8037C7E8 00379748 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C7E8 00379748 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C7EC 0037974C 80 05 04 E4 */ lwz r0, 0x4e4(r5) /* 8037C7F0 00379750 2C 00 00 22 */ cmpwi r0, 0x22 /* 8037C7F4 00379754 41 82 00 2C */ beq lbl_8037C820 @@ -111,7 +111,7 @@ lbl_8037C858: /* 8037C864 003797C4 3C 00 24 00 */ lis r0, 0x2400 /* 8037C868 003797C8 90 05 80 00 */ stw r0, 0xCC008000@l(r5) lbl_8037C86C: -/* 8037C86C 003797CC 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037C86C 003797CC 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037C870 003797D0 80 07 04 E8 */ lwz r0, 0x4e8(r7) /* 8037C874 003797D4 2C 00 00 15 */ cmpwi r0, 0x15 /* 8037C878 003797D8 41 82 00 2C */ beq lbl_8037C8A4 @@ -150,7 +150,7 @@ lbl_8037C8E8: /* 8037C8EC 0037984C 38 00 00 00 */ li r0, 0 /* 8037C8F0 00379850 B0 05 00 06 */ sth r0, 6(r5) lbl_8037C8F4: -/* 8037C8F4 00379854 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C8F4 00379854 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C8F8 00379858 90 65 04 E4 */ stw r3, 0x4e4(r5) /* 8037C8FC 0037985C 80 05 04 E4 */ lwz r0, 0x4e4(r5) /* 8037C900 00379860 28 00 00 23 */ cmplwi r0, 0x23 @@ -453,7 +453,7 @@ lbl_8037CD08: /* 8037CD18 00379C78 38 03 C1 AD */ addi r0, r3, 0x2402C1AD@l /* 8037CD1C 00379C7C 90 05 80 00 */ stw r0, 0xCC008000@l(r5) lbl_8037CD20: -/* 8037CD20 00379C80 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037CD20 00379C80 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037CD24 00379C84 90 83 04 E8 */ stw r4, 0x4e8(r3) /* 8037CD28 00379C88 80 03 04 E8 */ lwz r0, 0x4e8(r3) /* 8037CD2C 00379C8C 28 00 00 16 */ cmplwi r0, 0x16 @@ -668,7 +668,7 @@ lbl_8037D014: /* 8037D018 00379F78 38 00 00 05 */ li r0, 5 /* 8037D01C 00379F7C B0 03 00 06 */ sth r0, 6(r3) lbl_8037D020: -/* 8037D020 00379F80 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037D020 00379F80 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037D024 00379F84 38 00 00 00 */ li r0, 0 /* 8037D028 00379F88 B0 03 00 02 */ sth r0, 2(r3) /* 8037D02C 00379F8C 4E 80 00 20 */ blr diff --git a/asm/Dolphin/gx/GXPixel.s b/asm/Dolphin/gx/GXPixel.s index 0b56b75e..7e486e66 100644 --- a/asm/Dolphin/gx/GXPixel.s +++ b/asm/Dolphin/gx/GXPixel.s @@ -137,7 +137,7 @@ lbl_8037BCA0: /* 8037BD04 00378C64 50 80 03 7E */ rlwimi r0, r4, 0, 0xd, 0x1f /* 8037BD08 00378C68 81 81 00 28 */ lwz r12, 0x28(r1) /* 8037BD0C 00378C6C 54 07 02 3E */ clrlwi r7, r0, 8 -/* 8037BD10 00378C70 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037BD10 00378C70 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037BD14 00378C74 64 EA EE 00 */ oris r10, r7, 0xee00 /* 8037BD18 00378C78 38 00 00 61 */ li r0, 0x61 /* 8037BD1C 00378C7C 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -230,7 +230,7 @@ GXSetFogRangeAdj: /* 8037BE6C 00378DCC 91 26 80 00 */ stw r9, 0xCC008000@l(r6) lbl_8037BE70: /* 8037BE70 00378DD0 54 85 04 3E */ clrlwi r5, r4, 0x10 -/* 8037BE74 00378DD4 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037BE74 00378DD4 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037BE78 00378DD8 38 05 01 56 */ addi r0, r5, 0x156 /* 8037BE7C 00378DDC 54 05 05 A8 */ rlwinm r5, r0, 0, 0x16, 0x14 /* 8037BE80 00378DE0 54 60 53 AA */ rlwinm r0, r3, 0xa, 0xe, 0x15 @@ -247,7 +247,7 @@ lbl_8037BE70: .global GXSetBlendMode GXSetBlendMode: -/* 8037BEAC 00378E0C 81 02 CE 08 */ lwz r8, lbl_805AEB28@sda21(r2) +/* 8037BEAC 00378E0C 81 02 CE 08 */ lwz r8, __GXData@sda21(r2) /* 8037BEB0 00378E10 20 03 00 03 */ subfic r0, r3, 3 /* 8037BEB4 00378E14 7C 07 00 34 */ cntlzw r7, r0 /* 8037BEB8 00378E18 20 03 00 02 */ subfic r0, r3, 2 @@ -271,7 +271,7 @@ GXSetBlendMode: .global GXSetColorUpdate GXSetColorUpdate: -/* 8037BF00 00378E60 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037BF00 00378E60 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037BF04 00378E64 38 00 00 61 */ li r0, 0x61 /* 8037BF08 00378E68 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037BF0C 00378E6C 80 C5 01 D0 */ lwz r6, 0x1d0(r5) @@ -285,7 +285,7 @@ GXSetColorUpdate: .global GXSetAlphaUpdate GXSetAlphaUpdate: -/* 8037BF2C 00378E8C 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037BF2C 00378E8C 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037BF30 00378E90 38 00 00 61 */ li r0, 0x61 /* 8037BF34 00378E94 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037BF38 00378E98 80 C5 01 D0 */ lwz r6, 0x1d0(r5) @@ -299,7 +299,7 @@ GXSetAlphaUpdate: .global GXSetZMode GXSetZMode: -/* 8037BF58 00378EB8 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037BF58 00378EB8 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037BF5C 00378EBC 38 00 00 61 */ li r0, 0x61 /* 8037BF60 00378EC0 80 E6 01 D8 */ lwz r7, 0x1d8(r6) /* 8037BF64 00378EC4 50 67 07 FE */ rlwimi r7, r3, 0, 0x1f, 0x1f @@ -315,7 +315,7 @@ GXSetZMode: .global GXSetZCompLoc GXSetZCompLoc: -/* 8037BF8C 00378EEC 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037BF8C 00378EEC 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037BF90 00378EF0 54 60 34 B2 */ rlwinm r0, r3, 6, 0x12, 0x19 /* 8037BF94 00378EF4 38 60 00 61 */ li r3, 0x61 /* 8037BF98 00378EF8 80 A6 01 DC */ lwz r5, 0x1dc(r6) @@ -332,7 +332,7 @@ GXSetZCompLoc: .global GXSetPixelFmt GXSetPixelFmt: -/* 8037BFC4 00378F24 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037BFC4 00378F24 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037BFC8 00378F28 3C A0 80 3F */ lis r5, lbl_803F0C90@ha /* 8037BFCC 00378F2C 54 66 10 3A */ slwi r6, r3, 2 /* 8037BFD0 00378F30 38 05 0C 90 */ addi r0, r5, lbl_803F0C90@l @@ -361,7 +361,7 @@ GXSetPixelFmt: lbl_8037C02C: /* 8037C02C 00378F8C 38 00 00 00 */ li r0, 0 lbl_8037C030: -/* 8037C030 00378F90 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C030 00378F90 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C034 00378F94 54 00 4B EC */ rlwinm r0, r0, 9, 0xf, 0x16 /* 8037C038 00378F98 80 85 02 04 */ lwz r4, 0x204(r5) /* 8037C03C 00378F9C 54 84 05 EA */ rlwinm r4, r4, 0, 0x17, 0x15 @@ -374,7 +374,7 @@ lbl_8037C054: /* 8037C054 00378FB4 80 0A 00 00 */ lwz r0, 0(r10) /* 8037C058 00378FB8 28 00 00 04 */ cmplwi r0, 4 /* 8037C05C 00378FBC 40 82 00 40 */ bne lbl_8037C09C -/* 8037C060 00378FC0 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C060 00378FC0 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C064 00378FC4 38 63 FF FC */ addi r3, r3, -4 /* 8037C068 00378FC8 38 00 00 61 */ li r0, 0x61 /* 8037C06C 00378FCC 80 85 01 D4 */ lwz r4, 0x1d4(r5) @@ -390,14 +390,14 @@ lbl_8037C054: /* 8037C094 00378FF4 80 05 01 D4 */ lwz r0, 0x1d4(r5) /* 8037C098 00378FF8 90 03 80 00 */ stw r0, 0xCC008000@l(r3) lbl_8037C09C: -/* 8037C09C 00378FFC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C09C 00378FFC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C0A0 00379000 38 00 00 00 */ li r0, 0 /* 8037C0A4 00379004 B0 03 00 02 */ sth r0, 2(r3) /* 8037C0A8 00379008 4E 80 00 20 */ blr .global GXSetDither GXSetDither: -/* 8037C0AC 0037900C 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037C0AC 0037900C 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037C0B0 00379010 38 00 00 61 */ li r0, 0x61 /* 8037C0B4 00379014 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037C0B8 00379018 80 A6 01 D0 */ lwz r5, 0x1d0(r6) @@ -413,7 +413,7 @@ GXSetDither: .global GXSetDstAlpha GXSetDstAlpha: -/* 8037C0E0 00379040 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037C0E0 00379040 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037C0E4 00379044 54 85 06 3E */ clrlwi r5, r4, 0x18 /* 8037C0E8 00379048 38 00 00 61 */ li r0, 0x61 /* 8037C0EC 0037904C 80 E6 01 D4 */ lwz r7, 0x1d4(r6) @@ -432,7 +432,7 @@ GXSetDstAlpha: .global GXSetFieldMask GXSetFieldMask: /* 8037C11C 0037907C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8037C120 00379080 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C120 00379080 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C124 00379084 54 05 07 FA */ rlwinm r5, r0, 0, 0x1f, 0x1d /* 8037C128 00379088 54 60 0D FC */ rlwinm r0, r3, 1, 0x17, 0x1e /* 8037C12C 0037908C 7C A0 03 78 */ or r0, r5, r0 @@ -458,7 +458,7 @@ GXSetFieldMode: /* 8037C170 003790D0 3B C0 00 61 */ li r30, 0x61 /* 8037C174 003790D4 93 A1 00 14 */ stw r29, 0x14(r1) /* 8037C178 003790D8 7C 7D 1B 78 */ mr r29, r3 -/* 8037C17C 003790DC 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C17C 003790DC 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C180 003790E0 80 85 00 7C */ lwz r4, 0x7c(r5) /* 8037C184 003790E4 54 84 02 90 */ rlwinm r4, r4, 0, 0xa, 8 /* 8037C188 003790E8 7C 80 03 78 */ or r0, r4, r0 diff --git a/asm/Dolphin/gx/GXTev.s b/asm/Dolphin/gx/GXTev.s index 661a4cd3..05a8989b 100644 --- a/asm/Dolphin/gx/GXTev.s +++ b/asm/Dolphin/gx/GXTev.s @@ -60,7 +60,7 @@ lbl_8037B438: /* 8037B444 003783A4 38 A5 00 14 */ addi r5, r5, 0x14 /* 8037B448 003783A8 39 29 00 3C */ addi r9, r9, 0x3c lbl_8037B44C: -/* 8037B44C 003783AC 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B44C 003783AC 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B450 003783B0 54 63 10 3A */ slwi r3, r3, 2 /* 8037B454 003783B4 80 05 00 00 */ lwz r0, 0(r5) /* 8037B458 003783B8 38 A0 00 61 */ li r5, 0x61 @@ -85,7 +85,7 @@ lbl_8037B44C: .global GXSetTevColorIn GXSetTevColorIn: -/* 8037B4A4 00378404 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 8037B4A4 00378404 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 8037B4A8 00378408 54 63 10 3A */ slwi r3, r3, 2 /* 8037B4AC 0037840C 38 00 00 61 */ li r0, 0x61 /* 8037B4B0 00378410 7D 09 1A 14 */ add r8, r9, r3 @@ -105,7 +105,7 @@ GXSetTevColorIn: .global GXSetTevAlphaIn GXSetTevAlphaIn: -/* 8037B4E8 00378448 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 8037B4E8 00378448 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 8037B4EC 0037844C 54 63 10 3A */ slwi r3, r3, 2 /* 8037B4F0 00378450 38 00 00 61 */ li r0, 0x61 /* 8037B4F4 00378454 7D 09 1A 14 */ add r8, r9, r3 @@ -125,7 +125,7 @@ GXSetTevAlphaIn: .global GXSetTevColorOp GXSetTevColorOp: -/* 8037B52C 0037848C 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 8037B52C 0037848C 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 8037B530 00378490 54 69 10 3A */ slwi r9, r3, 2 /* 8037B534 00378494 2C 04 00 01 */ cmpwi r4, 1 /* 8037B538 00378498 7C 60 4A 14 */ add r3, r0, r9 @@ -142,7 +142,7 @@ lbl_8037B558: /* 8037B560 003784C0 50 0A 83 9E */ rlwimi r10, r0, 0x10, 0xe, 0xf lbl_8037B564: /* 8037B564 003784C4 38 00 00 61 */ li r0, 0x61 -/* 8037B568 003784C8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B568 003784C8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B56C 003784CC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B570 003784D0 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B574 003784D4 50 EA 9B 18 */ rlwimi r10, r7, 0x13, 0xc, 0xc @@ -156,7 +156,7 @@ lbl_8037B564: .global GXSetTevAlphaOp GXSetTevAlphaOp: -/* 8037B594 003784F4 80 02 CE 08 */ lwz r0, lbl_805AEB28@sda21(r2) +/* 8037B594 003784F4 80 02 CE 08 */ lwz r0, __GXData@sda21(r2) /* 8037B598 003784F8 54 69 10 3A */ slwi r9, r3, 2 /* 8037B59C 003784FC 2C 04 00 01 */ cmpwi r4, 1 /* 8037B5A0 00378500 7C 60 4A 14 */ add r3, r0, r9 @@ -173,7 +173,7 @@ lbl_8037B5C0: /* 8037B5C8 00378528 50 0A 83 9E */ rlwimi r10, r0, 0x10, 0xe, 0xf lbl_8037B5CC: /* 8037B5CC 0037852C 38 00 00 61 */ li r0, 0x61 -/* 8037B5D0 00378530 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B5D0 00378530 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B5D4 00378534 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B5D8 00378538 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B5DC 0037853C 50 EA 9B 18 */ rlwimi r10, r7, 0x13, 0xc, 0xc @@ -197,7 +197,7 @@ GXSetTevColor: /* 8037B618 00378578 88 C4 00 01 */ lbz r6, 1(r4) /* 8037B61C 0037857C 54 E7 C0 0E */ slwi r7, r7, 0x18 /* 8037B620 00378580 38 A0 00 61 */ li r5, 0x61 -/* 8037B624 00378584 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B624 00378584 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B628 00378588 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037B62C 0037858C 98 A4 80 00 */ stb r5, 0xCC008000@l(r4) /* 8037B630 00378590 51 27 03 3E */ rlwimi r7, r9, 0, 0xc, 0x1f @@ -229,7 +229,7 @@ GXSetTevColorS10: /* 8037B68C 003785EC A8 C4 00 02 */ lha r6, 2(r4) /* 8037B690 003785F0 55 08 C0 0E */ slwi r8, r8, 0x18 /* 8037B694 003785F4 38 A0 00 61 */ li r5, 0x61 -/* 8037B698 003785F8 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B698 003785F8 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B69C 003785FC 3C 80 CC 01 */ lis r4, 0xCC008000@ha /* 8037B6A0 00378600 98 A4 80 00 */ stb r5, 0xCC008000@l(r4) /* 8037B6A4 00378604 51 48 02 7E */ rlwimi r8, r10, 0, 9, 0x1f @@ -261,7 +261,7 @@ GXSetTevKColor: /* 8037B700 00378660 89 24 00 02 */ lbz r9, 2(r4) /* 8037B704 00378664 54 00 03 0E */ rlwinm r0, r0, 0, 0xc, 7 /* 8037B708 00378668 64 08 00 80 */ oris r8, r0, 0x80 -/* 8037B70C 0037866C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B70C 0037866C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B710 00378670 54 E7 C0 0E */ slwi r7, r7, 0x18 /* 8037B714 00378674 38 00 00 61 */ li r0, 0x61 /* 8037B718 00378678 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -284,7 +284,7 @@ GXSetTevKColor: .global GXSetTevKColorSel GXSetTevKColorSel: /* 8037B758 003786B8 7C 65 0E 70 */ srawi r5, r3, 1 -/* 8037B75C 003786BC 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037B75C 003786BC 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037B760 003786C0 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 8037B764 003786C4 54 A3 10 3A */ slwi r3, r5, 2 /* 8037B768 003786C8 38 E3 01 B0 */ addi r7, r3, 0x1b0 @@ -304,7 +304,7 @@ lbl_8037B78C: /* 8037B79C 003786FC 90 07 00 00 */ stw r0, 0(r7) lbl_8037B7A0: /* 8037B7A0 00378700 38 00 00 61 */ li r0, 0x61 -/* 8037B7A4 00378704 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B7A4 00378704 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B7A8 00378708 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B7AC 0037870C 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B7B0 00378710 38 00 00 00 */ li r0, 0 @@ -316,7 +316,7 @@ lbl_8037B7A0: .global GXSetTevKAlphaSel GXSetTevKAlphaSel: /* 8037B7C4 00378724 7C 65 0E 70 */ srawi r5, r3, 1 -/* 8037B7C8 00378728 80 C2 CE 08 */ lwz r6, lbl_805AEB28@sda21(r2) +/* 8037B7C8 00378728 80 C2 CE 08 */ lwz r6, __GXData@sda21(r2) /* 8037B7CC 0037872C 54 60 07 FF */ clrlwi. r0, r3, 0x1f /* 8037B7D0 00378730 54 A3 10 3A */ slwi r3, r5, 2 /* 8037B7D4 00378734 38 E3 01 B0 */ addi r7, r3, 0x1b0 @@ -336,7 +336,7 @@ lbl_8037B7F8: /* 8037B808 00378768 90 07 00 00 */ stw r0, 0(r7) lbl_8037B80C: /* 8037B80C 0037876C 38 00 00 61 */ li r0, 0x61 -/* 8037B810 00378770 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037B810 00378770 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037B814 00378774 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B818 00378778 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B81C 0037877C 38 00 00 00 */ li r0, 0 @@ -348,7 +348,7 @@ lbl_8037B80C: .global GXSetTevSwapMode GXSetTevSwapMode: /* 8037B830 00378790 54 63 10 3A */ slwi r3, r3, 2 -/* 8037B834 00378794 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037B834 00378794 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037B838 00378798 39 03 01 70 */ addi r8, r3, 0x170 /* 8037B83C 0037879C 7D 07 42 14 */ add r8, r7, r8 /* 8037B840 003787A0 80 08 00 00 */ lwz r0, 0(r8) @@ -372,7 +372,7 @@ GXSetTevSwapMode: .global GXSetTevSwapModeTable GXSetTevSwapModeTable: /* 8037B884 003787E4 54 6A 08 3C */ slwi r10, r3, 1 -/* 8037B888 003787E8 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 8037B888 003787E8 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 8037B88C 003787EC 54 63 18 38 */ slwi r3, r3, 3 /* 8037B890 003787F0 39 63 01 B0 */ addi r11, r3, 0x1b0 /* 8037B894 003787F4 7D 69 5A 14 */ add r11, r9, r11 @@ -413,7 +413,7 @@ GXSetTevSwapModeTable: .global GXSetAlphaCompare GXSetAlphaCompare: /* 8037B91C 0037887C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 8037B920 00378880 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B920 00378880 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B924 00378884 64 00 F3 00 */ oris r0, r0, 0xf300 /* 8037B928 00378888 54 00 06 1E */ rlwinm r0, r0, 0, 0x18, 0xf /* 8037B92C 0037888C 50 E0 44 2E */ rlwimi r0, r7, 8, 0x10, 0x17 @@ -461,7 +461,7 @@ lbl_8037B9B4: /* 8037B9B4 00378914 38 C0 00 02 */ li r6, 2 lbl_8037B9B8: /* 8037B9B8 00378918 38 00 00 61 */ li r0, 0x61 -/* 8037B9BC 0037891C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037B9BC 0037891C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037B9C0 00378920 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037B9C4 00378924 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037B9C8 00378928 54 C6 07 B6 */ rlwinm r6, r6, 0, 0x1e, 0x1b @@ -479,7 +479,7 @@ lbl_8037B9B8: .global GXSetTevOrder GXSetTevOrder: /* 8037B9F4 00378954 7C 67 0E 70 */ srawi r7, r3, 1 -/* 8037B9F8 00378958 81 22 CE 08 */ lwz r9, lbl_805AEB28@sda21(r2) +/* 8037B9F8 00378958 81 22 CE 08 */ lwz r9, __GXData@sda21(r2) /* 8037B9FC 0037895C 54 AA 06 2C */ rlwinm r10, r5, 0, 0x18, 0x16 /* 8037BA00 00378960 7C E7 01 94 */ addze r7, r7 /* 8037BA04 00378964 54 60 10 3A */ slwi r0, r3, 2 @@ -498,7 +498,7 @@ lbl_8037BA30: lbl_8037BA34: /* 8037BA34 00378994 2C 04 00 08 */ cmpwi r4, 8 /* 8037BA38 00378998 41 80 00 28 */ blt lbl_8037BA60 -/* 8037BA3C 0037899C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037BA3C 0037899C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037BA40 003789A0 38 00 00 01 */ li r0, 1 /* 8037BA44 003789A4 7C 00 18 30 */ slw r0, r0, r3 /* 8037BA48 003789A8 81 04 04 E0 */ lwz r8, 0x4e0(r4) @@ -508,7 +508,7 @@ lbl_8037BA34: /* 8037BA58 003789B8 90 0A 00 00 */ stw r0, 0(r10) /* 8037BA5C 003789BC 48 00 00 20 */ b lbl_8037BA7C lbl_8037BA60: -/* 8037BA60 003789C0 81 02 CE 08 */ lwz r8, lbl_805AEB28@sda21(r2) +/* 8037BA60 003789C0 81 02 CE 08 */ lwz r8, __GXData@sda21(r2) /* 8037BA64 003789C4 38 00 00 01 */ li r0, 1 /* 8037BA68 003789C8 7C 00 18 30 */ slw r0, r0, r3 /* 8037BA6C 003789CC 39 48 04 E0 */ addi r10, r8, 0x4e0 @@ -597,7 +597,7 @@ lbl_8037BB88: /* 8037BB98 00378AF8 90 07 00 00 */ stw r0, 0(r7) lbl_8037BB9C: /* 8037BB9C 00378AFC 38 00 00 61 */ li r0, 0x61 -/* 8037BBA0 00378B00 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037BBA0 00378B00 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037BBA4 00378B04 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037BBA8 00378B08 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037BBAC 00378B0C 38 00 00 00 */ li r0, 0 @@ -611,7 +611,7 @@ lbl_8037BB9C: .global GXSetNumTevStages GXSetNumTevStages: -/* 8037BBCC 00378B2C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037BBCC 00378B2C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037BBD0 00378B30 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8037BBD4 00378B34 38 03 FF FF */ addi r0, r3, -1 /* 8037BBD8 00378B38 80 64 02 04 */ lwz r3, 0x204(r4) diff --git a/asm/Dolphin/gx/GXTexture.s b/asm/Dolphin/gx/GXTexture.s index c802d859..e0f11209 100644 --- a/asm/Dolphin/gx/GXTexture.s +++ b/asm/Dolphin/gx/GXTexture.s @@ -826,7 +826,7 @@ GXLoadTexObjPreLoaded: /* 8037A400 00377360 88 1C 00 1F */ lbz r0, 0x1f(r28) /* 8037A404 00377364 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8037A408 00377368 40 82 00 3C */ bne lbl_8037A444 -/* 8037A40C 0037736C 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037A40C 0037736C 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037A410 00377370 80 7C 00 18 */ lwz r3, 0x18(r28) /* 8037A414 00377374 81 84 04 14 */ lwz r12, 0x414(r4) /* 8037A418 00377378 7D 88 03 A6 */ mtlr r12 @@ -841,7 +841,7 @@ GXLoadTexObjPreLoaded: /* 8037A43C 0037739C 80 03 00 04 */ lwz r0, 4(r3) /* 8037A440 003773A0 90 1F 80 00 */ stw r0, 0xCC008000@l(r31) lbl_8037A444: -/* 8037A444 003773A4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037A444 003773A4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037A448 003773A8 57 A4 10 3A */ slwi r4, r29, 2 /* 8037A44C 003773AC 80 7C 00 08 */ lwz r3, 8(r28) /* 8037A450 003773B0 38 00 00 00 */ li r0, 0 @@ -871,7 +871,7 @@ GXLoadTexObj: /* 8037A4A4 00377404 3B E4 00 00 */ addi r31, r4, 0 /* 8037A4A8 00377408 93 C1 00 10 */ stw r30, 0x10(r1) /* 8037A4AC 0037740C 3B C3 00 00 */ addi r30, r3, 0 -/* 8037A4B0 00377410 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037A4B0 00377410 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037A4B4 00377414 81 85 04 10 */ lwz r12, 0x410(r5) /* 8037A4B8 00377418 7D 88 03 A6 */ mtlr r12 /* 8037A4BC 0037741C 4E 80 00 21 */ blrl @@ -916,7 +916,7 @@ GXLoadTlut: /* 8037A540 003774A0 93 C1 00 18 */ stw r30, 0x18(r1) /* 8037A544 003774A4 7C 7E 1B 78 */ mr r30, r3 /* 8037A548 003774A8 38 64 00 00 */ addi r3, r4, 0 -/* 8037A54C 003774AC 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037A54C 003774AC 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037A550 003774B0 81 85 04 14 */ lwz r12, 0x414(r5) /* 8037A554 003774B4 7D 88 03 A6 */ mtlr r12 /* 8037A558 003774B8 4E 80 00 21 */ blrl @@ -1157,7 +1157,7 @@ GXInvalidateTexAll: .global GXSetTexRegionCallback GXSetTexRegionCallback: -/* 8037A888 003777E8 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037A888 003777E8 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037A88C 003777EC 84 04 04 10 */ lwzu r0, 0x410(r4) /* 8037A890 003777F0 90 64 00 00 */ stw r3, 0(r4) /* 8037A894 003777F4 7C 03 03 78 */ mr r3, r0 @@ -1165,7 +1165,7 @@ GXSetTexRegionCallback: .global GXSetTlutRegionCallback GXSetTlutRegionCallback: -/* 8037A89C 003777FC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037A89C 003777FC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037A8A0 00377800 84 04 04 14 */ lwzu r0, 0x414(r4) /* 8037A8A4 00377804 90 64 00 00 */ stw r3, 0(r4) /* 8037A8A8 00377808 7C 03 03 78 */ mr r3, r0 @@ -1173,7 +1173,7 @@ GXSetTlutRegionCallback: .global GXSetTexCoordScaleManually GXSetTexCoordScaleManually: -/* 8037A8B0 00377810 81 02 CE 08 */ lwz r8, lbl_805AEB28@sda21(r2) +/* 8037A8B0 00377810 81 02 CE 08 */ lwz r8, __GXData@sda21(r2) /* 8037A8B4 00377814 38 00 00 01 */ li r0, 1 /* 8037A8B8 00377818 54 84 06 3F */ clrlwi. r4, r4, 0x18 /* 8037A8BC 0037781C 80 E8 04 DC */ lwz r7, 0x4dc(r8) @@ -1211,7 +1211,7 @@ GXSetTexCoordScaleManually: .global GXSetTexCoordBias GXSetTexCoordBias: -/* 8037A93C 0037789C 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037A93C 0037789C 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037A940 003778A0 54 69 10 3A */ slwi r9, r3, 2 /* 8037A944 003778A4 7D 07 4A 14 */ add r8, r7, r9 /* 8037A948 003778A8 80 08 00 B8 */ lwz r0, 0xb8(r8) @@ -1245,7 +1245,7 @@ GXSetTexCoordBias: .global __SetSURegs __SetSURegs: -/* 8037A9B8 00377918 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037A9B8 00377918 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037A9BC 0037791C 54 88 10 3A */ slwi r8, r4, 2 /* 8037A9C0 00377920 54 60 10 3A */ slwi r0, r3, 2 /* 8037A9C4 00377924 7C 65 02 14 */ add r3, r5, r0 @@ -1298,7 +1298,7 @@ __GXSetSUTexRegs: /* 8037AA74 003779D4 90 01 00 04 */ stw r0, 4(r1) /* 8037AA78 003779D8 94 21 FF D8 */ stwu r1, -0x28(r1) /* 8037AA7C 003779DC BF 61 00 14 */ stmw r27, 0x14(r1) -/* 8037AA80 003779E0 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AA80 003779E0 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AA84 003779E4 80 03 04 DC */ lwz r0, 0x4dc(r3) /* 8037AA88 003779E8 28 00 00 FF */ cmplwi r0, 0xff /* 8037AA8C 003779EC 41 82 01 4C */ beq lbl_8037ABD8 @@ -1321,30 +1321,30 @@ lbl_8037AAC4: /* 8037AAC8 00377A28 40 80 00 54 */ bge lbl_8037AB1C /* 8037AACC 00377A2C 48 00 00 40 */ b lbl_8037AB0C lbl_8037AAD0: -/* 8037AAD0 00377A30 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AAD0 00377A30 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AAD4 00377A34 80 03 01 20 */ lwz r0, 0x120(r3) /* 8037AAD8 00377A38 54 1D 07 7E */ clrlwi r29, r0, 0x1d /* 8037AADC 00377A3C 54 1C EF 7E */ rlwinm r28, r0, 0x1d, 0x1d, 0x1f /* 8037AAE0 00377A40 48 00 00 3C */ b lbl_8037AB1C lbl_8037AAE4: -/* 8037AAE4 00377A44 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AAE4 00377A44 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AAE8 00377A48 80 03 01 20 */ lwz r0, 0x120(r3) /* 8037AAEC 00377A4C 54 1D D7 7E */ rlwinm r29, r0, 0x1a, 0x1d, 0x1f /* 8037AAF0 00377A50 54 1C BF 7E */ rlwinm r28, r0, 0x17, 0x1d, 0x1f /* 8037AAF4 00377A54 48 00 00 28 */ b lbl_8037AB1C lbl_8037AAF8: -/* 8037AAF8 00377A58 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AAF8 00377A58 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AAFC 00377A5C 80 03 01 20 */ lwz r0, 0x120(r3) /* 8037AB00 00377A60 54 1D A7 7E */ rlwinm r29, r0, 0x14, 0x1d, 0x1f /* 8037AB04 00377A64 54 1C 8F 7E */ rlwinm r28, r0, 0x11, 0x1d, 0x1f /* 8037AB08 00377A68 48 00 00 14 */ b lbl_8037AB1C lbl_8037AB0C: -/* 8037AB0C 00377A6C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AB0C 00377A6C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AB10 00377A70 80 03 01 20 */ lwz r0, 0x120(r3) /* 8037AB14 00377A74 54 1D 77 7E */ rlwinm r29, r0, 0xe, 0x1d, 0x1f /* 8037AB18 00377A78 54 1C 5F 7E */ rlwinm r28, r0, 0xb, 0x1d, 0x1f lbl_8037AB1C: -/* 8037AB1C 00377A7C 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037AB1C 00377A7C 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037AB20 00377A80 38 00 00 01 */ li r0, 1 /* 8037AB24 00377A84 7C 00 E0 30 */ slw r0, r0, r28 /* 8037AB28 00377A88 80 63 04 DC */ lwz r3, 0x4dc(r3) @@ -1362,7 +1362,7 @@ lbl_8037AB44: /* 8037AB50 00377AB0 3B 7F 00 00 */ addi r27, r31, 0 /* 8037AB54 00377AB4 48 00 00 7C */ b lbl_8037ABD0 lbl_8037AB58: -/* 8037AB58 00377AB8 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037AB58 00377AB8 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037AB5C 00377ABC 38 7B 04 9C */ addi r3, r27, 0x49c /* 8037AB60 00377AC0 57 E4 08 3A */ rlwinm r4, r31, 1, 0, 0x1d /* 8037AB64 00377AC4 7C 65 18 2E */ lwzx r3, r5, r3 diff --git a/asm/Dolphin/gx/GXTransform.s b/asm/Dolphin/gx/GXTransform.s index a512465a..67d50053 100644 --- a/asm/Dolphin/gx/GXTransform.s +++ b/asm/Dolphin/gx/GXTransform.s @@ -24,7 +24,7 @@ lbl_805AEBF0: .global GXSetProjection GXSetProjection: -/* 8037C244 003791A4 80 A2 CE 08 */ lwz r5, lbl_805AEB28@sda21(r2) +/* 8037C244 003791A4 80 A2 CE 08 */ lwz r5, __GXData@sda21(r2) /* 8037C248 003791A8 2C 04 00 01 */ cmpwi r4, 1 /* 8037C24C 003791AC 90 85 04 20 */ stw r4, 0x420(r5) /* 8037C250 003791B0 C0 03 00 00 */ lfs f0, 0(r3) @@ -48,7 +48,7 @@ lbl_8037C288: /* 8037C294 003791F4 D0 05 04 30 */ stfs f0, 0x430(r5) lbl_8037C298: /* 8037C298 003791F8 38 00 00 10 */ li r0, 0x10 -/* 8037C29C 003791FC 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C29C 003791FC 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C2A0 00379200 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C2A4 00379204 3C 60 00 06 */ lis r3, 0x00061020@ha /* 8037C2A8 00379208 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -81,7 +81,7 @@ GXSetProjectionv: /* 8037C308 00379268 7C 7F 1B 78 */ mr r31, r3 /* 8037C30C 0037926C C0 23 00 00 */ lfs f1, 0(r3) /* 8037C310 00379270 48 00 D6 45 */ bl __cvt_fp2unsigned -/* 8037C314 00379274 80 E2 CE 08 */ lwz r7, lbl_805AEB28@sda21(r2) +/* 8037C314 00379274 80 E2 CE 08 */ lwz r7, __GXData@sda21(r2) /* 8037C318 00379278 3C 80 00 06 */ lis r4, 0x00061020@ha /* 8037C31C 0037927C 38 C0 00 10 */ li r6, 0x10 /* 8037C320 00379280 90 67 04 20 */ stw r3, 0x420(r7) @@ -174,7 +174,7 @@ GXSetCurrentMtx: /* 8037C458 003793B8 7C 08 02 A6 */ mflr r0 /* 8037C45C 003793BC 90 01 00 04 */ stw r0, 4(r1) /* 8037C460 003793C0 94 21 FF F8 */ stwu r1, -8(r1) -/* 8037C464 003793C4 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C464 003793C4 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C468 003793C8 84 04 00 80 */ lwzu r0, 0x80(r4) /* 8037C46C 003793CC 54 00 00 32 */ rlwinm r0, r0, 0, 0, 0x19 /* 8037C470 003793D0 7C 00 1B 78 */ or r0, r0, r3 @@ -260,7 +260,7 @@ lbl_8037C578: /* 8037C580 003794E0 C0 02 CE D0 */ lfs f0, lbl_805AEBF0@sda21(r2) /* 8037C584 003794E4 C1 22 CE CC */ lfs f9, lbl_805AEBEC@sda21(r2) /* 8037C588 003794E8 EF E3 02 F2 */ fmuls f31, f3, f11 -/* 8037C58C 003794EC 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C58C 003794EC 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C590 003794F0 EC E4 02 F2 */ fmuls f7, f4, f11 /* 8037C594 003794F4 D0 23 04 3C */ stfs f1, 0x43c(r3) /* 8037C598 003794F8 ED 01 F8 2A */ fadds f8, f1, f31 @@ -284,7 +284,7 @@ lbl_8037C578: /* 8037C5E0 00379540 4B FF FB F1 */ bl __GXSetRange lbl_8037C5E4: /* 8037C5E4 00379544 38 00 00 10 */ li r0, 0x10 -/* 8037C5E8 00379548 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C5E8 00379548 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C5EC 0037954C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C5F0 00379550 3C 80 00 05 */ lis r4, 0x0005101A@ha /* 8037C5F4 00379554 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -323,7 +323,7 @@ GXSetViewport: .global GXSetScissor GXSetScissor: -/* 8037C66C 003795CC 81 02 CE 08 */ lwz r8, lbl_805AEB28@sda21(r2) +/* 8037C66C 003795CC 81 02 CE 08 */ lwz r8, __GXData@sda21(r2) /* 8037C670 003795D0 39 23 01 56 */ addi r9, r3, 0x156 /* 8037C674 003795D4 39 44 01 56 */ addi r10, r4, 0x156 /* 8037C678 003795D8 80 68 00 F8 */ lwz r3, 0xf8(r8) @@ -363,7 +363,7 @@ GXSetScissor: .global GXSetScissorBoxOffset GXSetScissorBoxOffset: /* 8037C6FC 0037965C 38 A3 01 56 */ addi r5, r3, 0x156 -/* 8037C700 00379660 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C700 00379660 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C704 00379664 38 04 01 56 */ addi r0, r4, 0x156 /* 8037C708 00379668 54 A4 F8 7E */ srwi r4, r5, 1 /* 8037C70C 0037966C 54 84 05 96 */ rlwinm r4, r4, 0, 0x16, 0xb @@ -382,7 +382,7 @@ GXSetScissorBoxOffset: .global GXSetClipMode GXSetClipMode: /* 8037C73C 0037969C 38 00 00 10 */ li r0, 0x10 -/* 8037C740 003796A0 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C740 003796A0 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C744 003796A4 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 8037C748 003796A8 98 06 80 00 */ stb r0, 0xCC008000@l(r6) /* 8037C74C 003796AC 38 A0 10 05 */ li r5, 0x1005 @@ -397,7 +397,7 @@ __GXSetMatrixIndex: /* 8037C764 003796C4 2C 03 00 05 */ cmpwi r3, 5 /* 8037C768 003796C8 40 80 00 3C */ bge lbl_8037C7A4 /* 8037C76C 003796CC 38 00 00 08 */ li r0, 8 -/* 8037C770 003796D0 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C770 003796D0 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C774 003796D4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C778 003796D8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037C77C 003796DC 38 00 00 30 */ li r0, 0x30 @@ -412,7 +412,7 @@ __GXSetMatrixIndex: /* 8037C7A0 00379700 48 00 00 38 */ b lbl_8037C7D8 lbl_8037C7A4: /* 8037C7A4 00379704 38 00 00 08 */ li r0, 8 -/* 8037C7A8 00379708 80 82 CE 08 */ lwz r4, lbl_805AEB28@sda21(r2) +/* 8037C7A8 00379708 80 82 CE 08 */ lwz r4, __GXData@sda21(r2) /* 8037C7AC 0037970C 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8037C7B0 00379710 98 05 80 00 */ stb r0, 0xCC008000@l(r5) /* 8037C7B4 00379714 38 00 00 40 */ li r0, 0x40 @@ -425,7 +425,7 @@ lbl_8037C7A4: /* 8037C7D0 00379730 90 05 80 00 */ stw r0, 0xCC008000@l(r5) /* 8037C7D4 00379734 90 85 80 00 */ stw r4, 0xCC008000@l(r5) lbl_8037C7D8: -/* 8037C7D8 00379738 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 8037C7D8 00379738 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 8037C7DC 0037973C 38 00 00 01 */ li r0, 1 /* 8037C7E0 00379740 B0 03 00 02 */ sth r0, 2(r3) /* 8037C7E4 00379744 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index a20e6a96..5e3a7625 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1769,7 +1769,7 @@ lbl_801A9FC8: /* 801A9FE8 001A6F48 41 82 00 14 */ beq lbl_801A9FFC /* 801A9FEC 001A6F4C 80 9F 02 78 */ lwz r4, 0x278(r31) /* 801A9FF0 001A6F50 38 BF 00 68 */ addi r5, r31, 0x68 -/* 801A9FF4 001A6F54 48 10 39 71 */ bl "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList" +/* 801A9FF4 001A6F54 48 10 39 71 */ bl "__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList" /* 801A9FF8 001A6F58 7C 60 1B 78 */ mr r0, r3 lbl_801A9FFC: /* 801A9FFC 001A6F5C 90 1F 02 7C */ stw r0, 0x27c(r31) diff --git a/asm/MetroidPrime/CEnvFxManager.s b/asm/MetroidPrime/CEnvFxManager.s index 0f4972af..222bfbad 100644 --- a/asm/MetroidPrime/CEnvFxManager.s +++ b/asm/MetroidPrime/CEnvFxManager.s @@ -1954,11 +1954,11 @@ lbl_802117F8: /* 80211960 0020E8C0 D8 01 02 30 */ stfd f0, 0x230(r1) lbl_80211964: /* 80211964 0020E8C4 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80211968 0020E8C8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80211968 0020E8C8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8021196C 0020E8CC 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 80211970 0020E8D0 38 00 00 00 */ li r0, 0 /* 80211974 0020E8D4 90 81 01 E0 */ stw r4, 0x1e0(r1) -/* 80211978 0020E8D8 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80211978 0020E8D8 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 8021197C 0020E8DC 90 61 01 E0 */ stw r3, 0x1e0(r1) /* 80211980 0020E8E0 98 01 01 30 */ stb r0, 0x130(r1) lbl_80211984: diff --git a/asm/MetroidPrime/CGameCollision.s b/asm/MetroidPrime/CGameCollision.s index 7c65f593..35668372 100644 --- a/asm/MetroidPrime/CGameCollision.s +++ b/asm/MetroidPrime/CGameCollision.s @@ -261,9 +261,9 @@ sub_8017fb84: /* 8017FDD0 0017CD30 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 8017FDD4 0017CD34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017FDD8 0017CD38 3B A4 CA F8 */ addi r29, r4, lbl_803ECAF8@l -/* 8017FDDC 0017CD3C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8017FDDC 0017CD3C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8017FDE0 0017CD40 93 A1 00 F8 */ stw r29, 0xf8(r1) -/* 8017FDE4 0017CD44 3B C3 97 E4 */ addi r30, r3, lbl_803D97E4@l +/* 8017FDE4 0017CD44 3B C3 97 E4 */ addi r30, r3, __vt__19CCollisionPrimitive@l /* 8017FDE8 0017CD48 93 C1 00 F8 */ stw r30, 0xf8(r1) /* 8017FDEC 0017CD4C 41 82 00 A0 */ beq lbl_8017FE8C /* 8017FDF0 0017CD50 34 E1 01 C0 */ addic. r7, r1, 0x1c0 diff --git a/asm/MetroidPrime/CGameProjectile.s b/asm/MetroidPrime/CGameProjectile.s index 5235912a..50e620dc 100644 --- a/asm/MetroidPrime/CGameProjectile.s +++ b/asm/MetroidPrime/CGameProjectile.s @@ -1894,8 +1894,8 @@ lbl_80038CB0: /* 80038CC4 00035C24 39 03 CA D0 */ addi r8, r3, lbl_803ECAD0@l /* 80038CC8 00035C28 C0 A1 00 EC */ lfs f5, 0xec(r1) /* 80038CCC 00035C2C 91 01 01 68 */ stw r8, 0x168(r1) -/* 80038CD0 00035C30 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80038CD4 00035C34 38 E3 97 E4 */ addi r7, r3, lbl_803D97E4@l +/* 80038CD0 00035C30 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80038CD4 00035C34 38 E3 97 E4 */ addi r7, r3, __vt__19CCollisionPrimitive@l /* 80038CD8 00035C38 C0 81 00 F0 */ lfs f4, 0xf0(r1) /* 80038CDC 00035C3C C0 61 00 F4 */ lfs f3, 0xf4(r1) /* 80038CE0 00035C40 FC 20 F0 90 */ fmr f1, f30 @@ -2020,7 +2020,7 @@ lbl_80038E7C: /* 80038EB4 00035E14 C0 97 00 04 */ lfs f4, 4(r23) /* 80038EB8 00035E18 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha /* 80038EBC 00035E1C C1 01 00 3C */ lfs f8, 0x3c(r1) -/* 80038EC0 00035E20 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80038EC0 00035E20 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80038EC4 00035E24 C0 C1 00 34 */ lfs f6, 0x34(r1) /* 80038EC8 00035E28 EC 04 01 F2 */ fmuls f0, f4, f7 /* 80038ECC 00035E2C C0 77 00 00 */ lfs f3, 0(r23) @@ -2031,7 +2031,7 @@ lbl_80038E7C: /* 80038EE0 00035E40 81 1B 00 6C */ lwz r8, 0x6c(r27) /* 80038EE4 00035E44 EC 03 01 BA */ fmadds f0, f3, f6, f0 /* 80038EE8 00035E48 A0 BB 00 08 */ lhz r5, 8(r27) -/* 80038EEC 00035E4C 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80038EEC 00035E4C 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80038EF0 00035E50 C0 22 84 14 */ lfs f1, lbl_805AA134@sda21(r2) /* 80038EF4 00035E54 38 00 00 00 */ li r0, 0 /* 80038EF8 00035E58 EC 45 02 3A */ fmadds f2, f5, f8, f0 @@ -2071,11 +2071,11 @@ lbl_80038E7C: /* 80038F80 00035EE0 48 00 00 50 */ b lbl_80038FD0 lbl_80038F84: /* 80038F84 00035EE4 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80038F88 00035EE8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80038F88 00035EE8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80038F8C 00035EEC 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 80038F90 00035EF0 38 00 00 00 */ li r0, 0 /* 80038F94 00035EF4 90 81 02 28 */ stw r4, 0x228(r1) -/* 80038F98 00035EF8 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80038F98 00035EF8 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80038F9C 00035EFC 90 61 02 28 */ stw r3, 0x228(r1) /* 80038FA0 00035F00 98 01 01 00 */ stb r0, 0x100(r1) lbl_80038FA4: diff --git a/asm/MetroidPrime/CPhysicsActor.s b/asm/MetroidPrime/CPhysicsActor.s index 9e854f3e..107675c3 100644 --- a/asm/MetroidPrime/CPhysicsActor.s +++ b/asm/MetroidPrime/CPhysicsActor.s @@ -2337,8 +2337,8 @@ lbl_8011C450: /* 8011C460 001193C0 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 8011C464 001193C4 90 1E 01 C0 */ stw r0, 0x1c0(r30) /* 8011C468 001193C8 41 82 00 10 */ beq lbl_8011C478 -/* 8011C46C 001193CC 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 8011C470 001193D0 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8011C46C 001193CC 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 8011C470 001193D0 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8011C474 001193D4 90 1E 01 C0 */ stw r0, 0x1c0(r30) lbl_8011C478: /* 8011C478 001193D8 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/CRagDoll.s b/asm/MetroidPrime/CRagDoll.s index 957ecb8e..cbd4fd60 100644 --- a/asm/MetroidPrime/CRagDoll.s +++ b/asm/MetroidPrime/CRagDoll.s @@ -1499,9 +1499,9 @@ lbl_8020DBF8: /* 8020DD14 0020AC74 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 8020DD18 0020AC78 88 01 01 28 */ lbz r0, 0x128(r1) /* 8020DD1C 0020AC7C 38 83 CA F8 */ addi r4, r3, lbl_803ECAF8@l -/* 8020DD20 0020AC80 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8020DD20 0020AC80 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8020DD24 0020AC84 90 81 00 90 */ stw r4, 0x90(r1) -/* 8020DD28 0020AC88 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 8020DD28 0020AC88 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 8020DD2C 0020AC8C 28 00 00 00 */ cmplwi r0, 0 /* 8020DD30 0020AC90 90 61 00 90 */ stw r3, 0x90(r1) /* 8020DD34 0020AC94 41 82 01 94 */ beq lbl_8020DEC8 diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index f73abb18..1ad6afe2 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -626,8 +626,8 @@ sub_80044008: /* 80044028 00040F88 90 03 0F 04 */ stw r0, 0xf04(r3) /* 8004402C 00040F8C 4E 80 00 20 */ blr -.global sub_80044030 -sub_80044030: +.global "SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>" +"SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>": /* 80044030 00040F90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80044034 00040F94 7C 08 02 A6 */ mflr r0 /* 80044038 00040F98 90 01 00 14 */ stw r0, 0x14(r1) @@ -652,13 +652,13 @@ lbl_80044070: /* 80044080 00040FE0 38 21 00 10 */ addi r1, r1, 0x10 /* 80044084 00040FE4 4E 80 00 20 */ blr -.global sub_80044088 -sub_80044088: +.global CurrentMaze__13CStateManagerFv +CurrentMaze__13CStateManagerFv: /* 80044088 00040FE8 80 63 0F 70 */ lwz r3, 0xf70(r3) /* 8004408C 00040FEC 4E 80 00 20 */ blr -.global sub_80044090 -sub_80044090: +.global GetCurrentMaze__13CStateManagerCFv +GetCurrentMaze__13CStateManagerCFv: /* 80044090 00040FF0 80 63 0F 70 */ lwz r3, 0xf70(r3) /* 80044094 00040FF4 4E 80 00 20 */ blr @@ -5423,8 +5423,8 @@ lbl_800482C8: /* 800482E0 00045240 38 21 00 70 */ addi r1, r1, 0x70 /* 800482E4 00045244 4E 80 00 20 */ blr -.global GenerateObject__13CStateManagerF9TEditorId -GenerateObject__13CStateManagerF9TEditorId: +.global GenerateObject__13CStateManagerFRC9TEditorId +GenerateObject__13CStateManagerFRC9TEditorId: /* 800482E8 00045248 94 21 FF 90 */ stwu r1, -0x70(r1) /* 800482EC 0004524C 7C 08 02 A6 */ mflr r0 /* 800482F0 00045250 90 01 00 74 */ stw r0, 0x74(r1) diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 3d8d2344..3173473e 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -11363,9 +11363,9 @@ lbl_8008ABF8: /* 8008AD18 00087C78 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 8008AD1C 00087C7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008AD20 00087C80 38 84 CA F8 */ addi r4, r4, lbl_803ECAF8@l -/* 8008AD24 00087C84 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8008AD24 00087C84 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8008AD28 00087C88 90 81 00 C0 */ stw r4, 0xc0(r1) -/* 8008AD2C 00087C8C 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 8008AD2C 00087C8C 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 8008AD30 00087C90 90 61 00 C0 */ stw r3, 0xc0(r1) /* 8008AD34 00087C94 41 82 01 00 */ beq lbl_8008AE34 /* 8008AD38 00087C98 C0 02 89 F8 */ lfs f0, lbl_805AA718@sda21(r2) @@ -11538,9 +11538,9 @@ lbl_8008AE34: /* 8008AFA0 00087F00 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 8008AFA4 00087F04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008AFA8 00087F08 38 84 CA F8 */ addi r4, r4, lbl_803ECAF8@l -/* 8008AFAC 00087F0C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8008AFAC 00087F0C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8008AFB0 00087F10 90 81 00 88 */ stw r4, 0x88(r1) -/* 8008AFB4 00087F14 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 8008AFB4 00087F14 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 8008AFB8 00087F18 90 61 00 88 */ stw r3, 0x88(r1) /* 8008AFBC 00087F1C 41 82 00 14 */ beq lbl_8008AFD0 /* 8008AFC0 00087F20 C8 01 00 28 */ lfd f0, 0x28(r1) diff --git a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s index 7f831f50..f4669715 100644 --- a/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s +++ b/asm/MetroidPrime/Cameras/CBallCameraFailsafeState.s @@ -851,9 +851,9 @@ lbl_8023F058: /* 8023F1C4 0023C124 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 8023F1C8 0023C128 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023F1CC 0023C12C 38 84 CA F8 */ addi r4, r4, lbl_803ECAF8@l -/* 8023F1D0 0023C130 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8023F1D0 0023C130 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8023F1D4 0023C134 90 81 00 80 */ stw r4, 0x80(r1) -/* 8023F1D8 0023C138 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 8023F1D8 0023C138 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 8023F1DC 0023C13C 90 61 00 80 */ stw r3, 0x80(r1) /* 8023F1E0 0023C140 41 82 00 14 */ beq lbl_8023F1F4 /* 8023F1E4 0023C144 C8 01 00 20 */ lfd f0, 0x20(r1) diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index ed73a12e..bbb6ab83 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -7175,8 +7175,8 @@ lbl_8022362C: /* 8022363C 0022059C 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 80223640 002205A0 90 1E 09 30 */ stw r0, 0x930(r30) /* 80223644 002205A4 41 82 00 10 */ beq lbl_80223654 -/* 80223648 002205A8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 8022364C 002205AC 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80223648 002205A8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 8022364C 002205AC 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80223650 002205B0 90 1E 09 30 */ stw r0, 0x930(r30) lbl_80223654: /* 80223654 002205B4 34 1E 09 28 */ addic. r0, r30, 0x928 diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 2536a06d..c9e23cb2 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -702,8 +702,8 @@ lbl_8015F0C0: /* 8015F0D0 0015C030 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 8015F0D4 0015C034 90 1E 06 90 */ stw r0, 0x690(r30) /* 8015F0D8 0015C038 41 82 00 10 */ beq lbl_8015F0E8 -/* 8015F0DC 0015C03C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 8015F0E0 0015C040 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8015F0DC 0015C03C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 8015F0E0 0015C040 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8015F0E4 0015C044 90 1E 06 90 */ stw r0, 0x690(r30) lbl_8015F0E8: /* 8015F0E8 0015C048 38 7E 05 7C */ addi r3, r30, 0x57c @@ -5795,10 +5795,10 @@ lbl_801639C8: /* 80163AF0 00160A50 90 01 00 F0 */ stw r0, 0xf0(r1) /* 80163AF4 00160A54 40 82 00 20 */ bne lbl_80163B14 /* 80163AF8 00160A58 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80163AFC 00160A5C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80163AFC 00160A5C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80163B00 00160A60 38 04 CA D0 */ addi r0, r4, lbl_803ECAD0@l /* 80163B04 00160A64 90 01 00 F8 */ stw r0, 0xf8(r1) -/* 80163B08 00160A68 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80163B08 00160A68 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80163B0C 00160A6C 90 01 00 F8 */ stw r0, 0xf8(r1) /* 80163B10 00160A70 48 00 00 A0 */ b lbl_80163BB0 lbl_80163B14: @@ -5832,10 +5832,10 @@ lbl_80163B28: /* 80163B7C 00160ADC B0 18 00 00 */ sth r0, 0(r24) lbl_80163B80: /* 80163B80 00160AE0 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80163B84 00160AE4 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80163B84 00160AE4 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80163B88 00160AE8 38 04 CA D0 */ addi r0, r4, lbl_803ECAD0@l /* 80163B8C 00160AEC 90 01 00 F8 */ stw r0, 0xf8(r1) -/* 80163B90 00160AF0 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80163B90 00160AF0 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80163B94 00160AF4 90 01 00 F8 */ stw r0, 0xf8(r1) lbl_80163B98: /* 80163B98 00160AF8 C0 22 9F 68 */ lfs f1, lbl_805ABC88@sda21(r2) diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 9373ca2c..9d37d55d 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -7300,8 +7300,8 @@ lbl_8022D6D8: /* 8022D6E8 0022A648 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 8022D6EC 0022A64C 90 1E 07 38 */ stw r0, 0x738(r30) /* 8022D6F0 0022A650 41 82 00 10 */ beq lbl_8022D700 -/* 8022D6F4 0022A654 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 8022D6F8 0022A658 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8022D6F4 0022A654 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 8022D6F8 0022A658 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8022D6FC 0022A65C 90 1E 07 38 */ stw r0, 0x738(r30) lbl_8022D700: /* 8022D700 0022A660 34 1E 07 30 */ addic. r0, r30, 0x730 diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index dfc7543e..9e8fbb36 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -1895,8 +1895,8 @@ lbl_80230F28: /* 80230F38 0022DE98 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 80230F3C 0022DE9C 90 1E 03 28 */ stw r0, 0x328(r30) /* 80230F40 0022DEA0 41 82 00 10 */ beq lbl_80230F50 -/* 80230F44 0022DEA4 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80230F48 0022DEA8 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80230F44 0022DEA4 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80230F48 0022DEA8 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80230F4C 0022DEAC 90 1E 03 28 */ stw r0, 0x328(r30) lbl_80230F50: /* 80230F50 0022DEB0 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Enemies/CIceSheegoth.s b/asm/MetroidPrime/Enemies/CIceSheegoth.s index 47e11a4e..9e1a205e 100644 --- a/asm/MetroidPrime/Enemies/CIceSheegoth.s +++ b/asm/MetroidPrime/Enemies/CIceSheegoth.s @@ -8888,8 +8888,8 @@ lbl_801A5CE8: /* 801A5CF8 001A2C58 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 801A5CFC 001A2C5C 90 1E 0A 30 */ stw r0, 0xa30(r30) /* 801A5D00 001A2C60 41 82 00 10 */ beq lbl_801A5D10 -/* 801A5D04 001A2C64 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 801A5D08 001A2C68 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 801A5D04 001A2C64 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 801A5D08 001A2C68 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 801A5D0C 001A2C6C 90 1E 0A 30 */ stw r0, 0xa30(r30) lbl_801A5D10: /* 801A5D10 001A2C70 34 1E 0A 2C */ addic. r0, r30, 0xa2c diff --git a/asm/MetroidPrime/Enemies/CMetroid.s b/asm/MetroidPrime/Enemies/CMetroid.s index a2c214c3..9239f8f4 100644 --- a/asm/MetroidPrime/Enemies/CMetroid.s +++ b/asm/MetroidPrime/Enemies/CMetroid.s @@ -9126,8 +9126,8 @@ lbl_80171DFC: /* 80171E0C 0016ED6C 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 80171E10 0016ED70 90 1E 06 A0 */ stw r0, 0x6a0(r30) /* 80171E14 0016ED74 41 82 00 10 */ beq lbl_80171E24 -/* 80171E18 0016ED78 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80171E1C 0016ED7C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80171E18 0016ED78 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80171E1C 0016ED7C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80171E20 0016ED80 90 1E 06 A0 */ stw r0, 0x6a0(r30) lbl_80171E24: /* 80171E24 0016ED84 38 7E 05 6C */ addi r3, r30, 0x56c diff --git a/asm/MetroidPrime/Enemies/CMetroidBeta.s b/asm/MetroidPrime/Enemies/CMetroidBeta.s index 9bc85324..44dcb5a5 100644 --- a/asm/MetroidPrime/Enemies/CMetroidBeta.s +++ b/asm/MetroidPrime/Enemies/CMetroidBeta.s @@ -6093,8 +6093,8 @@ lbl_801C5FB4: /* 801C5FC4 001C2F24 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 801C5FC8 001C2F28 90 1E 07 68 */ stw r0, 0x768(r30) /* 801C5FCC 001C2F2C 41 82 00 10 */ beq lbl_801C5FDC -/* 801C5FD0 001C2F30 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 801C5FD4 001C2F34 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 801C5FD0 001C2F30 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 801C5FD4 001C2F34 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 801C5FD8 001C2F38 90 1E 07 68 */ stw r0, 0x768(r30) lbl_801C5FDC: /* 801C5FDC 001C2F3C 34 1E 07 64 */ addic. r0, r30, 0x764 diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 3e291efb..10d3c3f0 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -2676,11 +2676,11 @@ sub_8027e870: /* 8027EB0C 0027BA6C 2C 05 00 00 */ cmpwi r5, 0 /* 8027EB10 0027BA70 40 81 00 C0 */ ble lbl_8027EBD0 /* 8027EB14 0027BA74 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 8027EB18 0027BA78 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8027EB18 0027BA78 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8027EB1C 0027BA7C 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 8027EB20 0027BA80 38 80 00 00 */ li r4, 0 /* 8027EB24 0027BA84 90 01 00 A8 */ stw r0, 0xa8(r1) -/* 8027EB28 0027BA88 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8027EB28 0027BA88 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8027EB2C 0027BA8C 90 01 00 A8 */ stw r0, 0xa8(r1) /* 8027EB30 0027BA90 40 81 00 40 */ ble lbl_8027EB70 /* 8027EB34 0027BA94 2C 05 00 08 */ cmpwi r5, 8 @@ -2788,9 +2788,9 @@ lbl_8027EBD0: /* 8027ECA8 0027BC08 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 8027ECAC 0027BC0C 80 A1 01 40 */ lwz r5, 0x140(r1) /* 8027ECB0 0027BC10 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l -/* 8027ECB4 0027BC14 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8027ECB4 0027BC14 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8027ECB8 0027BC18 90 01 00 A8 */ stw r0, 0xa8(r1) -/* 8027ECBC 0027BC1C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8027ECBC 0027BC1C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8027ECC0 0027BC20 2C 05 00 00 */ cmpwi r5, 0 /* 8027ECC4 0027BC24 38 60 00 00 */ li r3, 0 /* 8027ECC8 0027BC28 90 01 00 A8 */ stw r0, 0xa8(r1) @@ -2846,9 +2846,9 @@ lbl_8027ED6C: /* 8027ED6C 0027BCCC 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 8027ED70 0027BCD0 80 A1 01 40 */ lwz r5, 0x140(r1) /* 8027ED74 0027BCD4 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l -/* 8027ED78 0027BCD8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8027ED78 0027BCD8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8027ED7C 0027BCDC 90 01 00 A8 */ stw r0, 0xa8(r1) -/* 8027ED80 0027BCE0 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8027ED80 0027BCE0 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8027ED84 0027BCE4 2C 05 00 00 */ cmpwi r5, 0 /* 8027ED88 0027BCE8 38 60 00 00 */ li r3, 0 /* 8027ED8C 0027BCEC 90 01 00 A8 */ stw r0, 0xa8(r1) diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 0940c6a8..601f65a3 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -3712,7 +3712,7 @@ lbl_80273AF0: /* 80273B40 00270AA0 7F C4 F3 78 */ mr r4, r30 /* 80273B44 00270AA4 7F 65 DB 78 */ mr r5, r27 /* 80273B48 00270AA8 38 61 00 2C */ addi r3, r1, 0x2c -/* 80273B4C 00270AAC 4B DD 47 9D */ bl GenerateObject__13CStateManagerF9TEditorId +/* 80273B4C 00270AAC 4B DD 47 9D */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 80273B50 00270AB0 A0 01 00 30 */ lhz r0, 0x30(r1) /* 80273B54 00270AB4 7F C3 F3 78 */ mr r3, r30 /* 80273B58 00270AB8 38 81 00 10 */ addi r4, r1, 0x10 diff --git a/asm/MetroidPrime/Enemies/CParasite.s b/asm/MetroidPrime/Enemies/CParasite.s index 5d97171e..9f3c4843 100644 --- a/asm/MetroidPrime/Enemies/CParasite.s +++ b/asm/MetroidPrime/Enemies/CParasite.s @@ -367,8 +367,8 @@ __dt__11CWallWalkerFv: /* 80156AB0 00153A10 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 80156AB4 00153A14 90 1E 05 90 */ stw r0, 0x590(r30) /* 80156AB8 00153A18 41 82 00 10 */ beq lbl_80156AC8 -/* 80156ABC 00153A1C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80156AC0 00153A20 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80156ABC 00153A1C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80156AC0 00153A20 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80156AC4 00153A24 90 1E 05 90 */ stw r0, 0x590(r30) lbl_80156AC8: /* 80156AC8 00153A28 7F C3 F3 78 */ mr r3, r30 @@ -3266,10 +3266,10 @@ lbl_80159364: /* 80159430 00156390 D0 01 00 8C */ stfs f0, 0x8c(r1) /* 80159434 00156394 48 02 9F 6D */ bl DetectStaticCollisionBoolean__14CGameCollisionFRC13CStateManagerRC19CCollisionPrimitiveRC12CTransform4fRC15CMaterialFilter /* 80159438 00156398 3C A0 80 3F */ lis r5, lbl_803ECAD0@ha -/* 8015943C 0015639C 3C 80 80 3E */ lis r4, lbl_803D97E4@ha +/* 8015943C 0015639C 3C 80 80 3E */ lis r4, __vt__19CCollisionPrimitive@ha /* 80159440 001563A0 38 05 CA D0 */ addi r0, r5, lbl_803ECAD0@l /* 80159444 001563A4 90 01 00 68 */ stw r0, 0x68(r1) -/* 80159448 001563A8 38 04 97 E4 */ addi r0, r4, lbl_803D97E4@l +/* 80159448 001563A8 38 04 97 E4 */ addi r0, r4, __vt__19CCollisionPrimitive@l /* 8015944C 001563AC 90 01 00 68 */ stw r0, 0x68(r1) /* 80159450 001563B0 83 E1 00 9C */ lwz r31, 0x9c(r1) /* 80159454 001563B4 83 C1 00 98 */ lwz r30, 0x98(r1) diff --git a/asm/MetroidPrime/Enemies/CPuddleSpore.s b/asm/MetroidPrime/Enemies/CPuddleSpore.s index ab362e53..6422e4d5 100644 --- a/asm/MetroidPrime/Enemies/CPuddleSpore.s +++ b/asm/MetroidPrime/Enemies/CPuddleSpore.s @@ -293,8 +293,8 @@ lbl_80146B80: /* 80146B90 00143AF0 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 80146B94 00143AF4 90 1E 05 A0 */ stw r0, 0x5a0(r30) /* 80146B98 00143AF8 41 82 00 10 */ beq lbl_80146BA8 -/* 80146B9C 00143AFC 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80146BA0 00143B00 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80146B9C 00143AFC 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80146BA0 00143B00 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80146BA4 00143B04 90 1E 05 A0 */ stw r0, 0x5a0(r30) lbl_80146BA8: /* 80146BA8 00143B08 7F C3 F3 78 */ mr r3, r30 @@ -898,13 +898,13 @@ UpdateBoundingState__12CPuddleSporeFRC6CAABoxR13CStateManager: /* 801473E4 00144344 39 03 CA D0 */ addi r8, r3, lbl_803ECAD0@l /* 801473E8 00144348 C0 BC 00 04 */ lfs f5, 4(r28) /* 801473EC 0014434C C0 9C 00 08 */ lfs f4, 8(r28) -/* 801473F0 00144350 3C A0 80 3E */ lis r5, lbl_803D97E4@ha +/* 801473F0 00144350 3C A0 80 3E */ lis r5, __vt__19CCollisionPrimitive@ha /* 801473F4 00144354 C0 7C 00 0C */ lfs f3, 0xc(r28) /* 801473F8 00144358 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801473FC 0014435C C0 5C 00 10 */ lfs f2, 0x10(r28) /* 80147400 00144360 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l /* 80147404 00144364 C0 3C 00 14 */ lfs f1, 0x14(r28) -/* 80147408 00144368 38 05 97 E4 */ addi r0, r5, lbl_803D97E4@l +/* 80147408 00144368 38 05 97 E4 */ addi r0, r5, __vt__19CCollisionPrimitive@l /* 8014740C 0014436C 91 01 00 90 */ stw r8, 0x90(r1) /* 80147410 00144370 7C 85 23 78 */ mr r5, r4 /* 80147414 00144374 C8 01 00 98 */ lfd f0, 0x98(r1) diff --git a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s index 9e024060..49a33625 100644 --- a/asm/MetroidPrime/Enemies/CPuddleToadGamma.s +++ b/asm/MetroidPrime/Enemies/CPuddleToadGamma.s @@ -2145,7 +2145,7 @@ lbl_8014CC14: /* 8014CF50 00149EB0 41 82 00 14 */ beq lbl_8014CF64 /* 8014CF54 00149EB4 80 81 00 48 */ lwz r4, 0x48(r1) /* 8014CF58 00149EB8 38 BD 00 68 */ addi r5, r29, 0x68 -/* 8014CF5C 00149EBC 48 16 0A 09 */ bl "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList" +/* 8014CF5C 00149EBC 48 16 0A 09 */ bl "__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList" /* 8014CF60 00149EC0 7C 7E 1B 78 */ mr r30, r3 lbl_8014CF64: /* 8014CF64 00149EC4 80 7D 05 E4 */ lwz r3, 0x5e4(r29) diff --git a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s index 0c100192..d9066e58 100644 --- a/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s +++ b/asm/MetroidPrime/Enemies/CRipperControlledPlatform.s @@ -362,7 +362,7 @@ lbl_80232B78: /* 80232C44 0022FBA4 93 C1 00 1C */ stw r30, 0x1c(r1) /* 80232C48 0022FBA8 90 01 00 20 */ stw r0, 0x20(r1) /* 80232C4C 0022FBAC 90 01 00 24 */ stw r0, 0x24(r1) -/* 80232C50 0022FBB0 4B E8 11 B1 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii" +/* 80232C50 0022FBB0 4B E8 11 B1 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi" /* 80232C54 0022FBB4 38 61 00 34 */ addi r3, r1, 0x34 /* 80232C58 0022FBB8 38 80 FF FF */ li r4, -1 /* 80232C5C 0022FBBC 4B ED 39 AD */ bl __dt__16CLightParametersFv diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index 316d125f..288fe9fa 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -7277,7 +7277,7 @@ lbl_801E0640: /* 801E0640 001DD5A0 7F E4 FB 78 */ mr r4, r31 /* 801E0644 001DD5A4 38 61 00 EC */ addi r3, r1, 0xec /* 801E0648 001DD5A8 38 BE 06 0C */ addi r5, r30, 0x60c -/* 801E064C 001DD5AC 4B E6 7C 9D */ bl GenerateObject__13CStateManagerF9TEditorId +/* 801E064C 001DD5AC 4B E6 7C 9D */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 801E0650 001DD5B0 A0 81 00 F0 */ lhz r4, 0xf0(r1) /* 801E0654 001DD5B4 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13) /* 801E0658 001DD5B8 54 83 04 3E */ clrlwi r3, r4, 0x10 diff --git a/asm/MetroidPrime/Enemies/CTryclops.s b/asm/MetroidPrime/Enemies/CTryclops.s index 262e51b7..6ff3254c 100644 --- a/asm/MetroidPrime/Enemies/CTryclops.s +++ b/asm/MetroidPrime/Enemies/CTryclops.s @@ -452,11 +452,11 @@ lbl_8025DE14: /* 8025DE14 0025AD74 42 00 00 00 */ bdnz lbl_8025DE14 lbl_8025DE18: /* 8025DE18 0025AD78 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 8025DE1C 0025AD7C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8025DE1C 0025AD7C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8025DE20 0025AD80 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 8025DE24 0025AD84 38 80 00 00 */ li r4, 0 /* 8025DE28 0025AD88 90 01 00 78 */ stw r0, 0x78(r1) -/* 8025DE2C 0025AD8C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8025DE2C 0025AD8C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8025DE30 0025AD90 38 60 00 01 */ li r3, 1 /* 8025DE34 0025AD94 90 81 01 B0 */ stw r4, 0x1b0(r1) /* 8025DE38 0025AD98 90 01 00 78 */ stw r0, 0x78(r1) @@ -537,11 +537,11 @@ lbl_8025DF50: /* 8025DF50 0025AEB0 42 00 00 00 */ bdnz lbl_8025DF50 lbl_8025DF54: /* 8025DF54 0025AEB4 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 8025DF58 0025AEB8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8025DF58 0025AEB8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8025DF5C 0025AEBC 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 8025DF60 0025AEC0 38 80 00 00 */ li r4, 0 /* 8025DF64 0025AEC4 90 01 00 78 */ stw r0, 0x78(r1) -/* 8025DF68 0025AEC8 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8025DF68 0025AEC8 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8025DF6C 0025AECC 38 60 00 01 */ li r3, 1 /* 8025DF70 0025AED0 90 81 01 B0 */ stw r4, 0x1b0(r1) /* 8025DF74 0025AED4 90 01 00 78 */ stw r0, 0x78(r1) @@ -577,11 +577,11 @@ lbl_8025DFD8: /* 8025DFD8 0025AF38 42 00 00 00 */ bdnz lbl_8025DFD8 lbl_8025DFDC: /* 8025DFDC 0025AF3C 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 8025DFE0 0025AF40 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8025DFE0 0025AF40 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8025DFE4 0025AF44 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 8025DFE8 0025AF48 38 80 00 00 */ li r4, 0 /* 8025DFEC 0025AF4C 90 01 00 78 */ stw r0, 0x78(r1) -/* 8025DFF0 0025AF50 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8025DFF0 0025AF50 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8025DFF4 0025AF54 38 60 00 00 */ li r3, 0 /* 8025DFF8 0025AF58 90 81 01 B0 */ stw r4, 0x1b0(r1) /* 8025DFFC 0025AF5C 90 01 00 78 */ stw r0, 0x78(r1) diff --git a/asm/MetroidPrime/Enemies/CWarWasp.s b/asm/MetroidPrime/Enemies/CWarWasp.s index 58773045..1176cf65 100644 --- a/asm/MetroidPrime/Enemies/CWarWasp.s +++ b/asm/MetroidPrime/Enemies/CWarWasp.s @@ -6998,8 +6998,8 @@ lbl_80110B9C: /* 80110BAC 0010DB0C 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 80110BB0 0010DB10 90 1E 05 70 */ stw r0, 0x570(r30) /* 80110BB4 0010DB14 41 82 00 10 */ beq lbl_80110BC4 -/* 80110BB8 0010DB18 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80110BBC 0010DB1C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80110BB8 0010DB18 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80110BBC 0010DB1C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80110BC0 0010DB20 90 1E 05 70 */ stw r0, 0x570(r30) lbl_80110BC4: /* 80110BC4 0010DB24 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/MetroidPrime/Player/CMorphBall.s b/asm/MetroidPrime/Player/CMorphBall.s index a2709c0b..34e7df8a 100644 --- a/asm/MetroidPrime/Player/CMorphBall.s +++ b/asm/MetroidPrime/Player/CMorphBall.s @@ -3902,9 +3902,9 @@ lbl_800F01D8: /* 800F039C 000ED2FC 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha /* 800F03A0 000ED300 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F03A4 000ED304 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l -/* 800F03A8 000ED308 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F03A8 000ED308 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F03AC 000ED30C 90 81 01 30 */ stw r4, 0x130(r1) -/* 800F03B0 000ED310 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 800F03B0 000ED310 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 800F03B4 000ED314 90 61 01 30 */ stw r3, 0x130(r1) /* 800F03B8 000ED318 41 82 01 88 */ beq lbl_800F0540 /* 800F03BC 000ED31C 7F A3 EB 78 */ mr r3, r29 @@ -5245,11 +5245,11 @@ lbl_800F16E4: /* 800F16E4 000EE644 42 00 00 00 */ bdnz lbl_800F16E4 lbl_800F16E8: /* 800F16E8 000EE648 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F16EC 000EE64C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F16EC 000EE64C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F16F0 000EE650 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F16F4 000EE654 38 80 00 00 */ li r4, 0 /* 800F16F8 000EE658 90 01 00 38 */ stw r0, 0x38(r1) -/* 800F16FC 000EE65C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F16FC 000EE65C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F1700 000EE660 38 60 00 01 */ li r3, 1 /* 800F1704 000EE664 90 81 00 F8 */ stw r4, 0xf8(r1) /* 800F1708 000EE668 90 01 00 38 */ stw r0, 0x38(r1) @@ -5326,11 +5326,11 @@ lbl_800F1810: /* 800F1810 000EE770 42 00 00 00 */ bdnz lbl_800F1810 lbl_800F1814: /* 800F1814 000EE774 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F1818 000EE778 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F1818 000EE778 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F181C 000EE77C 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F1820 000EE780 38 80 00 00 */ li r4, 0 /* 800F1824 000EE784 90 01 00 38 */ stw r0, 0x38(r1) -/* 800F1828 000EE788 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F1828 000EE788 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F182C 000EE78C 38 60 00 01 */ li r3, 1 /* 800F1830 000EE790 90 81 00 F8 */ stw r4, 0xf8(r1) /* 800F1834 000EE794 90 01 00 38 */ stw r0, 0x38(r1) @@ -5366,11 +5366,11 @@ lbl_800F1898: /* 800F1898 000EE7F8 42 00 00 00 */ bdnz lbl_800F1898 lbl_800F189C: /* 800F189C 000EE7FC 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F18A0 000EE800 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F18A0 000EE800 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F18A4 000EE804 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F18A8 000EE808 38 80 00 00 */ li r4, 0 /* 800F18AC 000EE80C 90 01 00 38 */ stw r0, 0x38(r1) -/* 800F18B0 000EE810 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F18B0 000EE810 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F18B4 000EE814 38 60 00 00 */ li r3, 0 /* 800F18B8 000EE818 90 81 00 F8 */ stw r4, 0xf8(r1) /* 800F18BC 000EE81C 90 01 00 38 */ stw r0, 0x38(r1) @@ -6905,7 +6905,7 @@ PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes: /* 800F2ECC 000EFE2C 50 60 2E F6 */ rlwimi r0, r3, 5, 0x1b, 0x1b /* 800F2ED0 000EFE30 C0 02 91 FC */ lfs f0, lbl_805AAF1C@sda21(r2) /* 800F2ED4 000EFE34 98 1E 02 98 */ stb r0, 0x298(r30) -/* 800F2ED8 000EFE38 3C A0 80 3E */ lis r5, lbl_803D97E4@ha +/* 800F2ED8 000EFE38 3C A0 80 3E */ lis r5, __vt__19CCollisionPrimitive@ha /* 800F2EDC 000EFE3C 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha /* 800F2EE0 000EFE40 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800F2EE4 000EFE44 D0 1E 02 D0 */ stfs f0, 0x2d0(r30) @@ -6914,7 +6914,7 @@ PreRender__10CMorphBallFR13CStateManagerRC14CFrustumPlanes: /* 800F2EF0 000EFE50 3B E3 66 A0 */ addi r31, r3, sZeroVector__9CVector3f@l /* 800F2EF4 000EFE54 88 DE 02 98 */ lbz r6, 0x298(r30) /* 800F2EF8 000EFE58 50 E6 3E 30 */ rlwimi r6, r7, 7, 0x18, 0x18 -/* 800F2EFC 000EFE5C 38 A5 97 E4 */ addi r5, r5, lbl_803D97E4@l +/* 800F2EFC 000EFE5C 38 A5 97 E4 */ addi r5, r5, __vt__19CCollisionPrimitive@l /* 800F2F00 000EFE60 7F 84 E3 78 */ mr r4, r28 /* 800F2F04 000EFE64 98 DE 02 98 */ stb r6, 0x298(r30) /* 800F2F08 000EFE68 38 61 01 08 */ addi r3, r1, 0x108 @@ -6998,9 +6998,9 @@ lbl_800F3020: /* 800F303C 000EFF9C 80 67 02 9C */ lwz r3, 0x29c(r7) /* 800F3040 000EFFA0 7C 03 00 40 */ cmplw r3, r0 /* 800F3044 000EFFA4 41 82 00 F8 */ beq lbl_800F313C -/* 800F3048 000EFFA8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F3048 000EFFA8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F304C 000EFFAC C0 3F 00 04 */ lfs f1, 4(r31) -/* 800F3050 000EFFB0 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F3050 000EFFB0 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F3054 000EFFB4 C0 1F 00 08 */ lfs f0, 8(r31) /* 800F3058 000EFFB8 90 01 00 80 */ stw r0, 0x80(r1) /* 800F305C 000EFFBC 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha @@ -7053,10 +7053,10 @@ lbl_800F3020: /* 800F3118 000F0078 39 20 00 00 */ li r9, 0 /* 800F311C 000F007C 48 01 E0 B5 */ bl BuildLightShadowTexture__12CWorldShadowFRC13CStateManager7TAreaIdUiRC6CAABoxbb /* 800F3120 000F0080 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F3124 000F0084 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F3124 000F0084 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F3128 000F0088 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F312C 000F008C 90 01 00 80 */ stw r0, 0x80(r1) -/* 800F3130 000F0090 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F3130 000F0090 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F3134 000F0094 90 01 00 80 */ stw r0, 0x80(r1) /* 800F3138 000F0098 48 00 00 0C */ b lbl_800F3144 lbl_800F313C: @@ -7114,10 +7114,10 @@ lbl_800F31A8: /* 800F31FC 000F015C 4B F3 98 09 */ bl PreRender__9CAnimDataFv lbl_800F3200: /* 800F3200 000F0160 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 800F3204 000F0164 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 800F3204 000F0164 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 800F3208 000F0168 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 800F320C 000F016C 90 01 00 B8 */ stw r0, 0xb8(r1) -/* 800F3210 000F0170 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F3210 000F0170 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F3214 000F0174 90 01 00 B8 */ stw r0, 0xb8(r1) lbl_800F3218: /* 800F3218 000F0178 BB 61 01 3C */ lmw r27, 0x13c(r1) @@ -13986,8 +13986,8 @@ lbl_800F9518: /* 800F9528 000F6488 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 800F952C 000F648C 90 1E 00 38 */ stw r0, 0x38(r30) /* 800F9530 000F6490 41 82 00 10 */ beq lbl_800F9540 -/* 800F9534 000F6494 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 800F9538 000F6498 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800F9534 000F6494 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 800F9538 000F6498 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800F953C 000F649C 90 1E 00 38 */ stw r0, 0x38(r30) lbl_800F9540: /* 800F9540 000F64A0 7F E0 07 35 */ extsh. r0, r31 diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index f8e69311..a02c5419 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -81,8 +81,8 @@ lbl_803D978C: .4byte lbl_80016C30 .4byte lbl_80016A14 -.global lbl_803D97E4 -lbl_803D97E4: +.global __vt__19CCollisionPrimitive +__vt__19CCollisionPrimitive: # ROM: 0x3D67E4 .4byte 0 .4byte 0 @@ -2337,11 +2337,11 @@ lbl_80011538: /* 80011538 0000E498 42 00 00 00 */ bdnz lbl_80011538 lbl_8001153C: /* 8001153C 0000E49C 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 80011540 0000E4A0 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80011540 0000E4A0 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80011544 0000E4A4 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 80011548 0000E4A8 38 80 00 00 */ li r4, 0 /* 8001154C 0000E4AC 90 01 00 E0 */ stw r0, 0xe0(r1) -/* 80011550 0000E4B0 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80011550 0000E4B0 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80011554 0000E4B4 90 81 01 B8 */ stw r4, 0x1b8(r1) /* 80011558 0000E4B8 90 01 00 E0 */ stw r0, 0xe0(r1) lbl_8001155C: @@ -2494,8 +2494,8 @@ __dt__17CCollidableSphere: /* 80011768 0000E6C8 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l /* 8001176C 0000E6CC 90 1F 00 00 */ stw r0, 0(r31) /* 80011770 0000E6D0 41 82 00 10 */ beq lbl_80011780 -/* 80011774 0000E6D4 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80011778 0000E6D8 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80011774 0000E6D4 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80011778 0000E6D8 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8001177C 0000E6DC 90 1F 00 00 */ stw r0, 0(r31) lbl_80011780: /* 80011780 0000E6E0 7C 80 07 35 */ extsh. r0, r4 @@ -2518,9 +2518,9 @@ __dt__19CCollisionPrimitiveFv: /* 800117B4 0000E714 93 E1 00 0C */ stw r31, 0xc(r1) /* 800117B8 0000E718 7C 7F 1B 79 */ or. r31, r3, r3 /* 800117BC 0000E71C 41 82 00 1C */ beq lbl_800117D8 -/* 800117C0 0000E720 3C A0 80 3E */ lis r5, lbl_803D97E4@ha +/* 800117C0 0000E720 3C A0 80 3E */ lis r5, __vt__19CCollisionPrimitive@ha /* 800117C4 0000E724 7C 80 07 35 */ extsh. r0, r4 -/* 800117C8 0000E728 38 05 97 E4 */ addi r0, r5, lbl_803D97E4@l +/* 800117C8 0000E728 38 05 97 E4 */ addi r0, r5, __vt__19CCollisionPrimitive@l /* 800117CC 0000E72C 90 1F 00 00 */ stw r0, 0(r31) /* 800117D0 0000E730 40 81 00 08 */ ble lbl_800117D8 /* 800117D4 0000E734 48 30 41 5D */ bl Free__7CMemoryFPCv @@ -4004,7 +4004,7 @@ lbl_80012B20: /* 80012C2C 0000FB8C 3C C0 80 3F */ lis r6, lbl_803ECAD0@ha /* 80012C30 0000FB90 C0 07 00 00 */ lfs f0, 0(r7) /* 80012C34 0000FB94 3C A0 80 5A */ lis r5, sIdentity__12CTransform4f@ha -/* 80012C38 0000FB98 3C 80 80 3E */ lis r4, lbl_803D97E4@ha +/* 80012C38 0000FB98 3C 80 80 3E */ lis r4, __vt__19CCollisionPrimitive@ha /* 80012C3C 0000FB9C FF 80 10 18 */ frsp f28, f2 /* 80012C40 0000FBA0 D0 1F 00 00 */ stfs f0, 0(r31) /* 80012C44 0000FBA4 FF A0 18 18 */ frsp f29, f3 @@ -4016,7 +4016,7 @@ lbl_80012B20: /* 80012C5C 0000FBBC 3B 66 CA D0 */ addi r27, r6, lbl_803ECAD0@l /* 80012C60 0000FBC0 D0 1F 00 04 */ stfs f0, 4(r31) /* 80012C64 0000FBC4 3B 85 66 70 */ addi r28, r5, sIdentity__12CTransform4f@l -/* 80012C68 0000FBC8 3B A4 97 E4 */ addi r29, r4, lbl_803D97E4@l +/* 80012C68 0000FBC8 3B A4 97 E4 */ addi r29, r4, __vt__19CCollisionPrimitive@l /* 80012C6C 0000FBCC 3B 20 00 00 */ li r25, 0 /* 80012C70 0000FBD0 C0 07 00 08 */ lfs f0, 8(r7) /* 80012C74 0000FBD4 D0 41 00 44 */ stfs f2, 0x44(r1) @@ -4090,9 +4090,9 @@ lbl_80012C80: /* 80012D80 0000FCE0 3C 60 80 3F */ lis r3, lbl_803ECAD0@ha /* 80012D84 0000FCE4 80 A1 01 10 */ lwz r5, 0x110(r1) /* 80012D88 0000FCE8 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l -/* 80012D8C 0000FCEC 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80012D8C 0000FCEC 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80012D90 0000FCF0 90 01 00 E8 */ stw r0, 0xe8(r1) -/* 80012D94 0000FCF4 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80012D94 0000FCF4 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80012D98 0000FCF8 2C 05 00 00 */ cmpwi r5, 0 /* 80012D9C 0000FCFC 38 60 00 00 */ li r3, 0 /* 80012DA0 0000FD00 90 01 00 E8 */ stw r0, 0xe8(r1) @@ -4182,8 +4182,8 @@ __dt__16CCollidableAABoxFv: /* 80012EBC 0000FE1C 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l /* 80012EC0 0000FE20 90 1F 00 00 */ stw r0, 0(r31) /* 80012EC4 0000FE24 41 82 00 10 */ beq lbl_80012ED4 -/* 80012EC8 0000FE28 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80012ECC 0000FE2C 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80012EC8 0000FE28 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80012ECC 0000FE2C 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80012ED0 0000FE30 90 1F 00 00 */ stw r0, 0(r31) lbl_80012ED4: /* 80012ED4 0000FE34 7C 80 07 35 */ extsh. r0, r4 @@ -6681,10 +6681,10 @@ lbl_800151FC: /* 8001520C 0001216C 90 07 00 00 */ stw r0, 0(r7) lbl_80015210: /* 80015210 00012170 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80015214 00012174 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80015214 00012174 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80015218 00012178 38 04 CA D0 */ addi r0, r4, lbl_803ECAD0@l /* 8001521C 0001217C 90 01 01 A8 */ stw r0, 0x1a8(r1) -/* 80015220 00012180 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80015220 00012180 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80015224 00012184 90 01 01 A8 */ stw r0, 0x1a8(r1) lbl_80015228: /* 80015228 00012188 7F A3 EB 78 */ mr r3, r29 diff --git a/asm/MetroidPrime/Player/CPlayerOrbit.s b/asm/MetroidPrime/Player/CPlayerOrbit.s index de4bca70..49fa5bbb 100644 --- a/asm/MetroidPrime/Player/CPlayerOrbit.s +++ b/asm/MetroidPrime/Player/CPlayerOrbit.s @@ -1301,9 +1301,9 @@ ValidateFPPosition__7CPlayerF9CVector3fR13CStateManager: /* 8017A568 001774C8 3C 60 80 3F */ lis r3, lbl_803ECAD0@ha /* 8017A56C 001774CC 80 A1 00 E0 */ lwz r5, 0xe0(r1) /* 8017A570 001774D0 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l -/* 8017A574 001774D4 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8017A574 001774D4 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8017A578 001774D8 90 01 00 B8 */ stw r0, 0xb8(r1) -/* 8017A57C 001774DC 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8017A57C 001774DC 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8017A580 001774E0 2C 05 00 00 */ cmpwi r5, 0 /* 8017A584 001774E4 38 60 00 00 */ li r3, 0 /* 8017A588 001774E8 90 01 00 B8 */ stw r0, 0xb8(r1) @@ -1335,9 +1335,9 @@ lbl_8017A5DC: /* 8017A5DC 0017753C 3C 60 80 3F */ lis r3, lbl_803ECAD0@ha /* 8017A5E0 00177540 80 A1 00 E0 */ lwz r5, 0xe0(r1) /* 8017A5E4 00177544 38 03 CA D0 */ addi r0, r3, lbl_803ECAD0@l -/* 8017A5E8 00177548 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 8017A5E8 00177548 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8017A5EC 0017754C 90 01 00 B8 */ stw r0, 0xb8(r1) -/* 8017A5F0 00177550 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 8017A5F0 00177550 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8017A5F4 00177554 2C 05 00 00 */ cmpwi r5, 0 /* 8017A5F8 00177558 38 60 00 00 */ li r3, 0 /* 8017A5FC 0017755C 90 01 00 B8 */ stw r0, 0xb8(r1) diff --git a/asm/MetroidPrime/ScriptLoader.s b/asm/MetroidPrime/ScriptLoader.s index 54895c01..87963210 100644 --- a/asm/MetroidPrime/ScriptLoader.s +++ b/asm/MetroidPrime/ScriptLoader.s @@ -18314,7 +18314,7 @@ lbl_800D5C10: /* 800D5C8C 000D2BEC 93 81 00 1C */ stw r28, 0x1c(r1) /* 800D5C90 000D2BF0 93 A1 00 20 */ stw r29, 0x20(r1) /* 800D5C94 000D2BF4 93 C1 00 24 */ stw r30, 0x24(r1) -/* 800D5C98 000D2BF8 4B FD E1 69 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii" +/* 800D5C98 000D2BF8 4B FD E1 69 */ bl "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi" /* 800D5C9C 000D2BFC 7C 76 1B 78 */ mr r22, r3 lbl_800D5CA0: /* 800D5CA0 000D2C00 38 61 02 80 */ addi r3, r1, 0x280 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s index 90212282..27b8fb45 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptGenerator.s @@ -384,7 +384,7 @@ lbl_800B497C: /* 800B49F4 000B1954 98 1F 0F 94 */ stb r0, 0xf94(r31) /* 800B49F8 000B1958 54 D2 DF FE */ rlwinm r18, r6, 0x1b, 0x1f, 0x1f /* 800B49FC 000B195C 38 61 00 E8 */ addi r3, r1, 0xe8 -/* 800B4A00 000B1960 4B F9 38 E9 */ bl GenerateObject__13CStateManagerF9TEditorId +/* 800B4A00 000B1960 4B F9 38 E9 */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 800B4A04 000B1964 A0 81 00 EC */ lhz r4, 0xec(r1) /* 800B4A08 000B1968 88 1F 0F 94 */ lbz r0, 0xf94(r31) /* 800B4A0C 000B196C 52 40 2E B4 */ rlwimi r0, r18, 5, 0x1a, 0x1a diff --git a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s index 1cdef48b..bd589927 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptMazeNode.s @@ -216,7 +216,7 @@ lbl_80288A1C: /* 80288A30 00285990 48 00 07 C0 */ b lbl_802891F0 lbl_80288A34: /* 80288A34 00285994 7F C3 F3 78 */ mr r3, r30 -/* 80288A38 00285998 4B DB B6 51 */ bl sub_80044088 +/* 80288A38 00285998 4B DB B6 51 */ bl CurrentMaze__13CStateManagerFv /* 80288A3C 0028599C 28 03 00 00 */ cmplwi r3, 0 /* 80288A40 002859A0 40 82 07 B0 */ bne lbl_802891F0 /* 80288A44 002859A4 3C 80 80 3D */ lis r4, lbl_803D5980@ha @@ -261,7 +261,7 @@ lbl_80288A7C: /* 80288ADC 00285A3C 7F C3 F3 78 */ mr r3, r30 /* 80288AE0 00285A40 38 81 00 58 */ addi r4, r1, 0x58 /* 80288AE4 00285A44 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80288AE8 00285A48 4B DB B5 49 */ bl sub_80044030 +/* 80288AE8 00285A48 4B DB B5 49 */ bl "SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>" /* 80288AEC 00285A4C 80 61 00 58 */ lwz r3, 0x58(r1) /* 80288AF0 00285A50 48 08 CE 41 */ bl Free__7CMemoryFPCv /* 80288AF4 00285A54 80 61 00 5C */ lwz r3, 0x5c(r1) @@ -270,12 +270,12 @@ lbl_80288A7C: lbl_80288B00: /* 80288B00 00285A60 7F C3 F3 78 */ mr r3, r30 /* 80288B04 00285A64 3B 60 00 00 */ li r27, 0 -/* 80288B08 00285A68 4B DB B5 81 */ bl sub_80044088 +/* 80288B08 00285A68 4B DB B5 81 */ bl CurrentMaze__13CStateManagerFv /* 80288B0C 00285A6C 28 03 00 00 */ cmplwi r3, 0 /* 80288B10 00285A70 41 82 06 E0 */ beq lbl_802891F0 /* 80288B14 00285A74 80 9F 00 E8 */ lwz r4, 0xe8(r31) /* 80288B18 00285A78 80 BF 00 EC */ lwz r5, 0xec(r31) -/* 80288B1C 00285A7C 48 00 13 F9 */ bl GetCell__10CMazeStateFUiUi +/* 80288B1C 00285A7C 48 00 13 F9 */ bl GetCell__10CMazeStateCFUiUi /* 80288B20 00285A80 80 9F 00 F0 */ lwz r4, 0xf0(r31) /* 80288B24 00285A84 7C 7A 1B 78 */ mr r26, r3 /* 80288B28 00285A88 2C 04 00 00 */ cmpwi r4, 0 @@ -349,7 +349,7 @@ lbl_80288BF0: /* 80288C20 00285B80 98 1E 0F 94 */ stb r0, 0xf94(r30) /* 80288C24 00285B84 38 61 00 80 */ addi r3, r1, 0x80 /* 80288C28 00285B88 38 A6 00 08 */ addi r5, r6, 8 -/* 80288C2C 00285B8C 4B DB F6 BD */ bl GenerateObject__13CStateManagerF9TEditorId +/* 80288C2C 00285B8C 4B DB F6 BD */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 80288C30 00285B90 A0 A1 00 84 */ lhz r5, 0x84(r1) /* 80288C34 00285B94 7F C3 F3 78 */ mr r3, r30 /* 80288C38 00285B98 88 1E 0F 94 */ lbz r0, 0xf94(r30) @@ -449,7 +449,7 @@ lbl_80288D68: /* 80288D8C 00285CEC 98 1E 0F 94 */ stb r0, 0xf94(r30) /* 80288D90 00285CF0 38 61 00 70 */ addi r3, r1, 0x70 /* 80288D94 00285CF4 38 BA 00 08 */ addi r5, r26, 8 -/* 80288D98 00285CF8 4B DB F5 51 */ bl GenerateObject__13CStateManagerF9TEditorId +/* 80288D98 00285CF8 4B DB F5 51 */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 80288D9C 00285CFC A0 61 00 74 */ lhz r3, 0x74(r1) /* 80288DA0 00285D00 88 1E 0F 94 */ lbz r0, 0xf94(r30) /* 80288DA4 00285D04 53 60 2E B4 */ rlwimi r0, r27, 5, 0x1a, 0x1a @@ -525,7 +525,7 @@ lbl_80288E90: /* 80288EA8 00285E08 48 00 03 48 */ b lbl_802891F0 lbl_80288EAC: /* 80288EAC 00285E0C 7F C3 F3 78 */ mr r3, r30 -/* 80288EB0 00285E10 4B DB B1 D9 */ bl sub_80044088 +/* 80288EB0 00285E10 4B DB B1 D9 */ bl CurrentMaze__13CStateManagerFv /* 80288EB4 00285E14 88 1F 01 3C */ lbz r0, 0x13c(r31) /* 80288EB8 00285E18 7C 7C 1B 78 */ mr r28, r3 /* 80288EBC 00285E1C 54 00 CF FF */ rlwinm. r0, r0, 0x19, 0x1f, 0x1f @@ -621,7 +621,7 @@ lbl_80288FB8: /* 80289004 00285F64 2C 00 00 01 */ cmpwi r0, 1 /* 80289008 00285F68 40 82 00 40 */ bne lbl_80289048 /* 8028900C 00285F6C 7F 83 E3 78 */ mr r3, r28 -/* 80289010 00285F70 48 00 0E E9 */ bl GetCell2__10CMazeStateFUiUi +/* 80289010 00285F70 48 00 0E E9 */ bl GetCell__10CMazeStateFUiUi /* 80289014 00285F74 88 A3 00 00 */ lbz r5, 0(r3) /* 80289018 00285F78 54 A0 D7 FF */ rlwinm. r0, r5, 0x1a, 0x1f, 0x1f /* 8028901C 00285F7C 40 82 00 2C */ bne lbl_80289048 @@ -648,7 +648,7 @@ lbl_80289048: /* 8028906C 00285FCC 2C 00 00 01 */ cmpwi r0, 1 /* 80289070 00285FD0 40 82 00 40 */ bne lbl_802890B0 /* 80289074 00285FD4 7F 83 E3 78 */ mr r3, r28 -/* 80289078 00285FD8 48 00 0E 81 */ bl GetCell2__10CMazeStateFUiUi +/* 80289078 00285FD8 48 00 0E 81 */ bl GetCell__10CMazeStateFUiUi /* 8028907C 00285FDC 88 A3 00 00 */ lbz r5, 0(r3) /* 80289080 00285FE0 54 A0 D7 FF */ rlwinm. r0, r5, 0x1a, 0x1f, 0x1f /* 80289084 00285FE4 40 82 00 2C */ bne lbl_802890B0 @@ -675,7 +675,7 @@ lbl_802890B0: /* 802890D4 00286034 2C 00 00 00 */ cmpwi r0, 0 /* 802890D8 00286038 40 82 00 40 */ bne lbl_80289118 /* 802890DC 0028603C 7F 83 E3 78 */ mr r3, r28 -/* 802890E0 00286040 48 00 0E 19 */ bl GetCell2__10CMazeStateFUiUi +/* 802890E0 00286040 48 00 0E 19 */ bl GetCell__10CMazeStateFUiUi /* 802890E4 00286044 88 A3 00 00 */ lbz r5, 0(r3) /* 802890E8 00286048 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f /* 802890EC 0028604C 40 82 00 2C */ bne lbl_80289118 @@ -703,7 +703,7 @@ lbl_80289118: /* 80289140 002860A0 2C 00 00 00 */ cmpwi r0, 0 /* 80289144 002860A4 40 82 00 40 */ bne lbl_80289184 /* 80289148 002860A8 7F 83 E3 78 */ mr r3, r28 -/* 8028914C 002860AC 48 00 0D AD */ bl GetCell2__10CMazeStateFUiUi +/* 8028914C 002860AC 48 00 0D AD */ bl GetCell__10CMazeStateFUiUi /* 80289150 002860B0 88 A3 00 00 */ lbz r5, 0(r3) /* 80289154 002860B4 54 A0 CF FF */ rlwinm. r0, r5, 0x19, 0x1f, 0x1f /* 80289158 002860B8 40 82 00 2C */ bne lbl_80289184 @@ -732,14 +732,14 @@ lbl_802891A0: /* 802891A8 00286108 48 00 00 48 */ b lbl_802891F0 lbl_802891AC: /* 802891AC 0028610C 7F C3 F3 78 */ mr r3, r30 -/* 802891B0 00286110 4B DB AE E1 */ bl sub_80044090 +/* 802891B0 00286110 4B DB AE E1 */ bl GetCurrentMaze__13CStateManagerCFv /* 802891B4 00286114 28 03 00 00 */ cmplwi r3, 0 /* 802891B8 00286118 41 82 00 20 */ beq lbl_802891D8 /* 802891BC 0028611C 38 00 00 00 */ li r0, 0 /* 802891C0 00286120 7F C3 F3 78 */ mr r3, r30 /* 802891C4 00286124 90 01 00 40 */ stw r0, 0x40(r1) /* 802891C8 00286128 38 81 00 40 */ addi r4, r1, 0x40 -/* 802891CC 0028612C 4B DB AE 65 */ bl sub_80044030 +/* 802891CC 0028612C 4B DB AE 65 */ bl "SetCurrentMaze__13CStateManagerFRCQ24rstl24single_ptr<10CMazeState>" /* 802891D0 00286130 80 61 00 40 */ lwz r3, 0x40(r1) /* 802891D4 00286134 48 08 C7 5D */ bl Free__7CMemoryFPCv lbl_802891D8: @@ -947,7 +947,7 @@ lbl_802894AC: /* 802894C4 00286424 98 1E 0F 94 */ stb r0, 0xf94(r30) /* 802894C8 00286428 38 61 00 24 */ addi r3, r1, 0x24 /* 802894CC 0028642C 38 BF 00 08 */ addi r5, r31, 8 -/* 802894D0 00286430 4B DB EE 19 */ bl GenerateObject__13CStateManagerF9TEditorId +/* 802894D0 00286430 4B DB EE 19 */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 802894D4 00286434 A0 A1 00 28 */ lhz r5, 0x28(r1) /* 802894D8 00286438 7F C3 F3 78 */ mr r3, r30 /* 802894DC 0028643C 88 1E 0F 94 */ lbz r0, 0xf94(r30) @@ -1648,8 +1648,8 @@ lbl_80289EE4: /* 80289EF0 00286E50 38 21 00 20 */ addi r1, r1, 0x20 /* 80289EF4 00286E54 4E 80 00 20 */ blr -.global GetCell2__10CMazeStateFUiUi -GetCell2__10CMazeStateFUiUi: +.global GetCell__10CMazeStateFUiUi +GetCell__10CMazeStateFUiUi: /* 80289EF8 00286E58 1C 05 00 09 */ mulli r0, r5, 9 /* 80289EFC 00286E5C 7C 65 1B 78 */ mr r5, r3 /* 80289F00 00286E60 7C 04 02 14 */ add r0, r4, r0 @@ -1658,8 +1658,8 @@ GetCell2__10CMazeStateFUiUi: /* 80289F0C 00286E6C 7C 65 1A 14 */ add r3, r5, r3 /* 80289F10 00286E70 4E 80 00 20 */ blr -.global GetCell__10CMazeStateFUiUi -GetCell__10CMazeStateFUiUi: +.global GetCell__10CMazeStateCFUiUi +GetCell__10CMazeStateCFUiUi: /* 80289F14 00286E74 1C 05 00 09 */ mulli r0, r5, 9 /* 80289F18 00286E78 7C 65 1B 78 */ mr r5, r3 /* 80289F1C 00286E7C 7C 04 02 14 */ add r0, r4, r0 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s index 3a179c44..1e40109b 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickupGenerator.s @@ -343,7 +343,7 @@ GeneratePickup__22CScriptPickupGeneratorFR13CStateManager9TUniqueId9TEditorId: /* 8015E2E4 0015B244 98 1F 0F 94 */ stb r0, 0xf94(r31) /* 8015E2E8 0015B248 54 DD DF FE */ rlwinm r29, r6, 0x1b, 0x1f, 0x1f /* 8015E2EC 0015B24C 38 61 00 4C */ addi r3, r1, 0x4c -/* 8015E2F0 0015B250 4B EE 9F F9 */ bl GenerateObject__13CStateManagerF9TEditorId +/* 8015E2F0 0015B250 4B EE 9F F9 */ bl GenerateObject__13CStateManagerFRC9TEditorId /* 8015E2F4 0015B254 A0 81 00 50 */ lhz r4, 0x50(r1) /* 8015E2F8 0015B258 88 1F 0F 94 */ lbz r0, 0xf94(r31) /* 8015E2FC 0015B25C 53 A0 2E B4 */ rlwimi r0, r29, 5, 0x1a, 0x1a diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s index 1db7ee10..8a4d0098 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPlatform.s @@ -3713,12 +3713,12 @@ __dt__23CCollidableOBBTreeGroupFv: /* 800B3DB0 000B0D10 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B3DB4 000B0D14 7C 7F 1B 79 */ or. r31, r3, r3 /* 800B3DB8 000B0D18 41 82 00 30 */ beq lbl_800B3DE8 -/* 800B3DBC 000B0D1C 3C 60 80 3F */ lis r3, lbl_803EC470@ha -/* 800B3DC0 000B0D20 38 03 C4 70 */ addi r0, r3, lbl_803EC470@l +/* 800B3DBC 000B0D1C 3C 60 80 3F */ lis r3, __vt__23CCollidableOBBTreeGroup@ha +/* 800B3DC0 000B0D20 38 03 C4 70 */ addi r0, r3, __vt__23CCollidableOBBTreeGroup@l /* 800B3DC4 000B0D24 90 1F 00 00 */ stw r0, 0(r31) /* 800B3DC8 000B0D28 41 82 00 10 */ beq lbl_800B3DD8 -/* 800B3DCC 000B0D2C 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 800B3DD0 000B0D30 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 800B3DCC 000B0D2C 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 800B3DD0 000B0D30 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 800B3DD4 000B0D34 90 1F 00 00 */ stw r0, 0(r31) lbl_800B3DD8: /* 800B3DD8 000B0D38 7C 80 07 35 */ extsh. r0, r4 @@ -3733,8 +3733,8 @@ lbl_800B3DE8: /* 800B3DF8 000B0D58 38 21 00 10 */ addi r1, r1, 0x10 /* 800B3DFC 000B0D5C 4E 80 00 20 */ blr -.global "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii" -"__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl58optional_object<39TLockedToken<23CCollidableOBBTreeGroup>>bii": +.global "__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi" +"__ct__15CScriptPlatformF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC11CEntityInfoRC12CTransform4fRC10CModelDataRC16CActorParametersRC6CAABoxfbfbRC11CHealthInfoRC20CDamageVulnerabilityRCQ24rstl67optional_object<48TLockedToken<32CCollidableOBBTreeGroupContainer>>bUiUi": /* 800B3E00 000B0D60 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 800B3E04 000B0D64 7C 08 02 A6 */ mflr r0 /* 800B3E08 000B0D68 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -4067,7 +4067,7 @@ lbl_800B42F4: /* 800B4318 000B1278 41 82 00 14 */ beq lbl_800B432C /* 800B431C 000B127C 80 9F 03 0C */ lwz r4, 0x30c(r31) /* 800B4320 000B1280 38 BF 00 68 */ addi r5, r31, 0x68 -/* 800B4324 000B1284 48 1F 96 41 */ bl "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList" +/* 800B4324 000B1284 48 1F 96 41 */ bl "__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList" /* 800B4328 000B1288 7C 6E 1B 78 */ mr r14, r3 lbl_800B432C: /* 800B432C 000B128C 80 7F 03 14 */ lwz r3, 0x314(r31) @@ -4112,7 +4112,7 @@ update_fog__3CGXFUi: /* 800B43B4 000B1314 3C 60 F2 00 */ lis r3, 0xf200 /* 800B43B8 000B1318 38 00 00 00 */ li r0, 0 /* 800B43BC 000B131C 90 64 80 00 */ stw r3, 0xCC008000@l(r4) -/* 800B43C0 000B1320 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 800B43C0 000B1320 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 800B43C4 000B1324 B0 03 00 02 */ sth r0, 2(r3) /* 800B43C8 000B1328 4E 80 00 20 */ blr lbl_800B43CC: @@ -4127,7 +4127,7 @@ lbl_800B43CC: /* 800B43EC 000B134C 50 A4 82 1E */ rlwimi r4, r5, 0x10, 8, 0xf /* 800B43F0 000B1350 64 83 F2 00 */ oris r3, r4, 0xf200 /* 800B43F4 000B1354 90 66 80 00 */ stw r3, 0xCC008000@l(r6) -/* 800B43F8 000B1358 80 62 CE 08 */ lwz r3, lbl_805AEB28@sda21(r2) +/* 800B43F8 000B1358 80 62 CE 08 */ lwz r3, __GXData@sda21(r2) /* 800B43FC 000B135C B0 03 00 02 */ sth r0, 2(r3) /* 800B4400 000B1360 4E 80 00 20 */ blr diff --git a/asm/MetroidPrime/Weapons/CFlameThrower.s b/asm/MetroidPrime/Weapons/CFlameThrower.s index 34ed7093..17e79fe3 100644 --- a/asm/MetroidPrime/Weapons/CFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CFlameThrower.s @@ -419,8 +419,8 @@ lbl_80197A00: /* 80197A28 00194988 39 03 CA D0 */ addi r8, r3, lbl_803ECAD0@l /* 80197A2C 0019498C C0 A1 00 8C */ lfs f5, 0x8c(r1) /* 80197A30 00194990 91 01 01 08 */ stw r8, 0x108(r1) -/* 80197A34 00194994 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 80197A38 00194998 38 E3 97 E4 */ addi r7, r3, lbl_803D97E4@l +/* 80197A34 00194994 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 80197A38 00194998 38 E3 97 E4 */ addi r7, r3, __vt__19CCollisionPrimitive@l /* 80197A3C 0019499C C0 81 00 90 */ lfs f4, 0x90(r1) /* 80197A40 001949A0 C0 61 00 94 */ lfs f3, 0x94(r1) /* 80197A44 001949A4 7E 84 A3 78 */ mr r4, r20 @@ -520,11 +520,11 @@ lbl_80197A00: /* 80197BBC 00194B1C D8 01 02 90 */ stfd f0, 0x290(r1) /* 80197BC0 00194B20 40 82 00 34 */ bne lbl_80197BF4 /* 80197BC4 00194B24 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 80197BC8 00194B28 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80197BC8 00194B28 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80197BCC 00194B2C 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 80197BD0 00194B30 38 00 00 00 */ li r0, 0 /* 80197BD4 00194B34 90 81 01 98 */ stw r4, 0x198(r1) -/* 80197BD8 00194B38 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80197BD8 00194B38 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80197BDC 00194B3C 28 17 00 00 */ cmplwi r23, 0 /* 80197BE0 00194B40 90 61 01 98 */ stw r3, 0x198(r1) /* 80197BE4 00194B44 98 01 00 A0 */ stb r0, 0xa0(r1) @@ -535,13 +535,13 @@ lbl_80197BF4: /* 80197BF4 00194B54 D0 3E 00 00 */ stfs f1, 0(r30) /* 80197BF8 00194B58 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha /* 80197BFC 00194B5C C0 01 02 6C */ lfs f0, 0x26c(r1) -/* 80197C00 00194B60 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80197C00 00194B60 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80197C04 00194B64 C0 21 02 70 */ lfs f1, 0x270(r1) /* 80197C08 00194B68 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 80197C0C 00194B6C D0 1E 00 04 */ stfs f0, 4(r30) /* 80197C10 00194B70 28 17 00 00 */ cmplwi r23, 0 /* 80197C14 00194B74 C0 01 02 74 */ lfs f0, 0x274(r1) -/* 80197C18 00194B78 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80197C18 00194B78 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80197C1C 00194B7C D0 3E 00 08 */ stfs f1, 8(r30) /* 80197C20 00194B80 38 00 00 00 */ li r0, 0 /* 80197C24 00194B84 80 C1 02 94 */ lwz r6, 0x294(r1) diff --git a/asm/MetroidPrime/Weapons/CNewFlameThrower.s b/asm/MetroidPrime/Weapons/CNewFlameThrower.s index a388c993..a107671c 100644 --- a/asm/MetroidPrime/Weapons/CNewFlameThrower.s +++ b/asm/MetroidPrime/Weapons/CNewFlameThrower.s @@ -1355,9 +1355,9 @@ lbl_8026212C: /* 8026220C 0025F16C 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha /* 80262210 0025F170 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80262214 0025F174 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l -/* 80262218 0025F178 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80262218 0025F178 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 8026221C 0025F17C 90 81 00 60 */ stw r4, 0x60(r1) -/* 80262220 0025F180 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80262220 0025F180 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80262224 0025F184 90 61 00 60 */ stw r3, 0x60(r1) /* 80262228 0025F188 41 82 00 1C */ beq lbl_80262244 /* 8026222C 0025F18C A0 9B 00 00 */ lhz r4, 0(r27) @@ -2074,11 +2074,11 @@ lbl_80262C88: /* 80262C88 0025FBE8 42 00 00 00 */ bdnz lbl_80262C88 lbl_80262C8C: /* 80262C8C 0025FBEC 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 80262C90 0025FBF0 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80262C90 0025FBF0 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80262C94 0025FBF4 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 80262C98 0025FBF8 90 01 02 08 */ stw r0, 0x208(r1) /* 80262C9C 0025FBFC 38 80 00 00 */ li r4, 0 -/* 80262CA0 0025FC00 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 80262CA0 0025FC00 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 80262CA4 0025FC04 34 01 26 C8 */ addic. r0, r1, 0x26c8 /* 80262CA8 0025FC08 90 81 1A AC */ stw r4, 0x1aac(r1) /* 80262CAC 0025FC0C 90 61 02 08 */ stw r3, 0x208(r1) @@ -2206,11 +2206,11 @@ lbl_80262E3C: /* 80262E40 0025FDA0 42 00 FF FC */ bdnz lbl_80262E3C lbl_80262E44: /* 80262E44 0025FDA4 3C 80 80 3F */ lis r4, lbl_803ECAF8@ha -/* 80262E48 0025FDA8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80262E48 0025FDA8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80262E4C 0025FDAC 38 04 CA F8 */ addi r0, r4, lbl_803ECAF8@l /* 80262E50 0025FDB0 38 80 00 00 */ li r4, 0 /* 80262E54 0025FDB4 90 01 02 08 */ stw r0, 0x208(r1) -/* 80262E58 0025FDB8 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80262E58 0025FDB8 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 80262E5C 0025FDBC 90 81 1A AC */ stw r4, 0x1aac(r1) /* 80262E60 0025FDC0 90 01 02 08 */ stw r0, 0x208(r1) lbl_80262E64: @@ -2432,9 +2432,9 @@ lbl_80263184: /* 80263184 002600E4 3C 60 80 3F */ lis r3, lbl_803ECAF8@ha /* 80263188 002600E8 80 A1 02 A4 */ lwz r5, 0x2a4(r1) /* 8026318C 002600EC 38 03 CA F8 */ addi r0, r3, lbl_803ECAF8@l -/* 80263190 002600F0 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 80263190 002600F0 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 80263194 002600F4 90 01 01 E8 */ stw r0, 0x1e8(r1) -/* 80263198 002600F8 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 80263198 002600F8 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 8026319C 002600FC 2C 05 00 00 */ cmpwi r5, 0 /* 802631A0 00260100 38 60 00 00 */ li r3, 0 /* 802631A4 00260104 90 01 01 E8 */ stw r0, 0x1e8(r1) diff --git a/asm/MetroidPrime/Weapons/CWaveBuster.s b/asm/MetroidPrime/Weapons/CWaveBuster.s index 24be92f1..c47c73de 100644 --- a/asm/MetroidPrime/Weapons/CWaveBuster.s +++ b/asm/MetroidPrime/Weapons/CWaveBuster.s @@ -563,8 +563,8 @@ lbl_801BDD98: /* 801BDDAC 001BAD0C 39 03 CA D0 */ addi r8, r3, lbl_803ECAD0@l /* 801BDDB0 001BAD10 C0 A1 00 D4 */ lfs f5, 0xd4(r1) /* 801BDDB4 001BAD14 91 01 01 38 */ stw r8, 0x138(r1) -/* 801BDDB8 001BAD18 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 801BDDBC 001BAD1C 38 E3 97 E4 */ addi r7, r3, lbl_803D97E4@l +/* 801BDDB8 001BAD18 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 801BDDBC 001BAD1C 38 E3 97 E4 */ addi r7, r3, __vt__19CCollisionPrimitive@l /* 801BDDC0 001BAD20 C0 81 00 D8 */ lfs f4, 0xd8(r1) /* 801BDDC4 001BAD24 C0 61 00 DC */ lfs f3, 0xdc(r1) /* 801BDDC8 001BAD28 FC 20 F0 90 */ fmr f1, f30 @@ -643,11 +643,11 @@ lbl_801BDD98: /* 801BDEEC 001BAE4C 90 01 01 E8 */ stw r0, 0x1e8(r1) /* 801BDEF0 001BAE50 40 82 00 28 */ bne lbl_801BDF18 /* 801BDEF4 001BAE54 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 801BDEF8 001BAE58 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 801BDEF8 001BAE58 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 801BDEFC 001BAE5C 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 801BDF00 001BAE60 38 00 00 00 */ li r0, 0 /* 801BDF04 001BAE64 90 81 01 F0 */ stw r4, 0x1f0(r1) -/* 801BDF08 001BAE68 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 801BDF08 001BAE68 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 801BDF0C 001BAE6C 90 61 01 F0 */ stw r3, 0x1f0(r1) /* 801BDF10 001BAE70 98 01 00 E8 */ stb r0, 0xe8(r1) /* 801BDF14 001BAE74 48 00 00 70 */ b lbl_801BDF84 @@ -673,11 +673,11 @@ lbl_801BDF18: /* 801BDF60 001BAEC0 B0 1B 00 00 */ sth r0, 0(r27) lbl_801BDF64: /* 801BDF64 001BAEC4 3C 80 80 3F */ lis r4, lbl_803ECAD0@ha -/* 801BDF68 001BAEC8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 801BDF68 001BAEC8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 801BDF6C 001BAECC 38 84 CA D0 */ addi r4, r4, lbl_803ECAD0@l /* 801BDF70 001BAED0 38 00 00 00 */ li r0, 0 /* 801BDF74 001BAED4 90 81 01 F0 */ stw r4, 0x1f0(r1) -/* 801BDF78 001BAED8 38 63 97 E4 */ addi r3, r3, lbl_803D97E4@l +/* 801BDF78 001BAED8 38 63 97 E4 */ addi r3, r3, __vt__19CCollisionPrimitive@l /* 801BDF7C 001BAEDC 90 61 01 F0 */ stw r3, 0x1f0(r1) /* 801BDF80 001BAEE0 98 01 00 E8 */ stb r0, 0xe8(r1) lbl_801BDF84: diff --git a/asm/WorldFormat/CCollidableOBBTree.s b/asm/WorldFormat/CCollidableOBBTree.s index 838dc0b0..09130ec8 100644 --- a/asm/WorldFormat/CCollidableOBBTree.s +++ b/asm/WorldFormat/CCollidableOBBTree.s @@ -48,8 +48,8 @@ __dt__18CCollidableOBBTreeFv: /* 802A9908 002A6868 38 03 C4 48 */ addi r0, r3, lbl_803EC448@l /* 802A990C 002A686C 90 1F 00 00 */ stw r0, 0(r31) /* 802A9910 002A6870 41 82 00 10 */ beq lbl_802A9920 -/* 802A9914 002A6874 3C 60 80 3E */ lis r3, lbl_803D97E4@ha -/* 802A9918 002A6878 38 03 97 E4 */ addi r0, r3, lbl_803D97E4@l +/* 802A9914 002A6874 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha +/* 802A9918 002A6878 38 03 97 E4 */ addi r0, r3, __vt__19CCollisionPrimitive@l /* 802A991C 002A687C 90 1F 00 00 */ stw r0, 0(r31) lbl_802A9920: /* 802A9920 002A6880 7C 80 07 35 */ extsh. r0, r4 diff --git a/asm/WorldFormat/CCollidableOBBTreeGroup.s b/asm/WorldFormat/CCollidableOBBTreeGroup.s index 122f1420..9633eed8 100644 --- a/asm/WorldFormat/CCollidableOBBTreeGroup.s +++ b/asm/WorldFormat/CCollidableOBBTreeGroup.s @@ -3,8 +3,8 @@ .section .data .balign 8 -.global lbl_803EC470 -lbl_803EC470: +.global __vt__23CCollidableOBBTreeGroup +__vt__23CCollidableOBBTreeGroup: # ROM: 0x3E9470 .4byte 0 .4byte 0 @@ -179,11 +179,11 @@ CollideMovingSphere__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC /* 802AC93C 002A989C C0 41 00 C8 */ lfs f2, 0xc8(r1) /* 802AC940 002A98A0 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802AC944 002A98A4 C0 21 00 CC */ lfs f1, 0xcc(r1) -/* 802AC948 002A98A8 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802AC948 002A98A8 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802AC94C 002A98AC C0 01 00 D0 */ lfs f0, 0xd0(r1) /* 802AC950 002A98B0 3B 44 C4 48 */ addi r26, r4, lbl_803EC448@l /* 802AC954 002A98B4 D0 41 01 64 */ stfs f2, 0x164(r1) -/* 802AC958 002A98B8 3B 63 97 E4 */ addi r27, r3, lbl_803D97E4@l +/* 802AC958 002A98B8 3B 63 97 E4 */ addi r27, r3, __vt__19CCollisionPrimitive@l /* 802AC95C 002A98BC 3A E0 00 00 */ li r23, 0 /* 802AC960 002A98C0 3A C0 00 00 */ li r22, 0 /* 802AC964 002A98C4 D0 21 01 68 */ stfs f1, 0x168(r1) @@ -357,11 +357,11 @@ CollideMovingAABox__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureRC9 /* 802ACBEC 002A9B4C C0 41 00 E0 */ lfs f2, 0xe0(r1) /* 802ACBF0 002A9B50 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802ACBF4 002A9B54 C0 21 00 E4 */ lfs f1, 0xe4(r1) -/* 802ACBF8 002A9B58 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802ACBF8 002A9B58 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802ACBFC 002A9B5C C0 01 00 E8 */ lfs f0, 0xe8(r1) /* 802ACC00 002A9B60 3B 04 C4 48 */ addi r24, r4, lbl_803EC448@l /* 802ACC04 002A9B64 D0 41 01 7C */ stfs f2, 0x17c(r1) -/* 802ACC08 002A9B68 3B 23 97 E4 */ addi r25, r3, lbl_803D97E4@l +/* 802ACC08 002A9B68 3B 23 97 E4 */ addi r25, r3, __vt__19CCollisionPrimitive@l /* 802ACC0C 002A9B6C 3B C0 00 00 */ li r30, 0 /* 802ACC10 002A9B70 3A C0 00 00 */ li r22, 0 /* 802ACC14 002A9B74 D0 21 01 80 */ stfs f1, 0x180(r1) @@ -529,11 +529,11 @@ SphereCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: /* 802ACE60 002A9DC0 C0 41 00 90 */ lfs f2, 0x90(r1) /* 802ACE64 002A9DC4 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802ACE68 002A9DC8 C0 21 00 94 */ lfs f1, 0x94(r1) -/* 802ACE6C 002A9DCC 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802ACE6C 002A9DCC 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802ACE70 002A9DD0 C0 01 00 98 */ lfs f0, 0x98(r1) /* 802ACE74 002A9DD4 3B C4 C4 48 */ addi r30, r4, lbl_803EC448@l /* 802ACE78 002A9DD8 D0 41 01 2C */ stfs f2, 0x12c(r1) -/* 802ACE7C 002A9DDC 3B E3 97 E4 */ addi r31, r3, lbl_803D97E4@l +/* 802ACE7C 002A9DDC 3B E3 97 E4 */ addi r31, r3, __vt__19CCollisionPrimitive@l /* 802ACE80 002A9DE0 3B 60 00 00 */ li r27, 0 /* 802ACE84 002A9DE4 D0 21 01 30 */ stfs f1, 0x130(r1) /* 802ACE88 002A9DE8 D0 01 01 34 */ stfs f0, 0x134(r1) @@ -563,11 +563,11 @@ lbl_802ACE90: /* 802ACEE4 002A9E44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802ACEE8 002A9E48 41 82 00 24 */ beq lbl_802ACF0C /* 802ACEEC 002A9E4C 3C 60 80 3F */ lis r3, lbl_803EC448@ha -/* 802ACEF0 002A9E50 3C 80 80 3E */ lis r4, lbl_803D97E4@ha +/* 802ACEF0 002A9E50 3C 80 80 3E */ lis r4, __vt__19CCollisionPrimitive@ha /* 802ACEF4 002A9E54 38 03 C4 48 */ addi r0, r3, lbl_803EC448@l /* 802ACEF8 002A9E58 38 60 00 01 */ li r3, 1 /* 802ACEFC 002A9E5C 90 01 00 40 */ stw r0, 0x40(r1) -/* 802ACF00 002A9E60 38 04 97 E4 */ addi r0, r4, lbl_803D97E4@l +/* 802ACF00 002A9E60 38 04 97 E4 */ addi r0, r4, __vt__19CCollisionPrimitive@l /* 802ACF04 002A9E64 90 01 00 40 */ stw r0, 0x40(r1) /* 802ACF08 002A9E68 48 00 00 24 */ b lbl_802ACF2C lbl_802ACF0C: @@ -638,11 +638,11 @@ SphereCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColl /* 802ACFF8 002A9F58 C0 41 00 90 */ lfs f2, 0x90(r1) /* 802ACFFC 002A9F5C 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802AD000 002A9F60 C0 21 00 94 */ lfs f1, 0x94(r1) -/* 802AD004 002A9F64 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802AD004 002A9F64 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802AD008 002A9F68 C0 01 00 98 */ lfs f0, 0x98(r1) /* 802AD00C 002A9F6C 3B 84 C4 48 */ addi r28, r4, lbl_803EC448@l /* 802AD010 002A9F70 D0 41 01 2C */ stfs f2, 0x12c(r1) -/* 802AD014 002A9F74 3B A3 97 E4 */ addi r29, r3, lbl_803D97E4@l +/* 802AD014 002A9F74 3B A3 97 E4 */ addi r29, r3, __vt__19CCollisionPrimitive@l /* 802AD018 002A9F78 3B 00 00 00 */ li r24, 0 /* 802AD01C 002A9F7C 3A E0 00 00 */ li r23, 0 /* 802AD020 002A9F80 D0 21 01 30 */ stfs f1, 0x130(r1) @@ -753,11 +753,11 @@ AABoxCollideBoolean__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructure: /* 802AD1AC 002AA10C C0 41 00 A0 */ lfs f2, 0xa0(r1) /* 802AD1B0 002AA110 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802AD1B4 002AA114 C0 21 00 A4 */ lfs f1, 0xa4(r1) -/* 802AD1B8 002AA118 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802AD1B8 002AA118 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802AD1BC 002AA11C C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 802AD1C0 002AA120 3B C4 C4 48 */ addi r30, r4, lbl_803EC448@l /* 802AD1C4 002AA124 D0 41 01 3C */ stfs f2, 0x13c(r1) -/* 802AD1C8 002AA128 3B E3 97 E4 */ addi r31, r3, lbl_803D97E4@l +/* 802AD1C8 002AA128 3B E3 97 E4 */ addi r31, r3, __vt__19CCollisionPrimitive@l /* 802AD1CC 002AA12C 3B 60 00 00 */ li r27, 0 /* 802AD1D0 002AA130 D0 21 01 40 */ stfs f1, 0x140(r1) /* 802AD1D4 002AA134 D0 01 01 44 */ stfs f0, 0x144(r1) @@ -787,11 +787,11 @@ lbl_802AD1DC: /* 802AD230 002AA190 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AD234 002AA194 41 82 00 24 */ beq lbl_802AD258 /* 802AD238 002AA198 3C 60 80 3F */ lis r3, lbl_803EC448@ha -/* 802AD23C 002AA19C 3C 80 80 3E */ lis r4, lbl_803D97E4@ha +/* 802AD23C 002AA19C 3C 80 80 3E */ lis r4, __vt__19CCollisionPrimitive@ha /* 802AD240 002AA1A0 38 03 C4 48 */ addi r0, r3, lbl_803EC448@l /* 802AD244 002AA1A4 38 60 00 01 */ li r3, 1 /* 802AD248 002AA1A8 90 01 00 38 */ stw r0, 0x38(r1) -/* 802AD24C 002AA1AC 38 04 97 E4 */ addi r0, r4, lbl_803D97E4@l +/* 802AD24C 002AA1AC 38 04 97 E4 */ addi r0, r4, __vt__19CCollisionPrimitive@l /* 802AD250 002AA1B0 90 01 00 38 */ stw r0, 0x38(r1) /* 802AD254 002AA1B4 48 00 00 24 */ b lbl_802AD278 lbl_802AD258: @@ -878,7 +878,7 @@ AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColli /* 802AD384 002AA2E4 C0 E2 C1 E0 */ lfs f7, lbl_805ADF00@sda21(r2) /* 802AD388 002AA2E8 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802AD38C 002AA2EC C0 C2 C1 E4 */ lfs f6, lbl_805ADF04@sda21(r2) -/* 802AD390 002AA2F0 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802AD390 002AA2F0 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802AD394 002AA2F4 FF E0 38 50 */ fneg f31, f7 /* 802AD398 002AA2F8 C1 41 00 64 */ lfs f10, 0x64(r1) /* 802AD39C 002AA2FC FF A0 30 50 */ fneg f29, f6 @@ -906,7 +906,7 @@ AABoxCollide__23CCollidableOBBTreeGroupFRC27CInternalCollisionStructureR18CColli /* 802AD3F4 002AA354 EC 2B 09 BA */ fmadds f1, f11, f6, f1 /* 802AD3F8 002AA358 D0 A1 01 4C */ stfs f5, 0x14c(r1) /* 802AD3FC 002AA35C EC 0D 07 7A */ fmadds f0, f13, f29, f0 -/* 802AD400 002AA360 3B E3 97 E4 */ addi r31, r3, lbl_803D97E4@l +/* 802AD400 002AA360 3B E3 97 E4 */ addi r31, r3, __vt__19CCollisionPrimitive@l /* 802AD404 002AA364 ED 0B 01 F2 */ fmuls f8, f11, f7 /* 802AD408 002AA368 D0 C1 01 B0 */ stfs f6, 0x1b0(r1) /* 802AD40C 002AA36C EC BE E1 BA */ fmadds f5, f30, f6, f28 @@ -1046,7 +1046,7 @@ CastRayInternal__23CCollidableOBBTreeGroupCFRC25CInternalRayCastStructure: /* 802AD60C 002AA56C C1 A1 00 70 */ lfs f13, 0x70(r1) /* 802AD610 002AA570 3C 80 80 3F */ lis r4, lbl_803EC448@ha /* 802AD614 002AA574 C1 81 00 74 */ lfs f12, 0x74(r1) -/* 802AD618 002AA578 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802AD618 002AA578 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802AD61C 002AA57C C1 61 00 78 */ lfs f11, 0x78(r1) /* 802AD620 002AA580 3B 81 00 D4 */ addi r28, r1, 0xd4 /* 802AD624 002AA584 C1 41 00 7C */ lfs f10, 0x7c(r1) @@ -1054,7 +1054,7 @@ CastRayInternal__23CCollidableOBBTreeGroupCFRC25CInternalRayCastStructure: /* 802AD62C 002AA58C C1 21 00 80 */ lfs f9, 0x80(r1) /* 802AD630 002AA590 3A E4 C4 48 */ addi r23, r4, lbl_803EC448@l /* 802AD634 002AA594 C1 01 00 84 */ lfs f8, 0x84(r1) -/* 802AD638 002AA598 3B 03 97 E4 */ addi r24, r3, lbl_803D97E4@l +/* 802AD638 002AA598 3B 03 97 E4 */ addi r24, r3, __vt__19CCollisionPrimitive@l /* 802AD63C 002AA59C C0 E1 00 88 */ lfs f7, 0x88(r1) /* 802AD640 002AA5A0 C0 C1 00 8C */ lfs f6, 0x8c(r1) /* 802AD644 002AA5A4 C0 A1 00 90 */ lfs f5, 0x90(r1) @@ -1268,8 +1268,8 @@ GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi: /* 802AD95C 002AA8BC 7C 63 00 2E */ lwzx r3, r3, r0 /* 802AD960 002AA8C0 4E 80 00 20 */ blr -.global "__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList" -"__ct__23CCollidableOBBTreeGroupFRCQ24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>R14CCMaterialList": +.global "__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList" +"__ct__23CCollidableOBBTreeGroupFP32CCollidableOBBTreeGroupContainerRC13CMaterialList": /* 802AD964 002AA8C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802AD968 002AA8C8 7C 08 02 A6 */ mflr r0 /* 802AD96C 002AA8CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1279,9 +1279,9 @@ GetOBBTreeAABox__23CCollidableOBBTreeGroupCFi: /* 802AD97C 002AA8DC 93 C1 00 08 */ stw r30, 8(r1) /* 802AD980 002AA8E0 7C 7E 1B 78 */ mr r30, r3 /* 802AD984 002AA8E4 48 02 1F 31 */ bl __ct__19CCollisionPrimitiveFRC13CMaterialList -/* 802AD988 002AA8E8 3C 80 80 3F */ lis r4, lbl_803EC470@ha +/* 802AD988 002AA8E8 3C 80 80 3F */ lis r4, __vt__23CCollidableOBBTreeGroup@ha /* 802AD98C 002AA8EC 7F C3 F3 78 */ mr r3, r30 -/* 802AD990 002AA8F0 38 04 C4 70 */ addi r0, r4, lbl_803EC470@l +/* 802AD990 002AA8F0 38 04 C4 70 */ addi r0, r4, __vt__23CCollidableOBBTreeGroup@l /* 802AD994 002AA8F4 90 1E 00 00 */ stw r0, 0(r30) /* 802AD998 002AA8F8 93 FE 00 10 */ stw r31, 0x10(r30) /* 802AD99C 002AA8FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1393,11 +1393,11 @@ lbl_802ADB08: /* 802ADB0C 002AAA6C 38 80 00 01 */ li r4, 1 /* 802ADB10 002AAA70 48 00 07 B9 */ bl "reserve__Q24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>Fi" /* 802ADB14 002AAA74 3C 80 80 3F */ lis r4, lbl_803EC448@ha -/* 802ADB18 002AAA78 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802ADB18 002AAA78 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802ADB1C 002AAA7C 83 FD 00 0C */ lwz r31, 0xc(r29) /* 802ADB20 002AAA80 3B C1 00 44 */ addi r30, r1, 0x44 /* 802ADB24 002AAA84 3B 64 C4 48 */ addi r27, r4, lbl_803EC448@l -/* 802ADB28 002AAA88 3B 83 97 E4 */ addi r28, r3, lbl_803D97E4@l +/* 802ADB28 002AAA88 3B 83 97 E4 */ addi r28, r3, __vt__19CCollisionPrimitive@l /* 802ADB2C 002AAA8C 48 00 00 F8 */ b lbl_802ADC24 lbl_802ADB30: /* 802ADB30 002AAA90 38 00 00 00 */ li r0, 0 @@ -1575,11 +1575,11 @@ lbl_802ADD9C: /* 802ADDA8 002AAD08 38 7B 00 10 */ addi r3, r27, 0x10 /* 802ADDAC 002AAD0C 48 00 05 1D */ bl "reserve__Q24rstl42vector<6CAABox,Q24rstl17rmemory_allocator>Fi" /* 802ADDB0 002AAD10 3C 80 80 3F */ lis r4, lbl_803EC448@ha -/* 802ADDB4 002AAD14 3C 60 80 3E */ lis r3, lbl_803D97E4@ha +/* 802ADDB4 002AAD14 3C 60 80 3E */ lis r3, __vt__19CCollisionPrimitive@ha /* 802ADDB8 002AAD18 83 DB 00 0C */ lwz r30, 0xc(r27) /* 802ADDBC 002AAD1C 3B E1 00 3C */ addi r31, r1, 0x3c /* 802ADDC0 002AAD20 3B A4 C4 48 */ addi r29, r4, lbl_803EC448@l -/* 802ADDC4 002AAD24 3B 83 97 E4 */ addi r28, r3, lbl_803D97E4@l +/* 802ADDC4 002AAD24 3B 83 97 E4 */ addi r28, r3, __vt__19CCollisionPrimitive@l /* 802ADDC8 002AAD28 48 00 00 F8 */ b lbl_802ADEC0 lbl_802ADDCC: /* 802ADDCC 002AAD2C 38 00 00 00 */ li r0, 0