From fc57e8dd52e25158561103f662a3178cf0df1dbb Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:07:28 -0500
Subject: [PATCH] Match se_t_koame_e.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_t_koame_e.mid | Bin 0 -> 134 bytes
 sound/songs/se_t_koame_e.s        |  74 ------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_t_koame_e.mid
 delete mode 100644 sound/songs/se_t_koame_e.s

diff --git a/ld_script.txt b/ld_script.txt
index 99347f7a8..e7cc1e7cc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -701,7 +701,7 @@ SECTIONS {
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
-        sound/songs/se_t_koame_e.o(.rodata);
+        sound/songs/midi/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
         sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 48b3401bd..9e09ce176 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1092,5 +1092,8 @@ $(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_t_koame_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4a04f73f9e7f4f07e6dda90ccba5c11e8d88f2de
GIT binary patch
literal 134
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?IL3S~H;!mvSv
zhk?t1fxVvL0fPg>1a}kW4eXW7>}AaC#mwwE%<O5*?6J)30n82V3=A9C-JmLLnc2;l
X*|nM36`0v2nAruG*}1?ffQADA#rGJj

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_koame_e.s b/sound/songs/se_t_koame_e.s
deleted file mode 100644
index 7570d98cd..000000000
--- a/sound/songs/se_t_koame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_koame_e_grp, voicegroup128
-	.equ	se_t_koame_e_pri, 2
-	.equ	se_t_koame_e_rev, reverb_set+50
-	.equ	se_t_koame_e_mvl, 127
-	.equ	se_t_koame_e_key, 0
-	.equ	se_t_koame_e_tbs, 1
-	.equ	se_t_koame_e_exg, 0
-	.equ	se_t_koame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_koame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_koame_e_1:
-	.byte	KEYSH , se_t_koame_e_key+0
-	.byte	TEMPO , 220*se_t_koame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 80*se_t_koame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Bn3 , v052
-	.byte	W03
-	.byte		VOL   , 76*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        72*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        64*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        58*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        50*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_koame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 38*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        34*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        27*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        20*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        15*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        10*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        6*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_koame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_koame_e_pri	@ Priority
-	.byte	se_t_koame_e_rev	@ Reverb.
-
-	.word	se_t_koame_e_grp
-
-	.word	se_t_koame_e_1
-
-	.end