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

Add kMaxPriority/kMedPriority to CSfxManager 

Former-commit-id: b423771f97
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-03 19:23:22 +03:00
parent d55ba2e58e
commit bd8d881f6b
63 changed files with 238 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4609,8 +4609,8 @@ lbl_805AE318:
# ROM: 0x3FABB8 # ROM: 0x3FABB8
.2byte 0x000000FF .2byte 0x000000FF
.global lbl_805AE31A .global kMedPriority__11CSfxManager
lbl_805AE31A: kMedPriority__11CSfxManager:
# ROM: 0x3FABBA # ROM: 0x3FABBA
.2byte 0x0000007F .2byte 0x0000007F

10
asm/MetroidPrime/CActor.s
View File

@ -523,7 +523,7 @@ lbl_80052FF4:
/* 800530A4 00050004 40 82 00 98 */ bne lbl_8005313C /* 800530A4 00050004 40 82 00 98 */ bne lbl_8005313C
/* 800530A8 00050008 28 1A 00 00 */ cmplwi r26, 0 /* 800530A8 00050008 28 1A 00 00 */ cmplwi r26, 0
/* 800530AC 0005000C 41 82 00 34 */ beq lbl_800530E0 /* 800530AC 0005000C 41 82 00 34 */ beq lbl_800530E0
/* 800530B0 00050010 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800530B0 00050010 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800530B4 00050014 7F C4 F3 78 */ mr r4, r30 /* 800530B4 00050014 7F C4 F3 78 */ mr r4, r30
/* 800530B8 00050018 7E CA B3 78 */ mr r10, r22 /* 800530B8 00050018 7E CA B3 78 */ mr r10, r22
/* 800530BC 0005001C 38 61 00 2C */ addi r3, r1, 0x2c /* 800530BC 0005001C 38 61 00 2C */ addi r3, r1, 0x2c
@ -536,7 +536,7 @@ lbl_80052FF4:
/* 800530D8 00050038 90 01 00 38 */ stw r0, 0x38(r1) /* 800530D8 00050038 90 01 00 38 */ stw r0, 0x38(r1)
/* 800530DC 0005003C 48 00 00 28 */ b lbl_80053104 /* 800530DC 0005003C 48 00 00 28 */ b lbl_80053104
lbl_800530E0: lbl_800530E0:
/* 800530E0 00050040 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 800530E0 00050040 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 800530E4 00050044 7E C8 B3 78 */ mr r8, r22 /* 800530E4 00050044 7E C8 B3 78 */ mr r8, r22
/* 800530E8 00050048 38 61 00 28 */ addi r3, r1, 0x28 /* 800530E8 00050048 38 61 00 28 */ addi r3, r1, 0x28
/* 800530EC 0005004C 38 81 00 40 */ addi r4, r1, 0x40 /* 800530EC 0005004C 38 81 00 40 */ addi r4, r1, 0x40
@ -578,7 +578,7 @@ lbl_80053168:
/* 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__11CSfxManagerF10CSfxHandle /* 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, kMedPriority__11CSfxManager@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
/* 80053188 000500E8 38 81 00 40 */ addi r4, r1, 0x40 /* 80053188 000500E8 38 81 00 40 */ addi r4, r1, 0x40
@ -604,7 +604,7 @@ lbl_80053168:
lbl_800531D8: lbl_800531D8:
/* 800531D8 00050138 28 1A 00 00 */ cmplwi r26, 0 /* 800531D8 00050138 28 1A 00 00 */ cmplwi r26, 0
/* 800531DC 0005013C 41 82 00 34 */ beq lbl_80053210 /* 800531DC 0005013C 41 82 00 34 */ beq lbl_80053210
/* 800531E0 00050140 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800531E0 00050140 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800531E4 00050144 7F C4 F3 78 */ mr r4, r30 /* 800531E4 00050144 7F C4 F3 78 */ mr r4, r30
/* 800531E8 00050148 7E CA B3 78 */ mr r10, r22 /* 800531E8 00050148 7E CA B3 78 */ mr r10, r22
/* 800531EC 0005014C 38 61 00 10 */ addi r3, r1, 0x10 /* 800531EC 0005014C 38 61 00 10 */ addi r3, r1, 0x10
@ -617,7 +617,7 @@ lbl_800531D8:
/* 80053208 00050168 90 01 00 30 */ stw r0, 0x30(r1) /* 80053208 00050168 90 01 00 30 */ stw r0, 0x30(r1)
/* 8005320C 0005016C 48 00 00 28 */ b lbl_80053234 /* 8005320C 0005016C 48 00 00 28 */ b lbl_80053234
lbl_80053210: lbl_80053210:
/* 80053210 00050170 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80053210 00050170 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80053214 00050174 7E C8 B3 78 */ mr r8, r22 /* 80053214 00050174 7E C8 B3 78 */ mr r8, r22
/* 80053218 00050178 38 61 00 0C */ addi r3, r1, 0xc /* 80053218 00050178 38 61 00 0C */ addi r3, r1, 0xc
/* 8005321C 0005017C 38 81 00 40 */ addi r4, r1, 0x40 /* 8005321C 0005017C 38 81 00 40 */ addi r4, r1, 0x40

4
asm/MetroidPrime/CActorParticles.s
View File

@ -94,7 +94,7 @@ StartBurnDeath__20CActorModelParticlesFR5CActor:
/* 801E3990 001E08F0 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 801E3990 001E08F0 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 801E3994 001E08F4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E3994 001E08F4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801E3998 001E08F8 7C 03 FE 70 */ srawi r3, r0, 0x1f /* 801E3998 001E08F8 7C 03 FE 70 */ srawi r3, r0, 0x1f
/* 801E399C 001E08FC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801E399C 001E08FC A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801E39A0 001E0900 38 03 04 7E */ addi r0, r3, 0x47e /* 801E39A0 001E0900 38 03 04 7E */ addi r0, r3, 0x47e
/* 801E39A4 001E0904 D0 01 00 10 */ stfs f0, 0x10(r1) /* 801E39A4 001E0904 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 801E39A8 001E0908 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801E39A8 001E0908 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -2617,7 +2617,7 @@ lbl_801E5C7C:
/* 801E5CB0 001E2C10 38 04 04 80 */ addi r0, r4, 0x480 /* 801E5CB0 001E2C10 38 04 04 80 */ addi r0, r4, 0x480
/* 801E5CB4 001E2C14 D0 01 00 30 */ stfs f0, 0x30(r1) /* 801E5CB4 001E2C14 D0 01 00 30 */ stfs f0, 0x30(r1)
/* 801E5CB8 001E2C18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801E5CB8 001E2C18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801E5CBC 001E2C1C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801E5CBC 001E2C1C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801E5CC0 001E2C20 D0 21 00 34 */ stfs f1, 0x34(r1) /* 801E5CC0 001E2C20 D0 21 00 34 */ stfs f1, 0x34(r1)
/* 801E5CC4 001E2C24 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 801E5CC4 001E2C24 54 04 04 3E */ clrlwi r4, r0, 0x10
/* 801E5CC8 001E2C28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801E5CC8 001E2C28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)

21
asm/MetroidPrime/CAutoMapper.s
View File

@ -1848,7 +1848,7 @@ SetShouldRotatingSoundBePlaying__11CAutoMapperFb:
/* 80096B3C 00093A9C 80 1F 01 D0 */ lwz r0, 0x1d0(r31) /* 80096B3C 00093A9C 80 1F 01 D0 */ lwz r0, 0x1d0(r31)
/* 80096B40 00093AA0 28 00 00 00 */ cmplwi r0, 0 /* 80096B40 00093AA0 28 00 00 00 */ cmplwi r0, 0
/* 80096B44 00093AA4 40 82 00 4C */ bne lbl_80096B90 /* 80096B44 00093AA4 40 82 00 4C */ bne lbl_80096B90
/* 80096B48 00093AA8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80096B48 00093AA8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80096B4C 00093AAC 38 61 00 0C */ addi r3, r1, 0xc /* 80096B4C 00093AAC 38 61 00 0C */ addi r3, r1, 0xc
/* 80096B50 00093AB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80096B50 00093AB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80096B54 00093AB4 38 80 05 5F */ li r4, 0x55f /* 80096B54 00093AB4 38 80 05 5F */ li r4, 0x55f
@ -1886,7 +1886,7 @@ SetShouldZoomingSoundBePlaying__11CAutoMapperFb:
/* 80096BC0 00093B20 80 1F 01 D4 */ lwz r0, 0x1d4(r31) /* 80096BC0 00093B20 80 1F 01 D4 */ lwz r0, 0x1d4(r31)
/* 80096BC4 00093B24 28 00 00 00 */ cmplwi r0, 0 /* 80096BC4 00093B24 28 00 00 00 */ cmplwi r0, 0
/* 80096BC8 00093B28 40 82 00 4C */ bne lbl_80096C14 /* 80096BC8 00093B28 40 82 00 4C */ bne lbl_80096C14
/* 80096BCC 00093B2C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80096BCC 00093B2C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80096BD0 00093B30 38 61 00 0C */ addi r3, r1, 0xc /* 80096BD0 00093B30 38 61 00 0C */ addi r3, r1, 0xc
/* 80096BD4 00093B34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80096BD4 00093B34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80096BD8 00093B38 38 80 05 60 */ li r4, 0x560 /* 80096BD8 00093B38 38 80 05 60 */ li r4, 0x560
@ -1924,7 +1924,7 @@ SetShouldPanningSoundBePlaying__11CAutoMapperFb:
/* 80096C44 00093BA4 80 1F 01 CC */ lwz r0, 0x1cc(r31) /* 80096C44 00093BA4 80 1F 01 CC */ lwz r0, 0x1cc(r31)
/* 80096C48 00093BA8 28 00 00 00 */ cmplwi r0, 0 /* 80096C48 00093BA8 28 00 00 00 */ cmplwi r0, 0
/* 80096C4C 00093BAC 40 82 00 4C */ bne lbl_80096C98 /* 80096C4C 00093BAC 40 82 00 4C */ bne lbl_80096C98
/* 80096C50 00093BB0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80096C50 00093BB0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80096C54 00093BB4 38 61 00 0C */ addi r3, r1, 0xc /* 80096C54 00093BB4 38 61 00 0C */ addi r3, r1, 0xc
/* 80096C58 00093BB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80096C58 00093BB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80096C5C 00093BBC 38 80 05 7E */ li r4, 0x57e /* 80096C5C 00093BBC 38 80 05 7E */ li r4, 0x57e
@ -2664,7 +2664,7 @@ lbl_80097730:
/* 80097734 00094694 40 82 01 1C */ bne lbl_80097850 /* 80097734 00094694 40 82 01 1C */ bne lbl_80097850
/* 80097738 00094698 2C 1E 00 02 */ cmpwi r30, 2 /* 80097738 00094698 2C 1E 00 02 */ cmpwi r30, 2
/* 8009773C 0009469C 40 82 01 14 */ bne lbl_80097850 /* 8009773C 0009469C 40 82 01 14 */ bne lbl_80097850
/* 80097740 000946A0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80097740 000946A0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80097744 000946A4 38 61 00 10 */ addi r3, r1, 0x10 /* 80097744 000946A4 38 61 00 10 */ addi r3, r1, 0x10
/* 80097748 000946A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80097748 000946A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009774C 000946AC 38 80 05 92 */ li r4, 0x592 /* 8009774C 000946AC 38 80 05 92 */ li r4, 0x592
@ -2737,7 +2737,7 @@ lbl_80097850:
/* 80097854 000947B4 40 82 02 04 */ bne lbl_80097A58 /* 80097854 000947B4 40 82 02 04 */ bne lbl_80097A58
/* 80097858 000947B8 2C 1E 00 01 */ cmpwi r30, 1 /* 80097858 000947B8 2C 1E 00 01 */ cmpwi r30, 1
/* 8009785C 000947BC 40 82 01 FC */ bne lbl_80097A58 /* 8009785C 000947BC 40 82 01 FC */ bne lbl_80097A58
/* 80097860 000947C0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80097860 000947C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80097864 000947C4 38 61 00 0C */ addi r3, r1, 0xc /* 80097864 000947C4 38 61 00 0C */ addi r3, r1, 0xc
/* 80097868 000947C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80097868 000947C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009786C 000947CC 38 80 05 93 */ li r4, 0x593 /* 8009786C 000947CC 38 80 05 93 */ li r4, 0x593
@ -7115,7 +7115,7 @@ lbl_8009B7C4:
lbl_8009B7D0: lbl_8009B7D0:
/* 8009B7D0 00098730 38 80 00 01 */ li r4, 1 /* 8009B7D0 00098730 38 80 00 01 */ li r4, 1
/* 8009B7D4 00098734 48 13 99 D5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B7D4 00098734 48 13 99 D5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi
/* 8009B7D8 00098738 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8009B7D8 00098738 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8009B7DC 0009873C 38 61 00 24 */ addi r3, r1, 0x24 /* 8009B7DC 0009873C 38 61 00 24 */ addi r3, r1, 0x24
/* 8009B7E0 00098740 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8009B7E0 00098740 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009B7E4 00098744 38 80 05 AC */ li r4, 0x5ac /* 8009B7E4 00098744 38 80 05 AC */ li r4, 0x5ac
@ -7128,7 +7128,7 @@ lbl_8009B7D0:
lbl_8009B800: lbl_8009B800:
/* 8009B800 00098760 38 80 00 02 */ li r4, 2 /* 8009B800 00098760 38 80 00 02 */ li r4, 2
/* 8009B804 00098764 48 13 99 A5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B804 00098764 48 13 99 A5 */ bl SetAutoMapperKeyState__14CSystemOptionsFi
/* 8009B808 00098768 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8009B808 00098768 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8009B80C 0009876C 38 61 00 20 */ addi r3, r1, 0x20 /* 8009B80C 0009876C 38 61 00 20 */ addi r3, r1, 0x20
/* 8009B810 00098770 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8009B810 00098770 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009B814 00098774 38 80 05 A6 */ li r4, 0x5a6 /* 8009B814 00098774 38 80 05 A6 */ li r4, 0x5a6
@ -7141,7 +7141,7 @@ lbl_8009B800:
lbl_8009B830: lbl_8009B830:
/* 8009B830 00098790 38 80 00 00 */ li r4, 0 /* 8009B830 00098790 38 80 00 00 */ li r4, 0
/* 8009B834 00098794 48 13 99 75 */ bl SetAutoMapperKeyState__14CSystemOptionsFi /* 8009B834 00098794 48 13 99 75 */ bl SetAutoMapperKeyState__14CSystemOptionsFi
/* 8009B838 00098798 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8009B838 00098798 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8009B83C 0009879C 38 61 00 1C */ addi r3, r1, 0x1c /* 8009B83C 0009879C 38 61 00 1C */ addi r3, r1, 0x1c
/* 8009B840 000987A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8009B840 000987A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009B844 000987A4 38 80 05 AD */ li r4, 0x5ad /* 8009B844 000987A4 38 80 05 AD */ li r4, 0x5ad
@ -7433,7 +7433,7 @@ lbl_8009BC40:
/* 8009BC64 00098BC4 80 1F 08 50 */ lwz r0, 0x850(r31) /* 8009BC64 00098BC4 80 1F 08 50 */ lwz r0, 0x850(r31)
/* 8009BC68 00098BC8 7C 03 00 40 */ cmplw r3, r0 /* 8009BC68 00098BC8 7C 03 00 40 */ cmplw r3, r0
/* 8009BC6C 00098BCC 40 82 00 2C */ bne lbl_8009BC98 /* 8009BC6C 00098BCC 40 82 00 2C */ bne lbl_8009BC98
/* 8009BC70 00098BD0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8009BC70 00098BD0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8009BC74 00098BD4 38 61 00 14 */ addi r3, r1, 0x14 /* 8009BC74 00098BD4 38 61 00 14 */ addi r3, r1, 0x14
/* 8009BC78 00098BD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8009BC78 00098BD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009BC7C 00098BDC 38 80 05 6A */ li r4, 0x56a /* 8009BC7C 00098BDC 38 80 05 6A */ li r4, 0x56a
@ -7444,7 +7444,7 @@ lbl_8009BC40:
/* 8009BC90 00098BF0 48 24 E0 E5 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 8009BC90 00098BF0 48 24 E0 E5 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 8009BC94 00098BF4 48 00 00 28 */ b lbl_8009BCBC /* 8009BC94 00098BF4 48 00 00 28 */ b lbl_8009BCBC
lbl_8009BC98: lbl_8009BC98:
/* 8009BC98 00098BF8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8009BC98 00098BF8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8009BC9C 00098BFC 38 61 00 10 */ addi r3, r1, 0x10 /* 8009BC9C 00098BFC 38 61 00 10 */ addi r3, r1, 0x10
/* 8009BCA0 00098C00 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8009BCA0 00098C00 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8009BCA4 00098C04 38 80 05 6B */ li r4, 0x56b /* 8009BCA4 00098C04 38 80 05 6B */ li r4, 0x56b
@ -10299,4 +10299,3 @@ lbl_803CD80C:
.byte 0x43, 0x4D .byte 0x43, 0x4D
.asciz "DL_MiniMapSamus" .asciz "DL_MiniMapSamus"
.asciz "TXTR_HintBeacon" .asciz "TXTR_HintBeacon"

4
asm/MetroidPrime/CCredits.s
View File

@ -1604,7 +1604,7 @@ sub_8002645c:
/* 80026490 000233F0 40 82 00 3C */ bne lbl_800264CC /* 80026490 000233F0 40 82 00 3C */ bne lbl_800264CC
/* 80026494 000233F4 80 A3 00 38 */ lwz r5, 0x38(r3) /* 80026494 000233F4 80 A3 00 38 */ lwz r5, 0x38(r3)
/* 80026498 000233F8 38 80 00 00 */ li r4, 0 /* 80026498 000233F8 38 80 00 00 */ li r4, 0
/* 8002649C 000233FC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8002649C 000233FC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800264A0 00023400 38 61 00 08 */ addi r3, r1, 8 /* 800264A0 00023400 38 61 00 08 */ addi r3, r1, 8
/* 800264A4 00023404 88 05 00 F4 */ lbz r0, 0xf4(r5) /* 800264A4 00023404 88 05 00 F4 */ lbz r0, 0xf4(r5)
/* 800264A8 00023408 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 800264A8 00023408 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18
@ -1711,7 +1711,7 @@ lbl_800265E0:
/* 80026610 00023570 40 82 00 2C */ bne lbl_8002663C /* 80026610 00023570 40 82 00 2C */ bne lbl_8002663C
/* 80026614 00023574 D0 1F 00 74 */ stfs f0, 0x74(r31) /* 80026614 00023574 D0 1F 00 74 */ stfs f0, 0x74(r31)
/* 80026618 00023578 38 61 00 18 */ addi r3, r1, 0x18 /* 80026618 00023578 38 61 00 18 */ addi r3, r1, 0x18
/* 8002661C 0002357C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8002661C 0002357C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80026620 00023580 38 80 05 9E */ li r4, 0x59e /* 80026620 00023580 38 80 05 9E */ li r4, 0x59e
/* 80026624 00023584 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80026624 00023584 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80026628 00023588 38 A0 00 7F */ li r5, 0x7f /* 80026628 00023588 38 A0 00 7F */ li r5, 0x7f

3
asm/MetroidPrime/CFluidPlaneManager.s
View File

@ -426,7 +426,7 @@ lbl_8012F510:
/* 8012F52C 0012C48C D0 41 00 48 */ stfs f2, 0x48(r1) /* 8012F52C 0012C48C D0 41 00 48 */ stfs f2, 0x48(r1)
/* 8012F530 0012C490 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 8012F530 0012C490 D0 01 00 4C */ stfs f0, 0x4c(r1)
/* 8012F534 0012C494 4B FD 01 91 */ bl GetSplashSound__12CScriptWaterCFf /* 8012F534 0012C494 4B FD 01 91 */ bl GetSplashSound__12CScriptWaterCFf
/* 8012F538 0012C498 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8012F538 0012C498 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8012F53C 0012C49C 7C 64 1B 78 */ mr r4, r3 /* 8012F53C 0012C49C 7C 64 1B 78 */ mr r4, r3
/* 8012F540 0012C4A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8012F540 0012C4A0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8012F544 0012C4A4 7F A5 EB 78 */ mr r5, r29 /* 8012F544 0012C4A4 7F A5 EB 78 */ mr r5, r29
@ -612,4 +612,3 @@ lbl_803D0038:
.byte 0x53 .byte 0x53
.asciz "plash" .asciz "plash"
.balign 4 .balign 4

48
asm/MetroidPrime/CFrontEndUI.s
View File

