PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update symbols to use RemoveEmitter-by-value

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-03 18:58:51 +03:00
parent 10908935db
commit 07147d4057
No known key found for this signature in database
GPG Key ID: E224F951761145F8
21 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asm/Kyoto/Audio/CSfxManager.s
View File

@ -2917,8 +2917,8 @@ lbl_802E9E70:
/* 802E9E7C 002E6DDC 38 21 00 70 */ addi r1, r1, 0x70 /* 802E9E7C 002E6DDC 38 21 00 70 */ addi r1, r1, 0x70
/* 802E9E80 002E6DE0 4E 80 00 20 */ blr /* 802E9E80 002E6DE0 4E 80 00 20 */ blr
.global RemoveEmitter__11CSfxManagerFRC10CSfxHandle .global RemoveEmitter__11CSfxManagerF10CSfxHandle
RemoveEmitter__11CSfxManagerFRC10CSfxHandle: RemoveEmitter__11CSfxManagerF10CSfxHandle:
/* 802E9E84 002E6DE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E9E84 002E6DE4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802E9E88 002E6DE8 7C 08 02 A6 */ mflr r0 /* 802E9E88 002E6DE8 7C 08 02 A6 */ mflr r0
/* 802E9E8C 002E6DEC 90 01 00 14 */ stw r0, 0x14(r1) /* 802E9E8C 002E6DEC 90 01 00 14 */ stw r0, 0x14(r1)
@ -4677,4 +4677,3 @@ lbl_803D6DC8:
# ROM: 0x3D3DC8 # ROM: 0x3D3DC8
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

4
asm/MetroidPrime/CActor.s
View File

@ -577,7 +577,7 @@ lbl_80053168:
/* 8005316C 000500CC 41 82 01 28 */ beq lbl_80053294 /* 8005316C 000500CC 41 82 01 28 */ beq lbl_80053294
/* 80053170 000500D0 90 81 00 1C */ stw r4, 0x1c(r1) /* 80053170 000500D0 90 81 00 1C */ stw r4, 0x1c(r1)
/* 80053174 000500D4 38 61 00 1C */ addi r3, r1, 0x1c /* 80053174 000500D4 38 61 00 1C */ addi r3, r1, 0x1c
/* 80053178 000500D8 48 29 6D 0D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80053178 000500D8 48 29 6D 0D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8005317C 000500DC A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 8005317C 000500DC A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2)
/* 80053180 000500E0 7E C8 B3 78 */ mr r8, r22 /* 80053180 000500E0 7E C8 B3 78 */ mr r8, r22
/* 80053184 000500E4 38 61 00 18 */ addi r3, r1, 0x18 /* 80053184 000500E4 38 61 00 18 */ addi r3, r1, 0x18
@ -2962,7 +2962,7 @@ RemoveEmitter__6CActorFv:
/* 80055264 000521C4 41 82 00 24 */ beq lbl_80055288 /* 80055264 000521C4 41 82 00 24 */ beq lbl_80055288
/* 80055268 000521C8 90 01 00 08 */ stw r0, 8(r1) /* 80055268 000521C8 90 01 00 08 */ stw r0, 8(r1)
/* 8005526C 000521CC 38 61 00 08 */ addi r3, r1, 8 /* 8005526C 000521CC 38 61 00 08 */ addi r3, r1, 8
/* 80055270 000521D0 48 29 4C 15 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80055270 000521D0 48 29 4C 15 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80055274 000521D4 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 80055274 000521D4 3C 60 00 01 */ lis r3, 0x0000FFFF@ha
/* 80055278 000521D8 38 00 00 00 */ li r0, 0 /* 80055278 000521D8 38 00 00 00 */ li r0, 0
/* 8005527C 000521DC 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 8005527C 000521DC 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l

7
asm/MetroidPrime/CActorParticles.s
View File

@ -2731,7 +2731,7 @@ lbl_801E5E4C:
/* 801E5E4C 001E2DAC 80 1B 00 74 */ lwz r0, 0x74(r27) /* 801E5E4C 001E2DAC 80 1B 00 74 */ lwz r0, 0x74(r27)
/* 801E5E50 001E2DB0 38 61 00 08 */ addi r3, r1, 8 /* 801E5E50 001E2DB0 38 61 00 08 */ addi r3, r1, 8
/* 801E5E54 001E2DB4 90 01 00 08 */ stw r0, 8(r1) /* 801E5E54 001E2DB4 90 01 00 08 */ stw r0, 8(r1)
/* 801E5E58 001E2DB8 48 10 40 2D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 801E5E58 001E2DB8 48 10 40 2D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 801E5E5C 001E2DBC 38 00 00 00 */ li r0, 0 /* 801E5E5C 001E2DBC 38 00 00 00 */ li r0, 0
/* 801E5E60 001E2DC0 90 1B 00 74 */ stw r0, 0x74(r27) /* 801E5E60 001E2DC0 90 1B 00 74 */ stw r0, 0x74(r27)
lbl_801E5E64: lbl_801E5E64:
@ -3656,7 +3656,7 @@ lbl_801E6B50:
/* 801E6B5C 001E3ABC 80 1C 00 74 */ lwz r0, 0x74(r28) /* 801E6B5C 001E3ABC 80 1C 00 74 */ lwz r0, 0x74(r28)
/* 801E6B60 001E3AC0 38 61 00 0C */ addi r3, r1, 0xc /* 801E6B60 001E3AC0 38 61 00 0C */ addi r3, r1, 0xc
/* 801E6B64 001E3AC4 90 01 00 0C */ stw r0, 0xc(r1) /* 801E6B64 001E3AC4 90 01 00 0C */ stw r0, 0xc(r1)
/* 801E6B68 001E3AC8 48 10 33 1D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 801E6B68 001E3AC8 48 10 33 1D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 801E6B6C 001E3ACC 38 00 00 00 */ li r0, 0 /* 801E6B6C 001E3ACC 38 00 00 00 */ li r0, 0
/* 801E6B70 001E3AD0 90 1C 00 74 */ stw r0, 0x74(r28) /* 801E6B70 001E3AD0 90 1C 00 74 */ stw r0, 0x74(r28)
lbl_801E6B74: lbl_801E6B74:
@ -3772,7 +3772,7 @@ __dt__Q220CActorModelParticles5CItemFv:
/* 801E6CF4 001E3C54 80 1E 00 74 */ lwz r0, 0x74(r30) /* 801E6CF4 001E3C54 80 1E 00 74 */ lwz r0, 0x74(r30)
/* 801E6CF8 001E3C58 38 61 00 08 */ addi r3, r1, 8 /* 801E6CF8 001E3C58 38 61 00 08 */ addi r3, r1, 8
/* 801E6CFC 001E3C5C 90 01 00 08 */ stw r0, 8(r1) /* 801E6CFC 001E3C5C 90 01 00 08 */ stw r0, 8(r1)
/* 801E6D00 001E3C60 48 10 31 85 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 801E6D00 001E3C60 48 10 31 85 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
lbl_801E6D04: lbl_801E6D04:
/* 801E6D04 001E3C64 88 1E 01 34 */ lbz r0, 0x134(r30) /* 801E6D04 001E3C64 88 1E 01 34 */ lbz r0, 0x134(r30)
/* 801E6D08 001E3C68 28 00 00 00 */ cmplwi r0, 0 /* 801E6D08 001E3C68 28 00 00 00 */ cmplwi r0, 0
@ -4471,4 +4471,3 @@ lbl_803D1EF8:
.byte 0x54 .byte 0x54
.asciz "XTR_Ashy" .asciz "XTR_Ashy"
.balign 4 .balign 4

