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

Fix up .comm entries to account for MWCC bug

This commit is contained in:
Luke Street 2022-10-09 15:07:39 -04:00
parent ca87e890b5
commit 76c4802efb
24 changed files with 166 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/GuiSys/CGuiGroup.s
View File

@ -2,7 +2,8 @@
#TODO: Split this up properly (need to split CGuiCamera and CGuiCompoundWidget) #TODO: Split this up properly (need to split CGuiCamera and CGuiCompoundWidget)
.comm lbl_8059FBD0, 0xA8, 4 .comm lbl_8059FBD0, 0x18, 4
.comm lbl_8059FBE8, 0x90, 4 # MWCC .comm bug
.comm lbl_8059FC78, 0x18, 4 .comm lbl_8059FC78, 0x18, 4
.comm lbl_8059FC90, 0x18, 4 .comm lbl_8059FC90, 0x18, 4
.comm lbl_8059FCA8, 0x18, 4 .comm lbl_8059FCA8, 0x18, 4
@ -2762,4 +2763,3 @@ lbl_803D6898:
# ROM: 0x3D3898 # ROM: 0x3D3898
.asciz "??(??)" .asciz "??(??)"
.balign 4 .balign 4

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

@ -138,10 +138,10 @@ lbl_805A877C:
.balign 8 .balign 8
.lcomm lbl_80479BA0, 0x30, 4 .lcomm lbl_80479BA0, 0x30, 4
.comm lbl_8059FD48, 0x2BC, 4 .comm mChannels__11CSfxManager, 0x5B0, 4
.comm lbl_805A0004, 0x2B5C, 4 .comm lbl_805A02F8, 0x2868, 4 # MWCC .comm bug
.comm lbl_805A2B60, 0x1604, 4 .comm mEmitterWrapperPool__11CSfxManager, 0x1604, 4
.comm lbl_805A4164, 0xA04, 4 .comm mWrapperPool__11CSfxManager, 0xA04, 4
.comm lbl_805A4B68, 0x1E0, 4 .comm lbl_805A4B68, 0x1E0, 4
.comm lbl_805A4D48, 0x9C, 4 .comm lbl_805A4D48, 0x9C, 4
.comm lbl_805A4DE4, 0x154, 4 .comm lbl_805A4DE4, 0x154, 4
@ -959,9 +959,9 @@ lbl_802E8364:
ApplyReverb__11CSfxManagerFv: ApplyReverb__11CSfxManagerFv:
/* 802E8378 002E52D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E8378 002E52D8 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E837C 002E52DC 7C 08 02 A6 */ mflr r0 /* 802E837C 002E52DC 7C 08 02 A6 */ mflr r0
/* 802E8380 002E52E0 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E8380 002E52E0 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E8384 002E52E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802E8384 002E52E4 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E8388 002E52E8 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E8388 002E52E8 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E838C 002E52EC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E838C 002E52EC 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E8390 002E52F0 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E8390 002E52F0 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E8394 002E52F4 93 A1 00 14 */ stw r29, 0x14(r1) /* 802E8394 002E52F4 93 A1 00 14 */ stw r29, 0x14(r1)
@ -1027,10 +1027,10 @@ DisableAuxProcessing__11CSfxManagerFv:
AllocateCSfxWrapper__11CSfxManagerFRCQ211CSfxManager11CSfxWrapper: AllocateCSfxWrapper__11CSfxManagerFRCQ211CSfxManager11CSfxWrapper:
/* 802E844C 002E53AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E844C 002E53AC 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E8450 002E53B0 7C 08 02 A6 */ mflr r0 /* 802E8450 002E53B0 7C 08 02 A6 */ mflr r0
/* 802E8454 002E53B4 3C 80 80 5A */ lis r4, lbl_805A4164@ha /* 802E8454 002E53B4 3C 80 80 5A */ lis r4, mWrapperPool__11CSfxManager@ha
/* 802E8458 002E53B8 90 01 00 24 */ stw r0, 0x24(r1) /* 802E8458 002E53B8 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E845C 002E53BC BF 41 00 08 */ stmw r26, 8(r1) /* 802E845C 002E53BC BF 41 00 08 */ stmw r26, 8(r1)
/* 802E8460 002E53C0 3B 84 41 64 */ addi r28, r4, lbl_805A4164@l /* 802E8460 002E53C0 3B 84 41 64 */ addi r28, r4, mWrapperPool__11CSfxManager@l
/* 802E8464 002E53C4 3B FC 00 04 */ addi r31, r28, 4 /* 802E8464 002E53C4 3B FC 00 04 */ addi r31, r28, 4
/* 802E8468 002E53C8 7C 7D 1B 78 */ mr r29, r3 /* 802E8468 002E53C8 7C 7D 1B 78 */ mr r29, r3
/* 802E846C 002E53CC 3B C0 00 00 */ li r30, 0 /* 802E846C 002E53CC 3B C0 00 00 */ li r30, 0
@ -1078,8 +1078,8 @@ lbl_802E84FC:
lbl_802E8508: lbl_802E8508:
/* 802E8508 002E5468 28 1E 00 00 */ cmplwi r30, 0 /* 802E8508 002E5468 28 1E 00 00 */ cmplwi r30, 0
/* 802E850C 002E546C 40 82 00 B0 */ bne lbl_802E85BC /* 802E850C 002E546C 40 82 00 B0 */ bne lbl_802E85BC
/* 802E8510 002E5470 3C 60 80 5A */ lis r3, lbl_805A4164@ha /* 802E8510 002E5470 3C 60 80 5A */ lis r3, mWrapperPool__11CSfxManager@ha
/* 802E8514 002E5474 80 03 41 64 */ lwz r0, lbl_805A4164@l(r3) /* 802E8514 002E5474 80 03 41 64 */ lwz r0, mWrapperPool__11CSfxManager@l(r3)
/* 802E8518 002E5478 2C 00 00 40 */ cmpwi r0, 0x40 /* 802E8518 002E5478 2C 00 00 40 */ cmpwi r0, 0x40
/* 802E851C 002E547C 41 82 00 A0 */ beq lbl_802E85BC /* 802E851C 002E547C 41 82 00 A0 */ beq lbl_802E85BC
/* 802E8520 002E5480 1C 00 00 28 */ mulli r0, r0, 0x28 /* 802E8520 002E5480 1C 00 00 28 */ mulli r0, r0, 0x28
@ -1114,8 +1114,8 @@ lbl_802E8508:
/* 802E8594 002E54F4 B0 65 00 22 */ sth r3, 0x22(r5) /* 802E8594 002E54F4 B0 65 00 22 */ sth r3, 0x22(r5)
/* 802E8598 002E54F8 98 05 00 24 */ stb r0, 0x24(r5) /* 802E8598 002E54F8 98 05 00 24 */ stb r0, 0x24(r5)
lbl_802E859C: lbl_802E859C:
/* 802E859C 002E54FC 3C 60 80 5A */ lis r3, lbl_805A4164@ha /* 802E859C 002E54FC 3C 60 80 5A */ lis r3, mWrapperPool__11CSfxManager@ha
/* 802E85A0 002E5500 38 83 41 64 */ addi r4, r3, lbl_805A4164@l /* 802E85A0 002E5500 38 83 41 64 */ addi r4, r3, mWrapperPool__11CSfxManager@l
/* 802E85A4 002E5504 80 64 00 00 */ lwz r3, 0(r4) /* 802E85A4 002E5504 80 64 00 00 */ lwz r3, 0(r4)
/* 802E85A8 002E5508 38 63 00 01 */ addi r3, r3, 1 /* 802E85A8 002E5508 38 63 00 01 */ addi r3, r3, 1
/* 802E85AC 002E550C 38 03 FF FF */ addi r0, r3, -1 /* 802E85AC 002E550C 38 03 FF FF */ addi r0, r3, -1
@ -1134,10 +1134,10 @@ lbl_802E85BC:
sub_802e85d4: sub_802e85d4:
/* 802E85D4 002E5534 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E85D4 002E5534 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E85D8 002E5538 7C 08 02 A6 */ mflr r0 /* 802E85D8 002E5538 7C 08 02 A6 */ mflr r0
/* 802E85DC 002E553C 3C 80 80 5A */ lis r4, lbl_805A2B60@ha /* 802E85DC 002E553C 3C 80 80 5A */ lis r4, mEmitterWrapperPool__11CSfxManager@ha
/* 802E85E0 002E5540 90 01 00 24 */ stw r0, 0x24(r1) /* 802E85E0 002E5540 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E85E4 002E5544 BF 41 00 08 */ stmw r26, 8(r1) /* 802E85E4 002E5544 BF 41 00 08 */ stmw r26, 8(r1)
/* 802E85E8 002E5548 3B 84 2B 60 */ addi r28, r4, lbl_805A2B60@l /* 802E85E8 002E5548 3B 84 2B 60 */ addi r28, r4, mEmitterWrapperPool__11CSfxManager@l
/* 802E85EC 002E554C 3B FC 00 04 */ addi r31, r28, 4 /* 802E85EC 002E554C 3B FC 00 04 */ addi r31, r28, 4
/* 802E85F0 002E5550 7C 7D 1B 78 */ mr r29, r3 /* 802E85F0 002E5550 7C 7D 1B 78 */ mr r29, r3
/* 802E85F4 002E5554 3B C0 00 00 */ li r30, 0 /* 802E85F4 002E5554 3B C0 00 00 */ li r30, 0
@ -1209,15 +1209,15 @@ lbl_802E86E4:
lbl_802E86F0: lbl_802E86F0:
/* 802E86F0 002E5650 28 1E 00 00 */ cmplwi r30, 0 /* 802E86F0 002E5650 28 1E 00 00 */ cmplwi r30, 0
/* 802E86F4 002E5654 40 82 00 38 */ bne lbl_802E872C /* 802E86F4 002E5654 40 82 00 38 */ bne lbl_802E872C
/* 802E86F8 002E5658 3C 60 80 5A */ lis r3, lbl_805A2B60@ha /* 802E86F8 002E5658 3C 60 80 5A */ lis r3, mEmitterWrapperPool__11CSfxManager@ha
/* 802E86FC 002E565C 38 63 2B 60 */ addi r3, r3, lbl_805A2B60@l /* 802E86FC 002E565C 38 63 2B 60 */ addi r3, r3, mEmitterWrapperPool__11CSfxManager@l
/* 802E8700 002E5660 80 03 00 00 */ lwz r0, 0(r3) /* 802E8700 002E5660 80 03 00 00 */ lwz r0, 0(r3)
/* 802E8704 002E5664 2C 00 00 40 */ cmpwi r0, 0x40 /* 802E8704 002E5664 2C 00 00 40 */ cmpwi r0, 0x40
/* 802E8708 002E5668 41 82 00 24 */ beq lbl_802E872C /* 802E8708 002E5668 41 82 00 24 */ beq lbl_802E872C
/* 802E870C 002E566C 7F A4 EB 78 */ mr r4, r29 /* 802E870C 002E566C 7F A4 EB 78 */ mr r4, r29
/* 802E8710 002E5670 48 00 00 35 */ bl sub_802e8744 /* 802E8710 002E5670 48 00 00 35 */ bl sub_802e8744
/* 802E8714 002E5674 3C 60 80 5A */ lis r3, lbl_805A2B60@ha /* 802E8714 002E5674 3C 60 80 5A */ lis r3, mEmitterWrapperPool__11CSfxManager@ha
/* 802E8718 002E5678 38 63 2B 60 */ addi r3, r3, lbl_805A2B60@l /* 802E8718 002E5678 38 63 2B 60 */ addi r3, r3, mEmitterWrapperPool__11CSfxManager@l
/* 802E871C 002E567C 80 63 00 00 */ lwz r3, 0(r3) /* 802E871C 002E567C 80 63 00 00 */ lwz r3, 0(r3)
/* 802E8720 002E5680 38 03 FF FF */ addi r0, r3, -1 /* 802E8720 002E5680 38 03 FF FF */ addi r0, r3, -1
/* 802E8724 002E5684 1C 00 00 58 */ mulli r0, r0, 0x58 /* 802E8724 002E5684 1C 00 00 58 */ mulli r0, r0, 0x58
@ -1331,9 +1331,9 @@ sub_802e87b4:
"SetActiveAreas__11CSfxManagerFRCQ24rstl21reserved_vector<i,10>": "SetActiveAreas__11CSfxManagerFRCQ24rstl21reserved_vector<i,10>":
/* 802E88A0 002E5800 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E88A0 002E5800 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E88A4 002E5804 7C 08 02 A6 */ mflr r0 /* 802E88A4 002E5804 7C 08 02 A6 */ mflr r0
/* 802E88A8 002E5808 3C 80 80 5A */ lis r4, lbl_8059FD48@ha /* 802E88A8 002E5808 3C 80 80 5A */ lis r4, mChannels__11CSfxManager@ha
/* 802E88AC 002E580C 90 01 00 24 */ stw r0, 0x24(r1) /* 802E88AC 002E580C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E88B0 002E5810 38 04 FD 48 */ addi r0, r4, lbl_8059FD48@l /* 802E88B0 002E5810 38 04 FD 48 */ addi r0, r4, mChannels__11CSfxManager@l
/* 802E88B4 002E5814 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E88B4 002E5814 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E88B8 002E5818 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E88B8 002E5818 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E88BC 002E581C 93 A1 00 14 */ stw r29, 0x14(r1) /* 802E88BC 002E581C 93 A1 00 14 */ stw r29, 0x14(r1)
@ -1578,9 +1578,9 @@ lbl_802E8BD8:
GetRank__11CSfxManagerFPQ211CSfxManager15CBaseSfxWrapper: GetRank__11CSfxManagerFPQ211CSfxManager15CBaseSfxWrapper:
/* 802E8BF4 002E5B54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E8BF4 002E5B54 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E8BF8 002E5B58 7C 08 02 A6 */ mflr r0 /* 802E8BF8 002E5B58 7C 08 02 A6 */ mflr r0
/* 802E8BFC 002E5B5C 3C 80 80 5A */ lis r4, lbl_8059FD48@ha /* 802E8BFC 002E5B5C 3C 80 80 5A */ lis r4, mChannels__11CSfxManager@ha
/* 802E8C00 002E5B60 90 01 00 24 */ stw r0, 0x24(r1) /* 802E8C00 002E5B60 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E8C04 002E5B64 38 04 FD 48 */ addi r0, r4, lbl_8059FD48@l /* 802E8C04 002E5B64 38 04 FD 48 */ addi r0, r4, mChannels__11CSfxManager@l
/* 802E8C08 002E5B68 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E8C08 002E5B68 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E8C0C 002E5B6C 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E8C0C 002E5B6C 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E8C10 002E5B70 93 A1 00 14 */ stw r29, 0x14(r1) /* 802E8C10 002E5B70 93 A1 00 14 */ stw r29, 0x14(r1)
@ -1673,10 +1673,10 @@ IsHandleValid__11CSfxManagerF10CSfxHandle:
/* 802E8D44 002E5CA4 7C 7F 1B 78 */ mr r31, r3 /* 802E8D44 002E5CA4 7C 7F 1B 78 */ mr r31, r3
/* 802E8D48 002E5CA8 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13) /* 802E8D48 002E5CA8 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13)
/* 802E8D4C 002E5CAC 80 03 00 00 */ lwz r0, 0(r3) /* 802E8D4C 002E5CAC 80 03 00 00 */ lwz r0, 0(r3)
/* 802E8D50 002E5CB0 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E8D50 002E5CB0 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E8D54 002E5CB4 1C 84 01 6C */ mulli r4, r4, 0x16c /* 802E8D54 002E5CB4 1C 84 01 6C */ mulli r4, r4, 0x16c
/* 802E8D58 002E5CB8 54 05 05 3F */ clrlwi. r5, r0, 0x14 /* 802E8D58 002E5CB8 54 05 05 3F */ clrlwi. r5, r0, 0x14
/* 802E8D5C 002E5CBC 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E8D5C 002E5CBC 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E8D60 002E5CC0 7C 60 22 14 */ add r3, r0, r4 /* 802E8D60 002E5CC0 7C 60 22 14 */ add r3, r0, r4
/* 802E8D64 002E5CC4 41 80 00 10 */ blt lbl_802E8D74 /* 802E8D64 002E5CC4 41 80 00 10 */ blt lbl_802E8D74
/* 802E8D68 002E5CC8 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E8D68 002E5CC8 80 03 00 48 */ lwz r0, 0x48(r3)
@ -1722,10 +1722,10 @@ IsPlaying__11CSfxManagerF10CSfxHandle:
/* 802E8DE8 002E5D48 7C 7E 1B 78 */ mr r30, r3 /* 802E8DE8 002E5D48 7C 7E 1B 78 */ mr r30, r3
/* 802E8DEC 002E5D4C 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13) /* 802E8DEC 002E5D4C 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13)
/* 802E8DF0 002E5D50 80 03 00 00 */ lwz r0, 0(r3) /* 802E8DF0 002E5D50 80 03 00 00 */ lwz r0, 0(r3)
/* 802E8DF4 002E5D54 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E8DF4 002E5D54 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E8DF8 002E5D58 1C 84 01 6C */ mulli r4, r4, 0x16c /* 802E8DF8 002E5D58 1C 84 01 6C */ mulli r4, r4, 0x16c
/* 802E8DFC 002E5D5C 54 05 05 3F */ clrlwi. r5, r0, 0x14 /* 802E8DFC 002E5D5C 54 05 05 3F */ clrlwi. r5, r0, 0x14
/* 802E8E00 002E5D60 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E8E00 002E5D60 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E8E04 002E5D64 7C 60 22 14 */ add r3, r0, r4 /* 802E8E04 002E5D64 7C 60 22 14 */ add r3, r0, r4
/* 802E8E08 002E5D68 41 80 00 10 */ blt lbl_802E8E18 /* 802E8E08 002E5D68 41 80 00 10 */ blt lbl_802E8E18
/* 802E8E0C 002E5D6C 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E8E0C 002E5D6C 80 03 00 48 */ lwz r0, 0x48(r3)
@ -1786,9 +1786,9 @@ PitchBend__11CSfxManagerF10CSfxHandlei:
/* 802E8EC8 002E5E28 7C 7D 1B 78 */ mr r29, r3 /* 802E8EC8 002E5E28 7C 7D 1B 78 */ mr r29, r3
/* 802E8ECC 002E5E2C 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13) /* 802E8ECC 002E5E2C 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13)
/* 802E8ED0 002E5E30 80 03 00 00 */ lwz r0, 0(r3) /* 802E8ED0 002E5E30 80 03 00 00 */ lwz r0, 0(r3)
/* 802E8ED4 002E5E34 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E8ED4 002E5E34 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E8ED8 002E5E38 1C A5 01 6C */ mulli r5, r5, 0x16c /* 802E8ED8 002E5E38 1C A5 01 6C */ mulli r5, r5, 0x16c
/* 802E8EDC 002E5E3C 38 63 FD 48 */ addi r3, r3, lbl_8059FD48@l /* 802E8EDC 002E5E3C 38 63 FD 48 */ addi r3, r3, mChannels__11CSfxManager@l
/* 802E8EE0 002E5E40 54 00 14 BA */ rlwinm r0, r0, 2, 0x12, 0x1d /* 802E8EE0 002E5E40 54 00 14 BA */ rlwinm r0, r0, 2, 0x12, 0x1d
/* 802E8EE4 002E5E44 7C 63 2A 14 */ add r3, r3, r5 /* 802E8EE4 002E5E44 7C 63 2A 14 */ add r3, r3, r5
/* 802E8EE8 002E5E48 7C 63 02 14 */ add r3, r3, r0 /* 802E8EE8 002E5E48 7C 63 02 14 */ add r3, r3, r0
@ -1853,8 +1853,8 @@ Update__11CSfxManagerFf:
/* 802E8FBC 002E5F1C F3 C1 00 E8 */ psq_st f30, 232(r1), 0, qr0 /* 802E8FBC 002E5F1C F3 C1 00 E8 */ psq_st f30, 232(r1), 0, qr0
/* 802E8FC0 002E5F20 BE A1 00 B4 */ stmw r21, 0xb4(r1) /* 802E8FC0 002E5F20 BE A1 00 B4 */ stmw r21, 0xb4(r1)
/* 802E8FC4 002E5F24 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13) /* 802E8FC4 002E5F24 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13)
/* 802E8FC8 002E5F28 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E8FC8 002E5F28 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E8FCC 002E5F2C 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E8FCC 002E5F2C 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E8FD0 002E5F30 FF C0 08 90 */ fmr f30, f1 /* 802E8FD0 002E5F30 FF C0 08 90 */ fmr f30, f1
/* 802E8FD4 002E5F34 1C 64 01 6C */ mulli r3, r4, 0x16c /* 802E8FD4 002E5F34 1C 64 01 6C */ mulli r3, r4, 0x16c
/* 802E8FD8 002E5F38 3B 80 00 00 */ li r28, 0 /* 802E8FD8 002E5F38 3B 80 00 00 */ li r28, 0
@ -2327,9 +2327,9 @@ lbl_802E963C:
LocateHandle__11CSfxManagerFs: LocateHandle__11CSfxManagerFs:
/* 802E9660 002E65C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E9660 002E65C0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802E9664 002E65C4 7C 08 02 A6 */ mflr r0 /* 802E9664 002E65C4 7C 08 02 A6 */ mflr r0
/* 802E9668 002E65C8 3C 80 80 5A */ lis r4, lbl_8059FD48@ha /* 802E9668 002E65C8 3C 80 80 5A */ lis r4, mChannels__11CSfxManager@ha
/* 802E966C 002E65CC 90 01 00 14 */ stw r0, 0x14(r1) /* 802E966C 002E65CC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802E9670 002E65D0 38 04 FD 48 */ addi r0, r4, lbl_8059FD48@l /* 802E9670 002E65D0 38 04 FD 48 */ addi r0, r4, mChannels__11CSfxManager@l
/* 802E9674 002E65D4 38 80 00 00 */ li r4, 0 /* 802E9674 002E65D4 38 80 00 00 */ li r4, 0
/* 802E9678 002E65D8 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13) /* 802E9678 002E65D8 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13)
/* 802E967C 002E65DC 1C A5 01 6C */ mulli r5, r5, 0x16c /* 802E967C 002E65DC 1C A5 01 6C */ mulli r5, r5, 0x16c
@ -2380,10 +2380,10 @@ TurnOnChannel__11CSfxManagerFQ211CSfxManager12ESfxChannels:
/* 802E970C 002E666C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E970C 002E666C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E9710 002E6670 7C 08 02 A6 */ mflr r0 /* 802E9710 002E6670 7C 08 02 A6 */ mflr r0
/* 802E9714 002E6674 1C C3 01 6C */ mulli r6, r3, 0x16c /* 802E9714 002E6674 1C C3 01 6C */ mulli r6, r3, 0x16c
/* 802E9718 002E6678 3C A0 80 5A */ lis r5, lbl_8059FD48@ha /* 802E9718 002E6678 3C A0 80 5A */ lis r5, mChannels__11CSfxManager@ha
/* 802E971C 002E667C 90 01 00 24 */ stw r0, 0x24(r1) /* 802E971C 002E667C 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E9720 002E6680 38 80 00 01 */ li r4, 1 /* 802E9720 002E6680 38 80 00 01 */ li r4, 1
/* 802E9724 002E6684 38 05 FD 48 */ addi r0, r5, lbl_8059FD48@l /* 802E9724 002E6684 38 05 FD 48 */ addi r0, r5, mChannels__11CSfxManager@l
/* 802E9728 002E6688 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E9728 002E6688 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E972C 002E668C 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E972C 002E668C 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E9730 002E6690 7F C0 32 14 */ add r30, r0, r6 /* 802E9730 002E6690 7F C0 32 14 */ add r30, r0, r6
@ -2425,9 +2425,9 @@ TurnOffChannel__11CSfxManagerFi:
/* 802E97A4 002E6704 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E97A4 002E6704 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E97A8 002E6708 7C 08 02 A6 */ mflr r0 /* 802E97A8 002E6708 7C 08 02 A6 */ mflr r0
/* 802E97AC 002E670C 1C 83 01 6C */ mulli r4, r3, 0x16c /* 802E97AC 002E670C 1C 83 01 6C */ mulli r4, r3, 0x16c
/* 802E97B0 002E6710 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E97B0 002E6710 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E97B4 002E6714 90 01 00 24 */ stw r0, 0x24(r1) /* 802E97B4 002E6714 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E97B8 002E6718 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E97B8 002E6718 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E97BC 002E671C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E97BC 002E671C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E97C0 002E6720 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E97C0 002E6720 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E97C4 002E6724 93 A1 00 14 */ stw r29, 0x14(r1) /* 802E97C4 002E6724 93 A1 00 14 */ stw r29, 0x14(r1)
@ -2535,10 +2535,10 @@ SetDuration__10CSfxHandleFf:
/* 802E9920 002E6880 7C 7E 1B 78 */ mr r30, r3 /* 802E9920 002E6880 7C 7E 1B 78 */ mr r30, r3
/* 802E9924 002E6884 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13) /* 802E9924 002E6884 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13)
/* 802E9928 002E6888 80 03 00 00 */ lwz r0, 0(r3) /* 802E9928 002E6888 80 03 00 00 */ lwz r0, 0(r3)
/* 802E992C 002E688C 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E992C 002E688C 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E9930 002E6890 1C 84 01 6C */ mulli r4, r4, 0x16c /* 802E9930 002E6890 1C 84 01 6C */ mulli r4, r4, 0x16c
/* 802E9934 002E6894 54 05 05 3F */ clrlwi. r5, r0, 0x14 /* 802E9934 002E6894 54 05 05 3F */ clrlwi. r5, r0, 0x14
/* 802E9938 002E6898 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E9938 002E6898 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E993C 002E689C 7C 60 22 14 */ add r3, r0, r4 /* 802E993C 002E689C 7C 60 22 14 */ add r3, r0, r4
/* 802E9940 002E68A0 41 80 00 60 */ blt lbl_802E99A0 /* 802E9940 002E68A0 41 80 00 60 */ blt lbl_802E99A0
/* 802E9944 002E68A4 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E9944 002E68A4 80 03 00 48 */ lwz r0, 0x48(r3)
@ -2586,10 +2586,10 @@ StopSound__11CSfxManagerFRC10CSfxHandle:
/* 802E99D4 002E6934 7C 7D 1B 78 */ mr r29, r3 /* 802E99D4 002E6934 7C 7D 1B 78 */ mr r29, r3
/* 802E99D8 002E6938 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13) /* 802E99D8 002E6938 80 8D A7 00 */ lwz r4, lbl_805A92C0@sda21(r13)
/* 802E99DC 002E693C 80 03 00 00 */ lwz r0, 0(r3) /* 802E99DC 002E693C 80 03 00 00 */ lwz r0, 0(r3)
/* 802E99E0 002E6940 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E99E0 002E6940 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E99E4 002E6944 1C 84 01 6C */ mulli r4, r4, 0x16c /* 802E99E4 002E6944 1C 84 01 6C */ mulli r4, r4, 0x16c
/* 802E99E8 002E6948 54 05 05 3F */ clrlwi. r5, r0, 0x14 /* 802E99E8 002E6948 54 05 05 3F */ clrlwi. r5, r0, 0x14
/* 802E99EC 002E694C 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E99EC 002E694C 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E99F0 002E6950 7C 60 22 14 */ add r3, r0, r4 /* 802E99F0 002E6950 7C 60 22 14 */ add r3, r0, r4
/* 802E99F4 002E6954 41 80 00 A4 */ blt lbl_802E9A98 /* 802E99F4 002E6954 41 80 00 A4 */ blt lbl_802E9A98
/* 802E99F8 002E6958 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E99F8 002E6958 80 03 00 48 */ lwz r0, 0x48(r3)
@ -2649,9 +2649,9 @@ KillAll__11CSfxManagerFQ211CSfxManager12ESfxChannels:
/* 802E9AB4 002E6A14 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E9AB4 002E6A14 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802E9AB8 002E6A18 7C 08 02 A6 */ mflr r0 /* 802E9AB8 002E6A18 7C 08 02 A6 */ mflr r0
/* 802E9ABC 002E6A1C 1C 83 01 6C */ mulli r4, r3, 0x16c /* 802E9ABC 002E6A1C 1C 83 01 6C */ mulli r4, r3, 0x16c
/* 802E9AC0 002E6A20 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E9AC0 002E6A20 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E9AC4 002E6A24 90 01 00 24 */ stw r0, 0x24(r1) /* 802E9AC4 002E6A24 90 01 00 24 */ stw r0, 0x24(r1)
/* 802E9AC8 002E6A28 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E9AC8 002E6A28 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E9ACC 002E6A2C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802E9ACC 002E6A2C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 802E9AD0 002E6A30 93 C1 00 18 */ stw r30, 0x18(r1) /* 802E9AD0 002E6A30 93 C1 00 18 */ stw r30, 0x18(r1)
/* 802E9AD4 002E6A34 7F C0 22 14 */ add r30, r0, r4 /* 802E9AD4 002E6A34 7F C0 22 14 */ add r30, r0, r4
@ -2711,10 +2711,10 @@ SfxSpan__11CSfxManagerF10CSfxHandleUc:
/* 802E9B90 002E6AF0 7C 7D 1B 78 */ mr r29, r3 /* 802E9B90 002E6AF0 7C 7D 1B 78 */ mr r29, r3
/* 802E9B94 002E6AF4 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13) /* 802E9B94 002E6AF4 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13)
/* 802E9B98 002E6AF8 80 03 00 00 */ lwz r0, 0(r3) /* 802E9B98 002E6AF8 80 03 00 00 */ lwz r0, 0(r3)
/* 802E9B9C 002E6AFC 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E9B9C 002E6AFC 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E9BA0 002E6B00 1C A5 01 6C */ mulli r5, r5, 0x16c /* 802E9BA0 002E6B00 1C A5 01 6C */ mulli r5, r5, 0x16c
/* 802E9BA4 002E6B04 54 04 05 3F */ clrlwi. r4, r0, 0x14 /* 802E9BA4 002E6B04 54 04 05 3F */ clrlwi. r4, r0, 0x14
/* 802E9BA8 002E6B08 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E9BA8 002E6B08 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E9BAC 002E6B0C 7C 60 2A 14 */ add r3, r0, r5 /* 802E9BAC 002E6B0C 7C 60 2A 14 */ add r3, r0, r5
/* 802E9BB0 002E6B10 41 80 00 8C */ blt lbl_802E9C3C /* 802E9BB0 002E6B10 41 80 00 8C */ blt lbl_802E9C3C
/* 802E9BB4 002E6B14 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E9BB4 002E6B14 80 03 00 48 */ lwz r0, 0x48(r3)
@ -2774,10 +2774,10 @@ SfxVolume__11CSfxManagerF10CSfxHandleUc:
/* 802E9C74 002E6BD4 7C 7D 1B 78 */ mr r29, r3 /* 802E9C74 002E6BD4 7C 7D 1B 78 */ mr r29, r3
/* 802E9C78 002E6BD8 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13) /* 802E9C78 002E6BD8 80 AD A7 00 */ lwz r5, lbl_805A92C0@sda21(r13)
/* 802E9C7C 002E6BDC 80 03 00 00 */ lwz r0, 0(r3) /* 802E9C7C 002E6BDC 80 03 00 00 */ lwz r0, 0(r3)
/* 802E9C80 002E6BE0 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E9C80 002E6BE0 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E9C84 002E6BE4 1C A5 01 6C */ mulli r5, r5, 0x16c /* 802E9C84 002E6BE4 1C A5 01 6C */ mulli r5, r5, 0x16c
/* 802E9C88 002E6BE8 54 04 05 3F */ clrlwi. r4, r0, 0x14 /* 802E9C88 002E6BE8 54 04 05 3F */ clrlwi. r4, r0, 0x14
/* 802E9C8C 002E6BEC 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E9C8C 002E6BEC 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E9C90 002E6BF0 7C 60 2A 14 */ add r3, r0, r5 /* 802E9C90 002E6BF0 7C 60 2A 14 */ add r3, r0, r5
/* 802E9C94 002E6BF4 41 80 00 98 */ blt lbl_802E9D2C /* 802E9C94 002E6BF4 41 80 00 98 */ blt lbl_802E9D2C
/* 802E9C98 002E6BF8 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E9C98 002E6BF8 80 03 00 48 */ lwz r0, 0x48(r3)
@ -2872,11 +2872,11 @@ lbl_802E9DC8:
lbl_802E9DD4: lbl_802E9DD4:
/* 802E9DD4 002E6D34 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13) /* 802E9DD4 002E6D34 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13)
/* 802E9DD8 002E6D38 38 60 00 01 */ li r3, 1 /* 802E9DD8 002E6D38 38 60 00 01 */ li r3, 1
/* 802E9DDC 002E6D3C 3C 80 80 5A */ lis r4, lbl_8059FD48@ha /* 802E9DDC 002E6D3C 3C 80 80 5A */ lis r4, mChannels__11CSfxManager@ha
/* 802E9DE0 002E6D40 98 6D A7 04 */ stb r3, lbl_805A92C4@sda21(r13) /* 802E9DE0 002E6D40 98 6D A7 04 */ stb r3, lbl_805A92C4@sda21(r13)
/* 802E9DE4 002E6D44 1C A0 01 6C */ mulli r5, r0, 0x16c /* 802E9DE4 002E6D44 1C A0 01 6C */ mulli r5, r0, 0x16c
/* 802E9DE8 002E6D48 38 61 00 14 */ addi r3, r1, 0x14 /* 802E9DE8 002E6D48 38 61 00 14 */ addi r3, r1, 0x14
/* 802E9DEC 002E6D4C 38 04 FD 48 */ addi r0, r4, lbl_8059FD48@l /* 802E9DEC 002E6D4C 38 04 FD 48 */ addi r0, r4, mChannels__11CSfxManager@l
/* 802E9DF0 002E6D50 7F 24 07 34 */ extsh r4, r25 /* 802E9DF0 002E6D50 7F 24 07 34 */ extsh r4, r25
/* 802E9DF4 002E6D54 7F 80 2A 14 */ add r28, r0, r5 /* 802E9DF4 002E6D54 7F 80 2A 14 */ add r28, r0, r5
/* 802E9DF8 002E6D58 4B FF F8 69 */ bl LocateHandle__11CSfxManagerFs /* 802E9DF8 002E6D58 4B FF F8 69 */ bl LocateHandle__11CSfxManagerFs
@ -2943,10 +2943,10 @@ UpdateEmitter__11CSfxManagerF10CSfxHandleRC9CVector3fRC9CVector3fUc:
/* 802E9ECC 002E6E2C 7C DC 33 78 */ mr r28, r6 /* 802E9ECC 002E6E2C 7C DC 33 78 */ mr r28, r6
/* 802E9ED0 002E6E30 80 ED A7 00 */ lwz r7, lbl_805A92C0@sda21(r13) /* 802E9ED0 002E6E30 80 ED A7 00 */ lwz r7, lbl_805A92C0@sda21(r13)
/* 802E9ED4 002E6E34 80 03 00 00 */ lwz r0, 0(r3) /* 802E9ED4 002E6E34 80 03 00 00 */ lwz r0, 0(r3)
/* 802E9ED8 002E6E38 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802E9ED8 002E6E38 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802E9EDC 002E6E3C 1C E7 01 6C */ mulli r7, r7, 0x16c /* 802E9EDC 002E6E3C 1C E7 01 6C */ mulli r7, r7, 0x16c
/* 802E9EE0 002E6E40 54 04 05 3F */ clrlwi. r4, r0, 0x14 /* 802E9EE0 002E6E40 54 04 05 3F */ clrlwi. r4, r0, 0x14
/* 802E9EE4 002E6E44 38 03 FD 48 */ addi r0, r3, lbl_8059FD48@l /* 802E9EE4 002E6E44 38 03 FD 48 */ addi r0, r3, mChannels__11CSfxManager@l
/* 802E9EE8 002E6E48 7C 60 3A 14 */ add r3, r0, r7 /* 802E9EE8 002E6E48 7C 60 3A 14 */ add r3, r0, r7
/* 802E9EEC 002E6E4C 41 80 00 E0 */ blt lbl_802E9FCC /* 802E9EEC 002E6E4C 41 80 00 E0 */ blt lbl_802E9FCC
/* 802E9EF0 002E6E50 80 03 00 48 */ lwz r0, 0x48(r3) /* 802E9EF0 002E6E50 80 03 00 48 */ lwz r0, 0x48(r3)
@ -3073,11 +3073,11 @@ lbl_802EA034:
lbl_802EA0B4: lbl_802EA0B4:
/* 802EA0B4 002E7014 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13) /* 802EA0B4 002E7014 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13)
/* 802EA0B8 002E7018 38 60 00 01 */ li r3, 1 /* 802EA0B8 002E7018 38 60 00 01 */ li r3, 1
/* 802EA0BC 002E701C 3C 80 80 5A */ lis r4, lbl_8059FD48@ha /* 802EA0BC 002E701C 3C 80 80 5A */ lis r4, mChannels__11CSfxManager@ha
/* 802EA0C0 002E7020 98 6D A7 04 */ stb r3, lbl_805A92C4@sda21(r13) /* 802EA0C0 002E7020 98 6D A7 04 */ stb r3, lbl_805A92C4@sda21(r13)
/* 802EA0C4 002E7024 1C A0 01 6C */ mulli r5, r0, 0x16c /* 802EA0C4 002E7024 1C A0 01 6C */ mulli r5, r0, 0x16c
/* 802EA0C8 002E7028 38 61 00 0C */ addi r3, r1, 0xc /* 802EA0C8 002E7028 38 61 00 0C */ addi r3, r1, 0xc
/* 802EA0CC 002E702C 38 04 FD 48 */ addi r0, r4, lbl_8059FD48@l /* 802EA0CC 002E702C 38 04 FD 48 */ addi r0, r4, mChannels__11CSfxManager@l
/* 802EA0D0 002E7030 7F A4 07 34 */ extsh r4, r29 /* 802EA0D0 002E7030 7F A4 07 34 */ extsh r4, r29
/* 802EA0D4 002E7034 7F 40 2A 14 */ add r26, r0, r5 /* 802EA0D4 002E7034 7F 40 2A 14 */ add r26, r0, r5
/* 802EA0D8 002E7038 4B FF F5 89 */ bl LocateHandle__11CSfxManagerFs /* 802EA0D8 002E7038 4B FF F5 89 */ bl LocateHandle__11CSfxManagerFs
@ -3275,9 +3275,9 @@ AddEmitter__11CSfxManagerFUsRC9CVector3fRC9CVector3fbbsi:
UpdateListener__11CSfxManagerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc: UpdateListener__11CSfxManagerFRC9CVector3fRC9CVector3fRC9CVector3fRC9CVector3fUc:
/* 802EA398 002E72F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA398 002E72F8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802EA39C 002E72FC 7C 08 02 A6 */ mflr r0 /* 802EA39C 002E72FC 7C 08 02 A6 */ mflr r0
/* 802EA3A0 002E7300 3D 00 80 5A */ lis r8, lbl_8059FD48@ha /* 802EA3A0 002E7300 3D 00 80 5A */ lis r8, mChannels__11CSfxManager@ha
/* 802EA3A4 002E7304 90 01 00 14 */ stw r0, 0x14(r1) /* 802EA3A4 002E7304 90 01 00 14 */ stw r0, 0x14(r1)
/* 802EA3A8 002E7308 39 08 FD 48 */ addi r8, r8, lbl_8059FD48@l /* 802EA3A8 002E7308 39 08 FD 48 */ addi r8, r8, mChannels__11CSfxManager@l
/* 802EA3AC 002E730C 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13) /* 802EA3AC 002E730C 80 0D A7 00 */ lwz r0, lbl_805A92C0@sda21(r13)
/* 802EA3B0 002E7310 C0 23 00 00 */ lfs f1, 0(r3) /* 802EA3B0 002E7310 C0 23 00 00 */ lfs f1, 0(r3)
/* 802EA3B4 002E7314 1D 20 01 6C */ mulli r9, r0, 0x16c /* 802EA3B4 002E7314 1D 20 01 6C */ mulli r9, r0, 0x16c
@ -3319,10 +3319,10 @@ AddListener__11CSfxManagerFQ211CSfxManager12ESfxChannelsRC9CVector3fRC9CVector3f
/* 802EA438 002E7398 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802EA438 002E7398 94 21 FF 80 */ stwu r1, -0x80(r1)
/* 802EA43C 002E739C 7C 08 02 A6 */ mflr r0 /* 802EA43C 002E739C 7C 08 02 A6 */ mflr r0
/* 802EA440 002E73A0 1D 83 01 6C */ mulli r12, r3, 0x16c /* 802EA440 002E73A0 1D 83 01 6C */ mulli r12, r3, 0x16c
/* 802EA444 002E73A4 3D 60 80 5A */ lis r11, lbl_8059FD48@ha /* 802EA444 002E73A4 3D 60 80 5A */ lis r11, mChannels__11CSfxManager@ha
/* 802EA448 002E73A8 90 01 00 84 */ stw r0, 0x84(r1) /* 802EA448 002E73A8 90 01 00 84 */ stw r0, 0x84(r1)
/* 802EA44C 002E73AC FC A0 08 18 */ frsp f5, f1 /* 802EA44C 002E73AC FC A0 08 18 */ frsp f5, f1
/* 802EA450 002E73B0 38 6B FD 48 */ addi r3, r11, lbl_8059FD48@l /* 802EA450 002E73B0 38 6B FD 48 */ addi r3, r11, mChannels__11CSfxManager@l
/* 802EA454 002E73B4 FC 80 10 18 */ frsp f4, f2 /* 802EA454 002E73B4 FC 80 10 18 */ frsp f4, f2
/* 802EA458 002E73B8 80 04 00 00 */ lwz r0, 0(r4) /* 802EA458 002E73B8 80 04 00 00 */ lwz r0, 0(r4)
/* 802EA45C 002E73BC 81 44 00 04 */ lwz r10, 4(r4) /* 802EA45C 002E73BC 81 44 00 04 */ lwz r10, 4(r4)
@ -3426,11 +3426,11 @@ AddListener__11CSfxManagerFQ211CSfxManager12ESfxChannelsRC9CVector3fRC9CVector3f
StopAndRemoveAllEmitters__11CSfxManagerFv: StopAndRemoveAllEmitters__11CSfxManagerFv:
/* 802EA5DC 002E753C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802EA5DC 002E753C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802EA5E0 002E7540 7C 08 02 A6 */ mflr r0 /* 802EA5E0 002E7540 7C 08 02 A6 */ mflr r0
/* 802EA5E4 002E7544 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802EA5E4 002E7544 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802EA5E8 002E7548 90 01 00 24 */ stw r0, 0x24(r1) /* 802EA5E8 002E7548 90 01 00 24 */ stw r0, 0x24(r1)
/* 802EA5EC 002E754C BF 61 00 0C */ stmw r27, 0xc(r1) /* 802EA5EC 002E754C BF 61 00 0C */ stmw r27, 0xc(r1)
/* 802EA5F0 002E7550 3B 80 00 00 */ li r28, 0 /* 802EA5F0 002E7550 3B 80 00 00 */ li r28, 0
/* 802EA5F4 002E7554 3B A3 FD 48 */ addi r29, r3, lbl_8059FD48@l /* 802EA5F4 002E7554 3B A3 FD 48 */ addi r29, r3, mChannels__11CSfxManager@l
lbl_802EA5F8: lbl_802EA5F8:
/* 802EA5F8 002E7558 3B DD 00 4C */ addi r30, r29, 0x4c /* 802EA5F8 002E7558 3B DD 00 4C */ addi r30, r29, 0x4c
/* 802EA5FC 002E755C 3B 60 00 00 */ li r27, 0 /* 802EA5FC 002E755C 3B 60 00 00 */ li r27, 0
@ -4339,12 +4339,12 @@ lbl_802EB138:
__sinit_CSfxManager_cpp: __sinit_CSfxManager_cpp:
/* 802EB154 002E80B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB154 002E80B4 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802EB158 002E80B8 7C 08 02 A6 */ mflr r0 /* 802EB158 002E80B8 7C 08 02 A6 */ mflr r0
/* 802EB15C 002E80BC 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802EB15C 002E80BC 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802EB160 002E80C0 3C 80 80 2F */ lis r4, __ct__Q211CSfxManager11CSfxChannelFv@ha /* 802EB160 002E80C0 3C 80 80 2F */ lis r4, __ct__Q211CSfxManager11CSfxChannelFv@ha
/* 802EB164 002E80C4 90 01 00 14 */ stw r0, 0x14(r1) /* 802EB164 002E80C4 90 01 00 14 */ stw r0, 0x14(r1)
/* 802EB168 002E80C8 3C A0 80 2F */ lis r5, __dt__Q211CSfxManager11CSfxChannelFv@ha /* 802EB168 002E80C8 3C A0 80 2F */ lis r5, __dt__Q211CSfxManager11CSfxChannelFv@ha
/* 802EB16C 002E80CC 3C C0 80 48 */ lis r6, lbl_80479BA0@ha /* 802EB16C 002E80CC 3C C0 80 48 */ lis r6, lbl_80479BA0@ha
/* 802EB170 002E80D0 38 63 FD 48 */ addi r3, r3, lbl_8059FD48@l /* 802EB170 002E80D0 38 63 FD 48 */ addi r3, r3, mChannels__11CSfxManager@l
/* 802EB174 002E80D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802EB174 002E80D4 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802EB178 002E80D8 3B E6 9B A0 */ addi r31, r6, lbl_80479BA0@l /* 802EB178 002E80D8 3B E6 9B A0 */ addi r31, r6, lbl_80479BA0@l
/* 802EB17C 002E80DC 38 84 B4 20 */ addi r4, r4, __ct__Q211CSfxManager11CSfxChannelFv@l /* 802EB17C 002E80DC 38 84 B4 20 */ addi r4, r4, __ct__Q211CSfxManager11CSfxChannelFv@l
@ -4367,16 +4367,16 @@ __sinit_CSfxManager_cpp:
/* 802EB1C0 002E8120 38 6D A7 10 */ addi r3, r13, lbl_805A92D0@sda21 /* 802EB1C0 002E8120 38 6D A7 10 */ addi r3, r13, lbl_805A92D0@sda21
/* 802EB1C4 002E8124 48 09 E4 C9 */ bl __register_global_object /* 802EB1C4 002E8124 48 09 E4 C9 */ bl __register_global_object
/* 802EB1C8 002E8128 38 00 00 00 */ li r0, 0 /* 802EB1C8 002E8128 38 00 00 00 */ li r0, 0
/* 802EB1CC 002E812C 3C 60 80 5A */ lis r3, lbl_805A2B60@ha /* 802EB1CC 002E812C 3C 60 80 5A */ lis r3, mEmitterWrapperPool__11CSfxManager@ha
/* 802EB1D0 002E8130 3C 80 80 2F */ lis r4, "__dt__Q24rstl56reserved_vector<Q211CSfxManager18CSfxEmitterWrapper,128>Fv"@ha /* 802EB1D0 002E8130 3C 80 80 2F */ lis r4, "__dt__Q24rstl56reserved_vector<Q211CSfxManager18CSfxEmitterWrapper,128>Fv"@ha
/* 802EB1D4 002E8134 94 03 2B 60 */ stwu r0, lbl_805A2B60@l(r3) /* 802EB1D4 002E8134 94 03 2B 60 */ stwu r0, mEmitterWrapperPool__11CSfxManager@l(r3)
/* 802EB1D8 002E8138 38 84 B2 B0 */ addi r4, r4, "__dt__Q24rstl56reserved_vector<Q211CSfxManager18CSfxEmitterWrapper,128>Fv"@l /* 802EB1D8 002E8138 38 84 B2 B0 */ addi r4, r4, "__dt__Q24rstl56reserved_vector<Q211CSfxManager18CSfxEmitterWrapper,128>Fv"@l
/* 802EB1DC 002E813C 38 BF 00 18 */ addi r5, r31, 0x18 /* 802EB1DC 002E813C 38 BF 00 18 */ addi r5, r31, 0x18
/* 802EB1E0 002E8140 48 09 E4 AD */ bl __register_global_object /* 802EB1E0 002E8140 48 09 E4 AD */ bl __register_global_object
/* 802EB1E4 002E8144 38 00 00 00 */ li r0, 0 /* 802EB1E4 002E8144 38 00 00 00 */ li r0, 0
/* 802EB1E8 002E8148 3C 60 80 5A */ lis r3, lbl_805A4164@ha /* 802EB1E8 002E8148 3C 60 80 5A */ lis r3, mWrapperPool__11CSfxManager@ha
/* 802EB1EC 002E814C 3C 80 80 2F */ lis r4, "__dt__Q24rstl49reserved_vector<Q211CSfxManager11CSfxWrapper,128>Fv"@ha /* 802EB1EC 002E814C 3C 80 80 2F */ lis r4, "__dt__Q24rstl49reserved_vector<Q211CSfxManager11CSfxWrapper,128>Fv"@ha
/* 802EB1F0 002E8150 94 03 41 64 */ stwu r0, lbl_805A4164@l(r3) /* 802EB1F0 002E8150 94 03 41 64 */ stwu r0, mWrapperPool__11CSfxManager@l(r3)
/* 802EB1F4 002E8154 38 84 B2 14 */ addi r4, r4, "__dt__Q24rstl49reserved_vector<Q211CSfxManager11CSfxWrapper,128>Fv"@l /* 802EB1F4 002E8154 38 84 B2 14 */ addi r4, r4, "__dt__Q24rstl49reserved_vector<Q211CSfxManager11CSfxWrapper,128>Fv"@l
/* 802EB1F8 002E8158 38 BF 00 24 */ addi r5, r31, 0x24 /* 802EB1F8 002E8158 38 BF 00 24 */ addi r5, r31, 0x24
/* 802EB1FC 002E815C 48 09 E4 91 */ bl __register_global_object /* 802EB1FC 002E815C 48 09 E4 91 */ bl __register_global_object
@ -4480,10 +4480,10 @@ lbl_802EB328:
__arraydtor$2309: __arraydtor$2309:
/* 802EB34C 002E82AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB34C 002E82AC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802EB350 002E82B0 7C 08 02 A6 */ mflr r0 /* 802EB350 002E82B0 7C 08 02 A6 */ mflr r0
/* 802EB354 002E82B4 3C 60 80 5A */ lis r3, lbl_8059FD48@ha /* 802EB354 002E82B4 3C 60 80 5A */ lis r3, mChannels__11CSfxManager@ha
/* 802EB358 002E82B8 3C 80 80 2F */ lis r4, __dt__Q211CSfxManager11CSfxChannelFv@ha /* 802EB358 002E82B8 3C 80 80 2F */ lis r4, __dt__Q211CSfxManager11CSfxChannelFv@ha
/* 802EB35C 002E82BC 90 01 00 14 */ stw r0, 0x14(r1) /* 802EB35C 002E82BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 802EB360 002E82C0 38 63 FD 48 */ addi r3, r3, lbl_8059FD48@l /* 802EB360 002E82C0 38 63 FD 48 */ addi r3, r3, mChannels__11CSfxManager@l
/* 802EB364 002E82C4 38 A0 01 6C */ li r5, 0x16c /* 802EB364 002E82C4 38 A0 01 6C */ li r5, 0x16c
/* 802EB368 002E82C8 38 84 B3 84 */ addi r4, r4, __dt__Q211CSfxManager11CSfxChannelFv@l /* 802EB368 002E82C8 38 84 B3 84 */ addi r4, r4, __dt__Q211CSfxManager11CSfxChannelFv@l
/* 802EB36C 002E82CC 38 C0 00 04 */ li r6, 4 /* 802EB36C 002E82CC 38 C0 00 04 */ li r6, 4

