diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-26 18:41:29 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-26 18:41:29 -0400 |
| commit | f334a3c4da66c84d721c6d9994ae1a6d56edf805 (patch) | |
| tree | e00f7bb155d2069625a38fdde08d36cad75ea9fe | |
| parent | c744979fdd7d03172982b22cde4450f32f8aab43 (diff) | |
Match mus_fanfa1.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/mus_fanfa1.mid | bin | 0 -> 477 bytes | |||
| -rw-r--r-- | sound/songs/mus_fanfa1.s | 179 |
4 files changed, 4 insertions, 180 deletions
diff --git a/ld_script.txt b/ld_script.txt index 33d5e6d0b..7f5db384b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -850,7 +850,7 @@ SECTIONS { sound/songs/mus_gim.o(.rodata); sound/songs/midi/mus_naminori.o(.rodata); sound/songs/midi/mus_dan01.o(.rodata); - sound/songs/mus_fanfa1.o(.rodata); + sound/songs/midi/mus_fanfa1.o(.rodata); sound/songs/mus_me_asa.o(.rodata); sound/songs/mus_me_bachi.o(.rodata); sound/songs/mus_fanfa4.o(.rodata); @@ -147,6 +147,9 @@ $(MID_SUBDIR)/mus_end.s: %.s: %.mid $(MID_SUBDIR)/mus_event0.s: %.s: %.mid $(MID) $< $@ -G056 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid + $(MID) $< $@ -G012 -R$(STD_REVERB) -P5 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_fanfa1.mid Binary files differnew file mode 100644 index 000000000..d9d495b68 --- /dev/null +++ b/sound/songs/midi/mus_fanfa1.mid diff --git a/sound/songs/mus_fanfa1.s b/sound/songs/mus_fanfa1.s deleted file mode 100644 index 0010b4268..000000000 --- a/sound/songs/mus_fanfa1.s +++ /dev/null @@ -1,179 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_fanfa1_grp, voicegroup012 - .equ mus_fanfa1_pri, 5 - .equ mus_fanfa1_rev, reverb_set+50 - .equ mus_fanfa1_mvl, 127 - .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 , 90*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 W54 - .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 , 90*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 W54 - .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 , 90*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 W54 - .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 , 90*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 , 71*mus_fanfa1_mvl/mxv - .byte W03 - .byte 48*mus_fanfa1_mvl/mxv - .byte W03 - .byte 25*mus_fanfa1_mvl/mxv - .byte W03 - .byte 10*mus_fanfa1_mvl/mxv - .byte W03 - .byte 0*mus_fanfa1_mvl/mxv - .byte W36 - .byte W03 - .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 , 90*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 , 71*mus_fanfa1_mvl/mxv - .byte W03 - .byte 48*mus_fanfa1_mvl/mxv - .byte W03 - .byte 25*mus_fanfa1_mvl/mxv - .byte W03 - .byte 10*mus_fanfa1_mvl/mxv - .byte W03 - .byte 0*mus_fanfa1_mvl/mxv - .byte W36 - .byte W03 - .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 |