4
asm/MetroidPrime/CEnvFxManager.s
View File

@ -308,11 +308,11 @@ lbl_8021015C:
/* 80210168 0020D0C8 80 1F 0B 6C */ lwz r0, 0xb6c(r31) /* 80210168 0020D0C8 80 1F 0B 6C */ lwz r0, 0xb6c(r31)
/* 8021016C 0020D0CC 38 61 00 0C */ addi r3, r1, 0xc /* 8021016C 0020D0CC 38 61 00 0C */ addi r3, r1, 0xc
/* 80210170 0020D0D0 90 01 00 0C */ stw r0, 0xc(r1) /* 80210170 0020D0D0 90 01 00 0C */ stw r0, 0xc(r1)
/* 80210174 0020D0D4 48 0D 9D 11 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80210174 0020D0D4 48 0D 9D 11 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80210178 0020D0D8 80 1F 0B 70 */ lwz r0, 0xb70(r31) /* 80210178 0020D0D8 80 1F 0B 70 */ lwz r0, 0xb70(r31)
/* 8021017C 0020D0DC 38 61 00 08 */ addi r3, r1, 8 /* 8021017C 0020D0DC 38 61 00 08 */ addi r3, r1, 8
/* 80210180 0020D0E0 90 01 00 08 */ stw r0, 8(r1) /* 80210180 0020D0E0 90 01 00 08 */ stw r0, 8(r1)
/* 80210184 0020D0E4 48 0D 9D 01 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80210184 0020D0E4 48 0D 9D 01 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80210188 0020D0E8 38 00 00 00 */ li r0, 0 /* 80210188 0020D0E8 38 00 00 00 */ li r0, 0
/* 8021018C 0020D0EC 98 1F 0B 6A */ stb r0, 0xb6a(r31) /* 8021018C 0020D0EC 98 1F 0B 6A */ stb r0, 0xb6a(r31)
lbl_80210190: lbl_80210190:

5
asm/MetroidPrime/CWorld.s
View File

@ -159,7 +159,7 @@ lbl_80055DD0:
/* 80055DD0 00052D30 80 1E 00 04 */ lwz r0, 4(r30) /* 80055DD0 00052D30 80 1E 00 04 */ lwz r0, 4(r30)
/* 80055DD4 00052D34 38 61 00 08 */ addi r3, r1, 8 /* 80055DD4 00052D34 38 61 00 08 */ addi r3, r1, 8
/* 80055DD8 00052D38 90 01 00 08 */ stw r0, 8(r1) /* 80055DD8 00052D38 90 01 00 08 */ stw r0, 8(r1)
/* 80055DDC 00052D3C 48 29 40 A9 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80055DDC 00052D3C 48 29 40 A9 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80055DE0 00052D40 3B DE 00 08 */ addi r30, r30, 8 /* 80055DE0 00052D40 3B DE 00 08 */ addi r30, r30, 8
lbl_80055DE4: lbl_80055DE4:
/* 80055DE4 00052D44 80 BD 00 C8 */ lwz r5, 0xc8(r29) /* 80055DE4 00052D44 80 BD 00 C8 */ lwz r5, 0xc8(r29)
@ -222,7 +222,7 @@ lbl_80055E9C:
/* 80055EA8 00052E08 80 1D 00 04 */ lwz r0, 4(r29) /* 80055EA8 00052E08 80 1D 00 04 */ lwz r0, 4(r29)
/* 80055EAC 00052E0C 38 61 00 08 */ addi r3, r1, 8 /* 80055EAC 00052E0C 38 61 00 08 */ addi r3, r1, 8
/* 80055EB0 00052E10 90 01 00 08 */ stw r0, 8(r1) /* 80055EB0 00052E10 90 01 00 08 */ stw r0, 8(r1)
/* 80055EB4 00052E14 48 29 3F D1 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80055EB4 00052E14 48 29 3F D1 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80055EB8 00052E18 7C 1D F8 40 */ cmplw r29, r31 /* 80055EB8 00052E18 7C 1D F8 40 */ cmplw r29, r31
/* 80055EBC 00052E1C 41 80 00 64 */ blt lbl_80055F20 /* 80055EBC 00052E1C 41 80 00 64 */ blt lbl_80055F20
/* 80055EC0 00052E20 80 1E 00 C8 */ lwz r0, 0xc8(r30) /* 80055EC0 00052E20 80 1E 00 C8 */ lwz r0, 0xc8(r30)
@ -5011,4 +5011,3 @@ lbl_803CCF70:
# ROM: 0x3C9F70 # ROM: 0x3C9F70
.4byte 0x003F3F28 .4byte 0x003F3F28
.4byte 0x3F3F2900 .4byte 0x3F3F2900

2
asm/MetroidPrime/Enemies/CAtomicBeta.s
View File

@ -390,7 +390,7 @@ sub_80250cd0:
/* 80250CF0 0024DC50 80 1F 00 00 */ lwz r0, 0(r31) /* 80250CF0 0024DC50 80 1F 00 00 */ lwz r0, 0(r31)
/* 80250CF4 0024DC54 38 61 00 08 */ addi r3, r1, 8 /* 80250CF4 0024DC54 38 61 00 08 */ addi r3, r1, 8
/* 80250CF8 0024DC58 90 01 00 08 */ stw r0, 8(r1) /* 80250CF8 0024DC58 90 01 00 08 */ stw r0, 8(r1)
/* 80250CFC 0024DC5C 48 09 91 89 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80250CFC 0024DC5C 48 09 91 89 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80250D00 0024DC60 38 00 00 00 */ li r0, 0 /* 80250D00 0024DC60 38 00 00 00 */ li r0, 0
/* 80250D04 0024DC64 90 1F 00 00 */ stw r0, 0(r31) /* 80250D04 0024DC64 90 1F 00 00 */ stw r0, 0(r31)
lbl_80250D08: lbl_80250D08:

6
asm/MetroidPrime/Enemies/CDrone.s
View File