3
asm/Kyoto/Audio/CStreamAudioManager.s
View File

@ -42,7 +42,7 @@ lbl_805A8A41:
.balign 8 .balign 8
.comm lbl_805A6B60, 0x30, 4 .comm lbl_805A6B60, 0x30, 4
.comm lbl_805A6B90, 0x10, 4 .comm lbl_805A6B90, 0x10, 4 # MWCC .comm bug
.comm lbl_805A6BA0, 0x4, 4 .comm lbl_805A6BA0, 0x4, 4
.comm lbl_805A6BA4, 0x4, 4 .comm lbl_805A6BA4, 0x4, 4
.comm lbl_805A6BA8, 0x8, 4 .comm lbl_805A6BA8, 0x8, 4
@ -1512,4 +1512,3 @@ lbl_803D8410:
# ROM: 0x3D5410 # ROM: 0x3D5410
.4byte 0 .4byte 0
.4byte 0 .4byte 0

3
asm/Kyoto/DolphinCMemoryCardSys.s
View File

@ -31,7 +31,8 @@ lbl_805A89AB:
.section .bss .section .bss
.balign 8 .balign 8
.comm lbl_805A67DC, 0x20, 4 .comm lbl_805A67DC, 0x10, 4
.comm lbl_805A67EC, 0x10, 4 # MWCC .comm bug
.comm lbl_805A67FC, 0x10, 4 .comm lbl_805A67FC, 0x10, 4
.lcomm lbl_804BFFA0, 0xC, 4 .lcomm lbl_804BFFA0, 0xC, 4
.lcomm lbl_804BFFAC, 0x14, 4 .lcomm lbl_804BFFAC, 0x14, 4

