diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-17 21:25:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-17 21:25:18 -0400 |
| commit | 75f1c808ccd173ca35c67b827e8d6c3825b526c2 (patch) | |
| tree | b6fc30ead285e73f9b8904e2560b996ce6132f82 | |
| parent | 758a46aa1ffc78baaf4e6822f44a2500f0161bc1 (diff) | |
| parent | a5349dd82286543971b710090acf8b521f633754 (diff) | |
Merge pull request #129 from Kermalis/music
Finish music dump
20 files changed, 7 insertions, 894 deletions
diff --git a/ld_script.txt b/ld_script.txt index 6ae4b85a6..551a63cef 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -768,7 +768,7 @@ SECTIONS { sound/songs/se_w287b.o(.rodata); sound/songs/se_w114.o(.rodata); sound/songs/se_w063b.o(.rodata); - sound/songs/mus_w_door.o(.rodata); + sound/songs/midi/mus_w_door.o(.rodata); sound/songs/se_card1.o(.rodata); sound/songs/se_card2.o(.rodata); sound/songs/se_card3.o(.rodata); @@ -784,9 +784,9 @@ SECTIONS { sound/songs/se_excellent.o(.rodata); sound/songs/se_nawamiss.o(.rodata); sound/songs/midi/mus_me_asa.o(.rodata); - sound/songs/mus_fanfa1.o(.rodata); - sound/songs/mus_fanfa4.o(.rodata); - sound/songs/mus_fanfa5.o(.rodata); + sound/songs/midi/mus_fanfa1.o(.rodata); + sound/songs/midi/mus_fanfa4.o(.rodata); + sound/songs/midi/mus_fanfa5.o(.rodata); sound/songs/midi/mus_me_bachi.o(.rodata); sound/songs/midi/mus_me_waza.o(.rodata); sound/songs/midi/mus_me_kinomi.o(.rodata); @@ -270,6 +270,9 @@ $(MID_SUBDIR)/mus_vs_tore.s: %.s: %.mid $(MID_SUBDIR)/mus_vs_yasei.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 +$(MID_SUBDIR)/mus_w_door.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 + $(MID_SUBDIR)/mus_win_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090 diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid Binary files differindex a7140d984..531b5fba1 100644 --- a/sound/songs/midi/mus_battle20.mid +++ b/sound/songs/midi/mus_battle20.mid diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_battle32.mid Binary files differindex a52fc6b37..0b7c49bd7 100644 --- a/sound/songs/midi/mus_battle32.mid +++ b/sound/songs/midi/mus_battle32.mid diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_fanfa1.mid Binary files differnew file mode 100644 index 000000000..edf9c6e28 --- /dev/null +++ b/sound/songs/midi/mus_fanfa1.mid diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_fanfa4.mid Binary files differnew file mode 100644 index 000000000..58cab9350 --- /dev/null +++ b/sound/songs/midi/mus_fanfa4.mid diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid Binary files differnew file mode 100644 index 000000000..519ebf29a --- /dev/null +++ b/sound/songs/midi/mus_fanfa5.mid diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_me_b_big.mid Binary files differindex 2028f0016..150a669b4 100644 --- a/sound/songs/midi/mus_me_b_big.mid +++ b/sound/songs/midi/mus_me_b_big.mid diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_me_b_small.mid Binary files differindex a51f48ed4..bf7aa33be 100644 --- a/sound/songs/midi/mus_me_b_small.mid +++ b/sound/songs/midi/mus_me_b_small.mid diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_me_bachi.mid Binary files differindex 27b97f09c..05fe1516a 100644 --- a/sound/songs/midi/mus_me_bachi.mid +++ b/sound/songs/midi/mus_me_bachi.mid diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid Binary files differindex 30fbd3607..e7eb4afd1 100644 --- a/sound/songs/midi/mus_me_kinomi.mid +++ b/sound/songs/midi/mus_me_kinomi.mid diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_me_shinka.mid Binary files differindex 81cd5d041..231f25533 100644 --- a/sound/songs/midi/mus_me_shinka.mid +++ b/sound/songs/midi/mus_me_shinka.mid diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_me_waza.mid Binary files differindex ac132f5ff..40f9c2ed8 100644 --- a/sound/songs/midi/mus_me_waza.mid +++ b/sound/songs/midi/mus_me_waza.mid diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_p_school.mid Binary files differindex 55651dea5..4e6fd3340 100644 --- a/sound/songs/midi/mus_p_school.mid +++ b/sound/songs/midi/mus_p_school.mid diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_shinka.mid Binary files differindex de8b2ab91..375e6d5db 100644 --- a/sound/songs/midi/mus_shinka.mid +++ b/sound/songs/midi/mus_shinka.mid diff --git a/sound/songs/midi/mus_w_door.mid b/sound/songs/midi/mus_w_door.mid Binary files differnew file mode 100644 index 000000000..82ffd2ebe --- /dev/null +++ b/sound/songs/midi/mus_w_door.mid diff --git a/sound/songs/mus_fanfa1.s b/sound/songs/mus_fanfa1.s deleted file mode 100644 index 5987024ad..000000000 --- a/sound/songs/mus_fanfa1.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_fanfa1_grp, voicegroup008 - .equ mus_fanfa1_pri, 5 - .equ mus_fanfa1_rev, reverb_set+50 - .equ mus_fanfa1_mvl, 90 - .equ mus_fanfa1_key, 0 - .equ mus_fanfa1_tbs, 1 - .equ mus_fanfa1_exg, 0 - .equ mus_fanfa1_cmp, 1 - - .section .rodata - .global mus_fanfa1 - .align 2 - -@********************** Track 1 **********************@ - -mus_fanfa1_1: - .byte KEYSH , mus_fanfa1_key+0 - .byte TEMPO , 174*mus_fanfa1_tbs/2 - .byte VOICE , 46 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*mus_fanfa1_mvl/mxv - .byte PAN , c_v+48 - .byte W08 - .byte N04 , Bn3 , v100 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N24 , Gs4 - .byte W10 - .byte MOD , 5 - .byte W06 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -mus_fanfa1_2: - .byte KEYSH , mus_fanfa1_key+0 - .byte VOICE , 46 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*mus_fanfa1_mvl/mxv - .byte W08 - .byte PAN , c_v-16 - .byte N04 , En4 , v100 - .byte W08 - .byte PAN , c_v+16 - .byte N04 - .byte W08 - .byte PAN , c_v-16 - .byte N04 - .byte W08 - .byte PAN , c_v+0 - .byte N24 , Bn4 - .byte W10 - .byte MOD , 5 - .byte W06 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -mus_fanfa1_3: - .byte KEYSH , mus_fanfa1_key+0 - .byte VOICE , 46 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*mus_fanfa1_mvl/mxv - .byte PAN , c_v-48 - .byte W08 - .byte N04 , Gs3 , v068 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N24 , En4 - .byte W10 - .byte MOD , 5 - .byte W06 - .byte W24 - .byte FINE - -@********************** Track 4 **********************@ - -mus_fanfa1_4: - .byte KEYSH , mus_fanfa1_key+0 - .byte VOICE , 84 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*mus_fanfa1_mvl/mxv - .byte W08 - .byte N04 , Bn3 , v048 - .byte W04 - .byte Bn3 , v020 - .byte W04 - .byte Bn3 , v048 - .byte W04 - .byte Bn3 , v020 - .byte W04 - .byte Bn3 , v048 - .byte W04 - .byte Bn3 , v020 - .byte W04 - .byte N24 , Gs4 , v048 - .byte W10 - .byte MOD , 5 - .byte W03 - .byte VOL , 101*mus_fanfa1_mvl/mxv - .byte W03 - .byte 68*mus_fanfa1_mvl/mxv - .byte W03 - .byte 36*mus_fanfa1_mvl/mxv - .byte W03 - .byte 15*mus_fanfa1_mvl/mxv - .byte W03 - .byte 0*mus_fanfa1_mvl/mxv - .byte W15 - .byte FINE - -@********************** Track 5 **********************@ - -mus_fanfa1_5: - .byte KEYSH , mus_fanfa1_key+0 - .byte VOICE , 85 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*mus_fanfa1_mvl/mxv - .byte W08 - .byte N04 , En4 , v048 - .byte W04 - .byte En4 , v020 - .byte W04 - .byte En4 , v048 - .byte W04 - .byte En4 , v020 - .byte W04 - .byte En4 , v048 - .byte W04 - .byte En4 , v020 - .byte W04 - .byte N24 , Bn4 , v048 - .byte W10 - .byte MOD , 5 - .byte W03 - .byte VOL , 101*mus_fanfa1_mvl/mxv - .byte W03 - .byte 68*mus_fanfa1_mvl/mxv - .byte W03 - .byte 36*mus_fanfa1_mvl/mxv - .byte W03 - .byte 15*mus_fanfa1_mvl/mxv - .byte W03 - .byte 0*mus_fanfa1_mvl/mxv - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -mus_fanfa1: - .byte 5 @ NumTrks - .byte 0 @ NumBlks - .byte mus_fanfa1_pri @ Priority - .byte mus_fanfa1_rev @ Reverb. - - .word mus_fanfa1_grp - - .word mus_fanfa1_1 - .word mus_fanfa1_2 - .word mus_fanfa1_3 - .word mus_fanfa1_4 - .word mus_fanfa1_5 - - .end diff --git a/sound/songs/mus_fanfa4.s b/sound/songs/mus_fanfa4.s deleted file mode 100644 index 58f52e0dd..000000000 --- a/sound/songs/mus_fanfa4.s +++ /dev/null @@ -1,283 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_fanfa4_grp, voicegroup008 - .equ mus_fanfa4_pri, 5 - .equ mus_fanfa4_rev, reverb_set+50 -.equ mus_fanfa4_mvl, 90 - .equ mus_fanfa4_key, 0 - .equ mus_fanfa4_tbs, 1 - .equ mus_fanfa4_exg, 0 - .equ mus_fanfa4_cmp, 1 - - .section .rodata - .global mus_fanfa4 - .align 2 - -@********************** Track 1 **********************@ - -mus_fanfa4_1: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte TEMPO , 190*mus_fanfa4_tbs/2 - .byte VOICE , 46 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte PAN , c_v-24 - .byte N16 , Gs4 , v080 - .byte W08 - .byte MOD , 5 - .byte W08 - .byte 0 - .byte W08 - .byte N06 , Ds4 - .byte W08 - .byte Gs4 - .byte W08 - .byte Ds4 - .byte W08 - .byte N08 , As4 - .byte W16 - .byte N08 - .byte W16 - .byte N08 - .byte W16 - .byte N48 , Gs4 - .byte W16 - .byte MOD , 5 - .byte W08 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte MOD , 0 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -mus_fanfa4_2: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte VOICE , 46 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte PAN , c_v+0 - .byte N16 , Cn5 , v104 - .byte W08 - .byte MOD , 5 - .byte W08 - .byte 0 - .byte W08 - .byte N06 - .byte W08 - .byte N06 - .byte W08 - .byte N06 - .byte W08 - .byte N08 , Cs5 - .byte W16 - .byte N08 - .byte W16 - .byte N08 - .byte W16 - .byte N48 , Cn5 - .byte W16 - .byte MOD , 5 - .byte W08 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte MOD , 0 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -mus_fanfa4_3: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte VOICE , 58 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte N16 , Gs1 , v120 - .byte W24 - .byte N06 - .byte W08 - .byte N06 - .byte W08 - .byte N06 - .byte W08 - .byte N08 , Fs1 - .byte W16 - .byte N08 - .byte W16 - .byte Gn1 - .byte W16 - .byte N48 , Gs1 - .byte W24 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte W24 - .byte FINE - -@********************** Track 4 **********************@ - -mus_fanfa4_4: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte VOICE , 82 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte PAN , c_v-48 - .byte N16 , Cn4 , v036 - .byte W08 - .byte MOD , 5 - .byte W08 - .byte 0 - .byte W08 - .byte N06 , Gs3 - .byte W08 - .byte Cn4 - .byte W08 - .byte Gs3 - .byte W08 - .byte N08 , As3 - .byte W16 - .byte N08 - .byte W16 - .byte N08 - .byte W16 - .byte N48 , Gs3 - .byte W16 - .byte MOD , 5 - .byte W08 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte MOD , 0 - .byte W24 - .byte FINE - -@********************** Track 5 **********************@ - -mus_fanfa4_5: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte VOICE , 83 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte PAN , c_v+48 - .byte N16 , Gs3 , v036 - .byte W08 - .byte MOD , 5 - .byte W08 - .byte 0 - .byte W08 - .byte N06 , Ds3 - .byte W08 - .byte Gs3 - .byte W08 - .byte Ds3 - .byte W08 - .byte N08 , Fs3 - .byte W16 - .byte N08 - .byte W16 - .byte N08 - .byte W16 - .byte N48 , Ds3 - .byte W16 - .byte MOD , 5 - .byte W08 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte MOD , 0 - .byte W24 - .byte FINE - -@********************** Track 6 **********************@ - -mus_fanfa4_6: - .byte KEYSH , mus_fanfa4_key+0 - .byte W12 - .byte VOICE , 46 - .byte PAN , c_v+24 - .byte VOL , 127*mus_fanfa4_mvl/mxv - .byte N16 , Ds4 , v080 - .byte W08 - .byte MOD , 5 - .byte W08 - .byte 0 - .byte W08 - .byte N06 , Cn4 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte N08 , Fs4 - .byte W16 - .byte N08 - .byte W16 - .byte N08 - .byte W16 - .byte N48 , Ds4 - .byte W16 - .byte MOD , 5 - .byte W08 - .byte VOL , 116*mus_fanfa4_mvl/mxv - .byte W05 - .byte 102*mus_fanfa4_mvl/mxv - .byte W07 - .byte 58*mus_fanfa4_mvl/mxv - .byte W05 - .byte 20*mus_fanfa4_mvl/mxv - .byte W07 - .byte MOD , 0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -mus_fanfa4: - .byte 6 @ NumTrks - .byte 0 @ NumBlks - .byte mus_fanfa4_pri @ Priority - .byte mus_fanfa4_rev @ Reverb. - - .word mus_fanfa4_grp - - .word mus_fanfa4_1 - .word mus_fanfa4_2 - .word mus_fanfa4_3 - .word mus_fanfa4_4 - .word mus_fanfa4_5 - .word mus_fanfa4_6 - - .end diff --git a/sound/songs/mus_fanfa5.s b/sound/songs/mus_fanfa5.s deleted file mode 100644 index 7ebd1e01d..000000000 --- a/sound/songs/mus_fanfa5.s +++ /dev/null @@ -1,350 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_fanfa5_grp, voicegroup008 - .equ mus_fanfa5_pri, 5 - .equ mus_fanfa5_rev, reverb_set+50 - .equ mus_fanfa5_mvl, 90 - .equ mus_fanfa5_key, 0 - .equ mus_fanfa5_tbs, 1 - .equ mus_fanfa5_exg, 0 - .equ mus_fanfa5_cmp, 1 - - .section .rodata - .global mus_fanfa5 - .align 2 - -@********************** Track 1 **********************@ - -mus_fanfa5_1: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte TEMPO , 150*mus_fanfa5_tbs/2 - .byte VOICE , 56 - .byte PAN , c_v+18 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N22 , Ds4 , v092 - .byte W16 - .byte VOL , 96*mus_fanfa5_mvl/mxv - .byte W04 - .byte 51*mus_fanfa5_mvl/mxv - .byte W04 - .byte 127*mus_fanfa5_mvl/mxv - .byte N22 , Cn4 - .byte W16 - .byte VOL , 96*mus_fanfa5_mvl/mxv - .byte W04 - .byte 51*mus_fanfa5_mvl/mxv - .byte W04 - .byte 127*mus_fanfa5_mvl/mxv - .byte N16 , Gs3 - .byte W16 - .byte N06 , Ds3 - .byte W08 - .byte Cn3 - .byte W08 - .byte Gs3 - .byte W08 - .byte Cn4 - .byte W08 - .byte N04 , Fs4 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte As4 - .byte W08 - .byte N48 , Gs4 - .byte W16 - .byte MOD , 6 - .byte W32 - .byte 0 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -mus_fanfa5_2: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 56 - .byte PAN , c_v-16 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N22 , Cn5 , v100 - .byte W16 - .byte VOL , 96*mus_fanfa5_mvl/mxv - .byte W04 - .byte 51*mus_fanfa5_mvl/mxv - .byte W04 - .byte 127*mus_fanfa5_mvl/mxv - .byte N22 , Gs4 - .byte W16 - .byte VOL , 96*mus_fanfa5_mvl/mxv - .byte W04 - .byte 51*mus_fanfa5_mvl/mxv - .byte W04 - .byte 127*mus_fanfa5_mvl/mxv - .byte N40 , Ds4 - .byte W12 - .byte MOD , 6 - .byte W28 - .byte VOL , 96*mus_fanfa5_mvl/mxv - .byte MOD , 0 - .byte W04 - .byte VOL , 51*mus_fanfa5_mvl/mxv - .byte W04 - .byte 127*mus_fanfa5_mvl/mxv - .byte N04 , Cs5 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte As4 - .byte W08 - .byte N04 - .byte W08 - .byte Cs5 - .byte W08 - .byte N48 , Cn5 - .byte W16 - .byte MOD , 6 - .byte W32 - .byte 0 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -mus_fanfa5_3: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 88 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N12 , Ds1 , v080 - .byte W24 - .byte N12 - .byte W24 - .byte N12 - .byte W24 - .byte N08 , Cn1 - .byte W08 - .byte Ds1 - .byte W08 - .byte Gs1 - .byte W08 - .byte N24 , As1 - .byte W24 - .byte Cs2 - .byte W24 - .byte N40 , Cn2 - .byte W48 - .byte W24 - .byte FINE - -@********************** Track 4 **********************@ - -mus_fanfa5_4: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 82 - .byte PAN , c_v-48 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N08 , Gs4 , v040 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N08 , Gs4 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte Gs3 - .byte W08 - .byte Cn4 - .byte W08 - .byte Gs3 - .byte W08 - .byte Ds3 - .byte W08 - .byte Cs3 - .byte W08 - .byte As2 - .byte W08 - .byte Fs2 - .byte W08 - .byte Cs2 - .byte W08 - .byte As2 - .byte W08 - .byte Cs3 - .byte W08 - .byte N48 , Ds3 - .byte W16 - .byte MOD , 6 - .byte W32 - .byte 0 - .byte W24 - .byte FINE - -@********************** Track 5 **********************@ - -mus_fanfa5_5: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 83 - .byte PAN , c_v+48 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte W04 - .byte N08 , Gs4 , v040 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W04 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte W04 - .byte N08 , Gs4 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte Ds4 - .byte W08 - .byte Cn4 - .byte W08 - .byte Gs3 - .byte W08 - .byte Cn4 - .byte W08 - .byte Gs3 - .byte W08 - .byte Ds3 - .byte W04 - .byte W04 - .byte Cs3 - .byte W08 - .byte As2 - .byte W08 - .byte Fs2 - .byte W08 - .byte Cs2 - .byte W08 - .byte As2 - .byte W08 - .byte Cs3 - .byte W08 - .byte N44 , Ds3 - .byte W12 - .byte MOD , 6 - .byte W32 - .byte 0 - .byte W24 - .byte FINE - -@********************** Track 6 **********************@ - -mus_fanfa5_6: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 47 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte W24 - .byte 127*mus_fanfa5_mvl/mxv - .byte W56 - .byte N08 , Cn2 , v127 - .byte W08 - .byte N08 - .byte W08 - .byte Fs2 - .byte W24 - .byte Cs2 - .byte W08 - .byte As1 , v112 - .byte W08 - .byte N08 - .byte W08 - .byte N12 , Cn2 , v127 - .byte W48 - .byte W24 - .byte FINE - -@********************** Track 7 **********************@ - -mus_fanfa5_7: - .byte KEYSH , mus_fanfa5_key+0 - .byte W12 - .byte VOICE , 0 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N04 , En1 , v112 - .byte N80 , An2 , v120 - .byte W24 - .byte VOL , 127*mus_fanfa5_mvl/mxv - .byte N04 , En1 , v112 - .byte W08 - .byte En1 , v092 - .byte W08 - .byte N04 - .byte W08 - .byte En1 , v112 - .byte W16 - .byte En1 , v092 - .byte W08 - .byte En1 , v112 - .byte W08 - .byte En1 , v092 - .byte W08 - .byte N04 - .byte W08 - .byte En1 , v112 - .byte W16 - .byte En1 , v092 - .byte W08 - .byte En1 , v112 - .byte W08 - .byte En1 , v092 - .byte W04 - .byte En1 , v112 - .byte W04 - .byte En1 , v092 - .byte W04 - .byte N04 - .byte W04 - .byte En1 , v112 - .byte W48 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -mus_fanfa5: - .byte 7 @ NumTrks - .byte 0 @ NumBlks - .byte mus_fanfa5_pri @ Priority - .byte mus_fanfa5_rev @ Reverb. - - .word mus_fanfa5_grp - - .word mus_fanfa5_1 - .word mus_fanfa5_2 - .word mus_fanfa5_3 - .word mus_fanfa5_4 - .word mus_fanfa5_5 - .word mus_fanfa5_6 - .word mus_fanfa5_7 - - .end diff --git a/sound/songs/mus_w_door.s b/sound/songs/mus_w_door.s deleted file mode 100644 index fc68d4e5b..000000000 --- a/sound/songs/mus_w_door.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - .section .rodata - .global mus_w_door - .align 2 - .equ mus_w_door_grp, voicegroup129 - .equ mus_w_door_pri, 5 - .equ mus_w_door_rev, reverb_set+50 - -mus_w_door_1: @ 86BC628 - .byte KEYSH, 0x00 - .byte TEMPO, 0x37 - .byte VOICE, 0x7F - .byte VOL, 0x64 - .byte N03 - .byte Fn2 - .byte v100 - .byte N03 - .byte As2 - .byte v127 - .byte W06 - .byte N08 - .byte Fs3 - .byte v096 - .byte W06 - .byte VOL, 0x58 - .byte W03 - .byte Fs2 - .byte W03 - .byte Gs3 - .byte W06 - .byte FINE - -mus_w_door_2: @ 86BC643 - .byte KEYSH, 0x00 - .byte VOICE, 0x5C - .byte BENDR, 0x0C - .byte VOL, 0x2B - .byte BEND, 0x40 - .byte W04 - .byte DnM1 - .byte N10 - .byte Bn5 - .byte v052 - .byte W02 - .byte BEND, 0x13 - .byte W01 - .byte Fn1 - .byte W01 - .byte Dn3 - .byte W01 - .byte Dn5 - .byte W01 - .byte Gs5 - .byte W01 - .byte An6 - .byte W01 - .byte VOL, 0x1D - .byte BEND, 0x75 - .byte W01 - .byte En8 - .byte W02 - .byte VOL, 0x12 - .byte BEND, 0x7F - .byte W09 - .byte FINE - -@ *************************************** - .align 2 -mus_w_door: @ 86BC670 - .byte 2 - .byte 0 - .byte mus_w_door_pri - .byte mus_w_door_rev - .word mus_w_door_grp - - .word mus_w_door_1 - .word mus_w_door_2 |