@ -7262,7 +7262,7 @@ lbl_80165048:
/* 80165054 00161FB4 80 1E 07 D0 */ lwz r0, 0x7d0(r30) /* 80165054 00161FB4 80 1E 07 D0 */ lwz r0, 0x7d0(r30)
/* 80165058 00161FB8 38 61 00 30 */ addi r3, r1, 0x30 /* 80165058 00161FB8 38 61 00 30 */ addi r3, r1, 0x30
/* 8016505C 00161FBC 90 01 00 30 */ stw r0, 0x30(r1) /* 8016505C 00161FBC 90 01 00 30 */ stw r0, 0x30(r1)
/* 80165060 00161FC0 48 18 4E 25 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80165060 00161FC0 48 18 4E 25 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80165064 00161FC4 38 00 00 00 */ li r0, 0 /* 80165064 00161FC4 38 00 00 00 */ li r0, 0
/* 80165068 00161FC8 90 1E 07 D0 */ stw r0, 0x7d0(r30) /* 80165068 00161FC8 90 1E 07 D0 */ stw r0, 0x7d0(r30)
lbl_8016506C: lbl_8016506C:
@ -8248,7 +8248,7 @@ lbl_80165E8C:
/* 80165E98 00162DF8 80 1C 07 D0 */ lwz r0, 0x7d0(r28) /* 80165E98 00162DF8 80 1C 07 D0 */ lwz r0, 0x7d0(r28)
/* 80165E9C 00162DFC 38 61 00 08 */ addi r3, r1, 8 /* 80165E9C 00162DFC 38 61 00 08 */ addi r3, r1, 8
/* 80165EA0 00162E00 90 01 00 08 */ stw r0, 8(r1) /* 80165EA0 00162E00 90 01 00 08 */ stw r0, 8(r1)
/* 80165EA4 00162E04 48 18 3F E1 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80165EA4 00162E04 48 18 3F E1 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80165EA8 00162E08 38 00 00 00 */ li r0, 0 /* 80165EA8 00162E08 38 00 00 00 */ li r0, 0
/* 80165EAC 00162E0C 90 1C 07 D0 */ stw r0, 0x7d0(r28) /* 80165EAC 00162E0C 90 1C 07 D0 */ stw r0, 0x7d0(r28)
lbl_80165EB0: lbl_80165EB0:
@ -8660,7 +8660,7 @@ lbl_80166470:
/* 8016647C 001633DC 80 1E 07 D0 */ lwz r0, 0x7d0(r30) /* 8016647C 001633DC 80 1E 07 D0 */ lwz r0, 0x7d0(r30)
/* 80166480 001633E0 38 61 00 48 */ addi r3, r1, 0x48 /* 80166480 001633E0 38 61 00 48 */ addi r3, r1, 0x48
/* 80166484 001633E4 90 01 00 48 */ stw r0, 0x48(r1) /* 80166484 001633E4 90 01 00 48 */ stw r0, 0x48(r1)
/* 80166488 001633E8 48 18 39 FD */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80166488 001633E8 48 18 39 FD */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8016648C 001633EC 38 00 00 00 */ li r0, 0 /* 8016648C 001633EC 38 00 00 00 */ li r0, 0
/* 80166490 001633F0 90 1E 07 D0 */ stw r0, 0x7d0(r30) /* 80166490 001633F0 90 1E 07 D0 */ stw r0, 0x7d0(r30)
/* 80166494 001633F4 48 00 02 74 */ b lbl_80166708 /* 80166494 001633F4 48 00 02 74 */ b lbl_80166708

6
asm/MetroidPrime/Enemies/CEyeBall.s
View File

@ -362,7 +362,7 @@ lbl_80224820:
/* 8022483C 0022179C 80 1E 06 08 */ lwz r0, 0x608(r30) /* 8022483C 0022179C 80 1E 06 08 */ lwz r0, 0x608(r30)
/* 80224840 002217A0 38 61 00 0C */ addi r3, r1, 0xc /* 80224840 002217A0 38 61 00 0C */ addi r3, r1, 0xc
/* 80224844 002217A4 90 01 00 0C */ stw r0, 0xc(r1) /* 80224844 002217A4 90 01 00 0C */ stw r0, 0xc(r1)
/* 80224848 002217A8 48 0C 56 3D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80224848 002217A8 48 0C 56 3D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8022484C 002217AC 38 00 00 00 */ li r0, 0 /* 8022484C 002217AC 38 00 00 00 */ li r0, 0
/* 80224850 002217B0 90 1E 06 08 */ stw r0, 0x608(r30) /* 80224850 002217B0 90 1E 06 08 */ stw r0, 0x608(r30)
lbl_80224854: lbl_80224854:
@ -1011,7 +1011,7 @@ lbl_80225154:
/* 80225164 002220C4 98 1E 06 0C */ stb r0, 0x60c(r30) /* 80225164 002220C4 98 1E 06 0C */ stb r0, 0x60c(r30)
/* 80225168 002220C8 80 1E 06 08 */ lwz r0, 0x608(r30) /* 80225168 002220C8 80 1E 06 08 */ lwz r0, 0x608(r30)
/* 8022516C 002220CC 90 01 00 0C */ stw r0, 0xc(r1) /* 8022516C 002220CC 90 01 00 0C */ stw r0, 0xc(r1)
/* 80225170 002220D0 48 0C 4D 15 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80225170 002220D0 48 0C 4D 15 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80225174 002220D4 38 00 00 00 */ li r0, 0 /* 80225174 002220D4 38 00 00 00 */ li r0, 0
/* 80225178 002220D8 90 1E 06 08 */ stw r0, 0x608(r30) /* 80225178 002220D8 90 1E 06 08 */ stw r0, 0x608(r30)
lbl_8022517C: lbl_8022517C:
@ -1228,7 +1228,7 @@ lbl_80225428:
/* 80225458 002223B8 80 1B 06 08 */ lwz r0, 0x608(r27) /* 80225458 002223B8 80 1B 06 08 */ lwz r0, 0x608(r27)
/* 8022545C 002223BC 38 61 00 18 */ addi r3, r1, 0x18 /* 8022545C 002223BC 38 61 00 18 */ addi r3, r1, 0x18
/* 80225460 002223C0 90 01 00 18 */ stw r0, 0x18(r1) /* 80225460 002223C0 90 01 00 18 */ stw r0, 0x18(r1)
/* 80225464 002223C4 48 0C 4A 21 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80225464 002223C4 48 0C 4A 21 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80225468 002223C8 38 00 00 00 */ li r0, 0 /* 80225468 002223C8 38 00 00 00 */ li r0, 0
/* 8022546C 002223CC 90 1B 06 08 */ stw r0, 0x608(r27) /* 8022546C 002223CC 90 1B 06 08 */ stw r0, 0x608(r27)
lbl_80225470: lbl_80225470:

2
asm/MetroidPrime/Enemies/CFlyingPirate.s
View File