@ -1042,7 +1042,7 @@ lbl_8001BFDC:
/* 8001BFF0 00018F50 48 33 FB ED */ bl GetTotalSeconds__12CMoviePlayerCFv /* 8001BFF0 00018F50 48 33 FB ED */ bl GetTotalSeconds__12CMoviePlayerCFv
/* 8001BFF4 00018F54 7F C3 F3 78 */ mr r3, r30 /* 8001BFF4 00018F54 7F C3 F3 78 */ mr r3, r30
/* 8001BFF8 00018F58 4B FF FB 95 */ bl SetFadeBlackTimer__11CFrontEndUIFf /* 8001BFF8 00018F58 4B FF FB 95 */ bl SetFadeBlackTimer__11CFrontEndUIFf
/* 8001BFFC 00018F5C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001BFFC 00018F5C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C000 00018F60 38 61 00 14 */ addi r3, r1, 0x14 /* 8001C000 00018F60 38 61 00 14 */ addi r3, r1, 0x14
/* 8001C004 00018F64 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C004 00018F64 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C008 00018F68 38 80 04 54 */ li r4, 0x454 /* 8001C008 00018F68 38 80 04 54 */ li r4, 0x454
@ -1051,7 +1051,7 @@ lbl_8001BFDC:
/* 8001C014 00018F74 38 E0 00 00 */ li r7, 0 /* 8001C014 00018F74 38 E0 00 00 */ li r7, 0
/* 8001C018 00018F78 39 20 00 00 */ li r9, 0 /* 8001C018 00018F78 39 20 00 00 */ li r9, 0
/* 8001C01C 00018F7C 48 2C DD 59 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 8001C01C 00018F7C 48 2C DD 59 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 8001C020 00018F80 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001C020 00018F80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C024 00018F84 38 61 00 10 */ addi r3, r1, 0x10 /* 8001C024 00018F84 38 61 00 10 */ addi r3, r1, 0x10
/* 8001C028 00018F88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C028 00018F88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C02C 00018F8C 38 80 04 55 */ li r4, 0x455 /* 8001C02C 00018F8C 38 80 04 55 */ li r4, 0x455
@ -1080,7 +1080,7 @@ lbl_8001C06C:
/* 8001C080 00018FE0 48 33 FB 5D */ bl GetTotalSeconds__12CMoviePlayerCFv /* 8001C080 00018FE0 48 33 FB 5D */ bl GetTotalSeconds__12CMoviePlayerCFv
/* 8001C084 00018FE4 7F C3 F3 78 */ mr r3, r30 /* 8001C084 00018FE4 7F C3 F3 78 */ mr r3, r30
/* 8001C088 00018FE8 4B FF FB 05 */ bl SetFadeBlackTimer__11CFrontEndUIFf /* 8001C088 00018FE8 4B FF FB 05 */ bl SetFadeBlackTimer__11CFrontEndUIFf
/* 8001C08C 00018FEC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001C08C 00018FEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C090 00018FF0 38 61 00 0C */ addi r3, r1, 0xc /* 8001C090 00018FF0 38 61 00 0C */ addi r3, r1, 0xc
/* 8001C094 00018FF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C094 00018FF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C098 00018FF8 38 80 04 56 */ li r4, 0x456 /* 8001C098 00018FF8 38 80 04 56 */ li r4, 0x456
@ -1089,7 +1089,7 @@ lbl_8001C06C:
/* 8001C0A4 00019004 38 E0 00 00 */ li r7, 0 /* 8001C0A4 00019004 38 E0 00 00 */ li r7, 0
/* 8001C0A8 00019008 39 20 00 00 */ li r9, 0 /* 8001C0A8 00019008 39 20 00 00 */ li r9, 0
/* 8001C0AC 0001900C 48 2C DC C9 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 8001C0AC 0001900C 48 2C DC C9 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 8001C0B0 00019010 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001C0B0 00019010 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C0B4 00019014 38 61 00 08 */ addi r3, r1, 8 /* 8001C0B4 00019014 38 61 00 08 */ addi r3, r1, 8
/* 8001C0B8 00019018 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C0B8 00019018 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C0BC 0001901C 38 80 04 57 */ li r4, 0x457 /* 8001C0BC 0001901C 38 80 04 57 */ li r4, 0x457
@ -1611,7 +1611,7 @@ lbl_8001C804:
/* 8001C820 00019780 80 1F 00 18 */ lwz r0, 0x18(r31) /* 8001C820 00019780 80 1F 00 18 */ lwz r0, 0x18(r31)
/* 8001C824 00019784 3C 60 80 3D */ lis r3, lbl_803CC5C4@ha /* 8001C824 00019784 3C 60 80 3D */ lis r3, lbl_803CC5C4@ha
/* 8001C828 00019788 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l /* 8001C828 00019788 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l
/* 8001C82C 0001978C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001C82C 0001978C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C830 00019790 54 00 10 3A */ slwi r0, r0, 2 /* 8001C830 00019790 54 00 10 3A */ slwi r0, r0, 2
/* 8001C834 00019794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C834 00019794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C838 00019798 7C 03 02 AE */ lhax r0, r3, r0 /* 8001C838 00019798 7C 03 02 AE */ lhax r0, r3, r0
@ -1625,7 +1625,7 @@ lbl_8001C804:
/* 8001C858 000197B8 80 1F 00 18 */ lwz r0, 0x18(r31) /* 8001C858 000197B8 80 1F 00 18 */ lwz r0, 0x18(r31)
/* 8001C85C 000197BC 3C 60 80 3D */ lis r3, lbl_803CC5C4@ha /* 8001C85C 000197BC 3C 60 80 3D */ lis r3, lbl_803CC5C4@ha
/* 8001C860 000197C0 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l /* 8001C860 000197C0 38 63 C5 C4 */ addi r3, r3, lbl_803CC5C4@l
/* 8001C864 000197C4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001C864 000197C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001C868 000197C8 54 00 10 3A */ slwi r0, r0, 2 /* 8001C868 000197C8 54 00 10 3A */ slwi r0, r0, 2
/* 8001C86C 000197CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001C86C 000197CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001C870 000197D0 7C 83 02 14 */ add r4, r3, r0 /* 8001C870 000197D0 7C 83 02 14 */ add r4, r3, r0
@ -2812,7 +2812,7 @@ TransitionToFive__11CFrontEndUIFv:
/* 8001D8DC 0001A83C 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 8001D8DC 0001A83C 80 1F 00 1C */ lwz r0, 0x1c(r31)
/* 8001D8E0 0001A840 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha /* 8001D8E0 0001A840 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha
/* 8001D8E4 0001A844 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 8001D8E4 0001A844 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l
/* 8001D8E8 0001A848 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001D8E8 0001A848 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001D8EC 0001A84C 54 00 10 3A */ slwi r0, r0, 2 /* 8001D8EC 0001A84C 54 00 10 3A */ slwi r0, r0, 2
/* 8001D8F0 0001A850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001D8F0 0001A850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001D8F4 0001A854 7C 03 02 AE */ lhax r0, r3, r0 /* 8001D8F4 0001A854 7C 03 02 AE */ lhax r0, r3, r0
@ -2826,7 +2826,7 @@ TransitionToFive__11CFrontEndUIFv:
/* 8001D914 0001A874 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 8001D914 0001A874 80 1F 00 1C */ lwz r0, 0x1c(r31)
/* 8001D918 0001A878 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha /* 8001D918 0001A878 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha
/* 8001D91C 0001A87C 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 8001D91C 0001A87C 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l
/* 8001D920 0001A880 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001D920 0001A880 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001D924 0001A884 54 00 10 3A */ slwi r0, r0, 2 /* 8001D924 0001A884 54 00 10 3A */ slwi r0, r0, 2
/* 8001D928 0001A888 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001D928 0001A888 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001D92C 0001A88C 7C 83 02 14 */ add r4, r3, r0 /* 8001D92C 0001A88C 7C 83 02 14 */ add r4, r3, r0
@ -3273,7 +3273,7 @@ DoOptionsCancel__17SFusionBonusFrameFPC14CGuiTableGroup:
/* 8001DF68 0001AEC8 41 82 00 38 */ beq lbl_8001DFA0 /* 8001DF68 0001AEC8 41 82 00 38 */ beq lbl_8001DFA0
lbl_8001DF6C: lbl_8001DF6C:
/* 8001DF6C 0001AECC 38 00 00 00 */ li r0, 0 /* 8001DF6C 0001AECC 38 00 00 00 */ li r0, 0
/* 8001DF70 0001AED0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001DF70 0001AED0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001DF74 0001AED4 98 1F 00 3A */ stb r0, 0x3a(r31) /* 8001DF74 0001AED4 98 1F 00 3A */ stb r0, 0x3a(r31)
/* 8001DF78 0001AED8 38 61 00 08 */ addi r3, r1, 8 /* 8001DF78 0001AED8 38 61 00 08 */ addi r3, r1, 8
/* 8001DF7C 0001AEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001DF7C 0001AEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -3327,7 +3327,7 @@ DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup:
/* 8001E028 0001AF88 80 03 00 28 */ lwz r0, 0x28(r3) /* 8001E028 0001AF88 80 03 00 28 */ lwz r0, 0x28(r3)
/* 8001E02C 0001AF8C 7C 1E 00 40 */ cmplw r30, r0 /* 8001E02C 0001AF8C 7C 1E 00 40 */ cmplw r30, r0
/* 8001E030 0001AF90 40 82 00 38 */ bne lbl_8001E068 /* 8001E030 0001AF90 40 82 00 38 */ bne lbl_8001E068
/* 8001E034 0001AF94 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001E034 0001AF94 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001E038 0001AF98 38 61 00 0C */ addi r3, r1, 0xc /* 8001E038 0001AF98 38 61 00 0C */ addi r3, r1, 0xc
/* 8001E03C 0001AF9C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001E03C 0001AF9C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001E040 0001AFA0 38 80 04 45 */ li r4, 0x445 /* 8001E040 0001AFA0 38 80 04 45 */ li r4, 0x445
@ -3341,7 +3341,7 @@ DoSelectionChange__17SFusionBonusFrameFPC14CGuiTableGroup:
/* 8001E060 0001AFC0 98 1D 00 39 */ stb r0, 0x39(r29) /* 8001E060 0001AFC0 98 1D 00 39 */ stb r0, 0x39(r29)
/* 8001E064 0001AFC4 48 00 00 70 */ b lbl_8001E0D4 /* 8001E064 0001AFC4 48 00 00 70 */ b lbl_8001E0D4
lbl_8001E068: lbl_8001E068:
/* 8001E068 0001AFC8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001E068 0001AFC8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001E06C 0001AFCC 38 61 00 08 */ addi r3, r1, 8 /* 8001E06C 0001AFCC 38 61 00 08 */ addi r3, r1, 8
/* 8001E070 0001AFD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001E070 0001AFD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001E074 0001AFD4 38 80 04 47 */ li r4, 0x447 /* 8001E074 0001AFD4 38 80 04 47 */ li r4, 0x447
@ -3436,7 +3436,7 @@ lbl_8001E1A8:
/* 8001E1BC 0001B11C 48 00 00 AC */ b lbl_8001E268 /* 8001E1BC 0001B11C 48 00 00 AC */ b lbl_8001E268
lbl_8001E1C0: lbl_8001E1C0:
/* 8001E1C0 0001B120 38 00 00 01 */ li r0, 1 /* 8001E1C0 0001B120 38 00 00 01 */ li r0, 1
/* 8001E1C4 0001B124 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001E1C4 0001B124 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001E1C8 0001B128 98 1F 00 3A */ stb r0, 0x3a(r31) /* 8001E1C8 0001B128 98 1F 00 3A */ stb r0, 0x3a(r31)
/* 8001E1CC 0001B12C 38 61 00 08 */ addi r3, r1, 8 /* 8001E1CC 0001B12C 38 61 00 08 */ addi r3, r1, 8
/* 8001E1D0 0001B130 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001E1D0 0001B130 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -4262,7 +4262,7 @@ DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup:
/* 8001ED60 0001BCC0 80 03 00 08 */ lwz r0, 8(r3) /* 8001ED60 0001BCC0 80 03 00 08 */ lwz r0, 8(r3)
/* 8001ED64 0001BCC4 2C 00 00 02 */ cmpwi r0, 2 /* 8001ED64 0001BCC4 2C 00 00 02 */ cmpwi r0, 2
/* 8001ED68 0001BCC8 40 82 00 38 */ bne lbl_8001EDA0 /* 8001ED68 0001BCC8 40 82 00 38 */ bne lbl_8001EDA0
/* 8001ED6C 0001BCCC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001ED6C 0001BCCC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001ED70 0001BCD0 38 61 00 0C */ addi r3, r1, 0xc /* 8001ED70 0001BCD0 38 61 00 0C */ addi r3, r1, 0xc
/* 8001ED74 0001BCD4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001ED74 0001BCD4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001ED78 0001BCD8 38 80 04 46 */ li r4, 0x446 /* 8001ED78 0001BCD8 38 80 04 46 */ li r4, 0x446
@ -4276,7 +4276,7 @@ DoPopupCancel__19SNewFileSelectFrameFPC14CGuiTableGroup:
/* 8001ED98 0001BCF8 98 1F 01 0D */ stb r0, 0x10d(r31) /* 8001ED98 0001BCF8 98 1F 01 0D */ stb r0, 0x10d(r31)
/* 8001ED9C 0001BCFC 48 00 00 38 */ b lbl_8001EDD4 /* 8001ED9C 0001BCFC 48 00 00 38 */ b lbl_8001EDD4
lbl_8001EDA0: lbl_8001EDA0:
/* 8001EDA0 0001BD00 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001EDA0 0001BD00 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001EDA4 0001BD04 38 61 00 08 */ addi r3, r1, 8 /* 8001EDA4 0001BD04 38 61 00 08 */ addi r3, r1, 8
/* 8001EDA8 0001BD08 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001EDA8 0001BD08 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001EDAC 0001BD0C 38 80 04 46 */ li r4, 0x446 /* 8001EDAC 0001BD0C 38 80 04 46 */ li r4, 0x446
@ -4387,7 +4387,7 @@ DoFileselectCancel__19SNewFileSelectFrameFPC14CGuiTableGroup:
/* 8001EF18 0001BE78 80 03 00 08 */ lwz r0, 8(r3) /* 8001EF18 0001BE78 80 03 00 08 */ lwz r0, 8(r3)
/* 8001EF1C 0001BE7C 2C 00 00 01 */ cmpwi r0, 1 /* 8001EF1C 0001BE7C 2C 00 00 01 */ cmpwi r0, 1
/* 8001EF20 0001BE80 40 82 00 30 */ bne lbl_8001EF50 /* 8001EF20 0001BE80 40 82 00 30 */ bne lbl_8001EF50
/* 8001EF24 0001BE84 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001EF24 0001BE84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001EF28 0001BE88 38 61 00 08 */ addi r3, r1, 8 /* 8001EF28 0001BE88 38 61 00 08 */ addi r3, r1, 8
/* 8001EF2C 0001BE8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001EF2C 0001BE8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001EF30 0001BE90 38 80 04 46 */ li r4, 0x446 /* 8001EF30 0001BE90 38 80 04 46 */ li r4, 0x446
@ -4411,7 +4411,7 @@ DoSelectionChange__19SNewFileSelectFrameFPC14CGuiTableGroup:
/* 8001EF68 0001BEC8 7C 08 02 A6 */ mflr r0 /* 8001EF68 0001BEC8 7C 08 02 A6 */ mflr r0
/* 8001EF6C 0001BECC 90 01 00 14 */ stw r0, 0x14(r1) /* 8001EF6C 0001BECC 90 01 00 14 */ stw r0, 0x14(r1)
/* 8001EF70 0001BED0 48 00 12 29 */ bl HandleActiveChange__19SNewFileSelectFrameFP10CGuiWidget /* 8001EF70 0001BED0 48 00 12 29 */ bl HandleActiveChange__19SNewFileSelectFrameFP10CGuiWidget
/* 8001EF74 0001BED4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001EF74 0001BED4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8001EF78 0001BED8 38 61 00 08 */ addi r3, r1, 8 /* 8001EF78 0001BED8 38 61 00 08 */ addi r3, r1, 8
/* 8001EF7C 0001BEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001EF7C 0001BEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001EF80 0001BEE0 38 80 04 45 */ li r4, 0x445 /* 8001EF80 0001BEE0 38 80 04 45 */ li r4, 0x445
@ -6816,7 +6816,7 @@ HandleActiveChange__14SFrontEndFrameFPC14CGuiTableGroup:
DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup: DoSelectionChange__14SFrontEndFrameFPC14CGuiTableGroup:
/* 80021210 0001E170 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80021210 0001E170 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80021214 0001E174 7C 08 02 A6 */ mflr r0 /* 80021214 0001E174 7C 08 02 A6 */ mflr r0
/* 80021218 0001E178 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80021218 0001E178 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8002121C 0001E17C 38 A0 00 7F */ li r5, 0x7f /* 8002121C 0001E17C 38 A0 00 7F */ li r5, 0x7f
/* 80021220 0001E180 90 01 00 24 */ stw r0, 0x24(r1) /* 80021220 0001E180 90 01 00 24 */ stw r0, 0x24(r1)
/* 80021224 0001E184 38 C0 00 40 */ li r6, 0x40 /* 80021224 0001E184 38 C0 00 40 */ li r6, 0x40
@ -6864,7 +6864,7 @@ lbl_800212B8:
/* 800212B8 0001E218 80 1F 00 00 */ lwz r0, 0(r31) /* 800212B8 0001E218 80 1F 00 00 */ lwz r0, 0(r31)
/* 800212BC 0001E21C 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha /* 800212BC 0001E21C 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha
/* 800212C0 0001E220 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 800212C0 0001E220 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l
/* 800212C4 0001E224 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800212C4 0001E224 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800212C8 0001E228 54 00 10 3A */ slwi r0, r0, 2 /* 800212C8 0001E228 54 00 10 3A */ slwi r0, r0, 2
/* 800212CC 0001E22C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800212CC 0001E22C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800212D0 0001E230 7C 03 02 AE */ lhax r0, r3, r0 /* 800212D0 0001E230 7C 03 02 AE */ lhax r0, r3, r0
@ -6878,7 +6878,7 @@ lbl_800212B8:
/* 800212F0 0001E250 80 1F 00 00 */ lwz r0, 0(r31) /* 800212F0 0001E250 80 1F 00 00 */ lwz r0, 0(r31)
/* 800212F4 0001E254 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha /* 800212F4 0001E254 3C 60 80 3D */ lis r3, lbl_803CC5D0@ha
/* 800212F8 0001E258 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l /* 800212F8 0001E258 38 63 C5 D0 */ addi r3, r3, lbl_803CC5D0@l
/* 800212FC 0001E25C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800212FC 0001E25C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80021300 0001E260 54 00 10 3A */ slwi r0, r0, 2 /* 80021300 0001E260 54 00 10 3A */ slwi r0, r0, 2
/* 80021304 0001E264 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80021304 0001E264 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80021308 0001E268 7C 83 02 14 */ add r4, r3, r0 /* 80021308 0001E268 7C 83 02 14 */ add r4, r3, r0
@ -7723,7 +7723,7 @@ lbl_80021EA0:
/* 80021EB4 0001EE14 7C 03 00 2E */ lwzx r0, r3, r0 /* 80021EB4 0001EE14 7C 03 00 2E */ lwzx r0, r3, r0
/* 80021EB8 0001EE18 2C 00 FF FF */ cmpwi r0, -1 /* 80021EB8 0001EE18 2C 00 FF FF */ cmpwi r0, -1
/* 80021EBC 0001EE1C 41 82 01 38 */ beq lbl_80021FF4 /* 80021EBC 0001EE1C 41 82 01 38 */ beq lbl_80021FF4
/* 80021EC0 0001EE20 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80021EC0 0001EE20 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80021EC4 0001EE24 38 61 00 10 */ addi r3, r1, 0x10 /* 80021EC4 0001EE24 38 61 00 10 */ addi r3, r1, 0x10
/* 80021EC8 0001EE28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80021EC8 0001EE28 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80021ECC 0001EE2C 38 80 04 46 */ li r4, 0x446 /* 80021ECC 0001EE2C 38 80 04 46 */ li r4, 0x446
@ -7772,7 +7772,7 @@ lbl_80021F50:
/* 80021F6C 0001EECC 4B FF FB 8D */ bl SetUIText__13SGBALinkFrameF7EUIType /* 80021F6C 0001EECC 4B FF FB 8D */ bl SetUIText__13SGBALinkFrameF7EUIType
/* 80021F70 0001EED0 48 00 00 84 */ b lbl_80021FF4 /* 80021F70 0001EED0 48 00 00 84 */ b lbl_80021FF4
lbl_80021F74: lbl_80021F74:
/* 80021F74 0001EED4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80021F74 0001EED4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80021F78 0001EED8 38 61 00 0C */ addi r3, r1, 0xc /* 80021F78 0001EED8 38 61 00 0C */ addi r3, r1, 0xc
/* 80021F7C 0001EEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80021F7C 0001EEDC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80021F80 0001EEE0 38 80 04 46 */ li r4, 0x446 /* 80021F80 0001EEE0 38 80 04 46 */ li r4, 0x446
@ -7788,7 +7788,7 @@ lbl_80021F74:
lbl_80021FA8: lbl_80021FA8:
/* 80021FA8 0001EF08 2C 00 00 08 */ cmpwi r0, 8 /* 80021FA8 0001EF08 2C 00 00 08 */ cmpwi r0, 8
/* 80021FAC 0001EF0C 40 82 00 48 */ bne lbl_80021FF4 /* 80021FAC 0001EF0C 40 82 00 48 */ bne lbl_80021FF4
/* 80021FB0 0001EF10 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80021FB0 0001EF10 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80021FB4 0001EF14 38 61 00 08 */ addi r3, r1, 8 /* 80021FB4 0001EF14 38 61 00 08 */ addi r3, r1, 8
/* 80021FB8 0001EF18 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80021FB8 0001EF18 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80021FBC 0001EF1C 38 80 04 46 */ li r4, 0x446 /* 80021FBC 0001EF1C 38 80 04 46 */ li r4, 0x446
@ -8908,7 +8908,7 @@ FindAndSetPairText__14SFrontEndFrameFR9CGuiFramePCcRCQ24rstl7wstring:
PlayAdvanceSfx__11CFrontEndUIFv: PlayAdvanceSfx__11CFrontEndUIFv:
/* 80022F54 0001FEB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80022F54 0001FEB4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80022F58 0001FEB8 7C 08 02 A6 */ mflr r0 /* 80022F58 0001FEB8 7C 08 02 A6 */ mflr r0
/* 80022F5C 0001FEBC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80022F5C 0001FEBC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80022F60 0001FEC0 38 80 04 48 */ li r4, 0x448 /* 80022F60 0001FEC0 38 80 04 48 */ li r4, 0x448
/* 80022F64 0001FEC4 90 01 00 14 */ stw r0, 0x14(r1) /* 80022F64 0001FEC4 90 01 00 14 */ stw r0, 0x14(r1)
/* 80022F68 0001FEC8 38 61 00 0C */ addi r3, r1, 0xc /* 80022F68 0001FEC8 38 61 00 0C */ addi r3, r1, 0xc
@ -8918,7 +8918,7 @@ PlayAdvanceSfx__11CFrontEndUIFv:
/* 80022F78 0001FED8 38 E0 00 00 */ li r7, 0 /* 80022F78 0001FED8 38 E0 00 00 */ li r7, 0
/* 80022F7C 0001FEDC 39 20 00 00 */ li r9, 0 /* 80022F7C 0001FEDC 39 20 00 00 */ li r9, 0
/* 80022F80 0001FEE0 48 2C 6D F5 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80022F80 0001FEE0 48 2C 6D F5 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 80022F84 0001FEE4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80022F84 0001FEE4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80022F88 0001FEE8 38 61 00 08 */ addi r3, r1, 8 /* 80022F88 0001FEE8 38 61 00 08 */ addi r3, r1, 8
/* 80022F8C 0001FEEC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80022F8C 0001FEEC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80022F90 0001FEF0 38 80 04 43 */ li r4, 0x443 /* 80022F90 0001FEF0 38 80 04 43 */ li r4, 0x443

2
asm/MetroidPrime/CGameProjectile.s
View File

@ -447,7 +447,7 @@ lbl_800377CC:
lbl_800377DC: lbl_800377DC:
/* 800377DC 0003473C A0 9E 01 68 */ lhz r4, 0x168(r30) /* 800377DC 0003473C A0 9E 01 68 */ lhz r4, 0x168(r30)
/* 800377E0 00034740 38 61 00 20 */ addi r3, r1, 0x20 /* 800377E0 00034740 38 61 00 20 */ addi r3, r1, 0x20
/* 800377E4 00034744 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800377E4 00034744 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800377E8 00034748 38 A0 00 7F */ li r5, 0x7f /* 800377E8 00034748 38 A0 00 7F */ li r5, 0x7f
/* 800377EC 0003474C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800377EC 0003474C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800377F0 00034750 38 C0 00 40 */ li r6, 0x40 /* 800377F0 00034750 38 C0 00 40 */ li r6, 0x40

4
asm/MetroidPrime/CInGameGuiManager.s
View File

@ -1873,7 +1873,7 @@ lbl_801082E4:
/* 80108340 001052A0 C0 02 94 94 */ lfs f0, lbl_805AB1B4@sda21(r2) /* 80108340 001052A0 C0 02 94 94 */ lfs f0, lbl_805AB1B4@sda21(r2)
/* 80108344 001052A4 FC 00 10 00 */ fcmpu cr0, f0, f2 /* 80108344 001052A4 FC 00 10 00 */ fcmpu cr0, f0, f2
/* 80108348 001052A8 40 82 00 2C */ bne lbl_80108374 /* 80108348 001052A8 40 82 00 2C */ bne lbl_80108374
/* 8010834C 001052AC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8010834C 001052AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80108350 001052B0 38 61 00 1C */ addi r3, r1, 0x1c /* 80108350 001052B0 38 61 00 1C */ addi r3, r1, 0x1c
/* 80108354 001052B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80108354 001052B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80108358 001052B8 38 80 05 79 */ li r4, 0x579 /* 80108358 001052B8 38 80 05 79 */ li r4, 0x579
@ -1887,7 +1887,7 @@ lbl_80108374:
/* 80108374 001052D4 C0 02 94 90 */ lfs f0, lbl_805AB1B0@sda21(r2) /* 80108374 001052D4 C0 02 94 90 */ lfs f0, lbl_805AB1B0@sda21(r2)
/* 80108378 001052D8 FC 00 10 00 */ fcmpu cr0, f0, f2 /* 80108378 001052D8 FC 00 10 00 */ fcmpu cr0, f0, f2
/* 8010837C 001052DC 40 82 00 28 */ bne lbl_801083A4 /* 8010837C 001052DC 40 82 00 28 */ bne lbl_801083A4
/* 80108380 001052E0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80108380 001052E0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80108384 001052E4 38 61 00 18 */ addi r3, r1, 0x18 /* 80108384 001052E4 38 61 00 18 */ addi r3, r1, 0x18
/* 80108388 001052E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80108388 001052E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8010838C 001052EC 38 80 05 78 */ li r4, 0x578 /* 8010838C 001052EC 38 80 05 78 */ li r4, 0x578

3
asm/MetroidPrime/CInventoryScreen.s
View File

@ -1724,7 +1724,7 @@ lbl_802072A4:
/* 802072B0 00204210 48 0C 0B 59 */ bl SetPage__15CGuiTextSupportFi /* 802072B0 00204210 48 0C 0B 59 */ bl SetPage__15CGuiTextSupportFi
/* 802072B4 00204214 7C 1F F0 00 */ cmpw r31, r30 /* 802072B4 00204214 7C 1F F0 00 */ cmpw r31, r30
/* 802072B8 00204218 41 82 00 28 */ beq lbl_802072E0 /* 802072B8 00204218 41 82 00 28 */ beq lbl_802072E0
/* 802072BC 0020421C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802072BC 0020421C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802072C0 00204220 38 61 00 08 */ addi r3, r1, 8 /* 802072C0 00204220 38 61 00 08 */ addi r3, r1, 8
/* 802072C4 00204224 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802072C4 00204224 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 802072C8 00204228 38 80 05 A4 */ li r4, 0x5a4 /* 802072C8 00204228 38 80 05 A4 */ li r4, 0x5a4
@ -2124,4 +2124,3 @@ lbl_803D2718:
# ROM: 0x3CF718 # ROM: 0x3CF718
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

3
asm/MetroidPrime/CLogBookScreen.s
View File

@ -1965,7 +1965,7 @@ lbl_80247434:
/* 80247440 002443A0 48 08 09 C9 */ bl SetPage__15CGuiTextSupportFi /* 80247440 002443A0 48 08 09 C9 */ bl SetPage__15CGuiTextSupportFi
/* 80247444 002443A4 7C 1F F0 00 */ cmpw r31, r30 /* 80247444 002443A4 7C 1F F0 00 */ cmpw r31, r30
/* 80247448 002443A8 41 82 00 28 */ beq lbl_80247470 /* 80247448 002443A8 41 82 00 28 */ beq lbl_80247470
/* 8024744C 002443AC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8024744C 002443AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80247450 002443B0 38 61 00 08 */ addi r3, r1, 8 /* 80247450 002443B0 38 61 00 08 */ addi r3, r1, 8
/* 80247454 002443B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80247454 002443B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80247458 002443B8 38 80 05 A4 */ li r4, 0x5a4 /* 80247458 002443B8 38 80 05 A4 */ li r4, 0x5a4
@ -3294,4 +3294,3 @@ lbl_803D4760:
# ROM: 0x3D1760 # ROM: 0x3D1760
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

3
asm/MetroidPrime/CMessageScreen.s
View File

@ -119,7 +119,7 @@ lbl_801EF70C:
/* 801EF74C 001EC6AC 48 0D A1 39 */ bl "SetText__15CGuiTextSupportFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>" /* 801EF74C 001EC6AC 48 0D A1 39 */ bl "SetText__15CGuiTextSupportFRCQ24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>"
/* 801EF750 001EC6B0 38 61 00 10 */ addi r3, r1, 0x10 /* 801EF750 001EC6B0 38 61 00 10 */ addi r3, r1, 0x10
/* 801EF754 001EC6B4 48 14 D9 E1 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv" /* 801EF754 001EC6B4 48 14 D9 E1 */ bl "internal_dereference__Q24rstl66basic_string<w,Q24rstl14char_traits<w>,Q24rstl17rmemory_allocator>Fv"
/* 801EF758 001EC6B8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801EF758 001EC6B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801EF75C 001EC6BC 38 61 00 0C */ addi r3, r1, 0xc /* 801EF75C 001EC6BC 38 61 00 0C */ addi r3, r1, 0xc
/* 801EF760 001EC6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801EF760 001EC6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801EF764 001EC6C4 38 80 05 8D */ li r4, 0x58d /* 801EF764 001EC6C4 38 80 05 8D */ li r4, 0x58d
@ -878,4 +878,3 @@ lbl_803D1F48:
.byte 0x46, 0x52, 0x4D .byte 0x46, 0x52, 0x4D
.asciz "E_MsgScreen" .asciz "E_MsgScreen"
.4byte 0 .4byte 0

21
asm/MetroidPrime/CPauseScreen.s
View File

@ -285,7 +285,7 @@ SetRightTableSelection__16CPauseScreenBaseFii:
/* 80070B5C 0006DABC 80 1D 00 1C */ lwz r0, 0x1c(r29) /* 80070B5C 0006DABC 80 1D 00 1C */ lwz r0, 0x1c(r29)
/* 80070B60 0006DAC0 7C 1C 00 00 */ cmpw r28, r0 /* 80070B60 0006DAC0 7C 1C 00 00 */ cmpw r28, r0
/* 80070B64 0006DAC4 41 82 00 28 */ beq lbl_80070B8C /* 80070B64 0006DAC4 41 82 00 28 */ beq lbl_80070B8C
/* 80070B68 0006DAC8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070B68 0006DAC8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070B6C 0006DACC 38 61 00 08 */ addi r3, r1, 8 /* 80070B6C 0006DACC 38 61 00 08 */ addi r3, r1, 8
/* 80070B70 0006DAD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070B70 0006DAD0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80070B74 0006DAD4 38 80 05 9C */ li r4, 0x59c /* 80070B74 0006DAD4 38 80 05 9C */ li r4, 0x59c
@ -350,7 +350,7 @@ OnTableSelectionChange__16CPauseScreenBaseFP14CGuiTableGroupi:
/* 80070C48 0006DBA8 80 1D 00 70 */ lwz r0, 0x70(r29) /* 80070C48 0006DBA8 80 1D 00 70 */ lwz r0, 0x70(r29)
/* 80070C4C 0006DBAC 7C 1E 00 40 */ cmplw r30, r0 /* 80070C4C 0006DBAC 7C 1E 00 40 */ cmplw r30, r0
/* 80070C50 0006DBB0 40 82 00 40 */ bne lbl_80070C90 /* 80070C50 0006DBB0 40 82 00 40 */ bne lbl_80070C90
/* 80070C54 0006DBB4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070C54 0006DBB4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070C58 0006DBB8 38 61 00 08 */ addi r3, r1, 8 /* 80070C58 0006DBB8 38 61 00 08 */ addi r3, r1, 8
/* 80070C5C 0006DBBC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070C5C 0006DBBC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80070C60 0006DBC0 38 80 05 9C */ li r4, 0x59c /* 80070C60 0006DBC0 38 80 05 9C */ li r4, 0x59c
@ -399,7 +399,7 @@ OnRightTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup:
/* 80070CF8 0006DC58 7F E3 FB 78 */ mr r3, r31 /* 80070CF8 0006DC58 7F E3 FB 78 */ mr r3, r31
/* 80070CFC 0006DC5C 38 80 00 02 */ li r4, 2 /* 80070CFC 0006DC5C 38 80 00 02 */ li r4, 2
/* 80070D00 0006DC60 48 00 01 15 */ bl ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode /* 80070D00 0006DC60 48 00 01 15 */ bl ChangeMode__16CPauseScreenBaseFQ216CPauseScreenBase5EMode
/* 80070D04 0006DC64 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070D04 0006DC64 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070D08 0006DC68 38 61 00 08 */ addi r3, r1, 8 /* 80070D08 0006DC68 38 61 00 08 */ addi r3, r1, 8
/* 80070D0C 0006DC6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070D0C 0006DC6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80070D10 0006DC70 38 80 05 98 */ li r4, 0x598 /* 80070D10 0006DC70 38 80 05 98 */ li r4, 0x598
@ -439,7 +439,7 @@ OnLeftTableAdvance__16CPauseScreenBaseFP14CGuiTableGroup:
/* 80070D7C 0006DCDC 88 1F 01 98 */ lbz r0, 0x198(r31) /* 80070D7C 0006DCDC 88 1F 01 98 */ lbz r0, 0x198(r31)
/* 80070D80 0006DCE0 38 60 00 01 */ li r3, 1 /* 80070D80 0006DCE0 38 60 00 01 */ li r3, 1
/* 80070D84 0006DCE4 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 80070D84 0006DCE4 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19
/* 80070D88 0006DCE8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070D88 0006DCE8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070D8C 0006DCEC 98 1F 01 98 */ stb r0, 0x198(r31) /* 80070D8C 0006DCEC 98 1F 01 98 */ stb r0, 0x198(r31)
/* 80070D90 0006DCF0 38 61 00 08 */ addi r3, r1, 8 /* 80070D90 0006DCF0 38 61 00 08 */ addi r3, r1, 8
/* 80070D94 0006DCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070D94 0006DCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -554,7 +554,7 @@ lbl_80070EF8:
/* 80070F00 0006DE60 48 25 96 E5 */ bl SetIsActive__10CGuiWidgetFb /* 80070F00 0006DE60 48 25 96 E5 */ bl SetIsActive__10CGuiWidgetFb
/* 80070F04 0006DE64 48 00 00 28 */ b lbl_80070F2C /* 80070F04 0006DE64 48 00 00 28 */ b lbl_80070F2C
lbl_80070F08: lbl_80070F08:
/* 80070F08 0006DE68 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070F08 0006DE68 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070F0C 0006DE6C 38 61 00 10 */ addi r3, r1, 0x10 /* 80070F0C 0006DE6C 38 61 00 10 */ addi r3, r1, 0x10
/* 80070F10 0006DE70 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070F10 0006DE70 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80070F14 0006DE74 38 80 05 97 */ li r4, 0x597 /* 80070F14 0006DE74 38 80 05 97 */ li r4, 0x597
@ -579,7 +579,7 @@ lbl_80070F4C:
lbl_80070F58: lbl_80070F58:
/* 80070F58 0006DEB8 2C 1F 00 01 */ cmpwi r31, 1 /* 80070F58 0006DEB8 2C 1F 00 01 */ cmpwi r31, 1
/* 80070F5C 0006DEBC 40 82 00 28 */ bne lbl_80070F84 /* 80070F5C 0006DEBC 40 82 00 28 */ bne lbl_80070F84
/* 80070F60 0006DEC0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80070F60 0006DEC0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80070F64 0006DEC4 38 61 00 0C */ addi r3, r1, 0xc /* 80070F64 0006DEC4 38 61 00 0C */ addi r3, r1, 0xc
/* 80070F68 0006DEC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80070F68 0006DEC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80070F6C 0006DECC 38 80 05 97 */ li r4, 0x597 /* 80070F6C 0006DECC 38 80 05 97 */ li r4, 0x597
@ -2610,7 +2610,7 @@ lbl_80072CA8:
/* 80072CC4 0006FC24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072CC4 0006FC24 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80072CC8 0006FC28 41 82 00 44 */ beq lbl_80072D0C /* 80072CC8 0006FC28 41 82 00 44 */ beq lbl_80072D0C
lbl_80072CCC: lbl_80072CCC:
/* 80072CCC 0006FC2C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80072CCC 0006FC2C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80072CD0 0006FC30 38 61 00 24 */ addi r3, r1, 0x24 /* 80072CD0 0006FC30 38 61 00 24 */ addi r3, r1, 0x24
/* 80072CD4 0006FC34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80072CD4 0006FC34 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80072CD8 0006FC38 38 80 05 9A */ li r4, 0x59a /* 80072CD8 0006FC38 38 80 05 9A */ li r4, 0x59a
@ -2632,7 +2632,7 @@ lbl_80072D0C:
/* 80072D14 0006FC74 4B F9 9A BD */ bl GetPressInput__13ControlMapperFQ213ControlMapper9ECommandsRC11CFinalInput /* 80072D14 0006FC74 4B F9 9A BD */ bl GetPressInput__13ControlMapperFQ213ControlMapper9ECommandsRC11CFinalInput
/* 80072D18 0006FC78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072D18 0006FC78 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80072D1C 0006FC7C 41 82 00 5C */ beq lbl_80072D78 /* 80072D1C 0006FC7C 41 82 00 5C */ beq lbl_80072D78
/* 80072D20 0006FC80 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80072D20 0006FC80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80072D24 0006FC84 38 61 00 20 */ addi r3, r1, 0x20 /* 80072D24 0006FC84 38 61 00 20 */ addi r3, r1, 0x20
/* 80072D28 0006FC88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80072D28 0006FC88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80072D2C 0006FC8C 38 80 05 99 */ li r4, 0x599 /* 80072D2C 0006FC8C 38 80 05 99 */ li r4, 0x599
@ -2661,7 +2661,7 @@ lbl_80072D78:
/* 80072D80 0006FCE0 4B F9 9A 51 */ bl GetPressInput__13ControlMapperFQ213ControlMapper9ECommandsRC11CFinalInput /* 80072D80 0006FCE0 4B F9 9A 51 */ bl GetPressInput__13ControlMapperFQ213ControlMapper9ECommandsRC11CFinalInput
/* 80072D84 0006FCE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072D84 0006FCE4 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 80072D88 0006FCE8 41 82 00 58 */ beq lbl_80072DE0 /* 80072D88 0006FCE8 41 82 00 58 */ beq lbl_80072DE0
/* 80072D8C 0006FCEC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80072D8C 0006FCEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80072D90 0006FCF0 38 61 00 1C */ addi r3, r1, 0x1c /* 80072D90 0006FCF0 38 61 00 1C */ addi r3, r1, 0x1c
/* 80072D94 0006FCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80072D94 0006FCF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80072D98 0006FCF8 38 80 05 99 */ li r4, 0x599 /* 80072D98 0006FCF8 38 80 05 99 */ li r4, 0x599
@ -4108,7 +4108,7 @@ lbl_80074240:
/* 80074254 000711B4 48 2C CB 31 */ bl Lock__6CTokenFv /* 80074254 000711B4 48 2C CB 31 */ bl Lock__6CTokenFv
/* 80074258 000711B8 38 7F 00 28 */ addi r3, r31, 0x28 /* 80074258 000711B8 38 7F 00 28 */ addi r3, r31, 0x28
/* 8007425C 000711BC 48 2C CB 29 */ bl Lock__6CTokenFv /* 8007425C 000711BC 48 2C CB 29 */ bl Lock__6CTokenFv
/* 80074260 000711C0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80074260 000711C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80074264 000711C4 38 61 00 08 */ addi r3, r1, 8 /* 80074264 000711C4 38 61 00 08 */ addi r3, r1, 8
/* 80074268 000711C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80074268 000711C8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8007426C 000711CC 38 80 05 9B */ li r4, 0x59b /* 8007426C 000711CC 38 80 05 9B */ li r4, 0x59b
@ -4260,4 +4260,3 @@ lbl_803CD2D8:
.byte 0x46, 0x52 .byte 0x46, 0x52
.asciz "ME_PauseScreen" .asciz "ME_PauseScreen"
.balign 4 .balign 4

