From 14e231b4dd4f3ab69e1c5ab0ec28ad45d17905c4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 7 Apr 2022 23:41:39 -0700 Subject: [PATCH] MusyX: deincbin Former-commit-id: 706a4b54cd8b41a7afbe8ab0d506f75530fdb8df --- asm/musyx/chorus_fx.s | 12 ++-- asm/musyx/creverb.s | 67 ++++++++++++----- asm/musyx/hardware.s | 20 ++++-- asm/musyx/hw_dspctrl.s | 109 ++++++++++++++++++---------- asm/musyx/hw_volconv.s | 43 ++++++++--- asm/musyx/reverb.s | 74 +++++++++++++------ asm/musyx/seq.s | 27 +++++-- asm/musyx/snd3d.s | 113 +++++++++++++++++++---------- asm/musyx/snd_math.s | 32 ++++++--- asm/musyx/stream.s | 95 +++++++++++++----------- asm/musyx/synth.s | 131 ++++++++++++++++++++------------- asm/musyx/synth_ac.s | 23 ++++-- asm/musyx/synth_adsr.s | 44 ++++++++---- asm/musyx/synthmacros.s | 155 ++++++++++++++++++++++------------------ 14 files changed, 605 insertions(+), 340 deletions(-) diff --git a/asm/musyx/chorus_fx.s b/asm/musyx/chorus_fx.s index c9165de3..463ee436 100644 --- a/asm/musyx/chorus_fx.s +++ b/asm/musyx/chorus_fx.s @@ -521,7 +521,7 @@ rsmpTab12khz: .4byte 0x3DD01000 .4byte 0x3F4D5E00 .4byte 0x3DC7B000 - + .section .text, "ax" .global do_src1 @@ -632,7 +632,7 @@ lbl_803B6E10: /* 803B6E38 003B3D98 90 A3 00 10 */ stw r5, 0x10(r3) /* 803B6E3C 003B3D9C BB 41 00 28 */ lmw r26, 0x28(r1) /* 803B6E40 003B3DA0 38 21 00 40 */ addi r1, r1, 0x40 -/* 803B6E44 003B3DA4 4E 80 00 20 */ blr +/* 803B6E44 003B3DA4 4E 80 00 20 */ blr .global do_src2 do_src2: @@ -764,7 +764,7 @@ lbl_803B6FF4: /* 803B7024 003B3F84 90 A3 00 10 */ stw r5, 0x10(r3) /* 803B7028 003B3F88 BB 41 00 28 */ lmw r26, 0x28(r1) /* 803B702C 003B3F8C 38 21 00 40 */ addi r1, r1, 0x40 -/* 803B7030 003B3F90 4E 80 00 20 */ blr +/* 803B7030 003B3F90 4E 80 00 20 */ blr .global sndAuxCallbackChorus sndAuxCallbackChorus: @@ -955,7 +955,7 @@ lbl_803B72D0: /* 803B72E0 003B4240 83 81 00 10 */ lwz r28, 0x10(r1) /* 803B72E4 003B4244 7C 08 03 A6 */ mtlr r0 /* 803B72E8 003B4248 38 21 00 20 */ addi r1, r1, 0x20 -/* 803B72EC 003B424C 4E 80 00 20 */ blr +/* 803B72EC 003B424C 4E 80 00 20 */ blr .global sndAuxCallbackPrepareChorus sndAuxCallbackPrepareChorus: @@ -1089,7 +1089,7 @@ lbl_803B74DC: /* 803B74E0 003B4440 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803B74E4 003B4444 7C 08 03 A6 */ mtlr r0 /* 803B74E8 003B4448 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B74EC 003B444C 4E 80 00 20 */ blr +/* 803B74EC 003B444C 4E 80 00 20 */ blr .global sndAuxCallbackShutdownChorus sndAuxCallbackShutdownChorus: @@ -1102,4 +1102,4 @@ sndAuxCallbackShutdownChorus: /* 803B7508 003B4468 38 60 00 01 */ li r3, 1 /* 803B750C 003B446C 7C 08 03 A6 */ mtlr r0 /* 803B7510 003B4470 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B7514 003B4474 4E 80 00 20 */ blr +/* 803B7514 003B4474 4E 80 00 20 */ blr diff --git a/asm/musyx/creverb.s b/asm/musyx/creverb.s index e641bbef..b3fb89ea 100644 --- a/asm/musyx/creverb.s +++ b/asm/musyx/creverb.s @@ -4,43 +4,72 @@ .global lbl_805AF3B0 lbl_805AF3B0: - .incbin "baserom.dol", 0x3FBC50, 0x4 + # ROM: 0x3FBC50 + .4byte 0 + .global lbl_805AF3B4 lbl_805AF3B4: - .incbin "baserom.dol", 0x3FBC54, 0x4 + # ROM: 0x3FBC54 + .4byte 0x3F800000 + .global lbl_805AF3B8 lbl_805AF3B8: - .incbin "baserom.dol", 0x3FBC58, 0x4 + # ROM: 0x3FBC58 + .4byte 0x3C23D70A + .global lbl_805AF3BC lbl_805AF3BC: - .incbin "baserom.dol", 0x3FBC5C, 0x4 + # ROM: 0x3FBC5C + .4byte 0x41200000 + .global lbl_805AF3C0 lbl_805AF3C0: - .incbin "baserom.dol", 0x3FBC60, 0x4 + # ROM: 0x3FBC60 + .4byte 0x3DCCCCCD + .global lbl_805AF3C4 lbl_805AF3C4: - .incbin "baserom.dol", 0x3FBC64, 0x4 + # ROM: 0x3FBC64 + .4byte 0x46FA0000 + .global lbl_805AF3C8 lbl_805AF3C8: - .incbin "baserom.dol", 0x3FBC68, 0x8 + # ROM: 0x3FBC68 + .4byte 0x40240000 + .4byte 0 + .global lbl_805AF3D0 lbl_805AF3D0: - .incbin "baserom.dol", 0x3FBC70, 0x4 + # ROM: 0x3FBC70 + .4byte 0x3D4CCCCD + .global lbl_805AF3D4 lbl_805AF3D4: - .incbin "baserom.dol", 0x3FBC74, 0x4 + # ROM: 0x3FBC74 + .4byte 0x3F4CCCCD + .global lbl_805AF3D8 lbl_805AF3D8: - .incbin "baserom.dol", 0x3FBC78, 0x8 + # ROM: 0x3FBC78 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF3E0 lbl_805AF3E0: - .incbin "baserom.dol", 0x3FBC80, 0x4 + # ROM: 0x3FBC80 + .4byte 0x3E99999A + .global lbl_805AF3E4 lbl_805AF3E4: - .incbin "baserom.dol", 0x3FBC84, 0x4 + # ROM: 0x3FBC84 + .4byte 0x3F19999A + .global lbl_805AF3E8 lbl_805AF3E8: - .incbin "baserom.dol", 0x3FBC88, 0x8 + # ROM: 0x3FBC88 + .4byte 0x43300000 + .4byte 0x80000000 + .section .data, "wa" @@ -49,8 +78,8 @@ lbl_803F6460: .4byte 0x000007CF .4byte 0x000001B1 .4byte 0x00000095 - -.section .text, "ax" + +.section .text, "ax" .global ReverbSTDCreate ReverbSTDCreate: @@ -341,7 +370,7 @@ lbl_803B561C: /* 803B565C 003B25BC 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 803B5660 003B25C0 7C 08 03 A6 */ mtlr r0 /* 803B5664 003B25C4 38 21 00 B0 */ addi r1, r1, 0xb0 -/* 803B5668 003B25C8 4E 80 00 20 */ blr +/* 803B5668 003B25C8 4E 80 00 20 */ blr .global HandleReverb HandleReverb: @@ -601,7 +630,7 @@ lbl_803B599C: /* 803B5A10 003B2970 CA 81 00 88 */ lfd f20, 0x88(r1) /* 803B5A14 003B2974 BA 21 00 08 */ lmw r17, 8(r1) /* 803B5A18 003B2978 38 21 00 90 */ addi r1, r1, 0x90 -/* 803B5A1C 003B297C 4E 80 00 20 */ blr +/* 803B5A1C 003B297C 4E 80 00 20 */ blr .global ReverbSTDCallback ReverbSTDCallback: @@ -613,7 +642,7 @@ ReverbSTDCallback: /* 803B5A34 003B2994 80 01 00 14 */ lwz r0, 0x14(r1) /* 803B5A38 003B2998 7C 08 03 A6 */ mtlr r0 /* 803B5A3C 003B299C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5A40 003B29A0 4E 80 00 20 */ blr +/* 803B5A40 003B29A0 4E 80 00 20 */ blr .global ReverbSTDFree ReverbSTDFree: @@ -670,4 +699,4 @@ lbl_803B5AE8: /* 803B5AF0 003B2A50 83 C1 00 08 */ lwz r30, 8(r1) /* 803B5AF4 003B2A54 7C 08 03 A6 */ mtlr r0 /* 803B5AF8 003B2A58 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B5AFC 003B2A5C 4E 80 00 20 */ blr +/* 803B5AFC 003B2A5C 4E 80 00 20 */ blr diff --git a/asm/musyx/hardware.s b/asm/musyx/hardware.s index 9234652a..bdd9758b 100644 --- a/asm/musyx/hardware.s +++ b/asm/musyx/hardware.s @@ -3,17 +3,27 @@ .section .sdata2 .global lbl_805AF398 lbl_805AF398: - .incbin "baserom.dol", 0x3FBC38, 0x4 + # ROM: 0x3FBC38 + .4byte 0x3F800000 + .global lbl_805AF39C lbl_805AF39C: - .incbin "baserom.dol", 0x3FBC3C, 0x4 + # ROM: 0x3FBC3C + .4byte 0x46FFFE00 + .global lbl_805AF3A0 lbl_805AF3A0: - .incbin "baserom.dol", 0x3FBC40, 0x8 + # ROM: 0x3FBC40 + .4byte 0x45800000 + .4byte 0 + .global lbl_805AF3A8 lbl_805AF3A8: - .incbin "baserom.dol", 0x3FBC48, 0x8 - + # ROM: 0x3FBC48 + .4byte 0x43300000 + .4byte 0 + + .section .sbss .balign 4 .global salTimeOffset diff --git a/asm/musyx/hw_dspctrl.s b/asm/musyx/hw_dspctrl.s index debd5b2a..022ae2fa 100644 --- a/asm/musyx/hw_dspctrl.s +++ b/asm/musyx/hw_dspctrl.s @@ -9,8 +9,8 @@ dspStudio: .skip 0x5E0 "voices$217": .skip 0x100 - -.section .sbss + +.section .sbss .balign 4 .global dspARAMZeroBuffer dspARAMZeroBuffer: @@ -57,22 +57,53 @@ dspVoice: .global salMessageCallback salMessageCallback: .skip 0x8 - + .section .data, "wa" .global lbl_803F3FA8 lbl_803F3FA8: - .incbin "baserom.dol", 0x3F0FA8, 0x18 - + # ROM: 0x3F0FA8 + .4byte 0x0BAE0BAE + .4byte 0x045B0CE4 + .4byte 0x0CE4045B + .4byte 0x0E740E74 + .4byte 0x045B0000 + .4byte 0 + + .section .rodata .global lbl_803D8A68 lbl_803D8A68: - .incbin "baserom.dol", 0x3D5A68, 0x40 + # ROM: 0x3D5A68 + .4byte 0x05BE0B7C + .4byte 0x0B7C113A + .4byte 0x08B6116C + .4byte 0x116C1A22 + .4byte 0x09A6134C + .4byte 0x134C1CF2 + .4byte 0x0E971D2E + .4byte 0x1D2E2BC5 + .4byte 0x0B7C0D3A + .4byte 0x0B7C0D3A + .4byte 0x0B7C0D3A + .4byte 0x0B7C0D3A + .4byte 0x134C1637 + .4byte 0x134C1637 + .4byte 0x134C1637 + .4byte 0x134C1637 + .global lbl_803D8AA8 lbl_803D8AA8: - .incbin "baserom.dol", 0x3D5AA8, 0x18 + # ROM: 0x3D5AA8 + .4byte 0x000A000C + .4byte 0x0018000E + .4byte 0x0010001A + .4byte 0x00120014 + .4byte 0x00160000 + .4byte 0 -.section .text, "ax" + +.section .text, "ax" .global salInitDspCtrl salInitDspCtrl: @@ -321,7 +352,7 @@ lbl_803AB090: /* 803AB0A0 003A8000 83 81 00 10 */ lwz r28, 0x10(r1) /* 803AB0A4 003A8004 7C 08 03 A6 */ mtlr r0 /* 803AB0A8 003A8008 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AB0AC 003A800C 4E 80 00 20 */ blr +/* 803AB0AC 003A800C 4E 80 00 20 */ blr .global salInitHRTFBuffer salInitHRTFBuffer: @@ -338,7 +369,7 @@ salInitHRTFBuffer: /* 803AB0D8 003A8038 80 01 00 14 */ lwz r0, 0x14(r1) /* 803AB0DC 003A803C 7C 08 03 A6 */ mtlr r0 /* 803AB0E0 003A8040 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AB0E4 003A8044 4E 80 00 20 */ blr +/* 803AB0E4 003A8044 4E 80 00 20 */ blr .global salExitDspCtrl salExitDspCtrl: @@ -401,7 +432,7 @@ lbl_803AB178: /* 803AB1B8 003A8118 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803AB1BC 003A811C 7C 08 03 A6 */ mtlr r0 /* 803AB1C0 003A8120 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AB1C4 003A8124 4E 80 00 20 */ blr +/* 803AB1C4 003A8124 4E 80 00 20 */ blr .global salActivateStudio salActivateStudio: @@ -488,7 +519,7 @@ salActivateStudio: /* 803AB308 003A8268 83 81 00 10 */ lwz r28, 0x10(r1) /* 803AB30C 003A826C 7C 08 03 A6 */ mtlr r0 /* 803AB310 003A8270 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AB314 003A8274 4E 80 00 20 */ blr +/* 803AB314 003A8274 4E 80 00 20 */ blr .global sub_803ab318 sub_803ab318: @@ -499,7 +530,7 @@ sub_803ab318: /* 803AB328 003A8288 38 63 F2 60 */ addi r3, r3, dspStudio@l /* 803AB32C 003A828C 7C 63 02 14 */ add r3, r3, r0 /* 803AB330 003A8290 98 83 00 50 */ stb r4, 0x50(r3) -/* 803AB334 003A8294 4E 80 00 20 */ blr +/* 803AB334 003A8294 4E 80 00 20 */ blr .global salCheckVolErrorAndResetDelta salCheckVolErrorAndResetDelta: @@ -531,7 +562,7 @@ lbl_803AB388: /* 803AB398 003A82F8 A0 85 00 00 */ lhz r4, 0(r5) /* 803AB39C 003A82FC 7C 04 02 14 */ add r0, r4, r0 /* 803AB3A0 003A8300 B0 05 00 00 */ sth r0, 0(r5) -/* 803AB3A4 003A8304 4E 80 00 20 */ blr +/* 803AB3A4 003A8304 4E 80 00 20 */ blr lbl_803AB3A8: /* 803AB3A8 003A8308 2C 09 FF E0 */ cmpwi r9, -32 /* 803AB3AC 003A830C 41 81 00 54 */ bgt lbl_803AB400 @@ -555,7 +586,7 @@ lbl_803AB3DC: /* 803AB3F0 003A8350 A0 05 00 00 */ lhz r0, 0(r5) /* 803AB3F4 003A8354 7C 06 00 50 */ subf r0, r6, r0 /* 803AB3F8 003A8358 B0 05 00 00 */ sth r0, 0(r5) -/* 803AB3FC 003A835C 4E 80 00 20 */ blr +/* 803AB3FC 003A835C 4E 80 00 20 */ blr lbl_803AB400: /* 803AB400 003A8360 54 C0 04 3F */ clrlwi. r0, r6, 0x10 /* 803AB404 003A8364 40 82 00 18 */ bne lbl_803AB41C @@ -568,7 +599,7 @@ lbl_803AB41C: /* 803AB41C 003A837C 38 00 00 00 */ li r0, 0 /* 803AB420 003A8380 38 60 00 00 */ li r3, 0 /* 803AB424 003A8384 B0 04 00 00 */ sth r0, 0(r4) -/* 803AB428 003A8388 4E 80 00 20 */ blr +/* 803AB428 003A8388 4E 80 00 20 */ blr .global sal_setup_dspvol sal_setup_dspvol: @@ -589,13 +620,13 @@ sal_setup_dspvol: /* 803AB464 003A83C4 1C 00 00 A0 */ mulli r0, r0, 0xa0 /* 803AB468 003A83C8 7C 03 02 14 */ add r0, r3, r0 /* 803AB46C 003A83CC B0 04 00 00 */ sth r0, 0(r4) -/* 803AB470 003A83D0 4E 80 00 20 */ blr +/* 803AB470 003A83D0 4E 80 00 20 */ blr .global sal_update_hostplayinfo sal_update_hostplayinfo: /* 803AB474 003A83D4 80 03 00 8C */ lwz r0, 0x8c(r3) /* 803AB478 003A83D8 28 00 00 00 */ cmplwi r0, 0 -/* 803AB47C 003A83DC 4C 82 00 20 */ bnelr +/* 803AB47C 003A83DC 4C 82 00 20 */ bnelr /* 803AB480 003A83E0 80 83 00 00 */ lwz r4, 0(r3) /* 803AB484 003A83E4 A0 04 00 08 */ lhz r0, 8(r4) /* 803AB488 003A83E8 28 00 00 02 */ cmplwi r0, 2 @@ -618,13 +649,13 @@ lbl_803AB4A0: /* 803AB4C4 003A8424 7C 80 22 14 */ add r4, r0, r4 /* 803AB4C8 003A8428 38 04 00 01 */ addi r0, r4, 1 /* 803AB4CC 003A842C 90 03 00 D8 */ stw r0, 0xd8(r3) -/* 803AB4D0 003A8430 4E 80 00 20 */ blr +/* 803AB4D0 003A8430 4E 80 00 20 */ blr lbl_803AB4D4: /* 803AB4D4 003A8434 80 83 00 D8 */ lwz r4, 0xd8(r3) /* 803AB4D8 003A8438 54 A0 84 3E */ srwi r0, r5, 0x10 /* 803AB4DC 003A843C 7C 04 02 14 */ add r0, r4, r0 /* 803AB4E0 003A8440 90 03 00 D8 */ stw r0, 0xd8(r3) -/* 803AB4E4 003A8444 4E 80 00 20 */ blr +/* 803AB4E4 003A8444 4E 80 00 20 */ blr .global DoDepopFade DoDepopFade: @@ -677,7 +708,7 @@ lbl_803AB574: /* 803AB584 003A84E4 1C 00 00 A0 */ mulli r0, r0, 0xa0 /* 803AB588 003A84E8 7C 03 02 14 */ add r0, r3, r0 /* 803AB58C 003A84EC 90 05 00 00 */ stw r0, 0(r5) -/* 803AB590 003A84F0 4E 80 00 20 */ blr +/* 803AB590 003A84F0 4E 80 00 20 */ blr .global sub_803ab594 sub_803ab594: @@ -825,7 +856,7 @@ lbl_803AB778: lbl_803AB77C: /* 803AB77C 003A86DC A0 04 00 0C */ lhz r0, 0xc(r4) /* 803AB780 003A86E0 70 00 00 12 */ andi. r0, r0, 0x12 -/* 803AB784 003A86E4 4D 82 00 20 */ beqlr +/* 803AB784 003A86E4 4D 82 00 20 */ beqlr /* 803AB788 003A86E8 A0 04 00 56 */ lhz r0, 0x56(r4) /* 803AB78C 003A86EC 3C A0 00 80 */ lis r5, 0x007FFFFF@ha /* 803AB790 003A86F0 80 C3 00 1C */ lwz r6, 0x1c(r3) @@ -870,7 +901,7 @@ lbl_803AB814: /* 803AB814 003A8774 90 C3 00 20 */ stw r6, 0x20(r3) /* 803AB818 003A8778 A0 04 00 0C */ lhz r0, 0xc(r4) /* 803AB81C 003A877C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 803AB820 003A8780 4D 82 00 20 */ beqlr +/* 803AB820 003A8780 4D 82 00 20 */ beqlr /* 803AB824 003A8784 A0 04 00 62 */ lhz r0, 0x62(r4) /* 803AB828 003A8788 3C 80 00 80 */ lis r4, 0x007FFFFF@ha /* 803AB82C 003A878C 80 A3 00 24 */ lwz r5, 0x24(r3) @@ -892,7 +923,7 @@ lbl_803AB864: /* 803AB864 003A87C4 7C 04 03 78 */ mr r4, r0 lbl_803AB868: /* 803AB868 003A87C8 90 83 00 24 */ stw r4, 0x24(r3) -/* 803AB86C 003A87CC 4E 80 00 20 */ blr +/* 803AB86C 003A87CC 4E 80 00 20 */ blr .global SortVoices SortVoices: @@ -1056,7 +1087,7 @@ lbl_803ABAB0: /* 803ABAB8 003A8A18 80 01 00 24 */ lwz r0, 0x24(r1) /* 803ABABC 003A8A1C 7C 08 03 A6 */ mtlr r0 /* 803ABAC0 003A8A20 38 21 00 20 */ addi r1, r1, 0x20 -/* 803ABAC4 003A8A24 4E 80 00 20 */ blr +/* 803ABAC4 003A8A24 4E 80 00 20 */ blr .global salBuildCommandList salBuildCommandList: @@ -3377,7 +3408,7 @@ lbl_803ADC58: /* 803ADC70 003AABD0 80 01 00 84 */ lwz r0, 0x84(r1) /* 803ADC74 003AABD4 7C 08 03 A6 */ mtlr r0 /* 803ADC78 003AABD8 38 21 00 80 */ addi r1, r1, 0x80 -/* 803ADC7C 003AABDC 4E 80 00 20 */ blr +/* 803ADC7C 003AABDC 4E 80 00 20 */ blr .global salSynthSendMessage salSynthSendMessage: @@ -3394,12 +3425,12 @@ lbl_803ADCA4: /* 803ADCA4 003AAC04 7C 83 23 78 */ mr r3, r4 /* 803ADCA8 003AAC08 80 85 00 18 */ lwz r4, 0x18(r5) /* 803ADCAC 003AAC0C 7D 89 03 A6 */ mtctr r12 -/* 803ADCB0 003AAC10 4E 80 04 21 */ bctrl +/* 803ADCB0 003AAC10 4E 80 04 21 */ bctrl lbl_803ADCB4: /* 803ADCB4 003AAC14 80 01 00 14 */ lwz r0, 0x14(r1) /* 803ADCB8 003AAC18 7C 08 03 A6 */ mtlr r0 /* 803ADCBC 003AAC1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803ADCC0 003AAC20 4E 80 00 20 */ blr +/* 803ADCC0 003AAC20 4E 80 00 20 */ blr .global salActivateVoice salActivateVoice: @@ -3444,13 +3475,13 @@ lbl_803ADD30: /* 803ADD54 003AACB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803ADD58 003AACB8 7C 08 03 A6 */ mtlr r0 /* 803ADD5C 003AACBC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803ADD60 003AACC0 4E 80 00 20 */ blr +/* 803ADD60 003AACC0 4E 80 00 20 */ blr .global salDeactivateVoice salDeactivateVoice: /* 803ADD64 003AACC4 88 03 00 EC */ lbz r0, 0xec(r3) /* 803ADD68 003AACC8 28 00 00 00 */ cmplwi r0, 0 -/* 803ADD6C 003AACCC 4D 82 00 20 */ beqlr +/* 803ADD6C 003AACCC 4D 82 00 20 */ beqlr /* 803ADD70 003AACD0 80 83 00 10 */ lwz r4, 0x10(r3) /* 803ADD74 003AACD4 28 04 00 00 */ cmplwi r4, 0 /* 803ADD78 003AACD8 41 82 00 10 */ beq lbl_803ADD88 @@ -3474,7 +3505,7 @@ lbl_803ADDA4: lbl_803ADDB8: /* 803ADDB8 003AAD18 38 00 00 00 */ li r0, 0 /* 803ADDBC 003AAD1C 98 03 00 EC */ stb r0, 0xec(r3) -/* 803ADDC0 003AAD20 4E 80 00 20 */ blr +/* 803ADDC0 003AAD20 4E 80 00 20 */ blr .global sub_803addc4 sub_803addc4: @@ -3532,7 +3563,7 @@ lbl_803ADE44: /* 803ADE80 003AADE0 7C 65 01 2E */ stwx r3, r5, r0 lbl_803ADE84: /* 803ADE84 003AADE4 98 83 00 EF */ stb r4, 0xef(r3) -/* 803ADE88 003AADE8 4E 80 00 20 */ blr +/* 803ADE88 003AADE8 4E 80 00 20 */ blr .global sub_803ade8c sub_803ade8c: @@ -3575,10 +3606,10 @@ sub_803ade8c: /* 803ADF1C 003AAE7C 38 04 00 01 */ addi r0, r4, 1 /* 803ADF20 003AAE80 98 03 00 52 */ stb r0, 0x52(r3) /* 803ADF24 003AAE84 38 60 00 01 */ li r3, 1 -/* 803ADF28 003AAE88 4E 80 00 20 */ blr +/* 803ADF28 003AAE88 4E 80 00 20 */ blr lbl_803ADF2C: /* 803ADF2C 003AAE8C 38 60 00 00 */ li r3, 0 -/* 803ADF30 003AAE90 4E 80 00 20 */ blr +/* 803ADF30 003AAE90 4E 80 00 20 */ blr .global sub_803adf34 sub_803adf34: @@ -3612,14 +3643,14 @@ lbl_803ADF84: /* 803ADF94 003AAEF4 38 03 FF FF */ addi r0, r3, -1 /* 803ADF98 003AAEF8 38 60 00 01 */ li r3, 1 /* 803ADF9C 003AAEFC 98 06 00 52 */ stb r0, 0x52(r6) -/* 803ADFA0 003AAF00 4E 80 00 20 */ blr +/* 803ADFA0 003AAF00 4E 80 00 20 */ blr lbl_803ADFA4: /* 803ADFA4 003AAF04 38 63 00 0C */ addi r3, r3, 0xc /* 803ADFA8 003AAF08 38 A5 00 01 */ addi r5, r5, 1 /* 803ADFAC 003AAF0C 42 00 FF A0 */ bdnz lbl_803ADF4C lbl_803ADFB0: /* 803ADFB0 003AAF10 38 60 00 00 */ li r3, 0 -/* 803ADFB4 003AAF14 4E 80 00 20 */ blr +/* 803ADFB4 003AAF14 4E 80 00 20 */ blr .global salHandleAuxProcessing salHandleAuxProcessing: @@ -3662,7 +3693,7 @@ lbl_803ADFE4: /* 803AE044 003AAFA4 90 C1 00 0C */ stw r6, 0xc(r1) /* 803AE048 003AAFA8 90 01 00 10 */ stw r0, 0x10(r1) /* 803AE04C 003AAFAC 7D 89 03 A6 */ mtctr r12 -/* 803AE050 003AAFB0 4E 80 04 21 */ bctrl +/* 803AE050 003AAFB0 4E 80 04 21 */ bctrl /* 803AE054 003AAFB4 7F A3 EB 78 */ mr r3, r29 /* 803AE058 003AAFB8 38 80 07 80 */ li r4, 0x780 /* 803AE05C 003AAFBC 4B FD 0A B5 */ bl DCFlushRangeNoSync @@ -3694,7 +3725,7 @@ lbl_803AE060: /* 803AE0C0 003AB020 90 C1 00 0C */ stw r6, 0xc(r1) /* 803AE0C4 003AB024 90 01 00 10 */ stw r0, 0x10(r1) /* 803AE0C8 003AB028 7D 89 03 A6 */ mtctr r12 -/* 803AE0CC 003AB02C 4E 80 04 21 */ bctrl +/* 803AE0CC 003AB02C 4E 80 04 21 */ bctrl /* 803AE0D0 003AB030 7F A3 EB 78 */ mr r3, r29 /* 803AE0D4 003AB034 38 80 07 80 */ li r4, 0x780 /* 803AE0D8 003AB038 4B FD 0A 39 */ bl DCFlushRangeNoSync @@ -3712,4 +3743,4 @@ lbl_803AE0E4: /* 803AE100 003AB060 83 A1 00 24 */ lwz r29, 0x24(r1) /* 803AE104 003AB064 7C 08 03 A6 */ mtlr r0 /* 803AE108 003AB068 38 21 00 30 */ addi r1, r1, 0x30 -/* 803AE10C 003AB06C 4E 80 00 20 */ blr +/* 803AE10C 003AB06C 4E 80 00 20 */ blr diff --git a/asm/musyx/hw_volconv.s b/asm/musyx/hw_volconv.s index 61580971..1a97eee7 100644 --- a/asm/musyx/hw_volconv.s +++ b/asm/musyx/hw_volconv.s @@ -3,32 +3,55 @@ .section .sdata2 .global lbl_805AF2F0 lbl_805AF2F0: - .incbin "baserom.dol", 0x3FBB90, 0x4 + # ROM: 0x3FBB90 + .4byte 0x42FE0000 + .global lbl_805AF2F4 lbl_805AF2F4: - .incbin "baserom.dol", 0x3FBB94, 0x4 + # ROM: 0x3FBB94 + .4byte 0x3F800000 + .global lbl_805AF2F8 lbl_805AF2F8: - .incbin "baserom.dol", 0x3FBB98, 0x8 + # ROM: 0x3FBB98 + .4byte 0x3F3538EF + .4byte 0 + .global lbl_805AF300 lbl_805AF300: - .incbin "baserom.dol", 0x3FBBA0, 0x8 + # ROM: 0x3FBBA0 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF308 lbl_805AF308: - .incbin "baserom.dol", 0x3FBBA8, 0x8 + # ROM: 0x3FBBA8 + .4byte 0x34820821 + .4byte 0 + .global lbl_805AF310 lbl_805AF310: - .incbin "baserom.dol", 0x3FBBB0, 0x8 + # ROM: 0x3FBBB0 + .4byte 0x3FF00000 + .4byte 0 + .global lbl_805AF318 lbl_805AF318: - .incbin "baserom.dol", 0x3FBBB8, 0x4 + # ROM: 0x3FBBB8 + .4byte 0x40000000 + .global lbl_805AF31C lbl_805AF31C: - .incbin "baserom.dol", 0x3FBBBC, 0x4 + # ROM: 0x3FBBBC + .4byte 0x3F441B33 + .global lbl_805AF320 lbl_805AF320: - .incbin "baserom.dol", 0x3FBBC0, 0x8 - + # ROM: 0x3FBBC0 + .4byte 0 + .4byte 0 + + .section .data, "wa" .global lbl_803F3FC0 diff --git a/asm/musyx/reverb.s b/asm/musyx/reverb.s index d468b221..db550332 100644 --- a/asm/musyx/reverb.s +++ b/asm/musyx/reverb.s @@ -3,47 +3,79 @@ .section .sdata2 .global lbl_805AF3F0 lbl_805AF3F0: - .incbin "baserom.dol", 0x3FBC90, 0x4 + # ROM: 0x3FBC90 + .4byte 0 + .global lbl_805AF3F4 lbl_805AF3F4: - .incbin "baserom.dol", 0x3FBC94, 0x4 + # ROM: 0x3FBC94 + .4byte 0x3F800000 + .global lbl_805AF3F8 lbl_805AF3F8: - .incbin "baserom.dol", 0x3FBC98, 0x4 + # ROM: 0x3FBC98 + .4byte 0x3C23D70A + .global lbl_805AF3FC lbl_805AF3FC: - .incbin "baserom.dol", 0x3FBC9C, 0x4 + # ROM: 0x3FBC9C + .4byte 0x41200000 + .global lbl_805AF400 lbl_805AF400: - .incbin "baserom.dol", 0x3FBCA0, 0x4 + # ROM: 0x3FBCA0 + .4byte 0x3DCCCCCD + .global lbl_805AF404 lbl_805AF404: - .incbin "baserom.dol", 0x3FBCA4, 0x4 + # ROM: 0x3FBCA4 + .4byte 0x46FA0000 + .global lbl_805AF408 lbl_805AF408: - .incbin "baserom.dol", 0x3FBCA8, 0x8 + # ROM: 0x3FBCA8 + .4byte 0x40240000 + .4byte 0 + .global lbl_805AF410 lbl_805AF410: - .incbin "baserom.dol", 0x3FBCB0, 0x4 + # ROM: 0x3FBCB0 + .4byte 0x3D4CCCCD + .global lbl_805AF414 lbl_805AF414: - .incbin "baserom.dol", 0x3FBCB4, 0x4 + # ROM: 0x3FBCB4 + .4byte 0x3F4CCCCD + .global lbl_805AF418 lbl_805AF418: - .incbin "baserom.dol", 0x3FBCB8, 0x8 + # ROM: 0x3FBCB8 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF420 lbl_805AF420: - .incbin "baserom.dol", 0x3FBCC0, 0x8 + # ROM: 0x3FBCC0 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF428 lbl_805AF428: - .incbin "baserom.dol", 0x3FBCC8, 0x4 + # ROM: 0x3FBCC8 + .4byte 0x3F19999A + .global lbl_805AF42C lbl_805AF42C: - .incbin "baserom.dol", 0x3FBCCC, 0x4 + # ROM: 0x3FBCCC + .4byte 0x3E99999A + .global lbl_805AF430 lbl_805AF430: - .incbin "baserom.dol", 0x3FBCD0, 0x8 - + # ROM: 0x3FBCD0 + .4byte 0x3F000000 + .4byte 0 + + .section .data, "wa" lbl_803F6470: .4byte 0x000006FD @@ -54,8 +86,8 @@ lbl_803F6470: .4byte 0x0000002F .4byte 0x00000049 .4byte 0x00000043 - -.section .text, "ax" + +.section .text, "ax" .global ReverbHICreate ReverbHICreate: @@ -407,7 +439,7 @@ lbl_803B6074: /* 803B60BC 003B301C 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 803B60C0 003B3020 7C 08 03 A6 */ mtlr r0 /* 803B60C4 003B3024 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 803B60C8 003B3028 4E 80 00 20 */ blr +/* 803B60C8 003B3028 4E 80 00 20 */ blr .global DoCrossTalk DoCrossTalk: @@ -511,7 +543,7 @@ lbl_803B6164: /* 803B624C 003B31AC 7D CB 27 AE */ stfiwx f14, r11, r4 /* 803B6250 003B31B0 C9 C1 00 28 */ lfd f14, 0x28(r1) /* 803B6254 003B31B4 38 21 00 30 */ addi r1, r1, 0x30 -/* 803B6258 003B31B8 4E 80 00 20 */ blr +/* 803B6258 003B31B8 4E 80 00 20 */ blr .global HandleReverb_0 HandleReverb_0: @@ -866,7 +898,7 @@ lbl_803B66C0: /* 803B6758 003B36B8 CB 21 00 B8 */ lfd f25, 0xb8(r1) /* 803B675C 003B36BC B9 C1 00 08 */ lmw r14, 8(r1) /* 803B6760 003B36C0 38 21 00 C0 */ addi r1, r1, 0xc0 -/* 803B6764 003B36C4 4E 80 00 20 */ blr +/* 803B6764 003B36C4 4E 80 00 20 */ blr .global ReverbHICallback ReverbHICallback: @@ -933,7 +965,7 @@ lbl_803B6824: /* 803B6838 003B3798 80 01 00 24 */ lwz r0, 0x24(r1) /* 803B683C 003B379C 7C 08 03 A6 */ mtlr r0 /* 803B6840 003B37A0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803B6844 003B37A4 4E 80 00 20 */ blr +/* 803B6844 003B37A4 4E 80 00 20 */ blr .global ReverbHIFree ReverbHIFree: diff --git a/asm/musyx/seq.s b/asm/musyx/seq.s index 00b56f66..b70f08bc 100644 --- a/asm/musyx/seq.s +++ b/asm/musyx/seq.s @@ -10,7 +10,7 @@ seqInstance: .global seqMIDIPriority seqMIDIPriority: .skip 0x100 - + .section .sbss seq_next_id: .skip 0x4 @@ -32,20 +32,33 @@ seqActiveRoot: .section .sdata2 .global lbl_805AF210 lbl_805AF210: - .incbin "baserom.dol", 0x3FBAB0, 0x4 + # ROM: 0x3FBAB0 + .4byte 0x32D1B717 + .global lbl_805AF214 lbl_805AF214: - .incbin "baserom.dol", 0x3FBAB4, 0x4 + # ROM: 0x3FBAB4 + .4byte 0x3B800000 + .global lbl_805AF218 lbl_805AF218: - .incbin "baserom.dol", 0x3FBAB8, 0x8 + # ROM: 0x3FBAB8 + .4byte 0x47800000 + .4byte 0 + .global lbl_805AF220 lbl_805AF220: - .incbin "baserom.dol", 0x3FBAC0, 0x8 + # ROM: 0x3FBAC0 + .4byte 0x40F00000 + .4byte 0 + .global lbl_805AF228 lbl_805AF228: - .incbin "baserom.dol", 0x3FBAC8, 0x8 - + # ROM: 0x3FBAC8 + .4byte 0x43300000 + .4byte 0 + + .section .data, "wa" .global lbl_803F2F88 diff --git a/asm/musyx/snd3d.s b/asm/musyx/snd3d.s index 628f528e..41237de0 100644 --- a/asm/musyx/snd3d.s +++ b/asm/musyx/snd3d.s @@ -13,7 +13,7 @@ runList: .global startListNum startListNum: .skip 0x700 - + .section .sbss .balign 4 .global runListNum @@ -56,51 +56,86 @@ s3dCallCnt: .section .sdata2 .global lbl_805AF328 lbl_805AF328: - .incbin "baserom.dol", 0x3FBBC8, 0x8 + # ROM: 0x3FBBC8 + .4byte 0 + .4byte 0 + .global lbl_805AF330 lbl_805AF330: - .incbin "baserom.dol", 0x3FBBD0, 0x8 + # ROM: 0x3FBBD0 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF338 lbl_805AF338: - .incbin "baserom.dol", 0x3FBBD8, 0x4 + # ROM: 0x3FBBD8 + .4byte 0xBF800000 + .global lbl_805AF33C lbl_805AF33C: - .incbin "baserom.dol", 0x3FBBDC, 0x4 + # ROM: 0x3FBBDC + .4byte 0x34010204 + .global lbl_805AF340 lbl_805AF340: - .incbin "baserom.dol", 0x3FBBE0, 0x8 + # ROM: 0x3FBBE0 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF348 lbl_805AF348: - .incbin "baserom.dol", 0x3FBBE8, 0x4 + # ROM: 0x3FBBE8 + .4byte 0x42FE0000 + .global lbl_805AF34C lbl_805AF34C: - .incbin "baserom.dol", 0x3FBBEC, 0x4 + # ROM: 0x3FBBEC + .4byte 0x3F800000 + .global lbl_805AF350 lbl_805AF350: - .incbin "baserom.dol", 0x3FBBF0, 0x8 + # ROM: 0x3FBBF0 + .4byte 0x40080000 + .4byte 0 + .global lbl_805AF358 lbl_805AF358: - .incbin "baserom.dol", 0x3FBBF8, 0x4 + # ROM: 0x3FBBF8 + .4byte 0x3C888889 + .global lbl_805AF35C lbl_805AF35C: - .incbin "baserom.dol", 0x3FBBFC, 0x4 + # ROM: 0x3FBBFC + .4byte 0x42800000 + .global lbl_805AF360 lbl_805AF360: - .incbin "baserom.dol", 0x3FBC00, 0x4 + # ROM: 0x3FBC00 + .4byte 0x46000000 + .global lbl_805AF364 lbl_805AF364: - .incbin "baserom.dol", 0x3FBC04, 0x4 + # ROM: 0x3FBC04 + .4byte 0x3C010204 + .global lbl_805AF368 lbl_805AF368: - .incbin "baserom.dol", 0x3FBC08, 0x4 + # ROM: 0x3FBC08 + .4byte 0x3DA3D70A + .global lbl_805AF36C lbl_805AF36C: - .incbin "baserom.dol", 0x3FBC0C, 0x4 + # ROM: 0x3FBC0C + .4byte 0x3E19999A + .global lbl_805AF370 lbl_805AF370: - .incbin "baserom.dol", 0x3FBC10, 0x8 + # ROM: 0x3FBC10 + .4byte 0x3E99999A + .4byte 0 -.section .text, "ax" + +.section .text, "ax" .global sub_803ae800 sub_803ae800: @@ -302,7 +337,7 @@ lbl_803AEA90: /* 803AEAA0 003ABA00 41 82 00 10 */ beq lbl_803AEAB0 /* 803AEAA4 003ABA04 88 7F 00 1C */ lbz r3, 0x1c(r31) /* 803AEAA8 003ABA08 7D 89 03 A6 */ mtctr r12 -/* 803AEAAC 003ABA0C 4E 80 04 21 */ bctrl +/* 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 @@ -351,7 +386,7 @@ lbl_803AEB48: /* 803AEB54 003ABAB4 88 7E 00 1C */ lbz r3, 0x1c(r30) /* 803AEB58 003ABAB8 80 9E 00 28 */ lwz r4, 0x28(r30) /* 803AEB5C 003ABABC 7D 89 03 A6 */ mtctr r12 -/* 803AEB60 003ABAC0 4E 80 04 21 */ bctrl +/* 803AEB60 003ABAC0 4E 80 04 21 */ bctrl /* 803AEB64 003ABAC4 48 00 01 24 */ b lbl_803AEC88 lbl_803AEB68: /* 803AEB68 003ABAC8 80 1E 00 08 */ lwz r0, 8(r30) @@ -444,7 +479,7 @@ lbl_803AEC94: /* 803AECA4 003ABC04 80 01 00 44 */ lwz r0, 0x44(r1) /* 803AECA8 003ABC08 7C 08 03 A6 */ mtlr r0 /* 803AECAC 003ABC0C 38 21 00 40 */ addi r1, r1, 0x40 -/* 803AECB0 003ABC10 4E 80 00 20 */ blr +/* 803AECB0 003ABC10 4E 80 00 20 */ blr .global CalcEmitter CalcEmitter: @@ -794,7 +829,7 @@ lbl_803AF198: /* 803AF1C0 003AC120 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 803AF1C4 003AC124 7C 08 03 A6 */ mtlr r0 /* 803AF1C8 003AC128 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 803AF1CC 003AC12C 4E 80 00 20 */ blr +/* 803AF1CC 003AC12C 4E 80 00 20 */ blr .global sndUpdateEmitter sndUpdateEmitter: @@ -879,7 +914,7 @@ lbl_803AF2E8: /* 803AF2F0 003AC250 80 01 00 34 */ lwz r0, 0x34(r1) /* 803AF2F4 003AC254 7C 08 03 A6 */ mtlr r0 /* 803AF2F8 003AC258 38 21 00 30 */ addi r1, r1, 0x30 -/* 803AF2FC 003AC25C 4E 80 00 20 */ blr +/* 803AF2FC 003AC25C 4E 80 00 20 */ blr .global sndCheckEmitter sndCheckEmitter: @@ -888,10 +923,10 @@ sndCheckEmitter: /* 803AF308 003AC268 41 82 00 10 */ beq lbl_803AF318 /* 803AF30C 003AC26C 80 03 00 10 */ lwz r0, 0x10(r3) /* 803AF310 003AC270 54 03 87 FE */ rlwinm r3, r0, 0x10, 0x1f, 0x1f -/* 803AF314 003AC274 4E 80 00 20 */ blr +/* 803AF314 003AC274 4E 80 00 20 */ blr lbl_803AF318: /* 803AF318 003AC278 38 60 00 00 */ li r3, 0 -/* 803AF31C 003AC27C 4E 80 00 20 */ blr +/* 803AF31C 003AC27C 4E 80 00 20 */ blr .global AddEmitter AddEmitter: @@ -1171,7 +1206,7 @@ lbl_803AF6E8: /* 803AF708 003AC668 80 01 00 A4 */ lwz r0, 0xa4(r1) /* 803AF70C 003AC66C 7C 08 03 A6 */ mtlr r0 /* 803AF710 003AC670 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 803AF714 003AC674 4E 80 00 20 */ blr +/* 803AF714 003AC674 4E 80 00 20 */ blr .global sndAddEmitterParaEx sndAddEmitterParaEx: @@ -1196,7 +1231,7 @@ lbl_803AF758: /* 803AF758 003AC6B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 803AF75C 003AC6BC 7C 08 03 A6 */ mtlr r0 /* 803AF760 003AC6C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AF764 003AC6C4 4E 80 00 20 */ blr +/* 803AF764 003AC6C4 4E 80 00 20 */ blr .global sndRemoveEmitter sndRemoveEmitter: @@ -1247,7 +1282,7 @@ lbl_803AF7FC: /* 803AF800 003AC760 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803AF804 003AC764 7C 08 03 A6 */ mtlr r0 /* 803AF808 003AC768 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AF80C 003AC76C 4E 80 00 20 */ blr +/* 803AF80C 003AC76C 4E 80 00 20 */ blr .global sndEmitterVoiceID sndEmitterVoiceID: @@ -1275,7 +1310,7 @@ lbl_803AF850: /* 803AF85C 003AC7BC 83 C1 00 08 */ lwz r30, 8(r1) /* 803AF860 003AC7C0 7C 08 03 A6 */ mtlr r0 /* 803AF864 003AC7C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AF868 003AC7C8 4E 80 00 20 */ blr +/* 803AF868 003AC7C8 4E 80 00 20 */ blr .global s3dKillEmitterByFXID s3dKillEmitterByFXID: @@ -1350,7 +1385,7 @@ lbl_803AF940: /* 803AF958 003AC8B8 83 81 00 10 */ lwz r28, 0x10(r1) /* 803AF95C 003AC8BC 7C 08 03 A6 */ mtlr r0 /* 803AF960 003AC8C0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803AF964 003AC8C4 4E 80 00 20 */ blr +/* 803AF964 003AC8C4 4E 80 00 20 */ blr .global sndUpdateListener sndUpdateListener: @@ -1489,7 +1524,7 @@ lbl_803AFB54: /* 803AFB5C 003ACABC 80 01 00 64 */ lwz r0, 0x64(r1) /* 803AFB60 003ACAC0 7C 08 03 A6 */ mtlr r0 /* 803AFB64 003ACAC4 38 21 00 60 */ addi r1, r1, 0x60 -/* 803AFB68 003ACAC8 4E 80 00 20 */ blr +/* 803AFB68 003ACAC8 4E 80 00 20 */ blr .global sndAddListener sndAddListener: @@ -1632,7 +1667,7 @@ lbl_803AFD5C: /* 803AFD7C 003ACCDC 80 01 00 94 */ lwz r0, 0x94(r1) /* 803AFD80 003ACCE0 7C 08 03 A6 */ mtlr r0 /* 803AFD84 003ACCE4 38 21 00 90 */ addi r1, r1, 0x90 -/* 803AFD88 003ACCE8 4E 80 00 20 */ blr +/* 803AFD88 003ACCE8 4E 80 00 20 */ blr .global sub_803afd8c sub_803afd8c: @@ -1696,7 +1731,7 @@ lbl_803AFE48: /* 803AFE4C 003ACDAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803AFE50 003ACDB0 7C 08 03 A6 */ mtlr r0 /* 803AFE54 003ACDB4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803AFE58 003ACDB8 4E 80 00 20 */ blr +/* 803AFE58 003ACDB8 4E 80 00 20 */ blr .global sub_803afe5c sub_803afe5c: @@ -1721,7 +1756,7 @@ lbl_803AFE94: /* 803AFE9C 003ACDFC 28 06 00 40 */ cmplwi r6, 0x40 /* 803AFEA0 003ACE00 40 82 00 0C */ bne lbl_803AFEAC /* 803AFEA4 003ACE04 38 60 00 00 */ li r3, 0 -/* 803AFEA8 003ACE08 4E 80 00 20 */ blr +/* 803AFEA8 003ACE08 4E 80 00 20 */ blr lbl_803AFEAC: /* 803AFEAC 003ACE0C 3C A0 80 56 */ lis r5, startGroup@ha /* 803AFEB0 003ACE10 88 8D AF 62 */ lbz r4, startGroupNum@sda21(r13) @@ -1741,7 +1776,7 @@ lbl_803AFEE0: /* 803AFEE4 003ACE44 28 05 00 40 */ cmplwi r5, 0x40 /* 803AFEE8 003ACE48 40 82 00 0C */ bne lbl_803AFEF4 /* 803AFEEC 003ACE4C 38 60 00 00 */ li r3, 0 -/* 803AFEF0 003ACE50 4E 80 00 20 */ blr +/* 803AFEF0 003ACE50 4E 80 00 20 */ blr lbl_803AFEF4: /* 803AFEF4 003ACE54 3C 80 80 56 */ lis r4, startGroup@ha /* 803AFEF8 003ACE58 55 20 20 36 */ slwi r0, r9, 4 @@ -1792,7 +1827,7 @@ lbl_803AFF6C: /* 803AFF98 003ACEF8 D0 64 00 0C */ stfs f3, 0xc(r4) /* 803AFF9C 003ACEFC D0 84 00 10 */ stfs f4, 0x10(r4) /* 803AFFA0 003ACF00 D0 24 00 04 */ stfs f1, 4(r4) -/* 803AFFA4 003ACF04 4E 80 00 20 */ blr +/* 803AFFA4 003ACF04 4E 80 00 20 */ blr .global sub_803affa8 sub_803affa8: @@ -2059,7 +2094,7 @@ lbl_803B031C: /* 803B0348 003AD2A8 80 01 00 84 */ lwz r0, 0x84(r1) /* 803B034C 003AD2AC 7C 08 03 A6 */ mtlr r0 /* 803B0350 003AD2B0 38 21 00 80 */ addi r1, r1, 0x80 -/* 803B0354 003AD2B4 4E 80 00 20 */ blr +/* 803B0354 003AD2B4 4E 80 00 20 */ blr .global s3dHandle s3dHandle: @@ -2645,7 +2680,7 @@ lbl_803B0B54: /* 803B0B74 003ADAD4 80 01 00 94 */ lwz r0, 0x94(r1) /* 803B0B78 003ADAD8 7C 08 03 A6 */ mtlr r0 /* 803B0B7C 003ADADC 38 21 00 90 */ addi r1, r1, 0x90 -/* 803B0B80 003ADAE0 4E 80 00 20 */ blr +/* 803B0B80 003ADAE0 4E 80 00 20 */ blr .global sub_803b0b84 sub_803b0b84: @@ -2662,8 +2697,8 @@ sub_803b0b84: /* 803B0BAC 003ADB0C 98 6D AF 64 */ stb r3, snd_max_studios@sda21(r13) /* 803B0BB0 003ADB10 98 AD AF 7C */ stb r5, s3dCallCnt@sda21(r13) /* 803B0BB4 003ADB14 98 0D AF 63 */ stb r0, s3dUseMaxVoices@sda21(r13) -/* 803B0BB8 003ADB18 4E 80 00 20 */ blr +/* 803B0BB8 003ADB18 4E 80 00 20 */ blr .global s3dExit s3dExit: -/* 803B0BBC 003ADB1C 4E 80 00 20 */ blr +/* 803B0BBC 003ADB1C 4E 80 00 20 */ blr diff --git a/asm/musyx/snd_math.s b/asm/musyx/snd_math.s index cd0d5b52..91b09115 100644 --- a/asm/musyx/snd_math.s +++ b/asm/musyx/snd_math.s @@ -3,18 +3,30 @@ .section .sdata2 .global lbl_805AF378 lbl_805AF378: - .incbin "baserom.dol", 0x3FBC18, 0x8 + # ROM: 0x3FBC18 + .4byte 0 + .4byte 0 + .global lbl_805AF380 lbl_805AF380: - .incbin "baserom.dol", 0x3FBC20, 0x8 + # ROM: 0x3FBC20 + .4byte 0x3FE00000 + .4byte 0 + .global lbl_805AF388 lbl_805AF388: - .incbin "baserom.dol", 0x3FBC28, 0x8 + # ROM: 0x3FBC28 + .4byte 0x40080000 + .4byte 0 + .global lbl_805AF390 lbl_805AF390: - .incbin "baserom.dol", 0x3FBC30, 0x8 - -.section .text, "ax" + # ROM: 0x3FBC30 + .4byte 0x3F800000 + .4byte 0 + + +.section .text, "ax" .global salApplyMatrix salApplyMatrix: @@ -60,7 +72,7 @@ salApplyMatrix: /* 803B0DA8 003ADD08 EC 01 00 2A */ fadds f0, f1, f0 /* 803B0DAC 003ADD0C EC 04 00 2A */ fadds f0, f4, f0 /* 803B0DB0 003ADD10 D0 05 00 08 */ stfs f0, 8(r5) -/* 803B0DB4 003ADD14 4E 80 00 20 */ blr +/* 803B0DB4 003ADD14 4E 80 00 20 */ blr .global salNormalizeVector salNormalizeVector: @@ -109,7 +121,7 @@ lbl_803B0E40: /* 803B0E5C 003ADDBC EC 00 08 24 */ fdivs f0, f0, f1 /* 803B0E60 003ADDC0 D0 03 00 08 */ stfs f0, 8(r3) /* 803B0E64 003ADDC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803B0E68 003ADDC8 4E 80 00 20 */ blr +/* 803B0E68 003ADDC8 4E 80 00 20 */ blr .global salCrossProduct salCrossProduct: @@ -137,7 +149,7 @@ salCrossProduct: /* 803B0EC0 003ADE20 EC 01 00 32 */ fmuls f0, f1, f0 /* 803B0EC4 003ADE24 EC 02 00 28 */ fsubs f0, f2, f0 /* 803B0EC8 003ADE28 D0 03 00 08 */ stfs f0, 8(r3) -/* 803B0ECC 003ADE2C 4E 80 00 20 */ blr +/* 803B0ECC 003ADE2C 4E 80 00 20 */ blr .global salInvertMatrix salInvertMatrix: @@ -267,4 +279,4 @@ salInvertMatrix: /* 803B10BC 003AE01C EC 24 10 28 */ fsubs f1, f4, f2 /* 803B10C0 003AE020 EC 01 00 28 */ fsubs f0, f1, f0 /* 803B10C4 003AE024 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 803B10C8 003AE028 4E 80 00 20 */ blr +/* 803B10C8 003AE028 4E 80 00 20 */ blr diff --git a/asm/musyx/stream.s b/asm/musyx/stream.s index 4c937a56..f33e13e4 100644 --- a/asm/musyx/stream.s +++ b/asm/musyx/stream.s @@ -4,7 +4,7 @@ .global streamInfo streamInfo: .skip 0x1900 - + .section .sbss .balign 4 nextPublicID: @@ -17,15 +17,24 @@ streamCallCnt: .section .sdata2 .global lbl_805AF270 lbl_805AF270: - .incbin "baserom.dol", 0x3FBB10, 0x8 + # ROM: 0x3FBB10 + .4byte 0x3C010204 + .4byte 0 + .global lbl_805AF278 lbl_805AF278: - .incbin "baserom.dol", 0x3FBB18, 0x8 + # ROM: 0x3FBB18 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF280 lbl_805AF280: - .incbin "baserom.dol", 0x3FBB20, 0x8 + # ROM: 0x3FBB20 + .4byte 0x45800000 + .4byte 0 -.section .text, "ax" + +.section .text, "ax" .global streamInit streamInit: @@ -79,7 +88,7 @@ lbl_8039C908: lbl_8039C914: /* 8039C914 00399874 38 00 00 00 */ li r0, 0 /* 8039C918 00399878 90 0D AE 90 */ stw r0, nextPublicID@sda21(r13) -/* 8039C91C 0039987C 4E 80 00 20 */ blr +/* 8039C91C 0039987C 4E 80 00 20 */ blr .global SetHWMix SetHWMix: @@ -117,7 +126,7 @@ SetHWMix: /* 8039C99C 003998FC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039C9A0 00399900 7C 08 03 A6 */ mtlr r0 /* 8039C9A4 00399904 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039C9A8 00399908 4E 80 00 20 */ blr +/* 8039C9A8 00399908 4E 80 00 20 */ blr .global streamHandle streamHandle: @@ -299,7 +308,7 @@ lbl_8039CC2C: /* 8039CC44 00399BA4 38 A0 00 00 */ li r5, 0 /* 8039CC48 00399BA8 38 C0 00 00 */ li r6, 0 /* 8039CC4C 00399BAC 7D 89 03 A6 */ mtctr r12 -/* 8039CC50 00399BB0 4E 80 04 21 */ bctrl +/* 8039CC50 00399BB0 4E 80 04 21 */ bctrl /* 8039CC54 00399BB4 28 03 00 00 */ cmplwi r3, 0 /* 8039CC58 00399BB8 41 82 05 94 */ beq lbl_8039D1EC /* 8039CC5C 00399BBC 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -353,7 +362,7 @@ lbl_8039CCE0: /* 8039CD10 00399C70 54 1E 00 38 */ rlwinm r30, r0, 0, 0, 0x1c /* 8039CD14 00399C74 7C 68 F2 14 */ add r3, r8, r30 /* 8039CD18 00399C78 7D 89 03 A6 */ mtctr r12 -/* 8039CD1C 00399C7C 4E 80 04 21 */ bctrl +/* 8039CD1C 00399C7C 4E 80 04 21 */ bctrl /* 8039CD20 00399C80 28 03 00 00 */ cmplwi r3, 0 /* 8039CD24 00399C84 41 82 04 C8 */ beq lbl_8039D1EC /* 8039CD28 00399C88 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -418,7 +427,7 @@ lbl_8039CDE8: /* 8039CE04 00399D64 80 FC 00 50 */ lwz r7, 0x50(r28) /* 8039CE08 00399D68 38 C0 00 00 */ li r6, 0 /* 8039CE0C 00399D6C 7D 89 03 A6 */ mtctr r12 -/* 8039CE10 00399D70 4E 80 04 21 */ bctrl +/* 8039CE10 00399D70 4E 80 04 21 */ bctrl /* 8039CE14 00399D74 28 03 00 00 */ cmplwi r3, 0 /* 8039CE18 00399D78 41 82 03 D4 */ beq lbl_8039D1EC /* 8039CE1C 00399D7C 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -473,7 +482,7 @@ lbl_8039CEA0: /* 8039CED4 00399E34 54 1E 00 38 */ rlwinm r30, r0, 0, 0, 0x1c /* 8039CED8 00399E38 7C 68 F2 14 */ add r3, r8, r30 /* 8039CEDC 00399E3C 7D 89 03 A6 */ mtctr r12 -/* 8039CEE0 00399E40 4E 80 04 21 */ bctrl +/* 8039CEE0 00399E40 4E 80 04 21 */ bctrl /* 8039CEE4 00399E44 28 03 00 00 */ cmplwi r3, 0 /* 8039CEE8 00399E48 41 82 03 04 */ beq lbl_8039D1EC /* 8039CEEC 00399E4C 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -535,7 +544,7 @@ lbl_8039CFA4: /* 8039CFBC 00399F1C 7C 65 3A 14 */ add r3, r5, r7 /* 8039CFC0 00399F20 80 FC 00 50 */ lwz r7, 0x50(r28) /* 8039CFC4 00399F24 7D 89 03 A6 */ mtctr r12 -/* 8039CFC8 00399F28 4E 80 04 21 */ bctrl +/* 8039CFC8 00399F28 4E 80 04 21 */ bctrl /* 8039CFCC 00399F2C 28 03 00 00 */ cmplwi r3, 0 /* 8039CFD0 00399F30 41 82 02 1C */ beq lbl_8039D1EC /* 8039CFD4 00399F34 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -609,7 +618,7 @@ lbl_8039D0A4: /* 8039D0D4 0039A034 54 1B 00 38 */ rlwinm r27, r0, 0, 0, 0x1c /* 8039D0D8 0039A038 7C 65 DA 14 */ add r3, r5, r27 /* 8039D0DC 0039A03C 7D 89 03 A6 */ mtctr r12 -/* 8039D0E0 0039A040 4E 80 04 21 */ bctrl +/* 8039D0E0 0039A040 4E 80 04 21 */ bctrl /* 8039D0E4 0039A044 28 03 00 00 */ cmplwi r3, 0 /* 8039D0E8 0039A048 41 82 01 04 */ beq lbl_8039D1EC /* 8039D0EC 0039A04C 88 1C 00 0C */ lbz r0, 0xc(r28) @@ -709,11 +718,11 @@ lbl_8039D240: /* 8039D248 0039A1A8 80 01 00 74 */ lwz r0, 0x74(r1) /* 8039D24C 0039A1AC 7C 08 03 A6 */ mtlr r0 /* 8039D250 0039A1B0 38 21 00 70 */ addi r1, r1, 0x70 -/* 8039D254 0039A1B4 4E 80 00 20 */ blr +/* 8039D254 0039A1B4 4E 80 00 20 */ blr .global nullsub_60 nullsub_60: -/* 8039D258 0039A1B8 4E 80 00 20 */ blr +/* 8039D258 0039A1B8 4E 80 00 20 */ blr .global streamKill streamKill: @@ -746,13 +755,13 @@ lbl_8039D2A4: /* 8039D2BC 0039A21C 81 9F 00 10 */ lwz r12, 0x10(r31) /* 8039D2C0 0039A220 80 FF 00 50 */ lwz r7, 0x50(r31) /* 8039D2C4 0039A224 7D 89 03 A6 */ mtctr r12 -/* 8039D2C8 0039A228 4E 80 04 21 */ bctrl +/* 8039D2C8 0039A228 4E 80 04 21 */ bctrl lbl_8039D2CC: /* 8039D2CC 0039A22C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039D2D0 0039A230 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039D2D4 0039A234 7C 08 03 A6 */ mtlr r0 /* 8039D2D8 0039A238 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039D2DC 0039A23C 4E 80 00 20 */ blr +/* 8039D2DC 0039A23C 4E 80 00 20 */ blr .global GetPrivateIndex GetPrivateIndex: @@ -769,7 +778,7 @@ lbl_8039D2F4: /* 8039D304 0039A264 7C 03 00 40 */ cmplw r3, r0 /* 8039D308 0039A268 40 82 00 0C */ bne lbl_8039D314 /* 8039D30C 0039A26C 7C A3 2B 78 */ mr r3, r5 -/* 8039D310 0039A270 4E 80 00 20 */ blr +/* 8039D310 0039A270 4E 80 00 20 */ blr lbl_8039D314: /* 8039D314 0039A274 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D318 0039A278 38 A5 00 01 */ addi r5, r5, 1 @@ -780,7 +789,7 @@ lbl_8039D314: /* 8039D32C 0039A28C 7C 03 00 40 */ cmplw r3, r0 /* 8039D330 0039A290 40 82 00 0C */ bne lbl_8039D33C /* 8039D334 0039A294 7C A3 2B 78 */ mr r3, r5 -/* 8039D338 0039A298 4E 80 00 20 */ blr +/* 8039D338 0039A298 4E 80 00 20 */ blr lbl_8039D33C: /* 8039D33C 0039A29C 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D340 0039A2A0 38 A5 00 01 */ addi r5, r5, 1 @@ -791,7 +800,7 @@ lbl_8039D33C: /* 8039D354 0039A2B4 7C 03 00 40 */ cmplw r3, r0 /* 8039D358 0039A2B8 40 82 00 0C */ bne lbl_8039D364 /* 8039D35C 0039A2BC 7C A3 2B 78 */ mr r3, r5 -/* 8039D360 0039A2C0 4E 80 00 20 */ blr +/* 8039D360 0039A2C0 4E 80 00 20 */ blr lbl_8039D364: /* 8039D364 0039A2C4 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D368 0039A2C8 38 A5 00 01 */ addi r5, r5, 1 @@ -802,7 +811,7 @@ lbl_8039D364: /* 8039D37C 0039A2DC 7C 03 00 40 */ cmplw r3, r0 /* 8039D380 0039A2E0 40 82 00 0C */ bne lbl_8039D38C /* 8039D384 0039A2E4 7C A3 2B 78 */ mr r3, r5 -/* 8039D388 0039A2E8 4E 80 00 20 */ blr +/* 8039D388 0039A2E8 4E 80 00 20 */ blr lbl_8039D38C: /* 8039D38C 0039A2EC 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D390 0039A2F0 38 A5 00 01 */ addi r5, r5, 1 @@ -813,7 +822,7 @@ lbl_8039D38C: /* 8039D3A4 0039A304 7C 03 00 40 */ cmplw r3, r0 /* 8039D3A8 0039A308 40 82 00 0C */ bne lbl_8039D3B4 /* 8039D3AC 0039A30C 7C A3 2B 78 */ mr r3, r5 -/* 8039D3B0 0039A310 4E 80 00 20 */ blr +/* 8039D3B0 0039A310 4E 80 00 20 */ blr lbl_8039D3B4: /* 8039D3B4 0039A314 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D3B8 0039A318 38 A5 00 01 */ addi r5, r5, 1 @@ -824,7 +833,7 @@ lbl_8039D3B4: /* 8039D3CC 0039A32C 7C 03 00 40 */ cmplw r3, r0 /* 8039D3D0 0039A330 40 82 00 0C */ bne lbl_8039D3DC /* 8039D3D4 0039A334 7C A3 2B 78 */ mr r3, r5 -/* 8039D3D8 0039A338 4E 80 00 20 */ blr +/* 8039D3D8 0039A338 4E 80 00 20 */ blr lbl_8039D3DC: /* 8039D3DC 0039A33C 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D3E0 0039A340 38 A5 00 01 */ addi r5, r5, 1 @@ -835,7 +844,7 @@ lbl_8039D3DC: /* 8039D3F4 0039A354 7C 03 00 40 */ cmplw r3, r0 /* 8039D3F8 0039A358 40 82 00 0C */ bne lbl_8039D404 /* 8039D3FC 0039A35C 7C A3 2B 78 */ mr r3, r5 -/* 8039D400 0039A360 4E 80 00 20 */ blr +/* 8039D400 0039A360 4E 80 00 20 */ blr lbl_8039D404: /* 8039D404 0039A364 88 04 00 70 */ lbz r0, 0x70(r4) /* 8039D408 0039A368 38 A5 00 01 */ addi r5, r5, 1 @@ -846,13 +855,13 @@ lbl_8039D404: /* 8039D41C 0039A37C 7C 03 00 40 */ cmplw r3, r0 /* 8039D420 0039A380 40 82 00 0C */ bne lbl_8039D42C /* 8039D424 0039A384 7C A3 2B 78 */ mr r3, r5 -/* 8039D428 0039A388 4E 80 00 20 */ blr +/* 8039D428 0039A388 4E 80 00 20 */ blr lbl_8039D42C: /* 8039D42C 0039A38C 38 84 00 64 */ addi r4, r4, 0x64 /* 8039D430 0039A390 38 A5 00 01 */ addi r5, r5, 1 /* 8039D434 0039A394 42 00 FE C0 */ bdnz lbl_8039D2F4 /* 8039D438 0039A398 38 60 FF FF */ li r3, -1 -/* 8039D43C 0039A39C 4E 80 00 20 */ blr +/* 8039D43C 0039A39C 4E 80 00 20 */ blr .global sndStreamARAMUpdate sndStreamARAMUpdate: @@ -1056,7 +1065,7 @@ lbl_8039D708: /* 8039D714 0039A674 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039D718 0039A678 7C 08 03 A6 */ mtlr r0 /* 8039D71C 0039A67C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039D720 0039A680 4E 80 00 20 */ blr +/* 8039D720 0039A680 4E 80 00 20 */ blr .global CheckOutputMode CheckOutputMode: @@ -1067,13 +1076,13 @@ CheckOutputMode: /* 8039D734 0039A694 38 00 00 00 */ li r0, 0 /* 8039D738 0039A698 98 A3 00 00 */ stb r5, 0(r3) /* 8039D73C 0039A69C 98 04 00 00 */ stb r0, 0(r4) -/* 8039D740 0039A6A0 4E 80 00 20 */ blr +/* 8039D740 0039A6A0 4E 80 00 20 */ blr lbl_8039D744: /* 8039D744 0039A6A4 54 A0 07 BD */ rlwinm. r0, r5, 0, 0x1e, 0x1e -/* 8039D748 0039A6A8 4C 82 00 20 */ bnelr +/* 8039D748 0039A6A8 4C 82 00 20 */ bnelr /* 8039D74C 0039A6AC 38 00 00 00 */ li r0, 0 /* 8039D750 0039A6B0 98 04 00 00 */ stb r0, 0(r4) -/* 8039D754 0039A6B4 4E 80 00 20 */ blr +/* 8039D754 0039A6B4 4E 80 00 20 */ blr .global SetupVolumeAndPan SetupVolumeAndPan: @@ -1095,7 +1104,7 @@ lbl_8039D784: /* 8039D78C 0039A6EC 98 C3 00 5B */ stb r6, 0x5b(r3) /* 8039D790 0039A6F0 98 E3 00 5C */ stb r7, 0x5c(r3) /* 8039D794 0039A6F4 99 03 00 5D */ stb r8, 0x5d(r3) -/* 8039D798 0039A6F8 4E 80 00 20 */ blr +/* 8039D798 0039A6F8 4E 80 00 20 */ blr .global streamOutputModeChanged streamOutputModeChanged: @@ -1179,7 +1188,7 @@ lbl_8039D8A0: /* 8039D8BC 0039A81C 83 A1 00 24 */ lwz r29, 0x24(r1) /* 8039D8C0 0039A820 7C 08 03 A6 */ mtlr r0 /* 8039D8C4 0039A824 38 21 00 30 */ addi r1, r1, 0x30 -/* 8039D8C8 0039A828 4E 80 00 20 */ blr +/* 8039D8C8 0039A828 4E 80 00 20 */ blr .global sndStreamAllocEx sndStreamAllocEx: @@ -1483,7 +1492,7 @@ lbl_8039DD04: /* 8039DD14 0039AC74 80 01 00 54 */ lwz r0, 0x54(r1) /* 8039DD18 0039AC78 7C 08 03 A6 */ mtlr r0 /* 8039DD1C 0039AC7C 38 21 00 50 */ addi r1, r1, 0x50 -/* 8039DD20 0039AC80 4E 80 00 20 */ blr +/* 8039DD20 0039AC80 4E 80 00 20 */ blr .global sndStreamAllocStereo sndStreamAllocStereo: @@ -1679,7 +1688,7 @@ lbl_8039DFCC: /* 8039DFD4 0039AF34 80 01 00 74 */ lwz r0, 0x74(r1) /* 8039DFD8 0039AF38 7C 08 03 A6 */ mtlr r0 /* 8039DFDC 0039AF3C 38 21 00 70 */ addi r1, r1, 0x70 -/* 8039DFE0 0039AF40 4E 80 00 20 */ blr +/* 8039DFE0 0039AF40 4E 80 00 20 */ blr .global sndStreamAllocLength sndStreamAllocLength: @@ -1695,12 +1704,12 @@ sndStreamAllocLength: /* 8039E008 0039AF68 54 03 00 38 */ rlwinm r3, r0, 0, 0, 0x1c /* 8039E00C 0039AF6C 38 03 00 1F */ addi r0, r3, 0x1f /* 8039E010 0039AF70 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a -/* 8039E014 0039AF74 4E 80 00 20 */ blr +/* 8039E014 0039AF74 4E 80 00 20 */ blr lbl_8039E018: /* 8039E018 0039AF78 54 63 08 3C */ slwi r3, r3, 1 /* 8039E01C 0039AF7C 38 03 00 1F */ addi r0, r3, 0x1f /* 8039E020 0039AF80 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a -/* 8039E024 0039AF84 4E 80 00 20 */ blr +/* 8039E024 0039AF84 4E 80 00 20 */ blr .global sndStreamADPCMParameter sndStreamADPCMParameter: @@ -2184,7 +2193,7 @@ lbl_8039E708: /* 8039E714 0039B674 80 01 00 24 */ lwz r0, 0x24(r1) /* 8039E718 0039B678 7C 08 03 A6 */ mtlr r0 /* 8039E71C 0039B67C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039E720 0039B680 4E 80 00 20 */ blr +/* 8039E720 0039B680 4E 80 00 20 */ blr .global sndStreamMixParameter sndStreamMixParameter: @@ -2535,7 +2544,7 @@ lbl_8039EC14: /* 8039EC20 0039BB80 80 01 00 44 */ lwz r0, 0x44(r1) /* 8039EC24 0039BB84 7C 08 03 A6 */ mtlr r0 /* 8039EC28 0039BB88 38 21 00 40 */ addi r1, r1, 0x40 -/* 8039EC2C 0039BB8C 4E 80 00 20 */ blr +/* 8039EC2C 0039BB8C 4E 80 00 20 */ blr .global sndStreamMixParameterEx sndStreamMixParameterEx: @@ -2909,7 +2918,7 @@ lbl_8039F170: /* 8039F17C 0039C0DC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8039F180 0039C0E0 7C 08 03 A6 */ mtlr r0 /* 8039F184 0039C0E4 38 21 00 50 */ addi r1, r1, 0x50 -/* 8039F188 0039C0E8 4E 80 00 20 */ blr +/* 8039F188 0039C0E8 4E 80 00 20 */ blr .global sndStreamFrq sndStreamFrq: @@ -3360,7 +3369,7 @@ lbl_8039F7D8: /* 8039F7E4 0039C744 80 01 00 44 */ lwz r0, 0x44(r1) /* 8039F7E8 0039C748 7C 08 03 A6 */ mtlr r0 /* 8039F7EC 0039C74C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8039F7F0 0039C750 4E 80 00 20 */ blr +/* 8039F7F0 0039C750 4E 80 00 20 */ blr .global sndStreamFree sndStreamFree: @@ -3850,7 +3859,7 @@ lbl_8039FEAC: /* 8039FEB8 0039CE18 80 01 00 34 */ lwz r0, 0x34(r1) /* 8039FEBC 0039CE1C 7C 08 03 A6 */ mtlr r0 /* 8039FEC0 0039CE20 38 21 00 30 */ addi r1, r1, 0x30 -/* 8039FEC4 0039CE24 4E 80 00 20 */ blr +/* 8039FEC4 0039CE24 4E 80 00 20 */ blr .global sndStreamActivate sndStreamActivate: @@ -4307,7 +4316,7 @@ lbl_803A0500: /* 803A0510 0039D470 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A0514 0039D474 7C 08 03 A6 */ mtlr r0 /* 803A0518 0039D478 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A051C 0039D47C 4E 80 00 20 */ blr +/* 803A051C 0039D47C 4E 80 00 20 */ blr .global sndStreamDeactivate sndStreamDeactivate: @@ -4818,4 +4827,4 @@ lbl_803A0C14: /* 803A0C24 0039DB84 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A0C28 0039DB88 7C 08 03 A6 */ mtlr r0 /* 803A0C2C 0039DB8C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A0C30 0039DB90 4E 80 00 20 */ blr +/* 803A0C30 0039DB90 4E 80 00 20 */ blr diff --git a/asm/musyx/synth.s b/asm/musyx/synth.s index 6fac4c1a..57e38330 100644 --- a/asm/musyx/synth.s +++ b/asm/musyx/synth.s @@ -3,44 +3,73 @@ .section .sdata2 .global lbl_805AF230 lbl_805AF230: - .incbin "baserom.dol", 0x3FBAD0, 0x4 + # ROM: 0x3FBAD0 + .4byte 0x3C010204 + .global lbl_805AF234 lbl_805AF234: - .incbin "baserom.dol", 0x3FBAD4, 0x4 + # ROM: 0x3FBAD4 + .4byte 0x34010204 + .global lbl_805AF238 lbl_805AF238: - .incbin "baserom.dol", 0x3FBAD8, 0x4 + # ROM: 0x3FBAD8 + .4byte 0x39000000 + .global lbl_805AF23C lbl_805AF23C: - .incbin "baserom.dol", 0x3FBADC, 0x4 + # ROM: 0x3FBADC + .4byte 0x39800000 + .global lbl_805AF240 lbl_805AF240: - .incbin "baserom.dol", 0x3FBAE0, 0x4 + # ROM: 0x3FBAE0 + .4byte 0x3F800000 + .global lbl_805AF244 lbl_805AF244: - .incbin "baserom.dol", 0x3FBAE4, 0x4 + # ROM: 0x3FBAE4 + .4byte 0x32800200 + .global lbl_805AF248 lbl_805AF248: - .incbin "baserom.dol", 0x3FBAE8, 0x4 + # ROM: 0x3FBAE8 + .4byte 0x3E4CCCCD + .global lbl_805AF24C lbl_805AF24C: - .incbin "baserom.dol", 0x3FBAEC, 0x4 + # ROM: 0x3FBAEC + .4byte 0x38800200 + .global lbl_805AF250 lbl_805AF250: - .incbin "baserom.dol", 0x3FBAF0, 0x8 + # ROM: 0x3FBAF0 + .4byte 0x46FFFE00 + .4byte 0 + .global lbl_805AF258 lbl_805AF258: - .incbin "baserom.dol", 0x3FBAF8, 0x8 + # ROM: 0x3FBAF8 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF260 lbl_805AF260: - .incbin "baserom.dol", 0x3FBB00, 0x8 + # ROM: 0x3FBB00 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF268 lbl_805AF268: - .incbin "baserom.dol", 0x3FBB08, 0x4 + # ROM: 0x3FBB08 + .4byte 0 + .global lbl_805AF26C lbl_805AF26C: - .incbin "baserom.dol", 0x3FBB0C, 0x4 - + # ROM: 0x3FBB0C + .4byte 0x44A00000 + + .section .bss .global synthTicksPerSecond synthTicksPerSecond: @@ -81,7 +110,7 @@ inpAuxB: .global inpAuxA inpAuxA: .skip 0x484 - + .section .sbss .balign 4 .global sndActive @@ -123,8 +152,8 @@ synthIdleWaitActive: .global synthRealTime synthRealTime: .skip 0x8 - -.section .text, "ax" + +.section .text, "ax" .global synthSetBpm synthSetBpm: @@ -145,7 +174,7 @@ lbl_80398CB0: /* 80398CD4 00395C34 7C 63 22 14 */ add r3, r3, r4 /* 80398CD8 00395C38 54 C4 C9 FE */ srwi r4, r6, 7 /* 80398CDC 00395C3C 7C 83 01 2E */ stwx r4, r3, r0 -/* 80398CE0 00395C40 4E 80 00 20 */ blr +/* 80398CE0 00395C40 4E 80 00 20 */ blr .global synthGetTicksPerSecond synthGetTicksPerSecond: @@ -162,7 +191,7 @@ lbl_80398CF8: /* 80398D08 00395C68 54 00 10 3A */ slwi r0, r0, 2 /* 80398D0C 00395C6C 7C 63 22 14 */ add r3, r3, r4 /* 80398D10 00395C70 7C 63 00 2E */ lwzx r3, r3, r0 -/* 80398D14 00395C74 4E 80 00 20 */ blr +/* 80398D14 00395C74 4E 80 00 20 */ blr .global synthInitPortamento synthInitPortamento: @@ -175,7 +204,7 @@ synthInitPortamento: /* 80398D30 00395C90 7C 04 32 78 */ xor r4, r0, r6 /* 80398D34 00395C94 7C A0 32 78 */ xor r0, r5, r6 /* 80398D38 00395C98 7C 80 03 79 */ or. r0, r4, r0 -/* 80398D3C 00395C9C 4C 82 00 20 */ bnelr +/* 80398D3C 00395C9C 4C 82 00 20 */ bnelr /* 80398D40 00395CA0 88 03 01 31 */ lbz r0, 0x131(r3) /* 80398D44 00395CA4 28 00 00 01 */ cmplwi r0, 1 /* 80398D48 00395CA8 40 82 00 30 */ bne lbl_80398D78 @@ -198,7 +227,7 @@ lbl_80398D80: /* 80398D80 00395CE0 88 03 01 30 */ lbz r0, 0x130(r3) /* 80398D84 00395CE4 54 00 80 1E */ slwi r0, r0, 0x10 /* 80398D88 00395CE8 90 03 01 38 */ stw r0, 0x138(r3) -/* 80398D8C 00395CEC 4E 80 00 20 */ blr +/* 80398D8C 00395CEC 4E 80 00 20 */ blr .global do_voice_portamento do_voice_portamento: @@ -378,7 +407,7 @@ lbl_80399018: /* 80399020 00395F80 80 01 00 44 */ lwz r0, 0x44(r1) /* 80399024 00395F84 7C 08 03 A6 */ mtlr r0 /* 80399028 00395F88 38 21 00 40 */ addi r1, r1, 0x40 -/* 8039902C 00395F8C 4E 80 00 20 */ blr +/* 8039902C 00395F8C 4E 80 00 20 */ blr .global StartLayer StartLayer: @@ -646,7 +675,7 @@ lbl_803993D4: /* 803993E0 00396340 80 01 00 84 */ lwz r0, 0x84(r1) /* 803993E4 00396344 7C 08 03 A6 */ mtlr r0 /* 803993E8 00396348 38 21 00 80 */ addi r1, r1, 0x80 -/* 803993EC 0039634C 4E 80 00 20 */ blr +/* 803993EC 0039634C 4E 80 00 20 */ blr .global StartKeymap StartKeymap: @@ -815,7 +844,7 @@ lbl_80399634: /* 8039963C 0039659C 80 01 00 84 */ lwz r0, 0x84(r1) /* 80399640 003965A0 7C 08 03 A6 */ mtlr r0 /* 80399644 003965A4 38 21 00 80 */ addi r1, r1, 0x80 -/* 80399648 003965A8 4E 80 00 20 */ blr +/* 80399648 003965A8 4E 80 00 20 */ blr .global sub_8039964c sub_8039964c: @@ -1129,7 +1158,7 @@ lbl_80399A90: /* 80399A98 003969F8 80 01 00 84 */ lwz r0, 0x84(r1) /* 80399A9C 003969FC 7C 08 03 A6 */ mtlr r0 /* 80399AA0 00396A00 38 21 00 80 */ addi r1, r1, 0x80 -/* 80399AA4 00396A04 4E 80 00 20 */ blr +/* 80399AA4 00396A04 4E 80 00 20 */ blr .global LowPrecisionHandler LowPrecisionHandler: @@ -1636,7 +1665,7 @@ lbl_8039A1D4: /* 8039A1DC 0039713C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8039A1E0 00397140 7C 08 03 A6 */ mtlr r0 /* 8039A1E4 00397144 38 21 00 30 */ addi r1, r1, 0x30 -/* 8039A1E8 00397148 4E 80 00 20 */ blr +/* 8039A1E8 00397148 4E 80 00 20 */ blr .global sub_8039a1ec sub_8039a1ec: @@ -2111,7 +2140,7 @@ lbl_8039A8A8: /* 8039A8D8 00397838 83 81 00 50 */ lwz r28, 0x50(r1) /* 8039A8DC 0039783C 7C 08 03 A6 */ mtlr r0 /* 8039A8E0 00397840 38 21 00 A0 */ addi r1, r1, 0xa0 -/* 8039A8E4 00397844 4E 80 00 20 */ blr +/* 8039A8E4 00397844 4E 80 00 20 */ blr .global synthAddJob synthAddJob: @@ -2139,7 +2168,7 @@ lbl_8039A92C: /* 8039A934 00397894 28 00 00 FF */ cmplwi r0, 0xff /* 8039A938 00397898 41 82 00 50 */ beq lbl_8039A988 /* 8039A93C 0039789C 7C 00 40 40 */ cmplw r0, r8 -/* 8039A940 003978A0 4D 82 00 20 */ beqlr +/* 8039A940 003978A0 4D 82 00 20 */ beqlr /* 8039A944 003978A4 80 C3 00 00 */ lwz r6, 0(r3) /* 8039A948 003978A8 28 06 00 00 */ cmplwi r6, 0 /* 8039A94C 003978AC 41 82 00 0C */ beq lbl_8039A958 @@ -2168,7 +2197,7 @@ lbl_8039A990: /* 8039A998 003978F8 28 00 00 FF */ cmplwi r0, 0xff /* 8039A99C 003978FC 41 82 00 54 */ beq lbl_8039A9F0 /* 8039A9A0 00397900 7C 00 40 40 */ cmplw r0, r8 -/* 8039A9A4 00397904 4D 82 00 20 */ beqlr +/* 8039A9A4 00397904 4D 82 00 20 */ beqlr /* 8039A9A8 00397908 80 64 00 00 */ lwz r3, 0(r4) /* 8039A9AC 0039790C 28 03 00 00 */ cmplwi r3, 0 /* 8039A9B0 00397910 41 82 00 0C */ beq lbl_8039A9BC @@ -2196,7 +2225,7 @@ lbl_8039A9F8: /* 8039A9F8 00397958 38 83 00 18 */ addi r4, r3, 0x18 /* 8039A9FC 0039795C 88 03 00 21 */ lbz r0, 0x21(r3) /* 8039AA00 00397960 28 00 00 FF */ cmplwi r0, 0xff -/* 8039AA04 00397964 4C 82 00 20 */ bnelr +/* 8039AA04 00397964 4C 82 00 20 */ bnelr /* 8039AA08 00397968 38 E5 00 04 */ addi r7, r5, 4 lbl_8039AA0C: /* 8039AA0C 0039796C 99 04 00 09 */ stb r8, 9(r4) @@ -2210,7 +2239,7 @@ lbl_8039AA28: /* 8039AA28 00397988 38 00 00 00 */ li r0, 0 /* 8039AA2C 0039798C 90 04 00 04 */ stw r0, 4(r4) /* 8039AA30 00397990 90 87 00 00 */ stw r4, 0(r7) -/* 8039AA34 00397994 4E 80 00 20 */ blr +/* 8039AA34 00397994 4E 80 00 20 */ blr .global synthStartSynthJobHandling synthStartSynthJobHandling: @@ -2238,7 +2267,7 @@ synthStartSynthJobHandling: /* 8039AA8C 003979EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039AA90 003979F0 7C 08 03 A6 */ mtlr r0 /* 8039AA94 003979F4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039AA98 003979F8 4E 80 00 20 */ blr +/* 8039AA98 003979F8 4E 80 00 20 */ blr .global synthForceLowPrecisionUpdate synthForceLowPrecisionUpdate: @@ -2258,7 +2287,7 @@ synthForceLowPrecisionUpdate: /* 8039AAD0 00397A30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8039AAD4 00397A34 7C 08 03 A6 */ mtlr r0 /* 8039AAD8 00397A38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039AADC 00397A3C 4E 80 00 20 */ blr +/* 8039AADC 00397A3C 4E 80 00 20 */ blr .global sub_8039aae0 sub_8039aae0: @@ -2271,7 +2300,7 @@ sub_8039aae0: /* 8039AAF8 00397A58 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039AAFC 00397A5C 7C 08 03 A6 */ mtlr r0 /* 8039AB00 00397A60 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039AB04 00397A64 4E 80 00 20 */ blr +/* 8039AB04 00397A64 4E 80 00 20 */ blr .global synthHandle synthHandle: @@ -2576,7 +2605,7 @@ lbl_8039AF24: /* 8039AF54 00397EB4 80 BD 00 00 */ lwz r5, 0(r29) /* 8039AF58 00397EB8 38 60 00 01 */ li r3, 1 /* 8039AF5C 00397EBC 7D 89 03 A6 */ mtctr r12 -/* 8039AF60 00397EC0 4E 80 04 21 */ bctrl +/* 8039AF60 00397EC0 4E 80 04 21 */ bctrl lbl_8039AF64: /* 8039AF64 00397EC4 88 1F 00 00 */ lbz r0, 0(r31) /* 8039AF68 00397EC8 28 00 00 FF */ cmplwi r0, 0xff @@ -2599,7 +2628,7 @@ lbl_8039AF78: /* 8039AFA8 00397F08 80 B7 00 00 */ lwz r5, 0(r23) /* 8039AFAC 00397F0C 38 60 00 01 */ li r3, 1 /* 8039AFB0 00397F10 7D 89 03 A6 */ mtctr r12 -/* 8039AFB4 00397F14 4E 80 04 21 */ bctrl +/* 8039AFB4 00397F14 4E 80 04 21 */ bctrl lbl_8039AFB8: /* 8039AFB8 00397F18 3A 94 00 01 */ addi r20, r20, 1 /* 8039AFBC 00397F1C 3B 9C 00 01 */ addi r28, r28, 1 @@ -2626,7 +2655,7 @@ lbl_8039B000: /* 8039B008 00397F68 80 01 00 54 */ lwz r0, 0x54(r1) /* 8039B00C 00397F6C 7C 08 03 A6 */ mtlr r0 /* 8039B010 00397F70 38 21 00 50 */ addi r1, r1, 0x50 -/* 8039B014 00397F74 4E 80 00 20 */ blr +/* 8039B014 00397F74 4E 80 00 20 */ blr .global synthFXGetMaxVoices synthFXGetMaxVoices: @@ -2644,7 +2673,7 @@ lbl_8039B03C: /* 8039B03C 00397F9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039B040 00397FA0 7C 08 03 A6 */ mtlr r0 /* 8039B044 00397FA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039B048 00397FA8 4E 80 00 20 */ blr +/* 8039B048 00397FA8 4E 80 00 20 */ blr .global synthFXStart synthFXStart: @@ -2700,7 +2729,7 @@ lbl_8039B0F8: /* 8039B104 00398064 80 01 00 44 */ lwz r0, 0x44(r1) /* 8039B108 00398068 7C 08 03 A6 */ mtlr r0 /* 8039B10C 0039806C 38 21 00 40 */ addi r1, r1, 0x40 -/* 8039B110 00398070 4E 80 00 20 */ blr +/* 8039B110 00398070 4E 80 00 20 */ blr .global synthFXSetCtrl synthFXSetCtrl: @@ -2766,7 +2795,7 @@ lbl_8039B1D8: /* 8039B1E8 00398148 83 81 00 10 */ lwz r28, 0x10(r1) /* 8039B1EC 0039814C 7C 08 03 A6 */ mtlr r0 /* 8039B1F0 00398150 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039B1F4 00398154 4E 80 00 20 */ blr +/* 8039B1F4 00398154 4E 80 00 20 */ blr .global synthFXSetCtrl14 synthFXSetCtrl14: @@ -2832,7 +2861,7 @@ lbl_8039B2BC: /* 8039B2CC 0039822C 83 81 00 10 */ lwz r28, 0x10(r1) /* 8039B2D0 00398230 7C 08 03 A6 */ mtlr r0 /* 8039B2D4 00398234 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039B2D8 00398238 4E 80 00 20 */ blr +/* 8039B2D8 00398238 4E 80 00 20 */ blr .global synthFXCloneMidiSetup synthFXCloneMidiSetup: @@ -2868,7 +2897,7 @@ synthFXCloneMidiSetup: /* 8039B350 003982B0 83 C1 00 08 */ lwz r30, 8(r1) /* 8039B354 003982B4 7C 08 03 A6 */ mtlr r0 /* 8039B358 003982B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039B35C 003982BC 4E 80 00 20 */ blr +/* 8039B35C 003982BC 4E 80 00 20 */ blr .global synthSendKeyOff synthSendKeyOff: @@ -2909,7 +2938,7 @@ lbl_8039B3CC: /* 8039B3D8 00398338 83 C1 00 08 */ lwz r30, 8(r1) /* 8039B3DC 0039833C 7C 08 03 A6 */ mtlr r0 /* 8039B3E0 00398340 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039B3E4 00398344 4E 80 00 20 */ blr +/* 8039B3E4 00398344 4E 80 00 20 */ blr .global synthVolume synthVolume: @@ -3287,7 +3316,7 @@ lbl_8039B8F8: /* 8039B908 00398868 80 01 00 54 */ lwz r0, 0x54(r1) /* 8039B90C 0039886C 7C 08 03 A6 */ mtlr r0 /* 8039B910 00398870 38 21 00 50 */ addi r1, r1, 0x50 -/* 8039B914 00398874 4E 80 00 20 */ blr +/* 8039B914 00398874 4E 80 00 20 */ blr .global synthIsFadeOutActive synthIsFadeOutActive: @@ -3309,23 +3338,23 @@ synthIsFadeOutActive: /* 8039B954 003988B4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8039B958 003988B8 40 81 00 0C */ ble lbl_8039B964 /* 8039B95C 003988BC 38 60 00 01 */ li r3, 1 -/* 8039B960 003988C0 4E 80 00 20 */ blr +/* 8039B960 003988C0 4E 80 00 20 */ blr lbl_8039B964: /* 8039B964 003988C4 38 60 00 00 */ li r3, 0 -/* 8039B968 003988C8 4E 80 00 20 */ blr +/* 8039B968 003988C8 4E 80 00 20 */ blr .global synthSetMusicVolumeType synthSetMusicVolumeType: /* 8039B96C 003988CC 88 0D AE 48 */ lbz r0, sndActive@sda21(r13) /* 8039B970 003988D0 28 00 00 00 */ cmplwi r0, 0 -/* 8039B974 003988D4 4D 82 00 20 */ beqlr +/* 8039B974 003988D4 4D 82 00 20 */ beqlr /* 8039B978 003988D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8039B97C 003988DC 3C 60 80 55 */ lis r3, synthMasterFader@ha /* 8039B980 003988E0 1C 00 00 30 */ mulli r0, r0, 0x30 /* 8039B984 003988E4 38 63 02 64 */ addi r3, r3, synthMasterFader@l /* 8039B988 003988E8 7C 63 02 14 */ add r3, r3, r0 /* 8039B98C 003988EC 98 83 00 2D */ stb r4, 0x2d(r3) -/* 8039B990 003988F0 4E 80 00 20 */ blr +/* 8039B990 003988F0 4E 80 00 20 */ blr .global sub_8039b994 sub_8039b994: @@ -3386,7 +3415,7 @@ lbl_8039BA44: /* 8039BA54 003989B4 83 A1 00 14 */ lwz r29, 0x14(r1) /* 8039BA58 003989B8 7C 08 03 A6 */ mtlr r0 /* 8039BA5C 003989BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8039BA60 003989C0 4E 80 00 20 */ blr +/* 8039BA60 003989C0 4E 80 00 20 */ blr .global synthInit synthInit: @@ -3743,7 +3772,7 @@ lbl_8039BFA0: /* 8039BFC8 00398F28 80 01 00 54 */ lwz r0, 0x54(r1) /* 8039BFCC 00398F2C 7C 08 03 A6 */ mtlr r0 /* 8039BFD0 00398F30 38 21 00 50 */ addi r1, r1, 0x50 -/* 8039BFD4 00398F34 4E 80 00 20 */ blr +/* 8039BFD4 00398F34 4E 80 00 20 */ blr .global synthExit synthExit: @@ -3755,4 +3784,4 @@ synthExit: /* 8039BFEC 00398F4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8039BFF0 00398F50 7C 08 03 A6 */ mtlr r0 /* 8039BFF4 00398F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 8039BFF8 00398F58 4E 80 00 20 */ blr +/* 8039BFF8 00398F58 4E 80 00 20 */ blr diff --git a/asm/musyx/synth_ac.s b/asm/musyx/synth_ac.s index e9ae2fc6..a67b7fae 100644 --- a/asm/musyx/synth_ac.s +++ b/asm/musyx/synth_ac.s @@ -3,15 +3,24 @@ .section .sdata2 .global lbl_805AF2B0 lbl_805AF2B0: - .incbin "baserom.dol", 0x3FBB50, 0x8 + # ROM: 0x3FBB50 + .4byte 0x3F879C7D + .4byte 0 + .global lbl_805AF2B8 lbl_805AF2B8: - .incbin "baserom.dol", 0x3FBB58, 0x8 + # ROM: 0x3FBB58 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF2C0 lbl_805AF2C0: - .incbin "baserom.dol", 0x3FBB60, 0x8 - -.section .text, "ax" + # ROM: 0x3FBB60 + .4byte 0x45800000 + .4byte 0 + + +.section .text, "ax" .global sndPitchUpOne sndPitchUpOne: @@ -29,7 +38,7 @@ sndPitchUpOne: /* 803A911C 003A607C D8 01 00 10 */ stfd f0, 0x10(r1) /* 803A9120 003A6080 80 61 00 14 */ lwz r3, 0x14(r1) /* 803A9124 003A6084 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A9128 003A6088 4E 80 00 20 */ blr +/* 803A9128 003A6088 4E 80 00 20 */ blr .global sndGetPitch sndGetPitch: @@ -94,4 +103,4 @@ lbl_803A91D4: /* 803A9200 003A6160 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A9204 003A6164 7C 08 03 A6 */ mtlr r0 /* 803A9208 003A6168 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A920C 003A616C 4E 80 00 20 */ blr +/* 803A920C 003A616C 4E 80 00 20 */ blr diff --git a/asm/musyx/synth_adsr.s b/asm/musyx/synth_adsr.s index b8f856ce..34cd8cf8 100644 --- a/asm/musyx/synth_adsr.s +++ b/asm/musyx/synth_adsr.s @@ -3,25 +3,41 @@ .section .sdata2 .global lbl_805AF2C8 lbl_805AF2C8: - .incbin "baserom.dol", 0x3FBB68, 0x8 + # ROM: 0x3FBB68 + .4byte 0x40000000 + .4byte 0 + .global lbl_805AF2D0 lbl_805AF2D0: - .incbin "baserom.dol", 0x3FBB70, 0x4 + # ROM: 0x3FBB70 + .4byte 0x325A740E + .global lbl_805AF2D4 lbl_805AF2D4: - .incbin "baserom.dol", 0x3FBB74, 0x4 + # ROM: 0x3FBB74 + .4byte 0x447A0000 + .global lbl_805AF2D8 lbl_805AF2D8: - .incbin "baserom.dol", 0x3FBB78, 0x8 + # ROM: 0x3FBB78 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF2E0 lbl_805AF2E0: - .incbin "baserom.dol", 0x3FBB80, 0x8 + # ROM: 0x3FBB80 + .4byte 0x39A9C84A + .4byte 0 + .global lbl_805AF2E8 lbl_805AF2E8: - .incbin "baserom.dol", 0x3FBB88, 0x8 + # ROM: 0x3FBB88 + .4byte 0x43300000 + .4byte 0 -.section .text, "ax" + +.section .text, "ax" .global adsrConvertTimeCents adsrConvertTimeCents: @@ -46,7 +62,7 @@ adsrConvertTimeCents: /* 803A9258 003A61B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A925C 003A61BC 7C 08 03 A6 */ mtlr r0 /* 803A9260 003A61C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A9264 003A61C4 4E 80 00 20 */ blr +/* 803A9264 003A61C4 4E 80 00 20 */ blr .global salChangeADSRState salChangeADSRState: @@ -218,7 +234,7 @@ lbl_803A94C0: /* 803A94C8 003A6428 90 83 00 08 */ stw r4, 8(r3) lbl_803A94CC: /* 803A94CC 003A642C 7C 03 03 78 */ mr r3, r0 -/* 803A94D0 003A6430 4E 80 00 20 */ blr +/* 803A94D0 003A6430 4E 80 00 20 */ blr .global adsrSetup adsrSetup: @@ -231,7 +247,7 @@ adsrSetup: /* 803A94EC 003A644C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A94F0 003A6450 7C 08 03 A6 */ mtlr r0 /* 803A94F4 003A6454 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A94F8 003A6458 4E 80 00 20 */ blr +/* 803A94F8 003A6458 4E 80 00 20 */ blr .global adsrStartRelease adsrStartRelease: @@ -325,7 +341,7 @@ lbl_803A9638: /* 803A963C 003A659C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803A9640 003A65A0 7C 08 03 A6 */ mtlr r0 /* 803A9644 003A65A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A9648 003A65A8 4E 80 00 20 */ blr +/* 803A9648 003A65A8 4E 80 00 20 */ blr .global adsrRelease adsrRelease: @@ -427,7 +443,7 @@ lbl_803A97A0: /* 803A97A4 003A6704 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 803A97A8 003A6708 7C 08 03 A6 */ mtlr r0 /* 803A97AC 003A670C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A97B0 003A6710 4E 80 00 20 */ blr +/* 803A97B0 003A6710 4E 80 00 20 */ blr .global adsrHandle adsrHandle: @@ -543,7 +559,7 @@ lbl_803A9938: /* 803A993C 003A689C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A9940 003A68A0 7C 08 03 A6 */ mtlr r0 /* 803A9944 003A68A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A9948 003A68A8 4E 80 00 20 */ blr +/* 803A9948 003A68A8 4E 80 00 20 */ blr .global adsrHandleLowPrecision adsrHandleLowPrecision: @@ -583,4 +599,4 @@ lbl_803A99B0: /* 803A99C0 003A6920 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A99C4 003A6924 7C 08 03 A6 */ mtlr r0 /* 803A99C8 003A6928 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A99CC 003A692C 4E 80 00 20 */ blr +/* 803A99CC 003A692C 4E 80 00 20 */ blr diff --git a/asm/musyx/synthmacros.s b/asm/musyx/synthmacros.s index 8b978e9f..9197b176 100644 --- a/asm/musyx/synthmacros.s +++ b/asm/musyx/synthmacros.s @@ -4,7 +4,7 @@ .global "newsmp$473" "newsmp$473": .skip 0x20 - + .section .sbss "cstep$1643": .skip 0x8 @@ -20,26 +20,43 @@ DebugMacroSteps: .section .sdata2 .global lbl_805AF288 lbl_805AF288: - .incbin "baserom.dol", 0x3FBB28, 0x4 + # ROM: 0x3FBB28 + .4byte 0x45800000 + .global lbl_805AF28C lbl_805AF28C: - .incbin "baserom.dol", 0x3FBB2C, 0x4 + # ROM: 0x3FBB2C + .4byte 0x34000000 + .global lbl_805AF290 lbl_805AF290: - .incbin "baserom.dol", 0x3FBB30, 0x8 + # ROM: 0x3FBB30 + .4byte 0x3C000000 + .4byte 0 + .global lbl_805AF298 lbl_805AF298: - .incbin "baserom.dol", 0x3FBB38, 0x8 + # ROM: 0x3FBB38 + .4byte 0x43300000 + .4byte 0 + .global lbl_805AF2A0 lbl_805AF2A0: - .incbin "baserom.dol", 0x3FBB40, 0x8 + # ROM: 0x3FBB40 + .4byte 0x43300000 + .4byte 0x80000000 + .global lbl_805AF2A8 lbl_805AF2A8: - .incbin "baserom.dol", 0x3FBB48, 0x4 + # ROM: 0x3FBB48 + .4byte 0x447FC000 + .global lbl_805AF2AC lbl_805AF2AC: - .incbin "baserom.dol", 0x3FBB4C, 0x4 -.section .text, "ax" + # ROM: 0x3FBB4C + .4byte 0x3F800000 + +.section .text, "ax" .global mcmdWait mcmdWait: @@ -249,7 +266,7 @@ lbl_803A2C94: /* 803A2CA4 0039FC04 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A2CA8 0039FC08 7C 08 03 A6 */ mtlr r0 /* 803A2CAC 0039FC0C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A2CB0 0039FC10 4E 80 00 20 */ blr +/* 803A2CB0 0039FC10 4E 80 00 20 */ blr .global mcmdGosub mcmdGosub: @@ -307,7 +324,7 @@ lbl_803A2D6C: /* 803A2D74 0039FCD4 83 C1 00 08 */ lwz r30, 8(r1) /* 803A2D78 0039FCD8 7C 08 03 A6 */ mtlr r0 /* 803A2D7C 0039FCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A2D80 0039FCE0 4E 80 00 20 */ blr +/* 803A2D80 0039FCE0 4E 80 00 20 */ blr .global mcmdLoop mcmdLoop: @@ -403,7 +420,7 @@ lbl_803A2EC0: /* 803A2EC8 0039FE28 83 C1 00 08 */ lwz r30, 8(r1) /* 803A2ECC 0039FE2C 7C 08 03 A6 */ mtlr r0 /* 803A2ED0 0039FE30 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A2ED4 0039FE34 4E 80 00 20 */ blr +/* 803A2ED4 0039FE34 4E 80 00 20 */ blr .global sub_803a2ed8 sub_803a2ed8: @@ -511,7 +528,7 @@ lbl_803A3050: /* 803A3054 0039FFB4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 803A3058 0039FFB8 7C 08 03 A6 */ mtlr r0 /* 803A305C 0039FFBC 38 21 00 30 */ addi r1, r1, 0x30 -/* 803A3060 0039FFC0 4E 80 00 20 */ blr +/* 803A3060 0039FFC0 4E 80 00 20 */ blr .global mcmdAddKey mcmdAddKey: @@ -573,7 +590,7 @@ lbl_803A3110: /* 803A312C 003A008C 83 C1 00 08 */ lwz r30, 8(r1) /* 803A3130 003A0090 7C 08 03 A6 */ mtlr r0 /* 803A3134 003A0094 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A3138 003A0098 4E 80 00 20 */ blr +/* 803A3138 003A0098 4E 80 00 20 */ blr .global sub_803a313c sub_803a313c: @@ -712,7 +729,7 @@ lbl_803A331C: /* 803A3328 003A0288 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A332C 003A028C 7C 08 03 A6 */ mtlr r0 /* 803A3330 003A0290 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A3334 003A0294 4E 80 00 20 */ blr +/* 803A3334 003A0294 4E 80 00 20 */ blr .global mcmdVibrato mcmdVibrato: @@ -822,7 +839,7 @@ lbl_803A349C: /* 803A34A4 003A0404 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803A34A8 003A0408 7C 08 03 A6 */ mtlr r0 /* 803A34AC 003A040C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A34B0 003A0410 4E 80 00 20 */ blr +/* 803A34B0 003A0410 4E 80 00 20 */ blr .global DoSetPitch DoSetPitch: @@ -836,7 +853,7 @@ DoSetPitch: /* 803A34D0 003A0430 38 00 00 00 */ li r0, 0 /* 803A34D4 003A0434 B0 83 01 2C */ sth r4, 0x12c(r3) /* 803A34D8 003A0438 98 03 01 2E */ stb r0, 0x12e(r3) -/* 803A34DC 003A043C 4E 80 00 20 */ blr +/* 803A34DC 003A043C 4E 80 00 20 */ blr lbl_803A34E0: /* 803A34E0 003A0440 40 80 00 B0 */ bge lbl_803A3590 /* 803A34E4 003A0444 54 C4 60 26 */ slwi r4, r6, 0xc @@ -885,7 +902,7 @@ lbl_803A354C: /* 803A3580 003A04E0 7C 05 00 50 */ subf r0, r5, r0 /* 803A3584 003A04E4 7C 04 03 96 */ divwu r0, r4, r0 /* 803A3588 003A04E8 98 03 01 2E */ stb r0, 0x12e(r3) -/* 803A358C 003A04EC 4E 80 00 20 */ blr +/* 803A358C 003A04EC 4E 80 00 20 */ blr lbl_803A3590: /* 803A3590 003A04F0 54 E4 60 26 */ slwi r4, r7, 0xc /* 803A3594 003A04F4 38 00 00 0B */ li r0, 0xb @@ -925,7 +942,7 @@ lbl_803A35F8: /* 803A360C 003A056C 38 00 00 00 */ li r0, 0 /* 803A3610 003A0570 98 03 01 2E */ stb r0, 0x12e(r3) /* 803A3614 003A0574 B0 03 01 2C */ sth r0, 0x12c(r3) -/* 803A3618 003A0578 4E 80 00 20 */ blr +/* 803A3618 003A0578 4E 80 00 20 */ blr lbl_803A361C: /* 803A361C 003A057C 7C 04 00 50 */ subf r0, r4, r0 /* 803A3620 003A0580 3C 80 80 3F */ lis r4, lbl_803F2FD8@ha @@ -940,7 +957,7 @@ lbl_803A361C: /* 803A3644 003A05A4 7C 05 00 50 */ subf r0, r5, r0 /* 803A3648 003A05A8 7C 04 03 96 */ divwu r0, r4, r0 /* 803A364C 003A05AC 98 03 01 2E */ stb r0, 0x12e(r3) -/* 803A3650 003A05B0 4E 80 00 20 */ blr +/* 803A3650 003A05B0 4E 80 00 20 */ blr .global mcmdSetADSR mcmdSetADSR: @@ -1098,7 +1115,7 @@ lbl_803A3894: /* 803A389C 003A07FC 83 C1 00 48 */ lwz r30, 0x48(r1) /* 803A38A0 003A0800 7C 08 03 A6 */ mtlr r0 /* 803A38A4 003A0804 38 21 00 50 */ addi r1, r1, 0x50 -/* 803A38A8 003A0808 4E 80 00 20 */ blr +/* 803A38A8 003A0808 4E 80 00 20 */ blr .global mcmdSetADSRFromCtrl mcmdSetADSRFromCtrl: @@ -1176,7 +1193,7 @@ mcmdSetADSRFromCtrl: /* 803A39C8 003A0928 83 C1 00 28 */ lwz r30, 0x28(r1) /* 803A39CC 003A092C 7C 08 03 A6 */ mtlr r0 /* 803A39D0 003A0930 38 21 00 40 */ addi r1, r1, 0x40 -/* 803A39D4 003A0934 4E 80 00 20 */ blr +/* 803A39D4 003A0934 4E 80 00 20 */ blr .global mcmdSetPitchADSR mcmdSetPitchADSR: @@ -1344,7 +1361,7 @@ lbl_803A3C3C: /* 803A3C44 003A0BA4 80 01 00 54 */ lwz r0, 0x54(r1) /* 803A3C48 003A0BA8 7C 08 03 A6 */ mtlr r0 /* 803A3C4C 003A0BAC 38 21 00 50 */ addi r1, r1, 0x50 -/* 803A3C50 003A0BB0 4E 80 00 20 */ blr +/* 803A3C50 003A0BB0 4E 80 00 20 */ blr .global sub_803a3c54 sub_803a3c54: @@ -1388,7 +1405,7 @@ lbl_803A3CC8: /* 803A3CE0 003A0C40 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A3CE4 003A0C44 7C 08 03 A6 */ mtlr r0 /* 803A3CE8 003A0C48 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A3CEC 003A0C4C 4E 80 00 20 */ blr +/* 803A3CEC 003A0C4C 4E 80 00 20 */ blr .global mcmdSetPanning mcmdSetPanning: @@ -1432,7 +1449,7 @@ lbl_803A3D64: /* 803A3D7C 003A0CDC 83 A1 00 14 */ lwz r29, 0x14(r1) /* 803A3D80 003A0CE0 7C 08 03 A6 */ mtlr r0 /* 803A3D84 003A0CE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A3D88 003A0CE8 4E 80 00 20 */ blr +/* 803A3D88 003A0CE8 4E 80 00 20 */ blr .global mcmdScaleVolume mcmdScaleVolume: @@ -1517,7 +1534,7 @@ lbl_803A3E98: /* 803A3EB0 003A0E10 83 C1 00 08 */ lwz r30, 8(r1) /* 803A3EB4 003A0E14 7C 08 03 A6 */ mtlr r0 /* 803A3EB8 003A0E18 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A3EBC 003A0E1C 4E 80 00 20 */ blr +/* 803A3EBC 003A0E1C 4E 80 00 20 */ blr .global mcmdEnvelope mcmdEnvelope: @@ -1602,7 +1619,7 @@ lbl_803A3FAC: /* 803A3FE0 003A0F40 80 01 00 34 */ lwz r0, 0x34(r1) /* 803A3FE4 003A0F44 7C 08 03 A6 */ mtlr r0 /* 803A3FE8 003A0F48 38 21 00 30 */ addi r1, r1, 0x30 -/* 803A3FEC 003A0F4C 4E 80 00 20 */ blr +/* 803A3FEC 003A0F4C 4E 80 00 20 */ blr .global mcmdFadeIn mcmdFadeIn: @@ -1690,7 +1707,7 @@ lbl_803A40E0: /* 803A411C 003A107C 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A4120 003A1080 7C 08 03 A6 */ mtlr r0 /* 803A4124 003A1084 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A4128 003A1088 4E 80 00 20 */ blr +/* 803A4128 003A1088 4E 80 00 20 */ blr .global mcmdRandomKey mcmdRandomKey: @@ -1805,7 +1822,7 @@ lbl_803A429C: /* 803A42B8 003A1218 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A42BC 003A121C 7C 08 03 A6 */ mtlr r0 /* 803A42C0 003A1220 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A42C4 003A1224 4E 80 00 20 */ blr +/* 803A42C4 003A1224 4E 80 00 20 */ blr .global sub_803a42c8 sub_803a42c8: @@ -1877,7 +1894,7 @@ lbl_803A438C: /* 803A43BC 003A131C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A43C0 003A1320 7C 08 03 A6 */ mtlr r0 /* 803A43C4 003A1324 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A43C8 003A1328 4E 80 00 20 */ blr +/* 803A43C8 003A1328 4E 80 00 20 */ blr .global sub_803a43cc sub_803a43cc: @@ -1949,7 +1966,7 @@ lbl_803A4490: /* 803A44C0 003A1420 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A44C4 003A1424 7C 08 03 A6 */ mtlr r0 /* 803A44C8 003A1428 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A44CC 003A142C 4E 80 00 20 */ blr +/* 803A44CC 003A142C 4E 80 00 20 */ blr .global sub_803a44d0 sub_803a44d0: @@ -2021,7 +2038,7 @@ lbl_803A4594: /* 803A45C4 003A1524 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A45C8 003A1528 7C 08 03 A6 */ mtlr r0 /* 803A45CC 003A152C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A45D0 003A1530 4E 80 00 20 */ blr +/* 803A45D0 003A1530 4E 80 00 20 */ blr .global sub_803a45d4 sub_803a45d4: @@ -2093,7 +2110,7 @@ lbl_803A4698: /* 803A46C8 003A1628 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A46CC 003A162C 7C 08 03 A6 */ mtlr r0 /* 803A46D0 003A1630 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A46D4 003A1634 4E 80 00 20 */ blr +/* 803A46D4 003A1634 4E 80 00 20 */ blr .global sub_803a46d8 sub_803a46d8: @@ -2165,7 +2182,7 @@ lbl_803A479C: /* 803A47CC 003A172C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A47D0 003A1730 7C 08 03 A6 */ mtlr r0 /* 803A47D4 003A1734 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A47D8 003A1738 4E 80 00 20 */ blr +/* 803A47D8 003A1738 4E 80 00 20 */ blr .global sub_803a47dc sub_803a47dc: @@ -2237,7 +2254,7 @@ lbl_803A48A0: /* 803A48D0 003A1830 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A48D4 003A1834 7C 08 03 A6 */ mtlr r0 /* 803A48D8 003A1838 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A48DC 003A183C 4E 80 00 20 */ blr +/* 803A48DC 003A183C 4E 80 00 20 */ blr .global sub_803a48e0 sub_803a48e0: @@ -2309,7 +2326,7 @@ lbl_803A49A4: /* 803A49D4 003A1934 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A49D8 003A1938 7C 08 03 A6 */ mtlr r0 /* 803A49DC 003A193C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A49E0 003A1940 4E 80 00 20 */ blr +/* 803A49E0 003A1940 4E 80 00 20 */ blr .global sub_803a49e4 sub_803a49e4: @@ -2381,7 +2398,7 @@ lbl_803A4AA8: /* 803A4AD8 003A1A38 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4ADC 003A1A3C 7C 08 03 A6 */ mtlr r0 /* 803A4AE0 003A1A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4AE4 003A1A44 4E 80 00 20 */ blr +/* 803A4AE4 003A1A44 4E 80 00 20 */ blr .global sub_803a4ae8 sub_803a4ae8: @@ -2453,7 +2470,7 @@ lbl_803A4BAC: /* 803A4BDC 003A1B3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4BE0 003A1B40 7C 08 03 A6 */ mtlr r0 /* 803A4BE4 003A1B44 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4BE8 003A1B48 4E 80 00 20 */ blr +/* 803A4BE8 003A1B48 4E 80 00 20 */ blr .global mcmdVolumeSelect mcmdVolumeSelect: @@ -2525,7 +2542,7 @@ lbl_803A4CB0: /* 803A4CE0 003A1C40 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4CE4 003A1C44 7C 08 03 A6 */ mtlr r0 /* 803A4CE8 003A1C48 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4CEC 003A1C4C 4E 80 00 20 */ blr +/* 803A4CEC 003A1C4C 4E 80 00 20 */ blr .global sub_803a4cf0 sub_803a4cf0: @@ -2597,7 +2614,7 @@ lbl_803A4DB4: /* 803A4DE4 003A1D44 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4DE8 003A1D48 7C 08 03 A6 */ mtlr r0 /* 803A4DEC 003A1D4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4DF0 003A1D50 4E 80 00 20 */ blr +/* 803A4DF0 003A1D50 4E 80 00 20 */ blr .global sub_803a4df4 sub_803a4df4: @@ -2669,7 +2686,7 @@ lbl_803A4EB8: /* 803A4EE8 003A1E48 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4EEC 003A1E4C 7C 08 03 A6 */ mtlr r0 /* 803A4EF0 003A1E50 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4EF4 003A1E54 4E 80 00 20 */ blr +/* 803A4EF4 003A1E54 4E 80 00 20 */ blr .global sub_803a4ef8 sub_803a4ef8: @@ -2741,7 +2758,7 @@ lbl_803A4FBC: /* 803A4FEC 003A1F4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A4FF0 003A1F50 7C 08 03 A6 */ mtlr r0 /* 803A4FF4 003A1F54 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A4FF8 003A1F58 4E 80 00 20 */ blr +/* 803A4FF8 003A1F58 4E 80 00 20 */ blr .global sub_803a4ffc sub_803a4ffc: @@ -2845,7 +2862,7 @@ lbl_803A5158: /* 803A5168 003A20C8 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A516C 003A20CC 7C 08 03 A6 */ mtlr r0 /* 803A5170 003A20D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A5174 003A20D4 4E 80 00 20 */ blr +/* 803A5174 003A20D4 4E 80 00 20 */ blr .global mcmdAuxAFXSelect mcmdAuxAFXSelect: @@ -2949,7 +2966,7 @@ lbl_803A52D4: /* 803A52E4 003A2244 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A52E8 003A2248 7C 08 03 A6 */ mtlr r0 /* 803A52EC 003A224C 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A52F0 003A2250 4E 80 00 20 */ blr +/* 803A52F0 003A2250 4E 80 00 20 */ blr .global mcmdPortamento mcmdPortamento: @@ -3051,7 +3068,7 @@ lbl_803A5440: /* 803A5448 003A23A8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 803A544C 003A23AC 7C 08 03 A6 */ mtlr r0 /* 803A5450 003A23B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A5454 003A23B4 4E 80 00 20 */ blr +/* 803A5454 003A23B4 4E 80 00 20 */ blr .global varGet varGet: @@ -3083,7 +3100,7 @@ lbl_803A54AC: /* 803A54B0 003A2410 80 01 00 14 */ lwz r0, 0x14(r1) /* 803A54B4 003A2414 7C 08 03 A6 */ mtlr r0 /* 803A54B8 003A2418 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A54BC 003A241C 4E 80 00 20 */ blr +/* 803A54BC 003A241C 4E 80 00 20 */ blr .global mcmdVarCalculation mcmdVarCalculation: @@ -3246,7 +3263,7 @@ lbl_803A56C8: /* 803A56D0 003A2630 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A56D4 003A2634 7C 08 03 A6 */ mtlr r0 /* 803A56D8 003A2638 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A56DC 003A263C 4E 80 00 20 */ blr +/* 803A56DC 003A263C 4E 80 00 20 */ blr .global mcmdIfVarCompare mcmdIfVarCompare: @@ -3343,7 +3360,7 @@ lbl_803A5814: /* 803A581C 003A277C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A5820 003A2780 7C 08 03 A6 */ mtlr r0 /* 803A5824 003A2784 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A5828 003A2788 4E 80 00 20 */ blr +/* 803A5828 003A2788 4E 80 00 20 */ blr .global mcmdSendMessage mcmdSendMessage: @@ -3442,7 +3459,7 @@ lbl_803A5974: /* 803A5984 003A28E4 7F A4 EB 78 */ mr r4, r29 /* 803A5988 003A28E8 80 63 00 08 */ lwz r3, 8(r3) /* 803A598C 003A28EC 7D 89 03 A6 */ mtctr r12 -/* 803A5990 003A28F0 4E 80 04 21 */ bctrl +/* 803A5990 003A28F0 4E 80 04 21 */ bctrl /* 803A5994 003A28F4 48 00 00 BC */ b lbl_803A5A50 lbl_803A5998: /* 803A5998 003A28F8 54 C0 06 FE */ clrlwi r0, r6, 0x1b @@ -3501,7 +3518,7 @@ lbl_803A5A50: /* 803A5A60 003A29C0 83 81 00 10 */ lwz r28, 0x10(r1) /* 803A5A64 003A29C4 7C 08 03 A6 */ mtlr r0 /* 803A5A68 003A29C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A5A6C 003A29CC 4E 80 00 20 */ blr +/* 803A5A6C 003A29CC 4E 80 00 20 */ blr .global mcmdGetVID mcmdGetVID: @@ -3516,14 +3533,14 @@ mcmdGetVID: /* 803A5A90 003A29F0 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 803A5A94 003A29F4 7C 63 02 14 */ add r3, r3, r0 /* 803A5A98 003A29F8 90 83 00 AC */ stw r4, 0xac(r3) -/* 803A5A9C 003A29FC 4E 80 00 20 */ blr +/* 803A5A9C 003A29FC 4E 80 00 20 */ blr lbl_803A5AA0: /* 803A5AA0 003A2A00 3C 60 80 55 */ lis r3, synthGlobalVariable@ha /* 803A5AA4 003A2A04 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 803A5AA8 003A2A08 38 63 0A B4 */ addi r3, r3, synthGlobalVariable@l /* 803A5AAC 003A2A0C 7C 63 02 14 */ add r3, r3, r0 /* 803A5AB0 003A2A10 90 83 FF C0 */ stw r4, -0x40(r3) -/* 803A5AB4 003A2A14 4E 80 00 20 */ blr +/* 803A5AB4 003A2A14 4E 80 00 20 */ blr lbl_803A5AB8: /* 803A5AB8 003A2A18 54 80 C6 FE */ rlwinm r0, r4, 0x18, 0x1b, 0x1f /* 803A5ABC 003A2A1C 80 83 01 08 */ lwz r4, 0x108(r3) @@ -3532,14 +3549,14 @@ lbl_803A5AB8: /* 803A5AC8 003A2A28 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 803A5ACC 003A2A2C 7C 63 02 14 */ add r3, r3, r0 /* 803A5AD0 003A2A30 90 83 00 AC */ stw r4, 0xac(r3) -/* 803A5AD4 003A2A34 4E 80 00 20 */ blr +/* 803A5AD4 003A2A34 4E 80 00 20 */ blr lbl_803A5AD8: /* 803A5AD8 003A2A38 3C 60 80 55 */ lis r3, synthGlobalVariable@ha /* 803A5ADC 003A2A3C 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 803A5AE0 003A2A40 38 63 0A B4 */ addi r3, r3, synthGlobalVariable@l /* 803A5AE4 003A2A44 7C 63 02 14 */ add r3, r3, r0 /* 803A5AE8 003A2A48 90 83 FF C0 */ stw r4, -0x40(r3) -/* 803A5AEC 003A2A4C 4E 80 00 20 */ blr +/* 803A5AEC 003A2A4C 4E 80 00 20 */ blr .global mcmdSetKeyGroup mcmdSetKeyGroup: @@ -3602,7 +3619,7 @@ lbl_803A5BB4: /* 803A5BBC 003A2B1C 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A5BC0 003A2B20 7C 08 03 A6 */ mtlr r0 /* 803A5BC4 003A2B24 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A5BC8 003A2B28 4E 80 00 20 */ blr +/* 803A5BC8 003A2B28 4E 80 00 20 */ blr .global sub_803a5bcc sub_803a5bcc: @@ -3791,7 +3808,7 @@ lbl_803A5E38: /* 803A5E88 003A2DE8 38 63 32 58 */ addi r3, r3, lbl_803F3258@l /* 803A5E8C 003A2DEC 7C 03 00 2E */ lwzx r0, r3, r0 /* 803A5E90 003A2DF0 7C 09 03 A6 */ mtctr r0 -/* 803A5E94 003A2DF4 4E 80 04 20 */ bctr +/* 803A5E94 003A2DF4 4E 80 04 20 */ bctr /* 803A5E98 003A2DF8 7F E3 FB 78 */ mr r3, r31 /* 803A5E9C 003A2DFC 48 00 18 A5 */ bl vidRemoveVoiceReferences /* 803A5EA0 003A2E00 7F E3 FB 78 */ mr r3, r31 @@ -4629,7 +4646,7 @@ lbl_803A6B0C: /* 803A6B14 003A3A74 80 01 00 34 */ lwz r0, 0x34(r1) /* 803A6B18 003A3A78 7C 08 03 A6 */ mtlr r0 /* 803A6B1C 003A3A7C 38 21 00 30 */ addi r1, r1, 0x30 -/* 803A6B20 003A3A80 4E 80 00 20 */ blr +/* 803A6B20 003A3A80 4E 80 00 20 */ blr .global sub_803a6b24 sub_803a6b24: @@ -4724,7 +4741,7 @@ lbl_803A6C3C: /* 803A6C64 003A3BC4 80 01 00 24 */ lwz r0, 0x24(r1) /* 803A6C68 003A3BC8 7C 08 03 A6 */ mtlr r0 /* 803A6C6C 003A3BCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803A6C70 003A3BD0 4E 80 00 20 */ blr +/* 803A6C70 003A3BD0 4E 80 00 20 */ blr .global macSampleEndNotify macSampleEndNotify: @@ -4773,7 +4790,7 @@ lbl_803A6D0C: /* 803A6D10 003A3C70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A6D14 003A3C74 7C 08 03 A6 */ mtlr r0 /* 803A6D18 003A3C78 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A6D1C 003A3C7C 4E 80 00 20 */ blr +/* 803A6D1C 003A3C7C 4E 80 00 20 */ blr .global macSetExternalKeyoff macSetExternalKeyoff: @@ -4840,7 +4857,7 @@ lbl_803A6DFC: /* 803A6E00 003A3D60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A6E04 003A3D64 7C 08 03 A6 */ mtlr r0 /* 803A6E08 003A3D68 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A6E0C 003A3D6C 4E 80 00 20 */ blr +/* 803A6E0C 003A3D6C 4E 80 00 20 */ blr .global macSetPedalState macSetPedalState: @@ -4914,7 +4931,7 @@ lbl_803A6F04: /* 803A6F08 003A3E68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A6F0C 003A3E6C 7C 08 03 A6 */ mtlr r0 /* 803A6F10 003A3E70 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A6F14 003A3E74 4E 80 00 20 */ blr +/* 803A6F14 003A3E74 4E 80 00 20 */ blr .global TimeQueueAdd TimeQueueAdd: @@ -4945,13 +4962,13 @@ lbl_803A6F58: /* 803A6F6C 003A3ECC 38 00 00 00 */ li r0, 0 /* 803A6F70 003A3ED0 90 03 00 44 */ stw r0, 0x44(r3) /* 803A6F74 003A3ED4 90 03 00 48 */ stw r0, 0x48(r3) -/* 803A6F78 003A3ED8 4E 80 00 20 */ blr +/* 803A6F78 003A3ED8 4E 80 00 20 */ blr lbl_803A6F7C: /* 803A6F7C 003A3EDC 90 68 00 44 */ stw r3, 0x44(r8) /* 803A6F80 003A3EE0 38 00 00 00 */ li r0, 0 /* 803A6F84 003A3EE4 91 03 00 48 */ stw r8, 0x48(r3) /* 803A6F88 003A3EE8 90 03 00 44 */ stw r0, 0x44(r3) -/* 803A6F8C 003A3EEC 4E 80 00 20 */ blr +/* 803A6F8C 003A3EEC 4E 80 00 20 */ blr lbl_803A6F90: /* 803A6F90 003A3EF0 90 E3 00 44 */ stw r7, 0x44(r3) /* 803A6F94 003A3EF4 80 07 00 48 */ lwz r0, 0x48(r7) @@ -4965,7 +4982,7 @@ lbl_803A6FB0: /* 803A6FB0 003A3F10 90 6D AE F0 */ stw r3, macTimeQueueRoot@sda21(r13) lbl_803A6FB4: /* 803A6FB4 003A3F14 90 67 00 48 */ stw r3, 0x48(r7) -/* 803A6FB8 003A3F18 4E 80 00 20 */ blr +/* 803A6FB8 003A3F18 4E 80 00 20 */ blr .global macMakeActive macMakeActive: @@ -5040,13 +5057,13 @@ lbl_803A70B0: /* 803A70B4 003A4014 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803A70B8 003A4018 7C 08 03 A6 */ mtlr r0 /* 803A70BC 003A401C 38 21 00 10 */ addi r1, r1, 0x10 -/* 803A70C0 003A4020 4E 80 00 20 */ blr +/* 803A70C0 003A4020 4E 80 00 20 */ blr .global macMakeInactive macMakeInactive: /* 803A70C4 003A4024 80 03 00 4C */ lwz r0, 0x4c(r3) /* 803A70C8 003A4028 7C 00 20 00 */ cmpw r0, r4 -/* 803A70CC 003A402C 4D 82 00 20 */ beqlr +/* 803A70CC 003A402C 4D 82 00 20 */ beqlr /* 803A70D0 003A4030 2C 00 00 00 */ cmpwi r0, 0 /* 803A70D4 003A4034 40 82 00 38 */ bne lbl_803A710C /* 803A70D8 003A4038 80 A3 00 40 */ lwz r5, 0x40(r3) @@ -5113,7 +5130,7 @@ lbl_803A7178: /* 803A71B4 003A4114 90 03 01 14 */ stw r0, 0x114(r3) lbl_803A71B8: /* 803A71B8 003A4118 90 83 00 4C */ stw r4, 0x4c(r3) -/* 803A71BC 003A411C 4E 80 00 20 */ blr +/* 803A71BC 003A411C 4E 80 00 20 */ blr .global sub_803a71c0 sub_803a71c0: @@ -5408,7 +5425,7 @@ lbl_803A75E0: /* 803A75E8 003A4548 80 01 00 54 */ lwz r0, 0x54(r1) /* 803A75EC 003A454C 7C 08 03 A6 */ mtlr r0 /* 803A75F0 003A4550 38 21 00 50 */ addi r1, r1, 0x50 -/* 803A75F4 003A4554 4E 80 00 20 */ blr +/* 803A75F4 003A4554 4E 80 00 20 */ blr .global macInit macInit: @@ -5439,4 +5456,4 @@ lbl_803A7650: /* 803A7650 003A45B0 88 07 02 10 */ lbz r0, 0x210(r7) /* 803A7654 003A45B4 7C 0A 00 40 */ cmplw r10, r0 /* 803A7658 003A45B8 41 80 FF CC */ blt lbl_803A7624 -/* 803A765C 003A45BC 4E 80 00 20 */ blr +/* 803A765C 003A45BC 4E 80 00 20 */ blr