From dff22304c4bb7c9ebda05cf8e3037694b429bfa1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:09:36 -0400
Subject: [PATCH] Match se_tk_warpout.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_tk_warpout.mid | Bin 0 -> 136 bytes
 sound/songs/se_tk_warpout.s        |  60 -----------------------------
 4 files changed, 4 insertions(+), 61 deletions(-)
 create mode 100644 sound/songs/midi/se_tk_warpout.mid
 delete mode 100644 sound/songs/se_tk_warpout.s

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 0000000000000000000000000000000000000000..5072e64483c67de55d497e015322faccd4c2d40d
GIT binary patch
literal 136
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10U22wKPRU!MUg70z%VmSKY&
p2ZJmpgB&M=EC&O7J;Q_u2eyU?1|TiK451^?_yuVEdK5m;cmR1H9s>XX

literal 0
HcmV?d00001

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