@ -13608,7 +13608,7 @@ __dt__20CFlyingPirateRagDollFv:
/* 801FFF34 001FCE94 90 1E 00 00 */ stw r0, 0(r30) /* 801FFF34 001FCE94 90 1E 00 00 */ stw r0, 0(r30)
/* 801FFF38 001FCE98 80 1E 00 A0 */ lwz r0, 0xa0(r30) /* 801FFF38 001FCE98 80 1E 00 A0 */ lwz r0, 0xa0(r30)
/* 801FFF3C 001FCE9C 90 01 00 08 */ stw r0, 8(r1) /* 801FFF3C 001FCE9C 90 01 00 08 */ stw r0, 8(r1)
/* 801FFF40 001FCEA0 48 0E 9F 45 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 801FFF40 001FCEA0 48 0E 9F 45 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 801FFF44 001FCEA4 7F C3 F3 78 */ mr r3, r30 /* 801FFF44 001FCEA4 7F C3 F3 78 */ mr r3, r30
/* 801FFF48 001FCEA8 38 80 00 00 */ li r4, 0 /* 801FFF48 001FCEA8 38 80 00 00 */ li r4, 0
/* 801FFF4C 001FCEAC 4B F2 08 D1 */ bl __dt__8CRagDollFv /* 801FFF4C 001FCEAC 4B F2 08 D1 */ bl __dt__8CRagDollFv

4
asm/MetroidPrime/Enemies/CIceSheegoth.s
View File

@ -1577,7 +1577,7 @@ lbl_8019F420:
/* 8019F42C 0019C38C 80 1F 0A F0 */ lwz r0, 0xaf0(r31) /* 8019F42C 0019C38C 80 1F 0A F0 */ lwz r0, 0xaf0(r31)
/* 8019F430 0019C390 38 61 00 10 */ addi r3, r1, 0x10 /* 8019F430 0019C390 38 61 00 10 */ addi r3, r1, 0x10
/* 8019F434 0019C394 90 01 00 10 */ stw r0, 0x10(r1) /* 8019F434 0019C394 90 01 00 10 */ stw r0, 0x10(r1)
/* 8019F438 0019C398 48 14 AA 4D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8019F438 0019C398 48 14 AA 4D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8019F43C 0019C39C 38 00 00 00 */ li r0, 0 /* 8019F43C 0019C39C 38 00 00 00 */ li r0, 0
/* 8019F440 0019C3A0 90 1F 0A F0 */ stw r0, 0xaf0(r31) /* 8019F440 0019C3A0 90 1F 0A F0 */ stw r0, 0xaf0(r31)
lbl_8019F444: lbl_8019F444:
@ -8094,7 +8094,7 @@ lbl_801A5198:
/* 801A51A4 001A2104 80 1F 0A F0 */ lwz r0, 0xaf0(r31) /* 801A51A4 001A2104 80 1F 0A F0 */ lwz r0, 0xaf0(r31)
/* 801A51A8 001A2108 38 61 00 50 */ addi r3, r1, 0x50 /* 801A51A8 001A2108 38 61 00 50 */ addi r3, r1, 0x50
/* 801A51AC 001A210C 90 01 00 50 */ stw r0, 0x50(r1) /* 801A51AC 001A210C 90 01 00 50 */ stw r0, 0x50(r1)
/* 801A51B0 001A2110 48 14 4C D5 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 801A51B0 001A2110 48 14 4C D5 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 801A51B4 001A2114 48 00 05 58 */ b lbl_801A570C /* 801A51B4 001A2114 48 00 05 58 */ b lbl_801A570C
.global lbl_801A51B8 .global lbl_801A51B8
lbl_801A51B8: lbl_801A51B8:

8
asm/MetroidPrime/Enemies/CMetroidPrimeExo.s
View File

@ -6435,7 +6435,7 @@ lbl_8027623C:
/* 80276254 002731B4 80 1F 0F BC */ lwz r0, 0xfbc(r31) /* 80276254 002731B4 80 1F 0F BC */ lwz r0, 0xfbc(r31)
/* 80276258 002731B8 38 61 00 18 */ addi r3, r1, 0x18 /* 80276258 002731B8 38 61 00 18 */ addi r3, r1, 0x18
/* 8027625C 002731BC 90 01 00 18 */ stw r0, 0x18(r1) /* 8027625C 002731BC 90 01 00 18 */ stw r0, 0x18(r1)
/* 80276260 002731C0 48 07 3C 25 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80276260 002731C0 48 07 3C 25 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
lbl_80276264: lbl_80276264:
/* 80276264 002731C4 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 80276264 002731C4 C0 5F 00 60 */ lfs f2, 0x60(r31)
/* 80276268 002731C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80276268 002731C8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
@ -6495,7 +6495,7 @@ lbl_8027633C:
/* 8027633C 0027329C 80 1F 0F BC */ lwz r0, 0xfbc(r31) /* 8027633C 0027329C 80 1F 0F BC */ lwz r0, 0xfbc(r31)
/* 80276340 002732A0 38 61 00 10 */ addi r3, r1, 0x10 /* 80276340 002732A0 38 61 00 10 */ addi r3, r1, 0x10
/* 80276344 002732A4 90 01 00 10 */ stw r0, 0x10(r1) /* 80276344 002732A4 90 01 00 10 */ stw r0, 0x10(r1)
/* 80276348 002732A8 48 07 3B 3D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80276348 002732A8 48 07 3B 3D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8027634C 002732AC 38 00 00 00 */ li r0, 0 /* 8027634C 002732AC 38 00 00 00 */ li r0, 0
/* 80276350 002732B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha /* 80276350 002732B0 3C 60 80 3E */ lis r3, lbl_803DAA68@ha
/* 80276354 002732B4 90 1F 0F BC */ stw r0, 0xfbc(r31) /* 80276354 002732B4 90 1F 0F BC */ stw r0, 0xfbc(r31)
@ -6563,7 +6563,7 @@ lbl_802763E0:
/* 80276434 00273394 80 1F 0F BC */ lwz r0, 0xfbc(r31) /* 80276434 00273394 80 1F 0F BC */ lwz r0, 0xfbc(r31)
/* 80276438 00273398 38 61 00 18 */ addi r3, r1, 0x18 /* 80276438 00273398 38 61 00 18 */ addi r3, r1, 0x18
/* 8027643C 0027339C 90 01 00 18 */ stw r0, 0x18(r1) /* 8027643C 0027339C 90 01 00 18 */ stw r0, 0x18(r1)
/* 80276440 002733A0 48 07 3A 45 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80276440 002733A0 48 07 3A 45 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
lbl_80276444: lbl_80276444:
/* 80276444 002733A4 C0 5F 00 60 */ lfs f2, 0x60(r31) /* 80276444 002733A4 C0 5F 00 60 */ lfs f2, 0x60(r31)
/* 80276448 002733A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80276448 002733A8 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
@ -6590,7 +6590,7 @@ lbl_80276498:
/* 80276498 002733F8 80 1F 0F BC */ lwz r0, 0xfbc(r31) /* 80276498 002733F8 80 1F 0F BC */ lwz r0, 0xfbc(r31)
/* 8027649C 002733FC 38 61 00 10 */ addi r3, r1, 0x10 /* 8027649C 002733FC 38 61 00 10 */ addi r3, r1, 0x10
/* 802764A0 00273400 90 01 00 10 */ stw r0, 0x10(r1) /* 802764A0 00273400 90 01 00 10 */ stw r0, 0x10(r1)
/* 802764A4 00273404 48 07 39 E1 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 802764A4 00273404 48 07 39 E1 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 802764A8 00273408 38 00 00 00 */ li r0, 0 /* 802764A8 00273408 38 00 00 00 */ li r0, 0
/* 802764AC 0027340C 90 1F 0F BC */ stw r0, 0xfbc(r31) /* 802764AC 0027340C 90 1F 0F BC */ stw r0, 0xfbc(r31)
lbl_802764B0: lbl_802764B0:

