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

CSfxManager: Add kAllAreas, areaId to int

Browse Source
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-03 20:00:51 +03:00
parent 6e7a6fb846
commit 4b08f70a0b
57 changed files with 217 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,7 +447,7 @@ lbl_8029F5E8:
/* 8029F5EC 0029C54C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8029F5F0 0029C550 98 01 00 90 */ stb r0, 0x90(r1)
/* 8029F5F4 0029C554 38 61 00 3C */ addi r3, r1, 0x3c
/* 8029F5F8 0029C558 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8029F5F8 0029C558 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2)
/* 8029F5FC 0029C55C 38 A0 00 7F */ li r5, 0x7f
/* 8029F600 0029C560 A0 9D 05 B4 */ lhz r4, 0x5b4(r29)
/* 8029F604 0029C564 38 C0 00 40 */ li r6, 0x40

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

@@ -522,7 +522,7 @@ lbl_800B025C:
/* 800B0278 000AD1D8 A8 DD 01 14 */ lha r6, 0x114(r29)
/* 800B027C 000AD1DC A9 1D 01 12 */ lha r8, 0x112(r29)
/* 800B0280 000AD1E0 41 82 00 08 */ beq lbl_800B0288
/* 800B0284 000AD1E4 83 E2 C6 00 */ lwz r31, lbl_805AE320@sda21(r2)
/* 800B0284 000AD1E4 83 E2 C6 00 */ lwz r31, kAllAreas__11CSfxManager@sda21(r2)
lbl_800B0288:
/* 800B0288 000AD1E8 7F EA FB 78 */ mr r10, r31
/* 800B028C 000AD1EC 48 23 9A E9 */ bl SfxStart__11CSfxManagerFUsssbsbi

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

@@ -361,7 +361,7 @@ AddOrUpdateEmitter__22CScriptSpecialFunctionFfR10CSfxHandleUsRC9CVector3fUc:
/* 8014F410 0014C370 7C 9F 23 78 */ mr r31, r4
/* 8014F414 0014C374 28 00 00 00 */ cmplwi r0, 0
/* 8014F418 0014C378 40 82 00 40 */ bne lbl_8014F458
/* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, lbl_805AE320@sda21(r2)
/* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, kAllAreas__11CSfxManager@sda21(r2)
/* 8014F420 0014C380 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l
/* 8014F428 0014C388 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
@@ -1638,7 +1638,7 @@ lbl_80150638:
/* 80150694 0014D5F4 38 A1 00 60 */ addi r5, r1, 0x60
/* 80150698 0014D5F8 D0 01 00 60 */ stfs f0, 0x60(r1)
/* 8015069C 0014D5FC 38 E0 00 01 */ li r7, 1
/* 801506A0 0014D600 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801506A0 0014D600 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2)
/* 801506A4 0014D604 39 00 00 00 */ li r8, 0
/* 801506A8 0014D608 D0 21 00 64 */ stfs f1, 0x64(r1)
/* 801506AC 0014D60C D0 41 00 68 */ stfs f2, 0x68(r1)
@@ -1686,7 +1686,7 @@ lbl_801506F0:
/* 80150744 0014D6A4 38 A1 00 54 */ addi r5, r1, 0x54
/* 80150748 0014D6A8 D0 01 00 54 */ stfs f0, 0x54(r1)
/* 8015074C 0014D6AC 38 E0 00 01 */ li r7, 1
/* 80150750 0014D6B0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80150750 0014D6B0 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2)
/* 80150754 0014D6B4 39 00 00 00 */ li r8, 0
/* 80150758 0014D6B8 D0 21 00 58 */ stfs f1, 0x58(r1)
/* 8015075C 0014D6BC D0 41 00 5C */ stfs f2, 0x5c(r1)

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

@@ -445,7 +445,7 @@ lbl_801D7534:
/* 801D7538 001D4498 38 61 00 20 */ addi r3, r1, 0x20
/* 801D753C 001D449C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801D7540 001D44A0 38 A0 00 7F */ li r5, 0x7f
/* 801D7544 001D44A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801D7544 001D44A4 81 42 C6 00 */ lwz r10, kAllAreas__11CSfxManager@sda21(r2)
/* 801D7548 001D44A8 38 C0 00 40 */ li r6, 0x40
/* 801D754C 001D44AC 38 E0 00 00 */ li r7, 0
/* 801D7550 001D44B0 39 20 00 00 */ li r9, 0