diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_fu_zaku2.mid | bin | 0 -> 92 bytes | |||
| -rw-r--r-- | sound/songs/se_fu_zaku2.s | 48 |
4 files changed, 4 insertions, 49 deletions
diff --git a/ld_script.txt b/ld_script.txt index 66081961e..546d7cb2d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -602,7 +602,7 @@ SECTIONS { sound/songs/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); - sound/songs/se_fu_zaku2.o(.rodata); + sound/songs/midi/se_fu_zaku2.o(.rodata); sound/songs/se_fu_zuzuzu.o(.rodata); sound/songs/se_ru_gashin.o(.rodata); sound/songs/se_ru_gasyan.o(.rodata); @@ -870,5 +870,8 @@ $(MID_SUBDIR)/se_expmax.s: %.s: %.mid $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 +$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_fu_zaku2.mid Binary files differnew file mode 100644 index 000000000..3fc903844 --- /dev/null +++ b/sound/songs/midi/se_fu_zaku2.mid diff --git a/sound/songs/se_fu_zaku2.s b/sound/songs/se_fu_zaku2.s deleted file mode 100644 index 0ef523654..000000000 --- a/sound/songs/se_fu_zaku2.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fu_zaku2_grp, voicegroup127 - .equ se_fu_zaku2_pri, 4 - .equ se_fu_zaku2_rev, reverb_set+50 - .equ se_fu_zaku2_mvl, 127 - .equ se_fu_zaku2_key, 0 - .equ se_fu_zaku2_tbs, 1 - .equ se_fu_zaku2_exg, 0 - .equ se_fu_zaku2_cmp, 1 - - .section .rodata - .global se_fu_zaku2 - .align 2 - -@********************** Track 1 **********************@ - -se_fu_zaku2_1: - .byte KEYSH , se_fu_zaku2_key+0 - .byte TEMPO , 150*se_fu_zaku2_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_fu_zaku2_mvl/mxv - .byte N01 , An2 , v112 - .byte W01 - .byte En3 - .byte W01 - .byte Gn3 - .byte W01 - .byte W02 - .byte N02 , Cn3 , v092 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_fu_zaku2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fu_zaku2_pri @ Priority - .byte se_fu_zaku2_rev @ Reverb. - - .word se_fu_zaku2_grp - - .word se_fu_zaku2_1 - - .end |