primeret/prime
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2026-07-12 18:18:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

More symbol fixes

Browse Source 
Former-commit-id: 52b5ab45d3
This commit is contained in:
Luke Street
2022-09-14 01:24:37 -04:00
parent 86c16b4b9d
commit 07d8389435
34 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/MetroidPrime/BodyState/CBSHurled.s
+3 -3
View File
@@ -461,7 +461,7 @@ PlayLandAnimation__9CBSHurledFR15CBodyControllerR13CStateManager:
/* 80144A14 00141974 38 A1 00 10 */ addi r5, r1, 0x10
/* 80144A18 00141978 38 C0 00 17 */ li r6, 0x17
/* 80144A1C 0014197C B0 01 00 10 */ sth r0, 0x10(r1)
/* 80144A20 00141980 4B EF F4 B1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80144A20 00141980 4B EF F4 B1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80144A24:
/* 80144A24 00141984 34 A1 00 A0 */ addic. r5, r1, 0xa0
/* 80144A28 00141988 41 82 00 58 */ beq lbl_80144A80
@@ -1102,14 +1102,14 @@ lbl_801451EC:
/* 8014533C 0014229C A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 80145340 001422A0 38 C0 00 1A */ li r6, 0x1a
/* 80145344 001422A4 B0 01 00 14 */ sth r0, 0x14(r1)
/* 80145348 001422A8 4B EF EB 89 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80145348 001422A8 4B EF EB 89 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8014534C 001422AC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 80145350 001422B0 7F 83 E3 78 */ mr r3, r28
/* 80145354 001422B4 7F C4 F3 78 */ mr r4, r30
/* 80145358 001422B8 38 A1 00 10 */ addi r5, r1, 0x10
/* 8014535C 001422BC B0 01 00 10 */ sth r0, 0x10(r1)
/* 80145360 001422C0 38 C0 00 28 */ li r6, 0x28
/* 80145364 001422C4 4B EF EB 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80145364 001422C4 4B EF EB 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80145368 001422C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8014536C 001422CC C0 22 9C 24 */ lfs f1, lbl_805AB944@sda21(r2)
/* 80145370 001422D0 38 83 66 A0 */ addi r4, r3, sZeroVector__9CVector3f@l
asm/MetroidPrime/BodyState/CBSJump.s
+5 -5
View File
@@ -214,7 +214,7 @@ lbl_8014580C:
/* 801458A8 00142808 38 A1 00 10 */ addi r5, r1, 0x10
/* 801458AC 0014280C B0 01 00 10 */ sth r0, 0x10(r1)
/* 801458B0 00142810 38 C0 00 17 */ li r6, 0x17
/* 801458B4 00142814 4B EF E6 1D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801458B4 00142814 4B EF E6 1D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801458B8 00142818 34 A1 00 84 */ addic. r5, r1, 0x84
/* 801458BC 0014281C 3B C0 00 01 */ li r30, 1
/* 801458C0 00142820 41 82 00 58 */ beq lbl_80145918
@@ -325,7 +325,7 @@ lbl_801459A0:
/* 80145A40 001429A0 38 A1 00 10 */ addi r5, r1, 0x10
/* 80145A44 001429A4 B0 01 00 10 */ sth r0, 0x10(r1)
/* 80145A48 001429A8 38 C0 00 17 */ li r6, 0x17
/* 80145A4C 001429AC 4B EF E4 85 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80145A4C 001429AC 4B EF E4 85 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80145A50 001429B0 34 A1 00 60 */ addic. r5, r1, 0x60
/* 80145A54 001429B4 41 82 00 58 */ beq lbl_80145AAC
/* 80145A58 001429B8 80 C5 00 00 */ lwz r6, 0(r5)
@@ -619,7 +619,7 @@ lbl_80145E40:
/* 80145E58 00142DB8 38 C0 00 1A */ li r6, 0x1a
/* 80145E5C 00142DBC B0 01 00 10 */ sth r0, 0x10(r1)
/* 80145E60 00142DC0 80 9D 00 00 */ lwz r4, 0(r29)
/* 80145E64 00142DC4 4B EF E0 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80145E64 00142DC4 4B EF E0 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80145E68 00142DC8 38 00 00 02 */ li r0, 2
/* 80145E6C 00142DCC 38 61 00 1C */ addi r3, r1, 0x1c
/* 80145E70 00142DD0 90 1C 00 04 */ stw r0, 4(r28)
@@ -896,14 +896,14 @@ lbl_80146248:
/* 8014626C 001431CC 38 A1 00 14 */ addi r5, r1, 0x14
/* 80146270 001431D0 B0 01 00 14 */ sth r0, 0x14(r1)
/* 80146274 001431D4 38 C0 00 1A */ li r6, 0x1a
/* 80146278 001431D8 4B EF DC 59 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80146278 001431D8 4B EF DC 59 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8014627C 001431DC A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 80146280 001431E0 7F C3 F3 78 */ mr r3, r30
/* 80146284 001431E4 7F E4 FB 78 */ mr r4, r31
/* 80146288 001431E8 38 A1 00 10 */ addi r5, r1, 0x10
/* 8014628C 001431EC B0 01 00 10 */ sth r0, 0x10(r1)
/* 80146290 001431F0 38 C0 00 28 */ li r6, 0x28
/* 80146294 001431F4 4B EF DC 3D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80146294 001431F4 4B EF DC 3D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80146298 001431F8 C0 1F 01 38 */ lfs f0, 0x138(r31)
/* 8014629C 001431FC 38 60 00 00 */ li r3, 0
/* 801462A0 00143200 88 1D 00 30 */ lbz r0, 0x30(r29)
asm/MetroidPrime/BodyState/CBSWallHang.s
+4 -4
View File
@@ -193,7 +193,7 @@ lbl_8018D630:
/* 8018D6CC 0018A62C 38 A1 00 10 */ addi r5, r1, 0x10
/* 8018D6D0 0018A630 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8018D6D4 0018A634 38 C0 00 17 */ li r6, 0x17
/* 8018D6D8 0018A638 4B EB 67 F9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8018D6D8 0018A638 4B EB 67 F9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8018D6DC 0018A63C 34 A1 00 60 */ addic. r5, r1, 0x60
/* 8018D6E0 0018A640 3B C0 00 01 */ li r30, 1
/* 8018D6E4 0018A644 41 82 00 58 */ beq lbl_8018D73C
@@ -401,7 +401,7 @@ lbl_8018D910:
/* 8018D9DC 0018A93C D0 1F 01 58 */ stfs f0, 0x158(r31)
/* 8018D9E0 0018A940 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
/* 8018D9E4 0018A944 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8018D9E8 0018A948 4B EB 64 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8018D9E8 0018A948 4B EB 64 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8018D9EC 0018A94C 34 A1 00 E4 */ addic. r5, r1, 0xe4
/* 8018D9F0 0018A950 3B 60 00 01 */ li r27, 1
/* 8018D9F4 0018A954 41 82 00 58 */ beq lbl_8018DA4C
@@ -617,7 +617,7 @@ lbl_8018DCCC:
/* 8018DCF0 0018AC50 38 A1 00 20 */ addi r5, r1, 0x20
/* 8018DCF4 0018AC54 B0 01 00 20 */ sth r0, 0x20(r1)
/* 8018DCF8 0018AC58 38 C0 00 28 */ li r6, 0x28
/* 8018DCFC 0018AC5C 4B EB 61 D5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8018DCFC 0018AC5C 4B EB 61 D5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8018DD00 0018AC60 A0 1C 00 08 */ lhz r0, 8(r28)
/* 8018DD04 0018AC64 7F C3 F3 78 */ mr r3, r30
/* 8018DD08 0018AC68 38 81 00 1C */ addi r4, r1, 0x1c
@@ -1242,7 +1242,7 @@ lbl_8018E5D0:
/* 8018E5F4 0018B554 38 A1 00 14 */ addi r5, r1, 0x14
/* 8018E5F8 0018B558 B0 01 00 14 */ sth r0, 0x14(r1)
/* 8018E5FC 0018B55C 38 C0 00 28 */ li r6, 0x28
/* 8018E600 0018B560 4B EB 58 D1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8018E600 0018B560 4B EB 58 D1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8018E604 0018B564 88 1C 00 18 */ lbz r0, 0x18(r28)
/* 8018E608 0018B568 38 60 00 00 */ li r3, 0
/* 8018E60C 0018B56C 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18
asm/MetroidPrime/CCollisionActor.s
+1 -1
View File
@@ -543,7 +543,7 @@ lbl_801A8D8C:
/* 801A8DBC 001A5D1C A0 1C 00 08 */ lhz r0, 8(r28)
/* 801A8DC0 001A5D20 B0 01 00 18 */ sth r0, 0x18(r1)
/* 801A8DC4 001A5D24 B0 01 00 1C */ sth r0, 0x1c(r1)
/* 801A8DC8 001A5D28 4B E9 B1 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801A8DC8 001A5D28 4B E9 B1 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801A8DCC 001A5D2C 48 00 00 2C */ b lbl_801A8DF8
.global lbl_801A8DD0
lbl_801A8DD0:
asm/MetroidPrime/CGameCollision.s
+5 -5
View File
@@ -2201,7 +2201,7 @@ lbl_80181998:
/* 801819E4 0017E944 38 A1 00 08 */ addi r5, r1, 8
/* 801819E8 0017E948 B0 01 00 08 */ sth r0, 8(r1)
/* 801819EC 0017E94C 38 C0 00 1A */ li r6, 0x1a
/* 801819F0 0017E950 4B EC 24 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801819F0 0017E950 4B EC 24 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801819F4:
/* 801819F4 0017E954 57 00 06 3F */ clrlwi. r0, r24, 0x18
/* 801819F8 0017E958 41 82 00 38 */ beq lbl_80181A30
@@ -3333,7 +3333,7 @@ lbl_801829CC:
/* 801829D0 0017F930 7C A4 2B 78 */ mr r4, r5
/* 801829D4 0017F934 38 A1 00 08 */ addi r5, r1, 8
/* 801829D8 0017F938 B0 01 00 08 */ sth r0, 8(r1)
/* 801829DC 0017F93C 4B EC 14 F5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801829DC 0017F93C 4B EC 14 F5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801829E0 0017F940 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801829E4 0017F944 7C 08 03 A6 */ mtlr r0
/* 801829E8 0017F948 38 21 00 10 */ addi r1, r1, 0x10
@@ -3394,7 +3394,7 @@ lbl_80182A88:
/* 80182AA8 0017FA08 38 A1 00 18 */ addi r5, r1, 0x18
/* 80182AAC 0017FA0C B0 01 00 18 */ sth r0, 0x18(r1)
/* 80182AB0 0017FA10 38 C0 00 17 */ li r6, 0x17
/* 80182AB4 0017FA14 4B EC 14 1D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80182AB4 0017FA14 4B EC 14 1D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80182AB8 0017FA18 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 80182ABC 0017FA1C 41 82 00 E8 */ beq lbl_80182BA4
/* 80182AC0 0017FA20 7F 24 CB 78 */ mr r4, r25
@@ -3409,7 +3409,7 @@ lbl_80182A88:
/* 80182AE4 0017FA44 38 C0 00 1F */ li r6, 0x1f
/* 80182AE8 0017FA48 B0 01 00 10 */ sth r0, 0x10(r1)
/* 80182AEC 0017FA4C B0 01 00 14 */ sth r0, 0x14(r1)
/* 80182AF0 0017FA50 4B EC 13 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80182AF0 0017FA50 4B EC 13 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80182AF4 0017FA54 48 00 00 B0 */ b lbl_80182BA4
lbl_80182AF8:
/* 80182AF8 0017FA58 28 19 00 00 */ cmplwi r25, 0
@@ -3458,7 +3458,7 @@ lbl_80182B7C:
/* 80182B94 0017FAF4 B0 01 00 08 */ sth r0, 8(r1)
/* 80182B98 0017FAF8 38 C0 00 1F */ li r6, 0x1f
/* 80182B9C 0017FAFC B0 01 00 0C */ sth r0, 0xc(r1)
/* 80182BA0 0017FB00 4B EC 13 31 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80182BA0 0017FB00 4B EC 13 31 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80182BA4:
/* 80182BA4 0017FB04 BA C1 00 38 */ lmw r22, 0x38(r1)
/* 80182BA8 0017FB08 80 01 00 64 */ lwz r0, 0x64(r1)
asm/MetroidPrime/CGameProjectile.s
+1 -1
View File
@@ -464,7 +464,7 @@ lbl_800377DC:
/* 8003781C 0003477C B0 01 00 14 */ sth r0, 0x14(r1)
/* 80037820 00034780 B0 01 00 10 */ sth r0, 0x10(r1)
/* 80037824 00034784 80 9F 08 4C */ lwz r4, 0x84c(r31)
/* 80037828 00034788 48 00 C6 A9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80037828 00034788 48 00 C6 A9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8003782C:
/* 8003782C 0003478C E3 E1 01 18 */ psq_l f31, 280(r1), 0, qr0
/* 80037830 00034790 CB E1 01 10 */ lfd f31, 0x110(r1)
asm/MetroidPrime/CGroundMovement.s
+11 -11
View File
@@ -1651,7 +1651,7 @@ lbl_80187098:
/* 801870B8 00184018 38 A1 00 2C */ addi r5, r1, 0x2c
/* 801870BC 0018401C B0 01 00 2C */ sth r0, 0x2c(r1)
/* 801870C0 00184020 38 C0 00 17 */ li r6, 0x17
/* 801870C4 00184024 4B EB CE 0D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801870C4 00184024 4B EB CE 0D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801870C8 00184028 55 D3 08 3C */ slwi r19, r14, 1
/* 801870CC 0018402C 55 C3 18 38 */ slwi r3, r14, 3
/* 801870D0 00184030 7C 14 9A 2E */ lhzx r0, r20, r19
@@ -1697,7 +1697,7 @@ lbl_80187128:
/* 80187164 001840C4 B0 01 00 20 */ sth r0, 0x20(r1)
/* 80187168 001840C8 38 C0 00 1F */ li r6, 0x1f
/* 8018716C 001840CC B0 01 00 24 */ sth r0, 0x24(r1)
/* 80187170 001840D0 4B EB CD 61 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80187170 001840D0 4B EB CD 61 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80187174:
/* 80187174 001840D4 1C 0E 00 60 */ mulli r0, r14, 0x60
/* 80187178 001840D8 39 C1 08 A8 */ addi r14, r1, 0x8a8
@@ -2169,7 +2169,7 @@ lbl_801877D8:
/* 801877E4 00184744 38 A1 00 1C */ addi r5, r1, 0x1c
/* 801877E8 00184748 B0 01 00 1C */ sth r0, 0x1c(r1)
/* 801877EC 0018474C 38 C0 00 17 */ li r6, 0x17
/* 801877F0 00184750 4B EB C6 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801877F0 00184750 4B EB C6 E1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801877F4 00184754 C8 41 00 88 */ lfd f2, 0x88(r1)
/* 801877F8 00184758 C8 22 A3 48 */ lfd f1, lbl_805AC068@sda21(r2)
/* 801877FC 0018475C C8 0D 8E D0 */ lfd f0, lbl_805A7A90@sda21(r13)
@@ -2230,7 +2230,7 @@ lbl_8018781C:
/* 801878D0 00184830 B0 01 00 10 */ sth r0, 0x10(r1)
/* 801878D4 00184834 38 C0 00 1F */ li r6, 0x1f
/* 801878D8 00184838 B0 01 00 14 */ sth r0, 0x14(r1)
/* 801878DC 0018483C 4B EB C5 F5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801878DC 0018483C 4B EB C5 F5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801878E0:
/* 801878E0 00184840 7E 03 83 78 */ mr r3, r16
/* 801878E4 00184844 7D C4 73 78 */ mr r4, r14
@@ -3475,7 +3475,7 @@ lbl_80188A9C:
/* 80188AE0 00185A40 38 A1 00 08 */ addi r5, r1, 8
/* 80188AE4 00185A44 B0 01 00 08 */ sth r0, 8(r1)
/* 80188AE8 00185A48 38 C0 00 1A */ li r6, 0x1a
/* 80188AEC 00185A4C 4B EB B3 E5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80188AEC 00185A4C 4B EB B3 E5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80188AF0:
/* 80188AF0 00185A50 3C 80 80 5A */ lis r4, sZeroVector__9CVector3f@ha
/* 80188AF4 00185A54 7F C3 F3 78 */ mr r3, r30
@@ -3722,7 +3722,7 @@ lbl_80188E5C:
/* 80188E70 00185DD0 38 A1 00 08 */ addi r5, r1, 8
/* 80188E74 00185DD4 B0 01 00 08 */ sth r0, 8(r1)
/* 80188E78 00185DD8 38 C0 00 20 */ li r6, 0x20
/* 80188E7C 00185DDC 4B EB B0 55 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80188E7C 00185DDC 4B EB B0 55 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80188E80:
/* 80188E80 00185DE0 C8 02 A3 50 */ lfd f0, lbl_805AC070@sda21(r2)
/* 80188E84 00185DE4 38 00 00 00 */ li r0, 0
@@ -3995,7 +3995,7 @@ lbl_80189244:
/* 80189258 001861B8 38 A1 00 08 */ addi r5, r1, 8
/* 8018925C 001861BC B0 01 00 08 */ sth r0, 8(r1)
/* 80189260 001861C0 38 C0 00 20 */ li r6, 0x20
/* 80189264 001861C4 4B EB AC 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80189264 001861C4 4B EB AC 6D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80189268:
/* 80189268 001861C8 38 60 00 00 */ li r3, 0
/* 8018926C 001861CC 48 00 00 08 */ b lbl_80189274
@@ -4480,7 +4480,7 @@ lbl_80189894:
/* 80189990 001868F0 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80189994 001868F4 38 C0 00 1F */ li r6, 0x1f
/* 80189998 001868F8 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8018999C 001868FC 4B EB A5 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8018999C 001868FC 4B EB A5 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801899A0:
/* 801899A0 00186900 7F 83 E3 78 */ mr r3, r28
/* 801899A4 00186904 7F 64 DB 78 */ mr r4, r27
@@ -4492,7 +4492,7 @@ lbl_801899A0:
/* 801899BC 0018691C 38 A1 00 08 */ addi r5, r1, 8
/* 801899C0 00186920 B0 01 00 08 */ sth r0, 8(r1)
/* 801899C4 00186924 38 C0 00 17 */ li r6, 0x17
/* 801899C8 00186928 4B EB A5 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801899C8 00186928 4B EB A5 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801899CC 0018692C 48 00 00 14 */ b lbl_801899E0
lbl_801899D0:
/* 801899D0 00186930 FC 20 E8 90 */ fmr f1, f29
@@ -4724,7 +4724,7 @@ lbl_80189CC8:
/* 80189CDC 00186C3C 38 A1 00 0C */ addi r5, r1, 0xc
/* 80189CE0 00186C40 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80189CE4 00186C44 38 C0 00 1A */ li r6, 0x1a
/* 80189CE8 00186C48 4B EB A1 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80189CE8 00186C48 4B EB A1 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80189CEC 00186C4C 48 00 00 94 */ b lbl_80189D80
lbl_80189CF0:
/* 80189CF0 00186C50 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
@@ -4733,7 +4733,7 @@ lbl_80189CF0:
/* 80189CFC 00186C5C 38 A1 00 08 */ addi r5, r1, 8
/* 80189D00 00186C60 B0 01 00 08 */ sth r0, 8(r1)
/* 80189D04 00186C64 38 C0 00 17 */ li r6, 0x17
/* 80189D08 00186C68 4B EB A1 C9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80189D08 00186C68 4B EB A1 C9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80189D0C 00186C6C 38 61 00 20 */ addi r3, r1, 0x20
/* 80189D10 00186C70 38 9B 01 44 */ addi r4, r27, 0x144
/* 80189D14 00186C74 38 AD 8E A8 */ addi r5, r13, lbl_805A7A68@sda21
asm/MetroidPrime/CStateManager.s
+9 -9
View File
@@ -513,8 +513,8 @@ lbl_80043EB4:
/* 80043EC8 00040E28 38 21 00 20 */ addi r1, r1, 0x20
/* 80043ECC 00040E2C 4E 80 00 20 */ blr
.global SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage:
.global SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage:
/* 80043ED0 00040E30 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80043ED4 00040E34 7C 08 02 A6 */ mflr r0
/* 80043ED8 00040E38 28 04 00 00 */ cmplwi r4, 0
@@ -4898,7 +4898,7 @@ lbl_80047BBC:
/* 80047BDC 00044B3C 7F 66 DB 78 */ mr r6, r27
/* 80047BE0 00044B40 B0 01 00 08 */ sth r0, 8(r1)
/* 80047BE4 00044B44 38 A1 00 08 */ addi r5, r1, 8
/* 80047BE8 00044B48 4B FF C2 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80047BE8 00044B48 4B FF C2 E9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80047BEC 00044B4C 7F C3 F3 78 */ mr r3, r30
/* 80047BF0 00044B50 7F 04 C3 78 */ mr r4, r24
/* 80047BF4 00044B54 48 2F 49 ED */ bl rbtree_traverse_forward__4rstlFPCvPv
@@ -6633,7 +6633,7 @@ lbl_800493F0:
/* 80049414 00046374 B0 01 00 10 */ sth r0, 0x10(r1)
/* 80049418 00046378 38 C0 00 29 */ li r6, 0x29
/* 8004941C 0004637C B0 01 00 14 */ sth r0, 0x14(r1)
/* 80049420 00046380 4B FF AA B1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80049420 00046380 4B FF AA B1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80049424 00046384 48 00 00 38 */ b lbl_8004945C
lbl_80049428:
/* 80049428 00046388 7F 43 D3 78 */ mr r3, r26
@@ -6648,7 +6648,7 @@ lbl_80049428:
/* 8004944C 000463AC B0 01 00 08 */ sth r0, 8(r1)
/* 80049450 000463B0 38 C0 00 2A */ li r6, 0x2a
/* 80049454 000463B4 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80049458 000463B8 4B FF AA 79 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80049458 000463B8 4B FF AA 79 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8004945C:
/* 8004945C 000463BC 57 A0 06 3F */ clrlwi. r0, r29, 0x18
/* 80049460 000463C0 41 82 00 64 */ beq lbl_800494C4
@@ -7622,7 +7622,7 @@ lbl_8004A270:
/* 8004A290 000471F0 38 A1 00 10 */ addi r5, r1, 0x10
/* 8004A294 000471F4 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8004A298 000471F8 38 C0 00 29 */ li r6, 0x29
/* 8004A29C 000471FC 4B FF 9C 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8004A29C 000471FC 4B FF 9C 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8004A2A0 00047200 48 00 00 34 */ b lbl_8004A2D4
lbl_8004A2A4:
/* 8004A2A4 00047204 7F A3 EB 78 */ mr r3, r29
@@ -7636,7 +7636,7 @@ lbl_8004A2A4:
/* 8004A2C4 00047224 38 A1 00 0C */ addi r5, r1, 0xc
/* 8004A2C8 00047228 B0 01 00 0C */ sth r0, 0xc(r1)
/* 8004A2CC 0004722C 38 C0 00 2A */ li r6, 0x2a
/* 8004A2D0 00047230 4B FF 9C 01 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8004A2D0 00047230 4B FF 9C 01 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8004A2D4:
/* 8004A2D4 00047234 28 1C 00 00 */ cmplwi r28, 0
/* 8004A2D8 00047238 41 82 00 CC */ beq lbl_8004A3A4
@@ -9139,7 +9139,7 @@ lbl_8004B77C:
/* 8004B794 000486F4 7F E3 FB 78 */ mr r3, r31
/* 8004B798 000486F8 38 A1 00 08 */ addi r5, r1, 8
/* 8004B79C 000486FC 38 C0 00 24 */ li r6, 0x24
/* 8004B7A0 00048700 4B FF 87 31 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8004B7A0 00048700 4B FF 87 31 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8004B7A4 00048704 2C 1A FF FF */ cmpwi r26, -1
/* 8004B7A8 00048708 41 82 00 14 */ beq lbl_8004B7BC
/* 8004B7AC 0004870C 57 43 18 38 */ slwi r3, r26, 3
@@ -10657,7 +10657,7 @@ lbl_8004CC44:
/* 8004CCC4 00049C24 38 A1 00 08 */ addi r5, r1, 8
/* 8004CCC8 00049C28 B0 01 00 08 */ sth r0, 8(r1)
/* 8004CCCC 00049C2C 38 C0 00 23 */ li r6, 0x23
/* 8004CCD0 00049C30 4B FF 72 01 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8004CCD0 00049C30 4B FF 72 01 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8004CCD4:
/* 8004CCD4 00049C34 80 01 00 64 */ lwz r0, 0x64(r1)
/* 8004CCD8 00049C38 83 E1 00 5C */ lwz r31, 0x5c(r1)
asm/MetroidPrime/Enemies/CBloodFlower.s
+1 -1
View File
@@ -1344,7 +1344,7 @@ lbl_80119AE0:
/* 80119AE8 00116A48 38 A1 00 0C */ addi r5, r1, 0xc
/* 80119AEC 00116A4C B0 01 00 08 */ sth r0, 8(r1)
/* 80119AF0 00116A50 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80119AF4 00116A54 4B F2 A3 DD */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80119AF4 00116A54 4B F2 A3 DD */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80119AF8:
/* 80119AF8 00116A58 3B FF 00 0C */ addi r31, r31, 0xc
lbl_80119AFC:
asm/MetroidPrime/Enemies/CDrone.s
+2 -2
View File
@@ -5303,7 +5303,7 @@ lbl_8016337C:
/* 80163384 001602E4 38 A1 00 0C */ addi r5, r1, 0xc
/* 80163388 001602E8 B0 01 00 08 */ sth r0, 8(r1)
/* 8016338C 001602EC B0 01 00 0C */ sth r0, 0xc(r1)
/* 80163390 001602F0 4B EE 0B 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80163390 001602F0 4B EE 0B 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80163394:
/* 80163394 001602F4 BB 61 00 2C */ lmw r27, 0x2c(r1)
/* 80163398 001602F8 80 01 00 44 */ lwz r0, 0x44(r1)
@@ -8525,7 +8525,7 @@ lbl_80166298:
/* 801662A4 00163204 38 A1 00 1C */ addi r5, r1, 0x1c
/* 801662A8 00163208 B0 01 00 18 */ sth r0, 0x18(r1)
/* 801662AC 0016320C B0 01 00 1C */ sth r0, 0x1c(r1)
/* 801662B0 00163210 4B ED DC 21 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801662B0 00163210 4B ED DC 21 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801662B4:
/* 801662B4 00163214 BB 41 00 F8 */ lmw r26, 0xf8(r1)
/* 801662B8 00163218 80 01 01 14 */ lwz r0, 0x114(r1)
asm/MetroidPrime/Enemies/CElitePirate.s
+2 -2
View File
@@ -1896,7 +1896,7 @@ lbl_8022897C:
/* 80228984 002258E4 38 A1 00 0C */ addi r5, r1, 0xc
/* 80228988 002258E8 B0 01 00 08 */ sth r0, 8(r1)
/* 8022898C 002258EC B0 01 00 0C */ sth r0, 0xc(r1)
/* 80228990 002258F0 4B E1 B5 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80228990 002258F0 4B E1 B5 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80228994:
/* 80228994 002258F4 80 01 00 34 */ lwz r0, 0x34(r1)
/* 80228998 002258F8 83 E1 00 2C */ lwz r31, 0x2c(r1)
@@ -6000,7 +6000,7 @@ lbl_8022C460:
/* 8022C498 002293F8 38 C0 00 13 */ li r6, 0x13
/* 8022C49C 002293FC B0 01 00 1C */ sth r0, 0x1c(r1)
/* 8022C4A0 00229400 B0 01 00 20 */ sth r0, 0x20(r1)
/* 8022C4A4 00229404 4B E1 7A 2D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8022C4A4 00229404 4B E1 7A 2D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8022C4A8:
/* 8022C4A8 00229408 38 C0 00 01 */ li r6, 1
/* 8022C4AC 0022940C 48 00 02 FC */ b lbl_8022C7A8
asm/MetroidPrime/Enemies/CFlaahgra.s
+2 -2
View File
@@ -6257,7 +6257,7 @@ lbl_801B27F8:
/* 801B2840 001AF7A0 38 C0 00 02 */ li r6, 2
/* 801B2844 001AF7A4 B0 01 00 20 */ sth r0, 0x20(r1)
/* 801B2848 001AF7A8 B0 01 00 24 */ sth r0, 0x24(r1)
/* 801B284C 001AF7AC 4B E9 16 85 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801B284C 001AF7AC 4B E9 16 85 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 801B2850 001AF7B0 80 7B 07 F8 */ lwz r3, 0x7f8(r27)
/* 801B2854 001AF7B4 2C 03 00 00 */ cmpwi r3, 0
/* 801B2858 001AF7B8 40 81 02 A0 */ ble lbl_801B2AF8
@@ -8153,7 +8153,7 @@ lbl_801B4358:
/* 801B4398 001B12F8 38 C0 00 13 */ li r6, 0x13
/* 801B439C 001B12FC B0 01 00 08 */ sth r0, 8(r1)
/* 801B43A0 001B1300 B0 01 00 0C */ sth r0, 0xc(r1)
/* 801B43A4 001B1304 4B E8 FB 2D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801B43A4 001B1304 4B E8 FB 2D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801B43A8:
/* 801B43A8 001B1308 80 01 00 34 */ lwz r0, 0x34(r1)
/* 801B43AC 001B130C 83 E1 00 2C */ lwz r31, 0x2c(r1)
asm/MetroidPrime/Enemies/CFlyingPirate.s
+1 -1
View File
@@ -1928,7 +1928,7 @@ lbl_801F55BC:
/* 801F55CC 001F252C B0 01 00 0C */ sth r0, 0xc(r1)
/* 801F55D0 001F2530 38 C0 00 02 */ li r6, 2
/* 801F55D4 001F2534 B0 01 00 10 */ sth r0, 0x10(r1)
/* 801F55D8 001F2538 4B E4 E8 F9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 801F55D8 001F2538 4B E4 E8 F9 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_801F55DC:
/* 801F55DC 001F253C A0 7B 02 DC */ lhz r3, 0x2dc(r27)
/* 801F55E0 001F2540 A0 0D A3 8C */ lhz r0, kInvalidUniqueId@sda21(r13)
asm/MetroidPrime/Enemies/CGrenadeLauncher.s
+2 -2
View File
@@ -1553,7 +1553,7 @@ Touch__16CGrenadeLauncherFR6CActorR13CStateManager:
/* 80230A8C 0022D9EC 38 C0 00 1E */ li r6, 0x1e
/* 80230A90 0022D9F0 B0 01 00 08 */ sth r0, 8(r1)
/* 80230A94 0022D9F4 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80230A98 0022D9F8 4B E1 34 39 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80230A98 0022D9F8 4B E1 34 39 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80230A9C:
/* 80230A9C 0022D9FC 80 01 00 44 */ lwz r0, 0x44(r1)
/* 80230AA0 0022DA00 83 E1 00 3C */ lwz r31, 0x3c(r1)
@@ -1833,7 +1833,7 @@ lbl_80230E4C:
/* 80230E5C 0022DDBC B0 01 00 10 */ sth r0, 0x10(r1)
/* 80230E60 0022DDC0 38 C0 00 29 */ li r6, 0x29
/* 80230E64 0022DDC4 B0 01 00 14 */ sth r0, 0x14(r1)
/* 80230E68 0022DDC8 4B E1 30 69 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80230E68 0022DDC8 4B E1 30 69 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80230E6C 0022DDCC 7F A3 EB 78 */ mr r3, r29
/* 80230E70 0022DDD0 7F C4 F3 78 */ mr r4, r30
/* 80230E74 0022DDD4 4B FF E8 FD */ bl sub_8022f770
asm/MetroidPrime/Enemies/CMetroid.s
+2 -2
View File
@@ -2448,7 +2448,7 @@ lbl_8016BD74:
/* 8016BDB4 00168D14 A0 1D 00 08 */ lhz r0, 8(r29)
/* 8016BDB8 00168D18 B0 01 00 3C */ sth r0, 0x3c(r1)
/* 8016BDBC 00168D1C B0 01 00 40 */ sth r0, 0x40(r1)
/* 8016BDC0 00168D20 4B ED 81 11 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8016BDC0 00168D20 4B ED 81 11 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_8016BDC4:
/* 8016BDC4 00168D24 C0 02 A0 80 */ lfs f0, lbl_805ABDA0@sda21(r2)
/* 8016BDC8 00168D28 D0 1D 07 C0 */ stfs f0, 0x7c0(r29)
@@ -6112,7 +6112,7 @@ lbl_8016F310:
/* 8016F348 0016C2A8 38 C0 00 15 */ li r6, 0x15
/* 8016F34C 0016C2AC B0 01 00 0C */ sth r0, 0xc(r1)
/* 8016F350 0016C2B0 B0 01 00 10 */ sth r0, 0x10(r1)
/* 8016F354 0016C2B4 4B ED 4B 7D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8016F354 0016C2B4 4B ED 4B 7D */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8016F358 0016C2B8 48 00 01 98 */ b lbl_8016F4F0
lbl_8016F35C:
/* 8016F35C 0016C2BC 80 1E 05 68 */ lwz r0, 0x568(r30)
asm/MetroidPrime/Enemies/CMetroidPrimeRelay.s
+2 -2
View File
@@ -275,7 +275,7 @@ lbl_802807E8:
/* 80280800 0027D760 38 A1 00 60 */ addi r5, r1, 0x60
/* 80280804 0027D764 B0 01 00 60 */ sth r0, 0x60(r1)
/* 80280808 0027D768 38 C0 00 23 */ li r6, 0x23
/* 8028080C 0027D76C 4B DC 36 C5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8028080C 0027D76C 4B DC 36 C5 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80280810:
/* 80280810 0027D770 BA 81 01 20 */ lmw r20, 0x120(r1)
/* 80280814 0027D774 80 01 01 54 */ lwz r0, 0x154(r1)
@@ -316,7 +316,7 @@ lbl_80280884:
/* 80280890 0027D7F0 38 A1 00 0C */ addi r5, r1, 0xc
/* 80280894 0027D7F4 B0 01 00 08 */ sth r0, 8(r1)
/* 80280898 0027D7F8 B0 01 00 0C */ sth r0, 0xc(r1)
/* 8028089C 0027D7FC 4B DC 36 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8028089C 0027D7FC 4B DC 36 35 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_802808A0:
/* 802808A0 0027D800 80 01 00 34 */ lwz r0, 0x34(r1)
/* 802808A4 0027D804 83 E1 00 2C */ lwz r31, 0x2c(r1)
asm/MetroidPrime/Enemies/COmegaPirate.s
+1 -1
View File
@@ -6247,7 +6247,7 @@ lbl_80290654:
/* 8029068C 0028D5EC 38 C0 00 13 */ li r6, 0x13
/* 80290690 0028D5F0 B0 01 00 08 */ sth r0, 8(r1)
/* 80290694 0028D5F4 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80290698 0028D5F8 4B DB 38 39 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80290698 0028D5F8 4B DB 38 39 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8029069C 0028D5FC 48 00 01 60 */ b lbl_802907FC
.global lbl_802906A0
lbl_802906A0:
asm/MetroidPrime/Enemies/CPhazonPool.s
+4 -4
View File
@@ -138,7 +138,7 @@ lbl_80292638:
/* 80292684 0028F5E4 B0 01 00 08 */ sth r0, 8(r1)
/* 80292688 0028F5E8 38 C0 00 2F */ li r6, 0x2f
/* 8029268C 0028F5EC B0 01 00 0C */ sth r0, 0xc(r1)
/* 80292690 0028F5F0 4B DB 18 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80292690 0028F5F0 4B DB 18 41 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80292694:
/* 80292694 0028F5F4 7F DF F3 78 */ mr r31, r30
lbl_80292698:
@@ -223,7 +223,7 @@ lbl_80292790:
/* 802927B4 0028F714 B0 01 00 10 */ sth r0, 0x10(r1)
/* 802927B8 0028F718 38 C0 00 2E */ li r6, 0x2e
/* 802927BC 0028F71C B0 01 00 14 */ sth r0, 0x14(r1)
/* 802927C0 0028F720 4B DB 17 11 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 802927C0 0028F720 4B DB 17 11 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 802927C4 0028F724 38 00 00 00 */ li r0, 0
/* 802927C8 0028F728 98 1F 00 0A */ stb r0, 0xa(r31)
/* 802927CC 0028F72C 48 00 00 38 */ b lbl_80292804
@@ -240,7 +240,7 @@ lbl_802927D0:
/* 802927F4 0028F754 B0 01 00 08 */ sth r0, 8(r1)
/* 802927F8 0028F758 38 C0 00 2F */ li r6, 0x2f
/* 802927FC 0028F75C B0 01 00 0C */ sth r0, 0xc(r1)
/* 80292800 0028F760 4B DB 16 D1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80292800 0028F760 4B DB 16 D1 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80292804:
/* 80292804 0028F764 7F DF F3 78 */ mr r31, r30
lbl_80292808:
@@ -619,7 +619,7 @@ lbl_80292D08:
/* 80292D34 0028FC94 A0 1D 00 08 */ lhz r0, 8(r29)
/* 80292D38 0028FC98 B0 01 00 08 */ sth r0, 8(r1)
/* 80292D3C 0028FC9C B0 01 00 0C */ sth r0, 0xc(r1)
/* 80292D40 0028FCA0 4B DB 11 91 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80292D40 0028FCA0 4B DB 11 91 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 80292D44 0028FCA4 38 00 00 00 */ li r0, 0
/* 80292D48 0028FCA8 98 01 00 44 */ stb r0, 0x44(r1)
lbl_80292D4C:
asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
+1 -1
View File
@@ -1768,7 +1768,7 @@ lbl_8023CC54:
/* 8023CCBC 00239C1C 38 A1 00 08 */ addi r5, r1, 8
/* 8023CCC0 00239C20 B0 01 00 08 */ sth r0, 8(r1)
/* 8023CCC4 00239C24 38 C0 00 2C */ li r6, 0x2c
/* 8023CCC8 00239C28 4B E0 72 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 8023CCC8 00239C28 4B E0 72 09 */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
/* 8023CCCC 00239C2C 88 1C 01 40 */ lbz r0, 0x140(r28)
/* 8023CCD0 00239C30 38 60 00 01 */ li r3, 1
/* 8023CCD4 00239C34 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a
asm/MetroidPrime/Enemies/CWallWalker.s
+1 -1
View File
@@ -370,7 +370,7 @@ lbl_802687E8:
/* 802687F8 00265758 B0 01 00 08 */ sth r0, 8(r1)
/* 802687FC 0026575C 38 C0 00 02 */ li r6, 2
/* 80268800 00265760 B0 01 00 0C */ sth r0, 0xc(r1)
/* 80268804 00265764 4B DD B6 CD */ bl SendScriptMsg__13CStateManagerFP7CEntity9TEditorId20EScriptObjectMessage
/* 80268804 00265764 4B DD B6 CD */ bl SendScriptMsg__13CStateManagerFP7CEntity9TUniqueId20EScriptObjectMessage
lbl_80268808:
/* 80268808 00265768 7F A3 EB 78 */ mr r3, r29
/* 8026880C 0026576C 38 81 00 2C */ addi r4, r1, 0x2c

Some files were not shown because too many files have changed in this diff Show More