3
asm/Kyoto/Graphics/CLight.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm kDefaultPosition__6CLight, 0x18, 4 .comm kDefaultPosition__6CLight, 0xC, 4
.comm lbl_805A53D4, 0xC, 4 # MWCC .comm bug
.comm kDefaultDirection__6CLight, 0xC, 4 .comm kDefaultDirection__6CLight, 0xC, 4
.section .ctors, "wa" .section .ctors, "wa"

2
asm/Kyoto/Graphics/DolphinCGraphics.s
View File

@ -96,7 +96,7 @@ mBrightnessMax__9CGraphics:
.lcomm sSpareFrameBuffer, 0x46000, 4 .lcomm sSpareFrameBuffer, 0x46000, 4
.lcomm kEnvBlendCTandCConCF, 0x50, 4 .lcomm kEnvBlendCTandCConCF, 0x50, 4
.comm kEnvModulateConstColor__9CGraphics, 0x4C, 4 .comm kEnvModulateConstColor__9CGraphics, 0x4C, 4
.comm lbl_805A56E4, 0x78C, 4 # ??? .comm lbl_805A56E4, 0x78C, 4 # MWCC .comm bug
.comm kEnvConstColor__9CGraphics, 0x4C, 4 .comm kEnvConstColor__9CGraphics, 0x4C, 4
.comm kEnvModulate__9CGraphics, 0x4C, 4 .comm kEnvModulate__9CGraphics, 0x4C, 4
.comm kEnvDecal__9CGraphics, 0x4C, 4 .comm kEnvDecal__9CGraphics, 0x4C, 4

