diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:53:49 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:53:49 -0400 |
| commit | 973fdffb2cc352799d15e537b3bd2fa8c12c701b (patch) | |
| tree | 3eb2e0fdc7b1d25402cc9c4246f46ea0e678efc0 | |
| parent | 72366a320baf10820bb501733ce064a4d1a331d1 (diff) | |
Match se_fuusen1.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_fuusen1.mid | bin | 0 -> 118 bytes | |||
| -rw-r--r-- | sound/songs/se_fuusen1.s | 53 |
4 files changed, 4 insertions, 54 deletions
diff --git a/ld_script.txt b/ld_script.txt index a28b20104..74ab2a5e5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -638,7 +638,7 @@ SECTIONS { sound/songs/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); - sound/songs/se_fuusen1.o(.rodata); + sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/se_fuusen2.o(.rodata); sound/songs/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); @@ -876,5 +876,8 @@ $(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid $(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 +$(MID_SUBDIR)/se_fuusen1.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_fuusen1.mid b/sound/songs/midi/se_fuusen1.mid Binary files differnew file mode 100644 index 000000000..d22679a86 --- /dev/null +++ b/sound/songs/midi/se_fuusen1.mid diff --git a/sound/songs/se_fuusen1.s b/sound/songs/se_fuusen1.s deleted file mode 100644 index 458b010c6..000000000 --- a/sound/songs/se_fuusen1.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen1_grp, voicegroup128 - .equ se_fuusen1_pri, 4 - .equ se_fuusen1_rev, reverb_set+50 - .equ se_fuusen1_mvl, 127 - .equ se_fuusen1_key, 0 - .equ se_fuusen1_tbs, 1 - .equ se_fuusen1_exg, 0 - .equ se_fuusen1_cmp, 1 - - .section .rodata - .global se_fuusen1 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen1_1: - .byte KEYSH , se_fuusen1_key+0 - .byte TEMPO , 240*se_fuusen1_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen1_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn4 , v127 - .byte W06 - .byte VOICE , 23 - .byte N02 , Cn3 , v112 - .byte W07 - .byte N01 , Cn4 - .byte W05 - .byte Cn3 , v100 - .byte W02 - .byte Gn3 , v092 - .byte W02 - .byte Cn3 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen1: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen1_pri @ Priority - .byte se_fuusen1_rev @ Reverb. - - .word se_fuusen1_grp - - .word se_fuusen1_1 - - .end |