diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:57:41 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:57:41 -0400 |
| commit | ad717c719fa29f43c75f389abcf79ec3f1921f27 (patch) | |
| tree | b88a64a35234c3d596c4b9e54669a107644eebf6 | |
| parent | 77c2afcaa9ac40ee8cfa546d5f297429f89f5c31 (diff) | |
Match se_fuusen3.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_fuusen3.mid | bin | 0 -> 142 bytes | |||
| -rw-r--r-- | sound/songs/se_fuusen3.s | 60 |
4 files changed, 4 insertions, 61 deletions
diff --git a/ld_script.txt b/ld_script.txt index 23f98c8a6..c2c122a1a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -640,7 +640,7 @@ SECTIONS { sound/songs/se_pinpon.o(.rodata); sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/midi/se_fuusen2.o(.rodata); - sound/songs/se_fuusen3.o(.rodata); + sound/songs/midi/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); @@ -882,5 +882,8 @@ $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_fuusen3.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_fuusen3.mid b/sound/songs/midi/se_fuusen3.mid Binary files differnew file mode 100644 index 000000000..ae40e0008 --- /dev/null +++ b/sound/songs/midi/se_fuusen3.mid diff --git a/sound/songs/se_fuusen3.s b/sound/songs/se_fuusen3.s deleted file mode 100644 index 0756c9618..000000000 --- a/sound/songs/se_fuusen3.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen3_grp, voicegroup128 - .equ se_fuusen3_pri, 4 - .equ se_fuusen3_rev, reverb_set+50 - .equ se_fuusen3_mvl, 127 - .equ se_fuusen3_key, 0 - .equ se_fuusen3_tbs, 1 - .equ se_fuusen3_exg, 0 - .equ se_fuusen3_cmp, 1 - - .section .rodata - .global se_fuusen3 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen3_1: - .byte KEYSH , se_fuusen3_key+0 - .byte TEMPO , 240*se_fuusen3_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen3_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Fn3 , v127 - .byte W02 - .byte N01 , Cn4 , v112 - .byte W02 - .byte N03 , Fn3 , v052 - .byte W02 - .byte W02 - .byte VOICE , 23 - .byte N01 , En4 , v092 - .byte W01 - .byte Cn5 - .byte W03 - .byte Gn3 - .byte W01 - .byte En4 - .byte W02 - .byte En3 , v048 - .byte W01 - .byte Bn3 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen3: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen3_pri @ Priority - .byte se_fuusen3_rev @ Reverb. - - .word se_fuusen3_grp - - .word se_fuusen3_1 - - .end |