6
asm/MetroidPrime/Enemies/CRidley.s
View File

@ -5225,7 +5225,7 @@ sub_80256624:
/* 80256744 002536A4 80 1F 0D 0C */ lwz r0, 0xd0c(r31) /* 80256744 002536A4 80 1F 0D 0C */ lwz r0, 0xd0c(r31)
/* 80256748 002536A8 38 61 00 18 */ addi r3, r1, 0x18 /* 80256748 002536A8 38 61 00 18 */ addi r3, r1, 0x18
/* 8025674C 002536AC 90 01 00 18 */ stw r0, 0x18(r1) /* 8025674C 002536AC 90 01 00 18 */ stw r0, 0x18(r1)
/* 80256750 002536B0 48 09 37 35 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80256750 002536B0 48 09 37 35 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80256754 002536B4 38 00 00 00 */ li r0, 0 /* 80256754 002536B4 38 00 00 00 */ li r0, 0
/* 80256758 002536B8 90 1F 0D 0C */ stw r0, 0xd0c(r31) /* 80256758 002536B8 90 1F 0D 0C */ stw r0, 0xd0c(r31)
/* 8025675C 002536BC 48 00 01 10 */ b lbl_8025686C /* 8025675C 002536BC 48 00 01 10 */ b lbl_8025686C
@ -5320,7 +5320,7 @@ lbl_80256888:
/* 80256894 002537F4 80 1F 0D 0C */ lwz r0, 0xd0c(r31) /* 80256894 002537F4 80 1F 0D 0C */ lwz r0, 0xd0c(r31)
/* 80256898 002537F8 38 61 00 14 */ addi r3, r1, 0x14 /* 80256898 002537F8 38 61 00 14 */ addi r3, r1, 0x14
/* 8025689C 002537FC 90 01 00 14 */ stw r0, 0x14(r1) /* 8025689C 002537FC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802568A0 00253800 48 09 35 E5 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 802568A0 00253800 48 09 35 E5 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 802568A4 00253804 38 00 00 00 */ li r0, 0 /* 802568A4 00253804 38 00 00 00 */ li r0, 0
/* 802568A8 00253808 90 1F 0D 0C */ stw r0, 0xd0c(r31) /* 802568A8 00253808 90 1F 0D 0C */ stw r0, 0xd0c(r31)
lbl_802568AC: lbl_802568AC:
@ -5480,7 +5480,7 @@ lbl_80256AD4:
/* 80256AE0 00253A40 80 1D 0C A8 */ lwz r0, 0xca8(r29) /* 80256AE0 00253A40 80 1D 0C A8 */ lwz r0, 0xca8(r29)
/* 80256AE4 00253A44 38 61 00 0C */ addi r3, r1, 0xc /* 80256AE4 00253A44 38 61 00 0C */ addi r3, r1, 0xc
/* 80256AE8 00253A48 90 01 00 0C */ stw r0, 0xc(r1) /* 80256AE8 00253A48 90 01 00 0C */ stw r0, 0xc(r1)
/* 80256AEC 00253A4C 48 09 33 99 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80256AEC 00253A4C 48 09 33 99 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80256AF0 00253A50 38 00 00 00 */ li r0, 0 /* 80256AF0 00253A50 38 00 00 00 */ li r0, 0
/* 80256AF4 00253A54 90 1D 0C A8 */ stw r0, 0xca8(r29) /* 80256AF4 00253A54 90 1D 0C A8 */ stw r0, 0xca8(r29)
lbl_80256AF8: lbl_80256AF8:

4
asm/MetroidPrime/Enemies/CSnakeWeedSwarm.s
View File

@ -2072,7 +2072,7 @@ lbl_8023D118:
/* 8023D124 0023A084 80 1D 01 D8 */ lwz r0, 0x1d8(r29) /* 8023D124 0023A084 80 1D 01 D8 */ lwz r0, 0x1d8(r29)
/* 8023D128 0023A088 38 61 00 24 */ addi r3, r1, 0x24 /* 8023D128 0023A088 38 61 00 24 */ addi r3, r1, 0x24
/* 8023D12C 0023A08C 90 01 00 24 */ stw r0, 0x24(r1) /* 8023D12C 0023A08C 90 01 00 24 */ stw r0, 0x24(r1)
/* 8023D130 0023A090 48 0A CD 55 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8023D130 0023A090 48 0A CD 55 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8023D134 0023A094 38 00 00 00 */ li r0, 0 /* 8023D134 0023A094 38 00 00 00 */ li r0, 0
/* 8023D138 0023A098 90 1D 01 D8 */ stw r0, 0x1d8(r29) /* 8023D138 0023A098 90 1D 01 D8 */ stw r0, 0x1d8(r29)
lbl_8023D13C: lbl_8023D13C:
@ -2492,7 +2492,7 @@ lbl_8023D718:
/* 8023D724 0023A684 80 1D 01 D8 */ lwz r0, 0x1d8(r29) /* 8023D724 0023A684 80 1D 01 D8 */ lwz r0, 0x1d8(r29)
/* 8023D728 0023A688 38 61 00 0C */ addi r3, r1, 0xc /* 8023D728 0023A688 38 61 00 0C */ addi r3, r1, 0xc
/* 8023D72C 0023A68C 90 01 00 0C */ stw r0, 0xc(r1) /* 8023D72C 0023A68C 90 01 00 0C */ stw r0, 0xc(r1)
/* 8023D730 0023A690 48 0A C7 55 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8023D730 0023A690 48 0A C7 55 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8023D734 0023A694 38 00 00 00 */ li r0, 0 /* 8023D734 0023A694 38 00 00 00 */ li r0, 0
/* 8023D738 0023A698 90 1D 01 D8 */ stw r0, 0x1d8(r29) /* 8023D738 0023A698 90 1D 01 D8 */ stw r0, 0x1d8(r29)
lbl_8023D73C: lbl_8023D73C:

