diff --git a/asm/MetroidPrime/CCollisionActor.s b/asm/MetroidPrime/CCollisionActor.s index 496391f6..42ea94fd 100644 --- a/asm/MetroidPrime/CCollisionActor.s +++ b/asm/MetroidPrime/CCollisionActor.s @@ -1024,9 +1024,9 @@ __ct__15CCollisionActorF9TUniqueId7TAreaId9TUniqueIdbff: /* 801A948C 001A63EC 38 61 00 40 */ addi r3, r1, 0x40 /* 801A9490 001A63F0 4B E5 B8 29 */ bl string_l__4rstlFPCc /* 801A9494 001A63F4 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 801A9498 001A63F8 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 801A9498 001A63F8 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 801A949C 001A63FC 80 1A 00 00 */ lwz r0, 0(r26) -/* 801A94A0 001A6400 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801A94A0 001A6400 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801A94A4 001A6404 90 81 00 2C */ stw r4, 0x2c(r1) /* 801A94A8 001A6408 38 61 00 68 */ addi r3, r1, 0x68 /* 801A94AC 001A640C 38 81 00 30 */ addi r4, r1, 0x30 @@ -1321,9 +1321,9 @@ __ct__15CCollisionActorF9TUniqueId9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9914 001A6874 38 61 00 58 */ addi r3, r1, 0x58 /* 801A9918 001A6878 4B E5 B3 A1 */ bl string_l__4rstlFPCc /* 801A991C 001A687C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 801A9920 001A6880 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 801A9920 001A6880 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 801A9924 001A6884 80 19 00 00 */ lwz r0, 0(r25) -/* 801A9928 001A6888 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801A9928 001A6888 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801A992C 001A688C 90 81 00 2C */ stw r4, 0x2c(r1) /* 801A9930 001A6890 38 61 00 98 */ addi r3, r1, 0x98 /* 801A9934 001A6894 38 81 00 30 */ addi r4, r1, 0x30 @@ -1638,9 +1638,9 @@ __ct__15CCollisionActorF9TUniqueIdCRi9TUniqueIdRC9CVector3fRC9CVector3fbf: /* 801A9DEC 001A6D4C 38 61 00 34 */ addi r3, r1, 0x34 /* 801A9DF0 001A6D50 4B E5 AE C9 */ bl string_l__4rstlFPCc /* 801A9DF4 001A6D54 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 801A9DF8 001A6D58 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 801A9DF8 001A6D58 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 801A9DFC 001A6D5C 80 18 00 00 */ lwz r0, 0(r24) -/* 801A9E00 001A6D60 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801A9E00 001A6D60 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801A9E04 001A6D64 90 81 00 2C */ stw r4, 0x2c(r1) /* 801A9E08 001A6D68 38 61 00 60 */ addi r3, r1, 0x60 /* 801A9E0C 001A6D6C 38 81 00 30 */ addi r4, r1, 0x30 diff --git a/asm/MetroidPrime/CEntity.s b/asm/MetroidPrime/CEntity.s index 1abe24c4..d0486f52 100644 --- a/asm/MetroidPrime/CEntity.s +++ b/asm/MetroidPrime/CEntity.s @@ -406,11 +406,11 @@ lbl_80051558: __sinit_CEntity_cpp: /* 80051580 0004E4E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80051584 0004E4E4 7C 08 02 A6 */ mflr r0 -/* 80051588 0004E4E8 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80051588 0004E4E8 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8005158C 0004E4EC 3C 80 80 05 */ lis r4, "__dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv"@ha /* 80051590 0004E4F0 90 01 00 14 */ stw r0, 0x14(r1) /* 80051594 0004E4F4 3C A0 80 47 */ lis r5, lbl_8046C3B8@ha -/* 80051598 0004E4F8 38 63 D4 10 */ addi r3, r3, lbl_8056D410@l +/* 80051598 0004E4F8 38 63 D4 10 */ addi r3, r3, NullConnectionList__7CEntity@l /* 8005159C 0004E4FC 38 00 00 00 */ li r0, 0 /* 800515A0 0004E500 90 03 00 04 */ stw r0, 4(r3) /* 800515A4 0004E504 38 84 86 F8 */ addi r4, r4, "__dt__Q24rstl48vector<11SConnection,Q24rstl17rmemory_allocator>Fv"@l diff --git a/asm/MetroidPrime/CFluidPlaneManager.s b/asm/MetroidPrime/CFluidPlaneManager.s index 0568bcb6..706235e7 100644 --- a/asm/MetroidPrime/CFluidPlaneManager.s +++ b/asm/MetroidPrime/CFluidPlaneManager.s @@ -332,9 +332,9 @@ lbl_8012F390: /* 8012F3F4 0012C354 D3 E1 00 68 */ stfs f31, 0x68(r1) /* 8012F3F8 0012C358 4B ED 58 C1 */ bl string_l__4rstlFPCc /* 8012F3FC 0012C35C 80 1C 00 04 */ lwz r0, 4(r28) -/* 8012F400 0012C360 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8012F400 0012C360 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8012F404 0012C364 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) -/* 8012F408 0012C368 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8012F408 0012C368 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8012F40C 0012C36C 90 01 00 30 */ stw r0, 0x30(r1) /* 8012F410 0012C370 38 61 00 6C */ addi r3, r1, 0x6c /* 8012F414 0012C374 38 81 00 34 */ addi r4, r1, 0x34 diff --git a/asm/MetroidPrime/CGameLight.s b/asm/MetroidPrime/CGameLight.s index 4a0c9982..eb789488 100644 --- a/asm/MetroidPrime/CGameLight.s +++ b/asm/MetroidPrime/CGameLight.s @@ -241,7 +241,7 @@ SetLight__10CGameLightFRC6CLight: "__ct__10CGameLightF9TUniqueIdbRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4f9TUniqueIdRC6CLightUiUif": /* 800B5824 000B2784 94 21 FE C0 */ stwu r1, -0x140(r1) /* 800B5828 000B2788 7C 08 02 A6 */ mflr r0 -/* 800B582C 000B278C 3D 60 80 57 */ lis r11, lbl_8056D410@ha +/* 800B582C 000B278C 3D 60 80 57 */ lis r11, NullConnectionList__7CEntity@ha /* 800B5830 000B2790 90 01 01 44 */ stw r0, 0x144(r1) /* 800B5834 000B2794 DB E1 01 38 */ stfd f31, 0x138(r1) /* 800B5838 000B2798 FF E0 08 90 */ fmr f31, f1 @@ -259,7 +259,7 @@ SetLight__10CGameLightFRC6CLight: /* 800B5868 000B27C8 38 81 00 2C */ addi r4, r1, 0x2c /* 800B586C 000B27CC 38 C1 00 28 */ addi r6, r1, 0x28 /* 800B5870 000B27D0 80 05 00 00 */ lwz r0, 0(r5) -/* 800B5874 000B27D4 38 AB D4 10 */ addi r5, r11, lbl_8056D410@l +/* 800B5874 000B27D4 38 AB D4 10 */ addi r5, r11, NullConnectionList__7CEntity@l /* 800B5878 000B27D8 81 8D A3 88 */ lwz r12, kInvalidEditorId@sda21(r13) /* 800B587C 000B27DC 90 01 00 2C */ stw r0, 0x2c(r1) /* 800B5880 000B27E0 91 81 00 28 */ stw r12, 0x28(r1) diff --git a/asm/MetroidPrime/CStateManager.s b/asm/MetroidPrime/CStateManager.s index dd324722..614ddd15 100644 --- a/asm/MetroidPrime/CStateManager.s +++ b/asm/MetroidPrime/CStateManager.s @@ -807,9 +807,9 @@ lbl_8004420C: /* 80044288 000411E8 38 84 00 07 */ addi r4, r4, 7 /* 8004428C 000411EC 4B FC 0A 2D */ bl string_l__4rstlFPCc /* 80044290 000411F0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 80044294 000411F4 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80044294 000411F4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80044298 000411F8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) -/* 8004429C 000411FC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8004429C 000411FC 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 800442A0 00041200 90 81 00 34 */ stw r4, 0x34(r1) /* 800442A4 00041204 38 61 00 7C */ addi r3, r1, 0x7c /* 800442A8 00041208 38 81 00 30 */ addi r4, r1, 0x30 diff --git a/asm/MetroidPrime/Cameras/CBallCamera.s b/asm/MetroidPrime/Cameras/CBallCamera.s index 2f4e4d30..02568769 100644 --- a/asm/MetroidPrime/Cameras/CBallCamera.s +++ b/asm/MetroidPrime/Cameras/CBallCamera.s @@ -13761,9 +13761,9 @@ __ct__11CBallCameraF9TUniqueId9TUniqueIdRC12CTransform4fffff: /* 8008CFC4 00089F24 38 87 00 07 */ addi r4, r7, 7 /* 8008CFC8 00089F28 4B F7 7C F1 */ bl string_l__4rstlFPCc /* 8008CFCC 00089F2C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 8008CFD0 00089F30 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8008CFD0 00089F30 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8008CFD4 00089F34 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) -/* 8008CFD8 00089F38 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8008CFD8 00089F38 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8008CFDC 00089F3C 90 81 00 28 */ stw r4, 0x28(r1) /* 8008CFE0 00089F40 38 61 00 40 */ addi r3, r1, 0x40 /* 8008CFE4 00089F44 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s index 355db330..cbf5038d 100644 --- a/asm/MetroidPrime/Cameras/CFirstPersonCamera.s +++ b/asm/MetroidPrime/Cameras/CFirstPersonCamera.s @@ -1998,9 +1998,9 @@ __ct__18CFirstPersonCameraFRC9TUniqueIdRC12CTransform4f9TUniqueIdfffff: /* 8000FB58 0000CAB8 38 61 00 30 */ addi r3, r1, 0x30 /* 8000FB5C 0000CABC 4B FF 51 5D */ bl string_l__4rstlFPCc /* 8000FB60 0000CAC0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 8000FB64 0000CAC4 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8000FB64 0000CAC4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8000FB68 0000CAC8 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) -/* 8000FB6C 0000CACC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8000FB6C 0000CACC 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8000FB70 0000CAD0 90 81 00 28 */ stw r4, 0x28(r1) /* 8000FB74 0000CAD4 38 61 00 40 */ addi r3, r1, 0x40 /* 8000FB78 0000CAD8 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Cameras/CInterpolationCamera.s b/asm/MetroidPrime/Cameras/CInterpolationCamera.s index 3a3a518d..e7b38610 100644 --- a/asm/MetroidPrime/Cameras/CInterpolationCamera.s +++ b/asm/MetroidPrime/Cameras/CInterpolationCamera.s @@ -1075,9 +1075,9 @@ __ct__20CInterpolationCameraF9TUniqueIdRC12CTransform4f: /* 80265EB8 00262E18 7C 04 03 78 */ mr r4, r0 /* 80265EBC 00262E1C 4B D9 ED FD */ bl string_l__4rstlFPCc /* 80265EC0 00262E20 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 80265EC4 00262E24 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80265EC4 00262E24 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80265EC8 00262E28 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) -/* 80265ECC 00262E2C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80265ECC 00262E2C 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80265ED0 00262E30 90 81 00 28 */ stw r4, 0x28(r1) /* 80265ED4 00262E34 38 61 00 40 */ addi r3, r1, 0x40 /* 80265ED8 00262E38 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Enemies/CBabygoth.s b/asm/MetroidPrime/Enemies/CBabygoth.s index f776ec47..9f3bd608 100644 --- a/asm/MetroidPrime/Enemies/CBabygoth.s +++ b/asm/MetroidPrime/Enemies/CBabygoth.s @@ -625,8 +625,8 @@ sub_8021d7e0: /* 8021D858 0021A7B8 D0 01 00 60 */ stfs f0, 0x60(r1) /* 8021D85C 0021A7BC 4B DE 74 5D */ bl string_l__4rstlFPCc /* 8021D860 0021A7C0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8021D864 0021A7C4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8021D868 0021A7C8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8021D864 0021A7C4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 8021D868 0021A7C8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8021D86C 0021A7CC 38 81 00 34 */ addi r4, r1, 0x34 /* 8021D870 0021A7D0 90 01 00 38 */ stw r0, 0x38(r1) /* 8021D874 0021A7D4 38 61 00 64 */ addi r3, r1, 0x64 diff --git a/asm/MetroidPrime/Enemies/CDrone.s b/asm/MetroidPrime/Enemies/CDrone.s index 812de36d..68b14fcc 100644 --- a/asm/MetroidPrime/Enemies/CDrone.s +++ b/asm/MetroidPrime/Enemies/CDrone.s @@ -8450,9 +8450,9 @@ sub_801660a4: /* 8016616C 001630CC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80166170 001630D0 41 82 00 B4 */ beq lbl_80166224 /* 80166174 001630D4 C0 41 00 D0 */ lfs f2, 0xd0(r1) -/* 80166178 001630D8 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80166178 001630D8 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8016617C 001630DC C0 21 00 E0 */ lfs f1, 0xe0(r1) -/* 80166180 001630E0 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80166180 001630E0 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80166184 001630E4 C0 01 00 F0 */ lfs f0, 0xf0(r1) /* 80166188 001630E8 38 61 00 7C */ addi r3, r1, 0x7c /* 8016618C 001630EC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) @@ -10072,9 +10072,9 @@ __ct__11CDroneLaserF9TUniqueIdRC12CTransform4fUi: /* 80167934 00164894 38 88 00 83 */ addi r4, r8, 0x83 /* 80167938 00164898 4B E9 D3 81 */ bl string_l__4rstlFPCc /* 8016793C 0016489C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 80167940 001648A0 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80167940 001648A0 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80167944 001648A4 80 1B 00 00 */ lwz r0, 0(r27) -/* 80167948 001648A8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80167948 001648A8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8016794C 001648AC 90 81 00 28 */ stw r4, 0x28(r1) /* 80167950 001648B0 38 61 00 60 */ addi r3, r1, 0x60 /* 80167954 001648B4 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Enemies/CElitePirate.s b/asm/MetroidPrime/Enemies/CElitePirate.s index 3975af8f..8ebfe423 100644 --- a/asm/MetroidPrime/Enemies/CElitePirate.s +++ b/asm/MetroidPrime/Enemies/CElitePirate.s @@ -1392,8 +1392,8 @@ sub_802281d8: /* 80228258 002251B8 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 8022825C 002251BC 4B DD CA 5D */ bl string_l__4rstlFPCc /* 80228260 002251C0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 80228264 002251C4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80228268 002251C8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80228264 002251C4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 80228268 002251C8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8022826C 002251CC 38 81 00 30 */ addi r4, r1, 0x30 /* 80228270 002251D0 90 01 00 34 */ stw r0, 0x34(r1) /* 80228274 002251D4 38 61 00 60 */ addi r3, r1, 0x60 @@ -2078,8 +2078,8 @@ sub_80228aac: /* 80228C38 00225B98 7C 7B 1B 79 */ or. r27, r3, r3 /* 80228C3C 00225B9C 41 82 00 D8 */ beq lbl_80228D14 /* 80228C40 00225BA0 A0 DD 00 08 */ lhz r6, 8(r29) -/* 80228C44 00225BA4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80228C48 00225BA8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80228C44 00225BA4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 80228C48 00225BA8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80228C4C 00225BAC C0 02 B5 F4 */ lfs f0, lbl_805AD314@sda21(r2) /* 80228C50 00225BB0 B0 C1 00 20 */ sth r6, 0x20(r1) /* 80228C54 00225BB4 38 61 00 74 */ addi r3, r1, 0x74 @@ -6079,9 +6079,9 @@ lbl_8022C5C8: /* 8022C5C8 00229528 C3 A2 B6 14 */ lfs f29, lbl_805AD334@sda21(r2) lbl_8022C5CC: /* 8022C5CC 0022952C A0 FC 00 08 */ lhz r7, 8(r28) -/* 8022C5D0 00229530 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8022C5D0 00229530 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8022C5D4 00229534 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8022C5D8 00229538 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8022C5D8 00229538 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8022C5DC 0022953C B0 E1 00 18 */ sth r7, 0x18(r1) /* 8022C5E0 00229540 38 61 00 78 */ addi r3, r1, 0x78 /* 8022C5E4 00229544 38 81 00 40 */ addi r4, r1, 0x40 diff --git a/asm/MetroidPrime/Enemies/CFireFlea.s b/asm/MetroidPrime/Enemies/CFireFlea.s index 73315e5e..76a62299 100644 --- a/asm/MetroidPrime/Enemies/CFireFlea.s +++ b/asm/MetroidPrime/Enemies/CFireFlea.s @@ -1699,7 +1699,7 @@ lbl_80143D98: "__ct__Q29CFireFlea18CDeathCameraEffectF9TUniqueIdRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>": /* 80143DB8 00140D18 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80143DBC 00140D1C 7C 08 02 A6 */ mflr r0 -/* 80143DC0 00140D20 3C E0 80 57 */ lis r7, lbl_8056D410@ha +/* 80143DC0 00140D20 3C E0 80 57 */ lis r7, NullConnectionList__7CEntity@ha /* 80143DC4 00140D24 90 01 00 54 */ stw r0, 0x54(r1) /* 80143DC8 00140D28 93 E1 00 4C */ stw r31, 0x4c(r1) /* 80143DCC 00140D2C 7C 7F 1B 78 */ mr r31, r3 @@ -1711,7 +1711,7 @@ lbl_80143D98: /* 80143DE4 00140D44 7C 9D 23 78 */ mr r29, r4 /* 80143DE8 00140D48 38 81 00 20 */ addi r4, r1, 0x20 /* 80143DEC 00140D4C 80 05 00 00 */ lwz r0, 0(r5) -/* 80143DF0 00140D50 38 A7 D4 10 */ addi r5, r7, lbl_8056D410@l +/* 80143DF0 00140D50 38 A7 D4 10 */ addi r5, r7, NullConnectionList__7CEntity@l /* 80143DF4 00140D54 81 0D A3 88 */ lwz r8, kInvalidEditorId@sda21(r13) /* 80143DF8 00140D58 90 01 00 20 */ stw r0, 0x20(r1) /* 80143DFC 00140D5C 91 01 00 1C */ stw r8, 0x1c(r1) diff --git a/asm/MetroidPrime/Enemies/CFlaahgra.s b/asm/MetroidPrime/Enemies/CFlaahgra.s index 4b95c2d2..4d393838 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgra.s +++ b/asm/MetroidPrime/Enemies/CFlaahgra.s @@ -6608,8 +6608,8 @@ lbl_801B2CE4: /* 801B2D38 001AFC98 7C 7B 1B 79 */ or. r27, r3, r3 /* 801B2D3C 001AFC9C 41 82 00 80 */ beq lbl_801B2DBC /* 801B2D40 001AFCA0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 801B2D44 001AFCA4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 801B2D48 001AFCA8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801B2D44 001AFCA4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 801B2D48 001AFCA8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801B2D4C 001AFCAC 38 81 00 70 */ addi r4, r1, 0x70 /* 801B2D50 001AFCB0 90 01 00 74 */ stw r0, 0x74(r1) /* 801B2D54 001AFCB4 38 61 01 14 */ addi r3, r1, 0x114 diff --git a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s index 7a160de5..cdbcf72b 100644 --- a/asm/MetroidPrime/Enemies/CFlaahgraPlants.s +++ b/asm/MetroidPrime/Enemies/CFlaahgraPlants.s @@ -566,9 +566,9 @@ lbl_80208AB8: /* 80208B1C 00205A7C 38 A0 FF FF */ li r5, -1 /* 80208B20 00205A80 48 13 56 75 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" /* 80208B24 00205A84 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 80208B28 00205A88 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80208B28 00205A88 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80208B2C 00205A8C 80 17 00 00 */ lwz r0, 0(r23) -/* 80208B30 00205A90 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80208B30 00205A90 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80208B34 00205A94 90 81 00 2C */ stw r4, 0x2c(r1) /* 80208B38 00205A98 38 61 00 7C */ addi r3, r1, 0x7c /* 80208B3C 00205A9C 38 81 00 30 */ addi r4, r1, 0x30 diff --git a/asm/MetroidPrime/Enemies/CFlyingPirate.s b/asm/MetroidPrime/Enemies/CFlyingPirate.s index db4819d6..f852377c 100644 --- a/asm/MetroidPrime/Enemies/CFlyingPirate.s +++ b/asm/MetroidPrime/Enemies/CFlyingPirate.s @@ -9328,8 +9328,8 @@ Explode__13CFlyingPirateFR13CStateManager: /* 801FBFF4 001F8F54 D0 01 00 60 */ stfs f0, 0x60(r1) /* 801FBFF8 001F8F58 4B E0 8C C1 */ bl string_l__4rstlFPCc /* 801FBFFC 001F8F5C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 801FC000 001F8F60 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 801FC004 001F8F64 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801FC000 001F8F60 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 801FC004 001F8F64 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801FC008 001F8F68 38 81 00 34 */ addi r4, r1, 0x34 /* 801FC00C 001F8F6C 90 01 00 38 */ stw r0, 0x38(r1) /* 801FC010 001F8F70 38 61 00 80 */ addi r3, r1, 0x80 diff --git a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s index c87a0d31..dfaa755b 100644 --- a/asm/MetroidPrime/Enemies/CGrenadeLauncher.s +++ b/asm/MetroidPrime/Enemies/CGrenadeLauncher.s @@ -271,8 +271,8 @@ sub_8022f770: /* 8022F7F0 0022C750 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8022F7F4 0022C754 4B DD 54 C5 */ bl string_l__4rstlFPCc /* 8022F7F8 0022C758 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8022F7FC 0022C75C 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8022F800 0022C760 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8022F7FC 0022C75C 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 8022F800 0022C760 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8022F804 0022C764 38 81 00 30 */ addi r4, r1, 0x30 /* 8022F808 0022C768 90 01 00 34 */ stw r0, 0x34(r1) /* 8022F80C 0022C76C 38 61 00 54 */ addi r3, r1, 0x54 @@ -1000,8 +1000,8 @@ lbl_802301CC: /* 802302A8 0022D208 D0 01 00 AC */ stfs f0, 0xac(r1) /* 802302AC 0022D20C 4B EE 6A B1 */ bl __ct__10CModelDataFRC10CStaticRes /* 802302B0 0022D210 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 802302B4 0022D214 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 802302B8 0022D218 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 802302B4 0022D214 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 802302B8 0022D218 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 802302BC 0022D21C 38 81 00 30 */ addi r4, r1, 0x30 /* 802302C0 0022D220 90 01 00 34 */ stw r0, 0x34(r1) /* 802302C4 0022D224 38 61 01 5C */ addi r3, r1, 0x15c diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s index 7a204c7b..d2043595 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeEssence.s @@ -1158,9 +1158,9 @@ sub_8027d52c: /* 8027D5DC 0027A53C 7C 7C 1B 79 */ or. r28, r3, r3 /* 8027D5E0 0027A540 41 82 00 A4 */ beq lbl_8027D684 /* 8027D5E4 0027A544 A0 FB 00 08 */ lhz r7, 8(r27) -/* 8027D5E8 0027A548 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8027D5E8 0027A548 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8027D5EC 0027A54C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8027D5F0 0027A550 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8027D5F0 0027A550 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8027D5F4 0027A554 B0 E1 00 14 */ sth r7, 0x14(r1) /* 8027D5F8 0027A558 38 61 00 44 */ addi r3, r1, 0x44 /* 8027D5FC 0027A55C 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s index 22316b9a..201adb81 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeExo.s @@ -4145,8 +4145,8 @@ sub_802740fc: /* 80274144 002710A4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80274148 002710A8 41 82 00 70 */ beq lbl_802741B8 /* 8027414C 002710AC 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 80274150 002710B0 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80274154 002710B4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80274150 002710B0 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 80274154 002710B4 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80274158 002710B8 38 81 00 24 */ addi r4, r1, 0x24 /* 8027415C 002710BC 90 01 00 28 */ stw r0, 0x28(r1) /* 80274160 002710C0 38 61 00 3C */ addi r3, r1, 0x3c diff --git a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s index 76522198..ecd7093c 100644 --- a/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s +++ b/asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s @@ -158,9 +158,9 @@ lbl_802805D8: /* 80280644 0027D5A4 90 E1 00 CC */ stw r7, 0xcc(r1) /* 80280648 0027D5A8 4B E9 65 0D */ bl __ct__10CModelDataFRC8CAnimRes /* 8028064C 0027D5AC 80 1D 00 04 */ lwz r0, 4(r29) -/* 80280650 0027D5B0 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80280650 0027D5B0 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80280654 0027D5B4 80 CD A3 88 */ lwz r6, kInvalidEditorId@sda21(r13) -/* 80280658 0027D5B8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80280658 0027D5B8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8028065C 0027D5BC 90 01 00 7C */ stw r0, 0x7c(r1) /* 80280660 0027D5C0 38 61 00 9C */ addi r3, r1, 0x9c /* 80280664 0027D5C4 38 81 00 80 */ addi r4, r1, 0x80 diff --git a/asm/MetroidPrime/Enemies/CPatterned.s b/asm/MetroidPrime/Enemies/CPatterned.s index 15f48e3e..d54168a7 100644 --- a/asm/MetroidPrime/Enemies/CPatterned.s +++ b/asm/MetroidPrime/Enemies/CPatterned.s @@ -4736,9 +4736,9 @@ GenerateIceDeathExplosion__10CPatternedFR13CStateManager: /* 8007AEA4 00077E04 90 01 00 3C */ stw r0, 0x3c(r1) /* 8007AEA8 00077E08 4B FD 22 35 */ bl AllocateUniqueId__13CStateManagerFv /* 8007AEAC 00077E0C 80 FA 00 04 */ lwz r7, 4(r26) -/* 8007AEB0 00077E10 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8007AEB0 00077E10 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8007AEB4 00077E14 A0 81 00 10 */ lhz r4, 0x10(r1) -/* 8007AEB8 00077E18 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8007AEB8 00077E18 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8007AEBC 00077E1C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007AEC0 00077E20 38 61 00 74 */ addi r3, r1, 0x74 /* 8007AEC4 00077E24 B0 81 00 14 */ sth r4, 0x14(r1) @@ -4891,9 +4891,9 @@ lbl_8007B020: /* 8007B0E4 00078044 90 01 00 84 */ stw r0, 0x84(r1) /* 8007B0E8 00078048 4B FD 1F F5 */ bl AllocateUniqueId__13CStateManagerFv /* 8007B0EC 0007804C 80 FC 00 04 */ lwz r7, 4(r28) -/* 8007B0F0 00078050 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8007B0F0 00078050 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8007B0F4 00078054 A0 81 00 18 */ lhz r4, 0x18(r1) -/* 8007B0F8 00078058 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8007B0F8 00078058 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8007B0FC 0007805C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007B100 00078060 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8007B104 00078064 B0 81 00 1C */ sth r4, 0x1c(r1) @@ -4997,9 +4997,9 @@ lbl_8007B214: /* 8007B270 000781D0 90 01 00 5C */ stw r0, 0x5c(r1) /* 8007B274 000781D4 4B FD 1E 69 */ bl AllocateUniqueId__13CStateManagerFv /* 8007B278 000781D8 80 FC 00 04 */ lwz r7, 4(r28) -/* 8007B27C 000781DC 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8007B27C 000781DC 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8007B280 000781E0 A0 81 00 10 */ lhz r4, 0x10(r1) -/* 8007B284 000781E4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8007B284 000781E4 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8007B288 000781E8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8007B28C 000781EC 38 61 00 BC */ addi r3, r1, 0xbc /* 8007B290 000781F0 B0 81 00 14 */ sth r4, 0x14(r1) diff --git a/asm/MetroidPrime/Enemies/CRidley.s b/asm/MetroidPrime/Enemies/CRidley.s index f94d80b1..c97951a6 100644 --- a/asm/MetroidPrime/Enemies/CRidley.s +++ b/asm/MetroidPrime/Enemies/CRidley.s @@ -3692,8 +3692,8 @@ lbl_80254FE0: /* 80255134 00252094 D0 01 00 68 */ stfs f0, 0x68(r1) /* 80255138 00252098 4B DA FB 81 */ bl string_l__4rstlFPCc /* 8025513C 0025209C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 80255140 002520A0 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 80255144 002520A4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80255140 002520A0 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 80255144 002520A4 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80255148 002520A8 38 81 00 2C */ addi r4, r1, 0x2c /* 8025514C 002520AC 90 01 00 30 */ stw r0, 0x30(r1) /* 80255150 002520B0 38 61 00 B4 */ addi r3, r1, 0xb4 diff --git a/asm/MetroidPrime/Enemies/CRipper.s b/asm/MetroidPrime/Enemies/CRipper.s index 0cebdf09..75e8b640 100644 --- a/asm/MetroidPrime/Enemies/CRipper.s +++ b/asm/MetroidPrime/Enemies/CRipper.s @@ -284,9 +284,9 @@ AddPlatform__7CRipperFR13CStateManager: /* 8015BEC8 00158E28 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015BECC 00158E2C 41 82 00 A4 */ beq lbl_8015BF70 /* 8015BED0 00158E30 38 00 00 00 */ li r0, 0 -/* 8015BED4 00158E34 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8015BED4 00158E34 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8015BED8 00158E38 98 01 00 58 */ stb r0, 0x58(r1) -/* 8015BEDC 00158E3C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8015BEDC 00158E3C 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8015BEE0 00158E40 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 8015BEE4 00158E44 38 61 00 5C */ addi r3, r1, 0x5c /* 8015BEE8 00158E48 88 FD 00 30 */ lbz r7, 0x30(r29) @@ -479,8 +479,8 @@ AddGrapplePoint__7CRipperFR13CStateManager: /* 8015C188 001590E8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015C18C 001590EC 41 82 00 78 */ beq lbl_8015C204 /* 8015C190 001590F0 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8015C194 001590F4 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8015C198 001590F8 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8015C194 001590F4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 8015C198 001590F8 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8015C19C 001590FC 38 81 00 24 */ addi r4, r1, 0x24 /* 8015C1A0 00159100 90 01 00 28 */ stw r0, 0x28(r1) /* 8015C1A4 00159104 38 61 00 3C */ addi r3, r1, 0x3c diff --git a/asm/MetroidPrime/Enemies/CThardus.s b/asm/MetroidPrime/Enemies/CThardus.s index be8f53be..877cb715 100644 --- a/asm/MetroidPrime/Enemies/CThardus.s +++ b/asm/MetroidPrime/Enemies/CThardus.s @@ -8140,8 +8140,8 @@ lbl_801E119C: /* 801E12E4 001DE244 39 40 00 01 */ li r10, 1 /* 801E12E8 001DE248 4B F2 55 E1 */ bl sub_801068c8 /* 801E12EC 001DE24C C0 02 AC DC */ lfs f0, lbl_805AC9FC@sda21(r2) -/* 801E12F0 001DE250 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 801E12F4 001DE254 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801E12F0 001DE250 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 801E12F4 001DE254 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801E12F8 001DE258 D3 E1 01 60 */ stfs f31, 0x160(r1) /* 801E12FC 001DE25C 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 801E1300 001DE260 38 61 02 38 */ addi r3, r1, 0x238 diff --git a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s index 3f3d7d5b..26445fb8 100644 --- a/asm/MetroidPrime/Enemies/CThardusRockProjectile.s +++ b/asm/MetroidPrime/Enemies/CThardusRockProjectile.s @@ -2291,9 +2291,9 @@ lbl_80205314: /* 80205468 002023C8 7D 89 03 A6 */ mtctr r12 /* 8020546C 002023CC 4E 80 04 21 */ bctrl /* 80205470 002023D0 80 DF 05 88 */ lwz r6, 0x588(r31) -/* 80205474 002023D4 3C 80 80 57 */ lis r4, lbl_8056D410@ha +/* 80205474 002023D4 3C 80 80 57 */ lis r4, NullConnectionList__7CEntity@ha /* 80205478 002023D8 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8020547C 002023DC 38 A4 D4 10 */ addi r5, r4, lbl_8056D410@l +/* 8020547C 002023DC 38 A4 D4 10 */ addi r5, r4, NullConnectionList__7CEntity@l /* 80205480 002023E0 7C 72 1B 78 */ mr r18, r3 /* 80205484 002023E4 7E 26 EA 14 */ add r17, r6, r29 /* 80205488 002023E8 90 01 00 9C */ stw r0, 0x9c(r1) diff --git a/asm/MetroidPrime/Player/CPlayer.s b/asm/MetroidPrime/Player/CPlayer.s index 63a61df1..8fc45bc3 100644 --- a/asm/MetroidPrime/Player/CPlayer.s +++ b/asm/MetroidPrime/Player/CPlayer.s @@ -12358,9 +12358,9 @@ __ct__7CPlayerF9TUniqueIdRC12CTransform4fRC6CAABoxUi9CVector3fffffRC13CMaterialL /* 8001A2A4 00017204 38 8A 00 3F */ addi r4, r10, 0x3f /* 8001A2A8 00017208 4B FE AA 11 */ bl string_l__4rstlFPCc /* 8001A2AC 0001720C 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 8001A2B0 00017210 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8001A2B0 00017210 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8001A2B4 00017214 80 0D A3 90 */ lwz r0, kInvalidAreaId@sda21(r13) -/* 8001A2B8 00017218 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8001A2B8 00017218 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8001A2BC 0001721C 90 81 00 30 */ stw r4, 0x30(r1) /* 8001A2C0 00017220 38 61 00 94 */ addi r3, r1, 0x94 /* 8001A2C4 00017224 38 81 00 34 */ addi r4, r1, 0x34 diff --git a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s index bfb5b4a2..74031638 100644 --- a/asm/MetroidPrime/ScriptObjects/CEnergyBall.s +++ b/asm/MetroidPrime/ScriptObjects/CEnergyBall.s @@ -505,8 +505,8 @@ lbl_8029F694: /* 8029F6CC 0029C62C 38 84 00 26 */ addi r4, r4, 0x26 /* 8029F6D0 0029C630 4B D6 55 E9 */ bl string_l__4rstlFPCc /* 8029F6D4 0029C634 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8029F6D8 0029C638 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8029F6DC 0029C63C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8029F6D8 0029C638 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 8029F6DC 0029C63C 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8029F6E0 0029C640 38 81 00 34 */ addi r4, r1, 0x34 /* 8029F6E4 0029C644 90 01 00 38 */ stw r0, 0x38(r1) /* 8029F6E8 0029C648 38 61 00 C8 */ addi r3, r1, 0xc8 diff --git a/asm/MetroidPrime/ScriptObjects/CFire.s b/asm/MetroidPrime/ScriptObjects/CFire.s index d332b384..264fb031 100644 --- a/asm/MetroidPrime/ScriptObjects/CFire.s +++ b/asm/MetroidPrime/ScriptObjects/CFire.s @@ -499,9 +499,9 @@ __ct__5CFire: /* 8025D26C 0025A1CC 38 A0 FF FF */ li r5, -1 /* 8025D270 0025A1D0 48 0E 0F 25 */ bl "__ct__Q24rstl66basic_string,Q24rstl17rmemory_allocator>FPCciRCQ24rstl17rmemory_allocator" /* 8025D274 0025A1D4 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 8025D278 0025A1D8 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8025D278 0025A1D8 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 8025D27C 0025A1DC 80 11 00 00 */ lwz r0, 0(r17) -/* 8025D280 0025A1E0 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 8025D280 0025A1E0 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 8025D284 0025A1E4 90 81 00 2C */ stw r4, 0x2c(r1) /* 8025D288 0025A1E8 38 61 00 64 */ addi r3, r1, 0x64 /* 8025D28C 0025A1EC 38 81 00 30 */ addi r4, r1, 0x30 diff --git a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s index e3f9799a..6096d302 100644 --- a/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s +++ b/asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s @@ -418,11 +418,11 @@ lbl_8012FEDC: /* 8012FF08 0012CE68 F3 E1 00 88 */ psq_st f31, 136(r1), 0, qr0 /* 8012FF0C 0012CE6C BE C1 00 58 */ stmw r22, 0x58(r1) /* 8012FF10 0012CE70 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 8012FF14 0012CE74 3D 60 80 57 */ lis r11, lbl_8056D410@ha +/* 8012FF14 0012CE74 3D 60 80 57 */ lis r11, NullConnectionList__7CEntity@ha /* 8012FF18 0012CE78 81 8D A3 90 */ lwz r12, kInvalidAreaId@sda21(r13) /* 8012FF1C 0012CE7C FF E0 08 90 */ fmr f31, f1 /* 8012FF20 0012CE80 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8012FF24 0012CE84 38 0B D4 10 */ addi r0, r11, lbl_8056D410@l +/* 8012FF24 0012CE84 38 0B D4 10 */ addi r0, r11, NullConnectionList__7CEntity@l /* 8012FF28 0012CE88 7C 7F 1B 78 */ mr r31, r3 /* 8012FF2C 0012CE8C 7C 99 23 78 */ mr r25, r4 /* 8012FF30 0012CE90 7C BA 2B 78 */ mr r26, r5 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s index a1205877..be7f3e1a 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s @@ -898,9 +898,9 @@ lbl_802017D8: /* 80201820 001FE780 7C 7B 1B 79 */ or. r27, r3, r3 /* 80201824 001FE784 41 82 00 B8 */ beq lbl_802018DC /* 80201828 001FE788 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 8020182C 001FE78C 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 8020182C 001FE78C 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80201830 001FE790 80 01 00 58 */ lwz r0, 0x58(r1) -/* 80201834 001FE794 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80201834 001FE794 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80201838 001FE798 90 81 00 44 */ stw r4, 0x44(r1) /* 8020183C 001FE79C 38 61 00 6C */ addi r3, r1, 0x6c /* 80201840 001FE7A0 38 81 00 40 */ addi r4, r1, 0x40 @@ -1047,9 +1047,9 @@ lbl_80201A08: /* 80201A50 001FE9B0 7C 7B 1B 79 */ or. r27, r3, r3 /* 80201A54 001FE9B4 41 82 00 B8 */ beq lbl_80201B0C /* 80201A58 001FE9B8 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 80201A5C 001FE9BC 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 80201A5C 001FE9BC 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 80201A60 001FE9C0 80 01 00 58 */ lwz r0, 0x58(r1) -/* 80201A64 001FE9C4 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80201A64 001FE9C4 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80201A68 001FE9C8 90 81 00 44 */ stw r4, 0x44(r1) /* 80201A6C 001FE9CC 38 61 00 6C */ addi r3, r1, 0x6c /* 80201A70 001FE9D0 38 81 00 40 */ addi r4, r1, 0x40 diff --git a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s index e2e0b02e..41d46759 100644 --- a/asm/MetroidPrime/ScriptObjects/CScriptPickup.s +++ b/asm/MetroidPrime/ScriptObjects/CScriptPickup.s @@ -285,8 +285,8 @@ lbl_800C2790: /* 800C2804 000BF764 90 01 00 64 */ stw r0, 0x64(r1) /* 800C2808 000BF768 4B F8 A8 D5 */ bl AllocateUniqueId__13CStateManagerFv /* 800C280C 000BF76C A0 81 00 18 */ lhz r4, 0x18(r1) -/* 800C2810 000BF770 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 800C2814 000BF774 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 800C2810 000BF770 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 800C2814 000BF774 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 800C2818 000BF778 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) /* 800C281C 000BF77C B0 81 00 1C */ sth r4, 0x1c(r1) /* 800C2820 000BF780 38 61 00 84 */ addi r3, r1, 0x84 diff --git a/asm/MetroidPrime/Weapons/CEnergyProjectile.s b/asm/MetroidPrime/Weapons/CEnergyProjectile.s index 4164d09a..16a7ed1e 100644 --- a/asm/MetroidPrime/Weapons/CEnergyProjectile.s +++ b/asm/MetroidPrime/Weapons/CEnergyProjectile.s @@ -1637,8 +1637,8 @@ lbl_802151D8: /* 8021520C 0021216C 38 84 00 26 */ addi r4, r4, 0x26 /* 80215210 00212170 4B DE FA A9 */ bl string_l__4rstlFPCc /* 80215214 00212174 80 0D A3 88 */ lwz r0, kInvalidEditorId@sda21(r13) -/* 80215218 00212178 3C 60 80 57 */ lis r3, lbl_8056D410@ha -/* 8021521C 0021217C 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 80215218 00212178 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha +/* 8021521C 0021217C 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 80215220 00212180 38 81 00 58 */ addi r4, r1, 0x58 /* 80215224 00212184 90 01 00 5C */ stw r0, 0x5c(r1) /* 80215228 00212188 38 61 01 40 */ addi r3, r1, 0x140 diff --git a/asm/MetroidPrime/Weapons/CIceImpact.s b/asm/MetroidPrime/Weapons/CIceImpact.s index 29b1e9b6..e0735727 100644 --- a/asm/MetroidPrime/Weapons/CIceImpact.s +++ b/asm/MetroidPrime/Weapons/CIceImpact.s @@ -2224,10 +2224,10 @@ lbl_801B7A38: /* 801B7A80 001B49E0 38 61 00 8C */ addi r3, r1, 0x8c /* 801B7A84 001B49E4 38 81 00 20 */ addi r4, r1, 0x20 /* 801B7A88 001B49E8 80 06 00 00 */ lwz r0, 0(r6) -/* 801B7A8C 001B49EC 3C C0 80 57 */ lis r6, lbl_8056D410@ha +/* 801B7A8C 001B49EC 3C C0 80 57 */ lis r6, NullConnectionList__7CEntity@ha /* 801B7A90 001B49F0 81 6D A3 88 */ lwz r11, kInvalidEditorId@sda21(r13) /* 801B7A94 001B49F4 90 01 00 20 */ stw r0, 0x20(r1) -/* 801B7A98 001B49F8 38 06 D4 10 */ addi r0, r6, lbl_8056D410@l +/* 801B7A98 001B49F8 38 06 D4 10 */ addi r0, r6, NullConnectionList__7CEntity@l /* 801B7A9C 001B49FC 7C 05 03 78 */ mr r5, r0 /* 801B7AA0 001B4A00 38 C1 00 1C */ addi r6, r1, 0x1c /* 801B7AA4 001B4A04 91 61 00 1C */ stw r11, 0x1c(r1) diff --git a/asm/MetroidPrime/Weapons/CIceProjectile.s b/asm/MetroidPrime/Weapons/CIceProjectile.s index 4659d1cf..e0355187 100644 --- a/asm/MetroidPrime/Weapons/CIceProjectile.s +++ b/asm/MetroidPrime/Weapons/CIceProjectile.s @@ -2302,9 +2302,9 @@ lbl_801F39D4: /* 801F3A68 001F09C8 38 8B 00 07 */ addi r4, r11, 7 /* 801F3A6C 001F09CC 4B E1 12 4D */ bl string_l__4rstlFPCc /* 801F3A70 001F09D0 80 8D A3 88 */ lwz r4, kInvalidEditorId@sda21(r13) -/* 801F3A74 001F09D4 3C 60 80 57 */ lis r3, lbl_8056D410@ha +/* 801F3A74 001F09D4 3C 60 80 57 */ lis r3, NullConnectionList__7CEntity@ha /* 801F3A78 001F09D8 80 11 00 00 */ lwz r0, 0(r17) -/* 801F3A7C 001F09DC 38 A3 D4 10 */ addi r5, r3, lbl_8056D410@l +/* 801F3A7C 001F09DC 38 A3 D4 10 */ addi r5, r3, NullConnectionList__7CEntity@l /* 801F3A80 001F09E0 90 81 00 28 */ stw r4, 0x28(r1) /* 801F3A84 001F09E4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 801F3A88 001F09E8 38 81 00 2C */ addi r4, r1, 0x2c diff --git a/asm/MetroidPrime/Weapons/CWeapon.s b/asm/MetroidPrime/Weapons/CWeapon.s index 9b61c763..28e9f2fc 100644 --- a/asm/MetroidPrime/Weapons/CWeapon.s +++ b/asm/MetroidPrime/Weapons/CWeapon.s @@ -368,7 +368,7 @@ lbl_80102278: "__ct__7CWeaponF9TUniqueIdb9TUniqueId11EWeaponTypeRCQ24rstl66basic_string,Q24rstl17rmemory_allocator>RC12CTransform4fRC15CMaterialFilterRC13CMaterialListRC11CDamageInfoiRC10CModelData": /* 80102294 000FF1F4 94 21 FE B0 */ stwu r1, -0x150(r1) /* 80102298 000FF1F8 7C 08 02 A6 */ mflr r0 -/* 8010229C 000FF1FC 3D 60 80 57 */ lis r11, lbl_8056D410@ha +/* 8010229C 000FF1FC 3D 60 80 57 */ lis r11, NullConnectionList__7CEntity@ha /* 801022A0 000FF200 90 01 01 54 */ stw r0, 0x154(r1) /* 801022A4 000FF204 BE 81 01 20 */ stmw r20, 0x120(r1) /* 801022A8 000FF208 7C 79 1B 78 */ mr r25, r3 @@ -387,7 +387,7 @@ lbl_80102278: /* 801022DC 000FF23C 38 81 00 2C */ addi r4, r1, 0x2c /* 801022E0 000FF240 38 C1 00 28 */ addi r6, r1, 0x28 /* 801022E4 000FF244 80 05 00 00 */ lwz r0, 0(r5) -/* 801022E8 000FF248 38 AB D4 10 */ addi r5, r11, lbl_8056D410@l +/* 801022E8 000FF248 38 AB D4 10 */ addi r5, r11, NullConnectionList__7CEntity@l /* 801022EC 000FF24C 81 8D A3 88 */ lwz r12, kInvalidEditorId@sda21(r13) /* 801022F0 000FF250 90 01 00 2C */ stw r0, 0x2c(r1) /* 801022F4 000FF254 91 81 00 28 */ stw r12, 0x28(r1)