4
asm/Kyoto/Math/CAABox.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm mskInvertedBox__6CAABox, 0x30, 4 .comm mskInvertedBox__6CAABox, 0x18, 4
.comm lbl_805A676C, 0x18, 4 # MWCC .comm bug
.comm mskNullBox__6CAABox, 0x18, 4 .comm mskNullBox__6CAABox, 0x18, 4
.section .ctors, "wa" .section .ctors, "wa"
@ -1489,4 +1490,3 @@ lbl_805AE8B8:
# ROM: 0x3FB158 # ROM: 0x3FB158
.4byte 0xFF7FFFFF .4byte 0xFF7FFFFF
.4byte 0 .4byte 0

2
asm/Kyoto/Math/CVector3f.s
View File

@ -1,7 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm sZeroVector__9CVector3f, 0xC, 4 .comm sZeroVector__9CVector3f, 0xC, 4
.comm lbl_805A66AC, 0x48, 4 # unreferenced, what's this? .comm lbl_805A66AC, 0x48, 4 # MWCC .comm bug
.comm sUpVector__9CVector3f, 0xC, 4 .comm sUpVector__9CVector3f, 0xC, 4
.comm sDownVector__9CVector3f, 0xC, 4 .comm sDownVector__9CVector3f, 0xC, 4
.comm sLeftVector__9CVector3f, 0xC, 4 .comm sLeftVector__9CVector3f, 0xC, 4

