diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_tk_warpin.mid | bin | 0 -> 116 bytes | |||
| -rw-r--r-- | sound/songs/se_tk_warpin.s | 56 |
4 files changed, 4 insertions, 57 deletions
diff --git a/ld_script.txt b/ld_script.txt index 2b0a5ce24..0c77fa863 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -679,7 +679,7 @@ SECTIONS { sound/songs/midi/se_ru_bari.o(.rodata); sound/songs/midi/se_ru_hyuu.o(.rodata); sound/songs/midi/se_ki_gasyan.o(.rodata); - sound/songs/se_tk_warpin.o(.rodata); + sound/songs/midi/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); sound/songs/midi/se_hi_turun.o(.rodata); @@ -1125,5 +1125,8 @@ $(MID_SUBDIR)/se_tb_start.s: %.s: %.mid $(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_tk_warpin.mid Binary files differnew file mode 100644 index 000000000..e47d3df4d --- /dev/null +++ b/sound/songs/midi/se_tk_warpin.mid diff --git a/sound/songs/se_tk_warpin.s b/sound/songs/se_tk_warpin.s deleted file mode 100644 index b40985aa0..000000000 --- a/sound/songs/se_tk_warpin.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tk_warpin_grp, voicegroup127 - .equ se_tk_warpin_pri, 4 - .equ se_tk_warpin_rev, reverb_set+50 - .equ se_tk_warpin_mvl, 127 - .equ se_tk_warpin_key, 0 - .equ se_tk_warpin_tbs, 1 - .equ se_tk_warpin_exg, 0 - .equ se_tk_warpin_cmp, 1 - - .section .rodata - .global se_tk_warpin - .align 2 - -@********************** Track 1 **********************@ - -se_tk_warpin_1: - .byte KEYSH , se_tk_warpin_key+0 - .byte TEMPO , 110*se_tk_warpin_tbs/2 - .byte VOICE , 90 - .byte VOL , 90*se_tk_warpin_mvl/mxv - .byte N06 , En4 , v127 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v112 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v088 - .byte W03 - .byte W03 - .byte N03 , En4 , v016 - .byte W03 - .byte N06 , En4 , v064 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tk_warpin: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tk_warpin_pri @ Priority - .byte se_tk_warpin_rev @ Reverb. - - .word se_tk_warpin_grp - - .word se_tk_warpin_1 - - .end |