9
asm/MetroidPrime/CPauseScreenBlur.s
View File

@ -54,7 +54,7 @@ lbl_8025D5F4:
/* 8025D600 0025A560 48 08 C2 B5 */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels /* 8025D600 0025A560 48 08 C2 B5 */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels
/* 8025D604 0025A564 2C 1F 00 03 */ cmpwi r31, 3 /* 8025D604 0025A564 2C 1F 00 03 */ cmpwi r31, 3
/* 8025D608 0025A568 40 82 00 2C */ bne lbl_8025D634 /* 8025D608 0025A568 40 82 00 2C */ bne lbl_8025D634
/* 8025D60C 0025A56C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8025D60C 0025A56C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8025D610 0025A570 38 61 00 14 */ addi r3, r1, 0x14 /* 8025D610 0025A570 38 61 00 14 */ addi r3, r1, 0x14
/* 8025D614 0025A574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8025D614 0025A574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8025D618 0025A578 38 80 05 87 */ li r4, 0x587 /* 8025D618 0025A578 38 80 05 87 */ li r4, 0x587
@ -67,7 +67,7 @@ lbl_8025D5F4:
lbl_8025D634: lbl_8025D634:
/* 8025D634 0025A594 2C 1F 00 01 */ cmpwi r31, 1 /* 8025D634 0025A594 2C 1F 00 01 */ cmpwi r31, 1
/* 8025D638 0025A598 40 82 00 28 */ bne lbl_8025D660 /* 8025D638 0025A598 40 82 00 28 */ bne lbl_8025D660
/* 8025D63C 0025A59C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8025D63C 0025A59C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8025D640 0025A5A0 38 61 00 10 */ addi r3, r1, 0x10 /* 8025D640 0025A5A0 38 61 00 10 */ addi r3, r1, 0x10
/* 8025D644 0025A5A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8025D644 0025A5A4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8025D648 0025A5A8 38 80 05 62 */ li r4, 0x562 /* 8025D648 0025A5A8 38 80 05 62 */ li r4, 0x562
@ -101,7 +101,7 @@ lbl_8025D698:
/* 8025D6A8 0025A608 80 1E 00 10 */ lwz r0, 0x10(r30) /* 8025D6A8 0025A608 80 1E 00 10 */ lwz r0, 0x10(r30)
/* 8025D6AC 0025A60C 2C 00 00 03 */ cmpwi r0, 3 /* 8025D6AC 0025A60C 2C 00 00 03 */ cmpwi r0, 3
/* 8025D6B0 0025A610 40 82 00 2C */ bne lbl_8025D6DC /* 8025D6B0 0025A610 40 82 00 2C */ bne lbl_8025D6DC
/* 8025D6B4 0025A614 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8025D6B4 0025A614 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8025D6B8 0025A618 38 61 00 0C */ addi r3, r1, 0xc /* 8025D6B8 0025A618 38 61 00 0C */ addi r3, r1, 0xc
/* 8025D6BC 0025A61C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8025D6BC 0025A61C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8025D6C0 0025A620 38 80 05 88 */ li r4, 0x588 /* 8025D6C0 0025A620 38 80 05 88 */ li r4, 0x588
@ -114,7 +114,7 @@ lbl_8025D698:
lbl_8025D6DC: lbl_8025D6DC:
/* 8025D6DC 0025A63C 2C 00 00 01 */ cmpwi r0, 1 /* 8025D6DC 0025A63C 2C 00 00 01 */ cmpwi r0, 1
/* 8025D6E0 0025A640 40 82 00 28 */ bne lbl_8025D708 /* 8025D6E0 0025A640 40 82 00 28 */ bne lbl_8025D708
/* 8025D6E4 0025A644 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8025D6E4 0025A644 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8025D6E8 0025A648 38 61 00 08 */ addi r3, r1, 8 /* 8025D6E8 0025A648 38 61 00 08 */ addi r3, r1, 8
/* 8025D6EC 0025A64C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8025D6EC 0025A64C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8025D6F0 0025A650 38 80 05 64 */ li r4, 0x564 /* 8025D6F0 0025A650 38 80 05 64 */ li r4, 0x564
@ -508,4 +508,3 @@ lbl_803D5240:
# ROM: 0x3D2240 # ROM: 0x3D2240
.asciz "TXTR_MapLightQuarter" .asciz "TXTR_MapLightQuarter"
.balign 4 .balign 4

37
asm/MetroidPrime/CPauseScreenFrame.s
View File

@ -288,7 +288,7 @@ lbl_80241C84:
/* 80241CC4 0023EC24 88 1E 01 34 */ lbz r0, 0x134(r30) /* 80241CC4 0023EC24 88 1E 01 34 */ lbz r0, 0x134(r30)
/* 80241CC8 0023EC28 38 60 00 01 */ li r3, 1 /* 80241CC8 0023EC28 38 60 00 01 */ li r3, 1
/* 80241CCC 0023EC2C 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 /* 80241CCC 0023EC2C 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19
/* 80241CD0 0023EC30 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80241CD0 0023EC30 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80241CD4 0023EC34 98 1E 01 34 */ stb r0, 0x134(r30) /* 80241CD4 0023EC34 98 1E 01 34 */ stb r0, 0x134(r30)
/* 80241CD8 0023EC38 38 61 00 08 */ addi r3, r1, 8 /* 80241CD8 0023EC38 38 61 00 08 */ addi r3, r1, 8
/* 80241CDC 0023EC3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80241CDC 0023EC3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -381,7 +381,7 @@ lbl_80241DD8:
/* 80241E14 0023ED74 41 82 00 54 */ beq lbl_80241E68 /* 80241E14 0023ED74 41 82 00 54 */ beq lbl_80241E68
/* 80241E18 0023ED78 28 03 00 00 */ cmplwi r3, 0 /* 80241E18 0023ED78 28 03 00 00 */ cmplwi r3, 0
/* 80241E1C 0023ED7C 41 82 00 34 */ beq lbl_80241E50 /* 80241E1C 0023ED7C 41 82 00 34 */ beq lbl_80241E50
/* 80241E20 0023ED80 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80241E20 0023ED80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80241E24 0023ED84 38 61 00 0C */ addi r3, r1, 0xc /* 80241E24 0023ED84 38 61 00 0C */ addi r3, r1, 0xc
/* 80241E28 0023ED88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80241E28 0023ED88 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80241E2C 0023ED8C 38 80 05 B2 */ li r4, 0x5b2 /* 80241E2C 0023ED8C 38 80 05 B2 */ li r4, 0x5b2
@ -435,7 +435,7 @@ DoMenuCancel__21SOptionsFrontEndFrameFP14CGuiTableGroup:
/* 80241ED8 0023EE38 90 05 00 C4 */ stw r0, 0xc4(r5) /* 80241ED8 0023EE38 90 05 00 C4 */ stw r0, 0xc4(r5)
/* 80241EDC 0023EE3C 80 9F 00 28 */ lwz r4, 0x28(r31) /* 80241EDC 0023EE3C 80 9F 00 28 */ lwz r4, 0x28(r31)
/* 80241EE0 0023EE40 4B FF FC A9 */ bl SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup /* 80241EE0 0023EE40 4B FF FC A9 */ bl SetTableColors__21SOptionsFrontEndFrameFP14CGuiTableGroup
/* 80241EE4 0023EE44 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80241EE4 0023EE44 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80241EE8 0023EE48 38 61 00 08 */ addi r3, r1, 8 /* 80241EE8 0023EE48 38 61 00 08 */ addi r3, r1, 8
/* 80241EEC 0023EE4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80241EEC 0023EE4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80241EF0 0023EE50 38 80 04 46 */ li r4, 0x446 /* 80241EF0 0023EE50 38 80 04 46 */ li r4, 0x446
@ -468,7 +468,7 @@ DoMenuSelectionChange__21SOptionsFrontEndFrameFP14CGuiTableGroup:
/* 80241F4C 0023EEAC 40 82 00 34 */ bne lbl_80241F80 /* 80241F4C 0023EEAC 40 82 00 34 */ bne lbl_80241F80
/* 80241F50 0023EEB0 7F E3 FB 78 */ mr r3, r31 /* 80241F50 0023EEB0 7F E3 FB 78 */ mr r3, r31
/* 80241F54 0023EEB4 48 00 05 25 */ bl SetRightUIText__21SOptionsFrontEndFrameFv /* 80241F54 0023EEB4 48 00 05 25 */ bl SetRightUIText__21SOptionsFrontEndFrameFv
/* 80241F58 0023EEB8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80241F58 0023EEB8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80241F5C 0023EEBC 38 61 00 10 */ addi r3, r1, 0x10 /* 80241F5C 0023EEBC 38 61 00 10 */ addi r3, r1, 0x10
/* 80241F60 0023EEC0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80241F60 0023EEC0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80241F64 0023EEC4 38 80 04 45 */ li r4, 0x445 /* 80241F64 0023EEC4 38 80 04 45 */ li r4, 0x445
@ -484,7 +484,7 @@ lbl_80241F80:
/* 80241F88 0023EEE8 40 82 00 34 */ bne lbl_80241FBC /* 80241F88 0023EEE8 40 82 00 34 */ bne lbl_80241FBC
/* 80241F8C 0023EEEC 7F E3 FB 78 */ mr r3, r31 /* 80241F8C 0023EEEC 7F E3 FB 78 */ mr r3, r31
/* 80241F90 0023EEF0 48 00 02 3D */ bl HandleRightSelectionChange__21SOptionsFrontEndFrameFv /* 80241F90 0023EEF0 48 00 02 3D */ bl HandleRightSelectionChange__21SOptionsFrontEndFrameFv
/* 80241F94 0023EEF4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80241F94 0023EEF4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80241F98 0023EEF8 38 61 00 0C */ addi r3, r1, 0xc /* 80241F98 0023EEF8 38 61 00 0C */ addi r3, r1, 0xc
/* 80241F9C 0023EEFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80241F9C 0023EEFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80241FA0 0023EF00 38 80 04 45 */ li r4, 0x445 /* 80241FA0 0023EF00 38 80 04 45 */ li r4, 0x445
@ -522,7 +522,7 @@ lbl_80241FD4:
/* 80242018 0023EF78 7F 84 E3 78 */ mr r4, r28 /* 80242018 0023EF78 7F 84 E3 78 */ mr r4, r28
/* 8024201C 0023EF7C 7C 7D F0 2E */ lwzx r3, r29, r30 /* 8024201C 0023EF7C 7C 7D F0 2E */ lwzx r3, r29, r30
/* 80242020 0023EF80 48 00 21 89 */ bl SetOption__12CGameOptionsF11EGameOptioni /* 80242020 0023EF80 48 00 21 89 */ bl SetOption__12CGameOptionsF11EGameOptioni
/* 80242024 0023EF84 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80242024 0023EF84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80242028 0023EF88 38 61 00 08 */ addi r3, r1, 8 /* 80242028 0023EF88 38 61 00 08 */ addi r3, r1, 8
/* 8024202C 0023EF8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024202C 0023EF8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80242030 0023EF90 38 80 04 47 */ li r4, 0x447 /* 80242030 0023EF90 38 80 04 47 */ li r4, 0x447
@ -578,7 +578,7 @@ DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup:
/* 802420E8 0023F048 80 7F 00 28 */ lwz r3, 0x28(r31) /* 802420E8 0023F048 80 7F 00 28 */ lwz r3, 0x28(r31)
/* 802420EC 0023F04C 38 80 00 01 */ li r4, 1 /* 802420EC 0023F04C 38 80 00 01 */ li r4, 1
/* 802420F0 0023F050 48 08 84 F5 */ bl SetIsActive__10CGuiWidgetFb /* 802420F0 0023F050 48 08 84 F5 */ bl SetIsActive__10CGuiWidgetFb
/* 802420F4 0023F054 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802420F4 0023F054 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802420F8 0023F058 38 61 00 0C */ addi r3, r1, 0xc /* 802420F8 0023F058 38 61 00 0C */ addi r3, r1, 0xc
/* 802420FC 0023F05C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802420FC 0023F05C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80242100 0023F060 38 80 04 48 */ li r4, 0x448 /* 80242100 0023F060 38 80 04 48 */ li r4, 0x448
@ -587,7 +587,7 @@ DoLeftMenuAdvance__21SOptionsFrontEndFrameFP14CGuiTableGroup:
/* 8024210C 0023F06C 38 E0 00 00 */ li r7, 0 /* 8024210C 0023F06C 38 E0 00 00 */ li r7, 0
/* 80242110 0023F070 39 20 00 00 */ li r9, 0 /* 80242110 0023F070 39 20 00 00 */ li r9, 0
/* 80242114 0023F074 48 0A 7C 61 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80242114 0023F074 48 0A 7C 61 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 80242118 0023F078 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80242118 0023F078 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8024211C 0023F07C 38 61 00 08 */ addi r3, r1, 8 /* 8024211C 0023F07C 38 61 00 08 */ addi r3, r1, 8
/* 80242120 0023F080 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80242120 0023F080 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80242124 0023F084 38 80 04 43 */ li r4, 0x443 /* 80242124 0023F084 38 80 04 43 */ li r4, 0x443
@ -1624,7 +1624,7 @@ lbl_80243058:
/* 80243058 0023FFB8 7F 63 DB 78 */ mr r3, r27 /* 80243058 0023FFB8 7F 63 DB 78 */ mr r3, r27
/* 8024305C 0023FFBC 7F 84 E3 78 */ mr r4, r28 /* 8024305C 0023FFBC 7F 84 E3 78 */ mr r4, r28
/* 80243060 0023FFC0 4B E2 E0 85 */ bl UpdateSideTable__16CPauseScreenBaseFP14CGuiTableGroup /* 80243060 0023FFC0 4B E2 E0 85 */ bl UpdateSideTable__16CPauseScreenBaseFP14CGuiTableGroup
/* 80243064 0023FFC4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80243064 0023FFC4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80243068 0023FFC8 38 61 00 08 */ addi r3, r1, 8 /* 80243068 0023FFC8 38 61 00 08 */ addi r3, r1, 8
/* 8024306C 0023FFCC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024306C 0023FFCC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80243070 0023FFD0 38 80 05 9D */ li r4, 0x59d /* 80243070 0023FFD0 38 80 05 9D */ li r4, 0x59d
@ -2430,7 +2430,7 @@ Update__14COptionsScreenFfR9CRandom16R18CArchitectureQueue:
/* 80243BE0 00240B40 41 82 00 54 */ beq lbl_80243C34 /* 80243BE0 00240B40 41 82 00 54 */ beq lbl_80243C34
/* 80243BE4 00240B44 28 03 00 00 */ cmplwi r3, 0 /* 80243BE4 00240B44 28 03 00 00 */ cmplwi r3, 0
/* 80243BE8 00240B48 41 82 00 34 */ beq lbl_80243C1C /* 80243BE8 00240B48 41 82 00 34 */ beq lbl_80243C1C
/* 80243BEC 00240B4C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80243BEC 00240B4C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80243BF0 00240B50 38 61 00 20 */ addi r3, r1, 0x20 /* 80243BF0 00240B50 38 61 00 20 */ addi r3, r1, 0x20
/* 80243BF4 00240B54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80243BF4 00240B54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80243BF8 00240B58 38 80 05 AB */ li r4, 0x5ab /* 80243BF8 00240B58 38 80 05 AB */ li r4, 0x5ab
@ -2540,7 +2540,7 @@ lbl_80243CD4:
lbl_80243D74: lbl_80243D74:
/* 80243D74 00240CD4 38 60 00 00 */ li r3, 0 /* 80243D74 00240CD4 38 60 00 00 */ li r3, 0
/* 80243D78 00240CD8 48 0A 5B 3D */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels /* 80243D78 00240CD8 48 0A 5B 3D */ bl SetChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels
/* 80243D7C 00240CDC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80243D7C 00240CDC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80243D80 00240CE0 38 61 00 10 */ addi r3, r1, 0x10 /* 80243D80 00240CE0 38 61 00 10 */ addi r3, r1, 0x10
/* 80243D84 00240CE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80243D84 00240CE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80243D88 00240CE8 38 80 05 8E */ li r4, 0x58e /* 80243D88 00240CE8 38 80 05 8E */ li r4, 0x58e
@ -2553,7 +2553,7 @@ lbl_80243D74:
lbl_80243DA4: lbl_80243DA4:
/* 80243DA4 00240D04 2C 03 00 02 */ cmpwi r3, 2 /* 80243DA4 00240D04 2C 03 00 02 */ cmpwi r3, 2
/* 80243DA8 00240D08 40 82 00 60 */ bne lbl_80243E08 /* 80243DA8 00240D08 40 82 00 60 */ bne lbl_80243E08
/* 80243DAC 00240D0C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80243DAC 00240D0C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80243DB0 00240D10 38 61 00 0C */ addi r3, r1, 0xc /* 80243DB0 00240D10 38 61 00 0C */ addi r3, r1, 0xc
/* 80243DB4 00240D14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80243DB4 00240D14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80243DB8 00240D18 38 80 05 8F */ li r4, 0x58f /* 80243DB8 00240D18 38 80 05 8F */ li r4, 0x58f
@ -2734,7 +2734,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib:
/* 80244018 00240F78 41 82 01 78 */ beq lbl_80244190 /* 80244018 00240F78 41 82 01 78 */ beq lbl_80244190
/* 8024401C 00240F7C 54 C0 06 3F */ clrlwi. r0, r6, 0x18 /* 8024401C 00240F7C 54 C0 06 3F */ clrlwi. r0, r6, 0x18
/* 80244020 00240F80 41 82 00 50 */ beq lbl_80244070 /* 80244020 00240F80 41 82 00 50 */ beq lbl_80244070
/* 80244024 00240F84 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80244024 00240F84 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80244028 00240F88 38 61 00 10 */ addi r3, r1, 0x10 /* 80244028 00240F88 38 61 00 10 */ addi r3, r1, 0x10
/* 8024402C 00240F8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024402C 00240F8C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80244030 00240F90 38 80 04 48 */ li r4, 0x448 /* 80244030 00240F90 38 80 04 48 */ li r4, 0x448
@ -2743,7 +2743,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib:
/* 8024403C 00240F9C 38 E0 00 00 */ li r7, 0 /* 8024403C 00240F9C 38 E0 00 00 */ li r7, 0
/* 80244040 00240FA0 39 20 00 00 */ li r9, 0 /* 80244040 00240FA0 39 20 00 00 */ li r9, 0
/* 80244044 00240FA4 48 0A 5D 31 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80244044 00240FA4 48 0A 5D 31 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 80244048 00240FA8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80244048 00240FA8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8024404C 00240FAC 38 61 00 0C */ addi r3, r1, 0xc /* 8024404C 00240FAC 38 61 00 0C */ addi r3, r1, 0xc
/* 80244050 00240FB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80244050 00240FB0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80244054 00240FB4 38 80 04 43 */ li r4, 0x443 /* 80244054 00240FB4 38 80 04 43 */ li r4, 0x443
@ -2754,7 +2754,7 @@ TryRestoreDefaults__12CGameOptionsFRC11CFinalInputiib:
/* 80244068 00240FC8 48 0A 5D 0D */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80244068 00240FC8 48 0A 5D 0D */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 8024406C 00240FCC 48 00 00 28 */ b lbl_80244094 /* 8024406C 00240FCC 48 00 00 28 */ b lbl_80244094
lbl_80244070: lbl_80244070:
/* 80244070 00240FD0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80244070 00240FD0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80244074 00240FD4 38 61 00 08 */ addi r3, r1, 8 /* 80244074 00240FD4 38 61 00 08 */ addi r3, r1, 8
/* 80244078 00240FD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80244078 00240FD8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8024407C 00240FDC 38 80 05 98 */ li r4, 0x598 /* 8024407C 00240FDC 38 80 05 98 */ li r4, 0x598
@ -3354,7 +3354,7 @@ DoSelectionChange__15CQuitGameScreenFP14CGuiTableGroup:
/* 80244858 002417B8 7C 08 02 A6 */ mflr r0 /* 80244858 002417B8 7C 08 02 A6 */ mflr r0
/* 8024485C 002417BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8024485C 002417BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 80244860 002417C0 4B FF FC 41 */ bl SetColors__15CQuitGameScreenFv /* 80244860 002417C0 4B FF FC 41 */ bl SetColors__15CQuitGameScreenFv
/* 80244864 002417C4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80244864 002417C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80244868 002417C8 38 61 00 08 */ addi r3, r1, 8 /* 80244868 002417C8 38 61 00 08 */ addi r3, r1, 8
/* 8024486C 002417CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024486C 002417CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80244870 002417D0 38 80 05 90 */ li r4, 0x590 /* 80244870 002417D0 38 80 05 90 */ li r4, 0x590
@ -3378,7 +3378,7 @@ DoAdvance__15CQuitGameScreenFP14CGuiTableGroup:
/* 802448AC 0024180C 80 04 00 C4 */ lwz r0, 0xc4(r4) /* 802448AC 0024180C 80 04 00 C4 */ lwz r0, 0xc4(r4)
/* 802448B0 00241810 2C 00 00 00 */ cmpwi r0, 0 /* 802448B0 00241810 2C 00 00 00 */ cmpwi r0, 0
/* 802448B4 00241814 40 82 00 34 */ bne lbl_802448E8 /* 802448B4 00241814 40 82 00 34 */ bne lbl_802448E8
/* 802448B8 00241818 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802448B8 00241818 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802448BC 0024181C 38 61 00 0C */ addi r3, r1, 0xc /* 802448BC 0024181C 38 61 00 0C */ addi r3, r1, 0xc
/* 802448C0 00241820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802448C0 00241820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 802448C4 00241824 38 80 05 98 */ li r4, 0x598 /* 802448C4 00241824 38 80 05 98 */ li r4, 0x598
@ -3391,7 +3391,7 @@ DoAdvance__15CQuitGameScreenFP14CGuiTableGroup:
/* 802448E0 00241840 90 1F 00 18 */ stw r0, 0x18(r31) /* 802448E0 00241840 90 1F 00 18 */ stw r0, 0x18(r31)
/* 802448E4 00241844 48 00 00 30 */ b lbl_80244914 /* 802448E4 00241844 48 00 00 30 */ b lbl_80244914
lbl_802448E8: lbl_802448E8:
/* 802448E8 00241848 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802448E8 00241848 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802448EC 0024184C 38 61 00 08 */ addi r3, r1, 8 /* 802448EC 0024184C 38 61 00 08 */ addi r3, r1, 8
/* 802448F0 00241850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802448F0 00241850 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 802448F4 00241854 38 80 05 97 */ li r4, 0x597 /* 802448F4 00241854 38 80 05 97 */ li r4, 0x597
@ -3834,4 +3834,3 @@ lbl_803D45B4:
.asciz "textpane_no" .asciz "textpane_no"
.asciz "FRME_QuitScreen" .asciz "FRME_QuitScreen"
.4byte 0 .4byte 0

10
asm/MetroidPrime/CSamusDoll.s
View File

@ -342,7 +342,7 @@ SetRotationSfxPlaying__10CSamusDollFb:
/* 800DAA4C 000D79AC 80 1F 02 68 */ lwz r0, 0x268(r31) /* 800DAA4C 000D79AC 80 1F 02 68 */ lwz r0, 0x268(r31)
/* 800DAA50 000D79B0 28 00 00 00 */ cmplwi r0, 0 /* 800DAA50 000D79B0 28 00 00 00 */ cmplwi r0, 0
/* 800DAA54 000D79B4 40 82 00 4C */ bne lbl_800DAAA0 /* 800DAA54 000D79B4 40 82 00 4C */ bne lbl_800DAAA0
/* 800DAA58 000D79B8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800DAA58 000D79B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800DAA5C 000D79BC 38 61 00 0C */ addi r3, r1, 0xc /* 800DAA5C 000D79BC 38 61 00 0C */ addi r3, r1, 0xc
/* 800DAA60 000D79C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800DAA60 000D79C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800DAA64 000D79C4 38 80 05 5F */ li r4, 0x55f /* 800DAA64 000D79C4 38 80 05 5F */ li r4, 0x55f
@ -380,7 +380,7 @@ SetZoomSfxPlaying__10CSamusDollFb:
/* 800DAAD0 000D7A30 80 1F 02 6C */ lwz r0, 0x26c(r31) /* 800DAAD0 000D7A30 80 1F 02 6C */ lwz r0, 0x26c(r31)
/* 800DAAD4 000D7A34 28 00 00 00 */ cmplwi r0, 0 /* 800DAAD4 000D7A34 28 00 00 00 */ cmplwi r0, 0
/* 800DAAD8 000D7A38 40 82 00 4C */ bne lbl_800DAB24 /* 800DAAD8 000D7A38 40 82 00 4C */ bne lbl_800DAB24
/* 800DAADC 000D7A3C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800DAADC 000D7A3C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800DAAE0 000D7A40 38 61 00 0C */ addi r3, r1, 0xc /* 800DAAE0 000D7A40 38 61 00 0C */ addi r3, r1, 0xc
/* 800DAAE4 000D7A44 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800DAAE4 000D7A44 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800DAAE8 000D7A48 38 80 05 60 */ li r4, 0x560 /* 800DAAE8 000D7A48 38 80 05 60 */ li r4, 0x560
@ -418,7 +418,7 @@ SetOffsetSfxPlaying__10CSamusDollFb:
/* 800DAB54 000D7AB4 80 1F 02 64 */ lwz r0, 0x264(r31) /* 800DAB54 000D7AB4 80 1F 02 64 */ lwz r0, 0x264(r31)
/* 800DAB58 000D7AB8 28 00 00 00 */ cmplwi r0, 0 /* 800DAB58 000D7AB8 28 00 00 00 */ cmplwi r0, 0
/* 800DAB5C 000D7ABC 40 82 00 4C */ bne lbl_800DABA8 /* 800DAB5C 000D7ABC 40 82 00 4C */ bne lbl_800DABA8
/* 800DAB60 000D7AC0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800DAB60 000D7AC0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800DAB64 000D7AC4 38 61 00 0C */ addi r3, r1, 0xc /* 800DAB64 000D7AC4 38 61 00 0C */ addi r3, r1, 0xc
/* 800DAB68 000D7AC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800DAB68 000D7AC8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800DAB6C 000D7ACC 38 80 05 7E */ li r4, 0x57e /* 800DAB6C 000D7ACC 38 80 05 7E */ li r4, 0x57e
@ -457,7 +457,7 @@ BeginViewInterpolate__10CSamusDollFb:
/* 800DABDC 000D7B3C C0 23 00 C4 */ lfs f1, 0xc4(r3) /* 800DABDC 000D7B3C C0 23 00 C4 */ lfs f1, 0xc4(r3)
/* 800DABE0 000D7B40 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 800DABE0 000D7B40 FC 00 08 00 */ fcmpu cr0, f0, f1
/* 800DABE4 000D7B44 40 82 00 2C */ bne lbl_800DAC10 /* 800DABE4 000D7B44 40 82 00 2C */ bne lbl_800DAC10
/* 800DABE8 000D7B48 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800DABE8 000D7B48 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800DABEC 000D7B4C 38 61 00 0C */ addi r3, r1, 0xc /* 800DABEC 000D7B4C 38 61 00 0C */ addi r3, r1, 0xc
/* 800DABF0 000D7B50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800DABF0 000D7B50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800DABF4 000D7B54 38 80 05 A0 */ li r4, 0x5a0 /* 800DABF4 000D7B54 38 80 05 A0 */ li r4, 0x5a0
@ -479,7 +479,7 @@ lbl_800DAC10:
/* 800DAC30 000D7B90 7F C3 F3 78 */ mr r3, r30 /* 800DAC30 000D7B90 7F C3 F3 78 */ mr r3, r30
/* 800DAC34 000D7B94 38 80 00 00 */ li r4, 0 /* 800DAC34 000D7B94 38 80 00 00 */ li r4, 0
/* 800DAC38 000D7B98 4B FF FD F9 */ bl SetRotationSfxPlaying__10CSamusDollFb /* 800DAC38 000D7B98 4B FF FD F9 */ bl SetRotationSfxPlaying__10CSamusDollFb
/* 800DAC3C 000D7B9C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800DAC3C 000D7B9C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800DAC40 000D7BA0 38 61 00 08 */ addi r3, r1, 8 /* 800DAC40 000D7BA0 38 61 00 08 */ addi r3, r1, 8
/* 800DAC44 000D7BA4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800DAC44 000D7BA4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800DAC48 000D7BA8 38 80 05 A1 */ li r4, 0x5a1 /* 800DAC48 000D7BA8 38 80 05 A1 */ li r4, 0x5a1

