diff --git a/asm/CriWare/ADXT.s b/asm/CriWare/ADXT.s index bf801a3..7058564 100644 --- a/asm/CriWare/ADXT.s +++ b/asm/CriWare/ADXT.s @@ -477,7 +477,7 @@ func_8037FD58: .global func_8037FD64 func_8037FD64: /* 8037FD64 00349324 80 63 00 04 */ lwz r3, 4(r3) -/* 8037FD68 00349328 48 00 60 5C */ b lbl_80385DC4 +/* 8037FD68 00349328 48 00 60 5C */ b func_80385DC4 .global func_8037FD6C func_8037FD6C: @@ -7516,8 +7516,10 @@ func_80385DB4: /* 80385DB4 0034F374 3C 80 80 5F */ lis r4, lbl_805E89D4@ha /* 80385DB8 0034F378 81 84 89 D4 */ lwz r12, lbl_805E89D4@l(r4) /* 80385DBC 0034F37C 7D 89 03 A6 */ mtctr r12 -/* 80385DC0 0034F380 4E 80 04 20 */ bctr -lbl_80385DC4: +/* 80385DC0 0034F380 4E 80 04 20 */ bctr + +.global func_80385DC4 +func_80385DC4: /* 80385DC4 0034F384 80 63 00 B8 */ lwz r3, 0xb8(r3) /* 80385DC8 0034F388 2C 03 00 00 */ cmpwi r3, 0 /* 80385DCC 0034F38C 4D 82 00 20 */ beqlr diff --git a/asm/CriWare/MFCI.s b/asm/CriWare/MFCI.s index 7a2d601..3557d4a 100644 --- a/asm/CriWare/MFCI.s +++ b/asm/CriWare/MFCI.s @@ -7457,7 +7457,9 @@ func_80398FA0: .global func_80398FA4 func_80398FA4: /* 80398FA4 00362564 4B FF D9 C8 */ b func_8039696C -lbl_80398FA8: + +.global func_80398FA8 +func_80398FA8: /* 80398FA8 00362568 3C C0 80 5F */ lis r6, lbl_805F60B8@ha /* 80398FAC 0036256C 3C A0 80 5F */ lis r5, lbl_805F60BC@ha /* 80398FB0 00362570 90 66 60 B8 */ stw r3, lbl_805F60B8@l(r6) @@ -7492,8 +7494,10 @@ lbl_80399000: .global func_80399014 func_80399014: -/* 80399014 003625D4 4B FF FF 94 */ b lbl_80398FA8 -lbl_80399018: +/* 80399014 003625D4 4B FF FF 94 */ b func_80398FA8 + +.global func_80399018 +func_80399018: /* 80399018 003625D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8039901C 003625DC 7C 08 02 A6 */ mflr r0 /* 80399020 003625E0 3C 60 80 5F */ lis r3, lbl_805F61C0@ha @@ -10064,7 +10068,7 @@ lbl_8039B344: .global func_8039B360 func_8039B360: -/* 8039B360 00364920 4B FF DC B8 */ b lbl_80399018 +/* 8039B360 00364920 4B FF DC B8 */ b func_80399018 .global func_8039B364 func_8039B364: diff --git a/asm/CriWare/MPS.s b/asm/CriWare/MPS.s index d74f0a7..61cf216 100644 --- a/asm/CriWare/MPS.s +++ b/asm/CriWare/MPS.s @@ -1953,18 +1953,21 @@ func_803BE7BC: /* 803BE7BC 00387D7C 3C 80 FF 00 */ lis r4, 0xFF000C03@ha /* 803BE7C0 00387D80 38 84 0C 03 */ addi r4, r4, 0xFF000C03@l /* 803BE7C4 00387D84 48 00 24 90 */ b func_803C0C54 -.global lbl_803BE7C8 -lbl_803BE7C8: + +.global func_803BE7C8 +func_803BE7C8: /* 803BE7C8 00387D88 3C 80 FF 00 */ lis r4, 0xFF000C03@ha /* 803BE7CC 00387D8C 38 84 0C 03 */ addi r4, r4, 0xFF000C03@l /* 803BE7D0 00387D90 48 00 24 84 */ b func_803C0C54 -.global lbl_803BE7D4 -lbl_803BE7D4: + +.global func_803BE7D4 +func_803BE7D4: /* 803BE7D4 00387D94 3C 80 FF 00 */ lis r4, 0xFF000C03@ha /* 803BE7D8 00387D98 38 84 0C 03 */ addi r4, r4, 0xFF000C03@l /* 803BE7DC 00387D9C 48 00 24 78 */ b func_803C0C54 -.global lbl_803BE7E0 -lbl_803BE7E0: + +.global func_803BE7E0 +func_803BE7E0: /* 803BE7E0 00387DA0 3C 80 FF 00 */ lis r4, 0xFF000C03@ha /* 803BE7E4 00387DA4 38 84 0C 03 */ addi r4, r4, 0xFF000C03@l /* 803BE7E8 00387DA8 48 00 24 6C */ b func_803C0C54 @@ -2352,23 +2355,27 @@ func_803BECC8: /* 803BECC8 00388288 3C 80 FF 00 */ lis r4, 0xFF000A01@ha /* 803BECCC 0038828C 38 84 0A 01 */ addi r4, r4, 0xFF000A01@l /* 803BECD0 00388290 48 00 1F 84 */ b func_803C0C54 -.global lbl_803BECD4 -lbl_803BECD4: + +.global func_803BECD4 +func_803BECD4: /* 803BECD4 00388294 3C 80 FF 00 */ lis r4, 0xFF000A01@ha /* 803BECD8 00388298 38 84 0A 01 */ addi r4, r4, 0xFF000A01@l /* 803BECDC 0038829C 48 00 1F 78 */ b func_803C0C54 -.global lbl_803BECE0 -lbl_803BECE0: + +.global func_803BECE0 +func_803BECE0: /* 803BECE0 003882A0 3C 80 FF 00 */ lis r4, 0xFF000A01@ha /* 803BECE4 003882A4 38 84 0A 01 */ addi r4, r4, 0xFF000A01@l /* 803BECE8 003882A8 48 00 1F 6C */ b func_803C0C54 -.global lbl_803BECEC -lbl_803BECEC: + +.global func_803BECEC +func_803BECEC: /* 803BECEC 003882AC 3C 80 FF 00 */ lis r4, 0xFF000A01@ha /* 803BECF0 003882B0 38 84 0A 01 */ addi r4, r4, 0xFF000A01@l /* 803BECF4 003882B4 48 00 1F 60 */ b func_803C0C54 -.global lbl_803BECF8 -lbl_803BECF8: + +.global func_803BECF8 +func_803BECF8: /* 803BECF8 003882B8 38 60 00 00 */ li r3, 0 /* 803BECFC 003882BC 4E 80 00 20 */ blr @@ -3045,13 +3052,15 @@ lbl_803BF65C: .global func_803BF670 func_803BF670: /* 803BF670 00388C30 38 C0 00 00 */ li r6, 0 -/* 803BF674 00388C34 48 00 00 0C */ b lbl_803BF680 +/* 803BF674 00388C34 48 00 00 0C */ b func_803BF680 .global func_803BF678 func_803BF678: /* 803BF678 00388C38 38 C0 00 01 */ li r6, 1 -/* 803BF67C 00388C3C 48 00 00 04 */ b lbl_803BF680 -lbl_803BF680: +/* 803BF67C 00388C3C 48 00 00 04 */ b func_803BF680 + +.global func_803BF680 +func_803BF680: /* 803BF680 00388C40 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803BF684 00388C44 7C 08 02 A6 */ mflr r0 /* 803BF688 00388C48 2C 05 00 00 */ cmpwi r5, 0 diff --git a/asm/CriWare/MPV.s b/asm/CriWare/MPV.s index 4f09634..07e091a 100644 --- a/asm/CriWare/MPV.s +++ b/asm/CriWare/MPV.s @@ -837,10 +837,9 @@ lbl_803A8A64: /* 803A8AA4 00372064 D8 A3 00 28 */ stfd f5, 0x28(r3) /* 803A8AA8 00372068 D8 C3 00 30 */ stfd f6, 0x30(r3) /* 803A8AAC 0037206C D8 E3 00 38 */ stfd f7, 0x38(r3) -/* 803A8AB0 00372070 4E 80 00 20 */ blr - -.global func_803A8AB4 -func_803A8AB4: +/* 803A8AB0 00372070 4E 80 00 20 */ blr +.global lbl_803A8AB4 +lbl_803A8AB4: /* 803A8AB4 00372074 80 03 00 20 */ lwz r0, 0x20(r3) /* 803A8AB8 00372078 7C E4 3B 78 */ mr r4, r7 /* 803A8ABC 0037207C 80 63 00 18 */ lwz r3, 0x18(r3) @@ -876,10 +875,9 @@ func_803A8AB4: /* 803A8B34 003720F4 90 C3 00 34 */ stw r6, 0x34(r3) /* 803A8B38 003720F8 91 03 00 38 */ stw r8, 0x38(r3) /* 803A8B3C 003720FC 90 E3 00 3C */ stw r7, 0x3c(r3) -/* 803A8B40 00372100 4E 80 00 20 */ blr - -.global func_803A8B44 -func_803A8B44: +/* 803A8B40 00372100 4E 80 00 20 */ blr +.global lbl_803A8B44 +lbl_803A8B44: /* 803A8B44 00372104 81 07 00 02 */ lwz r8, 2(r7) /* 803A8B48 00372108 80 03 00 20 */ lwz r0, 0x20(r3) /* 803A8B4C 0037210C A0 C7 00 06 */ lhz r6, 6(r7) @@ -954,10 +952,9 @@ func_803A8B44: /* 803A8C60 00372220 50 80 80 1E */ rlwimi r0, r4, 0x10, 0, 0xf /* 803A8C64 00372224 90 03 00 38 */ stw r0, 0x38(r3) /* 803A8C68 00372228 90 C3 00 3C */ stw r6, 0x3c(r3) -/* 803A8C6C 0037222C 4E 80 00 20 */ blr - -.global func_803A8C70 -func_803A8C70: +/* 803A8C6C 0037222C 4E 80 00 20 */ blr +.global lbl_803A8C70 +lbl_803A8C70: /* 803A8C70 00372230 80 03 00 20 */ lwz r0, 0x20(r3) /* 803A8C74 00372234 80 63 00 18 */ lwz r3, 0x18(r3) /* 803A8C78 00372238 7C 07 02 2C */ dcbt r7, r0 @@ -1038,10 +1035,9 @@ func_803A8C70: /* 803A8DA4 00372364 50 80 40 2E */ rlwimi r0, r4, 8, 0, 0x17 /* 803A8DA8 00372368 90 03 00 38 */ stw r0, 0x38(r3) /* 803A8DAC 0037236C 90 C3 00 3C */ stw r6, 0x3c(r3) -/* 803A8DB0 00372370 4E 80 00 20 */ blr - -.global func_803A8DB4 -func_803A8DB4: +/* 803A8DB0 00372370 4E 80 00 20 */ blr +.global lbl_803A8DB4 +lbl_803A8DB4: /* 803A8DB4 00372374 80 03 00 20 */ lwz r0, 0x20(r3) /* 803A8DB8 00372378 80 63 00 18 */ lwz r3, 0x18(r3) /* 803A8DBC 0037237C 7C 07 02 2C */ dcbt r7, r0 @@ -6544,9 +6540,8 @@ lbl_803ADEB4: /* 803AE0BC 0037767C 90 83 00 FC */ stw r4, 0xfc(r3) /* 803AE0C0 00377680 91 43 00 F8 */ stw r10, 0xf8(r3) /* 803AE0C4 00377684 4E 80 00 20 */ blr - -.global func_803AE0C8 -func_803AE0C8: +.global lbl_803AE0C8 +lbl_803AE0C8: /* 803AE0C8 00377688 80 03 00 20 */ lwz r0, 0x20(r3) /* 803AE0CC 0037768C 80 63 00 18 */ lwz r3, 0x18(r3) /* 803AE0D0 00377690 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d @@ -6682,9 +6677,8 @@ func_803AE0C8: /* 803AE2D8 00377898 90 C3 00 F8 */ stw r6, 0xf8(r3) /* 803AE2DC 0037789C 90 E3 00 FC */ stw r7, 0xfc(r3) /* 803AE2E0 003778A0 4E 80 00 20 */ blr - -.global func_803AE2E4 -func_803AE2E4: +.global lbl_803AE2E4 +lbl_803AE2E4: /* 803AE2E4 003778A4 80 83 00 20 */ lwz r4, 0x20(r3) /* 803AE2E8 003778A8 38 00 00 08 */ li r0, 8 /* 803AE2EC 003778AC 81 23 00 18 */ lwz r9, 0x18(r3) @@ -6740,9 +6734,8 @@ lbl_803AE3A8: /* 803AE3A8 00377968 39 08 00 01 */ addi r8, r8, 1 /* 803AE3AC 0037796C 42 00 FF 50 */ bdnz lbl_803AE2FC /* 803AE3B0 00377970 4E 80 00 20 */ blr - -.global func_803AE3B4 -func_803AE3B4: +.global lbl_803AE3B4 +lbl_803AE3B4: /* 803AE3B4 00377974 38 00 00 10 */ li r0, 0x10 /* 803AE3B8 00377978 81 23 00 18 */ lwz r9, 0x18(r3) /* 803AE3BC 0037797C 39 00 00 00 */ li r8, 0 @@ -6775,9 +6768,8 @@ lbl_803AE420: /* 803AE420 003779E0 39 08 00 01 */ addi r8, r8, 1 /* 803AE424 003779E4 42 00 FF A4 */ bdnz lbl_803AE3C8 /* 803AE428 003779E8 4E 80 00 20 */ blr - -.global func_803AE42C -func_803AE42C: +.global lbl_803AE42C +lbl_803AE42C: /* 803AE42C 003779EC 38 00 00 10 */ li r0, 0x10 /* 803AE430 003779F0 81 03 00 18 */ lwz r8, 0x18(r3) /* 803AE434 003779F4 38 E0 00 00 */ li r7, 0 @@ -20380,7 +20372,6 @@ lbl_803BA770: /* 803BA7A8 00383D68 7F 58 D0 50 */ subf r26, r24, r26 /* 803BA7AC 00383D6C 7D 8C 00 D0 */ neg r12, r12 /* 803BA7B0 00383D70 48 00 02 B4 */ b lbl_803BAA64 - .global lbl_803BA7B4 lbl_803BA7B4: /* 803BA7B4 00383D74 7E 1A B8 50 */ subf r16, r26, r23 @@ -20397,7 +20388,6 @@ lbl_803BA7B4: /* 803BA7E0 00383DA0 7D 8C 00 D0 */ neg r12, r12 /* 803BA7E4 00383DA4 7F 58 D0 50 */ subf r26, r24, r26 /* 803BA7E8 00383DA8 48 00 02 7C */ b lbl_803BAA64 - .global lbl_803BA7EC lbl_803BA7EC: /* 803BA7EC 00383DAC 39 86 6A 0A */ addi r12, r6, 0x6a0a @@ -20415,7 +20405,6 @@ lbl_803BA7EC: /* 803BA81C 00383DDC 7E F0 00 D0 */ neg r23, r16 /* 803BA820 00383DE0 7D 8C 00 D0 */ neg r12, r12 /* 803BA824 00383DE4 48 00 02 40 */ b lbl_803BAA64 - .global lbl_803BA828 lbl_803BA828: /* 803BA828 00383DE8 39 86 6A 0A */ addi r12, r6, 0x6a0a @@ -20430,7 +20419,6 @@ lbl_803BA828: /* 803BA84C 00383E0C 7D 8C 00 D0 */ neg r12, r12 /* 803BA850 00383E10 7F 58 D0 50 */ subf r26, r24, r26 /* 803BA854 00383E14 48 00 02 10 */ b lbl_803BAA64 - .global lbl_803BA858 lbl_803BA858: /* 803BA858 00383E18 7E 1A B8 50 */ subf r16, r26, r23 @@ -20447,7 +20435,6 @@ lbl_803BA858: /* 803BA884 00383E44 7E F0 00 D0 */ neg r23, r16 /* 803BA888 00383E48 7F 5A C2 14 */ add r26, r26, r24 /* 803BA88C 00383E4C 48 00 01 D8 */ b lbl_803BAA64 - .global lbl_803BA890 lbl_803BA890: /* 803BA890 00383E50 7E 1A B8 50 */ subf r16, r26, r23 @@ -20460,7 +20447,6 @@ lbl_803BA890: /* 803BA8AC 00383E6C 7E F7 00 D0 */ neg r23, r23 /* 803BA8B0 00383E70 7D 9A 00 D0 */ neg r12, r26 /* 803BA8B4 00383E74 48 00 01 B0 */ b lbl_803BAA64 - .global lbl_803BA8B8 lbl_803BA8B8: /* 803BA8B8 00383E78 39 86 6A 0A */ addi r12, r6, 0x6a0a @@ -20475,7 +20461,6 @@ lbl_803BA8B8: /* 803BA8DC 00383E9C 7E F0 00 D0 */ neg r23, r16 /* 803BA8E0 00383EA0 7F 5A C2 14 */ add r26, r26, r24 /* 803BA8E4 00383EA4 48 00 01 80 */ b lbl_803BAA64 - .global lbl_803BA8E8 lbl_803BA8E8: /* 803BA8E8 00383EA8 39 86 6A 0A */ addi r12, r6, 0x6a0a @@ -20486,7 +20471,6 @@ lbl_803BA8E8: /* 803BA8FC 00383EBC 7E F7 00 D0 */ neg r23, r23 /* 803BA900 00383EC0 7D 9A 00 D0 */ neg r12, r26 /* 803BA904 00383EC4 48 00 01 60 */ b lbl_803BAA64 - .global lbl_803BA908 lbl_803BA908: /* 803BA908 00383EC8 39 85 95 F6 */ addi r12, r5, -27146 @@ -20505,7 +20489,6 @@ lbl_803BA908: /* 803BA93C 00383EFC 7F 58 D0 50 */ subf r26, r24, r26 /* 803BA940 00383F00 7D 8C 00 D0 */ neg r12, r12 /* 803BA944 00383F04 48 00 01 20 */ b lbl_803BAA64 - .global lbl_803BA948 lbl_803BA948: /* 803BA948 00383F08 39 85 95 F6 */ addi r12, r5, -27146 @@ -20521,7 +20504,6 @@ lbl_803BA948: /* 803BA970 00383F30 7D 8C 00 D0 */ neg r12, r12 /* 803BA974 00383F34 7F 58 D0 50 */ subf r26, r24, r26 /* 803BA978 00383F38 48 00 00 EC */ b lbl_803BAA64 - .global lbl_803BA97C lbl_803BA97C: /* 803BA97C 00383F3C 57 7B 80 1E */ slwi r27, r27, 0x10 @@ -20532,7 +20514,6 @@ lbl_803BA97C: /* 803BA990 00383F50 7E FB BB 78 */ mr r27, r23 /* 803BA994 00383F54 7D 9A 63 78 */ mr r26, r12 /* 803BA998 00383F58 48 00 00 CC */ b lbl_803BAA64 - .global lbl_803BA99C lbl_803BA99C: /* 803BA99C 00383F5C 57 18 80 1E */ slwi r24, r24, 0x10 @@ -20541,7 +20522,6 @@ lbl_803BA99C: /* 803BA9A8 00383F68 7F 1B C3 78 */ mr r27, r24 /* 803BA9AC 00383F6C 7D 9A 63 78 */ mr r26, r12 /* 803BA9B0 00383F70 48 00 00 B4 */ b lbl_803BAA64 - .global lbl_803BA9B4 lbl_803BA9B4: /* 803BA9B4 00383F74 39 85 95 F6 */ addi r12, r5, -27146 @@ -20557,7 +20537,6 @@ lbl_803BA9B4: /* 803BA9DC 00383F9C 7D 9A C0 50 */ subf r12, r26, r24 /* 803BA9E0 00383FA0 7F 5A C2 14 */ add r26, r26, r24 /* 803BA9E4 00383FA4 48 00 00 80 */ b lbl_803BAA64 - .global lbl_803BA9E8 lbl_803BA9E8: /* 803BA9E8 00383FA8 39 85 95 F6 */ addi r12, r5, -27146 @@ -20568,7 +20547,6 @@ lbl_803BA9E8: /* 803BA9FC 00383FBC 7F 5A DA 14 */ add r26, r26, r27 /* 803BAA00 00383FC0 7D 9A 00 D0 */ neg r12, r26 /* 803BAA04 00383FC4 48 00 00 60 */ b lbl_803BAA64 - .global lbl_803BAA08 lbl_803BAA08: /* 803BAA08 00383FC8 2C 0B 00 00 */ cmpwi r11, 0 diff --git a/asm/CriWare/SFD.s b/asm/CriWare/SFD.s index d94c9d8..a96fb2a 100644 --- a/asm/CriWare/SFD.s +++ b/asm/CriWare/SFD.s @@ -327,26 +327,30 @@ func_803C0EAC: /* 803C0EAC 0038A46C 7C 85 23 78 */ mr r5, r4 /* 803C0EB0 0038A470 80 83 1F E4 */ lwz r4, 0x1fe4(r3) /* 803C0EB4 0038A474 4B FF E6 64 */ b func_803BF518 -.global lbl_803C0EB8 -lbl_803C0EB8: + +.global func_803C0EB8 +func_803C0EB8: /* 803C0EB8 0038A478 7C 87 23 78 */ mr r7, r4 /* 803C0EBC 0038A47C 7C A6 2B 78 */ mr r6, r5 /* 803C0EC0 0038A480 80 83 1F E4 */ lwz r4, 0x1fe4(r3) /* 803C0EC4 0038A484 80 A7 00 00 */ lwz r5, 0(r7) /* 803C0EC8 0038A488 80 C6 00 00 */ lwz r6, 0(r6) /* 803C0ECC 0038A48C 4B FF E7 A4 */ b func_803BF670 -.global lbl_803C0ED0 -lbl_803C0ED0: + +.global func_803C0ED0 +func_803C0ED0: /* 803C0ED0 0038A490 3C 80 FF 00 */ lis r4, 0xFF000501@ha /* 803C0ED4 0038A494 38 84 05 01 */ addi r4, r4, 0xFF000501@l /* 803C0ED8 0038A498 4B FF FD 7C */ b func_803C0C54 -.global lbl_803C0EDC -lbl_803C0EDC: + +.global func_803C0EDC +func_803C0EDC: /* 803C0EDC 0038A49C 3C 80 FF 00 */ lis r4, 0xFF000501@ha /* 803C0EE0 0038A4A0 38 84 05 01 */ addi r4, r4, 0xFF000501@l /* 803C0EE4 0038A4A4 4B FF FD 70 */ b func_803C0C54 -.global lbl_803C0EE8 -lbl_803C0EE8: + +.global func_803C0EE8 +func_803C0EE8: /* 803C0EE8 0038A4A8 38 60 00 00 */ li r3, 0 /* 803C0EEC 0038A4AC 4E 80 00 20 */ blr @@ -2575,18 +2579,21 @@ func_803C2D30: /* 803C2D30 0038C2F0 3C 80 FF 00 */ lis r4, 0xFF000D0B@ha /* 803C2D34 0038C2F4 38 84 0D 0B */ addi r4, r4, 0xFF000D0B@l /* 803C2D38 0038C2F8 4B FF DF 1C */ b func_803C0C54 -.global lbl_803C2D3C -lbl_803C2D3C: + +.global func_803C2D3C +func_803C2D3C: /* 803C2D3C 0038C2FC 3C 80 FF 00 */ lis r4, 0xFF000D0B@ha /* 803C2D40 0038C300 38 84 0D 0B */ addi r4, r4, 0xFF000D0B@l /* 803C2D44 0038C304 4B FF DF 10 */ b func_803C0C54 -.global lbl_803C2D48 -lbl_803C2D48: + +.global func_803C2D48 +func_803C2D48: /* 803C2D48 0038C308 3C 80 FF 00 */ lis r4, 0xFF000D0B@ha /* 803C2D4C 0038C30C 38 84 0D 0B */ addi r4, r4, 0xFF000D0B@l /* 803C2D50 0038C310 4B FF DF 04 */ b func_803C0C54 -.global lbl_803C2D54 -lbl_803C2D54: + +.global func_803C2D54 +func_803C2D54: /* 803C2D54 0038C314 3C 80 FF 00 */ lis r4, 0xFF000D0B@ha /* 803C2D58 0038C318 38 84 0D 0B */ addi r4, r4, 0xFF000D0B@l /* 803C2D5C 0038C31C 4B FF DE F8 */ b func_803C0C54 @@ -7946,17 +7953,21 @@ func_803C7860: /* 803C7860 00390E20 3C 80 FF 00 */ lis r4, 0xFF000F0D@ha /* 803C7864 00390E24 38 84 0F 0D */ addi r4, r4, 0xFF000F0D@l /* 803C7868 00390E28 4B FF 93 EC */ b func_803C0C54 -.global lbl_803C786C -lbl_803C786C: + +.global func_803C786C +func_803C786C: /* 803C786C 00390E2C 3C 80 FF 00 */ lis r4, 0xFF000F0D@ha /* 803C7870 00390E30 38 84 0F 0D */ addi r4, r4, 0xFF000F0D@l /* 803C7874 00390E34 4B FF 93 E0 */ b func_803C0C54 -.global lbl_803C7878 -lbl_803C7878: -/* 803C7878 00390E38 3C C0 80 3C */ lis r6, lbl_803C7884@ha -/* 803C787C 00390E3C 38 C6 78 84 */ addi r6, r6, lbl_803C7884@l + +.global func_803C7878 +func_803C7878: +/* 803C7878 00390E38 3C C0 80 3C */ lis r6, func_803C7884@ha +/* 803C787C 00390E3C 38 C6 78 84 */ addi r6, r6, func_803C7884@l /* 803C7880 00390E40 48 00 09 E4 */ b func_803C8264 -lbl_803C7884: + + +func_803C7884: /* 803C7884 00390E44 80 04 00 68 */ lwz r0, 0x68(r4) /* 803C7888 00390E48 90 05 00 00 */ stw r0, 0(r5) /* 803C788C 00390E4C 80 04 00 6C */ lwz r0, 0x6c(r4) @@ -16511,23 +16522,27 @@ func_803CEC64: /* 803CEC64 00398224 3C 80 FF 00 */ lis r4, 0xFF000601@ha /* 803CEC68 00398228 38 84 06 01 */ addi r4, r4, 0xFF000601@l /* 803CEC6C 0039822C 4B FF 1F E8 */ b func_803C0C54 -.global lbl_803CEC70 -lbl_803CEC70: + +.global func_803CEC70 +func_803CEC70: /* 803CEC70 00398230 3C 80 FF 00 */ lis r4, 0xFF000601@ha /* 803CEC74 00398234 38 84 06 01 */ addi r4, r4, 0xFF000601@l /* 803CEC78 00398238 4B FF 1F DC */ b func_803C0C54 -.global lbl_803CEC7C -lbl_803CEC7C: + +.global func_803CEC7C +func_803CEC7C: /* 803CEC7C 0039823C 3C 80 FF 00 */ lis r4, 0xFF000601@ha /* 803CEC80 00398240 38 84 06 01 */ addi r4, r4, 0xFF000601@l /* 803CEC84 00398244 4B FF 1F D0 */ b func_803C0C54 -.global lbl_803CEC88 -lbl_803CEC88: + +.global func_803CEC88 +func_803CEC88: /* 803CEC88 00398248 3C 80 FF 00 */ lis r4, 0xFF000601@ha /* 803CEC8C 0039824C 38 84 06 01 */ addi r4, r4, 0xFF000601@l /* 803CEC90 00398250 4B FF 1F C4 */ b func_803C0C54 -.global lbl_803CEC94 -lbl_803CEC94: + +.global func_803CEC94 +func_803CEC94: /* 803CEC94 00398254 38 60 00 00 */ li r3, 0 /* 803CEC98 00398258 4E 80 00 20 */ blr @@ -16644,8 +16659,9 @@ func_803CEDC8: /* 803CEDC8 00398388 3C 80 FF 00 */ lis r4, 0xFF000701@ha /* 803CEDCC 0039838C 38 84 07 01 */ addi r4, r4, 0xFF000701@l /* 803CEDD0 00398390 4B FF 1E 84 */ b func_803C0C54 -.global lbl_803CEDD4 -lbl_803CEDD4: + +.global func_803CEDD4 +func_803CEDD4: /* 803CEDD4 00398394 3C 80 FF 00 */ lis r4, 0xFF000701@ha /* 803CEDD8 00398398 38 84 07 01 */ addi r4, r4, 0xFF000701@l /* 803CEDDC 0039839C 4B FF 1E 78 */ b func_803C0C54 @@ -16688,8 +16704,9 @@ func_803CEE44: /* 803CEE4C 0039840C 7C A6 2B 78 */ mr r6, r5 /* 803CEE50 00398410 7C 05 03 78 */ mr r5, r0 /* 803CEE54 00398414 4B FF 0C A0 */ b func_803BFAF4 -.global lbl_803CEE58 -lbl_803CEE58: + +.global func_803CEE58 +func_803CEE58: /* 803CEE58 00398418 38 60 00 00 */ li r3, 0 /* 803CEE5C 0039841C 4E 80 00 20 */ blr @@ -21472,41 +21489,34 @@ func_803D2C98: lbl_803D2CB8: /* 803D2CB8 0039C278 38 60 5D A8 */ li r3, 0x5da8 /* 803D2CBC 0039C27C 4E 80 00 20 */ blr - -.global func_803D2CC0 -func_803D2CC0: +.global lbl_803D2CC0 +lbl_803D2CC0: /* 803D2CC0 0039C280 38 60 5D C0 */ li r3, 0x5dc0 /* 803D2CC4 0039C284 4E 80 00 20 */ blr - -.global func_803D2CC8 -func_803D2CC8: +.global lbl_803D2CC8 +lbl_803D2CC8: /* 803D2CC8 0039C288 38 60 61 A8 */ li r3, 0x61a8 /* 803D2CCC 0039C28C 4E 80 00 20 */ blr - -.global func_803D2CD0 -func_803D2CD0: +.global lbl_803D2CD0 +lbl_803D2CD0: /* 803D2CD0 0039C290 38 60 75 12 */ li r3, 0x7512 /* 803D2CD4 0039C294 4E 80 00 20 */ blr - -.global func_803D2CD8 -func_803D2CD8: +.global lbl_803D2CD8 +lbl_803D2CD8: /* 803D2CD8 0039C298 38 60 75 30 */ li r3, 0x7530 /* 803D2CDC 0039C29C 4E 80 00 20 */ blr - -.global func_803D2CE0 -func_803D2CE0: +.global lbl_803D2CE0 +lbl_803D2CE0: /* 803D2CE0 0039C2A0 3C 60 00 01 */ lis r3, 0x0000C350@ha /* 803D2CE4 0039C2A4 38 63 C3 50 */ addi r3, r3, 0x0000C350@l /* 803D2CE8 0039C2A8 4E 80 00 20 */ blr - -.global func_803D2CEC -func_803D2CEC: +.global lbl_803D2CEC +lbl_803D2CEC: /* 803D2CEC 0039C2AC 3C 60 00 01 */ lis r3, 0x0000EA24@ha /* 803D2CF0 0039C2B0 38 63 EA 24 */ addi r3, r3, 0x0000EA24@l /* 803D2CF4 0039C2B4 4E 80 00 20 */ blr - -.global func_803D2CF8 -func_803D2CF8: +.global lbl_803D2CF8 +lbl_803D2CF8: /* 803D2CF8 0039C2B8 3C 60 00 01 */ lis r3, 0x0000EA60@ha /* 803D2CFC 0039C2BC 38 63 EA 60 */ addi r3, r3, 0x0000EA60@l /* 803D2D00 0039C2C0 4E 80 00 20 */ blr @@ -23538,8 +23548,6 @@ lbl_803D47FC: /* 803D47FC 0039DDBC 38 80 00 00 */ li r4, 0 /* 803D4800 0039DDC0 38 60 00 00 */ li r3, 0 /* 803D4804 0039DDC4 4E 80 00 20 */ blr - -.global lbl_803D4808 lbl_803D4808: /* 803D4808 0039DDC8 7C 6D 42 E6 */ mftbu r3 /* 803D480C 0039DDCC 7C 8C 42 E6 */ mftb r4, 0x10c diff --git a/asm/PowerPC_EABI_Support/MetroTRK/targimpl.s b/asm/PowerPC_EABI_Support/MetroTRK/targimpl.s index ebe2051..7474b4e 100644 --- a/asm/PowerPC_EABI_Support/MetroTRK/targimpl.s +++ b/asm/PowerPC_EABI_Support/MetroTRK/targimpl.s @@ -698,7 +698,7 @@ lbl_802CF694: /* 802CF750 00298D10 80 02 00 00 */ lwz r0, 0(r2) /* 802CF754 00298D14 80 22 00 04 */ lwz r1, 4(r2) /* 802CF758 00298D18 80 42 00 08 */ lwz r2, 8(r2) -/* 802CF75C 00298D1C 48 00 00 A0 */ b lbl_802CF7FC +/* 802CF75C 00298D1C 48 00 00 A0 */ b func_802CF7FC lbl_802CF760: /* 802CF760 00298D20 3C 40 80 53 */ lis r2, lbl_8053FFA8@h /* 802CF764 00298D24 60 42 FF A8 */ ori r2, r2, lbl_8053FFA8@l @@ -741,7 +741,9 @@ lbl_802CF7D8: /* 802CF7F0 00298DB0 7C 51 42 A6 */ mfspr r2, 0x111 /* 802CF7F4 00298DB4 7C 72 42 A6 */ mfspr r3, 0x112 /* 802CF7F8 00298DB8 4C 00 00 64 */ rfi -lbl_802CF7FC: + +.global func_802CF7FC +func_802CF7FC: /* 802CF7FC 00298DBC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802CF800 00298DC0 7C 08 02 A6 */ mflr r0 /* 802CF804 00298DC4 3C 60 80 58 */ lis r3, lbl_8057D350@ha @@ -868,7 +870,7 @@ lbl_802CF978: /* 802CF9BC 00298F7C 80 02 00 00 */ lwz r0, 0(r2) /* 802CF9C0 00298F80 80 22 00 04 */ lwz r1, 4(r2) /* 802CF9C4 00298F84 80 42 00 08 */ lwz r2, 8(r2) -/* 802CF9C8 00298F88 4B FF FE 34 */ b lbl_802CF7FC +/* 802CF9C8 00298F88 4B FF FE 34 */ b func_802CF7FC .global TRKPostInterruptEvent TRKPostInterruptEvent: diff --git a/asm/data_1.s b/asm/data_1.s index 51aebbd..456a0aa 100644 --- a/asm/data_1.s +++ b/asm/data_1.s @@ -13,7 +13,7 @@ lbl_8052A650: .4byte func_800697C8 .4byte func_800697CC .4byte func_800697E0 - .4byte lbl_800697E4 + .4byte func_800697E4 .4byte lbl_806643D0 .4byte 0xFFFFFFAC .4byte func_80069944 @@ -162,7 +162,7 @@ lbl_8052A818: .4byte func_8006CA2C .4byte func_8006A9F8 .4byte func_8006ACC0 - .4byte lbl_80071B74 + .4byte func_80071B74 .4byte func_8006A82C .4byte func_80073C74 .4byte func_8006B6A0 @@ -361,7 +361,7 @@ lbl_8052AA30: .4byte func_8006CA2C .4byte func_80074D4C .4byte func_8006E884 - .4byte lbl_80071B74 + .4byte func_80071B74 .4byte func_8006BFDC .4byte func_80073C74 .4byte func_8006B6A0 @@ -695,15 +695,15 @@ lbl_8052AF08: .4byte func_80088888 .4byte func_80088880 .4byte func_80088878 - .4byte lbl_80088870 + .4byte func_80088870 .4byte func_800D1F0C .4byte func_800D1CFC .4byte func_800D11B0 .4byte func_80088800 .4byte func_8008884C - .4byte lbl_80088858 - .4byte lbl_80088860 - .4byte lbl_80088868 + .4byte func_80088858 + .4byte func_80088860 + .4byte func_80088868 .4byte func_800D2A5C .4byte func_800D2D64 .4byte func_800888F4 @@ -1027,7 +1027,7 @@ lbl_8052B308: .4byte func_80088888 .4byte func_80088880 .4byte func_80088878 - .4byte lbl_80088870 + .4byte func_80088870 .4byte func_8009398C .4byte func_80093F28 @@ -1065,7 +1065,7 @@ lbl_8052B380: .4byte func_80088888 .4byte func_80088880 .4byte func_80088878 - .4byte lbl_80088870 + .4byte func_80088870 .global lbl_8052B3D8 @@ -1133,9 +1133,9 @@ lbl_8052B450: .4byte func_800D11B0 .4byte func_800987A0 .4byte func_800987EC - .4byte lbl_800987F8 - .4byte lbl_80098800 - .4byte lbl_80098808 + .4byte func_800987F8 + .4byte func_80098800 + .4byte func_80098808 .4byte func_800D2A5C .4byte func_800D2D64 .4byte func_80098810 @@ -1217,15 +1217,15 @@ lbl_8052B580: .4byte func_80088888 .4byte func_80088880 .4byte func_80088878 - .4byte lbl_80088870 + .4byte func_80088870 .4byte func_800D1F0C .4byte func_800D1CFC .4byte func_800D11B0 .4byte func_800987A0 .4byte func_800987EC - .4byte lbl_800987F8 - .4byte lbl_80098800 - .4byte lbl_80098808 + .4byte func_800987F8 + .4byte func_80098800 + .4byte func_80098808 .4byte func_800D2A5C .4byte func_800D2D64 .4byte func_80098810 @@ -1362,9 +1362,9 @@ lbl_8052B758: .4byte func_800D11B0 .4byte func_800987A0 .4byte func_800987EC - .4byte lbl_800987F8 - .4byte lbl_80098800 - .4byte lbl_80098808 + .4byte func_800987F8 + .4byte func_80098800 + .4byte func_80098808 .4byte func_800D2A5C .4byte func_800D2D64 .4byte func_80098810 @@ -1451,7 +1451,7 @@ lbl_8052B8B8: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -1477,7 +1477,7 @@ lbl_8052B90C: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -1848,7 +1848,7 @@ lbl_8052BDD0: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -2060,7 +2060,7 @@ lbl_8052C040: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -2168,9 +2168,9 @@ lbl_8052C1E8: .4byte func_800AFB04 .4byte lbl_806645B8 .4byte 0xFFFFFFF8 - .4byte lbl_800B064C - .4byte lbl_800B0654 - .4byte lbl_800B0644 + .4byte func_800B064C + .4byte func_800B0654 + .4byte func_800B0644 .4byte func_80147790 .4byte func_801463A8 .4byte func_8014780C @@ -2184,7 +2184,7 @@ lbl_8052C1E8: .4byte func_80148748 .4byte func_80148758 .4byte func_80148768 - .4byte lbl_800B063C + .4byte func_800B063C .4byte func_800B0634 .4byte func_801463A4 .4byte func_800AFB90 @@ -2394,7 +2394,7 @@ lbl_8052C1E8: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -2402,15 +2402,15 @@ lbl_8052C1E8: .4byte func_800A3494 .4byte func_800A3488 .4byte func_8003C7F8 - .4byte lbl_800B067C + .4byte func_800B067C .4byte func_800A34B4 - .4byte lbl_800B065C + .4byte func_800B065C .4byte func_8003E664 .4byte func_8003DC74 - .4byte lbl_800B069C - .4byte lbl_800B066C + .4byte func_800B069C + .4byte func_800B066C .4byte func_800AC75C - .4byte lbl_800B0694 + .4byte func_800B0694 .4byte func_800BC758 .4byte func_800BC040 .4byte func_800BC020 @@ -2420,7 +2420,7 @@ lbl_8052C1E8: .4byte func_800AC5E4 .4byte func_800BE9E4 .4byte func_800BE088 - .4byte lbl_800B068C + .4byte func_800B068C .4byte func_800BE1F8 .4byte func_800BE214 .4byte func_800BE248 @@ -2437,7 +2437,7 @@ lbl_8052C1E8: .4byte func_800BB200 .4byte func_800BDF78 .4byte func_800BDFE0 - .4byte lbl_800B0664 + .4byte func_800B0664 .4byte func_800BE058 .4byte func_800BE070 .4byte func_800BB2E4 @@ -2505,7 +2505,7 @@ lbl_8052C1E8: .4byte func_800BEA40 .4byte func_800BE0DC .4byte func_80092CA8 - .4byte lbl_800B0684 + .4byte func_800B0684 .4byte func_800BE264 .4byte func_800BE278 .4byte func_800BE2A0 @@ -2514,7 +2514,7 @@ lbl_8052C1E8: .4byte func_800BE300 .4byte func_800BE314 .4byte func_800BE328 - .4byte lbl_800B0674 + .4byte func_800B0674 .4byte func_800BE474 .4byte func_800BE504 .4byte func_800BE57C @@ -2675,7 +2675,7 @@ lbl_8052C8F8: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -2807,7 +2807,7 @@ lbl_8052CAE8: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -2926,7 +2926,7 @@ lbl_8052CCB0: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -3037,7 +3037,7 @@ lbl_8052CE60: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -3180,7 +3180,7 @@ lbl_8052D088: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -3356,7 +3356,7 @@ lbl_8052D31C: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -3510,9 +3510,9 @@ lbl_8052D570: .4byte func_800AFB04 .4byte lbl_806642A0 .4byte 0xFFFFFFF8 - .4byte lbl_800B064C - .4byte lbl_800B0654 - .4byte lbl_800B0644 + .4byte func_800B064C + .4byte func_800B0654 + .4byte func_800B0644 .4byte func_80147790 .4byte func_801463A8 .4byte func_8014780C @@ -3526,7 +3526,7 @@ lbl_8052D570: .4byte func_80148748 .4byte func_80148758 .4byte func_80148768 - .4byte lbl_800B063C + .4byte func_800B063C .4byte func_800B0634 .4byte func_801463A4 .4byte func_800AFB90 @@ -3736,7 +3736,7 @@ lbl_8052D570: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -3744,17 +3744,17 @@ lbl_8052D570: .4byte func_800A3494 .4byte func_800A3488 .4byte func_8003C7F8 - .4byte lbl_800B067C + .4byte func_800B067C .4byte func_800A34B4 .4byte func_800C11F0 .4byte func_8003E664 .4byte func_8003DC74 - .4byte lbl_800C1220 - .4byte lbl_800C1200 - .4byte lbl_800C11F8 - .4byte lbl_800C1218 + .4byte func_800C1220 + .4byte func_800C1200 + .4byte func_800C11F8 + .4byte func_800C1218 .4byte func_800BC758 - .4byte lbl_800C1210 + .4byte func_800C1210 .4byte func_800BC020 .4byte func_800BABBC .4byte func_800BE984 @@ -3762,7 +3762,7 @@ lbl_8052D570: .4byte func_800AC5E4 .4byte func_800BE9E4 .4byte func_800BE088 - .4byte lbl_800B068C + .4byte func_800B068C .4byte func_800BE1F8 .4byte func_800BE214 .4byte func_800BE248 @@ -3779,7 +3779,7 @@ lbl_8052D570: .4byte func_800BB200 .4byte func_800BDF78 .4byte func_800BDFE0 - .4byte lbl_800B0664 + .4byte func_800B0664 .4byte func_800BE058 .4byte func_800BE070 .4byte func_800BB2E4 @@ -3847,7 +3847,7 @@ lbl_8052D570: .4byte func_800BEA40 .4byte func_800BE0DC .4byte func_80092CA8 - .4byte lbl_800B0684 + .4byte func_800B0684 .4byte func_800BE264 .4byte func_800BE278 .4byte func_800BE2A0 @@ -3856,8 +3856,8 @@ lbl_8052D570: .4byte func_800BE300 .4byte func_800BE314 .4byte func_800BE328 - .4byte lbl_800B0674 - .4byte lbl_800C1208 + .4byte func_800B0674 + .4byte func_800C1208 .4byte func_800BE504 .4byte func_800BE57C .4byte func_800BE6B4 @@ -3906,7 +3906,7 @@ lbl_8052DB80: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -4061,12 +4061,12 @@ lbl_8052DD28: .4byte func_800CAB00 .4byte lbl_80664620 .4byte 0xFFFFFFF4 - .4byte lbl_800C5980 + .4byte func_800C5980 .4byte func_800C5978 .4byte lbl_80664620 .4byte 0xFFFFFFF0 - .4byte lbl_800C5990 - .4byte lbl_800C5988 + .4byte func_800C5990 + .4byte func_800C5988 .4byte func_800C22CC .4byte func_800C2714 .4byte func_800C2E3C @@ -4248,7 +4248,7 @@ lbl_8052DFB8: .4byte lbl_80664558 .4byte 0xFFFFFFF0 .4byte lbl_800CA4E4 - .4byte lbl_800C5988 + .4byte func_800C5988 .4byte func_800C5B00 .4byte func_800C6A58 .4byte func_800CC01C @@ -4312,13 +4312,13 @@ lbl_8052E0B8: .4byte func_800CA540 .4byte lbl_80664628 .4byte 0xFFFFFFF4 - .4byte lbl_800CA6D4 + .4byte func_800CA6D4 .4byte func_800CA6CC .4byte lbl_80664628 .4byte 0xFFFFFFF0 - .4byte lbl_800CA6DC - .4byte lbl_800C5988 - .4byte lbl_800CA58C + .4byte func_800CA6DC + .4byte func_800C5988 + .4byte func_800CA58C .4byte func_800CBBD8 .4byte func_800CC01C .4byte func_800CC020 @@ -4410,7 +4410,7 @@ lbl_8052E1F8: .4byte lbl_80664630 .4byte 0xFFFFFFF0 .4byte lbl_800CA940 - .4byte lbl_800C5988 + .4byte func_800C5988 .4byte func_800CAB2C .4byte func_800CBBD8 .4byte func_800CA850 @@ -4589,7 +4589,7 @@ lbl_8052E468: .4byte lbl_80664560 .4byte 0xFFFFFFF0 .4byte lbl_800CFFC4 - .4byte lbl_800C5988 + .4byte func_800C5988 .4byte func_800CAB2C .4byte func_800CBBD8 .4byte func_800CC01C @@ -4647,7 +4647,7 @@ lbl_8052E590: .4byte func_800D0AFC .4byte func_800CE6A0 .4byte func_800CE8AC - .4byte lbl_800D0B00 + .4byte func_800D0B00 .4byte func_800CAB30 .4byte func_800CB454 .4byte func_800CB21C @@ -4661,12 +4661,12 @@ lbl_8052E590: .4byte func_800CAB00 .4byte lbl_80664648 .4byte 0xFFFFFFF4 - .4byte lbl_800D10BC + .4byte func_800D10BC .4byte func_800D10B4 .4byte lbl_80664648 .4byte 0xFFFFFFF0 - .4byte lbl_800D10C4 - .4byte lbl_800C5988 + .4byte func_800D10C4 + .4byte func_800C5988 .4byte func_800D02D4 .4byte func_800CBBD8 .4byte func_800CC01C @@ -4676,8 +4676,8 @@ lbl_8052E590: .4byte func_800CFFA0 .4byte lbl_80664648 .4byte 0xFFFFFF98 - .4byte lbl_800D10D4 - .4byte lbl_800D10CC + .4byte func_800D10D4 + .4byte func_800D10CC .4byte func_800D0B04 .4byte func_800D1020 @@ -4829,7 +4829,7 @@ lbl_8052E850: .4byte func_80088888 .4byte func_80088880 .4byte func_80088878 - .4byte lbl_80088870 + .4byte func_80088870 .4byte func_800D1F0C .4byte func_800D1CFC .4byte func_800D11B0 @@ -4850,6 +4850,7 @@ lbl_8052E8E0: .4byte 0 .4byte 0xFFFFFFFF .4byte func_801A60B0 + .global lbl_8052E8EC lbl_8052E8EC: .4byte lbl_800E0844 @@ -4862,6 +4863,7 @@ lbl_8052E8EC: .4byte lbl_800E0820 .4byte lbl_800E082C .4byte lbl_800E0838 + .global lbl_8052E914 lbl_8052E914: .4byte lbl_800E074C @@ -4874,6 +4876,7 @@ lbl_8052E914: .4byte lbl_800E0728 .4byte lbl_800E0734 .4byte lbl_800E0740 + .global lbl_8052E93C lbl_8052E93C: .4byte lbl_800E06AC @@ -4886,6 +4889,7 @@ lbl_8052E93C: .4byte lbl_800E0688 .4byte lbl_800E0694 .4byte lbl_800E06A0 + .global lbl_8052E964 lbl_8052E964: .4byte lbl_800E05B4 @@ -4898,6 +4902,7 @@ lbl_8052E964: .4byte lbl_800E0590 .4byte lbl_800E059C .4byte lbl_800E05A8 + .global lbl_8052E98C lbl_8052E98C: .4byte lbl_800E02A8 @@ -5155,6 +5160,7 @@ lbl_8052EC34: .4byte lbl_800E4D84 .4byte lbl_800E4D90 .4byte lbl_800E4D9C + .global lbl_8052EC5C lbl_8052EC5C: .4byte lbl_800E4CAC @@ -5167,6 +5173,7 @@ lbl_8052EC5C: .4byte lbl_800E4C88 .4byte lbl_800E4C94 .4byte lbl_800E4CA0 + .global lbl_8052EC84 lbl_8052EC84: .4byte lbl_800E4C0C @@ -5179,6 +5186,7 @@ lbl_8052EC84: .4byte lbl_800E4BE8 .4byte lbl_800E4BF4 .4byte lbl_800E4C00 + .global lbl_8052ECAC lbl_8052ECAC: .4byte lbl_800E4B14 @@ -5191,6 +5199,7 @@ lbl_8052ECAC: .4byte lbl_800E4AF0 .4byte lbl_800E4AFC .4byte lbl_800E4B08 + .global lbl_8052ECD4 lbl_8052ECD4: .4byte lbl_800E46C0 @@ -5288,6 +5297,7 @@ lbl_8052EDD8: .4byte lbl_800E7340 .4byte lbl_800E7358 .4byte lbl_800E7370 + .global lbl_8052EE00 lbl_8052EE00: .4byte lbl_800E7238 @@ -5300,6 +5310,7 @@ lbl_8052EE00: .4byte lbl_800E71F0 .4byte lbl_800E7208 .4byte lbl_800E7220 + .global lbl_8052EE28 lbl_8052EE28: .4byte lbl_800E7144 @@ -5312,6 +5323,7 @@ lbl_8052EE28: .4byte lbl_800E70FC .4byte lbl_800E7114 .4byte lbl_800E712C + .global lbl_8052EE50 lbl_8052EE50: .4byte lbl_800E6FF8 @@ -5324,6 +5336,7 @@ lbl_8052EE50: .4byte lbl_800E6FB0 .4byte lbl_800E6FC8 .4byte lbl_800E6FE0 + .global lbl_8052EE78 lbl_8052EE78: .4byte lbl_800E6B50 @@ -5794,7 +5807,7 @@ lbl_8052F4B0: .4byte func_800EA410 .4byte func_800EA420 .4byte func_800EA460 - .4byte lbl_800EA470 + .4byte func_800EA470 .4byte func_800EA998 .global lbl_8052F4F0 @@ -5880,7 +5893,7 @@ lbl_8052F570: .4byte lbl_80664690 .4byte 0xFFFFF9FC .4byte func_800FD698 - .4byte lbl_800FD6A0 + .4byte func_800FD6A0 .4byte func_800FD68C .4byte func_800F4798 @@ -5943,7 +5956,7 @@ lbl_8052F5F4: .4byte func_80043F20 .4byte lbl_806646C0 .4byte 0xFFFFFFA8 - .4byte lbl_80102008 + .4byte func_80102008 .4byte func_80039E28 .4byte func_80102000 .4byte func_80039E18 @@ -5977,8 +5990,8 @@ lbl_8052F5F4: .4byte func_80039D40 .4byte lbl_806646C0 .4byte 0xFFFFFFA4 - .4byte lbl_80102018 - .4byte lbl_80102010 + .4byte func_80102018 + .4byte func_80102010 .4byte func_800FF604 .4byte func_800FF300 @@ -7753,8 +7766,8 @@ lbl_80530DE8: .4byte lbl_806647E0 .4byte 0 .4byte func_80125890 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_801289B4 .global lbl_80530E00 @@ -7771,8 +7784,8 @@ lbl_80530E10: .4byte lbl_806647E8 .4byte 0 .4byte func_80125850 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_801289FC .global lbl_80530E28 @@ -7789,8 +7802,8 @@ lbl_80530E38: .4byte lbl_806647F0 .4byte 0 .4byte func_80125810 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128A70 .global lbl_80530E50 @@ -7807,8 +7820,8 @@ lbl_80530E60: .4byte lbl_806647F8 .4byte 0 .4byte func_801257D0 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128AB8 .global lbl_80530E78 @@ -7825,8 +7838,8 @@ lbl_80530E88: .4byte lbl_80664800 .4byte 0 .4byte func_80125790 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128B0C .global lbl_80530EA0 @@ -7843,8 +7856,8 @@ lbl_80530EB0: .4byte lbl_80664808 .4byte 0 .4byte func_80125750 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128B80 .global lbl_80530EC8 @@ -7861,8 +7874,8 @@ lbl_80530ED8: .4byte lbl_80664810 .4byte 0 .4byte func_80125710 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128BB0 .global lbl_80530EF0 @@ -7879,8 +7892,8 @@ lbl_80530F00: .4byte lbl_80664818 .4byte 0 .4byte func_801256D0 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128BF8 .global lbl_80530F18 @@ -7897,8 +7910,8 @@ lbl_80530F28: .4byte lbl_80664820 .4byte 0 .4byte func_80125690 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128C6C .global lbl_80530F40 @@ -7915,8 +7928,8 @@ lbl_80530F50: .4byte lbl_80664828 .4byte 0 .4byte func_80125650 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128DA0 .global lbl_80530F68 @@ -7933,8 +7946,8 @@ lbl_80530F78: .4byte lbl_80664830 .4byte 0 .4byte func_80125610 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80128EF8 .global lbl_80530F90 @@ -7951,8 +7964,8 @@ lbl_80530FA0: .4byte lbl_80664838 .4byte 0 .4byte func_801255D0 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_80129008 .global lbl_80530FB8 @@ -7987,8 +8000,8 @@ lbl_80530FF0: .4byte lbl_80664848 .4byte 0 .4byte func_80125550 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012A1A4 .global lbl_80531008 @@ -8005,8 +8018,8 @@ lbl_80531018: .4byte lbl_80664850 .4byte 0 .4byte func_80125510 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012A224 .global lbl_80531030 @@ -8023,8 +8036,8 @@ lbl_80531040: .4byte lbl_80664858 .4byte 0 .4byte func_801254D0 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012A388 .global lbl_80531058 @@ -8041,8 +8054,8 @@ lbl_80531068: .4byte lbl_80664860 .4byte 0 .4byte func_80125490 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012A460 .global lbl_80531080 @@ -8119,8 +8132,8 @@ lbl_80531138: .4byte lbl_80664878 .4byte 0 .4byte func_801253D0 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012B8C4 .global lbl_80531150 @@ -8137,8 +8150,8 @@ lbl_80531160: .4byte lbl_80664880 .4byte 0 .4byte func_80125390 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012B944 .global lbl_80531178 @@ -8155,8 +8168,8 @@ lbl_80531188: .4byte lbl_80664888 .4byte 0 .4byte func_80125350 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012B9E0 .global lbl_805311A0 @@ -8173,8 +8186,8 @@ lbl_805311B0: .4byte lbl_80664890 .4byte 0 .4byte func_80125310 - .4byte lbl_80125B00 - .4byte lbl_80125B50 + .4byte func_80125B00 + .4byte func_80125B50 .4byte func_8012B9F0 .global lbl_805311C8 @@ -8921,6 +8934,7 @@ lbl_80531C58: .4byte lbl_8013949C .4byte lbl_801394A4 .4byte lbl_801394AC + .global lbl_80531C90 lbl_80531C90: .asciz "NW4R:Pointer must not be NULL (p)" @@ -9591,6 +9605,7 @@ lbl_80532450: .4byte lbl_8014F188 .4byte lbl_8014F56C .4byte lbl_8014F56C + .global lbl_805325BC lbl_805325BC: .4byte lbl_80151D54 @@ -10309,7 +10324,7 @@ lbl_80532F40: .4byte lbl_80664BE0 .4byte 0 .4byte func_8015B4BC - .4byte lbl_80156F0C + .4byte func_80156F0C .4byte func_8015B46C .4byte func_8015B4B4 .4byte func_8015B460 @@ -10328,7 +10343,7 @@ lbl_80532F40: .4byte func_80156048 .4byte func_80156924 .4byte func_8015B44C - .4byte lbl_80156F30 + .4byte func_80156F30 .4byte func_8015B3F4 .4byte func_8015B440 .4byte func_8015B3EC @@ -10927,7 +10942,7 @@ lbl_8053370C: .4byte func_80043F20 .4byte lbl_80664C58 .4byte 0xFFFFFF94 - .4byte lbl_80164118 + .4byte func_80164118 .4byte func_80039E28 .4byte func_80039E20 .4byte func_80039E18 @@ -10991,9 +11006,9 @@ lbl_805337EC: .4byte func_80043F20 .4byte lbl_80664C60 .4byte 0xFFFFFF94 - .4byte lbl_80164100 + .4byte func_80164100 .4byte func_80039E28 - .4byte lbl_801640F8 + .4byte func_801640F8 .4byte func_80039E18 .4byte func_80039E10 .4byte func_80039E0C @@ -11025,8 +11040,8 @@ lbl_805337EC: .4byte func_80039D40 .4byte lbl_80664C60 .4byte 0xFFFFFF90 - .4byte lbl_80164110 - .4byte lbl_80164108 + .4byte func_80164110 + .4byte func_80164108 .4byte func_80160214 .4byte func_80160118 @@ -11063,9 +11078,9 @@ lbl_805338EC: .4byte func_80043F20 .4byte lbl_80664C68 .4byte 0xFFFFFF94 - .4byte lbl_801640E0 + .4byte func_801640E0 .4byte func_80039E28 - .4byte lbl_801640D8 + .4byte func_801640D8 .4byte func_80039E18 .4byte func_80039E10 .4byte func_80039E0C @@ -11097,8 +11112,8 @@ lbl_805338EC: .4byte func_80039D40 .4byte lbl_80664C68 .4byte 0xFFFFFF90 - .4byte lbl_801640F0 - .4byte lbl_801640E8 + .4byte func_801640F0 + .4byte func_801640E8 .4byte func_8015DC04 .4byte func_8015DB08 @@ -11512,23 +11527,23 @@ lbl_80533F60: .4byte func_80043F20 .4byte lbl_80664C80 .4byte 0xFFFFFFAC - .4byte lbl_801666CC + .4byte func_801666CC .4byte func_80166630 .4byte func_8016662C .4byte func_801666C4 .4byte lbl_80664C80 .4byte 0xFFFFFFA8 - .4byte lbl_801666DC - .4byte lbl_801666D4 + .4byte func_801666DC + .4byte func_801666D4 .4byte lbl_80664C80 .4byte 0xFFFFFFA4 - .4byte lbl_801666EC - .4byte lbl_801666E4 + .4byte func_801666EC + .4byte func_801666E4 .4byte lbl_80664C80 .4byte 0xFFFFFFA0 - .4byte lbl_801666FC + .4byte func_801666FC .4byte func_80039E28 - .4byte lbl_801666F4 + .4byte func_801666F4 .4byte func_80039E18 .4byte func_80039E10 .4byte func_80039E0C @@ -12181,9 +12196,9 @@ lbl_8053486C: .4byte func_800AFB04 .4byte lbl_806641B0 .4byte 0xFFFFFFF8 - .4byte lbl_800B064C - .4byte lbl_800B0654 - .4byte lbl_800B0644 + .4byte func_800B064C + .4byte func_800B0654 + .4byte func_800B0644 .4byte func_80147790 .4byte func_801463A8 .4byte func_8014780C @@ -12197,7 +12212,7 @@ lbl_8053486C: .4byte func_80148748 .4byte func_80148758 .4byte func_80148768 - .4byte lbl_800B063C + .4byte func_800B063C .4byte func_800B0634 .4byte func_801463A4 .4byte func_800AFB90 @@ -12407,7 +12422,7 @@ lbl_8053486C: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -12415,7 +12430,7 @@ lbl_8053486C: .4byte func_800A3494 .4byte func_800A3488 .4byte func_8003C7F8 - .4byte lbl_800B067C + .4byte func_800B067C .4byte func_800A34B4 .4byte func_80080640 .4byte func_8003E664 @@ -12433,7 +12448,7 @@ lbl_8053486C: .4byte func_800AC5E4 .4byte func_800BE9E4 .4byte func_800BE088 - .4byte lbl_800B068C + .4byte func_800B068C .4byte func_800BE1F8 .4byte func_800BE214 .4byte func_800BE248 @@ -12450,7 +12465,7 @@ lbl_8053486C: .4byte func_800BB200 .4byte func_800BDF78 .4byte func_800BDFE0 - .4byte lbl_800B0664 + .4byte func_800B0664 .4byte func_800BE058 .4byte func_800BE070 .4byte func_800BB2E4 @@ -12518,7 +12533,7 @@ lbl_8053486C: .4byte func_800BEA40 .4byte func_800BE0DC .4byte func_80092CA8 - .4byte lbl_800B0684 + .4byte func_800B0684 .4byte func_800BE264 .4byte func_800BE278 .4byte func_800BE2A0 @@ -12527,7 +12542,7 @@ lbl_8053486C: .4byte func_800BE300 .4byte func_800BE314 .4byte func_800BE328 - .4byte lbl_800B0674 + .4byte func_800B0674 .4byte func_800BE474 .4byte func_800BE504 .4byte func_800BE57C @@ -12612,7 +12627,7 @@ lbl_80534EC8: .4byte func_801738AC .4byte func_801737CC .4byte func_801737D4 - .4byte lbl_8017389C + .4byte func_8017389C .global lbl_80534EE0 @@ -12626,6 +12641,7 @@ lbl_80534EE0: .4byte lbl_80175094 .4byte lbl_80175044 .4byte lbl_801750D0 + .global lbl_80534F00 lbl_80534F00: .4byte lbl_80177D10 @@ -12638,6 +12654,7 @@ lbl_80534F00: .4byte lbl_80177CEC .4byte lbl_80177CF8 .4byte lbl_80177D04 + .global lbl_80534F28 lbl_80534F28: .4byte lbl_80177C18 @@ -12650,6 +12667,7 @@ lbl_80534F28: .4byte lbl_80177BF4 .4byte lbl_80177C00 .4byte lbl_80177C0C + .global lbl_80534F50 lbl_80534F50: .4byte lbl_80177B08 @@ -12662,6 +12680,7 @@ lbl_80534F50: .4byte lbl_80177AE4 .4byte lbl_80177AF0 .4byte lbl_80177AFC + .global lbl_80534F78 lbl_80534F78: .4byte lbl_80177A10 @@ -12674,6 +12693,7 @@ lbl_80534F78: .4byte lbl_801779EC .4byte lbl_801779F8 .4byte lbl_80177A04 + .global lbl_80534FA0 lbl_80534FA0: .4byte lbl_801777D4 @@ -12686,6 +12706,7 @@ lbl_80534FA0: .4byte lbl_801777B0 .4byte lbl_801777BC .4byte lbl_801777C8 + .global lbl_80534FC8 lbl_80534FC8: .4byte lbl_801776DC @@ -12698,6 +12719,7 @@ lbl_80534FC8: .4byte lbl_801776B8 .4byte lbl_801776C4 .4byte lbl_801776D0 + .global lbl_80534FF0 lbl_80534FF0: .4byte lbl_80177620 @@ -12710,6 +12732,7 @@ lbl_80534FF0: .4byte lbl_801775FC .4byte lbl_80177608 .4byte lbl_80177614 + .global lbl_80535018 lbl_80535018: .4byte lbl_80177528 @@ -12732,9 +12755,9 @@ lbl_80535040: .4byte func_800AFB04 .4byte lbl_806641B8 .4byte 0xFFFFFFF8 - .4byte lbl_8017ED84 - .4byte lbl_8017ED8C - .4byte lbl_8017ED7C + .4byte func_8017ED84 + .4byte func_8017ED8C + .4byte func_8017ED7C .4byte func_80147790 .4byte func_801463A8 .4byte func_8014780C @@ -12748,7 +12771,7 @@ lbl_80535040: .4byte func_80148748 .4byte func_80148758 .4byte func_80148768 - .4byte lbl_8017ED74 + .4byte func_8017ED74 .4byte func_8017ED6C .4byte func_801463A4 .4byte func_800AFB90 @@ -13556,7 +13579,7 @@ lbl_80535AF0: .4byte func_801856C0 .4byte 0 .4byte func_80169A34 - .4byte lbl_80185758 + .4byte func_80185758 .4byte func_80169048 .4byte func_801809A8 .4byte func_801696C4 @@ -15175,9 +15198,9 @@ lbl_80536EFC: .4byte func_801B218C .4byte lbl_80664EC0 .4byte 0xFFFFFFFC - .4byte lbl_801B255C - .4byte lbl_801B2554 - .4byte lbl_801B254C + .4byte func_801B255C + .4byte func_801B2554 + .4byte func_801B254C .4byte func_801B2544 .4byte func_801B20C8 .4byte func_801B21E0 @@ -15189,6 +15212,7 @@ lbl_80536F30: .4byte 0x00000004 .4byte 0 .4byte 0 + .global lbl_80536F40 lbl_80536F40: .4byte lbl_801B3B54 @@ -15205,6 +15229,7 @@ lbl_80536F40: .4byte lbl_801B3B18 .4byte lbl_801B3B48 .4byte lbl_801B3B50 + .global lbl_80536F78 lbl_80536F78: .4byte lbl_801B3558 @@ -15238,6 +15263,7 @@ lbl_80536FB0: .4byte lbl_801B43F8 .4byte lbl_801B4404 .4byte lbl_801B444C + .global lbl_80536FE0 lbl_80536FE0: .4byte lbl_801B5208 @@ -15254,6 +15280,7 @@ lbl_80536FE0: .4byte lbl_801B51CC .4byte lbl_801B51FC .4byte lbl_801B5204 + .global lbl_80537018 lbl_80537018: .4byte lbl_801B4CE8 @@ -15300,7 +15327,7 @@ lbl_80537074: .4byte func_80043F20 .4byte lbl_80664ED0 .4byte 0xFFFFFF94 - .4byte lbl_801BA134 + .4byte func_801BA134 .4byte func_80039E28 .4byte func_801BA12C .4byte func_80039E18 @@ -15334,8 +15361,8 @@ lbl_80537074: .4byte func_80039D40 .4byte lbl_80664ED0 .4byte 0xFFFFFF90 - .4byte lbl_801BA144 - .4byte lbl_801BA13C + .4byte func_801BA144 + .4byte func_801BA13C .4byte func_801B4638 .4byte func_801B45A0 @@ -15645,7 +15672,7 @@ lbl_80537548: .4byte func_801C3604 .4byte func_801C37C8 .4byte func_80169A34 - .4byte lbl_80185758 + .4byte func_80185758 .4byte func_80169048 .4byte func_801809A8 .4byte func_801696C4 @@ -17112,7 +17139,7 @@ lbl_80538770: .4byte func_800A34A8 .4byte func_8009489C .4byte func_800A349C - .4byte lbl_80086B4C + .4byte func_80086B4C .4byte func_8003CB20 .4byte func_8003D98C .4byte func_8003D8C0 @@ -17516,19 +17543,19 @@ lbl_80538C80: .4byte func_80039D40 .4byte lbl_80665038 .4byte 0xFFFFFFFC - .4byte lbl_80201A6C - .4byte lbl_80201A64 + .4byte func_80201A6C + .4byte func_80201A64 .4byte func_800550D8 - .4byte lbl_80201A5C - .4byte lbl_80201A54 - .4byte lbl_80201A4C + .4byte func_80201A5C + .4byte func_80201A54 + .4byte func_80201A4C .4byte func_800554D8 .4byte func_800554D0 .4byte func_80201A44 .4byte lbl_80665038 .4byte 0xFFFFFFF8 - .4byte lbl_80201A7C - .4byte lbl_80201A74 + .4byte func_80201A7C + .4byte func_80201A74 .4byte func_80200F9C .4byte func_80201298 .4byte func_8020131C @@ -18090,7 +18117,7 @@ lbl_80539328: .4byte func_80039D40 .4byte lbl_806650C8 .4byte 0xFFFFFFFC - .4byte lbl_80213480 + .4byte func_80213480 .4byte func_80213478 .4byte func_802133C8 @@ -18337,8 +18364,8 @@ lbl_80539628: .4byte func_800554D4 .4byte lbl_806650E0 .4byte 0xFFFFFFF8 - .4byte lbl_80221E64 - .4byte lbl_80221E5C + .4byte func_80221E64 + .4byte func_80221E5C .4byte func_80221D58 .global lbl_805396F0 @@ -21360,7 +21387,7 @@ lbl_8053BC10: .4byte func_8027A58C .4byte func_8027A8C8 .4byte func_80281438 - .4byte lbl_80281460 + .4byte func_80281460 .4byte func_80278E00 .4byte func_80278E04 .4byte func_8028146C @@ -21371,7 +21398,7 @@ lbl_8053BC10: .4byte func_8028183C .4byte func_8027976C .4byte func_8027A584 - .4byte lbl_802818DC + .4byte func_802818DC .4byte func_802818D4 .4byte func_80278F70 .4byte func_80278F5C @@ -21402,8 +21429,8 @@ lbl_8053BC98: .4byte func_8027A58C .4byte func_8027A8C8 .4byte func_80282020 - .4byte lbl_80282048 - .4byte lbl_80282490 + .4byte func_80282048 + .4byte func_80282490 .4byte func_8028248C .4byte func_80282054 .4byte func_8028246C @@ -21412,7 +21439,7 @@ lbl_8053BC98: .4byte func_802820D4 .4byte func_80282100 .4byte func_80282174 - .4byte lbl_80282464 + .4byte func_80282464 .4byte func_8027A9D8 .4byte func_8028245C .4byte func_80278F70 @@ -21876,7 +21903,7 @@ lbl_8053C258: .4byte func_802948D0 .4byte func_80294CB0 .4byte func_8029493C - .4byte lbl_80185758 + .4byte func_80185758 .4byte func_80169048 .4byte func_801809A8 .4byte func_801696C4 @@ -21987,14 +22014,14 @@ lbl_8053C3B8: .4byte 0 .4byte func_80295650 .4byte func_80446734 - .4byte lbl_802956AC - .4byte lbl_802956CC + .4byte func_802956AC + .4byte func_802956CC .4byte func_802956E4 .4byte func_802957D4 .4byte func_80043F20 .4byte lbl_80665428 .4byte 0xFFFFFFAC - .4byte lbl_80295870 + .4byte func_80295870 .4byte func_80039E28 .4byte func_80295868 .4byte func_80039E18 @@ -22028,8 +22055,8 @@ lbl_8053C3B8: .4byte func_80039D40 .4byte lbl_80665428 .4byte 0xFFFFFFA8 - .4byte lbl_80295880 - .4byte lbl_80295878 + .4byte func_80295880 + .4byte func_80295878 .4byte func_80295760 .4byte func_80295764 @@ -22309,7 +22336,7 @@ lbl_8053C78C: .4byte func_802B86BC .4byte func_80295D98 .4byte func_802B86F0 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -22339,9 +22366,9 @@ lbl_8053C7E0: .4byte lbl_806654F0 .4byte 0 .4byte func_80295D88 - .4byte lbl_80295D9C + .4byte func_80295D9C .4byte func_802B818C - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053C7FC @@ -22365,9 +22392,9 @@ lbl_8053C81C: .4byte lbl_80665500 .4byte 0 .4byte func_802B7CB0 - .4byte lbl_80295DA0 + .4byte func_80295DA0 .4byte func_802B7EC4 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -22398,8 +22425,8 @@ lbl_8053C870: .4byte 0 .4byte func_80295D88 .4byte func_80295DAC - .4byte lbl_80295DA4 - .4byte lbl_80295D90 + .4byte func_80295DA4 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053C88C @@ -22418,8 +22445,8 @@ lbl_8053C8A0: .4byte 0 .4byte func_80295D88 .4byte func_802B7BEC - .4byte lbl_80295DA4 - .4byte lbl_80295D90 + .4byte func_80295DA4 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053C8BC @@ -22727,50 +22754,50 @@ lbl_8053CC58: lbl_8053CC84: # ROM: 0x538D84 .4byte lbl_8029D654 - .4byte func_8029D6B4 - .4byte func_8029D6C4 - .4byte func_8029D6D4 - .4byte func_8029D6E4 - .4byte func_8029D6F4 - .4byte func_8029D704 - .4byte func_8029D714 - .4byte func_8029D720 - .4byte func_8029D730 - .4byte func_8029D740 - .4byte func_8029D750 - .4byte func_8029D760 - .4byte func_8029D770 - .4byte func_8029D780 - .4byte func_8029D790 - .4byte func_8029D7A0 - .4byte func_8029D7B0 - .4byte func_8029D7C0 - .4byte func_8029D7D0 + .4byte lbl_8029D6B4 + .4byte lbl_8029D6C4 + .4byte lbl_8029D6D4 + .4byte lbl_8029D6E4 + .4byte lbl_8029D6F4 + .4byte lbl_8029D704 + .4byte lbl_8029D714 + .4byte lbl_8029D720 + .4byte lbl_8029D730 + .4byte lbl_8029D740 + .4byte lbl_8029D750 + .4byte lbl_8029D760 + .4byte lbl_8029D770 + .4byte lbl_8029D780 + .4byte lbl_8029D790 + .4byte lbl_8029D7A0 + .4byte lbl_8029D7B0 + .4byte lbl_8029D7C0 + .4byte lbl_8029D7D0 .global lbl_8053CCD4 lbl_8053CCD4: # ROM: 0x538DD4 .4byte lbl_8029D830 - .4byte func_8029D840 - .4byte func_8029D850 - .4byte func_8029D860 - .4byte func_8029D870 - .4byte func_8029D880 - .4byte func_8029D890 - .4byte func_8029D8A0 - .4byte func_8029D8AC - .4byte func_8029D8BC - .4byte func_8029D8CC - .4byte func_8029D8DC - .4byte func_8029D8EC - .4byte func_8029D8FC - .4byte func_8029D90C - .4byte func_8029D91C - .4byte func_8029D92C - .4byte func_8029D93C - .4byte func_8029D94C - .4byte func_8029D95C + .4byte lbl_8029D840 + .4byte lbl_8029D850 + .4byte lbl_8029D860 + .4byte lbl_8029D870 + .4byte lbl_8029D880 + .4byte lbl_8029D890 + .4byte lbl_8029D8A0 + .4byte lbl_8029D8AC + .4byte lbl_8029D8BC + .4byte lbl_8029D8CC + .4byte lbl_8029D8DC + .4byte lbl_8029D8EC + .4byte lbl_8029D8FC + .4byte lbl_8029D90C + .4byte lbl_8029D91C + .4byte lbl_8029D92C + .4byte lbl_8029D93C + .4byte lbl_8029D94C + .4byte lbl_8029D95C .global lbl_8053CD24 @@ -25393,7 +25420,7 @@ lbl_8053EA90: .4byte func_80296898 .4byte func_802B7BEC .4byte func_802B7A90 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EAAC @@ -25411,7 +25438,7 @@ lbl_8053EAB8: .4byte func_80295D88 .4byte func_802B7BEC .4byte 0 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte 0 @@ -25424,7 +25451,7 @@ lbl_8053EAD8: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B7D00 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25446,7 +25473,7 @@ lbl_8053EB10: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B7D9C - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EB2C @@ -25464,7 +25491,7 @@ lbl_8053EB38: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B7DEC - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25486,7 +25513,7 @@ lbl_8053EB70: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B7E34 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25508,7 +25535,7 @@ lbl_8053EBA8: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B7E7C - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25530,7 +25557,7 @@ lbl_8053EBE0: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B7EC4 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25545,7 +25572,7 @@ lbl_8053EC08: .4byte func_802B7F54 .4byte func_802B7BEC .4byte func_802B7F60 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EC24 @@ -25563,7 +25590,7 @@ lbl_8053EC30: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B8028 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EC4C @@ -25593,8 +25620,8 @@ lbl_8053EC78: .4byte 0 .4byte func_80295D88 .4byte func_802B7BEC - .4byte lbl_802B80F0 - .4byte lbl_80295D90 + .4byte func_802B80F0 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EC94 @@ -25612,7 +25639,7 @@ lbl_8053ECA0: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B80F4 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053ECBC @@ -25630,7 +25657,7 @@ lbl_8053ECC8: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B8180 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053ECE4 @@ -25648,7 +25675,7 @@ lbl_8053ECF0: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B818C - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte 0 @@ -25661,7 +25688,7 @@ lbl_8053ED10: .4byte func_802B8280 .4byte func_802B7BEC .4byte func_802B8328 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte lbl_806657F8 .4byte 0xFFFFFFF4 @@ -25685,7 +25712,7 @@ lbl_8053ED50: .4byte func_802B84E0 .4byte func_802B7BEC .4byte func_802B8398 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053ED6C @@ -25703,7 +25730,7 @@ lbl_8053ED78: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B8534 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25725,7 +25752,7 @@ lbl_8053EDB0: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B84EC - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_802B859C .global lbl_8053EDCC @@ -25743,7 +25770,7 @@ lbl_8053EDD8: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B85A4 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EDF4 @@ -25761,7 +25788,7 @@ lbl_8053EE00: .4byte func_802B7CB0 .4byte func_802B7BEC .4byte func_802B8604 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25782,8 +25809,8 @@ lbl_8053EE38: .4byte 0 .4byte func_80295D88 .4byte func_802B7BEC - .4byte lbl_802B8650 - .4byte lbl_80295D90 + .4byte func_802B8650 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EE54 @@ -25801,7 +25828,7 @@ lbl_8053EE60: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B864C - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EE7C @@ -25819,7 +25846,7 @@ lbl_8053EE88: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B8654 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EEA4 @@ -25837,7 +25864,7 @@ lbl_8053EEB0: .4byte func_802B86BC .4byte func_802B7BEC .4byte func_802B86F0 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .4byte func_802B7CBC .4byte func_802B7CE4 @@ -25852,7 +25879,7 @@ lbl_8053EED8: .4byte func_80295D88 .4byte func_802B7BEC .4byte func_802B88C8 - .4byte lbl_80295D90 + .4byte func_80295D90 .4byte func_80295D80 .global lbl_8053EEF4 @@ -26025,6 +26052,7 @@ lbl_8053F068: .4byte lbl_802BAC08 .4byte lbl_802BABF0 .4byte lbl_802BABD8 + .global lbl_8053F0AC lbl_8053F0AC: .4byte lbl_802BB688 diff --git a/asm/data_2.s b/asm/data_2.s index a81ebec..97c4c2d 100644 --- a/asm/data_2.s +++ b/asm/data_2.s @@ -4318,6 +4318,8 @@ lbl_80544418: .4byte lbl_802E2B44 .4byte lbl_802E2B4C .4byte lbl_802E2B54 + + .asciz "Ctrl DATA received w4: event[%s]" .balign 4 .asciz "invalid transaction type for DATA payload: 4_evt[%s]" @@ -38311,26 +38313,27 @@ lbl_8056A840: lbl_8056A918: # ROM: 0x566A18 .4byte lbl_803A8A64 - .4byte func_803A8C70 - .4byte func_803A8B44 - .4byte func_803A8DB4 - .4byte func_803A8AB4 - .4byte func_803A8C70 - .4byte func_803A8B44 - .4byte func_803A8DB4 + .4byte lbl_803A8C70 + .4byte lbl_803A8B44 + .4byte lbl_803A8DB4 + .4byte lbl_803A8AB4 + .4byte lbl_803A8C70 + .4byte lbl_803A8B44 + .4byte lbl_803A8DB4 .global lbl_8056A938 lbl_8056A938: # ROM: 0x566A38 .4byte lbl_803ADEB4 - .4byte func_803AE3B4 - .4byte func_803AE2E4 - .4byte func_803AE42C - .4byte func_803AE0C8 - .4byte func_803AE3B4 - .4byte func_803AE2E4 - .4byte func_803AE42C + .4byte lbl_803AE3B4 + .4byte lbl_803AE2E4 + .4byte lbl_803AE42C + .4byte lbl_803AE0C8 + .4byte lbl_803AE3B4 + .4byte lbl_803AE2E4 + .4byte lbl_803AE42C + .global lbl_8056A958 lbl_8056A958: .4byte lbl_803B1B44 @@ -40325,13 +40328,13 @@ lbl_8056C744: # ROM: 0x568844 .4byte lbl_803D2D04 .4byte lbl_803D2CB8 - .4byte func_803D2CC0 - .4byte func_803D2CC8 - .4byte func_803D2CD0 - .4byte func_803D2CD8 - .4byte func_803D2CE0 - .4byte func_803D2CEC - .4byte func_803D2CF8 + .4byte lbl_803D2CC0 + .4byte lbl_803D2CC8 + .4byte lbl_803D2CD0 + .4byte lbl_803D2CD8 + .4byte lbl_803D2CE0 + .4byte lbl_803D2CEC + .4byte lbl_803D2CF8 .global lbl_8056C768 @@ -40912,7 +40915,7 @@ lbl_8056CEB0: .4byte 0 .4byte 0 .4byte __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo - .4byte func_803EB374 + .4byte __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv .4byte Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv .4byte SetNrmMapMtx__Q44nw4r3g3d8G3DState11IndMtxOpStdF14_GXIndTexMtxIDPCQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34Q44nw4r3g3d14ResMatMiscData14IndirectMethod @@ -42132,7 +42135,7 @@ lbl_8056DFC8: # ROM: 0x56A0C8 .4byte 0 .4byte 0 - .4byte func_80412460 + .4byte __dt__Q44nw4r3snd6detail11BasicPlayerFv .4byte 0 .4byte 0 .4byte 0 @@ -42147,18 +42150,18 @@ lbl_8056DFF0: # ROM: 0x56A0F0 .4byte 0 .4byte 0 - .4byte func_80413B00 - .4byte func_80413AC0 - .4byte func_804135A0 + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv + .4byte __dt__Q44nw4r3snd6detail10BasicSoundFv + .4byte Shutdown__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 .4byte 0 - .4byte func_8041257C + .4byte InitParam__Q44nw4r3snd6detail10BasicSoundFv .4byte 0 .4byte 0 - .4byte func_804137B0 - .4byte func_80413190 - .4byte func_804131C4 + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .global lbl_8056E028 @@ -42212,12 +42215,12 @@ lbl_8056E078: .4byte 0 .4byte 0 .4byte func_801C2E34 - .4byte func_80415B00 - .4byte func_80415C28 - .4byte func_80415EA0 - .4byte func_80415F40 - .4byte func_80415AF0 - .4byte lbl_80415AF8 + .4byte StartUp__Q34nw4r3snd12FxChorusDpl2Fv + .4byte Shutdown__Q34nw4r3snd12FxChorusDpl2Fv + .4byte UpdateBuffer__Q34nw4r3snd12FxChorusDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode + .4byte OnChangeOutputMode__Q34nw4r3snd12FxChorusDpl2Fv + .4byte AssignWorkBuffer__Q34nw4r3snd12FxChorusDpl2FPvUl + .4byte ReleaseWorkBuffer__Q34nw4r3snd12FxChorusDpl2Fv .4byte 0 @@ -42227,12 +42230,12 @@ lbl_8056E0A0: .4byte 0 .4byte 0 .4byte func_801C2EB0 - .4byte func_804160A0 - .4byte func_804161C8 - .4byte func_804164A0 - .4byte func_80416540 - .4byte func_80416090 - .4byte lbl_80416098 + .4byte StartUp__Q34nw4r3snd11FxDelayDpl2Fv + .4byte Shutdown__Q34nw4r3snd11FxDelayDpl2Fv + .4byte UpdateBuffer__Q34nw4r3snd11FxDelayDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode + .4byte OnChangeOutputMode__Q34nw4r3snd11FxDelayDpl2Fv + .4byte AssignWorkBuffer__Q34nw4r3snd11FxDelayDpl2FPvUl + .4byte ReleaseWorkBuffer__Q34nw4r3snd11FxDelayDpl2Fv .4byte 0 @@ -42242,12 +42245,12 @@ lbl_8056E0C8: .4byte 0 .4byte 0 .4byte func_801C2D78 - .4byte func_804166D8 - .4byte func_80416800 - .4byte func_80416B98 - .4byte func_80416C38 - .4byte func_804166C8 - .4byte lbl_804166D0 + .4byte StartUp__Q34nw4r3snd15FxReverbStdDpl2Fv + .4byte Shutdown__Q34nw4r3snd15FxReverbStdDpl2Fv + .4byte UpdateBuffer__Q34nw4r3snd15FxReverbStdDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode + .4byte OnChangeOutputMode__Q34nw4r3snd15FxReverbStdDpl2Fv + .4byte AssignWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2FPvUl + .4byte ReleaseWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2Fv .4byte 0 @@ -42256,27 +42259,27 @@ lbl_8056E0F0: # ROM: 0x56A1F0 .4byte 0 .4byte 0 - .4byte func_8041751C - .4byte func_8041755C - .4byte func_80417460 - .4byte func_80417474 + .4byte GetRuntimeTypeInfo__Q34nw4r2ut10FileStreamCFv + .4byte __dt__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv + .4byte Close__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv + .4byte Read__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFPvUl .4byte func_8042BDD0 .4byte func_8042BDD8 .4byte func_8042BDE0 .4byte func_8042BDE8 - .4byte func_80417544 - .4byte func_8041753C - .4byte func_80417534 - .4byte func_80417160 - .4byte func_80417158 - .4byte func_80417150 - .4byte func_80417524 - .4byte func_804174CC + .4byte CanAsync__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte CanRead__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte CanWrite__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut8IOStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut8IOStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut8IOStreamCFv + .4byte GetSize__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte Seek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFlUl .4byte func_8042BDFC .4byte func_8042BE00 - .4byte func_80417554 - .4byte func_8041754C - .4byte func_8041752C + .4byte CanSeek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte CanCancel__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv + .4byte Tell__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv .4byte 0 @@ -42285,12 +42288,12 @@ lbl_8056E150: # ROM: 0x56A250 .4byte 0 .4byte 0 - .4byte func_804171B4 - .4byte func_80417290 - .4byte func_80417340 - .4byte func_80417458 - .4byte func_804173F0 - .4byte func_80417450 + .4byte __dt__Q34nw4r3snd18MemorySoundArchiveFv + .4byte detail_GetFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl + .4byte detail_GetWaveDataFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl + .4byte detail_GetRequiredStreamBufferSize__Q34nw4r3snd18MemorySoundArchiveCFv + .4byte OpenStream__Q34nw4r3snd18MemorySoundArchiveCFPviUlUl + .4byte OpenExtStream__Q34nw4r3snd18MemorySoundArchiveCFPviPCcUlUl .global lbl_8056E170 @@ -42473,21 +42476,21 @@ lbl_8056E3D8: # ROM: 0x56A4D8 .4byte 0 .4byte 0 - .4byte func_8041989C - .4byte func_80419E48 - .4byte func_80419EB8 - .4byte func_8041A008 + .4byte __dt__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Start__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Stop__Q44nw4r3snd6detail9SeqPlayerFv + .4byte Pause__Q44nw4r3snd6detail9SeqPlayerFb .4byte IsActive__Q44nw4r3snd6detail9SeqPlayerCFv .4byte IsStarted__Q44nw4r3snd6detail9SeqPlayerCFv .4byte IsPause__Q44nw4r3snd6detail9SeqPlayerCFv .4byte 0 .4byte 0 - .4byte func_8041ABAC + .4byte _180___dt__Q44nw4r3snd6detail9SeqPlayerFv .4byte _208_InvalidateData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv .4byte _208_InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv .4byte 0 .4byte 0 - .4byte lbl_8041ABB4 + .4byte _192___dt__Q44nw4r3snd6detail9SeqPlayerFv .4byte _220_OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv .4byte OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv .4byte _220_OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv @@ -42504,18 +42507,18 @@ lbl_8056E440: # ROM: 0x56A540 .4byte 0 .4byte 0 - .4byte func_8041B2F0 - .4byte func_8041B00C - .4byte func_8041AF30 - .4byte func_8041B2E8 - .4byte func_8041B174 - .4byte func_8041B188 - .4byte func_8041ACB0 - .4byte func_8041B2D8 - .4byte func_8041B2E0 - .4byte func_8041B090 - .4byte func_80413190 - .4byte func_804131C4 + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail8SeqSoundCFv + .4byte __dt__Q44nw4r3snd6detail8SeqSoundFv + .4byte Shutdown__Q44nw4r3snd6detail8SeqSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail8SeqSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv + .4byte InitParam__Q44nw4r3snd6detail8SeqSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail8SeqSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .global lbl_8056E478 @@ -42523,10 +42526,10 @@ lbl_8056E478: # ROM: 0x56A578 .4byte 0 .4byte 0 - .4byte func_8041AC58 - .4byte func_8041B190 - .4byte func_8041B288 - .4byte func_8041B2AC + .4byte __dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv .global lbl_8056E490 @@ -42543,7 +42546,7 @@ lbl_8056E4A0: # ROM: 0x56A5A0 .4byte 0 .4byte 0 - .4byte func_8041C7A0 + .4byte __dt__Q34nw4r3snd12SoundArchiveFv .4byte 0 .4byte 0 .4byte 0 @@ -42556,16 +42559,16 @@ lbl_8056E4C0: # ROM: 0x56A5C0 .4byte 0 .4byte 0 - .4byte func_8041DEA4 - .4byte func_8041FFAC - .4byte func_80420050 + .4byte __dt__Q34nw4r3snd18SoundArchivePlayerFv + .4byte InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv + .4byte InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv .4byte 0 .4byte 0 - .4byte lbl_80420328 - .4byte lbl_80420320 - .4byte func_80420318 - .4byte func_8041C774 - .4byte func_8041EEF0 + .4byte _12___dt__Q34nw4r3snd18SoundArchivePlayerFv + .4byte _12_detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + .4byte _12_detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .4byte detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + .4byte detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo .global lbl_8056E4F0 @@ -42574,7 +42577,7 @@ lbl_8056E4F0: .4byte 0 .4byte 0 .4byte func_8041DCFC - .4byte func_8042021C + .4byte GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl .global lbl_8056E500 @@ -42583,7 +42586,7 @@ lbl_8056E500: .4byte 0 .4byte 0 .4byte func_8041DCBC - .4byte func_804200F4 + .4byte NoteOn__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFPQ44nw4r3snd6detail9SeqPlayeriRCQ44nw4r3snd6detail10NoteOnInfo .global lbl_8056E510 @@ -42596,22 +42599,22 @@ lbl_8056E558: # ROM: 0x56A658 .4byte 0 .4byte 0 - .4byte func_80422740 - .4byte func_80422BC0 - .4byte func_80422F58 - .4byte func_80423120 - .4byte func_80424F94 - .4byte func_80424F8C - .4byte func_80424F84 + .4byte __dt__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Start__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Stop__Q44nw4r3snd6detail10StrmPlayerFv + .4byte Pause__Q44nw4r3snd6detail10StrmPlayerFb + .4byte IsActive__Q44nw4r3snd6detail10StrmPlayerCFv + .4byte IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv + .4byte IsPause__Q44nw4r3snd6detail10StrmPlayerCFv .4byte 0 .4byte 0 - .4byte lbl_80424FB4 - .4byte lbl_80424FAC - .4byte lbl_80424FA4 - .4byte func_80424F9C - .4byte func_80424F6C - .4byte lbl_80424F70 - .4byte lbl_80424F74 + .4byte _208___dt__Q44nw4r3snd6detail10StrmPlayerFv + .4byte _208_OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte _208_OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte _208_OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + .4byte OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv .global lbl_8056E5A0 @@ -42619,10 +42622,10 @@ lbl_8056E5A0: # ROM: 0x56A6A0 .4byte 0 .4byte 0 - .4byte func_804226E8 - .4byte func_80424D68 - .4byte func_80424E38 - .4byte func_80424EC4 + .4byte __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv .global lbl_8056E5B8 @@ -42630,10 +42633,10 @@ lbl_8056E5B8: # ROM: 0x56A6B8 .4byte 0 .4byte 0 - .4byte func_80422690 - .4byte func_80424C24 - .4byte func_80424C74 - .4byte func_80424C78 + .4byte __dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv + .4byte OnCancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv .global lbl_8056E5D0 @@ -42641,18 +42644,18 @@ lbl_8056E5D0: # ROM: 0x56A6D0 .4byte 0 .4byte 0 - .4byte func_80425738 - .4byte func_804255C4 - .4byte func_80425528 - .4byte func_80425730 - .4byte func_80425704 - .4byte func_80425718 - .4byte func_804251B8 - .4byte lbl_80425720 - .4byte func_80425728 - .4byte func_80425620 - .4byte func_804253C8 - .4byte func_80425448 + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail9StrmSoundCFv + .4byte __dt__Q44nw4r3snd6detail9StrmSoundFv + .4byte Shutdown__Q44nw4r3snd6detail9StrmSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail9StrmSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv + .4byte InitParam__Q44nw4r3snd6detail9StrmSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail9StrmSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail9StrmSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail9StrmSoundFv .global lbl_8056E608 @@ -42693,18 +42696,18 @@ lbl_8056E650: # ROM: 0x56A750 .4byte 0 .4byte 0 - .4byte func_80429F24 - .4byte func_80429DBC - .4byte func_80429D20 - .4byte func_80429F1C - .4byte func_80429EF0 - .4byte func_80429F04 - .4byte func_8041257C - .4byte lbl_80429F0C - .4byte func_80429F14 - .4byte func_80429E0C - .4byte func_80413190 - .4byte func_804131C4 + .4byte GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv + .4byte __dt__Q44nw4r3snd6detail9WaveSoundFv + .4byte Shutdown__Q44nw4r3snd6detail9WaveSoundFv + .4byte IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv + .4byte IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv + .4byte DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv + .4byte InitParam__Q44nw4r3snd6detail10BasicSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv + .4byte GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv + .4byte OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv + .4byte UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv + .4byte UpdateParam__Q44nw4r3snd6detail10BasicSoundFv .global lbl_8056E688 @@ -42712,28 +42715,28 @@ lbl_8056E688: # ROM: 0x56A788 .4byte 0 .4byte 0 - .4byte func_80429C40 - .4byte func_8042A5DC - .4byte func_8042A64C - .4byte func_8042A774 - .4byte func_8042B340 - .4byte func_8042B32C - .4byte func_8042B318 + .4byte __dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Start__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Stop__Q44nw4r3snd6detail9WsdPlayerFv + .4byte Pause__Q44nw4r3snd6detail9WsdPlayerFb + .4byte IsActive__Q44nw4r3snd6detail9WsdPlayerCFv + .4byte IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv + .4byte IsPause__Q44nw4r3snd6detail9WsdPlayerCFv .4byte 0 .4byte 0 - .4byte lbl_8042B364 - .4byte lbl_8042B35C - .4byte func_8042B354 + .4byte _180___dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte _180_InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte _180_InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv .4byte 0 .4byte 0 - .4byte lbl_8042B37C - .4byte lbl_8042B374 + .4byte _192___dt__Q44nw4r3snd6detail9WsdPlayerFv + .4byte _192_OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv .4byte OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv - .4byte lbl_8042B36C - .4byte func_8042A838 - .4byte func_8042B314 - .4byte func_8042B300 - .4byte lbl_8042B304 + .4byte _192_OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + .4byte OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + .4byte OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv .global lbl_8056E6E8 @@ -43400,13 +43403,13 @@ lbl_8056EE58: .4byte 0xFFFFFE3C .4byte func_8043FBC4 .4byte func_8043FB68 - .4byte lbl_8043EAD8 + .4byte func_8043EAD8 .4byte func_8043D9E8 .4byte func_8043DD20 .4byte func_8043FB60 .4byte func_8043FB58 .4byte func_8043C9B8 - .4byte lbl_8043EAD0 + .4byte func_8043EAD0 .4byte func_8043EAC8 .global lbl_8056EF28 @@ -43870,7 +43873,7 @@ lbl_8056F438: .4byte func_80039D4C .4byte func_80039D44 .4byte func_80039D40 - .4byte lbl_80447A34 + .4byte func_80447A34 .4byte func_80039E3C .4byte func_80039E38 .4byte func_80447A40 @@ -44987,9 +44990,9 @@ lbl_805701A8: .4byte func_80039E30 .4byte lbl_80666080 .4byte 0xFFFFFE38 - .4byte lbl_804559C4 + .4byte func_804559C4 .4byte func_80166630 - .4byte lbl_804559BC + .4byte func_804559BC .4byte func_804559B4 .4byte func_80455498 .4byte func_80455544 @@ -45355,7 +45358,7 @@ lbl_805706A0: .4byte func_80039D4C .4byte func_80039D44 .4byte func_80039D40 - .4byte lbl_80459AD4 + .4byte func_80459AD4 .4byte func_80039E3C .4byte func_80039E38 .4byte func_80459AE4 @@ -45363,14 +45366,14 @@ lbl_805706A0: .4byte func_80039E30 .4byte lbl_806660B8 .4byte 0xFFFFFE3C - .4byte lbl_80459C80 - .4byte lbl_80459C78 + .4byte func_80459C80 + .4byte func_80459C78 .4byte func_8016662C .4byte func_80448A40 .4byte lbl_806660B8 .4byte 0xFFFFFE38 - .4byte lbl_80459C90 - .4byte lbl_80459C88 + .4byte func_80459C90 + .4byte func_80459C88 .4byte func_80459AD8 .4byte func_80459C74 @@ -46377,7 +46380,7 @@ lbl_805714D8: .4byte func_80482048 .4byte func_80481F9C .4byte func_8048204C - .4byte lbl_80482040 + .4byte func_80482040 .4byte func_80482038 .4byte func_80481F00 @@ -46425,8 +46428,8 @@ lbl_80571550: .4byte func_80482388 .4byte func_80482048 .4byte func_80482288 - .4byte lbl_804823A0 - .4byte lbl_80482040 + .4byte func_804823A0 + .4byte func_80482040 .global lbl_80571570 lbl_80571570: @@ -46445,8 +46448,8 @@ lbl_80571580: .4byte func_80482388 .4byte func_80482048 .4byte func_80482400 - .4byte lbl_804823A0 - .4byte lbl_80482040 + .4byte func_804823A0 + .4byte func_80482040 .global lbl_805715A0 lbl_805715A0: @@ -46509,7 +46512,7 @@ lbl_805715B8: .4byte func_80484914 .4byte 0 .4byte func_8048607C - .4byte lbl_80486074 + .4byte func_80486074 .4byte func_801FCAC0 .4byte func_801FCBEC .4byte func_804830AC @@ -46559,8 +46562,8 @@ lbl_805716C8: .4byte func_8048AB0C .4byte func_800BD638 .4byte func_80487E40 - .4byte lbl_80487E48 - .4byte lbl_80487E50 + .4byte func_80487E48 + .4byte func_80487E50 .4byte func_80487E58 .4byte func_80487EB8 .4byte func_80488FEC @@ -46593,18 +46596,18 @@ lbl_805716C8: .4byte func_80488AAC .4byte lbl_80664DB8 .4byte 0xFFFFEB9C - .4byte lbl_8048BD6C - .4byte lbl_8048BD64 - .4byte lbl_8048BD5C + .4byte func_8048BD6C + .4byte func_8048BD64 + .4byte func_8048BD5C .4byte func_8048BD54 .4byte lbl_80664DB8 .4byte 0xFFFFEB98 - .4byte lbl_8048BD8C - .4byte lbl_8048BD84 + .4byte func_8048BD8C + .4byte func_8048BD84 .4byte ExecCallback_CALC_MAT__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv .4byte ExecCallback_CALC_VIEW__Q34nw4r3g3d15IScnObjCallbackFQ44nw4r3g3d6ScnObj6TimingPQ34nw4r3g3d6ScnObjUlPv - .4byte lbl_8048BD7C - .4byte lbl_8048BD74 + .4byte func_8048BD7C + .4byte func_8048BD74 .4byte func_80489014 .4byte func_8048917C .4byte func_80489200 @@ -46937,11 +46940,11 @@ lbl_80571E10: .4byte func_80043F20 .4byte lbl_806662A0 .4byte 0xFFFFFFAC - .4byte lbl_8048ED1C + .4byte func_8048ED1C .4byte func_80039E28 .4byte func_80039E20 - .4byte lbl_8048ED14 - .4byte lbl_8048ED0C + .4byte func_8048ED14 + .4byte func_8048ED0C .4byte func_80039E0C .4byte func_80039E04 .4byte func_80039DFC @@ -47190,8 +47193,8 @@ lbl_80572118: .4byte func_80496B04 .4byte func_80039E28 .4byte func_80039E20 - .4byte lbl_8048ED14 - .4byte lbl_8048ED0C + .4byte func_8048ED14 + .4byte func_8048ED0C .4byte func_80039E0C .4byte func_80039E04 .4byte func_80039DFC @@ -47348,12 +47351,12 @@ lbl_80572320: .4byte func_8049B9AC .4byte func_8049BEA4 .4byte func_8049BA44 - .4byte lbl_8049BEAC - .4byte lbl_8049BEB4 - .4byte lbl_8049BEBC + .4byte func_8049BEAC + .4byte func_8049BEB4 + .4byte func_8049BEBC .4byte func_8049BED0 .4byte func_8049BEE4 - .4byte lbl_8049BEEC + .4byte func_8049BEEC .4byte func_8049BF0C .4byte func_8049BF34 .4byte func_8049BF5C @@ -47365,9 +47368,9 @@ lbl_80572320: .4byte func_8049C430 .4byte func_8049C314 .4byte func_8049C394 - .4byte lbl_8049C39C - .4byte lbl_8049C3A4 - .4byte lbl_8049C3AC + .4byte func_8049C39C + .4byte func_8049C3A4 + .4byte func_8049C3AC .4byte func_8049C420 .global lbl_80572388 @@ -47544,7 +47547,7 @@ lbl_80572508: .4byte func_80482048 .4byte func_8049F8E4 .4byte func_8048204C - .4byte lbl_80482040 + .4byte func_80482040 .4byte 0 .4byte func_8049EBF0 diff --git a/asm/extab.s b/asm/extab.s index af59f49..83b955c 100644 --- a/asm/extab.s +++ b/asm/extab.s @@ -20202,7 +20202,7 @@ lbl_8001041C: .4byte 0 .4byte 0x8780001E .4byte 0x0000017C - .4byte func_8041DEA4 + .4byte __dt__Q34nw4r3snd18SoundArchivePlayerFv .global lbl_80010438 lbl_80010438: @@ -20334,7 +20334,7 @@ lbl_80010530: .4byte 0 .4byte 0x8780001F .4byte 0x0000002C - .4byte func_804171B4 + .4byte __dt__Q34nw4r3snd18MemorySoundArchiveFv .global lbl_8001054C lbl_8001054C: diff --git a/asm/kyoshin/appgame/cf/code_80039EEC.s b/asm/kyoshin/appgame/cf/code_80039EEC.s index 9f2b995..3ebea73 100644 --- a/asm/kyoshin/appgame/cf/code_80039EEC.s +++ b/asm/kyoshin/appgame/cf/code_80039EEC.s @@ -45,16 +45,16 @@ func_80039F34: func_80039F5C: /* 80039F5C 0000351C 48 11 09 10 */ b func_8014A86C -.global lbl_80039F60 -lbl_80039F60: +.global func_80039F60 +func_80039F60: /* 80039F60 00003520 48 11 09 98 */ b func_8014A8F8 -.global lbl_80039F64 -lbl_80039F64: +.global func_80039F64 +func_80039F64: /* 80039F64 00003524 48 42 35 1C */ b func_8045D480 -.global lbl_80039F68 -lbl_80039F68: +.global func_80039F68 +func_80039F68: /* 80039F68 00003528 48 42 35 94 */ b func_8045D4FC .global func_80039F6C diff --git a/asm/kyoshin/appgame/cf/code_8003A05C.s b/asm/kyoshin/appgame/cf/code_8003A05C.s index 662eb92..dd696de 100644 --- a/asm/kyoshin/appgame/cf/code_8003A05C.s +++ b/asm/kyoshin/appgame/cf/code_8003A05C.s @@ -807,7 +807,7 @@ lbl_80528390: .4byte lbl_804F5CA4 .4byte 0x00000001 .4byte func_80039F5C - .4byte lbl_80039F60 + .4byte func_80039F60 .4byte lbl_80668408 .4byte lbl_804F5CB8 .4byte 0x00000001 @@ -816,8 +816,8 @@ lbl_80528390: .4byte lbl_80668410 .4byte lbl_804F5CD8 .4byte 0x00000001 - .4byte lbl_80039F64 - .4byte lbl_80039F68 + .4byte func_80039F64 + .4byte func_80039F68 .4byte 0 .4byte 0 .4byte 0 diff --git a/asm/kyoshin/appgame/cf/code_80059EB8.s b/asm/kyoshin/appgame/cf/code_80059EB8.s index 9cd8a6a..5baedba 100644 --- a/asm/kyoshin/appgame/cf/code_80059EB8.s +++ b/asm/kyoshin/appgame/cf/code_80059EB8.s @@ -13764,11 +13764,13 @@ func_80065D00: .global func_80065D04 func_80065D04: /* 80065D04 0002F2C4 48 04 21 F8 */ b func_800A7EFC -.global lbl_80065D08 -lbl_80065D08: + +.global func_80065D08 +func_80065D08: /* 80065D08 0002F2C8 48 04 21 F4 */ b func_800A7EFC -.global lbl_80065D0C -lbl_80065D0C: + +.global func_80065D0C +func_80065D0C: /* 80065D0C 0002F2CC 80 64 00 00 */ lwz r3, 0(r4) /* 80065D10 0002F2D0 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b /* 80065D14 0002F2D4 41 82 00 0C */ beq lbl_80065D20 @@ -13805,8 +13807,9 @@ func_80065D64: .global func_80065D74 func_80065D74: /* 80065D74 0002F334 48 04 2F 60 */ b func_800A8CD4 -.global lbl_80065D78 -lbl_80065D78: + +.global func_80065D78 +func_80065D78: /* 80065D78 0002F338 4E 80 00 20 */ blr .global func_80065D7C @@ -13816,14 +13819,17 @@ func_80065D7C: .global func_80065D80 func_80065D80: /* 80065D80 0002F340 48 04 23 BC */ b func_800A813C -.global lbl_80065D84 -lbl_80065D84: + +.global func_80065D84 +func_80065D84: /* 80065D84 0002F344 48 04 22 38 */ b func_800A7FBC -.global lbl_80065D88 -lbl_80065D88: + +.global func_80065D88 +func_80065D88: /* 80065D88 0002F348 48 04 3C 48 */ b func_800A99D0 -.global lbl_80065D8C -lbl_80065D8C: + +.global func_80065D8C +func_80065D8C: /* 80065D8C 0002F34C 4E 80 00 20 */ blr .global func_80065D90 @@ -13948,11 +13954,13 @@ lbl_80065F04: .global func_80065F18 func_80065F18: /* 80065F18 0002F4D8 48 04 3B 78 */ b func_800A9A90 -.global lbl_80065F1C -lbl_80065F1C: + +.global func_80065F1C +func_80065F1C: /* 80065F1C 0002F4DC 48 04 21 60 */ b func_800A807C -.global lbl_80065F20 -lbl_80065F20: + +.global func_80065F20 +func_80065F20: /* 80065F20 0002F4E0 4E 80 00 20 */ blr .global func_80065F24 @@ -18677,7 +18685,7 @@ lbl_8052A2A0: # ROM: 0x5263A0 .4byte lbl_80664370 .4byte 0 - .4byte lbl_80065F1C + .4byte func_80065F1C .4byte func_800689E0 .4byte func_800689A4 .4byte func_800689A0 @@ -18688,7 +18696,7 @@ lbl_8052A2A0: .4byte func_800643C8 .4byte func_800689D0 .4byte func_800689C0 - .4byte lbl_80065F20 + .4byte func_80065F20 .4byte func_80065F24 .4byte func_80065C48 .4byte func_80065C5C @@ -18773,7 +18781,7 @@ lbl_8052A3C0: # ROM: 0x5264C0 .4byte lbl_80664388 .4byte 0 - .4byte lbl_80065D88 + .4byte func_80065D88 .4byte func_800689F8 .4byte func_800689A4 .4byte func_800689A0 @@ -18784,7 +18792,7 @@ lbl_8052A3C0: .4byte func_800643C8 .4byte func_80065E00 .4byte func_800689C0 - .4byte lbl_80065D8C + .4byte func_80065D8C .4byte func_80065D90 .4byte func_80065C48 .4byte func_80065C5C @@ -18805,7 +18813,7 @@ lbl_8052A420: # ROM: 0x526520 .4byte lbl_80664390 .4byte 0 - .4byte lbl_80065D84 + .4byte func_80065D84 .4byte func_80068A00 .4byte func_800689A4 .4byte func_800689A0 @@ -18880,7 +18888,7 @@ lbl_8052A4E0: .4byte func_800643C8 .4byte func_800689D0 .4byte func_800689C0 - .4byte lbl_80065D78 + .4byte func_80065D78 .4byte func_80065D7C .4byte func_80065C48 .4byte func_80065C5C @@ -18901,7 +18909,7 @@ lbl_8052A540: # ROM: 0x526640 .4byte lbl_806643A8 .4byte 0 - .4byte lbl_80065D08 + .4byte func_80065D08 .4byte func_80068A18 .4byte func_800689A4 .4byte func_800689A0 @@ -18915,7 +18923,7 @@ lbl_8052A540: .4byte func_80063C2C .4byte func_80063C78 .4byte func_80065C48 - .4byte lbl_80065D0C + .4byte func_80065D0C .4byte func_80065C80 .4byte func_80065D64 .4byte func_80068990 diff --git a/asm/kyoshin/appgame/cf/code_80069710.s b/asm/kyoshin/appgame/cf/code_80069710.s index bd2e09b..01161e2 100644 --- a/asm/kyoshin/appgame/cf/code_80069710.s +++ b/asm/kyoshin/appgame/cf/code_80069710.s @@ -75,8 +75,9 @@ func_800697CC: .global func_800697E0 func_800697E0: /* 800697E0 00032DA0 48 01 64 1C */ b func_8007FBFC -.global lbl_800697E4 -lbl_800697E4: + +.global func_800697E4 +func_800697E4: /* 800697E4 00032DA4 48 01 64 48 */ b func_8007FC2C .global func_800697E8 diff --git a/asm/kyoshin/appgame/cf/code_8006A960.s b/asm/kyoshin/appgame/cf/code_8006A960.s index d6daec0..2fbd974 100644 --- a/asm/kyoshin/appgame/cf/code_8006A960.s +++ b/asm/kyoshin/appgame/cf/code_8006A960.s @@ -8158,8 +8158,9 @@ lbl_80071B44: func_80071B6C: /* 80071B6C 0003B12C D0 23 01 E0 */ stfs f1, 0x1e0(r3) /* 80071B70 0003B130 48 42 CF F0 */ b func_8049EB60 -.global lbl_80071B74 -lbl_80071B74: + +.global func_80071B74 +func_80071B74: /* 80071B74 0003B134 4E 80 00 20 */ blr .global func_80071B78 diff --git a/asm/kyoshin/appgame/cf/code_8007C0F8.s b/asm/kyoshin/appgame/cf/code_8007C0F8.s index 14a76bd..b39fde1 100644 --- a/asm/kyoshin/appgame/cf/code_8007C0F8.s +++ b/asm/kyoshin/appgame/cf/code_8007C0F8.s @@ -12540,8 +12540,9 @@ func_80086B44: .global func_80086B48 func_80086B48: /* 80086B48 00050108 4B FE 33 58 */ b func_80069EA0 -.global lbl_80086B4C -lbl_80086B4C: + +.global func_80086B4C +func_80086B4C: /* 80086B4C 0005010C 80 03 00 08 */ lwz r0, 8(r3) /* 80086B50 00050110 7C 00 20 78 */ andc r0, r0, r4 /* 80086B54 00050114 90 03 00 08 */ stw r0, 8(r3) diff --git a/asm/kyoshin/appgame/cf/code_8008753C.s b/asm/kyoshin/appgame/cf/code_8008753C.s index 5c7474c..698af4e 100644 --- a/asm/kyoshin/appgame/cf/code_8008753C.s +++ b/asm/kyoshin/appgame/cf/code_8008753C.s @@ -1347,20 +1347,24 @@ func_8008884C: /* 8008884C 00051E0C C0 22 8A 98 */ lfs f1, lbl_80668E18@sda21(r2) /* 80088850 00051E10 38 63 00 84 */ addi r3, r3, 0x84 /* 80088854 00051E14 48 00 11 6C */ b func_800899C0 -.global lbl_80088858 -lbl_80088858: + +.global func_80088858 +func_80088858: /* 80088858 00051E18 38 63 00 84 */ addi r3, r3, 0x84 /* 8008885C 00051E1C 48 00 12 C8 */ b func_80089B24 -.global lbl_80088860 -lbl_80088860: + +.global func_80088860 +func_80088860: /* 80088860 00051E20 38 63 00 84 */ addi r3, r3, 0x84 /* 80088864 00051E24 48 00 16 24 */ b func_80089E88 -.global lbl_80088868 -lbl_80088868: + +.global func_80088868 +func_80088868: /* 80088868 00051E28 38 63 00 84 */ addi r3, r3, 0x84 /* 8008886C 00051E2C 48 00 16 FC */ b func_80089F68 -.global lbl_80088870 -lbl_80088870: + +.global func_80088870 +func_80088870: /* 80088870 00051E30 38 60 00 00 */ li r3, 0 /* 80088874 00051E34 4E 80 00 20 */ blr diff --git a/asm/kyoshin/appgame/cf/code_8008A104.s b/asm/kyoshin/appgame/cf/code_8008A104.s index 3450005..69e10e6 100644 --- a/asm/kyoshin/appgame/cf/code_8008A104.s +++ b/asm/kyoshin/appgame/cf/code_8008A104.s @@ -15965,16 +15965,19 @@ func_800987EC: /* 800987EC 00061DAC C0 22 8C 30 */ lfs f1, lbl_80668FB0@sda21(r2) /* 800987F0 00061DB0 38 63 00 8C */ addi r3, r3, 0x8c /* 800987F4 00061DB4 4B FF 11 CC */ b func_800899C0 -.global lbl_800987F8 -lbl_800987F8: + +.global func_800987F8 +func_800987F8: /* 800987F8 00061DB8 38 63 00 8C */ addi r3, r3, 0x8c /* 800987FC 00061DBC 4B FF 13 28 */ b func_80089B24 -.global lbl_80098800 -lbl_80098800: + +.global func_80098800 +func_80098800: /* 80098800 00061DC0 38 63 00 8C */ addi r3, r3, 0x8c /* 80098804 00061DC4 4B FF 16 84 */ b func_80089E88 -.global lbl_80098808 -lbl_80098808: + +.global func_80098808 +func_80098808: /* 80098808 00061DC8 38 63 00 8C */ addi r3, r3, 0x8c /* 8009880C 00061DCC 4B FF 17 5C */ b func_80089F68 diff --git a/asm/kyoshin/appgame/cf/code_800AB3D0.s b/asm/kyoshin/appgame/cf/code_800AB3D0.s index 19c2495..7169ba0 100644 --- a/asm/kyoshin/appgame/cf/code_800AB3D0.s +++ b/asm/kyoshin/appgame/cf/code_800AB3D0.s @@ -6186,56 +6186,69 @@ func_800B062C: func_800B0634: /* 800B0634 00079BF4 38 63 FF F8 */ addi r3, r3, -8 /* 800B0638 00079BF8 48 0C 10 80 */ b func_801716B8 -.global lbl_800B063C -lbl_800B063C: + +.global func_800B063C +func_800B063C: /* 800B063C 00079BFC 38 63 FF F8 */ addi r3, r3, -8 /* 800B0640 00079C00 48 0C 0F 68 */ b func_801715A8 -.global lbl_800B0644 -lbl_800B0644: + +.global func_800B0644 +func_800B0644: /* 800B0644 00079C04 38 63 FF F8 */ addi r3, r3, -8 /* 800B0648 00079C08 48 0B F8 C4 */ b func_8016FF0C -.global lbl_800B064C -lbl_800B064C: + +.global func_800B064C +func_800B064C: /* 800B064C 00079C0C 38 63 FF F8 */ addi r3, r3, -8 /* 800B0650 00079C10 4B FF F4 B0 */ b func_800AFB00 -.global lbl_800B0654 -lbl_800B0654: + +.global func_800B0654 +func_800B0654: /* 800B0654 00079C14 38 63 FF F8 */ addi r3, r3, -8 /* 800B0658 00079C18 4B FF F4 A4 */ b func_800AFAFC -.global lbl_800B065C -lbl_800B065C: + +.global func_800B065C +func_800B065C: /* 800B065C 00079C1C 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0660 00079C20 4B FF D7 48 */ b func_800ADDA8 -.global lbl_800B0664 -lbl_800B0664: + +.global func_800B0664 +func_800B0664: /* 800B0664 00079C24 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0668 00079C28 48 0C 1D C4 */ b func_8017242C -.global lbl_800B066C -lbl_800B066C: + +.global func_800B066C +func_800B066C: /* 800B066C 00079C2C 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0670 00079C30 4B FF D4 BC */ b func_800ADB2C -.global lbl_800B0674 -lbl_800B0674: + +.global func_800B0674 +func_800B0674: /* 800B0674 00079C34 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0678 00079C38 4B FF F4 7C */ b func_800AFAF4 -.global lbl_800B067C -lbl_800B067C: + +.global func_800B067C +func_800B067C: /* 800B067C 00079C3C 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0680 00079C40 48 0B F8 8C */ b func_8016FF0C -.global lbl_800B0684 -lbl_800B0684: + +.global func_800B0684 +func_800B0684: /* 800B0684 00079C44 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0688 00079C48 48 0C 1F 38 */ b func_801725C0 -.global lbl_800B068C -lbl_800B068C: + +.global func_800B068C +func_800B068C: /* 800B068C 00079C4C 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0690 00079C50 48 0C 1E 98 */ b func_80172528 -.global lbl_800B0694 -lbl_800B0694: + +.global func_800B0694 +func_800B0694: /* 800B0694 00079C54 38 63 C1 64 */ addi r3, r3, -16028 /* 800B0698 00079C58 4B FF D5 3C */ b func_800ADBD4 -.global lbl_800B069C -lbl_800B069C: + +.global func_800B069C +func_800B069C: /* 800B069C 00079C5C 38 63 C1 64 */ addi r3, r3, -16028 /* 800B06A0 00079C60 4B FF D3 B4 */ b func_800ADA54 diff --git a/asm/kyoshin/appgame/cf/code_800B9C14.s b/asm/kyoshin/appgame/cf/code_800B9C14.s index 99f6b04..a4d25c6 100644 --- a/asm/kyoshin/appgame/cf/code_800B9C14.s +++ b/asm/kyoshin/appgame/cf/code_800B9C14.s @@ -8720,28 +8720,34 @@ lbl_800C11DC: func_800C11F0: /* 800C11F0 0008A7B0 38 63 C1 64 */ addi r3, r3, -16028 /* 800C11F4 0008A7B4 4B FF EE CC */ b func_800C00C0 -.global lbl_800C11F8 -lbl_800C11F8: + +.global func_800C11F8 +func_800C11F8: /* 800C11F8 0008A7B8 38 63 C1 64 */ addi r3, r3, -16028 /* 800C11FC 0008A7BC 4B FF EE 84 */ b func_800C0080 -.global lbl_800C1200 -lbl_800C1200: + +.global func_800C1200 +func_800C1200: /* 800C1200 0008A7C0 38 63 C1 64 */ addi r3, r3, -16028 /* 800C1204 0008A7C4 4B FF ED 1C */ b func_800BFF20 -.global lbl_800C1208 -lbl_800C1208: + +.global func_800C1208 +func_800C1208: /* 800C1208 0008A7C8 38 63 C1 64 */ addi r3, r3, -16028 /* 800C120C 0008A7CC 4B FF FF C0 */ b func_800C11CC -.global lbl_800C1210 -lbl_800C1210: + +.global func_800C1210 +func_800C1210: /* 800C1210 0008A7D0 38 63 C1 64 */ addi r3, r3, -16028 /* 800C1214 0008A7D4 4B FF ED D8 */ b func_800BFFEC -.global lbl_800C1218 -lbl_800C1218: + +.global func_800C1218 +func_800C1218: /* 800C1218 0008A7D8 38 63 C1 64 */ addi r3, r3, -16028 /* 800C121C 0008A7DC 4B FF F3 08 */ b func_800C0524 -.global lbl_800C1220 -lbl_800C1220: + +.global func_800C1220 +func_800C1220: /* 800C1220 0008A7E0 38 63 C1 64 */ addi r3, r3, -16028 /* 800C1224 0008A7E4 4B FF EB 04 */ b func_800BFD28 diff --git a/asm/kyoshin/appgame/cf/code_800C2C90.s b/asm/kyoshin/appgame/cf/code_800C2C90.s index 5283a88..4146c36 100644 --- a/asm/kyoshin/appgame/cf/code_800C2C90.s +++ b/asm/kyoshin/appgame/cf/code_800C2C90.s @@ -3125,16 +3125,19 @@ func_800C5970: func_800C5978: /* 800C5978 0008EF38 38 63 FF F4 */ addi r3, r3, -12 /* 800C597C 0008EF3C 48 00 15 44 */ b func_800C6EC0 -.global lbl_800C5980 -lbl_800C5980: + +.global func_800C5980 +func_800C5980: /* 800C5980 0008EF40 38 63 FF F4 */ addi r3, r3, -12 /* 800C5984 0008EF44 4B FF FF A8 */ b func_800C592C -.global lbl_800C5988 -lbl_800C5988: + +.global func_800C5988 +func_800C5988: /* 800C5988 0008EF48 38 63 FF F0 */ addi r3, r3, -16 /* 800C598C 0008EF4C 48 00 A6 14 */ b func_800CFFA0 -.global lbl_800C5990 -lbl_800C5990: + +.global func_800C5990 +func_800C5990: /* 800C5990 0008EF50 38 63 FF F0 */ addi r3, r3, -16 /* 800C5994 0008EF54 4B FF FF 98 */ b func_800C592C @@ -8350,8 +8353,9 @@ func_800CA580: /* 800CA580 00093B40 38 A0 00 01 */ li r5, 1 /* 800CA584 00093B44 38 63 03 68 */ addi r3, r3, 0x368 /* 800CA588 00093B48 48 0C 8B 18 */ b func_801930A0 -.global lbl_800CA58C -lbl_800CA58C: + +.global func_800CA58C +func_800CA58C: /* 800CA58C 00093B4C 4E 80 00 20 */ blr .global func_800CA590 @@ -8448,12 +8452,14 @@ lbl_800CA6B0: func_800CA6CC: /* 800CA6CC 00093C8C 38 63 FF F4 */ addi r3, r3, -12 /* 800CA6D0 00093C90 48 00 47 58 */ b func_800CEE28 -.global lbl_800CA6D4 -lbl_800CA6D4: + +.global func_800CA6D4 +func_800CA6D4: /* 800CA6D4 00093C94 38 63 FF F4 */ addi r3, r3, -12 /* 800CA6D8 00093C98 4B FF FF 98 */ b func_800CA670 -.global lbl_800CA6DC -lbl_800CA6DC: + +.global func_800CA6DC +func_800CA6DC: /* 800CA6DC 00093C9C 38 63 FF F0 */ addi r3, r3, -16 /* 800CA6E0 00093CA0 4B FF FF 90 */ b func_800CA670 @@ -15480,8 +15486,9 @@ lbl_800D0AE8: .global func_800D0AFC func_800D0AFC: /* 800D0AFC 0009A0BC 4B FF DA 48 */ b func_800CE544 -.global lbl_800D0B00 -lbl_800D0B00: + +.global func_800D0B00 +func_800D0B00: /* 800D0B00 0009A0C0 4B FF DF 34 */ b func_800CEA34 .global func_800D0B04 @@ -15883,20 +15890,24 @@ lbl_800D109C: func_800D10B4: /* 800D10B4 0009A674 38 63 FF F4 */ addi r3, r3, -12 /* 800D10B8 0009A678 4B FF F9 A0 */ b func_800D0A58 -.global lbl_800D10BC -lbl_800D10BC: + +.global func_800D10BC +func_800D10BC: /* 800D10BC 0009A67C 38 63 FF F4 */ addi r3, r3, -12 /* 800D10C0 0009A680 4B FF FF B4 */ b func_800D1074 -.global lbl_800D10C4 -lbl_800D10C4: + +.global func_800D10C4 +func_800D10C4: /* 800D10C4 0009A684 38 63 FF F0 */ addi r3, r3, -16 /* 800D10C8 0009A688 4B FF FF AC */ b func_800D1074 -.global lbl_800D10CC -lbl_800D10CC: + +.global func_800D10CC +func_800D10CC: /* 800D10CC 0009A68C 38 63 FF 98 */ addi r3, r3, -104 /* 800D10D0 0009A690 4B FF FF 50 */ b func_800D1020 -.global lbl_800D10D4 -lbl_800D10D4: + +.global func_800D10D4 +func_800D10D4: /* 800D10D4 0009A694 38 63 FF 98 */ addi r3, r3, -104 /* 800D10D8 0009A698 4B FF FF 9C */ b func_800D1074 diff --git a/asm/kyoshin/appgame/cf/code_800D7A04.s b/asm/kyoshin/appgame/cf/code_800D7A04.s index 8b72933..742ab18 100644 --- a/asm/kyoshin/appgame/cf/code_800D7A04.s +++ b/asm/kyoshin/appgame/cf/code_800D7A04.s @@ -21071,8 +21071,9 @@ func_800EA460: /* 800EA464 000B3A24 90 83 00 8C */ stw r4, 0x8c(r3) /* 800EA468 000B3A28 D0 23 00 90 */ stfs f1, 0x90(r3) /* 800EA46C 000B3A2C 48 00 00 18 */ b func_800EA484 -.global lbl_800EA470 -lbl_800EA470: + +.global func_800EA470 +func_800EA470: /* 800EA470 000B3A30 C0 02 93 24 */ lfs f0, lbl_806696A4@sda21(r2) /* 800EA474 000B3A34 D0 03 00 88 */ stfs f0, 0x88(r3) /* 800EA478 000B3A38 C0 22 93 1C */ lfs f1, lbl_8066969C@sda21(r2) @@ -42683,8 +42684,9 @@ func_800FD68C: func_800FD698: /* 800FD698 000C6C58 38 63 F9 FC */ addi r3, r3, -1540 /* 800FD69C 000C6C5C 4B FF FF F0 */ b func_800FD68C -.global lbl_800FD6A0 -lbl_800FD6A0: + +.global func_800FD6A0 +func_800FD6A0: /* 800FD6A0 000C6C60 38 63 F9 FC */ addi r3, r3, -1540 /* 800FD6A4 000C6C64 4B FF 70 F4 */ b func_800F4798 diff --git a/asm/kyoshin/appgame/cf/code_800FEB84.s b/asm/kyoshin/appgame/cf/code_800FEB84.s index 9f9e4f5..8f900b1 100644 --- a/asm/kyoshin/appgame/cf/code_800FEB84.s +++ b/asm/kyoshin/appgame/cf/code_800FEB84.s @@ -3643,16 +3643,19 @@ lbl_80101FEC: func_80102000: /* 80102000 000CB5C0 38 63 FF A8 */ addi r3, r3, -88 /* 80102004 000CB5C4 4B FF D2 FC */ b func_800FF300 -.global lbl_80102008 -lbl_80102008: + +.global func_80102008 +func_80102008: /* 80102008 000CB5C8 38 63 FF A8 */ addi r3, r3, -88 /* 8010200C 000CB5CC 4B FF CD 5C */ b func_800FED68 -.global lbl_80102010 -lbl_80102010: + +.global func_80102010 +func_80102010: /* 80102010 000CB5D0 38 63 FF A4 */ addi r3, r3, -92 /* 80102014 000CB5D4 4B FF D5 F0 */ b func_800FF604 -.global lbl_80102018 -lbl_80102018: + +.global func_80102018 +func_80102018: /* 80102018 000CB5D8 38 63 FF A4 */ addi r3, r3, -92 /* 8010201C 000CB5DC 4B FF CD 4C */ b func_800FED68 diff --git a/asm/kyoshin/appgame/cf/code_8011C44C.s b/asm/kyoshin/appgame/cf/code_8011C44C.s index a074364..56b5acd 100644 --- a/asm/kyoshin/appgame/cf/code_8011C44C.s +++ b/asm/kyoshin/appgame/cf/code_8011C44C.s @@ -10661,8 +10661,9 @@ lbl_80125AD8: lbl_80125AF8: /* 80125AF8 000EF0B8 38 C6 00 0C */ addi r6, r6, 0xc /* 80125AFC 000EF0BC 4B FF FF C8 */ b lbl_80125AC4 -.global lbl_80125B00 -lbl_80125B00: + +.global func_80125B00 +func_80125B00: /* 80125B00 000EF0C0 38 60 00 00 */ li r3, 0 /* 80125B04 000EF0C4 4E 80 00 20 */ blr @@ -10689,8 +10690,9 @@ lbl_80125B28: lbl_80125B48: /* 80125B48 000EF108 38 E7 00 0C */ addi r7, r7, 0xc /* 80125B4C 000EF10C 4B FF FF C8 */ b lbl_80125B14 -.global lbl_80125B50 -lbl_80125B50: + +.global func_80125B50 +func_80125B50: /* 80125B50 000EF110 38 60 00 00 */ li r3, 0 /* 80125B54 000EF114 4E 80 00 20 */ blr diff --git a/asm/kyoshin/appgame/cf/code_80155660.s b/asm/kyoshin/appgame/cf/code_80155660.s index db70eef..5814748 100644 --- a/asm/kyoshin/appgame/cf/code_80155660.s +++ b/asm/kyoshin/appgame/cf/code_80155660.s @@ -1793,8 +1793,9 @@ lbl_80156EF0: /* 80156F00 001204C0 54 05 DD 7E */ rlwinm r5, r0, 0x1b, 0x15, 0x1f /* 80156F04 001204C4 54 07 F7 7E */ rlwinm r7, r0, 0x1e, 0x1d, 0x1f /* 80156F08 001204C8 4B FF E9 AC */ b func_801558B4 -.global lbl_80156F0C -lbl_80156F0C: + +.global func_80156F0C +func_80156F0C: /* 80156F0C 001204CC 80 04 00 00 */ lwz r0, 0(r4) /* 80156F10 001204D0 50 A0 16 FA */ rlwimi r0, r5, 2, 0x1b, 0x1d /* 80156F14 001204D4 90 04 00 00 */ stw r0, 0(r4) @@ -1804,8 +1805,9 @@ lbl_80156F0C: /* 80156F24 001204E4 54 07 F7 7E */ rlwinm r7, r0, 0x1e, 0x1d, 0x1f /* 80156F28 001204E8 38 C0 00 00 */ li r6, 0 /* 80156F2C 001204EC 4B FF E9 88 */ b func_801558B4 -.global lbl_80156F30 -lbl_80156F30: + +.global func_80156F30 +func_80156F30: /* 80156F30 001204F0 80 04 00 00 */ lwz r0, 0(r4) /* 80156F34 001204F4 50 A0 2C 34 */ rlwimi r0, r5, 5, 0x10, 0x1a /* 80156F38 001204F8 90 04 00 00 */ stw r0, 0(r4) diff --git a/asm/kyoshin/appgame/cf/code_8015BAA8.s b/asm/kyoshin/appgame/cf/code_8015BAA8.s index 57dc55b..6dc1254 100644 --- a/asm/kyoshin/appgame/cf/code_8015BAA8.s +++ b/asm/kyoshin/appgame/cf/code_8015BAA8.s @@ -9311,40 +9311,49 @@ lbl_801640BC: func_801640D0: /* 801640D0 0012D690 38 63 FF 94 */ addi r3, r3, -108 /* 801640D4 0012D694 4B FF 90 00 */ b func_8015D0D4 -.global lbl_801640D8 -lbl_801640D8: + +.global func_801640D8 +func_801640D8: /* 801640D8 0012D698 38 63 FF 94 */ addi r3, r3, -108 /* 801640DC 0012D69C 4B FF 9A 2C */ b func_8015DB08 -.global lbl_801640E0 -lbl_801640E0: + +.global func_801640E0 +func_801640E0: /* 801640E0 0012D6A0 38 63 FF 94 */ addi r3, r3, -108 /* 801640E4 0012D6A4 4B FF 94 B0 */ b func_8015D594 -.global lbl_801640E8 -lbl_801640E8: + +.global func_801640E8 +func_801640E8: /* 801640E8 0012D6A8 38 63 FF 90 */ addi r3, r3, -112 /* 801640EC 0012D6AC 4B FF 9B 18 */ b func_8015DC04 -.global lbl_801640F0 -lbl_801640F0: + +.global func_801640F0 +func_801640F0: /* 801640F0 0012D6B0 38 63 FF 90 */ addi r3, r3, -112 /* 801640F4 0012D6B4 4B FF 94 A0 */ b func_8015D594 -.global lbl_801640F8 -lbl_801640F8: + +.global func_801640F8 +func_801640F8: /* 801640F8 0012D6B8 38 63 FF 94 */ addi r3, r3, -108 /* 801640FC 0012D6BC 4B FF C0 1C */ b func_80160118 -.global lbl_80164100 -lbl_80164100: + +.global func_80164100 +func_80164100: /* 80164100 0012D6C0 38 63 FF 94 */ addi r3, r3, -108 /* 80164104 0012D6C4 4B FF AA B0 */ b func_8015EBB4 -.global lbl_80164108 -lbl_80164108: + +.global func_80164108 +func_80164108: /* 80164108 0012D6C8 38 63 FF 90 */ addi r3, r3, -112 /* 8016410C 0012D6CC 4B FF C1 08 */ b func_80160214 -.global lbl_80164110 -lbl_80164110: + +.global func_80164110 +func_80164110: /* 80164110 0012D6D0 38 63 FF 90 */ addi r3, r3, -112 /* 80164114 0012D6D4 4B FF AA A0 */ b func_8015EBB4 -.global lbl_80164118 -lbl_80164118: + +.global func_80164118 +func_80164118: /* 80164118 0012D6D8 38 63 FF 94 */ addi r3, r3, -108 /* 8016411C 0012D6DC 4B FF FB EC */ b func_80163D08 @@ -12096,32 +12105,39 @@ lbl_801666B0: func_801666C4: /* 801666C4 0012FC84 38 63 FF AC */ addi r3, r3, -84 /* 801666C8 0012FC88 4B FF FC 20 */ b func_801662E8 -.global lbl_801666CC -lbl_801666CC: + +.global func_801666CC +func_801666CC: /* 801666CC 0012FC8C 38 63 FF AC */ addi r3, r3, -84 /* 801666D0 0012FC90 4B FF DC 44 */ b func_80164314 -.global lbl_801666D4 -lbl_801666D4: + +.global func_801666D4 +func_801666D4: /* 801666D4 0012FC94 38 63 FF A8 */ addi r3, r3, -88 /* 801666D8 0012FC98 4B FF DE 00 */ b func_801644D8 -.global lbl_801666DC -lbl_801666DC: + +.global func_801666DC +func_801666DC: /* 801666DC 0012FC9C 38 63 FF A8 */ addi r3, r3, -88 /* 801666E0 0012FCA0 4B FF DC 34 */ b func_80164314 -.global lbl_801666E4 -lbl_801666E4: + +.global func_801666E4 +func_801666E4: /* 801666E4 0012FCA4 38 63 FF A4 */ addi r3, r3, -92 /* 801666E8 0012FCA8 4B FF FB 68 */ b func_80166250 -.global lbl_801666EC -lbl_801666EC: + +.global func_801666EC +func_801666EC: /* 801666EC 0012FCAC 38 63 FF A4 */ addi r3, r3, -92 /* 801666F0 0012FCB0 4B FF DC 24 */ b func_80164314 -.global lbl_801666F4 -lbl_801666F4: + +.global func_801666F4 +func_801666F4: /* 801666F4 0012FCB4 38 63 FF A0 */ addi r3, r3, -96 /* 801666F8 0012FCB8 4B FF FC B0 */ b func_801663A8 -.global lbl_801666FC -lbl_801666FC: + +.global func_801666FC +func_801666FC: /* 801666FC 0012FCBC 38 63 FF A0 */ addi r3, r3, -96 /* 80166700 0012FCC0 4B FF DC 14 */ b func_80164314 @@ -19304,7 +19320,7 @@ func_8016C888: /* 8016C91C 00135EDC 2C 03 00 00 */ cmpwi r3, 0 /* 8016C920 00135EE0 41 82 00 0C */ beq lbl_8016C92C /* 8016C924 00135EE4 7F E4 FB 78 */ mr r4, r31 -/* 8016C928 00135EE8 48 2A 6E 31 */ bl func_80413758 +/* 8016C928 00135EE8 48 2A 6E 31 */ bl SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi lbl_8016C92C: /* 8016C92C 00135EEC 80 01 00 34 */ lwz r0, 0x34(r1) /* 8016C930 00135EF0 CB E1 00 28 */ lfd f31, 0x28(r1) @@ -19850,7 +19866,7 @@ lbl_8016D048: /* 8016D088 00136648 2C 03 00 00 */ cmpwi r3, 0 /* 8016D08C 0013664C 41 82 00 0C */ beq lbl_8016D098 /* 8016D090 00136650 7F C4 F3 78 */ mr r4, r30 -/* 8016D094 00136654 48 2A 66 C5 */ bl func_80413758 +/* 8016D094 00136654 48 2A 66 C5 */ bl SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi lbl_8016D098: /* 8016D098 00136658 80 01 00 34 */ lwz r0, 0x34(r1) /* 8016D09C 0013665C CB E1 00 28 */ lfd f31, 0x28(r1) diff --git a/asm/kyoshin/appgame/cf/code_8016ED50.s b/asm/kyoshin/appgame/cf/code_8016ED50.s index 2ce3605..e4b9136 100644 --- a/asm/kyoshin/appgame/cf/code_8016ED50.s +++ b/asm/kyoshin/appgame/cf/code_8016ED50.s @@ -5269,8 +5269,9 @@ lbl_8017386C: func_80173894: /* 80173894 0013CE54 38 C0 00 00 */ li r6, 0 /* 80173898 0013CE58 4B FF FB 28 */ b func_801733C0 -.global lbl_8017389C -lbl_8017389C: + +.global func_8017389C +func_8017389C: /* 8017389C 0013CE5C 80 6D A8 30 */ lwz r3, lbl_806669B0@sda21(r13) /* 801738A0 0013CE60 4E 80 00 20 */ blr @@ -17838,20 +17839,24 @@ func_8017ED64: func_8017ED6C: /* 8017ED6C 0014832C 38 63 FF F8 */ addi r3, r3, -8 /* 8017ED70 00148330 4B FF E3 08 */ b func_8017D078 -.global lbl_8017ED74 -lbl_8017ED74: + +.global func_8017ED74 +func_8017ED74: /* 8017ED74 00148334 38 63 FF F8 */ addi r3, r3, -8 /* 8017ED78 00148338 4B FF E1 FC */ b func_8017CF74 -.global lbl_8017ED7C -lbl_8017ED7C: + +.global func_8017ED7C +func_8017ED7C: /* 8017ED7C 0014833C 38 63 FF F8 */ addi r3, r3, -8 /* 8017ED80 00148340 4B FF 78 10 */ b func_80176590 -.global lbl_8017ED84 -lbl_8017ED84: + +.global func_8017ED84 +func_8017ED84: /* 8017ED84 00148344 38 63 FF F8 */ addi r3, r3, -8 /* 8017ED88 00148348 4B FF 7D 60 */ b func_80176AE8 -.global lbl_8017ED8C -lbl_8017ED8C: + +.global func_8017ED8C +func_8017ED8C: /* 8017ED8C 0014834C 38 63 FF F8 */ addi r3, r3, -8 /* 8017ED90 00148350 4B FD 67 44 */ b func_801554D4 @@ -25436,8 +25441,9 @@ func_80185748: .global func_80185754 func_80185754: /* 80185754 0014ED14 4B FE 28 A8 */ b func_80167FFC -.global lbl_80185758 -lbl_80185758: + +.global func_80185758 +func_80185758: /* 80185758 0014ED18 38 60 00 00 */ li r3, 0 /* 8018575C 0014ED1C 4E 80 00 20 */ blr diff --git a/asm/kyoshin/appgame/cf/code_80189DE8.s b/asm/kyoshin/appgame/cf/code_80189DE8.s index 1055998..e1c2120 100644 --- a/asm/kyoshin/appgame/cf/code_80189DE8.s +++ b/asm/kyoshin/appgame/cf/code_80189DE8.s @@ -3422,7 +3422,7 @@ lbl_8018CE04: /* 8018CE44 00156404 2C 03 00 00 */ cmpwi r3, 0 /* 8018CE48 00156408 41 82 00 0C */ beq lbl_8018CE54 /* 8018CE4C 0015640C 7F A4 EB 78 */ mr r4, r29 -/* 8018CE50 00156410 48 28 69 09 */ bl func_80413758 +/* 8018CE50 00156410 48 28 69 09 */ bl SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi lbl_8018CE54: /* 8018CE54 00156414 CB E1 00 28 */ lfd f31, 0x28(r1) /* 8018CE58 00156418 CB C1 00 20 */ lfd f30, 0x20(r1) diff --git a/asm/kyoshin/appgame/cf/code_801A30D8.s b/asm/kyoshin/appgame/cf/code_801A30D8.s index e6e7499..ec28dd6 100644 --- a/asm/kyoshin/appgame/cf/code_801A30D8.s +++ b/asm/kyoshin/appgame/cf/code_801A30D8.s @@ -7397,7 +7397,7 @@ lbl_801A9AA8: /* 801A9AD4 00173094 2C 03 00 00 */ cmpwi r3, 0 /* 801A9AD8 00173098 41 82 00 0C */ beq lbl_801A9AE4 /* 801A9ADC 0017309C 38 80 00 50 */ li r4, 0x50 -/* 801A9AE0 001730A0 48 26 9C 79 */ bl func_80413758 +/* 801A9AE0 001730A0 48 26 9C 79 */ bl SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi lbl_801A9AE4: /* 801A9AE4 001730A4 A0 1C 00 2C */ lhz r0, 0x2c(r28) /* 801A9AE8 001730A8 28 00 FF FF */ cmplwi r0, 0xffff diff --git a/asm/kyoshin/appgame/cf/code_801AFE1C.s b/asm/kyoshin/appgame/cf/code_801AFE1C.s index 457bcbf..fb81d14 100644 --- a/asm/kyoshin/appgame/cf/code_801AFE1C.s +++ b/asm/kyoshin/appgame/cf/code_801AFE1C.s @@ -2753,16 +2753,19 @@ lbl_801B2510: func_801B2544: /* 801B2544 0017BB04 38 63 FF FC */ addi r3, r3, -4 /* 801B2548 0017BB08 4B FF FC 98 */ b func_801B21E0 -.global lbl_801B254C -lbl_801B254C: + +.global func_801B254C +func_801B254C: /* 801B254C 0017BB0C 38 63 FF FC */ addi r3, r3, -4 /* 801B2550 0017BB10 4B FF FD C8 */ b func_801B2318 -.global lbl_801B2554 -lbl_801B2554: + +.global func_801B2554 +func_801B2554: /* 801B2554 0017BB14 38 63 FF FC */ addi r3, r3, -4 /* 801B2558 0017BB18 4B FF FB 70 */ b func_801B20C8 -.global lbl_801B255C -lbl_801B255C: + +.global func_801B255C +func_801B255C: /* 801B255C 0017BB1C 38 63 FF FC */ addi r3, r3, -4 /* 801B2560 0017BB20 4B FF F4 14 */ b func_801B1974 @@ -11319,15 +11322,18 @@ sinit_801B9FC8: func_801BA12C: /* 801BA12C 001836EC 38 63 FF 94 */ addi r3, r3, -108 /* 801BA130 001836F0 4B FF A4 70 */ b func_801B45A0 -.global lbl_801BA134 -lbl_801BA134: + +.global func_801BA134 +func_801BA134: /* 801BA134 001836F4 38 63 FF 94 */ addi r3, r3, -108 /* 801BA138 001836F8 4B FF 88 1C */ b func_801B2954 -.global lbl_801BA13C -lbl_801BA13C: + +.global func_801BA13C +func_801BA13C: /* 801BA13C 001836FC 38 63 FF 90 */ addi r3, r3, -112 /* 801BA140 00183700 4B FF A4 F8 */ b func_801B4638 -.global lbl_801BA144 -lbl_801BA144: + +.global func_801BA144 +func_801BA144: /* 801BA144 00183704 38 63 FF 90 */ addi r3, r3, -112 /* 801BA148 00183708 4B FF 88 0C */ b func_801B2954 diff --git a/asm/kyoshin/appgame/cf/code_801BCA38.s b/asm/kyoshin/appgame/cf/code_801BCA38.s index 80fbb2b..446b9ed 100644 --- a/asm/kyoshin/appgame/cf/code_801BCA38.s +++ b/asm/kyoshin/appgame/cf/code_801BCA38.s @@ -3242,10 +3242,10 @@ func_801BF80C: /* 801BF82C 00188DEC 41 82 00 2C */ beq lbl_801BF858 /* 801BF830 00188DF0 38 80 FF FF */ li r4, -1 /* 801BF834 00188DF4 38 63 01 7C */ addi r3, r3, 0x17c -/* 801BF838 00188DF8 48 25 E6 6D */ bl func_8041DEA4 +/* 801BF838 00188DF8 48 25 E6 6D */ bl __dt__Q34nw4r3snd18SoundArchivePlayerFv /* 801BF83C 00188DFC 38 7E 00 2C */ addi r3, r30, 0x2c /* 801BF840 00188E00 38 80 FF FF */ li r4, -1 -/* 801BF844 00188E04 48 25 79 71 */ bl func_804171B4 +/* 801BF844 00188E04 48 25 79 71 */ bl __dt__Q34nw4r3snd18MemorySoundArchiveFv /* 801BF848 00188E08 2C 1F 00 00 */ cmpwi r31, 0 /* 801BF84C 00188E0C 40 81 00 0C */ ble lbl_801BF858 /* 801BF850 00188E10 7F C3 F3 78 */ mr r3, r30 @@ -4344,7 +4344,7 @@ lbl_801C0670: /* 801C0684 00189C44 41 82 01 54 */ beq lbl_801C07D8 /* 801C0688 00189C48 C0 22 A3 E0 */ lfs f1, lbl_8066A760@sda21(r2) /* 801C068C 00189C4C 38 80 00 00 */ li r4, 0 -/* 801C0690 00189C50 48 25 31 51 */ bl func_804137E0 +/* 801C0690 00189C50 48 25 31 51 */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi /* 801C0694 00189C54 48 00 01 44 */ b lbl_801C07D8 lbl_801C0698: /* 801C0698 00189C58 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b @@ -4353,14 +4353,14 @@ lbl_801C0698: /* 801C06A4 00189C64 2C 03 00 00 */ cmpwi r3, 0 /* 801C06A8 00189C68 41 82 01 30 */ beq lbl_801C07D8 /* 801C06AC 00189C6C 38 80 00 00 */ li r4, 0 -/* 801C06B0 00189C70 48 25 20 39 */ bl func_804126E8 +/* 801C06B0 00189C70 48 25 20 39 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 801C06B4 00189C74 48 00 01 24 */ b lbl_801C07D8 lbl_801C06B8: /* 801C06B8 00189C78 80 7F 00 00 */ lwz r3, 0(r31) /* 801C06BC 00189C7C 2C 03 00 00 */ cmpwi r3, 0 /* 801C06C0 00189C80 41 82 00 0C */ beq lbl_801C06CC /* 801C06C4 00189C84 38 80 00 00 */ li r4, 0 -/* 801C06C8 00189C88 48 25 20 21 */ bl func_804126E8 +/* 801C06C8 00189C88 48 25 20 21 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_801C06CC: /* 801C06CC 00189C8C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 801C06D0 00189C90 38 60 00 00 */ li r3, 0 @@ -4379,7 +4379,7 @@ lbl_801C06EC: /* 801C0700 00189CC0 41 82 00 D8 */ beq lbl_801C07D8 /* 801C0704 00189CC4 C0 22 A3 E0 */ lfs f1, lbl_8066A760@sda21(r2) /* 801C0708 00189CC8 38 80 00 0F */ li r4, 0xf -/* 801C070C 00189CCC 48 25 30 D5 */ bl func_804137E0 +/* 801C070C 00189CCC 48 25 30 D5 */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi /* 801C0710 00189CD0 48 00 00 C8 */ b lbl_801C07D8 lbl_801C0714: /* 801C0714 00189CD4 4B EA 18 C5 */ bl func_80061FD8 @@ -4427,7 +4427,7 @@ lbl_801C07A4: /* 801C07B4 00189D74 EC 21 00 32 */ fmuls f1, f1, f0 /* 801C07B8 00189D78 41 82 00 0C */ beq lbl_801C07C4 /* 801C07BC 00189D7C 38 80 00 00 */ li r4, 0 -/* 801C07C0 00189D80 48 25 30 21 */ bl func_804137E0 +/* 801C07C0 00189D80 48 25 30 21 */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi lbl_801C07C4: /* 801C07C4 00189D84 80 7F 00 00 */ lwz r3, 0(r31) /* 801C07C8 00189D88 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -4468,7 +4468,7 @@ lbl_801C082C: /* 801C0840 00189E00 41 82 00 10 */ beq lbl_801C0850 /* 801C0844 00189E04 41 86 00 0C */ beq cr1, lbl_801C0850 /* 801C0848 00189E08 7F 84 E3 78 */ mr r4, r28 -/* 801C084C 00189E0C 48 25 1E 9D */ bl func_804126E8 +/* 801C084C 00189E0C 48 25 1E 9D */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_801C0850: /* 801C0850 00189E10 3B BD 00 30 */ addi r29, r29, 0x30 lbl_801C0854: @@ -4569,7 +4569,7 @@ lbl_801C097C: /* 801C0980 00189F40 2C 03 00 00 */ cmpwi r3, 0 /* 801C0984 00189F44 41 82 00 0C */ beq lbl_801C0990 /* 801C0988 00189F48 7F 44 D3 78 */ mr r4, r26 -/* 801C098C 00189F4C 48 25 1D 5D */ bl func_804126E8 +/* 801C098C 00189F4C 48 25 1D 5D */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_801C0990: /* 801C0990 00189F50 B3 9B 00 04 */ sth r28, 4(r27) /* 801C0994 00189F54 B3 BB 00 2A */ sth r29, 0x2a(r27) @@ -4599,9 +4599,9 @@ func_801C09BC: /* 801C09E4 00189FA4 90 83 00 24 */ stw r4, 0x24(r3) /* 801C09E8 00189FA8 90 03 00 28 */ stw r0, 0x28(r3) /* 801C09EC 00189FAC 38 63 00 2C */ addi r3, r3, 0x2c -/* 801C09F0 00189FB0 48 25 67 79 */ bl func_80417168 +/* 801C09F0 00189FB0 48 25 67 79 */ bl __ct__Q34nw4r3snd18MemorySoundArchiveFv /* 801C09F4 00189FB4 38 7F 01 7C */ addi r3, r31, 0x17c -/* 801C09F8 00189FB8 48 25 D1 8D */ bl func_8041DB84 +/* 801C09F8 00189FB8 48 25 D1 8D */ bl __ct__Q34nw4r3snd18SoundArchivePlayerFv /* 801C09FC 00189FBC 7F E3 FB 78 */ mr r3, r31 /* 801C0A00 00189FC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C0A04 00189FC4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4620,9 +4620,9 @@ func_801C0A14: /* 801C0A2C 00189FEC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801C0A30 00189FF0 41 82 00 14 */ beq lbl_801C0A44 /* 801C0A34 00189FF4 38 63 01 7C */ addi r3, r3, 0x17c -/* 801C0A38 00189FF8 48 25 D6 29 */ bl func_8041E060 +/* 801C0A38 00189FF8 48 25 D6 29 */ bl Shutdown__Q34nw4r3snd18SoundArchivePlayerFv /* 801C0A3C 00189FFC 38 7F 00 2C */ addi r3, r31, 0x2c -/* 801C0A40 0018A000 48 25 68 45 */ bl func_80417284 +/* 801C0A40 0018A000 48 25 68 45 */ bl Shutdown__Q34nw4r3snd18MemorySoundArchiveFv lbl_801C0A44: /* 801C0A44 0018A004 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801C0A48 0018A008 3C 03 00 01 */ addis r0, r3, 1 @@ -4664,9 +4664,9 @@ func_801C0A98: /* 801C0AC8 0018A088 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801C0ACC 0018A08C 41 82 00 14 */ beq lbl_801C0AE0 /* 801C0AD0 0018A090 38 63 01 7C */ addi r3, r3, 0x17c -/* 801C0AD4 0018A094 48 25 D5 8D */ bl func_8041E060 +/* 801C0AD4 0018A094 48 25 D5 8D */ bl Shutdown__Q34nw4r3snd18SoundArchivePlayerFv /* 801C0AD8 0018A098 38 7F 00 2C */ addi r3, r31, 0x2c -/* 801C0ADC 0018A09C 48 25 67 A9 */ bl func_80417284 +/* 801C0ADC 0018A09C 48 25 67 A9 */ bl Shutdown__Q34nw4r3snd18MemorySoundArchiveFv lbl_801C0AE0: /* 801C0AE0 0018A0A0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801C0AE4 0018A0A4 3C 03 00 01 */ addis r0, r3, 1 @@ -4696,11 +4696,11 @@ lbl_801C0B08: /* 801C0B40 0018A100 93 DF 00 0C */ stw r30, 0xc(r31) /* 801C0B44 0018A104 90 BF 00 20 */ stw r5, 0x20(r31) /* 801C0B48 0018A108 90 1F 00 24 */ stw r0, 0x24(r31) -/* 801C0B4C 0018A10C 48 25 66 C1 */ bl func_8041720C +/* 801C0B4C 0018A10C 48 25 66 C1 */ bl Setup__Q34nw4r3snd18MemorySoundArchiveFPCv /* 801C0B50 0018A110 7C 7E 1B 78 */ mr r30, r3 /* 801C0B54 0018A114 38 7F 01 7C */ addi r3, r31, 0x17c /* 801C0B58 0018A118 38 9F 00 2C */ addi r4, r31, 0x2c -/* 801C0B5C 0018A11C 48 25 D6 35 */ bl func_8041E190 +/* 801C0B5C 0018A11C 48 25 D6 35 */ bl GetRequiredMemSize__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchive /* 801C0B60 0018A120 38 03 00 1F */ addi r0, r3, 0x1f /* 801C0B64 0018A124 7F C3 F3 78 */ mr r3, r30 /* 801C0B68 0018A128 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a @@ -4747,7 +4747,7 @@ lbl_801C0BEC: /* 801C0BF8 0018A1B8 38 E0 00 00 */ li r7, 0 /* 801C0BFC 0018A1BC 39 00 00 00 */ li r8, 0 /* 801C0C00 0018A1C0 38 63 01 7C */ addi r3, r3, 0x17c -/* 801C0C04 0018A1C4 48 25 D3 59 */ bl func_8041DF5C +/* 801C0C04 0018A1C4 48 25 D3 59 */ bl Setup__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUlPvUl /* 801C0C08 0018A1C8 2C 03 00 00 */ cmpwi r3, 0 /* 801C0C0C 0018A1CC 7C 7E 1B 78 */ mr r30, r3 /* 801C0C10 0018A1D0 41 82 00 10 */ beq lbl_801C0C20 @@ -4765,13 +4765,13 @@ lbl_801C0C20: lbl_801C0C3C: /* 801C0C3C 0018A1FC 7F E4 FB 78 */ mr r4, r31 /* 801C0C40 0018A200 38 7C 01 7C */ addi r3, r28, 0x17c -/* 801C0C44 0018A204 48 25 DF 7D */ bl func_8041EBC0 +/* 801C0C44 0018A204 48 25 DF 7D */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C0C48 0018A208 7F A4 EB 78 */ mr r4, r29 -/* 801C0C4C 0018A20C 48 26 00 51 */ bl func_80420C9C +/* 801C0C4C 0018A20C 48 26 00 51 */ bl SetPlayableSoundCount__Q34nw4r3snd11SoundPlayerFi /* 801C0C50 0018A210 3B FF 00 01 */ addi r31, r31, 1 lbl_801C0C54: /* 801C0C54 0018A214 38 7C 00 2C */ addi r3, r28, 0x2c -/* 801C0C58 0018A218 48 25 BB C5 */ bl func_8041C81C +/* 801C0C58 0018A218 48 25 BB C5 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C0C5C 0018A21C 7C 1F 18 40 */ cmplw r31, r3 /* 801C0C60 0018A220 41 80 FF DC */ blt lbl_801C0C3C lbl_801C0C64: @@ -4805,14 +4805,14 @@ func_801C0C88: lbl_801C0CC4: /* 801C0CC4 0018A284 7F E4 FB 78 */ mr r4, r31 /* 801C0CC8 0018A288 38 7D 01 7C */ addi r3, r29, 0x17c -/* 801C0CCC 0018A28C 48 25 DE F5 */ bl func_8041EBC0 +/* 801C0CCC 0018A28C 48 25 DE F5 */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C0CD0 0018A290 FC 20 F8 90 */ fmr f1, f31 /* 801C0CD4 0018A294 7F C4 F3 78 */ mr r4, r30 -/* 801C0CD8 0018A298 48 25 FA BD */ bl func_80420794 +/* 801C0CD8 0018A298 48 25 FA BD */ bl SetFxSend__Q34nw4r3snd11SoundPlayerFQ34nw4r3snd6AuxBusf /* 801C0CDC 0018A29C 3B FF 00 01 */ addi r31, r31, 1 lbl_801C0CE0: /* 801C0CE0 0018A2A0 38 7D 00 2C */ addi r3, r29, 0x2c -/* 801C0CE4 0018A2A4 48 25 BB 39 */ bl func_8041C81C +/* 801C0CE4 0018A2A4 48 25 BB 39 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C0CE8 0018A2A8 7C 1F 18 40 */ cmplw r31, r3 /* 801C0CEC 0018A2AC 41 80 FF D8 */ blt lbl_801C0CC4 lbl_801C0CF0: @@ -4831,7 +4831,7 @@ func_801C0D10: /* 801C0D14 0018A2D4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801C0D18 0018A2D8 4D 82 00 20 */ beqlr /* 801C0D1C 0018A2DC 38 63 01 7C */ addi r3, r3, 0x17c -/* 801C0D20 0018A2E0 48 25 DA E4 */ b func_8041E804 +/* 801C0D20 0018A2E0 48 25 DA E4 */ b Update__Q34nw4r3snd18SoundArchivePlayerFv /* 801C0D24 0018A2E4 4E 80 00 20 */ blr .global func_801C0D28 @@ -4848,7 +4848,7 @@ func_801C0D28: /* 801C0D4C 0018A30C 2C 04 FF FF */ cmpwi r4, -1 /* 801C0D50 0018A310 41 82 00 58 */ beq lbl_801C0DA8 /* 801C0D54 0018A314 38 63 00 2C */ addi r3, r3, 0x2c -/* 801C0D58 0018A318 48 25 BA BD */ bl func_8041C814 +/* 801C0D58 0018A318 48 25 BA BD */ bl GetSoundCount__Q34nw4r3snd12SoundArchiveCFv /* 801C0D5C 0018A31C 7C 7E 1B 78 */ mr r30, r3 /* 801C0D60 0018A320 3B E0 00 00 */ li r31, 0 /* 801C0D64 0018A324 48 00 00 3C */ b lbl_801C0DA0 @@ -4857,7 +4857,7 @@ lbl_801C0D68: /* 801C0D6C 0018A32C 38 7B 00 2C */ addi r3, r27, 0x2c /* 801C0D70 0018A330 7C 1D 0E 70 */ srawi r29, r0, 1 /* 801C0D74 0018A334 7F A4 EB 78 */ mr r4, r29 -/* 801C0D78 0018A338 48 25 BA C5 */ bl func_8041C83C +/* 801C0D78 0018A338 48 25 BA C5 */ bl GetSoundUserParam__Q34nw4r3snd12SoundArchiveCFUl /* 801C0D7C 0018A33C 7C 03 E0 51 */ subf. r0, r3, r28 /* 801C0D80 0018A340 40 82 00 0C */ bne lbl_801C0D8C /* 801C0D84 0018A344 7F A3 EB 78 */ mr r3, r29 @@ -4980,14 +4980,14 @@ lbl_801C0EF8: /* 801C0F08 0018A4C8 41 82 00 10 */ beq lbl_801C0F18 /* 801C0F0C 0018A4CC C0 22 A3 E0 */ lfs f1, lbl_8066A760@sda21(r2) /* 801C0F10 0018A4D0 38 80 00 00 */ li r4, 0 -/* 801C0F14 0018A4D4 48 25 28 CD */ bl func_804137E0 +/* 801C0F14 0018A4D4 48 25 28 CD */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi lbl_801C0F18: /* 801C0F18 0018A4D8 80 7D 00 00 */ lwz r3, 0(r29) /* 801C0F1C 0018A4DC 2C 03 00 00 */ cmpwi r3, 0 /* 801C0F20 0018A4E0 41 82 00 18 */ beq lbl_801C0F38 /* 801C0F24 0018A4E4 FC 20 F8 90 */ fmr f1, f31 /* 801C0F28 0018A4E8 7F 64 DB 78 */ mr r4, r27 -/* 801C0F2C 0018A4EC 48 25 28 B5 */ bl func_804137E0 +/* 801C0F2C 0018A4EC 48 25 28 B5 */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi /* 801C0F30 0018A4F0 48 00 00 08 */ b lbl_801C0F38 lbl_801C0F34: /* 801C0F34 0018A4F4 4B FF FE 8D */ bl func_801C0DC0 @@ -5225,14 +5225,14 @@ func_801C1218: lbl_801C1254: /* 801C1254 0018A814 7F E4 FB 78 */ mr r4, r31 /* 801C1258 0018A818 38 7C 01 7C */ addi r3, r28, 0x17c -/* 801C125C 0018A81C 48 25 D9 65 */ bl func_8041EBC0 +/* 801C125C 0018A81C 48 25 D9 65 */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C1260 0018A820 7F A4 EB 78 */ mr r4, r29 /* 801C1264 0018A824 7F C5 F3 78 */ mr r5, r30 -/* 801C1268 0018A828 48 25 F4 95 */ bl func_804206FC +/* 801C1268 0018A828 48 25 F4 95 */ bl PauseAllSound__Q34nw4r3snd11SoundPlayerFbi /* 801C126C 0018A82C 3B FF 00 01 */ addi r31, r31, 1 lbl_801C1270: /* 801C1270 0018A830 38 7C 00 2C */ addi r3, r28, 0x2c -/* 801C1274 0018A834 48 25 B5 A9 */ bl func_8041C81C +/* 801C1274 0018A834 48 25 B5 A9 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C1278 0018A838 7C 1F 18 40 */ cmplw r31, r3 /* 801C127C 0018A83C 41 80 FF D8 */ blt lbl_801C1254 lbl_801C1280: @@ -5263,13 +5263,13 @@ func_801C12A0: lbl_801C12D4: /* 801C12D4 0018A894 7F E4 FB 78 */ mr r4, r31 /* 801C12D8 0018A898 38 7D 01 7C */ addi r3, r29, 0x17c -/* 801C12DC 0018A89C 48 25 D8 E5 */ bl func_8041EBC0 +/* 801C12DC 0018A89C 48 25 D8 E5 */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C12E0 0018A8A0 7F C4 F3 78 */ mr r4, r30 -/* 801C12E4 0018A8A4 48 25 F3 A1 */ bl func_80420684 +/* 801C12E4 0018A8A4 48 25 F3 A1 */ bl StopAllSound__Q34nw4r3snd11SoundPlayerFi /* 801C12E8 0018A8A8 3B FF 00 01 */ addi r31, r31, 1 lbl_801C12EC: /* 801C12EC 0018A8AC 38 7D 00 2C */ addi r3, r29, 0x2c -/* 801C12F0 0018A8B0 48 25 B5 2D */ bl func_8041C81C +/* 801C12F0 0018A8B0 48 25 B5 2D */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C12F4 0018A8B4 7C 1F 18 40 */ cmplw r31, r3 /* 801C12F8 0018A8B8 41 80 FF DC */ blt lbl_801C12D4 lbl_801C12FC: @@ -5314,7 +5314,7 @@ lbl_801C136C: /* 801C1380 0018A940 41 82 00 10 */ beq lbl_801C1390 /* 801C1384 0018A944 FC 20 F8 90 */ fmr f1, f31 /* 801C1388 0018A948 7F A4 EB 78 */ mr r4, r29 -/* 801C138C 0018A94C 48 25 24 55 */ bl func_804137E0 +/* 801C138C 0018A94C 48 25 24 55 */ bl SetVolume__Q44nw4r3snd6detail10BasicSoundFfi lbl_801C1390: /* 801C1390 0018A950 38 00 00 01 */ li r0, 1 lbl_801C1394: @@ -5365,7 +5365,7 @@ func_801C13D8: lbl_801C1430: /* 801C1430 0018A9F0 7E 84 A3 78 */ mr r4, r20 /* 801C1434 0018A9F4 38 7F 01 7C */ addi r3, r31, 0x17c -/* 801C1438 0018A9F8 48 25 D7 89 */ bl func_8041EBC0 +/* 801C1438 0018A9F8 48 25 D7 89 */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C143C 0018A9FC 83 C3 00 04 */ lwz r30, 4(r3) /* 801C1440 0018AA00 3B A3 00 04 */ addi r29, r3, 4 /* 801C1444 0018AA04 48 00 00 98 */ b lbl_801C14DC @@ -5409,7 +5409,7 @@ lbl_801C14C4: /* 801C14C4 0018AA84 2C 03 00 00 */ cmpwi r3, 0 /* 801C14C8 0018AA88 A0 96 00 04 */ lhz r4, 4(r22) /* 801C14CC 0018AA8C 41 82 00 08 */ beq lbl_801C14D4 -/* 801C14D0 0018AA90 48 25 12 19 */ bl func_804126E8 +/* 801C14D0 0018AA90 48 25 12 19 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_801C14D4: /* 801C14D4 0018AA94 7E A3 AB 78 */ mr r3, r21 /* 801C14D8 0018AA98 48 25 EE F1 */ bl DetachSound__Q34nw4r3snd11SoundHandleFv @@ -5419,7 +5419,7 @@ lbl_801C14DC: /* 801C14E4 0018AAA4 3A 94 00 01 */ addi r20, r20, 1 lbl_801C14E8: /* 801C14E8 0018AAA8 38 7F 00 2C */ addi r3, r31, 0x2c -/* 801C14EC 0018AAAC 48 25 B3 31 */ bl func_8041C81C +/* 801C14EC 0018AAAC 48 25 B3 31 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C14F0 0018AAB0 7C 14 18 40 */ cmplw r20, r3 /* 801C14F4 0018AAB4 41 80 FF 3C */ blt lbl_801C1430 lbl_801C14F8: @@ -5460,7 +5460,7 @@ lbl_801C155C: /* 801C156C 0018AB2C 2C 03 00 00 */ cmpwi r3, 0 /* 801C1570 0018AB30 41 82 00 0C */ beq lbl_801C157C /* 801C1574 0018AB34 7F 24 CB 78 */ mr r4, r25 -/* 801C1578 0018AB38 48 25 11 71 */ bl func_804126E8 +/* 801C1578 0018AB38 48 25 11 71 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_801C157C: /* 801C157C 0018AB3C B3 9A 00 04 */ sth r28, 4(r26) /* 801C1580 0018AB40 B3 DA 00 2A */ sth r30, 0x2a(r26) @@ -5509,7 +5509,7 @@ lbl_801C15F4: /* 801C1604 0018ABC4 7C 00 23 78 */ or r0, r0, r4 /* 801C1608 0018ABC8 54 04 0F FE */ srwi r4, r0, 0x1f /* 801C160C 0018ABCC 4D 82 00 20 */ beqlr -/* 801C1610 0018ABD0 48 25 12 C0 */ b func_804128D0 +/* 801C1610 0018ABD0 48 25 12 C0 */ b Pause__Q44nw4r3snd6detail10BasicSoundFbi /* 801C1614 0018ABD4 4E 80 00 20 */ blr .global func_801C1618 @@ -5541,7 +5541,7 @@ func_801C1618: lbl_801C1678: /* 801C1678 0018AC38 7E A4 AB 78 */ mr r4, r21 /* 801C167C 0018AC3C 38 7F 01 7C */ addi r3, r31, 0x17c -/* 801C1680 0018AC40 48 25 D5 41 */ bl func_8041EBC0 +/* 801C1680 0018AC40 48 25 D5 41 */ bl GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl /* 801C1684 0018AC44 83 C3 00 04 */ lwz r30, 4(r3) /* 801C1688 0018AC48 3B A3 00 04 */ addi r29, r3, 4 /* 801C168C 0018AC4C 48 00 00 60 */ b lbl_801C16EC @@ -5577,7 +5577,7 @@ lbl_801C16EC: /* 801C16F4 0018ACB4 3A B5 00 01 */ addi r21, r21, 1 lbl_801C16F8: /* 801C16F8 0018ACB8 38 7F 00 2C */ addi r3, r31, 0x2c -/* 801C16FC 0018ACBC 48 25 B1 21 */ bl func_8041C81C +/* 801C16FC 0018ACBC 48 25 B1 21 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 801C1700 0018ACC0 7C 15 18 40 */ cmplw r21, r3 /* 801C1704 0018ACC4 41 80 FF 74 */ blt lbl_801C1678 lbl_801C1708: diff --git a/asm/kyoshin/appgame/cf/code_801C189C.s b/asm/kyoshin/appgame/cf/code_801C189C.s index 5693ae0..ea603f5 100644 --- a/asm/kyoshin/appgame/cf/code_801C189C.s +++ b/asm/kyoshin/appgame/cf/code_801C189C.s @@ -1471,11 +1471,11 @@ func_801C2C14: /* 801C2CA0 0018C260 D0 03 00 58 */ stfs f0, 0x58(r3) /* 801C2CA4 0018C264 D0 83 00 5C */ stfs f4, 0x5c(r3) /* 801C2CA8 0018C268 38 63 00 60 */ addi r3, r3, 0x60 -/* 801C2CAC 0018C26C 48 25 39 05 */ bl func_804165B0 +/* 801C2CAC 0018C26C 48 25 39 05 */ bl __ct__Q34nw4r3snd15FxReverbStdDpl2Fv /* 801C2CB0 0018C270 38 7E 02 90 */ addi r3, r30, 0x290 -/* 801C2CB4 0018C274 48 25 2D 59 */ bl func_80415A0C +/* 801C2CB4 0018C274 48 25 2D 59 */ bl __ct__Q34nw4r3snd12FxChorusDpl2Fv /* 801C2CB8 0018C278 38 7E 04 14 */ addi r3, r30, 0x414 -/* 801C2CBC 0018C27C 48 25 32 F5 */ bl func_80415FB0 +/* 801C2CBC 0018C27C 48 25 32 F5 */ bl __ct__Q34nw4r3snd11FxDelayDpl2Fv /* 801C2CC0 0018C280 38 7E 00 04 */ addi r3, r30, 4 /* 801C2CC4 0018C284 38 80 00 00 */ li r4, 0 /* 801C2CC8 0018C288 38 A0 00 0C */ li r5, 0xc @@ -1849,9 +1849,9 @@ lbl_801C31F0: /* 801C31F4 0018C7B4 40 82 00 44 */ bne lbl_801C3238 /* 801C31F8 0018C7B8 38 79 00 60 */ addi r3, r25, 0x60 /* 801C31FC 0018C7BC 38 99 00 10 */ addi r4, r25, 0x10 -/* 801C3200 0018C7C0 48 25 36 7D */ bl func_8041687C +/* 801C3200 0018C7C0 48 25 36 7D */ bl SetParam__Q34nw4r3snd15FxReverbStdDpl2FRCQ44nw4r3snd6detail16FxReverbStdParam /* 801C3204 0018C7C4 38 79 00 60 */ addi r3, r25, 0x60 -/* 801C3208 0018C7C8 48 25 34 6D */ bl func_80416674 +/* 801C3208 0018C7C8 48 25 34 6D */ bl GetRequiredMemSize__Q34nw4r3snd15FxReverbStdDpl2Fv /* 801C320C 0018C7CC 93 79 00 04 */ stw r27, 4(r25) /* 801C3210 0018C7D0 38 79 00 60 */ addi r3, r25, 0x60 /* 801C3214 0018C7D4 7F 64 DB 78 */ mr r4, r27 @@ -1868,9 +1868,9 @@ lbl_801C3238: /* 801C323C 0018C7FC 40 82 00 44 */ bne lbl_801C3280 /* 801C3240 0018C800 38 79 02 90 */ addi r3, r25, 0x290 /* 801C3244 0018C804 38 99 00 38 */ addi r4, r25, 0x38 -/* 801C3248 0018C808 48 25 2A 5D */ bl func_80415CA4 +/* 801C3248 0018C808 48 25 2A 5D */ bl SetParam__Q34nw4r3snd12FxChorusDpl2FRCQ44nw4r3snd6detail13FxChorusParam /* 801C324C 0018C80C 38 79 02 90 */ addi r3, r25, 0x290 -/* 801C3250 0018C810 48 25 28 4D */ bl func_80415A9C +/* 801C3250 0018C810 48 25 28 4D */ bl GetRequiredMemSize__Q34nw4r3snd12FxChorusDpl2Fv /* 801C3254 0018C814 93 79 00 04 */ stw r27, 4(r25) /* 801C3258 0018C818 38 79 02 90 */ addi r3, r25, 0x290 /* 801C325C 0018C81C 7F 64 DB 78 */ mr r4, r27 @@ -1887,9 +1887,9 @@ lbl_801C3280: /* 801C3284 0018C844 40 82 00 40 */ bne lbl_801C32C4 /* 801C3288 0018C848 38 79 04 14 */ addi r3, r25, 0x414 /* 801C328C 0018C84C 38 99 00 4C */ addi r4, r25, 0x4c -/* 801C3290 0018C850 48 25 2F B5 */ bl func_80416244 +/* 801C3290 0018C850 48 25 2F B5 */ bl SetParam__Q34nw4r3snd11FxDelayDpl2FRCQ44nw4r3snd6detail12FxDelayParam /* 801C3294 0018C854 38 79 04 14 */ addi r3, r25, 0x414 -/* 801C3298 0018C858 48 25 2D A5 */ bl func_8041603C +/* 801C3298 0018C858 48 25 2D A5 */ bl GetRequiredMemSize__Q34nw4r3snd11FxDelayDpl2Fv /* 801C329C 0018C85C 93 79 00 04 */ stw r27, 4(r25) /* 801C32A0 0018C860 38 79 04 14 */ addi r3, r25, 0x414 /* 801C32A4 0018C864 7F 64 DB 78 */ mr r4, r27 diff --git a/asm/kyoshin/appgame/cf/code_801F3410.s b/asm/kyoshin/appgame/cf/code_801F3410.s index d32ebc8..fe92c4f 100644 --- a/asm/kyoshin/appgame/cf/code_801F3410.s +++ b/asm/kyoshin/appgame/cf/code_801F3410.s @@ -16545,37 +16545,4 @@ sinit_802019F8: /* 80201A34 001CAFF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80201A38 001CAFF8 7C 08 03 A6 */ mtlr r0 /* 80201A3C 001CAFFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80201A40 001CB000 4E 80 00 20 */ blr - -.global func_80201A44 -func_80201A44: -/* 80201A44 001CB004 38 63 FF FC */ addi r3, r3, -4 -/* 80201A48 001CB008 4B FF F8 50 */ b func_80201298 -.global lbl_80201A4C -lbl_80201A4C: -/* 80201A4C 001CB00C 38 63 FF FC */ addi r3, r3, -4 -/* 80201A50 001CB010 4B FF F9 F0 */ b func_80201440 -.global lbl_80201A54 -lbl_80201A54: -/* 80201A54 001CB014 38 63 FF FC */ addi r3, r3, -4 -/* 80201A58 001CB018 4B FF F8 C4 */ b func_8020131C -.global lbl_80201A5C -lbl_80201A5C: -/* 80201A5C 001CB01C 38 63 FF FC */ addi r3, r3, -4 -/* 80201A60 001CB020 4B FF F8 B8 */ b func_80201318 -.global lbl_80201A64 -lbl_80201A64: -/* 80201A64 001CB024 38 63 FF FC */ addi r3, r3, -4 -/* 80201A68 001CB028 4B FF F5 34 */ b func_80200F9C -.global lbl_80201A6C -lbl_80201A6C: -/* 80201A6C 001CB02C 38 63 FF FC */ addi r3, r3, -4 -/* 80201A70 001CB030 4B FF DC EC */ b func_801FF75C -.global lbl_80201A74 -lbl_80201A74: -/* 80201A74 001CB034 38 63 FF F8 */ addi r3, r3, -8 -/* 80201A78 001CB038 4B FF F9 CC */ b func_80201444 -.global lbl_80201A7C -lbl_80201A7C: -/* 80201A7C 001CB03C 38 63 FF F8 */ addi r3, r3, -8 -/* 80201A80 001CB040 4B FF DC DC */ b func_801FF75C +/* 80201A40 001CB000 4E 80 00 20 */ blr \ No newline at end of file diff --git a/asm/kyoshin/appgame/cf/code_80201A84.s b/asm/kyoshin/appgame/cf/code_80201A44.s similarity index 99% rename from asm/kyoshin/appgame/cf/code_80201A84.s rename to asm/kyoshin/appgame/cf/code_80201A44.s index 5eebd38..1cd86b1 100644 --- a/asm/kyoshin/appgame/cf/code_80201A84.s +++ b/asm/kyoshin/appgame/cf/code_80201A44.s @@ -2,6 +2,47 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 + +.global func_80201A44 +func_80201A44: +/* 80201A44 001CB004 38 63 FF FC */ addi r3, r3, -4 +/* 80201A48 001CB008 4B FF F8 50 */ b func_80201298 + +.global func_80201A4C +func_80201A4C: +/* 80201A4C 001CB00C 38 63 FF FC */ addi r3, r3, -4 +/* 80201A50 001CB010 4B FF F9 F0 */ b func_80201440 + +.global func_80201A54 +func_80201A54: +/* 80201A54 001CB014 38 63 FF FC */ addi r3, r3, -4 +/* 80201A58 001CB018 4B FF F8 C4 */ b func_8020131C + +.global func_80201A5C +func_80201A5C: +/* 80201A5C 001CB01C 38 63 FF FC */ addi r3, r3, -4 +/* 80201A60 001CB020 4B FF F8 B8 */ b func_80201318 + +.global func_80201A64 +func_80201A64: +/* 80201A64 001CB024 38 63 FF FC */ addi r3, r3, -4 +/* 80201A68 001CB028 4B FF F5 34 */ b func_80200F9C + +.global func_80201A6C +func_80201A6C: +/* 80201A6C 001CB02C 38 63 FF FC */ addi r3, r3, -4 +/* 80201A70 001CB030 4B FF DC EC */ b func_801FF75C + +.global func_80201A74 +func_80201A74: +/* 80201A74 001CB034 38 63 FF F8 */ addi r3, r3, -8 +/* 80201A78 001CB038 4B FF F9 CC */ b func_80201444 + +.global func_80201A7C +func_80201A7C: +/* 80201A7C 001CB03C 38 63 FF F8 */ addi r3, r3, -8 +/* 80201A80 001CB040 4B FF DC DC */ b func_801FF75C + .global func_80201A84 func_80201A84: /* 80201A84 001CB044 94 21 D6 30 */ stwu r1, -0x29d0(r1) diff --git a/asm/kyoshin/appgame/cf/code_8020AB80.s b/asm/kyoshin/appgame/cf/code_8020AB80.s index cb313d3..534e40d 100644 --- a/asm/kyoshin/appgame/cf/code_8020AB80.s +++ b/asm/kyoshin/appgame/cf/code_8020AB80.s @@ -9625,8 +9625,9 @@ lbl_80213464: func_80213478: /* 80213478 001DCA38 38 63 FF FC */ addi r3, r3, -4 /* 8021347C 001DCA3C 4B FF FF 4C */ b func_802133C8 -.global lbl_80213480 -lbl_80213480: + +.global func_80213480 +func_80213480: /* 80213480 001DCA40 38 63 FF FC */ addi r3, r3, -4 /* 80213484 001DCA44 4B FF F1 10 */ b func_80212594 diff --git a/asm/kyoshin/appgame/cf/code_80221E38.s b/asm/kyoshin/appgame/cf/code_80221E38.s index 04007cf..1b73149 100644 --- a/asm/kyoshin/appgame/cf/code_80221E38.s +++ b/asm/kyoshin/appgame/cf/code_80221E38.s @@ -16,12 +16,14 @@ func_80221E38: func_80221E54: /* 80221E54 001EB414 38 63 FF FC */ addi r3, r3, -4 /* 80221E58 001EB418 4B FF A7 3C */ b func_8021C594 -.global lbl_80221E5C -lbl_80221E5C: + +.global func_80221E5C +func_80221E5C: /* 80221E5C 001EB41C 38 63 FF F8 */ addi r3, r3, -8 /* 80221E60 001EB420 4B FF FE F8 */ b func_80221D58 -.global lbl_80221E64 -lbl_80221E64: + +.global func_80221E64 +func_80221E64: /* 80221E64 001EB424 38 63 FF F8 */ addi r3, r3, -8 /* 80221E68 001EB428 4B FF A7 2C */ b func_8021C594 diff --git a/asm/kyoshin/appgame/cf/code_802744D4.s b/asm/kyoshin/appgame/cf/code_802744D4.s index 5fcad95..ee9e0d0 100644 --- a/asm/kyoshin/appgame/cf/code_802744D4.s +++ b/asm/kyoshin/appgame/cf/code_802744D4.s @@ -15225,11 +15225,12 @@ func_80281438: /* 80281454 0024AA14 38 63 00 74 */ addi r3, r3, 0x74 /* 80281458 0024AA18 70 08 00 5F */ andi. r8, r0, 0x5f /* 8028145C 0024AA1C 48 01 F4 F4 */ b func_802A0950 -.global lbl_80281460 -lbl_80281460: + +.global func_80281460 +func_80281460: /* 80281460 0024AA20 7C 64 1B 78 */ mr r4, r3 /* 80281464 0024AA24 38 60 00 BA */ li r3, 0xba -/* 80281468 0024AA28 48 01 F3 9C */ b lbl_802A0804 +/* 80281468 0024AA28 48 01 F3 9C */ b func_802A0804 .global func_8028146C func_8028146C: @@ -15573,8 +15574,9 @@ lbl_802818C0: func_802818D4: /* 802818D4 0024AE94 38 63 00 74 */ addi r3, r3, 0x74 /* 802818D8 0024AE98 48 01 F1 C8 */ b func_802A0AA0 -.global lbl_802818DC -lbl_802818DC: + +.global func_802818DC +func_802818DC: /* 802818DC 0024AE9C 38 60 00 01 */ li r3, 1 /* 802818E0 0024AEA0 4E 80 00 20 */ blr @@ -16103,11 +16105,12 @@ func_80282020: /* 8028203C 0024B5FC 38 63 00 74 */ addi r3, r3, 0x74 /* 80282040 0024B600 70 08 00 5F */ andi. r8, r0, 0x5f /* 80282044 0024B604 48 01 E9 0C */ b func_802A0950 -.global lbl_80282048 -lbl_80282048: + +.global func_80282048 +func_80282048: /* 80282048 0024B608 7C 64 1B 78 */ mr r4, r3 /* 8028204C 0024B60C 38 60 00 B3 */ li r3, 0xb3 -/* 80282050 0024B610 48 01 E7 B4 */ b lbl_802A0804 +/* 80282050 0024B610 48 01 E7 B4 */ b func_802A0804 .global func_80282054 func_80282054: @@ -16413,8 +16416,9 @@ lbl_80282448: func_8028245C: /* 8028245C 0024BA1C 38 63 00 74 */ addi r3, r3, 0x74 /* 80282460 0024BA20 48 01 E6 40 */ b func_802A0AA0 -.global lbl_80282464 -lbl_80282464: + +.global func_80282464 +func_80282464: /* 80282464 0024BA24 38 60 00 01 */ li r3, 1 /* 80282468 0024BA28 4E 80 00 20 */ blr @@ -16435,8 +16439,9 @@ func_80282480: .global func_8028248C func_8028248C: /* 8028248C 0024BA4C 4B FF 4C C8 */ b func_80277154 -.global lbl_80282490 -lbl_80282490: + +.global func_80282490 +func_80282490: /* 80282490 0024BA50 7C 66 1B 78 */ mr r6, r3 /* 80282494 0024BA54 2C 05 00 00 */ cmpwi r5, 0 /* 80282498 0024BA58 7C 83 23 78 */ mr r3, r4 diff --git a/asm/kyoshin/appgame/cf/code_80293140.s b/asm/kyoshin/appgame/cf/code_80293140.s index 28036a4..f810c24 100644 --- a/asm/kyoshin/appgame/cf/code_80293140.s +++ b/asm/kyoshin/appgame/cf/code_80293140.s @@ -2689,8 +2689,9 @@ func_802956A4: .global func_802956A8 func_802956A8: /* 802956A8 0025EC68 4B EC F6 54 */ b func_80164CFC -.global lbl_802956AC -lbl_802956AC: + +.global func_802956AC +func_802956AC: /* 802956AC 0025EC6C 2C 03 00 00 */ cmpwi r3, 0 /* 802956B0 0025EC70 7C 64 1B 78 */ mr r4, r3 /* 802956B4 0025EC74 41 82 00 08 */ beq lbl_802956BC @@ -2700,8 +2701,9 @@ lbl_802956BC: /* 802956C0 0025EC80 38 A0 00 0B */ li r5, 0xb /* 802956C4 0025EC84 38 C0 00 00 */ li r6, 0 /* 802956C8 0025EC88 48 20 07 EC */ b func_80495EB4 -.global lbl_802956CC -lbl_802956CC: + +.global func_802956CC +func_802956CC: /* 802956CC 0025EC8C 2C 03 00 00 */ cmpwi r3, 0 /* 802956D0 0025EC90 7C 64 1B 78 */ mr r4, r3 /* 802956D4 0025EC94 41 82 00 08 */ beq lbl_802956DC @@ -2837,16 +2839,19 @@ lbl_80295854: func_80295868: /* 80295868 0025EE28 38 63 FF AC */ addi r3, r3, -84 /* 8029586C 0025EE2C 4B FF FE F8 */ b func_80295764 -.global lbl_80295870 -lbl_80295870: + +.global func_80295870 +func_80295870: /* 80295870 0025EE30 38 63 FF AC */ addi r3, r3, -84 /* 80295874 0025EE34 4B FF FD DC */ b func_80295650 -.global lbl_80295878 -lbl_80295878: + +.global func_80295878 +func_80295878: /* 80295878 0025EE38 38 63 FF A8 */ addi r3, r3, -88 /* 8029587C 0025EE3C 4B FF FE E4 */ b func_80295760 -.global lbl_80295880 -lbl_80295880: + +.global func_80295880 +func_80295880: /* 80295880 0025EE40 38 63 FF A8 */ addi r3, r3, -88 /* 80295884 0025EE44 4B FF FD CC */ b func_80295650 @@ -3234,22 +3239,26 @@ func_80295D88: .global func_80295D8C func_80295D8C: /* 80295D8C 0025F34C 48 02 1E DC */ b func_802B7C68 -.global lbl_80295D90 -lbl_80295D90: + +.global func_80295D90 +func_80295D90: /* 80295D90 0025F350 38 60 00 00 */ li r3, 0 /* 80295D94 0025F354 4E 80 00 20 */ blr .global func_80295D98 func_80295D98: /* 80295D98 0025F358 48 02 1E D0 */ b func_802B7C68 -.global lbl_80295D9C -lbl_80295D9C: + +.global func_80295D9C +func_80295D9C: /* 80295D9C 0025F35C 48 02 1E CC */ b func_802B7C68 -.global lbl_80295DA0 -lbl_80295DA0: + +.global func_80295DA0 +func_80295DA0: /* 80295DA0 0025F360 48 02 1E C8 */ b func_802B7C68 -.global lbl_80295DA4 -lbl_80295DA4: + +.global func_80295DA4 +func_80295DA4: /* 80295DA4 0025F364 38 60 00 01 */ li r3, 1 /* 80295DA8 0025F368 4E 80 00 20 */ blr diff --git a/asm/kyoshin/appgame/cf/code_80296B44.s b/asm/kyoshin/appgame/cf/code_80296B44.s index 121bcc0..4d4c74d 100644 --- a/asm/kyoshin/appgame/cf/code_80296B44.s +++ b/asm/kyoshin/appgame/cf/code_80296B44.s @@ -7706,134 +7706,115 @@ lbl_8029D6A4: lbl_8029D6AC: /* 8029D6AC 00266C6C 38 60 00 04 */ li r3, 4 /* 8029D6B0 00266C70 4E 80 00 20 */ blr - -.global func_8029D6B4 -func_8029D6B4: +.global lbl_8029D6B4 +lbl_8029D6B4: /* 8029D6B4 00266C74 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D6B8 00266C78 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D6BC 00266C7C 88 63 00 20 */ lbz r3, 0x20(r3) /* 8029D6C0 00266C80 4E 80 00 20 */ blr - -.global func_8029D6C4 -func_8029D6C4: +.global lbl_8029D6C4 +lbl_8029D6C4: /* 8029D6C4 00266C84 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D6C8 00266C88 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D6CC 00266C8C 88 63 00 21 */ lbz r3, 0x21(r3) /* 8029D6D0 00266C90 4E 80 00 20 */ blr - -.global func_8029D6D4 -func_8029D6D4: +.global lbl_8029D6D4 +lbl_8029D6D4: /* 8029D6D4 00266C94 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D6D8 00266C98 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D6DC 00266C9C 88 63 00 23 */ lbz r3, 0x23(r3) /* 8029D6E0 00266CA0 4E 80 00 20 */ blr - -.global func_8029D6E4 -func_8029D6E4: +.global lbl_8029D6E4 +lbl_8029D6E4: /* 8029D6E4 00266CA4 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D6E8 00266CA8 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D6EC 00266CAC 88 63 00 22 */ lbz r3, 0x22(r3) /* 8029D6F0 00266CB0 4E 80 00 20 */ blr - -.global func_8029D6F4 -func_8029D6F4: +.global lbl_8029D6F4 +lbl_8029D6F4: /* 8029D6F4 00266CB4 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D6F8 00266CB8 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D6FC 00266CBC 88 63 00 24 */ lbz r3, 0x24(r3) /* 8029D700 00266CC0 4E 80 00 20 */ blr - -.global func_8029D704 -func_8029D704: +.global lbl_8029D704 +lbl_8029D704: /* 8029D704 00266CC4 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D708 00266CC8 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D70C 00266CCC 88 63 00 25 */ lbz r3, 0x25(r3) /* 8029D710 00266CD0 4E 80 00 20 */ blr - -.global func_8029D714 -func_8029D714: +.global lbl_8029D714 +lbl_8029D714: /* 8029D714 00266CD4 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D718 00266CD8 88 63 AA 08 */ lbz r3, lbl_8057AA08@l(r3) /* 8029D71C 00266CDC 4E 80 00 20 */ blr - -.global func_8029D720 -func_8029D720: +.global lbl_8029D720 +lbl_8029D720: /* 8029D720 00266CE0 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D724 00266CE4 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D728 00266CE8 88 63 00 01 */ lbz r3, 1(r3) /* 8029D72C 00266CEC 4E 80 00 20 */ blr - -.global func_8029D730 -func_8029D730: +.global lbl_8029D730 +lbl_8029D730: /* 8029D730 00266CF0 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D734 00266CF4 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D738 00266CF8 88 63 00 02 */ lbz r3, 2(r3) /* 8029D73C 00266CFC 4E 80 00 20 */ blr - -.global func_8029D740 -func_8029D740: +.global lbl_8029D740 +lbl_8029D740: /* 8029D740 00266D00 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D744 00266D04 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D748 00266D08 88 63 00 03 */ lbz r3, 3(r3) /* 8029D74C 00266D0C 4E 80 00 20 */ blr - -.global func_8029D750 -func_8029D750: +.global lbl_8029D750 +lbl_8029D750: /* 8029D750 00266D10 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D754 00266D14 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D758 00266D18 88 63 00 04 */ lbz r3, 4(r3) /* 8029D75C 00266D1C 4E 80 00 20 */ blr - -.global func_8029D760 -func_8029D760: +.global lbl_8029D760 +lbl_8029D760: /* 8029D760 00266D20 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D764 00266D24 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D768 00266D28 88 63 00 05 */ lbz r3, 5(r3) /* 8029D76C 00266D2C 4E 80 00 20 */ blr - -.global func_8029D770 -func_8029D770: +.global lbl_8029D770 +lbl_8029D770: /* 8029D770 00266D30 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D774 00266D34 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D778 00266D38 88 63 00 06 */ lbz r3, 6(r3) /* 8029D77C 00266D3C 4E 80 00 20 */ blr - -.global func_8029D780 -func_8029D780: +.global lbl_8029D780 +lbl_8029D780: /* 8029D780 00266D40 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D784 00266D44 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D788 00266D48 88 63 00 07 */ lbz r3, 7(r3) /* 8029D78C 00266D4C 4E 80 00 20 */ blr - -.global func_8029D790 -func_8029D790: +.global lbl_8029D790 +lbl_8029D790: /* 8029D790 00266D50 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D794 00266D54 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D798 00266D58 88 63 00 10 */ lbz r3, 0x10(r3) /* 8029D79C 00266D5C 4E 80 00 20 */ blr - -.global func_8029D7A0 -func_8029D7A0: +.global lbl_8029D7A0 +lbl_8029D7A0: /* 8029D7A0 00266D60 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D7A4 00266D64 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D7A8 00266D68 88 63 00 11 */ lbz r3, 0x11(r3) /* 8029D7AC 00266D6C 4E 80 00 20 */ blr - -.global func_8029D7B0 -func_8029D7B0: +.global lbl_8029D7B0 +lbl_8029D7B0: /* 8029D7B0 00266D70 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D7B4 00266D74 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D7B8 00266D78 88 63 00 30 */ lbz r3, 0x30(r3) /* 8029D7BC 00266D7C 4E 80 00 20 */ blr - -.global func_8029D7C0 -func_8029D7C0: +.global lbl_8029D7C0 +lbl_8029D7C0: /* 8029D7C0 00266D80 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D7C4 00266D84 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D7C8 00266D88 88 63 00 32 */ lbz r3, 0x32(r3) /* 8029D7CC 00266D8C 4E 80 00 20 */ blr - -.global func_8029D7D0 -func_8029D7D0: +.global lbl_8029D7D0 +lbl_8029D7D0: /* 8029D7D0 00266D90 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D7D4 00266D94 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D7D8 00266D98 88 63 00 31 */ lbz r3, 0x31(r3) @@ -7868,134 +7849,115 @@ lbl_8029D830: /* 8029D834 00266DF4 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D838 00266DF8 98 83 00 0F */ stb r4, 0xf(r3) /* 8029D83C 00266DFC 4E 80 00 20 */ blr - -.global func_8029D840 -func_8029D840: +.global lbl_8029D840 +lbl_8029D840: /* 8029D840 00266E00 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D844 00266E04 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D848 00266E08 98 83 00 20 */ stb r4, 0x20(r3) /* 8029D84C 00266E0C 4E 80 00 20 */ blr - -.global func_8029D850 -func_8029D850: +.global lbl_8029D850 +lbl_8029D850: /* 8029D850 00266E10 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D854 00266E14 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D858 00266E18 98 83 00 21 */ stb r4, 0x21(r3) /* 8029D85C 00266E1C 4E 80 00 20 */ blr - -.global func_8029D860 -func_8029D860: +.global lbl_8029D860 +lbl_8029D860: /* 8029D860 00266E20 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D864 00266E24 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D868 00266E28 98 83 00 23 */ stb r4, 0x23(r3) /* 8029D86C 00266E2C 4E 80 00 20 */ blr - -.global func_8029D870 -func_8029D870: +.global lbl_8029D870 +lbl_8029D870: /* 8029D870 00266E30 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D874 00266E34 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D878 00266E38 98 83 00 22 */ stb r4, 0x22(r3) /* 8029D87C 00266E3C 4E 80 00 20 */ blr - -.global func_8029D880 -func_8029D880: +.global lbl_8029D880 +lbl_8029D880: /* 8029D880 00266E40 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D884 00266E44 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D888 00266E48 98 83 00 24 */ stb r4, 0x24(r3) /* 8029D88C 00266E4C 4E 80 00 20 */ blr - -.global func_8029D890 -func_8029D890: +.global lbl_8029D890 +lbl_8029D890: /* 8029D890 00266E50 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D894 00266E54 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D898 00266E58 98 83 00 25 */ stb r4, 0x25(r3) /* 8029D89C 00266E5C 4E 80 00 20 */ blr - -.global func_8029D8A0 -func_8029D8A0: +.global lbl_8029D8A0 +lbl_8029D8A0: /* 8029D8A0 00266E60 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8A4 00266E64 98 83 AA 08 */ stb r4, lbl_8057AA08@l(r3) /* 8029D8A8 00266E68 4E 80 00 20 */ blr - -.global func_8029D8AC -func_8029D8AC: +.global lbl_8029D8AC +lbl_8029D8AC: /* 8029D8AC 00266E6C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8B0 00266E70 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D8B4 00266E74 98 83 00 01 */ stb r4, 1(r3) /* 8029D8B8 00266E78 4E 80 00 20 */ blr - -.global func_8029D8BC -func_8029D8BC: +.global lbl_8029D8BC +lbl_8029D8BC: /* 8029D8BC 00266E7C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8C0 00266E80 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D8C4 00266E84 98 83 00 02 */ stb r4, 2(r3) /* 8029D8C8 00266E88 4E 80 00 20 */ blr - -.global func_8029D8CC -func_8029D8CC: +.global lbl_8029D8CC +lbl_8029D8CC: /* 8029D8CC 00266E8C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8D0 00266E90 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D8D4 00266E94 98 83 00 03 */ stb r4, 3(r3) /* 8029D8D8 00266E98 4E 80 00 20 */ blr - -.global func_8029D8DC -func_8029D8DC: +.global lbl_8029D8DC +lbl_8029D8DC: /* 8029D8DC 00266E9C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8E0 00266EA0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D8E4 00266EA4 98 83 00 04 */ stb r4, 4(r3) /* 8029D8E8 00266EA8 4E 80 00 20 */ blr - -.global func_8029D8EC -func_8029D8EC: +.global lbl_8029D8EC +lbl_8029D8EC: /* 8029D8EC 00266EAC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D8F0 00266EB0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D8F4 00266EB4 98 83 00 05 */ stb r4, 5(r3) /* 8029D8F8 00266EB8 4E 80 00 20 */ blr - -.global func_8029D8FC -func_8029D8FC: +.global lbl_8029D8FC +lbl_8029D8FC: /* 8029D8FC 00266EBC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D900 00266EC0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D904 00266EC4 98 83 00 06 */ stb r4, 6(r3) /* 8029D908 00266EC8 4E 80 00 20 */ blr - -.global func_8029D90C -func_8029D90C: +.global lbl_8029D90C +lbl_8029D90C: /* 8029D90C 00266ECC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D910 00266ED0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D914 00266ED4 98 83 00 07 */ stb r4, 7(r3) /* 8029D918 00266ED8 4E 80 00 20 */ blr - -.global func_8029D91C -func_8029D91C: +.global lbl_8029D91C +lbl_8029D91C: /* 8029D91C 00266EDC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D920 00266EE0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D924 00266EE4 98 83 00 10 */ stb r4, 0x10(r3) /* 8029D928 00266EE8 4E 80 00 20 */ blr - -.global func_8029D92C -func_8029D92C: +.global lbl_8029D92C +lbl_8029D92C: /* 8029D92C 00266EEC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D930 00266EF0 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D934 00266EF4 98 83 00 11 */ stb r4, 0x11(r3) /* 8029D938 00266EF8 4E 80 00 20 */ blr - -.global func_8029D93C -func_8029D93C: +.global lbl_8029D93C +lbl_8029D93C: /* 8029D93C 00266EFC 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D940 00266F00 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D944 00266F04 98 83 00 30 */ stb r4, 0x30(r3) /* 8029D948 00266F08 4E 80 00 20 */ blr - -.global func_8029D94C -func_8029D94C: +.global lbl_8029D94C +lbl_8029D94C: /* 8029D94C 00266F0C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D950 00266F10 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D954 00266F14 98 83 00 32 */ stb r4, 0x32(r3) /* 8029D958 00266F18 4E 80 00 20 */ blr - -.global func_8029D95C -func_8029D95C: +.global lbl_8029D95C +lbl_8029D95C: /* 8029D95C 00266F1C 3C 60 80 58 */ lis r3, lbl_8057AA08@ha /* 8029D960 00266F20 38 63 AA 08 */ addi r3, r3, lbl_8057AA08@l /* 8029D964 00266F24 98 83 00 31 */ stb r4, 0x31(r3) diff --git a/asm/kyoshin/appgame/cf/code_802A07F4.s b/asm/kyoshin/appgame/cf/code_802A07F4.s index bf95127..6eb46de 100644 --- a/asm/kyoshin/appgame/cf/code_802A07F4.s +++ b/asm/kyoshin/appgame/cf/code_802A07F4.s @@ -9,8 +9,9 @@ func_802A07F4: /* 802A07FC 00269DBC 38 84 3E 9C */ addi r4, r4, 0x3e9c lbl_802A0800: /* 802A0800 00269DC0 4B DA 49 D8 */ b func_800451D8 -.global lbl_802A0804 -lbl_802A0804: + +.global func_802A0804 +func_802A0804: /* 802A0804 00269DC4 80 84 00 00 */ lwz r4, 0(r4) /* 802A0808 00269DC8 2C 04 00 00 */ cmpwi r4, 0 /* 802A080C 00269DCC 41 82 00 08 */ beq lbl_802A0814 diff --git a/asm/kyoshin/appgame/cf/code_802B48A0.s b/asm/kyoshin/appgame/cf/code_802B48A0.s index a3343e4..6325c5f 100644 --- a/asm/kyoshin/appgame/cf/code_802B48A0.s +++ b/asm/kyoshin/appgame/cf/code_802B48A0.s @@ -4198,8 +4198,9 @@ lbl_802B80D4: .global func_802B80EC func_802B80EC: /* 802B80EC 002816AC 4B F5 A3 A4 */ b func_80212490 -.global lbl_802B80F0 -lbl_802B80F0: + +.global func_802B80F0 +func_802B80F0: /* 802B80F0 002816B0 4B F0 6D 6C */ b func_801BEE5C .global func_802B80F4 @@ -4623,8 +4624,9 @@ func_802B8604: .global func_802B864C func_802B864C: /* 802B864C 00281C0C 4B ED 3B 34 */ b func_8018C180 -.global lbl_802B8650 -lbl_802B8650: + +.global func_802B8650 +func_802B8650: /* 802B8650 00281C10 4B ED 2D 48 */ b func_8018B398 .global func_802B8654 diff --git a/asm/monolithlib/code_8043738C.s b/asm/monolithlib/code_8043738C.s index 7930498..f6a4beb 100644 --- a/asm/monolithlib/code_8043738C.s +++ b/asm/monolithlib/code_8043738C.s @@ -8790,12 +8790,14 @@ func_8043EA88: func_8043EAC8: /* 8043EAC8 00408088 38 63 01 DC */ addi r3, r3, 0x1dc /* 8043EACC 0040808C 48 00 31 3C */ b func_80441C08 -.global lbl_8043EAD0 -lbl_8043EAD0: + +.global func_8043EAD0 +func_8043EAD0: /* 8043EAD0 00408090 38 63 01 DC */ addi r3, r3, 0x1dc /* 8043EAD4 00408094 48 00 34 0C */ b func_80441EE0 -.global lbl_8043EAD8 -lbl_8043EAD8: + +.global func_8043EAD8 +func_8043EAD8: /* 8043EAD8 00408098 38 63 01 DC */ addi r3, r3, 0x1dc /* 8043EADC 0040809C 48 00 30 DC */ b func_80441BB8 diff --git a/asm/monolithlib/code_80446538.s b/asm/monolithlib/code_80446538.s index 13fdd19..7a02ea8 100644 --- a/asm/monolithlib/code_80446538.s +++ b/asm/monolithlib/code_80446538.s @@ -1578,8 +1578,9 @@ func_80447A10: .global func_80447A30 func_80447A30: /* 80447A30 00410FF0 4B FF ED 3C */ b func_8044676C -.global lbl_80447A34 -lbl_80447A34: + +.global func_80447A34 +func_80447A34: /* 80447A34 00410FF4 81 83 01 C8 */ lwz r12, 0x1c8(r3) /* 80447A38 00410FF8 7D 89 03 A6 */ mtctr r12 /* 80447A3C 00410FFC 4E 80 04 20 */ bctr diff --git a/asm/monolithlib/code_80450B44.s b/asm/monolithlib/code_80450B44.s index 03dcbbc..910577c 100644 --- a/asm/monolithlib/code_80450B44.s +++ b/asm/monolithlib/code_80450B44.s @@ -5877,12 +5877,14 @@ func_804559A8: func_804559B4: /* 804559B4 0041EF74 38 63 FE 38 */ addi r3, r3, -456 /* 804559B8 0041EF78 4B FF FB 8C */ b func_80455544 -.global lbl_804559BC -lbl_804559BC: + +.global func_804559BC +func_804559BC: /* 804559BC 0041EF7C 38 63 FE 38 */ addi r3, r3, -456 /* 804559C0 0041EF80 4B FF FA D8 */ b func_80455498 -.global lbl_804559C4 -lbl_804559C4: + +.global func_804559C4 +func_804559C4: /* 804559C4 0041EF84 38 63 FE 38 */ addi r3, r3, -456 /* 804559C8 0041EF88 4B FF F8 30 */ b func_804551F8 @@ -10629,8 +10631,9 @@ func_80459ACC: .global func_80459AD0 func_80459AD0: /* 80459AD0 00423090 48 00 17 10 */ b func_8045B1E0 -.global lbl_80459AD4 -lbl_80459AD4: + +.global func_80459AD4 +func_80459AD4: /* 80459AD4 00423094 4E 80 00 20 */ blr .global func_80459AD8 @@ -10761,20 +10764,24 @@ func_80459C70: .global func_80459C74 func_80459C74: /* 80459C74 00423234 48 00 1F 2C */ b func_8045BBA0 -.global lbl_80459C78 -lbl_80459C78: + +.global func_80459C78 +func_80459C78: /* 80459C78 00423238 38 63 FE 3C */ addi r3, r3, -452 /* 80459C7C 0042323C 4B FF FE 5C */ b func_80459AD8 -.global lbl_80459C80 -lbl_80459C80: + +.global func_80459C80 +func_80459C80: /* 80459C80 00423240 38 63 FE 3C */ addi r3, r3, -452 /* 80459C84 00423244 4B FF FC 58 */ b func_804598DC -.global lbl_80459C88 -lbl_80459C88: + +.global func_80459C88 +func_80459C88: /* 80459C88 00423248 38 63 FE 38 */ addi r3, r3, -456 /* 80459C8C 0042324C 4B FF FF E8 */ b func_80459C74 -.global lbl_80459C90 -lbl_80459C90: + +.global func_80459C90 +func_80459C90: /* 80459C90 00423250 38 63 FE 38 */ addi r3, r3, -456 /* 80459C94 00423254 4B FF FC 48 */ b func_804598DC diff --git a/asm/monolithlib/code_8046A530.s b/asm/monolithlib/code_8046A530.s index 9369705..75c9050 100644 --- a/asm/monolithlib/code_8046A530.s +++ b/asm/monolithlib/code_8046A530.s @@ -388,7 +388,9 @@ lbl_8046A9C0: .global func_8046AAD8 func_8046AAD8: /* 8046AAD8 00434098 48 00 00 7C */ b func_8046AB54 -lbl_8046AADC: + +.global func_8046AADC +func_8046AADC: /* 8046AADC 0043409C 2C 04 00 00 */ cmpwi r4, 0 /* 8046AAE0 004340A0 90 83 12 1C */ stw r4, 0x121c(r3) /* 8046AAE4 004340A4 40 82 00 18 */ bne lbl_8046AAFC @@ -5277,7 +5279,7 @@ lbl_8046F07C: .global func_8046F088 func_8046F088: /* 8046F088 00438648 38 63 0A BC */ addi r3, r3, 0xabc -/* 8046F08C 0043864C 4B FF BA 50 */ b lbl_8046AADC +/* 8046F08C 0043864C 4B FF BA 50 */ b func_8046AADC .global func_8046F090 func_8046F090: diff --git a/asm/monolithlib/code_80481E6C.s b/asm/monolithlib/code_80481E6C.s index f76d609..5d7dc05 100644 --- a/asm/monolithlib/code_80481E6C.s +++ b/asm/monolithlib/code_80481E6C.s @@ -134,8 +134,9 @@ func_80481F9C: func_80482038: /* 80482038 0044B5F8 38 63 02 B8 */ addi r3, r3, 0x2b8 /* 8048203C 0044B5FC 4B F8 A1 20 */ b IntersectSphere__Q34nw4r4math7FRUSTUMCFPCQ34nw4r4math6SPHERE -.global lbl_80482040 -lbl_80482040: + +.global func_80482040 +func_80482040: /* 80482040 0044B600 38 60 00 00 */ li r3, 0 /* 80482044 0044B604 4E 80 00 20 */ blr @@ -401,8 +402,9 @@ func_80482388: func_80482398: /* 80482398 0044B958 7C 84 07 34 */ extsh r4, r4 /* 8048239C 0044B95C 48 00 00 A4 */ b func_80482440 -.global lbl_804823A0 -lbl_804823A0: + +.global func_804823A0 +func_804823A0: /* 804823A0 0044B960 38 63 11 D8 */ addi r3, r3, 0x11d8 /* 804823A4 0044B964 4E 80 00 20 */ blr @@ -5026,11 +5028,13 @@ lbl_80486048: func_80486068: /* 80486068 0044F628 39 00 00 66 */ li r8, 0x66 /* 8048606C 0044F62C 48 00 39 F4 */ b func_80489A60 -.global lbl_80486070 -lbl_80486070: + +.global func_80486070 +func_80486070: /* 80486070 0044F630 48 00 3C 24 */ b func_80489C94 -.global lbl_80486074 -lbl_80486074: + +.global func_80486074 +func_80486074: /* 80486074 0044F634 38 60 00 00 */ li r3, 0 /* 80486078 0044F638 4E 80 00 20 */ blr @@ -7140,12 +7144,14 @@ lbl_80487E08: func_80487E40: /* 80487E40 00451400 38 63 17 00 */ addi r3, r3, 0x1700 /* 80487E44 00451404 48 05 E9 58 */ b func_804E679C -.global lbl_80487E48 -lbl_80487E48: + +.global func_80487E48 +func_80487E48: /* 80487E48 00451408 38 63 17 00 */ addi r3, r3, 0x1700 /* 80487E4C 0045140C 48 05 EA 4C */ b func_804E6898 -.global lbl_80487E50 -lbl_80487E50: + +.global func_80487E50 +func_80487E50: /* 80487E50 00451410 80 63 17 08 */ lwz r3, 0x1708(r3) /* 80487E54 00451414 4E 80 00 20 */ blr @@ -11710,32 +11716,39 @@ func_8048BD50: func_8048BD54: /* 8048BD54 00455314 38 63 EB 9C */ addi r3, r3, -5220 /* 8048BD58 00455318 4B FF D4 A8 */ b func_80489200 -.global lbl_8048BD5C -lbl_8048BD5C: + +.global func_8048BD5C +func_8048BD5C: /* 8048BD5C 0045531C 38 63 EB 9C */ addi r3, r3, -5220 /* 8048BD60 00455320 4B FF D4 1C */ b func_8048917C -.global lbl_8048BD64 -lbl_8048BD64: + +.global func_8048BD64 +func_8048BD64: /* 8048BD64 00455324 38 63 EB 9C */ addi r3, r3, -5220 /* 8048BD68 00455328 4B FF D2 AC */ b func_80489014 -.global lbl_8048BD6C -lbl_8048BD6C: + +.global func_8048BD6C +func_8048BD6C: /* 8048BD6C 0045532C 38 63 EB 9C */ addi r3, r3, -5220 /* 8048BD70 00455330 4B FF B4 D8 */ b func_80487248 -.global lbl_8048BD74 -lbl_8048BD74: + +.global func_8048BD74 +func_8048BD74: /* 8048BD74 00455334 38 63 EB 98 */ addi r3, r3, -5224 /* 8048BD78 00455338 4B FF DC 7C */ b func_804899F4 -.global lbl_8048BD7C -lbl_8048BD7C: + +.global func_8048BD7C +func_8048BD7C: /* 8048BD7C 0045533C 38 63 EB 98 */ addi r3, r3, -5224 /* 8048BD80 00455340 4B FF DB A4 */ b func_80489924 -.global lbl_8048BD84 -lbl_8048BD84: + +.global func_8048BD84 +func_8048BD84: /* 8048BD84 00455344 38 63 EB 98 */ addi r3, r3, -5224 /* 8048BD88 00455348 4B FF D7 FC */ b func_80489584 -.global lbl_8048BD8C -lbl_8048BD8C: + +.global func_8048BD8C +func_8048BD8C: /* 8048BD8C 0045534C 38 63 EB 98 */ addi r3, r3, -5224 /* 8048BD90 00455350 4B FF B4 B8 */ b func_80487248 diff --git a/asm/monolithlib/code_8048EAA8.s b/asm/monolithlib/code_8048EAA8.s index 8ea0a5d..f46b6f5 100644 --- a/asm/monolithlib/code_8048EAA8.s +++ b/asm/monolithlib/code_8048EAA8.s @@ -199,16 +199,19 @@ func_8048ECFC: func_8048ED04: /* 8048ED04 004582C4 80 63 00 8C */ lwz r3, 0x8c(r3) /* 8048ED08 004582C8 48 00 11 24 */ b func_8048FE2C -.global lbl_8048ED0C -lbl_8048ED0C: + +.global func_8048ED0C +func_8048ED0C: /* 8048ED0C 004582CC 38 63 FF AC */ addi r3, r3, -84 /* 8048ED10 004582D0 48 00 7C 60 */ b func_80496970 -.global lbl_8048ED14 -lbl_8048ED14: + +.global func_8048ED14 +func_8048ED14: /* 8048ED14 004582D4 38 63 FF AC */ addi r3, r3, -84 /* 8048ED18 004582D8 48 00 7C 44 */ b func_8049695C -.global lbl_8048ED1C -lbl_8048ED1C: + +.global func_8048ED1C +func_8048ED1C: /* 8048ED1C 004582DC 38 63 FF AC */ addi r3, r3, -84 /* 8048ED20 004582E0 4B FF FE 9C */ b func_8048EBBC diff --git a/asm/monolithlib/code_8049431C.s b/asm/monolithlib/code_8049431C.s index 37971ad..524069a 100644 --- a/asm/monolithlib/code_8049431C.s +++ b/asm/monolithlib/code_8049431C.s @@ -1940,7 +1940,7 @@ func_80495E94: .global lbl_80495EA4 lbl_80495EA4: /* 80495EA4 0045F464 38 A0 00 08 */ li r5, 8 -/* 80495EA8 0045F468 4B FF 01 C8 */ b lbl_80486070 +/* 80495EA8 0045F468 4B FF 01 C8 */ b func_80486070 .global func_80495EAC func_80495EAC: @@ -2807,7 +2807,7 @@ func_80496994: .global func_80496998 func_80496998: -/* 80496998 0045FF58 48 00 4A 70 */ b lbl_8049B408 +/* 80496998 0045FF58 48 00 4A 70 */ b func_8049B408 .global func_8049699C func_8049699C: @@ -8067,7 +8067,9 @@ func_8049B3FC: /* 8049B3FC 004649BC 80 6D A1 A8 */ lwz r3, lbl_80666328@sda21(r13) /* 8049B400 004649C0 38 80 00 00 */ li r4, 0 /* 8049B404 004649C4 4B F9 F3 08 */ b func_8043A70C -lbl_8049B408: + +.global func_8049B408 +func_8049B408: /* 8049B408 004649C8 80 6D A1 A8 */ lwz r3, lbl_80666328@sda21(r13) /* 8049B40C 004649CC 4B F9 F1 70 */ b func_8043A57C @@ -8828,16 +8830,19 @@ lbl_8049BE90: func_8049BEA4: /* 8049BEA4 00465464 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEA8 00465468 4B FF 9F B8 */ b func_80495E60 -.global lbl_8049BEAC -lbl_8049BEAC: + +.global func_8049BEAC +func_8049BEAC: /* 8049BEAC 0046546C 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEB0 00465470 4B FE 8F AC */ b func_80484E5C -.global lbl_8049BEB4 -lbl_8049BEB4: + +.global func_8049BEB4 +func_8049BEB4: /* 8049BEB4 00465474 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEB8 00465478 4B FE 7A 24 */ b func_804838DC -.global lbl_8049BEBC -lbl_8049BEBC: + +.global func_8049BEBC +func_8049BEBC: /* 8049BEBC 0046547C 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEC0 00465480 81 83 00 00 */ lwz r12, 0(r3) /* 8049BEC4 00465484 81 8C 00 B4 */ lwz r12, 0xb4(r12) @@ -8856,8 +8861,9 @@ func_8049BED0: func_8049BEE4: /* 8049BEE4 004654A4 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEE8 004654A8 4B FE 72 74 */ b func_8048315C -.global lbl_8049BEEC -lbl_8049BEEC: + +.global func_8049BEEC +func_8049BEEC: /* 8049BEEC 004654AC 80 63 00 04 */ lwz r3, 4(r3) /* 8049BEF0 004654B0 80 04 00 00 */ lwz r0, 0(r4) /* 8049BEF4 004654B4 90 03 03 04 */ stw r0, 0x304(r3) @@ -9210,16 +9216,19 @@ lbl_8049C380: func_8049C394: /* 8049C394 00465954 80 63 00 04 */ lwz r3, 4(r3) /* 8049C398 00465958 4B FE 67 20 */ b func_80482AB8 -.global lbl_8049C39C -lbl_8049C39C: + +.global func_8049C39C +func_8049C39C: /* 8049C39C 0046595C 80 63 00 04 */ lwz r3, 4(r3) /* 8049C3A0 00465960 4B FE 67 34 */ b func_80482AD4 -.global lbl_8049C3A4 -lbl_8049C3A4: + +.global func_8049C3A4 +func_8049C3A4: /* 8049C3A4 00465964 80 63 00 04 */ lwz r3, 4(r3) /* 8049C3A8 00465968 4B FE C1 C4 */ b func_8048856C -.global lbl_8049C3AC -lbl_8049C3AC: + +.global func_8049C3AC +func_8049C3AC: /* 8049C3AC 0046596C 80 A3 00 04 */ lwz r5, 4(r3) /* 8049C3B0 00465970 38 60 00 01 */ li r3, 1 /* 8049C3B4 00465974 38 80 00 01 */ li r4, 1 diff --git a/asm/nw4r/g3d/g3d_anmclr.s b/asm/nw4r/g3d/g3d_anmclr.s index 50eb690..1145aeb 100644 --- a/asm/nw4r/g3d/g3d_anmclr.s +++ b/asm/nw4r/g3d/g3d_anmclr.s @@ -548,11 +548,11 @@ ApplyClrAnmResult__Q24nw4r3g3dFQ34nw4r3g3d10ResMatChanQ34nw4r3g3d14ResMatTevColo /* 803E22F8 003AB8B8 38 81 00 7C */ addi r4, r1, 0x7c /* 803E22FC 003AB8BC 80 1C 00 04 */ lwz r0, 4(r28) /* 803E2300 003AB8C0 90 01 00 7C */ stw r0, 0x7c(r1) -/* 803E2304 003AB8C4 48 00 04 D5 */ bl func_803E27D8 +/* 803E2304 003AB8C4 48 00 04 D5 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2308 003AB8C8 80 BF 00 04 */ lwz r5, 4(r31) /* 803E230C 003AB8CC 38 61 00 74 */ addi r3, r1, 0x74 /* 803E2310 003AB8D0 38 81 00 78 */ addi r4, r1, 0x78 -/* 803E2314 003AB8D4 48 00 04 D5 */ bl func_803E27E8 +/* 803E2314 003AB8D4 48 00 04 D5 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2318 003AB8D8 88 01 00 74 */ lbz r0, 0x74(r1) /* 803E231C 003AB8DC 98 1C 00 04 */ stb r0, 4(r28) /* 803E2320 003AB8E0 88 01 00 75 */ lbz r0, 0x75(r1) @@ -571,11 +571,11 @@ lbl_803E2338: /* 803E2350 003AB910 38 81 00 7C */ addi r4, r1, 0x7c /* 803E2354 003AB914 80 1C 00 08 */ lwz r0, 8(r28) /* 803E2358 003AB918 90 01 00 7C */ stw r0, 0x7c(r1) -/* 803E235C 003AB91C 48 00 04 7D */ bl func_803E27D8 +/* 803E235C 003AB91C 48 00 04 7D */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2360 003AB920 80 BF 00 0C */ lwz r5, 0xc(r31) /* 803E2364 003AB924 38 61 00 6C */ addi r3, r1, 0x6c /* 803E2368 003AB928 38 81 00 70 */ addi r4, r1, 0x70 -/* 803E236C 003AB92C 48 00 04 7D */ bl func_803E27E8 +/* 803E236C 003AB92C 48 00 04 7D */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2370 003AB930 88 01 00 6C */ lbz r0, 0x6c(r1) /* 803E2374 003AB934 98 1C 00 08 */ stb r0, 8(r28) /* 803E2378 003AB938 88 01 00 6D */ lbz r0, 0x6d(r1) @@ -594,11 +594,11 @@ lbl_803E2390: /* 803E23A8 003AB968 38 81 00 7C */ addi r4, r1, 0x7c /* 803E23AC 003AB96C 80 1C 00 18 */ lwz r0, 0x18(r28) /* 803E23B0 003AB970 90 01 00 7C */ stw r0, 0x7c(r1) -/* 803E23B4 003AB974 48 00 04 25 */ bl func_803E27D8 +/* 803E23B4 003AB974 48 00 04 25 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E23B8 003AB978 80 BF 00 08 */ lwz r5, 8(r31) /* 803E23BC 003AB97C 38 61 00 64 */ addi r3, r1, 0x64 /* 803E23C0 003AB980 38 81 00 68 */ addi r4, r1, 0x68 -/* 803E23C4 003AB984 48 00 04 25 */ bl func_803E27E8 +/* 803E23C4 003AB984 48 00 04 25 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E23C8 003AB988 88 01 00 64 */ lbz r0, 0x64(r1) /* 803E23CC 003AB98C 98 1C 00 18 */ stb r0, 0x18(r28) /* 803E23D0 003AB990 88 01 00 65 */ lbz r0, 0x65(r1) @@ -617,11 +617,11 @@ lbl_803E23E8: /* 803E2400 003AB9C0 38 81 00 7C */ addi r4, r1, 0x7c /* 803E2404 003AB9C4 80 1D 00 1C */ lwz r0, 0x1c(r29) /* 803E2408 003AB9C8 90 01 00 7C */ stw r0, 0x7c(r1) -/* 803E240C 003AB9CC 48 00 03 CD */ bl func_803E27D8 +/* 803E240C 003AB9CC 48 00 03 CD */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2410 003AB9D0 80 BF 00 10 */ lwz r5, 0x10(r31) /* 803E2414 003AB9D4 38 61 00 5C */ addi r3, r1, 0x5c /* 803E2418 003AB9D8 38 81 00 60 */ addi r4, r1, 0x60 -/* 803E241C 003AB9DC 48 00 03 CD */ bl func_803E27E8 +/* 803E241C 003AB9DC 48 00 03 CD */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2420 003AB9E0 88 01 00 5C */ lbz r0, 0x5c(r1) /* 803E2424 003AB9E4 98 1D 00 1C */ stb r0, 0x1c(r29) /* 803E2428 003AB9E8 88 01 00 5D */ lbz r0, 0x5d(r1) @@ -648,11 +648,11 @@ lbl_803E2474: /* 803E2474 003ABA34 80 BF 00 40 */ lwz r5, 0x40(r31) /* 803E2478 003ABA38 38 61 00 54 */ addi r3, r1, 0x54 /* 803E247C 003ABA3C 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E2480 003ABA40 48 00 03 59 */ bl func_803E27D8 +/* 803E2480 003ABA40 48 00 03 59 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2484 003ABA44 80 BF 00 14 */ lwz r5, 0x14(r31) /* 803E2488 003ABA48 38 61 00 50 */ addi r3, r1, 0x50 /* 803E248C 003ABA4C 38 81 00 54 */ addi r4, r1, 0x54 -/* 803E2490 003ABA50 48 00 03 59 */ bl func_803E27E8 +/* 803E2490 003ABA50 48 00 03 59 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2494 003ABA54 89 01 00 50 */ lbz r8, 0x50(r1) /* 803E2498 003ABA58 38 A1 00 58 */ addi r5, r1, 0x58 /* 803E249C 003ABA5C 88 E1 00 51 */ lbz r7, 0x51(r1) @@ -681,11 +681,11 @@ lbl_803E24F0: /* 803E24F0 003ABAB0 80 BF 00 44 */ lwz r5, 0x44(r31) /* 803E24F4 003ABAB4 38 61 00 48 */ addi r3, r1, 0x48 /* 803E24F8 003ABAB8 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E24FC 003ABABC 48 00 02 DD */ bl func_803E27D8 +/* 803E24FC 003ABABC 48 00 02 DD */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2500 003ABAC0 80 BF 00 18 */ lwz r5, 0x18(r31) /* 803E2504 003ABAC4 38 61 00 44 */ addi r3, r1, 0x44 /* 803E2508 003ABAC8 38 81 00 48 */ addi r4, r1, 0x48 -/* 803E250C 003ABACC 48 00 02 DD */ bl func_803E27E8 +/* 803E250C 003ABACC 48 00 02 DD */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2510 003ABAD0 89 01 00 44 */ lbz r8, 0x44(r1) /* 803E2514 003ABAD4 38 A1 00 4C */ addi r5, r1, 0x4c /* 803E2518 003ABAD8 88 E1 00 45 */ lbz r7, 0x45(r1) @@ -714,11 +714,11 @@ lbl_803E256C: /* 803E256C 003ABB2C 80 BF 00 48 */ lwz r5, 0x48(r31) /* 803E2570 003ABB30 38 61 00 3C */ addi r3, r1, 0x3c /* 803E2574 003ABB34 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E2578 003ABB38 48 00 02 61 */ bl func_803E27D8 +/* 803E2578 003ABB38 48 00 02 61 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E257C 003ABB3C 80 BF 00 1C */ lwz r5, 0x1c(r31) /* 803E2580 003ABB40 38 61 00 38 */ addi r3, r1, 0x38 /* 803E2584 003ABB44 38 81 00 3C */ addi r4, r1, 0x3c -/* 803E2588 003ABB48 48 00 02 61 */ bl func_803E27E8 +/* 803E2588 003ABB48 48 00 02 61 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E258C 003ABB4C 89 01 00 38 */ lbz r8, 0x38(r1) /* 803E2590 003ABB50 38 A1 00 40 */ addi r5, r1, 0x40 /* 803E2594 003ABB54 88 E1 00 39 */ lbz r7, 0x39(r1) @@ -747,11 +747,11 @@ lbl_803E25E8: /* 803E25E8 003ABBA8 80 BF 00 4C */ lwz r5, 0x4c(r31) /* 803E25EC 003ABBAC 38 61 00 30 */ addi r3, r1, 0x30 /* 803E25F0 003ABBB0 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E25F4 003ABBB4 48 00 01 E5 */ bl func_803E27D8 +/* 803E25F4 003ABBB4 48 00 01 E5 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E25F8 003ABBB8 80 BF 00 20 */ lwz r5, 0x20(r31) /* 803E25FC 003ABBBC 38 61 00 2C */ addi r3, r1, 0x2c /* 803E2600 003ABBC0 38 81 00 30 */ addi r4, r1, 0x30 -/* 803E2604 003ABBC4 48 00 01 E5 */ bl func_803E27E8 +/* 803E2604 003ABBC4 48 00 01 E5 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2608 003ABBC8 89 01 00 2C */ lbz r8, 0x2c(r1) /* 803E260C 003ABBCC 38 A1 00 34 */ addi r5, r1, 0x34 /* 803E2610 003ABBD0 88 E1 00 2D */ lbz r7, 0x2d(r1) @@ -780,11 +780,11 @@ lbl_803E2664: /* 803E2664 003ABC24 80 BF 00 50 */ lwz r5, 0x50(r31) /* 803E2668 003ABC28 38 61 00 24 */ addi r3, r1, 0x24 /* 803E266C 003ABC2C 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E2670 003ABC30 48 00 01 69 */ bl func_803E27D8 +/* 803E2670 003ABC30 48 00 01 69 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E2674 003ABC34 80 BF 00 24 */ lwz r5, 0x24(r31) /* 803E2678 003ABC38 38 61 00 20 */ addi r3, r1, 0x20 /* 803E267C 003ABC3C 38 81 00 24 */ addi r4, r1, 0x24 -/* 803E2680 003ABC40 48 00 01 69 */ bl func_803E27E8 +/* 803E2680 003ABC40 48 00 01 69 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2684 003ABC44 89 01 00 20 */ lbz r8, 0x20(r1) /* 803E2688 003ABC48 38 A1 00 28 */ addi r5, r1, 0x28 /* 803E268C 003ABC4C 88 E1 00 21 */ lbz r7, 0x21(r1) @@ -813,11 +813,11 @@ lbl_803E26E0: /* 803E26E0 003ABCA0 80 BF 00 54 */ lwz r5, 0x54(r31) /* 803E26E4 003ABCA4 38 61 00 18 */ addi r3, r1, 0x18 /* 803E26E8 003ABCA8 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E26EC 003ABCAC 48 00 00 ED */ bl func_803E27D8 +/* 803E26EC 003ABCAC 48 00 00 ED */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E26F0 003ABCB0 80 BF 00 28 */ lwz r5, 0x28(r31) /* 803E26F4 003ABCB4 38 61 00 14 */ addi r3, r1, 0x14 /* 803E26F8 003ABCB8 38 81 00 18 */ addi r4, r1, 0x18 -/* 803E26FC 003ABCBC 48 00 00 ED */ bl func_803E27E8 +/* 803E26FC 003ABCBC 48 00 00 ED */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E2700 003ABCC0 89 01 00 14 */ lbz r8, 0x14(r1) /* 803E2704 003ABCC4 38 A1 00 1C */ addi r5, r1, 0x1c /* 803E2708 003ABCC8 88 E1 00 15 */ lbz r7, 0x15(r1) @@ -846,11 +846,11 @@ lbl_803E275C: /* 803E275C 003ABD1C 80 BF 00 58 */ lwz r5, 0x58(r31) /* 803E2760 003ABD20 38 61 00 0C */ addi r3, r1, 0xc /* 803E2764 003ABD24 38 81 00 7C */ addi r4, r1, 0x7c -/* 803E2768 003ABD28 48 00 00 71 */ bl func_803E27D8 +/* 803E2768 003ABD28 48 00 00 71 */ bl __ad__Q34nw4r2ut5ColorCFUl /* 803E276C 003ABD2C 80 BF 00 2C */ lwz r5, 0x2c(r31) /* 803E2770 003ABD30 38 61 00 08 */ addi r3, r1, 8 /* 803E2774 003ABD34 38 81 00 0C */ addi r4, r1, 0xc -/* 803E2778 003ABD38 48 00 00 71 */ bl func_803E27E8 +/* 803E2778 003ABD38 48 00 00 71 */ bl __or__Q34nw4r2ut5ColorCFUl /* 803E277C 003ABD3C 89 01 00 08 */ lbz r8, 8(r1) /* 803E2780 003ABD40 38 A1 00 10 */ addi r5, r1, 0x10 /* 803E2784 003ABD44 88 E1 00 09 */ lbz r7, 9(r1) @@ -877,15 +877,15 @@ lbl_803E27B8: /* 803E27D0 003ABD90 38 21 00 90 */ addi r1, r1, 0x90 /* 803E27D4 003ABD94 4E 80 00 20 */ blr -.global func_803E27D8 -func_803E27D8: +.global __ad__Q34nw4r2ut5ColorCFUl +__ad__Q34nw4r2ut5ColorCFUl: /* 803E27D8 003ABD98 80 04 00 00 */ lwz r0, 0(r4) /* 803E27DC 003ABD9C 7C A0 00 38 */ and r0, r5, r0 /* 803E27E0 003ABDA0 90 03 00 00 */ stw r0, 0(r3) /* 803E27E4 003ABDA4 4E 80 00 20 */ blr -.global func_803E27E8 -func_803E27E8: +.global __or__Q34nw4r2ut5ColorCFUl +__or__Q34nw4r2ut5ColorCFUl: /* 803E27E8 003ABDA8 80 04 00 00 */ lwz r0, 0(r4) /* 803E27EC 003ABDAC 7C A0 03 78 */ or r0, r5, r0 /* 803E27F0 003ABDB0 90 03 00 00 */ stw r0, 0(r3) diff --git a/asm/nw4r/g3d/g3d_anmscn.s b/asm/nw4r/g3d/g3d_anmscn.s index 5a6102d..f422d0f 100644 --- a/asm/nw4r/g3d/g3d_anmscn.s +++ b/asm/nw4r/g3d/g3d_anmscn.s @@ -217,7 +217,7 @@ lbl_803E6038: /* 803E6038 003AF5F8 7F A4 EB 78 */ mr r4, r29 /* 803E603C 003AF5FC 7F C5 F3 78 */ mr r5, r30 /* 803E6040 003AF600 38 61 00 30 */ addi r3, r1, 0x30 -/* 803E6044 003AF604 48 00 02 79 */ bl func_803E62BC +/* 803E6044 003AF604 48 00 02 79 */ bl GetLightSet__Q34nw4r3g3d12LightSettingFi /* 803E6048 003AF608 80 81 00 30 */ lwz r4, 0x30(r1) /* 803E604C 003AF60C 7F 83 E3 78 */ mr r3, r28 /* 803E6050 003AF610 80 01 00 34 */ lwz r0, 0x34(r1) @@ -393,8 +393,8 @@ lbl_803E62A4: /* 803E62B4 003AF874 38 21 00 60 */ addi r1, r1, 0x60 /* 803E62B8 003AF878 4E 80 00 20 */ blr -.global func_803E62BC -func_803E62BC: +.global GetLightSet__Q34nw4r3g3d12LightSettingFi +GetLightSet__Q34nw4r3g3d12LightSettingFi: /* 803E62BC 003AF87C A0 04 00 02 */ lhz r0, 2(r4) /* 803E62C0 003AF880 7C 05 00 00 */ cmpw r5, r0 /* 803E62C4 003AF884 40 80 00 24 */ bge lbl_803E62E8 diff --git a/asm/nw4r/g3d/g3d_state.s b/asm/nw4r/g3d/g3d_state.s index 38a6a6d..e9b71ca 100644 --- a/asm/nw4r/g3d/g3d_state.s +++ b/asm/nw4r/g3d/g3d_state.s @@ -695,7 +695,6 @@ lbl_803E8564: /* 803E8570 003B1B30 38 21 00 10 */ addi r1, r1, 0x10 /* 803E8574 003B1B34 4E 80 00 20 */ blr -#may not be this .global __dt__Q34nw4r3g3d12LightSettingFv __dt__Q34nw4r3g3d12LightSettingFv: /* 803E8578 003B1B38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -811,7 +810,6 @@ lbl_803E86E0: /* 803E86F0 003B1CB0 38 21 00 20 */ addi r1, r1, 0x20 /* 803E86F4 003B1CB4 4E 80 00 20 */ blr -#not sure about this function #SetLightObj__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@10LightStateFRCQ34nw4r3g3d8LightObji .global SetLightObj__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFRCQ34nw4r3g3d8LightObji SetLightObj__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFRCQ34nw4r3g3d8LightObji: @@ -3995,8 +3993,8 @@ lbl_803EB2F8: /* 803EB36C 003B492C 90 04 00 00 */ stw r0, 0(r4) /* 803EB370 003B4930 4E 80 00 20 */ blr -.global func_803EB374 -func_803EB374: +.global __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv +__dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv: /* 803EB374 003B4934 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803EB378 003B4938 7C 08 02 A6 */ mflr r0 /* 803EB37C 003B493C 2C 03 00 00 */ cmpwi r3, 0 @@ -4129,12 +4127,12 @@ lbl_803EB4FC: /* 803EB55C 003B4B1C 4B EC E5 A5 */ bl __construct_array /* 803EB560 003B4B20 38 00 FF FF */ li r0, -1 /* 803EB564 003B4B24 3B C0 00 00 */ li r30, 0 -/* 803EB568 003B4B28 3C 80 80 3F */ lis r4, func_803EB648@ha +/* 803EB568 003B4B28 3C 80 80 3F */ lis r4, __dt__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFv@ha /* 803EB56C 003B4B2C 90 1C 00 10 */ stw r0, 0x10(r28) /* 803EB570 003B4B30 7F 83 E3 78 */ mr r3, r28 /* 803EB574 003B4B34 38 BF 10 48 */ addi r5, r31, 0x1048 /* 803EB578 003B4B38 93 DC 00 14 */ stw r30, 0x14(r28) -/* 803EB57C 003B4B3C 38 84 B6 48 */ addi r4, r4, func_803EB648@l +/* 803EB57C 003B4B3C 38 84 B6 48 */ addi r4, r4, __dt__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFv@l /* 803EB580 003B4B40 93 DC 00 18 */ stw r30, 0x18(r28) /* 803EB584 003B4B44 93 DC 00 1C */ stw r30, 0x1c(r28) /* 803EB588 003B4B48 93 DC 00 20 */ stw r30, 0x20(r28) @@ -4169,10 +4167,10 @@ lbl_803EB5DC: /* 803EB5F8 003B4BB8 38 7C 00 68 */ addi r3, r28, 0x68 /* 803EB5FC 003B4BBC 4B F6 1B E5 */ bl PSMTXIdentity /* 803EB600 003B4BC0 38 00 00 00 */ li r0, 0 -/* 803EB604 003B4BC4 3C 80 80 3F */ lis r4, func_803EB374@ha +/* 803EB604 003B4BC4 3C 80 80 3F */ lis r4, __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv@ha /* 803EB608 003B4BC8 98 1C 00 06 */ stb r0, 6(r28) /* 803EB60C 003B4BCC 38 7F 55 00 */ addi r3, r31, 0x5500 -/* 803EB610 003B4BD0 38 84 B3 74 */ addi r4, r4, func_803EB374@l +/* 803EB610 003B4BD0 38 84 B3 74 */ addi r4, r4, __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv@l /* 803EB614 003B4BD4 38 BF 54 F0 */ addi r5, r31, 0x54f0 /* 803EB618 003B4BD8 98 1C 00 05 */ stb r0, 5(r28) /* 803EB61C 003B4BDC 98 1C 00 04 */ stb r0, 4(r28) @@ -4187,8 +4185,9 @@ lbl_803EB5DC: /* 803EB640 003B4C00 38 21 00 20 */ addi r1, r1, 0x20 /* 803EB644 003B4C04 4E 80 00 20 */ blr -.global func_803EB648 -func_803EB648: +#__dt__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@10LightStateFv +.global __dt__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFv +__dt__Q54nw4r3g3d8G3DState23_unnamed_g3d_state_cpp_10LightStateFv: /* 803EB648 003B4C08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803EB64C 003B4C0C 7C 08 02 A6 */ mflr r0 /* 803EB650 003B4C10 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/nw4r/snd/snd_AxVoiceManager.s b/asm/nw4r/snd/snd_AxVoiceManager.s index 2fdbb5b..e24640e 100644 --- a/asm/nw4r/snd/snd_AxVoiceManager.s +++ b/asm/nw4r/snd/snd_AxVoiceManager.s @@ -13,14 +13,14 @@ GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv: /* 80410B98 003DA158 3C C0 80 64 */ lis r6, lbl_8063B174@ha /* 80410B9C 003DA15C 38 00 00 00 */ li r0, 0 /* 80410BA0 003DA160 38 66 B1 74 */ addi r3, r6, lbl_8063B174@l -/* 80410BA4 003DA164 3C 80 80 41 */ lis r4, func_80410C24@ha +/* 80410BA4 003DA164 3C 80 80 41 */ lis r4, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@ha /* 80410BA8 003DA168 90 03 00 04 */ stw r0, 4(r3) /* 80410BAC 003DA16C 39 23 00 04 */ addi r9, r3, 4 /* 80410BB0 003DA170 39 03 00 10 */ addi r8, r3, 0x10 /* 80410BB4 003DA174 38 E3 00 1C */ addi r7, r3, 0x1c /* 80410BB8 003DA178 90 03 00 08 */ stw r0, 8(r3) /* 80410BBC 003DA17C 3C A0 80 64 */ lis r5, lbl_8063B168@ha -/* 80410BC0 003DA180 38 84 0C 24 */ addi r4, r4, func_80410C24@l +/* 80410BC0 003DA180 38 84 0C 24 */ addi r4, r4, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@l /* 80410BC4 003DA184 90 03 00 10 */ stw r0, 0x10(r3) /* 80410BC8 003DA188 38 A5 B1 68 */ addi r5, r5, lbl_8063B168@l /* 80410BCC 003DA18C 90 03 00 14 */ stw r0, 0x14(r3) @@ -47,8 +47,8 @@ lbl_80410C0C: /* 80410C1C 003DA1DC 38 21 00 10 */ addi r1, r1, 0x10 /* 80410C20 003DA1E0 4E 80 00 20 */ blr -.global func_80410C24 -func_80410C24: +.global __dt__Q44nw4r3snd6detail14AxVoiceManagerFv +__dt__Q44nw4r3snd6detail14AxVoiceManagerFv: /* 80410C24 003DA1E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80410C28 003DA1E8 7C 08 02 A6 */ mflr r0 /* 80410C2C 003DA1EC 2C 03 00 00 */ cmpwi r3, 0 @@ -356,7 +356,7 @@ AcquireAxVoice__Q44nw4r3snd6detail14AxVoiceManagerFUlPFPQ44nw4r3snd6detail7AxVoi /* 80411044 003DA604 3F 60 80 64 */ lis r27, lbl_8063B174@ha /* 80411048 003DA608 3B 80 00 00 */ li r28, 0 /* 8041104C 003DA60C 3B 5B B1 74 */ addi r26, r27, lbl_8063B174@l -/* 80411050 003DA610 3F A0 80 41 */ lis r29, func_80410C24@ha +/* 80411050 003DA610 3F A0 80 41 */ lis r29, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@ha /* 80411054 003DA614 3F C0 80 64 */ lis r30, lbl_8063B168@ha /* 80411058 003DA618 3B E0 00 01 */ li r31, 1 /* 8041105C 003DA61C 3A 1A 00 10 */ addi r16, r26, 0x10 @@ -382,7 +382,7 @@ lbl_8041108C: /* 804110A4 003DA664 39 1A 00 1C */ addi r8, r26, 0x1c /* 804110A8 003DA668 93 9A 00 08 */ stw r28, 8(r26) /* 804110AC 003DA66C 7F 43 D3 78 */ mr r3, r26 -/* 804110B0 003DA670 38 9D 0C 24 */ addi r4, r29, func_80410C24@l +/* 804110B0 003DA670 38 9D 0C 24 */ addi r4, r29, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@l /* 804110B4 003DA674 38 BE B1 68 */ addi r5, r30, lbl_8063B168@l /* 804110B8 003DA678 93 9A 00 10 */ stw r28, 0x10(r26) /* 804110BC 003DA67C 93 9A 00 14 */ stw r28, 0x14(r26) @@ -645,7 +645,7 @@ FreeAllReservedAxVoice__Q44nw4r3snd6detail14AxVoiceManagerFv: /* 80411458 003DAA18 3E E0 80 64 */ lis r23, lbl_8063B174@ha /* 8041145C 003DAA1C 3B 00 00 00 */ li r24, 0 /* 80411460 003DAA20 3A D7 B1 74 */ addi r22, r23, lbl_8063B174@l -/* 80411464 003DAA24 3F 20 80 41 */ lis r25, func_80410C24@ha +/* 80411464 003DAA24 3F 20 80 41 */ lis r25, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@ha /* 80411468 003DAA28 3F 40 80 64 */ lis r26, lbl_8063B168@ha /* 8041146C 003DAA2C 3B 60 00 01 */ li r27, 1 /* 80411470 003DAA30 3B 96 00 10 */ addi r28, r22, 0x10 @@ -671,7 +671,7 @@ lbl_804114A0: /* 804114B8 003DAA78 39 16 00 1C */ addi r8, r22, 0x1c /* 804114BC 003DAA7C 93 16 00 08 */ stw r24, 8(r22) /* 804114C0 003DAA80 7E C3 B3 78 */ mr r3, r22 -/* 804114C4 003DAA84 38 99 0C 24 */ addi r4, r25, func_80410C24@l +/* 804114C4 003DAA84 38 99 0C 24 */ addi r4, r25, __dt__Q44nw4r3snd6detail14AxVoiceManagerFv@l /* 804114C8 003DAA88 38 BA B1 68 */ addi r5, r26, lbl_8063B168@l /* 804114CC 003DAA8C 93 16 00 10 */ stw r24, 0x10(r22) /* 804114D0 003DAA90 93 16 00 14 */ stw r24, 0x14(r22) diff --git a/asm/nw4r/snd/snd_BasicPlayer.s b/asm/nw4r/snd/snd_BasicPlayer.s index b4b1f78..71f14cd 100644 --- a/asm/nw4r/snd/snd_BasicPlayer.s +++ b/asm/nw4r/snd/snd_BasicPlayer.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_804120AC -func_804120AC: +.global Init__Q44nw4r3snd6detail14PlayerParamSetFv +Init__Q44nw4r3snd6detail14PlayerParamSetFv: /* 804120AC 003DB66C C0 02 C3 64 */ lfs f0, lbl_8066C6E4@sda21(r2) /* 804120B0 003DB670 38 80 00 00 */ li r4, 0 /* 804120B4 003DB674 C0 22 C3 60 */ lfs f1, lbl_8066C6E0@sda21(r2) @@ -62,8 +62,8 @@ func_804120AC: /* 80412188 003DB748 D0 03 00 C8 */ stfs f0, 0xc8(r3) /* 8041218C 003DB74C 4E 80 00 20 */ blr -.global func_80412190 -func_80412190: +.global __ct__Q44nw4r3snd6detail11BasicPlayerFv +__ct__Q44nw4r3snd6detail11BasicPlayerFv: /* 80412190 003DB750 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80412194 003DB754 7C 08 02 A6 */ mflr r0 /* 80412198 003DB758 3C 80 80 57 */ lis r4, lbl_8056DFC8@ha @@ -210,11 +210,11 @@ lbl_80412394: /* 804123B0 003DB970 42 00 FF E4 */ bdnz lbl_80412394 lbl_804123B4: /* 804123B4 003DB974 38 63 00 04 */ addi r3, r3, 4 -/* 804123B8 003DB978 4B FF FC F5 */ bl func_804120AC +/* 804123B8 003DB978 4B FF FC F5 */ bl Init__Q44nw4r3snd6detail14PlayerParamSetFv /* 804123BC 003DB97C 38 00 FF FF */ li r0, -1 /* 804123C0 003DB980 38 7F 00 04 */ addi r3, r31, 4 /* 804123C4 003DB984 90 1F 00 D0 */ stw r0, 0xd0(r31) -/* 804123C8 003DB988 4B FF FC E5 */ bl func_804120AC +/* 804123C8 003DB988 4B FF FC E5 */ bl Init__Q44nw4r3snd6detail14PlayerParamSetFv /* 804123CC 003DB98C 7F E3 FB 78 */ mr r3, r31 /* 804123D0 003DB990 83 E1 00 0C */ lwz r31, 0xc(r1) /* 804123D4 003DB994 80 01 00 14 */ lwz r0, 0x14(r1) @@ -222,66 +222,66 @@ lbl_804123B4: /* 804123DC 003DB99C 38 21 00 10 */ addi r1, r1, 0x10 /* 804123E0 003DB9A0 4E 80 00 20 */ blr -.global func_804123E4 -func_804123E4: +.global InitParam__Q44nw4r3snd6detail11BasicPlayerFv +InitParam__Q44nw4r3snd6detail11BasicPlayerFv: /* 804123E4 003DB9A4 38 63 00 04 */ addi r3, r3, 4 -/* 804123E8 003DB9A8 4B FF FC C4 */ b func_804120AC +/* 804123E8 003DB9A8 4B FF FC C4 */ b Init__Q44nw4r3snd6detail14PlayerParamSetFv -.global func_804123EC -func_804123EC: +.global SetFxSend__Q44nw4r3snd6detail11BasicPlayerFQ34nw4r3snd6AuxBusf +SetFxSend__Q44nw4r3snd6detail11BasicPlayerFQ34nw4r3snd6AuxBusf: /* 804123EC 003DB9AC 54 80 10 3A */ slwi r0, r4, 2 /* 804123F0 003DB9B0 7C 63 02 14 */ add r3, r3, r0 /* 804123F4 003DB9B4 D0 23 00 34 */ stfs f1, 0x34(r3) /* 804123F8 003DB9B8 4E 80 00 20 */ blr -.global func_804123FC -func_804123FC: +.global GetFxSend__Q44nw4r3snd6detail11BasicPlayerCFQ34nw4r3snd6AuxBus +GetFxSend__Q44nw4r3snd6detail11BasicPlayerCFQ34nw4r3snd6AuxBus: /* 804123FC 003DB9BC 54 80 10 3A */ slwi r0, r4, 2 /* 80412400 003DB9C0 7C 63 02 14 */ add r3, r3, r0 /* 80412404 003DB9C4 C0 23 00 34 */ lfs f1, 0x34(r3) /* 80412408 003DB9C8 4E 80 00 20 */ blr -.global func_8041240C -func_8041240C: +.global SetBiquadFilter__Q44nw4r3snd6detail11BasicPlayerFif +SetBiquadFilter__Q44nw4r3snd6detail11BasicPlayerFif: /* 8041240C 003DB9CC 98 83 00 1C */ stb r4, 0x1c(r3) /* 80412410 003DB9D0 D0 23 00 18 */ stfs f1, 0x18(r3) /* 80412414 003DB9D4 4E 80 00 20 */ blr -.global func_80412418 -func_80412418: +.global SetRemoteFilter__Q44nw4r3snd6detail11BasicPlayerFi +SetRemoteFilter__Q44nw4r3snd6detail11BasicPlayerFi: /* 80412418 003DB9D8 98 83 00 1D */ stb r4, 0x1d(r3) /* 8041241C 003DB9DC 4E 80 00 20 */ blr -.global func_80412420 -func_80412420: +.global SetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerFif +SetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerFif: /* 80412420 003DB9E0 54 80 10 3A */ slwi r0, r4, 2 /* 80412424 003DB9E4 7C 63 02 14 */ add r3, r3, r0 /* 80412428 003DB9E8 D0 23 00 40 */ stfs f1, 0x40(r3) /* 8041242C 003DB9EC 4E 80 00 20 */ blr -.global func_80412430 -func_80412430: +.global GetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerCFi +GetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerCFi: /* 80412430 003DB9F0 54 80 10 3A */ slwi r0, r4, 2 /* 80412434 003DB9F4 7C 63 02 14 */ add r3, r3, r0 /* 80412438 003DB9F8 C0 23 00 40 */ lfs f1, 0x40(r3) /* 8041243C 003DB9FC 4E 80 00 20 */ blr -.global func_80412440 -func_80412440: +.global GetRemoteSend__Q44nw4r3snd6detail11BasicPlayerCFi +GetRemoteSend__Q44nw4r3snd6detail11BasicPlayerCFi: /* 80412440 003DBA00 54 80 10 3A */ slwi r0, r4, 2 /* 80412444 003DBA04 7C 63 02 14 */ add r3, r3, r0 /* 80412448 003DBA08 C0 23 00 50 */ lfs f1, 0x50(r3) /* 8041244C 003DBA0C 4E 80 00 20 */ blr -.global func_80412450 -func_80412450: +.global GetRemoteFxSend__Q44nw4r3snd6detail11BasicPlayerCFi +GetRemoteFxSend__Q44nw4r3snd6detail11BasicPlayerCFi: /* 80412450 003DBA10 54 80 10 3A */ slwi r0, r4, 2 /* 80412454 003DBA14 7C 63 02 14 */ add r3, r3, r0 /* 80412458 003DBA18 C0 23 00 60 */ lfs f1, 0x60(r3) /* 8041245C 003DBA1C 4E 80 00 20 */ blr -.global func_80412460 -func_80412460: +.global __dt__Q44nw4r3snd6detail11BasicPlayerFv +__dt__Q44nw4r3snd6detail11BasicPlayerFv: /* 80412460 003DBA20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80412464 003DBA24 7C 08 02 A6 */ mflr r0 /* 80412468 003DBA28 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/nw4r/snd/snd_BasicSound.s b/asm/nw4r/snd/snd_BasicSound.s index 8ffd767..950fabe 100644 --- a/asm/nw4r/snd/snd_BasicSound.s +++ b/asm/nw4r/snd/snd_BasicSound.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_804124A0 -func_804124A0: +.global __ct__Q44nw4r3snd6detail10BasicSoundFii +__ct__Q44nw4r3snd6detail10BasicSoundFii: /* 804124A0 003DBA60 C0 02 C3 6C */ lfs f0, lbl_8066C6EC@sda21(r2) /* 804124A4 003DBA64 3D 00 80 57 */ lis r8, lbl_8056DFF0@ha /* 804124A8 003DBA68 38 E0 00 00 */ li r7, 0 @@ -60,8 +60,8 @@ func_804124A0: /* 80412574 003DBB34 90 A3 00 50 */ stw r5, 0x50(r3) /* 80412578 003DBB38 4E 80 00 20 */ blr -.global func_8041257C -func_8041257C: +.global InitParam__Q44nw4r3snd6detail10BasicSoundFv +InitParam__Q44nw4r3snd6detail10BasicSoundFv: /* 8041257C 003DBB3C 38 00 00 00 */ li r0, 0 /* 80412580 003DBB40 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80412584 003DBB44 C0 82 C3 6C */ lfs f4, lbl_8066C6EC@sda21(r2) @@ -160,8 +160,8 @@ StartPrepared__Q44nw4r3snd6detail10BasicSoundFv: /* 804126E0 003DBCA0 98 03 00 80 */ stb r0, 0x80(r3) /* 804126E4 003DBCA4 4E 80 00 20 */ blr -.global func_804126E8 -func_804126E8: +.global Stop__Q44nw4r3snd6detail10BasicSoundFi +Stop__Q44nw4r3snd6detail10BasicSoundFi: /* 804126E8 003DBCA8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804126EC 003DBCAC 7C 08 02 A6 */ mflr r0 /* 804126F0 003DBCB0 90 01 00 34 */ stw r0, 0x34(r1) @@ -271,7 +271,7 @@ lbl_80412858: /* 80412878 003DBE38 98 1D 00 94 */ stb r0, 0x94(r29) /* 8041287C 003DBE3C 41 82 00 0C */ beq lbl_80412888 /* 80412880 003DBE40 7F A4 EB 78 */ mr r4, r29 -/* 80412884 003DBE44 48 00 DF 21 */ bl func_804207A4 +/* 80412884 003DBE44 48 00 DF 21 */ bl detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound lbl_80412888: /* 80412888 003DBE48 81 9D 00 00 */ lwz r12, 0(r29) /* 8041288C 003DBE4C 7F A3 EB 78 */ mr r3, r29 @@ -293,8 +293,8 @@ lbl_804128B4: /* 804128C8 003DBE88 38 21 00 30 */ addi r1, r1, 0x30 /* 804128CC 003DBE8C 4E 80 00 20 */ blr -.global func_804128D0 -func_804128D0: +.global Pause__Q44nw4r3snd6detail10BasicSoundFbi +Pause__Q44nw4r3snd6detail10BasicSoundFbi: /* 804128D0 003DBE90 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804128D4 003DBE94 3C 00 43 30 */ lis r0, 0x4330 /* 804128D8 003DBE98 2C 04 00 00 */ cmpwi r4, 0 @@ -464,8 +464,8 @@ lbl_80412B2C: /* 80412B2C 003DC0EC 38 21 00 20 */ addi r1, r1, 0x20 /* 80412B30 003DC0F0 4E 80 00 20 */ blr -.global func_80412B34 -func_80412B34: +.global Update__Q44nw4r3snd6detail10BasicSoundFv +Update__Q44nw4r3snd6detail10BasicSoundFv: /* 80412B34 003DC0F4 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 80412B38 003DC0F8 7C 08 02 A6 */ mflr r0 /* 80412B3C 003DC0FC 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -905,8 +905,8 @@ lbl_80413174: /* 80413188 003DC748 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8041318C 003DC74C 4E 80 00 20 */ blr -.global func_80413190 -func_80413190: +.global UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv +UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv: /* 80413190 003DC750 80 83 00 6C */ lwz r4, 0x6c(r3) /* 80413194 003DC754 80 03 00 68 */ lwz r0, 0x68(r3) /* 80413198 003DC758 7C 04 00 00 */ cmpw r4, r0 @@ -922,8 +922,8 @@ lbl_804131A8: /* 804131BC 003DC77C 90 03 00 A8 */ stw r0, 0xa8(r3) /* 804131C0 003DC780 4E 80 00 20 */ blr -.global func_804131C4 -func_804131C4: +.global UpdateParam__Q44nw4r3snd6detail10BasicSoundFv +UpdateParam__Q44nw4r3snd6detail10BasicSoundFv: /* 804131C4 003DC784 94 21 FF 30 */ stwu r1, -0xd0(r1) /* 804131C8 003DC788 7C 08 02 A6 */ mflr r0 /* 804131CC 003DC78C 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -1080,7 +1080,7 @@ lbl_80413408: /* 80413408 003DC9C8 D3 1E 00 00 */ stfs f24, 0(r30) /* 8041340C 003DC9CC 7F 44 D3 78 */ mr r4, r26 /* 80413410 003DC9D0 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80413414 003DC9D4 48 00 D3 71 */ bl func_80420784 +/* 80413414 003DC9D4 48 00 D3 71 */ bl GetRemoteOutVolume__Q34nw4r3snd11SoundPlayerCFi /* 80413418 003DC9D8 C0 5E 00 00 */ lfs f2, 0(r30) /* 8041341C 003DC9DC 3B 5A 00 01 */ addi r26, r26, 1 /* 80413420 003DC9E0 C0 1D 00 DC */ lfs f0, 0xdc(r29) @@ -1133,7 +1133,7 @@ lbl_80413408: /* 804134DC 003DCA9C D3 A3 00 10 */ stfs f29, 0x10(r3) /* 804134E0 003DCAA0 D3 83 00 08 */ stfs f28, 8(r3) /* 804134E4 003DCAA4 D3 63 00 14 */ stfs f27, 0x14(r3) -/* 804134E8 003DCAA8 4B FF EF 25 */ bl func_8041240C +/* 804134E8 003DCAA8 4B FF EF 25 */ bl SetBiquadFilter__Q44nw4r3snd6detail11BasicPlayerFif /* 804134EC 003DCAAC 93 7A 00 20 */ stw r27, 0x20(r26) /* 804134F0 003DCAB0 3B E1 00 18 */ addi r31, r1, 0x18 /* 804134F4 003DCAB4 3B 60 00 00 */ li r27, 0 @@ -1142,7 +1142,7 @@ lbl_804134FC: /* 804134FC 003DCABC C0 3F 00 00 */ lfs f1, 0(r31) /* 80413500 003DCAC0 7F 43 D3 78 */ mr r3, r26 /* 80413504 003DCAC4 7F 64 DB 78 */ mr r4, r27 -/* 80413508 003DCAC8 4B FF EF 19 */ bl func_80412420 +/* 80413508 003DCAC8 4B FF EF 19 */ bl SetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerFif /* 8041350C 003DCACC 3B 7B 00 01 */ addi r27, r27, 1 /* 80413510 003DCAD0 3B FF 00 04 */ addi r31, r31, 4 /* 80413514 003DCAD4 2C 1B 00 04 */ cmpwi r27, 4 @@ -1154,7 +1154,7 @@ lbl_80413528: /* 80413528 003DCAE8 C0 3F 00 00 */ lfs f1, 0(r31) /* 8041352C 003DCAEC 7F 43 D3 78 */ mr r3, r26 /* 80413530 003DCAF0 7F 64 DB 78 */ mr r4, r27 -/* 80413534 003DCAF4 4B FF EE B9 */ bl func_804123EC +/* 80413534 003DCAF4 4B FF EE B9 */ bl SetFxSend__Q44nw4r3snd6detail11BasicPlayerFQ34nw4r3snd6AuxBusf /* 80413538 003DCAF8 3B 7B 00 01 */ addi r27, r27, 1 /* 8041353C 003DCAFC 3B FF 00 04 */ addi r31, r31, 4 /* 80413540 003DCB00 2C 1B 00 03 */ cmpwi r27, 3 @@ -1182,8 +1182,8 @@ lbl_80413528: /* 80413598 003DCB58 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8041359C 003DCB5C 4E 80 00 20 */ blr -.global func_804135A0 -func_804135A0: +.global Shutdown__Q44nw4r3snd6detail10BasicSoundFv +Shutdown__Q44nw4r3snd6detail10BasicSoundFv: /* 804135A0 003DCB60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804135A4 003DCB64 7C 08 02 A6 */ mflr r0 /* 804135A8 003DCB68 90 01 00 14 */ stw r0, 0x14(r1) @@ -1249,13 +1249,13 @@ lbl_8041367C: /* 80413684 003DCC44 41 82 00 10 */ beq lbl_80413694 /* 80413688 003DCC48 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8041368C 003DCC4C 7F C4 F3 78 */ mr r4, r30 -/* 80413690 003DCC50 48 00 D8 91 */ bl func_80420F20 +/* 80413690 003DCC50 48 00 D8 91 */ bl detail_FreePlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound lbl_80413694: /* 80413694 003DCC54 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80413698 003DCC58 2C 03 00 00 */ cmpwi r3, 0 /* 8041369C 003DCC5C 41 82 00 0C */ beq lbl_804136A8 /* 804136A0 003DCC60 7F C4 F3 78 */ mr r4, r30 -/* 804136A4 003DCC64 48 00 D5 71 */ bl func_80420C14 +/* 804136A4 003DCC64 48 00 D5 71 */ bl detail_RemoveSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound lbl_804136A8: /* 804136A8 003DCC68 80 7E 00 18 */ lwz r3, 0x18(r30) /* 804136AC 003DCC6C 2C 03 00 00 */ cmpwi r3, 0 @@ -1285,30 +1285,30 @@ lbl_804136E8: /* 80413704 003DCCC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80413708 003DCCC8 4E 80 00 20 */ blr -.global func_8041370C -func_8041370C: +.global AttachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap +AttachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap: /* 8041370C 003DCCCC 90 83 00 04 */ stw r4, 4(r3) /* 80413710 003DCCD0 4E 80 00 20 */ blr -.global func_80413714 -func_80413714: +.global DetachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap +DetachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap: /* 80413714 003DCCD4 38 00 00 00 */ li r0, 0 /* 80413718 003DCCD8 90 03 00 04 */ stw r0, 4(r3) /* 8041371C 003DCCDC 4E 80 00 20 */ blr -.global func_80413720 -func_80413720: +.global AttachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer +AttachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer: /* 80413720 003DCCE0 90 83 00 10 */ stw r4, 0x10(r3) /* 80413724 003DCCE4 4E 80 00 20 */ blr -.global func_80413728 -func_80413728: +.global DetachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer +DetachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer: /* 80413728 003DCCE8 38 00 00 00 */ li r0, 0 /* 8041372C 003DCCEC 90 03 00 10 */ stw r0, 0x10(r3) /* 80413730 003DCCF0 4E 80 00 20 */ blr -.global func_80413734 -func_80413734: +.global AttachSoundActor__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd10SoundActor +AttachSoundActor__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd10SoundActor: /* 80413734 003DCCF4 90 83 00 14 */ stw r4, 0x14(r3) /* 80413738 003DCCF8 4E 80 00 20 */ blr @@ -1323,13 +1323,13 @@ DetachExternalSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail19E /* 80413748 003DCD08 90 03 00 18 */ stw r0, 0x18(r3) /* 8041374C 003DCD0C 4E 80 00 20 */ blr -.global func_80413750 -func_80413750: +.global GetVoiceOutCount__Q44nw4r3snd6detail10BasicSoundCFv +GetVoiceOutCount__Q44nw4r3snd6detail10BasicSoundCFv: /* 80413750 003DCD10 88 63 00 95 */ lbz r3, 0x95(r3) /* 80413754 003DCD14 4E 80 00 20 */ blr -.global func_80413758 -func_80413758: +.global SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi +SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi: /* 80413758 003DCD18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041375C 003DCD1C 7C 08 02 A6 */ mflr r0 /* 80413760 003DCD20 90 01 00 14 */ stw r0, 0x14(r1) @@ -1341,7 +1341,7 @@ func_80413758: /* 80413778 003DCD38 41 82 00 10 */ beq lbl_80413788 /* 8041377C 003DCD3C 7C 03 03 78 */ mr r3, r0 /* 80413780 003DCD40 7F E4 FB 78 */ mr r4, r31 -/* 80413784 003DCD44 48 00 D0 21 */ bl func_804207A4 +/* 80413784 003DCD44 48 00 D0 21 */ bl detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound lbl_80413788: /* 80413788 003DCD48 81 9F 00 00 */ lwz r12, 0(r31) /* 8041378C 003DCD4C 7F E3 FB 78 */ mr r3, r31 @@ -1354,12 +1354,12 @@ lbl_80413788: /* 804137A8 003DCD68 38 21 00 10 */ addi r1, r1, 0x10 /* 804137AC 003DCD6C 4E 80 00 20 */ blr -.global func_804137B0 -func_804137B0: +.global OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv +OnUpdatePlayerPriority__Q44nw4r3snd6detail10BasicSoundFv: /* 804137B0 003DCD70 4E 80 00 20 */ blr -.global func_804137B4 -func_804137B4: +.global SetInitialVolume__Q44nw4r3snd6detail10BasicSoundFf +SetInitialVolume__Q44nw4r3snd6detail10BasicSoundFf: /* 804137B4 003DCD74 C0 02 C3 68 */ lfs f0, lbl_8066C6E8@sda21(r2) /* 804137B8 003DCD78 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 804137BC 003DCD7C 40 81 00 08 */ ble lbl_804137C4 @@ -1375,8 +1375,8 @@ lbl_804137D8: /* 804137D8 003DCD98 D0 03 00 AC */ stfs f0, 0xac(r3) /* 804137DC 003DCD9C 4E 80 00 20 */ blr -.global func_804137E0 -func_804137E0: +.global SetVolume__Q44nw4r3snd6detail10BasicSoundFfi +SetVolume__Q44nw4r3snd6detail10BasicSoundFfi: /* 804137E0 003DCDA0 C0 A2 C3 68 */ lfs f5, lbl_8066C6E8@sda21(r2) /* 804137E4 003DCDA4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804137E8 003DCDA8 FC 01 28 40 */ fcmpo cr0, f1, f5 @@ -1424,13 +1424,15 @@ lbl_80413868: /* 8041387C 003DCE3C 38 21 00 20 */ addi r1, r1, 0x20 /* 80413880 003DCE40 4E 80 00 20 */ blr +#SetPitch__Q44nw4r3snd6detail10BasicSoundFf, SetPan__Q44nw4r3snd6detail10BasicSoundFf, SetSurroundPan__Q44nw4r3snd6detail10BasicSoundFf, SetLpfFreq__Q44nw4r3snd6detail10BasicSoundFf, +#SetOutputLine__Q44nw4r3snd6detail10BasicSoundFi or SetMainSend__Q44nw4r3snd6detail10BasicSoundFf .global func_80413884 func_80413884: /* 80413884 003DCE44 D0 23 00 B0 */ stfs f1, 0xb0(r3) /* 80413888 003DCE48 4E 80 00 20 */ blr -.global func_8041388C -func_8041388C: +.global SetRemoteFilter__Q44nw4r3snd6detail10BasicSoundFi +SetRemoteFilter__Q44nw4r3snd6detail10BasicSoundFi: /* 8041388C 003DCE4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80413890 003DCE50 7C 08 02 A6 */ mflr r0 /* 80413894 003DCE54 90 01 00 14 */ stw r0, 0x14(r1) @@ -1441,15 +1443,15 @@ func_8041388C: /* 804138A8 003DCE68 7D 89 03 A6 */ mtctr r12 /* 804138AC 003DCE6C 4E 80 04 21 */ bctrl /* 804138B0 003DCE70 7F E4 FB 78 */ mr r4, r31 -/* 804138B4 003DCE74 4B FF EB 65 */ bl func_80412418 +/* 804138B4 003DCE74 4B FF EB 65 */ bl SetRemoteFilter__Q44nw4r3snd6detail11BasicPlayerFi /* 804138B8 003DCE78 80 01 00 14 */ lwz r0, 0x14(r1) /* 804138BC 003DCE7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 804138C0 003DCE80 7C 08 03 A6 */ mtlr r0 /* 804138C4 003DCE84 38 21 00 10 */ addi r1, r1, 0x10 /* 804138C8 003DCE88 4E 80 00 20 */ blr -.global func_804138CC -func_804138CC: +.global SetPanMode__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd7PanMode +SetPanMode__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd7PanMode: /* 804138CC 003DCE8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804138D0 003DCE90 7C 08 02 A6 */ mflr r0 /* 804138D4 003DCE94 90 01 00 14 */ stw r0, 0x14(r1) @@ -1466,8 +1468,8 @@ func_804138CC: /* 80413900 003DCEC0 38 21 00 10 */ addi r1, r1, 0x10 /* 80413904 003DCEC4 4E 80 00 20 */ blr -.global func_80413908 -func_80413908: +.global SetPanCurve__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd8PanCurve +SetPanCurve__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd8PanCurve: /* 80413908 003DCEC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041390C 003DCECC 7C 08 02 A6 */ mflr r0 /* 80413910 003DCED0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1484,8 +1486,8 @@ func_80413908: /* 8041393C 003DCEFC 38 21 00 10 */ addi r1, r1, 0x10 /* 80413940 003DCF00 4E 80 00 20 */ blr -.global func_80413944 -func_80413944: +.global SetAmbientInfo__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfo +SetAmbientInfo__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfo: /* 80413944 003DCF04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80413948 003DCF08 7C 08 02 A6 */ mflr r0 /* 8041394C 003DCF0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1540,8 +1542,8 @@ lbl_804139F4: /* 80413A08 003DCFC8 38 21 00 20 */ addi r1, r1, 0x20 /* 80413A0C 003DCFCC 4E 80 00 20 */ blr -.global func_80413A10 -func_80413A10: +.global GetAmbientPriority__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfoUl +GetAmbientPriority__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfoUl: /* 80413A10 003DCFD0 80 03 00 00 */ lwz r0, 0(r3) /* 80413A14 003DCFD4 7C 66 1B 78 */ mr r6, r3 /* 80413A18 003DCFD8 2C 00 00 00 */ cmpwi r0, 0 @@ -1584,8 +1586,8 @@ DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv: /* 80413A78 003DD038 80 63 00 0C */ lwz r3, 0xc(r3) /* 80413A7C 003DD03C 48 00 C9 4C */ b DetachSound__Q34nw4r3snd11SoundHandleFv -.global func_80413A80 -func_80413A80: +.global SetId__Q44nw4r3snd6detail10BasicSoundFUl +SetId__Q44nw4r3snd6detail10BasicSoundFUl: /* 80413A80 003DD040 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80413A84 003DD044 7C 08 02 A6 */ mflr r0 /* 80413A88 003DD048 90 01 00 14 */ stw r0, 0x14(r1) @@ -1604,8 +1606,8 @@ func_80413A80: /* 80413ABC 003DD07C 4E 80 00 20 */ blr -.global func_80413AC0 -func_80413AC0: +.global __dt__Q44nw4r3snd6detail10BasicSoundFv +__dt__Q44nw4r3snd6detail10BasicSoundFv: /* 80413AC0 003DD080 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80413AC4 003DD084 7C 08 02 A6 */ mflr r0 /* 80413AC8 003DD088 2C 03 00 00 */ cmpwi r3, 0 @@ -1625,8 +1627,8 @@ lbl_80413AE8: /* 80413AFC 003DD0BC 4E 80 00 20 */ blr -.global func_80413B00 -func_80413B00: +.global GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv +GetRuntimeTypeInfo__Q44nw4r3snd6detail10BasicSoundCFv: /* 80413B00 003DD0C0 38 6D BC 30 */ addi r3, r13, lbl_80667DB0@sda21 /* 80413B04 003DD0C4 4E 80 00 20 */ blr diff --git a/asm/nw4r/snd/snd_FxChorusDpl2.s b/asm/nw4r/snd/snd_FxChorusDpl2.s index 12ba321..2d153ab 100644 --- a/asm/nw4r/snd/snd_FxChorusDpl2.s +++ b/asm/nw4r/snd/snd_FxChorusDpl2.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80415A0C -func_80415A0C: +.global __ct__Q34nw4r3snd12FxChorusDpl2Fv +__ct__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415A0C 003DEFCC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80415A10 003DEFD0 7C 08 02 A6 */ mflr r0 /* 80415A14 003DEFD4 3C A0 80 57 */ lis r5, lbl_8056E078@ha @@ -33,7 +33,7 @@ func_80415A0C: /* 80415A74 003DF034 D0 21 00 10 */ stfs f1, 0x10(r1) /* 80415A78 003DF038 D0 01 00 14 */ stfs f0, 0x14(r1) /* 80415A7C 003DF03C D0 21 00 18 */ stfs f1, 0x18(r1) -/* 80415A80 003DF040 48 00 02 25 */ bl func_80415CA4 +/* 80415A80 003DF040 48 00 02 25 */ bl SetParam__Q34nw4r3snd12FxChorusDpl2FRCQ44nw4r3snd6detail13FxChorusParam /* 80415A84 003DF044 7F E3 FB 78 */ mr r3, r31 /* 80415A88 003DF048 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80415A8C 003DF04C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -41,8 +41,8 @@ func_80415A0C: /* 80415A94 003DF054 38 21 00 30 */ addi r1, r1, 0x30 /* 80415A98 003DF058 4E 80 00 20 */ blr -.global func_80415A9C -func_80415A9C: +.global GetRequiredMemSize__Q34nw4r3snd12FxChorusDpl2Fv +GetRequiredMemSize__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415A9C 003DF05C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80415AA0 003DF060 7C 08 02 A6 */ mflr r0 /* 80415AA4 003DF064 90 01 00 14 */ stw r0, 0x14(r1) @@ -66,17 +66,18 @@ lbl_80415ADC: /* 80415AE8 003DF0A8 38 21 00 10 */ addi r1, r1, 0x10 /* 80415AEC 003DF0AC 4E 80 00 20 */ blr -.global func_80415AF0 -func_80415AF0: +.global AssignWorkBuffer__Q34nw4r3snd12FxChorusDpl2FPvUl +AssignWorkBuffer__Q34nw4r3snd12FxChorusDpl2FPvUl: /* 80415AF0 003DF0B0 38 63 00 14 */ addi r3, r3, 0x14 /* 80415AF4 003DF0B4 4B FF BA C0 */ b CreateHeap__Q44nw4r3snd6detail8AxfxImplFPvUl -.global lbl_80415AF8 -lbl_80415AF8: + +.global ReleaseWorkBuffer__Q34nw4r3snd12FxChorusDpl2Fv +ReleaseWorkBuffer__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415AF8 003DF0B8 38 63 00 14 */ addi r3, r3, 0x14 /* 80415AFC 003DF0BC 4B FF BB 20 */ b DestroyHeap__Q44nw4r3snd6detail8AxfxImplFv -.global func_80415B00 -func_80415B00: +.global StartUp__Q34nw4r3snd12FxChorusDpl2Fv +StartUp__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415B00 003DF0C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80415B04 003DF0C4 7C 08 02 A6 */ mflr r0 /* 80415B08 003DF0C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -159,8 +160,8 @@ lbl_80415C10: /* 80415C20 003DF1E0 38 21 00 20 */ addi r1, r1, 0x20 /* 80415C24 003DF1E4 4E 80 00 20 */ blr -.global func_80415C28 -func_80415C28: +.global Shutdown__Q34nw4r3snd12FxChorusDpl2Fv +Shutdown__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415C28 003DF1E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80415C2C 003DF1EC 7C 08 02 A6 */ mflr r0 /* 80415C30 003DF1F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -196,8 +197,8 @@ lbl_80415C90: /* 80415C9C 003DF25C 38 21 00 20 */ addi r1, r1, 0x20 /* 80415CA0 003DF260 4E 80 00 20 */ blr -.global func_80415CA4 -func_80415CA4: +.global SetParam__Q34nw4r3snd12FxChorusDpl2FRCQ44nw4r3snd6detail13FxChorusParam +SetParam__Q34nw4r3snd12FxChorusDpl2FRCQ44nw4r3snd6detail13FxChorusParam: /* 80415CA4 003DF264 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80415CA8 003DF268 7C 08 02 A6 */ mflr r0 /* 80415CAC 003DF26C C0 84 00 00 */ lfs f4, 0(r4) @@ -349,8 +350,8 @@ lbl_80415E88: /* 80415E98 003DF458 38 21 00 10 */ addi r1, r1, 0x10 /* 80415E9C 003DF45C 4E 80 00 20 */ blr -.global func_80415EA0 -func_80415EA0: +.global UpdateBuffer__Q34nw4r3snd12FxChorusDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode +UpdateBuffer__Q34nw4r3snd12FxChorusDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode: /* 80415EA0 003DF460 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80415EA4 003DF464 7C 08 02 A6 */ mflr r0 /* 80415EA8 003DF468 7C 64 1B 78 */ mr r4, r3 @@ -394,8 +395,8 @@ lbl_80415F30: /* 80415F38 003DF4F8 38 21 00 30 */ addi r1, r1, 0x30 /* 80415F3C 003DF4FC 4E 80 00 20 */ blr -.global func_80415F40 -func_80415F40: +.global OnChangeOutputMode__Q34nw4r3snd12FxChorusDpl2Fv +OnChangeOutputMode__Q34nw4r3snd12FxChorusDpl2Fv: /* 80415F40 003DF500 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80415F44 003DF504 7C 08 02 A6 */ mflr r0 /* 80415F48 003DF508 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/nw4r/snd/snd_FxDelayDpl2.s b/asm/nw4r/snd/snd_FxDelayDpl2.s index f85b4d9..3e58cb0 100644 --- a/asm/nw4r/snd/snd_FxDelayDpl2.s +++ b/asm/nw4r/snd/snd_FxDelayDpl2.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80415FB0 -func_80415FB0: +.global __ct__Q34nw4r3snd11FxDelayDpl2Fv +__ct__Q34nw4r3snd11FxDelayDpl2Fv: /* 80415FB0 003DF570 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80415FB4 003DF574 7C 08 02 A6 */ mflr r0 /* 80415FB8 003DF578 3C A0 80 57 */ lis r5, lbl_8056E0A0@ha @@ -32,7 +32,7 @@ func_80415FB0: /* 80416014 003DF5D4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80416018 003DF5D8 D0 41 00 14 */ stfs f2, 0x14(r1) /* 8041601C 003DF5DC D0 01 00 18 */ stfs f0, 0x18(r1) -/* 80416020 003DF5E0 48 00 02 25 */ bl func_80416244 +/* 80416020 003DF5E0 48 00 02 25 */ bl SetParam__Q34nw4r3snd11FxDelayDpl2FRCQ44nw4r3snd6detail12FxDelayParam /* 80416024 003DF5E4 7F E3 FB 78 */ mr r3, r31 /* 80416028 003DF5E8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8041602C 003DF5EC 80 01 00 34 */ lwz r0, 0x34(r1) @@ -40,8 +40,8 @@ func_80415FB0: /* 80416034 003DF5F4 38 21 00 30 */ addi r1, r1, 0x30 /* 80416038 003DF5F8 4E 80 00 20 */ blr -.global func_8041603C -func_8041603C: +.global GetRequiredMemSize__Q34nw4r3snd11FxDelayDpl2Fv +GetRequiredMemSize__Q34nw4r3snd11FxDelayDpl2Fv: /* 8041603C 003DF5FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80416040 003DF600 7C 08 02 A6 */ mflr r0 /* 80416044 003DF604 90 01 00 14 */ stw r0, 0x14(r1) @@ -65,17 +65,18 @@ lbl_8041607C: /* 80416088 003DF648 38 21 00 10 */ addi r1, r1, 0x10 /* 8041608C 003DF64C 4E 80 00 20 */ blr -.global func_80416090 -func_80416090: +.global AssignWorkBuffer__Q34nw4r3snd11FxDelayDpl2FPvUl +AssignWorkBuffer__Q34nw4r3snd11FxDelayDpl2FPvUl: /* 80416090 003DF650 38 63 00 14 */ addi r3, r3, 0x14 /* 80416094 003DF654 4B FF B5 20 */ b CreateHeap__Q44nw4r3snd6detail8AxfxImplFPvUl -.global lbl_80416098 -lbl_80416098: + +.global ReleaseWorkBuffer__Q34nw4r3snd11FxDelayDpl2Fv +ReleaseWorkBuffer__Q34nw4r3snd11FxDelayDpl2Fv: /* 80416098 003DF658 38 63 00 14 */ addi r3, r3, 0x14 /* 8041609C 003DF65C 4B FF B5 80 */ b DestroyHeap__Q44nw4r3snd6detail8AxfxImplFv -.global func_804160A0 -func_804160A0: +.global StartUp__Q34nw4r3snd11FxDelayDpl2Fv +StartUp__Q34nw4r3snd11FxDelayDpl2Fv: /* 804160A0 003DF660 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804160A4 003DF664 7C 08 02 A6 */ mflr r0 /* 804160A8 003DF668 90 01 00 24 */ stw r0, 0x24(r1) @@ -158,8 +159,8 @@ lbl_804161B0: /* 804161C0 003DF780 38 21 00 20 */ addi r1, r1, 0x20 /* 804161C4 003DF784 4E 80 00 20 */ blr -.global func_804161C8 -func_804161C8: +.global Shutdown__Q34nw4r3snd11FxDelayDpl2Fv +Shutdown__Q34nw4r3snd11FxDelayDpl2Fv: /* 804161C8 003DF788 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804161CC 003DF78C 7C 08 02 A6 */ mflr r0 /* 804161D0 003DF790 90 01 00 24 */ stw r0, 0x24(r1) @@ -195,8 +196,8 @@ lbl_80416230: /* 8041623C 003DF7FC 38 21 00 20 */ addi r1, r1, 0x20 /* 80416240 003DF800 4E 80 00 20 */ blr -.global func_80416244 -func_80416244: +.global SetParam__Q34nw4r3snd11FxDelayDpl2FRCQ44nw4r3snd6detail12FxDelayParam +SetParam__Q34nw4r3snd11FxDelayDpl2FRCQ44nw4r3snd6detail12FxDelayParam: /* 80416244 003DF804 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80416248 003DF808 7C 08 02 A6 */ mflr r0 /* 8041624C 003DF80C C0 24 00 0C */ lfs f1, 0xc(r4) @@ -375,8 +376,8 @@ lbl_80416484: /* 80416498 003DFA58 38 21 00 20 */ addi r1, r1, 0x20 /* 8041649C 003DFA5C 4E 80 00 20 */ blr -.global func_804164A0 -func_804164A0: +.global UpdateBuffer__Q34nw4r3snd11FxDelayDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode +UpdateBuffer__Q34nw4r3snd11FxDelayDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode: /* 804164A0 003DFA60 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804164A4 003DFA64 7C 08 02 A6 */ mflr r0 /* 804164A8 003DFA68 7C 64 1B 78 */ mr r4, r3 @@ -420,8 +421,8 @@ lbl_80416530: /* 80416538 003DFAF8 38 21 00 30 */ addi r1, r1, 0x30 /* 8041653C 003DFAFC 4E 80 00 20 */ blr -.global func_80416540 -func_80416540: +.global OnChangeOutputMode__Q34nw4r3snd11FxDelayDpl2Fv +OnChangeOutputMode__Q34nw4r3snd11FxDelayDpl2Fv: /* 80416540 003DFB00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80416544 003DFB04 7C 08 02 A6 */ mflr r0 /* 80416548 003DFB08 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/nw4r/snd/snd_FxReverbStdDpl2.s b/asm/nw4r/snd/snd_FxReverbStdDpl2.s index 1f140b4..e52d569 100644 --- a/asm/nw4r/snd/snd_FxReverbStdDpl2.s +++ b/asm/nw4r/snd/snd_FxReverbStdDpl2.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_804165B0 -func_804165B0: +.global __ct__Q34nw4r3snd15FxReverbStdDpl2Fv +__ct__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 804165B0 003DFB70 94 21 FF C0 */ stwu r1, -0x40(r1) /* 804165B4 003DFB74 7C 08 02 A6 */ mflr r0 /* 804165B8 003DFB78 3C A0 80 57 */ lis r5, lbl_8056E0C8@ha @@ -46,7 +46,7 @@ func_804165B0: /* 8041664C 003DFC0C 90 C1 00 24 */ stw r6, 0x24(r1) /* 80416650 003DFC10 D0 01 00 28 */ stfs f0, 0x28(r1) /* 80416654 003DFC14 D0 21 00 2C */ stfs f1, 0x2c(r1) -/* 80416658 003DFC18 48 00 02 25 */ bl func_8041687C +/* 80416658 003DFC18 48 00 02 25 */ bl SetParam__Q34nw4r3snd15FxReverbStdDpl2FRCQ44nw4r3snd6detail16FxReverbStdParam /* 8041665C 003DFC1C 7F E3 FB 78 */ mr r3, r31 /* 80416660 003DFC20 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80416664 003DFC24 80 01 00 44 */ lwz r0, 0x44(r1) @@ -54,8 +54,8 @@ func_804165B0: /* 8041666C 003DFC2C 38 21 00 40 */ addi r1, r1, 0x40 /* 80416670 003DFC30 4E 80 00 20 */ blr -.global func_80416674 -func_80416674: +.global GetRequiredMemSize__Q34nw4r3snd15FxReverbStdDpl2Fv +GetRequiredMemSize__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 80416674 003DFC34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80416678 003DFC38 7C 08 02 A6 */ mflr r0 /* 8041667C 003DFC3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -79,17 +79,18 @@ lbl_804166B4: /* 804166C0 003DFC80 38 21 00 10 */ addi r1, r1, 0x10 /* 804166C4 003DFC84 4E 80 00 20 */ blr -.global func_804166C8 -func_804166C8: +.global AssignWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2FPvUl +AssignWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2FPvUl: /* 804166C8 003DFC88 38 63 00 14 */ addi r3, r3, 0x14 /* 804166CC 003DFC8C 4B FF AE E8 */ b CreateHeap__Q44nw4r3snd6detail8AxfxImplFPvUl -.global lbl_804166D0 -lbl_804166D0: + +.global ReleaseWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2Fv +ReleaseWorkBuffer__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 804166D0 003DFC90 38 63 00 14 */ addi r3, r3, 0x14 /* 804166D4 003DFC94 4B FF AF 48 */ b DestroyHeap__Q44nw4r3snd6detail8AxfxImplFv -.global func_804166D8 -func_804166D8: +.global StartUp__Q34nw4r3snd15FxReverbStdDpl2Fv +StartUp__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 804166D8 003DFC98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804166DC 003DFC9C 7C 08 02 A6 */ mflr r0 /* 804166E0 003DFCA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -172,8 +173,8 @@ lbl_804167E8: /* 804167F8 003DFDB8 38 21 00 20 */ addi r1, r1, 0x20 /* 804167FC 003DFDBC 4E 80 00 20 */ blr -.global func_80416800 -func_80416800: +.global Shutdown__Q34nw4r3snd15FxReverbStdDpl2Fv +Shutdown__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 80416800 003DFDC0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80416804 003DFDC4 7C 08 02 A6 */ mflr r0 /* 80416808 003DFDC8 90 01 00 24 */ stw r0, 0x24(r1) @@ -209,8 +210,8 @@ lbl_80416868: /* 80416874 003DFE34 38 21 00 20 */ addi r1, r1, 0x20 /* 80416878 003DFE38 4E 80 00 20 */ blr -.global func_8041687C -func_8041687C: +.global SetParam__Q34nw4r3snd15FxReverbStdDpl2FRCQ44nw4r3snd6detail16FxReverbStdParam +SetParam__Q34nw4r3snd15FxReverbStdDpl2FRCQ44nw4r3snd6detail16FxReverbStdParam: /* 8041687C 003DFE3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80416880 003DFE40 7C 08 02 A6 */ mflr r0 /* 80416884 003DFE44 C0 44 00 18 */ lfs f2, 0x18(r4) @@ -445,8 +446,8 @@ lbl_80416B7C: /* 80416B90 003E0150 38 21 00 20 */ addi r1, r1, 0x20 /* 80416B94 003E0154 4E 80 00 20 */ blr -.global func_80416B98 -func_80416B98: +.global UpdateBuffer__Q34nw4r3snd15FxReverbStdDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode +UpdateBuffer__Q34nw4r3snd15FxReverbStdDpl2FiPPvUlQ34nw4r3snd12SampleFormatfQ34nw4r3snd10OutputMode: /* 80416B98 003E0158 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80416B9C 003E015C 7C 08 02 A6 */ mflr r0 /* 80416BA0 003E0160 7C 64 1B 78 */ mr r4, r3 @@ -490,8 +491,8 @@ lbl_80416C28: /* 80416C30 003E01F0 38 21 00 30 */ addi r1, r1, 0x30 /* 80416C34 003E01F4 4E 80 00 20 */ blr -.global func_80416C38 -func_80416C38: +.global OnChangeOutputMode__Q34nw4r3snd15FxReverbStdDpl2Fv +OnChangeOutputMode__Q34nw4r3snd15FxReverbStdDpl2Fv: /* 80416C38 003E01F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80416C3C 003E01FC 7C 08 02 A6 */ mflr r0 /* 80416C40 003E0200 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/nw4r/snd/snd_McsSoundArchive.s b/asm/nw4r/snd/snd_McsSoundArchive.s new file mode 100644 index 0000000..3e04614 --- /dev/null +++ b/asm/nw4r/snd/snd_McsSoundArchive.s @@ -0,0 +1,20 @@ +.include "macros.inc" + +.section .text, "ax" # 0x80039220 - 0x804F5900 + +#not sure if these belong in this file + +.global GetBufferAlign__Q34nw4r2ut8IOStreamCFv +GetBufferAlign__Q34nw4r2ut8IOStreamCFv: +/* 80417150 003E0710 38 60 00 01 */ li r3, 1 +/* 80417154 003E0714 4E 80 00 20 */ blr + +.global GetSizeAlign__Q34nw4r2ut8IOStreamCFv +GetSizeAlign__Q34nw4r2ut8IOStreamCFv: +/* 80417158 003E0718 38 60 00 01 */ li r3, 1 +/* 8041715C 003E071C 4E 80 00 20 */ blr + +.global GetOffsetAlign__Q34nw4r2ut8IOStreamCFv +GetOffsetAlign__Q34nw4r2ut8IOStreamCFv: +/* 80417160 003E0720 38 60 00 01 */ li r3, 1 +/* 80417164 003E0724 4E 80 00 20 */ blr \ No newline at end of file diff --git a/asm/nw4r/snd/snd_MemorySoundArchive.s b/asm/nw4r/snd/snd_MemorySoundArchive.s index 31ee975..997f22a 100644 --- a/asm/nw4r/snd/snd_MemorySoundArchive.s +++ b/asm/nw4r/snd/snd_MemorySoundArchive.s @@ -2,36 +2,21 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80417150 -func_80417150: -/* 80417150 003E0710 38 60 00 01 */ li r3, 1 -/* 80417154 003E0714 4E 80 00 20 */ blr - -.global func_80417158 -func_80417158: -/* 80417158 003E0718 38 60 00 01 */ li r3, 1 -/* 8041715C 003E071C 4E 80 00 20 */ blr - -.global func_80417160 -func_80417160: -/* 80417160 003E0720 38 60 00 01 */ li r3, 1 -/* 80417164 003E0724 4E 80 00 20 */ blr - -.global func_80417168 -func_80417168: +.global __ct__Q34nw4r3snd18MemorySoundArchiveFv +__ct__Q34nw4r3snd18MemorySoundArchiveFv: /* 80417168 003E0728 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041716C 003E072C 7C 08 02 A6 */ mflr r0 /* 80417170 003E0730 90 01 00 14 */ stw r0, 0x14(r1) /* 80417174 003E0734 93 E1 00 0C */ stw r31, 0xc(r1) /* 80417178 003E0738 7C 7F 1B 78 */ mr r31, r3 -/* 8041717C 003E073C 48 00 56 01 */ bl func_8041C77C +/* 8041717C 003E073C 48 00 56 01 */ bl __ct__Q34nw4r3snd12SoundArchiveFv /* 80417180 003E0740 3C 80 80 57 */ lis r4, lbl_8056E150@ha /* 80417184 003E0744 38 00 00 00 */ li r0, 0 /* 80417188 003E0748 38 84 E1 50 */ addi r4, r4, lbl_8056E150@l /* 8041718C 003E074C 90 1F 01 08 */ stw r0, 0x108(r31) /* 80417190 003E0750 38 7F 01 0C */ addi r3, r31, 0x10c /* 80417194 003E0754 90 9F 00 00 */ stw r4, 0(r31) -/* 80417198 003E0758 48 00 59 3D */ bl func_8041CAD4 +/* 80417198 003E0758 48 00 59 3D */ bl __ct__Q44nw4r3snd6detail22SoundArchiveFileReaderFv /* 8041719C 003E075C 7F E3 FB 78 */ mr r3, r31 /* 804171A0 003E0760 83 E1 00 0C */ lwz r31, 0xc(r1) /* 804171A4 003E0764 80 01 00 14 */ lwz r0, 0x14(r1) @@ -39,8 +24,8 @@ func_80417168: /* 804171AC 003E076C 38 21 00 10 */ addi r1, r1, 0x10 /* 804171B0 003E0770 4E 80 00 20 */ blr -.global func_804171B4 -func_804171B4: +.global __dt__Q34nw4r3snd18MemorySoundArchiveFv +__dt__Q34nw4r3snd18MemorySoundArchiveFv: /* 804171B4 003E0774 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804171B8 003E0778 7C 08 02 A6 */ mflr r0 /* 804171BC 003E077C 2C 03 00 00 */ cmpwi r3, 0 @@ -51,7 +36,7 @@ func_804171B4: /* 804171D0 003E0790 7C 7E 1B 78 */ mr r30, r3 /* 804171D4 003E0794 41 82 00 1C */ beq lbl_804171F0 /* 804171D8 003E0798 38 80 00 00 */ li r4, 0 -/* 804171DC 003E079C 48 00 55 C5 */ bl func_8041C7A0 +/* 804171DC 003E079C 48 00 55 C5 */ bl __dt__Q34nw4r3snd12SoundArchiveFv /* 804171E0 003E07A0 2C 1F 00 00 */ cmpwi r31, 0 /* 804171E4 003E07A4 40 81 00 0C */ ble lbl_804171F0 /* 804171E8 003E07A8 7F C3 F3 78 */ mr r3, r30 @@ -65,8 +50,8 @@ lbl_804171F0: /* 80417204 003E07C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80417208 003E07C8 4E 80 00 20 */ blr -.global func_8041720C -func_8041720C: +.global Setup__Q34nw4r3snd18MemorySoundArchiveFPCv +Setup__Q34nw4r3snd18MemorySoundArchiveFPCv: /* 8041720C 003E07CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80417210 003E07D0 7C 08 02 A6 */ mflr r0 /* 80417214 003E07D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -75,20 +60,20 @@ func_8041720C: /* 80417220 003E07E0 93 C1 00 08 */ stw r30, 8(r1) /* 80417224 003E07E4 7C 7E 1B 78 */ mr r30, r3 /* 80417228 003E07E8 38 63 01 0C */ addi r3, r3, 0x10c -/* 8041722C 003E07EC 48 00 58 CD */ bl func_8041CAF8 +/* 8041722C 003E07EC 48 00 58 CD */ bl Init__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCv /* 80417230 003E07F0 7F C3 F3 78 */ mr r3, r30 /* 80417234 003E07F4 38 9E 01 0C */ addi r4, r30, 0x10c -/* 80417238 003E07F8 48 00 55 BD */ bl func_8041C7F4 +/* 80417238 003E07F8 48 00 55 BD */ bl Setup__Q34nw4r3snd12SoundArchiveFPQ44nw4r3snd6detail22SoundArchiveFileReader /* 8041723C 003E07FC 80 1E 01 24 */ lwz r0, 0x124(r30) /* 80417240 003E0800 38 7E 01 0C */ addi r3, r30, 0x10c /* 80417244 003E0804 80 BE 01 28 */ lwz r5, 0x128(r30) /* 80417248 003E0808 7C 80 FA 14 */ add r4, r0, r31 -/* 8041724C 003E080C 48 00 5A 05 */ bl func_8041CC50 +/* 8041724C 003E080C 48 00 5A 05 */ bl SetInfoChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl /* 80417250 003E0810 80 1E 01 1C */ lwz r0, 0x11c(r30) /* 80417254 003E0814 38 7E 01 0C */ addi r3, r30, 0x10c /* 80417258 003E0818 80 BE 01 20 */ lwz r5, 0x120(r30) /* 8041725C 003E081C 7C 80 FA 14 */ add r4, r0, r31 -/* 80417260 003E0820 48 00 59 49 */ bl func_8041CBA8 +/* 80417260 003E0820 48 00 59 49 */ bl SetStringChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl /* 80417264 003E0824 93 FE 01 08 */ stw r31, 0x108(r30) /* 80417268 003E0828 38 60 00 01 */ li r3, 1 /* 8041726C 003E082C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -98,14 +83,14 @@ func_8041720C: /* 8041727C 003E083C 38 21 00 10 */ addi r1, r1, 0x10 /* 80417280 003E0840 4E 80 00 20 */ blr -.global func_80417284 -func_80417284: +.global Shutdown__Q34nw4r3snd18MemorySoundArchiveFv +Shutdown__Q34nw4r3snd18MemorySoundArchiveFv: /* 80417284 003E0844 38 00 00 00 */ li r0, 0 /* 80417288 003E0848 90 03 01 08 */ stw r0, 0x108(r3) -/* 8041728C 003E084C 48 00 55 70 */ b func_8041C7FC +/* 8041728C 003E084C 48 00 55 70 */ b Shutdown__Q34nw4r3snd12SoundArchiveFv -.global func_80417290 -func_80417290: +.global detail_GetFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl +detail_GetFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl: /* 80417290 003E0850 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80417294 003E0854 7C 08 02 A6 */ mflr r0 /* 80417298 003E0858 38 A0 00 00 */ li r5, 0 @@ -113,7 +98,7 @@ func_80417290: /* 804172A0 003E0860 38 C1 00 08 */ addi r6, r1, 8 /* 804172A4 003E0864 93 E1 00 4C */ stw r31, 0x4c(r1) /* 804172A8 003E0868 7C 7F 1B 78 */ mr r31, r3 -/* 804172AC 003E086C 48 00 55 F9 */ bl func_8041C8A4 +/* 804172AC 003E086C 48 00 55 F9 */ bl detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos /* 804172B0 003E0870 2C 03 00 00 */ cmpwi r3, 0 /* 804172B4 003E0874 40 82 00 0C */ bne lbl_804172C0 /* 804172B8 003E0878 38 60 00 00 */ li r3, 0 @@ -122,7 +107,7 @@ lbl_804172C0: /* 804172C0 003E0880 80 81 00 08 */ lwz r4, 8(r1) /* 804172C4 003E0884 7F E3 FB 78 */ mr r3, r31 /* 804172C8 003E0888 38 A1 00 28 */ addi r5, r1, 0x28 -/* 804172CC 003E088C 48 00 55 B9 */ bl func_8041C884 +/* 804172CC 003E088C 48 00 55 B9 */ bl detail_ReadGroupInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9GroupInfo /* 804172D0 003E0890 2C 03 00 00 */ cmpwi r3, 0 /* 804172D4 003E0894 40 82 00 0C */ bne lbl_804172E0 /* 804172D8 003E0898 38 60 00 00 */ li r3, 0 @@ -132,7 +117,7 @@ lbl_804172E0: /* 804172E4 003E08A4 7F E3 FB 78 */ mr r3, r31 /* 804172E8 003E08A8 80 A1 00 0C */ lwz r5, 0xc(r1) /* 804172EC 003E08AC 38 C1 00 10 */ addi r6, r1, 0x10 -/* 804172F0 003E08B0 48 00 55 9D */ bl func_8041C88C +/* 804172F0 003E08B0 48 00 55 9D */ bl detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo /* 804172F4 003E08B4 2C 03 00 00 */ cmpwi r3, 0 /* 804172F8 003E08B8 40 82 00 0C */ bne lbl_80417304 /* 804172FC 003E08BC 38 60 00 00 */ li r3, 0 @@ -156,8 +141,8 @@ lbl_8041732C: /* 80417338 003E08F8 38 21 00 50 */ addi r1, r1, 0x50 /* 8041733C 003E08FC 4E 80 00 20 */ blr -.global func_80417340 -func_80417340: +.global detail_GetWaveDataFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl +detail_GetWaveDataFileAddress__Q34nw4r3snd18MemorySoundArchiveCFUl: /* 80417340 003E0900 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80417344 003E0904 7C 08 02 A6 */ mflr r0 /* 80417348 003E0908 38 A0 00 00 */ li r5, 0 @@ -165,7 +150,7 @@ func_80417340: /* 80417350 003E0910 38 C1 00 08 */ addi r6, r1, 8 /* 80417354 003E0914 93 E1 00 4C */ stw r31, 0x4c(r1) /* 80417358 003E0918 7C 7F 1B 78 */ mr r31, r3 -/* 8041735C 003E091C 48 00 55 49 */ bl func_8041C8A4 +/* 8041735C 003E091C 48 00 55 49 */ bl detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos /* 80417360 003E0920 2C 03 00 00 */ cmpwi r3, 0 /* 80417364 003E0924 40 82 00 0C */ bne lbl_80417370 /* 80417368 003E0928 38 60 00 00 */ li r3, 0 @@ -174,7 +159,7 @@ lbl_80417370: /* 80417370 003E0930 80 81 00 08 */ lwz r4, 8(r1) /* 80417374 003E0934 7F E3 FB 78 */ mr r3, r31 /* 80417378 003E0938 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8041737C 003E093C 48 00 55 09 */ bl func_8041C884 +/* 8041737C 003E093C 48 00 55 09 */ bl detail_ReadGroupInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9GroupInfo /* 80417380 003E0940 2C 03 00 00 */ cmpwi r3, 0 /* 80417384 003E0944 40 82 00 0C */ bne lbl_80417390 /* 80417388 003E0948 38 60 00 00 */ li r3, 0 @@ -184,7 +169,7 @@ lbl_80417390: /* 80417394 003E0954 7F E3 FB 78 */ mr r3, r31 /* 80417398 003E0958 80 A1 00 0C */ lwz r5, 0xc(r1) /* 8041739C 003E095C 38 C1 00 10 */ addi r6, r1, 0x10 -/* 804173A0 003E0960 48 00 54 ED */ bl func_8041C88C +/* 804173A0 003E0960 48 00 54 ED */ bl detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo /* 804173A4 003E0964 2C 03 00 00 */ cmpwi r3, 0 /* 804173A8 003E0968 40 82 00 0C */ bne lbl_804173B4 /* 804173AC 003E096C 38 60 00 00 */ li r3, 0 @@ -208,8 +193,8 @@ lbl_804173DC: /* 804173E8 003E09A8 38 21 00 50 */ addi r1, r1, 0x50 /* 804173EC 003E09AC 4E 80 00 20 */ blr -.global func_804173F0 -func_804173F0: +.global OpenStream__Q34nw4r3snd18MemorySoundArchiveCFPviUlUl +OpenStream__Q34nw4r3snd18MemorySoundArchiveCFPviUlUl: /* 804173F0 003E09B0 80 03 01 08 */ lwz r0, 0x108(r3) /* 804173F4 003E09B4 2C 00 00 00 */ cmpwi r0, 0 /* 804173F8 003E09B8 40 82 00 0C */ bne lbl_80417404 @@ -237,26 +222,26 @@ lbl_80417414: /* 80417448 003E0A08 91 04 00 1C */ stw r8, 0x1c(r4) /* 8041744C 003E0A0C 4E 80 00 20 */ blr -.global func_80417450 -func_80417450: +.global OpenExtStream__Q34nw4r3snd18MemorySoundArchiveCFPviPCcUlUl +OpenExtStream__Q34nw4r3snd18MemorySoundArchiveCFPviPCcUlUl: /* 80417450 003E0A10 38 60 00 00 */ li r3, 0 /* 80417454 003E0A14 4E 80 00 20 */ blr -.global func_80417458 -func_80417458: +.global detail_GetRequiredStreamBufferSize__Q34nw4r3snd18MemorySoundArchiveCFv +detail_GetRequiredStreamBufferSize__Q34nw4r3snd18MemorySoundArchiveCFv: /* 80417458 003E0A18 38 60 00 20 */ li r3, 0x20 /* 8041745C 003E0A1C 4E 80 00 20 */ blr -.global func_80417460 -func_80417460: +.global Close__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv +Close__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv: /* 80417460 003E0A20 38 00 00 00 */ li r0, 0 /* 80417464 003E0A24 90 03 00 14 */ stw r0, 0x14(r3) /* 80417468 003E0A28 90 03 00 18 */ stw r0, 0x18(r3) /* 8041746C 003E0A2C 90 03 00 1C */ stw r0, 0x1c(r3) /* 80417470 003E0A30 4E 80 00 20 */ blr -.global func_80417474 -func_80417474: +.global Read__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFPvUl +Read__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFPvUl: /* 80417474 003E0A34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80417478 003E0A38 7C 08 02 A6 */ mflr r0 /* 8041747C 003E0A3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -281,8 +266,8 @@ lbl_804174A0: /* 804174C4 003E0A84 38 21 00 10 */ addi r1, r1, 0x10 /* 804174C8 003E0A88 4E 80 00 20 */ blr -.global func_804174CC -func_804174CC: +.global Seek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFlUl +Seek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFlUl: /* 804174CC 003E0A8C 2C 05 00 01 */ cmpwi r5, 1 /* 804174D0 003E0A90 41 82 00 28 */ beq lbl_804174F8 /* 804174D4 003E0A94 40 80 00 10 */ bge lbl_804174E4 @@ -306,61 +291,59 @@ lbl_80417508: /* 8041750C 003E0ACC 7C 04 00 50 */ subf r0, r4, r0 /* 80417510 003E0AD0 90 03 00 1C */ stw r0, 0x1c(r3) /* 80417514 003E0AD4 4E 80 00 20 */ blr +/* 80417518 003E0AD8 4E 80 00 20 */ blr -/* 80417518 003E0AD8 4E 80 00 20 */ blr - - -.global func_8041751C -func_8041751C: +.global GetRuntimeTypeInfo__Q34nw4r2ut10FileStreamCFv +GetRuntimeTypeInfo__Q34nw4r2ut10FileStreamCFv: /* 8041751C 003E0ADC 38 6D BC A8 */ addi r3, r13, lbl_80667E28@sda21 /* 80417520 003E0AE0 4E 80 00 20 */ blr -.global func_80417524 -func_80417524: +.global GetSize__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +GetSize__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 80417524 003E0AE4 80 63 00 18 */ lwz r3, 0x18(r3) /* 80417528 003E0AE8 4E 80 00 20 */ blr -.global func_8041752C -func_8041752C: +.global Tell__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +Tell__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 8041752C 003E0AEC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80417530 003E0AF0 4E 80 00 20 */ blr -.global func_80417534 -func_80417534: +.global CanWrite__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +CanWrite__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 80417534 003E0AF4 38 60 00 00 */ li r3, 0 /* 80417538 003E0AF8 4E 80 00 20 */ blr -.global func_8041753C -func_8041753C: +.global CanRead__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +CanRead__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 8041753C 003E0AFC 38 60 00 01 */ li r3, 1 /* 80417540 003E0B00 4E 80 00 20 */ blr -.global func_80417544 -func_80417544: +.global CanAsync__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +CanAsync__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 80417544 003E0B04 38 60 00 00 */ li r3, 0 /* 80417548 003E0B08 4E 80 00 20 */ blr -.global func_8041754C -func_8041754C: +.global CanCancel__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +CanCancel__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 8041754C 003E0B0C 38 60 00 01 */ li r3, 1 /* 80417550 003E0B10 4E 80 00 20 */ blr -.global func_80417554 -func_80417554: +.global CanSeek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv +CanSeek__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamCFv: /* 80417554 003E0B14 38 60 00 01 */ li r3, 1 /* 80417558 003E0B18 4E 80 00 20 */ blr -.global func_8041755C -func_8041755C: +.global __dt__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv +__dt__Q44nw4r3snd18MemorySoundArchive16MemoryFileStreamFv: /* 8041755C 003E0B1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80417560 003E0B20 7C 08 02 A6 */ mflr r0 /* 80417564 003E0B24 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/nw4r/snd/snd_MmlParser.s b/asm/nw4r/snd/snd_MmlParser.s index 73c6979..8ef97b2 100644 --- a/asm/nw4r/snd/snd_MmlParser.s +++ b/asm/nw4r/snd/snd_MmlParser.s @@ -542,7 +542,7 @@ lbl_80417D48: lbl_80417D60: /* 80417D60 003E1320 7F 83 E3 78 */ mr r3, r28 /* 80417D64 003E1324 7F 24 CB 78 */ mr r4, r25 -/* 80417D68 003E1328 48 00 44 79 */ bl func_8041C1E0 +/* 80417D68 003E1328 48 00 44 79 */ bl SetMute__Q44nw4r3snd6detail8SeqTrackFQ34nw4r3snd7SeqMute /* 80417D6C 003E132C 48 00 08 50 */ b lbl_804185BC .global lbl_80417D70 lbl_80417D70: @@ -760,9 +760,9 @@ lbl_80417FC8: /* 80417FD4 003E1594 38 80 FF FF */ li r4, -1 /* 80417FD8 003E1598 54 00 0F FE */ srwi r0, r0, 0x1f /* 80417FDC 003E159C 98 1F 00 0A */ stb r0, 0xa(r31) -/* 80417FE0 003E15A0 48 00 39 B9 */ bl func_8041B998 +/* 80417FE0 003E15A0 48 00 39 B9 */ bl ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi /* 80417FE4 003E15A4 7F 83 E3 78 */ mr r3, r28 -/* 80417FE8 003E15A8 48 00 40 95 */ bl func_8041C07C +/* 80417FE8 003E15A8 48 00 40 95 */ bl FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv /* 80417FEC 003E15AC 48 00 05 D0 */ b lbl_804185BC .global lbl_80417FF0 lbl_80417FF0: @@ -773,9 +773,9 @@ lbl_80417FF0: /* 80418000 003E15C0 41 82 05 BC */ beq lbl_804185BC /* 80418004 003E15C4 7F 83 E3 78 */ mr r3, r28 /* 80418008 003E15C8 38 80 FF FF */ li r4, -1 -/* 8041800C 003E15CC 48 00 39 8D */ bl func_8041B998 +/* 8041800C 003E15CC 48 00 39 8D */ bl ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi /* 80418010 003E15D0 7F 83 E3 78 */ mr r3, r28 -/* 80418014 003E15D4 48 00 40 69 */ bl func_8041C07C +/* 80418014 003E15D4 48 00 40 69 */ bl FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv /* 80418018 003E15D8 48 00 05 A4 */ b lbl_804185BC .global lbl_8041801C lbl_8041801C: @@ -898,13 +898,13 @@ lbl_80418168: /* 8041817C 003E173C 41 82 04 40 */ beq lbl_804185BC /* 80418180 003E1740 7C 03 E0 40 */ cmplw r3, r28 /* 80418184 003E1744 41 82 04 38 */ beq lbl_804185BC -/* 80418188 003E1748 48 00 34 FD */ bl func_8041B684 +/* 80418188 003E1748 48 00 34 FD */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041818C 003E174C 80 9F 00 00 */ lwz r4, 0(r31) /* 80418190 003E1750 7F 63 DB 78 */ mr r3, r27 /* 80418194 003E1754 7F A5 EB 78 */ mr r5, r29 -/* 80418198 003E1758 48 00 34 C1 */ bl func_8041B658 +/* 80418198 003E1758 48 00 34 C1 */ bl SetSeqData__Q44nw4r3snd6detail8SeqTrackFPCvl /* 8041819C 003E175C 7F 63 DB 78 */ mr r3, r27 -/* 804181A0 003E1760 48 00 34 C9 */ bl func_8041B668 +/* 804181A0 003E1760 48 00 34 C9 */ bl Open__Q44nw4r3snd6detail8SeqTrackFv /* 804181A4 003E1764 48 00 04 18 */ b lbl_804185BC .global lbl_804181A8 lbl_804181A8: diff --git a/asm/nw4r/snd/snd_RemoteSpeaker.s b/asm/nw4r/snd/snd_RemoteSpeaker.s index 80070ae..138e588 100644 --- a/asm/nw4r/snd/snd_RemoteSpeaker.s +++ b/asm/nw4r/snd/snd_RemoteSpeaker.s @@ -52,11 +52,11 @@ lbl_80418C08: /* 80418C08 003E21C8 38 00 00 00 */ li r0, 0 /* 80418C0C 003E21CC 90 03 00 0C */ stw r0, 0xc(r3) /* 80418C10 003E21D0 90 03 00 10 */ stw r0, 0x10(r3) -/* 80418C14 003E21D4 48 00 00 08 */ b func_80418C1C +/* 80418C14 003E21D4 48 00 00 08 */ b ExecCommand__Q34nw4r3snd13RemoteSpeakerFQ44nw4r3snd13RemoteSpeaker14SpeakerCommand /* 80418C18 003E21D8 4E 80 00 20 */ blr -.global func_80418C1C -func_80418C1C: +.global ExecCommand__Q34nw4r3snd13RemoteSpeakerFQ44nw4r3snd13RemoteSpeaker14SpeakerCommand +ExecCommand__Q34nw4r3snd13RemoteSpeakerFQ44nw4r3snd13RemoteSpeaker14SpeakerCommand: /* 80418C1C 003E21DC 2C 04 00 02 */ cmpwi r4, 2 /* 80418C20 003E21E0 41 82 00 48 */ beq lbl_80418C68 /* 80418C24 003E21E4 40 80 00 14 */ bge lbl_80418C38 @@ -70,9 +70,9 @@ lbl_80418C38: /* 80418C40 003E2200 48 00 00 50 */ b lbl_80418C90 lbl_80418C44: /* 80418C44 003E2204 38 00 00 01 */ li r0, 1 -/* 80418C48 003E2208 3C A0 80 42 */ lis r5, func_80418FC0@ha +/* 80418C48 003E2208 3C A0 80 42 */ lis r5, SpeakerOnCallback__Q34nw4r3snd13RemoteSpeakerFll@ha /* 80418C4C 003E220C 98 03 00 04 */ stb r0, 4(r3) -/* 80418C50 003E2210 38 A5 8F C0 */ addi r5, r5, func_80418FC0@l +/* 80418C50 003E2210 38 A5 8F C0 */ addi r5, r5, SpeakerOnCallback__Q34nw4r3snd13RemoteSpeakerFll@l /* 80418C54 003E2214 38 80 00 01 */ li r4, 1 /* 80418C58 003E2218 98 03 00 05 */ stb r0, 5(r3) /* 80418C5C 003E221C 90 03 00 08 */ stw r0, 8(r3) @@ -81,9 +81,9 @@ lbl_80418C44: lbl_80418C68: /* 80418C68 003E2228 38 C0 00 01 */ li r6, 1 /* 80418C6C 003E222C 38 00 00 03 */ li r0, 3 -/* 80418C70 003E2230 3C A0 80 42 */ lis r5, func_804190CC@ha +/* 80418C70 003E2230 3C A0 80 42 */ lis r5, SpeakerPlayCallback__Q34nw4r3snd13RemoteSpeakerFll@ha /* 80418C74 003E2234 98 C3 00 04 */ stb r6, 4(r3) -/* 80418C78 003E2238 38 A5 90 CC */ addi r5, r5, func_804190CC@l +/* 80418C78 003E2238 38 A5 90 CC */ addi r5, r5, SpeakerPlayCallback__Q34nw4r3snd13RemoteSpeakerFll@l /* 80418C7C 003E223C 38 80 00 04 */ li r4, 4 /* 80418C80 003E2240 98 C3 00 05 */ stb r6, 5(r3) /* 80418C84 003E2244 90 03 00 08 */ stw r0, 8(r3) @@ -92,9 +92,9 @@ lbl_80418C68: lbl_80418C90: /* 80418C90 003E2250 38 C0 00 01 */ li r6, 1 /* 80418C94 003E2254 38 00 00 05 */ li r0, 5 -/* 80418C98 003E2258 3C A0 80 42 */ lis r5, func_804191B4@ha +/* 80418C98 003E2258 3C A0 80 42 */ lis r5, SpeakerOffCallback__Q34nw4r3snd13RemoteSpeakerFll@ha /* 80418C9C 003E225C 98 C3 00 04 */ stb r6, 4(r3) -/* 80418CA0 003E2260 38 A5 91 B4 */ addi r5, r5, func_804191B4@l +/* 80418CA0 003E2260 38 A5 91 B4 */ addi r5, r5, SpeakerOffCallback__Q34nw4r3snd13RemoteSpeakerFll@l /* 80418CA4 003E2264 38 80 00 00 */ li r4, 0 /* 80418CA8 003E2268 98 C3 00 05 */ stb r6, 5(r3) /* 80418CAC 003E226C 90 03 00 08 */ stw r0, 8(r3) @@ -268,13 +268,13 @@ lbl_80418EE0: /* 80418EF4 003E24B4 2C 00 00 00 */ cmpwi r0, 0 /* 80418EF8 003E24B8 40 82 00 4C */ bne lbl_80418F44 /* 80418EFC 003E24BC 3C 60 80 00 */ lis r3, 0x800000F8@ha -/* 80418F00 003E24C0 3C E0 80 42 */ lis r7, func_8041929C@ha +/* 80418F00 003E24C0 3C E0 80 42 */ lis r7, ContinueAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext@ha /* 80418F04 003E24C4 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 80418F08 003E24C8 38 80 01 E0 */ li r4, 0x1e0 /* 80418F0C 003E24CC 38 A0 00 00 */ li r5, 0 /* 80418F10 003E24D0 38 7D 00 40 */ addi r3, r29, 0x40 /* 80418F14 003E24D4 54 06 F0 BE */ srwi r6, r0, 2 -/* 80418F18 003E24D8 38 E7 92 9C */ addi r7, r7, func_8041929C@l +/* 80418F18 003E24D8 38 E7 92 9C */ addi r7, r7, ContinueAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext@l /* 80418F1C 003E24DC 7C 06 20 16 */ mulhwu r0, r6, r4 /* 80418F20 003E24E0 7C 85 21 D6 */ mullw r4, r5, r4 /* 80418F24 003E24E4 1C C6 01 E0 */ mulli r6, r6, 0x1e0 @@ -302,10 +302,10 @@ lbl_80418F5C: /* 80418F74 003E2534 38 7D 00 70 */ addi r3, r29, 0x70 /* 80418F78 003E2538 4B F3 A2 09 */ bl OSCancelAlarm /* 80418F7C 003E253C 3C 60 80 00 */ lis r3, 0x800000F8@ha -/* 80418F80 003E2540 3C E0 80 42 */ lis r7, func_804192E4@ha +/* 80418F80 003E2540 3C E0 80 42 */ lis r7, IntervalAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext@ha /* 80418F84 003E2544 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 80418F88 003E2548 38 7D 00 70 */ addi r3, r29, 0x70 -/* 80418F8C 003E254C 38 E7 92 E4 */ addi r7, r7, func_804192E4@l +/* 80418F8C 003E254C 38 E7 92 E4 */ addi r7, r7, IntervalAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext@l /* 80418F90 003E2550 38 A0 00 00 */ li r5, 0 /* 80418F94 003E2554 54 06 F0 BE */ srwi r6, r0, 2 /* 80418F98 003E2558 4B F3 A0 E9 */ bl OSSetAlarm @@ -321,8 +321,8 @@ lbl_80418FA8: /* 80418FB8 003E2578 38 21 00 40 */ addi r1, r1, 0x40 /* 80418FBC 003E257C 4E 80 00 20 */ blr -.global func_80418FC0 -func_80418FC0: +.global SpeakerOnCallback__Q34nw4r3snd13RemoteSpeakerFll +SpeakerOnCallback__Q34nw4r3snd13RemoteSpeakerFll: /* 80418FC0 003E2580 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80418FC4 003E2584 7C 08 02 A6 */ mflr r0 /* 80418FC8 003E2588 90 01 00 24 */ stw r0, 0x24(r1) @@ -398,8 +398,8 @@ lbl_804190A8: /* 804190C4 003E2684 38 21 00 20 */ addi r1, r1, 0x20 /* 804190C8 003E2688 4E 80 00 20 */ blr -.global func_804190CC -func_804190CC: +.global SpeakerPlayCallback__Q34nw4r3snd13RemoteSpeakerFll +SpeakerPlayCallback__Q34nw4r3snd13RemoteSpeakerFll: /* 804190CC 003E268C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804190D0 003E2690 7C 08 02 A6 */ mflr r0 /* 804190D4 003E2694 90 01 00 24 */ stw r0, 0x24(r1) @@ -466,8 +466,8 @@ lbl_80419190: /* 804191AC 003E276C 38 21 00 20 */ addi r1, r1, 0x20 /* 804191B0 003E2770 4E 80 00 20 */ blr -.global func_804191B4 -func_804191B4: +.global SpeakerOffCallback__Q34nw4r3snd13RemoteSpeakerFll +SpeakerOffCallback__Q34nw4r3snd13RemoteSpeakerFll: /* 804191B4 003E2774 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804191B8 003E2778 7C 08 02 A6 */ mflr r0 /* 804191BC 003E277C 90 01 00 24 */ stw r0, 0x24(r1) @@ -534,8 +534,8 @@ lbl_80419278: /* 80419294 003E2854 38 21 00 20 */ addi r1, r1, 0x20 /* 80419298 003E2858 4E 80 00 20 */ blr -.global func_8041929C -func_8041929C: +.global ContinueAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext +ContinueAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext: /* 8041929C 003E285C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804192A0 003E2860 7C 08 02 A6 */ mflr r0 /* 804192A4 003E2864 90 01 00 14 */ stw r0, 0x14(r1) @@ -555,8 +555,8 @@ func_8041929C: /* 804192DC 003E289C 38 21 00 10 */ addi r1, r1, 0x10 /* 804192E0 003E28A0 4E 80 00 20 */ blr -.global func_804192E4 -func_804192E4: +.global IntervalAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext +IntervalAlarmHandler__Q34nw4r3snd13RemoteSpeakerFP7OSAlarmP9OSContext: /* 804192E4 003E28A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804192E8 003E28A8 7C 08 02 A6 */ mflr r0 /* 804192EC 003E28AC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/nw4r/snd/snd_SeqPlayer.s b/asm/nw4r/snd/snd_SeqPlayer.s index 8c296cd..95e48a6 100644 --- a/asm/nw4r/snd/snd_SeqPlayer.s +++ b/asm/nw4r/snd/snd_SeqPlayer.s @@ -24,14 +24,14 @@ InitSeqPlayer__Q44nw4r3snd6detail9SeqPlayerFv: /* 8041974C 003E2D0C B0 03 00 1E */ sth r0, 0x1e(r3) /* 80419750 003E2D10 4E 80 00 20 */ blr -.global func_80419754 -func_80419754: +.global __ct__Q44nw4r3snd6detail9SeqPlayerFv +__ct__Q44nw4r3snd6detail9SeqPlayerFv: /* 80419754 003E2D14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80419758 003E2D18 7C 08 02 A6 */ mflr r0 /* 8041975C 003E2D1C 90 01 00 14 */ stw r0, 0x14(r1) /* 80419760 003E2D20 93 E1 00 0C */ stw r31, 0xc(r1) /* 80419764 003E2D24 7C 7F 1B 78 */ mr r31, r3 -/* 80419768 003E2D28 4B FF 8A 29 */ bl func_80412190 +/* 80419768 003E2D28 4B FF 8A 29 */ bl __ct__Q44nw4r3snd6detail11BasicPlayerFv /* 8041976C 003E2D2C 3D 20 80 57 */ lis r9, lbl_8056E3D8@ha /* 80419770 003E2D30 39 40 00 00 */ li r10, 0 /* 80419774 003E2D34 39 29 E3 D8 */ addi r9, r9, lbl_8056E3D8@l @@ -109,8 +109,8 @@ func_80419754: /* 80419894 003E2E54 38 21 00 10 */ addi r1, r1, 0x10 /* 80419898 003E2E58 4E 80 00 20 */ blr -.global func_8041989C -func_8041989C: +.global __dt__Q44nw4r3snd6detail9SeqPlayerFv +__dt__Q44nw4r3snd6detail9SeqPlayerFv: /* 8041989C 003E2E5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804198A0 003E2E60 7C 08 02 A6 */ mflr r0 /* 804198A4 003E2E64 90 01 00 24 */ stw r0, 0x24(r1) @@ -143,7 +143,7 @@ func_8041989C: lbl_80419910: /* 80419910 003E2ED0 48 00 79 D5 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80419914 003E2ED4 7F C4 F3 78 */ mr r4, r30 -/* 80419918 003E2ED8 48 00 7F 01 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80419918 003E2ED8 48 00 7F 01 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8041991C 003E2EDC 38 00 00 00 */ li r0, 0 /* 80419920 003E2EE0 98 1B 00 ED */ stb r0, 0xed(r27) lbl_80419924: @@ -182,7 +182,7 @@ lbl_80419980: /* 80419990 003E2F50 4B F4 03 B1 */ bl OSUnlockMutex /* 80419994 003E2F54 48 00 00 30 */ b lbl_804199C4 lbl_80419998: -/* 80419998 003E2F58 48 00 1C ED */ bl func_8041B684 +/* 80419998 003E2F58 48 00 1C ED */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041999C 003E2F5C 80 7B 01 14 */ lwz r3, 0x114(r27) /* 804199A0 003E2F60 80 9D 01 20 */ lwz r4, 0x120(r29) /* 804199A4 003E2F64 81 83 00 00 */ lwz r12, 0(r3) @@ -217,8 +217,8 @@ lbl_804199FC: /* 80419A10 003E2FD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80419A14 003E2FD4 4E 80 00 20 */ blr -.global func_80419A18 -func_80419A18: +.global InitParam__Q44nw4r3snd6detail9SeqPlayerFiPQ44nw4r3snd6detail14NoteOnCallback +InitParam__Q44nw4r3snd6detail9SeqPlayerFiPQ44nw4r3snd6detail14NoteOnCallback: /* 80419A18 003E2FD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80419A1C 003E2FDC 7C 08 02 A6 */ mflr r0 /* 80419A20 003E2FE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -228,7 +228,7 @@ func_80419A18: /* 80419A30 003E2FF0 7C 9E 23 78 */ mr r30, r4 /* 80419A34 003E2FF4 93 A1 00 14 */ stw r29, 0x14(r1) /* 80419A38 003E2FF8 7C 7D 1B 78 */ mr r29, r3 -/* 80419A3C 003E2FFC 4B FF 89 A9 */ bl func_804123E4 +/* 80419A3C 003E2FFC 4B FF 89 A9 */ bl InitParam__Q44nw4r3snd6detail11BasicPlayerFv /* 80419A40 003E3000 C0 22 C4 80 */ lfs f1, lbl_8066C800@sda21(r2) /* 80419A44 003E3004 38 E0 00 00 */ li r7, 0 /* 80419A48 003E3008 C0 02 C4 84 */ lfs f0, lbl_8066C804@sda21(r2) @@ -292,8 +292,8 @@ func_80419A18: /* 80419B30 003E30F0 38 21 00 20 */ addi r1, r1, 0x20 /* 80419B34 003E30F4 4E 80 00 20 */ blr -.global func_80419B38 -func_80419B38: +.global Setup__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail17SeqTrackAllocatorUliPQ44nw4r3snd6detail14NoteOnCallback +Setup__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail17SeqTrackAllocatorUliPQ44nw4r3snd6detail14NoteOnCallback: /* 80419B38 003E30F8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80419B3C 003E30FC 7C 08 02 A6 */ mflr r0 /* 80419B40 003E3100 90 01 00 34 */ stw r0, 0x34(r1) @@ -323,7 +323,7 @@ func_80419B38: lbl_80419BA0: /* 80419BA0 003E3160 48 00 77 45 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80419BA4 003E3164 7F 64 DB 78 */ mr r4, r27 -/* 80419BA8 003E3168 48 00 7C 71 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80419BA8 003E3168 48 00 7C 71 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 80419BAC 003E316C 38 00 00 00 */ li r0, 0 /* 80419BB0 003E3170 98 1D 00 ED */ stb r0, 0xed(r29) lbl_80419BB4: @@ -362,7 +362,7 @@ lbl_80419C10: /* 80419C20 003E31E0 4B F4 01 21 */ bl OSUnlockMutex /* 80419C24 003E31E4 48 00 00 30 */ b lbl_80419C54 lbl_80419C28: -/* 80419C28 003E31E8 48 00 1A 5D */ bl func_8041B684 +/* 80419C28 003E31E8 48 00 1A 5D */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 80419C2C 003E31EC 80 7D 01 14 */ lwz r3, 0x114(r29) /* 80419C30 003E31F0 80 9A 01 20 */ lwz r4, 0x120(r26) /* 80419C34 003E31F4 81 83 00 00 */ lwz r12, 0(r3) @@ -387,7 +387,7 @@ lbl_80419C54: /* 80419C7C 003E323C 7F A3 EB 78 */ mr r3, r29 /* 80419C80 003E3240 7F 04 C3 78 */ mr r4, r24 /* 80419C84 003E3244 7F 25 CB 78 */ mr r5, r25 -/* 80419C88 003E3248 4B FF FD 91 */ bl func_80419A18 +/* 80419C88 003E3248 4B FF FD 91 */ bl InitParam__Q44nw4r3snd6detail9SeqPlayerFiPQ44nw4r3snd6detail14NoteOnCallback /* 80419C8C 003E324C 4B F3 ED 25 */ bl OSDisableInterrupts /* 80419C90 003E3250 7C 7C 1B 78 */ mr r28, r3 /* 80419C94 003E3254 7F E3 FB 78 */ mr r3, r31 @@ -479,8 +479,8 @@ lbl_80419DB4: /* 80419DC4 003E3384 38 21 00 30 */ addi r1, r1, 0x30 /* 80419DC8 003E3388 4E 80 00 20 */ blr -.global func_80419DCC -func_80419DCC: +.global SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl +SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl: /* 80419DCC 003E338C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80419DD0 003E3390 7C 08 02 A6 */ mflr r0 /* 80419DD4 003E3394 90 01 00 24 */ stw r0, 0x24(r1) @@ -499,9 +499,9 @@ func_80419DCC: /* 80419E08 003E33C8 7F E3 FB 78 */ mr r3, r31 /* 80419E0C 003E33CC 7F A4 EB 78 */ mr r4, r29 /* 80419E10 003E33D0 7F C5 F3 78 */ mr r5, r30 -/* 80419E14 003E33D4 48 00 18 45 */ bl func_8041B658 +/* 80419E14 003E33D4 48 00 18 45 */ bl SetSeqData__Q44nw4r3snd6detail8SeqTrackFPCvl /* 80419E18 003E33D8 7F E3 FB 78 */ mr r3, r31 -/* 80419E1C 003E33DC 48 00 18 4D */ bl func_8041B668 +/* 80419E1C 003E33DC 48 00 18 4D */ bl Open__Q44nw4r3snd6detail8SeqTrackFv lbl_80419E20: /* 80419E20 003E33E0 48 00 74 C5 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80419E24 003E33E4 38 63 03 54 */ addi r3, r3, 0x354 @@ -514,8 +514,8 @@ lbl_80419E20: /* 80419E40 003E3400 38 21 00 20 */ addi r1, r1, 0x20 /* 80419E44 003E3404 4E 80 00 20 */ blr -.global func_80419E48 -func_80419E48: +.global Start__Q44nw4r3snd6detail9SeqPlayerFv +Start__Q44nw4r3snd6detail9SeqPlayerFv: /* 80419E48 003E3408 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80419E4C 003E340C 7C 08 02 A6 */ mflr r0 /* 80419E50 003E3410 90 01 00 14 */ stw r0, 0x14(r1) @@ -532,7 +532,7 @@ func_80419E48: lbl_80419E7C: /* 80419E7C 003E343C 48 00 74 69 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80419E80 003E3440 7F E4 FB 78 */ mr r4, r31 -/* 80419E84 003E3444 48 00 79 2D */ bl RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80419E84 003E3444 48 00 79 2D */ bl RegisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 80419E88 003E3448 38 00 00 01 */ li r0, 1 /* 80419E8C 003E344C 98 1E 00 ED */ stb r0, 0xed(r30) /* 80419E90 003E3450 48 00 74 55 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -546,8 +546,8 @@ lbl_80419E7C: /* 80419EB0 003E3470 38 21 00 10 */ addi r1, r1, 0x10 /* 80419EB4 003E3474 4E 80 00 20 */ blr -.global func_80419EB8 -func_80419EB8: +.global Stop__Q44nw4r3snd6detail9SeqPlayerFv +Stop__Q44nw4r3snd6detail9SeqPlayerFv: /* 80419EB8 003E3478 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80419EBC 003E347C 7C 08 02 A6 */ mflr r0 /* 80419EC0 003E3480 90 01 00 24 */ stw r0, 0x24(r1) @@ -572,7 +572,7 @@ func_80419EB8: lbl_80419F0C: /* 80419F0C 003E34CC 48 00 73 D9 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80419F10 003E34D0 7F C4 F3 78 */ mr r4, r30 -/* 80419F14 003E34D4 48 00 79 05 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80419F14 003E34D4 48 00 79 05 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 80419F18 003E34D8 38 00 00 00 */ li r0, 0 /* 80419F1C 003E34DC 98 1C 00 ED */ stb r0, 0xed(r28) lbl_80419F20: @@ -611,7 +611,7 @@ lbl_80419F7C: /* 80419F8C 003E354C 4B F3 FD B5 */ bl OSUnlockMutex /* 80419F90 003E3550 48 00 00 30 */ b lbl_80419FC0 lbl_80419F94: -/* 80419F94 003E3554 48 00 16 F1 */ bl func_8041B684 +/* 80419F94 003E3554 48 00 16 F1 */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 80419F98 003E3558 80 7C 01 14 */ lwz r3, 0x114(r28) /* 80419F9C 003E355C 80 9D 01 20 */ lwz r4, 0x120(r29) /* 80419FA0 003E3560 81 83 00 00 */ lwz r12, 0(r3) @@ -642,8 +642,8 @@ lbl_80419FC0: /* 8041A000 003E35C0 38 21 00 20 */ addi r1, r1, 0x20 /* 8041A004 003E35C4 4E 80 00 20 */ blr -.global func_8041A008 -func_8041A008: +.global Pause__Q44nw4r3snd6detail9SeqPlayerFb +Pause__Q44nw4r3snd6detail9SeqPlayerFb: /* 8041A008 003E35C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041A00C 003E35CC 7C 08 02 A6 */ mflr r0 /* 8041A010 003E35D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -668,7 +668,7 @@ lbl_8041A050: /* 8041A050 003E3610 2C 03 00 00 */ cmpwi r3, 0 /* 8041A054 003E3614 41 82 00 0C */ beq lbl_8041A060 /* 8041A058 003E3618 7F C4 F3 78 */ mr r4, r30 -/* 8041A05C 003E361C 48 00 19 CD */ bl func_8041BA28 +/* 8041A05C 003E361C 48 00 19 CD */ bl PauseAllChannel__Q44nw4r3snd6detail8SeqTrackFb lbl_8041A060: /* 8041A060 003E3620 3B FF 00 01 */ addi r31, r31, 1 /* 8041A064 003E3624 3B BD 00 04 */ addi r29, r29, 4 @@ -685,8 +685,8 @@ lbl_8041A060: /* 8041A090 003E3650 38 21 00 20 */ addi r1, r1, 0x20 /* 8041A094 003E3654 4E 80 00 20 */ blr -.global func_8041A098 -func_8041A098: +.global Skip__Q44nw4r3snd6detail9SeqPlayerFQ54nw4r3snd6detail9SeqPlayer10OffsetTypei +Skip__Q44nw4r3snd6detail9SeqPlayerFQ54nw4r3snd6detail9SeqPlayer10OffsetTypei: /* 8041A098 003E3658 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041A09C 003E365C 7C 08 02 A6 */ mflr r0 /* 8041A0A0 003E3660 90 01 00 24 */ stw r0, 0x24(r1) @@ -742,18 +742,18 @@ lbl_8041A140: /* 8041A154 003E3714 38 21 00 20 */ addi r1, r1, 0x20 /* 8041A158 003E3718 4E 80 00 20 */ blr -.global func_8041A15C -func_8041A15C: +.global SetChannelPriority__Q44nw4r3snd6detail9SeqPlayerFi +SetChannelPriority__Q44nw4r3snd6detail9SeqPlayerFi: /* 8041A15C 003E371C 98 83 01 09 */ stb r4, 0x109(r3) /* 8041A160 003E3720 4E 80 00 20 */ blr -.global func_8041A164 -func_8041A164: +.global SetReleasePriorityFix__Q44nw4r3snd6detail9SeqPlayerFb +SetReleasePriorityFix__Q44nw4r3snd6detail9SeqPlayerFb: /* 8041A164 003E3724 98 83 00 EF */ stb r4, 0xef(r3) /* 8041A168 003E3728 4E 80 00 20 */ blr -.global func_8041A16C -func_8041A16C: +.global SetSeqUserprocCallback__Q44nw4r3snd6detail9SeqPlayerFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv +SetSeqUserprocCallback__Q44nw4r3snd6detail9SeqPlayerFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv: /* 8041A16C 003E372C 90 83 01 18 */ stw r4, 0x118(r3) /* 8041A170 003E3730 90 A3 01 1C */ stw r5, 0x11c(r3) /* 8041A174 003E3734 4E 80 00 20 */ blr @@ -853,7 +853,7 @@ lbl_8041A274: lbl_8041A2C4: /* 8041A2C4 003E3884 48 00 70 21 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8041A2C8 003E3888 7F A4 EB 78 */ mr r4, r29 -/* 8041A2CC 003E388C 48 00 75 4D */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8041A2CC 003E388C 48 00 75 4D */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8041A2D0 003E3890 38 00 00 00 */ li r0, 0 /* 8041A2D4 003E3894 98 1F 00 ED */ stb r0, 0xed(r31) lbl_8041A2D8: @@ -892,7 +892,7 @@ lbl_8041A334: /* 8041A344 003E3904 4B F3 F9 FD */ bl OSUnlockMutex /* 8041A348 003E3908 48 00 00 30 */ b lbl_8041A378 lbl_8041A34C: -/* 8041A34C 003E390C 48 00 13 39 */ bl func_8041B684 +/* 8041A34C 003E390C 48 00 13 39 */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041A350 003E3910 80 7F 01 14 */ lwz r3, 0x114(r31) /* 8041A354 003E3914 80 9C 01 20 */ lwz r4, 0x120(r28) /* 8041A358 003E3918 81 83 00 00 */ lwz r12, 0(r3) @@ -932,6 +932,7 @@ lbl_8041A3B0: /* 8041A3D4 003E3994 38 21 00 20 */ addi r1, r1, 0x20 /* 8041A3D8 003E3998 4E 80 00 20 */ blr +#GetPlayerTrack__Q44nw4r3snd6detail9SeqPlayerFi or GetPlayerTrack__Q44nw4r3snd6detail9SeqPlayerCFi .global func_8041A3DC func_8041A3DC: /* 8041A3DC 003E399C 2C 04 00 0F */ cmpwi r4, 0xf @@ -944,8 +945,8 @@ lbl_8041A3EC: /* 8041A3F4 003E39B4 80 63 01 20 */ lwz r3, 0x120(r3) /* 8041A3F8 003E39B8 4E 80 00 20 */ blr -.global func_8041A3FC -func_8041A3FC: +.global ParseNextTick__Q44nw4r3snd6detail9SeqPlayerFb +ParseNextTick__Q44nw4r3snd6detail9SeqPlayerFb: /* 8041A3FC 003E39BC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8041A400 003E39C0 7C 08 02 A6 */ mflr r0 /* 8041A404 003E39C4 90 01 00 34 */ stw r0, 0x34(r1) @@ -971,10 +972,10 @@ lbl_8041A448: /* 8041A448 003E3A08 2C 1E 00 00 */ cmpwi r30, 0 /* 8041A44C 003E3A0C 41 82 00 94 */ beq lbl_8041A4E0 /* 8041A450 003E3A10 7F C3 F3 78 */ mr r3, r30 -/* 8041A454 003E3A14 48 00 13 01 */ bl func_8041B754 +/* 8041A454 003E3A14 48 00 13 01 */ bl UpdateChannelLength__Q44nw4r3snd6detail8SeqTrackFv /* 8041A458 003E3A18 7F C3 F3 78 */ mr r3, r30 /* 8041A45C 003E3A1C 7F 44 D3 78 */ mr r4, r26 -/* 8041A460 003E3A20 48 00 13 C5 */ bl func_8041B824 +/* 8041A460 003E3A20 48 00 13 C5 */ bl ParseNextTick__Q44nw4r3snd6detail8SeqTrackFb /* 8041A464 003E3A24 2C 03 00 00 */ cmpwi r3, 0 /* 8041A468 003E3A28 40 80 00 68 */ bge lbl_8041A4D0 /* 8041A46C 003E3A2C 48 00 6E 79 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -994,7 +995,7 @@ lbl_8041A48C: /* 8041A49C 003E3A5C 4B F3 F8 A5 */ bl OSUnlockMutex /* 8041A4A0 003E3A60 48 00 00 30 */ b lbl_8041A4D0 lbl_8041A4A4: -/* 8041A4A4 003E3A64 48 00 11 E1 */ bl func_8041B684 +/* 8041A4A4 003E3A64 48 00 11 E1 */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041A4A8 003E3A68 80 79 01 14 */ lwz r3, 0x114(r25) /* 8041A4AC 003E3A6C 80 9D 01 20 */ lwz r4, 0x120(r29) /* 8041A4B0 003E3A70 81 83 00 00 */ lwz r12, 0(r3) @@ -1090,7 +1091,7 @@ lbl_8041A5CC: /* 8041A5E4 003E3BA4 40 81 00 10 */ ble lbl_8041A5F4 lbl_8041A5E8: /* 8041A5E8 003E3BA8 7F C3 F3 78 */ mr r3, r30 -/* 8041A5EC 003E3BAC 48 00 02 F5 */ bl func_8041A8E0 +/* 8041A5EC 003E3BAC 48 00 02 F5 */ bl SkipTick__Q44nw4r3snd6detail9SeqPlayerFv /* 8041A5F0 003E3BB0 48 00 00 1C */ b lbl_8041A60C lbl_8041A5F4: /* 8041A5F4 003E3BB4 88 1E 00 EE */ lbz r0, 0xee(r30) @@ -1098,7 +1099,7 @@ lbl_8041A5F4: /* 8041A5FC 003E3BBC 40 82 00 10 */ bne lbl_8041A60C /* 8041A600 003E3BC0 7F C3 F3 78 */ mr r3, r30 /* 8041A604 003E3BC4 38 80 00 03 */ li r4, 3 -/* 8041A608 003E3BC8 48 00 00 75 */ bl func_8041A67C +/* 8041A608 003E3BC8 48 00 00 75 */ bl UpdateTick__Q44nw4r3snd6detail9SeqPlayerFi lbl_8041A60C: /* 8041A60C 003E3BCC 48 00 6C D9 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8041A610 003E3BD0 38 63 03 54 */ addi r3, r3, 0x354 @@ -1114,7 +1115,7 @@ lbl_8041A62C: lbl_8041A630: /* 8041A630 003E3BF0 2C 03 00 00 */ cmpwi r3, 0 /* 8041A634 003E3BF4 41 82 00 08 */ beq lbl_8041A63C -/* 8041A638 003E3BF8 48 00 14 85 */ bl func_8041BABC +/* 8041A638 003E3BF8 48 00 14 85 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv lbl_8041A63C: /* 8041A63C 003E3BFC 3B FF 00 01 */ addi r31, r31, 1 /* 8041A640 003E3C00 3B DE 00 04 */ addi r30, r30, 4 @@ -1134,8 +1135,8 @@ lbl_8041A664: /* 8041A674 003E3C34 38 21 00 10 */ addi r1, r1, 0x10 /* 8041A678 003E3C38 4E 80 00 20 */ blr -.global func_8041A67C -func_8041A67C: +.global UpdateTick__Q44nw4r3snd6detail9SeqPlayerFi +UpdateTick__Q44nw4r3snd6detail9SeqPlayerFi: /* 8041A67C 003E3C3C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8041A680 003E3C40 7C 08 02 A6 */ mflr r0 /* 8041A684 003E3C44 90 01 00 74 */ stw r0, 0x74(r1) @@ -1184,7 +1185,7 @@ lbl_8041A72C: /* 8041A72C 003E3CEC EF 7B 10 28 */ fsubs f27, f27, f2 /* 8041A730 003E3CF0 7F E3 FB 78 */ mr r3, r31 /* 8041A734 003E3CF4 38 80 00 01 */ li r4, 1 -/* 8041A738 003E3CF8 4B FF FC C5 */ bl func_8041A3FC +/* 8041A738 003E3CF8 4B FF FC C5 */ bl ParseNextTick__Q44nw4r3snd6detail9SeqPlayerFb /* 8041A73C 003E3CFC 2C 03 00 00 */ cmpwi r3, 0 /* 8041A740 003E3D00 41 82 01 00 */ beq lbl_8041A840 /* 8041A744 003E3D04 48 00 6B A1 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -1200,7 +1201,7 @@ lbl_8041A72C: lbl_8041A76C: /* 8041A76C 003E3D2C 48 00 6B 79 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8041A770 003E3D30 7F A4 EB 78 */ mr r4, r29 -/* 8041A774 003E3D34 48 00 70 A5 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8041A774 003E3D34 48 00 70 A5 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8041A778 003E3D38 38 00 00 00 */ li r0, 0 /* 8041A77C 003E3D3C 98 1F 00 ED */ stb r0, 0xed(r31) lbl_8041A780: @@ -1239,7 +1240,7 @@ lbl_8041A7DC: /* 8041A7EC 003E3DAC 4B F3 F5 55 */ bl OSUnlockMutex /* 8041A7F0 003E3DB0 48 00 00 30 */ b lbl_8041A820 lbl_8041A7F4: -/* 8041A7F4 003E3DB4 48 00 0E 91 */ bl func_8041B684 +/* 8041A7F4 003E3DB4 48 00 0E 91 */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041A7F8 003E3DB8 80 7F 01 14 */ lwz r3, 0x114(r31) /* 8041A7FC 003E3DBC 80 9C 01 20 */ lwz r4, 0x120(r28) /* 8041A800 003E3DC0 81 83 00 00 */ lwz r12, 0(r3) @@ -1303,8 +1304,8 @@ lbl_8041A898: /* 8041A8D8 003E3E98 38 21 00 70 */ addi r1, r1, 0x70 /* 8041A8DC 003E3E9C 4E 80 00 20 */ blr -.global func_8041A8E0 -func_8041A8E0: +.global SkipTick__Q44nw4r3snd6detail9SeqPlayerFv +SkipTick__Q44nw4r3snd6detail9SeqPlayerFv: /* 8041A8E0 003E3EA0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8041A8E4 003E3EA4 7C 08 02 A6 */ mflr r0 /* 8041A8E8 003E3EA8 90 01 00 54 */ stw r0, 0x54(r1) @@ -1333,9 +1334,9 @@ lbl_8041A934: /* 8041A938 003E3EF8 41 82 00 18 */ beq lbl_8041A950 /* 8041A93C 003E3EFC 7F C3 F3 78 */ mr r3, r30 /* 8041A940 003E3F00 38 80 00 7F */ li r4, 0x7f -/* 8041A944 003E3F04 48 00 10 55 */ bl func_8041B998 +/* 8041A944 003E3F04 48 00 10 55 */ bl ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi /* 8041A948 003E3F08 7F C3 F3 78 */ mr r3, r30 -/* 8041A94C 003E3F0C 48 00 17 31 */ bl func_8041C07C +/* 8041A94C 003E3F0C 48 00 17 31 */ bl FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv lbl_8041A950: /* 8041A950 003E3F10 3B BD 00 01 */ addi r29, r29, 1 /* 8041A954 003E3F14 3B 9C 00 04 */ addi r28, r28, 4 @@ -1375,7 +1376,7 @@ lbl_8041A998: lbl_8041A9D4: /* 8041A9D4 003E3F94 7F E3 FB 78 */ mr r3, r31 /* 8041A9D8 003E3F98 38 80 00 00 */ li r4, 0 -/* 8041A9DC 003E3F9C 4B FF FA 21 */ bl func_8041A3FC +/* 8041A9DC 003E3F9C 4B FF FA 21 */ bl ParseNextTick__Q44nw4r3snd6detail9SeqPlayerFb /* 8041A9E0 003E3FA0 2C 03 00 00 */ cmpwi r3, 0 /* 8041A9E4 003E3FA4 41 82 01 00 */ beq lbl_8041AAE4 /* 8041A9E8 003E3FA8 48 00 68 FD */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -1391,7 +1392,7 @@ lbl_8041A9D4: lbl_8041AA10: /* 8041AA10 003E3FD0 48 00 68 D5 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8041AA14 003E3FD4 7F A4 EB 78 */ mr r4, r29 -/* 8041AA18 003E3FD8 48 00 6E 01 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8041AA18 003E3FD8 48 00 6E 01 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8041AA1C 003E3FDC 38 00 00 00 */ li r0, 0 /* 8041AA20 003E3FE0 98 1F 00 ED */ stb r0, 0xed(r31) lbl_8041AA24: @@ -1430,7 +1431,7 @@ lbl_8041AA80: /* 8041AA90 003E4050 4B F3 F2 B1 */ bl OSUnlockMutex /* 8041AA94 003E4054 48 00 00 30 */ b lbl_8041AAC4 lbl_8041AA98: -/* 8041AA98 003E4058 48 00 0B ED */ bl func_8041B684 +/* 8041AA98 003E4058 48 00 0B ED */ bl Close__Q44nw4r3snd6detail8SeqTrackFv /* 8041AA9C 003E405C 80 7F 01 14 */ lwz r3, 0x114(r31) /* 8041AAA0 003E4060 80 9C 01 20 */ lwz r4, 0x120(r28) /* 8041AAA4 003E4064 81 83 00 00 */ lwz r12, 0(r3) @@ -1493,8 +1494,8 @@ lbl_8041AB48: /* 8041AB78 003E4138 38 21 00 50 */ addi r1, r1, 0x50 /* 8041AB7C 003E413C 4E 80 00 20 */ blr -.global func_8041AB80 -func_8041AB80: +.global NoteOn__Q44nw4r3snd6detail9SeqPlayerFiRCQ44nw4r3snd6detail10NoteOnInfo +NoteOn__Q44nw4r3snd6detail9SeqPlayerFiRCQ44nw4r3snd6detail10NoteOnInfo: /* 8041AB80 003E4140 7C 67 1B 78 */ mr r7, r3 /* 8041AB84 003E4144 80 63 01 10 */ lwz r3, 0x110(r3) /* 8041AB88 003E4148 7C 80 23 78 */ mr r0, r4 @@ -1506,15 +1507,23 @@ func_8041AB80: /* 8041ABA0 003E4160 7D 89 03 A6 */ mtctr r12 /* 8041ABA4 003E4164 4E 80 04 20 */ bctr +#InvalidateWaveData__Q44nw4r3snd6detail9SeqPlayerFPCvPCv +#OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv +#ChannelCallback__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail7Channel +#OnShutdownSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv +#OnUpdateFrameSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv .global func_8041ABA8 func_8041ABA8: /* 8041ABA8 003E4168 4E 80 00 20 */ blr -.global func_8041ABAC -func_8041ABAC: +#@180@__dt__Q44nw4r3snd6detail9SeqPlayerFv +.global _180___dt__Q44nw4r3snd6detail9SeqPlayerFv +_180___dt__Q44nw4r3snd6detail9SeqPlayerFv: /* 8041ABAC 003E416C 38 63 FF 2C */ addi r3, r3, -212 -/* 8041ABB0 003E4170 4B FF EC EC */ b func_8041989C -.global lbl_8041ABB4 -lbl_8041ABB4: +/* 8041ABB0 003E4170 4B FF EC EC */ b __dt__Q44nw4r3snd6detail9SeqPlayerFv + +#@192@__dt__Q44nw4r3snd6detail9SeqPlayerFv +.global _192___dt__Q44nw4r3snd6detail9SeqPlayerFv +_192___dt__Q44nw4r3snd6detail9SeqPlayerFv: /* 8041ABB4 003E4174 38 63 FF 20 */ addi r3, r3, -224 -/* 8041ABB8 003E4178 4B FF EC E4 */ b func_8041989C +/* 8041ABB8 003E4178 4B FF EC E4 */ b __dt__Q44nw4r3snd6detail9SeqPlayerFv diff --git a/asm/nw4r/snd/snd_SeqSound.s b/asm/nw4r/snd/snd_SeqSound.s index 1b6a7c6..226ddde 100644 --- a/asm/nw4r/snd/snd_SeqSound.s +++ b/asm/nw4r/snd/snd_SeqSound.s @@ -2,8 +2,9 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_8041ABBC -func_8041ABBC: +#__ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManagerii +.global __ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager_Q44nw4r3snd6detail8SeqSound_ii +__ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager_Q44nw4r3snd6detail8SeqSound_ii: /* 8041ABBC 003E417C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041ABC0 003E4180 7C 08 02 A6 */ mflr r0 /* 8041ABC4 003E4184 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,12 +14,12 @@ func_8041ABBC: /* 8041ABD4 003E4194 7C C5 33 78 */ mr r5, r6 /* 8041ABD8 003E4198 93 C1 00 08 */ stw r30, 8(r1) /* 8041ABDC 003E419C 7C 7E 1B 78 */ mr r30, r3 -/* 8041ABE0 003E41A0 4B FF 78 C1 */ bl func_804124A0 +/* 8041ABE0 003E41A0 4B FF 78 C1 */ bl __ct__Q44nw4r3snd6detail10BasicSoundFii /* 8041ABE4 003E41A4 3C 80 80 57 */ lis r4, lbl_8056E440@ha /* 8041ABE8 003E41A8 38 7E 01 0C */ addi r3, r30, 0x10c /* 8041ABEC 003E41AC 38 84 E4 40 */ addi r4, r4, lbl_8056E440@l /* 8041ABF0 003E41B0 90 9E 00 00 */ stw r4, 0(r30) -/* 8041ABF4 003E41B4 4B FF EB 61 */ bl func_80419754 +/* 8041ABF4 003E41B4 4B FF EB 61 */ bl __ct__Q44nw4r3snd6detail9SeqPlayerFv /* 8041ABF8 003E41B8 3C 80 80 57 */ lis r4, lbl_8056E478@ha /* 8041ABFC 003E41BC 38 00 00 00 */ li r0, 0 /* 8041AC00 003E41C0 38 84 E4 78 */ addi r4, r4, lbl_8056E478@l @@ -44,8 +45,8 @@ func_8041ABBC: /* 8041AC50 003E4210 38 21 00 10 */ addi r1, r1, 0x10 /* 8041AC54 003E4214 4E 80 00 20 */ blr -.global func_8041AC58 -func_8041AC58: +.global __dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv +__dt__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv: /* 8041AC58 003E4218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041AC5C 003E421C 7C 08 02 A6 */ mflr r0 /* 8041AC60 003E4220 2C 03 00 00 */ cmpwi r3, 0 @@ -56,7 +57,7 @@ func_8041AC58: /* 8041AC74 003E4234 7C 7E 1B 78 */ mr r30, r3 /* 8041AC78 003E4238 41 82 00 1C */ beq lbl_8041AC94 /* 8041AC7C 003E423C 38 80 00 00 */ li r4, 0 -/* 8041AC80 003E4240 48 00 AB 05 */ bl func_80425784 +/* 8041AC80 003E4240 48 00 AB 05 */ bl __dt__Q44nw4r3snd6detail4TaskFv /* 8041AC84 003E4244 2C 1F 00 00 */ cmpwi r31, 0 /* 8041AC88 003E4248 40 81 00 0C */ ble lbl_8041AC94 /* 8041AC8C 003E424C 7F C3 F3 78 */ mr r3, r30 @@ -70,14 +71,14 @@ lbl_8041AC94: /* 8041ACA8 003E4268 38 21 00 10 */ addi r1, r1, 0x10 /* 8041ACAC 003E426C 4E 80 00 20 */ blr -.global func_8041ACB0 -func_8041ACB0: +.global InitParam__Q44nw4r3snd6detail8SeqSoundFv +InitParam__Q44nw4r3snd6detail8SeqSoundFv: /* 8041ACB0 003E4270 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041ACB4 003E4274 7C 08 02 A6 */ mflr r0 /* 8041ACB8 003E4278 90 01 00 14 */ stw r0, 0x14(r1) /* 8041ACBC 003E427C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8041ACC0 003E4280 7C 7F 1B 78 */ mr r31, r3 -/* 8041ACC4 003E4284 4B FF 78 B9 */ bl func_8041257C +/* 8041ACC4 003E4284 4B FF 78 B9 */ bl InitParam__Q44nw4r3snd6detail10BasicSoundFv /* 8041ACC8 003E4288 38 00 00 00 */ li r0, 0 /* 8041ACCC 003E428C 90 1F 02 A0 */ stw r0, 0x2a0(r31) /* 8041ACD0 003E4290 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -86,8 +87,8 @@ func_8041ACB0: /* 8041ACDC 003E429C 38 21 00 10 */ addi r1, r1, 0x10 /* 8041ACE0 003E42A0 4E 80 00 20 */ blr -.global func_8041ACE4 -func_8041ACE4: +.global Setup__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail17SeqTrackAllocatorUlPQ44nw4r3snd6detail14NoteOnCallback +Setup__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail17SeqTrackAllocatorUlPQ44nw4r3snd6detail14NoteOnCallback: /* 8041ACE4 003E42A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041ACE8 003E42A8 7C 08 02 A6 */ mflr r0 /* 8041ACEC 003E42AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -104,13 +105,13 @@ func_8041ACE4: /* 8041AD18 003E42D8 7D 89 03 A6 */ mtctr r12 /* 8041AD1C 003E42DC 4E 80 04 21 */ bctrl /* 8041AD20 003E42E0 7F 83 E3 78 */ mr r3, r28 -/* 8041AD24 003E42E4 4B FF 8A 2D */ bl func_80413750 +/* 8041AD24 003E42E4 4B FF 8A 2D */ bl GetVoiceOutCount__Q44nw4r3snd6detail10BasicSoundCFv /* 8041AD28 003E42E8 7C 66 1B 78 */ mr r6, r3 /* 8041AD2C 003E42EC 7F A4 EB 78 */ mr r4, r29 /* 8041AD30 003E42F0 7F C5 F3 78 */ mr r5, r30 /* 8041AD34 003E42F4 7F E7 FB 78 */ mr r7, r31 /* 8041AD38 003E42F8 38 7C 01 0C */ addi r3, r28, 0x10c -/* 8041AD3C 003E42FC 4B FF ED FD */ bl func_80419B38 +/* 8041AD3C 003E42FC 4B FF ED FD */ bl Setup__Q44nw4r3snd6detail9SeqPlayerFPQ44nw4r3snd6detail17SeqTrackAllocatorUliPQ44nw4r3snd6detail14NoteOnCallback /* 8041AD40 003E4300 80 01 00 24 */ lwz r0, 0x24(r1) /* 8041AD44 003E4304 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8041AD48 003E4308 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -120,8 +121,8 @@ func_8041ACE4: /* 8041AD58 003E4318 38 21 00 20 */ addi r1, r1, 0x20 /* 8041AD5C 003E431C 4E 80 00 20 */ blr -.global func_8041AD60 -func_8041AD60: +.global Prepare__Q44nw4r3snd6detail8SeqSoundFPCvlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei +Prepare__Q44nw4r3snd6detail8SeqSoundFPCvlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei: /* 8041AD60 003E4320 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041AD64 003E4324 7C 08 02 A6 */ mflr r0 /* 8041AD68 003E4328 90 01 00 24 */ stw r0, 0x24(r1) @@ -132,13 +133,13 @@ func_8041AD60: /* 8041AD7C 003E433C 93 A1 00 14 */ stw r29, 0x14(r1) /* 8041AD80 003E4340 7C 7D 1B 78 */ mr r29, r3 /* 8041AD84 003E4344 38 63 01 0C */ addi r3, r3, 0x10c -/* 8041AD88 003E4348 4B FF F0 45 */ bl func_80419DCC +/* 8041AD88 003E4348 4B FF F0 45 */ bl SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl /* 8041AD8C 003E434C 2C 1F 00 00 */ cmpwi r31, 0 /* 8041AD90 003E4350 40 81 00 14 */ ble lbl_8041ADA4 /* 8041AD94 003E4354 7F C4 F3 78 */ mr r4, r30 /* 8041AD98 003E4358 7F E5 FB 78 */ mr r5, r31 /* 8041AD9C 003E435C 38 7D 01 0C */ addi r3, r29, 0x10c -/* 8041ADA0 003E4360 4B FF F2 F9 */ bl func_8041A098 +/* 8041ADA0 003E4360 4B FF F2 F9 */ bl Skip__Q44nw4r3snd6detail9SeqPlayerFQ54nw4r3snd6detail9SeqPlayer10OffsetTypei lbl_8041ADA4: /* 8041ADA4 003E4364 38 00 00 01 */ li r0, 1 /* 8041ADA8 003E4368 98 1D 02 A5 */ stb r0, 0x2a5(r29) @@ -150,8 +151,8 @@ lbl_8041ADA4: /* 8041ADC0 003E4380 38 21 00 20 */ addi r1, r1, 0x20 /* 8041ADC4 003E4384 4E 80 00 20 */ blr -.global func_8041ADC8 -func_8041ADC8: +.global Prepare__Q44nw4r3snd6detail8SeqSoundFPQ34nw4r2ut10FileStreamlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei +Prepare__Q44nw4r3snd6detail8SeqSoundFPQ34nw4r2ut10FileStreamlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei: /* 8041ADC8 003E4388 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041ADCC 003E438C 7C 08 02 A6 */ mflr r0 /* 8041ADD0 003E4390 90 01 00 24 */ stw r0, 0x24(r1) @@ -189,8 +190,8 @@ lbl_8041AE10: /* 8041AE4C 003E440C 48 00 00 38 */ b lbl_8041AE84 lbl_8041AE50: /* 8041AE50 003E4410 80 1D 02 A8 */ lwz r0, 0x2a8(r29) -/* 8041AE54 003E4414 3C 80 80 42 */ lis r4, func_8041AEBC@ha -/* 8041AE58 003E4418 38 84 AE BC */ addi r4, r4, func_8041AEBC@l +/* 8041AE54 003E4414 3C 80 80 42 */ lis r4, NotifyLoadAsyncEndSeqData__Q44nw4r3snd6detail8SeqSoundFbPCvPv@ha +/* 8041AE58 003E4418 38 84 AE BC */ addi r4, r4, NotifyLoadAsyncEndSeqData__Q44nw4r3snd6detail8SeqSoundFbPCvPv@l /* 8041AE5C 003E441C 90 7D 04 C0 */ stw r3, 0x4c0(r29) /* 8041AE60 003E4420 90 1D 04 BC */ stw r0, 0x4bc(r29) /* 8041AE64 003E4424 93 FD 04 C4 */ stw r31, 0x4c4(r29) @@ -199,7 +200,7 @@ lbl_8041AE50: /* 8041AE70 003E4430 48 00 A9 55 */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 8041AE74 003E4434 38 9D 04 AC */ addi r4, r29, 0x4ac /* 8041AE78 003E4438 38 A0 00 01 */ li r5, 1 -/* 8041AE7C 003E443C 48 00 AA C1 */ bl func_8042593C +/* 8041AE7C 003E443C 48 00 AA C1 */ bl AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority /* 8041AE80 003E4440 38 00 00 01 */ li r0, 1 lbl_8041AE84: /* 8041AE84 003E4444 2C 00 00 00 */ cmpwi r0, 0 @@ -218,8 +219,8 @@ lbl_8041AEA0: /* 8041AEB4 003E4474 38 21 00 20 */ addi r1, r1, 0x20 /* 8041AEB8 003E4478 4E 80 00 20 */ blr -.global func_8041AEBC -func_8041AEBC: +.global NotifyLoadAsyncEndSeqData__Q44nw4r3snd6detail8SeqSoundFbPCvPv +NotifyLoadAsyncEndSeqData__Q44nw4r3snd6detail8SeqSoundFbPCvPv: /* 8041AEBC 003E447C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041AEC0 003E4480 7C 08 02 A6 */ mflr r0 /* 8041AEC4 003E4484 2C 03 00 00 */ cmpwi r3, 0 @@ -231,18 +232,18 @@ func_8041AEBC: /* 8041AEDC 003E449C 40 82 00 14 */ bne lbl_8041AEF0 /* 8041AEE0 003E44A0 7F E3 FB 78 */ mr r3, r31 /* 8041AEE4 003E44A4 38 80 00 00 */ li r4, 0 -/* 8041AEE8 003E44A8 4B FF 78 01 */ bl func_804126E8 +/* 8041AEE8 003E44A8 4B FF 78 01 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041AEEC 003E44AC 48 00 00 30 */ b lbl_8041AF1C lbl_8041AEF0: /* 8041AEF0 003E44B0 38 65 01 0C */ addi r3, r5, 0x10c /* 8041AEF4 003E44B4 80 A5 02 98 */ lwz r5, 0x298(r5) -/* 8041AEF8 003E44B8 4B FF EE D5 */ bl func_80419DCC +/* 8041AEF8 003E44B8 4B FF EE D5 */ bl SetSeqData__Q44nw4r3snd6detail9SeqPlayerFPCvl /* 8041AEFC 003E44BC 80 BF 02 A0 */ lwz r5, 0x2a0(r31) /* 8041AF00 003E44C0 2C 05 00 00 */ cmpwi r5, 0 /* 8041AF04 003E44C4 40 81 00 10 */ ble lbl_8041AF14 /* 8041AF08 003E44C8 80 9F 02 9C */ lwz r4, 0x29c(r31) /* 8041AF0C 003E44CC 38 7F 01 0C */ addi r3, r31, 0x10c -/* 8041AF10 003E44D0 4B FF F1 89 */ bl func_8041A098 +/* 8041AF10 003E44D0 4B FF F1 89 */ bl Skip__Q44nw4r3snd6detail9SeqPlayerFQ54nw4r3snd6detail9SeqPlayer10OffsetTypei lbl_8041AF14: /* 8041AF14 003E44D4 38 00 00 01 */ li r0, 1 /* 8041AF18 003E44D8 98 1F 02 A5 */ stb r0, 0x2a5(r31) @@ -253,8 +254,8 @@ lbl_8041AF1C: /* 8041AF28 003E44E8 38 21 00 10 */ addi r1, r1, 0x10 /* 8041AF2C 003E44EC 4E 80 00 20 */ blr -.global func_8041AF30 -func_8041AF30: +.global Shutdown__Q44nw4r3snd6detail8SeqSoundFv +Shutdown__Q44nw4r3snd6detail8SeqSoundFv: /* 8041AF30 003E44F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041AF34 003E44F4 7C 08 02 A6 */ mflr r0 /* 8041AF38 003E44F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -267,7 +268,7 @@ func_8041AF30: /* 8041AF54 003E4514 41 82 00 10 */ beq lbl_8041AF64 /* 8041AF58 003E4518 48 00 A8 6D */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 8041AF5C 003E451C 38 9D 04 AC */ addi r4, r29, 0x4ac -/* 8041AF60 003E4520 48 00 AD 3D */ bl func_80425C9C +/* 8041AF60 003E4520 48 00 AD 3D */ bl CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task lbl_8041AF64: /* 8041AF64 003E4524 80 7D 02 A8 */ lwz r3, 0x2a8(r29) /* 8041AF68 003E4528 2C 03 00 00 */ cmpwi r3, 0 @@ -280,7 +281,7 @@ lbl_8041AF64: /* 8041AF84 003E4544 90 1D 02 A8 */ stw r0, 0x2a8(r29) lbl_8041AF88: /* 8041AF88 003E4548 7F A3 EB 78 */ mr r3, r29 -/* 8041AF8C 003E454C 4B FF 86 15 */ bl func_804135A0 +/* 8041AF8C 003E454C 4B FF 86 15 */ bl Shutdown__Q44nw4r3snd6detail10BasicSoundFv /* 8041AF90 003E4550 83 DD 02 94 */ lwz r30, 0x294(r29) /* 8041AF94 003E4554 3B FE 00 10 */ addi r31, r30, 0x10 /* 8041AF98 003E4558 7F E3 FB 78 */ mr r3, r31 @@ -316,8 +317,8 @@ lbl_8041AFF0: /* 8041B008 003E45C8 4E 80 00 20 */ blr -.global func_8041B00C -func_8041B00C: +.global __dt__Q44nw4r3snd6detail8SeqSoundFv +__dt__Q44nw4r3snd6detail8SeqSoundFv: /* 8041B00C 003E45CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B010 003E45D0 7C 08 02 A6 */ mflr r0 /* 8041B014 003E45D4 2C 03 00 00 */ cmpwi r3, 0 @@ -330,11 +331,11 @@ func_8041B00C: /* 8041B030 003E45F0 34 63 04 AC */ addic. r3, r3, 0x4ac /* 8041B034 003E45F4 41 82 00 0C */ beq lbl_8041B040 /* 8041B038 003E45F8 38 80 00 00 */ li r4, 0 -/* 8041B03C 003E45FC 48 00 A7 49 */ bl func_80425784 +/* 8041B03C 003E45FC 48 00 A7 49 */ bl __dt__Q44nw4r3snd6detail4TaskFv lbl_8041B040: /* 8041B040 003E4600 38 7E 01 0C */ addi r3, r30, 0x10c /* 8041B044 003E4604 38 80 FF FF */ li r4, -1 -/* 8041B048 003E4608 4B FF E8 55 */ bl func_8041989C +/* 8041B048 003E4608 4B FF E8 55 */ bl __dt__Q44nw4r3snd6detail9SeqPlayerFv /* 8041B04C 003E460C 2C 1F 00 00 */ cmpwi r31, 0 /* 8041B050 003E4610 40 81 00 0C */ ble lbl_8041B05C /* 8041B054 003E4614 7F C3 F3 78 */ mr r3, r30 @@ -348,24 +349,24 @@ lbl_8041B05C: /* 8041B070 003E4630 38 21 00 10 */ addi r1, r1, 0x10 /* 8041B074 003E4634 4E 80 00 20 */ blr -.global func_8041B078 -func_8041B078: +.global SetChannelPriority__Q44nw4r3snd6detail8SeqSoundFi +SetChannelPriority__Q44nw4r3snd6detail8SeqSoundFi: /* 8041B078 003E4638 38 63 01 0C */ addi r3, r3, 0x10c -/* 8041B07C 003E463C 4B FF F0 E0 */ b func_8041A15C +/* 8041B07C 003E463C 4B FF F0 E0 */ b SetChannelPriority__Q44nw4r3snd6detail9SeqPlayerFi -.global func_8041B080 -func_8041B080: +.global SetReleasePriorityFix__Q44nw4r3snd6detail8SeqSoundFb +SetReleasePriorityFix__Q44nw4r3snd6detail8SeqSoundFb: /* 8041B080 003E4640 38 63 01 0C */ addi r3, r3, 0x10c -/* 8041B084 003E4644 4B FF F0 E0 */ b func_8041A164 +/* 8041B084 003E4644 4B FF F0 E0 */ b SetReleasePriorityFix__Q44nw4r3snd6detail9SeqPlayerFb -.global func_8041B088 -func_8041B088: +.global SetSeqUserprocCallback__Q44nw4r3snd6detail8SeqSoundFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv +SetSeqUserprocCallback__Q44nw4r3snd6detail8SeqSoundFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv: /* 8041B088 003E4648 38 63 01 0C */ addi r3, r3, 0x10c -/* 8041B08C 003E464C 4B FF F0 E0 */ b func_8041A16C +/* 8041B08C 003E464C 4B FF F0 E0 */ b SetSeqUserprocCallback__Q44nw4r3snd6detail9SeqPlayerFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv -.global func_8041B090 -func_8041B090: +.global OnUpdatePlayerPriority__Q44nw4r3snd6detail8SeqSoundFv +OnUpdatePlayerPriority__Q44nw4r3snd6detail8SeqSoundFv: /* 8041B090 003E4650 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041B094 003E4654 7C 08 02 A6 */ mflr r0 /* 8041B098 003E4658 90 01 00 24 */ stw r0, 0x24(r1) @@ -432,8 +433,8 @@ lbl_8041B138: /* 8041B170 003E4730 4E 80 00 20 */ blr -.global func_8041B174 -func_8041B174: +.global IsAttachedTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv +IsAttachedTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv: /* 8041B174 003E4734 80 63 02 90 */ lwz r3, 0x290(r3) /* 8041B178 003E4738 7C 03 00 D0 */ neg r0, r3 /* 8041B17C 003E473C 7C 00 1B 78 */ or r0, r0, r3 @@ -441,14 +442,14 @@ func_8041B174: /* 8041B184 003E4744 4E 80 00 20 */ blr -.global func_8041B188 -func_8041B188: +.global DetachTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv +DetachTempSpecialHandle__Q44nw4r3snd6detail8SeqSoundFv: /* 8041B188 003E4748 80 63 02 90 */ lwz r3, 0x290(r3) /* 8041B18C 003E474C 48 00 01 78 */ b DetachSound__Q34nw4r3snd14SeqSoundHandleFv -.global func_8041B190 -func_8041B190: +.global Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv +Execute__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv: /* 8041B190 003E4750 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041B194 003E4754 7C 08 02 A6 */ mflr r0 /* 8041B198 003E4758 38 80 00 00 */ li r4, 0 @@ -516,8 +517,8 @@ lbl_8041B274: /* 8041B284 003E4844 4E 80 00 20 */ blr -.global func_8041B288 -func_8041B288: +.global Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv +Cancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv: /* 8041B288 003E4848 81 83 00 1C */ lwz r12, 0x1c(r3) /* 8041B28C 003E484C 2C 0C 00 00 */ cmpwi r12, 0 /* 8041B290 003E4850 4D 82 00 20 */ beqlr @@ -529,8 +530,8 @@ func_8041B288: /* 8041B2A8 003E4868 4E 80 00 20 */ blr -.global func_8041B2AC -func_8041B2AC: +.global OnCancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv +OnCancel__Q54nw4r3snd6detail8SeqSound11SeqLoadTaskFv: /* 8041B2AC 003E486C 80 83 00 10 */ lwz r4, 0x10(r3) /* 8041B2B0 003E4870 38 00 00 00 */ li r0, 0 /* 8041B2B4 003E4874 90 03 00 1C */ stw r0, 0x1c(r3) @@ -543,23 +544,23 @@ func_8041B2AC: /* 8041B2D0 003E4890 4E 80 04 20 */ bctr /* 8041B2D4 003E4894 4E 80 00 20 */ blr -.global func_8041B2D8 -func_8041B2D8: +.global GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundFv +GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundFv: /* 8041B2D8 003E4898 38 63 01 0C */ addi r3, r3, 0x10c /* 8041B2DC 003E489C 4E 80 00 20 */ blr -.global func_8041B2E0 -func_8041B2E0: +.global GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundCFv +GetBasicPlayer__Q44nw4r3snd6detail8SeqSoundCFv: /* 8041B2E0 003E48A0 38 63 01 0C */ addi r3, r3, 0x10c /* 8041B2E4 003E48A4 4E 80 00 20 */ blr -.global func_8041B2E8 -func_8041B2E8: +.global IsPrepared__Q44nw4r3snd6detail8SeqSoundCFv +IsPrepared__Q44nw4r3snd6detail8SeqSoundCFv: /* 8041B2E8 003E48A8 88 63 02 A5 */ lbz r3, 0x2a5(r3) /* 8041B2EC 003E48AC 4E 80 00 20 */ blr -.global func_8041B2F0 -func_8041B2F0: +.global GetRuntimeTypeInfo__Q44nw4r3snd6detail8SeqSoundCFv +GetRuntimeTypeInfo__Q44nw4r3snd6detail8SeqSoundCFv: /* 8041B2F0 003E48B0 38 6D BC 58 */ addi r3, r13, lbl_80667DD8@sda21 /* 8041B2F4 003E48B4 4E 80 00 20 */ blr diff --git a/asm/nw4r/snd/snd_SeqTrack.s b/asm/nw4r/snd/snd_SeqTrack.s index 5edc832..1d8b985 100644 --- a/asm/nw4r/snd/snd_SeqTrack.s +++ b/asm/nw4r/snd/snd_SeqTrack.s @@ -37,7 +37,7 @@ __ct__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B3A8 003E4968 B3 FE 00 80 */ sth r31, 0x80(r30) /* 8041B3AC 003E496C 93 FE 00 C0 */ stw r31, 0xc0(r30) /* 8041B3B0 003E4970 93 FE 00 C4 */ stw r31, 0xc4(r30) -/* 8041B3B4 003E4974 48 00 01 25 */ bl func_8041B4D8 +/* 8041B3B4 003E4974 48 00 01 25 */ bl InitParam__Q44nw4r3snd6detail8SeqTrackFv /* 8041B3B8 003E4978 7F C3 F3 78 */ mr r3, r30 /* 8041B3BC 003E497C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8041B3C0 003E4980 83 C1 00 08 */ lwz r30, 8(r1) @@ -68,7 +68,7 @@ __dt__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B418 003E49D8 38 63 03 54 */ addi r3, r3, 0x354 /* 8041B41C 003E49DC 4B F3 E8 45 */ bl OSLockMutex /* 8041B420 003E49E0 7F A3 EB 78 */ mr r3, r29 -/* 8041B424 003E49E4 48 00 06 99 */ bl func_8041BABC +/* 8041B424 003E49E4 48 00 06 99 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv /* 8041B428 003E49E8 83 FD 00 C4 */ lwz r31, 0xc4(r29) /* 8041B42C 003E49EC 48 00 00 1C */ b lbl_8041B448 lbl_8041B430: @@ -120,8 +120,8 @@ lbl_8041B4B8: /* 8041B4D0 003E4A90 38 21 00 20 */ addi r1, r1, 0x20 /* 8041B4D4 003E4A94 4E 80 00 20 */ blr -.global func_8041B4D8 -func_8041B4D8: +.global InitParam__Q44nw4r3snd6detail8SeqTrackFv +InitParam__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B4D8 003E4A98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B4DC 003E4A9C 7C 08 02 A6 */ mflr r0 /* 8041B4E0 003E4AA0 C0 22 C4 98 */ lfs f1, lbl_8066C818@sda21(r2) @@ -219,15 +219,15 @@ func_8041B4D8: /* 8041B650 003E4C10 38 21 00 10 */ addi r1, r1, 0x10 /* 8041B654 003E4C14 4E 80 00 20 */ blr -.global func_8041B658 -func_8041B658: +.global SetSeqData__Q44nw4r3snd6detail8SeqTrackFPCvl +SetSeqData__Q44nw4r3snd6detail8SeqTrackFPCvl: /* 8041B658 003E4C18 7C 04 2A 14 */ add r0, r4, r5 /* 8041B65C 003E4C1C 90 83 00 1C */ stw r4, 0x1c(r3) /* 8041B660 003E4C20 90 03 00 20 */ stw r0, 0x20(r3) /* 8041B664 003E4C24 4E 80 00 20 */ blr -.global func_8041B668 -func_8041B668: +.global Open__Q44nw4r3snd6detail8SeqTrackFv +Open__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B668 003E4C28 38 80 00 00 */ li r4, 0 /* 8041B66C 003E4C2C 38 00 00 01 */ li r0, 1 /* 8041B670 003E4C30 98 83 00 4A */ stb r4, 0x4a(r3) @@ -236,8 +236,8 @@ func_8041B668: /* 8041B67C 003E4C3C 98 03 00 05 */ stb r0, 5(r3) /* 8041B680 003E4C40 4E 80 00 20 */ blr -.global func_8041B684 -func_8041B684: +.global Close__Q44nw4r3snd6detail8SeqTrackFv +Close__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B684 003E4C44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B688 003E4C48 7C 08 02 A6 */ mflr r0 /* 8041B68C 003E4C4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -251,7 +251,7 @@ func_8041B684: /* 8041B6AC 003E4C6C 38 63 03 54 */ addi r3, r3, 0x354 /* 8041B6B0 003E4C70 4B F3 E5 B1 */ bl OSLockMutex /* 8041B6B4 003E4C74 7F C3 F3 78 */ mr r3, r30 -/* 8041B6B8 003E4C78 48 00 04 05 */ bl func_8041BABC +/* 8041B6B8 003E4C78 48 00 04 05 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv /* 8041B6BC 003E4C7C 83 FE 00 C4 */ lwz r31, 0xc4(r30) /* 8041B6C0 003E4C80 48 00 00 1C */ b lbl_8041B6DC lbl_8041B6C4: @@ -296,8 +296,8 @@ lbl_8041B710: /* 8041B74C 003E4D0C 38 21 00 10 */ addi r1, r1, 0x10 /* 8041B750 003E4D10 4E 80 00 20 */ blr -.global func_8041B754 -func_8041B754: +.global UpdateChannelLength__Q44nw4r3snd6detail8SeqTrackFv +UpdateChannelLength__Q44nw4r3snd6detail8SeqTrackFv: /* 8041B754 003E4D14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B758 003E4D18 7C 08 02 A6 */ mflr r0 /* 8041B75C 003E4D1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -358,8 +358,8 @@ lbl_8041B80C: /* 8041B81C 003E4DDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8041B820 003E4DE0 4E 80 00 20 */ blr -.global func_8041B824 -func_8041B824: +.global ParseNextTick__Q44nw4r3snd6detail8SeqTrackFb +ParseNextTick__Q44nw4r3snd6detail8SeqTrackFb: /* 8041B824 003E4DE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B828 003E4DE8 7C 08 02 A6 */ mflr r0 /* 8041B82C 003E4DEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -465,8 +465,8 @@ lbl_8041B980: /* 8041B990 003E4F50 38 21 00 10 */ addi r1, r1, 0x10 /* 8041B994 003E4F54 4E 80 00 20 */ blr -.global func_8041B998 -func_8041B998: +.global ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi +ReleaseAllChannel__Q44nw4r3snd6detail8SeqTrackFi: /* 8041B998 003E4F58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041B99C 003E4F5C 7C 08 02 A6 */ mflr r0 /* 8041B9A0 003E4F60 90 01 00 14 */ stw r0, 0x14(r1) @@ -478,7 +478,7 @@ func_8041B998: /* 8041B9B8 003E4F78 38 63 03 54 */ addi r3, r3, 0x354 /* 8041B9BC 003E4F7C 4B F3 E2 A5 */ bl OSLockMutex /* 8041B9C0 003E4F80 7F E3 FB 78 */ mr r3, r31 -/* 8041B9C4 003E4F84 48 00 00 F9 */ bl func_8041BABC +/* 8041B9C4 003E4F84 48 00 00 F9 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv /* 8041B9C8 003E4F88 83 FF 00 C4 */ lwz r31, 0xc4(r31) /* 8041B9CC 003E4F8C 48 00 00 30 */ b lbl_8041B9FC lbl_8041B9D0: @@ -508,8 +508,8 @@ lbl_8041B9FC: /* 8041BA20 003E4FE0 38 21 00 10 */ addi r1, r1, 0x10 /* 8041BA24 003E4FE4 4E 80 00 20 */ blr -.global func_8041BA28 -func_8041BA28: +.global PauseAllChannel__Q44nw4r3snd6detail8SeqTrackFb +PauseAllChannel__Q44nw4r3snd6detail8SeqTrackFb: /* 8041BA28 003E4FE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041BA2C 003E4FEC 7C 08 02 A6 */ mflr r0 /* 8041BA30 003E4FF0 90 01 00 14 */ stw r0, 0x14(r1) @@ -551,8 +551,8 @@ lbl_8041BA90: /* 8041BAB4 003E5074 38 21 00 10 */ addi r1, r1, 0x10 /* 8041BAB8 003E5078 4E 80 00 20 */ blr -.global func_8041BABC -func_8041BABC: +.global UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv +UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv: /* 8041BABC 003E507C 94 21 FE E0 */ stwu r1, -0x120(r1) /* 8041BAC0 003E5080 7C 08 02 A6 */ mflr r0 /* 8041BAC4 003E5084 90 01 01 24 */ stw r0, 0x124(r1) @@ -798,7 +798,7 @@ lbl_8041BE20: /* 8041BE44 003E5404 EC 21 F8 24 */ fdivs f1, f1, f31 /* 8041BE48 003E5408 EC 00 08 2A */ fadds f0, f0, f1 /* 8041BE4C 003E540C D0 19 00 00 */ stfs f0, 0(r25) -/* 8041BE50 003E5410 4B FF 65 AD */ bl func_804123FC +/* 8041BE50 003E5410 4B FF 65 AD */ bl GetFxSend__Q44nw4r3snd6detail11BasicPlayerCFQ34nw4r3snd6AuxBus /* 8041BE54 003E5414 C0 19 00 00 */ lfs f0, 0(r25) /* 8041BE58 003E5418 3B 5A 00 01 */ addi r26, r26, 1 /* 8041BE5C 003E541C 2C 1A 00 03 */ cmpwi r26, 3 @@ -814,14 +814,14 @@ lbl_8041BE80: /* 8041BE80 003E5440 D3 D9 00 00 */ stfs f30, 0(r25) /* 8041BE84 003E5444 7F 64 DB 78 */ mr r4, r27 /* 8041BE88 003E5448 80 7D 00 C0 */ lwz r3, 0xc0(r29) -/* 8041BE8C 003E544C 4B FF 65 B5 */ bl func_80412440 +/* 8041BE8C 003E544C 4B FF 65 B5 */ bl GetRemoteSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 8041BE90 003E5450 C0 19 00 00 */ lfs f0, 0(r25) /* 8041BE94 003E5454 7F 64 DB 78 */ mr r4, r27 /* 8041BE98 003E5458 D3 DA 00 00 */ stfs f30, 0(r26) /* 8041BE9C 003E545C EC 00 08 2A */ fadds f0, f0, f1 /* 8041BEA0 003E5460 80 7D 00 C0 */ lwz r3, 0xc0(r29) /* 8041BEA4 003E5464 D0 19 00 00 */ stfs f0, 0(r25) -/* 8041BEA8 003E5468 4B FF 65 A9 */ bl func_80412450 +/* 8041BEA8 003E5468 4B FF 65 A9 */ bl GetRemoteFxSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 8041BEAC 003E546C C0 1A 00 00 */ lfs f0, 0(r26) /* 8041BEB0 003E5470 3B 7B 00 01 */ addi r27, r27, 1 /* 8041BEB4 003E5474 2C 1B 00 04 */ cmpwi r27, 4 @@ -864,7 +864,7 @@ lbl_8041BEE0: lbl_8041BF44: /* 8041BF44 003E5504 80 7D 00 C0 */ lwz r3, 0xc0(r29) /* 8041BF48 003E5508 7F 04 C3 78 */ mr r4, r24 -/* 8041BF4C 003E550C 4B FF 64 E5 */ bl func_80412430 +/* 8041BF4C 003E550C 4B FF 64 E5 */ bl GetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerCFi /* 8041BF50 003E5510 C0 1A 00 00 */ lfs f0, 0(r26) /* 8041BF54 003E5514 3B 18 00 01 */ addi r24, r24, 1 /* 8041BF58 003E5518 D0 3B 00 70 */ stfs f1, 0x70(r27) @@ -945,8 +945,8 @@ lbl_8041C00C: /* 8041C074 003E5634 38 21 01 20 */ addi r1, r1, 0x120 /* 8041C078 003E5638 4E 80 00 20 */ blr -.global func_8041C07C -func_8041C07C: +.global FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv +FreeAllChannel__Q44nw4r3snd6detail8SeqTrackFv: /* 8041C07C 003E563C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041C080 003E5640 7C 08 02 A6 */ mflr r0 /* 8041C084 003E5644 90 01 00 14 */ stw r0, 0x14(r1) @@ -977,8 +977,8 @@ lbl_8041C0B4: /* 8041C0E0 003E56A0 38 21 00 10 */ addi r1, r1, 0x10 /* 8041C0E4 003E56A4 4E 80 00 20 */ blr -.global func_8041C0E8 -func_8041C0E8: +.global ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl +ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl: /* 8041C0E8 003E56A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041C0EC 003E56AC 7C 08 02 A6 */ mflr r0 /* 8041C0F0 003E56B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1050,8 +1050,8 @@ lbl_8041C1C4: /* 8041C1D8 003E5798 38 21 00 20 */ addi r1, r1, 0x20 /* 8041C1DC 003E579C 4E 80 00 20 */ blr -.global func_8041C1E0 -func_8041C1E0: +.global SetMute__Q44nw4r3snd6detail8SeqTrackFQ34nw4r3snd7SeqMute +SetMute__Q44nw4r3snd6detail8SeqTrackFQ34nw4r3snd7SeqMute: /* 8041C1E0 003E57A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041C1E4 003E57A4 7C 08 02 A6 */ mflr r0 /* 8041C1E8 003E57A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1105,7 +1105,7 @@ lbl_8041C28C: /* 8041C290 003E5850 38 63 03 54 */ addi r3, r3, 0x354 /* 8041C294 003E5854 4B F3 D9 CD */ bl OSLockMutex /* 8041C298 003E5858 7F C3 F3 78 */ mr r3, r30 -/* 8041C29C 003E585C 4B FF F8 21 */ bl func_8041BABC +/* 8041C29C 003E585C 4B FF F8 21 */ bl UpdateChannelParam__Q44nw4r3snd6detail8SeqTrackFv /* 8041C2A0 003E5860 83 FE 00 C4 */ lwz r31, 0xc4(r30) /* 8041C2A4 003E5864 48 00 00 1C */ b lbl_8041C2C0 lbl_8041C2A8: @@ -1286,7 +1286,7 @@ lbl_8041C4EC: /* 8041C51C 003E5ADC 93 21 00 28 */ stw r25, 0x28(r1) /* 8041C520 003E5AE0 80 79 00 C0 */ lwz r3, 0xc0(r25) /* 8041C524 003E5AE4 80 99 00 50 */ lwz r4, 0x50(r25) -/* 8041C528 003E5AE8 4B FF E6 59 */ bl func_8041AB80 +/* 8041C528 003E5AE8 4B FF E6 59 */ bl NoteOn__Q44nw4r3snd6detail9SeqPlayerFiRCQ44nw4r3snd6detail10NoteOnInfo /* 8041C52C 003E5AEC 2C 03 00 00 */ cmpwi r3, 0 /* 8041C530 003E5AF0 7C 7E 1B 78 */ mr r30, r3 /* 8041C534 003E5AF4 40 82 00 18 */ bne lbl_8041C54C @@ -1453,7 +1453,7 @@ lbl_8041C75C: /* 8041C76C 003E5D2C 38 21 00 70 */ addi r1, r1, 0x70 /* 8041C770 003E5D30 4E 80 00 20 */ blr -.global func_8041C774 -func_8041C774: +.global detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc +detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc: /* 8041C774 003E5D34 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8041C778 003E5D38 48 00 00 B4 */ b lbl_8041C82C +/* 8041C778 003E5D38 48 00 00 B4 */ b ConvertLabelStringToSoundId__Q34nw4r3snd12SoundArchiveCFPCc diff --git a/asm/nw4r/snd/snd_SoundArchive.s b/asm/nw4r/snd/snd_SoundArchive.s index 5a051d0..7031134 100644 --- a/asm/nw4r/snd/snd_SoundArchive.s +++ b/asm/nw4r/snd/snd_SoundArchive.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_8041C77C -func_8041C77C: +.global __ct__Q34nw4r3snd12SoundArchiveFv +__ct__Q34nw4r3snd12SoundArchiveFv: /* 8041C77C 003E5D3C 3C A0 80 57 */ lis r5, lbl_8056E4A0@ha /* 8041C780 003E5D40 38 80 00 00 */ li r4, 0 /* 8041C784 003E5D44 38 A5 E4 A0 */ addi r5, r5, lbl_8056E4A0@l @@ -14,8 +14,8 @@ func_8041C77C: /* 8041C798 003E5D58 98 83 00 09 */ stb r4, 9(r3) /* 8041C79C 003E5D5C 4E 80 00 20 */ blr -.global func_8041C7A0 -func_8041C7A0: +.global __dt__Q34nw4r3snd12SoundArchiveFv +__dt__Q34nw4r3snd12SoundArchiveFv: /* 8041C7A0 003E5D60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041C7A4 003E5D64 7C 08 02 A6 */ mflr r0 /* 8041C7A8 003E5D68 2C 03 00 00 */ cmpwi r3, 0 @@ -34,21 +34,21 @@ lbl_8041C7C8: /* 8041C7D8 003E5D98 38 21 00 10 */ addi r1, r1, 0x10 /* 8041C7DC 003E5D9C 4E 80 00 20 */ blr -.global func_8041C7E0 -func_8041C7E0: +.global IsAvailable__Q34nw4r3snd12SoundArchiveCFv +IsAvailable__Q34nw4r3snd12SoundArchiveCFv: /* 8041C7E0 003E5DA0 80 63 00 04 */ lwz r3, 4(r3) /* 8041C7E4 003E5DA4 7C 03 00 D0 */ neg r0, r3 /* 8041C7E8 003E5DA8 7C 00 1B 78 */ or r0, r0, r3 /* 8041C7EC 003E5DAC 54 03 0F FE */ srwi r3, r0, 0x1f /* 8041C7F0 003E5DB0 4E 80 00 20 */ blr -.global func_8041C7F4 -func_8041C7F4: +.global Setup__Q34nw4r3snd12SoundArchiveFPQ44nw4r3snd6detail22SoundArchiveFileReader +Setup__Q34nw4r3snd12SoundArchiveFPQ44nw4r3snd6detail22SoundArchiveFileReader: /* 8041C7F4 003E5DB4 90 83 00 04 */ stw r4, 4(r3) /* 8041C7F8 003E5DB8 4E 80 00 20 */ blr -.global func_8041C7FC -func_8041C7FC: +.global Shutdown__Q34nw4r3snd12SoundArchiveFv +Shutdown__Q34nw4r3snd12SoundArchiveFv: /* 8041C7FC 003E5DBC 38 80 00 00 */ li r4, 0 /* 8041C800 003E5DC0 38 00 00 2F */ li r0, 0x2f /* 8041C804 003E5DC4 90 83 00 04 */ stw r4, 4(r3) @@ -56,99 +56,101 @@ func_8041C7FC: /* 8041C80C 003E5DCC 98 83 00 09 */ stb r4, 9(r3) /* 8041C810 003E5DD0 4E 80 00 20 */ blr -.global func_8041C814 -func_8041C814: +.global GetSoundCount__Q34nw4r3snd12SoundArchiveCFv +GetSoundCount__Q34nw4r3snd12SoundArchiveCFv: /* 8041C814 003E5DD4 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C818 003E5DD8 48 00 0D 48 */ b func_8041D560 +/* 8041C818 003E5DD8 48 00 0D 48 */ b GetSoundCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv -.global func_8041C81C -func_8041C81C: +.global GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv +GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv: /* 8041C81C 003E5DDC 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C820 003E5DE0 48 00 0D 80 */ b func_8041D5A0 +/* 8041C820 003E5DE0 48 00 0D 80 */ b GetPlayerCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv -.global func_8041C824 -func_8041C824: +.global GetGroupCount__Q34nw4r3snd12SoundArchiveCFv +GetGroupCount__Q34nw4r3snd12SoundArchiveCFv: /* 8041C824 003E5DE4 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C828 003E5DE8 48 00 0D B8 */ b func_8041D5E0 -.global lbl_8041C82C -lbl_8041C82C: +/* 8041C828 003E5DE8 48 00 0D B8 */ b GetGroupCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv + +.global ConvertLabelStringToSoundId__Q34nw4r3snd12SoundArchiveCFPCc +ConvertLabelStringToSoundId__Q34nw4r3snd12SoundArchiveCFPCc: /* 8041C82C 003E5DEC 80 63 00 04 */ lwz r3, 4(r3) /* 8041C830 003E5DF0 7C 85 23 78 */ mr r5, r4 /* 8041C834 003E5DF4 80 83 00 34 */ lwz r4, 0x34(r3) -/* 8041C838 003E5DF8 48 00 11 04 */ b func_8041D93C +/* 8041C838 003E5DF8 48 00 11 04 */ b ConvertLabelStringToId__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPCQ54nw4r3snd6detail16SoundArchiveFile10StringTreePCc -.global func_8041C83C -func_8041C83C: +#not sure about this label +.global GetSoundUserParam__Q34nw4r3snd12SoundArchiveCFUl +GetSoundUserParam__Q34nw4r3snd12SoundArchiveCFUl: /* 8041C83C 003E5DFC 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C840 003E5E00 48 00 0D E4 */ b func_8041D624 +/* 8041C840 003E5E00 48 00 0D E4 */ b GetSoundUserParam__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl -.global func_8041C844 -func_8041C844: +.global GetSoundType__Q34nw4r3snd12SoundArchiveCFUl +GetSoundType__Q34nw4r3snd12SoundArchiveCFUl: /* 8041C844 003E5E04 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C848 003E5E08 48 00 04 14 */ b func_8041CC5C +/* 8041C848 003E5E08 48 00 04 14 */ b GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl -.global func_8041C84C -func_8041C84C: +.global ReadSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9SoundInfo +ReadSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9SoundInfo: /* 8041C84C 003E5E0C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C850 003E5E10 48 00 04 FC */ b func_8041CD4C +/* 8041C850 003E5E10 48 00 04 FC */ b ReadSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9SoundInfo -.global func_8041C854 -func_8041C854: +.global ReadSeqSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo +ReadSeqSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo: /* 8041C854 003E5E14 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C858 003E5E18 48 00 06 1C */ b func_8041CE74 +/* 8041C858 003E5E18 48 00 06 1C */ b ReadSeqSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo -.global func_8041C85C -func_8041C85C: +.global detail_ReadStrmSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo +detail_ReadStrmSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo: /* 8041C85C 003E5E1C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C860 003E5E20 48 00 06 F8 */ b func_8041CF58 +/* 8041C860 003E5E20 48 00 06 F8 */ b ReadStrmSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo -.global func_8041C864 -func_8041C864: +.global detail_ReadWaveSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo +detail_ReadWaveSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo: /* 8041C864 003E5E24 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C868 003E5E28 48 00 07 F4 */ b func_8041D05C +/* 8041C868 003E5E28 48 00 07 F4 */ b ReadWaveSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo -.global func_8041C86C -func_8041C86C: +.global ReadPlayerInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo +ReadPlayerInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo: /* 8041C86C 003E5E2C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C870 003E5E30 48 00 09 6C */ b func_8041D1DC +/* 8041C870 003E5E30 48 00 09 6C */ b ReadPlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo -.global func_8041C874 -func_8041C874: +.global ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo +ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo: /* 8041C874 003E5E34 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C878 003E5E38 48 00 0C 64 */ b func_8041D4DC +/* 8041C878 003E5E38 48 00 0C 64 */ b ReadSoundArchivePlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo -.global func_8041C87C -func_8041C87C: +.global ReadBankInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8BankInfo +ReadBankInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8BankInfo: /* 8041C87C 003E5E3C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C880 003E5E40 48 00 08 B0 */ b func_8041D130 +/* 8041C880 003E5E40 48 00 08 B0 */ b ReadBankInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8BankInfo -.global func_8041C884 -func_8041C884: +.global detail_ReadGroupInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9GroupInfo +detail_ReadGroupInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9GroupInfo: /* 8041C884 003E5E44 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C888 003E5E48 48 00 0A 0C */ b func_8041D294 +/* 8041C888 003E5E48 48 00 0A 0C */ b ReadGroupInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9GroupInfo -.global func_8041C88C -func_8041C88C: +.global detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo +detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo: /* 8041C88C 003E5E4C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C890 003E5E50 48 00 0B 14 */ b func_8041D3A4 +/* 8041C890 003E5E50 48 00 0B 14 */ b ReadGroupItemInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo -.global func_8041C894 -func_8041C894: +.global detail_GetFileCount__Q34nw4r3snd12SoundArchiveCFv +detail_GetFileCount__Q34nw4r3snd12SoundArchiveCFv: /* 8041C894 003E5E54 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C898 003E5E58 48 00 0E 44 */ b func_8041D6DC +/* 8041C898 003E5E58 48 00 0E 44 */ b GetFileCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv -.global func_8041C89C -func_8041C89C: +.global detail_ReadFileInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8FileInfo +detail_ReadFileInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8FileInfo: /* 8041C89C 003E5E5C 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C8A0 003E5E60 48 00 0E 7C */ b func_8041D71C +/* 8041C8A0 003E5E60 48 00 0E 7C */ b ReadFileInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8FileInfo -.global func_8041C8A4 -func_8041C8A4: +.global detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos +detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos: /* 8041C8A4 003E5E64 80 63 00 04 */ lwz r3, 4(r3) -/* 8041C8A8 003E5E68 48 00 0F 74 */ b func_8041D81C +/* 8041C8A8 003E5E68 48 00 0F 74 */ b ReadFilePos__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive7FilePos -.global func_8041C8AC -func_8041C8AC: +.global detail_OpenFileStream__Q34nw4r3snd12SoundArchiveCFUlPvi +detail_OpenFileStream__Q34nw4r3snd12SoundArchiveCFUlPvi: /* 8041C8AC 003E5E6C 94 21 FD 90 */ stwu r1, -0x270(r1) /* 8041C8B0 003E5E70 7C 08 02 A6 */ mflr r0 /* 8041C8B4 003E5E74 90 01 02 74 */ stw r0, 0x274(r1) @@ -160,7 +162,7 @@ func_8041C8AC: /* 8041C8CC 003E5E8C 7C 99 23 78 */ mr r25, r4 /* 8041C8D0 003E5E90 7C DF 33 78 */ mr r31, r6 /* 8041C8D4 003E5E94 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8041C8D8 003E5E98 48 00 0E 45 */ bl func_8041D71C +/* 8041C8D8 003E5E98 48 00 0E 45 */ bl ReadFileInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8FileInfo /* 8041C8DC 003E5E9C 2C 03 00 00 */ cmpwi r3, 0 /* 8041C8E0 003E5EA0 40 82 00 0C */ bne lbl_8041C8EC /* 8041C8E4 003E5EA4 38 60 00 00 */ li r3, 0 @@ -213,7 +215,7 @@ lbl_8041C988: /* 8041C98C 003E5F4C 7F 24 CB 78 */ mr r4, r25 /* 8041C990 003E5F50 38 C1 00 08 */ addi r6, r1, 8 /* 8041C994 003E5F54 38 A0 00 00 */ li r5, 0 -/* 8041C998 003E5F58 48 00 0E 85 */ bl func_8041D81C +/* 8041C998 003E5F58 48 00 0E 85 */ bl ReadFilePos__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive7FilePos /* 8041C99C 003E5F5C 2C 03 00 00 */ cmpwi r3, 0 /* 8041C9A0 003E5F60 40 82 00 0C */ bne lbl_8041C9AC /* 8041C9A4 003E5F64 38 60 00 00 */ li r3, 0 @@ -222,7 +224,7 @@ lbl_8041C9AC: /* 8041C9AC 003E5F6C 80 7D 00 04 */ lwz r3, 4(r29) /* 8041C9B0 003E5F70 38 A1 00 38 */ addi r5, r1, 0x38 /* 8041C9B4 003E5F74 80 81 00 08 */ lwz r4, 8(r1) -/* 8041C9B8 003E5F78 48 00 08 DD */ bl func_8041D294 +/* 8041C9B8 003E5F78 48 00 08 DD */ bl ReadGroupInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9GroupInfo /* 8041C9BC 003E5F7C 2C 03 00 00 */ cmpwi r3, 0 /* 8041C9C0 003E5F80 40 82 00 0C */ bne lbl_8041C9CC /* 8041C9C4 003E5F84 38 60 00 00 */ li r3, 0 @@ -232,7 +234,7 @@ lbl_8041C9CC: /* 8041C9D0 003E5F90 38 C1 00 20 */ addi r6, r1, 0x20 /* 8041C9D4 003E5F94 80 81 00 08 */ lwz r4, 8(r1) /* 8041C9D8 003E5F98 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 8041C9DC 003E5F9C 48 00 09 C9 */ bl func_8041D3A4 +/* 8041C9DC 003E5F9C 48 00 09 C9 */ bl ReadGroupItemInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo /* 8041C9E0 003E5FA0 2C 03 00 00 */ cmpwi r3, 0 /* 8041C9E4 003E5FA4 40 82 00 0C */ bne lbl_8041C9F0 /* 8041C9E8 003E5FA8 38 60 00 00 */ li r3, 0 diff --git a/asm/nw4r/snd/snd_SoundArchiveFile.s b/asm/nw4r/snd/snd_SoundArchiveFile.s index 19ed5cf..d165d58 100644 --- a/asm/nw4r/snd/snd_SoundArchiveFile.s +++ b/asm/nw4r/snd/snd_SoundArchiveFile.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_8041CAD4 -func_8041CAD4: +.global __ct__Q44nw4r3snd6detail22SoundArchiveFileReaderFv +__ct__Q44nw4r3snd6detail22SoundArchiveFileReaderFv: /* 8041CAD4 003E6094 38 00 00 00 */ li r0, 0 /* 8041CAD8 003E6098 90 03 00 28 */ stw r0, 0x28(r3) /* 8041CADC 003E609C 90 03 00 2C */ stw r0, 0x2c(r3) @@ -14,8 +14,8 @@ func_8041CAD4: /* 8041CAF0 003E60B0 90 03 00 40 */ stw r0, 0x40(r3) /* 8041CAF4 003E60B4 4E 80 00 20 */ blr -.global func_8041CAF8 -func_8041CAF8: +.global Init__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCv +Init__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCv: /* 8041CAF8 003E60B8 80 A4 00 00 */ lwz r5, 0(r4) /* 8041CAFC 003E60BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041CB00 003E60C0 3C 05 AD AD */ addis r0, r5, 0xadad @@ -65,8 +65,8 @@ lbl_8041CB9C: /* 8041CBA0 003E6160 38 21 00 10 */ addi r1, r1, 0x10 /* 8041CBA4 003E6164 4E 80 00 20 */ blr -.global func_8041CBA8 -func_8041CBA8: +.global SetStringChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl +SetStringChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl: /* 8041CBA8 003E6168 80 04 00 08 */ lwz r0, 8(r4) /* 8041CBAC 003E616C 38 A4 00 08 */ addi r5, r4, 8 /* 8041CBB0 003E6170 90 A3 00 2C */ stw r5, 0x2c(r3) @@ -120,14 +120,14 @@ lbl_8041CC48: /* 8041CC48 003E6208 90 03 00 40 */ stw r0, 0x40(r3) /* 8041CC4C 003E620C 4E 80 00 20 */ blr -.global func_8041CC50 -func_8041CC50: +.global SetInfoChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl +SetInfoChunk__Q44nw4r3snd6detail22SoundArchiveFileReaderFPCvUl: /* 8041CC50 003E6210 38 04 00 08 */ addi r0, r4, 8 /* 8041CC54 003E6214 90 03 00 28 */ stw r0, 0x28(r3) /* 8041CC58 003E6218 4E 80 00 20 */ blr -.global func_8041CC5C -func_8041CC5C: +.global GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl +GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl: /* 8041CC5C 003E621C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041CC60 003E6220 7C 08 02 A6 */ mflr r0 /* 8041CC64 003E6224 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -200,8 +200,8 @@ lbl_8041CD34: /* 8041CD44 003E6304 38 21 00 10 */ addi r1, r1, 0x10 /* 8041CD48 003E6308 4E 80 00 20 */ blr -.global func_8041CD4C -func_8041CD4C: +.global ReadSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9SoundInfo +ReadSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9SoundInfo: /* 8041CD4C 003E630C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041CD50 003E6310 7C 08 02 A6 */ mflr r0 /* 8041CD54 003E6314 80 C3 00 28 */ lwz r6, 0x28(r3) @@ -285,8 +285,8 @@ lbl_8041CE58: /* 8041CE6C 003E642C 38 21 00 20 */ addi r1, r1, 0x20 /* 8041CE70 003E6430 4E 80 00 20 */ blr -.global func_8041CE74 -func_8041CE74: +.global ReadSeqSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo +ReadSeqSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo: /* 8041CE74 003E6434 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041CE78 003E6438 7C 08 02 A6 */ mflr r0 /* 8041CE7C 003E643C 90 01 00 24 */ stw r0, 0x24(r1) @@ -296,7 +296,7 @@ func_8041CE74: /* 8041CE8C 003E644C 7C 9E 23 78 */ mr r30, r4 /* 8041CE90 003E6450 93 A1 00 14 */ stw r29, 0x14(r1) /* 8041CE94 003E6454 7C 7D 1B 78 */ mr r29, r3 -/* 8041CE98 003E6458 4B FF FD C5 */ bl func_8041CC5C +/* 8041CE98 003E6458 4B FF FD C5 */ bl GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl /* 8041CE9C 003E645C 2C 03 00 01 */ cmpwi r3, 1 /* 8041CEA0 003E6460 41 82 00 0C */ beq lbl_8041CEAC /* 8041CEA4 003E6464 38 60 00 00 */ li r3, 0 @@ -305,7 +305,7 @@ lbl_8041CEAC: /* 8041CEAC 003E646C 7F A3 EB 78 */ mr r3, r29 /* 8041CEB0 003E6470 7F C4 F3 78 */ mr r4, r30 /* 8041CEB4 003E6474 38 A1 00 08 */ addi r5, r1, 8 -/* 8041CEB8 003E6478 48 00 0B CD */ bl func_8041DA84 +/* 8041CEB8 003E6478 48 00 0B CD */ bl impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef_v_Q54nw4r3snd6detail16SoundArchiveFile12SeqSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13StrmSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13WaveSoundInfo_ /* 8041CEBC 003E647C 2C 03 00 00 */ cmpwi r3, 0 /* 8041CEC0 003E6480 40 82 00 0C */ bne lbl_8041CECC /* 8041CEC4 003E6484 38 60 00 00 */ li r3, 0 @@ -352,8 +352,8 @@ lbl_8041CF3C: /* 8041CF50 003E6510 38 21 00 20 */ addi r1, r1, 0x20 /* 8041CF54 003E6514 4E 80 00 20 */ blr -.global func_8041CF58 -func_8041CF58: +.global ReadStrmSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo +ReadStrmSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo: /* 8041CF58 003E6518 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041CF5C 003E651C 7C 08 02 A6 */ mflr r0 /* 8041CF60 003E6520 90 01 00 24 */ stw r0, 0x24(r1) @@ -363,7 +363,7 @@ func_8041CF58: /* 8041CF70 003E6530 7C 9E 23 78 */ mr r30, r4 /* 8041CF74 003E6534 93 A1 00 14 */ stw r29, 0x14(r1) /* 8041CF78 003E6538 7C 7D 1B 78 */ mr r29, r3 -/* 8041CF7C 003E653C 4B FF FC E1 */ bl func_8041CC5C +/* 8041CF7C 003E653C 4B FF FC E1 */ bl GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl /* 8041CF80 003E6540 2C 03 00 02 */ cmpwi r3, 2 /* 8041CF84 003E6544 41 82 00 0C */ beq lbl_8041CF90 /* 8041CF88 003E6548 38 60 00 00 */ li r3, 0 @@ -372,7 +372,7 @@ lbl_8041CF90: /* 8041CF90 003E6550 7F A3 EB 78 */ mr r3, r29 /* 8041CF94 003E6554 7F C4 F3 78 */ mr r4, r30 /* 8041CF98 003E6558 38 A1 00 08 */ addi r5, r1, 8 -/* 8041CF9C 003E655C 48 00 0A E9 */ bl func_8041DA84 +/* 8041CF9C 003E655C 48 00 0A E9 */ bl impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef_v_Q54nw4r3snd6detail16SoundArchiveFile12SeqSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13StrmSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13WaveSoundInfo_ /* 8041CFA0 003E6560 2C 03 00 00 */ cmpwi r3, 0 /* 8041CFA4 003E6564 40 82 00 0C */ bne lbl_8041CFB0 /* 8041CFA8 003E6568 38 60 00 00 */ li r3, 0 @@ -431,8 +431,8 @@ lbl_8041D040: /* 8041D054 003E6614 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D058 003E6618 4E 80 00 20 */ blr -.global func_8041D05C -func_8041D05C: +.global ReadWaveSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo +ReadWaveSoundInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo: /* 8041D05C 003E661C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D060 003E6620 7C 08 02 A6 */ mflr r0 /* 8041D064 003E6624 90 01 00 24 */ stw r0, 0x24(r1) @@ -442,7 +442,7 @@ func_8041D05C: /* 8041D074 003E6634 7C 9E 23 78 */ mr r30, r4 /* 8041D078 003E6638 93 A1 00 14 */ stw r29, 0x14(r1) /* 8041D07C 003E663C 7C 7D 1B 78 */ mr r29, r3 -/* 8041D080 003E6640 4B FF FB DD */ bl func_8041CC5C +/* 8041D080 003E6640 4B FF FB DD */ bl GetSoundType__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl /* 8041D084 003E6644 2C 03 00 03 */ cmpwi r3, 3 /* 8041D088 003E6648 41 82 00 0C */ beq lbl_8041D094 /* 8041D08C 003E664C 38 60 00 00 */ li r3, 0 @@ -451,7 +451,7 @@ lbl_8041D094: /* 8041D094 003E6654 7F A3 EB 78 */ mr r3, r29 /* 8041D098 003E6658 7F C4 F3 78 */ mr r4, r30 /* 8041D09C 003E665C 38 A1 00 08 */ addi r5, r1, 8 -/* 8041D0A0 003E6660 48 00 09 E5 */ bl func_8041DA84 +/* 8041D0A0 003E6660 48 00 09 E5 */ bl impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef_v_Q54nw4r3snd6detail16SoundArchiveFile12SeqSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13StrmSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13WaveSoundInfo_ /* 8041D0A4 003E6664 2C 03 00 00 */ cmpwi r3, 0 /* 8041D0A8 003E6668 40 82 00 0C */ bne lbl_8041D0B4 /* 8041D0AC 003E666C 38 60 00 00 */ li r3, 0 @@ -494,8 +494,8 @@ lbl_8041D114: /* 8041D128 003E66E8 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D12C 003E66EC 4E 80 00 20 */ blr -.global func_8041D130 -func_8041D130: +.global ReadBankInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8BankInfo +ReadBankInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8BankInfo: /* 8041D130 003E66F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D134 003E66F4 7C 08 02 A6 */ mflr r0 /* 8041D138 003E66F8 80 C3 00 28 */ lwz r6, 0x28(r3) @@ -545,8 +545,8 @@ lbl_8041D1C0: /* 8041D1D4 003E6794 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D1D8 003E6798 4E 80 00 20 */ blr -.global func_8041D1DC -func_8041D1DC: +.global ReadPlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo +ReadPlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo: /* 8041D1DC 003E679C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D1E0 003E67A0 7C 08 02 A6 */ mflr r0 /* 8041D1E4 003E67A4 80 C3 00 28 */ lwz r6, 0x28(r3) @@ -599,8 +599,8 @@ lbl_8041D278: /* 8041D28C 003E684C 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D290 003E6850 4E 80 00 20 */ blr -.global func_8041D294 -func_8041D294: +.global ReadGroupInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9GroupInfo +ReadGroupInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive9GroupInfo: /* 8041D294 003E6854 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D298 003E6858 7C 08 02 A6 */ mflr r0 /* 8041D29C 003E685C 80 C3 00 28 */ lwz r6, 0x28(r3) @@ -676,8 +676,8 @@ lbl_8041D384: /* 8041D39C 003E695C 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D3A0 003E6960 4E 80 00 20 */ blr -.global func_8041D3A4 -func_8041D3A4: +.global ReadGroupItemInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo +ReadGroupItemInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo: /* 8041D3A4 003E6964 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D3A8 003E6968 7C 08 02 A6 */ mflr r0 /* 8041D3AC 003E696C 80 E3 00 28 */ lwz r7, 0x28(r3) @@ -765,8 +765,8 @@ lbl_8041D4BC: /* 8041D4D4 003E6A94 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D4D8 003E6A98 4E 80 00 20 */ blr -.global func_8041D4DC -func_8041D4DC: +.global ReadSoundArchivePlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo +ReadSoundArchivePlayerInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo: /* 8041D4DC 003E6A9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D4E0 003E6AA0 7C 08 02 A6 */ mflr r0 /* 8041D4E4 003E6AA4 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -803,8 +803,8 @@ lbl_8041D54C: /* 8041D558 003E6B18 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D55C 003E6B1C 4E 80 00 20 */ blr -.global func_8041D560 -func_8041D560: +.global GetSoundCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv +GetSoundCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv: /* 8041D560 003E6B20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D564 003E6B24 7C 08 02 A6 */ mflr r0 /* 8041D568 003E6B28 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -824,8 +824,8 @@ lbl_8041D590: /* 8041D598 003E6B58 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D59C 003E6B5C 4E 80 00 20 */ blr -.global func_8041D5A0 -func_8041D5A0: +.global GetPlayerCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv +GetPlayerCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv: /* 8041D5A0 003E6B60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D5A4 003E6B64 7C 08 02 A6 */ mflr r0 /* 8041D5A8 003E6B68 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -845,8 +845,8 @@ lbl_8041D5D0: /* 8041D5D8 003E6B98 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D5DC 003E6B9C 4E 80 00 20 */ blr -.global func_8041D5E0 -func_8041D5E0: +.global GetGroupCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv +GetGroupCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv: /* 8041D5E0 003E6BA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D5E4 003E6BA4 7C 08 02 A6 */ mflr r0 /* 8041D5E8 003E6BA8 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -867,8 +867,9 @@ lbl_8041D614: /* 8041D61C 003E6BDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D620 003E6BE0 4E 80 00 20 */ blr -.global func_8041D624 -func_8041D624: +#not sure about this label +.global GetSoundUserParam__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl +GetSoundUserParam__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUl: /* 8041D624 003E6BE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D628 003E6BE8 7C 08 02 A6 */ mflr r0 /* 8041D62C 003E6BEC 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -922,8 +923,8 @@ lbl_8041D6C4: /* 8041D6D4 003E6C94 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D6D8 003E6C98 4E 80 00 20 */ blr -.global func_8041D6DC -func_8041D6DC: +.global GetFileCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv +GetFileCount__Q44nw4r3snd6detail22SoundArchiveFileReaderCFv: /* 8041D6DC 003E6C9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041D6E0 003E6CA0 7C 08 02 A6 */ mflr r0 /* 8041D6E4 003E6CA4 80 A3 00 28 */ lwz r5, 0x28(r3) @@ -943,8 +944,8 @@ lbl_8041D70C: /* 8041D714 003E6CD4 38 21 00 10 */ addi r1, r1, 0x10 /* 8041D718 003E6CD8 4E 80 00 20 */ blr -.global func_8041D71C -func_8041D71C: +.global ReadFileInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8FileInfo +ReadFileInfo__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ44nw4r3snd12SoundArchive8FileInfo: /* 8041D71C 003E6CDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D720 003E6CE0 7C 08 02 A6 */ mflr r0 /* 8041D724 003E6CE4 80 C3 00 28 */ lwz r6, 0x28(r3) @@ -1015,8 +1016,8 @@ lbl_8041D7FC: /* 8041D814 003E6DD4 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D818 003E6DD8 4E 80 00 20 */ blr -.global func_8041D81C -func_8041D81C: +.global ReadFilePos__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive7FilePos +ReadFilePos__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlUlPQ44nw4r3snd12SoundArchive7FilePos: /* 8041D81C 003E6DDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D820 003E6DE0 7C 08 02 A6 */ mflr r0 /* 8041D824 003E6DE4 80 E3 00 28 */ lwz r7, 0x28(r3) @@ -1097,8 +1098,8 @@ lbl_8041D91C: /* 8041D934 003E6EF4 38 21 00 20 */ addi r1, r1, 0x20 /* 8041D938 003E6EF8 4E 80 00 20 */ blr -.global func_8041D93C -func_8041D93C: +.global ConvertLabelStringToId__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPCQ54nw4r3snd6detail16SoundArchiveFile10StringTreePCc +ConvertLabelStringToId__Q44nw4r3snd6detail22SoundArchiveFileReaderCFPCQ54nw4r3snd6detail16SoundArchiveFile10StringTreePCc: /* 8041D93C 003E6EFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041D940 003E6F00 7C 08 02 A6 */ mflr r0 /* 8041D944 003E6F04 2C 04 00 00 */ cmpwi r4, 0 @@ -1194,8 +1195,9 @@ lbl_8041DA64: /* 8041DA7C 003E703C 38 21 00 20 */ addi r1, r1, 0x20 /* 8041DA80 003E7040 4E 80 00 20 */ blr -.global func_8041DA84 -func_8041DA84: +#impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef +.global impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef_v_Q54nw4r3snd6detail16SoundArchiveFile12SeqSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13StrmSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13WaveSoundInfo_ +impl_GetSoundInfoOffset__Q44nw4r3snd6detail22SoundArchiveFileReaderCFUlPQ54nw4r3snd6detail4Util165DataRef_v_Q54nw4r3snd6detail16SoundArchiveFile12SeqSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13StrmSoundInfo_Q54nw4r3snd6detail16SoundArchiveFile13WaveSoundInfo_: /* 8041DA84 003E7044 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041DA88 003E7048 7C 08 02 A6 */ mflr r0 /* 8041DA8C 003E704C 80 C3 00 28 */ lwz r6, 0x28(r3) diff --git a/asm/nw4r/snd/snd_SoundArchivePlayer.s b/asm/nw4r/snd/snd_SoundArchivePlayer.s index 9babaef..0326aa7 100644 --- a/asm/nw4r/snd/snd_SoundArchivePlayer.s +++ b/asm/nw4r/snd/snd_SoundArchivePlayer.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_8041DB84 -func_8041DB84: +.global __ct__Q34nw4r3snd18SoundArchivePlayerFv +__ct__Q34nw4r3snd18SoundArchivePlayerFv: /* 8041DB84 003E7144 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041DB88 003E7148 7C 08 02 A6 */ mflr r0 /* 8041DB8C 003E714C 3C C0 80 57 */ lis r6, lbl_8056E4C0@ha @@ -83,6 +83,17 @@ func_8041DB84: /* 8041DCB4 003E7274 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DCB8 003E7278 4E 80 00 20 */ blr +#Possible names for the following 2 functions: +#__dt__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackFv +#__dt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFv +#__dt__Q44nw4r3snd6detail17SeqTrackAllocatorFv +#__dt__Q54nw4r3snd6detail9WsdPlayer11WsdCallbackFv +#__dt__Q44nw4r3snd6detail14NoteOnCallbackFv +#__dt__Q34nw4r3snd14SoundStartableFv +#__dt__Q44nw4r2ut36@unnamed@snd_SoundArchivePlayer_cpp@11NonCopyableFv +#__dt__Q34nw4r2ut12LinkListNodeFv +#__dt__Q44nw4r3snd6detail15DisposeCallbackFv + .global func_8041DCBC func_8041DCBC: /* 8041DCBC 003E727C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -123,8 +134,9 @@ lbl_8041DD24: /* 8041DD34 003E72F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DD38 003E72F8 4E 80 00 20 */ blr -.global func_8041DD3C -func_8041DD3C: +#__ct__Q34nw4r2ut41LinkListFv +.global __ct__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv +__ct__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv: /* 8041DD3C 003E72FC 38 00 00 00 */ li r0, 0 /* 8041DD40 003E7300 38 83 00 04 */ addi r4, r3, 4 /* 8041DD44 003E7304 90 03 00 04 */ stw r0, 4(r3) @@ -134,8 +146,9 @@ func_8041DD3C: /* 8041DD54 003E7314 90 83 00 08 */ stw r4, 8(r3) /* 8041DD58 003E7318 4E 80 00 20 */ blr -.global func_8041DD5C -func_8041DD5C: +#__dt__Q34nw4r2ut41LinkListFv +.global __dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv +__dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv: /* 8041DD5C 003E731C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041DD60 003E7320 7C 08 02 A6 */ mflr r0 /* 8041DD64 003E7324 2C 03 00 00 */ cmpwi r3, 0 @@ -160,8 +173,9 @@ lbl_8041DD98: /* 8041DDAC 003E736C 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DDB0 003E7370 4E 80 00 20 */ blr -.global func_8041DDB4 -func_8041DDB4: +#__ct__Q34nw4r2ut42LinkListFv +.global __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv +__ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv: /* 8041DDB4 003E7374 38 00 00 00 */ li r0, 0 /* 8041DDB8 003E7378 38 83 00 04 */ addi r4, r3, 4 /* 8041DDBC 003E737C 90 03 00 04 */ stw r0, 4(r3) @@ -171,8 +185,10 @@ func_8041DDB4: /* 8041DDCC 003E738C 90 83 00 08 */ stw r4, 8(r3) /* 8041DDD0 003E7390 4E 80 00 20 */ blr -.global func_8041DDD4 -func_8041DDD4: + +#__dt__Q34nw4r2ut42LinkListFv +.global __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv +__dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv: /* 8041DDD4 003E7394 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041DDD8 003E7398 7C 08 02 A6 */ mflr r0 /* 8041DDDC 003E739C 2C 03 00 00 */ cmpwi r3, 0 @@ -197,8 +213,9 @@ lbl_8041DE10: /* 8041DE24 003E73E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DE28 003E73E8 4E 80 00 20 */ blr -.global func_8041DE2C -func_8041DE2C: +#__ct__Q34nw4r2ut42LinkListFv +.global __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv +__ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv: /* 8041DE2C 003E73EC 38 00 00 00 */ li r0, 0 /* 8041DE30 003E73F0 38 83 00 04 */ addi r4, r3, 4 /* 8041DE34 003E73F4 90 03 00 04 */ stw r0, 4(r3) @@ -208,8 +225,9 @@ func_8041DE2C: /* 8041DE44 003E7404 90 83 00 08 */ stw r4, 8(r3) /* 8041DE48 003E7408 4E 80 00 20 */ blr -.global func_8041DE4C -func_8041DE4C: +#__dt__Q34nw4r2ut42LinkListFv +.global __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv +__dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv: /* 8041DE4C 003E740C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041DE50 003E7410 7C 08 02 A6 */ mflr r0 /* 8041DE54 003E7414 2C 03 00 00 */ cmpwi r3, 0 @@ -234,8 +252,8 @@ lbl_8041DE88: /* 8041DE9C 003E745C 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DEA0 003E7460 4E 80 00 20 */ blr -.global func_8041DEA4 -func_8041DEA4: +.global __dt__Q34nw4r3snd18SoundArchivePlayerFv +__dt__Q34nw4r3snd18SoundArchivePlayerFv: /* 8041DEA4 003E7464 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8041DEA8 003E7468 7C 08 02 A6 */ mflr r0 /* 8041DEAC 003E746C 2C 03 00 00 */ cmpwi r3, 0 @@ -287,8 +305,8 @@ lbl_8041DF40: /* 8041DF54 003E7514 38 21 00 10 */ addi r1, r1, 0x10 /* 8041DF58 003E7518 4E 80 00 20 */ blr -.global func_8041DF5C -func_8041DF5C: +.global Setup__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUlPvUl +Setup__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUlPvUl: /* 8041DF5C 003E751C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8041DF60 003E7520 7C 08 02 A6 */ mflr r0 /* 8041DF64 003E7524 90 01 00 64 */ stw r0, 0x64(r1) @@ -310,7 +328,7 @@ lbl_8041DF9C: /* 8041DFA0 003E7560 7F 64 DB 78 */ mr r4, r27 /* 8041DFA4 003E7564 7F 85 E3 78 */ mr r5, r28 /* 8041DFA8 003E7568 7F E6 FB 78 */ mr r6, r31 -/* 8041DFAC 003E756C 48 00 03 31 */ bl func_8041E2DC +/* 8041DFAC 003E756C 48 00 03 31 */ bl SetupMram__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUl /* 8041DFB0 003E7570 2C 03 00 00 */ cmpwi r3, 0 /* 8041DFB4 003E7574 40 82 00 0C */ bne lbl_8041DFC0 /* 8041DFB8 003E7578 38 60 00 00 */ li r3, 0 @@ -319,7 +337,7 @@ lbl_8041DFC0: /* 8041DFC0 003E7580 7F 63 DB 78 */ mr r3, r27 /* 8041DFC4 003E7584 38 81 00 24 */ addi r4, r1, 0x24 /* 8041DFC8 003E7588 3B E0 00 00 */ li r31, 0 -/* 8041DFCC 003E758C 4B FF E8 A9 */ bl func_8041C874 +/* 8041DFCC 003E758C 4B FF E8 A9 */ bl ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo /* 8041DFD0 003E7590 2C 03 00 00 */ cmpwi r3, 0 /* 8041DFD4 003E7594 41 82 00 08 */ beq lbl_8041DFDC /* 8041DFD8 003E7598 83 E1 00 34 */ lwz r31, 0x34(r1) @@ -335,7 +353,7 @@ lbl_8041DFF8: /* 8041DFF8 003E75B8 7F 63 DB 78 */ mr r3, r27 /* 8041DFFC 003E75BC 38 81 00 08 */ addi r4, r1, 8 /* 8041E000 003E75C0 3B E0 00 00 */ li r31, 0 -/* 8041E004 003E75C4 4B FF E8 71 */ bl func_8041C874 +/* 8041E004 003E75C4 4B FF E8 71 */ bl ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo /* 8041E008 003E75C8 2C 03 00 00 */ cmpwi r3, 0 /* 8041E00C 003E75CC 41 82 00 08 */ beq lbl_8041E014 /* 8041E010 003E75D0 83 E1 00 18 */ lwz r31, 0x18(r1) @@ -363,8 +381,8 @@ lbl_8041E048: /* 8041E058 003E7618 38 21 00 60 */ addi r1, r1, 0x60 /* 8041E05C 003E761C 4E 80 00 20 */ blr -.global func_8041E060 -func_8041E060: +.global Shutdown__Q34nw4r3snd18SoundArchivePlayerFv +Shutdown__Q34nw4r3snd18SoundArchivePlayerFv: /* 8041E060 003E7620 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041E064 003E7624 7C 08 02 A6 */ mflr r0 /* 8041E068 003E7628 90 01 00 24 */ stw r0, 0x24(r1) @@ -384,7 +402,7 @@ lbl_8041E09C: /* 8041E09C 003E765C 80 1B 00 40 */ lwz r0, 0x40(r27) /* 8041E0A0 003E7660 38 80 FF FF */ li r4, -1 /* 8041E0A4 003E7664 7C 60 E2 14 */ add r3, r0, r28 -/* 8041E0A8 003E7668 48 00 24 8D */ bl func_80420534 +/* 8041E0A8 003E7668 48 00 24 8D */ bl __dt__Q34nw4r3snd11SoundPlayerFv /* 8041E0AC 003E766C 3B 9C 00 64 */ addi r28, r28, 0x64 /* 8041E0B0 003E7670 3B BD 00 01 */ addi r29, r29, 1 lbl_8041E0B4: @@ -445,8 +463,8 @@ lbl_8041E178: /* 8041E188 003E7748 38 21 00 20 */ addi r1, r1, 0x20 /* 8041E18C 003E774C 4E 80 00 20 */ blr -.global func_8041E190 -func_8041E190: +.global GetRequiredMemSize__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchive +GetRequiredMemSize__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchive: /* 8041E190 003E7750 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8041E194 003E7754 7C 08 02 A6 */ mflr r0 /* 8041E198 003E7758 90 01 00 44 */ stw r0, 0x44(r1) @@ -456,7 +474,7 @@ func_8041E190: /* 8041E1A8 003E7768 7F C3 F3 78 */ mr r3, r30 /* 8041E1AC 003E776C 93 A1 00 34 */ stw r29, 0x34(r1) /* 8041E1B0 003E7770 93 81 00 30 */ stw r28, 0x30(r1) -/* 8041E1B4 003E7774 4B FF E6 69 */ bl func_8041C81C +/* 8041E1B4 003E7774 4B FF E6 69 */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E1B8 003E7778 1C 83 00 64 */ mulli r4, r3, 0x64 /* 8041E1BC 003E777C 7C 7D 1B 78 */ mr r29, r3 /* 8041E1C0 003E7780 3B 80 00 00 */ li r28, 0 @@ -467,7 +485,7 @@ lbl_8041E1D0: /* 8041E1D0 003E7790 7F C3 F3 78 */ mr r3, r30 /* 8041E1D4 003E7794 7F 84 E3 78 */ mr r4, r28 /* 8041E1D8 003E7798 38 A1 00 08 */ addi r5, r1, 8 -/* 8041E1DC 003E779C 4B FF E6 91 */ bl func_8041C86C +/* 8041E1DC 003E779C 4B FF E6 91 */ bl ReadPlayerInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo /* 8041E1E0 003E77A0 2C 03 00 00 */ cmpwi r3, 0 /* 8041E1E4 003E77A4 41 82 00 38 */ beq lbl_8041E21C /* 8041E1E8 003E77A8 80 61 00 0C */ lwz r3, 0xc(r1) @@ -491,14 +509,14 @@ lbl_8041E220: /* 8041E220 003E77E0 7C 1C E8 40 */ cmplw r28, r29 /* 8041E224 003E77E4 41 80 FF AC */ blt lbl_8041E1D0 /* 8041E228 003E77E8 7F C3 F3 78 */ mr r3, r30 -/* 8041E22C 003E77EC 4B FF E5 F9 */ bl func_8041C824 +/* 8041E22C 003E77EC 4B FF E5 F9 */ bl GetGroupCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E230 003E77F0 54 64 18 38 */ slwi r4, r3, 3 /* 8041E234 003E77F4 7F C3 F3 78 */ mr r3, r30 /* 8041E238 003E77F8 38 04 00 07 */ addi r0, r4, 7 /* 8041E23C 003E77FC 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d /* 8041E240 003E7800 38 81 00 10 */ addi r4, r1, 0x10 /* 8041E244 003E7804 7F FF 02 14 */ add r31, r31, r0 -/* 8041E248 003E7808 4B FF E6 2D */ bl func_8041C874 +/* 8041E248 003E7808 4B FF E6 2D */ bl ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo /* 8041E24C 003E780C 2C 03 00 00 */ cmpwi r3, 0 /* 8041E250 003E7810 41 82 00 54 */ beq lbl_8041E2A4 /* 8041E254 003E7814 80 01 00 10 */ lwz r0, 0x10(r1) @@ -523,7 +541,7 @@ lbl_8041E220: /* 8041E2A0 003E7860 7F FF 02 14 */ add r31, r31, r0 lbl_8041E2A4: /* 8041E2A4 003E7864 7F C3 F3 78 */ mr r3, r30 -/* 8041E2A8 003E7868 4B FF E5 ED */ bl func_8041C894 +/* 8041E2A8 003E7868 4B FF E5 ED */ bl detail_GetFileCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E2AC 003E786C 54 63 18 38 */ slwi r3, r3, 3 /* 8041E2B0 003E7870 38 03 00 07 */ addi r0, r3, 7 /* 8041E2B4 003E7874 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d @@ -537,8 +555,8 @@ lbl_8041E2A4: /* 8041E2D4 003E7894 38 21 00 40 */ addi r1, r1, 0x40 /* 8041E2D8 003E7898 4E 80 00 20 */ blr -.global func_8041E2DC -func_8041E2DC: +.global SetupMram__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUl +SetupMram__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePvUl: /* 8041E2DC 003E789C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8041E2E0 003E78A0 7C 08 02 A6 */ mflr r0 /* 8041E2E4 003E78A4 90 01 00 54 */ stw r0, 0x54(r1) @@ -552,14 +570,14 @@ func_8041E2DC: /* 8041E304 003E78C4 7C 9C 23 78 */ mr r28, r4 /* 8041E308 003E78C8 7F E6 FB 78 */ mr r6, r31 /* 8041E30C 003E78CC 38 A1 00 08 */ addi r5, r1, 8 -/* 8041E310 003E78D0 48 00 03 C9 */ bl func_8041E6D8 +/* 8041E310 003E78D0 48 00 03 C9 */ bl SetupSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePPvPv /* 8041E314 003E78D4 2C 03 00 00 */ cmpwi r3, 0 /* 8041E318 003E78D8 40 82 00 0C */ bne lbl_8041E324 /* 8041E31C 003E78DC 38 60 00 00 */ li r3, 0 /* 8041E320 003E78E0 48 00 02 D4 */ b lbl_8041E5F4 lbl_8041E324: /* 8041E324 003E78E4 7F 83 E3 78 */ mr r3, r28 -/* 8041E328 003E78E8 4B FF E4 FD */ bl func_8041C824 +/* 8041E328 003E78E8 4B FF E4 FD */ bl GetGroupCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E32C 003E78EC 54 63 18 38 */ slwi r3, r3, 3 /* 8041E330 003E78F0 80 A1 00 08 */ lwz r5, 8(r1) /* 8041E334 003E78F4 38 03 00 04 */ addi r0, r3, 4 @@ -574,7 +592,7 @@ lbl_8041E354: /* 8041E354 003E7914 90 BB 00 14 */ stw r5, 0x14(r27) /* 8041E358 003E7918 7F 83 E3 78 */ mr r3, r28 /* 8041E35C 003E791C 90 81 00 08 */ stw r4, 8(r1) -/* 8041E360 003E7920 4B FF E4 C5 */ bl func_8041C824 +/* 8041E360 003E7920 4B FF E4 C5 */ bl GetGroupCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E364 003E7924 80 BB 00 14 */ lwz r5, 0x14(r27) /* 8041E368 003E7928 38 C0 00 00 */ li r6, 0 /* 8041E36C 003E792C 38 E0 00 00 */ li r7, 0 @@ -602,7 +620,7 @@ lbl_8041E3AC: /* 8041E3B8 003E7978 48 00 02 3C */ b lbl_8041E5F4 lbl_8041E3BC: /* 8041E3BC 003E797C 7F 83 E3 78 */ mr r3, r28 -/* 8041E3C0 003E7980 4B FF E4 D5 */ bl func_8041C894 +/* 8041E3C0 003E7980 4B FF E4 D5 */ bl detail_GetFileCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E3C4 003E7984 54 63 18 38 */ slwi r3, r3, 3 /* 8041E3C8 003E7988 80 A1 00 08 */ lwz r5, 8(r1) /* 8041E3CC 003E798C 38 03 00 04 */ addi r0, r3, 4 @@ -617,7 +635,7 @@ lbl_8041E3EC: /* 8041E3EC 003E79AC 90 BB 00 18 */ stw r5, 0x18(r27) /* 8041E3F0 003E79B0 7F 83 E3 78 */ mr r3, r28 /* 8041E3F4 003E79B4 90 81 00 08 */ stw r4, 8(r1) -/* 8041E3F8 003E79B8 4B FF E4 9D */ bl func_8041C894 +/* 8041E3F8 003E79B8 4B FF E4 9D */ bl detail_GetFileCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E3FC 003E79BC 80 BB 00 18 */ lwz r5, 0x18(r27) /* 8041E400 003E79C0 38 C0 00 00 */ li r6, 0 /* 8041E404 003E79C4 38 E0 00 00 */ li r7, 0 @@ -646,7 +664,7 @@ lbl_8041E444: lbl_8041E454: /* 8041E454 003E7A14 7F 83 E3 78 */ mr r3, r28 /* 8041E458 003E7A18 38 81 00 0C */ addi r4, r1, 0xc -/* 8041E45C 003E7A1C 4B FF E4 19 */ bl func_8041C874 +/* 8041E45C 003E7A1C 4B FF E4 19 */ bl ReadSoundArchivePlayerInfo__Q34nw4r3snd12SoundArchiveCFPQ44nw4r3snd12SoundArchive22SoundArchivePlayerInfo /* 8041E460 003E7A20 2C 03 00 00 */ cmpwi r3, 0 /* 8041E464 003E7A24 41 82 01 80 */ beq lbl_8041E5E4 /* 8041E468 003E7A28 80 01 00 0C */ lwz r0, 0xc(r1) @@ -768,8 +786,8 @@ lbl_8041E5F4: /* 8041E604 003E7BC4 38 21 00 50 */ addi r1, r1, 0x50 /* 8041E608 003E7BC8 4E 80 00 20 */ blr -.global func_8041E60C -func_8041E60C: +.global CreatePlayerHeap__Q34nw4r3snd18SoundArchivePlayerFPPvPvUl +CreatePlayerHeap__Q34nw4r3snd18SoundArchivePlayerFPPvPvUl: /* 8041E60C 003E7BCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8041E610 003E7BD0 7C 08 02 A6 */ mflr r0 /* 8041E614 003E7BD4 90 01 00 24 */ stw r0, 0x24(r1) @@ -827,8 +845,8 @@ lbl_8041E6B8: /* 8041E6D0 003E7C90 38 21 00 20 */ addi r1, r1, 0x20 /* 8041E6D4 003E7C94 4E 80 00 20 */ blr -.global func_8041E6D8 -func_8041E6D8: +.global SetupSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePPvPv +SetupSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFPCQ34nw4r3snd12SoundArchivePPvPv: /* 8041E6D8 003E7C98 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8041E6DC 003E7C9C 7C 08 02 A6 */ mflr r0 /* 8041E6E0 003E7CA0 90 01 00 44 */ stw r0, 0x44(r1) @@ -839,7 +857,7 @@ func_8041E6D8: /* 8041E6F4 003E7CB4 7C B9 2B 78 */ mr r25, r5 /* 8041E6F8 003E7CB8 7C DA 33 78 */ mr r26, r6 /* 8041E6FC 003E7CBC 7F 03 C3 78 */ mr r3, r24 -/* 8041E700 003E7CC0 4B FF E1 1D */ bl func_8041C81C +/* 8041E700 003E7CC0 4B FF E1 1D */ bl GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv /* 8041E704 003E7CC4 1C 03 00 64 */ mulli r0, r3, 0x64 /* 8041E708 003E7CC8 83 D9 00 00 */ lwz r30, 0(r25) /* 8041E70C 003E7CCC 7C 7F 1B 78 */ mr r31, r3 @@ -861,18 +879,18 @@ lbl_8041E740: /* 8041E744 003E7D04 7F DC F3 78 */ mr r28, r30 /* 8041E748 003E7D08 41 82 00 10 */ beq lbl_8041E758 /* 8041E74C 003E7D0C 7F C3 F3 78 */ mr r3, r30 -/* 8041E750 003E7D10 48 00 1C C9 */ bl func_80420418 +/* 8041E750 003E7D10 48 00 1C C9 */ bl __ct__Q34nw4r3snd11SoundPlayerFv /* 8041E754 003E7D14 7C 7C 1B 78 */ mr r28, r3 lbl_8041E758: /* 8041E758 003E7D18 7F 03 C3 78 */ mr r3, r24 /* 8041E75C 003E7D1C 7F A4 EB 78 */ mr r4, r29 /* 8041E760 003E7D20 38 A1 00 08 */ addi r5, r1, 8 -/* 8041E764 003E7D24 4B FF E1 09 */ bl func_8041C86C +/* 8041E764 003E7D24 4B FF E1 09 */ bl ReadPlayerInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive10PlayerInfo /* 8041E768 003E7D28 2C 03 00 00 */ cmpwi r3, 0 /* 8041E76C 003E7D2C 41 82 00 6C */ beq lbl_8041E7D8 /* 8041E770 003E7D30 80 81 00 08 */ lwz r4, 8(r1) /* 8041E774 003E7D34 7F 83 E3 78 */ mr r3, r28 -/* 8041E778 003E7D38 48 00 25 25 */ bl func_80420C9C +/* 8041E778 003E7D38 48 00 25 25 */ bl SetPlayableSoundCount__Q34nw4r3snd11SoundPlayerFi /* 8041E77C 003E7D3C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8041E780 003E7D40 2C 00 00 00 */ cmpwi r0, 0 /* 8041E784 003E7D44 41 82 00 54 */ beq lbl_8041E7D8 @@ -883,7 +901,7 @@ lbl_8041E790: /* 8041E794 003E7D54 7E E3 BB 78 */ mr r3, r23 /* 8041E798 003E7D58 7F 24 CB 78 */ mr r4, r25 /* 8041E79C 003E7D5C 7F 45 D3 78 */ mr r5, r26 -/* 8041E7A0 003E7D60 4B FF FE 6D */ bl func_8041E60C +/* 8041E7A0 003E7D60 4B FF FE 6D */ bl CreatePlayerHeap__Q34nw4r3snd18SoundArchivePlayerFPPvPvUl /* 8041E7A4 003E7D64 2C 03 00 00 */ cmpwi r3, 0 /* 8041E7A8 003E7D68 7C 64 1B 78 */ mr r4, r3 /* 8041E7AC 003E7D6C 40 82 00 0C */ bne lbl_8041E7B8 @@ -891,14 +909,14 @@ lbl_8041E790: /* 8041E7B4 003E7D74 48 00 00 38 */ b lbl_8041E7EC lbl_8041E7B8: /* 8041E7B8 003E7D78 7F 83 E3 78 */ mr r3, r28 -/* 8041E7BC 003E7D7C 48 00 26 55 */ bl func_80420E10 +/* 8041E7BC 003E7D7C 48 00 26 55 */ bl detail_AppendPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10PlayerHeap /* 8041E7C0 003E7D80 3B 7B 00 01 */ addi r27, r27, 1 lbl_8041E7C4: /* 8041E7C4 003E7D84 80 81 00 08 */ lwz r4, 8(r1) /* 8041E7C8 003E7D88 7C 1B 20 00 */ cmpw r27, r4 /* 8041E7CC 003E7D8C 41 80 FF C4 */ blt lbl_8041E790 /* 8041E7D0 003E7D90 7F 83 E3 78 */ mr r3, r28 -/* 8041E7D4 003E7D94 48 00 25 59 */ bl func_80420D2C +/* 8041E7D4 003E7D94 48 00 25 59 */ bl detail_SetPlayableSoundLimit__Q34nw4r3snd11SoundPlayerFi lbl_8041E7D8: /* 8041E7D8 003E7D98 3B BD 00 01 */ addi r29, r29, 1 /* 8041E7DC 003E7D9C 3B DE 00 64 */ addi r30, r30, 0x64 @@ -914,8 +932,8 @@ lbl_8041E7EC: /* 8041E7FC 003E7DBC 38 21 00 40 */ addi r1, r1, 0x40 /* 8041E800 003E7DC0 4E 80 00 20 */ blr -.global func_8041E804 -func_8041E804: +.global Update__Q34nw4r3snd18SoundArchivePlayerFv +Update__Q34nw4r3snd18SoundArchivePlayerFv: /* 8041E804 003E7DC4 94 21 ED B0 */ stwu r1, -0x1250(r1) /* 8041E808 003E7DC8 7C 08 02 A6 */ mflr r0 /* 8041E80C 003E7DCC 90 01 12 54 */ stw r0, 0x1254(r1) @@ -928,7 +946,7 @@ func_8041E804: lbl_8041E828: /* 8041E828 003E7DE8 80 1F 00 40 */ lwz r0, 0x40(r31) /* 8041E82C 003E7DEC 7C 60 DA 14 */ add r3, r0, r27 -/* 8041E830 003E7DF0 48 00 1D D9 */ bl func_80420608 +/* 8041E830 003E7DF0 48 00 1D D9 */ bl Update__Q34nw4r3snd11SoundPlayerFv /* 8041E834 003E7DF4 3B 7B 00 64 */ addi r27, r27, 0x64 /* 8041E838 003E7DF8 3B 5A 00 01 */ addi r26, r26, 1 lbl_8041E83C: @@ -941,12 +959,12 @@ lbl_8041E83C: /* 8041E854 003E7E14 3B BF 00 54 */ addi r29, r31, 0x54 /* 8041E858 003E7E18 7F A3 EB 78 */ mr r3, r29 /* 8041E85C 003E7E1C 4B F3 B4 05 */ bl OSLockMutex -/* 8041E860 003E7E20 3C 80 80 42 */ lis r4, func_8041DD3C@ha -/* 8041E864 003E7E24 3C A0 80 42 */ lis r5, func_8041DD5C@ha +/* 8041E860 003E7E20 3C 80 80 42 */ lis r4, __ct__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@ha +/* 8041E864 003E7E24 3C A0 80 42 */ lis r5, __dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@ha /* 8041E868 003E7E28 38 61 0C 38 */ addi r3, r1, 0xc38 /* 8041E86C 003E7E2C 38 C0 00 0C */ li r6, 0xc -/* 8041E870 003E7E30 38 84 DD 3C */ addi r4, r4, func_8041DD3C@l -/* 8041E874 003E7E34 38 A5 DD 5C */ addi r5, r5, func_8041DD5C@l +/* 8041E870 003E7E30 38 84 DD 3C */ addi r4, r4, __ct__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@l +/* 8041E874 003E7E34 38 A5 DD 5C */ addi r5, r5, __dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@l /* 8041E878 003E7E38 38 E0 00 80 */ li r7, 0x80 /* 8041E87C 003E7E3C 4B E9 B2 85 */ bl __construct_array /* 8041E880 003E7E40 48 00 00 5C */ b lbl_8041E8DC @@ -1007,9 +1025,9 @@ lbl_8041E938: /* 8041E93C 003E7EFC 3B 7B 00 0C */ addi r27, r27, 0xc /* 8041E940 003E7F00 2C 1C 00 80 */ cmpwi r28, 0x80 /* 8041E944 003E7F04 41 80 FF B0 */ blt lbl_8041E8F4 -/* 8041E948 003E7F08 3C 80 80 42 */ lis r4, func_8041DD5C@ha +/* 8041E948 003E7F08 3C 80 80 42 */ lis r4, __dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@ha /* 8041E94C 003E7F0C 38 61 0C 38 */ addi r3, r1, 0xc38 -/* 8041E950 003E7F10 38 84 DD 5C */ addi r4, r4, func_8041DD5C@l +/* 8041E950 003E7F10 38 84 DD 5C */ addi r4, r4, __dt__Q34nw4r2ut41LinkList_Q44nw4r3snd6detail8SeqSound_240_Fv@l /* 8041E954 003E7F14 38 A0 00 0C */ li r5, 0xc /* 8041E958 003E7F18 38 C0 00 80 */ li r6, 0x80 /* 8041E95C 003E7F1C 4B E9 B2 9D */ bl __destroy_arr @@ -1022,12 +1040,12 @@ lbl_8041E968: /* 8041E974 003E7F34 3B BF 00 7C */ addi r29, r31, 0x7c /* 8041E978 003E7F38 7F A3 EB 78 */ mr r3, r29 /* 8041E97C 003E7F3C 4B F3 B2 E5 */ bl OSLockMutex -/* 8041E980 003E7F40 3C 80 80 42 */ lis r4, func_8041DDB4@ha -/* 8041E984 003E7F44 3C A0 80 42 */ lis r5, func_8041DDD4@ha +/* 8041E980 003E7F40 3C 80 80 42 */ lis r4, __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@ha +/* 8041E984 003E7F44 3C A0 80 42 */ lis r5, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@ha /* 8041E988 003E7F48 38 61 06 38 */ addi r3, r1, 0x638 /* 8041E98C 003E7F4C 38 C0 00 0C */ li r6, 0xc -/* 8041E990 003E7F50 38 84 DD B4 */ addi r4, r4, func_8041DDB4@l -/* 8041E994 003E7F54 38 A5 DD D4 */ addi r5, r5, func_8041DDD4@l +/* 8041E990 003E7F50 38 84 DD B4 */ addi r4, r4, __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@l +/* 8041E994 003E7F54 38 A5 DD D4 */ addi r5, r5, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@l /* 8041E998 003E7F58 38 E0 00 80 */ li r7, 0x80 /* 8041E99C 003E7F5C 4B E9 B1 65 */ bl __construct_array /* 8041E9A0 003E7F60 48 00 00 5C */ b lbl_8041E9FC @@ -1088,9 +1106,9 @@ lbl_8041EA58: /* 8041EA5C 003E801C 3B 7B 00 0C */ addi r27, r27, 0xc /* 8041EA60 003E8020 2C 1C 00 80 */ cmpwi r28, 0x80 /* 8041EA64 003E8024 41 80 FF B0 */ blt lbl_8041EA14 -/* 8041EA68 003E8028 3C 80 80 42 */ lis r4, func_8041DDD4@ha +/* 8041EA68 003E8028 3C 80 80 42 */ lis r4, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@ha /* 8041EA6C 003E802C 38 61 06 38 */ addi r3, r1, 0x638 -/* 8041EA70 003E8030 38 84 DD D4 */ addi r4, r4, func_8041DDD4@l +/* 8041EA70 003E8030 38 84 DD D4 */ addi r4, r4, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9StrmSound_240_Fv@l /* 8041EA74 003E8034 38 A0 00 0C */ li r5, 0xc /* 8041EA78 003E8038 38 C0 00 80 */ li r6, 0x80 /* 8041EA7C 003E803C 4B E9 B1 7D */ bl __destroy_arr @@ -1103,12 +1121,12 @@ lbl_8041EA88: /* 8041EA94 003E8054 3B BF 00 A4 */ addi r29, r31, 0xa4 /* 8041EA98 003E8058 7F A3 EB 78 */ mr r3, r29 /* 8041EA9C 003E805C 4B F3 B1 C5 */ bl OSLockMutex -/* 8041EAA0 003E8060 3C 80 80 42 */ lis r4, func_8041DE2C@ha -/* 8041EAA4 003E8064 3C A0 80 42 */ lis r5, func_8041DE4C@ha +/* 8041EAA0 003E8060 3C 80 80 42 */ lis r4, __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@ha +/* 8041EAA4 003E8064 3C A0 80 42 */ lis r5, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@ha /* 8041EAA8 003E8068 38 61 00 38 */ addi r3, r1, 0x38 /* 8041EAAC 003E806C 38 C0 00 0C */ li r6, 0xc -/* 8041EAB0 003E8070 38 84 DE 2C */ addi r4, r4, func_8041DE2C@l -/* 8041EAB4 003E8074 38 A5 DE 4C */ addi r5, r5, func_8041DE4C@l +/* 8041EAB0 003E8070 38 84 DE 2C */ addi r4, r4, __ct__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@l +/* 8041EAB4 003E8074 38 A5 DE 4C */ addi r5, r5, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@l /* 8041EAB8 003E8078 38 E0 00 80 */ li r7, 0x80 /* 8041EABC 003E807C 4B E9 B0 45 */ bl __construct_array /* 8041EAC0 003E8080 48 00 00 5C */ b lbl_8041EB1C @@ -1169,9 +1187,9 @@ lbl_8041EB78: /* 8041EB7C 003E813C 3B 7B 00 0C */ addi r27, r27, 0xc /* 8041EB80 003E8140 2C 1C 00 80 */ cmpwi r28, 0x80 /* 8041EB84 003E8144 41 80 FF B0 */ blt lbl_8041EB34 -/* 8041EB88 003E8148 3C 80 80 42 */ lis r4, func_8041DE4C@ha +/* 8041EB88 003E8148 3C 80 80 42 */ lis r4, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@ha /* 8041EB8C 003E814C 38 61 00 38 */ addi r3, r1, 0x38 -/* 8041EB90 003E8150 38 84 DE 4C */ addi r4, r4, func_8041DE4C@l +/* 8041EB90 003E8150 38 84 DE 4C */ addi r4, r4, __dt__Q34nw4r2ut42LinkList_Q44nw4r3snd6detail9WaveSound_240_Fv@l /* 8041EB94 003E8154 38 A0 00 0C */ li r5, 0xc /* 8041EB98 003E8158 38 C0 00 80 */ li r6, 0x80 /* 8041EB9C 003E815C 4B E9 B0 5D */ bl __destroy_arr @@ -1185,15 +1203,15 @@ lbl_8041EBA8: /* 8041EBB8 003E8178 38 21 12 50 */ addi r1, r1, 0x1250 /* 8041EBBC 003E817C 4E 80 00 20 */ blr -.global func_8041EBC0 -func_8041EBC0: +.global GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl +GetSoundPlayer__Q34nw4r3snd18SoundArchivePlayerFUl: /* 8041EBC0 003E8180 1C 04 00 64 */ mulli r0, r4, 0x64 /* 8041EBC4 003E8184 80 63 00 40 */ lwz r3, 0x40(r3) /* 8041EBC8 003E8188 7C 63 02 14 */ add r3, r3, r0 /* 8041EBCC 003E818C 4E 80 00 20 */ blr -.global func_8041EBD0 -func_8041EBD0: +.global detail_GetFileAddress__Q34nw4r3snd18SoundArchivePlayerCFUl +detail_GetFileAddress__Q34nw4r3snd18SoundArchivePlayerCFUl: /* 8041EBD0 003E8190 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8041EBD4 003E8194 7C 08 02 A6 */ mflr r0 /* 8041EBD8 003E8198 90 01 00 54 */ stw r0, 0x54(r1) @@ -1248,7 +1266,7 @@ lbl_8041EC84: /* 8041EC84 003E8244 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8041EC88 003E8248 7F A4 EB 78 */ mr r4, r29 /* 8041EC8C 003E824C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8041EC90 003E8250 4B FF DC 0D */ bl func_8041C89C +/* 8041EC90 003E8250 4B FF DC 0D */ bl detail_ReadFileInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8FileInfo /* 8041EC94 003E8254 2C 03 00 00 */ cmpwi r3, 0 /* 8041EC98 003E8258 40 82 00 0C */ bne lbl_8041ECA4 /* 8041EC9C 003E825C 38 60 00 00 */ li r3, 0 @@ -1261,7 +1279,7 @@ lbl_8041ECAC: /* 8041ECB0 003E8270 7F A4 EB 78 */ mr r4, r29 /* 8041ECB4 003E8274 7F C5 F3 78 */ mr r5, r30 /* 8041ECB8 003E8278 38 C1 00 08 */ addi r6, r1, 8 -/* 8041ECBC 003E827C 4B FF DB E9 */ bl func_8041C8A4 +/* 8041ECBC 003E827C 4B FF DB E9 */ bl detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos /* 8041ECC0 003E8280 2C 03 00 00 */ cmpwi r3, 0 /* 8041ECC4 003E8284 41 82 00 68 */ beq lbl_8041ED2C /* 8041ECC8 003E8288 80 7C 00 14 */ lwz r3, 0x14(r28) @@ -1286,7 +1304,7 @@ lbl_8041ED00: /* 8041ED08 003E82C8 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8041ED0C 003E82CC 38 C1 00 20 */ addi r6, r1, 0x20 /* 8041ED10 003E82D0 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 8041ED14 003E82D4 4B FF DB 79 */ bl func_8041C88C +/* 8041ED14 003E82D4 4B FF DB 79 */ bl detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo /* 8041ED18 003E82D8 2C 03 00 00 */ cmpwi r3, 0 /* 8041ED1C 003E82DC 41 82 00 10 */ beq lbl_8041ED2C /* 8041ED20 003E82E0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1309,8 +1327,8 @@ lbl_8041ED40: /* 8041ED58 003E8318 38 21 00 50 */ addi r1, r1, 0x50 /* 8041ED5C 003E831C 4E 80 00 20 */ blr -.global func_8041ED60 -func_8041ED60: +.global detail_GetFileWaveDataAddress__Q34nw4r3snd18SoundArchivePlayerCFUl +detail_GetFileWaveDataAddress__Q34nw4r3snd18SoundArchivePlayerCFUl: /* 8041ED60 003E8320 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8041ED64 003E8324 7C 08 02 A6 */ mflr r0 /* 8041ED68 003E8328 90 01 00 54 */ stw r0, 0x54(r1) @@ -1365,7 +1383,7 @@ lbl_8041EE14: /* 8041EE14 003E83D4 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8041EE18 003E83D8 7F A4 EB 78 */ mr r4, r29 /* 8041EE1C 003E83DC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8041EE20 003E83E0 4B FF DA 7D */ bl func_8041C89C +/* 8041EE20 003E83E0 4B FF DA 7D */ bl detail_ReadFileInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8FileInfo /* 8041EE24 003E83E4 2C 03 00 00 */ cmpwi r3, 0 /* 8041EE28 003E83E8 40 82 00 0C */ bne lbl_8041EE34 /* 8041EE2C 003E83EC 38 60 00 00 */ li r3, 0 @@ -1378,7 +1396,7 @@ lbl_8041EE3C: /* 8041EE40 003E8400 7F A4 EB 78 */ mr r4, r29 /* 8041EE44 003E8404 7F C5 F3 78 */ mr r5, r30 /* 8041EE48 003E8408 38 C1 00 08 */ addi r6, r1, 8 -/* 8041EE4C 003E840C 4B FF DA 59 */ bl func_8041C8A4 +/* 8041EE4C 003E840C 4B FF DA 59 */ bl detail_ReadFilePos__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive7FilePos /* 8041EE50 003E8410 2C 03 00 00 */ cmpwi r3, 0 /* 8041EE54 003E8414 41 82 00 68 */ beq lbl_8041EEBC /* 8041EE58 003E8418 80 7C 00 14 */ lwz r3, 0x14(r28) @@ -1403,7 +1421,7 @@ lbl_8041EE90: /* 8041EE98 003E8458 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8041EE9C 003E845C 38 C1 00 20 */ addi r6, r1, 0x20 /* 8041EEA0 003E8460 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 8041EEA4 003E8464 4B FF D9 E9 */ bl func_8041C88C +/* 8041EEA4 003E8464 4B FF D9 E9 */ bl detail_ReadGroupItemInfo__Q34nw4r3snd12SoundArchiveCFUlUlPQ44nw4r3snd12SoundArchive13GroupItemInfo /* 8041EEA8 003E8468 2C 03 00 00 */ cmpwi r3, 0 /* 8041EEAC 003E846C 41 82 00 10 */ beq lbl_8041EEBC /* 8041EEB0 003E8470 80 01 00 2C */ lwz r0, 0x2c(r1) @@ -1426,14 +1444,16 @@ lbl_8041EED0: /* 8041EEE8 003E84A8 38 21 00 50 */ addi r1, r1, 0x50 /* 8041EEEC 003E84AC 4E 80 00 20 */ blr -.global func_8041EEF0 -func_8041EEF0: +.global detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo +detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo: /* 8041EEF0 003E84B0 7C C8 33 78 */ mr r8, r6 /* 8041EEF4 003E84B4 7C E9 3B 78 */ mr r9, r7 /* 8041EEF8 003E84B8 38 C0 00 00 */ li r6, 0 /* 8041EEFC 003E84BC 38 E0 00 00 */ li r7, 0 -/* 8041EF00 003E84C0 48 00 00 04 */ b lbl_8041EF04 -lbl_8041EF04: +/* 8041EF00 003E84C0 48 00 00 04 */ b detail_SetupSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlPQ54nw4r3snd6detail10BasicSound11AmbientInfoPQ34nw4r3snd10SoundActorbPCQ44nw4r3snd14SoundStartable9StartInfo + +.global detail_SetupSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlPQ54nw4r3snd6detail10BasicSound11AmbientInfoPQ34nw4r3snd10SoundActorbPCQ44nw4r3snd14SoundStartable9StartInfo +detail_SetupSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlPQ54nw4r3snd6detail10BasicSound11AmbientInfoPQ34nw4r3snd10SoundActorbPCQ44nw4r3snd14SoundStartable9StartInfo: /* 8041EF04 003E84C4 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 8041EF08 003E84C8 7C 08 02 A6 */ mflr r0 /* 8041EF0C 003E84CC 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -1453,7 +1473,7 @@ lbl_8041EF04: /* 8041EF44 003E8504 48 00 00 0C */ b lbl_8041EF50 lbl_8041EF48: /* 8041EF48 003E8508 7C 03 03 78 */ mr r3, r0 -/* 8041EF4C 003E850C 4B FF D8 95 */ bl func_8041C7E0 +/* 8041EF4C 003E850C 4B FF D8 95 */ bl IsAvailable__Q34nw4r3snd12SoundArchiveCFv lbl_8041EF50: /* 8041EF50 003E8510 2C 03 00 00 */ cmpwi r3, 0 /* 8041EF54 003E8514 40 82 00 0C */ bne lbl_8041EF60 @@ -1469,7 +1489,7 @@ lbl_8041EF74: /* 8041EF74 003E8534 80 72 00 10 */ lwz r3, 0x10(r18) /* 8041EF78 003E8538 7E 84 A3 78 */ mr r4, r20 /* 8041EF7C 003E853C 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8041EF80 003E8540 4B FF D8 CD */ bl func_8041C84C +/* 8041EF80 003E8540 4B FF D8 CD */ bl ReadSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9SoundInfo /* 8041EF84 003E8544 2C 03 00 00 */ cmpwi r3, 0 /* 8041EF88 003E8548 40 82 00 0C */ bne lbl_8041EF94 /* 8041EF8C 003E854C 38 60 00 03 */ li r3, 3 @@ -1522,7 +1542,7 @@ lbl_8041F024: /* 8041F02C 003E85EC 41 82 00 14 */ beq lbl_8041F040 /* 8041F030 003E85F0 7E A3 AB 78 */ mr r3, r21 /* 8041F034 003E85F4 7E 84 A3 78 */ mr r4, r20 -/* 8041F038 003E85F8 4B FF 49 D9 */ bl func_80413A10 +/* 8041F038 003E85F8 4B FF 49 D9 */ bl GetAmbientPriority__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfoUl /* 8041F03C 003E85FC 7C 7B 1B 78 */ mr r27, r3 lbl_8041F040: /* 8041F040 003E8600 7E 1C DA 14 */ add r16, r28, r27 @@ -1562,7 +1582,7 @@ lbl_8041F09C: /* 8041F0B0 003E8670 7D E4 7B 78 */ mr r4, r15 /* 8041F0B4 003E8674 7D C3 02 14 */ add r14, r3, r0 /* 8041F0B8 003E8678 7D C3 73 78 */ mr r3, r14 -/* 8041F0BC 003E867C 48 00 1C 79 */ bl func_80420D34 +/* 8041F0BC 003E867C 48 00 1C 79 */ bl detail_CanPlaySound__Q34nw4r3snd11SoundPlayerFi /* 8041F0C0 003E8680 2C 03 00 00 */ cmpwi r3, 0 /* 8041F0C4 003E8684 40 82 00 18 */ bne lbl_8041F0DC /* 8041F0C8 003E8688 48 00 22 1D */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -1589,7 +1609,7 @@ lbl_8041F10C: /* 8041F114 003E86D4 3B 20 00 00 */ li r25, 0 /* 8041F118 003E86D8 3B 00 00 00 */ li r24, 0 /* 8041F11C 003E86DC 3A E0 00 00 */ li r23, 0 -/* 8041F120 003E86E0 4B FF D7 25 */ bl func_8041C844 +/* 8041F120 003E86E0 4B FF D7 25 */ bl GetSoundType__Q34nw4r3snd12SoundArchiveCFUl /* 8041F124 003E86E4 2C 03 00 02 */ cmpwi r3, 2 /* 8041F128 003E86E8 41 82 01 C4 */ beq lbl_8041F2EC /* 8041F12C 003E86EC 40 80 00 10 */ bge lbl_8041F13C @@ -1624,7 +1644,7 @@ lbl_8041F174: /* 8041F18C 003E874C 7F 85 E3 78 */ mr r5, r28 /* 8041F190 003E8750 7F 66 DB 78 */ mr r6, r27 /* 8041F194 003E8754 38 92 00 44 */ addi r4, r18, 0x44 -/* 8041F198 003E8758 4B FF BA 25 */ bl func_8041ABBC +/* 8041F198 003E8758 4B FF BA 25 */ bl __ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager_Q44nw4r3snd6detail8SeqSound_ii /* 8041F19C 003E875C 7C 79 1B 78 */ mr r25, r3 /* 8041F1A0 003E8760 48 00 00 90 */ b lbl_8041F230 lbl_8041F1A4: @@ -1666,7 +1686,7 @@ lbl_8041F214: /* 8041F218 003E87D8 4B F3 AB 29 */ bl OSUnlockMutex /* 8041F21C 003E87DC 7D E3 7B 78 */ mr r3, r15 /* 8041F220 003E87E0 38 80 00 00 */ li r4, 0 -/* 8041F224 003E87E4 4B FF 34 C5 */ bl func_804126E8 +/* 8041F224 003E87E4 4B FF 34 C5 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041F228 003E87E8 38 72 00 54 */ addi r3, r18, 0x54 /* 8041F22C 003E87EC 4B F3 AA 35 */ bl OSLockMutex lbl_8041F230: @@ -1709,12 +1729,12 @@ lbl_8041F298: lbl_8041F2A8: /* 8041F2A8 003E8868 7F 23 CB 78 */ mr r3, r25 /* 8041F2AC 003E886C 7E 84 A3 78 */ mr r4, r20 -/* 8041F2B0 003E8870 4B FF 47 D1 */ bl func_80413A80 +/* 8041F2B0 003E8870 4B FF 47 D1 */ bl SetId__Q44nw4r3snd6detail10BasicSoundFUl /* 8041F2B4 003E8874 2C 15 00 00 */ cmpwi r21, 0 /* 8041F2B8 003E8878 41 82 00 10 */ beq lbl_8041F2C8 /* 8041F2BC 003E887C 7F 23 CB 78 */ mr r3, r25 /* 8041F2C0 003E8880 7E A4 AB 78 */ mr r4, r21 -/* 8041F2C4 003E8884 4B FF 46 81 */ bl func_80413944 +/* 8041F2C4 003E8884 4B FF 46 81 */ bl SetAmbientInfo__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfo lbl_8041F2C8: /* 8041F2C8 003E8888 2C 19 00 00 */ cmpwi r25, 0 /* 8041F2CC 003E888C 40 82 00 18 */ bne lbl_8041F2E4 @@ -1750,7 +1770,7 @@ lbl_8041F318: /* 8041F330 003E88F0 7F 85 E3 78 */ mr r5, r28 /* 8041F334 003E88F4 7F 66 DB 78 */ mr r6, r27 /* 8041F338 003E88F8 38 92 00 6C */ addi r4, r18, 0x6c -/* 8041F33C 003E88FC 48 00 5C 81 */ bl func_80424FBC +/* 8041F33C 003E88FC 48 00 5C 81 */ bl __ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9StrmSound_ii /* 8041F340 003E8900 7C 78 1B 78 */ mr r24, r3 /* 8041F344 003E8904 48 00 00 90 */ b lbl_8041F3D4 lbl_8041F348: @@ -1792,7 +1812,7 @@ lbl_8041F3B8: /* 8041F3BC 003E897C 4B F3 A9 85 */ bl OSUnlockMutex /* 8041F3C0 003E8980 7E 03 83 78 */ mr r3, r16 /* 8041F3C4 003E8984 38 80 00 00 */ li r4, 0 -/* 8041F3C8 003E8988 4B FF 33 21 */ bl func_804126E8 +/* 8041F3C8 003E8988 4B FF 33 21 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041F3CC 003E898C 38 72 00 7C */ addi r3, r18, 0x7c /* 8041F3D0 003E8990 4B F3 A8 91 */ bl OSLockMutex lbl_8041F3D4: @@ -1835,12 +1855,12 @@ lbl_8041F43C: lbl_8041F44C: /* 8041F44C 003E8A0C 7F 03 C3 78 */ mr r3, r24 /* 8041F450 003E8A10 7E 84 A3 78 */ mr r4, r20 -/* 8041F454 003E8A14 4B FF 46 2D */ bl func_80413A80 +/* 8041F454 003E8A14 4B FF 46 2D */ bl SetId__Q44nw4r3snd6detail10BasicSoundFUl /* 8041F458 003E8A18 2C 15 00 00 */ cmpwi r21, 0 /* 8041F45C 003E8A1C 41 82 00 10 */ beq lbl_8041F46C /* 8041F460 003E8A20 7F 03 C3 78 */ mr r3, r24 /* 8041F464 003E8A24 7E A4 AB 78 */ mr r4, r21 -/* 8041F468 003E8A28 4B FF 44 DD */ bl func_80413944 +/* 8041F468 003E8A28 4B FF 44 DD */ bl SetAmbientInfo__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfo lbl_8041F46C: /* 8041F46C 003E8A2C 2C 18 00 00 */ cmpwi r24, 0 /* 8041F470 003E8A30 40 82 00 18 */ bne lbl_8041F488 @@ -1876,7 +1896,7 @@ lbl_8041F4BC: /* 8041F4D4 003E8A94 7F 85 E3 78 */ mr r5, r28 /* 8041F4D8 003E8A98 7F 66 DB 78 */ mr r6, r27 /* 8041F4DC 003E8A9C 38 92 00 94 */ addi r4, r18, 0x94 -/* 8041F4E0 003E8AA0 48 00 A6 F9 */ bl func_80429BD8 +/* 8041F4E0 003E8AA0 48 00 A6 F9 */ bl __ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9WaveSound_ii /* 8041F4E4 003E8AA4 7C 77 1B 78 */ mr r23, r3 /* 8041F4E8 003E8AA8 48 00 00 90 */ b lbl_8041F578 lbl_8041F4EC: @@ -1918,7 +1938,7 @@ lbl_8041F55C: /* 8041F560 003E8B20 4B F3 A7 E1 */ bl OSUnlockMutex /* 8041F564 003E8B24 7E 03 83 78 */ mr r3, r16 /* 8041F568 003E8B28 38 80 00 00 */ li r4, 0 -/* 8041F56C 003E8B2C 4B FF 31 7D */ bl func_804126E8 +/* 8041F56C 003E8B2C 4B FF 31 7D */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041F570 003E8B30 38 72 00 A4 */ addi r3, r18, 0xa4 /* 8041F574 003E8B34 4B F3 A6 ED */ bl OSLockMutex lbl_8041F578: @@ -1961,12 +1981,12 @@ lbl_8041F5E0: lbl_8041F5F0: /* 8041F5F0 003E8BB0 7E E3 BB 78 */ mr r3, r23 /* 8041F5F4 003E8BB4 7E 84 A3 78 */ mr r4, r20 -/* 8041F5F8 003E8BB8 4B FF 44 89 */ bl func_80413A80 +/* 8041F5F8 003E8BB8 4B FF 44 89 */ bl SetId__Q44nw4r3snd6detail10BasicSoundFUl /* 8041F5FC 003E8BBC 2C 15 00 00 */ cmpwi r21, 0 /* 8041F600 003E8BC0 41 82 00 10 */ beq lbl_8041F610 /* 8041F604 003E8BC4 7E E3 BB 78 */ mr r3, r23 /* 8041F608 003E8BC8 7E A4 AB 78 */ mr r4, r21 -/* 8041F60C 003E8BCC 4B FF 43 39 */ bl func_80413944 +/* 8041F60C 003E8BCC 4B FF 43 39 */ bl SetAmbientInfo__Q44nw4r3snd6detail10BasicSoundFRCQ54nw4r3snd6detail10BasicSound11AmbientInfo lbl_8041F610: /* 8041F610 003E8BD0 2C 17 00 00 */ cmpwi r23, 0 /* 8041F614 003E8BD4 40 82 00 18 */ bne lbl_8041F62C @@ -1987,7 +2007,7 @@ lbl_8041F634: lbl_8041F648: /* 8041F648 003E8C08 7D C3 73 78 */ mr r3, r14 /* 8041F64C 003E8C0C 7D E4 7B 78 */ mr r4, r15 -/* 8041F650 003E8C10 48 00 13 ED */ bl func_80420A3C +/* 8041F650 003E8C10 48 00 13 ED */ bl detail_AppendSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound /* 8041F654 003E8C14 2C 03 00 00 */ cmpwi r3, 0 /* 8041F658 003E8C18 40 82 00 2C */ bne lbl_8041F684 /* 8041F65C 003E8C1C 81 8F 00 00 */ lwz r12, 0(r15) @@ -2003,7 +2023,7 @@ lbl_8041F648: lbl_8041F684: /* 8041F684 003E8C44 80 72 00 10 */ lwz r3, 0x10(r18) /* 8041F688 003E8C48 7E 84 A3 78 */ mr r4, r20 -/* 8041F68C 003E8C4C 4B FF D1 B9 */ bl func_8041C844 +/* 8041F68C 003E8C4C 4B FF D1 B9 */ bl GetSoundType__Q34nw4r3snd12SoundArchiveCFUl /* 8041F690 003E8C50 2C 03 00 02 */ cmpwi r3, 2 /* 8041F694 003E8C54 41 82 00 C4 */ beq lbl_8041F758 /* 8041F698 003E8C58 40 80 00 10 */ bge lbl_8041F6A8 @@ -2017,11 +2037,11 @@ lbl_8041F6A8: lbl_8041F6B4: /* 8041F6B4 003E8C74 7D C3 73 78 */ mr r3, r14 /* 8041F6B8 003E8C78 7F 24 CB 78 */ mr r4, r25 -/* 8041F6BC 003E8C7C 48 00 17 BD */ bl func_80420E78 +/* 8041F6BC 003E8C7C 48 00 17 BD */ bl detail_AllocPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound /* 8041F6C0 003E8C80 80 72 00 10 */ lwz r3, 0x10(r18) /* 8041F6C4 003E8C84 7E 84 A3 78 */ mr r4, r20 /* 8041F6C8 003E8C88 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8041F6CC 003E8C8C 4B FF D1 89 */ bl func_8041C854 +/* 8041F6CC 003E8C8C 4B FF D1 89 */ bl ReadSeqSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo /* 8041F6D0 003E8C90 2C 03 00 00 */ cmpwi r3, 0 /* 8041F6D4 003E8C94 40 82 00 2C */ bne lbl_8041F700 /* 8041F6D8 003E8C98 81 99 00 00 */ lwz r12, 0(r25) @@ -2043,7 +2063,7 @@ lbl_8041F700: /* 8041F714 003E8CD4 7F C8 F3 78 */ mr r8, r30 /* 8041F718 003E8CD8 38 A1 00 40 */ addi r5, r1, 0x40 /* 8041F71C 003E8CDC 38 C1 00 2C */ addi r6, r1, 0x2c -/* 8041F720 003E8CE0 48 00 02 25 */ bl func_8041F944 +/* 8041F720 003E8CE0 48 00 02 25 */ bl PrepareSeqImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail8SeqSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive12SeqSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypeiPCvPCc /* 8041F724 003E8CE4 2C 03 00 00 */ cmpwi r3, 0 /* 8041F728 003E8CE8 7C 6E 1B 78 */ mr r14, r3 /* 8041F72C 003E8CEC 41 82 01 74 */ beq lbl_8041F8A0 @@ -2061,7 +2081,7 @@ lbl_8041F758: /* 8041F758 003E8D18 80 72 00 10 */ lwz r3, 0x10(r18) /* 8041F75C 003E8D1C 7E 84 A3 78 */ mr r4, r20 /* 8041F760 003E8D20 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8041F764 003E8D24 4B FF D0 F9 */ bl func_8041C85C +/* 8041F764 003E8D24 4B FF D0 F9 */ bl detail_ReadStrmSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13StrmSoundInfo /* 8041F768 003E8D28 2C 03 00 00 */ cmpwi r3, 0 /* 8041F76C 003E8D2C 40 82 00 2C */ bne lbl_8041F798 /* 8041F770 003E8D30 81 98 00 00 */ lwz r12, 0(r24) @@ -2081,7 +2101,7 @@ lbl_8041F798: /* 8041F7A4 003E8D64 7F C8 F3 78 */ mr r8, r30 /* 8041F7A8 003E8D68 38 A1 00 40 */ addi r5, r1, 0x40 /* 8041F7AC 003E8D6C 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8041F7B0 003E8D70 48 00 05 05 */ bl func_8041FCB4 +/* 8041F7B0 003E8D70 48 00 05 05 */ bl PrepareStrmImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9StrmSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13StrmSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei /* 8041F7B4 003E8D74 2C 03 00 00 */ cmpwi r3, 0 /* 8041F7B8 003E8D78 7C 6E 1B 78 */ mr r14, r3 /* 8041F7BC 003E8D7C 41 82 00 E4 */ beq lbl_8041F8A0 @@ -2099,7 +2119,7 @@ lbl_8041F7E8: /* 8041F7E8 003E8DA8 80 72 00 10 */ lwz r3, 0x10(r18) /* 8041F7EC 003E8DAC 7E 84 A3 78 */ mr r4, r20 /* 8041F7F0 003E8DB0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8041F7F4 003E8DB4 4B FF D0 71 */ bl func_8041C864 +/* 8041F7F4 003E8DB4 4B FF D0 71 */ bl detail_ReadWaveSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive13WaveSoundInfo /* 8041F7F8 003E8DB8 2C 03 00 00 */ cmpwi r3, 0 /* 8041F7FC 003E8DBC 40 82 00 2C */ bne lbl_8041F828 /* 8041F800 003E8DC0 81 97 00 00 */ lwz r12, 0(r23) @@ -2119,7 +2139,7 @@ lbl_8041F828: /* 8041F834 003E8DF4 7F C8 F3 78 */ mr r8, r30 /* 8041F838 003E8DF8 38 A1 00 40 */ addi r5, r1, 0x40 /* 8041F83C 003E8DFC 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8041F840 003E8E00 48 00 06 2D */ bl func_8041FE6C +/* 8041F840 003E8E00 48 00 06 2D */ bl PrepareWaveSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9WaveSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13WaveSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei /* 8041F844 003E8E04 2C 03 00 00 */ cmpwi r3, 0 /* 8041F848 003E8E08 7C 6E 1B 78 */ mr r14, r3 /* 8041F84C 003E8E0C 41 82 00 54 */ beq lbl_8041F8A0 @@ -2167,14 +2187,14 @@ lbl_8041F8E4: /* 8041F8E8 003E8EA8 41 82 00 10 */ beq lbl_8041F8F8 /* 8041F8EC 003E8EAC 7D E3 7B 78 */ mr r3, r15 /* 8041F8F0 003E8EB0 7E C4 B3 78 */ mr r4, r22 -/* 8041F8F4 003E8EB4 4B FF 3E 41 */ bl func_80413734 +/* 8041F8F4 003E8EB4 4B FF 3E 41 */ bl AttachSoundActor__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd10SoundActor lbl_8041F8F8: /* 8041F8F8 003E8EB8 88 01 00 08 */ lbz r0, 8(r1) /* 8041F8FC 003E8EBC 2C 00 00 00 */ cmpwi r0, 0 /* 8041F900 003E8EC0 41 82 00 10 */ beq lbl_8041F910 /* 8041F904 003E8EC4 7D E3 7B 78 */ mr r3, r15 /* 8041F908 003E8EC8 7F A4 EB 78 */ mr r4, r29 -/* 8041F90C 003E8ECC 4B FF 3E 4D */ bl func_80413758 +/* 8041F90C 003E8ECC 4B FF 3E 4D */ bl SetPlayerPriority__Q44nw4r3snd6detail10BasicSoundFi lbl_8041F910: /* 8041F910 003E8ED0 7E 63 9B 78 */ mr r3, r19 /* 8041F914 003E8ED4 7D E4 7B 78 */ mr r4, r15 @@ -2191,8 +2211,8 @@ lbl_8041F92C: /* 8041F93C 003E8EFC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8041F940 003E8F00 4E 80 00 20 */ blr -.global func_8041F944 -func_8041F944: +.global PrepareSeqImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail8SeqSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive12SeqSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypeiPCvPCc +PrepareSeqImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail8SeqSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive12SeqSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypeiPCvPCc: /* 8041F944 003E8F04 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8041F948 003E8F08 7C 08 02 A6 */ mflr r0 /* 8041F94C 003E8F0C 90 01 00 64 */ stw r0, 0x64(r1) @@ -2240,7 +2260,7 @@ lbl_8041F9E8: /* 8041F9EC 003E8FAC 40 82 00 50 */ bne lbl_8041FA3C /* 8041F9F0 003E8FB0 80 9C 00 00 */ lwz r4, 0(r28) /* 8041F9F4 003E8FB4 7F 43 D3 78 */ mr r3, r26 -/* 8041F9F8 003E8FB8 4B FF F1 D9 */ bl func_8041EBD0 +/* 8041F9F8 003E8FB8 4B FF F1 D9 */ bl detail_GetFileAddress__Q34nw4r3snd18SoundArchivePlayerCFUl /* 8041F9FC 003E8FBC 80 1D 00 00 */ lwz r0, 0(r29) /* 8041FA00 003E8FC0 2C 18 00 00 */ cmpwi r24, 0 /* 8041FA04 003E8FC4 7C 77 1B 78 */ mr r23, r3 @@ -2270,7 +2290,7 @@ lbl_8041FA58: /* 8041FA5C 003E901C 38 BB 02 AC */ addi r5, r27, 0x2ac /* 8041FA60 003E9020 80 9C 00 00 */ lwz r4, 0(r28) /* 8041FA64 003E9024 38 C0 02 00 */ li r6, 0x200 -/* 8041FA68 003E9028 4B FF CE 45 */ bl func_8041C8AC +/* 8041FA68 003E9028 4B FF CE 45 */ bl detail_OpenFileStream__Q34nw4r3snd12SoundArchiveCFUlPvi /* 8041FA6C 003E902C 2C 03 00 00 */ cmpwi r3, 0 /* 8041FA70 003E9030 7C 76 1B 78 */ mr r22, r3 /* 8041FA74 003E9034 40 82 00 0C */ bne lbl_8041FA80 @@ -2298,7 +2318,7 @@ lbl_8041FAC0: /* 8041FAC4 003E9084 7F 63 DB 78 */ mr r3, r27 /* 8041FAC8 003E9088 80 A1 00 08 */ lwz r5, 8(r1) /* 8041FACC 003E908C 38 DA 00 20 */ addi r6, r26, 0x20 -/* 8041FAD0 003E9090 4B FF B2 15 */ bl func_8041ACE4 +/* 8041FAD0 003E9090 4B FF B2 15 */ bl Setup__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail17SeqTrackAllocatorUlPQ44nw4r3snd6detail14NoteOnCallback /* 8041FAD4 003E9094 48 00 00 A8 */ b lbl_8041FB7C lbl_8041FAD8: /* 8041FAD8 003E9098 2C 03 00 01 */ cmpwi r3, 1 @@ -2339,12 +2359,12 @@ lbl_8041FB4C: /* 8041FB50 003E9110 48 00 01 4C */ b lbl_8041FC9C lbl_8041FB54: /* 8041FB54 003E9114 38 80 00 00 */ li r4, 0 -/* 8041FB58 003E9118 4B FF 2B 91 */ bl func_804126E8 +/* 8041FB58 003E9118 4B FF 2B 91 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041FB5C 003E911C 80 9A 00 30 */ lwz r4, 0x30(r26) /* 8041FB60 003E9120 7F 63 DB 78 */ mr r3, r27 /* 8041FB64 003E9124 80 A1 00 08 */ lwz r5, 8(r1) /* 8041FB68 003E9128 38 DA 00 20 */ addi r6, r26, 0x20 -/* 8041FB6C 003E912C 4B FF B1 79 */ bl func_8041ACE4 +/* 8041FB6C 003E912C 4B FF B1 79 */ bl Setup__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail17SeqTrackAllocatorUlPQ44nw4r3snd6detail14NoteOnCallback /* 8041FB70 003E9130 48 00 00 0C */ b lbl_8041FB7C lbl_8041FB74: /* 8041FB74 003E9134 38 60 00 FF */ li r3, 0xff @@ -2363,26 +2383,26 @@ lbl_8041FB7C: /* 8041FBA4 003E9164 C8 21 00 28 */ lfd f1, 0x28(r1) /* 8041FBA8 003E9168 EC 21 10 28 */ fsubs f1, f1, f2 /* 8041FBAC 003E916C EC 21 00 24 */ fdivs f1, f1, f0 -/* 8041FBB0 003E9170 4B FF 3C 05 */ bl func_804137B4 +/* 8041FBB0 003E9170 4B FF 3C 05 */ bl SetInitialVolume__Q44nw4r3snd6detail10BasicSoundFf /* 8041FBB4 003E9174 80 9C 00 14 */ lwz r4, 0x14(r28) /* 8041FBB8 003E9178 7F 63 DB 78 */ mr r3, r27 -/* 8041FBBC 003E917C 4B FF 3C D1 */ bl func_8041388C +/* 8041FBBC 003E917C 4B FF 3C D1 */ bl SetRemoteFilter__Q44nw4r3snd6detail10BasicSoundFi /* 8041FBC0 003E9180 80 9C 00 18 */ lwz r4, 0x18(r28) /* 8041FBC4 003E9184 7F 63 DB 78 */ mr r3, r27 -/* 8041FBC8 003E9188 4B FF 3D 05 */ bl func_804138CC +/* 8041FBC8 003E9188 4B FF 3D 05 */ bl SetPanMode__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd7PanMode /* 8041FBCC 003E918C 80 9C 00 1C */ lwz r4, 0x1c(r28) /* 8041FBD0 003E9190 7F 63 DB 78 */ mr r3, r27 -/* 8041FBD4 003E9194 4B FF 3D 35 */ bl func_80413908 +/* 8041FBD4 003E9194 4B FF 3D 35 */ bl SetPanCurve__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd8PanCurve /* 8041FBD8 003E9198 80 9D 00 0C */ lwz r4, 0xc(r29) /* 8041FBDC 003E919C 7F 63 DB 78 */ mr r3, r27 -/* 8041FBE0 003E91A0 4B FF B4 99 */ bl func_8041B078 +/* 8041FBE0 003E91A0 4B FF B4 99 */ bl SetChannelPriority__Q44nw4r3snd6detail8SeqSoundFi /* 8041FBE4 003E91A4 88 9D 00 10 */ lbz r4, 0x10(r29) /* 8041FBE8 003E91A8 7F 63 DB 78 */ mr r3, r27 -/* 8041FBEC 003E91AC 4B FF B4 95 */ bl func_8041B080 +/* 8041FBEC 003E91AC 4B FF B4 95 */ bl SetReleasePriorityFix__Q44nw4r3snd6detail8SeqSoundFb /* 8041FBF0 003E91B0 80 9A 00 34 */ lwz r4, 0x34(r26) /* 8041FBF4 003E91B4 7F 63 DB 78 */ mr r3, r27 /* 8041FBF8 003E91B8 80 BA 00 38 */ lwz r5, 0x38(r26) -/* 8041FBFC 003E91BC 4B FF B4 8D */ bl func_8041B088 +/* 8041FBFC 003E91BC 4B FF B4 8D */ bl SetSeqUserprocCallback__Q44nw4r3snd6detail8SeqSoundFPFUsPQ34nw4r3snd24SeqUserprocCallbackParamPv_vPv /* 8041FC00 003E91C0 2C 1E 00 01 */ cmpwi r30, 1 /* 8041FC04 003E91C4 41 82 00 28 */ beq lbl_8041FC2C /* 8041FC08 003E91C8 40 80 00 10 */ bge lbl_8041FC18 @@ -2419,7 +2439,7 @@ lbl_8041FC48: /* 8041FC6C 003E922C 7F 63 DB 78 */ mr r3, r27 /* 8041FC70 003E9230 7F 06 C3 78 */ mr r6, r24 /* 8041FC74 003E9234 7F E7 FB 78 */ mr r7, r31 -/* 8041FC78 003E9238 4B FF B0 E9 */ bl func_8041AD60 +/* 8041FC78 003E9238 4B FF B0 E9 */ bl Prepare__Q44nw4r3snd6detail8SeqSoundFPCvlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei /* 8041FC7C 003E923C 48 00 00 1C */ b lbl_8041FC98 lbl_8041FC80: /* 8041FC80 003E9240 80 A1 00 0C */ lwz r5, 0xc(r1) @@ -2427,7 +2447,7 @@ lbl_8041FC80: /* 8041FC88 003E9248 7E C4 B3 78 */ mr r4, r22 /* 8041FC8C 003E924C 7F 06 C3 78 */ mr r6, r24 /* 8041FC90 003E9250 7F E7 FB 78 */ mr r7, r31 -/* 8041FC94 003E9254 4B FF B1 35 */ bl func_8041ADC8 +/* 8041FC94 003E9254 4B FF B1 35 */ bl Prepare__Q44nw4r3snd6detail8SeqSoundFPQ34nw4r2ut10FileStreamlQ54nw4r3snd6detail9SeqPlayer10OffsetTypei lbl_8041FC98: /* 8041FC98 003E9258 38 60 00 00 */ li r3, 0 lbl_8041FC9C: @@ -2438,8 +2458,8 @@ lbl_8041FC9C: /* 8041FCAC 003E926C 38 21 00 60 */ addi r1, r1, 0x60 /* 8041FCB0 003E9270 4E 80 00 20 */ blr -.global func_8041FCB4 -func_8041FCB4: +.global PrepareStrmImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9StrmSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13StrmSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei +PrepareStrmImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9StrmSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13StrmSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei: /* 8041FCB4 003E9274 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8041FCB8 003E9278 7C 08 02 A6 */ mflr r0 /* 8041FCBC 003E927C 90 01 00 34 */ stw r0, 0x34(r1) @@ -2455,7 +2475,7 @@ func_8041FCB4: /* 8041FCE4 003E92A4 7D 1E 43 78 */ mr r30, r8 /* 8041FCE8 003E92A8 7F 63 DB 78 */ mr r3, r27 /* 8041FCEC 003E92AC 38 9A 00 C8 */ addi r4, r26, 0xc8 -/* 8041FCF0 003E92B0 48 00 55 FD */ bl func_804252EC +/* 8041FCF0 003E92B0 48 00 55 FD */ bl Setup__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail14StrmBufferPooliUs /* 8041FCF4 003E92B4 48 00 00 70 */ b lbl_8041FD64 lbl_8041FCF8: /* 8041FCF8 003E92B8 2C 03 00 01 */ cmpwi r3, 1 @@ -2480,12 +2500,12 @@ lbl_8041FD2C: /* 8041FD38 003E92F8 48 00 01 1C */ b lbl_8041FE54 lbl_8041FD3C: /* 8041FD3C 003E92FC 38 80 00 00 */ li r4, 0 -/* 8041FD40 003E9300 4B FF 29 A9 */ bl func_804126E8 +/* 8041FD40 003E9300 4B FF 29 A9 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi /* 8041FD44 003E9304 A0 BD 00 04 */ lhz r5, 4(r29) /* 8041FD48 003E9308 7F 63 DB 78 */ mr r3, r27 /* 8041FD4C 003E930C A0 DD 00 06 */ lhz r6, 6(r29) /* 8041FD50 003E9310 38 9A 00 C8 */ addi r4, r26, 0xc8 -/* 8041FD54 003E9314 48 00 55 99 */ bl func_804252EC +/* 8041FD54 003E9314 48 00 55 99 */ bl Setup__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail14StrmBufferPooliUs /* 8041FD58 003E9318 48 00 00 0C */ b lbl_8041FD64 lbl_8041FD5C: /* 8041FD5C 003E931C 38 60 00 FF */ li r3, 0xff @@ -2521,7 +2541,7 @@ lbl_8041FDB4: /* 8041FDB8 003E9378 38 BB 0E D0 */ addi r5, r27, 0xed0 /* 8041FDBC 003E937C 80 9C 00 00 */ lwz r4, 0(r28) /* 8041FDC0 003E9380 38 C0 02 00 */ li r6, 0x200 -/* 8041FDC4 003E9384 4B FF CA E9 */ bl func_8041C8AC +/* 8041FDC4 003E9384 4B FF CA E9 */ bl detail_OpenFileStream__Q34nw4r3snd12SoundArchiveCFUlPvi /* 8041FDC8 003E9388 2C 03 00 00 */ cmpwi r3, 0 /* 8041FDCC 003E938C 7C 66 1B 78 */ mr r6, r3 /* 8041FDD0 003E9390 40 82 00 0C */ bne lbl_8041FDDC @@ -2531,7 +2551,7 @@ lbl_8041FDDC: /* 8041FDDC 003E939C 7F 63 DB 78 */ mr r3, r27 /* 8041FDE0 003E93A0 7F E4 FB 78 */ mr r4, r31 /* 8041FDE4 003E93A4 7F C5 F3 78 */ mr r5, r30 -/* 8041FDE8 003E93A8 48 00 55 81 */ bl func_80425368 +/* 8041FDE8 003E93A8 48 00 55 81 */ bl Prepare__Q44nw4r3snd6detail9StrmSoundFQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypelPQ34nw4r2ut10FileStream /* 8041FDEC 003E93AC 2C 03 00 00 */ cmpwi r3, 0 /* 8041FDF0 003E93B0 40 82 00 0C */ bne lbl_8041FDFC /* 8041FDF4 003E93B4 38 60 00 FF */ li r3, 0xff @@ -2548,16 +2568,16 @@ lbl_8041FDFC: /* 8041FE1C 003E93DC C8 21 00 08 */ lfd f1, 8(r1) /* 8041FE20 003E93E0 EC 21 10 28 */ fsubs f1, f1, f2 /* 8041FE24 003E93E4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8041FE28 003E93E8 4B FF 39 8D */ bl func_804137B4 +/* 8041FE28 003E93E8 4B FF 39 8D */ bl SetInitialVolume__Q44nw4r3snd6detail10BasicSoundFf /* 8041FE2C 003E93EC 80 9C 00 14 */ lwz r4, 0x14(r28) /* 8041FE30 003E93F0 7F 63 DB 78 */ mr r3, r27 -/* 8041FE34 003E93F4 4B FF 3A 59 */ bl func_8041388C +/* 8041FE34 003E93F4 4B FF 3A 59 */ bl SetRemoteFilter__Q44nw4r3snd6detail10BasicSoundFi /* 8041FE38 003E93F8 80 9C 00 18 */ lwz r4, 0x18(r28) /* 8041FE3C 003E93FC 7F 63 DB 78 */ mr r3, r27 -/* 8041FE40 003E9400 4B FF 3A 8D */ bl func_804138CC +/* 8041FE40 003E9400 4B FF 3A 8D */ bl SetPanMode__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd7PanMode /* 8041FE44 003E9404 80 9C 00 1C */ lwz r4, 0x1c(r28) /* 8041FE48 003E9408 7F 63 DB 78 */ mr r3, r27 -/* 8041FE4C 003E940C 4B FF 3A BD */ bl func_80413908 +/* 8041FE4C 003E940C 4B FF 3A BD */ bl SetPanCurve__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd8PanCurve /* 8041FE50 003E9410 38 60 00 00 */ li r3, 0 lbl_8041FE54: /* 8041FE54 003E9414 39 61 00 30 */ addi r11, r1, 0x30 @@ -2567,8 +2587,8 @@ lbl_8041FE54: /* 8041FE64 003E9424 38 21 00 30 */ addi r1, r1, 0x30 /* 8041FE68 003E9428 4E 80 00 20 */ blr -.global func_8041FE6C -func_8041FE6C: +.global PrepareWaveSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9WaveSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13WaveSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei +PrepareWaveSoundImpl__Q34nw4r3snd18SoundArchivePlayerFPQ44nw4r3snd6detail9WaveSoundPCQ44nw4r3snd12SoundArchive9SoundInfoPCQ44nw4r3snd12SoundArchive13WaveSoundInfoQ54nw4r3snd14SoundStartable9StartInfo15StartOffsetTypei: /* 8041FE6C 003E942C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8041FE70 003E9430 7C 08 02 A6 */ mflr r0 /* 8041FE74 003E9434 90 01 00 34 */ stw r0, 0x34(r1) @@ -2581,7 +2601,7 @@ func_8041FE6C: /* 8041FE90 003E9450 7C DD 33 78 */ mr r29, r6 /* 8041FE94 003E9454 7C FE 3B 78 */ mr r30, r7 /* 8041FE98 003E9458 7D 1F 43 78 */ mr r31, r8 -/* 8041FE9C 003E945C 4B FF ED 35 */ bl func_8041EBD0 +/* 8041FE9C 003E945C 4B FF ED 35 */ bl detail_GetFileAddress__Q34nw4r3snd18SoundArchivePlayerCFUl /* 8041FEA0 003E9460 2C 03 00 00 */ cmpwi r3, 0 /* 8041FEA4 003E9464 7C 64 1B 78 */ mr r4, r3 /* 8041FEA8 003E9468 40 82 00 0C */ bne lbl_8041FEB4 @@ -2617,7 +2637,7 @@ lbl_8041FEFC: /* 8041FF04 003E94C4 81 3C 00 00 */ lwz r9, 0(r28) /* 8041FF08 003E94C8 7F E7 FB 78 */ mr r7, r31 /* 8041FF0C 003E94CC 39 1A 00 28 */ addi r8, r26, 0x28 -/* 8041FF10 003E94D0 48 00 9D 71 */ bl func_80429C80 +/* 8041FF10 003E94D0 48 00 9D 71 */ bl Prepare__Q44nw4r3snd6detail9WaveSoundFPCvlQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypelPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl /* 8041FF14 003E94D4 2C 03 00 00 */ cmpwi r3, 0 /* 8041FF18 003E94D8 40 82 00 0C */ bne lbl_8041FF24 /* 8041FF1C 003E94DC 38 60 00 FF */ li r3, 0xff @@ -2634,22 +2654,22 @@ lbl_8041FF24: /* 8041FF44 003E9504 C8 21 00 08 */ lfd f1, 8(r1) /* 8041FF48 003E9508 EC 21 10 28 */ fsubs f1, f1, f2 /* 8041FF4C 003E950C EC 21 00 24 */ fdivs f1, f1, f0 -/* 8041FF50 003E9510 4B FF 38 65 */ bl func_804137B4 +/* 8041FF50 003E9510 4B FF 38 65 */ bl SetInitialVolume__Q44nw4r3snd6detail10BasicSoundFf /* 8041FF54 003E9514 80 9C 00 14 */ lwz r4, 0x14(r28) /* 8041FF58 003E9518 7F 63 DB 78 */ mr r3, r27 -/* 8041FF5C 003E951C 4B FF 39 31 */ bl func_8041388C +/* 8041FF5C 003E951C 4B FF 39 31 */ bl SetRemoteFilter__Q44nw4r3snd6detail10BasicSoundFi /* 8041FF60 003E9520 80 9C 00 18 */ lwz r4, 0x18(r28) /* 8041FF64 003E9524 7F 63 DB 78 */ mr r3, r27 -/* 8041FF68 003E9528 4B FF 39 65 */ bl func_804138CC +/* 8041FF68 003E9528 4B FF 39 65 */ bl SetPanMode__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd7PanMode /* 8041FF6C 003E952C 80 9C 00 1C */ lwz r4, 0x1c(r28) /* 8041FF70 003E9530 7F 63 DB 78 */ mr r3, r27 -/* 8041FF74 003E9534 4B FF 39 95 */ bl func_80413908 +/* 8041FF74 003E9534 4B FF 39 95 */ bl SetPanCurve__Q44nw4r3snd6detail10BasicSoundFQ34nw4r3snd8PanCurve /* 8041FF78 003E9538 80 9D 00 04 */ lwz r4, 4(r29) /* 8041FF7C 003E953C 7F 63 DB 78 */ mr r3, r27 -/* 8041FF80 003E9540 48 00 9E 7D */ bl func_80429DFC +/* 8041FF80 003E9540 48 00 9E 7D */ bl SetChannelPriority__Q44nw4r3snd6detail9WaveSoundFi /* 8041FF84 003E9544 88 9D 00 08 */ lbz r4, 8(r29) /* 8041FF88 003E9548 7F 63 DB 78 */ mr r3, r27 -/* 8041FF8C 003E954C 48 00 9E 79 */ bl func_80429E04 +/* 8041FF8C 003E954C 48 00 9E 79 */ bl SetReleasePriorityFix__Q44nw4r3snd6detail9WaveSoundFb /* 8041FF90 003E9550 38 60 00 00 */ li r3, 0 lbl_8041FF94: /* 8041FF94 003E9554 39 61 00 30 */ addi r11, r1, 0x30 @@ -2659,8 +2679,8 @@ lbl_8041FF94: /* 8041FFA4 003E9564 38 21 00 30 */ addi r1, r1, 0x30 /* 8041FFA8 003E9568 4E 80 00 20 */ blr -.global func_8041FFAC -func_8041FFAC: +.global InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv +InvalidateData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv: /* 8041FFAC 003E956C 80 03 00 18 */ lwz r0, 0x18(r3) /* 8041FFB0 003E9570 2C 00 00 00 */ cmpwi r0, 0 /* 8041FFB4 003E9574 41 82 00 48 */ beq lbl_8041FFFC @@ -2710,8 +2730,8 @@ lbl_8042003C: /* 80420048 003E9608 41 80 FF D0 */ blt lbl_80420018 /* 8042004C 003E960C 4E 80 00 20 */ blr -.global func_80420050 -func_80420050: +.global InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv +InvalidateWaveData__Q34nw4r3snd18SoundArchivePlayerFPCvPCv: /* 80420050 003E9610 80 03 00 18 */ lwz r0, 0x18(r3) /* 80420054 003E9614 2C 00 00 00 */ cmpwi r0, 0 /* 80420058 003E9618 41 82 00 48 */ beq lbl_804200A0 @@ -2761,8 +2781,8 @@ lbl_804200E0: /* 804200EC 003E96AC 41 80 FF D0 */ blt lbl_804200BC /* 804200F0 003E96B0 4E 80 00 20 */ blr -.global func_804200F4 -func_804200F4: +.global NoteOn__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFPQ44nw4r3snd6detail9SeqPlayeriRCQ44nw4r3snd6detail10NoteOnInfo +NoteOn__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallbackFPQ44nw4r3snd6detail9SeqPlayeriRCQ44nw4r3snd6detail10NoteOnInfo: /* 804200F4 003E96B4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 804200F8 003E96B8 7C 08 02 A6 */ mflr r0 /* 804200FC 003E96BC 90 01 00 54 */ stw r0, 0x54(r1) @@ -2779,7 +2799,7 @@ func_804200F4: /* 80420128 003E96E8 38 60 00 00 */ li r3, 0 /* 8042012C 003E96EC 48 00 00 08 */ b lbl_80420134 lbl_80420130: -/* 80420130 003E96F0 4B FF C6 B1 */ bl func_8041C7E0 +/* 80420130 003E96F0 4B FF C6 B1 */ bl IsAvailable__Q34nw4r3snd12SoundArchiveCFv lbl_80420134: /* 80420134 003E96F4 2C 03 00 00 */ cmpwi r3, 0 /* 80420138 003E96F8 40 82 00 0C */ bne lbl_80420144 @@ -2791,7 +2811,7 @@ lbl_80420144: /* 8042014C 003E970C 80 9F 00 D0 */ lwz r4, 0xd0(r31) /* 80420150 003E9710 83 E3 00 10 */ lwz r31, 0x10(r3) /* 80420154 003E9714 7F E3 FB 78 */ mr r3, r31 -/* 80420158 003E9718 4B FF C6 FD */ bl func_8041C854 +/* 80420158 003E9718 4B FF C6 FD */ bl ReadSeqSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive12SeqSoundInfo /* 8042015C 003E971C 2C 03 00 00 */ cmpwi r3, 0 /* 80420160 003E9720 40 82 00 0C */ bne lbl_8042016C /* 80420164 003E9724 38 60 00 00 */ li r3, 0 @@ -2800,7 +2820,7 @@ lbl_8042016C: /* 8042016C 003E972C 80 81 00 24 */ lwz r4, 0x24(r1) /* 80420170 003E9730 7F E3 FB 78 */ mr r3, r31 /* 80420174 003E9734 38 A1 00 08 */ addi r5, r1, 8 -/* 80420178 003E9738 4B FF C7 05 */ bl func_8041C87C +/* 80420178 003E9738 4B FF C7 05 */ bl ReadBankInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive8BankInfo /* 8042017C 003E973C 2C 03 00 00 */ cmpwi r3, 0 /* 80420180 003E9740 40 82 00 0C */ bne lbl_8042018C /* 80420184 003E9744 38 60 00 00 */ li r3, 0 @@ -2808,7 +2828,7 @@ lbl_8042016C: lbl_8042018C: /* 8042018C 003E974C 80 7D 00 04 */ lwz r3, 4(r29) /* 80420190 003E9750 80 81 00 08 */ lwz r4, 8(r1) -/* 80420194 003E9754 4B FF EA 3D */ bl func_8041EBD0 +/* 80420194 003E9754 4B FF EA 3D */ bl detail_GetFileAddress__Q34nw4r3snd18SoundArchivePlayerCFUl /* 80420198 003E9758 2C 03 00 00 */ cmpwi r3, 0 /* 8042019C 003E975C 40 82 00 0C */ bne lbl_804201A8 /* 804201A0 003E9760 38 60 00 00 */ li r3, 0 @@ -2819,7 +2839,7 @@ lbl_804201A8: /* 804201B0 003E9770 4B FF 15 D1 */ bl __ct__Q44nw4r3snd6detail4BankFPCv /* 804201B4 003E9774 80 7D 00 04 */ lwz r3, 4(r29) /* 804201B8 003E9778 80 81 00 08 */ lwz r4, 8(r1) -/* 804201BC 003E977C 4B FF EB A5 */ bl func_8041ED60 +/* 804201BC 003E977C 4B FF EB A5 */ bl detail_GetFileWaveDataAddress__Q34nw4r3snd18SoundArchivePlayerCFUl /* 804201C0 003E9780 2C 03 00 00 */ cmpwi r3, 0 /* 804201C4 003E9784 40 82 00 18 */ bne lbl_804201DC /* 804201C8 003E9788 38 61 00 10 */ addi r3, r1, 0x10 @@ -2846,8 +2866,8 @@ lbl_80420200: /* 80420214 003E97D4 38 21 00 50 */ addi r1, r1, 0x50 /* 80420218 003E97D8 4E 80 00 20 */ blr -.global func_8042021C -func_8042021C: +.global GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl +GetWaveSoundData__Q44nw4r3snd18SoundArchivePlayer11WsdCallbackCFPQ44nw4r3snd6detail13WaveSoundInfoPQ44nw4r3snd6detail17WaveSoundNoteInfoPQ44nw4r3snd6detail8WaveInfoPCviiUl: /* 8042021C 003E97DC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80420220 003E97E0 7C 08 02 A6 */ mflr r0 /* 80420224 003E97E4 90 01 00 44 */ stw r0, 0x44(r1) @@ -2868,7 +2888,7 @@ func_8042021C: /* 80420260 003E9820 38 60 00 00 */ li r3, 0 /* 80420264 003E9824 48 00 00 08 */ b lbl_8042026C lbl_80420268: -/* 80420268 003E9828 4B FF C5 79 */ bl func_8041C7E0 +/* 80420268 003E9828 4B FF C5 79 */ bl IsAvailable__Q34nw4r3snd12SoundArchiveCFv lbl_8042026C: /* 8042026C 003E982C 2C 03 00 00 */ cmpwi r3, 0 /* 80420270 003E9830 40 82 00 0C */ bne lbl_8042027C @@ -2877,7 +2897,7 @@ lbl_8042026C: lbl_8042027C: /* 8042027C 003E983C 80 78 00 04 */ lwz r3, 4(r24) /* 80420280 003E9840 7F E4 FB 78 */ mr r4, r31 -/* 80420284 003E9844 4B FF EA DD */ bl func_8041ED60 +/* 80420284 003E9844 4B FF EA DD */ bl detail_GetFileWaveDataAddress__Q34nw4r3snd18SoundArchivePlayerCFUl /* 80420288 003E9848 2C 03 00 00 */ cmpwi r3, 0 /* 8042028C 003E984C 7C 7F 1B 78 */ mr r31, r3 /* 80420290 003E9850 40 82 00 0C */ bne lbl_8042029C @@ -2919,15 +2939,20 @@ lbl_80420300: /* 80420310 003E98D0 38 21 00 40 */ addi r1, r1, 0x40 /* 80420314 003E98D4 4E 80 00 20 */ blr -.global func_80420318 -func_80420318: +#@12@detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc +.global _12_detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc +_12_detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc: /* 80420318 003E98D8 38 63 FF F4 */ addi r3, r3, -12 -/* 8042031C 003E98DC 4B FF C4 58 */ b func_8041C774 -.global lbl_80420320 -lbl_80420320: +/* 8042031C 003E98DC 4B FF C4 58 */ b detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc + +#@12@detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo +.global _12_detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo +_12_detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo: /* 80420320 003E98E0 38 63 FF F4 */ addi r3, r3, -12 -/* 80420324 003E98E4 4B FF EB CC */ b func_8041EEF0 -.global lbl_80420328 -lbl_80420328: +/* 80420324 003E98E4 4B FF EB CC */ b detail_SetupSound__Q34nw4r3snd18SoundArchivePlayerFPQ34nw4r3snd11SoundHandleUlbPCQ44nw4r3snd14SoundStartable9StartInfo + +#@12@__dt__Q34nw4r3snd18SoundArchivePlayerFv +.global _12___dt__Q34nw4r3snd18SoundArchivePlayerFv +_12___dt__Q34nw4r3snd18SoundArchivePlayerFv: /* 80420328 003E98E8 38 63 FF F4 */ addi r3, r3, -12 -/* 8042032C 003E98EC 4B FF DB 78 */ b func_8041DEA4 +/* 8042032C 003E98EC 4B FF DB 78 */ b __dt__Q34nw4r3snd18SoundArchivePlayerFv diff --git a/asm/nw4r/snd/snd_SoundPlayer.s b/asm/nw4r/snd/snd_SoundPlayer.s index 607d66b..5286eb8 100644 --- a/asm/nw4r/snd/snd_SoundPlayer.s +++ b/asm/nw4r/snd/snd_SoundPlayer.s @@ -2,8 +2,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80420418 -func_80420418: +.global __ct__Q34nw4r3snd11SoundPlayerFv +__ct__Q34nw4r3snd11SoundPlayerFv: /* 80420418 003E99D8 38 C0 00 00 */ li r6, 0 /* 8042041C 003E99DC C0 22 C4 D8 */ lfs f1, lbl_8066C858@sda21(r2) /* 80420420 003E99E0 C0 02 C4 DC */ lfs f0, lbl_8066C85C@sda21(r2) @@ -46,8 +46,9 @@ func_80420418: /* 804204B4 003E9A74 D0 03 00 60 */ stfs f0, 0x60(r3) /* 804204B8 003E9A78 4E 80 00 20 */ blr -.global func_804204BC -func_804204BC: +#__ct__Q34nw4r2ut44LinkListFv +.global __ct__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv +__ct__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv: /* 804204BC 003E9A7C 38 00 00 00 */ li r0, 0 /* 804204C0 003E9A80 38 83 00 04 */ addi r4, r3, 4 /* 804204C4 003E9A84 90 03 00 04 */ stw r0, 4(r3) @@ -57,8 +58,9 @@ func_804204BC: /* 804204D4 003E9A94 90 83 00 08 */ stw r4, 8(r3) /* 804204D8 003E9A98 4E 80 00 20 */ blr -.global func_804204DC -func_804204DC: +#__dt__Q34nw4r2ut44LinkListFv +.global __dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv +__dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv: /* 804204DC 003E9A9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804204E0 003E9AA0 7C 08 02 A6 */ mflr r0 /* 804204E4 003E9AA4 2C 03 00 00 */ cmpwi r3, 0 @@ -83,8 +85,8 @@ lbl_80420518: /* 8042052C 003E9AEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80420530 003E9AF0 4E 80 00 20 */ blr -.global func_80420534 -func_80420534: +.global __dt__Q34nw4r3snd11SoundPlayerFv +__dt__Q34nw4r3snd11SoundPlayerFv: /* 80420534 003E9AF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420538 003E9AF8 7C 08 02 A6 */ mflr r0 /* 8042053C 003E9AFC 2C 03 00 00 */ cmpwi r3, 0 @@ -107,7 +109,7 @@ lbl_80420578: /* 8042057C 003E9B3C 83 FF 00 00 */ lwz r31, 0(r31) /* 80420580 003E9B40 38 63 FF 0C */ addi r3, r3, -244 /* 80420584 003E9B44 38 80 00 00 */ li r4, 0 -/* 80420588 003E9B48 4B FF 21 61 */ bl func_804126E8 +/* 80420588 003E9B48 4B FF 21 61 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_8042058C: /* 8042058C 003E9B4C 7C 1F F0 40 */ cmplw r31, r30 /* 80420590 003E9B50 40 82 FF E8 */ bne lbl_80420578 @@ -145,8 +147,8 @@ lbl_804205E4: /* 80420600 003E9BC0 38 21 00 20 */ addi r1, r1, 0x20 /* 80420604 003E9BC4 4E 80 00 20 */ blr -.global func_80420608 -func_80420608: +.global Update__Q34nw4r3snd11SoundPlayerFv +Update__Q34nw4r3snd11SoundPlayerFv: /* 80420608 003E9BC8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042060C 003E9BCC 7C 08 02 A6 */ mflr r0 /* 80420610 003E9BD0 90 01 00 24 */ stw r0, 0x24(r1) @@ -164,12 +166,12 @@ lbl_8042063C: /* 8042063C 003E9BFC 7F E3 FB 78 */ mr r3, r31 /* 80420640 003E9C00 83 FF 00 00 */ lwz r31, 0(r31) /* 80420644 003E9C04 38 63 FF 0C */ addi r3, r3, -244 -/* 80420648 003E9C08 4B FF 24 ED */ bl func_80412B34 +/* 80420648 003E9C08 4B FF 24 ED */ bl Update__Q44nw4r3snd6detail10BasicSoundFv lbl_8042064C: /* 8042064C 003E9C0C 7C 1F F0 40 */ cmplw r31, r30 /* 80420650 003E9C10 40 82 FF EC */ bne lbl_8042063C /* 80420654 003E9C14 7F A3 EB 78 */ mr r3, r29 -/* 80420658 003E9C18 48 00 02 45 */ bl func_8042089C +/* 80420658 003E9C18 48 00 02 45 */ bl detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFv /* 8042065C 003E9C1C 48 00 0C 89 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80420660 003E9C20 38 63 03 54 */ addi r3, r3, 0x354 /* 80420664 003E9C24 4B F3 96 DD */ bl OSUnlockMutex @@ -181,8 +183,8 @@ lbl_8042064C: /* 8042067C 003E9C3C 38 21 00 20 */ addi r1, r1, 0x20 /* 80420680 003E9C40 4E 80 00 20 */ blr -.global func_80420684 -func_80420684: +.global StopAllSound__Q34nw4r3snd11SoundPlayerFi +StopAllSound__Q34nw4r3snd11SoundPlayerFi: /* 80420684 003E9C44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420688 003E9C48 7C 08 02 A6 */ mflr r0 /* 8042068C 003E9C4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -201,7 +203,7 @@ lbl_804206B8: /* 804206BC 003E9C7C 83 FF 00 00 */ lwz r31, 0(r31) /* 804206C0 003E9C80 7F A4 EB 78 */ mr r4, r29 /* 804206C4 003E9C84 38 63 FF 0C */ addi r3, r3, -244 -/* 804206C8 003E9C88 4B FF 20 21 */ bl func_804126E8 +/* 804206C8 003E9C88 4B FF 20 21 */ bl Stop__Q44nw4r3snd6detail10BasicSoundFi lbl_804206CC: /* 804206CC 003E9C8C 7C 1F F0 40 */ cmplw r31, r30 /* 804206D0 003E9C90 40 82 FF E8 */ bne lbl_804206B8 @@ -216,8 +218,8 @@ lbl_804206CC: /* 804206F4 003E9CB4 38 21 00 20 */ addi r1, r1, 0x20 /* 804206F8 003E9CB8 4E 80 00 20 */ blr -.global func_804206FC -func_804206FC: +.global PauseAllSound__Q34nw4r3snd11SoundPlayerFbi +PauseAllSound__Q34nw4r3snd11SoundPlayerFbi: /* 804206FC 003E9CBC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420700 003E9CC0 7C 08 02 A6 */ mflr r0 /* 80420704 003E9CC4 90 01 00 24 */ stw r0, 0x24(r1) @@ -239,7 +241,7 @@ lbl_80420738: /* 80420740 003E9D00 7F 84 E3 78 */ mr r4, r28 /* 80420744 003E9D04 7F A5 EB 78 */ mr r5, r29 /* 80420748 003E9D08 38 63 FF 0C */ addi r3, r3, -244 -/* 8042074C 003E9D0C 4B FF 21 85 */ bl func_804128D0 +/* 8042074C 003E9D0C 4B FF 21 85 */ bl Pause__Q44nw4r3snd6detail10BasicSoundFbi lbl_80420750: /* 80420750 003E9D10 7C 1F F0 40 */ cmplw r31, r30 /* 80420754 003E9D14 40 82 FF E4 */ bne lbl_80420738 @@ -255,22 +257,22 @@ lbl_80420750: /* 8042077C 003E9D3C 38 21 00 20 */ addi r1, r1, 0x20 /* 80420780 003E9D40 4E 80 00 20 */ blr -.global func_80420784 -func_80420784: +.global GetRemoteOutVolume__Q34nw4r3snd11SoundPlayerCFi +GetRemoteOutVolume__Q34nw4r3snd11SoundPlayerCFi: /* 80420784 003E9D44 54 80 10 3A */ slwi r0, r4, 2 /* 80420788 003E9D48 7C 63 02 14 */ add r3, r3, r0 /* 8042078C 003E9D4C C0 23 00 44 */ lfs f1, 0x44(r3) /* 80420790 003E9D50 4E 80 00 20 */ blr -.global func_80420794 -func_80420794: +.global SetFxSend__Q34nw4r3snd11SoundPlayerFQ34nw4r3snd6AuxBusf +SetFxSend__Q34nw4r3snd11SoundPlayerFQ34nw4r3snd6AuxBusf: /* 80420794 003E9D54 54 80 10 3A */ slwi r0, r4, 2 /* 80420798 003E9D58 7C 63 02 14 */ add r3, r3, r0 /* 8042079C 003E9D5C D0 23 00 58 */ stfs f1, 0x58(r3) /* 804207A0 003E9D60 4E 80 00 20 */ blr -.global func_804207A4 -func_804207A4: +.global detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound +detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound: /* 804207A4 003E9D64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804207A8 003E9D68 7C 08 02 A6 */ mflr r0 /* 804207AC 003E9D6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -341,8 +343,8 @@ lbl_80420860: /* 80420894 003E9E54 38 21 00 20 */ addi r1, r1, 0x20 /* 80420898 003E9E58 4E 80 00 20 */ blr -.global func_8042089C -func_8042089C: +.global detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFv +detail_SortPriorityList__Q34nw4r3snd11SoundPlayerFv: /* 8042089C 003E9E5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804208A0 003E9E60 7C 08 02 A6 */ mflr r0 /* 804208A4 003E9E64 90 01 00 34 */ stw r0, 0x34(r1) @@ -364,17 +366,17 @@ lbl_804208DC: /* 804208E0 003E9EA0 7C 00 07 75 */ extsb. r0, r0 /* 804208E4 003E9EA4 40 82 00 48 */ bne lbl_8042092C /* 804208E8 003E9EA8 3C 60 80 64 */ lis r3, lbl_8063B4F0@ha -/* 804208EC 003E9EAC 3C 80 80 42 */ lis r4, func_804204BC@ha -/* 804208F0 003E9EB0 3C A0 80 42 */ lis r5, func_804204DC@ha +/* 804208EC 003E9EAC 3C 80 80 42 */ lis r4, __ct__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@ha +/* 804208F0 003E9EB0 3C A0 80 42 */ lis r5, __dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@ha /* 804208F4 003E9EB4 38 C0 00 0C */ li r6, 0xc /* 804208F8 003E9EB8 38 63 B4 F0 */ addi r3, r3, lbl_8063B4F0@l -/* 804208FC 003E9EBC 38 84 04 BC */ addi r4, r4, func_804204BC@l -/* 80420900 003E9EC0 38 A5 04 DC */ addi r5, r5, func_804204DC@l +/* 804208FC 003E9EBC 38 84 04 BC */ addi r4, r4, __ct__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@l +/* 80420900 003E9EC0 38 A5 04 DC */ addi r5, r5, __dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@l /* 80420904 003E9EC4 38 E0 00 80 */ li r7, 0x80 /* 80420908 003E9EC8 4B E9 91 F9 */ bl __construct_array -/* 8042090C 003E9ECC 3C 80 80 42 */ lis r4, func_80420A20@ha +/* 8042090C 003E9ECC 3C 80 80 42 */ lis r4, __arraydtor$4226@ha /* 80420910 003E9ED0 3C A0 80 64 */ lis r5, lbl_8063B4E0@ha -/* 80420914 003E9ED4 38 84 0A 20 */ addi r4, r4, func_80420A20@l +/* 80420914 003E9ED4 38 84 0A 20 */ addi r4, r4, __arraydtor$4226@l /* 80420918 003E9ED8 38 60 00 00 */ li r3, 0 /* 8042091C 003E9EDC 38 A5 B4 E0 */ addi r5, r5, lbl_8063B4E0@l /* 80420920 003E9EE0 4B E9 8D 7D */ bl __register_global_object_tmp @@ -452,18 +454,18 @@ lbl_80420A08: /* 80420A18 003E9FD8 38 21 00 30 */ addi r1, r1, 0x30 /* 80420A1C 003E9FDC 4E 80 00 20 */ blr -.global func_80420A20 -func_80420A20: +.global __arraydtor$4226 +__arraydtor$4226: /* 80420A20 003E9FE0 3C 60 80 64 */ lis r3, lbl_8063B4F0@ha -/* 80420A24 003E9FE4 3C 80 80 42 */ lis r4, func_804204DC@ha +/* 80420A24 003E9FE4 3C 80 80 42 */ lis r4, __dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@ha /* 80420A28 003E9FE8 38 63 B4 F0 */ addi r3, r3, lbl_8063B4F0@l /* 80420A2C 003E9FEC 38 A0 00 0C */ li r5, 0xc -/* 80420A30 003E9FF0 38 84 04 DC */ addi r4, r4, func_804204DC@l +/* 80420A30 003E9FF0 38 84 04 DC */ addi r4, r4, __dt__Q34nw4r2ut44LinkList_Q44nw4r3snd6detail10BasicSound_256_Fv@l /* 80420A34 003E9FF4 38 C0 00 80 */ li r6, 0x80 /* 80420A38 003E9FF8 4B E9 91 C0 */ b __destroy_arr -.global func_80420A3C -func_80420A3C: +.global detail_AppendSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound +detail_AppendSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound: /* 80420A3C 003E9FFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420A40 003EA000 7C 08 02 A6 */ mflr r0 /* 80420A44 003EA004 90 01 00 24 */ stw r0, 0x24(r1) @@ -585,7 +587,7 @@ lbl_80420BBC: /* 80420BD8 003EA198 4B F3 91 69 */ bl OSUnlockMutex /* 80420BDC 003EA19C 7F E3 FB 78 */ mr r3, r31 /* 80420BE0 003EA1A0 7F C4 F3 78 */ mr r4, r30 -/* 80420BE4 003EA1A4 4B FF 2B 3D */ bl func_80413720 +/* 80420BE4 003EA1A4 4B FF 2B 3D */ bl AttachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer /* 80420BE8 003EA1A8 48 00 06 FD */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80420BEC 003EA1AC 38 63 03 54 */ addi r3, r3, 0x354 /* 80420BF0 003EA1B0 4B F3 91 51 */ bl OSUnlockMutex @@ -599,8 +601,8 @@ lbl_80420BF8: /* 80420C0C 003EA1CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80420C10 003EA1D0 4E 80 00 20 */ blr -.global func_80420C14 -func_80420C14: +.global detail_RemoveSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound +detail_RemoveSound__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound: /* 80420C14 003EA1D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80420C18 003EA1D8 7C 08 02 A6 */ mflr r0 /* 80420C1C 003EA1DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -625,7 +627,7 @@ func_80420C14: /* 80420C68 003EA228 48 00 A8 E5 */ bl Erase__Q44nw4r2ut6detail12LinkListImplFPQ34nw4r2ut12LinkListNode /* 80420C6C 003EA22C 7F E3 FB 78 */ mr r3, r31 /* 80420C70 003EA230 7F C4 F3 78 */ mr r4, r30 -/* 80420C74 003EA234 4B FF 2A B5 */ bl func_80413728 +/* 80420C74 003EA234 4B FF 2A B5 */ bl DetachSoundPlayer__Q44nw4r3snd6detail10BasicSoundFPQ34nw4r3snd11SoundPlayer /* 80420C78 003EA238 48 00 06 6D */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80420C7C 003EA23C 38 63 03 54 */ addi r3, r3, 0x354 /* 80420C80 003EA240 4B F3 90 C1 */ bl OSUnlockMutex @@ -636,8 +638,8 @@ func_80420C14: /* 80420C94 003EA254 38 21 00 10 */ addi r1, r1, 0x10 /* 80420C98 003EA258 4E 80 00 20 */ blr -.global func_80420C9C -func_80420C9C: +.global SetPlayableSoundCount__Q34nw4r3snd11SoundPlayerFi +SetPlayableSoundCount__Q34nw4r3snd11SoundPlayerFi: /* 80420C9C 003EA25C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80420CA0 003EA260 7C 08 02 A6 */ mflr r0 /* 80420CA4 003EA264 90 01 00 14 */ stw r0, 0x14(r1) @@ -679,13 +681,13 @@ lbl_80420CF8: /* 80420D24 003EA2E4 38 21 00 10 */ addi r1, r1, 0x10 /* 80420D28 003EA2E8 4E 80 00 20 */ blr -.global func_80420D2C -func_80420D2C: +.global detail_SetPlayableSoundLimit__Q34nw4r3snd11SoundPlayerFi +detail_SetPlayableSoundLimit__Q34nw4r3snd11SoundPlayerFi: /* 80420D2C 003EA2EC 90 83 00 28 */ stw r4, 0x28(r3) /* 80420D30 003EA2F0 4E 80 00 20 */ blr -.global func_80420D34 -func_80420D34: +.global detail_CanPlaySound__Q34nw4r3snd11SoundPlayerFi +detail_CanPlaySound__Q34nw4r3snd11SoundPlayerFi: /* 80420D34 003EA2F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80420D38 003EA2F8 7C 08 02 A6 */ mflr r0 /* 80420D3C 003EA2FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -748,8 +750,8 @@ lbl_80420DF8: /* 80420E08 003EA3C8 38 21 00 10 */ addi r1, r1, 0x10 /* 80420E0C 003EA3CC 4E 80 00 20 */ blr -.global func_80420E10 -func_80420E10: +.global detail_AppendPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10PlayerHeap +detail_AppendPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10PlayerHeap: /* 80420E10 003EA3D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420E14 003EA3D4 7C 08 02 A6 */ mflr r0 /* 80420E18 003EA3D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -777,8 +779,8 @@ func_80420E10: /* 80420E70 003EA430 38 21 00 20 */ addi r1, r1, 0x20 /* 80420E74 003EA434 4E 80 00 20 */ blr -.global func_80420E78 -func_80420E78: +.global detail_AllocPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound +detail_AllocPlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound: /* 80420E78 003EA438 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420E7C 003EA43C 7C 08 02 A6 */ mflr r0 /* 80420E80 003EA440 90 01 00 24 */ stw r0, 0x24(r1) @@ -809,7 +811,7 @@ lbl_80420EC0: /* 80420EE0 003EA4A0 4B FF 7C 75 */ bl AttachSound__Q44nw4r3snd6detail10PlayerHeapFPQ44nw4r3snd6detail10BasicSound /* 80420EE4 003EA4A4 7F C3 F3 78 */ mr r3, r30 /* 80420EE8 003EA4A8 7F E4 FB 78 */ mr r4, r31 -/* 80420EEC 003EA4AC 4B FF 28 21 */ bl func_8041370C +/* 80420EEC 003EA4AC 4B FF 28 21 */ bl AttachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap /* 80420EF0 003EA4B0 7F E3 FB 78 */ mr r3, r31 /* 80420EF4 003EA4B4 4B FF 7B C9 */ bl Clear__Q44nw4r3snd6detail10PlayerHeapFv /* 80420EF8 003EA4B8 48 00 03 ED */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -824,8 +826,8 @@ lbl_80420F08: /* 80420F18 003EA4D8 38 21 00 20 */ addi r1, r1, 0x20 /* 80420F1C 003EA4DC 4E 80 00 20 */ blr -.global func_80420F20 -func_80420F20: +.global detail_FreePlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound +detail_FreePlayerHeap__Q34nw4r3snd11SoundPlayerFPQ44nw4r3snd6detail10BasicSound: /* 80420F20 003EA4E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80420F24 003EA4E4 7C 08 02 A6 */ mflr r0 /* 80420F28 003EA4E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -850,7 +852,7 @@ lbl_80420F68: /* 80420F70 003EA530 4B FF 7B ED */ bl DetachSound__Q44nw4r3snd6detail10PlayerHeapFPQ44nw4r3snd6detail10BasicSound /* 80420F74 003EA534 7F C3 F3 78 */ mr r3, r30 /* 80420F78 003EA538 7F E4 FB 78 */ mr r4, r31 -/* 80420F7C 003EA53C 4B FF 27 99 */ bl func_80413714 +/* 80420F7C 003EA53C 4B FF 27 99 */ bl DetachPlayerHeap__Q44nw4r3snd6detail10BasicSoundFPQ44nw4r3snd6detail10PlayerHeap /* 80420F80 003EA540 38 1D 00 1C */ addi r0, r29, 0x1c /* 80420F84 003EA544 38 7D 00 18 */ addi r3, r29, 0x18 /* 80420F88 003EA548 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/nw4r/snd/snd_SoundThread.s b/asm/nw4r/snd/snd_SoundThread.s index 4060ff9..92db7f2 100644 --- a/asm/nw4r/snd/snd_SoundThread.s +++ b/asm/nw4r/snd/snd_SoundThread.s @@ -340,8 +340,8 @@ SoundThreadFunc__Q44nw4r3snd6detail11SoundThreadFPv: /* 804217A8 003EAD68 38 21 00 10 */ addi r1, r1, 0x10 /* 804217AC 003EAD6C 4E 80 00 20 */ blr -.global RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback -RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback: +.global RegisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback +RegisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback: /* 804217B0 003EAD70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804217B4 003EAD74 7C 08 02 A6 */ mflr r0 /* 804217B8 003EAD78 90 01 00 24 */ stw r0, 0x24(r1) @@ -369,8 +369,8 @@ RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail1 /* 80421810 003EADD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80421814 003EADD4 4E 80 00 20 */ blr -.global UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback -UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback: +.global UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback +UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback: /* 80421818 003EADD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042181C 003EADDC 7C 08 02 A6 */ mflr r0 /* 80421820 003EADE0 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/nw4r/snd/snd_StrmFile.s b/asm/nw4r/snd/snd_StrmFile.s index 1f1dfd9..a5da8ab 100644 --- a/asm/nw4r/snd/snd_StrmFile.s +++ b/asm/nw4r/snd/snd_StrmFile.s @@ -2,15 +2,15 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80421BE8 -func_80421BE8: +.global __ct__Q44nw4r3snd6detail14StrmFileReaderFv +__ct__Q44nw4r3snd6detail14StrmFileReaderFv: /* 80421BE8 003EB1A8 38 00 00 00 */ li r0, 0 /* 80421BEC 003EB1AC 90 03 00 00 */ stw r0, 0(r3) /* 80421BF0 003EB1B0 90 03 00 04 */ stw r0, 4(r3) /* 80421BF4 003EB1B4 4E 80 00 20 */ blr -.global func_80421BF8 -func_80421BF8: +.global ReadStrmInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo +ReadStrmInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo: /* 80421BF8 003EB1B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80421BFC 003EB1BC 7C 08 02 A6 */ mflr r0 /* 80421C00 003EB1C0 80 63 00 04 */ lwz r3, 4(r3) @@ -86,8 +86,8 @@ lbl_80421C60: /* 80421D04 003EB2C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80421D08 003EB2C8 4E 80 00 20 */ blr -.global func_80421D0C -func_80421D0C: +.global ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi +ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi: /* 80421D0C 003EB2CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80421D10 003EB2D0 7C 08 02 A6 */ mflr r0 /* 80421D14 003EB2D4 80 C3 00 04 */ lwz r6, 4(r3) @@ -283,8 +283,8 @@ lbl_80421FB4: /* 80421FC8 003EB588 38 21 00 20 */ addi r1, r1, 0x20 /* 80421FCC 003EB58C 4E 80 00 20 */ blr -.global func_80421FD0 -func_80421FD0: +.global LoadFileHeader__Q44nw4r3snd6detail14StrmFileLoaderFPvUl +LoadFileHeader__Q44nw4r3snd6detail14StrmFileLoaderFPvUl: /* 80421FD0 003EB590 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80421FD4 003EB594 7C 08 02 A6 */ mflr r0 /* 80421FD8 003EB598 90 01 00 84 */ stw r0, 0x84(r1) @@ -411,8 +411,8 @@ lbl_80422174: /* 8042218C 003EB74C 38 21 00 80 */ addi r1, r1, 0x80 /* 80422190 003EB750 4E 80 00 20 */ blr -.global func_80422194 -func_80422194: +.global GetChannelCount__Q44nw4r3snd6detail14StrmFileLoaderCFv +GetChannelCount__Q44nw4r3snd6detail14StrmFileLoaderCFv: /* 80422194 003EB754 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80422198 003EB758 7C 08 02 A6 */ mflr r0 /* 8042219C 003EB75C 90 01 00 14 */ stw r0, 0x14(r1) @@ -434,8 +434,8 @@ lbl_804221CC: /* 804221D4 003EB794 38 21 00 10 */ addi r1, r1, 0x10 /* 804221D8 003EB798 4E 80 00 20 */ blr -.global func_804221DC -func_804221DC: +.global ReadStrmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo +ReadStrmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo: /* 804221DC 003EB79C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804221E0 003EB7A0 7C 08 02 A6 */ mflr r0 /* 804221E4 003EB7A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -446,7 +446,7 @@ func_804221DC: /* 804221F8 003EB7B8 48 00 00 10 */ b lbl_80422208 lbl_804221FC: /* 804221FC 003EB7BC 38 63 00 04 */ addi r3, r3, 4 -/* 80422200 003EB7C0 4B FF F9 F9 */ bl func_80421BF8 +/* 80422200 003EB7C0 4B FF F9 F9 */ bl ReadStrmInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo /* 80422204 003EB7C4 38 60 00 01 */ li r3, 1 lbl_80422208: /* 80422208 003EB7C8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -454,8 +454,8 @@ lbl_80422208: /* 80422210 003EB7D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80422214 003EB7D4 4E 80 00 20 */ blr -.global func_80422218 -func_80422218: +.global ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi +ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi: /* 80422218 003EB7D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042221C 003EB7DC 7C 08 02 A6 */ mflr r0 /* 80422220 003EB7E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -466,7 +466,7 @@ func_80422218: /* 80422234 003EB7F4 48 00 00 10 */ b lbl_80422244 lbl_80422238: /* 80422238 003EB7F8 38 63 00 04 */ addi r3, r3, 4 -/* 8042223C 003EB7FC 4B FF FA D1 */ bl func_80421D0C +/* 8042223C 003EB7FC 4B FF FA D1 */ bl ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi /* 80422240 003EB800 38 60 00 01 */ li r3, 1 lbl_80422244: /* 80422244 003EB804 80 01 00 14 */ lwz r0, 0x14(r1) @@ -474,8 +474,8 @@ lbl_80422244: /* 8042224C 003EB80C 38 21 00 10 */ addi r1, r1, 0x10 /* 80422250 003EB810 4E 80 00 20 */ blr -.global func_80422254 -func_80422254: +.global ReadAdpcmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ44nw4r3snd6detail10AdpcmParamPQ44nw4r3snd6detail14AdpcmLoopParami +ReadAdpcmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ44nw4r3snd6detail10AdpcmParamPQ44nw4r3snd6detail14AdpcmLoopParami: /* 80422254 003EB814 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80422258 003EB818 7C 08 02 A6 */ mflr r0 /* 8042225C 003EB81C 90 01 00 24 */ stw r0, 0x24(r1) @@ -580,8 +580,8 @@ lbl_804223C4: /* 804223DC 003EB99C 38 21 00 20 */ addi r1, r1, 0x20 /* 804223E0 003EB9A0 4E 80 00 20 */ blr -.global func_804223E4 -func_804223E4: +.global ReadAdpcBlockData__Q44nw4r3snd6detail14StrmFileLoaderFPUsPUsii +ReadAdpcBlockData__Q44nw4r3snd6detail14StrmFileLoaderFPUsPUsii: /* 804223E4 003EB9A4 54 2B 06 FE */ clrlwi r11, r1, 0x1b /* 804223E8 003EB9A8 7C 2C 0B 78 */ mr r12, r1 /* 804223EC 003EB9AC 21 6B FF A0 */ subfic r11, r11, -96 diff --git a/asm/nw4r/snd/snd_StrmPlayer.s b/asm/nw4r/snd/snd_StrmPlayer.s index e67397d..be630f1 100644 --- a/asm/nw4r/snd/snd_StrmPlayer.s +++ b/asm/nw4r/snd/snd_StrmPlayer.s @@ -2,15 +2,15 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80422598 -func_80422598: +.global __ct__Q44nw4r3snd6detail10StrmPlayerFv +__ct__Q44nw4r3snd6detail10StrmPlayerFv: /* 80422598 003EBB58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042259C 003EBB5C 7C 08 02 A6 */ mflr r0 /* 804225A0 003EBB60 90 01 00 14 */ stw r0, 0x14(r1) /* 804225A4 003EBB64 93 E1 00 0C */ stw r31, 0xc(r1) /* 804225A8 003EBB68 93 C1 00 08 */ stw r30, 8(r1) /* 804225AC 003EBB6C 7C 7E 1B 78 */ mr r30, r3 -/* 804225B0 003EBB70 4B FE FB E1 */ bl func_80412190 +/* 804225B0 003EBB70 4B FE FB E1 */ bl __ct__Q44nw4r3snd6detail11BasicPlayerFv /* 804225B4 003EBB74 3B E0 00 00 */ li r31, 0 /* 804225B8 003EBB78 3C C0 80 57 */ lis r6, lbl_8056E558@ha /* 804225BC 003EBB7C 38 C6 E5 58 */ addi r6, r6, lbl_8056E558@l @@ -20,12 +20,12 @@ func_80422598: /* 804225CC 003EBB8C 39 3E 01 98 */ addi r9, r30, 0x198 /* 804225D0 003EBB90 39 08 E5 B8 */ addi r8, r8, lbl_8056E5B8@l /* 804225D4 003EBB94 93 FE 01 9C */ stw r31, 0x19c(r30) -/* 804225D8 003EBB98 3C 80 80 42 */ lis r4, func_80424D20@ha -/* 804225DC 003EBB9C 3C A0 80 42 */ lis r5, func_804226E8@ha +/* 804225D8 003EBB98 3C 80 80 42 */ lis r4, __ct__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@ha +/* 804225DC 003EBB9C 3C A0 80 42 */ lis r5, __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@ha /* 804225E0 003EBBA0 38 7E 01 A4 */ addi r3, r30, 0x1a4 /* 804225E4 003EBBA4 90 DE 00 00 */ stw r6, 0(r30) -/* 804225E8 003EBBA8 38 84 4D 20 */ addi r4, r4, func_80424D20@l -/* 804225EC 003EBBAC 38 A5 26 E8 */ addi r5, r5, func_804226E8@l +/* 804225E8 003EBBA8 38 84 4D 20 */ addi r4, r4, __ct__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@l +/* 804225EC 003EBBAC 38 A5 26 E8 */ addi r5, r5, __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@l /* 804225F0 003EBBB0 38 C0 00 34 */ li r6, 0x34 /* 804225F4 003EBBB4 93 FE 00 D4 */ stw r31, 0xd4(r30) /* 804225F8 003EBBB8 38 E0 00 20 */ li r7, 0x20 @@ -68,8 +68,8 @@ lbl_80422660: /* 80422688 003EBC48 38 21 00 10 */ addi r1, r1, 0x10 /* 8042268C 003EBC4C 4E 80 00 20 */ blr -.global func_80422690 -func_80422690: +.global __dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv +__dt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv: /* 80422690 003EBC50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80422694 003EBC54 7C 08 02 A6 */ mflr r0 /* 80422698 003EBC58 2C 03 00 00 */ cmpwi r3, 0 @@ -80,7 +80,7 @@ func_80422690: /* 804226AC 003EBC6C 7C 7E 1B 78 */ mr r30, r3 /* 804226B0 003EBC70 41 82 00 1C */ beq lbl_804226CC /* 804226B4 003EBC74 38 80 00 00 */ li r4, 0 -/* 804226B8 003EBC78 48 00 30 CD */ bl func_80425784 +/* 804226B8 003EBC78 48 00 30 CD */ bl __dt__Q44nw4r3snd6detail4TaskFv /* 804226BC 003EBC7C 2C 1F 00 00 */ cmpwi r31, 0 /* 804226C0 003EBC80 40 81 00 0C */ ble lbl_804226CC /* 804226C4 003EBC84 7F C3 F3 78 */ mr r3, r30 @@ -94,8 +94,8 @@ lbl_804226CC: /* 804226E0 003EBCA0 38 21 00 10 */ addi r1, r1, 0x10 /* 804226E4 003EBCA4 4E 80 00 20 */ blr -.global func_804226E8 -func_804226E8: +.global __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv +__dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv: /* 804226E8 003EBCA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804226EC 003EBCAC 7C 08 02 A6 */ mflr r0 /* 804226F0 003EBCB0 2C 03 00 00 */ cmpwi r3, 0 @@ -106,7 +106,7 @@ func_804226E8: /* 80422704 003EBCC4 7C 7E 1B 78 */ mr r30, r3 /* 80422708 003EBCC8 41 82 00 1C */ beq lbl_80422724 /* 8042270C 003EBCCC 38 80 00 00 */ li r4, 0 -/* 80422710 003EBCD0 48 00 30 75 */ bl func_80425784 +/* 80422710 003EBCD0 48 00 30 75 */ bl __dt__Q44nw4r3snd6detail4TaskFv /* 80422714 003EBCD4 2C 1F 00 00 */ cmpwi r31, 0 /* 80422718 003EBCD8 40 81 00 0C */ ble lbl_80422724 /* 8042271C 003EBCDC 7F C3 F3 78 */ mr r3, r30 @@ -120,8 +120,8 @@ lbl_80422724: /* 80422738 003EBCF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8042273C 003EBCFC 4E 80 00 20 */ blr -.global func_80422740 -func_80422740: +.global __dt__Q44nw4r3snd6detail10StrmPlayerFv +__dt__Q44nw4r3snd6detail10StrmPlayerFv: /* 80422740 003EBD00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80422744 003EBD04 7C 08 02 A6 */ mflr r0 /* 80422748 003EBD08 2C 03 00 00 */ cmpwi r3, 0 @@ -162,9 +162,9 @@ lbl_804227B0: /* 804227D0 003EBD90 38 63 03 54 */ addi r3, r3, 0x354 /* 804227D4 003EBD94 4B F3 75 6D */ bl OSUnlockMutex lbl_804227D8: -/* 804227D8 003EBD98 3C 80 80 42 */ lis r4, func_804226E8@ha +/* 804227D8 003EBD98 3C 80 80 42 */ lis r4, __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@ha /* 804227DC 003EBD9C 38 7D 01 A4 */ addi r3, r29, 0x1a4 -/* 804227E0 003EBDA0 38 84 26 E8 */ addi r4, r4, func_804226E8@l +/* 804227E0 003EBDA0 38 84 26 E8 */ addi r4, r4, __dt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv@l /* 804227E4 003EBDA4 38 A0 00 34 */ li r5, 0x34 /* 804227E8 003EBDA8 38 C0 00 20 */ li r6, 0x20 /* 804227EC 003EBDAC 4B E9 74 0D */ bl __destroy_arr @@ -176,7 +176,7 @@ lbl_80422800: /* 80422800 003EBDC0 34 7D 01 74 */ addic. r3, r29, 0x174 /* 80422804 003EBDC4 41 82 00 0C */ beq lbl_80422810 /* 80422808 003EBDC8 38 80 00 00 */ li r4, 0 -/* 8042280C 003EBDCC 48 00 2F 79 */ bl func_80425784 +/* 8042280C 003EBDCC 48 00 2F 79 */ bl __dt__Q44nw4r3snd6detail4TaskFv lbl_80422810: /* 80422810 003EBDD0 2C 1E 00 00 */ cmpwi r30, 0 /* 80422814 003EBDD4 40 81 00 0C */ ble lbl_80422820 @@ -192,8 +192,8 @@ lbl_80422820: /* 80422838 003EBDF8 38 21 00 20 */ addi r1, r1, 0x20 /* 8042283C 003EBDFC 4E 80 00 20 */ blr -.global func_80422840 -func_80422840: +.global Setup__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail14StrmBufferPooliUsi +Setup__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail14StrmBufferPooliUsi: /* 80422840 003EBE00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80422844 003EBE04 7C 08 02 A6 */ mflr r0 /* 80422848 003EBE08 90 01 00 24 */ stw r0, 0x24(r1) @@ -238,7 +238,7 @@ lbl_804228BC: /* 804228E0 003EBEA0 4B F3 74 61 */ bl OSUnlockMutex lbl_804228E4: /* 804228E4 003EBEA4 7F E3 FB 78 */ mr r3, r31 -/* 804228E8 003EBEA8 48 00 08 A1 */ bl func_80423188 +/* 804228E8 003EBEA8 48 00 08 A1 */ bl InitParam__Q44nw4r3snd6detail10StrmPlayerFv /* 804228EC 003EBEAC 2C 1C 00 10 */ cmpwi r28, 0x10 /* 804228F0 003EBEB0 38 00 00 10 */ li r0, 0x10 /* 804228F4 003EBEB4 41 81 00 08 */ bgt lbl_804228FC @@ -347,8 +347,8 @@ lbl_80422A40: /* 80422A50 003EC010 38 21 00 20 */ addi r1, r1, 0x20 /* 80422A54 003EC014 4E 80 00 20 */ blr -.global func_80422A58 -func_80422A58: +.global Shutdown__Q44nw4r3snd6detail10StrmPlayerFv +Shutdown__Q44nw4r3snd6detail10StrmPlayerFv: /* 80422A58 003EC018 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80422A5C 003EC01C 7C 08 02 A6 */ mflr r0 /* 80422A60 003EC020 90 01 00 14 */ stw r0, 0x14(r1) @@ -388,8 +388,8 @@ lbl_80422AD0: /* 80422AE0 003EC0A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80422AE4 003EC0A4 4E 80 00 20 */ blr -.global func_80422AE8 -func_80422AE8: +.global Prepare__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei +Prepare__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei: /* 80422AE8 003EC0A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80422AEC 003EC0AC 7C 08 02 A6 */ mflr r0 /* 80422AF0 003EC0B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -420,7 +420,7 @@ func_80422AE8: lbl_80422B54: /* 80422B54 003EC114 4B FF E7 91 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80422B58 003EC118 7F E4 FB 78 */ mr r4, r31 -/* 80422B5C 003EC11C 4B FF EC 55 */ bl RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80422B5C 003EC11C 4B FF EC 55 */ bl RegisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 80422B60 003EC120 80 9C 08 28 */ lwz r4, 0x828(r28) /* 80422B64 003EC124 3B FC 01 74 */ addi r31, r28, 0x174 /* 80422B68 003EC128 80 7C 01 6C */ lwz r3, 0x16c(r28) @@ -432,7 +432,7 @@ lbl_80422B54: /* 80422B80 003EC140 48 00 2C 45 */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 80422B84 003EC144 7F E4 FB 78 */ mr r4, r31 /* 80422B88 003EC148 38 A0 00 01 */ li r5, 1 -/* 80422B8C 003EC14C 48 00 2D B1 */ bl func_8042593C +/* 80422B8C 003EC14C 48 00 2D B1 */ bl AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority /* 80422B90 003EC150 4B FF E7 55 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80422B94 003EC154 38 63 03 54 */ addi r3, r3, 0x354 /* 80422B98 003EC158 4B F3 71 A9 */ bl OSUnlockMutex @@ -446,8 +446,8 @@ lbl_80422B54: /* 80422BB8 003EC178 38 21 00 20 */ addi r1, r1, 0x20 /* 80422BBC 003EC17C 4E 80 00 20 */ blr -.global func_80422BC0 -func_80422BC0: +.global Start__Q44nw4r3snd6detail10StrmPlayerFv +Start__Q44nw4r3snd6detail10StrmPlayerFv: /* 80422BC0 003EC180 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 80422BC4 003EC184 7C 08 02 A6 */ mflr r0 /* 80422BC8 003EC188 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -471,7 +471,7 @@ lbl_80422C04: /* 80422C0C 003EC1CC 40 82 03 24 */ bne lbl_80422F30 /* 80422C10 003EC1D0 80 9A 08 34 */ lwz r4, 0x834(r26) /* 80422C14 003EC1D4 7F 43 D3 78 */ mr r3, r26 -/* 80422C18 003EC1D8 48 00 0D BD */ bl func_804239D4 +/* 80422C18 003EC1D8 48 00 0D BD */ bl AllocVoices__Q44nw4r3snd6detail10StrmPlayerFi /* 80422C1C 003EC1DC 2C 03 00 00 */ cmpwi r3, 0 /* 80422C20 003EC1E0 40 82 00 54 */ bne lbl_80422C74 /* 80422C24 003EC1E4 7F 5C D3 78 */ mr r28, r26 @@ -506,7 +506,7 @@ lbl_80422C74: /* 80422C88 003EC248 38 C1 00 08 */ addi r6, r1, 8 /* 80422C8C 003EC24C 90 01 00 0C */ stw r0, 0xc(r1) /* 80422C90 003EC250 90 01 00 08 */ stw r0, 8(r1) -/* 80422C94 003EC254 48 00 1D 41 */ bl func_804249D4 +/* 80422C94 003EC254 48 00 1D 41 */ bl CalcStartOffset__Q44nw4r3snd6detail10StrmPlayerFPlPUlPl /* 80422C98 003EC258 2C 03 00 00 */ cmpwi r3, 0 /* 80422C9C 003EC25C 40 82 00 18 */ bne lbl_80422CB4 /* 80422CA0 003EC260 4B FF E6 45 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -676,7 +676,7 @@ lbl_80422ED8: /* 80422EF4 003EC4B4 40 82 00 14 */ bne lbl_80422F08 /* 80422EF8 003EC4B8 7F 43 D3 78 */ mr r3, r26 /* 80422EFC 003EC4BC 38 80 00 01 */ li r4, 1 -/* 80422F00 003EC4C0 48 00 15 A9 */ bl func_804244A8 +/* 80422F00 003EC4C0 48 00 15 A9 */ bl UpdateDataLoopAddress__Q44nw4r3snd6detail10StrmPlayerFl /* 80422F04 003EC4C4 48 00 00 1C */ b lbl_80422F20 lbl_80422F08: /* 80422F08 003EC4C8 38 03 FF FF */ addi r0, r3, -1 @@ -684,10 +684,10 @@ lbl_80422F08: /* 80422F10 003EC4D0 40 82 00 10 */ bne lbl_80422F20 /* 80422F14 003EC4D4 7F 43 D3 78 */ mr r3, r26 /* 80422F18 003EC4D8 38 80 00 00 */ li r4, 0 -/* 80422F1C 003EC4DC 48 00 15 8D */ bl func_804244A8 +/* 80422F1C 003EC4DC 48 00 15 8D */ bl UpdateDataLoopAddress__Q44nw4r3snd6detail10StrmPlayerFl lbl_80422F20: /* 80422F20 003EC4E0 7F 43 D3 78 */ mr r3, r26 -/* 80422F24 003EC4E4 48 00 19 FD */ bl func_80424920 +/* 80422F24 003EC4E4 48 00 19 FD */ bl UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv /* 80422F28 003EC4E8 38 00 00 01 */ li r0, 1 /* 80422F2C 003EC4EC 98 1A 01 22 */ stb r0, 0x122(r26) lbl_80422F30: @@ -703,8 +703,8 @@ lbl_80422F40: /* 80422F50 003EC510 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80422F54 003EC514 4E 80 00 20 */ blr -.global func_80422F58 -func_80422F58: +.global Stop__Q44nw4r3snd6detail10StrmPlayerFv +Stop__Q44nw4r3snd6detail10StrmPlayerFv: /* 80422F58 003EC518 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80422F5C 003EC51C 7C 08 02 A6 */ mflr r0 /* 80422F60 003EC520 90 01 00 24 */ stw r0, 0x24(r1) @@ -739,14 +739,14 @@ lbl_80422FA0: lbl_80422FCC: /* 80422FCC 003EC58C 4B FF E3 19 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80422FD0 003EC590 7F 84 E3 78 */ mr r4, r28 -/* 80422FD4 003EC594 4B FF E8 45 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 80422FD4 003EC594 4B FF E8 45 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback lbl_80422FD8: /* 80422FD8 003EC598 4B FF E3 0D */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80422FDC 003EC59C 38 63 03 54 */ addi r3, r3, 0x354 /* 80422FE0 003EC5A0 4B F3 6D 61 */ bl OSUnlockMutex /* 80422FE4 003EC5A4 48 00 27 E1 */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 80422FE8 003EC5A8 38 9F 01 74 */ addi r4, r31, 0x174 -/* 80422FEC 003EC5AC 48 00 2C B1 */ bl func_80425C9C +/* 80422FEC 003EC5AC 48 00 2C B1 */ bl CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task /* 80422FF0 003EC5B0 4B F3 59 C1 */ bl OSDisableInterrupts /* 80422FF4 003EC5B4 80 1F 01 94 */ lwz r0, 0x194(r31) /* 80422FF8 003EC5B8 7C 7E 1B 78 */ mr r30, r3 @@ -757,7 +757,7 @@ lbl_80423008: /* 80423008 003EC5C8 83 BF 01 9C */ lwz r29, 0x19c(r31) /* 8042300C 003EC5CC 48 00 27 B9 */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 80423010 003EC5D0 38 9D FF D4 */ addi r4, r29, -44 -/* 80423014 003EC5D4 48 00 2C 89 */ bl func_80425C9C +/* 80423014 003EC5D4 48 00 2C 89 */ bl CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task lbl_80423018: /* 80423018 003EC5D8 80 1F 01 94 */ lwz r0, 0x194(r31) /* 8042301C 003EC5DC 2C 00 00 00 */ cmpwi r0, 0 @@ -834,8 +834,8 @@ lbl_804230EC: /* 80423118 003EC6D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8042311C 003EC6DC 4E 80 00 20 */ blr -.global func_80423120 -func_80423120: +.global Pause__Q44nw4r3snd6detail10StrmPlayerFb +Pause__Q44nw4r3snd6detail10StrmPlayerFb: /* 80423120 003EC6E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80423124 003EC6E4 7C 08 02 A6 */ mflr r0 /* 80423128 003EC6E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -853,7 +853,7 @@ func_80423120: /* 80423158 003EC718 98 1E 01 29 */ stb r0, 0x129(r30) lbl_8042315C: /* 8042315C 003EC71C 7F C3 F3 78 */ mr r3, r30 -/* 80423160 003EC720 48 00 17 C1 */ bl func_80424920 +/* 80423160 003EC720 48 00 17 C1 */ bl UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv /* 80423164 003EC724 4B FF E1 81 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 80423168 003EC728 38 63 03 54 */ addi r3, r3, 0x354 /* 8042316C 003EC72C 4B F3 6B D5 */ bl OSUnlockMutex @@ -864,14 +864,14 @@ lbl_8042315C: /* 80423180 003EC740 38 21 00 10 */ addi r1, r1, 0x10 /* 80423184 003EC744 4E 80 00 20 */ blr -.global func_80423188 -func_80423188: +.global InitParam__Q44nw4r3snd6detail10StrmPlayerFv +InitParam__Q44nw4r3snd6detail10StrmPlayerFv: /* 80423188 003EC748 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042318C 003EC74C 7C 08 02 A6 */ mflr r0 /* 80423190 003EC750 90 01 00 14 */ stw r0, 0x14(r1) /* 80423194 003EC754 93 E1 00 0C */ stw r31, 0xc(r1) /* 80423198 003EC758 7C 7F 1B 78 */ mr r31, r3 -/* 8042319C 003EC75C 4B FE F2 49 */ bl func_804123E4 +/* 8042319C 003EC75C 4B FE F2 49 */ bl InitParam__Q44nw4r3snd6detail11BasicPlayerFv /* 804231A0 003EC760 C0 22 C4 F8 */ lfs f1, lbl_8066C878@sda21(r2) /* 804231A4 003EC764 38 60 00 00 */ li r3, 0 /* 804231A8 003EC768 C0 02 C4 E0 */ lfs f0, lbl_8066C860@sda21(r2) @@ -944,8 +944,8 @@ func_80423188: /* 804232B4 003EC874 38 21 00 10 */ addi r1, r1, 0x10 /* 804232B8 003EC878 4E 80 00 20 */ blr -.global func_804232BC -func_804232BC: +.global LoadHeader__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei +LoadHeader__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei: /* 804232BC 003EC87C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 804232C0 003EC880 7C 08 02 A6 */ mflr r0 /* 804232C4 003EC884 90 01 00 74 */ stw r0, 0x74(r1) @@ -961,12 +961,12 @@ func_804232BC: /* 804232EC 003EC8AC 4B F3 69 75 */ bl OSLockMutex /* 804232F0 003EC8B0 93 61 00 08 */ stw r27, 8(r1) /* 804232F4 003EC8B4 38 61 00 0C */ addi r3, r1, 0xc -/* 804232F8 003EC8B8 4B FF E8 F1 */ bl func_80421BE8 +/* 804232F8 003EC8B8 4B FF E8 F1 */ bl __ct__Q44nw4r3snd6detail14StrmFileReaderFv /* 804232FC 003EC8BC 3C 80 80 65 */ lis r4, lbl_80653000@ha /* 80423300 003EC8C0 38 61 00 08 */ addi r3, r1, 8 /* 80423304 003EC8C4 38 84 30 00 */ addi r4, r4, lbl_80653000@l /* 80423308 003EC8C8 38 A0 40 00 */ li r5, 0x4000 -/* 8042330C 003EC8CC 4B FF EC C5 */ bl func_80421FD0 +/* 8042330C 003EC8CC 4B FF EC C5 */ bl LoadFileHeader__Q44nw4r3snd6detail14StrmFileLoaderFPvUl /* 80423310 003EC8D0 2C 03 00 00 */ cmpwi r3, 0 /* 80423314 003EC8D4 40 82 00 14 */ bne lbl_80423328 /* 80423318 003EC8D8 7F E3 FB 78 */ mr r3, r31 @@ -976,7 +976,7 @@ func_804232BC: lbl_80423328: /* 80423328 003EC8E8 38 61 00 08 */ addi r3, r1, 8 /* 8042332C 003EC8EC 38 9D 00 E0 */ addi r4, r29, 0xe0 -/* 80423330 003EC8F0 4B FF EE AD */ bl func_804221DC +/* 80423330 003EC8F0 4B FF EE AD */ bl ReadStrmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo /* 80423334 003EC8F4 2C 03 00 00 */ cmpwi r3, 0 /* 80423338 003EC8F8 40 82 00 14 */ bne lbl_8042334C /* 8042333C 003EC8FC 7F E3 FB 78 */ mr r3, r31 @@ -988,7 +988,7 @@ lbl_8042334C: /* 80423350 003EC910 2C 00 00 00 */ cmpwi r0, 0 /* 80423354 003EC914 40 82 00 1C */ bne lbl_80423370 /* 80423358 003EC918 38 61 00 08 */ addi r3, r1, 8 -/* 8042335C 003EC91C 4B FF EE 39 */ bl func_80422194 +/* 8042335C 003EC91C 4B FF EE 39 */ bl GetChannelCount__Q44nw4r3snd6detail14StrmFileLoaderCFv /* 80423360 003EC920 2C 03 00 10 */ cmpwi r3, 0x10 /* 80423364 003EC924 40 81 00 08 */ ble lbl_8042336C /* 80423368 003EC928 38 60 00 10 */ li r3, 0x10 @@ -1003,7 +1003,7 @@ lbl_8042337C: /* 80423380 003EC940 7F 65 DB 78 */ mr r5, r27 /* 80423384 003EC944 38 61 00 08 */ addi r3, r1, 8 /* 80423388 003EC948 38 84 0B 80 */ addi r4, r4, 0xb80 -/* 8042338C 003EC94C 4B FF EE 8D */ bl func_80422218 +/* 8042338C 003EC94C 4B FF EE 8D */ bl ReadStrmTrackInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ54nw4r3snd6detail14StrmFileReader13StrmTrackInfoi /* 80423390 003EC950 2C 03 00 00 */ cmpwi r3, 0 /* 80423394 003EC954 40 82 00 14 */ bne lbl_804233A8 /* 80423398 003EC958 7F E3 FB 78 */ mr r3, r31 @@ -1031,7 +1031,7 @@ lbl_804233DC: /* 804233E4 003EC9A4 38 85 08 3C */ addi r4, r5, 0x83c /* 804233E8 003EC9A8 38 61 00 08 */ addi r3, r1, 8 /* 804233EC 003EC9AC 38 A5 08 64 */ addi r5, r5, 0x864 -/* 804233F0 003EC9B0 4B FF EE 65 */ bl func_80422254 +/* 804233F0 003EC9B0 4B FF EE 65 */ bl ReadAdpcmInfo__Q44nw4r3snd6detail14StrmFileLoaderCFPQ44nw4r3snd6detail10AdpcmParamPQ44nw4r3snd6detail14AdpcmLoopParami /* 804233F4 003EC9B4 2C 03 00 00 */ cmpwi r3, 0 /* 804233F8 003EC9B8 40 82 00 14 */ bne lbl_8042340C /* 804233FC 003EC9BC 7F E3 FB 78 */ mr r3, r31 @@ -1068,7 +1068,7 @@ lbl_8042345C: /* 80423468 003ECA28 38 81 00 38 */ addi r4, r1, 0x38 /* 8042346C 003ECA2C 7C DE 03 D6 */ divw r6, r30, r0 /* 80423470 003ECA30 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80423474 003ECA34 4B FF EF 71 */ bl func_804223E4 +/* 80423474 003ECA34 4B FF EF 71 */ bl ReadAdpcBlockData__Q44nw4r3snd6detail14StrmFileLoaderFPUsPUsii /* 80423478 003ECA38 2C 03 00 00 */ cmpwi r3, 0 /* 8042347C 003ECA3C 40 82 00 14 */ bne lbl_80423490 /* 80423480 003ECA40 7F E3 FB 78 */ mr r3, r31 @@ -1097,7 +1097,7 @@ lbl_804234C8: /* 804234D0 003ECA90 41 80 FF D8 */ blt lbl_804234A8 lbl_804234D4: /* 804234D4 003ECA94 7F A3 EB 78 */ mr r3, r29 -/* 804234D8 003ECA98 48 00 03 05 */ bl func_804237DC +/* 804234D8 003ECA98 48 00 03 05 */ bl SetupPlayer__Q44nw4r3snd6detail10StrmPlayerFv /* 804234DC 003ECA9C 2C 03 00 00 */ cmpwi r3, 0 /* 804234E0 003ECAA0 40 82 00 14 */ bne lbl_804234F4 /* 804234E4 003ECAA4 7F E3 FB 78 */ mr r3, r31 @@ -1111,7 +1111,7 @@ lbl_804234F4: /* 80423500 003ECAC0 48 00 00 28 */ b lbl_80423528 lbl_80423504: /* 80423504 003ECAC4 7F A3 EB 78 */ mr r3, r29 -/* 80423508 003ECAC8 48 00 11 ED */ bl func_804246F4 +/* 80423508 003ECAC8 48 00 11 ED */ bl UpdateLoadingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv /* 8042350C 003ECACC 80 7D 01 34 */ lwz r3, 0x134(r29) /* 80423510 003ECAD0 88 1D 01 2E */ lbz r0, 0x12e(r29) /* 80423514 003ECAD4 38 63 00 01 */ addi r3, r3, 1 @@ -1132,7 +1132,7 @@ lbl_80423534: /* 80423548 003ECB08 40 82 00 10 */ bne lbl_80423558 /* 8042354C 003ECB0C 7F A3 EB 78 */ mr r3, r29 /* 80423550 003ECB10 38 84 FF FF */ addi r4, r4, -1 -/* 80423554 003ECB14 48 00 10 B1 */ bl func_80424604 +/* 80423554 003ECB14 48 00 10 B1 */ bl SetLoopEndToZeroBuffer__Q44nw4r3snd6detail10StrmPlayerFi lbl_80423558: /* 80423558 003ECB18 7F E3 FB 78 */ mr r3, r31 /* 8042355C 003ECB1C 4B F3 67 E5 */ bl OSUnlockMutex @@ -1145,8 +1145,8 @@ lbl_80423564: /* 80423574 003ECB34 38 21 00 70 */ addi r1, r1, 0x70 /* 80423578 003ECB38 4E 80 00 20 */ blr -.global func_8042357C -func_8042357C: +.global LoadStreamData__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamiUlUlib +LoadStreamData__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamiUlUlib: /* 8042357C 003ECB3C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80423580 003ECB40 7C 08 02 A6 */ mflr r0 /* 80423584 003ECB44 90 01 00 74 */ stw r0, 0x74(r1) @@ -1320,8 +1320,8 @@ lbl_804237C4: /* 804237D4 003ECD94 38 21 00 70 */ addi r1, r1, 0x70 /* 804237D8 003ECD98 4E 80 00 20 */ blr -.global func_804237DC -func_804237DC: +.global SetupPlayer__Q44nw4r3snd6detail10StrmPlayerFv +SetupPlayer__Q44nw4r3snd6detail10StrmPlayerFv: /* 804237DC 003ECD9C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804237E0 003ECDA0 7C 08 02 A6 */ mflr r0 /* 804237E4 003ECDA4 90 01 00 34 */ stw r0, 0x34(r1) @@ -1337,7 +1337,7 @@ func_804237DC: /* 8042380C 003ECDCC 90 01 00 10 */ stw r0, 0x10(r1) /* 80423810 003ECDD0 90 01 00 0C */ stw r0, 0xc(r1) /* 80423814 003ECDD4 90 01 00 08 */ stw r0, 8(r1) -/* 80423818 003ECDD8 48 00 11 BD */ bl func_804249D4 +/* 80423818 003ECDD8 48 00 11 BD */ bl CalcStartOffset__Q44nw4r3snd6detail10StrmPlayerFPlPUlPl /* 8042381C 003ECDDC 2C 03 00 00 */ cmpwi r3, 0 /* 80423820 003ECDE0 40 82 00 0C */ bne lbl_8042382C /* 80423824 003ECDE4 38 60 00 00 */ li r3, 0 @@ -1465,8 +1465,8 @@ lbl_804239BC: /* 804239CC 003ECF8C 38 21 00 30 */ addi r1, r1, 0x30 /* 804239D0 003ECF90 4E 80 00 20 */ blr -.global func_804239D4 -func_804239D4: +.global AllocVoices__Q44nw4r3snd6detail10StrmPlayerFi +AllocVoices__Q44nw4r3snd6detail10StrmPlayerFi: /* 804239D4 003ECF94 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804239D8 003ECF98 7C 08 02 A6 */ mflr r0 /* 804239DC 003ECF9C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1479,7 +1479,7 @@ func_804239D4: /* 804239F8 003ECFB8 7C 7F 1B 78 */ mr r31, r3 /* 804239FC 003ECFBC 7F 7C DB 78 */ mr r28, r27 /* 80423A00 003ECFC0 3B 40 00 00 */ li r26, 0 -/* 80423A04 003ECFC4 3F A0 80 42 */ lis r29, func_80424AE0@ha +/* 80423A04 003ECFC4 3F A0 80 42 */ lis r29, VoiceCallbackFunc__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail5VoiceQ54nw4r3snd6detail5Voice19VoiceCallbackStatusPv@ha /* 80423A08 003ECFC8 3B C0 00 01 */ li r30, 1 /* 80423A0C 003ECFCC 48 00 00 84 */ b lbl_80423A90 lbl_80423A10: @@ -1490,7 +1490,7 @@ lbl_80423A10: /* 80423A20 003ECFE0 80 9C 00 0C */ lwz r4, 0xc(r28) /* 80423A24 003ECFE4 7F 25 CB 78 */ mr r5, r25 /* 80423A28 003ECFE8 7F 88 E3 78 */ mr r8, r28 -/* 80423A2C 003ECFEC 38 FD 4A E0 */ addi r7, r29, func_80424AE0@l +/* 80423A2C 003ECFEC 38 FD 4A E0 */ addi r7, r29, VoiceCallbackFunc__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail5VoiceQ54nw4r3snd6detail5Voice19VoiceCallbackStatusPv@l /* 80423A30 003ECFF0 38 C0 00 FF */ li r6, 0xff /* 80423A34 003ECFF4 48 00 54 B9 */ bl AllocVoice__Q44nw4r3snd6detail12VoiceManagerFiiiPFPQ44nw4r3snd6detail5VoiceQ54nw4r3snd6detail5Voice19VoiceCallbackStatusPv_vPv /* 80423A38 003ECFF8 2C 03 00 00 */ cmpwi r3, 0 @@ -1535,8 +1535,8 @@ lbl_80423AA8: /* 80423AB8 003ED078 38 21 00 30 */ addi r1, r1, 0x30 /* 80423ABC 003ED07C 4E 80 00 20 */ blr -.global func_80423AC0 -func_80423AC0: +.global Update__Q44nw4r3snd6detail10StrmPlayerFv +Update__Q44nw4r3snd6detail10StrmPlayerFv: /* 80423AC0 003ED080 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80423AC4 003ED084 7C 08 02 A6 */ mflr r0 /* 80423AC8 003ED088 90 01 00 24 */ stw r0, 0x24(r1) @@ -1634,7 +1634,7 @@ lbl_80423C00: /* 80423C08 003ED1C8 38 00 00 00 */ li r0, 0 /* 80423C0C 003ED1CC 7F E3 FB 78 */ mr r3, r31 /* 80423C10 003ED1D0 98 1F 01 29 */ stb r0, 0x129(r31) -/* 80423C14 003ED1D4 48 00 0D 0D */ bl func_80424920 +/* 80423C14 003ED1D4 48 00 0D 0D */ bl UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv lbl_80423C18: /* 80423C18 003ED1D8 88 1F 01 26 */ lbz r0, 0x126(r31) /* 80423C1C 003ED1DC 2C 00 00 00 */ cmpwi r0, 0 @@ -1648,7 +1648,7 @@ lbl_80423C2C: lbl_80423C38: /* 80423C38 003ED1F8 7F E3 FB 78 */ mr r3, r31 /* 80423C3C 003ED1FC 7F A4 EB 78 */ mr r4, r29 -/* 80423C40 003ED200 48 00 00 35 */ bl func_80423C74 +/* 80423C40 003ED200 48 00 00 35 */ bl UpdateVoiceParams__Q44nw4r3snd6detail10StrmPlayerFPQ54nw4r3snd6detail10StrmPlayer9StrmTrack /* 80423C44 003ED204 3B BD 00 38 */ addi r29, r29, 0x38 /* 80423C48 003ED208 3B DE 00 01 */ addi r30, r30, 1 lbl_80423C4C: @@ -1664,8 +1664,8 @@ lbl_80423C58: /* 80423C6C 003ED22C 38 21 00 20 */ addi r1, r1, 0x20 /* 80423C70 003ED230 4E 80 00 20 */ blr -.global func_80423C74 -func_80423C74: +.global UpdateVoiceParams__Q44nw4r3snd6detail10StrmPlayerFPQ54nw4r3snd6detail10StrmPlayer9StrmTrack +UpdateVoiceParams__Q44nw4r3snd6detail10StrmPlayerFPQ54nw4r3snd6detail10StrmPlayer9StrmTrack: /* 80423C74 003ED234 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 80423C78 003ED238 7C 08 02 A6 */ mflr r0 /* 80423C7C 003ED23C 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -1760,7 +1760,7 @@ lbl_80423DD4: /* 80423DD4 003ED394 D3 9A 00 00 */ stfs f28, 0(r26) /* 80423DD8 003ED398 7F C3 F3 78 */ mr r3, r30 /* 80423DDC 003ED39C 7F 64 DB 78 */ mr r4, r27 -/* 80423DE0 003ED3A0 4B FE E6 1D */ bl func_804123FC +/* 80423DE0 003ED3A0 4B FE E6 1D */ bl GetFxSend__Q44nw4r3snd6detail11BasicPlayerCFQ34nw4r3snd6AuxBus /* 80423DE4 003ED3A4 C0 1A 00 00 */ lfs f0, 0(r26) /* 80423DE8 003ED3A8 3B 7B 00 01 */ addi r27, r27, 1 /* 80423DEC 003ED3AC 2C 1B 00 03 */ cmpwi r27, 3 @@ -1776,19 +1776,19 @@ lbl_80423DD4: lbl_80423E14: /* 80423E14 003ED3D4 7F C3 F3 78 */ mr r3, r30 /* 80423E18 003ED3D8 7F 04 C3 78 */ mr r4, r24 -/* 80423E1C 003ED3DC 4B FE E6 15 */ bl func_80412430 +/* 80423E1C 003ED3DC 4B FE E6 15 */ bl GetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerCFi /* 80423E20 003ED3E0 D0 3B 00 00 */ stfs f1, 0(r27) /* 80423E24 003ED3E4 7F C3 F3 78 */ mr r3, r30 /* 80423E28 003ED3E8 7F 04 C3 78 */ mr r4, r24 /* 80423E2C 003ED3EC D3 9C 00 00 */ stfs f28, 0(r28) -/* 80423E30 003ED3F0 4B FE E6 11 */ bl func_80412440 +/* 80423E30 003ED3F0 4B FE E6 11 */ bl GetRemoteSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 80423E34 003ED3F4 C0 1C 00 00 */ lfs f0, 0(r28) /* 80423E38 003ED3F8 7F C3 F3 78 */ mr r3, r30 /* 80423E3C 003ED3FC D3 9A 00 00 */ stfs f28, 0(r26) /* 80423E40 003ED400 7F 04 C3 78 */ mr r4, r24 /* 80423E44 003ED404 EC 00 08 2A */ fadds f0, f0, f1 /* 80423E48 003ED408 D0 1C 00 00 */ stfs f0, 0(r28) -/* 80423E4C 003ED40C 4B FE E6 05 */ bl func_80412450 +/* 80423E4C 003ED40C 4B FE E6 05 */ bl GetRemoteFxSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 80423E50 003ED410 C0 1A 00 00 */ lfs f0, 0(r26) /* 80423E54 003ED414 3B 18 00 01 */ addi r24, r24, 1 /* 80423E58 003ED418 2C 18 00 04 */ cmpwi r24, 4 @@ -1909,8 +1909,8 @@ lbl_80423FBC: /* 8042400C 003ED5CC 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80424010 003ED5D0 4E 80 00 20 */ blr -.global func_80424014 -func_80424014: +.global UpdateBuffer__Q44nw4r3snd6detail10StrmPlayerFv +UpdateBuffer__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424014 003ED5D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424018 003ED5D8 7C 08 02 A6 */ mflr r0 /* 8042401C 003ED5DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1972,7 +1972,7 @@ lbl_804240D4: /* 804240DC 003ED69C 38 00 00 01 */ li r0, 1 /* 804240E0 003ED6A0 7F E3 FB 78 */ mr r3, r31 /* 804240E4 003ED6A4 98 1F 01 29 */ stb r0, 0x129(r31) -/* 804240E8 003ED6A8 48 00 08 39 */ bl func_80424920 +/* 804240E8 003ED6A8 48 00 08 39 */ bl UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv lbl_804240EC: /* 804240EC 003ED6AC 88 1F 01 2D */ lbz r0, 0x12d(r31) /* 804240F0 003ED6B0 2C 00 00 00 */ cmpwi r0, 0 @@ -2004,13 +2004,13 @@ lbl_80424124: /* 80424154 003ED714 7F E3 FB 78 */ mr r3, r31 /* 80424158 003ED718 98 1F 01 26 */ stb r0, 0x126(r31) /* 8042415C 003ED71C 98 1F 01 29 */ stb r0, 0x129(r31) -/* 80424160 003ED720 48 00 07 C1 */ bl func_80424920 +/* 80424160 003ED720 48 00 07 C1 */ bl UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv /* 80424164 003ED724 48 00 00 20 */ b lbl_80424184 lbl_80424168: /* 80424168 003ED728 7F E3 FB 78 */ mr r3, r31 -/* 8042416C 003ED72C 48 00 01 41 */ bl func_804242AC +/* 8042416C 003ED72C 48 00 01 41 */ bl UpdatePlayingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv /* 80424170 003ED730 7F E3 FB 78 */ mr r3, r31 -/* 80424174 003ED734 48 00 05 81 */ bl func_804246F4 +/* 80424174 003ED734 48 00 05 81 */ bl UpdateLoadingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv lbl_80424178: /* 80424178 003ED738 80 1F 01 58 */ lwz r0, 0x158(r31) /* 8042417C 003ED73C 7C 00 E0 00 */ cmpw r0, r28 @@ -2025,8 +2025,8 @@ lbl_80424184: /* 8042419C 003ED75C 38 21 00 20 */ addi r1, r1, 0x20 /* 804241A0 003ED760 4E 80 00 20 */ blr -.global func_804241A4 -func_804241A4: +.global UpdateLoopAddress__Q44nw4r3snd6detail10StrmPlayerFUlUl +UpdateLoopAddress__Q44nw4r3snd6detail10StrmPlayerFUlUl: /* 804241A4 003ED764 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804241A8 003ED768 7C 08 02 A6 */ mflr r0 /* 804241AC 003ED76C 90 01 00 34 */ stw r0, 0x34(r1) @@ -2102,8 +2102,8 @@ lbl_80424280: /* 804242A4 003ED864 38 21 00 30 */ addi r1, r1, 0x30 /* 804242A8 003ED868 4E 80 00 20 */ blr -.global func_804242AC -func_804242AC: +.global UpdatePlayingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv +UpdatePlayingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv: /* 804242AC 003ED86C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804242B0 003ED870 7C 08 02 A6 */ mflr r0 /* 804242B4 003ED874 90 01 00 34 */ stw r0, 0x34(r1) @@ -2134,7 +2134,7 @@ lbl_8042430C: /* 80424314 003ED8D4 80 1F 01 08 */ lwz r0, 0x108(r31) /* 80424318 003ED8D8 38 80 00 00 */ li r4, 0 /* 8042431C 003ED8DC 7C A5 01 D6 */ mullw r5, r5, r0 -/* 80424320 003ED8E0 4B FF FE 85 */ bl func_804241A4 +/* 80424320 003ED8E0 4B FF FE 85 */ bl UpdateLoopAddress__Q44nw4r3snd6detail10StrmPlayerFUlUl lbl_80424324: /* 80424324 003ED8E4 80 7F 01 58 */ lwz r3, 0x158(r31) /* 80424328 003ED8E8 80 1F 01 54 */ lwz r0, 0x154(r31) @@ -2150,7 +2150,7 @@ lbl_80424324: /* 80424350 003ED910 38 80 00 00 */ li r4, 0 /* 80424354 003ED914 7C A6 01 D6 */ mullw r5, r6, r0 /* 80424358 003ED918 90 DF 01 54 */ stw r6, 0x154(r31) -/* 8042435C 003ED91C 4B FF FE 49 */ bl func_804241A4 +/* 8042435C 003ED91C 4B FF FE 49 */ bl UpdateLoopAddress__Q44nw4r3snd6detail10StrmPlayerFUlUl lbl_80424360: /* 80424360 003ED920 80 7F 01 54 */ lwz r3, 0x154(r31) /* 80424364 003ED924 80 9F 01 58 */ lwz r4, 0x158(r31) @@ -2237,7 +2237,7 @@ lbl_8042446C: /* 80424480 003EDA40 80 9F 01 58 */ lwz r4, 0x158(r31) /* 80424484 003EDA44 7F E3 FB 78 */ mr r3, r31 /* 80424488 003EDA48 38 84 00 01 */ addi r4, r4, 1 -/* 8042448C 003EDA4C 48 00 00 1D */ bl func_804244A8 +/* 8042448C 003EDA4C 48 00 00 1D */ bl UpdateDataLoopAddress__Q44nw4r3snd6detail10StrmPlayerFl lbl_80424490: /* 80424490 003EDA50 39 61 00 30 */ addi r11, r1, 0x30 /* 80424494 003EDA54 4B E9 5D 05 */ bl _restgpr_25 @@ -2246,8 +2246,8 @@ lbl_80424490: /* 804244A0 003EDA60 38 21 00 30 */ addi r1, r1, 0x30 /* 804244A4 003EDA64 4E 80 00 20 */ blr -.global func_804244A8 -func_804244A8: +.global UpdateDataLoopAddress__Q44nw4r3snd6detail10StrmPlayerFl +UpdateDataLoopAddress__Q44nw4r3snd6detail10StrmPlayerFl: /* 804244A8 003EDA68 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804244AC 003EDA6C 7C 08 02 A6 */ mflr r0 /* 804244B0 003EDA70 90 01 00 34 */ stw r0, 0x34(r1) @@ -2272,7 +2272,7 @@ lbl_804244E4: /* 804244F8 003EDAB8 7C 1F 21 D6 */ mullw r0, r31, r4 /* 804244FC 003EDABC 7C 9C 21 D6 */ mullw r4, r28, r4 /* 80424500 003EDAC0 7C A5 02 14 */ add r5, r5, r0 -/* 80424504 003EDAC4 4B FF FC A1 */ bl func_804241A4 +/* 80424504 003EDAC4 4B FF FC A1 */ bl UpdateLoopAddress__Q44nw4r3snd6detail10StrmPlayerFUlUl /* 80424508 003EDAC8 80 1E 00 E0 */ lwz r0, 0xe0(r30) /* 8042450C 003EDACC 2C 00 00 03 */ cmpwi r0, 3 /* 80424510 003EDAD0 40 82 00 CC */ bne lbl_804245DC @@ -2339,7 +2339,7 @@ lbl_804245DC: /* 804245E0 003EDBA0 4B F3 44 11 */ bl OSRestoreInterrupts /* 804245E4 003EDBA4 48 00 00 08 */ b lbl_804245EC lbl_804245E8: -/* 804245E8 003EDBA8 48 00 00 1D */ bl func_80424604 +/* 804245E8 003EDBA8 48 00 00 1D */ bl SetLoopEndToZeroBuffer__Q44nw4r3snd6detail10StrmPlayerFi lbl_804245EC: /* 804245EC 003EDBAC 39 61 00 30 */ addi r11, r1, 0x30 /* 804245F0 003EDBB0 4B E9 5B A9 */ bl _restgpr_25 @@ -2348,8 +2348,8 @@ lbl_804245EC: /* 804245FC 003EDBBC 38 21 00 30 */ addi r1, r1, 0x30 /* 80424600 003EDBC0 4E 80 00 20 */ blr -.global func_80424604 -func_80424604: +.global SetLoopEndToZeroBuffer__Q44nw4r3snd6detail10StrmPlayerFi +SetLoopEndToZeroBuffer__Q44nw4r3snd6detail10StrmPlayerFi: /* 80424604 003EDBC4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80424608 003EDBC8 7C 08 02 A6 */ mflr r0 /* 8042460C 003EDBCC 90 01 00 34 */ stw r0, 0x34(r1) @@ -2419,8 +2419,8 @@ lbl_804246C0: /* 804246EC 003EDCAC 38 21 00 30 */ addi r1, r1, 0x30 /* 804246F0 003EDCB0 4E 80 00 20 */ blr -.global func_804246F4 -func_804246F4: +.global UpdateLoadingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv +UpdateLoadingBlockIndex__Q44nw4r3snd6detail10StrmPlayerFv: /* 804246F4 003EDCB4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804246F8 003EDCB8 7C 08 02 A6 */ mflr r0 /* 804246FC 003EDCBC 90 01 00 34 */ stw r0, 0x34(r1) @@ -2516,7 +2516,7 @@ lbl_8042484C: /* 8042484C 003EDE0C 48 00 0F 79 */ bl GetInstance__Q44nw4r3snd6detail11TaskManagerFv /* 80424850 003EDE10 7F 84 E3 78 */ mr r4, r28 /* 80424854 003EDE14 7F E5 FB 78 */ mr r5, r31 -/* 80424858 003EDE18 48 00 10 E5 */ bl func_8042593C +/* 80424858 003EDE18 48 00 10 E5 */ bl AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority /* 8042485C 003EDE1C 80 7D 01 50 */ lwz r3, 0x150(r29) /* 80424860 003EDE20 80 1D 01 64 */ lwz r0, 0x164(r29) /* 80424864 003EDE24 38 63 00 01 */ addi r3, r3, 1 @@ -2572,8 +2572,8 @@ lbl_80424908: /* 80424918 003EDED8 38 21 00 30 */ addi r1, r1, 0x30 /* 8042491C 003EDEDC 4E 80 00 20 */ blr -.global func_80424920 -func_80424920: +.global UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv +UpdatePauseStatus__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424920 003EDEE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424924 003EDEE4 7C 08 02 A6 */ mflr r0 /* 80424928 003EDEE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2626,8 +2626,8 @@ lbl_804249B4: /* 804249CC 003EDF8C 38 21 00 20 */ addi r1, r1, 0x20 /* 804249D0 003EDF90 4E 80 00 20 */ blr -.global func_804249D4 -func_804249D4: +.global CalcStartOffset__Q44nw4r3snd6detail10StrmPlayerFPlPUlPl +CalcStartOffset__Q44nw4r3snd6detail10StrmPlayerFPlPUlPl: /* 804249D4 003EDF94 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804249D8 003EDF98 7C 08 02 A6 */ mflr r0 /* 804249DC 003EDF9C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2702,8 +2702,8 @@ lbl_80424AC0: /* 80424AD8 003EE098 38 21 00 20 */ addi r1, r1, 0x20 /* 80424ADC 003EE09C 4E 80 00 20 */ blr -.global func_80424AE0 -func_80424AE0: +.global VoiceCallbackFunc__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail5VoiceQ54nw4r3snd6detail5Voice19VoiceCallbackStatusPv +VoiceCallbackFunc__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail5VoiceQ54nw4r3snd6detail5Voice19VoiceCallbackStatusPv: /* 80424AE0 003EE0A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424AE4 003EE0A4 7C 08 02 A6 */ mflr r0 /* 80424AE8 003EE0A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2752,8 +2752,8 @@ lbl_80424B64: /* 80424B7C 003EE13C 38 21 00 20 */ addi r1, r1, 0x20 /* 80424B80 003EE140 4E 80 00 20 */ blr -.global func_80424B84 -func_80424B84: +.global SetTrackVolume__Q44nw4r3snd6detail10StrmPlayerFUlf +SetTrackVolume__Q44nw4r3snd6detail10StrmPlayerFUlf: /* 80424B84 003EE144 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424B88 003EE148 7C 08 02 A6 */ mflr r0 /* 80424B8C 003EE14C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2791,8 +2791,9 @@ lbl_80424BE4: /* 80424BFC 003EE1BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80424C00 003EE1C0 4E 80 00 20 */ blr -.global func_80424C04 -func_80424C04: +#GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerCFi or GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerFi +.global GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerFi +GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerFi: /* 80424C04 003EE1C4 2C 04 00 07 */ cmpwi r4, 7 /* 80424C08 003EE1C8 40 81 00 0C */ ble lbl_80424C14 /* 80424C0C 003EE1CC 38 60 00 00 */ li r3, 0 @@ -2803,8 +2804,8 @@ lbl_80424C14: /* 80424C1C 003EE1DC 38 63 0B 78 */ addi r3, r3, 0xb78 /* 80424C20 003EE1E0 4E 80 00 20 */ blr -.global func_80424C24 -func_80424C24: +.global Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv +Execute__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv: /* 80424C24 003EE1E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80424C28 003EE1E8 7C 08 02 A6 */ mflr r0 /* 80424C2C 003EE1EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2814,7 +2815,7 @@ func_80424C24: /* 80424C3C 003EE1FC 80 9F 00 14 */ lwz r4, 0x14(r31) /* 80424C40 003EE200 80 BF 00 18 */ lwz r5, 0x18(r31) /* 80424C44 003EE204 80 DF 00 1C */ lwz r6, 0x1c(r31) -/* 80424C48 003EE208 4B FF E6 75 */ bl func_804232BC +/* 80424C48 003EE208 4B FF E6 75 */ bl LoadHeader__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei /* 80424C4C 003EE20C 2C 03 00 00 */ cmpwi r3, 0 /* 80424C50 003EE210 40 82 00 10 */ bne lbl_80424C60 /* 80424C54 003EE214 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -2827,12 +2828,12 @@ lbl_80424C60: /* 80424C6C 003EE22C 38 21 00 10 */ addi r1, r1, 0x10 /* 80424C70 003EE230 4E 80 00 20 */ blr -.global func_80424C74 -func_80424C74: +.global Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv +Cancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv: /* 80424C74 003EE234 4E 80 00 20 */ blr -.global func_80424C78 -func_80424C78: +.global OnCancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv +OnCancel__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTaskFv: /* 80424C78 003EE238 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80424C7C 003EE23C 7C 08 02 A6 */ mflr r0 /* 80424C80 003EE240 90 01 00 14 */ stw r0, 0x14(r1) @@ -2878,8 +2879,8 @@ lbl_80424D0C: /* 80424D18 003EE2D8 38 21 00 10 */ addi r1, r1, 0x10 /* 80424D1C 003EE2DC 4E 80 00 20 */ blr -.global func_80424D20 -func_80424D20: +.global __ct__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv +__ct__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv: /* 80424D20 003EE2E0 3C 80 80 57 */ lis r4, lbl_8056E5A0@ha /* 80424D24 003EE2E4 38 A0 00 00 */ li r5, 0 /* 80424D28 003EE2E8 38 84 E5 A0 */ addi r4, r4, lbl_8056E5A0@l @@ -2899,8 +2900,8 @@ func_80424D20: /* 80424D60 003EE320 90 A3 00 30 */ stw r5, 0x30(r3) /* 80424D64 003EE324 4E 80 00 20 */ blr -.global func_80424D68 -func_80424D68: +.global Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv +Execute__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv: /* 80424D68 003EE328 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424D6C 003EE32C 7C 08 02 A6 */ mflr r0 /* 80424D70 003EE330 90 01 00 24 */ stw r0, 0x24(r1) @@ -2915,7 +2916,7 @@ func_80424D68: /* 80424D94 003EE354 80 FD 00 20 */ lwz r7, 0x20(r29) /* 80424D98 003EE358 81 1D 00 24 */ lwz r8, 0x24(r29) /* 80424D9C 003EE35C 89 3D 00 28 */ lbz r9, 0x28(r29) -/* 80424DA0 003EE360 4B FF E7 DD */ bl func_8042357C +/* 80424DA0 003EE360 4B FF E7 DD */ bl LoadStreamData__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamiUlUlib /* 80424DA4 003EE364 2C 03 00 00 */ cmpwi r3, 0 /* 80424DA8 003EE368 40 82 00 10 */ bne lbl_80424DB8 /* 80424DAC 003EE36C 80 7D 00 10 */ lwz r3, 0x10(r29) @@ -2956,8 +2957,8 @@ lbl_80424E04: /* 80424E30 003EE3F0 38 21 00 20 */ addi r1, r1, 0x20 /* 80424E34 003EE3F4 4E 80 00 20 */ blr -.global func_80424E38 -func_80424E38: +.global Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv +Cancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv: /* 80424E38 003EE3F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80424E3C 003EE3FC 7C 08 02 A6 */ mflr r0 /* 80424E40 003EE400 90 01 00 24 */ stw r0, 0x24(r1) @@ -2995,8 +2996,8 @@ lbl_80424EA0: /* 80424EBC 003EE47C 38 21 00 20 */ addi r1, r1, 0x20 /* 80424EC0 003EE480 4E 80 00 20 */ blr -.global func_80424EC4 -func_80424EC4: +.global OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv +OnCancel__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTaskFv: /* 80424EC4 003EE484 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80424EC8 003EE488 7C 08 02 A6 */ mflr r0 /* 80424ECC 003EE48C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3042,47 +3043,56 @@ lbl_80424F58: /* 80424F64 003EE524 38 21 00 10 */ addi r1, r1, 0x10 /* 80424F68 003EE528 4E 80 00 20 */ blr -.global func_80424F6C -func_80424F6C: -/* 80424F6C 003EE52C 4B FF EB 54 */ b func_80423AC0 -.global lbl_80424F70 -lbl_80424F70: -/* 80424F70 003EE530 4B FF F0 A4 */ b func_80424014 -.global lbl_80424F74 -lbl_80424F74: +.global OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: +/* 80424F6C 003EE52C 4B FF EB 54 */ b Update__Q44nw4r3snd6detail10StrmPlayerFv + +.global OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: +/* 80424F70 003EE530 4B FF F0 A4 */ b UpdateBuffer__Q44nw4r3snd6detail10StrmPlayerFv + +.global OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424F74 003EE534 81 83 00 00 */ lwz r12, 0(r3) /* 80424F78 003EE538 81 8C 00 10 */ lwz r12, 0x10(r12) /* 80424F7C 003EE53C 7D 89 03 A6 */ mtctr r12 /* 80424F80 003EE540 4E 80 04 20 */ bctr -.global func_80424F84 -func_80424F84: +.global IsPause__Q44nw4r3snd6detail10StrmPlayerCFv +IsPause__Q44nw4r3snd6detail10StrmPlayerCFv: /* 80424F84 003EE544 88 63 01 27 */ lbz r3, 0x127(r3) /* 80424F88 003EE548 4E 80 00 20 */ blr -.global func_80424F8C -func_80424F8C: +.global IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv +IsStarted__Q44nw4r3snd6detail10StrmPlayerCFv: /* 80424F8C 003EE54C 88 63 01 22 */ lbz r3, 0x122(r3) /* 80424F90 003EE550 4E 80 00 20 */ blr -.global func_80424F94 -func_80424F94: +.global IsActive__Q44nw4r3snd6detail10StrmPlayerCFv +IsActive__Q44nw4r3snd6detail10StrmPlayerCFv: /* 80424F94 003EE554 88 63 01 21 */ lbz r3, 0x121(r3) /* 80424F98 003EE558 4E 80 00 20 */ blr -.global func_80424F9C -func_80424F9C: +#@208@OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +.global _208_OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +_208_OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424F9C 003EE55C 38 63 FF 2C */ addi r3, r3, -212 -/* 80424FA0 003EE560 4B FF FF D4 */ b lbl_80424F74 -.global lbl_80424FA4 -lbl_80424FA4: +/* 80424FA0 003EE560 4B FF FF D4 */ b OnShutdownSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + +#@208@OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +.global _208_OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +_208_OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424FA4 003EE564 38 63 FF 2C */ addi r3, r3, -212 -/* 80424FA8 003EE568 4B FF FF C8 */ b lbl_80424F70 -.global lbl_80424FAC -lbl_80424FAC: +/* 80424FA8 003EE568 4B FF FF C8 */ b OnUpdateVoiceSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + +#@208@OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +.global _208_OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv +_208_OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424FAC 003EE56C 38 63 FF 2C */ addi r3, r3, -212 -/* 80424FB0 003EE570 4B FF FF BC */ b func_80424F6C -.global lbl_80424FB4 -lbl_80424FB4: +/* 80424FB0 003EE570 4B FF FF BC */ b OnUpdateFrameSoundThread__Q44nw4r3snd6detail10StrmPlayerFv + +#@208@__dt__Q44nw4r3snd6detail10StrmPlayerFv +.global _208___dt__Q44nw4r3snd6detail10StrmPlayerFv +_208___dt__Q44nw4r3snd6detail10StrmPlayerFv: /* 80424FB4 003EE574 38 63 FF 2C */ addi r3, r3, -212 -/* 80424FB8 003EE578 4B FF D7 88 */ b func_80422740 +/* 80424FB8 003EE578 4B FF D7 88 */ b __dt__Q44nw4r3snd6detail10StrmPlayerFv diff --git a/asm/nw4r/snd/snd_StrmSound.s b/asm/nw4r/snd/snd_StrmSound.s index a21b3f0..d9d531e 100644 --- a/asm/nw4r/snd/snd_StrmSound.s +++ b/asm/nw4r/snd/snd_StrmSound.s @@ -2,8 +2,9 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80424FBC -func_80424FBC: +#__ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManagerii +.global __ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9StrmSound_ii +__ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9StrmSound_ii: /* 80424FBC 003EE57C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80424FC0 003EE580 7C 08 02 A6 */ mflr r0 /* 80424FC4 003EE584 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,12 +14,12 @@ func_80424FBC: /* 80424FD4 003EE594 7C 9E 23 78 */ mr r30, r4 /* 80424FD8 003EE598 7C A4 2B 78 */ mr r4, r5 /* 80424FDC 003EE59C 7C C5 33 78 */ mr r5, r6 -/* 80424FE0 003EE5A0 4B FE D4 C1 */ bl func_804124A0 +/* 80424FE0 003EE5A0 4B FE D4 C1 */ bl __ct__Q44nw4r3snd6detail10BasicSoundFii /* 80424FE4 003EE5A4 3C 80 80 57 */ lis r4, lbl_8056E5D0@ha /* 80424FE8 003EE5A8 38 7F 01 0C */ addi r3, r31, 0x10c /* 80424FEC 003EE5AC 38 84 E5 D0 */ addi r4, r4, lbl_8056E5D0@l /* 80424FF0 003EE5B0 90 9F 00 00 */ stw r4, 0(r31) -/* 80424FF4 003EE5B4 4B FF D5 A5 */ bl func_80422598 +/* 80424FF4 003EE5B4 4B FF D5 A5 */ bl __ct__Q44nw4r3snd6detail10StrmPlayerFv /* 80424FF8 003EE5B8 C0 02 C5 08 */ lfs f0, lbl_8066C888@sda21(r2) /* 80424FFC 003EE5BC 38 BF 0E 5C */ addi r5, r31, 0xe5c /* 80425000 003EE5C0 38 00 00 00 */ li r0, 0 @@ -140,14 +141,14 @@ lbl_8042519C: /* 804251B0 003EE770 38 21 00 10 */ addi r1, r1, 0x10 /* 804251B4 003EE774 4E 80 00 20 */ blr -.global func_804251B8 -func_804251B8: +.global InitParam__Q44nw4r3snd6detail9StrmSoundFv +InitParam__Q44nw4r3snd6detail9StrmSoundFv: /* 804251B8 003EE778 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804251BC 003EE77C 7C 08 02 A6 */ mflr r0 /* 804251C0 003EE780 90 01 00 24 */ stw r0, 0x24(r1) /* 804251C4 003EE784 93 E1 00 1C */ stw r31, 0x1c(r1) /* 804251C8 003EE788 7C 7F 1B 78 */ mr r31, r3 -/* 804251CC 003EE78C 4B FE D3 B1 */ bl func_8041257C +/* 804251CC 003EE78C 4B FE D3 B1 */ bl InitParam__Q44nw4r3snd6detail10BasicSoundFv /* 804251D0 003EE790 38 00 00 04 */ li r0, 4 /* 804251D4 003EE794 C0 C2 C5 08 */ lfs f6, lbl_8066C888@sda21(r2) /* 804251D8 003EE798 38 C0 00 00 */ li r6, 0 @@ -225,8 +226,8 @@ lbl_804252BC: /* 804252E4 003EE8A4 38 21 00 20 */ addi r1, r1, 0x20 /* 804252E8 003EE8A8 4E 80 00 20 */ blr -.global func_804252EC -func_804252EC: +.global Setup__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail14StrmBufferPooliUs +Setup__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail14StrmBufferPooliUs: /* 804252EC 003EE8AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804252F0 003EE8B0 7C 08 02 A6 */ mflr r0 /* 804252F4 003EE8B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -243,13 +244,13 @@ func_804252EC: /* 80425320 003EE8E0 7D 89 03 A6 */ mtctr r12 /* 80425324 003EE8E4 4E 80 04 21 */ bctrl /* 80425328 003EE8E8 7F 83 E3 78 */ mr r3, r28 -/* 8042532C 003EE8EC 4B FE E4 25 */ bl func_80413750 +/* 8042532C 003EE8EC 4B FE E4 25 */ bl GetVoiceOutCount__Q44nw4r3snd6detail10BasicSoundCFv /* 80425330 003EE8F0 7C 67 1B 78 */ mr r7, r3 /* 80425334 003EE8F4 7F A4 EB 78 */ mr r4, r29 /* 80425338 003EE8F8 7F C5 F3 78 */ mr r5, r30 /* 8042533C 003EE8FC 7F E6 FB 78 */ mr r6, r31 /* 80425340 003EE900 38 7C 01 0C */ addi r3, r28, 0x10c -/* 80425344 003EE904 4B FF D4 FD */ bl func_80422840 +/* 80425344 003EE904 4B FF D4 FD */ bl Setup__Q44nw4r3snd6detail10StrmPlayerFPQ44nw4r3snd6detail14StrmBufferPooliUsi /* 80425348 003EE908 80 01 00 24 */ lwz r0, 0x24(r1) /* 8042534C 003EE90C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80425350 003EE910 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -259,8 +260,8 @@ func_804252EC: /* 80425360 003EE920 38 21 00 20 */ addi r1, r1, 0x20 /* 80425364 003EE924 4E 80 00 20 */ blr -.global func_80425368 -func_80425368: +.global Prepare__Q44nw4r3snd6detail9StrmSoundFQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypelPQ34nw4r2ut10FileStream +Prepare__Q44nw4r3snd6detail9StrmSoundFQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypelPQ34nw4r2ut10FileStream: /* 80425368 003EE928 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042536C 003EE92C 7C 08 02 A6 */ mflr r0 /* 80425370 003EE930 7C 87 23 78 */ mr r7, r4 @@ -272,11 +273,11 @@ func_80425368: /* 80425388 003EE948 7C 7F 1B 78 */ mr r31, r3 /* 8042538C 003EE94C 7C 06 03 78 */ mr r6, r0 /* 80425390 003EE950 38 63 01 0C */ addi r3, r3, 0x10c -/* 80425394 003EE954 4B FF D7 55 */ bl func_80422AE8 +/* 80425394 003EE954 4B FF D7 55 */ bl Prepare__Q44nw4r3snd6detail10StrmPlayerFPQ34nw4r2ut10FileStreamQ54nw4r3snd6detail10StrmPlayer15StartOffsetTypei /* 80425398 003EE958 2C 03 00 00 */ cmpwi r3, 0 /* 8042539C 003EE95C 40 82 00 14 */ bne lbl_804253B0 /* 804253A0 003EE960 38 7F 01 0C */ addi r3, r31, 0x10c -/* 804253A4 003EE964 4B FF D6 B5 */ bl func_80422A58 +/* 804253A4 003EE964 4B FF D6 B5 */ bl Shutdown__Q44nw4r3snd6detail10StrmPlayerFv /* 804253A8 003EE968 38 60 00 00 */ li r3, 0 /* 804253AC 003EE96C 48 00 00 08 */ b lbl_804253B4 lbl_804253B0: @@ -288,8 +289,8 @@ lbl_804253B4: /* 804253C0 003EE980 38 21 00 10 */ addi r1, r1, 0x10 /* 804253C4 003EE984 4E 80 00 20 */ blr -.global func_804253C8 -func_804253C8: +.global UpdateMoveValue__Q44nw4r3snd6detail9StrmSoundFv +UpdateMoveValue__Q44nw4r3snd6detail9StrmSoundFv: /* 804253C8 003EE988 94 21 FF E0 */ stwu r1, -0x20(r1) /* 804253CC 003EE98C 7C 08 02 A6 */ mflr r0 /* 804253D0 003EE990 90 01 00 24 */ stw r0, 0x24(r1) @@ -297,13 +298,13 @@ func_804253C8: /* 804253D8 003EE998 93 C1 00 18 */ stw r30, 0x18(r1) /* 804253DC 003EE99C 93 A1 00 14 */ stw r29, 0x14(r1) /* 804253E0 003EE9A0 7C 7D 1B 78 */ mr r29, r3 -/* 804253E4 003EE9A4 4B FE DD AD */ bl func_80413190 +/* 804253E4 003EE9A4 4B FE DD AD */ bl UpdateMoveValue__Q44nw4r3snd6detail10BasicSoundFv /* 804253E8 003EE9A8 7F BF EB 78 */ mr r31, r29 /* 804253EC 003EE9AC 3B C0 00 00 */ li r30, 0 lbl_804253F0: /* 804253F0 003EE9B0 7F C4 F3 78 */ mr r4, r30 /* 804253F4 003EE9B4 38 7D 01 0C */ addi r3, r29, 0x10c -/* 804253F8 003EE9B8 4B FF F8 0D */ bl func_80424C04 +/* 804253F8 003EE9B8 4B FF F8 0D */ bl GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerFi /* 804253FC 003EE9BC 2C 03 00 00 */ cmpwi r3, 0 /* 80425400 003EE9C0 41 82 00 1C */ beq lbl_8042541C /* 80425404 003EE9C4 80 7F 0E 58 */ lwz r3, 0xe58(r31) @@ -325,8 +326,8 @@ lbl_8042541C: /* 80425440 003EEA00 38 21 00 20 */ addi r1, r1, 0x20 /* 80425444 003EEA04 4E 80 00 20 */ blr -.global func_80425448 -func_80425448: +.global UpdateParam__Q44nw4r3snd6detail9StrmSoundFv +UpdateParam__Q44nw4r3snd6detail9StrmSoundFv: /* 80425448 003EEA08 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8042544C 003EEA0C 7C 08 02 A6 */ mflr r0 /* 80425450 003EEA10 90 01 00 44 */ stw r0, 0x44(r1) @@ -335,7 +336,7 @@ func_80425448: /* 8042545C 003EEA1C 39 61 00 30 */ addi r11, r1, 0x30 /* 80425460 003EEA20 4B E9 4C F5 */ bl _savegpr_27 /* 80425464 003EEA24 7C 7B 1B 78 */ mr r27, r3 -/* 80425468 003EEA28 4B FE DD 5D */ bl func_804131C4 +/* 80425468 003EEA28 4B FE DD 5D */ bl UpdateParam__Q44nw4r3snd6detail10BasicSoundFv /* 8042546C 003EEA2C CB E2 C5 10 */ lfd f31, lbl_8066C890@sda21(r2) /* 80425470 003EEA30 7F 7D DB 78 */ mr r29, r27 /* 80425474 003EEA34 3B 80 00 00 */ li r28, 0 @@ -344,7 +345,7 @@ func_80425448: lbl_80425480: /* 80425480 003EEA40 7F 84 E3 78 */ mr r4, r28 /* 80425484 003EEA44 38 7B 01 0C */ addi r3, r27, 0x10c -/* 80425488 003EEA48 4B FF F7 7D */ bl func_80424C04 +/* 80425488 003EEA48 4B FF F7 7D */ bl GetPlayerTrack__Q44nw4r3snd6detail10StrmPlayerFi /* 8042548C 003EEA4C 2C 03 00 00 */ cmpwi r3, 0 /* 80425490 003EEA50 41 82 00 68 */ beq lbl_804254F8 /* 80425494 003EEA54 80 DD 0E 54 */ lwz r6, 0xe54(r29) @@ -373,7 +374,7 @@ lbl_804254B4: /* 804254EC 003EEAAC EC 01 00 24 */ fdivs f0, f1, f0 /* 804254F0 003EEAB0 EC 22 00 2A */ fadds f1, f2, f0 lbl_804254F4: -/* 804254F4 003EEAB4 4B FF F6 91 */ bl func_80424B84 +/* 804254F4 003EEAB4 4B FF F6 91 */ bl SetTrackVolume__Q44nw4r3snd6detail10StrmPlayerFUlf lbl_804254F8: /* 804254F8 003EEAB8 3B 9C 00 01 */ addi r28, r28, 1 /* 804254FC 003EEABC 3B BD 00 10 */ addi r29, r29, 0x10 @@ -388,8 +389,8 @@ lbl_804254F8: /* 80425520 003EEAE0 38 21 00 40 */ addi r1, r1, 0x40 /* 80425524 003EEAE4 4E 80 00 20 */ blr -.global func_80425528 -func_80425528: +.global Shutdown__Q44nw4r3snd6detail9StrmSoundFv +Shutdown__Q44nw4r3snd6detail9StrmSoundFv: /* 80425528 003EEAE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042552C 003EEAEC 7C 08 02 A6 */ mflr r0 /* 80425530 003EEAF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -397,7 +398,7 @@ func_80425528: /* 80425538 003EEAF8 93 C1 00 18 */ stw r30, 0x18(r1) /* 8042553C 003EEAFC 93 A1 00 14 */ stw r29, 0x14(r1) /* 80425540 003EEB00 7C 7D 1B 78 */ mr r29, r3 -/* 80425544 003EEB04 4B FE E0 5D */ bl func_804135A0 +/* 80425544 003EEB04 4B FE E0 5D */ bl Shutdown__Q44nw4r3snd6detail10BasicSoundFv /* 80425548 003EEB08 83 DD 0E 48 */ lwz r30, 0xe48(r29) /* 8042554C 003EEB0C 3B FE 00 10 */ addi r31, r30, 0x10 /* 80425550 003EEB10 7F E3 FB 78 */ mr r3, r31 @@ -432,8 +433,8 @@ lbl_804255A8: /* 804255BC 003EEB7C 38 21 00 20 */ addi r1, r1, 0x20 /* 804255C0 003EEB80 4E 80 00 20 */ blr -.global func_804255C4 -func_804255C4: +.global __dt__Q44nw4r3snd6detail9StrmSoundFv +__dt__Q44nw4r3snd6detail9StrmSoundFv: /* 804255C4 003EEB84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804255C8 003EEB88 7C 08 02 A6 */ mflr r0 /* 804255CC 003EEB8C 2C 03 00 00 */ cmpwi r3, 0 @@ -445,7 +446,7 @@ func_804255C4: /* 804255E4 003EEBA4 41 82 00 20 */ beq lbl_80425604 /* 804255E8 003EEBA8 38 80 FF FF */ li r4, -1 /* 804255EC 003EEBAC 38 63 01 0C */ addi r3, r3, 0x10c -/* 804255F0 003EEBB0 4B FF D1 51 */ bl func_80422740 +/* 804255F0 003EEBB0 4B FF D1 51 */ bl __dt__Q44nw4r3snd6detail10StrmPlayerFv /* 804255F4 003EEBB4 2C 1F 00 00 */ cmpwi r31, 0 /* 804255F8 003EEBB8 40 81 00 0C */ ble lbl_80425604 /* 804255FC 003EEBBC 7F C3 F3 78 */ mr r3, r30 @@ -459,8 +460,8 @@ lbl_80425604: /* 80425618 003EEBD8 38 21 00 10 */ addi r1, r1, 0x10 /* 8042561C 003EEBDC 4E 80 00 20 */ blr -.global func_80425620 -func_80425620: +.global OnUpdatePlayerPriority__Q44nw4r3snd6detail9StrmSoundFv +OnUpdatePlayerPriority__Q44nw4r3snd6detail9StrmSoundFv: /* 80425620 003EEBE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80425624 003EEBE4 7C 08 02 A6 */ mflr r0 /* 80425628 003EEBE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -526,37 +527,39 @@ lbl_804256C8: /* 804256FC 003EECBC 38 21 00 20 */ addi r1, r1, 0x20 /* 80425700 003EECC0 4E 80 00 20 */ blr -.global func_80425704 -func_80425704: +.global IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv +IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv: /* 80425704 003EECC4 80 63 0E 44 */ lwz r3, 0xe44(r3) /* 80425708 003EECC8 7C 03 00 D0 */ neg r0, r3 /* 8042570C 003EECCC 7C 00 1B 78 */ or r0, r0, r3 /* 80425710 003EECD0 54 03 0F FE */ srwi r3, r0, 0x1f /* 80425714 003EECD4 4E 80 00 20 */ blr -.global func_80425718 -func_80425718: +.global DetachTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv +DetachTempSpecialHandle__Q44nw4r3snd6detail9StrmSoundFv: /* 80425718 003EECD8 80 63 0E 44 */ lwz r3, 0xe44(r3) /* 8042571C 003EECDC 48 00 00 30 */ b DetachSound__Q34nw4r3snd15StrmSoundHandleFv -.global lbl_80425720 -lbl_80425720: + +.global GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundFv +GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundFv: /* 80425720 003EECE0 38 63 01 0C */ addi r3, r3, 0x10c /* 80425724 003EECE4 4E 80 00 20 */ blr -.global func_80425728 -func_80425728: +.global GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundCFv +GetBasicPlayer__Q44nw4r3snd6detail9StrmSoundCFv: /* 80425728 003EECE8 38 63 01 0C */ addi r3, r3, 0x10c /* 8042572C 003EECEC 4E 80 00 20 */ blr -.global func_80425730 -func_80425730: +.global IsPrepared__Q44nw4r3snd6detail9StrmSoundCFv +IsPrepared__Q44nw4r3snd6detail9StrmSoundCFv: /* 80425730 003EECF0 88 63 02 2F */ lbz r3, 0x22f(r3) /* 80425734 003EECF4 4E 80 00 20 */ blr -.global func_80425738 -func_80425738: +.global GetRuntimeTypeInfo__Q44nw4r3snd6detail9StrmSoundCFv +GetRuntimeTypeInfo__Q44nw4r3snd6detail9StrmSoundCFv: /* 80425738 003EECF8 38 6D BC 80 */ addi r3, r13, lbl_80667E00@sda21 -/* 8042573C 003EECFC 4E 80 00 20 */ blr +/* 8042573C 003EECFC 4E 80 00 20 */ blr + .global sinit_80425740 sinit_80425740: /* 80425740 003EED00 38 0D BC 30 */ addi r0, r13, lbl_80667DB0@sda21 diff --git a/asm/nw4r/snd/snd_Task.s b/asm/nw4r/snd/snd_Task.s index fb6298d..8065c95 100644 --- a/asm/nw4r/snd/snd_Task.s +++ b/asm/nw4r/snd/snd_Task.s @@ -3,8 +3,8 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 #__dt__Q44nw4r3snd6detail4TaskFv or __dt__Q34nw4r2ut12LinkListNodeFv or __dt__Q44nw4r2ut22@unnamed@snd_Task_cpp@11NonCopyableFv -.global func_80425784 -func_80425784: +.global __dt__Q44nw4r3snd6detail4TaskFv +__dt__Q44nw4r3snd6detail4TaskFv: /* 80425784 003EED44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80425788 003EED48 7C 08 02 A6 */ mflr r0 /* 8042578C 003EED4C 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/nw4r/snd/snd_TaskManager.s b/asm/nw4r/snd/snd_TaskManager.s index 32cea4d..c13f2ec 100644 --- a/asm/nw4r/snd/snd_TaskManager.s +++ b/asm/nw4r/snd/snd_TaskManager.s @@ -12,12 +12,12 @@ GetInstance__Q44nw4r3snd6detail11TaskManagerFv: /* 804257D8 003EED98 7C 00 07 75 */ extsb. r0, r0 /* 804257DC 003EED9C 40 82 00 68 */ bne lbl_80425844 /* 804257E0 003EEDA0 3F E0 80 65 */ lis r31, lbl_80657024@ha -/* 804257E4 003EEDA4 3C 80 80 42 */ lis r4, func_8042591C@ha +/* 804257E4 003EEDA4 3C 80 80 42 */ lis r4, __ct__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@ha /* 804257E8 003EEDA8 3B FF 70 24 */ addi r31, r31, lbl_80657024@l -/* 804257EC 003EEDAC 3C A0 80 42 */ lis r5, func_804258C4@ha +/* 804257EC 003EEDAC 3C A0 80 42 */ lis r5, __dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@ha /* 804257F0 003EEDB0 7F E3 FB 78 */ mr r3, r31 -/* 804257F4 003EEDB4 38 84 59 1C */ addi r4, r4, func_8042591C@l -/* 804257F8 003EEDB8 38 A5 58 C4 */ addi r5, r5, func_804258C4@l +/* 804257F4 003EEDB4 38 84 59 1C */ addi r4, r4, __ct__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@l +/* 804257F8 003EEDB8 38 A5 58 C4 */ addi r5, r5, __dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@l /* 804257FC 003EEDBC 38 C0 00 0C */ li r6, 0xc /* 80425800 003EEDC0 38 E0 00 03 */ li r7, 3 /* 80425804 003EEDC4 4B E9 42 FD */ bl __construct_array @@ -28,10 +28,10 @@ GetInstance__Q44nw4r3snd6detail11TaskManagerFv: /* 80425818 003EEDD8 4B F3 5D B9 */ bl OSInitThreadQueue /* 8042581C 003EEDDC 38 7F 00 34 */ addi r3, r31, 0x34 /* 80425820 003EEDE0 4B F3 5D B1 */ bl OSInitThreadQueue -/* 80425824 003EEDE4 3C 80 80 42 */ lis r4, func_80425860@ha +/* 80425824 003EEDE4 3C 80 80 42 */ lis r4, __dt__Q44nw4r3snd6detail11TaskManagerFv@ha /* 80425828 003EEDE8 3C A0 80 65 */ lis r5, lbl_80657018@ha /* 8042582C 003EEDEC 7F E3 FB 78 */ mr r3, r31 -/* 80425830 003EEDF0 38 84 58 60 */ addi r4, r4, func_80425860@l +/* 80425830 003EEDF0 38 84 58 60 */ addi r4, r4, __dt__Q44nw4r3snd6detail11TaskManagerFv@l /* 80425834 003EEDF4 38 A5 70 18 */ addi r5, r5, lbl_80657018@l /* 80425838 003EEDF8 4B E9 3E 65 */ bl __register_global_object_tmp /* 8042583C 003EEDFC 38 00 00 01 */ li r0, 1 @@ -45,8 +45,8 @@ lbl_80425844: /* 80425858 003EEE18 38 21 00 10 */ addi r1, r1, 0x10 /* 8042585C 003EEE1C 4E 80 00 20 */ blr -.global func_80425860 -func_80425860: +.global __dt__Q44nw4r3snd6detail11TaskManagerFv +__dt__Q44nw4r3snd6detail11TaskManagerFv: /* 80425860 003EEE20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80425864 003EEE24 7C 08 02 A6 */ mflr r0 /* 80425868 003EEE28 2C 03 00 00 */ cmpwi r3, 0 @@ -56,9 +56,9 @@ func_80425860: /* 80425878 003EEE38 93 C1 00 08 */ stw r30, 8(r1) /* 8042587C 003EEE3C 7C 7E 1B 78 */ mr r30, r3 /* 80425880 003EEE40 41 82 00 28 */ beq lbl_804258A8 -/* 80425884 003EEE44 3C 80 80 42 */ lis r4, func_804258C4@ha +/* 80425884 003EEE44 3C 80 80 42 */ lis r4, __dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@ha /* 80425888 003EEE48 38 A0 00 0C */ li r5, 0xc -/* 8042588C 003EEE4C 38 84 58 C4 */ addi r4, r4, func_804258C4@l +/* 8042588C 003EEE4C 38 84 58 C4 */ addi r4, r4, __dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv@l /* 80425890 003EEE50 38 C0 00 03 */ li r6, 3 /* 80425894 003EEE54 4B E9 43 65 */ bl __destroy_arr /* 80425898 003EEE58 2C 1F 00 00 */ cmpwi r31, 0 @@ -74,8 +74,9 @@ lbl_804258A8: /* 804258BC 003EEE7C 38 21 00 10 */ addi r1, r1, 0x10 /* 804258C0 003EEE80 4E 80 00 20 */ blr -.global func_804258C4 -func_804258C4: +#__dt__Q34nw4r2ut35LinkListFv +.global __dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv +__dt__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv: /* 804258C4 003EEE84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 804258C8 003EEE88 7C 08 02 A6 */ mflr r0 /* 804258CC 003EEE8C 2C 03 00 00 */ cmpwi r3, 0 @@ -100,8 +101,9 @@ lbl_80425900: /* 80425914 003EEED4 38 21 00 10 */ addi r1, r1, 0x10 /* 80425918 003EEED8 4E 80 00 20 */ blr -.global func_8042591C -func_8042591C: +#__ct__q34nw4r2ut35linklistFv +.global __ct__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv +__ct__Q34nw4r2ut35LinkList_Q44nw4r3snd6detail4Task_4_Fv: /* 8042591C 003EEEDC 38 00 00 00 */ li r0, 0 /* 80425920 003EEEE0 38 83 00 04 */ addi r4, r3, 4 /* 80425924 003EEEE4 90 03 00 04 */ stw r0, 4(r3) @@ -111,8 +113,8 @@ func_8042591C: /* 80425934 003EEEF4 90 83 00 08 */ stw r4, 8(r3) /* 80425938 003EEEF8 4E 80 00 20 */ blr -.global func_8042593C -func_8042593C: +.global AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority +AppendTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4TaskQ54nw4r3snd6detail11TaskManager12TaskPriority: /* 8042593C 003EEEFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80425940 003EEF00 7C 08 02 A6 */ mflr r0 /* 80425944 003EEF04 90 01 00 24 */ stw r0, 0x24(r1) @@ -145,8 +147,8 @@ func_8042593C: /* 804259B0 003EEF70 38 21 00 20 */ addi r1, r1, 0x20 /* 804259B4 003EEF74 4E 80 00 20 */ blr -.global func_804259B8 -func_804259B8: +.global PopTask__Q44nw4r3snd6detail11TaskManagerFv +PopTask__Q44nw4r3snd6detail11TaskManagerFv: /* 804259B8 003EEF78 94 21 FF D0 */ stwu r1, -0x30(r1) /* 804259BC 003EEF7C 7C 08 02 A6 */ mflr r0 /* 804259C0 003EEF80 90 01 00 34 */ stw r0, 0x34(r1) @@ -245,8 +247,8 @@ lbl_80425AF4: /* 80425B0C 003EF0CC 38 21 00 30 */ addi r1, r1, 0x30 /* 80425B10 003EF0D0 4E 80 00 20 */ blr -.global func_80425B14 -func_80425B14: +.global GetNextTask__Q44nw4r3snd6detail11TaskManagerFv +GetNextTask__Q44nw4r3snd6detail11TaskManagerFv: /* 80425B14 003EF0D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80425B18 003EF0D8 7C 08 02 A6 */ mflr r0 /* 80425B1C 003EF0DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -334,7 +336,7 @@ ExecuteTask__Q44nw4r3snd6detail11TaskManagerFv: /* 80425C30 003EF1F0 93 C1 00 18 */ stw r30, 0x18(r1) /* 80425C34 003EF1F4 93 A1 00 14 */ stw r29, 0x14(r1) /* 80425C38 003EF1F8 7C 7D 1B 78 */ mr r29, r3 -/* 80425C3C 003EF1FC 4B FF FD 7D */ bl func_804259B8 +/* 80425C3C 003EF1FC 4B FF FD 7D */ bl PopTask__Q44nw4r3snd6detail11TaskManagerFv /* 80425C40 003EF200 2C 03 00 00 */ cmpwi r3, 0 /* 80425C44 003EF204 7C 7E 1B 78 */ mr r30, r3 /* 80425C48 003EF208 40 82 00 0C */ bne lbl_80425C54 @@ -361,8 +363,8 @@ lbl_80425C80: /* 80425C94 003EF254 38 21 00 20 */ addi r1, r1, 0x20 /* 80425C98 003EF258 4E 80 00 20 */ blr -.global func_80425C9C -func_80425C9C: +.global CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task +CancelTask__Q44nw4r3snd6detail11TaskManagerFPQ44nw4r3snd6detail4Task: /* 80425C9C 003EF25C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80425CA0 003EF260 7C 08 02 A6 */ mflr r0 /* 80425CA4 003EF264 90 01 00 34 */ stw r0, 0x34(r1) @@ -517,7 +519,7 @@ lbl_80425E9C: /* 80425EA0 003EF460 4B F3 67 D1 */ bl OSSleepThread lbl_80425EA4: /* 80425EA4 003EF464 7F C3 F3 78 */ mr r3, r30 -/* 80425EA8 003EF468 4B FF FC 6D */ bl func_80425B14 +/* 80425EA8 003EF468 4B FF FC 6D */ bl GetNextTask__Q44nw4r3snd6detail11TaskManagerFv /* 80425EAC 003EF46C 2C 03 00 00 */ cmpwi r3, 0 /* 80425EB0 003EF470 40 82 00 10 */ bne lbl_80425EC0 /* 80425EB4 003EF474 88 1E 00 28 */ lbz r0, 0x28(r30) diff --git a/asm/nw4r/snd/snd_WaveSound.s b/asm/nw4r/snd/snd_WaveSound.s index ea9b745..423eb34 100644 --- a/asm/nw4r/snd/snd_WaveSound.s +++ b/asm/nw4r/snd/snd_WaveSound.s @@ -2,8 +2,9 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_80429BD8 -func_80429BD8: +#__ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManagerii +.global __ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9WaveSound_ii +__ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManager_Q44nw4r3snd6detail9WaveSound_ii: /* 80429BD8 003F3198 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80429BDC 003F319C 7C 08 02 A6 */ mflr r0 /* 80429BE0 003F31A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,12 +14,12 @@ func_80429BD8: /* 80429BF0 003F31B0 7C C5 33 78 */ mr r5, r6 /* 80429BF4 003F31B4 93 C1 00 08 */ stw r30, 8(r1) /* 80429BF8 003F31B8 7C 7E 1B 78 */ mr r30, r3 -/* 80429BFC 003F31BC 4B FE 88 A5 */ bl func_804124A0 +/* 80429BFC 003F31BC 4B FE 88 A5 */ bl __ct__Q44nw4r3snd6detail10BasicSoundFii /* 80429C00 003F31C0 3C 80 80 57 */ lis r4, lbl_8056E650@ha /* 80429C04 003F31C4 38 7E 01 0C */ addi r3, r30, 0x10c /* 80429C08 003F31C8 38 84 E6 50 */ addi r4, r4, lbl_8056E650@l /* 80429C0C 003F31CC 90 9E 00 00 */ stw r4, 0(r30) -/* 80429C10 003F31D0 48 00 07 1D */ bl func_8042A32C +/* 80429C10 003F31D0 48 00 07 1D */ bl __ct__Q44nw4r3snd6detail9WsdPlayerFv /* 80429C14 003F31D4 38 00 00 00 */ li r0, 0 /* 80429C18 003F31D8 93 FE 02 48 */ stw r31, 0x248(r30) /* 80429C1C 003F31DC 7F C3 F3 78 */ mr r3, r30 @@ -31,8 +32,8 @@ func_80429BD8: /* 80429C38 003F31F8 38 21 00 10 */ addi r1, r1, 0x10 /* 80429C3C 003F31FC 4E 80 00 20 */ blr -.global func_80429C40 -func_80429C40: +.global __dt__Q44nw4r3snd6detail9WsdPlayerFv +__dt__Q44nw4r3snd6detail9WsdPlayerFv: /* 80429C40 003F3200 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80429C44 003F3204 7C 08 02 A6 */ mflr r0 /* 80429C48 003F3208 2C 03 00 00 */ cmpwi r3, 0 @@ -51,8 +52,8 @@ lbl_80429C68: /* 80429C78 003F3238 38 21 00 10 */ addi r1, r1, 0x10 /* 80429C7C 003F323C 4E 80 00 20 */ blr -.global func_80429C80 -func_80429C80: +.global Prepare__Q44nw4r3snd6detail9WaveSoundFPCvlQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypelPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl +Prepare__Q44nw4r3snd6detail9WaveSoundFPCvlQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypelPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl: /* 80429C80 003F3240 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80429C84 003F3244 7C 08 02 A6 */ mflr r0 /* 80429C88 003F3248 90 01 00 34 */ stw r0, 0x34(r1) @@ -70,7 +71,7 @@ func_80429C80: /* 80429CB8 003F3278 7D 89 03 A6 */ mtctr r12 /* 80429CBC 003F327C 4E 80 04 21 */ bctrl /* 80429CC0 003F3280 7F 23 CB 78 */ mr r3, r25 -/* 80429CC4 003F3284 4B FE 9A 8D */ bl func_80413750 +/* 80429CC4 003F3284 4B FE 9A 8D */ bl GetVoiceOutCount__Q44nw4r3snd6detail10BasicSoundCFv /* 80429CC8 003F3288 7C 68 1B 78 */ mr r8, r3 /* 80429CCC 003F328C 7F 44 D3 78 */ mr r4, r26 /* 80429CD0 003F3290 7F 65 DB 78 */ mr r5, r27 @@ -79,7 +80,7 @@ func_80429C80: /* 80429CDC 003F329C 7F C9 F3 78 */ mr r9, r30 /* 80429CE0 003F32A0 7F EA FB 78 */ mr r10, r31 /* 80429CE4 003F32A4 38 79 01 0C */ addi r3, r25, 0x10c -/* 80429CE8 003F32A8 48 00 07 59 */ bl func_8042A440 +/* 80429CE8 003F32A8 48 00 07 59 */ bl Prepare__Q44nw4r3snd6detail9WsdPlayerFPCviQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypeiiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl /* 80429CEC 003F32AC 2C 03 00 00 */ cmpwi r3, 0 /* 80429CF0 003F32B0 40 82 00 0C */ bne lbl_80429CFC /* 80429CF4 003F32B4 38 60 00 00 */ li r3, 0 @@ -96,8 +97,8 @@ lbl_80429D08: /* 80429D18 003F32D8 38 21 00 30 */ addi r1, r1, 0x30 /* 80429D1C 003F32DC 4E 80 00 20 */ blr -.global func_80429D20 -func_80429D20: +.global Shutdown__Q44nw4r3snd6detail9WaveSoundFv +Shutdown__Q44nw4r3snd6detail9WaveSoundFv: /* 80429D20 003F32E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80429D24 003F32E4 7C 08 02 A6 */ mflr r0 /* 80429D28 003F32E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -105,7 +106,7 @@ func_80429D20: /* 80429D30 003F32F0 93 C1 00 18 */ stw r30, 0x18(r1) /* 80429D34 003F32F4 93 A1 00 14 */ stw r29, 0x14(r1) /* 80429D38 003F32F8 7C 7D 1B 78 */ mr r29, r3 -/* 80429D3C 003F32FC 4B FE 98 65 */ bl func_804135A0 +/* 80429D3C 003F32FC 4B FE 98 65 */ bl Shutdown__Q44nw4r3snd6detail10BasicSoundFv /* 80429D40 003F3300 83 DD 02 48 */ lwz r30, 0x248(r29) /* 80429D44 003F3304 3B FE 00 10 */ addi r31, r30, 0x10 /* 80429D48 003F3308 7F E3 FB 78 */ mr r3, r31 @@ -140,8 +141,8 @@ lbl_80429DA0: /* 80429DB4 003F3374 38 21 00 20 */ addi r1, r1, 0x20 /* 80429DB8 003F3378 4E 80 00 20 */ blr -.global func_80429DBC -func_80429DBC: +.global __dt__Q44nw4r3snd6detail9WaveSoundFv +__dt__Q44nw4r3snd6detail9WaveSoundFv: /* 80429DBC 003F337C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80429DC0 003F3380 7C 08 02 A6 */ mflr r0 /* 80429DC4 003F3384 2C 03 00 00 */ cmpwi r3, 0 @@ -160,18 +161,18 @@ lbl_80429DE4: /* 80429DF4 003F33B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80429DF8 003F33B8 4E 80 00 20 */ blr -.global func_80429DFC -func_80429DFC: +.global SetChannelPriority__Q44nw4r3snd6detail9WaveSoundFi +SetChannelPriority__Q44nw4r3snd6detail9WaveSoundFi: /* 80429DFC 003F33BC 38 63 01 0C */ addi r3, r3, 0x10c -/* 80429E00 003F33C0 48 00 0A 28 */ b func_8042A828 +/* 80429E00 003F33C0 48 00 0A 28 */ b SetChannelPriority__Q44nw4r3snd6detail9WsdPlayerFi -.global func_80429E04 -func_80429E04: +.global SetReleasePriorityFix__Q44nw4r3snd6detail9WaveSoundFb +SetReleasePriorityFix__Q44nw4r3snd6detail9WaveSoundFb: /* 80429E04 003F33C4 38 63 01 0C */ addi r3, r3, 0x10c -/* 80429E08 003F33C8 48 00 0A 28 */ b func_8042A830 +/* 80429E08 003F33C8 48 00 0A 28 */ b SetReleasePriorityFix__Q44nw4r3snd6detail9WsdPlayerFb -.global func_80429E0C -func_80429E0C: +.global OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv +OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv: /* 80429E0C 003F33CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80429E10 003F33D0 7C 08 02 A6 */ mflr r0 /* 80429E14 003F33D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -237,37 +238,39 @@ lbl_80429EB4: /* 80429EE8 003F34A8 38 21 00 20 */ addi r1, r1, 0x20 /* 80429EEC 003F34AC 4E 80 00 20 */ blr -.global func_80429EF0 -func_80429EF0: +.global IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv +IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv: /* 80429EF0 003F34B0 80 63 02 44 */ lwz r3, 0x244(r3) /* 80429EF4 003F34B4 7C 03 00 D0 */ neg r0, r3 /* 80429EF8 003F34B8 7C 00 1B 78 */ or r0, r0, r3 /* 80429EFC 003F34BC 54 03 0F FE */ srwi r3, r0, 0x1f /* 80429F00 003F34C0 4E 80 00 20 */ blr -.global func_80429F04 -func_80429F04: +.global DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv +DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv: /* 80429F04 003F34C4 80 63 02 44 */ lwz r3, 0x244(r3) /* 80429F08 003F34C8 48 00 00 30 */ b DetachSound__Q34nw4r3snd15WaveSoundHandleFv -.global lbl_80429F0C -lbl_80429F0C: + +.global GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv +GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv: /* 80429F0C 003F34CC 38 63 01 0C */ addi r3, r3, 0x10c /* 80429F10 003F34D0 4E 80 00 20 */ blr -.global func_80429F14 -func_80429F14: +.global GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv +GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv: /* 80429F14 003F34D4 38 63 01 0C */ addi r3, r3, 0x10c /* 80429F18 003F34D8 4E 80 00 20 */ blr -.global func_80429F1C -func_80429F1C: +.global IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv +IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv: /* 80429F1C 003F34DC 88 63 02 4C */ lbz r3, 0x24c(r3) /* 80429F20 003F34E0 4E 80 00 20 */ blr -.global func_80429F24 -func_80429F24: +.global GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv +GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv: /* 80429F24 003F34E4 38 6D BC 98 */ addi r3, r13, lbl_80667E18@sda21 -/* 80429F28 003F34E8 4E 80 00 20 */ blr +/* 80429F28 003F34E8 4E 80 00 20 */ blr + .global sinit_80429F2C sinit_80429F2C: /* 80429F2C 003F34EC 38 0D BC 30 */ addi r0, r13, lbl_80667DB0@sda21 diff --git a/asm/nw4r/snd/snd_WsdPlayer.s b/asm/nw4r/snd/snd_WsdPlayer.s index 5972023..db20cab 100644 --- a/asm/nw4r/snd/snd_WsdPlayer.s +++ b/asm/nw4r/snd/snd_WsdPlayer.s @@ -2,14 +2,14 @@ .section .text, "ax" # 0x80039220 - 0x804F5900 -.global func_8042A32C -func_8042A32C: +.global __ct__Q44nw4r3snd6detail9WsdPlayerFv +__ct__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042A32C 003F38EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042A330 003F38F0 7C 08 02 A6 */ mflr r0 /* 8042A334 003F38F4 90 01 00 14 */ stw r0, 0x14(r1) /* 8042A338 003F38F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8042A33C 003F38FC 7C 7F 1B 78 */ mr r31, r3 -/* 8042A340 003F3900 4B FE 7E 51 */ bl func_80412190 +/* 8042A340 003F3900 4B FE 7E 51 */ bl __ct__Q44nw4r3snd6detail11BasicPlayerFv /* 8042A344 003F3904 3C A0 80 57 */ lis r5, lbl_8056E688@ha /* 8042A348 003F3908 38 C0 00 00 */ li r6, 0 /* 8042A34C 003F390C 38 A5 E6 88 */ addi r5, r5, lbl_8056E688@l @@ -32,8 +32,8 @@ func_8042A32C: /* 8042A390 003F3950 38 21 00 10 */ addi r1, r1, 0x10 /* 8042A394 003F3954 4E 80 00 20 */ blr -.global func_8042A398 -func_8042A398: +.global InitParam__Q44nw4r3snd6detail9WsdPlayerFiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl +InitParam__Q44nw4r3snd6detail9WsdPlayerFiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl: /* 8042A398 003F3958 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042A39C 003F395C 7C 08 02 A6 */ mflr r0 /* 8042A3A0 003F3960 90 01 00 24 */ stw r0, 0x24(r1) @@ -43,7 +43,7 @@ func_8042A398: /* 8042A3B0 003F3970 7C 9C 23 78 */ mr r28, r4 /* 8042A3B4 003F3974 7C BD 2B 78 */ mr r29, r5 /* 8042A3B8 003F3978 7C DE 33 78 */ mr r30, r6 -/* 8042A3BC 003F397C 4B FE 80 29 */ bl func_804123E4 +/* 8042A3BC 003F397C 4B FE 80 29 */ bl InitParam__Q44nw4r3snd6detail11BasicPlayerFv /* 8042A3C0 003F3980 C0 02 C5 88 */ lfs f0, lbl_8066C908@sda21(r2) /* 8042A3C4 003F3984 3B E0 00 00 */ li r31, 0 /* 8042A3C8 003F3988 38 A0 00 40 */ li r5, 0x40 @@ -77,8 +77,8 @@ func_8042A398: /* 8042A438 003F39F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8042A43C 003F39FC 4E 80 00 20 */ blr -.global func_8042A440 -func_8042A440: +.global Prepare__Q44nw4r3snd6detail9WsdPlayerFPCviQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypeiiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl +Prepare__Q44nw4r3snd6detail9WsdPlayerFPCviQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypeiiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl: /* 8042A440 003F3A00 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8042A444 003F3A04 7C 08 02 A6 */ mflr r0 /* 8042A448 003F3A08 90 01 00 34 */ stw r0, 0x34(r1) @@ -111,7 +111,7 @@ func_8042A440: lbl_8042A4B4: /* 8042A4B4 003F3A74 4B FF 6E 31 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042A4B8 003F3A78 7E E4 BB 78 */ mr r4, r23 -/* 8042A4BC 003F3A7C 4B FF 73 5D */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042A4BC 003F3A7C 4B FF 73 5D */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042A4C0 003F3A80 38 00 00 00 */ li r0, 0 /* 8042A4C4 003F3A84 98 18 00 ED */ stb r0, 0xed(r24) lbl_8042A4C8: @@ -144,7 +144,7 @@ lbl_8042A524: /* 8042A524 003F3AE4 2C 03 00 00 */ cmpwi r3, 0 /* 8042A528 003F3AE8 41 82 00 14 */ beq lbl_8042A53C /* 8042A52C 003F3AEC 7F 03 C3 78 */ mr r3, r24 -/* 8042A530 003F3AF0 48 00 08 C5 */ bl func_8042ADF4 +/* 8042A530 003F3AF0 48 00 08 C5 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042A534 003F3AF4 80 78 01 34 */ lwz r3, 0x134(r24) /* 8042A538 003F3AF8 4B FE A5 51 */ bl Release__Q44nw4r3snd6detail7ChannelFv lbl_8042A53C: @@ -166,7 +166,7 @@ lbl_8042A56C: /* 8042A570 003F3B30 7F A4 EB 78 */ mr r4, r29 /* 8042A574 003F3B34 7F C5 F3 78 */ mr r5, r30 /* 8042A578 003F3B38 7F E6 FB 78 */ mr r6, r31 -/* 8042A57C 003F3B3C 4B FF FE 1D */ bl func_8042A398 +/* 8042A57C 003F3B3C 4B FF FE 1D */ bl InitParam__Q44nw4r3snd6detail9WsdPlayerFiPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl /* 8042A580 003F3B40 2C 18 00 00 */ cmpwi r24, 0 /* 8042A584 003F3B44 93 38 01 08 */ stw r25, 0x108(r24) /* 8042A588 003F3B48 7F 17 C3 78 */ mr r23, r24 @@ -192,8 +192,8 @@ lbl_8042A5A0: /* 8042A5D4 003F3B94 38 21 00 30 */ addi r1, r1, 0x30 /* 8042A5D8 003F3B98 4E 80 00 20 */ blr -.global func_8042A5DC -func_8042A5DC: +.global Start__Q44nw4r3snd6detail9WsdPlayerFv +Start__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042A5DC 003F3B9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042A5E0 003F3BA0 7C 08 02 A6 */ mflr r0 /* 8042A5E4 003F3BA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -210,7 +210,7 @@ func_8042A5DC: lbl_8042A610: /* 8042A610 003F3BD0 4B FF 6C D5 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042A614 003F3BD4 7F E4 FB 78 */ mr r4, r31 -/* 8042A618 003F3BD8 4B FF 71 99 */ bl RegisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042A618 003F3BD8 4B FF 71 99 */ bl RegisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042A61C 003F3BDC 38 00 00 01 */ li r0, 1 /* 8042A620 003F3BE0 98 1E 00 ED */ stb r0, 0xed(r30) /* 8042A624 003F3BE4 4B FF 6C C1 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -224,8 +224,8 @@ lbl_8042A610: /* 8042A644 003F3C04 38 21 00 10 */ addi r1, r1, 0x10 /* 8042A648 003F3C08 4E 80 00 20 */ blr -.global func_8042A64C -func_8042A64C: +.global Stop__Q44nw4r3snd6detail9WsdPlayerFv +Stop__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042A64C 003F3C0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042A650 003F3C10 7C 08 02 A6 */ mflr r0 /* 8042A654 003F3C14 90 01 00 14 */ stw r0, 0x14(r1) @@ -248,7 +248,7 @@ func_8042A64C: lbl_8042A698: /* 8042A698 003F3C58 4B FF 6C 4D */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042A69C 003F3C5C 7F E4 FB 78 */ mr r4, r31 -/* 8042A6A0 003F3C60 4B FF 71 79 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042A6A0 003F3C60 4B FF 71 79 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042A6A4 003F3C64 38 00 00 00 */ li r0, 0 /* 8042A6A8 003F3C68 98 1E 00 ED */ stb r0, 0xed(r30) lbl_8042A6AC: @@ -281,7 +281,7 @@ lbl_8042A708: /* 8042A708 003F3CC8 2C 03 00 00 */ cmpwi r3, 0 /* 8042A70C 003F3CCC 41 82 00 14 */ beq lbl_8042A720 /* 8042A710 003F3CD0 7F C3 F3 78 */ mr r3, r30 -/* 8042A714 003F3CD4 48 00 06 E1 */ bl func_8042ADF4 +/* 8042A714 003F3CD4 48 00 06 E1 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042A718 003F3CD8 80 7E 01 34 */ lwz r3, 0x134(r30) /* 8042A71C 003F3CDC 4B FE A3 6D */ bl Release__Q44nw4r3snd6detail7ChannelFv lbl_8042A720: @@ -308,8 +308,8 @@ lbl_8042A730: /* 8042A76C 003F3D2C 38 21 00 10 */ addi r1, r1, 0x10 /* 8042A770 003F3D30 4E 80 00 20 */ blr -.global func_8042A774 -func_8042A774: +.global Pause__Q44nw4r3snd6detail9WsdPlayerFb +Pause__Q44nw4r3snd6detail9WsdPlayerFb: /* 8042A774 003F3D34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042A778 003F3D38 7C 08 02 A6 */ mflr r0 /* 8042A77C 003F3D3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -358,18 +358,18 @@ lbl_8042A804: /* 8042A820 003F3DE0 38 21 00 10 */ addi r1, r1, 0x10 /* 8042A824 003F3DE4 4E 80 00 20 */ blr -.global func_8042A828 -func_8042A828: +.global SetChannelPriority__Q44nw4r3snd6detail9WsdPlayerFi +SetChannelPriority__Q44nw4r3snd6detail9WsdPlayerFi: /* 8042A828 003F3DE8 98 83 00 FC */ stb r4, 0xfc(r3) /* 8042A82C 003F3DEC 4E 80 00 20 */ blr -.global func_8042A830 -func_8042A830: +.global SetReleasePriorityFix__Q44nw4r3snd6detail9WsdPlayerFb +SetReleasePriorityFix__Q44nw4r3snd6detail9WsdPlayerFb: /* 8042A830 003F3DF0 98 83 00 F0 */ stb r4, 0xf0(r3) /* 8042A834 003F3DF4 4E 80 00 20 */ blr -.global func_8042A838 -func_8042A838: +.global InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv: /* 8042A838 003F3DF8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042A83C 003F3DFC 7C 08 02 A6 */ mflr r0 /* 8042A840 003F3E00 90 01 00 24 */ stw r0, 0x24(r1) @@ -403,7 +403,7 @@ func_8042A838: lbl_8042A8B0: /* 8042A8B0 003F3E70 4B FF 6A 35 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042A8B4 003F3E74 7F E4 FB 78 */ mr r4, r31 -/* 8042A8B8 003F3E78 4B FF 6F 61 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042A8B8 003F3E78 4B FF 6F 61 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042A8BC 003F3E7C 38 00 00 00 */ li r0, 0 /* 8042A8C0 003F3E80 98 1D 00 ED */ stb r0, 0xed(r29) lbl_8042A8C4: @@ -436,7 +436,7 @@ lbl_8042A920: /* 8042A920 003F3EE0 2C 03 00 00 */ cmpwi r3, 0 /* 8042A924 003F3EE4 41 82 00 14 */ beq lbl_8042A938 /* 8042A928 003F3EE8 7F A3 EB 78 */ mr r3, r29 -/* 8042A92C 003F3EEC 48 00 04 C9 */ bl func_8042ADF4 +/* 8042A92C 003F3EEC 48 00 04 C9 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042A930 003F3EF0 80 7D 01 34 */ lwz r3, 0x134(r29) /* 8042A934 003F3EF4 4B FE A1 55 */ bl Release__Q44nw4r3snd6detail7ChannelFv lbl_8042A938: @@ -465,8 +465,8 @@ lbl_8042A968: /* 8042A988 003F3F48 38 21 00 20 */ addi r1, r1, 0x20 /* 8042A98C 003F3F4C 4E 80 00 20 */ blr -.global func_8042A990 -func_8042A990: +.global Update__Q44nw4r3snd6detail9WsdPlayerFv +Update__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042A990 003F3F50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8042A994 003F3F54 7C 08 02 A6 */ mflr r0 /* 8042A998 003F3F58 90 01 00 14 */ stw r0, 0x14(r1) @@ -514,7 +514,7 @@ lbl_8042A9EC: lbl_8042AA38: /* 8042AA38 003F3FF8 4B FF 68 AD */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042AA3C 003F3FFC 7F C4 F3 78 */ mr r4, r30 -/* 8042AA40 003F4000 4B FF 6D D9 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042AA40 003F4000 4B FF 6D D9 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042AA44 003F4004 38 00 00 00 */ li r0, 0 /* 8042AA48 003F4008 98 1F 00 ED */ stb r0, 0xed(r31) lbl_8042AA4C: @@ -547,7 +547,7 @@ lbl_8042AAA8: /* 8042AAA8 003F4068 2C 03 00 00 */ cmpwi r3, 0 /* 8042AAAC 003F406C 41 82 00 14 */ beq lbl_8042AAC0 /* 8042AAB0 003F4070 7F E3 FB 78 */ mr r3, r31 -/* 8042AAB4 003F4074 48 00 03 41 */ bl func_8042ADF4 +/* 8042AAB4 003F4074 48 00 03 41 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042AAB8 003F4078 80 7F 01 34 */ lwz r3, 0x134(r31) /* 8042AABC 003F407C 4B FE 9F CD */ bl Release__Q44nw4r3snd6detail7ChannelFv lbl_8042AAC0: @@ -574,7 +574,7 @@ lbl_8042AB00: /* 8042AB08 003F40C8 80 9F 01 00 */ lwz r4, 0x100(r31) /* 8042AB0C 003F40CC 7F E3 FB 78 */ mr r3, r31 /* 8042AB10 003F40D0 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 8042AB14 003F40D4 48 00 01 29 */ bl func_8042AC3C +/* 8042AB14 003F40D4 48 00 01 29 */ bl StartChannel__Q44nw4r3snd6detail9WsdPlayerFPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl /* 8042AB18 003F40D8 2C 03 00 00 */ cmpwi r3, 0 /* 8042AB1C 003F40DC 40 82 00 F4 */ bne lbl_8042AC10 /* 8042AB20 003F40E0 4B FF 67 C5 */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv @@ -590,7 +590,7 @@ lbl_8042AB00: lbl_8042AB48: /* 8042AB48 003F4108 4B FF 67 9D */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042AB4C 003F410C 7F C4 F3 78 */ mr r4, r30 -/* 8042AB50 003F4110 4B FF 6C C9 */ bl UnregisterSoundFrameCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread18SoundFrameCallback +/* 8042AB50 003F4110 4B FF 6C C9 */ bl UnregisterPlayerCallback__Q44nw4r3snd6detail11SoundThreadFPQ54nw4r3snd6detail11SoundThread14PlayerCallback /* 8042AB54 003F4114 38 00 00 00 */ li r0, 0 /* 8042AB58 003F4118 98 1F 00 ED */ stb r0, 0xed(r31) lbl_8042AB5C: @@ -623,7 +623,7 @@ lbl_8042ABB8: /* 8042ABB8 003F4178 2C 03 00 00 */ cmpwi r3, 0 /* 8042ABBC 003F417C 41 82 00 14 */ beq lbl_8042ABD0 /* 8042ABC0 003F4180 7F E3 FB 78 */ mr r3, r31 -/* 8042ABC4 003F4184 48 00 02 31 */ bl func_8042ADF4 +/* 8042ABC4 003F4184 48 00 02 31 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042ABC8 003F4188 80 7F 01 34 */ lwz r3, 0x134(r31) /* 8042ABCC 003F418C 4B FE 9E BD */ bl Release__Q44nw4r3snd6detail7ChannelFv lbl_8042ABD0: @@ -646,7 +646,7 @@ lbl_8042ABE0: /* 8042AC0C 003F41CC 48 00 00 18 */ b lbl_8042AC24 lbl_8042AC10: /* 8042AC10 003F41D0 7F E3 FB 78 */ mr r3, r31 -/* 8042AC14 003F41D4 48 00 01 E1 */ bl func_8042ADF4 +/* 8042AC14 003F41D4 48 00 01 E1 */ bl UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv /* 8042AC18 003F41D8 4B FF 66 CD */ bl GetInstance__Q44nw4r3snd6detail11SoundThreadFv /* 8042AC1C 003F41DC 38 63 03 54 */ addi r3, r3, 0x354 /* 8042AC20 003F41E0 4B F2 F1 21 */ bl OSUnlockMutex @@ -658,8 +658,8 @@ lbl_8042AC24: /* 8042AC34 003F41F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8042AC38 003F41F8 4E 80 00 20 */ blr -.global func_8042AC3C -func_8042AC3C: +.global StartChannel__Q44nw4r3snd6detail9WsdPlayerFPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl +StartChannel__Q44nw4r3snd6detail9WsdPlayerFPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl: /* 8042AC3C 003F41FC 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 8042AC40 003F4200 7C 08 02 A6 */ mflr r0 /* 8042AC44 003F4204 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -727,10 +727,10 @@ lbl_8042AD1C: /* 8042AD2C 003F42EC 41 81 00 08 */ bgt lbl_8042AD34 /* 8042AD30 003F42F0 7C 03 03 78 */ mr r3, r0 lbl_8042AD34: -/* 8042AD34 003F42F4 3C C0 80 43 */ lis r6, func_8042B290@ha +/* 8042AD34 003F42F4 3C C0 80 43 */ lis r6, ChannelCallbackFunc__Q44nw4r3snd6detail9WsdPlayerFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl@ha /* 8042AD38 003F42F8 7F E5 FB 78 */ mr r5, r31 /* 8042AD3C 003F42FC 7F A7 EB 78 */ mr r7, r29 -/* 8042AD40 003F4300 38 C6 B2 90 */ addi r6, r6, func_8042B290@l +/* 8042AD40 003F4300 38 C6 B2 90 */ addi r6, r6, ChannelCallbackFunc__Q44nw4r3snd6detail9WsdPlayerFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl@l /* 8042AD44 003F4304 4B FE A0 DD */ bl AllocChannel__Q44nw4r3snd6detail7ChannelFiiiPFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl_vUl /* 8042AD48 003F4308 2C 03 00 00 */ cmpwi r3, 0 /* 8042AD4C 003F430C 7C 7F 1B 78 */ mr r31, r3 @@ -778,8 +778,8 @@ lbl_8042ADD8: /* 8042ADEC 003F43AC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8042ADF0 003F43B0 4E 80 00 20 */ blr -.global func_8042ADF4 -func_8042ADF4: +.global UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv +UpdateChannel__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042ADF4 003F43B4 94 21 FE F0 */ stwu r1, -0x110(r1) /* 8042ADF8 003F43B8 7C 08 02 A6 */ mflr r0 /* 8042ADFC 003F43BC 90 01 01 14 */ stw r0, 0x114(r1) @@ -929,7 +929,7 @@ lbl_8042B004: /* 8042B024 003F45E4 EC 21 F8 24 */ fdivs f1, f1, f31 /* 8042B028 003F45E8 EC 00 08 2A */ fadds f0, f0, f1 /* 8042B02C 003F45EC D0 1E 00 00 */ stfs f0, 0(r30) -/* 8042B030 003F45F0 4B FE 73 CD */ bl func_804123FC +/* 8042B030 003F45F0 4B FE 73 CD */ bl GetFxSend__Q44nw4r3snd6detail11BasicPlayerCFQ34nw4r3snd6AuxBus /* 8042B034 003F45F4 C0 1E 00 00 */ lfs f0, 0(r30) /* 8042B038 003F45F8 3B 5A 00 01 */ addi r26, r26, 1 /* 8042B03C 003F45FC 2C 1A 00 03 */ cmpwi r26, 3 @@ -946,14 +946,14 @@ lbl_8042B064: /* 8042B064 003F4624 D3 DE 00 00 */ stfs f30, 0(r30) /* 8042B068 003F4628 7F 63 DB 78 */ mr r3, r27 /* 8042B06C 003F462C 7F 44 D3 78 */ mr r4, r26 -/* 8042B070 003F4630 4B FE 73 D1 */ bl func_80412440 +/* 8042B070 003F4630 4B FE 73 D1 */ bl GetRemoteSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 8042B074 003F4634 C0 1E 00 00 */ lfs f0, 0(r30) /* 8042B078 003F4638 7F 63 DB 78 */ mr r3, r27 /* 8042B07C 003F463C D3 DF 00 00 */ stfs f30, 0(r31) /* 8042B080 003F4640 7F 44 D3 78 */ mr r4, r26 /* 8042B084 003F4644 EC 00 08 2A */ fadds f0, f0, f1 /* 8042B088 003F4648 D0 1E 00 00 */ stfs f0, 0(r30) -/* 8042B08C 003F464C 4B FE 73 C5 */ bl func_80412450 +/* 8042B08C 003F464C 4B FE 73 C5 */ bl GetRemoteFxSend__Q44nw4r3snd6detail11BasicPlayerCFi /* 8042B090 003F4650 C0 1F 00 00 */ lfs f0, 0(r31) /* 8042B094 003F4654 3B 5A 00 01 */ addi r26, r26, 1 /* 8042B098 003F4658 2C 1A 00 04 */ cmpwi r26, 4 @@ -1008,7 +1008,7 @@ lbl_8042B064: lbl_8042B15C: /* 8042B15C 003F471C 7F 63 DB 78 */ mr r3, r27 /* 8042B160 003F4720 7F 84 E3 78 */ mr r4, r28 -/* 8042B164 003F4724 4B FE 72 CD */ bl func_80412430 +/* 8042B164 003F4724 4B FE 72 CD */ bl GetRemoteOutVolume__Q44nw4r3snd6detail11BasicPlayerCFi /* 8042B168 003F4728 80 1B 01 34 */ lwz r0, 0x134(r27) /* 8042B16C 003F472C 3B 9C 00 01 */ addi r28, r28, 1 /* 8042B170 003F4730 C0 1E 00 00 */ lfs f0, 0(r30) @@ -1087,8 +1087,8 @@ lbl_8042B228: /* 8042B288 003F4848 38 21 01 10 */ addi r1, r1, 0x110 /* 8042B28C 003F484C 4E 80 00 20 */ blr -.global func_8042B290 -func_8042B290: +.global ChannelCallbackFunc__Q44nw4r3snd6detail9WsdPlayerFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl +ChannelCallbackFunc__Q44nw4r3snd6detail9WsdPlayerFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl: /* 8042B290 003F4850 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8042B294 003F4854 7C 08 02 A6 */ mflr r0 /* 8042B298 003F4858 90 01 00 24 */ stw r0, 0x24(r1) @@ -1119,65 +1119,79 @@ lbl_8042B2D0: /* 8042B2F8 003F48B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8042B2FC 003F48BC 4E 80 00 20 */ blr -.global func_8042B300 -func_8042B300: -/* 8042B300 003F48C0 4B FF F6 90 */ b func_8042A990 -.global lbl_8042B304 -lbl_8042B304: +.global OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv: +/* 8042B300 003F48C0 4B FF F6 90 */ b Update__Q44nw4r3snd6detail9WsdPlayerFv + +.global OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042B304 003F48C4 81 83 00 00 */ lwz r12, 0(r3) /* 8042B308 003F48C8 81 8C 00 10 */ lwz r12, 0x10(r12) /* 8042B30C 003F48CC 7D 89 03 A6 */ mtctr r12 /* 8042B310 003F48D0 4E 80 04 20 */ bctr -.global func_8042B314 -func_8042B314: +#InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv or OnUpdateVoiceSoundThread__Q54nw4r3snd6detail11SoundThread14PlayerCallbackFv +.global InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv: /* 8042B314 003F48D4 4E 80 00 20 */ blr -.global func_8042B318 -func_8042B318: +.global IsPause__Q44nw4r3snd6detail9WsdPlayerCFv +IsPause__Q44nw4r3snd6detail9WsdPlayerCFv: /* 8042B318 003F48D8 88 63 00 EE */ lbz r3, 0xee(r3) /* 8042B31C 003F48DC 7C 03 00 D0 */ neg r0, r3 /* 8042B320 003F48E0 7C 00 1B 78 */ or r0, r0, r3 /* 8042B324 003F48E4 54 03 0F FE */ srwi r3, r0, 0x1f /* 8042B328 003F48E8 4E 80 00 20 */ blr -.global func_8042B32C -func_8042B32C: +.global IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv +IsStarted__Q44nw4r3snd6detail9WsdPlayerCFv: /* 8042B32C 003F48EC 88 63 00 ED */ lbz r3, 0xed(r3) /* 8042B330 003F48F0 7C 03 00 D0 */ neg r0, r3 /* 8042B334 003F48F4 7C 00 1B 78 */ or r0, r0, r3 /* 8042B338 003F48F8 54 03 0F FE */ srwi r3, r0, 0x1f /* 8042B33C 003F48FC 4E 80 00 20 */ blr -.global func_8042B340 -func_8042B340: +.global IsActive__Q44nw4r3snd6detail9WsdPlayerCFv +IsActive__Q44nw4r3snd6detail9WsdPlayerCFv: /* 8042B340 003F4900 88 63 00 EC */ lbz r3, 0xec(r3) /* 8042B344 003F4904 7C 03 00 D0 */ neg r0, r3 /* 8042B348 003F4908 7C 00 1B 78 */ or r0, r0, r3 /* 8042B34C 003F490C 54 03 0F FE */ srwi r3, r0, 0x1f /* 8042B350 003F4910 4E 80 00 20 */ blr -.global func_8042B354 -func_8042B354: + +#@180@InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +.global _180_InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +_180_InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv: /* 8042B354 003F4914 38 63 FF 2C */ addi r3, r3, -212 -/* 8042B358 003F4918 4B FF FF BC */ b func_8042B314 -.global lbl_8042B35C -lbl_8042B35C: +/* 8042B358 003F4918 4B FF FF BC */ b InvalidateWaveData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + +#@180@InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +.global _180_InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv +_180_InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv: /* 8042B35C 003F491C 38 63 FF 2C */ addi r3, r3, -212 -/* 8042B360 003F4920 4B FF F4 D8 */ b func_8042A838 -.global lbl_8042B364 -lbl_8042B364: +/* 8042B360 003F4920 4B FF F4 D8 */ b InvalidateData__Q44nw4r3snd6detail9WsdPlayerFPCvPCv + +#@180@__dt__Q44nw4r3snd6detail9WsdPlayerFv +.global _180___dt__Q44nw4r3snd6detail9WsdPlayerFv +_180___dt__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042B364 003F4924 38 63 FF 2C */ addi r3, r3, -212 -/* 8042B368 003F4928 4B FF E8 D8 */ b func_80429C40 -.global lbl_8042B36C -lbl_8042B36C: +/* 8042B368 003F4928 4B FF E8 D8 */ b __dt__Q44nw4r3snd6detail9WsdPlayerFv + +#@192@OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +.global _192_OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +_192_OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042B36C 003F492C 38 63 FF 20 */ addi r3, r3, -224 -/* 8042B370 003F4930 4B FF FF 94 */ b lbl_8042B304 -.global lbl_8042B374 -lbl_8042B374: +/* 8042B370 003F4930 4B FF FF 94 */ b OnShutdownSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + +#@192@OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +.global _192_OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv +_192_OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042B374 003F4934 38 63 FF 20 */ addi r3, r3, -224 -/* 8042B378 003F4938 4B FF FF 88 */ b func_8042B300 -.global lbl_8042B37C -lbl_8042B37C: +/* 8042B378 003F4938 4B FF FF 88 */ b OnUpdateFrameSoundThread__Q44nw4r3snd6detail9WsdPlayerFv + +#@192@__dt__Q44nw4r3snd6detail9WsdPlayerFv +.global _192___dt__Q44nw4r3snd6detail9WsdPlayerFv +_192___dt__Q44nw4r3snd6detail9WsdPlayerFv: /* 8042B37C 003F493C 38 63 FF 20 */ addi r3, r3, -224 -/* 8042B380 003F4940 4B FF E8 C0 */ b func_80429C40 +/* 8042B380 003F4940 4B FF E8 C0 */ b __dt__Q44nw4r3snd6detail9WsdPlayerFv diff --git a/asm/rodata_3.s b/asm/rodata_3.s index c814005..2daa224 100644 --- a/asm/rodata_3.s +++ b/asm/rodata_3.s @@ -3323,10 +3323,11 @@ lbl_8051FEE0: .4byte func_803BE660 .4byte func_803BE68C .4byte func_803BE7BC - .4byte lbl_803BE7C8 - .4byte lbl_803BE7D4 - .4byte lbl_803BE7E0 + .4byte func_803BE7C8 + .4byte func_803BE7D4 + .4byte func_803BE7E0 .4byte func_803BE7EC + .global lbl_8051FF18 lbl_8051FF18: .4byte 0 @@ -3354,10 +3355,10 @@ lbl_8051FF48: .4byte func_803BEBE4 .4byte func_803BEC50 .4byte func_803BECC8 - .4byte lbl_803BECD4 - .4byte lbl_803BECE0 - .4byte lbl_803BECEC - .4byte lbl_803BECF8 + .4byte func_803BECD4 + .4byte func_803BECE0 + .4byte func_803BECEC + .4byte func_803BECF8 .global lbl_8051FF80 @@ -3646,10 +3647,10 @@ lbl_805202A0: .4byte func_803C0E9C .4byte func_803C0EA4 .4byte func_803C0EAC - .4byte lbl_803C0EB8 - .4byte lbl_803C0ED0 - .4byte lbl_803C0EDC - .4byte lbl_803C0EE8 + .4byte func_803C0EB8 + .4byte func_803C0ED0 + .4byte func_803C0EDC + .4byte func_803C0EE8 .global lbl_805202D8 lbl_805202D8: @@ -3663,9 +3664,9 @@ lbl_805202D8: .4byte func_803C2D20 .4byte func_803C2D28 .4byte func_803C2D30 - .4byte lbl_803C2D3C - .4byte lbl_803C2D48 - .4byte lbl_803C2D54 + .4byte func_803C2D3C + .4byte func_803C2D48 + .4byte func_803C2D54 .4byte func_803C2D60 @@ -3691,8 +3692,8 @@ lbl_80520320: .4byte func_803C7850 .4byte func_803C7858 .4byte func_803C7860 - .4byte lbl_803C786C - .4byte lbl_803C7878 + .4byte func_803C786C + .4byte func_803C7878 .4byte func_803C79F0 .4byte func_803C79F4 @@ -3921,10 +3922,10 @@ lbl_80520678: .4byte func_803CEC54 .4byte func_803CEC5C .4byte func_803CEC64 - .4byte lbl_803CEC70 - .4byte lbl_803CEC7C - .4byte lbl_803CEC88 - .4byte lbl_803CEC94 + .4byte func_803CEC70 + .4byte func_803CEC7C + .4byte func_803CEC88 + .4byte func_803CEC94 .global lbl_805206B0 lbl_805206B0: @@ -3938,10 +3939,10 @@ lbl_805206B0: .4byte func_803CEDB8 .4byte func_803CEDC0 .4byte func_803CEDC8 - .4byte lbl_803CEDD4 + .4byte func_803CEDD4 .4byte func_803CEDE0 .4byte func_803CEE44 - .4byte lbl_803CEE58 + .4byte func_803CEE58 .global lbl_805206E8 @@ -7049,7 +7050,7 @@ lbl_80523880: .4byte 0 .4byte 0 .4byte 0 - .4byte func_8041C0E8 + .4byte ChannelCallbackFunc__Q44nw4r3snd6detail8SeqTrackFPQ44nw4r3snd6detail7ChannelQ54nw4r3snd6detail7Channel21ChannelCallbackStatusUl .4byte 0 .4byte 0 diff --git a/obj_files.mk b/obj_files.mk index 0176be8..6083339 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -45,7 +45,7 @@ GAME_O_FILES :=\ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_801D1F9C.o \ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_801EADC0.o \ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_801F3410.o \ - $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_80201A84.o \ + $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_80201A44.o \ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_80205A7C.o \ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_8020AB80.o \ $(BUILD_DIR)/asm/kyoshin/appgame/cf/code_8021BC70.o \ @@ -540,6 +540,7 @@ NW4R_O_FILES :=\ $(BUILD_DIR)/asm/nw4r/snd/snd_FxReverbStdDpl2.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_InstancePool.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_Lfo.o \ + $(BUILD_DIR)/asm/nw4r/snd/snd_McsSoundArchive.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_MemorySoundArchive.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_MidiSeqPlayer.o \ $(BUILD_DIR)/asm/nw4r/snd/snd_MmlParser.o \