summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_tk_warpout.midbin0 -> 136 bytes
-rw-r--r--sound/songs/se_tk_warpout.s60
4 files changed, 4 insertions, 61 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 0c77fa863..21eb77a98 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -680,7 +680,7 @@ SECTIONS {
sound/songs/midi/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/midi/se_tk_warpin.o(.rodata);
- sound/songs/se_tk_warpout.o(.rodata);
+ sound/songs/midi/se_tk_warpout.o(.rodata);
sound/songs/se_tu_saa.o(.rodata);
sound/songs/midi/se_hi_turun.o(.rodata);
sound/songs/se_track_move.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e5f6b45ea..e512d068e 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1128,5 +1128,8 @@ $(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid
$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
+$(MID_SUBDIR)/se_tk_warpout.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_warpout.mid b/sound/songs/midi/se_tk_warpout.mid
new file mode 100644
index 000000000..5072e6448
--- /dev/null
+++ b/sound/songs/midi/se_tk_warpout.mid
Binary files differ
diff --git a/sound/songs/se_tk_warpout.s b/sound/songs/se_tk_warpout.s
deleted file mode 100644
index 0a1a0e96b..000000000
--- a/sound/songs/se_tk_warpout.s
+++ /dev/null
@@ -1,60 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_tk_warpout_grp, voicegroup127
- .equ se_tk_warpout_pri, 4
- .equ se_tk_warpout_rev, reverb_set+50
- .equ se_tk_warpout_mvl, 127
- .equ se_tk_warpout_key, 0
- .equ se_tk_warpout_tbs, 1
- .equ se_tk_warpout_exg, 0
- .equ se_tk_warpout_cmp, 1
-
- .section .rodata
- .global se_tk_warpout
- .align 2
-
-@********************** Track 1 **********************@
-
-se_tk_warpout_1:
- .byte KEYSH , se_tk_warpout_key+0
- .byte TEMPO , 110*se_tk_warpout_tbs/2
- .byte VOICE , 93
- .byte XCMD , xIECV , 9
- .byte xIECL , 8
- .byte VOL , 90*se_tk_warpout_mvl/mxv
- .byte N06 , En5 , v064
- .byte W03
- .byte W03
- .byte N03 , En5 , v016
- .byte W03
- .byte N06 , En5 , v088
- .byte W03
- .byte W03
- .byte N03 , En5 , v016
- .byte W03
- .byte N06 , En5 , v112
- .byte W03
- .byte W03
- .byte N03 , En5 , v016
- .byte W03
- .byte N06 , En5 , v127
- .byte W03
- .byte W03
- .byte N03 , En5 , v016
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_tk_warpout:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_tk_warpout_pri @ Priority
- .byte se_tk_warpout_rev @ Reverb.
-
- .word se_tk_warpout_grp
-
- .word se_tk_warpout_1
-
- .end