5
asm/MetroidPrime/CSaveGameScreen.s
View File

@ -107,7 +107,7 @@ DoSelectionChange__15CSaveGameScreenFP14CGuiTableGroup:
/* 8024F1D4 0024C134 4B FF FF A1 */ bl SetUIColors__15CSaveGameScreenFv /* 8024F1D4 0024C134 4B FF FF A1 */ bl SetUIColors__15CSaveGameScreenFv
/* 8024F1D8 0024C138 80 1F 00 88 */ lwz r0, 0x88(r31) /* 8024F1D8 0024C138 80 1F 00 88 */ lwz r0, 0x88(r31)
/* 8024F1DC 0024C13C 38 61 00 08 */ addi r3, r1, 8 /* 8024F1DC 0024C13C 38 61 00 08 */ addi r3, r1, 8
/* 8024F1E0 0024C140 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8024F1E0 0024C140 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8024F1E4 0024C144 38 A0 00 7F */ li r5, 0x7f /* 8024F1E4 0024C144 38 A0 00 7F */ li r5, 0x7f
/* 8024F1E8 0024C148 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024F1E8 0024C148 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8024F1EC 0024C14C 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 8024F1EC 0024C14C 54 04 04 3E */ clrlwi r4, r0, 0x10
@ -403,7 +403,7 @@ lbl_8024F5A0:
lbl_8024F5B4: lbl_8024F5B4:
/* 8024F5B4 0024C514 2C 06 00 00 */ cmpwi r6, 0 /* 8024F5B4 0024C514 2C 06 00 00 */ cmpwi r6, 0
/* 8024F5B8 0024C518 41 80 00 28 */ blt lbl_8024F5E0 /* 8024F5B8 0024C518 41 80 00 28 */ blt lbl_8024F5E0
/* 8024F5BC 0024C51C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8024F5BC 0024C51C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8024F5C0 0024C520 38 61 00 08 */ addi r3, r1, 8 /* 8024F5C0 0024C520 38 61 00 08 */ addi r3, r1, 8
/* 8024F5C4 0024C524 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8024F5C4 0024C524 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8024F5C8 0024C528 54 C4 04 3E */ clrlwi r4, r6, 0x10 /* 8024F5C8 0024C528 54 C4 04 3E */ clrlwi r4, r6, 0x10
@ -2007,4 +2007,3 @@ lbl_803D4ACE:
.byte 0x3F .byte 0x3F
.asciz "?(??)" .asciz "?(??)"
.balign 4 .balign 4

13
asm/MetroidPrime/CSlideShow.s
View File

@ -1299,7 +1299,7 @@ sub_80298ad0:
/* 80298AEC 00295A4C 80 1F 00 E4 */ lwz r0, 0xe4(r31) /* 80298AEC 00295A4C 80 1F 00 E4 */ lwz r0, 0xe4(r31)
/* 80298AF0 00295A50 28 00 00 00 */ cmplwi r0, 0 /* 80298AF0 00295A50 28 00 00 00 */ cmplwi r0, 0
/* 80298AF4 00295A54 40 82 00 4C */ bne lbl_80298B40 /* 80298AF4 00295A54 40 82 00 4C */ bne lbl_80298B40
/* 80298AF8 00295A58 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80298AF8 00295A58 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80298AFC 00295A5C 38 61 00 0C */ addi r3, r1, 0xc /* 80298AFC 00295A5C 38 61 00 0C */ addi r3, r1, 0xc
/* 80298B00 00295A60 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80298B00 00295A60 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80298B04 00295A64 38 80 05 AF */ li r4, 0x5af /* 80298B04 00295A64 38 80 05 AF */ li r4, 0x5af
@ -1337,7 +1337,7 @@ sub_80298b54:
/* 80298B70 00295AD0 80 1F 00 E0 */ lwz r0, 0xe0(r31) /* 80298B70 00295AD0 80 1F 00 E0 */ lwz r0, 0xe0(r31)
/* 80298B74 00295AD4 28 00 00 00 */ cmplwi r0, 0 /* 80298B74 00295AD4 28 00 00 00 */ cmplwi r0, 0
/* 80298B78 00295AD8 40 82 00 4C */ bne lbl_80298BC4 /* 80298B78 00295AD8 40 82 00 4C */ bne lbl_80298BC4
/* 80298B7C 00295ADC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80298B7C 00295ADC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80298B80 00295AE0 38 61 00 0C */ addi r3, r1, 0xc /* 80298B80 00295AE0 38 61 00 0C */ addi r3, r1, 0xc
/* 80298B84 00295AE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80298B84 00295AE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80298B88 00295AE8 38 80 05 AE */ li r4, 0x5ae /* 80298B88 00295AE8 38 80 05 AE */ li r4, 0x5ae
@ -2128,7 +2128,7 @@ sub_802996f8:
/* 80299714 00296674 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80299714 00296674 80 03 00 2C */ lwz r0, 0x2c(r3)
/* 80299718 00296678 2C 00 00 00 */ cmpwi r0, 0 /* 80299718 00296678 2C 00 00 00 */ cmpwi r0, 0
/* 8029971C 0029667C 41 82 01 2C */ beq lbl_80299848 /* 8029971C 0029667C 41 82 01 2C */ beq lbl_80299848
/* 80299720 00296680 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80299720 00296680 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80299724 00296684 38 61 00 08 */ addi r3, r1, 8 /* 80299724 00296684 38 61 00 08 */ addi r3, r1, 8
/* 80299728 00296688 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80299728 00296688 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8029972C 0029668C 38 80 04 45 */ li r4, 0x445 /* 8029972C 0029668C 38 80 04 45 */ li r4, 0x445
@ -2247,7 +2247,7 @@ lbl_802998A8:
/* 802998C0 00296820 7F A3 EB 78 */ mr r3, r29 /* 802998C0 00296820 7F A3 EB 78 */ mr r3, r29
/* 802998C4 00296824 38 80 00 00 */ li r4, 0 /* 802998C4 00296824 38 80 00 00 */ li r4, 0
/* 802998C8 00296828 4B FF F2 09 */ bl sub_80298ad0 /* 802998C8 00296828 4B FF F2 09 */ bl sub_80298ad0
/* 802998CC 0029682C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802998CC 0029682C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802998D0 00296830 38 61 00 10 */ addi r3, r1, 0x10 /* 802998D0 00296830 38 61 00 10 */ addi r3, r1, 0x10
/* 802998D4 00296834 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802998D4 00296834 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 802998D8 00296838 38 80 04 46 */ li r4, 0x446 /* 802998D8 00296838 38 80 04 46 */ li r4, 0x446
@ -2280,7 +2280,7 @@ lbl_80299914:
/* 80299940 002968A0 88 1D 01 35 */ lbz r0, 0x135(r29) /* 80299940 002968A0 88 1D 01 35 */ lbz r0, 0x135(r29)
/* 80299944 002968A4 38 60 00 01 */ li r3, 1 /* 80299944 002968A4 38 60 00 01 */ li r3, 1
/* 80299948 002968A8 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 80299948 002968A8 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18
/* 8029994C 002968AC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8029994C 002968AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80299950 002968B0 98 1D 01 35 */ stb r0, 0x135(r29) /* 80299950 002968B0 98 1D 01 35 */ stb r0, 0x135(r29)
/* 80299954 002968B4 38 61 00 0C */ addi r3, r1, 0xc /* 80299954 002968B4 38 61 00 0C */ addi r3, r1, 0xc
/* 80299958 002968B8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80299958 002968B8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -2292,7 +2292,7 @@ lbl_80299914:
/* 80299970 002968D0 48 05 04 05 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80299970 002968D0 48 05 04 05 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 80299974 002968D4 48 00 00 28 */ b lbl_8029999C /* 80299974 002968D4 48 00 00 28 */ b lbl_8029999C
lbl_80299978: lbl_80299978:
/* 80299978 002968D8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80299978 002968D8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8029997C 002968DC 38 61 00 08 */ addi r3, r1, 8 /* 8029997C 002968DC 38 61 00 08 */ addi r3, r1, 8
/* 80299980 002968E0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80299980 002968E0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80299984 002968E4 38 80 05 B0 */ li r4, 0x5b0 /* 80299984 002968E4 38 80 05 B0 */ li r4, 0x5b0
@ -5691,4 +5691,3 @@ lbl_803D5CBD:
.byte 0x53 .byte 0x53
.asciz "lideShow" .asciz "lideShow"
.balign 4 .balign 4

2
asm/MetroidPrime/CStateManager.s
View File

@ -896,7 +896,7 @@ lbl_80044370:
/* 80044404 00041364 48 2A 45 AD */ bl TranslateSFXID__11CSfxManagerFUs /* 80044404 00041364 48 2A 45 AD */ bl TranslateSFXID__11CSfxManagerFUs
/* 80044408 00041368 B0 61 00 E8 */ sth r3, 0xe8(r1) /* 80044408 00041368 B0 61 00 E8 */ sth r3, 0xe8(r1)
/* 8004440C 0004136C 38 61 00 2C */ addi r3, r1, 0x2c /* 8004440C 0004136C 38 61 00 2C */ addi r3, r1, 0x2c
/* 80044410 00041370 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80044410 00041370 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80044414 00041374 38 81 00 C4 */ addi r4, r1, 0xc4 /* 80044414 00041374 38 81 00 C4 */ addi r4, r1, 0xc4
/* 80044418 00041378 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) /* 80044418 00041378 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2)
/* 8004441C 0004137C 38 A0 00 01 */ li r5, 1 /* 8004441C 0004137C 38 A0 00 01 */ li r5, 1

5
asm/MetroidPrime/CTargetReticles.s
View File

@ -4643,7 +4643,7 @@ UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager:
/* 800C0268 000BD1C8 80 03 00 04 */ lwz r0, 4(r3) /* 800C0268 000BD1C8 80 03 00 04 */ lwz r0, 4(r3)
/* 800C026C 000BD1CC 28 00 00 00 */ cmplwi r0, 0 /* 800C026C 000BD1CC 28 00 00 00 */ cmplwi r0, 0
/* 800C0270 000BD1D0 41 82 00 2C */ beq lbl_800C029C /* 800C0270 000BD1D0 41 82 00 2C */ beq lbl_800C029C
/* 800C0274 000BD1D4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800C0274 000BD1D4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800C0278 000BD1D8 38 61 00 3C */ addi r3, r1, 0x3c /* 800C0278 000BD1D8 38 61 00 3C */ addi r3, r1, 0x3c
/* 800C027C 000BD1DC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800C027C 000BD1DC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800C0280 000BD1E0 38 80 05 71 */ li r4, 0x571 /* 800C0280 000BD1E0 38 80 05 71 */ li r4, 0x571
@ -4654,7 +4654,7 @@ UpdateCurrLockOnGroup__22CCompoundTargetReticleFfRC13CStateManager:
/* 800C0294 000BD1F4 48 22 9A E1 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 800C0294 000BD1F4 48 22 9A E1 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 800C0298 000BD1F8 48 00 00 28 */ b lbl_800C02C0 /* 800C0298 000BD1F8 48 00 00 28 */ b lbl_800C02C0
lbl_800C029C: lbl_800C029C:
/* 800C029C 000BD1FC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800C029C 000BD1FC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800C02A0 000BD200 38 61 00 38 */ addi r3, r1, 0x38 /* 800C02A0 000BD200 38 61 00 38 */ addi r3, r1, 0x38
/* 800C02A4 000BD204 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800C02A4 000BD204 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800C02A8 000BD208 38 80 05 61 */ li r4, 0x561 /* 800C02A8 000BD208 38 80 05 61 */ li r4, 0x561
@ -6575,4 +6575,3 @@ lbl_803CE008:
.byte 0x3F, 0x3F, 0x28 .byte 0x3F, 0x3F, 0x28
.4byte 0x3F3F2900 .4byte 0x3F3F2900
.4byte 0 .4byte 0

5
asm/MetroidPrime/CWorldTransManager.s
View File

@ -588,7 +588,7 @@ lbl_80209510:
/* 80209550 002064B0 40 82 00 2C */ bne lbl_8020957C /* 80209550 002064B0 40 82 00 2C */ bne lbl_8020957C
/* 80209554 002064B4 D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 80209554 002064B4 D0 1F 00 3C */ stfs f0, 0x3c(r31)
/* 80209558 002064B8 38 61 00 0C */ addi r3, r1, 0xc /* 80209558 002064B8 38 61 00 0C */ addi r3, r1, 0xc
/* 8020955C 002064BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8020955C 002064BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80209560 002064C0 38 80 05 9E */ li r4, 0x59e /* 80209560 002064C0 38 80 05 9E */ li r4, 0x59e
/* 80209564 002064C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80209564 002064C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80209568 002064C8 38 A0 00 7F */ li r5, 0x7f /* 80209568 002064C8 38 A0 00 7F */ li r5, 0x7f
@ -922,7 +922,7 @@ sub_802099c0:
/* 802099F4 00206954 38 61 00 08 */ addi r3, r1, 8 /* 802099F4 00206954 38 61 00 08 */ addi r3, r1, 8
/* 802099F8 00206958 88 DF 00 2D */ lbz r6, 0x2d(r31) /* 802099F8 00206958 88 DF 00 2D */ lbz r6, 0x2d(r31)
/* 802099FC 0020695C 38 E0 00 00 */ li r7, 0 /* 802099FC 0020695C 38 E0 00 00 */ li r7, 0
/* 80209A00 00206960 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80209A00 00206960 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80209A04 00206964 39 20 00 01 */ li r9, 1 /* 80209A04 00206964 39 20 00 01 */ li r9, 1
/* 80209A08 00206968 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80209A08 00206968 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80209A0C 0020696C 48 0E 03 69 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80209A0C 0020696C 48 0E 03 69 */ bl SfxStart__11CSfxManagerFUsssbsbi
@ -3276,4 +3276,3 @@ lbl_803D2768:
.asciz "??(??)" .asciz "??(??)"
.byte 0x47 .byte 0x47
.asciz "UN_LCTR" .asciz "UN_LCTR"

4
asm/MetroidPrime/Cameras/CCameraManager.s
View File

@ -1991,7 +1991,7 @@ lbl_8000AAD4:
/* 8000AB34 00007A94 38 A1 00 24 */ addi r5, r1, 0x24 /* 8000AB34 00007A94 38 A1 00 24 */ addi r5, r1, 0x24
/* 8000AB38 00007A98 D0 21 00 28 */ stfs f1, 0x28(r1) /* 8000AB38 00007A98 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 8000AB3C 00007A9C 38 80 04 6D */ li r4, 0x46d /* 8000AB3C 00007A9C 38 80 04 6D */ li r4, 0x46d
/* 8000AB40 00007AA0 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8000AB40 00007AA0 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 8000AB44 00007AA4 39 00 00 00 */ li r8, 0 /* 8000AB44 00007AA4 39 00 00 00 */ li r8, 0
/* 8000AB48 00007AA8 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8000AB48 00007AA8 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 8000AB4C 00007AAC 39 20 00 00 */ li r9, 0 /* 8000AB4C 00007AAC 39 20 00 00 */ li r9, 0
@ -2001,7 +2001,7 @@ lbl_8000AAD4:
/* 8000AB5C 00007ABC 90 01 00 20 */ stw r0, 0x20(r1) /* 8000AB5C 00007ABC 90 01 00 20 */ stw r0, 0x20(r1)
/* 8000AB60 00007AC0 48 00 00 30 */ b lbl_8000AB90 /* 8000AB60 00007AC0 48 00 00 30 */ b lbl_8000AB90
lbl_8000AB64: lbl_8000AB64:
/* 8000AB64 00007AC4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8000AB64 00007AC4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8000AB68 00007AC8 38 61 00 14 */ addi r3, r1, 0x14 /* 8000AB68 00007AC8 38 61 00 14 */ addi r3, r1, 0x14
/* 8000AB6C 00007ACC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8000AB6C 00007ACC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8000AB70 00007AD0 54 85 06 3E */ clrlwi r5, r4, 0x18 /* 8000AB70 00007AD0 54 85 06 3E */ clrlwi r5, r4, 0x18

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

@ -413,7 +413,7 @@ sub_80250d1c:
/* 80250D3C 0024DC9C 80 83 00 04 */ lwz r4, 4(r3) /* 80250D3C 0024DC9C 80 83 00 04 */ lwz r4, 4(r3)
/* 80250D40 0024DCA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80250D40 0024DCA0 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 80250D44 0024DCA4 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l /* 80250D44 0024DCA4 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l
/* 80250D48 0024DCA8 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 80250D48 0024DCA8 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 80250D4C 0024DCAC 90 81 00 08 */ stw r4, 8(r1) /* 80250D4C 0024DCAC 90 81 00 08 */ stw r4, 8(r1)
/* 80250D50 0024DCB0 7C A4 2B 78 */ mr r4, r5 /* 80250D50 0024DCB0 7C A4 2B 78 */ mr r4, r5
/* 80250D54 0024DCB4 7C C5 33 78 */ mr r5, r6 /* 80250D54 0024DCB4 7C C5 33 78 */ mr r5, r6

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

@ -694,7 +694,7 @@ lbl_8021D938:
/* 8021D950 0021A8B0 41 82 00 2C */ beq lbl_8021D97C /* 8021D950 0021A8B0 41 82 00 2C */ beq lbl_8021D97C
/* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 8021D954 0021A8B4 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 8021D958 0021A8B8 7F A4 EB 78 */ mr r4, r29 /* 8021D958 0021A8B8 7F A4 EB 78 */ mr r4, r29
/* 8021D95C 0021A8BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8021D95C 0021A8BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8021D960 0021A8C0 38 61 00 2C */ addi r3, r1, 0x2c /* 8021D960 0021A8C0 38 61 00 2C */ addi r3, r1, 0x2c
/* 8021D964 0021A8C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8021D964 0021A8C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8021D968 0021A8C8 38 C0 00 40 */ li r6, 0x40 /* 8021D968 0021A8C8 38 C0 00 40 */ li r6, 0x40
@ -711,7 +711,7 @@ lbl_8021D97C:
/* 8021D990 0021A8F0 7F A4 EB 78 */ mr r4, r29 /* 8021D990 0021A8F0 7F A4 EB 78 */ mr r4, r29
/* 8021D994 0021A8F4 C0 19 00 40 */ lfs f0, 0x40(r25) /* 8021D994 0021A8F4 C0 19 00 40 */ lfs f0, 0x40(r25)
/* 8021D998 0021A8F8 38 61 00 28 */ addi r3, r1, 0x28 /* 8021D998 0021A8F8 38 61 00 28 */ addi r3, r1, 0x28
/* 8021D99C 0021A8FC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8021D99C 0021A8FC A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8021D9A0 0021A900 38 A1 00 3C */ addi r5, r1, 0x3c /* 8021D9A0 0021A900 38 A1 00 3C */ addi r5, r1, 0x3c
/* 8021D9A4 0021A904 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 8021D9A4 0021A904 D0 01 00 3C */ stfs f0, 0x3c(r1)
/* 8021D9A8 0021A908 38 E0 00 00 */ li r7, 0 /* 8021D9A8 0021A908 38 E0 00 00 */ li r7, 0

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

@ -203,7 +203,7 @@ sub_8022e424:
/* 8022E44C 0022B3AC 38 00 00 01 */ li r0, 1 /* 8022E44C 0022B3AC 38 00 00 01 */ li r0, 1
/* 8022E450 0022B3B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha /* 8022E450 0022B3B0 3C 60 80 5A */ lis r3, sUpVector__9CVector3f@ha
/* 8022E454 0022B3B4 50 04 3E 30 */ rlwimi r4, r0, 7, 0x18, 0x18 /* 8022E454 0022B3B4 50 04 3E 30 */ rlwimi r4, r0, 7, 0x18, 0x18
/* 8022E458 0022B3B8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8022E458 0022B3B8 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8022E45C 0022B3BC 98 9E 02 B4 */ stb r4, 0x2b4(r30) /* 8022E45C 0022B3BC 98 9E 02 B4 */ stb r4, 0x2b4(r30)
/* 8022E460 0022B3C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l /* 8022E460 0022B3C0 38 C3 66 F4 */ addi r6, r3, sUpVector__9CVector3f@l
/* 8022E464 0022B3C4 38 61 00 3C */ addi r3, r1, 0x3c /* 8022E464 0022B3C4 38 61 00 3C */ addi r3, r1, 0x3c
@ -799,7 +799,7 @@ lbl_8022EC8C:
/* 8022ED18 0022BC78 38 61 00 14 */ addi r3, r1, 0x14 /* 8022ED18 0022BC78 38 61 00 14 */ addi r3, r1, 0x14
/* 8022ED1C 0022BC7C C0 1C 00 40 */ lfs f0, 0x40(r28) /* 8022ED1C 0022BC7C C0 1C 00 40 */ lfs f0, 0x40(r28)
/* 8022ED20 0022BC80 38 A1 00 24 */ addi r5, r1, 0x24 /* 8022ED20 0022BC80 38 A1 00 24 */ addi r5, r1, 0x24
/* 8022ED24 0022BC84 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8022ED24 0022BC84 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8022ED28 0022BC88 38 E0 00 00 */ li r7, 0 /* 8022ED28 0022BC88 38 E0 00 00 */ li r7, 0
/* 8022ED2C 0022BC8C D0 01 00 24 */ stfs f0, 0x24(r1) /* 8022ED2C 0022BC8C D0 01 00 24 */ stfs f0, 0x24(r1)
/* 8022ED30 0022BC90 39 00 00 00 */ li r8, 0 /* 8022ED30 0022BC90 39 00 00 00 */ li r8, 0

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

@ -688,7 +688,7 @@ lbl_8013F80C:
/* 8013F818 0013C778 C0 02 9B 68 */ lfs f0, lbl_805AB888@sda21(r2) /* 8013F818 0013C778 C0 02 9B 68 */ lfs f0, lbl_805AB888@sda21(r2)
/* 8013F81C 0013C77C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8013F81C 0013C77C 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8013F820 0013C780 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8013F820 0013C780 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8013F824 0013C784 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8013F824 0013C784 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8013F828 0013C788 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F828 0013C788 D0 1C 03 E8 */ stfs f0, 0x3e8(r28)
/* 8013F82C 0013C78C 38 61 00 14 */ addi r3, r1, 0x14 /* 8013F82C 0013C78C 38 61 00 14 */ addi r3, r1, 0x14
/* 8013F830 0013C790 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8013F830 0013C790 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -725,7 +725,7 @@ lbl_8013F898:
/* 8013F8A4 0013C804 C0 02 9B 6C */ lfs f0, lbl_805AB88C@sda21(r2) /* 8013F8A4 0013C804 C0 02 9B 6C */ lfs f0, lbl_805AB88C@sda21(r2)
/* 8013F8A8 0013C808 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8013F8A8 0013C808 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8013F8AC 0013C80C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8013F8AC 0013C80C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8013F8B0 0013C810 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8013F8B0 0013C810 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8013F8B4 0013C814 D0 1C 03 E8 */ stfs f0, 0x3e8(r28) /* 8013F8B4 0013C814 D0 1C 03 E8 */ stfs f0, 0x3e8(r28)
/* 8013F8B8 0013C818 38 61 00 10 */ addi r3, r1, 0x10 /* 8013F8B8 0013C818 38 61 00 10 */ addi r3, r1, 0x10
/* 8013F8BC 0013C81C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8013F8BC 0013C81C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)

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

@ -6198,7 +6198,7 @@ lbl_80164000:
/* 80164108 00161068 38 61 00 38 */ addi r3, r1, 0x38 /* 80164108 00161068 38 61 00 38 */ addi r3, r1, 0x38
/* 8016410C 0016106C D0 3E 06 28 */ stfs f1, 0x628(r30) /* 8016410C 0016106C D0 3E 06 28 */ stfs f1, 0x628(r30)
/* 80164110 00161070 38 C1 00 5C */ addi r6, r1, 0x5c /* 80164110 00161070 38 C1 00 5C */ addi r6, r1, 0x5c
/* 80164114 00161074 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80164114 00161074 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80164118 00161078 38 E0 00 01 */ li r7, 1 /* 80164118 00161078 38 E0 00 01 */ li r7, 1
/* 8016411C 0016107C 81 5E 00 04 */ lwz r10, 4(r30) /* 8016411C 0016107C 81 5E 00 04 */ lwz r10, 4(r30)
/* 80164120 00161080 39 00 00 00 */ li r8, 0 /* 80164120 00161080 39 00 00 00 */ li r8, 0
@ -7244,7 +7244,7 @@ lbl_80164FC0:
/* 80165010 00161F70 38 61 00 34 */ addi r3, r1, 0x34 /* 80165010 00161F70 38 61 00 34 */ addi r3, r1, 0x34
/* 80165014 00161F74 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80165014 00161F74 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 80165018 00161F78 38 A1 00 D0 */ addi r5, r1, 0xd0 /* 80165018 00161F78 38 A1 00 D0 */ addi r5, r1, 0xd0
/* 8016501C 00161F7C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8016501C 00161F7C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80165020 00161F80 38 80 00 DD */ li r4, 0xdd /* 80165020 00161F80 38 80 00 DD */ li r4, 0xdd
/* 80165024 00161F84 D0 01 00 D0 */ stfs f0, 0xd0(r1) /* 80165024 00161F84 D0 01 00 D0 */ stfs f0, 0xd0(r1)
/* 80165028 00161F88 38 E0 00 01 */ li r7, 1 /* 80165028 00161F88 38 E0 00 01 */ li r7, 1

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

@ -1466,7 +1466,7 @@ lbl_80228338:
/* 80228360 002252C0 38 61 00 28 */ addi r3, r1, 0x28 /* 80228360 002252C0 38 61 00 28 */ addi r3, r1, 0x28
/* 80228364 002252C4 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80228364 002252C4 C0 1D 00 40 */ lfs f0, 0x40(r29)
/* 80228368 002252C8 38 A1 00 38 */ addi r5, r1, 0x38 /* 80228368 002252C8 38 A1 00 38 */ addi r5, r1, 0x38
/* 8022836C 002252CC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8022836C 002252CC A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80228370 002252D0 38 E0 00 00 */ li r7, 0 /* 80228370 002252D0 38 E0 00 00 */ li r7, 0
/* 80228374 002252D4 D0 01 00 38 */ stfs f0, 0x38(r1) /* 80228374 002252D4 D0 01 00 38 */ stfs f0, 0x38(r1)
/* 80228378 002252D8 39 00 00 00 */ li r8, 0 /* 80228378 002252D8 39 00 00 00 */ li r8, 0

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

@ -428,7 +428,7 @@ FireBeam__8CEyeballFR13CStateManagerRC12CTransform4f:
/* 80224934 00221894 38 E0 00 01 */ li r7, 1 /* 80224934 00221894 38 E0 00 01 */ li r7, 1
/* 80224938 00221898 C0 06 00 08 */ lfs f0, 8(r6) /* 80224938 00221898 C0 06 00 08 */ lfs f0, 8(r6)
/* 8022493C 0022189C D0 A1 00 18 */ stfs f5, 0x18(r1) /* 8022493C 0022189C D0 A1 00 18 */ stfs f5, 0x18(r1)
/* 80224940 002218A0 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80224940 002218A0 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80224944 002218A4 D0 A1 00 1C */ stfs f5, 0x1c(r1) /* 80224944 002218A4 D0 A1 00 1C */ stfs f5, 0x1c(r1)
/* 80224948 002218A8 D0 A1 00 20 */ stfs f5, 0x20(r1) /* 80224948 002218A8 D0 A1 00 20 */ stfs f5, 0x20(r1)
/* 8022494C 002218AC D0 A1 00 24 */ stfs f5, 0x24(r1) /* 8022494C 002218AC D0 A1 00 24 */ stfs f5, 0x24(r1)

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

