From 599d80b937f19e750b896df345f792d19db71ed2 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:32:04 -0400
Subject: [PATCH] Match se_esuka.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_esuka.mid | Bin 0 -> 174 bytes
 sound/songs/se_esuka.s        |  93 ----------------------------------
 4 files changed, 4 insertions(+), 94 deletions(-)
 create mode 100644 sound/songs/midi/se_esuka.mid
 delete mode 100644 sound/songs/se_esuka.s

diff --git a/ld_script.txt b/ld_script.txt
index cb244a70e..dea61f820 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -644,7 +644,7 @@ SECTIONS {
         sound/songs/se_toy_kabe.o(.rodata);
         sound/songs/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
-        sound/songs/se_esuka.o(.rodata);
+        sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/se_t_ame.o(.rodata);
         sound/songs/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c7af5bc13..8cee992ec 100644
--- a/songs.mk
+++ b/songs.mk
@@ -858,5 +858,8 @@ $(MID_SUBDIR)/se_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_elebeta.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
+$(MID_SUBDIR)/se_esuka.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_esuka.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6a9e22a5b71724c80759157a0966bbfaa9f2784d
GIT binary patch
literal 174
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILs%1E!#;`$z
ziGkgb;Q@mJ!-R+c#s>^)j2qZJfV4J{_Gfy)U<jlmfP70JodBdAm^QHIFtL|1vDXK)
xS242}FteuvwOcc9V2=aR7C>o#AZ-Gq?SZs5P}~Ses{#26Kw5#hA%X$q2mmdrD4qZS

literal 0
HcmV?d00001

diff --git a/sound/songs/se_esuka.s b/sound/songs/se_esuka.s
deleted file mode 100644
index 88e88fcd3..000000000
--- a/sound/songs/se_esuka.s
+++ /dev/null
@@ -1,93 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_esuka_grp, voicegroup128
-	.equ	se_esuka_pri, 4
-	.equ	se_esuka_rev, reverb_set+50
-	.equ	se_esuka_mvl, 127
-	.equ	se_esuka_key, 0
-	.equ	se_esuka_tbs, 1
-	.equ	se_esuka_exg, 0
-	.equ	se_esuka_cmp, 1
-
-	.section .rodata
-	.global	se_esuka
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_esuka_1:
-	.byte	KEYSH , se_esuka_key+0
-	.byte	TEMPO , 150*se_esuka_tbs/2
-	.byte		VOICE , 38
-	.byte		BENDR , 2
-	.byte		VOL   , 51*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-32
-	.byte		TIE   , En5 , v080
-	.byte	W01
-	.byte		BEND  , c_v-26
-	.byte	W01
-	.byte		VOL   , 56*se_esuka_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		VOL   , 62*se_esuka_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v-15
-	.byte	W01
-	.byte		VOL   , 69*se_esuka_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-7
-	.byte	W01
-	.byte		VOL   , 75*se_esuka_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		VOL   , 85*se_esuka_mvl/mxv
-	.byte	W02
-	.byte		        92*se_esuka_mvl/mxv
-	.byte	W02
-	.byte		        100*se_esuka_mvl/mxv
-	.byte	W08
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W03
-	.byte		        96*se_esuka_mvl/mxv
-	.byte	W03
-	.byte		        88*se_esuka_mvl/mxv
-	.byte	W03
-	.byte		        81*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-5
-	.byte	W03
-	.byte		VOL   , 74*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W02
-	.byte		VOL   , 62*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W02
-	.byte		VOL   , 49*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-21
-	.byte	W03
-	.byte		VOL   , 39*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-26
-	.byte	W02
-	.byte		VOL   , 25*se_esuka_mvl/mxv
-	.byte		BEND  , c_v-32
-	.byte	W03
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_esuka:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_esuka_pri	@ Priority
-	.byte	se_esuka_rev	@ Reverb.
-
-	.word	se_esuka_grp
-
-	.word	se_esuka_1
-
-	.end