3
asm/MetroidPrime/CAnimData.s
View File

@ -88,7 +88,8 @@ lbl_805A6DB0:
.balign 8 .balign 8
.lcomm lbl_8045B140, 0x40, 4 .lcomm lbl_8045B140, 0x40, 4
.comm mBoolPOINodes__9CAnimData, 0x17F4, 4 .comm mBoolPOINodes__9CAnimData, 0x1E4, 4
.comm lbl_8056A7E4, 0x1610, 4 # MWCC .comm bug
.comm mInt32POINodes__9CAnimData, 0x4C4, 4 .comm mInt32POINodes__9CAnimData, 0x4C4, 4
.comm mParticlePOINodes__9CAnimData, 0x734, 4 .comm mParticlePOINodes__9CAnimData, 0x734, 4
.comm mSoundPOINodes__9CAnimData, 0x554, 4 .comm mSoundPOINodes__9CAnimData, 0x554, 4

3
asm/MetroidPrime/CDamageVulnerability.s
View File

@ -7,7 +7,8 @@ lbl_ctor:
.section .bss, "wa" .section .bss, "wa"
.balign 8 .balign 8
.comm sNormalVulnerability__20CDamageVulnerability, 0x1A0, 4 .comm sNormalVulnerability__20CDamageVulnerability, 0x68, 4
.comm lbl_8056D5E0, 0x138, 4 # MWCC .comm bug
.comm sImmuneVulnerability__20CDamageVulnerability, 0x68, 4 .comm sImmuneVulnerability__20CDamageVulnerability, 0x68, 4
.comm sReflectVulnerability__20CDamageVulnerability, 0x68, 4 .comm sReflectVulnerability__20CDamageVulnerability, 0x68, 4
.comm sPassThroughVulnerability__20CDamageVulnerability, 0x68, 4 .comm sPassThroughVulnerability__20CDamageVulnerability, 0x68, 4

97
asm/MetroidPrime/CDecalManager.s
View File