@ -5987,7 +5987,7 @@ lbl_801F8FF8:
/* 801F9004 001F5F64 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801F9004 001F5F64 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801F9008 001F5F68 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 801F9008 001F5F68 C0 1D 00 40 */ lfs f0, 0x40(r29)
/* 801F900C 001F5F6C 38 61 00 14 */ addi r3, r1, 0x14 /* 801F900C 001F5F6C 38 61 00 14 */ addi r3, r1, 0x14
/* 801F9010 001F5F70 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801F9010 001F5F70 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801F9014 001F5F74 38 A1 00 70 */ addi r5, r1, 0x70 /* 801F9014 001F5F74 38 A1 00 70 */ addi r5, r1, 0x70
/* 801F9018 001F5F78 D0 01 00 70 */ stfs f0, 0x70(r1) /* 801F9018 001F5F78 D0 01 00 70 */ stfs f0, 0x70(r1)
/* 801F901C 001F5F7C 38 E0 00 01 */ li r7, 1 /* 801F901C 001F5F7C 38 E0 00 01 */ li r7, 1
@ -9693,7 +9693,7 @@ lbl_801FC538:
/* 801FC554 001F94B4 38 61 00 20 */ addi r3, r1, 0x20 /* 801FC554 001F94B4 38 61 00 20 */ addi r3, r1, 0x20
/* 801FC558 001F94B8 88 9A 03 28 */ lbz r4, 0x328(r26) /* 801FC558 001F94B8 88 9A 03 28 */ lbz r4, 0x328(r26)
/* 801FC55C 001F94BC 50 A4 36 72 */ rlwimi r4, r5, 6, 0x19, 0x19 /* 801FC55C 001F94BC 50 A4 36 72 */ rlwimi r4, r5, 6, 0x19, 0x19
/* 801FC560 001F94C0 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 801FC560 001F94C0 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 801FC564 001F94C4 38 A1 00 38 */ addi r5, r1, 0x38 /* 801FC564 001F94C4 38 A1 00 38 */ addi r5, r1, 0x38
/* 801FC568 001F94C8 98 9A 03 28 */ stb r4, 0x328(r26) /* 801FC568 001F94C8 98 9A 03 28 */ stb r4, 0x328(r26)
/* 801FC56C 001F94CC 38 E0 00 7F */ li r7, 0x7f /* 801FC56C 001F94CC 38 E0 00 7F */ li r7, 0x7f
@ -9725,7 +9725,7 @@ lbl_801FC5B0:
/* 801FC5CC 001F952C 38 A1 00 2C */ addi r5, r1, 0x2c /* 801FC5CC 001F952C 38 A1 00 2C */ addi r5, r1, 0x2c
/* 801FC5D0 001F9530 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801FC5D0 001F9530 D0 01 00 2C */ stfs f0, 0x2c(r1)
/* 801FC5D4 001F9534 38 E0 00 7F */ li r7, 0x7f /* 801FC5D4 001F9534 38 E0 00 7F */ li r7, 0x7f
/* 801FC5D8 001F9538 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 801FC5D8 001F9538 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 801FC5DC 001F953C 39 00 00 01 */ li r8, 1 /* 801FC5DC 001F953C 39 00 00 01 */ li r8, 1
/* 801FC5E0 001F9540 D0 21 00 30 */ stfs f1, 0x30(r1) /* 801FC5E0 001F9540 D0 21 00 30 */ stfs f1, 0x30(r1)
/* 801FC5E4 001F9544 39 20 00 00 */ li r9, 0 /* 801FC5E4 001F9544 39 20 00 00 */ li r9, 0
@ -13492,7 +13492,7 @@ lbl_801FFD3C:
/* 801FFD88 001FCCE8 38 61 00 14 */ addi r3, r1, 0x14 /* 801FFD88 001FCCE8 38 61 00 14 */ addi r3, r1, 0x14
/* 801FFD8C 001FCCEC 90 01 00 08 */ stw r0, 8(r1) /* 801FFD8C 001FCCEC 90 01 00 08 */ stw r0, 8(r1)
/* 801FFD90 001FCCF0 38 A1 00 40 */ addi r5, r1, 0x40 /* 801FFD90 001FCCF0 38 A1 00 40 */ addi r5, r1, 0x40
/* 801FFD94 001FCCF4 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 801FFD94 001FCCF4 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 801FFD98 001FCCF8 39 00 00 01 */ li r8, 1 /* 801FFD98 001FCCF8 39 00 00 01 */ li r8, 1
/* 801FFD9C 001FCCFC A0 9E 00 88 */ lhz r4, 0x88(r30) /* 801FFD9C 001FCCFC A0 9E 00 88 */ lhz r4, 0x88(r30)
/* 801FFDA0 001FCD00 39 20 00 00 */ li r9, 0 /* 801FFDA0 001FCD00 39 20 00 00 */ li r9, 0
@ -13565,7 +13565,7 @@ sub_801ffe50:
/* 801FFE98 001FCDF8 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801FFE98 001FCDF8 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801FFE9C 001FCDFC C0 04 00 40 */ lfs f0, 0x40(r4) /* 801FFE9C 001FCDFC C0 04 00 40 */ lfs f0, 0x40(r4)
/* 801FFEA0 001FCE00 38 61 00 08 */ addi r3, r1, 8 /* 801FFEA0 001FCE00 38 61 00 08 */ addi r3, r1, 8
/* 801FFEA4 001FCE04 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801FFEA4 001FCE04 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801FFEA8 001FCE08 38 A1 00 0C */ addi r5, r1, 0xc /* 801FFEA8 001FCE08 38 A1 00 0C */ addi r5, r1, 0xc
/* 801FFEAC 001FCE0C D0 01 00 0C */ stfs f0, 0xc(r1) /* 801FFEAC 001FCE0C D0 01 00 0C */ stfs f0, 0xc(r1)
/* 801FFEB0 001FCE10 38 E0 00 01 */ li r7, 1 /* 801FFEB0 001FCE10 38 E0 00 01 */ li r7, 1

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

@ -338,7 +338,7 @@ lbl_8022F8D0:
/* 8022F8E8 0022C848 38 61 00 28 */ addi r3, r1, 0x28 /* 8022F8E8 0022C848 38 61 00 28 */ addi r3, r1, 0x28
/* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2) /* 8022F8EC 0022C84C 88 A2 CC 40 */ lbz r5, kMaxVolume__9CAudioSys@sda21(r2)
/* 8022F8F0 0022C850 38 C0 00 40 */ li r6, 0x40 /* 8022F8F0 0022C850 38 C0 00 40 */ li r6, 0x40
/* 8022F8F4 0022C854 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8022F8F4 0022C854 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8022F8F8 0022C858 38 E0 00 00 */ li r7, 0 /* 8022F8F8 0022C858 38 E0 00 00 */ li r7, 0
/* 8022F8FC 0022C85C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8022F8FC 0022C85C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8022F900 0022C860 39 20 00 00 */ li r9, 0 /* 8022F900 0022C860 39 20 00 00 */ li r9, 0

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

@ -1557,7 +1557,7 @@ lbl_8019F344:
/* 8019F3E0 0019C340 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8019F3E0 0019C340 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8019F3E4 0019C344 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8019F3E4 0019C344 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 8019F3E8 0019C348 38 61 00 14 */ addi r3, r1, 0x14 /* 8019F3E8 0019C348 38 61 00 14 */ addi r3, r1, 0x14
/* 8019F3EC 0019C34C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8019F3EC 0019C34C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8019F3F0 0019C350 38 A1 00 20 */ addi r5, r1, 0x20 /* 8019F3F0 0019C350 38 A1 00 20 */ addi r5, r1, 0x20
/* 8019F3F4 0019C354 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8019F3F4 0019C354 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 8019F3F8 0019C358 38 E0 00 00 */ li r7, 0 /* 8019F3F8 0019C358 38 E0 00 00 */ li r7, 0

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

@ -573,7 +573,7 @@ lbl_8014E5A4:
/* 8014E628 0014B588 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8014E628 0014B588 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8014E62C 0014B58C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8014E62C 0014B58C C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 8014E630 0014B590 38 61 00 08 */ addi r3, r1, 8 /* 8014E630 0014B590 38 61 00 08 */ addi r3, r1, 8
/* 8014E634 0014B594 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8014E634 0014B594 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8014E638 0014B598 38 A1 00 0C */ addi r5, r1, 0xc /* 8014E638 0014B598 38 A1 00 0C */ addi r5, r1, 0xc
/* 8014E63C 0014B59C D0 01 00 0C */ stfs f0, 0xc(r1) /* 8014E63C 0014B59C D0 01 00 0C */ stfs f0, 0xc(r1)
/* 8014E640 0014B5A0 38 E0 00 01 */ li r7, 1 /* 8014E640 0014B5A0 38 E0 00 01 */ li r7, 1

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

@ -581,7 +581,7 @@ sub_8027cce0:
/* 8027CDAC 00279D0C 38 81 00 10 */ addi r4, r1, 0x10 /* 8027CDAC 00279D0C 38 81 00 10 */ addi r4, r1, 0x10
/* 8027CDB0 00279D10 D0 61 00 10 */ stfs f3, 0x10(r1) /* 8027CDB0 00279D10 D0 61 00 10 */ stfs f3, 0x10(r1)
/* 8027CDB4 00279D14 38 E0 00 00 */ li r7, 0 /* 8027CDB4 00279D14 38 E0 00 00 */ li r7, 0
/* 8027CDB8 00279D18 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 8027CDB8 00279D18 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 8027CDBC 00279D1C D0 81 00 14 */ stfs f4, 0x14(r1) /* 8027CDBC 00279D1C D0 81 00 14 */ stfs f4, 0x14(r1)
/* 8027CDC0 00279D20 D0 A1 00 18 */ stfs f5, 0x18(r1) /* 8027CDC0 00279D20 D0 A1 00 18 */ stfs f5, 0x18(r1)
/* 8027CDC4 00279D24 D0 41 00 1C */ stfs f2, 0x1c(r1) /* 8027CDC4 00279D24 D0 41 00 1C */ stfs f2, 0x1c(r1)
@ -1006,7 +1006,7 @@ lbl_8027D3AC:
/* 8027D3B8 0027A318 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8027D3B8 0027A318 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8027D3BC 0027A31C C0 1E 00 40 */ lfs f0, 0x40(r30) /* 8027D3BC 0027A31C C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 8027D3C0 0027A320 7F 84 E3 78 */ mr r4, r28 /* 8027D3C0 0027A320 7F 84 E3 78 */ mr r4, r28
/* 8027D3C4 0027A324 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8027D3C4 0027A324 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8027D3C8 0027A328 38 61 00 08 */ addi r3, r1, 8 /* 8027D3C8 0027A328 38 61 00 08 */ addi r3, r1, 8
/* 8027D3CC 0027A32C D0 01 00 14 */ stfs f0, 0x14(r1) /* 8027D3CC 0027A32C D0 01 00 14 */ stfs f0, 0x14(r1)
/* 8027D3D0 0027A330 38 A1 00 14 */ addi r5, r1, 0x14 /* 8027D3D0 0027A330 38 A1 00 14 */ addi r5, r1, 0x14

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

@ -6447,7 +6447,7 @@ lbl_80276264:
/* 80276280 002731E0 38 A1 00 24 */ addi r5, r1, 0x24 /* 80276280 002731E0 38 A1 00 24 */ addi r5, r1, 0x24
/* 80276284 002731E4 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80276284 002731E4 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80276288 002731E8 38 80 05 19 */ li r4, 0x519 /* 80276288 002731E8 38 80 05 19 */ li r4, 0x519
/* 8027628C 002731EC A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8027628C 002731EC A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 80276290 002731F0 38 E0 00 7F */ li r7, 0x7f /* 80276290 002731F0 38 E0 00 7F */ li r7, 0x7f
/* 80276294 002731F4 D0 21 00 28 */ stfs f1, 0x28(r1) /* 80276294 002731F4 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 80276298 002731F8 39 00 00 01 */ li r8, 1 /* 80276298 002731F8 39 00 00 01 */ li r8, 1
@ -6575,7 +6575,7 @@ lbl_80276444:
/* 80276460 002733C0 38 A1 00 1C */ addi r5, r1, 0x1c /* 80276460 002733C0 38 A1 00 1C */ addi r5, r1, 0x1c
/* 80276464 002733C4 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80276464 002733C4 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 80276468 002733C8 38 80 05 1A */ li r4, 0x51a /* 80276468 002733C8 38 80 05 1A */ li r4, 0x51a
/* 8027646C 002733CC A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8027646C 002733CC A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 80276470 002733D0 38 E0 00 7F */ li r7, 0x7f /* 80276470 002733D0 38 E0 00 7F */ li r7, 0x7f
/* 80276474 002733D4 D0 21 00 20 */ stfs f1, 0x20(r1) /* 80276474 002733D4 D0 21 00 20 */ stfs f1, 0x20(r1)
/* 80276478 002733D8 39 00 00 01 */ li r8, 1 /* 80276478 002733D8 39 00 00 01 */ li r8, 1
@ -8898,7 +8898,7 @@ sub_80278508:
/* 802785B4 00275514 38 A0 00 01 */ li r5, 1 /* 802785B4 00275514 38 A0 00 01 */ li r5, 1
/* 802785B8 00275518 D0 A1 00 38 */ stfs f5, 0x38(r1) /* 802785B8 00275518 D0 A1 00 38 */ stfs f5, 0x38(r1)
/* 802785BC 0027551C 38 E0 00 00 */ li r7, 0 /* 802785BC 0027551C 38 E0 00 00 */ li r7, 0
/* 802785C0 00275520 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 802785C0 00275520 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 802785C4 00275524 D0 A1 00 3C */ stfs f5, 0x3c(r1) /* 802785C4 00275524 D0 A1 00 3C */ stfs f5, 0x3c(r1)
/* 802785C8 00275528 D0 A1 00 40 */ stfs f5, 0x40(r1) /* 802785C8 00275528 D0 A1 00 40 */ stfs f5, 0x40(r1)
/* 802785CC 0027552C D0 A1 00 44 */ stfs f5, 0x44(r1) /* 802785CC 0027552C D0 A1 00 44 */ stfs f5, 0x44(r1)

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

@ -1423,7 +1423,7 @@ GetUp__9CParasiteFR13CStateManager9EStateMsgf:
/* 801579C8 00154928 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801579C8 00154928 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801579CC 0015492C C0 1F 00 40 */ lfs f0, 0x40(r31) /* 801579CC 0015492C C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 801579D0 00154930 38 61 00 08 */ addi r3, r1, 8 /* 801579D0 00154930 38 61 00 08 */ addi r3, r1, 8
/* 801579D4 00154934 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801579D4 00154934 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801579D8 00154938 38 A1 00 0C */ addi r5, r1, 0xc /* 801579D8 00154938 38 A1 00 0C */ addi r5, r1, 0xc
/* 801579DC 0015493C D0 01 00 0C */ stfs f0, 0xc(r1) /* 801579DC 0015493C D0 01 00 0C */ stfs f0, 0xc(r1)
/* 801579E0 00154940 38 E0 00 01 */ li r7, 1 /* 801579E0 00154940 38 E0 00 01 */ li r7, 1
@ -1461,7 +1461,7 @@ Crouch__9CParasiteFR13CStateManager9EStateMsgf:
/* 80157A50 001549B0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80157A50 001549B0 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80157A54 001549B4 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80157A54 001549B4 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 80157A58 001549B8 38 61 00 08 */ addi r3, r1, 8 /* 80157A58 001549B8 38 61 00 08 */ addi r3, r1, 8
/* 80157A5C 001549BC A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80157A5C 001549BC A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80157A60 001549C0 38 A1 00 0C */ addi r5, r1, 0xc /* 80157A60 001549C0 38 A1 00 0C */ addi r5, r1, 0xc
/* 80157A64 001549C4 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80157A64 001549C4 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80157A68 001549C8 38 E0 00 01 */ li r7, 1 /* 80157A68 001549C8 38 E0 00 01 */ li r7, 1
@ -1515,7 +1515,7 @@ lbl_80157AD0:
/* 80157B10 00154A70 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80157B10 00154A70 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80157B14 00154A74 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80157B14 00154A74 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 80157B18 00154A78 38 61 00 08 */ addi r3, r1, 8 /* 80157B18 00154A78 38 61 00 08 */ addi r3, r1, 8
/* 80157B1C 00154A7C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80157B1C 00154A7C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80157B20 00154A80 38 A1 00 20 */ addi r5, r1, 0x20 /* 80157B20 00154A80 38 A1 00 20 */ addi r5, r1, 0x20
/* 80157B24 00154A84 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80157B24 00154A84 D0 01 00 20 */ stfs f0, 0x20(r1)
/* 80157B28 00154A88 38 E0 00 01 */ li r7, 1 /* 80157B28 00154A88 38 E0 00 01 */ li r7, 1

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

@ -2372,7 +2372,7 @@ lbl_80078C94:
/* 80078CA4 00075C04 38 80 07 01 */ li r4, 0x701 /* 80078CA4 00075C04 38 80 07 01 */ li r4, 0x701
lbl_80078CA8: lbl_80078CA8:
/* 80078CA8 00075C08 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 80078CA8 00075C08 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha
/* 80078CAC 00075C0C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80078CAC 00075C0C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80078CB0 00075C10 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 80078CB0 00075C10 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l
/* 80078CB4 00075C14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80078CB4 00075C14 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80078CB8 00075C18 7F A5 EB 78 */ mr r5, r29 /* 80078CB8 00075C18 7F A5 EB 78 */ mr r5, r29
@ -4524,7 +4524,7 @@ lbl_8007AB68:
/* 8007AB7C 00077ADC 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 8007AB7C 00077ADC 54 04 04 3E */ clrlwi r4, r0, 0x10
/* 8007AB80 00077AE0 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 8007AB80 00077AE0 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 8007AB84 00077AE4 38 61 00 08 */ addi r3, r1, 8 /* 8007AB84 00077AE4 38 61 00 08 */ addi r3, r1, 8
/* 8007AB88 00077AE8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8007AB88 00077AE8 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8007AB8C 00077AEC 38 A1 00 24 */ addi r5, r1, 0x24 /* 8007AB8C 00077AEC 38 A1 00 24 */ addi r5, r1, 0x24
/* 8007AB90 00077AF0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8007AB90 00077AF0 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 8007AB94 00077AF4 38 E0 00 01 */ li r7, 1 /* 8007AB94 00077AF4 38 E0 00 01 */ li r7, 1
@ -4620,7 +4620,7 @@ lbl_8007ACA4:
MassiveDeath__10CPatternedFR13CStateManager: MassiveDeath__10CPatternedFR13CStateManager:
/* 8007ACE8 00077C48 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007ACE8 00077C48 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8007ACEC 00077C4C 7C 08 02 A6 */ mflr r0 /* 8007ACEC 00077C4C 7C 08 02 A6 */ mflr r0
/* 8007ACF0 00077C50 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8007ACF0 00077C50 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8007ACF4 00077C54 38 E0 00 01 */ li r7, 1 /* 8007ACF4 00077C54 38 E0 00 01 */ li r7, 1
/* 8007ACF8 00077C58 90 01 00 24 */ stw r0, 0x24(r1) /* 8007ACF8 00077C58 90 01 00 24 */ stw r0, 0x24(r1)
/* 8007ACFC 00077C5C 38 A1 00 0C */ addi r5, r1, 0xc /* 8007ACFC 00077C5C 38 A1 00 0C */ addi r5, r1, 0xc

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

@ -418,7 +418,7 @@ Think__7CPufferFfR13CStateManager:
/* 8025C2A0 00259200 B0 7E 05 CC */ sth r3, 0x5cc(r30) /* 8025C2A0 00259200 B0 7E 05 CC */ sth r3, 0x5cc(r30)
/* 8025C2A4 00259204 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8025C2A4 00259204 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8025C2A8 00259208 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8025C2A8 00259208 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8025C2AC 0025920C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8025C2AC 0025920C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8025C2B0 00259210 C0 5E 00 60 */ lfs f2, 0x60(r30) /* 8025C2B0 00259210 C0 5E 00 60 */ lfs f2, 0x60(r30)
/* 8025C2B4 00259214 38 61 00 08 */ addi r3, r1, 8 /* 8025C2B4 00259214 38 61 00 08 */ addi r3, r1, 8
/* 8025C2B8 00259218 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 8025C2B8 00259218 C0 3E 00 50 */ lfs f1, 0x50(r30)

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

@ -5399,7 +5399,7 @@ lbl_80256974:
/* 802569B0 00253910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 802569B0 00253910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 802569B4 00253914 D0 A1 00 0C */ stfs f5, 0xc(r1) /* 802569B4 00253914 D0 A1 00 0C */ stfs f5, 0xc(r1)
/* 802569B8 00253918 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l /* 802569B8 00253918 39 03 66 A0 */ addi r8, r3, sZeroVector__9CVector3f@l
/* 802569BC 0025391C A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 802569BC 0025391C A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 802569C0 00253920 D0 A1 00 10 */ stfs f5, 0x10(r1) /* 802569C0 00253920 D0 A1 00 10 */ stfs f5, 0x10(r1)
/* 802569C4 00253924 38 61 00 08 */ addi r3, r1, 8 /* 802569C4 00253924 38 61 00 08 */ addi r3, r1, 8
/* 802569C8 00253928 C0 48 00 00 */ lfs f2, 0(r8) /* 802569C8 00253928 C0 48 00 00 */ lfs f2, 0(r8)

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

@ -1660,7 +1660,7 @@ lbl_8023CAF8:
/* 8023CB28 00239A88 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8023CB28 00239A88 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha
/* 8023CB2C 00239A8C A0 9C 01 D2 */ lhz r4, 0x1d2(r28) /* 8023CB2C 00239A8C A0 9C 01 D2 */ lhz r4, 0x1d2(r28)
/* 8023CB30 00239A90 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8023CB30 00239A90 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l
/* 8023CB34 00239A94 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8023CB34 00239A94 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8023CB38 00239A98 7C 65 1B 78 */ mr r5, r3 /* 8023CB38 00239A98 7C 65 1B 78 */ mr r5, r3
/* 8023CB3C 00239A9C 81 5C 00 04 */ lwz r10, 4(r28) /* 8023CB3C 00239A9C 81 5C 00 04 */ lwz r10, 4(r28)
/* 8023CB40 00239AA0 38 61 00 08 */ addi r3, r1, 8 /* 8023CB40 00239AA0 38 61 00 08 */ addi r3, r1, 8
@ -1986,7 +1986,7 @@ lbl_8023CF9C:
/* 8023CFDC 00239F3C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha /* 8023CFDC 00239F3C 3C A0 80 5A */ lis r5, sZeroVector__9CVector3f@ha
/* 8023CFE0 00239F40 A0 9D 01 D4 */ lhz r4, 0x1d4(r29) /* 8023CFE0 00239F40 A0 9D 01 D4 */ lhz r4, 0x1d4(r29)
/* 8023CFE4 00239F44 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l /* 8023CFE4 00239F44 38 C5 66 A0 */ addi r6, r5, sZeroVector__9CVector3f@l
/* 8023CFE8 00239F48 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8023CFE8 00239F48 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8023CFEC 00239F4C 7C 65 1B 78 */ mr r5, r3 /* 8023CFEC 00239F4C 7C 65 1B 78 */ mr r5, r3
/* 8023CFF0 00239F50 81 5D 00 04 */ lwz r10, 4(r29) /* 8023CFF0 00239F50 81 5D 00 04 */ lwz r10, 4(r29)
/* 8023CFF4 00239F54 38 61 00 2C */ addi r3, r1, 0x2c /* 8023CFF4 00239F54 38 61 00 2C */ addi r3, r1, 0x2c
@ -2054,7 +2054,7 @@ lbl_8023D0A0:
/* 8023D0E0 0023A040 38 61 00 28 */ addi r3, r1, 0x28 /* 8023D0E0 0023A040 38 61 00 28 */ addi r3, r1, 0x28
/* 8023D0E4 0023A044 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 8023D0E4 0023A044 C0 1D 00 40 */ lfs f0, 0x40(r29)
/* 8023D0E8 0023A048 38 A1 00 38 */ addi r5, r1, 0x38 /* 8023D0E8 0023A048 38 A1 00 38 */ addi r5, r1, 0x38
/* 8023D0EC 0023A04C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8023D0EC 0023A04C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8023D0F0 0023A050 38 E0 00 01 */ li r7, 1 /* 8023D0F0 0023A050 38 E0 00 01 */ li r7, 1
/* 8023D0F4 0023A054 D0 01 00 38 */ stfs f0, 0x38(r1) /* 8023D0F4 0023A054 D0 01 00 38 */ stfs f0, 0x38(r1)
/* 8023D0F8 0023A058 39 00 00 01 */ li r8, 1 /* 8023D0F8 0023A058 39 00 00 01 */ li r8, 1

10
asm/MetroidPrime/Enemies/CSpacePirate.s
View File

@ -3140,7 +3140,7 @@ lbl_80122620:
/* 8012262C 0011F58C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8012262C 0011F58C 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80122630 0011F590 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80122630 0011F590 C0 1D 00 40 */ lfs f0, 0x40(r29)
/* 80122634 0011F594 38 61 00 14 */ addi r3, r1, 0x14 /* 80122634 0011F594 38 61 00 14 */ addi r3, r1, 0x14
/* 80122638 0011F598 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80122638 0011F598 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8012263C 0011F59C 38 A1 00 70 */ addi r5, r1, 0x70 /* 8012263C 0011F59C 38 A1 00 70 */ addi r5, r1, 0x70
/* 80122640 0011F5A0 D0 01 00 70 */ stfs f0, 0x70(r1) /* 80122640 0011F5A0 D0 01 00 70 */ stfs f0, 0x70(r1)
/* 80122644 0011F5A4 38 E0 00 01 */ li r7, 1 /* 80122644 0011F5A4 38 E0 00 01 */ li r7, 1
@ -8491,7 +8491,7 @@ lbl_80127304:
/* 80127310 00124270 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80127310 00124270 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80127314 00124274 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80127314 00124274 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 80127318 00124278 38 61 00 1C */ addi r3, r1, 0x1c /* 80127318 00124278 38 61 00 1C */ addi r3, r1, 0x1c
/* 8012731C 0012427C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8012731C 0012427C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80127320 00124280 38 A1 00 80 */ addi r5, r1, 0x80 /* 80127320 00124280 38 A1 00 80 */ addi r5, r1, 0x80
/* 80127324 00124284 D0 01 00 80 */ stfs f0, 0x80(r1) /* 80127324 00124284 D0 01 00 80 */ stfs f0, 0x80(r1)
/* 80127328 00124288 38 E0 00 01 */ li r7, 1 /* 80127328 00124288 38 E0 00 01 */ li r7, 1
@ -9399,7 +9399,7 @@ lbl_80127F8C:
/* 80127FE4 00124F44 38 A1 00 24 */ addi r5, r1, 0x24 /* 80127FE4 00124F44 38 A1 00 24 */ addi r5, r1, 0x24
/* 80127FE8 00124F48 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80127FE8 00124F48 D0 01 00 24 */ stfs f0, 0x24(r1)
/* 80127FEC 00124F4C 38 E0 00 7F */ li r7, 0x7f /* 80127FEC 00124F4C 38 E0 00 7F */ li r7, 0x7f
/* 80127FF0 00124F50 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 80127FF0 00124F50 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 80127FF4 00124F54 39 00 00 01 */ li r8, 1 /* 80127FF4 00124F54 39 00 00 01 */ li r8, 1
/* 80127FF8 00124F58 D0 21 00 28 */ stfs f1, 0x28(r1) /* 80127FF8 00124F58 D0 21 00 28 */ stfs f1, 0x28(r1)
/* 80127FFC 00124F5C 39 20 00 00 */ li r9, 0 /* 80127FFC 00124F5C 39 20 00 00 */ li r9, 0
@ -9429,7 +9429,7 @@ lbl_80128024:
/* 80128054 00124FB4 38 A1 00 18 */ addi r5, r1, 0x18 /* 80128054 00124FB4 38 A1 00 18 */ addi r5, r1, 0x18
/* 80128058 00124FB8 D0 01 00 18 */ stfs f0, 0x18(r1) /* 80128058 00124FB8 D0 01 00 18 */ stfs f0, 0x18(r1)
/* 8012805C 00124FBC 38 E0 00 7F */ li r7, 0x7f /* 8012805C 00124FBC 38 E0 00 7F */ li r7, 0x7f
/* 80128060 00124FC0 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 80128060 00124FC0 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 80128064 00124FC4 39 00 00 01 */ li r8, 1 /* 80128064 00124FC4 39 00 00 01 */ li r8, 1
/* 80128068 00124FC8 D0 21 00 1C */ stfs f1, 0x1c(r1) /* 80128068 00124FC8 D0 21 00 1C */ stfs f1, 0x1c(r1)
/* 8012806C 00124FCC 39 20 00 00 */ li r9, 0 /* 8012806C 00124FCC 39 20 00 00 */ li r9, 0
@ -13840,7 +13840,7 @@ lbl_8012C0A8:
/* 8012C0F4 00129054 38 61 00 18 */ addi r3, r1, 0x18 /* 8012C0F4 00129054 38 61 00 18 */ addi r3, r1, 0x18
/* 8012C0F8 00129058 90 01 00 08 */ stw r0, 8(r1) /* 8012C0F8 00129058 90 01 00 08 */ stw r0, 8(r1)
/* 8012C0FC 0012905C 38 A1 00 38 */ addi r5, r1, 0x38 /* 8012C0FC 0012905C 38 A1 00 38 */ addi r5, r1, 0x38
/* 8012C100 00129060 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8012C100 00129060 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 8012C104 00129064 39 00 00 01 */ li r8, 1 /* 8012C104 00129064 39 00 00 01 */ li r8, 1
/* 8012C108 00129068 A0 9E 00 70 */ lhz r4, 0x70(r30) /* 8012C108 00129068 A0 9E 00 70 */ lhz r4, 0x70(r30)
/* 8012C10C 0012906C 39 20 00 00 */ li r9, 0 /* 8012C10C 0012906C 39 20 00 00 */ li r9, 0

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

