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

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

diff --git a/ld_script.txt b/ld_script.txt
index e79826fab..f9d8210a6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -696,7 +696,7 @@ SECTIONS {
         sound/songs/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
-        sound/songs/se_t_ame.o(.rodata);
+        sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 126477b99..1f5087f9c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1077,5 +1077,8 @@ $(MID_SUBDIR)/se_select.s: %.s: %.mid
 $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_t_ame.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_ame.mid b/sound/songs/midi/se_t_ame.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9e15434cdeb4d849b3970212ed28824122c60b38
GIT binary patch
literal 118
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztGdGD&bS{10Si(F~XP&&C*S10-S@{_8V9
z6<ISJP+{00!o$Gjz`!oS@PNUAVS=*_^9FWpW_CMfb~k4BU}p9>X7(Ir_Il<9X9ke0
K4Upym8UX-%To@Su

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s
deleted file mode 100644
index 78db57968..000000000
--- a/sound/songs/se_t_ame.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ame_grp, voicegroup128
-	.equ	se_t_ame_pri, 2
-	.equ	se_t_ame_rev, reverb_set+50
-	.equ	se_t_ame_mvl, 127
-	.equ	se_t_ame_key, 0
-	.equ	se_t_ame_tbs, 1
-	.equ	se_t_ame_exg, 0
-	.equ	se_t_ame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ame_1:
-	.byte	KEYSH , se_t_ame_key+0
-	.byte	TEMPO , 220*se_t_ame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 15*se_t_ame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v060
-	.byte	W03
-	.byte		VOL   , 27*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        39*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        52*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        59*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        80*se_t_ame_mvl/mxv
-	.byte	W03
-se_t_ame_1_B1:
-	.byte		N60   , Gn3 , v060
-	.byte	W24
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ame_pri	@ Priority
-	.byte	se_t_ame_rev	@ Reverb.
-
-	.word	se_t_ame_grp
-
-	.word	se_t_ame_1
-
-	.end