PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 10:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update symbols to use RemoveEmitter-by-value

Browse Source 
Former-commit-id: 07147d4057
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-03 18:58:51 +03:00
parent 13fa06c8a4
commit 2732fd1688
21 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1021,7 +1021,7 @@ lbl_80216454:
/* 80216468 002133C8 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 8021646C 002133CC 38 61 00 18 */ addi r3, r1, 0x18
/* 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
/* 8021647C 002133DC C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2)
/* 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)
/* 80216508 00213468 38 61 00 0C */ addi r3, r1, 0xc
/* 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
/* 80216518 00213478 C0 02 B3 5C */ lfs f0, lbl_805AD07C@sda21(r2)
/* 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)
/* 80216544 002134A4 38 61 00 08 */ addi r3, r1, 8
/* 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
/* 80216554 002134B4 90 1F 05 0C */ stw r0, 0x50c(r31)
lbl_80216558:
@@ -2721,7 +2721,7 @@ lbl_80217D08:
/* 80217D78 00214CD8 80 1F 05 0C */ lwz r0, 0x50c(r31)
/* 80217D7C 00214CDC 38 61 00 14 */ addi r3, r1, 0x14
/* 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
/* 80217D8C 00214CEC 90 1F 05 0C */ stw r0, 0x50c(r31)
/* 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)
/* 8021A504 00217464 38 61 00 44 */ addi r3, r1, 0x44
/* 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:
/* 8021A510 00217470 80 7E 04 9C */ lwz r3, 0x49c(r30)
/* 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)
/* 800B0190 000AD0F0 38 61 00 08 */ addi r3, r1, 8
/* 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
/* 800B01A0 000AD100 90 1F 00 EC */ stw r0, 0xec(r31)
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
/* 8014F3A0 0014C300 4E 80 00 20 */ blr
.global DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle
DeleteEmitter__22CScriptSpecialFunctionFRC10CSfxHandle:
.global DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle
DeleteEmitter__22CScriptSpecialFunctionFR10CSfxHandle:
/* 8014F3A4 0014C304 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8014F3A8 0014C308 7C 08 02 A6 */ mflr r0
/* 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)
/* 8014F3C8 0014C328 38 61 00 08 */ addi r3, r1, 8
/* 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
/* 8014F3D8 0014C338 90 1F 00 00 */ stw r0, 0(r31)
lbl_8014F3DC:
@@ -1796,7 +1796,7 @@ lbl_80150874:
lbl_801508D4:
/* 801508D4 0014D834 7F 03 C3 78 */ mr r3, r24
/* 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:
/* 801508E0 0014D840 80 7F 00 64 */ lwz r3, 0x64(r31)
/* 801508E4 0014D844 80 63 00 10 */ lwz r3, 0x10(r3)
@@ -3095,7 +3095,7 @@ lbl_80151AD8:
lbl_80151AEC:
/* 80151AEC 0014EA4C 7F E3 FB 78 */ mr r3, r31
/* 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
lbl_80151AFC:
/* 80151AFC 0014EA5C 2C 1C 00 07 */ cmpwi r28, 7