diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:17:00 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | bd100bcd9c153f46082afa5a5fb6b8b6066c963f (patch) | |
| tree | db072f9b4781b35db0af8f3c99511956945c2c55 | |
| parent | 2d7119355521d543c528bef70f9aec070c74f51b (diff) | |
Match se_toy_a.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_toy_a.mid | bin | 0 -> 119 bytes | |||
| -rw-r--r-- | sound/songs/se_toy_a.s | 59 |
4 files changed, 4 insertions, 60 deletions
diff --git a/ld_script.txt b/ld_script.txt index 827509a26..353c53939 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -701,7 +701,7 @@ SECTIONS { sound/songs/se_toy_e.o(.rodata); sound/songs/se_toy_f.o(.rodata); sound/songs/se_toy_g.o(.rodata); - sound/songs/se_toy_a.o(.rodata); + sound/songs/midi/se_toy_a.o(.rodata); sound/songs/se_toy_b.o(.rodata); sound/songs/se_toy_c1.o(.rodata); sound/songs/midi/se_mizu.o(.rodata); @@ -1137,5 +1137,8 @@ $(MID_SUBDIR)/se_toreeye.s: %.s: %.mid $(MID_SUBDIR)/se_toreoff.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5 +$(MID_SUBDIR)/se_toy_a.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_a.mid b/sound/songs/midi/se_toy_a.mid Binary files differnew file mode 100644 index 000000000..b6d5b6159 --- /dev/null +++ b/sound/songs/midi/se_toy_a.mid diff --git a/sound/songs/se_toy_a.s b/sound/songs/se_toy_a.s deleted file mode 100644 index ab772025d..000000000 --- a/sound/songs/se_toy_a.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_a_grp, voicegroup128 - .equ se_toy_a_pri, 4 - .equ se_toy_a_rev, reverb_set+50 - .equ se_toy_a_mvl, 127 - .equ se_toy_a_key, 0 - .equ se_toy_a_tbs, 1 - .equ se_toy_a_exg, 0 - .equ se_toy_a_cmp, 1 - - .section .rodata - .global se_toy_a - .align 2 - -@********************** Track 1 **********************@ - -se_toy_a_1: - .byte KEYSH , se_toy_a_key+0 - .byte TEMPO , 150*se_toy_a_tbs/2 - .byte VOICE , 48 - .byte VOL , 110*se_toy_a_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , An5 , v112 - .byte W06 - .byte W06 - .byte N06 , An5 , v040 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_toy_a_2: - .byte KEYSH , se_toy_a_key+0 - .byte VOICE , 17 - .byte VOL , 110*se_toy_a_mvl/mxv - .byte BEND , c_v-7 - .byte N12 , En6 , v060 - .byte W06 - .byte W06 - .byte N06 , En6 , v032 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_a: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_a_pri @ Priority - .byte se_toy_a_rev @ Reverb. - - .word se_toy_a_grp - - .word se_toy_a_1 - .word se_toy_a_2 - - .end |