diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:56:10 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:56:10 -0400 |
| commit | 77c2afcaa9ac40ee8cfa546d5f297429f89f5c31 (patch) | |
| tree | 2933d3e3e89b952d0e6e2eb498b5872af7f0d2cb | |
| parent | 973fdffb2cc352799d15e537b3bd2fa8c12c701b (diff) | |
Match se_fuusen2.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_fuusen2.mid | bin | 0 -> 110 bytes | |||
| -rw-r--r-- | sound/songs/se_fuusen2.s | 52 |
4 files changed, 4 insertions, 53 deletions
diff --git a/ld_script.txt b/ld_script.txt index 74ab2a5e5..23f98c8a6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -639,7 +639,7 @@ SECTIONS { sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); sound/songs/midi/se_fuusen1.o(.rodata); - sound/songs/se_fuusen2.o(.rodata); + sound/songs/midi/se_fuusen2.o(.rodata); sound/songs/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); @@ -879,5 +879,8 @@ $(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_fuusen2.mid Binary files differnew file mode 100644 index 000000000..4efc1a525 --- /dev/null +++ b/sound/songs/midi/se_fuusen2.mid diff --git a/sound/songs/se_fuusen2.s b/sound/songs/se_fuusen2.s deleted file mode 100644 index 065b91adf..000000000 --- a/sound/songs/se_fuusen2.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen2_grp, voicegroup128 - .equ se_fuusen2_pri, 4 - .equ se_fuusen2_rev, reverb_set+50 - .equ se_fuusen2_mvl, 127 - .equ se_fuusen2_key, 0 - .equ se_fuusen2_tbs, 1 - .equ se_fuusen2_exg, 0 - .equ se_fuusen2_cmp, 1 - - .section .rodata - .global se_fuusen2 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen2_1: - .byte KEYSH , se_fuusen2_key+0 - .byte TEMPO , 240*se_fuusen2_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen2_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v127 - .byte W04 - .byte N01 , Gn4 , v112 - .byte W02 - .byte W02 - .byte Gs3 , v052 - .byte W04 - .byte VOICE , 23 - .byte N02 , Fn3 , v112 - .byte W04 - .byte N01 , Cn4 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen2_pri @ Priority - .byte se_fuusen2_rev @ Reverb. - - .word se_fuusen2_grp - - .word se_fuusen2_1 - - .end |