5
asm/MetroidPrime/HUD/CSamusHud.s
View File

@ -4083,7 +4083,7 @@ lbl_800679D4:
/* 800679EC 0006494C 80 1D 03 A4 */ lwz r0, 0x3a4(r29) /* 800679EC 0006494C 80 1D 03 A4 */ lwz r0, 0x3a4(r29)
/* 800679F0 00064950 38 61 00 34 */ addi r3, r1, 0x34 /* 800679F0 00064950 38 61 00 34 */ addi r3, r1, 0x34
/* 800679F4 00064954 90 01 00 34 */ stw r0, 0x34(r1) /* 800679F4 00064954 90 01 00 34 */ stw r0, 0x34(r1)
/* 800679F8 00064958 48 28 24 8D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 800679F8 00064958 48 28 24 8D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 800679FC 0006495C 38 00 00 00 */ li r0, 0 /* 800679FC 0006495C 38 00 00 00 */ li r0, 0
/* 80067A00 00064960 90 1D 03 A4 */ stw r0, 0x3a4(r29) /* 80067A00 00064960 90 1D 03 A4 */ stw r0, 0x3a4(r29)
lbl_80067A04: lbl_80067A04:
@ -6627,7 +6627,7 @@ __dt__9CSamusHudFv:
/* 80069E50 00066DB0 80 1E 03 A4 */ lwz r0, 0x3a4(r30) /* 80069E50 00066DB0 80 1E 03 A4 */ lwz r0, 0x3a4(r30)
/* 80069E54 00066DB4 38 61 00 18 */ addi r3, r1, 0x18 /* 80069E54 00066DB4 38 61 00 18 */ addi r3, r1, 0x18
/* 80069E58 00066DB8 90 01 00 18 */ stw r0, 0x18(r1) /* 80069E58 00066DB8 90 01 00 18 */ stw r0, 0x18(r1)
/* 80069E5C 00066DBC 48 28 00 29 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80069E5C 00066DBC 48 28 00 29 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
lbl_80069E60: lbl_80069E60:
/* 80069E60 00066DC0 38 60 00 00 */ li r3, 0 /* 80069E60 00066DC0 38 60 00 00 */ li r3, 0
/* 80069E64 00066DC4 34 1E 07 AC */ addic. r0, r30, 0x7ac /* 80069E64 00066DC4 34 1E 07 AC */ addic. r0, r30, 0x7ac
@ -10838,4 +10838,3 @@ lbl_803CD1D8:
.asciz "%s%d" .asciz "%s%d"
.balign 4 .balign 4
.4byte 0 .4byte 0

2
asm/MetroidPrime/Player/CMorphBall.s
View File

@ -8461,7 +8461,7 @@ lbl_800F450C:
/* 800F456C 000F14CC 90 1E 1E 20 */ stw r0, 0x1e20(r30) /* 800F456C 000F14CC 90 1E 1E 20 */ stw r0, 0x1e20(r30)
/* 800F4570 000F14D0 80 1E 1E 24 */ lwz r0, 0x1e24(r30) /* 800F4570 000F14D0 80 1E 1E 24 */ lwz r0, 0x1e24(r30)
/* 800F4574 000F14D4 90 01 00 0C */ stw r0, 0xc(r1) /* 800F4574 000F14D4 90 01 00 0C */ stw r0, 0xc(r1)
/* 800F4578 000F14D8 48 1F 59 0D */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 800F4578 000F14D8 48 1F 59 0D */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 800F457C 000F14DC 80 6D A1 1C */ lwz r3, gpTweakBall@sda21(r13) /* 800F457C 000F14DC 80 6D A1 1C */ lwz r3, gpTweakBall@sda21(r13)
/* 800F4580 000F14E0 C0 3E 1D E8 */ lfs f1, 0x1de8(r30) /* 800F4580 000F14E0 C0 3E 1D E8 */ lfs f1, 0x1de8(r30)
/* 800F4584 000F14E4 C0 03 02 18 */ lfs f0, 0x218(r3) /* 800F4584 000F14E4 C0 03 02 18 */ lfs f0, 0x218(r3)

3
asm/MetroidPrime/Player/CPlayerDynamics.s
View File

@ -6693,7 +6693,7 @@ lbl_80287AE4:
/* 80287AF0 00284A50 EF 5A 07 32 */ fmuls f26, f26, f28 /* 80287AF0 00284A50 EF 5A 07 32 */ fmuls f26, f26, f28
/* 80287AF4 00284A54 38 61 00 0C */ addi r3, r1, 0xc /* 80287AF4 00284A54 38 61 00 0C */ addi r3, r1, 0xc
/* 80287AF8 00284A58 90 01 00 0C */ stw r0, 0xc(r1) /* 80287AF8 00284A58 90 01 00 0C */ stw r0, 0xc(r1)
/* 80287AFC 00284A5C 48 06 23 89 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80287AFC 00284A5C 48 06 23 89 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80287B00 00284A60 48 00 01 00 */ b lbl_80287C00 /* 80287B00 00284A60 48 00 01 00 */ b lbl_80287C00
lbl_80287B04: lbl_80287B04:
/* 80287B04 00284A64 88 1C 03 9C */ lbz r0, 0x39c(r28) /* 80287B04 00284A64 88 1C 03 9C */ lbz r0, 0x39c(r28)
@ -7899,4 +7899,3 @@ lbl_803D5968:
.asciz "?(??)" .asciz "?(??)"
.balign 4 .balign 4
.4byte 0 .4byte 0

10
asm/MetroidPrime/ScriptObjects/CScriptGunTurret.s
View File

