From 60a7134710686515776e321e1d32ddf2dc97442a Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:09:21 -0500
Subject: [PATCH] Match se_t_ooame.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_ooame.mid | Bin 0 -> 118 bytes
 sound/songs/se_t_ooame.s        |  64 --------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_t_ooame.mid
 delete mode 100644 sound/songs/se_t_ooame.s

diff --git a/ld_script.txt b/ld_script.txt
index e7cc1e7cc..171aa9362 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -698,7 +698,7 @@ SECTIONS {
         sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/midi/se_t_ame_e.o(.rodata);
-        sound/songs/se_t_ooame.o(.rodata);
+        sound/songs/midi/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/midi/se_t_koame_e.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9e09ce176..4f9bb601f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1095,5 +1095,8 @@ $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_ooame.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.mid b/sound/songs/midi/se_t_ooame.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3aedd44044f8f1daeb75c5d95456bf39e40621b9
GIT binary patch
literal 118
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztGdGD&bS{10Si(F~XP&&C+70wiJ?{_8V9
z6<ISJP+{00!o$Gjz`!of@PNUAVS<ef^9FV;W_DX<b~k4BU}p9>X7(Ir_Il<98wQZ9
K3XtXj8UX-tAQ#F2

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ooame.s b/sound/songs/se_t_ooame.s
deleted file mode 100644
index 434f20779..000000000
--- a/sound/songs/se_t_ooame.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_grp, voicegroup128
-	.equ	se_t_ooame_pri, 2
-	.equ	se_t_ooame_rev, reverb_set+50
-	.equ	se_t_ooame_mvl, 127
-	.equ	se_t_ooame_key, 0
-	.equ	se_t_ooame_tbs, 1
-	.equ	se_t_ooame_exg, 0
-	.equ	se_t_ooame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_1:
-	.byte	KEYSH , se_t_ooame_key+0
-	.byte	TEMPO , 220*se_t_ooame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 18*se_t_ooame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 33*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        48*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        65*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        100*se_t_ooame_mvl/mxv
-	.byte	W03
-se_t_ooame_1_B1:
-	.byte		N36   , Cn3 , v060
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ooame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_pri	@ Priority
-	.byte	se_t_ooame_rev	@ Reverb.
-
-	.word	se_t_ooame_grp
-
-	.word	se_t_ooame_1
-
-	.end