diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:27:06 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 16fedb74b43242c4088ef9f528cda5b742efd9b9 (patch) | |
| tree | 5a6bf7a75a04a2fcc2c812096b817fbd9f1ed021 | |
| parent | 6b318791353bf73951a730a4ab5ff1ad72471ed7 (diff) | |
Match se_toy_kabe.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_toy_kabe.mid | bin | 0 -> 132 bytes | |||
| -rw-r--r-- | sound/songs/se_toy_kabe.s | 75 |
4 files changed, 4 insertions, 76 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7659f5704..bce10035e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -711,7 +711,7 @@ SECTIONS { sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/midi/se_fuusen2.o(.rodata); sound/songs/midi/se_fuusen3.o(.rodata); - sound/songs/se_toy_kabe.o(.rodata); + sound/songs/midi/se_toy_kabe.o(.rodata); sound/songs/midi/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); sound/songs/midi/se_esuka.o(.rodata); @@ -1164,5 +1164,8 @@ $(MID_SUBDIR)/se_toy_f.s: %.s: %.mid $(MID_SUBDIR)/se_toy_g.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_toy_kabe.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_kabe.mid b/sound/songs/midi/se_toy_kabe.mid Binary files differnew file mode 100644 index 000000000..c35be0c0d --- /dev/null +++ b/sound/songs/midi/se_toy_kabe.mid diff --git a/sound/songs/se_toy_kabe.s b/sound/songs/se_toy_kabe.s deleted file mode 100644 index bb51229d0..000000000 --- a/sound/songs/se_toy_kabe.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toy_kabe_grp, voicegroup128 - .equ se_toy_kabe_pri, 4 - .equ se_toy_kabe_rev, reverb_set+50 - .equ se_toy_kabe_mvl, 127 - .equ se_toy_kabe_key, 0 - .equ se_toy_kabe_tbs, 1 - .equ se_toy_kabe_exg, 0 - .equ se_toy_kabe_cmp, 1 - - .section .rodata - .global se_toy_kabe - .align 2 - -@********************** Track 1 **********************@ - -se_toy_kabe_1: - .byte KEYSH , se_toy_kabe_key+0 - .byte TEMPO , 240*se_toy_kabe_tbs/2 - .byte VOICE , 41 - .byte BENDR , 12 - .byte VOL , 110*se_toy_kabe_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Fs4 , v127 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte c_v-23 - .byte W01 - .byte W01 - .byte c_v+0 - .byte N10 , Cn4 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W02 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W01 - .byte W03 - .byte W01 - .byte 110*se_toy_kabe_mvl/mxv - .byte N10 , Cn4 , v040 - .byte W02 - .byte W03 - .byte W01 - .byte VOL , 96*se_toy_kabe_mvl/mxv - .byte W01 - .byte 82*se_toy_kabe_mvl/mxv - .byte W01 - .byte 45*se_toy_kabe_mvl/mxv - .byte W01 - .byte 20*se_toy_kabe_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_toy_kabe: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_toy_kabe_pri @ Priority - .byte se_toy_kabe_rev @ Reverb. - - .word se_toy_kabe_grp - - .word se_toy_kabe_1 - - .end |