PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-09 23:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename NullConnectionList__7CEntity

Browse Source
This commit is contained in:
Luke Street
2022-08-10 19:45:31 -04:00
parent b7565482e9
commit 0a57ffc4d3
34 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/MetroidPrime/ScriptObjects/CEnergyBall.s
View File

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

4
asm/MetroidPrime/ScriptObjects/CFire.s
View File

@@ -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<c,Q24rstl14char_traits<c>,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

4
asm/MetroidPrime/ScriptObjects/CHUDBillboardEffect.s
View File

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

8
asm/MetroidPrime/ScriptObjects/CScriptColorModulate.s
View File

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

4
asm/MetroidPrime/ScriptObjects/CScriptPickup.s
View File

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