@ -9,8 +9,9 @@ lbl_ctor:
.lcomm lbl_8046C558, 0xC, 4 .lcomm lbl_8046C558, 0xC, 4
.lcomm lbl_8046C564, 0xC, 4 .lcomm lbl_8046C564, 0xC, 4
.comm lbl_8056D850, 0x1F08, 4 .comm mDecalPool__13CDecalManager, 0x1E04, 4
.comm lbl_8056F758, 0x104, 4 .comm lbl_8056F654, 0x104, 4 # MWCC .comm bug
.comm mActiveIndexList__13CDecalManager, 0x104, 4
.section .sbss .section .sbss
.balign 8 .balign 8
@ -57,11 +58,11 @@ lbl_805AB380:
AddToRenderer__13CDecalManagerFRC14CFrustumPlanesRC13CStateManager: AddToRenderer__13CDecalManagerFRC14CFrustumPlanesRC13CStateManager:
/* 80116EC4 00113E24 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80116EC4 00113E24 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80116EC8 00113E28 7C 08 02 A6 */ mflr r0 /* 80116EC8 00113E28 7C 08 02 A6 */ mflr r0
/* 80116ECC 00113E2C 3C A0 80 57 */ lis r5, lbl_8056F758@ha /* 80116ECC 00113E2C 3C A0 80 57 */ lis r5, mActiveIndexList__13CDecalManager@ha
/* 80116ED0 00113E30 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80116ED0 00113E30 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80116ED4 00113E34 90 01 00 64 */ stw r0, 0x64(r1) /* 80116ED4 00113E34 90 01 00 64 */ stw r0, 0x64(r1)
/* 80116ED8 00113E38 38 A5 F7 58 */ addi r5, r5, lbl_8056F758@l /* 80116ED8 00113E38 38 A5 F7 58 */ addi r5, r5, mActiveIndexList__13CDecalManager@l
/* 80116EDC 00113E3C 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 80116EDC 00113E3C 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 80116EE0 00113E40 BF 61 00 4C */ stmw r27, 0x4c(r1) /* 80116EE0 00113E40 BF 61 00 4C */ stmw r27, 0x4c(r1)
/* 80116EE4 00113E44 7C 9F 23 78 */ mr r31, r4 /* 80116EE4 00113E44 7C 9F 23 78 */ mr r31, r4
/* 80116EE8 00113E48 38 85 00 04 */ addi r4, r5, 4 /* 80116EE8 00113E48 38 85 00 04 */ addi r4, r5, 4
@ -131,13 +132,13 @@ Update__13CDecalManagerFfR13CStateManager:
/* 80116FCC 00113F2C BF 61 00 0C */ stmw r27, 0xc(r1) /* 80116FCC 00113F2C BF 61 00 0C */ stmw r27, 0xc(r1)
/* 80116FD0 00113F30 FF E0 08 90 */ fmr f31, f1 /* 80116FD0 00113F30 FF E0 08 90 */ fmr f31, f1
/* 80116FD4 00113F34 C0 0D A3 70 */ lfs f0, lbl_805A8F30@sda21(r13) /* 80116FD4 00113F34 C0 0D A3 70 */ lfs f0, lbl_805A8F30@sda21(r13)
/* 80116FD8 00113F38 3C A0 80 57 */ lis r5, lbl_8056F758@ha /* 80116FD8 00113F38 3C A0 80 57 */ lis r5, mActiveIndexList__13CDecalManager@ha
/* 80116FDC 00113F3C 3C 80 80 57 */ lis r4, lbl_8056D850@ha /* 80116FDC 00113F3C 3C 80 80 57 */ lis r4, mDecalPool__13CDecalManager@ha
/* 80116FE0 00113F40 3B E5 F7 58 */ addi r31, r5, lbl_8056F758@l /* 80116FE0 00113F40 3B E5 F7 58 */ addi r31, r5, mActiveIndexList__13CDecalManager@l
/* 80116FE4 00113F44 7C 7B 1B 78 */ mr r27, r3 /* 80116FE4 00113F44 7C 7B 1B 78 */ mr r27, r3
/* 80116FE8 00113F48 EC 00 F8 2A */ fadds f0, f0, f31 /* 80116FE8 00113F48 EC 00 F8 2A */ fadds f0, f0, f31
/* 80116FEC 00113F4C 3B BF 00 04 */ addi r29, r31, 4 /* 80116FEC 00113F4C 3B BF 00 04 */ addi r29, r31, 4
/* 80116FF0 00113F50 38 64 D8 50 */ addi r3, r4, lbl_8056D850@l /* 80116FF0 00113F50 38 64 D8 50 */ addi r3, r4, mDecalPool__13CDecalManager@l
/* 80116FF4 00113F54 7F BC EB 78 */ mr r28, r29 /* 80116FF4 00113F54 7F BC EB 78 */ mr r28, r29
/* 80116FF8 00113F58 D0 0D A3 70 */ stfs f0, lbl_805A8F30@sda21(r13) /* 80116FF8 00113F58 D0 0D A3 70 */ stfs f0, lbl_805A8F30@sda21(r13)
/* 80116FFC 00113F5C 3B C3 00 04 */ addi r30, r3, 4 /* 80116FFC 00113F5C 3B C3 00 04 */ addi r30, r3, 4
@ -178,8 +179,8 @@ lbl_80117048:
.global RemoveFromActiveList__13CDecalManagerFPii .global RemoveFromActiveList__13CDecalManagerFPii
RemoveFromActiveList__13CDecalManagerFPii: RemoveFromActiveList__13CDecalManagerFPii:
/* 80117078 00113FD8 3C A0 80 57 */ lis r5, lbl_8056F758@ha /* 80117078 00113FD8 3C A0 80 57 */ lis r5, mActiveIndexList__13CDecalManager@ha
/* 8011707C 00113FDC 38 C5 F7 58 */ addi r6, r5, lbl_8056F758@l /* 8011707C 00113FDC 38 C5 F7 58 */ addi r6, r5, mActiveIndexList__13CDecalManager@l
/* 80117080 00113FE0 39 06 00 04 */ addi r8, r6, 4 /* 80117080 00113FE0 39 06 00 04 */ addi r8, r6, 4
/* 80117084 00113FE4 7C 03 40 40 */ cmplw r3, r8 /* 80117084 00113FE4 7C 03 40 40 */ cmplw r3, r8
/* 80117088 00113FE8 41 80 00 5C */ blt lbl_801170E4 /* 80117088 00113FE8 41 80 00 5C */ blt lbl_801170E4
@ -201,24 +202,24 @@ lbl_801170B4:
/* 801170C0 00114020 7C 08 02 14 */ add r0, r8, r0 /* 801170C0 00114020 7C 08 02 14 */ add r0, r8, r0
/* 801170C4 00114024 7C 07 00 40 */ cmplw r7, r0 /* 801170C4 00114024 7C 07 00 40 */ cmplw r7, r0
/* 801170C8 00114028 41 80 FF E0 */ blt lbl_801170A8 /* 801170C8 00114028 41 80 FF E0 */ blt lbl_801170A8
/* 801170CC 0011402C 3C A0 80 57 */ lis r5, lbl_8056F758@ha /* 801170CC 0011402C 3C A0 80 57 */ lis r5, mActiveIndexList__13CDecalManager@ha
/* 801170D0 00114030 38 C5 F7 58 */ addi r6, r5, lbl_8056F758@l /* 801170D0 00114030 38 C5 F7 58 */ addi r6, r5, mActiveIndexList__13CDecalManager@l
/* 801170D4 00114034 80 A6 00 00 */ lwz r5, 0(r6) /* 801170D4 00114034 80 A6 00 00 */ lwz r5, 0(r6)
/* 801170D8 00114038 38 05 FF FF */ addi r0, r5, -1 /* 801170D8 00114038 38 05 FF FF */ addi r0, r5, -1
/* 801170DC 0011403C 90 06 00 00 */ stw r0, 0(r6) /* 801170DC 0011403C 90 06 00 00 */ stw r0, 0(r6)
/* 801170E0 00114040 48 00 00 14 */ b lbl_801170F4 /* 801170E0 00114040 48 00 00 14 */ b lbl_801170F4
lbl_801170E4: lbl_801170E4:
/* 801170E4 00114044 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 801170E4 00114044 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 801170E8 00114048 80 03 F7 58 */ lwz r0, lbl_8056F758@l(r3) /* 801170E8 00114048 80 03 F7 58 */ lwz r0, mActiveIndexList__13CDecalManager@l(r3)
/* 801170EC 0011404C 54 00 10 3A */ slwi r0, r0, 2 /* 801170EC 0011404C 54 00 10 3A */ slwi r0, r0, 2
/* 801170F0 00114050 7C 68 02 14 */ add r3, r8, r0 /* 801170F0 00114050 7C 68 02 14 */ add r3, r8, r0
lbl_801170F4: lbl_801170F4:
/* 801170F4 00114054 1C A4 00 78 */ mulli r5, r4, 0x78 /* 801170F4 00114054 1C A4 00 78 */ mulli r5, r4, 0x78
/* 801170F8 00114058 80 ED A3 68 */ lwz r7, lbl_805A8F28@sda21(r13) /* 801170F8 00114058 80 ED A3 68 */ lwz r7, lbl_805A8F28@sda21(r13)
/* 801170FC 0011405C 80 0D A3 74 */ lwz r0, lbl_805A8F34@sda21(r13) /* 801170FC 0011405C 80 0D A3 74 */ lwz r0, lbl_805A8F34@sda21(r13)
/* 80117100 00114060 3C C0 80 57 */ lis r6, lbl_8056D850@ha /* 80117100 00114060 3C C0 80 57 */ lis r6, mDecalPool__13CDecalManager@ha
/* 80117104 00114064 90 8D A3 68 */ stw r4, lbl_805A8F28@sda21(r13) /* 80117104 00114064 90 8D A3 68 */ stw r4, lbl_805A8F28@sda21(r13)
/* 80117108 00114068 38 C6 D8 50 */ addi r6, r6, lbl_8056D850@l /* 80117108 00114068 38 C6 D8 50 */ addi r6, r6, mDecalPool__13CDecalManager@l
/* 8011710C 0011406C 7C 00 20 00 */ cmpw r0, r4 /* 8011710C 0011406C 7C 00 20 00 */ cmpw r0, r4
/* 80117110 00114070 7C 86 2A 14 */ add r4, r6, r5 /* 80117110 00114070 7C 86 2A 14 */ add r4, r6, r5
/* 80117114 00114074 98 E4 00 78 */ stb r7, 0x78(r4) /* 80117114 00114074 98 E4 00 78 */ stb r7, 0x78(r4)
@ -250,9 +251,9 @@ lbl_801170F4:
/* 80117170 001140D0 7C 00 F0 40 */ cmplw r0, r30 /* 80117170 001140D0 7C 00 F0 40 */ cmplw r0, r30
/* 80117174 001140D4 40 82 00 70 */ bne lbl_801171E4 /* 80117174 001140D4 40 82 00 70 */ bne lbl_801171E4
/* 80117178 001140D8 1C 07 00 78 */ mulli r0, r7, 0x78 /* 80117178 001140D8 1C 07 00 78 */ mulli r0, r7, 0x78
/* 8011717C 001140DC 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 8011717C 001140DC 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80117180 001140E0 C0 5A 00 1C */ lfs f2, 0x1c(r26) /* 80117180 001140E0 C0 5A 00 1C */ lfs f2, 0x1c(r26)
/* 80117184 001140E4 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 80117184 001140E4 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 80117188 001140E8 C0 1A 00 0C */ lfs f0, 0xc(r26) /* 80117188 001140E8 C0 1A 00 0C */ lfs f0, 0xc(r26)
/* 8011718C 001140EC 7C 63 02 14 */ add r3, r3, r0 /* 8011718C 001140EC 7C 63 02 14 */ add r3, r3, r0
/* 80117190 001140F0 C0 E3 00 2C */ lfs f7, 0x2c(r3) /* 80117190 001140F0 C0 E3 00 2C */ lfs f7, 0x2c(r3)
@ -280,14 +281,14 @@ lbl_801171E4:
/* 801171E4 00114144 80 0D A3 68 */ lwz r0, lbl_805A8F28@sda21(r13) /* 801171E4 00114144 80 0D A3 68 */ lwz r0, lbl_805A8F28@sda21(r13)
/* 801171E8 00114148 2C 00 FF FF */ cmpwi r0, -1 /* 801171E8 00114148 2C 00 FF FF */ cmpwi r0, -1
/* 801171EC 0011414C 40 82 00 14 */ bne lbl_80117200 /* 801171EC 0011414C 40 82 00 14 */ bne lbl_80117200
/* 801171F0 00114150 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 801171F0 00114150 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 801171F4 00114154 38 63 F7 58 */ addi r3, r3, lbl_8056F758@l /* 801171F4 00114154 38 63 F7 58 */ addi r3, r3, mActiveIndexList__13CDecalManager@l
/* 801171F8 00114158 84 83 00 04 */ lwzu r4, 4(r3) /* 801171F8 00114158 84 83 00 04 */ lwzu r4, 4(r3)
/* 801171FC 0011415C 4B FF FE 7D */ bl RemoveFromActiveList__13CDecalManagerFPii /* 801171FC 0011415C 4B FF FE 7D */ bl RemoveFromActiveList__13CDecalManagerFPii
lbl_80117200: lbl_80117200:
/* 80117200 00114160 83 AD A3 68 */ lwz r29, lbl_805A8F28@sda21(r13) /* 80117200 00114160 83 AD A3 68 */ lwz r29, lbl_805A8F28@sda21(r13)
/* 80117204 00114164 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80117204 00114164 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80117208 00114168 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 80117208 00114168 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 8011720C 0011416C 1C 1D 00 78 */ mulli r0, r29, 0x78 /* 8011720C 0011416C 1C 1D 00 78 */ mulli r0, r29, 0x78
/* 80117210 00114170 7F E3 02 14 */ add r31, r3, r0 /* 80117210 00114170 7F E3 02 14 */ add r31, r3, r0
/* 80117214 00114174 88 7F 00 78 */ lbz r3, 0x78(r31) /* 80117214 00114174 88 7F 00 78 */ lbz r3, 0x78(r31)
@ -318,9 +319,9 @@ lbl_8011724C:
/* 80117274 001141D4 38 80 00 00 */ li r4, 0 /* 80117274 001141D4 38 80 00 00 */ li r4, 0
/* 80117278 001141D8 48 22 9B C9 */ bl __dt__6CTokenFv /* 80117278 001141D8 48 22 9B C9 */ bl __dt__6CTokenFv
/* 8011727C 001141DC 80 BC 08 CC */ lwz r5, 0x8cc(r28) /* 8011727C 001141DC 80 BC 08 CC */ lwz r5, 0x8cc(r28)
/* 80117280 001141E0 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 80117280 001141E0 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 80117284 001141E4 20 9B 00 01 */ subfic r4, r27, 1 /* 80117284 001141E4 20 9B 00 01 */ subfic r4, r27, 1
/* 80117288 001141E8 84 03 F7 58 */ lwzu r0, lbl_8056F758@l(r3) /* 80117288 001141E8 84 03 F7 58 */ lwzu r0, mActiveIndexList__13CDecalManager@l(r3)
/* 8011728C 001141EC 7C 84 00 34 */ cntlzw r4, r4 /* 8011728C 001141EC 7C 84 00 34 */ cntlzw r4, r4
/* 80117290 001141F0 90 BF 00 70 */ stw r5, 0x70(r31) /* 80117290 001141F0 90 BF 00 70 */ stw r5, 0x70(r31)
/* 80117294 001141F4 54 00 10 3A */ slwi r0, r0, 2 /* 80117294 001141F4 54 00 10 3A */ slwi r0, r0, 2
@ -338,8 +339,8 @@ lbl_8011724C:
/* 801172C4 00114224 41 82 00 08 */ beq lbl_801172CC /* 801172C4 00114224 41 82 00 08 */ beq lbl_801172CC
/* 801172C8 00114228 93 A5 00 00 */ stw r29, 0(r5) /* 801172C8 00114228 93 A5 00 00 */ stw r29, 0(r5)
lbl_801172CC: lbl_801172CC:
/* 801172CC 0011422C 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 801172CC 0011422C 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 801172D0 00114230 38 83 F7 58 */ addi r4, r3, lbl_8056F758@l /* 801172D0 00114230 38 83 F7 58 */ addi r4, r3, mActiveIndexList__13CDecalManager@l
/* 801172D4 00114234 80 64 00 00 */ lwz r3, 0(r4) /* 801172D4 00114234 80 64 00 00 */ lwz r3, 0(r4)
/* 801172D8 00114238 38 03 00 01 */ addi r0, r3, 1 /* 801172D8 00114238 38 03 00 01 */ addi r0, r3, 1
/* 801172DC 0011423C 90 04 00 00 */ stw r0, 0(r4) /* 801172DC 0011423C 90 04 00 00 */ stw r0, 0(r4)
@ -472,9 +473,9 @@ Reinitialize__13CDecalManagerFv:
/* 801174A4 00114404 40 82 00 08 */ bne lbl_801174AC /* 801174A4 00114404 40 82 00 08 */ bne lbl_801174AC
/* 801174A8 00114408 48 00 04 AD */ bl Initialize__13CDecalManagerFv /* 801174A8 00114408 48 00 04 AD */ bl Initialize__13CDecalManagerFv
lbl_801174AC: lbl_801174AC:
/* 801174AC 0011440C 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 801174AC 0011440C 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 801174B0 00114410 3B C0 00 00 */ li r30, 0 /* 801174B0 00114410 3B C0 00 00 */ li r30, 0
/* 801174B4 00114414 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 801174B4 00114414 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 801174B8 00114418 3B E3 00 04 */ addi r31, r3, 4 /* 801174B8 00114418 3B E3 00 04 */ addi r31, r3, 4
lbl_801174BC: lbl_801174BC:
/* 801174BC 0011441C 39 00 00 00 */ li r8, 0 /* 801174BC 0011441C 39 00 00 00 */ li r8, 0
@ -521,8 +522,8 @@ lbl_8011754C:
/* 80117558 001144B8 98 81 00 F4 */ stb r4, 0xf4(r1) /* 80117558 001144B8 98 81 00 F4 */ stb r4, 0xf4(r1)
/* 8011755C 001144BC 3B FF 00 78 */ addi r31, r31, 0x78 /* 8011755C 001144BC 3B FF 00 78 */ addi r31, r31, 0x78
/* 80117560 001144C0 41 80 FF 5C */ blt lbl_801174BC /* 80117560 001144C0 41 80 FF 5C */ blt lbl_801174BC
/* 80117564 001144C4 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 80117564 001144C4 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 80117568 001144C8 80 A3 F7 58 */ lwz r5, lbl_8056F758@l(r3) /* 80117568 001144C8 80 A3 F7 58 */ lwz r5, mActiveIndexList__13CDecalManager@l(r3)
/* 8011756C 001144CC 2C 05 00 00 */ cmpwi r5, 0 /* 8011756C 001144CC 2C 05 00 00 */ cmpwi r5, 0
/* 80117570 001144D0 40 81 00 40 */ ble lbl_801175B0 /* 80117570 001144D0 40 81 00 40 */ ble lbl_801175B0
/* 80117574 001144D4 2C 05 00 08 */ cmpwi r5, 8 /* 80117574 001144D4 2C 05 00 08 */ cmpwi r5, 8
@ -545,10 +546,10 @@ lbl_801175AC:
/* 801175AC 0011450C 42 00 00 00 */ bdnz lbl_801175AC /* 801175AC 0011450C 42 00 00 00 */ bdnz lbl_801175AC
lbl_801175B0: lbl_801175B0:
/* 801175B0 00114510 38 00 00 3F */ li r0, 0x3f /* 801175B0 00114510 38 00 00 3F */ li r0, 0x3f
/* 801175B4 00114514 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 801175B4 00114514 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 801175B8 00114518 38 80 00 00 */ li r4, 0 /* 801175B8 00114518 38 80 00 00 */ li r4, 0
/* 801175BC 0011451C 90 0D A3 68 */ stw r0, lbl_805A8F28@sda21(r13) /* 801175BC 0011451C 90 0D A3 68 */ stw r0, lbl_805A8F28@sda21(r13)
/* 801175C0 00114520 90 83 F7 58 */ stw r4, lbl_8056F758@l(r3) /* 801175C0 00114520 90 83 F7 58 */ stw r4, mActiveIndexList__13CDecalManager@l(r3)
/* 801175C4 00114524 83 E1 00 FC */ lwz r31, 0xfc(r1) /* 801175C4 00114524 83 E1 00 FC */ lwz r31, 0xfc(r1)
/* 801175C8 00114528 80 01 01 04 */ lwz r0, 0x104(r1) /* 801175C8 00114528 80 01 01 04 */ lwz r0, 0x104(r1)
/* 801175CC 0011452C 83 C1 00 F8 */ lwz r30, 0xf8(r1) /* 801175CC 0011452C 83 C1 00 F8 */ lwz r30, 0xf8(r1)
@ -716,10 +717,10 @@ lbl_801177E0:
ShutDown__13CDecalManagerFv: ShutDown__13CDecalManagerFv:
/* 80117804 00114764 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80117804 00114764 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80117808 00114768 7C 08 02 A6 */ mflr r0 /* 80117808 00114768 7C 08 02 A6 */ mflr r0
/* 8011780C 0011476C 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 8011780C 0011476C 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 80117810 00114770 38 80 00 00 */ li r4, 0 /* 80117810 00114770 38 80 00 00 */ li r4, 0
/* 80117814 00114774 90 01 00 14 */ stw r0, 0x14(r1) /* 80117814 00114774 90 01 00 14 */ stw r0, 0x14(r1)
/* 80117818 00114778 80 A3 F7 58 */ lwz r5, lbl_8056F758@l(r3) /* 80117818 00114778 80 A3 F7 58 */ lwz r5, mActiveIndexList__13CDecalManager@l(r3)
/* 8011781C 0011477C 2C 05 00 00 */ cmpwi r5, 0 /* 8011781C 0011477C 2C 05 00 00 */ cmpwi r5, 0
/* 80117820 00114780 40 81 00 40 */ ble lbl_80117860 /* 80117820 00114780 40 81 00 40 */ ble lbl_80117860
/* 80117824 00114784 2C 05 00 08 */ cmpwi r5, 8 /* 80117824 00114784 2C 05 00 08 */ cmpwi r5, 8
@ -741,11 +742,11 @@ lbl_8011784C:
lbl_8011785C: lbl_8011785C:
/* 8011785C 001147BC 42 00 00 00 */ bdnz lbl_8011785C /* 8011785C 001147BC 42 00 00 00 */ bdnz lbl_8011785C
lbl_80117860: lbl_80117860:
/* 80117860 001147C0 3C 80 80 57 */ lis r4, lbl_8056F758@ha /* 80117860 001147C0 3C 80 80 57 */ lis r4, mActiveIndexList__13CDecalManager@ha
/* 80117864 001147C4 38 00 00 00 */ li r0, 0 /* 80117864 001147C4 38 00 00 00 */ li r0, 0
/* 80117868 001147C8 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80117868 001147C8 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 8011786C 001147CC 90 04 F7 58 */ stw r0, lbl_8056F758@l(r4) /* 8011786C 001147CC 90 04 F7 58 */ stw r0, mActiveIndexList__13CDecalManager@l(r4)
/* 80117870 001147D0 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 80117870 001147D0 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 80117874 001147D4 48 00 00 1D */ bl "data__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv" /* 80117874 001147D4 48 00 00 1D */ bl "data__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv"
/* 80117878 001147D8 38 00 00 00 */ li r0, 0 /* 80117878 001147D8 38 00 00 00 */ li r0, 0
/* 8011787C 001147DC 98 0D A3 6C */ stb r0, lbl_805A8F2C@sda21(r13) /* 8011787C 001147DC 98 0D A3 6C */ stb r0, lbl_805A8F2C@sda21(r13)
@ -823,12 +824,12 @@ Initialize__13CDecalManagerFv:
/* 80117968 001148C8 88 0D A3 6C */ lbz r0, lbl_805A8F2C@sda21(r13) /* 80117968 001148C8 88 0D A3 6C */ lbz r0, lbl_805A8F2C@sda21(r13)
/* 8011796C 001148CC 28 00 00 00 */ cmplwi r0, 0 /* 8011796C 001148CC 28 00 00 00 */ cmplwi r0, 0
/* 80117970 001148D0 40 82 00 E4 */ bne lbl_80117A54 /* 80117970 001148D0 40 82 00 E4 */ bne lbl_80117A54
/* 80117974 001148D4 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80117974 001148D4 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80117978 001148D8 38 63 D8 50 */ addi r3, r3, lbl_8056D850@l /* 80117978 001148D8 38 63 D8 50 */ addi r3, r3, mDecalPool__13CDecalManager@l
/* 8011797C 001148DC 4B FF FF 15 */ bl "data__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv" /* 8011797C 001148DC 4B FF FF 15 */ bl "data__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv"
/* 80117980 001148E0 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80117980 001148E0 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80117984 001148E4 3B C0 00 00 */ li r30, 0 /* 80117984 001148E4 3B C0 00 00 */ li r30, 0
/* 80117988 001148E8 3B E3 D8 50 */ addi r31, r3, lbl_8056D850@l /* 80117988 001148E8 3B E3 D8 50 */ addi r31, r3, mDecalPool__13CDecalManager@l
lbl_8011798C: lbl_8011798C:
/* 8011798C 001148EC 39 00 00 00 */ li r8, 0 /* 8011798C 001148EC 39 00 00 00 */ li r8, 0
/* 80117990 001148F0 38 1E FF FF */ addi r0, r30, -1 /* 80117990 001148F0 38 1E FF FF */ addi r0, r30, -1
@ -957,16 +958,16 @@ __sinit_CDecalManager_cpp:
/* 80117B3C 00114A9C 3C A0 80 47 */ lis r5, lbl_8046C558@ha /* 80117B3C 00114A9C 3C A0 80 47 */ lis r5, lbl_8046C558@ha
/* 80117B40 00114AA0 90 01 00 14 */ stw r0, 0x14(r1) /* 80117B40 00114AA0 90 01 00 14 */ stw r0, 0x14(r1)
/* 80117B44 00114AA4 38 00 00 00 */ li r0, 0 /* 80117B44 00114AA4 38 00 00 00 */ li r0, 0
/* 80117B48 00114AA8 3C 60 80 57 */ lis r3, lbl_8056D850@ha /* 80117B48 00114AA8 3C 60 80 57 */ lis r3, mDecalPool__13CDecalManager@ha
/* 80117B4C 00114AAC 38 84 7C 20 */ addi r4, r4, "__dt__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv"@l /* 80117B4C 00114AAC 38 84 7C 20 */ addi r4, r4, "__dt__Q24rstl44reserved_vector<Q213CDecalManager6SDecal,64>Fv"@l
/* 80117B50 00114AB0 94 03 D8 50 */ stwu r0, lbl_8056D850@l(r3) /* 80117B50 00114AB0 94 03 D8 50 */ stwu r0, mDecalPool__13CDecalManager@l(r3)
/* 80117B54 00114AB4 38 A5 C5 58 */ addi r5, r5, lbl_8046C558@l /* 80117B54 00114AB4 38 A5 C5 58 */ addi r5, r5, lbl_8046C558@l
/* 80117B58 00114AB8 48 27 1B 35 */ bl __register_global_object /* 80117B58 00114AB8 48 27 1B 35 */ bl __register_global_object
/* 80117B5C 00114ABC 38 00 00 00 */ li r0, 0 /* 80117B5C 00114ABC 38 00 00 00 */ li r0, 0
/* 80117B60 00114AC0 3C 60 80 57 */ lis r3, lbl_8056F758@ha /* 80117B60 00114AC0 3C 60 80 57 */ lis r3, mActiveIndexList__13CDecalManager@ha
/* 80117B64 00114AC4 3C 80 80 11 */ lis r4, "__dt__Q24rstl21reserved_vector<i,64>Fv"@ha /* 80117B64 00114AC4 3C 80 80 11 */ lis r4, "__dt__Q24rstl21reserved_vector<i,64>Fv"@ha
/* 80117B68 00114AC8 3C A0 80 47 */ lis r5, lbl_8046C564@ha /* 80117B68 00114AC8 3C A0 80 47 */ lis r5, lbl_8046C564@ha
/* 80117B6C 00114ACC 94 03 F7 58 */ stwu r0, lbl_8056F758@l(r3) /* 80117B6C 00114ACC 94 03 F7 58 */ stwu r0, mActiveIndexList__13CDecalManager@l(r3)
/* 80117B70 00114AD0 38 84 7B 8C */ addi r4, r4, "__dt__Q24rstl21reserved_vector<i,64>Fv"@l /* 80117B70 00114AD0 38 84 7B 8C */ addi r4, r4, "__dt__Q24rstl21reserved_vector<i,64>Fv"@l
/* 80117B74 00114AD4 38 A5 C5 64 */ addi r5, r5, lbl_8046C564@l /* 80117B74 00114AD4 38 A5 C5 64 */ addi r5, r5, lbl_8046C564@l
/* 80117B78 00114AD8 48 27 1B 15 */ bl __register_global_object /* 80117B78 00114AD8 48 27 1B 15 */ bl __register_global_object