@ -3173,7 +3173,7 @@ lbl_801DCBC0:
/* 801DCBC8 001D9B28 48 00 01 10 */ b lbl_801DCCD8 /* 801DCBC8 001D9B28 48 00 01 10 */ b lbl_801DCCD8
lbl_801DCBCC: lbl_801DCBCC:
/* 801DCBCC 001D9B2C 38 00 00 00 */ li r0, 0 /* 801DCBCC 001D9B2C 38 00 00 00 */ li r0, 0
/* 801DCBD0 001D9B30 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801DCBD0 001D9B30 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801DCBD4 001D9B34 90 1E 05 EC */ stw r0, 0x5ec(r30) /* 801DCBD4 001D9B34 90 1E 05 EC */ stw r0, 0x5ec(r30)
/* 801DCBD8 001D9B38 38 61 00 24 */ addi r3, r1, 0x24 /* 801DCBD8 001D9B38 38 61 00 24 */ addi r3, r1, 0x24
/* 801DCBDC 001D9B3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801DCBDC 001D9B3C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)

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

@ -259,7 +259,7 @@ lbl_801E7670:
/* 801E76D8 001E4638 D0 A1 00 38 */ stfs f5, 0x38(r1) /* 801E76D8 001E4638 D0 A1 00 38 */ stfs f5, 0x38(r1)
/* 801E76DC 001E463C C0 1E 00 08 */ lfs f0, 8(r30) /* 801E76DC 001E463C C0 1E 00 08 */ lfs f0, 8(r30)
/* 801E76E0 001E4640 D0 A1 00 3C */ stfs f5, 0x3c(r1) /* 801E76E0 001E4640 D0 A1 00 3C */ stfs f5, 0x3c(r1)
/* 801E76E4 001E4644 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 801E76E4 001E4644 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 801E76E8 001E4648 D0 81 00 40 */ stfs f4, 0x40(r1) /* 801E76E8 001E4648 D0 81 00 40 */ stfs f4, 0x40(r1)
/* 801E76EC 001E464C D0 61 00 44 */ stfs f3, 0x44(r1) /* 801E76EC 001E464C D0 61 00 44 */ stfs f3, 0x44(r1)
/* 801E76F0 001E4650 91 61 00 48 */ stw r11, 0x48(r1) /* 801E76F0 001E4650 91 61 00 48 */ stw r11, 0x48(r1)
@ -3620,7 +3620,7 @@ lbl_801EA790:
/* 801EA79C 001E76FC 38 80 00 01 */ li r4, 1 /* 801EA79C 001E76FC 38 80 00 01 */ li r4, 1
/* 801EA7A0 001E7700 D3 9F 00 34 */ stfs f28, 0x34(r31) /* 801EA7A0 001E7700 D3 9F 00 34 */ stfs f28, 0x34(r31)
/* 801EA7A4 001E7704 38 61 00 08 */ addi r3, r1, 8 /* 801EA7A4 001E7704 38 61 00 08 */ addi r3, r1, 8
/* 801EA7A8 001E7708 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801EA7A8 001E7708 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801EA7AC 001E770C 38 A1 00 3C */ addi r5, r1, 0x3c /* 801EA7AC 001E770C 38 A1 00 3C */ addi r5, r1, 0x3c
/* 801EA7B0 001E7710 D3 7F 00 38 */ stfs f27, 0x38(r31) /* 801EA7B0 001E7710 D3 7F 00 38 */ stfs f27, 0x38(r31)
/* 801EA7B4 001E7714 38 E0 00 01 */ li r7, 1 /* 801EA7B4 001E7714 38 E0 00 01 */ li r7, 1
@ -3729,7 +3729,7 @@ sub_801ea83c:
/* 801EA944 001E78A4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801EA944 001E78A4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 801EA948 001E78A8 38 E0 00 01 */ li r7, 1 /* 801EA948 001E78A8 38 E0 00 01 */ li r7, 1
/* 801EA94C 001E78AC 38 80 00 05 */ li r4, 5 /* 801EA94C 001E78AC 38 80 00 05 */ li r4, 5
/* 801EA950 001E78B0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801EA950 001E78B0 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801EA954 001E78B4 D0 1E 00 34 */ stfs f0, 0x34(r30) /* 801EA954 001E78B4 D0 1E 00 34 */ stfs f0, 0x34(r30)
/* 801EA958 001E78B8 38 61 00 08 */ addi r3, r1, 8 /* 801EA958 001E78B8 38 61 00 08 */ addi r3, r1, 8
/* 801EA95C 001E78BC 38 A1 00 10 */ addi r5, r1, 0x10 /* 801EA95C 001E78BC 38 A1 00 10 */ addi r5, r1, 0x10
@ -5195,7 +5195,7 @@ lbl_801EBDFC:
/* 801EBEA0 001E8E00 88 1E 00 80 */ lbz r0, 0x80(r30) /* 801EBEA0 001E8E00 88 1E 00 80 */ lbz r0, 0x80(r30)
/* 801EBEA4 001E8E04 38 60 00 01 */ li r3, 1 /* 801EBEA4 001E8E04 38 60 00 01 */ li r3, 1
/* 801EBEA8 001E8E08 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b /* 801EBEA8 001E8E08 50 60 26 F6 */ rlwimi r0, r3, 4, 0x1b, 0x1b
/* 801EBEAC 001E8E0C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 801EBEAC 001E8E0C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 801EBEB0 001E8E10 98 1E 00 80 */ stb r0, 0x80(r30) /* 801EBEB0 001E8E10 98 1E 00 80 */ stb r0, 0x80(r30)
/* 801EBEB4 001E8E14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 801EBEB4 001E8E14 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 801EBEB8 001E8E18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 801EBEB8 001E8E18 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l

15
asm/MetroidPrime/HUD/CHudDecoInterface.s
View File

@ -847,7 +847,7 @@ lbl_8018F9D8:
lbl_8018F9F4: lbl_8018F9F4:
/* 8018F9F4 0018C954 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8018F9F4 0018C954 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 8018F9F8 0018C958 41 82 00 28 */ beq lbl_8018FA20 /* 8018F9F8 0018C958 41 82 00 28 */ beq lbl_8018FA20
/* 8018F9FC 0018C95C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8018F9FC 0018C95C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8018FA00 0018C960 38 61 00 08 */ addi r3, r1, 8 /* 8018FA00 0018C960 38 61 00 08 */ addi r3, r1, 8
/* 8018FA04 0018C964 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8018FA04 0018C964 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8018FA08 0018C968 38 80 05 7D */ li r4, 0x57d /* 8018FA08 0018C968 38 80 05 7D */ li r4, 0x57d
@ -2829,7 +2829,7 @@ lbl_801915E4:
/* 80191600 0018E560 40 82 00 40 */ bne lbl_80191640 /* 80191600 0018E560 40 82 00 40 */ bne lbl_80191640
/* 80191604 0018E564 2C 1E 00 01 */ cmpwi r30, 1 /* 80191604 0018E564 2C 1E 00 01 */ cmpwi r30, 1
/* 80191608 0018E568 40 82 00 38 */ bne lbl_80191640 /* 80191608 0018E568 40 82 00 38 */ bne lbl_80191640
/* 8019160C 0018E56C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8019160C 0018E56C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80191610 0018E570 38 61 00 20 */ addi r3, r1, 0x20 /* 80191610 0018E570 38 61 00 20 */ addi r3, r1, 0x20
/* 80191614 0018E574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80191614 0018E574 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80191618 0018E578 38 80 05 75 */ li r4, 0x575 /* 80191618 0018E578 38 80 05 75 */ li r4, 0x575
@ -2845,7 +2845,7 @@ lbl_801915E4:
lbl_80191640: lbl_80191640:
/* 80191640 0018E5A0 2C 1E 00 02 */ cmpwi r30, 2 /* 80191640 0018E5A0 2C 1E 00 02 */ cmpwi r30, 2
/* 80191644 0018E5A4 40 82 00 34 */ bne lbl_80191678 /* 80191644 0018E5A4 40 82 00 34 */ bne lbl_80191678
/* 80191648 0018E5A8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80191648 0018E5A8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8019164C 0018E5AC 38 61 00 1C */ addi r3, r1, 0x1c /* 8019164C 0018E5AC 38 61 00 1C */ addi r3, r1, 0x1c
/* 80191650 0018E5B0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80191650 0018E5B0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80191654 0018E5B4 38 80 05 75 */ li r4, 0x575 /* 80191654 0018E5B4 38 80 05 75 */ li r4, 0x575
@ -4663,7 +4663,7 @@ lbl_80193028:
/* 80193044 0018FFA4 40 82 00 34 */ bne lbl_80193078 /* 80193044 0018FFA4 40 82 00 34 */ bne lbl_80193078
/* 80193048 0018FFA8 2C 1E 00 01 */ cmpwi r30, 1 /* 80193048 0018FFA8 2C 1E 00 01 */ cmpwi r30, 1
/* 8019304C 0018FFAC 40 82 00 2C */ bne lbl_80193078 /* 8019304C 0018FFAC 40 82 00 2C */ bne lbl_80193078
/* 80193050 0018FFB0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80193050 0018FFB0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80193054 0018FFB4 38 61 00 30 */ addi r3, r1, 0x30 /* 80193054 0018FFB4 38 61 00 30 */ addi r3, r1, 0x30
/* 80193058 0018FFB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80193058 0018FFB8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8019305C 0018FFBC 38 80 05 74 */ li r4, 0x574 /* 8019305C 0018FFBC 38 80 05 74 */ li r4, 0x574
@ -4676,7 +4676,7 @@ lbl_80193028:
lbl_80193078: lbl_80193078:
/* 80193078 0018FFD8 2C 1E 00 02 */ cmpwi r30, 2 /* 80193078 0018FFD8 2C 1E 00 02 */ cmpwi r30, 2
/* 8019307C 0018FFDC 40 82 00 28 */ bne lbl_801930A4 /* 8019307C 0018FFDC 40 82 00 28 */ bne lbl_801930A4
/* 80193080 0018FFE0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80193080 0018FFE0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80193084 0018FFE4 38 61 00 2C */ addi r3, r1, 0x2c /* 80193084 0018FFE4 38 61 00 2C */ addi r3, r1, 0x2c
/* 80193088 0018FFE8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80193088 0018FFE8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8019308C 0018FFEC 38 80 05 77 */ li r4, 0x577 /* 8019308C 0018FFEC 38 80 05 77 */ li r4, 0x577
@ -4714,7 +4714,7 @@ lbl_801930EC:
/* 801930FC 0019005C C0 1F 00 08 */ lfs f0, 8(r31) /* 801930FC 0019005C C0 1F 00 08 */ lfs f0, 8(r31)
/* 80193100 00190060 FC 00 E0 40 */ fcmpo cr0, f0, f28 /* 80193100 00190060 FC 00 E0 40 */ fcmpo cr0, f0, f28
/* 80193104 00190064 40 80 00 28 */ bge lbl_8019312C /* 80193104 00190064 40 80 00 28 */ bge lbl_8019312C
/* 80193108 00190068 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80193108 00190068 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8019310C 0019006C 38 61 00 28 */ addi r3, r1, 0x28 /* 8019310C 0019006C 38 61 00 28 */ addi r3, r1, 0x28
/* 80193110 00190070 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80193110 00190070 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80193114 00190074 38 80 05 77 */ li r4, 0x577 /* 80193114 00190074 38 80 05 77 */ li r4, 0x577
@ -6107,7 +6107,7 @@ lbl_80194444:
/* 80194454 001913B4 41 82 00 34 */ beq lbl_80194488 /* 80194454 001913B4 41 82 00 34 */ beq lbl_80194488
/* 80194458 001913B8 80 1D 00 04 */ lwz r0, 4(r29) /* 80194458 001913B8 80 1D 00 04 */ lwz r0, 4(r29)
/* 8019445C 001913BC 38 82 A6 3C */ addi r4, r2, lbl_805AC35C@sda21 /* 8019445C 001913BC 38 82 A6 3C */ addi r4, r2, lbl_805AC35C@sda21
/* 80194460 001913C0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80194460 001913C0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80194464 001913C4 38 61 00 08 */ addi r3, r1, 8 /* 80194464 001913C4 38 61 00 08 */ addi r3, r1, 8
/* 80194468 001913C8 54 00 08 3C */ slwi r0, r0, 1 /* 80194468 001913C8 54 00 08 3C */ slwi r0, r0, 1
/* 8019446C 001913CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8019446C 001913CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -10486,4 +10486,3 @@ lbl_803D10E4:
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4
.4byte 0 .4byte 0

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

@ -593,7 +593,7 @@ lbl_80064854:
/* 80064870 000617D0 41 82 01 B4 */ beq lbl_80064A24 /* 80064870 000617D0 41 82 01 B4 */ beq lbl_80064A24
/* 80064874 000617D4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80064874 000617D4 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 80064878 000617D8 41 82 01 AC */ beq lbl_80064A24 /* 80064878 000617D8 41 82 01 AC */ beq lbl_80064A24
/* 8006487C 000617DC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8006487C 000617DC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80064880 000617E0 38 61 00 0C */ addi r3, r1, 0xc /* 80064880 000617E0 38 61 00 0C */ addi r3, r1, 0xc
/* 80064884 000617E4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80064884 000617E4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80064888 000617E8 38 80 05 A9 */ li r4, 0x5a9 /* 80064888 000617E8 38 80 05 A9 */ li r4, 0x5a9
@ -688,7 +688,7 @@ lbl_8006499C:
/* 800649D4 00061934 40 82 00 50 */ bne lbl_80064A24 /* 800649D4 00061934 40 82 00 50 */ bne lbl_80064A24
/* 800649D8 00061938 C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2) /* 800649D8 00061938 C0 02 87 34 */ lfs f0, lbl_805AA454@sda21(r2)
/* 800649DC 0006193C 38 61 00 08 */ addi r3, r1, 8 /* 800649DC 0006193C 38 61 00 08 */ addi r3, r1, 8
/* 800649E0 00061940 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800649E0 00061940 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800649E4 00061944 38 80 05 A3 */ li r4, 0x5a3 /* 800649E4 00061944 38 80 05 A3 */ li r4, 0x5a3
/* 800649E8 00061948 D0 1D 05 84 */ stfs f0, 0x584(r29) /* 800649E8 00061948 D0 1D 05 84 */ stfs f0, 0x584(r29)
/* 800649EC 0006194C 38 A0 00 7F */ li r5, 0x7f /* 800649EC 0006194C 38 A0 00 7F */ li r5, 0x7f
@ -2863,7 +2863,7 @@ lbl_800668EC:
lbl_800668F0: lbl_800668F0:
/* 800668F0 00063850 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 800668F0 00063850 57 60 06 3F */ clrlwi. r0, r27, 0x18
/* 800668F4 00063854 41 82 00 28 */ beq lbl_8006691C /* 800668F4 00063854 41 82 00 28 */ beq lbl_8006691C
/* 800668F8 00063858 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800668F8 00063858 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800668FC 0006385C 38 61 00 40 */ addi r3, r1, 0x40 /* 800668FC 0006385C 38 61 00 40 */ addi r3, r1, 0x40
/* 80066900 00063860 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80066900 00063860 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80066904 00063864 38 80 05 A2 */ li r4, 0x5a2 /* 80066904 00063864 38 80 05 A2 */ li r4, 0x5a2
@ -3144,7 +3144,7 @@ lbl_80066C90:
/* 80066CDC 00063C3C FC 00 F8 00 */ fcmpu cr0, f0, f31 /* 80066CDC 00063C3C FC 00 F8 00 */ fcmpu cr0, f0, f31
/* 80066CE0 00063C40 40 82 00 28 */ bne lbl_80066D08 /* 80066CE0 00063C40 40 82 00 28 */ bne lbl_80066D08
lbl_80066CE4: lbl_80066CE4:
/* 80066CE4 00063C44 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80066CE4 00063C44 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80066CE8 00063C48 38 61 00 2C */ addi r3, r1, 0x2c /* 80066CE8 00063C48 38 61 00 2C */ addi r3, r1, 0x2c
/* 80066CEC 00063C4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80066CEC 00063C4C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80066CF0 00063C50 38 80 05 8A */ li r4, 0x58a /* 80066CF0 00063C50 38 80 05 8A */ li r4, 0x58a
@ -5978,7 +5978,7 @@ lbl_80069528:
/* 8006954C 000664AC 80 1F 00 00 */ lwz r0, 0(r31) /* 8006954C 000664AC 80 1F 00 00 */ lwz r0, 0(r31)
/* 80069550 000664B0 28 00 00 00 */ cmplwi r0, 0 /* 80069550 000664B0 28 00 00 00 */ cmplwi r0, 0
/* 80069554 000664B4 40 82 00 4C */ bne lbl_800695A0 /* 80069554 000664B4 40 82 00 4C */ bne lbl_800695A0
/* 80069558 000664B8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80069558 000664B8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8006955C 000664BC 54 C4 04 3E */ clrlwi r4, r6, 0x10 /* 8006955C 000664BC 54 C4 04 3E */ clrlwi r4, r6, 0x10
/* 80069560 000664C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80069560 000664C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80069564 000664C4 38 61 00 0C */ addi r3, r1, 0xc /* 80069564 000664C4 38 61 00 0C */ addi r3, r1, 0xc
@ -6166,7 +6166,7 @@ lbl_800697D0:
/* 800697E4 00066744 41 82 00 64 */ beq lbl_80069848 /* 800697E4 00066744 41 82 00 64 */ beq lbl_80069848
/* 800697E8 00066748 28 00 00 00 */ cmplwi r0, 0 /* 800697E8 00066748 28 00 00 00 */ cmplwi r0, 0
/* 800697EC 0006674C 41 82 00 2C */ beq lbl_80069818 /* 800697EC 0006674C 41 82 00 2C */ beq lbl_80069818
/* 800697F0 00066750 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800697F0 00066750 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800697F4 00066754 38 61 00 1C */ addi r3, r1, 0x1c /* 800697F4 00066754 38 61 00 1C */ addi r3, r1, 0x1c
/* 800697F8 00066758 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800697F8 00066758 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800697FC 0006675C 38 80 05 70 */ li r4, 0x570 /* 800697FC 0006675C 38 80 05 70 */ li r4, 0x570
@ -6177,7 +6177,7 @@ lbl_800697D0:
/* 80069810 00066770 48 28 05 65 */ bl SfxStart__11CSfxManagerFUsssbsbi /* 80069810 00066770 48 28 05 65 */ bl SfxStart__11CSfxManagerFUsssbsbi
/* 80069814 00066774 48 00 00 28 */ b lbl_8006983C /* 80069814 00066774 48 00 00 28 */ b lbl_8006983C
lbl_80069818: lbl_80069818:
/* 80069818 00066778 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80069818 00066778 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8006981C 0006677C 38 61 00 18 */ addi r3, r1, 0x18 /* 8006981C 0006677C 38 61 00 18 */ addi r3, r1, 0x18
/* 80069820 00066780 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80069820 00066780 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80069824 00066784 38 80 05 6E */ li r4, 0x56e /* 80069824 00066784 38 80 05 6E */ li r4, 0x56e
@ -6290,7 +6290,7 @@ lbl_80069978:
/* 8006999C 000668FC 80 1B 05 64 */ lwz r0, 0x564(r27) /* 8006999C 000668FC 80 1B 05 64 */ lwz r0, 0x564(r27)
/* 800699A0 00066900 28 00 00 00 */ cmplwi r0, 0 /* 800699A0 00066900 28 00 00 00 */ cmplwi r0, 0
/* 800699A4 00066904 40 82 00 4C */ bne lbl_800699F0 /* 800699A4 00066904 40 82 00 4C */ bne lbl_800699F0
/* 800699A8 00066908 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800699A8 00066908 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800699AC 0006690C 38 61 00 10 */ addi r3, r1, 0x10 /* 800699AC 0006690C 38 61 00 10 */ addi r3, r1, 0x10
/* 800699B0 00066910 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800699B0 00066910 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800699B4 00066914 38 80 05 72 */ li r4, 0x572 /* 800699B4 00066914 38 80 05 72 */ li r4, 0x572
@ -7427,7 +7427,7 @@ lbl_8006A8DC:
/* 8006A8F4 00067854 C0 1E 05 7C */ lfs f0, 0x57c(r30) /* 8006A8F4 00067854 C0 1E 05 7C */ lfs f0, 0x57c(r30)
/* 8006A8F8 00067858 FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 8006A8F8 00067858 FC 00 F8 40 */ fcmpo cr0, f0, f31
/* 8006A8FC 0006785C 40 80 00 28 */ bge lbl_8006A924 /* 8006A8FC 0006785C 40 80 00 28 */ bge lbl_8006A924
/* 8006A900 00067860 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8006A900 00067860 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8006A904 00067864 38 61 00 08 */ addi r3, r1, 8 /* 8006A904 00067864 38 61 00 08 */ addi r3, r1, 8
/* 8006A908 00067868 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8006A908 00067868 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8006A90C 0006786C 38 80 05 7D */ li r4, 0x57d /* 8006A90C 0006786C 38 80 05 7D */ li r4, 0x57d

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

@ -1978,7 +1978,7 @@ StartLandingSfx__10CMorphBallFv:
/* 800EE820 000EB780 38 C0 00 40 */ li r6, 0x40 /* 800EE820 000EB780 38 C0 00 40 */ li r6, 0x40
/* 800EE824 000EB784 88 A1 00 08 */ lbz r5, 8(r1) /* 800EE824 000EB784 88 A1 00 08 */ lbz r5, 8(r1)
/* 800EE828 000EB788 38 E0 00 01 */ li r7, 1 /* 800EE828 000EB788 38 E0 00 01 */ li r7, 1
/* 800EE82C 000EB78C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800EE82C 000EB78C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800EE830 000EB790 39 20 00 00 */ li r9, 0 /* 800EE830 000EB790 39 20 00 00 */ li r9, 0
/* 800EE834 000EB794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800EE834 000EB794 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800EE838 000EB798 48 1F B5 3D */ bl SfxStart__11CSfxManagerFUsssbsbi /* 800EE838 000EB798 48 1F B5 3D */ bl SfxStart__11CSfxManagerFUsssbsbi
@ -2089,7 +2089,7 @@ lbl_800EE988:
/* 800EE9AC 000EB90C 80 BF 00 00 */ lwz r5, 0(r31) /* 800EE9AC 000EB90C 80 BF 00 00 */ lwz r5, 0(r31)
/* 800EE9B0 000EB910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 800EE9B0 000EB910 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 800EE9B4 000EB914 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 800EE9B4 000EB914 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 800EE9B8 000EB918 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 800EE9B8 000EB918 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 800EE9BC 000EB91C C0 45 00 60 */ lfs f2, 0x60(r5) /* 800EE9BC 000EB91C C0 45 00 60 */ lfs f2, 0x60(r5)
/* 800EE9C0 000EB920 38 61 00 34 */ addi r3, r1, 0x34 /* 800EE9C0 000EB920 38 61 00 34 */ addi r3, r1, 0x34
/* 800EE9C4 000EB924 C0 25 00 50 */ lfs f1, 0x50(r5) /* 800EE9C4 000EB924 C0 25 00 50 */ lfs f1, 0x50(r5)
@ -4552,7 +4552,7 @@ lbl_800F0CBC:
/* 800F0CF0 000EDC50 40 82 00 70 */ bne lbl_800F0D60 /* 800F0CF0 000EDC50 40 82 00 70 */ bne lbl_800F0D60
/* 800F0CF4 000EDC54 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2) /* 800F0CF4 000EDC54 C0 02 91 50 */ lfs f0, lbl_805AAE70@sda21(r2)
/* 800F0CF8 000EDC58 38 61 00 0C */ addi r3, r1, 0xc /* 800F0CF8 000EDC58 38 61 00 0C */ addi r3, r1, 0xc
/* 800F0CFC 000EDC5C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 800F0CFC 000EDC5C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 800F0D00 000EDC60 38 A1 00 4C */ addi r5, r1, 0x4c /* 800F0D00 000EDC60 38 A1 00 4C */ addi r5, r1, 0x4c
/* 800F0D04 000EDC64 D0 01 00 40 */ stfs f0, 0x40(r1) /* 800F0D04 000EDC64 D0 01 00 40 */ stfs f0, 0x40(r1)
/* 800F0D08 000EDC68 38 C1 00 40 */ addi r6, r1, 0x40 /* 800F0D08 000EDC68 38 C1 00 40 */ addi r6, r1, 0x40
@ -8410,7 +8410,7 @@ lbl_800F4420:
/* 800F44A8 000F1408 80 63 00 10 */ lwz r3, 0x10(r3) /* 800F44A8 000F1408 80 63 00 10 */ lwz r3, 0x10(r3)
/* 800F44AC 000F140C 4B F3 88 D1 */ bl SetAnimation__9CAnimDataFRC18CAnimPlaybackParmsb /* 800F44AC 000F140C 4B F3 88 D1 */ bl SetAnimation__9CAnimDataFRC18CAnimPlaybackParmsb
/* 800F44B0 000F1410 38 00 00 01 */ li r0, 1 /* 800F44B0 000F1410 38 00 00 01 */ li r0, 1
/* 800F44B4 000F1414 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800F44B4 000F1414 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800F44B8 000F1418 90 1E 1E 20 */ stw r0, 0x1e20(r30) /* 800F44B8 000F1418 90 1E 1E 20 */ stw r0, 0x1e20(r30)
/* 800F44BC 000F141C 38 61 00 10 */ addi r3, r1, 0x10 /* 800F44BC 000F141C 38 61 00 10 */ addi r3, r1, 0x10
/* 800F44C0 000F1420 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800F44C0 000F1420 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)

38
asm/MetroidPrime/Player/CPlayer.s
View File

@ -1742,7 +1742,7 @@ lbl_80010C98:
lbl_80010CE0: lbl_80010CE0:
/* 80010CE0 0000DC40 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80010CE0 0000DC40 57 E0 06 3F */ clrlwi. r0, r31, 0x18
/* 80010CE4 0000DC44 41 82 00 34 */ beq lbl_80010D18 /* 80010CE4 0000DC44 41 82 00 34 */ beq lbl_80010D18
/* 80010CE8 0000DC48 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80010CE8 0000DC48 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80010CEC 0000DC4C 7F 84 E3 78 */ mr r4, r28 /* 80010CEC 0000DC4C 7F 84 E3 78 */ mr r4, r28
/* 80010CF0 0000DC50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80010CF0 0000DC50 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80010CF4 0000DC54 7F A5 EB 78 */ mr r5, r29 /* 80010CF4 0000DC54 7F A5 EB 78 */ mr r5, r29
@ -3659,7 +3659,7 @@ lbl_80012730:
/* 80012754 0000F6B4 48 2D 75 F5 */ bl SfxStop__11CSfxManagerFRC10CSfxHandle /* 80012754 0000F6B4 48 2D 75 F5 */ bl SfxStop__11CSfxManagerFRC10CSfxHandle
lbl_80012758: lbl_80012758:
/* 80012758 0000F6B8 57 DE 04 3E */ clrlwi r30, r30, 0x10 /* 80012758 0000F6B8 57 DE 04 3E */ clrlwi r30, r30, 0x10
/* 8001275C 0000F6BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001275C 0000F6BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80012760 0000F6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80012760 0000F6C0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80012764 0000F6C4 7F C4 F3 78 */ mr r4, r30 /* 80012764 0000F6C4 7F C4 F3 78 */ mr r4, r30
/* 80012768 0000F6C8 38 61 00 10 */ addi r3, r1, 0x10 /* 80012768 0000F6C8 38 61 00 10 */ addi r3, r1, 0x10
@ -3687,7 +3687,7 @@ lbl_80012794:
/* 800127B8 0000F718 90 1A 07 70 */ stw r0, 0x770(r26) /* 800127B8 0000F718 90 1A 07 70 */ stw r0, 0x770(r26)
lbl_800127BC: lbl_800127BC:
/* 800127BC 0000F71C 57 F9 04 3E */ clrlwi r25, r31, 0x10 /* 800127BC 0000F71C 57 F9 04 3E */ clrlwi r25, r31, 0x10
/* 800127C0 0000F720 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800127C0 0000F720 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800127C4 0000F724 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800127C4 0000F724 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800127C8 0000F728 7F 24 CB 78 */ mr r4, r25 /* 800127C8 0000F728 7F 24 CB 78 */ mr r4, r25
/* 800127CC 0000F72C 38 61 00 08 */ addi r3, r1, 8 /* 800127CC 0000F72C 38 61 00 08 */ addi r3, r1, 8
@ -6279,7 +6279,7 @@ lbl_80014BD8:
/* 80014C28 00011B88 48 26 ED 25 */ bl TransitionToMorphBallState__7CPlayerFfR13CStateManager /* 80014C28 00011B88 48 26 ED 25 */ bl TransitionToMorphBallState__7CPlayerFfR13CStateManager
/* 80014C2C 00011B8C 48 00 01 10 */ b lbl_80014D3C /* 80014C2C 00011B8C 48 00 01 10 */ b lbl_80014D3C
lbl_80014C30: lbl_80014C30:
/* 80014C30 00011B90 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80014C30 00011B90 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80014C34 00011B94 38 61 00 10 */ addi r3, r1, 0x10 /* 80014C34 00011B94 38 61 00 10 */ addi r3, r1, 0x10
/* 80014C38 00011B98 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80014C38 00011B98 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80014C3C 00011B9C 38 80 06 F5 */ li r4, 0x6f5 /* 80014C3C 00011B9C 38 80 06 F5 */ li r4, 0x6f5
@ -6334,7 +6334,7 @@ lbl_80014C6C:
/* 80014CFC 00011C5C 48 26 E3 79 */ bl TransitionFromMorphBallState__7CPlayerFR13CStateManager /* 80014CFC 00011C5C 48 26 E3 79 */ bl TransitionFromMorphBallState__7CPlayerFR13CStateManager
/* 80014D00 00011C60 48 00 00 3C */ b lbl_80014D3C /* 80014D00 00011C60 48 00 00 3C */ b lbl_80014D3C
lbl_80014D04: lbl_80014D04:
/* 80014D04 00011C64 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80014D04 00011C64 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80014D08 00011C68 38 61 00 08 */ addi r3, r1, 8 /* 80014D08 00011C68 38 61 00 08 */ addi r3, r1, 8
/* 80014D0C 00011C6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80014D0C 00011C6C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80014D10 00011C70 38 80 06 F5 */ li r4, 0x6f5 /* 80014D10 00011C70 38 80 06 F5 */ li r4, 0x6f5
@ -7166,7 +7166,7 @@ lbl_800158D4:
/* 800158E8 00012848 80 1D 07 54 */ lwz r0, 0x754(r29) /* 800158E8 00012848 80 1D 07 54 */ lwz r0, 0x754(r29)
/* 800158EC 0001284C 2C 00 00 00 */ cmpwi r0, 0 /* 800158EC 0001284C 2C 00 00 00 */ cmpwi r0, 0
/* 800158F0 00012850 41 82 00 40 */ beq lbl_80015930 /* 800158F0 00012850 41 82 00 40 */ beq lbl_80015930
/* 800158F4 00012854 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800158F4 00012854 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800158F8 00012858 38 61 00 10 */ addi r3, r1, 0x10 /* 800158F8 00012858 38 61 00 10 */ addi r3, r1, 0x10
/* 800158FC 0001285C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800158FC 0001285C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80015900 00012860 38 80 0C 37 */ li r4, 0xc37 /* 80015900 00012860 38 80 0C 37 */ li r4, 0xc37
@ -7182,7 +7182,7 @@ lbl_800158D4:
/* 80015928 00012888 4B FF B8 65 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle /* 80015928 00012888 4B FF B8 65 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle
/* 8001592C 0001288C 48 00 00 3C */ b lbl_80015968 /* 8001592C 0001288C 48 00 00 3C */ b lbl_80015968
lbl_80015930: lbl_80015930:
/* 80015930 00012890 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80015930 00012890 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80015934 00012894 38 61 00 08 */ addi r3, r1, 8 /* 80015934 00012894 38 61 00 08 */ addi r3, r1, 8
/* 80015938 00012898 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80015938 00012898 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001593C 0001289C 38 80 0C 38 */ li r4, 0xc38 /* 8001593C 0001289C 38 80 0C 38 */ li r4, 0xc38
@ -7416,7 +7416,7 @@ lbl_80015C7C:
/* 80015C84 00012BE4 38 61 00 54 */ addi r3, r1, 0x54 /* 80015C84 00012BE4 38 61 00 54 */ addi r3, r1, 0x54
/* 80015C88 00012BE8 48 32 7E 59 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv" /* 80015C88 00012BE8 48 32 7E 59 */ bl "internal_dereference__Q24rstl66basic_string<c,Q24rstl14char_traits<c>,Q24rstl17rmemory_allocator>Fv"
lbl_80015C8C: lbl_80015C8C:
/* 80015C8C 00012BEC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80015C8C 00012BEC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80015C90 00012BF0 38 61 00 18 */ addi r3, r1, 0x18 /* 80015C90 00012BF0 38 61 00 18 */ addi r3, r1, 0x18
/* 80015C94 00012BF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80015C94 00012BF4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80015C98 00012BF8 38 80 0C 39 */ li r4, 0xc39 /* 80015C98 00012BF8 38 80 0C 39 */ li r4, 0xc39
@ -7545,7 +7545,7 @@ lbl_80015E3C:
/* 80015E50 00012DB0 48 00 43 C5 */ bl IsMorphBallTransitioning__7CPlayerCFv /* 80015E50 00012DB0 48 00 43 C5 */ bl IsMorphBallTransitioning__7CPlayerCFv
/* 80015E54 00012DB4 93 BB 0A 08 */ stw r29, 0xa08(r27) /* 80015E54 00012DB4 93 BB 0A 08 */ stw r29, 0xa08(r27)
/* 80015E58 00012DB8 7F C4 F3 78 */ mr r4, r30 /* 80015E58 00012DB8 7F C4 F3 78 */ mr r4, r30
/* 80015E5C 00012DBC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80015E5C 00012DBC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80015E60 00012DC0 38 61 00 08 */ addi r3, r1, 8 /* 80015E60 00012DC0 38 61 00 08 */ addi r3, r1, 8
/* 80015E64 00012DC4 93 FB 0A 0C */ stw r31, 0xa0c(r27) /* 80015E64 00012DC4 93 FB 0A 0C */ stw r31, 0xa0c(r27)
/* 80015E68 00012DC8 38 A0 00 7F */ li r5, 0x7f /* 80015E68 00012DC8 38 A0 00 7F */ li r5, 0x7f
@ -7823,7 +7823,7 @@ lbl_8001624C:
lbl_8001625C: lbl_8001625C:
/* 8001625C 000131BC A0 9F 02 60 */ lhz r4, 0x260(r31) /* 8001625C 000131BC A0 9F 02 60 */ lhz r4, 0x260(r31)
/* 80016260 000131C0 38 61 00 18 */ addi r3, r1, 0x18 /* 80016260 000131C0 38 61 00 18 */ addi r3, r1, 0x18
/* 80016264 000131C4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80016264 000131C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80016268 000131C8 38 A0 00 7F */ li r5, 0x7f /* 80016268 000131C8 38 A0 00 7F */ li r5, 0x7f
/* 8001626C 000131CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001626C 000131CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80016270 000131D0 38 C0 00 40 */ li r6, 0x40 /* 80016270 000131D0 38 C0 00 40 */ li r6, 0x40
@ -8174,7 +8174,7 @@ lbl_80016768:
/* 80016768 000136C8 7F 63 DB 78 */ mr r3, r27 /* 80016768 000136C8 7F 63 DB 78 */ mr r3, r27
/* 8001676C 000136CC 4B FF EF A9 */ bl StartLandingControlFreeze__7CPlayerFv /* 8001676C 000136CC 4B FF EF A9 */ bl StartLandingControlFreeze__7CPlayerFv
lbl_80016770: lbl_80016770:
/* 80016770 000136D0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80016770 000136D0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80016774 000136D4 7F E5 FB 78 */ mr r5, r31 /* 80016774 000136D4 7F E5 FB 78 */ mr r5, r31
/* 80016778 000136D8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80016778 000136D8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001677C 000136DC 38 61 00 44 */ addi r3, r1, 0x44 /* 8001677C 000136DC 38 61 00 44 */ addi r3, r1, 0x44
@ -9489,7 +9489,7 @@ lbl_800179F4:
lbl_80017A04: lbl_80017A04:
/* 80017A04 00014964 A0 9F 02 62 */ lhz r4, 0x262(r31) /* 80017A04 00014964 A0 9F 02 62 */ lhz r4, 0x262(r31)
/* 80017A08 00014968 38 61 00 18 */ addi r3, r1, 0x18 /* 80017A08 00014968 38 61 00 18 */ addi r3, r1, 0x18
/* 80017A0C 0001496C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80017A0C 0001496C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80017A10 00014970 38 A0 00 7F */ li r5, 0x7f /* 80017A10 00014970 38 A0 00 7F */ li r5, 0x7f
/* 80017A14 00014974 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80017A14 00014974 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80017A18 00014978 38 C0 00 40 */ li r6, 0x40 /* 80017A18 00014978 38 C0 00 40 */ li r6, 0x40
@ -9864,7 +9864,7 @@ lbl_80017F00:
/* 80017F34 00014E94 80 1D 07 90 */ lwz r0, 0x790(r29) /* 80017F34 00014E94 80 1D 07 90 */ lwz r0, 0x790(r29)
/* 80017F38 00014E98 2C 00 00 01 */ cmpwi r0, 1 /* 80017F38 00014E98 2C 00 00 01 */ cmpwi r0, 1
/* 80017F3C 00014E9C 40 82 00 40 */ bne lbl_80017F7C /* 80017F3C 00014E9C 40 82 00 40 */ bne lbl_80017F7C
/* 80017F40 00014EA0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80017F40 00014EA0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80017F44 00014EA4 38 61 00 2C */ addi r3, r1, 0x2c /* 80017F44 00014EA4 38 61 00 2C */ addi r3, r1, 0x2c
/* 80017F48 00014EA8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80017F48 00014EA8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80017F4C 00014EAC 7F E5 07 74 */ extsb r5, r31 /* 80017F4C 00014EAC 7F E5 07 74 */ extsb r5, r31
@ -9880,7 +9880,7 @@ lbl_80017F00:
/* 80017F74 00014ED4 4B FF 92 19 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle /* 80017F74 00014ED4 4B FF 92 19 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle
/* 80017F78 00014ED8 48 00 01 54 */ b lbl_800180CC /* 80017F78 00014ED8 48 00 01 54 */ b lbl_800180CC
lbl_80017F7C: lbl_80017F7C:
/* 80017F7C 00014EDC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80017F7C 00014EDC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80017F80 00014EE0 38 61 00 24 */ addi r3, r1, 0x24 /* 80017F80 00014EE0 38 61 00 24 */ addi r3, r1, 0x24
/* 80017F84 00014EE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80017F84 00014EE4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80017F88 00014EE8 7F E5 07 74 */ extsb r5, r31 /* 80017F88 00014EE8 7F E5 07 74 */ extsb r5, r31
@ -9899,7 +9899,7 @@ lbl_80017FB8:
/* 80017FB8 00014F18 80 1D 07 90 */ lwz r0, 0x790(r29) /* 80017FB8 00014F18 80 1D 07 90 */ lwz r0, 0x790(r29)
/* 80017FBC 00014F1C 2C 00 00 01 */ cmpwi r0, 1 /* 80017FBC 00014F1C 2C 00 00 01 */ cmpwi r0, 1
/* 80017FC0 00014F20 40 82 00 40 */ bne lbl_80018000 /* 80017FC0 00014F20 40 82 00 40 */ bne lbl_80018000
/* 80017FC4 00014F24 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80017FC4 00014F24 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80017FC8 00014F28 38 61 00 1C */ addi r3, r1, 0x1c /* 80017FC8 00014F28 38 61 00 1C */ addi r3, r1, 0x1c
/* 80017FCC 00014F2C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80017FCC 00014F2C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80017FD0 00014F30 7F E5 07 74 */ extsb r5, r31 /* 80017FD0 00014F30 7F E5 07 74 */ extsb r5, r31
@ -9915,7 +9915,7 @@ lbl_80017FB8:
/* 80017FF8 00014F58 4B FF 91 95 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle /* 80017FF8 00014F58 4B FF 91 95 */ bl ApplySubmergedPitchBend__7CPlayerFR10CSfxHandle
/* 80017FFC 00014F5C 48 00 00 D0 */ b lbl_800180CC /* 80017FFC 00014F5C 48 00 00 D0 */ b lbl_800180CC
lbl_80018000: lbl_80018000:
/* 80018000 00014F60 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80018000 00014F60 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80018004 00014F64 38 61 00 14 */ addi r3, r1, 0x14 /* 80018004 00014F64 38 61 00 14 */ addi r3, r1, 0x14
/* 80018008 00014F68 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80018008 00014F68 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8001800C 00014F6C 7F E5 07 74 */ extsb r5, r31 /* 8001800C 00014F6C 7F E5 07 74 */ extsb r5, r31
@ -9955,7 +9955,7 @@ lbl_80018070:
/* 8001808C 00014FEC 48 00 00 A9 */ bl GetMaterialSoundUnderPlayer__7CPlayerFR13CStateManagerPCUsiUs /* 8001808C 00014FEC 48 00 00 A9 */ bl GetMaterialSoundUnderPlayer__7CPlayerFR13CStateManagerPCUsiUs
/* 80018090 00014FF0 7C 60 1B 78 */ mr r0, r3 /* 80018090 00014FF0 7C 60 1B 78 */ mr r0, r3
lbl_80018094: lbl_80018094:
/* 80018094 00014FF4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80018094 00014FF4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80018098 00014FF8 38 61 00 0C */ addi r3, r1, 0xc /* 80018098 00014FF8 38 61 00 0C */ addi r3, r1, 0xc
/* 8001809C 00014FFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8001809C 00014FFC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800180A0 00015000 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 800180A0 00015000 54 04 04 3E */ clrlwi r4, r0, 0x10
@ -10530,7 +10530,7 @@ lbl_8001887C:
/* 800188AC 0001580C 80 1E 02 F8 */ lwz r0, 0x2f8(r30) /* 800188AC 0001580C 80 1E 02 F8 */ lwz r0, 0x2f8(r30)
/* 800188B0 00015810 2C 00 00 00 */ cmpwi r0, 0 /* 800188B0 00015810 2C 00 00 00 */ cmpwi r0, 0
/* 800188B4 00015814 40 82 00 3C */ bne lbl_800188F0 /* 800188B4 00015814 40 82 00 3C */ bne lbl_800188F0
/* 800188B8 00015818 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 800188B8 00015818 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 800188BC 0001581C 38 61 00 2C */ addi r3, r1, 0x2c /* 800188BC 0001581C 38 61 00 2C */ addi r3, r1, 0x2c
/* 800188C0 00015820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 800188C0 00015820 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 800188C4 00015824 38 80 05 EC */ li r4, 0x5ec /* 800188C4 00015824 38 80 05 EC */ li r4, 0x5ec
@ -10573,7 +10573,7 @@ lbl_80018940:
/* 80018950 000158B0 40 82 00 44 */ bne lbl_80018994 /* 80018950 000158B0 40 82 00 44 */ bne lbl_80018994
/* 80018954 000158B4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80018954 000158B4 FC 1F 00 40 */ fcmpo cr0, f31, f0
/* 80018958 000158B8 40 80 00 3C */ bge lbl_80018994 /* 80018958 000158B8 40 80 00 3C */ bge lbl_80018994
/* 8001895C 000158BC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8001895C 000158BC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80018960 000158C0 38 61 00 24 */ addi r3, r1, 0x24 /* 80018960 000158C0 38 61 00 24 */ addi r3, r1, 0x24
/* 80018964 000158C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80018964 000158C4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80018968 000158C8 38 80 05 EC */ li r4, 0x5ec /* 80018968 000158C8 38 80 05 EC */ li r4, 0x5ec

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

