diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 14:57:35 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 14:57:35 -0500 |
| commit | e7464b39a37637acfdcf92f7b5ec1c8bad673ac7 (patch) | |
| tree | de4c019ba3b8440fcf09ae47418ce876c19f43fe | |
| parent | 6acf6aed0486d090bf4f8e731189b9d4ad07dadb (diff) | |
Match se_mizu.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_mizu.mid | bin | 0 -> 105 bytes | |||
| -rw-r--r-- | sound/songs/se_mizu.s | 54 |
4 files changed, 4 insertions, 55 deletions
diff --git a/ld_script.txt b/ld_script.txt index 486562547..de01ac9b4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -685,7 +685,7 @@ SECTIONS { sound/songs/se_toy_a.o(.rodata); sound/songs/se_toy_b.o(.rodata); sound/songs/se_toy_c1.o(.rodata); - sound/songs/se_mizu.o(.rodata); + sound/songs/midi/se_mizu.o(.rodata); sound/songs/midi/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); @@ -951,5 +951,8 @@ $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 +$(MID_SUBDIR)/se_mizu.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_mizu.mid Binary files differnew file mode 100644 index 000000000..dfdc85619 --- /dev/null +++ b/sound/songs/midi/se_mizu.mid diff --git a/sound/songs/se_mizu.s b/sound/songs/se_mizu.s deleted file mode 100644 index f1c0d5e86..000000000 --- a/sound/songs/se_mizu.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_mizu_grp, voicegroup128 - .equ se_mizu_pri, 4 - .equ se_mizu_rev, reverb_set+50 - .equ se_mizu_mvl, 127 - .equ se_mizu_key, 0 - .equ se_mizu_tbs, 1 - .equ se_mizu_exg, 0 - .equ se_mizu_cmp, 1 - - .section .rodata - .global se_mizu - .align 2 - -@********************** Track 1 **********************@ - -se_mizu_1: - .byte KEYSH , se_mizu_key+0 - .byte TEMPO , 150*se_mizu_tbs/2 - .byte VOICE , 23 - .byte VOL , 20*se_mizu_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v-25 - .byte N03 , Gs4 , v112 - .byte W01 - .byte BEND , c_v-9 - .byte W01 - .byte c_v+9 - .byte W04 - .byte W02 - .byte VOL , 17*se_mizu_mvl/mxv - .byte BEND , c_v+18 - .byte N02 , Gs4 , v127 - .byte W01 - .byte BEND , c_v+34 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_mizu: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_mizu_pri @ Priority - .byte se_mizu_rev @ Reverb. - - .word se_mizu_grp - - .word se_mizu_1 - - .end |