From 27d46fa3a8542615de455bcc9068480ed1b5a44d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:10:25 -0500
Subject: [PATCH] Match se_t_ooame_e.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 171aa93621..635f09662b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -699,7 +699,7 @@ SECTIONS {
         sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/midi/se_t_ame_e.o(.rodata);
         sound/songs/midi/se_t_ooame.o(.rodata);
-        sound/songs/se_t_ooame_e.o(.rodata);
+        sound/songs/midi/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/midi/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4f9bb601f2..3520e5c052 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1098,5 +1098,8 @@ $(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
 
+$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_t_ooame_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b73010142d4436e23eba6296c95e6f006bd48e3f
GIT binary patch
literal 134
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?IL3S~H;!mvSv
zhk?t1fxVvL0fPg>1RERX4eV9S?B&et#mwwE%<SpR?6J)3{>%+F3=A9C-JmLLnc2;l
X*|nJ26`0w@nb`%H**U=~fQADA!xtEj

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s
deleted file mode 100644
index 329cd37025..0000000000
--- a/sound/songs/se_t_ooame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_e_grp, voicegroup128
-	.equ	se_t_ooame_e_pri, 2
-	.equ	se_t_ooame_e_rev, reverb_set+50
-	.equ	se_t_ooame_e_mvl, 127
-	.equ	se_t_ooame_e_key, 0
-	.equ	se_t_ooame_e_tbs, 1
-	.equ	se_t_ooame_e_exg, 0
-	.equ	se_t_ooame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_e_1:
-	.byte	KEYSH , se_t_ooame_e_key+0
-	.byte	TEMPO , 220*se_t_ooame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_t_ooame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 96*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        93*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        90*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        81*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        73*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        62*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 48*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        42*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        33*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        25*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        18*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        12*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        7*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_e_pri	@ Priority
-	.byte	se_t_ooame_e_rev	@ Reverb.
-
-	.word	se_t_ooame_e_grp
-
-	.word	se_t_ooame_e_1
-
-	.end