@ -4093,7 +4093,7 @@ lbl_80285670:
/* 8028567C 002825DC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8028567C 002825DC 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80285680 002825E0 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80285680 002825E0 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 80285684 002825E4 38 61 00 08 */ addi r3, r1, 8 /* 80285684 002825E4 38 61 00 08 */ addi r3, r1, 8
/* 80285688 002825E8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80285688 002825E8 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8028568C 002825EC 38 A1 00 10 */ addi r5, r1, 0x10 /* 8028568C 002825EC 38 A1 00 10 */ addi r5, r1, 0x10
/* 80285690 002825F0 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80285690 002825F0 D0 01 00 10 */ stfs f0, 0x10(r1)
/* 80285694 002825F4 38 80 05 BC */ li r4, 0x5bc /* 80285694 002825F4 38 80 05 BC */ li r4, 0x5bc
@ -5075,7 +5075,7 @@ lbl_80286434:
/* 80286434 00283394 80 1F 02 58 */ lwz r0, 0x258(r31) /* 80286434 00283394 80 1F 02 58 */ lwz r0, 0x258(r31)
/* 80286438 00283398 2C 00 00 02 */ cmpwi r0, 2 /* 80286438 00283398 2C 00 00 02 */ cmpwi r0, 2
/* 8028643C 0028339C 40 82 00 80 */ bne lbl_802864BC /* 8028643C 0028339C 40 82 00 80 */ bne lbl_802864BC
/* 80286440 002833A0 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80286440 002833A0 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80286444 002833A4 38 61 00 10 */ addi r3, r1, 0x10 /* 80286444 002833A4 38 61 00 10 */ addi r3, r1, 0x10
/* 80286448 002833A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80286448 002833A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 8028644C 002833AC 38 80 05 BE */ li r4, 0x5be /* 8028644C 002833AC 38 80 05 BE */ li r4, 0x5be
@ -5109,7 +5109,7 @@ lbl_80286434:
lbl_802864BC: lbl_802864BC:
/* 802864BC 0028341C 2C 00 00 01 */ cmpwi r0, 1 /* 802864BC 0028341C 2C 00 00 01 */ cmpwi r0, 1
/* 802864C0 00283420 41 82 00 E0 */ beq lbl_802865A0 /* 802864C0 00283420 41 82 00 E0 */ beq lbl_802865A0
/* 802864C4 00283424 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 802864C4 00283424 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 802864C8 00283428 38 61 00 08 */ addi r3, r1, 8 /* 802864C8 00283428 38 61 00 08 */ addi r3, r1, 8
/* 802864CC 0028342C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 802864CC 0028342C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 802864D0 00283430 38 80 05 BF */ li r4, 0x5bf /* 802864D0 00283430 38 80 05 BF */ li r4, 0x5bf
@ -6640,7 +6640,7 @@ lbl_802879AC:
/* 80287A28 00284988 7F 83 E3 78 */ mr r3, r28 /* 80287A28 00284988 7F 83 E3 78 */ mr r3, r28
/* 80287A2C 0028498C 38 81 00 88 */ addi r4, r1, 0x88 /* 80287A2C 0028498C 38 81 00 88 */ addi r4, r1, 0x88
/* 80287A30 00284990 4B E9 32 71 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f /* 80287A30 00284990 4B E9 32 71 */ bl SetVelocityWR__13CPhysicsActorFRC9CVector3f
/* 80287A34 00284994 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80287A34 00284994 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80287A38 00284998 38 61 00 14 */ addi r3, r1, 0x14 /* 80287A38 00284998 38 61 00 14 */ addi r3, r1, 0x14
/* 80287A3C 0028499C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80287A3C 0028499C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80287A40 002849A0 38 80 06 18 */ li r4, 0x618 /* 80287A40 002849A0 38 80 06 18 */ li r4, 0x618

25
asm/MetroidPrime/Player/CPlayerVisor.s
View File

@ -1023,7 +1023,7 @@ UpdateScanWindow__12CPlayerVisorFfRC13CStateManager:
/* 80112998 0010F8F8 40 82 00 4C */ bne lbl_801129E4 /* 80112998 0010F8F8 40 82 00 4C */ bne lbl_801129E4
/* 8011299C 0010F8FC 88 BF 00 24 */ lbz r5, 0x24(r31) /* 8011299C 0010F8FC 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 801129A0 0010F900 38 61 00 18 */ addi r3, r1, 0x18 /* 801129A0 0010F900 38 61 00 18 */ addi r3, r1, 0x18
/* 801129A4 0010F904 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801129A4 0010F904 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801129A8 0010F908 38 80 05 7F */ li r4, 0x57f /* 801129A8 0010F908 38 80 05 7F */ li r4, 0x57f
/* 801129AC 0010F90C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801129AC 0010F90C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801129B0 0010F910 38 C0 00 40 */ li r6, 0x40 /* 801129B0 0010F910 38 C0 00 40 */ li r6, 0x40
@ -1136,7 +1136,7 @@ lbl_80112B1C:
/* 80112B2C 0010FA8C 40 82 00 E4 */ bne lbl_80112C10 /* 80112B2C 0010FA8C 40 82 00 E4 */ bne lbl_80112C10
/* 80112B30 0010FA90 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80112B30 0010FA90 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80112B34 0010FA94 38 61 00 10 */ addi r3, r1, 0x10 /* 80112B34 0010FA94 38 61 00 10 */ addi r3, r1, 0x10
/* 80112B38 0010FA98 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80112B38 0010FA98 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80112B3C 0010FA9C 38 80 05 83 */ li r4, 0x583 /* 80112B3C 0010FA9C 38 80 05 83 */ li r4, 0x583
/* 80112B40 0010FAA0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80112B40 0010FAA0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80112B44 0010FAA4 38 C0 00 40 */ li r6, 0x40 /* 80112B44 0010FAA4 38 C0 00 40 */ li r6, 0x40
@ -1188,7 +1188,7 @@ lbl_80112BC8:
/* 80112BE8 0010FB48 40 82 00 28 */ bne lbl_80112C10 /* 80112BE8 0010FB48 40 82 00 28 */ bne lbl_80112C10
/* 80112BEC 0010FB4C 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80112BEC 0010FB4C 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80112BF0 0010FB50 38 61 00 0C */ addi r3, r1, 0xc /* 80112BF0 0010FB50 38 61 00 0C */ addi r3, r1, 0xc
/* 80112BF4 0010FB54 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80112BF4 0010FB54 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80112BF8 0010FB58 38 80 05 81 */ li r4, 0x581 /* 80112BF8 0010FB58 38 80 05 81 */ li r4, 0x581
/* 80112BFC 0010FB5C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80112BFC 0010FB5C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80112C00 0010FB60 38 C0 00 40 */ li r6, 0x40 /* 80112C00 0010FB60 38 C0 00 40 */ li r6, 0x40
@ -2557,7 +2557,7 @@ lbl_80113F9C:
/* 80113FB4 00110F14 80 1F 00 5C */ lwz r0, 0x5c(r31) /* 80113FB4 00110F14 80 1F 00 5C */ lwz r0, 0x5c(r31)
/* 80113FB8 00110F18 28 00 00 00 */ cmplwi r0, 0 /* 80113FB8 00110F18 28 00 00 00 */ cmplwi r0, 0
/* 80113FBC 00110F1C 40 82 00 FC */ bne lbl_801140B8 /* 80113FBC 00110F1C 40 82 00 FC */ bne lbl_801140B8
/* 80113FC0 00110F20 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80113FC0 00110F20 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80113FC4 00110F24 38 61 00 14 */ addi r3, r1, 0x14 /* 80113FC4 00110F24 38 61 00 14 */ addi r3, r1, 0x14
/* 80113FC8 00110F28 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80113FC8 00110F28 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80113FCC 00110F2C 38 80 05 68 */ li r4, 0x568 /* 80113FCC 00110F2C 38 80 05 68 */ li r4, 0x568
@ -2590,7 +2590,7 @@ lbl_80113FF8:
/* 80114034 00110F94 80 1F 00 5C */ lwz r0, 0x5c(r31) /* 80114034 00110F94 80 1F 00 5C */ lwz r0, 0x5c(r31)
/* 80114038 00110F98 28 00 00 00 */ cmplwi r0, 0 /* 80114038 00110F98 28 00 00 00 */ cmplwi r0, 0
/* 8011403C 00110F9C 40 82 00 7C */ bne lbl_801140B8 /* 8011403C 00110F9C 40 82 00 7C */ bne lbl_801140B8
/* 80114040 00110FA0 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80114040 00110FA0 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80114044 00110FA4 38 61 00 0C */ addi r3, r1, 0xc /* 80114044 00110FA4 38 61 00 0C */ addi r3, r1, 0xc
/* 80114048 00110FA8 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80114048 00110FA8 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 8011404C 00110FAC 38 80 05 7C */ li r4, 0x57c /* 8011404C 00110FAC 38 80 05 7C */ li r4, 0x57c
@ -2608,7 +2608,7 @@ lbl_80114078:
/* 80114078 00110FD8 80 1F 00 5C */ lwz r0, 0x5c(r31) /* 80114078 00110FD8 80 1F 00 5C */ lwz r0, 0x5c(r31)
/* 8011407C 00110FDC 28 00 00 00 */ cmplwi r0, 0 /* 8011407C 00110FDC 28 00 00 00 */ cmplwi r0, 0
/* 80114080 00110FE0 40 82 00 38 */ bne lbl_801140B8 /* 80114080 00110FE0 40 82 00 38 */ bne lbl_801140B8
/* 80114084 00110FE4 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80114084 00110FE4 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80114088 00110FE8 38 61 00 08 */ addi r3, r1, 8 /* 80114088 00110FE8 38 61 00 08 */ addi r3, r1, 8
/* 8011408C 00110FEC 88 BF 00 24 */ lbz r5, 0x24(r31) /* 8011408C 00110FEC 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80114090 00110FF0 38 80 05 6C */ li r4, 0x56c /* 80114090 00110FF0 38 80 05 6C */ li r4, 0x56c
@ -2660,7 +2660,7 @@ lbl_8011410C:
/* 80114130 00111090 38 80 05 67 */ li r4, 0x567 /* 80114130 00111090 38 80 05 67 */ li r4, 0x567
/* 80114134 00111094 D0 3F 00 C4 */ stfs f1, 0xc4(r31) /* 80114134 00111094 D0 3F 00 C4 */ stfs f1, 0xc4(r31)
/* 80114138 00111098 38 C0 00 40 */ li r6, 0x40 /* 80114138 00111098 38 C0 00 40 */ li r6, 0x40
/* 8011413C 0011109C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8011413C 0011109C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80114140 001110A0 38 E0 00 00 */ li r7, 0 /* 80114140 001110A0 38 E0 00 00 */ li r7, 0
/* 80114144 001110A4 D0 1F 00 C8 */ stfs f0, 0xc8(r31) /* 80114144 001110A4 D0 1F 00 C8 */ stfs f0, 0xc8(r31)
/* 80114148 001110A8 39 20 00 00 */ li r9, 0 /* 80114148 001110A8 39 20 00 00 */ li r9, 0
@ -2671,7 +2671,7 @@ lbl_8011410C:
lbl_8011415C: lbl_8011415C:
/* 8011415C 001110BC 88 BF 00 24 */ lbz r5, 0x24(r31) /* 8011415C 001110BC 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80114160 001110C0 38 61 00 0C */ addi r3, r1, 0xc /* 80114160 001110C0 38 61 00 0C */ addi r3, r1, 0xc
/* 80114164 001110C4 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80114164 001110C4 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80114168 001110C8 38 80 05 67 */ li r4, 0x567 /* 80114168 001110C8 38 80 05 67 */ li r4, 0x567
/* 8011416C 001110CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8011416C 001110CC 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80114170 001110D0 38 C0 00 40 */ li r6, 0x40 /* 80114170 001110D0 38 C0 00 40 */ li r6, 0x40
@ -2690,7 +2690,7 @@ lbl_8011415C:
lbl_801141A4: lbl_801141A4:
/* 801141A4 00111104 88 BF 00 24 */ lbz r5, 0x24(r31) /* 801141A4 00111104 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 801141A8 00111108 38 61 00 08 */ addi r3, r1, 8 /* 801141A8 00111108 38 61 00 08 */ addi r3, r1, 8
/* 801141AC 0011110C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801141AC 0011110C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801141B0 00111110 38 80 05 67 */ li r4, 0x567 /* 801141B0 00111110 38 80 05 67 */ li r4, 0x567
/* 801141B4 00111114 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801141B4 00111114 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801141B8 00111118 38 C0 00 40 */ li r6, 0x40 /* 801141B8 00111118 38 C0 00 40 */ li r6, 0x40
@ -2782,7 +2782,7 @@ lbl_801142CC:
lbl_801142D8: lbl_801142D8:
/* 801142D8 00111238 88 BF 00 24 */ lbz r5, 0x24(r31) /* 801142D8 00111238 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 801142DC 0011123C 38 61 00 14 */ addi r3, r1, 0x14 /* 801142DC 0011123C 38 61 00 14 */ addi r3, r1, 0x14
/* 801142E0 00111240 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801142E0 00111240 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801142E4 00111244 38 80 05 66 */ li r4, 0x566 /* 801142E4 00111244 38 80 05 66 */ li r4, 0x566
/* 801142E8 00111248 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801142E8 00111248 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801142EC 0011124C 38 C0 00 40 */ li r6, 0x40 /* 801142EC 0011124C 38 C0 00 40 */ li r6, 0x40
@ -2801,7 +2801,7 @@ lbl_80114300:
lbl_8011431C: lbl_8011431C:
/* 8011431C 0011127C 88 BF 00 24 */ lbz r5, 0x24(r31) /* 8011431C 0011127C 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80114320 00111280 38 61 00 0C */ addi r3, r1, 0xc /* 80114320 00111280 38 61 00 0C */ addi r3, r1, 0xc
/* 80114324 00111284 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80114324 00111284 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80114328 00111288 38 80 05 66 */ li r4, 0x566 /* 80114328 00111288 38 80 05 66 */ li r4, 0x566
/* 8011432C 0011128C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8011432C 0011128C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80114330 00111290 38 C0 00 40 */ li r6, 0x40 /* 80114330 00111290 38 C0 00 40 */ li r6, 0x40
@ -2812,7 +2812,7 @@ lbl_8011431C:
lbl_80114344: lbl_80114344:
/* 80114344 001112A4 88 BF 00 24 */ lbz r5, 0x24(r31) /* 80114344 001112A4 88 BF 00 24 */ lbz r5, 0x24(r31)
/* 80114348 001112A8 38 61 00 08 */ addi r3, r1, 8 /* 80114348 001112A8 38 61 00 08 */ addi r3, r1, 8
/* 8011434C 001112AC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8011434C 001112AC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80114350 001112B0 38 80 05 66 */ li r4, 0x566 /* 80114350 001112B0 38 80 05 66 */ li r4, 0x566
/* 80114354 001112B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80114354 001112B4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80114358 001112B8 38 C0 00 40 */ li r6, 0x40 /* 80114358 001112B8 38 C0 00 40 */ li r6, 0x40
@ -3467,4 +3467,3 @@ lbl_803CF210:
.asciz "R_XRayPalette" .asciz "R_XRayPalette"
.balign 4 .balign 4
.4byte 0 .4byte 0

11
asm/MetroidPrime/Player/CScanDisplay.s
View File