@ -1021,7 +1021,7 @@ lbl_80216454:
/* 80216468 002133C8 80 1F 05 0C */ lwz r0, 0x50c(r31) /* 80216468 002133C8 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 8021646C 002133CC 38 61 00 18 */ addi r3, r1, 0x18 /* 8021646C 002133CC 38 61 00 18 */ addi r3, r1, 0x18
/* 80216470 002133D0 90 01 00 18 */ stw r0, 0x18(r1) /* 80216470 002133D0 90 01 00 18 */ stw r0, 0x18(r1)
/* 80216474 002133D4 48 0D 3A 11 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80216474 002133D4 48 0D 3A 11 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80216478 002133D8 38 00 00 00 */ li r0, 0 /* 80216478 002133D8 38 00 00 00 */ li r0, 0
/* 8021647C 002133DC C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2) /* 8021647C 002133DC C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2)
/* 80216480 002133E0 90 1F 05 0C */ stw r0, 0x50c(r31) /* 80216480 002133E0 90 1F 05 0C */ stw r0, 0x50c(r31)
@ -1065,7 +1065,7 @@ lbl_802164F8:
/* 80216504 00213464 80 1F 05 0C */ lwz r0, 0x50c(r31) /* 80216504 00213464 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 80216508 00213468 38 61 00 0C */ addi r3, r1, 0xc /* 80216508 00213468 38 61 00 0C */ addi r3, r1, 0xc
/* 8021650C 0021346C 90 01 00 0C */ stw r0, 0xc(r1) /* 8021650C 0021346C 90 01 00 0C */ stw r0, 0xc(r1)
/* 80216510 00213470 48 0D 39 75 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80216510 00213470 48 0D 39 75 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80216514 00213474 38 00 00 00 */ li r0, 0 /* 80216514 00213474 38 00 00 00 */ li r0, 0
/* 80216518 00213478 C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2) /* 80216518 00213478 C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2)
/* 8021651C 0021347C 90 1F 05 0C */ stw r0, 0x50c(r31) /* 8021651C 0021347C 90 1F 05 0C */ stw r0, 0x50c(r31)
@ -1081,7 +1081,7 @@ lbl_80216528:
/* 80216540 002134A0 80 1F 05 0C */ lwz r0, 0x50c(r31) /* 80216540 002134A0 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 80216544 002134A4 38 61 00 08 */ addi r3, r1, 8 /* 80216544 002134A4 38 61 00 08 */ addi r3, r1, 8
/* 80216548 002134A8 90 01 00 08 */ stw r0, 8(r1) /* 80216548 002134A8 90 01 00 08 */ stw r0, 8(r1)
/* 8021654C 002134AC 48 0D 39 39 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8021654C 002134AC 48 0D 39 39 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80216550 002134B0 38 00 00 00 */ li r0, 0 /* 80216550 002134B0 38 00 00 00 */ li r0, 0
/* 80216554 002134B4 90 1F 05 0C */ stw r0, 0x50c(r31) /* 80216554 002134B4 90 1F 05 0C */ stw r0, 0x50c(r31)
lbl_80216558: lbl_80216558:
@ -2721,7 +2721,7 @@ lbl_80217D08:
/* 80217D78 00214CD8 80 1F 05 0C */ lwz r0, 0x50c(r31) /* 80217D78 00214CD8 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 80217D7C 00214CDC 38 61 00 14 */ addi r3, r1, 0x14 /* 80217D7C 00214CDC 38 61 00 14 */ addi r3, r1, 0x14
/* 80217D80 00214CE0 90 01 00 14 */ stw r0, 0x14(r1) /* 80217D80 00214CE0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80217D84 00214CE4 48 0D 21 01 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80217D84 00214CE4 48 0D 21 01 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80217D88 00214CE8 38 00 00 00 */ li r0, 0 /* 80217D88 00214CE8 38 00 00 00 */ li r0, 0
/* 80217D8C 00214CEC 90 1F 05 0C */ stw r0, 0x50c(r31) /* 80217D8C 00214CEC 90 1F 05 0C */ stw r0, 0x50c(r31)
/* 80217D90 00214CF0 48 00 00 8C */ b lbl_80217E1C /* 80217D90 00214CF0 48 00 00 8C */ b lbl_80217E1C
@ -5476,7 +5476,7 @@ lbl_8021A4F4:
/* 8021A500 00217460 80 1E 05 0C */ lwz r0, 0x50c(r30) /* 8021A500 00217460 80 1E 05 0C */ lwz r0, 0x50c(r30)
/* 8021A504 00217464 38 61 00 44 */ addi r3, r1, 0x44 /* 8021A504 00217464 38 61 00 44 */ addi r3, r1, 0x44
/* 8021A508 00217468 90 01 00 44 */ stw r0, 0x44(r1) /* 8021A508 00217468 90 01 00 44 */ stw r0, 0x44(r1)
/* 8021A50C 0021746C 48 0C F9 79 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8021A50C 0021746C 48 0C F9 79 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
lbl_8021A510: lbl_8021A510:
/* 8021A510 00217470 80 7E 04 9C */ lwz r3, 0x49c(r30) /* 8021A510 00217470 80 7E 04 9C */ lwz r3, 0x49c(r30)
/* 8021A514 00217474 28 03 00 00 */ cmplwi r3, 0 /* 8021A514 00217474 28 03 00 00 */ cmplwi r3, 0

2
asm/MetroidPrime/ScriptObjects/CScriptSound.s
View File

@ -456,7 +456,7 @@ lbl_800B0180:
/* 800B018C 000AD0EC 80 1F 00 EC */ lwz r0, 0xec(r31) /* 800B018C 000AD0EC 80 1F 00 EC */ lwz r0, 0xec(r31)
/* 800B0190 000AD0F0 38 61 00 08 */ addi r3, r1, 8 /* 800B0190 000AD0F0 38 61 00 08 */ addi r3, r1, 8
/* 800B0194 000AD0F4 90 01 00 08 */ stw r0, 8(r1) /* 800B0194 000AD0F4 90 01 00 08 */ stw r0, 8(r1)
/* 800B0198 000AD0F8 48 23 9C ED */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 800B0198 000AD0F8 48 23 9C ED */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 800B019C 000AD0FC 38 00 00 00 */ li r0, 0 /* 800B019C 000AD0FC 38 00 00 00 */ li r0, 0
/* 800B01A0 000AD100 90 1F 00 EC */ stw r0, 0xec(r31) /* 800B01A0 000AD100 90 1F 00 EC */ stw r0, 0xec(r31)
lbl_800B01A4: lbl_800B01A4:

10
asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
View File