4
asm/MetroidPrime/CFluidPlaneManager.s
View File

@ -15,8 +15,8 @@ lbl_805A76DC:
# .section .bss, "wa" # .section .bss, "wa"
.comm lbl_8056F8B4, 0x750, 4 .comm lbl_8056F8B4, 0x18, 4
.comm lbl_80570004, 0x948, 4 .comm lbl_8056F8CC, 0x1080, 4 # MWCC .comm bug
.comm lbl_8057094C, 0x1000, 4 .comm lbl_8057094C, 0x1000, 4
.comm lbl_8057194C, 0x40, 4 .comm lbl_8057194C, 0x40, 4
.comm lbl_8057198C, 0x40, 4 .comm lbl_8057198C, 0x40, 4

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

@ -40,7 +40,8 @@ lbl_805A789C:
.section .bss .section .bss
.balign 8 .balign 8
.lcomm lbl_8046C7D0, 0x78, 4 .lcomm lbl_8046C7D0, 0x78, 4
.comm lbl_805719E8, 0x1A8, 4 .comm lbl_805719E8, 0xD4, 4
.comm lbl_80571ABC, 0xD4, 4 # MWCC .comm bug
.comm lbl_80571B90, 0xD4, 4 .comm lbl_80571B90, 0xD4, 4
.section .text, "ax" .section .text, "ax"
@ -1647,4 +1648,3 @@ lbl_805ABC40:
lbl_805ABC44: lbl_805ABC44:
# ROM: 0x3F84E4 # ROM: 0x3F84E4
.4byte 0x3D4CCCCD .4byte 0x3D4CCCCD

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