@ -309,7 +309,7 @@ lbl_80172E10:
/* 80172E14 0016FD74 C0 02 A1 14 */ lfs f0, lbl_805ABE34@sda21(r2) /* 80172E14 0016FD74 C0 02 A1 14 */ lfs f0, lbl_805ABE34@sda21(r2)
/* 80172E18 0016FD78 90 1F 00 0C */ stw r0, 0xc(r31) /* 80172E18 0016FD78 90 1F 00 0C */ stw r0, 0xc(r31)
/* 80172E1C 0016FD7C 38 61 00 2C */ addi r3, r1, 0x2c /* 80172E1C 0016FD7C 38 61 00 2C */ addi r3, r1, 0x2c
/* 80172E20 0016FD80 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80172E20 0016FD80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80172E24 0016FD84 38 80 05 9F */ li r4, 0x59f /* 80172E24 0016FD84 38 80 05 9F */ li r4, 0x59f
/* 80172E28 0016FD88 D0 1F 01 A4 */ stfs f0, 0x1a4(r31) /* 80172E28 0016FD88 D0 1F 01 A4 */ stfs f0, 0x1a4(r31)
/* 80172E2C 0016FD8C 38 A0 00 7F */ li r5, 0x7f /* 80172E2C 0016FD8C 38 A0 00 7F */ li r5, 0x7f
@ -366,7 +366,7 @@ lbl_80172EE0:
/* 80172EE0 0016FE40 80 1F 01 AC */ lwz r0, 0x1ac(r31) /* 80172EE0 0016FE40 80 1F 01 AC */ lwz r0, 0x1ac(r31)
/* 80172EE4 0016FE44 7C 00 E0 00 */ cmpw r0, r28 /* 80172EE4 0016FE44 7C 00 E0 00 */ cmpw r0, r28
/* 80172EE8 0016FE48 41 82 00 98 */ beq lbl_80172F80 /* 80172EE8 0016FE48 41 82 00 98 */ beq lbl_80172F80
/* 80172EEC 0016FE4C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80172EEC 0016FE4C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80172EF0 0016FE50 38 61 00 20 */ addi r3, r1, 0x20 /* 80172EF0 0016FE50 38 61 00 20 */ addi r3, r1, 0x20
/* 80172EF4 0016FE54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80172EF4 0016FE54 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80172EF8 0016FE58 38 80 05 9F */ li r4, 0x59f /* 80172EF8 0016FE58 38 80 05 9F */ li r4, 0x59f
@ -738,7 +738,7 @@ lbl_80173438:
/* 8017343C 0017039C C0 02 A1 14 */ lfs f0, lbl_805ABE34@sda21(r2) /* 8017343C 0017039C C0 02 A1 14 */ lfs f0, lbl_805ABE34@sda21(r2)
/* 80173440 001703A0 90 1F 00 0C */ stw r0, 0xc(r31) /* 80173440 001703A0 90 1F 00 0C */ stw r0, 0xc(r31)
/* 80173444 001703A4 38 61 00 28 */ addi r3, r1, 0x28 /* 80173444 001703A4 38 61 00 28 */ addi r3, r1, 0x28
/* 80173448 001703A8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80173448 001703A8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8017344C 001703AC 38 80 05 89 */ li r4, 0x589 /* 8017344C 001703AC 38 80 05 89 */ li r4, 0x589
/* 80173450 001703B0 D0 1F 01 A4 */ stfs f0, 0x1a4(r31) /* 80173450 001703B0 D0 1F 01 A4 */ stfs f0, 0x1a4(r31)
/* 80173454 001703B4 38 A0 00 7F */ li r5, 0x7f /* 80173454 001703B4 38 A0 00 7F */ li r5, 0x7f
@ -786,7 +786,7 @@ lbl_80173474:
/* 801734F8 00170458 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801734F8 00170458 80 7F 00 A8 */ lwz r3, 0xa8(r31)
/* 801734FC 0017045C 38 80 00 01 */ li r4, 1 /* 801734FC 0017045C 38 80 00 01 */ li r4, 1
/* 80173500 00170460 48 00 15 C1 */ bl SetScanMessageTypeEffect__12CScanDisplayFP12CGuiTextPaneb /* 80173500 00170460 48 00 15 C1 */ bl SetScanMessageTypeEffect__12CScanDisplayFP12CGuiTextPaneb
/* 80173504 00170464 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80173504 00170464 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80173508 00170468 38 61 00 24 */ addi r3, r1, 0x24 /* 80173508 00170468 38 61 00 24 */ addi r3, r1, 0x24
/* 8017350C 0017046C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 8017350C 0017046C 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80173510 00170470 38 80 05 91 */ li r4, 0x591 /* 80173510 00170470 38 80 05 91 */ li r4, 0x591
@ -942,7 +942,7 @@ lbl_8017372C:
/* 80173730 00170690 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80173730 00170690 FC 00 08 00 */ fcmpu cr0, f0, f1
/* 80173734 00170694 40 82 00 48 */ bne lbl_8017377C /* 80173734 00170694 40 82 00 48 */ bne lbl_8017377C
/* 80173738 00170698 38 00 00 04 */ li r0, 4 /* 80173738 00170698 38 00 00 04 */ li r0, 4
/* 8017373C 0017069C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8017373C 0017069C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80173740 001706A0 90 1C 00 00 */ stw r0, 0(r28) /* 80173740 001706A0 90 1C 00 00 */ stw r0, 0(r28)
/* 80173744 001706A4 38 61 00 18 */ addi r3, r1, 0x18 /* 80173744 001706A4 38 61 00 18 */ addi r3, r1, 0x18
/* 80173748 001706A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80173748 001706A8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
@ -2460,4 +2460,3 @@ lbl_803D0620:
# ROM: 0x3CD620 # ROM: 0x3CD620
.asciz "TXTR_DataDot" .asciz "TXTR_DataDot"
.balign 4 .balign 4

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

@ -444,7 +444,7 @@ lbl_8029F594:
/* 8029F5E4 0029C544 48 0A 18 5D */ bl __dt__6CTokenFv /* 8029F5E4 0029C544 48 0A 18 5D */ bl __dt__6CTokenFv
lbl_8029F5E8: lbl_8029F5E8:
/* 8029F5E8 0029C548 38 00 00 00 */ li r0, 0 /* 8029F5E8 0029C548 38 00 00 00 */ li r0, 0
/* 8029F5EC 0029C54C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8029F5EC 0029C54C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8029F5F0 0029C550 98 01 00 90 */ stb r0, 0x90(r1) /* 8029F5F0 0029C550 98 01 00 90 */ stb r0, 0x90(r1)
/* 8029F5F4 0029C554 38 61 00 3C */ addi r3, r1, 0x3c /* 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, lbl_805AE320@sda21(r2)

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

@ -1971,7 +1971,7 @@ sub_801cfbd4:
/* 801CFC48 001CCBA8 38 E0 00 00 */ li r7, 0 /* 801CFC48 001CCBA8 38 E0 00 00 */ li r7, 0
/* 801CFC4C 001CCBAC C0 06 00 08 */ lfs f0, 8(r6) /* 801CFC4C 001CCBAC C0 06 00 08 */ lfs f0, 8(r6)
/* 801CFC50 001CCBB0 D0 A1 00 18 */ stfs f5, 0x18(r1) /* 801CFC50 001CCBB0 D0 A1 00 18 */ stfs f5, 0x18(r1)
/* 801CFC54 001CCBB4 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 801CFC54 001CCBB4 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 801CFC58 001CCBB8 D0 A1 00 1C */ stfs f5, 0x1c(r1) /* 801CFC58 001CCBB8 D0 A1 00 1C */ stfs f5, 0x1c(r1)
/* 801CFC5C 001CCBBC D0 A1 00 20 */ stfs f5, 0x20(r1) /* 801CFC5C 001CCBBC D0 A1 00 20 */ stfs f5, 0x20(r1)
/* 801CFC60 001CCBC0 D0 81 00 24 */ stfs f4, 0x24(r1) /* 801CFC60 001CCBC0 D0 81 00 24 */ stfs f4, 0x24(r1)

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

@ -345,7 +345,7 @@ UpdateFrozenState__16CScriptGunTurretFfR13CStateManager:
/* 80215A6C 002129CC 38 61 00 08 */ addi r3, r1, 8 /* 80215A6C 002129CC 38 61 00 08 */ addi r3, r1, 8
/* 80215A70 002129D0 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80215A70 002129D0 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 80215A74 002129D4 38 A1 00 0C */ addi r5, r1, 0xc /* 80215A74 002129D4 38 A1 00 0C */ addi r5, r1, 0xc
/* 80215A78 002129D8 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80215A78 002129D8 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80215A7C 002129DC 38 E0 00 00 */ li r7, 0 /* 80215A7C 002129DC 38 E0 00 00 */ li r7, 0
/* 80215A80 002129E0 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80215A80 002129E0 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80215A84 002129E4 39 00 00 00 */ li r8, 0 /* 80215A84 002129E4 39 00 00 00 */ li r8, 0
@ -953,7 +953,7 @@ lbl_80216348:
/* 80216368 002132C8 38 61 00 20 */ addi r3, r1, 0x20 /* 80216368 002132C8 38 61 00 20 */ addi r3, r1, 0x20
/* 8021636C 002132CC C0 1F 00 40 */ lfs f0, 0x40(r31) /* 8021636C 002132CC C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 80216370 002132D0 38 A1 00 50 */ addi r5, r1, 0x50 /* 80216370 002132D0 38 A1 00 50 */ addi r5, r1, 0x50
/* 80216374 002132D4 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80216374 002132D4 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80216378 002132D8 38 E0 00 00 */ li r7, 0 /* 80216378 002132D8 38 E0 00 00 */ li r7, 0
/* 8021637C 002132DC D0 01 00 50 */ stfs f0, 0x50(r1) /* 8021637C 002132DC D0 01 00 50 */ stfs f0, 0x50(r1)
/* 80216380 002132E0 39 00 00 00 */ li r8, 0 /* 80216380 002132E0 39 00 00 00 */ li r8, 0
@ -999,7 +999,7 @@ lbl_802163E0:
/* 80216414 00213374 38 61 00 1C */ addi r3, r1, 0x1c /* 80216414 00213374 38 61 00 1C */ addi r3, r1, 0x1c
/* 80216418 00213378 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80216418 00213378 C0 1F 00 40 */ lfs f0, 0x40(r31)
/* 8021641C 0021337C 38 A1 00 44 */ addi r5, r1, 0x44 /* 8021641C 0021337C 38 A1 00 44 */ addi r5, r1, 0x44
/* 80216420 00213380 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80216420 00213380 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80216424 00213384 38 E0 00 00 */ li r7, 0 /* 80216424 00213384 38 E0 00 00 */ li r7, 0
/* 80216428 00213388 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80216428 00213388 D0 01 00 44 */ stfs f0, 0x44(r1)
/* 8021642C 0021338C 39 00 00 01 */ li r8, 1 /* 8021642C 0021338C 39 00 00 01 */ li r8, 1
@ -3507,7 +3507,7 @@ lbl_802188A0:
/* 802188E8 00215848 38 61 00 08 */ addi r3, r1, 8 /* 802188E8 00215848 38 61 00 08 */ addi r3, r1, 8
/* 802188EC 0021584C C0 1E 00 40 */ lfs f0, 0x40(r30) /* 802188EC 0021584C C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 802188F0 00215850 38 A1 00 0C */ addi r5, r1, 0xc /* 802188F0 00215850 38 A1 00 0C */ addi r5, r1, 0xc
/* 802188F4 00215854 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 802188F4 00215854 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 802188F8 00215858 38 E0 00 00 */ li r7, 0 /* 802188F8 00215858 38 E0 00 00 */ li r7, 0
/* 802188FC 0021585C D0 01 00 0C */ stfs f0, 0xc(r1) /* 802188FC 0021585C D0 01 00 0C */ stfs f0, 0xc(r1)
/* 80218900 00215860 39 00 00 00 */ li r8, 0 /* 80218900 00215860 39 00 00 00 */ li r8, 0
@ -4314,7 +4314,7 @@ lbl_80219478:
/* 802194C0 00216420 38 61 00 08 */ addi r3, r1, 8 /* 802194C0 00216420 38 61 00 08 */ addi r3, r1, 8
/* 802194C4 00216424 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 802194C4 00216424 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 802194C8 00216428 38 A1 00 0C */ addi r5, r1, 0xc /* 802194C8 00216428 38 A1 00 0C */ addi r5, r1, 0xc
/* 802194CC 0021642C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 802194CC 0021642C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 802194D0 00216430 38 E0 00 00 */ li r7, 0 /* 802194D0 00216430 38 E0 00 00 */ li r7, 0
/* 802194D4 00216434 D0 01 00 0C */ stfs f0, 0xc(r1) /* 802194D4 00216434 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 802194D8 00216438 39 00 00 00 */ li r8, 0 /* 802194D8 00216438 39 00 00 00 */ li r8, 0
@ -4428,7 +4428,7 @@ lbl_802195FC:
/* 80219664 002165C4 38 61 00 08 */ addi r3, r1, 8 /* 80219664 002165C4 38 61 00 08 */ addi r3, r1, 8
/* 80219668 002165C8 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80219668 002165C8 C0 1E 00 40 */ lfs f0, 0x40(r30)
/* 8021966C 002165CC 38 A1 00 0C */ addi r5, r1, 0xc /* 8021966C 002165CC 38 A1 00 0C */ addi r5, r1, 0xc
/* 80219670 002165D0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80219670 002165D0 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80219674 002165D4 38 E0 00 00 */ li r7, 0 /* 80219674 002165D4 38 E0 00 00 */ li r7, 0
/* 80219678 002165D8 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80219678 002165D8 D0 01 00 0C */ stfs f0, 0xc(r1)
/* 8021967C 002165DC 39 00 00 00 */ li r8, 0 /* 8021967C 002165DC 39 00 00 00 */ li r8, 0

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

@ -364,7 +364,7 @@ AddOrUpdateEmitter__22CScriptSpecialFunctionFfR10CSfxHandleUsRC9CVector3fUc:
/* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, lbl_805AE320@sda21(r2) /* 8014F41C 0014C37C 80 82 C6 00 */ lwz r4, lbl_805AE320@sda21(r2)
/* 8014F420 0014C380 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 8014F420 0014C380 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l /* 8014F424 0014C384 38 03 66 A0 */ addi r0, r3, sZeroVector__9CVector3f@l
/* 8014F428 0014C388 A9 42 C5 FA */ lha r10, lbl_805AE31A@sda21(r2) /* 8014F428 0014C388 A9 42 C5 FA */ lha r10, kMedPriority__11CSfxManager@sda21(r2)
/* 8014F42C 0014C38C 90 81 00 08 */ stw r4, 8(r1) /* 8014F42C 0014C38C 90 81 00 08 */ stw r4, 8(r1)
/* 8014F430 0014C390 7C A4 2B 78 */ mr r4, r5 /* 8014F430 0014C390 7C A4 2B 78 */ mr r4, r5
/* 8014F434 0014C394 7C C5 33 78 */ mr r5, r6 /* 8014F434 0014C394 7C C5 33 78 */ mr r5, r6
@ -1634,7 +1634,7 @@ lbl_80150638:
/* 80150684 0014D5E4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80150684 0014D5E4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80150688 0014D5E8 C0 18 00 40 */ lfs f0, 0x40(r24) /* 80150688 0014D5E8 C0 18 00 40 */ lfs f0, 0x40(r24)
/* 8015068C 0014D5EC 38 61 00 14 */ addi r3, r1, 0x14 /* 8015068C 0014D5EC 38 61 00 14 */ addi r3, r1, 0x14
/* 80150690 0014D5F0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80150690 0014D5F0 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80150694 0014D5F4 38 A1 00 60 */ addi r5, r1, 0x60 /* 80150694 0014D5F4 38 A1 00 60 */ addi r5, r1, 0x60
/* 80150698 0014D5F8 D0 01 00 60 */ stfs f0, 0x60(r1) /* 80150698 0014D5F8 D0 01 00 60 */ stfs f0, 0x60(r1)
/* 8015069C 0014D5FC 38 E0 00 01 */ li r7, 1 /* 8015069C 0014D5FC 38 E0 00 01 */ li r7, 1
@ -1682,7 +1682,7 @@ lbl_801506F0:
/* 80150734 0014D694 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80150734 0014D694 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80150738 0014D698 C0 18 00 40 */ lfs f0, 0x40(r24) /* 80150738 0014D698 C0 18 00 40 */ lfs f0, 0x40(r24)
/* 8015073C 0014D69C 38 61 00 10 */ addi r3, r1, 0x10 /* 8015073C 0014D69C 38 61 00 10 */ addi r3, r1, 0x10
/* 80150740 0014D6A0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80150740 0014D6A0 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80150744 0014D6A4 38 A1 00 54 */ addi r5, r1, 0x54 /* 80150744 0014D6A4 38 A1 00 54 */ addi r5, r1, 0x54
/* 80150748 0014D6A8 D0 01 00 54 */ stfs f0, 0x54(r1) /* 80150748 0014D6A8 D0 01 00 54 */ stfs f0, 0x54(r1)
/* 8015074C 0014D6AC 38 E0 00 01 */ li r7, 1 /* 8015074C 0014D6AC 38 E0 00 01 */ li r7, 1

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

@ -443,7 +443,7 @@ lbl_801D7524:
lbl_801D7534: lbl_801D7534:
/* 801D7534 001D4494 A0 9C 00 F8 */ lhz r4, 0xf8(r28) /* 801D7534 001D4494 A0 9C 00 F8 */ lhz r4, 0xf8(r28)
/* 801D7538 001D4498 38 61 00 20 */ addi r3, r1, 0x20 /* 801D7538 001D4498 38 61 00 20 */ addi r3, r1, 0x20
/* 801D753C 001D449C A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801D753C 001D449C A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801D7540 001D44A0 38 A0 00 7F */ li r5, 0x7f /* 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, lbl_805AE320@sda21(r2)
/* 801D7548 001D44A8 38 C0 00 40 */ li r6, 0x40 /* 801D7548 001D44A8 38 C0 00 40 */ li r6, 0x40

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

@ -420,7 +420,7 @@ lbl_8008FEBC:
/* 8008FEE4 0008CE44 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8008FEE4 0008CE44 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8008FEE8 0008CE48 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 8008FEE8 0008CE48 C0 1C 00 40 */ lfs f0, 0x40(r28)
/* 8008FEEC 0008CE4C 38 61 00 38 */ addi r3, r1, 0x38 /* 8008FEEC 0008CE4C 38 61 00 38 */ addi r3, r1, 0x38
/* 8008FEF0 0008CE50 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8008FEF0 0008CE50 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8008FEF4 0008CE54 38 A1 00 50 */ addi r5, r1, 0x50 /* 8008FEF4 0008CE54 38 A1 00 50 */ addi r5, r1, 0x50
/* 8008FEF8 0008CE58 D0 01 00 50 */ stfs f0, 0x50(r1) /* 8008FEF8 0008CE58 D0 01 00 50 */ stfs f0, 0x50(r1)
/* 8008FEFC 0008CE5C 38 80 06 DC */ li r4, 0x6dc /* 8008FEFC 0008CE5C 38 80 06 DC */ li r4, 0x6dc
@ -933,7 +933,7 @@ Explode__5CBombFRC9CVector3fR13CStateManager:
/* 80090664 0008D5C4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80090664 0008D5C4 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80090668 0008D5C8 C0 1D 00 40 */ lfs f0, 0x40(r29) /* 80090668 0008D5C8 C0 1D 00 40 */ lfs f0, 0x40(r29)
/* 8009066C 0008D5CC 38 61 00 18 */ addi r3, r1, 0x18 /* 8009066C 0008D5CC 38 61 00 18 */ addi r3, r1, 0x18
/* 80090670 0008D5D0 A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 80090670 0008D5D0 A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 80090674 0008D5D4 38 A1 00 1C */ addi r5, r1, 0x1c /* 80090674 0008D5D4 38 A1 00 1C */ addi r5, r1, 0x1c
/* 80090678 0008D5D8 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 80090678 0008D5D8 D0 01 00 1C */ stfs f0, 0x1c(r1)
/* 8009067C 0008D5DC 38 80 06 DE */ li r4, 0x6de /* 8009067C 0008D5DC 38 80 06 DE */ li r4, 0x6de

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

@ -215,7 +215,7 @@ PlayImpactSound__17CEnergyProjectileFRC9CVector3f29EWeaponCollisionResponseTypes
/* 80213D34 00210C94 48 0D 4C 7D */ bl TranslateSFXID__11CSfxManagerFUs /* 80213D34 00210C94 48 0D 4C 7D */ bl TranslateSFXID__11CSfxManagerFUs
/* 80213D38 00210C98 B0 61 00 38 */ sth r3, 0x38(r1) /* 80213D38 00210C98 B0 61 00 38 */ sth r3, 0x38(r1)
/* 80213D3C 00210C9C 38 61 00 0C */ addi r3, r1, 0xc /* 80213D3C 00210C9C 38 61 00 0C */ addi r3, r1, 0xc
/* 80213D40 00210CA0 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 80213D40 00210CA0 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 80213D44 00210CA4 38 81 00 14 */ addi r4, r1, 0x14 /* 80213D44 00210CA4 38 81 00 14 */ addi r4, r1, 0x14
/* 80213D48 00210CA8 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) /* 80213D48 00210CA8 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2)
/* 80213D4C 00210CAC 38 A0 00 01 */ li r5, 1 /* 80213D4C 00210CAC 38 A0 00 01 */ li r5, 1
@ -516,7 +516,7 @@ lbl_802140E8:
/* 802141B0 00211110 38 61 00 2C */ addi r3, r1, 0x2c /* 802141B0 00211110 38 61 00 2C */ addi r3, r1, 0x2c
/* 802141B4 00211114 38 80 00 00 */ li r4, 0 /* 802141B4 00211114 38 80 00 00 */ li r4, 0
/* 802141B8 00211118 48 12 CC 89 */ bl __dt__6CTokenFv /* 802141B8 00211118 48 12 CC 89 */ bl __dt__6CTokenFv
/* 802141BC 0021111C A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 802141BC 0021111C A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 802141C0 00211120 38 61 00 1C */ addi r3, r1, 0x1c /* 802141C0 00211120 38 61 00 1C */ addi r3, r1, 0x1c
/* 802141C4 00211124 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2) /* 802141C4 00211124 81 02 C6 00 */ lwz r8, lbl_805AE320@sda21(r2)
/* 802141C8 00211128 38 81 00 90 */ addi r4, r1, 0x90 /* 802141C8 00211128 38 81 00 90 */ addi r4, r1, 0x90

2
asm/MetroidPrime/Weapons/CIceProjectile.s
View File

@ -1318,7 +1318,7 @@ UpdateTrailObjects__20CIceAttackProjectileFfR13CStateManager:
/* 801F2C6C 001EFBCC 40 82 00 38 */ bne lbl_801F2CA4 /* 801F2C6C 001EFBCC 40 82 00 38 */ bne lbl_801F2CA4
/* 801F2C70 001EFBD0 A0 9E 01 8A */ lhz r4, 0x18a(r30) /* 801F2C70 001EFBD0 A0 9E 01 8A */ lhz r4, 0x18a(r30)
/* 801F2C74 001EFBD4 38 61 00 0C */ addi r3, r1, 0xc /* 801F2C74 001EFBD4 38 61 00 0C */ addi r3, r1, 0xc
/* 801F2C78 001EFBD8 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 801F2C78 001EFBD8 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 801F2C7C 001EFBDC 38 A0 00 7F */ li r5, 0x7f /* 801F2C7C 001EFBDC 38 A0 00 7F */ li r5, 0x7f
/* 801F2C80 001EFBE0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 801F2C80 001EFBE0 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 801F2C84 001EFBE4 38 C0 00 40 */ li r6, 0x40 /* 801F2C84 001EFBE4 38 C0 00 40 */ li r6, 0x40

2
asm/MetroidPrime/Weapons/CPlasmaProjectile.s
View File

@ -2027,7 +2027,7 @@ lbl_80178714:
/* 80178774 001756D4 48 1C 86 CD */ bl __dt__6CTokenFv /* 80178774 001756D4 48 1C 86 CD */ bl __dt__6CTokenFv
lbl_80178778: lbl_80178778:
/* 80178778 001756D8 38 00 00 00 */ li r0, 0 /* 80178778 001756D8 38 00 00 00 */ li r0, 0
/* 8017877C 001756DC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8017877C 001756DC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80178780 001756E0 98 01 00 68 */ stb r0, 0x68(r1) /* 80178780 001756E0 98 01 00 68 */ stb r0, 0x68(r1)
/* 80178784 001756E4 38 61 00 30 */ addi r3, r1, 0x30 /* 80178784 001756E4 38 61 00 30 */ addi r3, r1, 0x30
/* 80178788 001756E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80178788 001756E8 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)

2
asm/MetroidPrime/Weapons/CPowerBomb.s
View File

@ -128,7 +128,7 @@ lbl_8014D98C:
/* 8014D9D0 0014A930 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 8014D9D0 0014A930 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 8014D9D4 0014A934 C0 1C 00 40 */ lfs f0, 0x40(r28) /* 8014D9D4 0014A934 C0 1C 00 40 */ lfs f0, 0x40(r28)
/* 8014D9D8 0014A938 38 61 00 24 */ addi r3, r1, 0x24 /* 8014D9D8 0014A938 38 61 00 24 */ addi r3, r1, 0x24
/* 8014D9DC 0014A93C A9 22 C5 FA */ lha r9, lbl_805AE31A@sda21(r2) /* 8014D9DC 0014A93C A9 22 C5 FA */ lha r9, kMedPriority__11CSfxManager@sda21(r2)
/* 8014D9E0 0014A940 38 A1 00 34 */ addi r5, r1, 0x34 /* 8014D9E0 0014A940 38 A1 00 34 */ addi r5, r1, 0x34
/* 8014D9E4 0014A944 D0 01 00 34 */ stfs f0, 0x34(r1) /* 8014D9E4 0014A944 D0 01 00 34 */ stfs f0, 0x34(r1)
/* 8014D9E8 0014A948 38 80 07 10 */ li r4, 0x710 /* 8014D9E8 0014A948 38 80 07 10 */ li r4, 0x710

2
asm/MetroidPrime/Weapons/CShockWave.s
View File

@ -679,7 +679,7 @@ lbl_80231F54:
lbl_80231F64: lbl_80231F64:
/* 80231F64 0022EEC4 A0 9B 01 4C */ lhz r4, 0x14c(r27) /* 80231F64 0022EEC4 A0 9B 01 4C */ lhz r4, 0x14c(r27)
/* 80231F68 0022EEC8 38 61 00 58 */ addi r3, r1, 0x58 /* 80231F68 0022EEC8 38 61 00 58 */ addi r3, r1, 0x58
/* 80231F6C 0022EECC A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 80231F6C 0022EECC A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 80231F70 0022EED0 38 A0 00 7F */ li r5, 0x7f /* 80231F70 0022EED0 38 A0 00 7F */ li r5, 0x7f
/* 80231F74 0022EED4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2) /* 80231F74 0022EED4 81 42 C6 00 */ lwz r10, lbl_805AE320@sda21(r2)
/* 80231F78 0022EED8 38 C0 00 40 */ li r6, 0x40 /* 80231F78 0022EED8 38 C0 00 40 */ li r6, 0x40

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

@ -222,7 +222,7 @@ lbl_8028AC3C:
/* 8028ACEC 00287C4C 40 82 00 94 */ bne lbl_8028AD80 /* 8028ACEC 00287C4C 40 82 00 94 */ bne lbl_8028AD80
/* 8028ACF0 00287C50 28 1B 00 00 */ cmplwi r27, 0 /* 8028ACF0 00287C50 28 1B 00 00 */ cmplwi r27, 0
/* 8028ACF4 00287C54 41 82 00 34 */ beq lbl_8028AD28 /* 8028ACF4 00287C54 41 82 00 34 */ beq lbl_8028AD28
/* 8028ACF8 00287C58 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8028ACF8 00287C58 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8028ACFC 00287C5C 7F A4 EB 78 */ mr r4, r29 /* 8028ACFC 00287C5C 7F A4 EB 78 */ mr r4, r29
/* 8028AD00 00287C60 7F 0A C3 78 */ mr r10, r24 /* 8028AD00 00287C60 7F 0A C3 78 */ mr r10, r24
/* 8028AD04 00287C64 38 61 00 2C */ addi r3, r1, 0x2c /* 8028AD04 00287C64 38 61 00 2C */ addi r3, r1, 0x2c
@ -235,7 +235,7 @@ lbl_8028AC3C:
/* 8028AD20 00287C80 90 01 00 38 */ stw r0, 0x38(r1) /* 8028AD20 00287C80 90 01 00 38 */ stw r0, 0x38(r1)
/* 8028AD24 00287C84 48 00 00 28 */ b lbl_8028AD4C /* 8028AD24 00287C84 48 00 00 28 */ b lbl_8028AD4C
lbl_8028AD28: lbl_8028AD28:
/* 8028AD28 00287C88 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 8028AD28 00287C88 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 8028AD2C 00287C8C 7F 08 C3 78 */ mr r8, r24 /* 8028AD2C 00287C8C 7F 08 C3 78 */ mr r8, r24
/* 8028AD30 00287C90 38 61 00 28 */ addi r3, r1, 0x28 /* 8028AD30 00287C90 38 61 00 28 */ addi r3, r1, 0x28
/* 8028AD34 00287C94 38 81 00 40 */ addi r4, r1, 0x40 /* 8028AD34 00287C94 38 81 00 40 */ addi r4, r1, 0x40
@ -276,7 +276,7 @@ lbl_8028ADAC:
/* 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__11CSfxManagerF10CSfxHandle /* 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, kMedPriority__11CSfxManager@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
/* 8028ADCC 00287D2C 38 81 00 40 */ addi r4, r1, 0x40 /* 8028ADCC 00287D2C 38 81 00 40 */ addi r4, r1, 0x40
@ -301,7 +301,7 @@ lbl_8028ADAC:
lbl_8028AE18: lbl_8028AE18:
/* 8028AE18 00287D78 28 1B 00 00 */ cmplwi r27, 0 /* 8028AE18 00287D78 28 1B 00 00 */ cmplwi r27, 0
/* 8028AE1C 00287D7C 41 82 00 34 */ beq lbl_8028AE50 /* 8028AE1C 00287D7C 41 82 00 34 */ beq lbl_8028AE50
/* 8028AE20 00287D80 A9 02 C5 FA */ lha r8, lbl_805AE31A@sda21(r2) /* 8028AE20 00287D80 A9 02 C5 FA */ lha r8, kMedPriority__11CSfxManager@sda21(r2)
/* 8028AE24 00287D84 7F A4 EB 78 */ mr r4, r29 /* 8028AE24 00287D84 7F A4 EB 78 */ mr r4, r29
/* 8028AE28 00287D88 7F 0A C3 78 */ mr r10, r24 /* 8028AE28 00287D88 7F 0A C3 78 */ mr r10, r24
/* 8028AE2C 00287D8C 38 61 00 10 */ addi r3, r1, 0x10 /* 8028AE2C 00287D8C 38 61 00 10 */ addi r3, r1, 0x10
@ -314,7 +314,7 @@ lbl_8028AE18:
/* 8028AE48 00287DA8 90 01 00 30 */ stw r0, 0x30(r1) /* 8028AE48 00287DA8 90 01 00 30 */ stw r0, 0x30(r1)
/* 8028AE4C 00287DAC 48 00 00 28 */ b lbl_8028AE74 /* 8028AE4C 00287DAC 48 00 00 28 */ b lbl_8028AE74
lbl_8028AE50: lbl_8028AE50:
/* 8028AE50 00287DB0 A8 C2 C5 FA */ lha r6, lbl_805AE31A@sda21(r2) /* 8028AE50 00287DB0 A8 C2 C5 FA */ lha r6, kMedPriority__11CSfxManager@sda21(r2)
/* 8028AE54 00287DB4 7F 08 C3 78 */ mr r8, r24 /* 8028AE54 00287DB4 7F 08 C3 78 */ mr r8, r24
/* 8028AE58 00287DB8 38 61 00 0C */ addi r3, r1, 0xc /* 8028AE58 00287DB8 38 61 00 0C */ addi r3, r1, 0xc
/* 8028AE5C 00287DBC 38 81 00 40 */ addi r4, r1, 0x40 /* 8028AE5C 00287DBC 38 81 00 40 */ addi r4, r1, 0x40

5
include/Kyoto/Audio/CSfxManager.hpp
View File

@ -9,7 +9,7 @@ class CSfxManager {
public: public:
static void Update(f32 dt); static void Update(f32 dt);
static void RemoveEmitter(CSfxHandle handle); static void RemoveEmitter(CSfxHandle handle);
static void UpdateEmitter(const CSfxHandle& handle, const CVector3f& pos, const CVector3f& dir, static void UpdateEmitter(CSfxHandle handle, const CVector3f& pos, const CVector3f& dir,
uchar maxVol); uchar maxVol);
static CSfxHandle AddEmitter(u16 id, const CVector3f& pos, const CVector3f& dir, static CSfxHandle AddEmitter(u16 id, const CVector3f& pos, const CVector3f& dir,
bool useAcoustics, bool looped, s16 prio, s32 areaId); bool useAcoustics, bool looped, s16 prio, s32 areaId);
@ -19,6 +19,9 @@ public:
static u16 TranslateSFXID(u16); static u16 TranslateSFXID(u16);
static void PitchBend(CSfxHandle handle, int pitch); static void PitchBend(CSfxHandle handle, int pitch);
static s16 kMaxPriority; // 0xff
static s16 kMedPriority; // 0x7f
}; };
#endif #endif