@ -325,8 +325,8 @@ lbl_8014F38C:
/* 8014F39C 0014C2FC 38 21 00 10 */ addi r1, r1, 0x10 /* 8014F39C 0014C2FC 38 21 00 10 */ addi r1, r1, 0x10
/* 8014F3A0 0014C300 4E 80 00 20 */ blr /* 8014F3A0 0014C300 4E 80 00 20 */ blr
.global DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle .global DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle
DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle: DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle:
/* 8014F3A4 0014C304 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8014F3A4 0014C304 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8014F3A8 0014C308 7C 08 02 A6 */ mflr r0 /* 8014F3A8 0014C308 7C 08 02 A6 */ mflr r0
/* 8014F3AC 0014C30C 90 01 00 24 */ stw r0, 0x24(r1) /* 8014F3AC 0014C30C 90 01 00 24 */ stw r0, 0x24(r1)
@ -338,7 +338,7 @@ DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle:
/* 8014F3C4 0014C324 80 1F 00 00 */ lwz r0, 0(r31) /* 8014F3C4 0014C324 80 1F 00 00 */ lwz r0, 0(r31)
/* 8014F3C8 0014C328 38 61 00 08 */ addi r3, r1, 8 /* 8014F3C8 0014C328 38 61 00 08 */ addi r3, r1, 8
/* 8014F3CC 0014C32C 90 01 00 08 */ stw r0, 8(r1) /* 8014F3CC 0014C32C 90 01 00 08 */ stw r0, 8(r1)
/* 8014F3D0 0014C330 48 19 AA B5 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8014F3D0 0014C330 48 19 AA B5 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8014F3D4 0014C334 38 00 00 00 */ li r0, 0 /* 8014F3D4 0014C334 38 00 00 00 */ li r0, 0
/* 8014F3D8 0014C338 90 1F 00 00 */ stw r0, 0(r31) /* 8014F3D8 0014C338 90 1F 00 00 */ stw r0, 0(r31)
lbl_8014F3DC: lbl_8014F3DC:
@ -1796,7 +1796,7 @@ lbl_80150874:
lbl_801508D4: lbl_801508D4:
/* 801508D4 0014D834 7F 03 C3 78 */ mr r3, r24 /* 801508D4 0014D834 7F 03 C3 78 */ mr r3, r24
/* 801508D8 0014D838 38 98 01 78 */ addi r4, r24, 0x178 /* 801508D8 0014D838 38 98 01 78 */ addi r4, r24, 0x178
/* 801508DC 0014D83C 4B FF EA C9 */ bl DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle /* 801508DC 0014D83C 4B FF EA C9 */ bl DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle
lbl_801508E0: lbl_801508E0:
/* 801508E0 0014D840 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801508E0 0014D840 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801508E4 0014D844 80 63 00 10 */ lwz r3, 0x10(r3) /* 801508E4 0014D844 80 63 00 10 */ lwz r3, 0x10(r3)
@ -3095,7 +3095,7 @@ lbl_80151AD8:
lbl_80151AEC: lbl_80151AEC:
/* 80151AEC 0014EA4C 7F E3 FB 78 */ mr r3, r31 /* 80151AEC 0014EA4C 7F E3 FB 78 */ mr r3, r31
/* 80151AF0 0014EA50 38 9F 01 78 */ addi r4, r31, 0x178 /* 80151AF0 0014EA50 38 9F 01 78 */ addi r4, r31, 0x178
/* 80151AF4 0014EA54 4B FF D8 B1 */ bl DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle /* 80151AF4 0014EA54 4B FF D8 B1 */ bl DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle
/* 80151AF8 0014EA58 48 00 0D A8 */ b lbl_801528A0 /* 80151AF8 0014EA58 48 00 0D A8 */ b lbl_801528A0
lbl_80151AFC: lbl_80151AFC:
/* 80151AFC 0014EA5C 2C 1C 00 07 */ cmpwi r28, 7 /* 80151AFC 0014EA5C 2C 1C 00 07 */ cmpwi r28, 7

4
asm/MetroidPrime/Weapons/CEnergyProjectile.s
View File

@ -364,7 +364,7 @@ lbl_80213F54:
/* 80213F60 00210EC0 80 1B 02 E8 */ lwz r0, 0x2e8(r27) /* 80213F60 00210EC0 80 1B 02 E8 */ lwz r0, 0x2e8(r27)
/* 80213F64 00210EC4 38 61 00 20 */ addi r3, r1, 0x20 /* 80213F64 00210EC4 38 61 00 20 */ addi r3, r1, 0x20
/* 80213F68 00210EC8 90 01 00 20 */ stw r0, 0x20(r1) /* 80213F68 00210EC8 90 01 00 20 */ stw r0, 0x20(r1)
/* 80213F6C 00210ECC 48 0D 5F 19 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80213F6C 00210ECC 48 0D 5F 19 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80213F70 00210ED0 38 00 00 00 */ li r0, 0 /* 80213F70 00210ED0 38 00 00 00 */ li r0, 0
/* 80213F74 00210ED4 90 1B 02 E8 */ stw r0, 0x2e8(r27) /* 80213F74 00210ED4 90 1B 02 E8 */ stw r0, 0x2e8(r27)
/* 80213F78 00210ED8 48 00 02 84 */ b lbl_802141FC /* 80213F78 00210ED8 48 00 02 84 */ b lbl_802141FC
@ -1938,7 +1938,7 @@ StopProjectile__17CEnergyProjectileFR13CStateManager:
/* 80215668 002125C8 80 1E 02 E8 */ lwz r0, 0x2e8(r30) /* 80215668 002125C8 80 1E 02 E8 */ lwz r0, 0x2e8(r30)
/* 8021566C 002125CC 38 61 00 10 */ addi r3, r1, 0x10 /* 8021566C 002125CC 38 61 00 10 */ addi r3, r1, 0x10
/* 80215670 002125D0 90 01 00 10 */ stw r0, 0x10(r1) /* 80215670 002125D0 90 01 00 10 */ stw r0, 0x10(r1)
/* 80215674 002125D4 48 0D 48 11 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 80215674 002125D4 48 0D 48 11 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 80215678 002125D8 38 00 00 00 */ li r0, 0 /* 80215678 002125D8 38 00 00 00 */ li r0, 0
/* 8021567C 002125DC 90 1E 02 E8 */ stw r0, 0x2e8(r30) /* 8021567C 002125DC 90 1E 02 E8 */ stw r0, 0x2e8(r30)
lbl_80215680: lbl_80215680:

3
asm/MetroidPrime/Weapons/WeaponTypes.s
View File

@ -275,7 +275,7 @@ lbl_8028ADAC:
/* 8028ADB0 00287D10 41 82 00 E0 */ beq lbl_8028AE90 /* 8028ADB0 00287D10 41 82 00 E0 */ beq lbl_8028AE90
/* 8028ADB4 00287D14 90 81 00 1C */ stw r4, 0x1c(r1) /* 8028ADB4 00287D14 90 81 00 1C */ stw r4, 0x1c(r1)
/* 8028ADB8 00287D18 38 61 00 1C */ addi r3, r1, 0x1c /* 8028ADB8 00287D18 38 61 00 1C */ addi r3, r1, 0x1c
/* 8028ADBC 00287D1C 48 05 F0 C9 */ bl RemoveEmitter__11CSfxManagerFRC10CSfxHandle /* 8028ADBC 00287D1C 48 05 F0 C9 */ bl RemoveEmitter__11CSfxManagerF10CSfxHandle
/* 8028ADC0 00287D20 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 8028ADC0 00287D20 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2)
/* 8028ADC4 00287D24 7F 08 C3 78 */ mr r8, r24 /* 8028ADC4 00287D24 7F 08 C3 78 */ mr r8, r24
/* 8028ADC8 00287D28 38 61 00 18 */ addi r3, r1, 0x18 /* 8028ADC8 00287D28 38 61 00 18 */ addi r3, r1, 0x18
@ -783,4 +783,3 @@ lbl_805ADB88:
lbl_805ADB8C: lbl_805ADB8C:
# ROM: 0x3FA42C # ROM: 0x3FA42C
.float 1.0 .float 1.0