diff --git a/ld_script.txt b/ld_script.txt index 496abf74e..2b0a5ce24 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -670,7 +670,7 @@ SECTIONS { sound/songs/midi/se_exp.o(.rodata); sound/songs/midi/se_jite_pyoko.o(.rodata); sound/songs/midi/se_mu_pachi.o(.rodata); - sound/songs/se_tk_kasya.o(.rodata); + sound/songs/midi/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/midi/se_fu_zaku2.o(.rodata); sound/songs/midi/se_fu_zuzuzu.o(.rodata); diff --git a/songs.mk b/songs.mk index a9b52604e..fd5e1b375 100644 --- a/songs.mk +++ b/songs.mk @@ -1122,5 +1122,8 @@ $(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid $(MID_SUBDIR)/se_tb_start.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 +$(MID_SUBDIR)/se_tk_kasya.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_tk_kasya.mid b/sound/songs/midi/se_tk_kasya.mid new file mode 100644 index 000000000..baa73e0c6 Binary files /dev/null and b/sound/songs/midi/se_tk_kasya.mid differ diff --git a/sound/songs/se_tk_kasya.s b/sound/songs/se_tk_kasya.s deleted file mode 100644 index 9bd0c6c4c..000000000 --- a/sound/songs/se_tk_kasya.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_kasya_grp, voicegroup127 - .equ se_tk_kasya_pri, 4 - .equ se_tk_kasya_rev, reverb_set+50 - .equ se_tk_kasya_mvl, 127 - .equ se_tk_kasya_key, 0 - .equ se_tk_kasya_tbs, 1 - .equ se_tk_kasya_exg, 0 - .equ se_tk_kasya_cmp, 1 - - .section .rodata - .global se_tk_kasya - .align 2 - -@********************** Track 1 **********************@ - -se_tk_kasya_1: - .byte KEYSH , se_tk_kasya_key+0 - .byte TEMPO , 150*se_tk_kasya_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_tk_kasya_mvl/mxv - .byte N01 , Gs3 , v127 - .byte W01 - .byte Cn4 , v068 - .byte W02 - .byte W02 - .byte N03 , Gs4 , v127 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_kasya: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_kasya_pri @ Priority - .byte se_tk_kasya_rev @ Reverb. - - .word se_tk_kasya_grp - - .word se_tk_kasya_1 - - .end