diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:20:07 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 2a7d758a171749590ae657e5d861b83fd55e46ab (patch) | |
| tree | ddee8353081e3c4f627fc870c66e0ef0ba9a2182 | |
| parent | 83cc45dec21d4fb172aca3dc37aeac3aae26fd25 (diff) | |
Match se_toy_c1.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_toy_c1.mid | bin | 0 -> 119 bytes | |||
| -rw-r--r-- | sound/songs/se_toy_c1.s | 59 |
4 files changed, 4 insertions, 60 deletions
diff --git a/ld_script.txt b/ld_script.txt index bf4bd00f1..d65c09d4c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -703,7 +703,7 @@ SECTIONS { sound/songs/se_toy_g.o(.rodata); sound/songs/midi/se_toy_a.o(.rodata); sound/songs/midi/se_toy_b.o(.rodata); - sound/songs/se_toy_c1.o(.rodata); + sound/songs/midi/se_toy_c1.o(.rodata); sound/songs/midi/se_mizu.o(.rodata); sound/songs/midi/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); @@ -1146,5 +1146,8 @@ $(MID_SUBDIR)/se_toy_b.s: %.s: %.mid $(MID_SUBDIR)/se_toy_c.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_toy_c1.mid Binary files differnew file mode 100644 index 000000000..345925255 --- /dev/null +++ b/sound/songs/midi/se_toy_c1.mid diff --git a/sound/songs/se_toy_c1.s b/sound/songs/se_toy_c1.s deleted file mode 100644 index 9a258f36d..000000000 --- a/sound/songs/se_toy_c1.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_c1_grp, voicegroup128 - .equ se_toy_c1_pri, 4 - .equ se_toy_c1_rev, reverb_set+50 - .equ se_toy_c1_mvl, 127 - .equ se_toy_c1_key, 0 - .equ se_toy_c1_tbs, 1 - .equ se_toy_c1_exg, 0 - .equ se_toy_c1_cmp, 1 - - .section .rodata - .global se_toy_c1 - .align 2 - -@********************** Track 1 **********************@ - -se_toy_c1_1: - .byte KEYSH , se_toy_c1_key+0 - .byte TEMPO , 150*se_toy_c1_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Cn6 , v112 - .byte W06 - .byte W06 - .byte N06 , Cn6 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_c1_2: - .byte KEYSH , se_toy_c1_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_c1_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , Gn6 , v060 - .byte W06 - .byte W06 - .byte N06 , Gn6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_c1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_c1_pri @ Priority - .byte se_toy_c1_rev @ Reverb. - - .word se_toy_c1_grp - - .word se_toy_c1_1 - .word se_toy_c1_2 - - .end |