From e26c30d390d7c2f96c4aaee747dc31593d895cba Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:22:22 -0400
Subject: [PATCH] Match se_toy_e.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_toy_e.mid | Bin 0 -> 119 bytes
 sound/songs/se_toy_e.s        |  59 ----------------------------------
 4 files changed, 4 insertions(+), 60 deletions(-)
 create mode 100644 sound/songs/midi/se_toy_e.mid
 delete mode 100644 sound/songs/se_toy_e.s

diff --git a/ld_script.txt b/ld_script.txt
index 19248be25..0fe264ed8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -698,7 +698,7 @@ SECTIONS {
         sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/midi/se_toy_c.o(.rodata);
         sound/songs/midi/se_toy_d.o(.rodata);
-        sound/songs/se_toy_e.o(.rodata);
+        sound/songs/midi/se_toy_e.o(.rodata);
         sound/songs/se_toy_f.o(.rodata);
         sound/songs/se_toy_g.o(.rodata);
         sound/songs/midi/se_toy_a.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 00a26d979..e3df6beea 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1152,5 +1152,8 @@ $(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid
 $(MID_SUBDIR)/se_toy_d.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_toy_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_toy_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..214b32bca3bb2fa1e3a18d9e1550d1eac503f6d4
GIT binary patch
literal 119
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILl4m$zz_5Y6
wp5Xz5CBuY>0-lBl1|Y4$2BMLb9Ta5P2vqhEsBB`q4Nqe{1CUl=1JOWb015FM@&Et;

literal 0
HcmV?d00001

diff --git a/sound/songs/se_toy_e.s b/sound/songs/se_toy_e.s
deleted file mode 100644
index d57dcf6c1..000000000
--- a/sound/songs/se_toy_e.s
+++ /dev/null
@@ -1,59 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_toy_e_grp, voicegroup128
-	.equ	se_toy_e_pri, 4
-	.equ	se_toy_e_rev, reverb_set+50
-	.equ	se_toy_e_mvl, 127
-	.equ	se_toy_e_key, 0
-	.equ	se_toy_e_tbs, 1
-	.equ	se_toy_e_exg, 0
-	.equ	se_toy_e_cmp, 1
-
-	.section .rodata
-	.global	se_toy_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_toy_e_1:
-	.byte	KEYSH , se_toy_e_key+0
-	.byte	TEMPO , 150*se_toy_e_tbs/2
-	.byte		VOICE , 48
-	.byte		VOL   , 110*se_toy_e_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte		N12   , En5 , v112
-	.byte	W06
-	.byte	W06
-	.byte		N06   , En5 , v040
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_toy_e_2:
-	.byte	KEYSH , se_toy_e_key+0
-	.byte		VOICE , 17
-	.byte		VOL   , 110*se_toy_e_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte		N12   , Bn5 , v060
-	.byte	W06
-	.byte	W06
-	.byte		N06   , Bn5 , v032
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_toy_e:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_toy_e_pri	@ Priority
-	.byte	se_toy_e_rev	@ Reverb.
-
-	.word	se_toy_e_grp
-
-	.word	se_toy_e_1
-	.word	se_toy_e_2
-
-	.end