@ -1,7 +1,8 @@
.include "macros.inc" .include "macros.inc"
.comm lbl_805723E0, 0x18, 4 .comm skExtendedClawBounds__12CElitePirate, 0xC, 4
.comm lbl_805723F8, 0xC, 4 .comm lbl_805723EC, 0xC, 4 # MWCC .comm bug
.comm skLocalShieldBounds__12CElitePirate, 0xC, 4
.section .ctors, "wa" .section .ctors, "wa"
lbl_ctor: lbl_ctor:
@ -3295,11 +3296,11 @@ lbl_80229D6C:
/* 80229DB0 00226D10 38 84 00 E1 */ addi r4, r4, 0xe1 /* 80229DB0 00226D10 38 84 00 E1 */ addi r4, r4, 0xe1
/* 80229DB4 00226D14 4B DD AF 05 */ bl string_l__4rstlFPCc /* 80229DB4 00226D14 4B DD AF 05 */ bl string_l__4rstlFPCc
/* 80229DB8 00226D18 88 01 00 10 */ lbz r0, 0x10(r1) /* 80229DB8 00226D18 88 01 00 10 */ lbz r0, 0x10(r1)
/* 80229DBC 00226D1C 3C 80 80 57 */ lis r4, lbl_805723F8@ha /* 80229DBC 00226D1C 3C 80 80 57 */ lis r4, skLocalShieldBounds__12CElitePirate@ha
/* 80229DC0 00226D20 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha /* 80229DC0 00226D20 3C 60 80 5A */ lis r3, sZeroVector__9CVector3f@ha
/* 80229DC4 00226D24 C0 22 B5 F4 */ lfs f1, lbl_805AD314@sda21(r2) /* 80229DC4 00226D24 C0 22 B5 F4 */ lfs f1, lbl_805AD314@sda21(r2)
/* 80229DC8 00226D28 98 01 00 08 */ stb r0, 8(r1) /* 80229DC8 00226D28 98 01 00 08 */ stb r0, 8(r1)
/* 80229DCC 00226D2C 38 A4 23 F8 */ addi r5, r4, lbl_805723F8@l /* 80229DCC 00226D2C 38 A4 23 F8 */ addi r5, r4, skLocalShieldBounds__12CElitePirate@l
/* 80229DD0 00226D30 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l /* 80229DD0 00226D30 38 C3 66 A0 */ addi r6, r3, sZeroVector__9CVector3f@l
/* 80229DD4 00226D34 38 61 00 90 */ addi r3, r1, 0x90 /* 80229DD4 00226D34 38 61 00 90 */ addi r3, r1, 0x90
/* 80229DD8 00226D38 38 81 00 08 */ addi r4, r1, 8 /* 80229DD8 00226D38 38 81 00 08 */ addi r4, r1, 8
@ -3924,9 +3925,9 @@ lbl_8022A6DC:
/* 8022A6E4 00227644 48 00 03 10 */ b lbl_8022A9F4 /* 8022A6E4 00227644 48 00 03 10 */ b lbl_8022A9F4
lbl_8022A6E8: lbl_8022A6E8:
/* 8022A6E8 00227648 38 00 00 00 */ li r0, 0 /* 8022A6E8 00227648 38 00 00 00 */ li r0, 0
/* 8022A6EC 0022764C 3C A0 80 57 */ lis r5, lbl_805723E0@ha /* 8022A6EC 0022764C 3C A0 80 57 */ lis r5, skExtendedClawBounds__12CElitePirate@ha
/* 8022A6F0 00227650 90 1E 05 68 */ stw r0, 0x568(r30) /* 8022A6F0 00227650 90 1E 05 68 */ stw r0, 0x568(r30)
/* 8022A6F4 00227654 38 C5 23 E0 */ addi r6, r5, lbl_805723E0@l /* 8022A6F4 00227654 38 C5 23 E0 */ addi r6, r5, skExtendedClawBounds__12CElitePirate@l
/* 8022A6F8 00227658 38 BE 07 74 */ addi r5, r30, 0x774 /* 8022A6F8 00227658 38 BE 07 74 */ addi r5, r30, 0x774
/* 8022A6FC 0022765C 4B FF EC 4D */ bl sub_80229348 /* 8022A6FC 0022765C 4B FF EC 4D */ bl sub_80229348
/* 8022A700 00227660 80 7E 00 64 */ lwz r3, 0x64(r30) /* 8022A700 00227660 80 7E 00 64 */ lwz r3, 0x64(r30)
@ -4032,9 +4033,9 @@ lbl_8022A83C:
/* 8022A878 002277D8 50 E0 2E B4 */ rlwimi r0, r7, 5, 0x1a, 0x1a /* 8022A878 002277D8 50 E0 2E B4 */ rlwimi r0, r7, 5, 0x1a, 0x1a
/* 8022A87C 002277DC 98 1E 09 88 */ stb r0, 0x988(r30) /* 8022A87C 002277DC 98 1E 09 88 */ stb r0, 0x988(r30)
/* 8022A880 002277E0 4B FF EA C9 */ bl sub_80229348 /* 8022A880 002277E0 4B FF EA C9 */ bl sub_80229348
/* 8022A884 002277E4 3C 80 80 57 */ lis r4, lbl_805723E0@ha /* 8022A884 002277E4 3C 80 80 57 */ lis r4, skExtendedClawBounds__12CElitePirate@ha
/* 8022A888 002277E8 7F C3 F3 78 */ mr r3, r30 /* 8022A888 002277E8 7F C3 F3 78 */ mr r3, r30
/* 8022A88C 002277EC 38 C4 23 E0 */ addi r6, r4, lbl_805723E0@l /* 8022A88C 002277EC 38 C4 23 E0 */ addi r6, r4, skExtendedClawBounds__12CElitePirate@l
/* 8022A890 002277F0 38 BE 07 88 */ addi r5, r30, 0x788 /* 8022A890 002277F0 38 BE 07 88 */ addi r5, r30, 0x788
/* 8022A894 002277F4 7F E4 FB 78 */ mr r4, r31 /* 8022A894 002277F4 7F E4 FB 78 */ mr r4, r31
/* 8022A898 002277F8 4B FF EA B1 */ bl sub_80229348 /* 8022A898 002277F8 4B FF EA B1 */ bl sub_80229348
@ -7960,11 +7961,11 @@ lbl_8022E0A4:
.global __sinit_CElitePirate_cpp .global __sinit_CElitePirate_cpp
__sinit_CElitePirate_cpp: __sinit_CElitePirate_cpp:
/* 8022E0C8 0022B028 C0 22 B6 10 */ lfs f1, lbl_805AD330@sda21(r2) /* 8022E0C8 0022B028 C0 22 B6 10 */ lfs f1, lbl_805AD330@sda21(r2)
/* 8022E0CC 0022B02C 3C 80 80 57 */ lis r4, lbl_805723E0@ha /* 8022E0CC 0022B02C 3C 80 80 57 */ lis r4, skExtendedClawBounds__12CElitePirate@ha
/* 8022E0D0 0022B030 C0 02 B6 04 */ lfs f0, lbl_805AD324@sda21(r2) /* 8022E0D0 0022B030 C0 02 B6 04 */ lfs f0, lbl_805AD324@sda21(r2)
/* 8022E0D4 0022B034 3C 60 80 57 */ lis r3, lbl_805723F8@ha /* 8022E0D4 0022B034 3C 60 80 57 */ lis r3, skLocalShieldBounds__12CElitePirate@ha
/* 8022E0D8 0022B038 D4 24 23 E0 */ stfsu f1, lbl_805723E0@l(r4) /* 8022E0D8 0022B038 D4 24 23 E0 */ stfsu f1, skExtendedClawBounds__12CElitePirate@l(r4)
/* 8022E0DC 0022B03C D4 03 23 F8 */ stfsu f0, lbl_805723F8@l(r3) /* 8022E0DC 0022B03C D4 03 23 F8 */ stfsu f0, skLocalShieldBounds__12CElitePirate@l(r3)
/* 8022E0E0 0022B040 D0 24 00 04 */ stfs f1, 4(r4) /* 8022E0E0 0022B040 D0 24 00 04 */ stfs f1, 4(r4)
/* 8022E0E4 0022B044 D0 24 00 08 */ stfs f1, 8(r4) /* 8022E0E4 0022B044 D0 24 00 08 */ stfs f1, 8(r4)
/* 8022E0E8 0022B048 D0 03 00 04 */ stfs f0, 4(r3) /* 8022E0E8 0022B048 D0 03 00 04 */ stfs f0, 4(r3)

3
asm/MetroidPrime/Enemies/CFlaahgra.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm lbl_80572024, 0x18, 4 .comm lbl_80572024, 0xC, 4
.comm lbl_80572030, 0xC, 4 # MWCC .comm bug
.comm lbl_8057203C, 0xC, 4 .comm lbl_8057203C, 0xC, 4
.section .ctors, "wa" .section .ctors, "wa"

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

@ -458,7 +458,8 @@ lbl_805A7EF8:
.lcomm lbl_8046C950, 0xFC, 4 .lcomm lbl_8046C950, 0xFC, 4
.lcomm lbl_8046CA4C, 0xF4, 4 .lcomm lbl_8046CA4C, 0xF4, 4
.comm lbl_80572078, 0x60, 4 .comm lbl_80572078, 0x10, 4
.comm lbl_80572088, 0x50, 4 # MWCC .comm bug
.comm lbl_805720D8, 0x10, 4 .comm lbl_805720D8, 0x10, 4
.comm lbl_805720E8, 0x10, 4 .comm lbl_805720E8, 0x10, 4
.comm lbl_805720F8, 0x10, 4 .comm lbl_805720F8, 0x10, 4

3
asm/MetroidPrime/Enemies/CMetroid.s
View File

@ -378,7 +378,8 @@ lbl_805A79D8:
.section .bss .section .bss
.balign 8 .balign 8
.comm lbl_80571C64, 0x208, 4 .comm lbl_80571C64, 0x68, 4
.comm lbl_80571CCC, 0x1A0, 4 # MWCC .comm bug
.comm lbl_80571E6C, 0x68, 4 .comm lbl_80571E6C, 0x68, 4
.comm lbl_80571ED4, 0x68, 4 .comm lbl_80571ED4, 0x68, 4
.comm lbl_80571F3C, 0x68, 4 .comm lbl_80571F3C, 0x68, 4

3
asm/MetroidPrime/Enemies/CMetroidBeta.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm lbl_80572048, 0x18, 4 .comm lbl_80572048, 0xC, 4
.comm lbl_80572054, 0xC, 4 # MWCC .comm bug
.comm lbl_80572060, 0xC, 4 .comm lbl_80572060, 0xC, 4
.section .ctors, "wa" .section .ctors, "wa"

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

@ -8692,7 +8692,7 @@ lbl_8029186C:
/* 80291AEC 0028EA4C 90 1F 0A 7C */ stw r0, 0xa7c(r31) /* 80291AEC 0028EA4C 90 1F 0A 7C */ stw r0, 0xa7c(r31)
/* 80291AF0 0028EA50 38 80 00 01 */ li r4, 1 /* 80291AF0 0028EA50 38 80 00 01 */ li r4, 1
/* 80291AF4 0028EA54 C0 22 BE 9C */ lfs f1, lbl_805ADBBC@sda21(r2) /* 80291AF4 0028EA54 C0 22 BE 9C */ lfs f1, lbl_805ADBBC@sda21(r2)
/* 80291AF8 0028EA58 3C 60 80 57 */ lis r3, lbl_80570004@ha /* 80291AF8 0028EA58 3C 60 80 57 */ lis r3, sNormalVulnerability__20CDamageVulnerability@ha
/* 80291AFC 0028EA5C D0 5F 0A 80 */ stfs f2, 0xa80(r31) /* 80291AFC 0028EA5C D0 5F 0A 80 */ stfs f2, 0xa80(r31)
/* 80291B00 0028EA60 C0 02 BE D8 */ lfs f0, lbl_805ADBF8@sda21(r2) /* 80291B00 0028EA60 C0 02 BE D8 */ lfs f0, lbl_805ADBF8@sda21(r2)
/* 80291B04 0028EA64 D0 3F 0A 84 */ stfs f1, 0xa84(r31) /* 80291B04 0028EA64 D0 3F 0A 84 */ stfs f1, 0xa84(r31)

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

@ -608,7 +608,8 @@ lbl_805A8378:
.lcomm lbl_8046D4F8, 0x2E8, 4 .lcomm lbl_8046D4F8, 0x2E8, 4
.lcomm lbl_8046D7E0, 0x1E0, 4 .lcomm lbl_8046D7E0, 0x1E0, 4
.lcomm lbl_8046D9C0, 0x2D0, 4 .lcomm lbl_8046D9C0, 0x2D0, 4
.comm lbl_80572404, 0x110, 4 .comm lbl_80572404, 0x10, 4
.comm lbl_80572414, 0x100, 4 # MWCC .comm bug
.comm lbl_80572514, 0x10, 4 .comm lbl_80572514, 0x10, 4
.comm lbl_80572524, 0x10, 4 .comm lbl_80572524, 0x10, 4
.comm lbl_80572534, 0x10, 4 .comm lbl_80572534, 0x10, 4

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

@ -528,7 +528,8 @@ lbl_805A76A0:
.lcomm lbl_8046C570, 0xA8, 4 .lcomm lbl_8046C570, 0xA8, 4
.lcomm lbl_8046C618, 0x108, 4 .lcomm lbl_8046C618, 0x108, 4
.comm lbl_8056F85C, 0x38, 4 .comm lbl_8056F85C, 0x18, 4
.comm lbl_8056F874, 0x20, 4 # MWCC .comm bug
.comm lbl_8056F894, 0x10, 4 .comm lbl_8056F894, 0x10, 4
.comm lbl_8056F8A4, 0x10, 4 .comm lbl_8056F8A4, 0x10, 4

3
asm/MetroidPrime/Enemies/CTryclops.s
View File

@ -276,7 +276,8 @@ lbl_805A83C4:
.balign 8 .balign 8
.lcomm lbl_8046DC90, 0x18, 4 .lcomm lbl_8046DC90, 0x18, 4
.comm lbl_80572614, 0x74, 4 .comm lbl_80572614, 0x68, 4
.comm lbl_8057267C, 0xC, 4 # MWCC .comm bug
.comm lbl_80572688, 0xC, 4 .comm lbl_80572688, 0xC, 4
.section .sbss, "wa" .section .sbss, "wa"

4
asm/WorldFormat/CMetroidAreaCollider.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm lbl_80572BAC, 0x19000, 4 .comm lbl_80572BAC, 0x5000, 4
.comm lbl_80577BAC, 0x14000, 4 # MWCC .comm bug
.comm lbl_8058BBAC, 0xC000, 4 .comm lbl_8058BBAC, 0xC000, 4
.comm lbl_80597BAC, 0x8000, 4 .comm lbl_80597BAC, 0x8000, 4
@ -4872,4 +4873,3 @@ lbl_805ADE98:
# ROM: 0x3FA738 # ROM: 0x3FA738
.4byte 0x40080000 .4byte 0x40080000
.4byte 0 .4byte 0

4
asm/WorldFormat/CWorldLight.s
View File

@ -1,6 +1,7 @@
.include "macros.inc" .include "macros.inc"
.comm lbl_8059FBAC, 0x18, 4 .comm lbl_8059FBAC, 0xC, 4
.comm lbl_8059FBB8, 0xC, 4 # MWCC .comm bug
.comm lbl_8059FBC4, 0xC, 4 .comm lbl_8059FBC4, 0xC, 4
.section .ctors, "wa" .section .ctors, "wa"
@ -323,4 +324,3 @@ lbl_805ADEB8:
lbl_805ADEBC: lbl_805ADEBC:
# ROM: 0x3FA75C # ROM: 0x3FA75C
.float 2.0 .float 2.0