diff --git a/asm/Runtime/runtime.s b/asm/Runtime/runtime.s index 72ea5719..9eaad443 100644 --- a/asm/Runtime/runtime.s +++ b/asm/Runtime/runtime.s @@ -119,12 +119,12 @@ sub_80389a34: __save_gpr: /* 80389A48 003869A8 91 CB FF B8 */ stw r14, -0x48(r11) -.global func_80389A4C -func_80389A4C: +.global _savegpr_15 +_savegpr_15: /* 80389A4C 003869AC 91 EB FF BC */ stw r15, -0x44(r11) -.global sub_80389a50 -sub_80389a50: +.global _savegpr_16 +_savegpr_16: /* 80389A50 003869B0 92 0B FF C0 */ stw r16, -0x40(r11) /* 80389A54 003869B4 92 2B FF C4 */ stw r17, -0x3c(r11) diff --git a/asm/musyx/creverb_fx.s b/asm/musyx/creverb_fx.s index 6590b82c..3c53158f 100644 --- a/asm/musyx/creverb_fx.s +++ b/asm/musyx/creverb_fx.s @@ -2,8 +2,8 @@ .section .text, "ax" -.global sub_803b5188 -sub_803b5188: +.global sndAuxCallbackReverbSTD +sndAuxCallbackReverbSTD: /* 803B5188 003B20E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B518C 003B20EC 7C 08 02 A6 */ mflr r0 /* 803B5190 003B20F0 7C 87 23 78 */ mr r7, r4 diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index eea008d2..20e9bfd0 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -141,7 +141,7 @@ snd_handle_irq: /* 803B2F5C 003AFEBC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 803B2F60 003AFEC0 28 00 00 00 */ cmplwi r0, 0 /* 803B2F64 003AFEC4 41 82 01 28 */ beq lbl_803B308C -/* 803B2F68 003AFEC8 4B FE A2 F1 */ bl nullsub_60 +/* 803B2F68 003AFEC8 4B FE A2 F1 */ bl streamCorrectLoops /* 803B2F6C 003AFECC 48 00 21 89 */ bl hwIRQEnterCritical /* 803B2F70 003AFED0 48 00 1F 05 */ bl salAiGetDest /* 803B2F74 003AFED4 48 00 20 21 */ bl salCtrlDsp @@ -198,7 +198,7 @@ lbl_803B3030: /* 803B3034 003AFF94 7F E3 FB 78 */ mr r3, r31 /* 803B3038 003AFF98 48 00 01 55 */ bl hwSetTimeOffset /* 803B303C 003AFF9C 38 60 01 00 */ li r3, 0x100 -/* 803B3040 003AFFA0 4B FE 50 C5 */ bl sub_80398104 +/* 803B3040 003AFFA0 4B FE 50 C5 */ bl seqHandle /* 803B3044 003AFFA4 38 60 01 00 */ li r3, 0x100 /* 803B3048 003AFFA8 4B FE 7A C1 */ bl synthHandle /* 803B304C 003AFFAC 48 00 20 C9 */ bl hwIRQLeaveCritical @@ -426,10 +426,10 @@ lbl_803B3310: /* 803B3348 003B02A8 41 82 00 1C */ beq lbl_803B3364 /* 803B334C 003B02AC 7F C3 F3 78 */ mr r3, r30 /* 803B3350 003B02B0 38 80 00 00 */ li r4, 0 -/* 803B3354 003B02B4 48 00 03 81 */ bl sub_803b36d4 +/* 803B3354 003B02B4 48 00 03 81 */ bl hwSetSRCType /* 803B3358 003B02B8 7F C3 F3 78 */ mr r3, r30 /* 803B335C 003B02BC 38 80 00 01 */ li r4, 1 -/* 803B3360 003B02C0 48 00 03 A1 */ bl hwSetSRCType +/* 803B3360 003B02C0 48 00 03 A1 */ bl hwSetPolyPhaseFilter lbl_803B3364: /* 803B3364 003B02C4 7F C3 F3 78 */ mr r3, r30 /* 803B3368 003B02C8 7F E4 FB 78 */ mr r4, r31 @@ -692,8 +692,8 @@ lbl_803B369C: /* 803B36CC 003B062C 98 05 00 E4 */ stb r0, 0xe4(r5) /* 803B36D0 003B0630 4E 80 00 20 */ blr -.global sub_803b36d4 -sub_803b36d4: +.global hwSetSRCType +hwSetSRCType: /* 803B36D4 003B0634 1C A3 00 F4 */ mulli r5, r3, 0xf4 /* 803B36D8 003B0638 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B36DC 003B063C 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e @@ -706,8 +706,8 @@ sub_803b36d4: /* 803B36F8 003B0658 90 03 00 24 */ stw r0, 0x24(r3) /* 803B36FC 003B065C 4E 80 00 20 */ blr -.global hwSetSRCType -hwSetSRCType: +.global hwSetPolyPhaseFilter +hwSetPolyPhaseFilter: /* 803B3700 003B0660 1C A3 00 F4 */ mulli r5, r3, 0xf4 /* 803B3704 003B0664 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3708 003B0668 54 80 0D FC */ rlwinm r0, r4, 1, 0x17, 0x1e @@ -936,8 +936,8 @@ lbl_803B3A30: /* 803B3A40 003B09A0 38 21 00 50 */ addi r1, r1, 0x50 /* 803B3A44 003B09A4 4E 80 00 20 */ blr -.global sub_803b3a48 -sub_803b3a48: +.global hwOff +hwOff: /* 803B3A48 003B09A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3A4C 003B09AC 7C 08 02 A6 */ mflr r0 /* 803B3A50 003B09B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -963,8 +963,8 @@ hwSetAUXProcessingCallbacks: /* 803B3A94 003B09F4 90 E3 00 B8 */ stw r7, 0xb8(r3) /* 803B3A98 003B09F8 4E 80 00 20 */ blr -.global sub_803b3a9c -sub_803b3a9c: +.global hwActivateStudio +hwActivateStudio: /* 803B3A9C 003B09FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3AA0 003B0A00 7C 08 02 A6 */ mflr r0 /* 803B3AA4 003B0A04 90 01 00 14 */ stw r0, 0x14(r1) @@ -974,19 +974,19 @@ sub_803b3a9c: /* 803B3AB4 003B0A14 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3AB8 003B0A18 4E 80 00 20 */ blr -.global sub_803b3abc -sub_803b3abc: +.global hwDeactivateStudio +hwDeactivateStudio: /* 803B3ABC 003B0A1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3AC0 003B0A20 7C 08 02 A6 */ mflr r0 /* 803B3AC4 003B0A24 90 01 00 14 */ stw r0, 0x14(r1) -/* 803B3AC8 003B0A28 4B FF 78 51 */ bl sub_803ab318 +/* 803B3AC8 003B0A28 4B FF 78 51 */ bl salDeactivateStudio /* 803B3ACC 003B0A2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B3AD0 003B0A30 7C 08 03 A6 */ mtlr r0 /* 803B3AD4 003B0A34 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3AD8 003B0A38 4E 80 00 20 */ blr -.global sub_803b3adc -sub_803b3adc: +.global hwAddInput +hwAddInput: /* 803B3ADC 003B0A3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3AE0 003B0A40 7C 08 02 A6 */ mflr r0 /* 803B3AE4 003B0A44 90 01 00 14 */ stw r0, 0x14(r1) @@ -995,14 +995,14 @@ sub_803b3adc: /* 803B3AF0 003B0A50 3C 60 80 56 */ lis r3, dspStudio@ha /* 803B3AF4 003B0A54 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803B3AF8 003B0A58 7C 60 2A 14 */ add r3, r0, r5 -/* 803B3AFC 003B0A5C 4B FF A3 91 */ bl sub_803ade8c +/* 803B3AFC 003B0A5C 4B FF A3 91 */ bl salAddStudioInput /* 803B3B00 003B0A60 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B3B04 003B0A64 7C 08 03 A6 */ mtlr r0 /* 803B3B08 003B0A68 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3B0C 003B0A6C 4E 80 00 20 */ blr -.global sub_803b3b10 -sub_803b3b10: +.global hwRemoveInput +hwRemoveInput: /* 803B3B10 003B0A70 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3B14 003B0A74 7C 08 02 A6 */ mflr r0 /* 803B3B18 003B0A78 90 01 00 14 */ stw r0, 0x14(r1) @@ -1011,7 +1011,7 @@ sub_803b3b10: /* 803B3B24 003B0A84 3C 60 80 56 */ lis r3, dspStudio@ha /* 803B3B28 003B0A88 38 03 F2 60 */ addi r0, r3, dspStudio@l /* 803B3B2C 003B0A8C 7C 60 2A 14 */ add r3, r0, r5 -/* 803B3B30 003B0A90 4B FF A4 05 */ bl sub_803adf34 +/* 803B3B30 003B0A90 4B FF A4 05 */ bl salRemoveStudioInput /* 803B3B34 003B0A94 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B3B38 003B0A98 7C 08 03 A6 */ mtlr r0 /* 803B3B3C 003B0A9C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1025,14 +1025,14 @@ hwChangeStudio: /* 803B3B50 003B0AB0 1C 03 00 F4 */ mulli r0, r3, 0xf4 /* 803B3B54 003B0AB4 80 6D AF 54 */ lwz r3, dspVoice@sda21(r13) /* 803B3B58 003B0AB8 7C 63 02 14 */ add r3, r3, r0 -/* 803B3B5C 003B0ABC 4B FF A2 69 */ bl sub_803addc4 +/* 803B3B5C 003B0ABC 4B FF A2 69 */ bl salReconnectVoice /* 803B3B60 003B0AC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B3B64 003B0AC4 7C 08 03 A6 */ mtlr r0 /* 803B3B68 003B0AC8 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3B6C 003B0ACC 4E 80 00 20 */ blr -.global sub_803b3b70 -sub_803b3b70: +.global hwGetPos +hwGetPos: /* 803B3B70 003B0AD0 1C A3 00 F4 */ mulli r5, r3, 0xf4 /* 803B3B74 003B0AD4 80 CD AF 54 */ lwz r6, dspVoice@sda21(r13) /* 803B3B78 003B0AD8 7C 86 2A 14 */ add r4, r6, r5 @@ -1050,9 +1050,6 @@ lbl_803B3B90: /* 803B3BA4 003B0B04 40 80 00 5C */ bge lbl_803B3C00 /* 803B3BA8 003B0B08 2C 00 00 00 */ cmpwi r0, 0 /* 803B3BAC 003B0B0C 40 80 00 10 */ bge lbl_803B3BBC - -.global sub_803b3bb0 -sub_803b3bb0: /* 803B3BB0 003B0B10 4E 80 00 20 */ blr lbl_803B3BB4: /* 803B3BB4 003B0B14 2C 00 00 06 */ cmpwi r0, 6 @@ -1122,8 +1119,8 @@ hwFlushStream: /* 803B3C9C 003B0BFC 38 21 00 30 */ addi r1, r1, 0x30 /* 803B3CA0 003B0C00 4E 80 00 20 */ blr -.global sub_803b3ca4 -sub_803b3ca4: +.global hwInitStream +hwInitStream: /* 803B3CA4 003B0C04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3CA8 003B0C08 7C 08 02 A6 */ mflr r0 /* 803B3CAC 003B0C0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1133,8 +1130,8 @@ sub_803b3ca4: /* 803B3CBC 003B0C1C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3CC0 003B0C20 4E 80 00 20 */ blr -.global sub_803b3cc4 -sub_803b3cc4: +.global hwExitStream +hwExitStream: /* 803B3CC4 003B0C24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3CC8 003B0C28 7C 08 02 A6 */ mflr r0 /* 803B3CCC 003B0C2C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1144,8 +1141,8 @@ sub_803b3cc4: /* 803B3CDC 003B0C3C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3CE0 003B0C40 4E 80 00 20 */ blr -.global sub_803b3ce4 -sub_803b3ce4: +.global hwGetStreamPlayBuffer +hwGetStreamPlayBuffer: /* 803B3CE4 003B0C44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3CE8 003B0C48 7C 08 02 A6 */ mflr r0 /* 803B3CEC 003B0C4C 38 80 00 00 */ li r4, 0 @@ -1186,8 +1183,8 @@ hwFrq2Pitch: /* 803B3D60 003B0CC0 38 21 00 20 */ addi r1, r1, 0x20 /* 803B3D64 003B0CC4 4E 80 00 20 */ blr -.global sub_803b3d68 -sub_803b3d68: +.global hwInitSampleMem +hwInitSampleMem: /* 803B3D68 003B0CC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3D6C 003B0CCC 7C 08 02 A6 */ mflr r0 /* 803B3D70 003B0CD0 7C 83 23 78 */ mr r3, r4 @@ -1198,8 +1195,8 @@ sub_803b3d68: /* 803B3D84 003B0CE4 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3D88 003B0CE8 4E 80 00 20 */ blr -.global sub_803b3d8c -sub_803b3d8c: +.global hwExitSampleMem +hwExitSampleMem: /* 803B3D8C 003B0CEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3D90 003B0CF0 7C 08 02 A6 */ mflr r0 /* 803B3D94 003B0CF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1209,8 +1206,8 @@ sub_803b3d8c: /* 803B3DA4 003B0D04 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3DA8 003B0D08 4E 80 00 20 */ blr -.global sub_803b3dac -sub_803b3dac: +.global hwSaveSample +hwSaveSample: /* 803B3DAC 003B0D0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3DB0 003B0D10 7C 08 02 A6 */ mflr r0 /* 803B3DB4 003B0D14 90 01 00 14 */ stw r0, 0x14(r1) @@ -1253,8 +1250,8 @@ lbl_803B3E20: /* 803B3E38 003B0D98 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3E3C 003B0D9C 4E 80 00 20 */ blr -.global sub_803b3e40 -sub_803b3e40: +.global hwSetSaveSampleCallback +hwSetSaveSampleCallback: /* 803B3E40 003B0DA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3E44 003B0DA4 7C 08 02 A6 */ mflr r0 /* 803B3E48 003B0DA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1264,8 +1261,8 @@ sub_803b3e40: /* 803B3E58 003B0DB8 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3E5C 003B0DBC 4E 80 00 20 */ blr -.global sub_803b3e60 -sub_803b3e60: +.global hwRemoveSample +hwRemoveSample: /* 803B3E60 003B0DC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B3E64 003B0DC4 7C 08 02 A6 */ mflr r0 /* 803B3E68 003B0DC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1315,8 +1312,8 @@ hwSyncSampleMem: /* 803B3EFC 003B0E5C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B3F00 003B0E60 4E 80 00 20 */ blr -.global nullsub_59 -nullsub_59: +.global hwFrameDone +hwFrameDone: /* 803B3F04 003B0E64 4E 80 00 20 */ blr .global sndSetHooks @@ -1327,8 +1324,8 @@ sndSetHooks: /* 803B3F14 003B0E74 90 0D AF 88 */ stw r0, salHooks+4@sda21(r13) /* 803B3F18 003B0E78 4E 80 00 20 */ blr -.global sub_803b3f1c -sub_803b3f1c: +.global hwDisableHRTF +hwDisableHRTF: /* 803B3F1C 003B0E7C 38 00 00 00 */ li r0, 0 /* 803B3F20 003B0E80 90 0D AF 44 */ stw r0, dspHRTFOn@sda21(r13) /* 803B3F24 003B0E84 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index 022ae2fa..60e77af2 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -521,8 +521,8 @@ salActivateStudio: /* 803AB310 003A8270 38 21 00 20 */ addi r1, r1, 0x20 /* 803AB314 003A8274 4E 80 00 20 */ blr -.global sub_803ab318 -sub_803ab318: +.global salDeactivateStudio +salDeactivateStudio: /* 803AB318 003A8278 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803AB31C 003A827C 3C 60 80 56 */ lis r3, dspStudio@ha /* 803AB320 003A8280 1C 00 00 BC */ mulli r0, r0, 0xbc @@ -710,8 +710,8 @@ lbl_803AB574: /* 803AB58C 003A84EC 90 05 00 00 */ stw r0, 0(r5) /* 803AB590 003A84F0 4E 80 00 20 */ blr -.global sub_803ab594 -sub_803ab594: +.global HandleDepopVoice +HandleDepopVoice: /* 803AB594 003A84F4 38 00 00 00 */ li r0, 0 /* 803AB598 003A84F8 3C A0 00 80 */ lis r5, 0x007FFFFF@ha /* 803AB59C 003A84FC 98 04 00 ED */ stb r0, 0xed(r4) @@ -1158,7 +1158,7 @@ lbl_803ABB98: lbl_803ABBB4: /* 803ABBB4 003A8B14 7E 03 83 78 */ mr r3, r16 /* 803ABBB8 003A8B18 7D C4 73 78 */ mr r4, r14 -/* 803ABBBC 003A8B1C 4B FF F9 D9 */ bl sub_803ab594 +/* 803ABBBC 003A8B1C 4B FF F9 D9 */ bl HandleDepopVoice /* 803ABBC0 003A8B20 80 6E 00 E8 */ lwz r3, 0xe8(r14) /* 803ABBC4 003A8B24 3C 03 00 01 */ addis r0, r3, 1 /* 803ABBC8 003A8B28 28 00 FF FF */ cmplwi r0, 0xffff @@ -1188,7 +1188,7 @@ lbl_803ABC08: lbl_803ABC18: /* 803ABC18 003A8B78 7E 03 83 78 */ mr r3, r16 /* 803ABC1C 003A8B7C 7D C4 73 78 */ mr r4, r14 -/* 803ABC20 003A8B80 4B FF F9 75 */ bl sub_803ab594 +/* 803ABC20 003A8B80 4B FF F9 75 */ bl HandleDepopVoice /* 803ABC24 003A8B84 81 CE 00 14 */ lwz r14, 0x14(r14) lbl_803ABC28: /* 803ABC28 003A8B88 28 0E 00 00 */ cmplwi r14, 0 @@ -2613,7 +2613,7 @@ lbl_803AD074: /* 803AD0E0 003AA040 40 82 00 10 */ bne lbl_803AD0F0 /* 803AD0E4 003AA044 7E 03 83 78 */ mr r3, r16 /* 803AD0E8 003AA048 7F A4 EB 78 */ mr r4, r29 -/* 803AD0EC 003AA04C 4B FF E4 A9 */ bl sub_803ab594 +/* 803AD0EC 003AA04C 4B FF E4 A9 */ bl HandleDepopVoice lbl_803AD0F0: /* 803AD0F0 003AA050 7F A3 EB 78 */ mr r3, r29 /* 803AD0F4 003AA054 48 00 0C 71 */ bl salDeactivateVoice @@ -2632,7 +2632,7 @@ lbl_803AD11C: /* 803AD124 003AA084 28 00 00 02 */ cmplwi r0, 2 /* 803AD128 003AA088 40 82 00 0C */ bne lbl_803AD134 /* 803AD12C 003AA08C 7E 03 83 78 */ mr r3, r16 -/* 803AD130 003AA090 4B FF E4 65 */ bl sub_803ab594 +/* 803AD130 003AA090 4B FF E4 65 */ bl HandleDepopVoice lbl_803AD134: /* 803AD134 003AA094 80 6E FF FC */ lwz r3, -4(r14) /* 803AD138 003AA098 48 00 0C 2D */ bl salDeactivateVoice @@ -2666,7 +2666,7 @@ lbl_803AD190: /* 803AD19C 003AA0FC 40 82 00 10 */ bne lbl_803AD1AC /* 803AD1A0 003AA100 7E 63 9B 78 */ mr r3, r19 /* 803AD1A4 003AA104 7E 84 A3 78 */ mr r4, r20 -/* 803AD1A8 003AA108 4B FF E3 ED */ bl sub_803ab594 +/* 803AD1A8 003AA108 4B FF E3 ED */ bl HandleDepopVoice lbl_803AD1AC: /* 803AD1AC 003AA10C 7E 83 A3 78 */ mr r3, r20 /* 803AD1B0 003AA110 48 00 0B B5 */ bl salDeactivateVoice @@ -3507,8 +3507,8 @@ lbl_803ADDB8: /* 803ADDBC 003AAD1C 98 03 00 EC */ stb r0, 0xec(r3) /* 803ADDC0 003AAD20 4E 80 00 20 */ blr -.global sub_803addc4 -sub_803addc4: +.global salReconnectVoice +salReconnectVoice: /* 803ADDC4 003AAD24 88 03 00 EC */ lbz r0, 0xec(r3) /* 803ADDC8 003AAD28 28 00 00 00 */ cmplwi r0, 0 /* 803ADDCC 003AAD2C 41 82 00 B8 */ beq lbl_803ADE84 @@ -3565,8 +3565,8 @@ lbl_803ADE84: /* 803ADE84 003AADE4 98 83 00 EF */ stb r4, 0xef(r3) /* 803ADE88 003AADE8 4E 80 00 20 */ blr -.global sub_803ade8c -sub_803ade8c: +.global salAddStudioInput +salAddStudioInput: /* 803ADE8C 003AADEC 88 03 00 52 */ lbz r0, 0x52(r3) /* 803ADE90 003AADF0 28 00 00 07 */ cmplwi r0, 7 /* 803ADE94 003AADF4 40 80 00 98 */ bge lbl_803ADF2C @@ -3611,8 +3611,8 @@ lbl_803ADF2C: /* 803ADF2C 003AAE8C 38 60 00 00 */ li r3, 0 /* 803ADF30 003AAE90 4E 80 00 20 */ blr -.global sub_803adf34 -sub_803adf34: +.global salRemoveStudioInput +salRemoveStudioInput: /* 803ADF34 003AAE94 88 03 00 52 */ lbz r0, 0x52(r3) /* 803ADF38 003AAE98 7C 66 1B 78 */ mr r6, r3 /* 803ADF3C 003AAE9C 38 A0 00 00 */ li r5, 0 diff --git a/asm/musyx/reverb_fx.s b/asm/musyx/reverb_fx.s index f5c8059a..c7b74edc 100644 --- a/asm/musyx/reverb_fx.s +++ b/asm/musyx/reverb_fx.s @@ -2,8 +2,8 @@ .section .text, "ax" -.global sndAuxCallbackReverbSTD -sndAuxCallbackReverbSTD: +.global sndAuxCallbackReverbHI +sndAuxCallbackReverbHI: /* 803B5B00 003B2A60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B5B04 003B2A64 7C 08 02 A6 */ mflr r0 /* 803B5B08 003B2A68 7C 87 23 78 */ mr r7, r4 diff --git a/asm/musyx/s_data.s b/asm/musyx/s_data.s index e381e2b7..fc5e5cc0 100644 --- a/asm/musyx/s_data.s +++ b/asm/musyx/s_data.s @@ -172,7 +172,7 @@ lbl_803A9FA4: /* 803A9FD0 003A6F30 1C 84 00 24 */ mulli r4, r4, 0x24 /* 803A9FD4 003A6F34 7C 80 22 14 */ add r4, r0, r4 /* 803A9FD8 003A6F38 3B 64 00 08 */ addi r27, r4, 8 -/* 803A9FDC 003A6F3C 48 00 9B 95 */ bl sub_803b3b70 +/* 803A9FDC 003A6F3C 48 00 9B 95 */ bl hwGetPos /* 803A9FE0 003A6F40 88 1B 00 02 */ lbz r0, 2(r27) /* 803A9FE4 003A6F44 7C 7C 1B 78 */ mr r28, r3 /* 803A9FE8 003A6F48 28 00 00 05 */ cmplwi r0, 5 @@ -344,11 +344,11 @@ lbl_803AA220: /* 803AA220 003A7180 28 06 00 00 */ cmplwi r6, 0 /* 803AA224 003A7184 41 82 00 10 */ beq lbl_803AA234 /* 803AA228 003A7188 38 86 00 08 */ addi r4, r6, 8 -/* 803AA22C 003A718C 4B FF 7D 39 */ bl sub_803a1f64 +/* 803AA22C 003A718C 4B FF 7D 39 */ bl dataInsertMacro /* 803AA230 003A7190 48 00 01 CC */ b lbl_803AA3FC lbl_803AA234: /* 803AA234 003A7194 38 80 00 00 */ li r4, 0 -/* 803AA238 003A7198 4B FF 7D 2D */ bl sub_803a1f64 +/* 803AA238 003A7198 4B FF 7D 2D */ bl dataInsertMacro /* 803AA23C 003A719C 48 00 01 C0 */ b lbl_803AA3FC lbl_803AA240: /* 803AA240 003A71A0 4B FF 80 29 */ bl dataRemoveMacro @@ -394,7 +394,7 @@ lbl_803AA2B8: /* 803AA2C4 003A7224 48 00 01 38 */ b lbl_803AA3FC lbl_803AA2C8: /* 803AA2C8 003A7228 60 63 40 00 */ ori r3, r3, 0x4000 -/* 803AA2CC 003A722C 4B FF 6B 59 */ bl sub_803a0e24 +/* 803AA2CC 003A722C 4B FF 6B 59 */ bl dataRemoveKeymap /* 803AA2D0 003A7230 48 00 01 2C */ b lbl_803AA3FC lbl_803AA2D4: /* 803AA2D4 003A7234 28 06 00 00 */ cmplwi r6, 0 @@ -479,27 +479,27 @@ lbl_803AA3D4: /* 803AA3D8 003A7338 4B FF 6F D5 */ bl dataInsertCurve /* 803AA3DC 003A733C 48 00 00 20 */ b lbl_803AA3FC lbl_803AA3E0: -/* 803AA3E0 003A7340 4B FF 71 D1 */ bl dataRemoveKeymap +/* 803AA3E0 003A7340 4B FF 71 D1 */ bl dataRemoveCurve /* 803AA3E4 003A7344 48 00 00 18 */ b lbl_803AA3FC lbl_803AA3E8: /* 803AA3E8 003A7348 28 06 00 00 */ cmplwi r6, 0 /* 803AA3EC 003A734C 40 82 00 0C */ bne lbl_803AA3F8 -/* 803AA3F0 003A7350 4B FF 77 8D */ bl sub_803a1b7c +/* 803AA3F0 003A7350 4B FF 77 8D */ bl dataAddSampleReference /* 803AA3F4 003A7354 48 00 00 08 */ b lbl_803AA3FC lbl_803AA3F8: -/* 803AA3F8 003A7358 4B FF 78 5D */ bl sub_803a1c54 +/* 803AA3F8 003A7358 4B FF 78 5D */ bl dataRemoveSampleReference lbl_803AA3FC: /* 803AA3FC 003A735C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803AA400 003A7360 7C 08 03 A6 */ mtlr r0 /* 803AA404 003A7364 38 21 00 10 */ addi r1, r1, 0x10 /* 803AA408 003A7368 4E 80 00 20 */ blr -.global sub_803aa40c -sub_803aa40c: +.global sndSetSampleDataUploadCallback +sndSetSampleDataUploadCallback: /* 803AA40C 003A736C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803AA410 003A7370 7C 08 02 A6 */ mflr r0 /* 803AA414 003A7374 90 01 00 14 */ stw r0, 0x14(r1) -/* 803AA418 003A7378 48 00 9A 29 */ bl sub_803b3e40 +/* 803AA418 003A7378 48 00 9A 29 */ bl hwSetSaveSampleCallback /* 803AA41C 003A737C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803AA420 003A7380 7C 08 03 A6 */ mtlr r0 /* 803AA424 003A7384 38 21 00 10 */ addi r1, r1, 0x10 @@ -838,7 +838,7 @@ lbl_803AA894: /* 803AA898 003A77F8 40 80 FF 74 */ bge lbl_803AA80C lbl_803AA89C: /* 803AA89C 003A77FC 7F 43 D3 78 */ mr r3, r26 -/* 803AA8A0 003A7800 4B FF 70 15 */ bl sub_803a18b4 +/* 803AA8A0 003A7800 4B FF 70 15 */ bl dataRemoveSDir /* 803AA8A4 003A7804 80 1F 00 08 */ lwz r0, 8(r31) /* 803AA8A8 003A7808 7F 9E 02 14 */ add r28, r30, r0 /* 803AA8AC 003A780C 48 00 00 5C */ b lbl_803AA908 @@ -975,7 +975,7 @@ lbl_803AAA58: /* 803AAA68 003A79C8 28 00 00 01 */ cmplwi r0, 1 /* 803AAA6C 003A79CC 40 82 00 0C */ bne lbl_803AAA78 /* 803AAA70 003A79D0 A0 7F 00 04 */ lhz r3, 4(r31) -/* 803AAA74 003A79D4 4B FF 73 95 */ bl sub_803a1e08 +/* 803AAA74 003A79D4 4B FF 73 95 */ bl dataRemoveFX lbl_803AAA78: /* 803AAA78 003A79D8 38 60 00 01 */ li r3, 1 /* 803AAA7C 003A79DC 39 61 00 20 */ addi r11, r1, 0x20 @@ -985,8 +985,8 @@ lbl_803AAA78: /* 803AAA8C 003A79EC 38 21 00 20 */ addi r1, r1, 0x20 /* 803AAA90 003A79F0 4E 80 00 20 */ blr -.global sub_803aaa94 -sub_803aaa94: +.global sndSeqPlaySong +sndSeqPlaySong: /* 803AAA94 003A79F4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803AAA98 003A79F8 7C 08 02 A6 */ mflr r0 /* 803AAA9C 003A79FC 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/musyx/seq.s b/asm/musyx/seq.s index b70f08bc..ce296926 100644 --- a/asm/musyx/seq.s +++ b/asm/musyx/seq.s @@ -2442,7 +2442,7 @@ lbl_80396CCC: /* 80396CF8 00393C58 38 E0 00 01 */ li r7, 1 /* 80396CFC 00393C5C 80 BF 00 10 */ lwz r5, 0x10(r31) /* 80396D00 00393C60 89 1F 00 19 */ lbz r8, 0x19(r31) -/* 80396D04 00393C64 48 01 3D 91 */ bl sub_803aaa94 +/* 80396D04 00393C64 48 01 3D 91 */ bl sndSeqPlaySong /* 80396D08 00393C68 3C 03 00 01 */ addis r0, r3, 1 /* 80396D0C 00393C6C 90 7D 00 00 */ stw r3, 0(r29) /* 80396D10 00393C70 28 00 FF FF */ cmplwi r0, 0xffff @@ -3245,7 +3245,7 @@ lbl_803977C8: /* 8039783C 0039479C 88 8A 0E 72 */ lbz r4, 0xe72(r10) /* 80397840 003947A0 88 AA 0E 73 */ lbz r5, 0xe73(r10) /* 80397844 003947A4 54 0A 06 3E */ clrlwi r10, r0, 0x18 -/* 80397848 003947A8 48 00 1E 05 */ bl sub_8039964c +/* 80397848 003947A8 48 00 1E 05 */ bl synthStartSound /* 8039784C 003947AC 3C 03 00 01 */ addis r0, r3, 1 /* 80397850 003947B0 90 7E 00 08 */ stw r3, 8(r30) /* 80397854 003947B4 28 00 FF FF */ cmplwi r0, 0xffff @@ -3896,8 +3896,8 @@ lbl_803980E4: /* 803980FC 0039505C 38 21 00 60 */ addi r1, r1, 0x60 /* 80398100 00395060 4E 80 00 20 */ blr -.global sub_80398104 -sub_80398104: +.global seqHandle +seqHandle: /* 80398104 00395064 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 80398108 00395068 7C 08 02 A6 */ mflr r0 /* 8039810C 0039506C 90 01 00 A4 */ stw r0, 0xa4(r1) diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index 0d96644d..9856f138 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -339,7 +339,7 @@ lbl_803AEA90: /* 803AEAAC 003ABA0C 4E 80 04 21 */ bctrl lbl_803AEAB0: /* 803AEAB0 003ABA10 88 7F 00 1C */ lbz r3, 0x1c(r31) -/* 803AEAB4 003ABA14 4B FE DC 81 */ bl sub_8039c734 +/* 803AEAB4 003ABA14 4B FE DC 81 */ bl synthDeactivateStudio /* 803AEAB8 003ABA18 88 9F 00 1C */ lbz r4, 0x1c(r31) /* 803AEABC 003ABA1C 38 60 00 FF */ li r3, 0xff /* 803AEAC0 003ABA20 38 00 00 00 */ li r0, 0 diff --git a/asm/musyx/snd_midictrl.s b/asm/musyx/snd_midictrl.s index b46e159f..e84655cf 100644 --- a/asm/musyx/snd_midictrl.s +++ b/asm/musyx/snd_midictrl.s @@ -377,7 +377,7 @@ lbl_803B13B4: /* 803B13D4 003AE334 93 63 02 14 */ stw r27, 0x214(r3) /* 803B13D8 003AE338 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B13DC 003AE33C 7C 60 CA 14 */ add r3, r0, r25 -/* 803B13E0 003AE340 4B FE 97 01 */ bl sub_8039aae0 +/* 803B13E0 003AE340 4B FE 97 01 */ bl synthkeystateupdate lbl_803B13E4: /* 803B13E4 003AE344 3B 39 04 04 */ addi r25, r25, 0x404 /* 803B13E8 003AE348 3B 9C 00 01 */ addi r28, r28, 1 @@ -587,7 +587,7 @@ lbl_803B169C: /* 803B16BC 003AE61C 93 83 02 14 */ stw r28, 0x214(r3) /* 803B16C0 003AE620 80 0D AE 78 */ lwz r0, synthVoice@sda21(r13) /* 803B16C4 003AE624 7C 60 CA 14 */ add r3, r0, r25 -/* 803B16C8 003AE628 4B FE 94 19 */ bl sub_8039aae0 +/* 803B16C8 003AE628 4B FE 94 19 */ bl synthkeystateupdate lbl_803B16CC: /* 803B16CC 003AE62C 3B 39 04 04 */ addi r25, r25, 0x404 /* 803B16D0 003AE630 3B BD 00 01 */ addi r29, r29, 1 @@ -952,8 +952,8 @@ lbl_803B1BC8: /* 803B1BC8 003AEB28 38 60 00 00 */ li r3, 0 /* 803B1BCC 003AEB2C 4E 80 00 20 */ blr -.global sub_803b1bd0 -sub_803b1bd0: +.global inpGetChannelDefaults +inpGetChannelDefaults: /* 803B1BD0 003AEB30 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 803B1BD4 003AEB34 3C A0 80 56 */ lis r5, inpChannelDefaults@ha /* 803B1BD8 003AEB38 28 00 00 FF */ cmplwi r0, 0xff @@ -1504,8 +1504,8 @@ lbl_803B22D8: /* 803B22FC 003AF25C 38 21 00 30 */ addi r1, r1, 0x30 /* 803B2300 003AF260 4E 80 00 20 */ blr -.global sub_803b2304 -sub_803b2304: +.global inpGetVolume +inpGetVolume: /* 803B2304 003AF264 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2308 003AF268 7C 08 02 A6 */ mflr r0 /* 803B230C 003AF26C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1527,8 +1527,8 @@ lbl_803B233C: /* 803B2344 003AF2A4 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2348 003AF2A8 4E 80 00 20 */ blr -.global sub_803b234c -sub_803b234c: +.global inpGetPanning +inpGetPanning: /* 803B234C 003AF2AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2350 003AF2B0 7C 08 02 A6 */ mflr r0 /* 803B2354 003AF2B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1550,8 +1550,8 @@ lbl_803B2384: /* 803B238C 003AF2EC 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2390 003AF2F0 4E 80 00 20 */ blr -.global sub_803b2394 -sub_803b2394: +.global inpGetSurPanning +inpGetSurPanning: /* 803B2394 003AF2F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2398 003AF2F8 7C 08 02 A6 */ mflr r0 /* 803B239C 003AF2FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1573,8 +1573,8 @@ lbl_803B23CC: /* 803B23D4 003AF334 38 21 00 10 */ addi r1, r1, 0x10 /* 803B23D8 003AF338 4E 80 00 20 */ blr -.global sub_803b23dc -sub_803b23dc: +.global inpGetPitchBend +inpGetPitchBend: /* 803B23DC 003AF33C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B23E0 003AF340 7C 08 02 A6 */ mflr r0 /* 803B23E4 003AF344 90 01 00 14 */ stw r0, 0x14(r1) @@ -1596,8 +1596,8 @@ lbl_803B2414: /* 803B241C 003AF37C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2420 003AF380 4E 80 00 20 */ blr -.global sub_803b2424 -sub_803b2424: +.global inpGetDoppler +inpGetDoppler: /* 803B2424 003AF384 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2428 003AF388 7C 08 02 A6 */ mflr r0 /* 803B242C 003AF38C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1619,8 +1619,8 @@ lbl_803B245C: /* 803B2464 003AF3C4 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2468 003AF3C8 4E 80 00 20 */ blr -.global sub_803b246c -sub_803b246c: +.global inpGetModulation +inpGetModulation: /* 803B246C 003AF3CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2470 003AF3D0 7C 08 02 A6 */ mflr r0 /* 803B2474 003AF3D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1642,8 +1642,8 @@ lbl_803B24A4: /* 803B24AC 003AF40C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B24B0 003AF410 4E 80 00 20 */ blr -.global inpGetVolume -inpGetVolume: +.global inpGetPedal +inpGetPedal: /* 803B24B4 003AF414 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B24B8 003AF418 7C 08 02 A6 */ mflr r0 /* 803B24BC 003AF41C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1665,8 +1665,8 @@ lbl_803B24EC: /* 803B24F4 003AF454 38 21 00 10 */ addi r1, r1, 0x10 /* 803B24F8 003AF458 4E 80 00 20 */ blr -.global sub_803b24fc -sub_803b24fc: +.global inpGetPreAuxA +inpGetPreAuxA: /* 803B24FC 003AF45C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2500 003AF460 7C 08 02 A6 */ mflr r0 /* 803B2504 003AF464 90 01 00 14 */ stw r0, 0x14(r1) @@ -1688,8 +1688,8 @@ lbl_803B2534: /* 803B253C 003AF49C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2540 003AF4A0 4E 80 00 20 */ blr -.global sub_803b2544 -sub_803b2544: +.global inpGetReverb +inpGetReverb: /* 803B2544 003AF4A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2548 003AF4A8 7C 08 02 A6 */ mflr r0 /* 803B254C 003AF4AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1711,8 +1711,8 @@ lbl_803B257C: /* 803B2584 003AF4E4 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2588 003AF4E8 4E 80 00 20 */ blr -.global sub_803b258c -sub_803b258c: +.global inpGetPreAuxB +inpGetPreAuxB: /* 803B258C 003AF4EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2590 003AF4F0 7C 08 02 A6 */ mflr r0 /* 803B2594 003AF4F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1734,8 +1734,8 @@ lbl_803B25C4: /* 803B25CC 003AF52C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B25D0 003AF530 4E 80 00 20 */ blr -.global sub_803b25d4 -sub_803b25d4: +.global inpGetPostAuxB +inpGetPostAuxB: /* 803B25D4 003AF534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B25D8 003AF538 7C 08 02 A6 */ mflr r0 /* 803B25DC 003AF53C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1757,8 +1757,8 @@ lbl_803B260C: /* 803B2614 003AF574 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2618 003AF578 4E 80 00 20 */ blr -.global sub_803b261c -sub_803b261c: +.global inpGetTremolo +inpGetTremolo: /* 803B261C 003AF57C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2620 003AF580 7C 08 02 A6 */ mflr r0 /* 803B2624 003AF584 90 01 00 14 */ stw r0, 0x14(r1) @@ -1780,8 +1780,8 @@ lbl_803B2654: /* 803B265C 003AF5BC 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2660 003AF5C0 4E 80 00 20 */ blr -.global sub_803b2664 -sub_803b2664: +.global inpGetAuxB +inpGetAuxB: /* 803B2664 003AF5C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803B2668 003AF5C8 7C 08 02 A6 */ mflr r0 /* 803B266C 003AF5CC 3C E0 80 56 */ lis r7, inpGlobalMIDIDirtyFlags@ha @@ -1882,8 +1882,8 @@ lbl_803B27BC: /* 803B27C4 003AF724 38 21 00 10 */ addi r1, r1, 0x10 /* 803B27C8 003AF728 4E 80 00 20 */ blr -.global sub_803b27cc -sub_803b27cc: +.global inpInit +inpInit: /* 803B27CC 003AF72C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803B27D0 003AF730 28 03 00 00 */ cmplwi r3, 0 /* 803B27D4 003AF734 93 E1 00 1C */ stw r31, 0x1c(r1) diff --git a/asm/musyx/snd_synthapi.s b/asm/musyx/snd_synthapi.s index ce2eb815..84f10a1e 100644 --- a/asm/musyx/snd_synthapi.s +++ b/asm/musyx/snd_synthapi.s @@ -222,21 +222,21 @@ lbl_8039C480: /* 8039C484 003993E4 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C488 003993E8 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 8039C48C 003993EC 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) -/* 8039C490 003993F0 48 01 7A 8D */ bl sub_803b3f1c +/* 8039C490 003993F0 48 01 7A 8D */ bl hwDisableHRTF /* 8039C494 003993F4 48 00 00 30 */ b lbl_8039C4C4 lbl_8039C498: /* 8039C498 003993F8 57 E3 00 3C */ rlwinm r3, r31, 0, 0, 0x1e /* 8039C49C 003993FC 57 E0 00 3A */ rlwinm r0, r31, 0, 0, 0x1d /* 8039C4A0 00399400 90 6D AE 74 */ stw r3, synthFlags@sda21(r13) /* 8039C4A4 00399404 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) -/* 8039C4A8 00399408 48 01 7A 75 */ bl sub_803b3f1c +/* 8039C4A8 00399408 48 01 7A 75 */ bl hwDisableHRTF /* 8039C4AC 0039940C 48 00 00 18 */ b lbl_8039C4C4 lbl_8039C4B0: /* 8039C4B0 00399410 57 E0 00 3C */ rlwinm r0, r31, 0, 0, 0x1e /* 8039C4B4 00399414 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) /* 8039C4B8 00399418 60 00 00 02 */ ori r0, r0, 2 /* 8039C4BC 0039941C 90 0D AE 74 */ stw r0, synthFlags@sda21(r13) -/* 8039C4C0 00399420 48 01 7A 5D */ bl sub_803b3f1c +/* 8039C4C0 00399420 48 01 7A 5D */ bl hwDisableHRTF lbl_8039C4C4: /* 8039C4C4 00399424 80 0D AE 74 */ lwz r0, synthFlags@sda21(r13) /* 8039C4C8 00399428 7C 1F 00 40 */ cmplw r31, r0 @@ -398,7 +398,7 @@ synthActivateStudio: /* 8039C704 00399664 7C 08 59 AE */ stbx r0, r8, r11 /* 8039C708 00399668 7C 07 59 AE */ stbx r0, r7, r11 /* 8039C70C 0039966C 7D 26 61 AE */ stbx r9, r6, r12 -/* 8039C710 00399670 48 01 73 8D */ bl sub_803b3a9c +/* 8039C710 00399670 48 01 73 8D */ bl hwActivateStudio /* 8039C714 00399674 48 01 89 71 */ bl hwEnableIrq /* 8039C718 00399678 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039C71C 0039967C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -408,8 +408,8 @@ synthActivateStudio: /* 8039C72C 0039968C 38 21 00 20 */ addi r1, r1, 0x20 /* 8039C730 00399690 4E 80 00 20 */ blr -.global sub_8039c734 -sub_8039c734: +.global synthDeactivateStudio +synthDeactivateStudio: /* 8039C734 00399694 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8039C738 00399698 7C 08 02 A6 */ mflr r0 /* 8039C73C 0039969C 90 01 00 24 */ stw r0, 0x24(r1) @@ -442,7 +442,7 @@ lbl_8039C798: /* 8039C7A0 00399700 28 03 00 00 */ cmplwi r3, 0 /* 8039C7A4 00399704 41 82 00 0C */ beq lbl_8039C7B0 /* 8039C7A8 00399708 7F 63 DB 78 */ mr r3, r27 -/* 8039C7AC 0039970C 48 01 72 9D */ bl sub_803b3a48 +/* 8039C7AC 0039970C 48 01 72 9D */ bl hwOff lbl_8039C7B0: /* 8039C7B0 00399710 3B 9C 04 04 */ addi r28, r28, 0x404 /* 8039C7B4 00399714 3B 7B 00 01 */ addi r27, r27, 1 @@ -467,7 +467,7 @@ lbl_8039C7B8: /* 8039C7FC 0039975C 7C 03 49 AE */ stbx r0, r3, r9 /* 8039C800 00399760 48 01 88 85 */ bl hwEnableIrq /* 8039C804 00399764 7F E3 FB 78 */ mr r3, r31 -/* 8039C808 00399768 48 01 72 B5 */ bl sub_803b3abc +/* 8039C808 00399768 48 01 72 B5 */ bl hwDeactivateStudio /* 8039C80C 0039976C 39 61 00 20 */ addi r11, r1, 0x20 /* 8039C810 00399770 4B FE D2 B9 */ bl _restgpr_27 /* 8039C814 00399774 80 01 00 24 */ lwz r0, 0x24(r1) @@ -480,7 +480,7 @@ synthAddStudioInput: /* 8039C824 00399784 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8039C828 00399788 7C 08 02 A6 */ mflr r0 /* 8039C82C 0039978C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8039C830 00399790 48 01 72 AD */ bl sub_803b3adc +/* 8039C830 00399790 48 01 72 AD */ bl hwAddInput /* 8039C834 00399794 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039C838 00399798 7C 08 03 A6 */ mtlr r0 /* 8039C83C 0039979C 38 21 00 10 */ addi r1, r1, 0x10 @@ -491,7 +491,7 @@ synthRemoveStudioInput: /* 8039C844 003997A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8039C848 003997A8 7C 08 02 A6 */ mflr r0 /* 8039C84C 003997AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8039C850 003997B0 48 01 72 C1 */ bl sub_803b3b10 +/* 8039C850 003997B0 48 01 72 C1 */ bl hwRemoveInput /* 8039C854 003997B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039C858 003997B8 7C 08 03 A6 */ mtlr r0 /* 8039C85C 003997BC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index f33e13e4..3d3f8fde 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -164,7 +164,7 @@ lbl_8039CA18: /* 8039CA1C 0039997C 88 7C 00 0E */ lbz r3, 0xe(r28) /* 8039CA20 00399980 64 00 40 00 */ oris r0, r0, 0x4000 /* 8039CA24 00399984 90 01 00 08 */ stw r0, 8(r1) -/* 8039CA28 00399988 48 01 72 BD */ bl sub_803b3ce4 +/* 8039CA28 00399988 48 01 72 BD */ bl hwGetStreamPlayBuffer /* 8039CA2C 0039998C 88 1C 00 0D */ lbz r0, 0xd(r28) /* 8039CA30 00399990 38 A0 00 00 */ li r5, 0 /* 8039CA34 00399994 80 9C 00 18 */ lwz r4, 0x18(r28) @@ -275,7 +275,7 @@ lbl_8039CA98: /* 8039CBCC 00399B2C 48 00 06 60 */ b lbl_8039D22C lbl_8039CBD0: /* 8039CBD0 00399B30 80 7C 00 4C */ lwz r3, 0x4c(r28) -/* 8039CBD4 00399B34 48 01 6F 9D */ bl sub_803b3b70 +/* 8039CBD4 00399B34 48 01 6F 9D */ bl hwGetPos /* 8039CBD8 00399B38 88 BC 00 0D */ lbz r5, 0xd(r28) /* 8039CBDC 00399B3C 28 05 00 01 */ cmplwi r5, 1 /* 8039CBE0 00399B40 40 82 00 24 */ bne lbl_8039CC04 @@ -720,8 +720,8 @@ lbl_8039D240: /* 8039D250 0039A1B0 38 21 00 70 */ addi r1, r1, 0x70 /* 8039D254 0039A1B4 4E 80 00 20 */ blr -.global nullsub_60 -nullsub_60: +.global streamCorrectLoops +streamCorrectLoops: /* 8039D258 0039A1B8 4E 80 00 20 */ blr .global streamKill @@ -1196,7 +1196,7 @@ sndStreamAllocEx: /* 8039D8D0 0039A830 7C 08 02 A6 */ mflr r0 /* 8039D8D4 0039A834 90 01 00 54 */ stw r0, 0x54(r1) /* 8039D8D8 0039A838 39 61 00 50 */ addi r11, r1, 0x50 -/* 8039D8DC 0039A83C 4B FE C1 75 */ bl sub_80389a50 +/* 8039D8DC 0039A83C 4B FE C1 75 */ bl _savegpr_16 /* 8039D8E0 0039A840 8A A1 00 5B */ lbz r21, 0x5b(r1) /* 8039D8E4 0039A844 7C 7B 1B 78 */ mr r27, r3 /* 8039D8E8 0039A848 8A C1 00 5F */ lbz r22, 0x5f(r1) @@ -1457,7 +1457,7 @@ lbl_8039DC6C: /* 8039DC98 0039ABF8 93 25 00 50 */ stw r25, 0x50(r5) /* 8039DC9C 0039ABFC 7C 86 81 2E */ stwx r4, r6, r16 /* 8039DCA0 0039AC00 98 05 00 0C */ stb r0, 0xc(r5) -/* 8039DCA4 0039AC04 48 01 60 01 */ bl sub_803b3ca4 +/* 8039DCA4 0039AC04 48 01 60 01 */ bl hwInitStream /* 8039DCA8 0039AC08 3C 80 80 55 */ lis r4, streamInfo@ha /* 8039DCAC 0039AC0C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8039DCB0 0039AC10 38 84 13 F8 */ addi r4, r4, streamInfo@l @@ -3480,7 +3480,7 @@ lbl_8039F950: /* 8039F96C 0039C8CC 1F FA 00 64 */ mulli r31, r26, 0x64 /* 8039F970 0039C8D0 3B A3 00 0E */ addi r29, r3, 0xe /* 8039F974 0039C8D4 7C 7D F8 AE */ lbzx r3, r29, r31 -/* 8039F978 0039C8D8 48 01 43 4D */ bl sub_803b3cc4 +/* 8039F978 0039C8D8 48 01 43 4D */ bl hwExitStream /* 8039F97C 0039C8DC 3C 60 80 55 */ lis r3, streamInfo@ha /* 8039F980 0039C8E0 38 63 13 F8 */ addi r3, r3, streamInfo@l /* 8039F984 0039C8E4 7F 43 F8 2E */ lwzx r26, r3, r31 @@ -3583,7 +3583,7 @@ lbl_8039FAD0: /* 8039FAE0 0039CA40 48 00 0A 41 */ bl sndStreamDeactivate /* 8039FAE4 0039CA44 1F 9B 00 64 */ mulli r28, r27, 0x64 /* 8039FAE8 0039CA48 7C 7D E0 AE */ lbzx r3, r29, r28 -/* 8039FAEC 0039CA4C 48 01 41 D9 */ bl sub_803b3cc4 +/* 8039FAEC 0039CA4C 48 01 41 D9 */ bl hwExitStream /* 8039FAF0 0039CA50 3C 60 80 55 */ lis r3, streamInfo@ha /* 8039FAF4 0039CA54 38 63 13 F8 */ addi r3, r3, streamInfo@l /* 8039FAF8 0039CA58 7F 43 E0 2E */ lwzx r26, r3, r28 @@ -3686,7 +3686,7 @@ lbl_8039FC44: /* 8039FC54 0039CBB4 48 00 08 CD */ bl sndStreamDeactivate /* 8039FC58 0039CBB8 1F 7B 00 64 */ mulli r27, r27, 0x64 /* 8039FC5C 0039CBBC 7C 7D D8 AE */ lbzx r3, r29, r27 -/* 8039FC60 0039CBC0 48 01 40 65 */ bl sub_803b3cc4 +/* 8039FC60 0039CBC0 48 01 40 65 */ bl hwExitStream /* 8039FC64 0039CBC4 3C 60 80 55 */ lis r3, streamInfo@ha /* 8039FC68 0039CBC8 38 63 13 F8 */ addi r3, r3, streamInfo@l /* 8039FC6C 0039CBCC 7F 43 D8 2E */ lwzx r26, r3, r27 @@ -3788,7 +3788,7 @@ lbl_8039FDB4: /* 8039FDC4 0039CD24 48 00 07 5D */ bl sndStreamDeactivate /* 8039FDC8 0039CD28 1F D9 00 64 */ mulli r30, r25, 0x64 /* 8039FDCC 0039CD2C 7C 7D F0 AE */ lbzx r3, r29, r30 -/* 8039FDD0 0039CD30 48 01 3E F5 */ bl sub_803b3cc4 +/* 8039FDD0 0039CD30 48 01 3E F5 */ bl hwExitStream /* 8039FDD4 0039CD34 3C 60 80 55 */ lis r3, streamInfo@ha /* 8039FDD8 0039CD38 38 63 13 F8 */ addi r3, r3, streamInfo@l /* 8039FDDC 0039CD3C 7F 23 F0 2E */ lwzx r25, r3, r30 @@ -3806,7 +3806,7 @@ lbl_8039FDB4: /* 8039FE0C 0039CD6C 48 00 07 15 */ bl sndStreamDeactivate /* 8039FE10 0039CD70 1F 3A 00 64 */ mulli r25, r26, 0x64 /* 8039FE14 0039CD74 7C 7D C8 AE */ lbzx r3, r29, r25 -/* 8039FE18 0039CD78 48 01 3E AD */ bl sub_803b3cc4 +/* 8039FE18 0039CD78 48 01 3E AD */ bl hwExitStream /* 8039FE1C 0039CD7C 3C 60 80 55 */ lis r3, streamInfo@ha /* 8039FE20 0039CD80 38 63 13 F8 */ addi r3, r3, streamInfo@l /* 8039FE24 0039CD84 7C 63 C8 2E */ lwzx r3, r3, r25 diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index 57e38330..f0d5fdc9 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -565,7 +565,7 @@ lbl_80399224: /* 80399258 003961B8 92 E1 00 1C */ stw r23, 0x1c(r1) /* 8039925C 003961BC 93 01 00 20 */ stw r24, 0x20(r1) /* 80399260 003961C0 93 21 00 24 */ stw r25, 0x24(r1) -/* 80399264 003961C4 48 00 DF 5D */ bl sub_803a71c0 +/* 80399264 003961C4 48 00 DF 5D */ bl macStart /* 80399268 003961C8 7C 7C 1B 78 */ mr r28, r3 /* 8039926C 003961CC 48 00 00 98 */ b lbl_80399304 lbl_80399270: @@ -683,7 +683,7 @@ StartKeymap: /* 803993F4 00396354 7C 08 02 A6 */ mflr r0 /* 803993F8 00396358 90 01 00 84 */ stw r0, 0x84(r1) /* 803993FC 0039635C 39 61 00 80 */ addi r11, r1, 0x80 -/* 80399400 00396360 4B FF 06 4D */ bl func_80389A4C +/* 80399400 00396360 4B FF 06 4D */ bl _savegpr_15 /* 80399404 00396364 8B A1 00 8B */ lbz r29, 0x8b(r1) /* 80399408 00396368 7C 97 23 78 */ mr r23, r4 /* 8039940C 0039636C 8B C1 00 8F */ lbz r30, 0x8f(r1) @@ -699,7 +699,7 @@ StartKeymap: /* 80399434 00396394 89 E1 00 A3 */ lbz r15, 0xa3(r1) /* 80399438 00396398 7D 5C 53 78 */ mr r28, r10 /* 8039943C 0039639C 82 61 00 A4 */ lwz r19, 0xa4(r1) -/* 80399440 003963A0 48 00 92 ED */ bl sub_803a272c +/* 80399440 003963A0 48 00 92 ED */ bl dataGetKeymap /* 80399444 003963A4 28 03 00 00 */ cmplwi r3, 0 /* 80399448 003963A8 41 82 01 E8 */ beq lbl_80399630 /* 8039944C 003963AC 56 C4 1D B8 */ rlwinm r4, r22, 3, 0x16, 0x1c @@ -812,7 +812,7 @@ lbl_80399588: /* 803995C8 00396528 91 E1 00 20 */ stw r15, 0x20(r1) /* 803995CC 0039652C 92 61 00 24 */ stw r19, 0x24(r1) /* 803995D0 00396530 A0 74 00 00 */ lhz r3, 0(r20) -/* 803995D4 00396534 48 00 DB ED */ bl sub_803a71c0 +/* 803995D4 00396534 48 00 DB ED */ bl macStart /* 803995D8 00396538 48 00 00 5C */ b lbl_80399634 lbl_803995DC: /* 803995DC 0039653C 93 A1 00 08 */ stw r29, 8(r1) @@ -846,13 +846,13 @@ lbl_80399634: /* 80399644 003965A4 38 21 00 80 */ addi r1, r1, 0x80 /* 80399648 003965A8 4E 80 00 20 */ blr -.global sub_8039964c -sub_8039964c: +.global synthStartSound +synthStartSound: /* 8039964C 003965AC 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80399650 003965B0 7C 08 02 A6 */ mflr r0 /* 80399654 003965B4 90 01 00 84 */ stw r0, 0x84(r1) /* 80399658 003965B8 39 61 00 80 */ addi r11, r1, 0x80 -/* 8039965C 003965BC 4B FF 03 F1 */ bl func_80389A4C +/* 8039965C 003965BC 4B FF 03 F1 */ bl _savegpr_15 /* 80399660 003965C0 A8 01 00 9A */ lha r0, 0x9a(r1) /* 80399664 003965C4 7C 7E 1B 78 */ mr r30, r3 /* 80399668 003965C8 8B 41 00 8B */ lbz r26, 0x8b(r1) @@ -937,11 +937,11 @@ lbl_80399750: /* 80399788 003966E8 92 C1 00 1C */ stw r22, 0x1c(r1) /* 8039978C 003966EC 92 41 00 20 */ stw r18, 0x20(r1) /* 80399790 003966F0 93 A1 00 24 */ stw r29, 0x24(r1) -/* 80399794 003966F4 48 00 DA 2D */ bl sub_803a71c0 +/* 80399794 003966F4 48 00 DA 2D */ bl macStart /* 80399798 003966F8 48 00 02 F8 */ b lbl_80399A90 lbl_8039979C: /* 8039979C 003966FC 7F C3 F3 78 */ mr r3, r30 -/* 803997A0 00396700 48 00 8F 8D */ bl sub_803a272c +/* 803997A0 00396700 48 00 8F 8D */ bl dataGetKeymap /* 803997A4 00396704 28 03 00 00 */ cmplwi r3, 0 /* 803997A8 00396708 41 82 01 F8 */ beq lbl_803999A0 /* 803997AC 0039670C 56 64 1D B8 */ rlwinm r4, r19, 3, 0x16, 0x1c @@ -1056,7 +1056,7 @@ lbl_803998F0: /* 80399930 00396890 92 41 00 20 */ stw r18, 0x20(r1) /* 80399934 00396894 93 A1 00 24 */ stw r29, 0x24(r1) /* 80399938 00396898 A0 71 00 00 */ lhz r3, 0(r17) -/* 8039993C 0039689C 48 00 D8 85 */ bl sub_803a71c0 +/* 8039993C 0039689C 48 00 D8 85 */ bl macStart /* 80399940 003968A0 7C 6F 1B 78 */ mr r15, r3 /* 80399944 003968A4 48 00 00 60 */ b lbl_803999A4 lbl_80399948: @@ -1399,7 +1399,7 @@ lbl_80399DB4: /* 80399E14 00396D74 28 00 00 FF */ cmplwi r0, 0xff /* 80399E18 00396D78 41 82 00 50 */ beq lbl_80399E68 /* 80399E1C 00396D7C 7F 83 E3 78 */ mr r3, r28 -/* 80399E20 00396D80 48 01 85 BD */ bl sub_803b23dc +/* 80399E20 00396D80 48 01 85 BD */ bl inpGetPitchBend /* 80399E24 00396D84 B0 7C 01 D8 */ sth r3, 0x1d8(r28) /* 80399E28 00396D88 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80399E2C 00396D8C 48 00 00 08 */ b lbl_80399E34 @@ -1432,7 +1432,7 @@ lbl_80399E68: /* 80399E88 00396DE8 7C 60 03 79 */ or. r0, r3, r0 /* 80399E8C 00396DEC 41 82 00 A8 */ beq lbl_80399F34 /* 80399E90 00396DF0 7F 83 E3 78 */ mr r3, r28 -/* 80399E94 00396DF4 48 01 85 D9 */ bl sub_803b246c +/* 80399E94 00396DF4 48 01 85 D9 */ bl inpGetModulation /* 80399E98 00396DF8 88 1C 01 41 */ lbz r0, 0x141(r28) /* 80399E9C 00396DFC 3C 80 51 EC */ lis r4, 0x51EB851F@ha /* 80399EA0 00396E00 A8 DC 01 50 */ lha r6, 0x150(r28) @@ -1639,7 +1639,7 @@ lbl_8039A174: /* 8039A17C 003970DC 80 9C 01 A0 */ lwz r4, 0x1a0(r28) /* 8039A180 003970E0 7F A0 EA 14 */ add r29, r0, r29 /* 8039A184 003970E4 7F A4 EA 14 */ add r29, r4, r29 -/* 8039A188 003970E8 48 01 82 9D */ bl sub_803b2424 +/* 8039A188 003970E8 48 01 82 9D */ bl inpGetDoppler /* 8039A18C 003970EC 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8039A190 003970F0 57 A0 84 3E */ srwi r0, r29, 0x10 /* 8039A194 003970F4 7C 00 19 D6 */ mullw r0, r0, r3 @@ -1667,8 +1667,7 @@ lbl_8039A1D4: /* 8039A1E4 00397144 38 21 00 30 */ addi r1, r1, 0x30 /* 8039A1E8 00397148 4E 80 00 20 */ blr -.global sub_8039a1ec -sub_8039a1ec: +ZeroOffsetHandler: /* 8039A1EC 0039714C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8039A1F0 00397150 7C 08 02 A6 */ mflr r0 /* 8039A1F4 00397154 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -1831,10 +1830,10 @@ lbl_8039A41C: /* 8039A448 003973A8 EF C2 00 32 */ fmuls f30, f2, f0 /* 8039A44C 003973AC 41 82 01 18 */ beq lbl_8039A564 /* 8039A450 003973B0 7F C3 F3 78 */ mr r3, r30 -/* 8039A454 003973B4 48 01 80 19 */ bl sub_803b246c +/* 8039A454 003973B4 48 01 80 19 */ bl inpGetModulation /* 8039A458 003973B8 7C 7C 1B 78 */ mr r28, r3 /* 8039A45C 003973BC 7F C3 F3 78 */ mr r3, r30 -/* 8039A460 003973C0 48 01 81 BD */ bl sub_803b261c +/* 8039A460 003973C0 48 01 81 BD */ bl inpGetTremolo /* 8039A464 003973C4 7C 63 07 34 */ extsh r3, r3 /* 8039A468 003973C8 3C A0 43 30 */ lis r5, 0x4330 /* 8039A46C 003973CC 38 03 E0 00 */ addi r0, r3, -8192 @@ -1928,7 +1927,7 @@ lbl_8039A5A4: /* 8039A5BC 0039751C 90 1E 01 18 */ stw r0, 0x118(r30) /* 8039A5C0 00397520 7C A0 20 38 */ and r0, r5, r4 /* 8039A5C4 00397524 90 1E 01 14 */ stw r0, 0x114(r30) -/* 8039A5C8 00397528 48 01 7D 85 */ bl sub_803b234c +/* 8039A5C8 00397528 48 01 7D 85 */ bl inpGetPanning /* 8039A5CC 0039752C 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8039A5D0 00397530 80 1E 01 70 */ lwz r0, 0x170(r30) /* 8039A5D4 00397534 38 63 E0 00 */ addi r3, r3, -8192 @@ -1948,7 +1947,7 @@ lbl_8039A5FC: /* 8039A604 00397564 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8039A608 00397568 41 82 00 30 */ beq lbl_8039A638 /* 8039A60C 0039756C 7F C3 F3 78 */ mr r3, r30 -/* 8039A610 00397570 48 01 7D 85 */ bl sub_803b2394 +/* 8039A610 00397570 48 01 7D 85 */ bl inpGetSurPanning /* 8039A614 00397574 80 9E 01 74 */ lwz r4, 0x174(r30) /* 8039A618 00397578 54 63 49 EC */ rlwinm r3, r3, 9, 7, 0x16 /* 8039A61C 0039757C 3C 00 00 7F */ lis r0, 0x7f @@ -1999,7 +1998,7 @@ lbl_8039A6AC: /* 8039A6BC 0039761C 41 82 01 74 */ beq lbl_8039A830 lbl_8039A6C0: /* 8039A6C0 00397620 7F C3 F3 78 */ mr r3, r30 -/* 8039A6C4 00397624 48 01 7C 41 */ bl sub_803b2304 +/* 8039A6C4 00397624 48 01 7C 41 */ bl inpGetVolume /* 8039A6C8 00397628 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8039A6CC 0039762C 3C 00 43 30 */ lis r0, 0x4330 /* 8039A6D0 00397630 90 61 00 24 */ stw r3, 0x24(r1) @@ -2012,7 +2011,7 @@ lbl_8039A6C0: /* 8039A6EC 0039764C EC 42 18 28 */ fsubs f2, f2, f3 /* 8039A6F0 00397650 EC 21 00 B2 */ fmuls f1, f1, f2 /* 8039A6F4 00397654 EF E0 00 72 */ fmuls f31, f0, f1 -/* 8039A6F8 00397658 48 01 7E 4D */ bl sub_803b2544 +/* 8039A6F8 00397658 48 01 7E 4D */ bl inpGetReverb /* 8039A6FC 0039765C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8039A700 00397660 3C 80 43 30 */ lis r4, 0x4330 /* 8039A704 00397664 90 01 00 1C */ stw r0, 0x1c(r1) @@ -2032,7 +2031,7 @@ lbl_8039A6C0: /* 8039A73C 0039769C EC 42 00 F2 */ fmuls f2, f2, f3 /* 8039A740 003976A0 EC 21 00 B2 */ fmuls f1, f1, f2 /* 8039A744 003976A4 EF A0 00 72 */ fmuls f29, f0, f1 -/* 8039A748 003976A8 48 01 7D B5 */ bl sub_803b24fc +/* 8039A748 003976A8 48 01 7D B5 */ bl inpGetPreAuxA /* 8039A74C 003976AC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8039A750 003976B0 3C 80 43 30 */ lis r4, 0x4330 /* 8039A754 003976B4 90 01 00 0C */ stw r0, 0xc(r1) @@ -2053,7 +2052,7 @@ lbl_8039A6C0: /* 8039A790 003976F0 EC 01 00 32 */ fmuls f0, f1, f0 /* 8039A794 003976F4 EC 22 E8 2A */ fadds f1, f2, f29 /* 8039A798 003976F8 EF 80 08 2A */ fadds f28, f0, f1 -/* 8039A79C 003976FC 48 01 7E 39 */ bl sub_803b25d4 +/* 8039A79C 003976FC 48 01 7E 39 */ bl inpGetPostAuxB /* 8039A7A0 00397700 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8039A7A4 00397704 3C 00 43 30 */ lis r0, 0x4330 /* 8039A7A8 00397708 90 61 00 34 */ stw r3, 0x34(r1) @@ -2065,7 +2064,7 @@ lbl_8039A6C0: /* 8039A7C0 00397720 EC 21 10 28 */ fsubs f1, f1, f2 /* 8039A7C4 00397724 EC 3F 00 72 */ fmuls f1, f31, f1 /* 8039A7C8 00397728 EF A0 00 72 */ fmuls f29, f0, f1 -/* 8039A7CC 0039772C 48 01 7D C1 */ bl sub_803b258c +/* 8039A7CC 0039772C 48 01 7D C1 */ bl inpGetPreAuxB /* 8039A7D0 00397730 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8039A7D4 00397734 3C 00 43 30 */ lis r0, 0x4330 /* 8039A7D8 00397738 90 61 00 3C */ stw r3, 0x3c(r1) @@ -2289,8 +2288,8 @@ synthForceLowPrecisionUpdate: /* 8039AAD8 00397A38 38 21 00 10 */ addi r1, r1, 0x10 /* 8039AADC 00397A3C 4E 80 00 20 */ blr -.global sub_8039aae0 -sub_8039aae0: +.global synthkeystateupdate +synthkeystateupdate: /* 8039AAE0 00397A40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8039AAE4 00397A44 7C 08 02 A6 */ mflr r0 /* 8039AAE8 00397A48 38 80 00 02 */ li r4, 2 @@ -2316,7 +2315,7 @@ synthHandle: /* 8039AB2C 00397A8C 80 04 00 04 */ lwz r0, 4(r4) /* 8039AB30 00397A90 28 00 00 00 */ cmplwi r0, 0 /* 8039AB34 00397A94 41 82 04 CC */ beq lbl_8039B000 -/* 8039AB38 00397A98 48 00 BF ED */ bl sub_803a6b24 +/* 8039AB38 00397A98 48 00 BF ED */ bl macHandle /* 8039AB3C 00397A9C 88 0D AE 49 */ lbz r0, synthJobTableIndex@sda21(r13) /* 8039AB40 00397AA0 3B DF 0A 94 */ addi r30, r31, 0xa94 /* 8039AB44 00397AA4 3B 40 00 FF */ li r26, 0xff @@ -2366,7 +2365,7 @@ lbl_8039ABA0: /* 8039ABE4 00397B44 41 82 01 1C */ beq lbl_8039AD00 lbl_8039ABE8: /* 8039ABE8 00397B48 7F 63 DB 78 */ mr r3, r27 -/* 8039ABEC 00397B4C 48 01 78 C9 */ bl inpGetVolume +/* 8039ABEC 00397B4C 48 01 78 C9 */ bl inpGetPedal /* 8039ABF0 00397B50 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8039ABF4 00397B54 7F 63 DB 78 */ mr r3, r27 /* 8039ABF8 00397B58 20 00 1F 80 */ subfic r0, r0, 0x1f80 @@ -2465,7 +2464,7 @@ lbl_8039AD40: /* 8039AD58 00397CB8 7C 05 00 AE */ lbzx r0, r5, r0 /* 8039AD5C 00397CBC 28 00 00 00 */ cmplwi r0, 0 /* 8039AD60 00397CC0 40 82 00 08 */ bne lbl_8039AD68 -/* 8039AD64 00397CC4 4B FF F4 89 */ bl sub_8039a1ec +/* 8039AD64 00397CC4 4B FF F4 89 */ bl ZeroOffsetHandler lbl_8039AD68: /* 8039AD68 00397CC8 7F 63 DB 78 */ mr r3, r27 lbl_8039AD6C: @@ -2594,7 +2593,7 @@ lbl_8039AF24: /* 8039AF28 00397E88 56 83 06 3E */ clrlwi r3, r20, 0x18 /* 8039AF2C 00397E8C 88 DC 00 00 */ lbz r6, 0(r28) /* 8039AF30 00397E90 56 A4 06 3E */ clrlwi r4, r21, 0x18 -/* 8039AF34 00397E94 48 01 77 31 */ bl sub_803b2664 +/* 8039AF34 00397E94 48 01 77 31 */ bl inpGetAuxB /* 8039AF38 00397E98 3A B5 00 01 */ addi r21, r21, 1 /* 8039AF3C 00397E9C B0 7A 00 00 */ sth r3, 0(r26) /* 8039AF40 00397EA0 28 15 00 04 */ cmplwi r21, 4 @@ -2642,7 +2641,7 @@ lbl_8039AFB8: /* 8039AFDC 00397F3C 3B 7B 00 01 */ addi r27, r27, 1 /* 8039AFE0 00397F40 41 80 FF 30 */ blt lbl_8039AF10 lbl_8039AFE4: -/* 8039AFE4 00397F44 48 01 8F 21 */ bl nullsub_59 +/* 8039AFE4 00397F44 48 01 8F 21 */ bl hwFrameDone /* 8039AFE8 00397F48 80 6D AE 8C */ lwz r3, synthRealTime+4@sda21(r13) /* 8039AFEC 00397F4C 80 0D AE 88 */ lwz r0, synthRealTime@sda21(r13) /* 8039AFF0 00397F50 7C 63 C8 14 */ addc r3, r3, r25 @@ -2720,7 +2719,7 @@ lbl_8039B0A0: /* 8039B0E4 00398044 88 85 00 05 */ lbz r4, 5(r5) /* 8039B0E8 00398048 88 A5 00 04 */ lbz r5, 4(r5) /* 8039B0EC 0039804C 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 8039B0F0 00398050 4B FF E5 5D */ bl sub_8039964c +/* 8039B0F0 00398050 4B FF E5 5D */ bl synthStartSound /* 8039B0F4 00398054 7C 7F 1B 78 */ mr r31, r3 lbl_8039B0F8: /* 8039B0F8 00398058 7F E3 FB 78 */ mr r3, r31 @@ -3356,8 +3355,8 @@ synthSetMusicVolumeType: /* 8039B98C 003988EC 98 83 00 2D */ stb r4, 0x2d(r3) /* 8039B990 003988F0 4E 80 00 20 */ blr -.global sub_8039b994 -sub_8039b994: + +synthHWMessageHandler: /* 8039B994 003988F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8039B998 003988F8 7C 08 02 A6 */ mflr r0 /* 8039B99C 003988FC 2C 03 00 02 */ cmpwi r3, 2 @@ -3647,7 +3646,7 @@ lbl_8039BCD4: /* 8039BDDC 00398D3C 98 A4 05 CD */ stb r5, 0x5cd(r4) /* 8039BDE0 00398D40 D0 04 03 F0 */ stfs f0, 0x3f0(r4) /* 8039BDE4 00398D44 D0 04 04 20 */ stfs f0, 0x420(r4) -/* 8039BDE8 00398D48 48 01 69 E5 */ bl sub_803b27cc +/* 8039BDE8 00398D48 48 01 69 E5 */ bl inpInit /* 8039BDEC 00398D4C 39 00 00 00 */ li r8, 0 /* 8039BDF0 00398D50 38 FF 0C 94 */ addi r7, r31, 0xc94 /* 8039BDF4 00398D54 38 DF 0C 34 */ addi r6, r31, 0xc34 @@ -3763,9 +3762,9 @@ lbl_8039BFA0: /* 8039BFA4 00398F04 28 00 00 20 */ cmplwi r0, 0x20 /* 8039BFA8 00398F08 41 80 FF 80 */ blt lbl_8039BF28 /* 8039BFAC 00398F0C 38 00 00 00 */ li r0, 0 -/* 8039BFB0 00398F10 3C 60 80 3A */ lis r3, sub_8039b994@ha +/* 8039BFB0 00398F10 3C 60 80 3A */ lis r3, synthHWMessageHandler@ha /* 8039BFB4 00398F14 98 0D AE 49 */ stb r0, synthJobTableIndex@sda21(r13) -/* 8039BFB8 00398F18 38 63 B9 94 */ addi r3, r3, sub_8039b994@l +/* 8039BFB8 00398F18 38 63 B9 94 */ addi r3, r3, synthHWMessageHandler@l /* 8039BFBC 00398F1C 48 01 72 01 */ bl hwSetMesgCallback /* 8039BFC0 00398F20 39 61 00 50 */ addi r11, r1, 0x50 /* 8039BFC4 00398F24 4B FE DA D1 */ bl __restore_gpr diff --git a/asm/musyx/synthdata.s b/asm/musyx/synthdata.s index 89331aa4..4efcdeac 100644 --- a/asm/musyx/synthdata.s +++ b/asm/musyx/synthdata.s @@ -1273,8 +1273,8 @@ lbl_803A0E0C: /* 803A0E1C 0039DD7C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A0E20 0039DD80 4E 80 00 20 */ blr -.global sub_803a0e24 -sub_803a0e24: +.global dataRemoveKeymap +dataRemoveKeymap: /* 803A0E24 0039DD84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A0E28 0039DD88 7C 08 02 A6 */ mflr r0 /* 803A0E2C 0039DD8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1812,8 +1812,8 @@ lbl_803A1594: /* 803A15A8 0039E508 38 21 00 20 */ addi r1, r1, 0x20 /* 803A15AC 0039E50C 4E 80 00 20 */ blr -.global dataRemoveKeymap -dataRemoveKeymap: +.global dataRemoveCurve +dataRemoveCurve: /* 803A15B0 0039E510 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A15B4 0039E514 7C 08 02 A6 */ mflr r0 /* 803A15B8 0039E518 90 01 00 14 */ stw r0, 0x14(r1) @@ -2036,8 +2036,8 @@ lbl_803A1894: /* 803A18AC 0039E80C 38 21 00 20 */ addi r1, r1, 0x20 /* 803A18B0 0039E810 4E 80 00 20 */ blr -.global sub_803a18b4 -sub_803a18b4: +.global dataRemoveSDir +dataRemoveSDir: /* 803A18B4 0039E814 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A18B8 0039E818 7C 08 02 A6 */ mflr r0 /* 803A18BC 0039E81C 3C 80 80 56 */ lis r4, dataSmpSDirs@ha @@ -2242,8 +2242,8 @@ lbl_803A1B60: /* 803A1B74 0039EAD4 38 21 00 20 */ addi r1, r1, 0x20 /* 803A1B78 0039EAD8 4E 80 00 20 */ blr -.global sub_803a1b7c -sub_803a1b7c: +.global dataAddSampleReference +dataAddSampleReference: /* 803A1B7C 0039EADC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A1B80 0039EAE0 7C 08 02 A6 */ mflr r0 /* 803A1B84 0039EAE4 3C 80 80 56 */ lis r4, dataSmpSDirs@ha @@ -2293,7 +2293,7 @@ lbl_803A1BF0: /* 803A1C20 0039EB80 7C A6 2A 14 */ add r5, r6, r5 /* 803A1C24 0039EB84 90 BF 00 08 */ stw r5, 8(r31) /* 803A1C28 0039EB88 90 01 00 08 */ stw r0, 8(r1) -/* 803A1C2C 0039EB8C 48 01 21 81 */ bl sub_803b3dac +/* 803A1C2C 0039EB8C 48 01 21 81 */ bl hwSaveSample lbl_803A1C30: /* 803A1C30 0039EB90 A0 9F 00 02 */ lhz r4, 2(r31) /* 803A1C34 0039EB94 38 60 00 01 */ li r3, 1 @@ -2305,8 +2305,8 @@ lbl_803A1C30: /* 803A1C4C 0039EBAC 38 21 00 20 */ addi r1, r1, 0x20 /* 803A1C50 0039EBB0 4E 80 00 20 */ blr -.global sub_803a1c54 -sub_803a1c54: +.global dataRemoveSampleReference +dataRemoveSampleReference: /* 803A1C54 0039EBB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A1C58 0039EBB8 7C 08 02 A6 */ mflr r0 /* 803A1C5C 0039EBBC 3C 80 80 56 */ lis r4, dataSmpSDirs@ha @@ -2333,7 +2333,7 @@ lbl_803A1C84: /* 803A1CA8 0039EC08 40 82 00 10 */ bne lbl_803A1CB8 /* 803A1CAC 0039EC0C 80 85 00 08 */ lwz r4, 8(r5) /* 803A1CB0 0039EC10 38 65 00 0C */ addi r3, r5, 0xc -/* 803A1CB4 0039EC14 48 01 21 AD */ bl sub_803b3e60 +/* 803A1CB4 0039EC14 48 01 21 AD */ bl hwRemoveSample lbl_803A1CB8: /* 803A1CB8 0039EC18 38 60 00 01 */ li r3, 1 /* 803A1CBC 0039EC1C 48 00 00 20 */ b lbl_803A1CDC @@ -2436,8 +2436,8 @@ lbl_803A1DEC: /* 803A1E00 0039ED60 38 21 00 20 */ addi r1, r1, 0x20 /* 803A1E04 0039ED64 4E 80 00 20 */ blr -.global sub_803a1e08 -sub_803a1e08: +.global dataRemoveFX +dataRemoveFX: /* 803A1E08 0039ED68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A1E0C 0039ED6C 7C 08 02 A6 */ mflr r0 /* 803A1E10 0039ED70 3C 80 80 56 */ lis r4, dataFXGroups@ha @@ -2535,8 +2535,8 @@ lbl_803A1F50: /* 803A1F5C 0039EEBC 38 21 00 10 */ addi r1, r1, 0x10 /* 803A1F60 0039EEC0 4E 80 00 20 */ blr -.global sub_803a1f64 -sub_803a1f64: +.global dataInsertMacro +dataInsertMacro: /* 803A1F64 0039EEC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A1F68 0039EEC8 7C 08 02 A6 */ mflr r0 /* 803A1F6C 0039EECC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2933,8 +2933,7 @@ lbl_803A24D0: /* 803A24E4 0039F444 38 21 00 10 */ addi r1, r1, 0x10 /* 803A24E8 0039F448 4E 80 00 20 */ blr -.global sub_803a24ec -sub_803a24ec: +maccmp: /* 803A24EC 0039F44C A0 84 00 04 */ lhz r4, 4(r4) /* 803A24F0 0039F450 A0 03 00 04 */ lhz r0, 4(r3) /* 803A24F4 0039F454 7C 64 00 50 */ subf r3, r4, r0 @@ -2958,10 +2957,10 @@ dataGetMacro: /* 803A2530 0039F490 A1 04 00 02 */ lhz r8, 2(r4) /* 803A2534 0039F494 3C C0 80 56 */ lis r6, dataMacSubTabmem@ha /* 803A2538 0039F498 B0 67 00 04 */ sth r3, 4(r7) -/* 803A253C 0039F49C 3C 80 80 3A */ lis r4, sub_803a24ec@ha +/* 803A253C 0039F49C 3C 80 80 3A */ lis r4, maccmp@ha /* 803A2540 0039F4A0 38 06 92 F8 */ addi r0, r6, dataMacSubTabmem@l /* 803A2544 0039F4A4 55 03 18 38 */ slwi r3, r8, 3 -/* 803A2548 0039F4A8 38 E4 24 EC */ addi r7, r4, sub_803a24ec@l +/* 803A2548 0039F4A8 38 E4 24 EC */ addi r7, r4, maccmp@l /* 803A254C 0039F4AC 91 0D AE CC */ stw r8, "base$711"@sda21(r13) /* 803A2550 0039F4B0 7C 80 1A 14 */ add r4, r0, r3 /* 803A2554 0039F4B4 38 6D AE C0 */ addi r3, r13, "key$713"@sda21 @@ -2980,15 +2979,14 @@ lbl_803A2578: /* 803A2580 0039F4E0 38 21 00 10 */ addi r1, r1, 0x10 /* 803A2584 0039F4E4 4E 80 00 20 */ blr -.global sub_803a2588 -sub_803a2588: +smpcmp: /* 803A2588 0039F4E8 A0 84 00 00 */ lhz r4, 0(r4) /* 803A258C 0039F4EC A0 03 00 00 */ lhz r0, 0(r3) /* 803A2590 0039F4F0 7C 64 00 50 */ subf r3, r4, r0 /* 803A2594 0039F4F4 4E 80 00 20 */ blr -.global sub_803a2598 -sub_803a2598: +.global dataGetSample +dataGetSample: /* 803A2598 0039F4F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A259C 0039F4FC 7C 08 02 A6 */ mflr r0 /* 803A25A0 0039F500 90 01 00 24 */ stw r0, 0x24(r1) @@ -2998,11 +2996,11 @@ sub_803a2598: /* 803A25B0 0039F510 3C C0 80 56 */ lis r6, dataSmpSDirs@ha /* 803A25B4 0039F514 3B 85 D2 F8 */ addi r28, r5, "key$731"@l /* 803A25B8 0039F518 7C 9E 23 78 */ mr r30, r4 -/* 803A25BC 0039F51C 3C A0 80 3A */ lis r5, sub_803a2588@ha +/* 803A25BC 0039F51C 3C A0 80 3A */ lis r5, smpcmp@ha /* 803A25C0 0039F520 B0 7C 00 00 */ sth r3, 0(r28) /* 803A25C4 0039F524 3B 66 80 F8 */ addi r27, r6, dataSmpSDirs@l /* 803A25C8 0039F528 3B E0 00 00 */ li r31, 0 -/* 803A25CC 0039F52C 3B A5 25 88 */ addi r29, r5, sub_803a2588@l +/* 803A25CC 0039F52C 3B A5 25 88 */ addi r29, r5, smpcmp@l /* 803A25D0 0039F530 48 00 00 C8 */ b lbl_803A2698 lbl_803A25D4: /* 803A25D4 0039F534 80 9B 00 00 */ lwz r4, 0(r27) @@ -3069,8 +3067,7 @@ lbl_803A26A8: /* 803A26B8 0039F618 38 21 00 20 */ addi r1, r1, 0x20 /* 803A26BC 0039F61C 4E 80 00 20 */ blr -.global sub_803a26c0 -sub_803a26c0: +curvecmp: /* 803A26C0 0039F620 A0 84 00 04 */ lhz r4, 4(r4) /* 803A26C4 0039F624 A0 03 00 04 */ lhz r0, 4(r3) /* 803A26C8 0039F628 7C 64 00 50 */ subf r3, r4, r0 @@ -3081,10 +3078,10 @@ dataGetCurve: /* 803A26D0 0039F630 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A26D4 0039F634 7C 08 02 A6 */ mflr r0 /* 803A26D8 0039F638 3C 80 80 55 */ lis r4, dataCurveTab@ha -/* 803A26DC 0039F63C 3C C0 80 3A */ lis r6, sub_803a26c0@ha +/* 803A26DC 0039F63C 3C C0 80 3A */ lis r6, curvecmp@ha /* 803A26E0 0039F640 90 01 00 14 */ stw r0, 0x14(r1) /* 803A26E4 0039F644 38 AD AE AC */ addi r5, r13, "key$759"@sda21 -/* 803A26E8 0039F648 38 E6 26 C0 */ addi r7, r6, sub_803a26c0@l +/* 803A26E8 0039F648 38 E6 26 C0 */ addi r7, r6, curvecmp@l /* 803A26EC 0039F64C 38 84 40 F8 */ addi r4, r4, dataCurveTab@l /* 803A26F0 0039F650 B0 65 00 04 */ sth r3, 4(r5) /* 803A26F4 0039F654 38 6D AE AC */ addi r3, r13, "key$759"@sda21 @@ -3104,15 +3101,15 @@ lbl_803A271C: /* 803A2724 0039F684 38 21 00 10 */ addi r1, r1, 0x10 /* 803A2728 0039F688 4E 80 00 20 */ blr -.global sub_803a272c -sub_803a272c: +.global dataGetKeymap +dataGetKeymap: /* 803A272C 0039F68C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A2730 0039F690 7C 08 02 A6 */ mflr r0 /* 803A2734 0039F694 3C 80 80 55 */ lis r4, dataKeymapTab@ha -/* 803A2738 0039F698 3C C0 80 3A */ lis r6, sub_803a26c0@ha +/* 803A2738 0039F698 3C C0 80 3A */ lis r6, curvecmp@ha /* 803A273C 0039F69C 90 01 00 14 */ stw r0, 0x14(r1) /* 803A2740 0039F6A0 38 AD AE A0 */ addi r5, r13, "key$767"@sda21 -/* 803A2744 0039F6A4 38 E6 26 C0 */ addi r7, r6, sub_803a26c0@l +/* 803A2744 0039F6A4 38 E6 26 C0 */ addi r7, r6, curvecmp@l /* 803A2748 0039F6A8 38 84 2C F8 */ addi r4, r4, dataKeymapTab@l /* 803A274C 0039F6AC B0 65 00 04 */ sth r3, 4(r5) /* 803A2750 0039F6B0 38 6D AE A0 */ addi r3, r13, "key$767"@sda21 @@ -3132,8 +3129,7 @@ lbl_803A2778: /* 803A2780 0039F6E0 38 21 00 10 */ addi r1, r1, 0x10 /* 803A2784 0039F6E4 4E 80 00 20 */ blr -.global sub_803a2788 -sub_803a2788: +layercmp: /* 803A2788 0039F6E8 A0 84 00 04 */ lhz r4, 4(r4) /* 803A278C 0039F6EC A0 03 00 04 */ lhz r0, 4(r3) /* 803A2790 0039F6F0 7C 64 00 50 */ subf r3, r4, r0 @@ -3147,10 +3143,10 @@ dataGetLayer: /* 803A27A4 0039F704 3C C0 80 55 */ lis r6, dataLayerTab@ha /* 803A27A8 0039F708 90 01 00 14 */ stw r0, 0x14(r1) /* 803A27AC 0039F70C 39 05 D3 18 */ addi r8, r5, "key$493"@l -/* 803A27B0 0039F710 3C A0 80 3A */ lis r5, sub_803a2788@ha +/* 803A27B0 0039F710 3C A0 80 3A */ lis r5, layercmp@ha /* 803A27B4 0039F714 38 06 34 F8 */ addi r0, r6, dataLayerTab@l /* 803A27B8 0039F718 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803A27BC 0039F71C 38 E5 27 88 */ addi r7, r5, sub_803a2788@l +/* 803A27BC 0039F71C 38 E5 27 88 */ addi r7, r5, layercmp@l /* 803A27C0 0039F720 7C 9F 23 78 */ mr r31, r4 /* 803A27C4 0039F724 7C 04 03 78 */ mr r4, r0 /* 803A27C8 0039F728 B0 68 00 04 */ sth r3, 4(r8) @@ -3175,8 +3171,7 @@ lbl_803A2800: /* 803A280C 0039F76C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A2810 0039F770 4E 80 00 20 */ blr -.global sub_803a2814 -sub_803a2814: +fxcmp: /* 803A2814 0039F774 A0 84 00 00 */ lhz r4, 0(r4) /* 803A2818 0039F778 A0 03 00 00 */ lhz r0, 0(r3) /* 803A281C 0039F77C 7C 64 00 50 */ subf r3, r4, r0 @@ -3192,10 +3187,10 @@ dataGetFX: /* 803A2838 0039F798 93 E1 00 1C */ stw r31, 0x1c(r1) /* 803A283C 0039F79C 93 C1 00 18 */ stw r30, 0x18(r1) /* 803A2840 0039F7A0 3B C4 D3 24 */ addi r30, r4, "key$487"@l -/* 803A2844 0039F7A4 3C 80 80 3A */ lis r4, sub_803a2814@ha +/* 803A2844 0039F7A4 3C 80 80 3A */ lis r4, fxcmp@ha /* 803A2848 0039F7A8 93 A1 00 14 */ stw r29, 0x14(r1) /* 803A284C 0039F7AC 3B A5 86 F8 */ addi r29, r5, dataFXGroups@l -/* 803A2850 0039F7B0 3B E4 28 14 */ addi r31, r4, sub_803a2814@l +/* 803A2850 0039F7B0 3B E4 28 14 */ addi r31, r4, fxcmp@l /* 803A2854 0039F7B4 93 81 00 10 */ stw r28, 0x10(r1) /* 803A2858 0039F7B8 3B 80 00 00 */ li r28, 0 /* 803A285C 0039F7BC B0 7E 00 00 */ sth r3, 0(r30) @@ -3284,7 +3279,7 @@ lbl_803A2904: /* 803A2988 0039F8E8 38 A5 00 40 */ addi r5, r5, 0x40 /* 803A298C 0039F8EC 42 00 FF 78 */ bdnz lbl_803A2904 lbl_803A2990: -/* 803A2990 0039F8F0 48 01 13 D9 */ bl sub_803b3d68 +/* 803A2990 0039F8F0 48 01 13 D9 */ bl hwInitSampleMem /* 803A2994 0039F8F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A2998 0039F8F8 7C 08 03 A6 */ mtlr r0 /* 803A299C 0039F8FC 38 21 00 10 */ addi r1, r1, 0x10 @@ -3295,7 +3290,7 @@ dataExit: /* 803A29A4 0039F904 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A29A8 0039F908 7C 08 02 A6 */ mflr r0 /* 803A29AC 0039F90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 803A29B0 0039F910 48 01 13 DD */ bl sub_803b3d8c +/* 803A29B0 0039F910 48 01 13 DD */ bl hwExitSampleMem /* 803A29B4 0039F914 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A29B8 0039F918 7C 08 03 A6 */ mtlr r0 /* 803A29BC 0039F91C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/musyx/synthmacros.s b/asm/musyx/synthmacros.s index 9197b176..0e73222a 100644 --- a/asm/musyx/synthmacros.s +++ b/asm/musyx/synthmacros.s @@ -422,8 +422,8 @@ lbl_803A2EC0: /* 803A2ED0 0039FE30 38 21 00 10 */ addi r1, r1, 0x10 /* 803A2ED4 0039FE34 4E 80 00 20 */ blr -.global sub_803a2ed8 -sub_803a2ed8: +.global mcmdPlayMacro +mcmdPlayMacro: /* 803A2ED8 0039FE38 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803A2EDC 0039FE3C 7C 08 02 A6 */ mflr r0 /* 803A2EE0 0039FE40 90 01 00 34 */ stw r0, 0x34(r1) @@ -480,7 +480,7 @@ lbl_803A2F2C: /* 803A2FA0 0039FF00 55 08 86 3E */ rlwinm r8, r8, 0x10, 0x18, 0x1f /* 803A2FA4 0039FF04 89 5F 01 21 */ lbz r10, 0x121(r31) /* 803A2FA8 0039FF08 54 09 86 3E */ rlwinm r9, r0, 0x10, 0x18, 0x1f -/* 803A2FAC 0039FF0C 48 00 42 15 */ bl sub_803a71c0 +/* 803A2FAC 0039FF0C 48 00 42 15 */ bl macStart /* 803A2FB0 0039FF10 3C 03 00 01 */ addis r0, r3, 1 /* 803A2FB4 0039FF14 38 80 00 00 */ li r4, 0 /* 803A2FB8 0039FF18 28 00 FF FF */ cmplwi r0, 0xffff @@ -592,8 +592,8 @@ lbl_803A3110: /* 803A3134 003A0094 38 21 00 10 */ addi r1, r1, 0x10 /* 803A3138 003A0098 4E 80 00 20 */ blr -.global sub_803a313c -sub_803a313c: +.global mcmdStartSample +mcmdStartSample: /* 803A313C 003A009C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A3140 003A00A0 7C 08 02 A6 */ mflr r0 /* 803A3144 003A00A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -607,7 +607,7 @@ sub_803a313c: /* 803A3164 003A00C4 38 84 D3 30 */ addi r4, r4, "newsmp$473"@l /* 803A3168 003A00C8 54 1F C4 3E */ rlwinm r31, r0, 0x18, 0x10, 0x1f /* 803A316C 003A00CC 7F E3 FB 78 */ mr r3, r31 -/* 803A3170 003A00D0 4B FF F4 29 */ bl sub_803a2598 +/* 803A3170 003A00D0 4B FF F4 29 */ bl dataGetSample /* 803A3174 003A00D4 2C 03 00 00 */ cmpwi r3, 0 /* 803A3178 003A00D8 40 82 01 A4 */ bne lbl_803A331C /* 803A317C 003A00DC 80 1D 00 00 */ lwz r0, 0(r29) @@ -721,7 +721,7 @@ lbl_803A3308: /* 803A330C 003A026C 7F C3 F3 78 */ mr r3, r30 /* 803A3310 003A0270 60 00 00 20 */ ori r0, r0, 0x20 /* 803A3314 003A0274 90 1E 01 18 */ stw r0, 0x118(r30) -/* 803A3318 003A0278 4B FF 77 C9 */ bl sub_8039aae0 +/* 803A3318 003A0278 4B FF 77 C9 */ bl synthkeystateupdate lbl_803A331C: /* 803A331C 003A027C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A3320 003A0280 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1363,8 +1363,8 @@ lbl_803A3C3C: /* 803A3C4C 003A0BAC 38 21 00 50 */ addi r1, r1, 0x50 /* 803A3C50 003A0BB0 4E 80 00 20 */ blr -.global sub_803a3c54 -sub_803a3c54: +.global macSetPanning +macSetPanning: /* 803A3C54 003A0BB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A3C58 003A0BB8 7C 08 02 A6 */ mflr r0 /* 803A3C5C 003A0BBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1824,8 +1824,8 @@ lbl_803A429C: /* 803A42C0 003A1220 38 21 00 20 */ addi r1, r1, 0x20 /* 803A42C4 003A1224 4E 80 00 20 */ blr -.global sub_803a42c8 -sub_803a42c8: +.global mcmdVolumeSelect +mcmdVolumeSelect: /* 803A42C8 003A1228 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A42CC 003A122C 7C 08 02 A6 */ mflr r0 /* 803A42D0 003A1230 3C A0 00 08 */ lis r5, 8 @@ -1896,8 +1896,8 @@ lbl_803A438C: /* 803A43C4 003A1324 38 21 00 10 */ addi r1, r1, 0x10 /* 803A43C8 003A1328 4E 80 00 20 */ blr -.global sub_803a43cc -sub_803a43cc: +.global mcmdPanningSelect +mcmdPanningSelect: /* 803A43CC 003A132C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A43D0 003A1330 7C 08 02 A6 */ mflr r0 /* 803A43D4 003A1334 3C A0 00 10 */ lis r5, 0x10 @@ -1968,8 +1968,8 @@ lbl_803A4490: /* 803A44C8 003A1428 38 21 00 10 */ addi r1, r1, 0x10 /* 803A44CC 003A142C 4E 80 00 20 */ blr -.global sub_803a44d0 -sub_803a44d0: +.global mcmdPitchWheelSelect +mcmdPitchWheelSelect: /* 803A44D0 003A1430 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A44D4 003A1434 7C 08 02 A6 */ mflr r0 /* 803A44D8 003A1438 3C A0 00 20 */ lis r5, 0x20 @@ -2040,8 +2040,8 @@ lbl_803A4594: /* 803A45CC 003A152C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A45D0 003A1530 4E 80 00 20 */ blr -.global sub_803a45d4 -sub_803a45d4: +.global mcmdModWheelSelect +mcmdModWheelSelect: /* 803A45D4 003A1534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A45D8 003A1538 7C 08 02 A6 */ mflr r0 /* 803A45DC 003A153C 3C A0 00 40 */ lis r5, 0x40 @@ -2112,8 +2112,8 @@ lbl_803A4698: /* 803A46D0 003A1630 38 21 00 10 */ addi r1, r1, 0x10 /* 803A46D4 003A1634 4E 80 00 20 */ blr -.global sub_803a46d8 -sub_803a46d8: +.global mcmdPedalSelect +mcmdPedalSelect: /* 803A46D8 003A1638 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A46DC 003A163C 7C 08 02 A6 */ mflr r0 /* 803A46E0 003A1640 3C A0 02 00 */ lis r5, 0x200 @@ -2184,8 +2184,8 @@ lbl_803A479C: /* 803A47D4 003A1734 38 21 00 10 */ addi r1, r1, 0x10 /* 803A47D8 003A1738 4E 80 00 20 */ blr -.global sub_803a47dc -sub_803a47dc: +.global mcmdPortamentoSelect +mcmdPortamentoSelect: /* 803A47DC 003A173C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A47E0 003A1740 7C 08 02 A6 */ mflr r0 /* 803A47E4 003A1744 3C A0 01 00 */ lis r5, 0x100 @@ -2256,8 +2256,8 @@ lbl_803A48A0: /* 803A48D8 003A1838 38 21 00 10 */ addi r1, r1, 0x10 /* 803A48DC 003A183C 4E 80 00 20 */ blr -.global sub_803a48e0 -sub_803a48e0: +.global mcmdReverbSelect +mcmdReverbSelect: /* 803A48E0 003A1840 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A48E4 003A1844 7C 08 02 A6 */ mflr r0 /* 803A48E8 003A1848 3C A0 00 80 */ lis r5, 0x80 @@ -2328,8 +2328,8 @@ lbl_803A49A4: /* 803A49DC 003A193C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A49E0 003A1940 4E 80 00 20 */ blr -.global sub_803a49e4 -sub_803a49e4: +.global mcmdPreAuxASelect +mcmdPreAuxASelect: /* 803A49E4 003A1944 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A49E8 003A1948 7C 08 02 A6 */ mflr r0 /* 803A49EC 003A194C 3C A0 20 00 */ lis r5, 0x2000 @@ -2400,8 +2400,8 @@ lbl_803A4AA8: /* 803A4AE0 003A1A40 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4AE4 003A1A44 4E 80 00 20 */ blr -.global sub_803a4ae8 -sub_803a4ae8: +.global mcmdPreAuxBSelect +mcmdPreAuxBSelect: /* 803A4AE8 003A1A48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A4AEC 003A1A4C 7C 08 02 A6 */ mflr r0 /* 803A4AF0 003A1A50 3C A0 40 00 */ lis r5, 0x4000 @@ -2472,8 +2472,8 @@ lbl_803A4BAC: /* 803A4BE4 003A1B44 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4BE8 003A1B48 4E 80 00 20 */ blr -.global mcmdVolumeSelect -mcmdVolumeSelect: +.global mcmdPostAuxBSelect +mcmdPostAuxBSelect: /* 803A4BEC 003A1B4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A4BF0 003A1B50 7C 08 02 A6 */ mflr r0 /* 803A4BF4 003A1B54 3C A0 80 00 */ lis r5, 0x8000 @@ -2544,8 +2544,8 @@ lbl_803A4CB0: /* 803A4CE8 003A1C48 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4CEC 003A1C4C 4E 80 00 20 */ blr -.global sub_803a4cf0 -sub_803a4cf0: +.global mcmdSurroundingPanningSelect +mcmdSurroundingPanningSelect: /* 803A4CF0 003A1C50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A4CF4 003A1C54 7C 08 02 A6 */ mflr r0 /* 803A4CF8 003A1C58 3C A0 04 00 */ lis r5, 0x400 @@ -2616,8 +2616,8 @@ lbl_803A4DB4: /* 803A4DEC 003A1D4C 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4DF0 003A1D50 4E 80 00 20 */ blr -.global sub_803a4df4 -sub_803a4df4: +.global mcmdDopplerSelect +mcmdDopplerSelect: /* 803A4DF4 003A1D54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A4DF8 003A1D58 7C 08 02 A6 */ mflr r0 /* 803A4DFC 003A1D5C 3C A0 08 00 */ lis r5, 0x800 @@ -2688,8 +2688,8 @@ lbl_803A4EB8: /* 803A4EF0 003A1E50 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4EF4 003A1E54 4E 80 00 20 */ blr -.global sub_803a4ef8 -sub_803a4ef8: +.global mcmdTremoloSelect +mcmdTremoloSelect: /* 803A4EF8 003A1E58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803A4EFC 003A1E5C 7C 08 02 A6 */ mflr r0 /* 803A4F00 003A1E60 3C A0 10 00 */ lis r5, 0x1000 @@ -2760,8 +2760,8 @@ lbl_803A4FBC: /* 803A4FF4 003A1F54 38 21 00 10 */ addi r1, r1, 0x10 /* 803A4FF8 003A1F58 4E 80 00 20 */ blr -.global sub_803a4ffc -sub_803a4ffc: +.global mcmdAuxAFXSelect +mcmdAuxAFXSelect: /* 803A4FFC 003A1F5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A5000 003A1F60 7C 08 02 A6 */ mflr r0 /* 803A5004 003A1F64 3C A0 80 3F */ lis r5, lbl_803F31F8@ha @@ -2864,8 +2864,8 @@ lbl_803A5158: /* 803A5170 003A20D0 38 21 00 20 */ addi r1, r1, 0x20 /* 803A5174 003A20D4 4E 80 00 20 */ blr -.global mcmdAuxAFXSelect -mcmdAuxAFXSelect: +.global mcmdAuxBFXSelect +mcmdAuxBFXSelect: /* 803A5178 003A20D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A517C 003A20DC 7C 08 02 A6 */ mflr r0 /* 803A5180 003A20E0 3C A0 80 3F */ lis r5, lbl_803F3228@ha @@ -3621,8 +3621,8 @@ lbl_803A5BB4: /* 803A5BC4 003A2B24 38 21 00 20 */ addi r1, r1, 0x20 /* 803A5BC8 003A2B28 4E 80 00 20 */ blr -.global sub_803a5bcc -sub_803a5bcc: +.global macHandleActive +macHandleActive: /* 803A5BCC 003A2B2C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803A5BD0 003A2B30 7C 08 02 A6 */ mflr r0 /* 803A5BD4 003A2B34 90 01 00 34 */ stw r0, 0x34(r1) @@ -3682,7 +3682,7 @@ lbl_803A5C48: /* 803A5CA8 003A2C08 98 9F 01 04 */ stb r4, 0x104(r31) /* 803A5CAC 003A2C0C B0 9F 01 50 */ sth r4, 0x150(r31) /* 803A5CB0 003A2C10 B0 9F 01 6C */ sth r4, 0x16c(r31) -/* 803A5CB4 003A2C14 48 00 CB 19 */ bl sub_803b27cc +/* 803A5CB4 003A2C14 48 00 CB 19 */ bl inpInit /* 803A5CB8 003A2C18 88 7F 01 21 */ lbz r3, 0x121(r31) /* 803A5CBC 003A2C1C 88 9F 01 22 */ lbz r4, 0x122(r31) /* 803A5CC0 003A2C20 48 00 C1 69 */ bl inpGetMidiLastNote @@ -3723,7 +3723,7 @@ lbl_803A5D3C: lbl_803A5D40: /* 803A5D40 003A2CA0 88 7F 01 21 */ lbz r3, 0x121(r31) /* 803A5D44 003A2CA4 88 9F 01 22 */ lbz r4, 0x122(r31) -/* 803A5D48 003A2CA8 48 00 BE 89 */ bl sub_803b1bd0 +/* 803A5D48 003A2CA8 48 00 BE 89 */ bl inpGetChannelDefaults /* 803A5D4C 003A2CAC 88 03 00 00 */ lbz r0, 0(r3) /* 803A5D50 003A2CB0 39 40 00 80 */ li r10, 0x80 /* 803A5D54 003A2CB4 39 20 00 00 */ li r9, 0 @@ -3888,7 +3888,7 @@ lbl_803A5FA0: /* 803A5FC0 003A2F20 48 00 0B 44 */ b lbl_803A6B04 /* 803A5FC4 003A2F24 7F E3 FB 78 */ mr r3, r31 /* 803A5FC8 003A2F28 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A5FCC 003A2F2C 4B FF CF 0D */ bl sub_803a2ed8 +/* 803A5FCC 003A2F2C 4B FF CF 0D */ bl mcmdPlayMacro /* 803A5FD0 003A2F30 48 00 0B 34 */ b lbl_803A6B04 /* 803A5FD4 003A2F34 88 9F 01 2F */ lbz r4, 0x12f(r31) /* 803A5FD8 003A2F38 57 43 C6 3E */ rlwinm r3, r26, 0x18, 0x18, 0x1f @@ -3928,7 +3928,7 @@ lbl_803A6040: /* 803A6054 003A2FB4 28 00 00 FF */ cmplwi r0, 0xff /* 803A6058 003A2FB8 41 82 0A AC */ beq lbl_803A6B04 /* 803A605C 003A2FBC 7F E3 FB 78 */ mr r3, r31 -/* 803A6060 003A2FC0 48 00 C4 0D */ bl sub_803b246c +/* 803A6060 003A2FC0 48 00 C4 0D */ bl inpGetModulation /* 803A6064 003A2FC4 80 8D AE E0 */ lwz r4, "cstep$1643"@sda21(r13) /* 803A6068 003A2FC8 54 63 CE 3E */ rlwinm r3, r3, 0x19, 0x18, 0x1f /* 803A606C 003A2FCC 54 80 C6 3E */ rlwinm r0, r4, 0x18, 0x18, 0x1f @@ -3976,7 +3976,7 @@ lbl_803A60E4: /* 803A610C 003A306C 48 00 09 F8 */ b lbl_803A6B04 /* 803A6110 003A3070 7F E3 FB 78 */ mr r3, r31 /* 803A6114 003A3074 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6118 003A3078 4B FF DB 3D */ bl sub_803a3c54 +/* 803A6118 003A3078 4B FF DB 3D */ bl macSetPanning /* 803A611C 003A307C 48 00 09 E8 */ b lbl_803A6B04 /* 803A6120 003A3080 7F E3 FB 78 */ mr r3, r31 /* 803A6124 003A3084 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 @@ -3984,7 +3984,7 @@ lbl_803A60E4: /* 803A612C 003A308C 48 00 09 D8 */ b lbl_803A6B04 /* 803A6130 003A3090 7F E3 FB 78 */ mr r3, r31 /* 803A6134 003A3094 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6138 003A3098 4B FF D0 05 */ bl sub_803a313c +/* 803A6138 003A3098 4B FF D0 05 */ bl mcmdStartSample /* 803A613C 003A309C 48 00 09 C8 */ b lbl_803A6B04 /* 803A6140 003A30A0 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 803A6144 003A30A4 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -3994,7 +3994,7 @@ lbl_803A60E4: /* 803A6154 003A30B4 7F E3 FB 78 */ mr r3, r31 /* 803A6158 003A30B8 60 00 00 80 */ ori r0, r0, 0x80 /* 803A615C 003A30BC 90 1F 01 18 */ stw r0, 0x118(r31) -/* 803A6160 003A30C0 4B FF 49 81 */ bl sub_8039aae0 +/* 803A6160 003A30C0 4B FF 49 81 */ bl synthkeystateupdate /* 803A6164 003A30C4 48 00 09 A0 */ b lbl_803A6B04 /* 803A6168 003A30C8 48 00 CC 39 */ bl sndRand /* 803A616C 003A30CC 80 8D AE E0 */ lwz r4, "cstep$1643"@sda21(r13) @@ -4473,63 +4473,63 @@ lbl_803A6854: /* 803A6874 003A37D4 48 00 02 90 */ b lbl_803A6B04 /* 803A6878 003A37D8 7F E3 FB 78 */ mr r3, r31 /* 803A687C 003A37DC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6880 003A37E0 4B FF DA 49 */ bl sub_803a42c8 +/* 803A6880 003A37E0 4B FF DA 49 */ bl mcmdVolumeSelect /* 803A6884 003A37E4 48 00 02 80 */ b lbl_803A6B04 /* 803A6888 003A37E8 7F E3 FB 78 */ mr r3, r31 /* 803A688C 003A37EC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6890 003A37F0 4B FF DB 3D */ bl sub_803a43cc +/* 803A6890 003A37F0 4B FF DB 3D */ bl mcmdPanningSelect /* 803A6894 003A37F4 48 00 02 70 */ b lbl_803A6B04 /* 803A6898 003A37F8 7F E3 FB 78 */ mr r3, r31 /* 803A689C 003A37FC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68A0 003A3800 4B FF DC 31 */ bl sub_803a44d0 +/* 803A68A0 003A3800 4B FF DC 31 */ bl mcmdPitchWheelSelect /* 803A68A4 003A3804 48 00 02 60 */ b lbl_803A6B04 /* 803A68A8 003A3808 7F E3 FB 78 */ mr r3, r31 /* 803A68AC 003A380C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68B0 003A3810 4B FF DD 25 */ bl sub_803a45d4 +/* 803A68B0 003A3810 4B FF DD 25 */ bl mcmdModWheelSelect /* 803A68B4 003A3814 48 00 02 50 */ b lbl_803A6B04 /* 803A68B8 003A3818 7F E3 FB 78 */ mr r3, r31 /* 803A68BC 003A381C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68C0 003A3820 4B FF DE 19 */ bl sub_803a46d8 +/* 803A68C0 003A3820 4B FF DE 19 */ bl mcmdPedalSelect /* 803A68C4 003A3824 48 00 02 40 */ b lbl_803A6B04 /* 803A68C8 003A3828 7F E3 FB 78 */ mr r3, r31 /* 803A68CC 003A382C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68D0 003A3830 4B FF DF 0D */ bl sub_803a47dc +/* 803A68D0 003A3830 4B FF DF 0D */ bl mcmdPortamentoSelect /* 803A68D4 003A3834 48 00 02 30 */ b lbl_803A6B04 /* 803A68D8 003A3838 7F E3 FB 78 */ mr r3, r31 /* 803A68DC 003A383C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68E0 003A3840 4B FF E0 01 */ bl sub_803a48e0 +/* 803A68E0 003A3840 4B FF E0 01 */ bl mcmdReverbSelect /* 803A68E4 003A3844 48 00 02 20 */ b lbl_803A6B04 /* 803A68E8 003A3848 7F E3 FB 78 */ mr r3, r31 /* 803A68EC 003A384C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A68F0 003A3850 4B FF E4 01 */ bl sub_803a4cf0 +/* 803A68F0 003A3850 4B FF E4 01 */ bl mcmdSurroundingPanningSelect /* 803A68F4 003A3854 48 00 02 10 */ b lbl_803A6B04 /* 803A68F8 003A3858 7F E3 FB 78 */ mr r3, r31 /* 803A68FC 003A385C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6900 003A3860 4B FF E4 F5 */ bl sub_803a4df4 +/* 803A6900 003A3860 4B FF E4 F5 */ bl mcmdDopplerSelect /* 803A6904 003A3864 48 00 02 00 */ b lbl_803A6B04 /* 803A6908 003A3868 7F E3 FB 78 */ mr r3, r31 /* 803A690C 003A386C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6910 003A3870 4B FF E5 E9 */ bl sub_803a4ef8 +/* 803A6910 003A3870 4B FF E5 E9 */ bl mcmdTremoloSelect /* 803A6914 003A3874 48 00 01 F0 */ b lbl_803A6B04 /* 803A6918 003A3878 7F E3 FB 78 */ mr r3, r31 /* 803A691C 003A387C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6920 003A3880 4B FF E0 C5 */ bl sub_803a49e4 +/* 803A6920 003A3880 4B FF E0 C5 */ bl mcmdPreAuxASelect /* 803A6924 003A3884 48 00 01 E0 */ b lbl_803A6B04 /* 803A6928 003A3888 7F E3 FB 78 */ mr r3, r31 /* 803A692C 003A388C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6930 003A3890 4B FF E1 B9 */ bl sub_803a4ae8 +/* 803A6930 003A3890 4B FF E1 B9 */ bl mcmdPreAuxBSelect /* 803A6934 003A3894 48 00 01 D0 */ b lbl_803A6B04 /* 803A6938 003A3898 7F E3 FB 78 */ mr r3, r31 /* 803A693C 003A389C 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6940 003A38A0 4B FF E2 AD */ bl mcmdVolumeSelect +/* 803A6940 003A38A0 4B FF E2 AD */ bl mcmdPostAuxBSelect /* 803A6944 003A38A4 48 00 01 C0 */ b lbl_803A6B04 /* 803A6948 003A38A8 7F E3 FB 78 */ mr r3, r31 /* 803A694C 003A38AC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6950 003A38B0 4B FF E6 AD */ bl sub_803a4ffc +/* 803A6950 003A38B0 4B FF E6 AD */ bl mcmdAuxAFXSelect /* 803A6954 003A38B4 48 00 01 B0 */ b lbl_803A6B04 /* 803A6958 003A38B8 7F E3 FB 78 */ mr r3, r31 /* 803A695C 003A38BC 38 8D AE E0 */ addi r4, r13, "cstep$1643"@sda21 -/* 803A6960 003A38C0 4B FF E8 19 */ bl mcmdAuxAFXSelect +/* 803A6960 003A38C0 4B FF E8 19 */ bl mcmdAuxBFXSelect /* 803A6964 003A38C4 48 00 01 A0 */ b lbl_803A6B04 /* 803A6968 003A38C8 57 40 84 3E */ srwi r0, r26, 0x10 /* 803A696C 003A38CC 38 61 00 08 */ addi r3, r1, 8 @@ -4570,12 +4570,12 @@ lbl_803A69AC: /* 803A69F4 003A3954 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 803A69F8 003A3958 57 44 C6 3E */ rlwinm r4, r26, 0x18, 0x18, 0x1f /* 803A69FC 003A395C 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 803A6A00 003A3960 48 00 CC D5 */ bl sub_803b36d4 +/* 803A6A00 003A3960 48 00 CC D5 */ bl hwSetSRCType /* 803A6A04 003A3964 80 0D AE E0 */ lwz r0, "cstep$1643"@sda21(r13) /* 803A6A08 003A3968 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 803A6A0C 003A396C 54 04 86 3E */ rlwinm r4, r0, 0x10, 0x18, 0x1f /* 803A6A10 003A3970 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 803A6A14 003A3974 48 00 CC ED */ bl hwSetSRCType +/* 803A6A14 003A3974 48 00 CC ED */ bl hwSetPolyPhaseFilter /* 803A6A18 003A3978 80 1F 01 14 */ lwz r0, 0x114(r31) /* 803A6A1C 003A397C 60 00 08 00 */ ori r0, r0, 0x800 /* 803A6A20 003A3980 90 1F 01 14 */ stw r0, 0x114(r31) @@ -4648,8 +4648,8 @@ lbl_803A6B0C: /* 803A6B1C 003A3A7C 38 21 00 30 */ addi r1, r1, 0x30 /* 803A6B20 003A3A80 4E 80 00 20 */ blr -.global sub_803a6b24 -sub_803a6b24: +.global macHandle +macHandle: /* 803A6B24 003A3A84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803A6B28 003A3A88 7C 08 02 A6 */ mflr r0 /* 803A6B2C 003A3A8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -4725,7 +4725,7 @@ lbl_803A6BB4: /* 803A6C2C 003A3B8C 48 00 03 91 */ bl macMakeActive lbl_803A6C30: /* 803A6C30 003A3B90 7F E3 FB 78 */ mr r3, r31 -/* 803A6C34 003A3B94 4B FF EF 99 */ bl sub_803a5bcc +/* 803A6C34 003A3B94 4B FF EF 99 */ bl macHandleActive /* 803A6C38 003A3B98 83 FF 00 3C */ lwz r31, 0x3c(r31) lbl_803A6C3C: /* 803A6C3C 003A3B9C 28 1F 00 00 */ cmplwi r31, 0 @@ -5132,8 +5132,8 @@ lbl_803A71B8: /* 803A71B8 003A4118 90 83 00 4C */ stw r4, 0x4c(r3) /* 803A71BC 003A411C 4E 80 00 20 */ blr -.global sub_803a71c0 -sub_803a71c0: +.global macStart +macStart: /* 803A71C0 003A4120 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803A71C4 003A4124 7C 08 02 A6 */ mflr r0 /* 803A71C8 003A4128 90 01 00 54 */ stw r0, 0x54(r1) diff --git a/asm/text.s.REMOVED.git-id b/asm/text.s.REMOVED.git-id index 399ffeed..2ed12b9e 100644 --- a/asm/text.s.REMOVED.git-id +++ b/asm/text.s.REMOVED.git-id @@ -1 +1 @@ -bc6c77af9c56238601999a98afd7cb53c1f1ec4e \ No newline at end of file +0d472a34f7bd15b1f539eb655c78d83232a46d08 \ No newline at end of file