diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-28 17:27:41 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-28 17:27:41 -0400 |
| commit | 6e1118c602184dc657ef69d868ba37333b5bd2e6 (patch) | |
| tree | 2fa2ecd52a4b8233058eee179d5476337a298cd0 | |
| parent | 32c0fbd35a7a37045ae1c37c863d0008c9dc68a7 (diff) | |
Match mus_me_asa.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/mus_me_asa.mid | bin | 0 -> 428 bytes | |||
| -rw-r--r-- | sound/songs/mus_me_asa.s | 150 |
4 files changed, 4 insertions, 151 deletions
diff --git a/ld_script.txt b/ld_script.txt index ff00818bf..7450ebee2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -851,7 +851,7 @@ SECTIONS { sound/songs/midi/mus_naminori.o(.rodata); sound/songs/midi/mus_dan01.o(.rodata); sound/songs/midi/mus_fanfa1.o(.rodata); - sound/songs/mus_me_asa.o(.rodata); + sound/songs/midi/mus_me_asa.o(.rodata); sound/songs/mus_me_bachi.o(.rodata); sound/songs/midi/mus_fanfa4.o(.rodata); sound/songs/midi/mus_fanfa5.o(.rodata); @@ -249,6 +249,9 @@ $(MID_SUBDIR)/mus_machi_s4.s: %.s: %.mid $(MID_SUBDIR)/mus_machupi.s: %.s: %.mid $(MID) $< $@ -G080 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid + $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_me_asa.mid b/sound/songs/midi/mus_me_asa.mid Binary files differnew file mode 100644 index 000000000..0606aafa6 --- /dev/null +++ b/sound/songs/midi/mus_me_asa.mid diff --git a/sound/songs/mus_me_asa.s b/sound/songs/mus_me_asa.s deleted file mode 100644 index 9db50e89a..000000000 --- a/sound/songs/mus_me_asa.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_me_asa_grp, voicegroup012 - .equ mus_me_asa_pri, 5 - .equ mus_me_asa_rev, reverb_set+50 - .equ mus_me_asa_mvl, 127 - .equ mus_me_asa_key, 0 - .equ mus_me_asa_tbs, 1 - .equ mus_me_asa_exg, 0 - .equ mus_me_asa_cmp, 1 - - .section .rodata - .global mus_me_asa - .align 2 - -@********************** Track 1 **********************@ - -mus_me_asa_1: - .byte KEYSH , mus_me_asa_key+0 - .byte TEMPO , 132*mus_me_asa_tbs/2 - .byte VOICE , 46 - .byte VOL , 90*mus_me_asa_mvl/mxv - .byte PAN , c_v+0 - .byte N12 , Bn4 , v112 - .byte W12 - .byte N06 , Bn4 , v052 - .byte W12 - .byte N12 , Bn4 , v112 - .byte W12 - .byte N06 , Bn4 , v052 - .byte W12 - .byte N12 , Bn4 , v112 - .byte W12 - .byte Gs4 - .byte W12 - .byte En5 - .byte W12 - .byte N06 , En5 , v052 - .byte W12 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -mus_me_asa_2: - .byte KEYSH , mus_me_asa_key+0 - .byte VOICE , 46 - .byte VOL , 90*mus_me_asa_mvl/mxv - .byte PAN , c_v+48 - .byte N06 , En4 , v080 - .byte W12 - .byte En4 , v020 - .byte W12 - .byte En4 , v080 - .byte W12 - .byte En4 , v020 - .byte W12 - .byte En4 , v080 - .byte W12 - .byte En4 , v020 - .byte W12 - .byte Bn4 , v080 - .byte W12 - .byte Bn4 , v020 - .byte W12 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -mus_me_asa_3: - .byte KEYSH , mus_me_asa_key+0 - .byte VOICE , 46 - .byte VOL , 90*mus_me_asa_mvl/mxv - .byte PAN , c_v-47 - .byte W12 - .byte N06 , Gs3 , v080 - .byte W12 - .byte Gs3 , v024 - .byte W12 - .byte Gs3 , v080 - .byte W12 - .byte Gs3 , v024 - .byte W12 - .byte Gs3 , v080 - .byte W12 - .byte En3 - .byte W12 - .byte En3 , v024 - .byte W12 - .byte W24 - .byte FINE - -@********************** Track 4 **********************@ - -mus_me_asa_4: - .byte VOL , 90*mus_me_asa_mvl/mxv - .byte KEYSH , mus_me_asa_key+0 - .byte VOICE , 100 - .byte PAN , c_v+0 - .byte W12 - .byte N03 , En5 , v080 - .byte W06 - .byte PAN , c_v-48 - .byte N03 , En5 , v024 - .byte W06 - .byte PAN , c_v+0 - .byte N03 , En5 , v080 - .byte W06 - .byte PAN , c_v+48 - .byte N03 , En5 , v024 - .byte W06 - .byte VOICE , 101 - .byte PAN , c_v+0 - .byte N03 , En4 , v080 - .byte W06 - .byte PAN , c_v-48 - .byte N03 , En4 , v024 - .byte W30 - .byte VOICE , 100 - .byte PAN , c_v+0 - .byte N03 , En5 , v080 - .byte W06 - .byte PAN , c_v+48 - .byte N03 , En5 , v024 - .byte W18 - .byte PAN , c_v+0 - .byte N03 , En5 , v072 - .byte W06 - .byte En5 , v028 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -mus_me_asa: - .byte 4 @ NumTrks - .byte 0 @ NumBlks - .byte mus_me_asa_pri @ Priority - .byte mus_me_asa_rev @ Reverb. - - .word mus_me_asa_grp - - .word mus_me_asa_1 - .word mus_me_asa_2 - .word mus_me_asa_3 - .word mus_me_asa_4 - - .end |