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

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

diff --git a/ld_script.txt b/ld_script.txt
index 59b3a790b..964b3148e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -592,7 +592,7 @@ SECTIONS {
         sound/songs/midi/se_a.o(.rodata);
         sound/songs/se_i.o(.rodata);
         sound/songs/se_u.o(.rodata);
-        sound/songs/se_e.o(.rodata);
+        sound/songs/midi/se_e.o(.rodata);
         sound/songs/se_o.o(.rodata);
         sound/songs/se_n.o(.rodata);
         sound/songs/se_seikai.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 2d77f6acf..131183fa7 100644
--- a/songs.mk
+++ b/songs.mk
@@ -852,5 +852,8 @@ $(MID_SUBDIR)/se_doku.s: %.s: %.mid
 $(MID_SUBDIR)/se_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
 
+$(MID_SUBDIR)/se_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_e.mid b/sound/songs/midi/se_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..79485cbc958bcb764150dd753c3037f32cd49d15
GIT binary patch
literal 75
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SizA%B|zdi$0N{Zn?EyD&8
X9tQS$h6fA|3=?eXJsNBnB!DUaO7Rh5

literal 0
HcmV?d00001

diff --git a/sound/songs/se_e.s b/sound/songs/se_e.s
deleted file mode 100644
index aa9b91844..000000000
--- a/sound/songs/se_e.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_e_grp, voicegroup128
-	.equ	se_e_pri, 4
-	.equ	se_e_rev, reverb_set+50
-	.equ	se_e_mvl, 127
-	.equ	se_e_key, 0
-	.equ	se_e_tbs, 1
-	.equ	se_e_exg, 0
-	.equ	se_e_cmp, 1
-
-	.section .rodata
-	.global	se_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_e_1:
-	.byte	KEYSH , se_e_key+0
-	.byte	TEMPO , 240*se_e_tbs/2
-	.byte		VOICE , 125
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N72   , Cn3 , v127
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_e_pri	@ Priority
-	.byte	se_e_rev	@ Reverb.
-
-	.word	se_e_grp
-
-	.word	se_e_1
-
-	.end