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

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

diff --git a/ld_script.txt b/ld_script.txt
index 353c539391..ecdfb6ddbc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -702,7 +702,7 @@ SECTIONS {
         sound/songs/se_toy_f.o(.rodata);
         sound/songs/se_toy_g.o(.rodata);
         sound/songs/midi/se_toy_a.o(.rodata);
-        sound/songs/se_toy_b.o(.rodata);
+        sound/songs/midi/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
         sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c61aacbebd..f935e1e128 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1140,5 +1140,8 @@ $(MID_SUBDIR)/se_toreoff.s: %.s: %.mid
 $(MID_SUBDIR)/se_toy_a.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_toy_b.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_b.mid b/sound/songs/midi/se_toy_b.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9e27e72e7cd7a48596efc64766cf1e9fc1eb10d2
GIT binary patch
literal 119
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILl4m$zz_5Y6
wp5Xz5CBuaH0-lC=1|Y4$2BMLb9Ta5P2vqhEsBB`I4Nqel1CUl=1JOWb01(w2DgXcg

literal 0
HcmV?d00001

diff --git a/sound/songs/se_toy_b.s b/sound/songs/se_toy_b.s
deleted file mode 100644
index b773808f19..0000000000
--- a/sound/songs/se_toy_b.s
+++ /dev/null
@@ -1,59 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_toy_b_grp, voicegroup128
-	.equ	se_toy_b_pri, 4
-	.equ	se_toy_b_rev, reverb_set+50
-	.equ	se_toy_b_mvl, 127
-	.equ	se_toy_b_key, 0
-	.equ	se_toy_b_tbs, 1
-	.equ	se_toy_b_exg, 0
-	.equ	se_toy_b_cmp, 1
-
-	.section .rodata
-	.global	se_toy_b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_toy_b_1:
-	.byte	KEYSH , se_toy_b_key+0
-	.byte	TEMPO , 150*se_toy_b_tbs/2
-	.byte		VOICE , 48
-	.byte		VOL   , 110*se_toy_b_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte		N12   , Bn5 , v112
-	.byte	W06
-	.byte	W06
-	.byte		N06   , Bn5 , v040
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_toy_b_2:
-	.byte	KEYSH , se_toy_b_key+0
-	.byte		VOICE , 17
-	.byte		VOL   , 110*se_toy_b_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte		N12   , Fs6 , v060
-	.byte	W06
-	.byte	W06
-	.byte		N06   , Fs6 , v032
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_toy_b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_toy_b_pri	@ Priority
-	.byte	se_toy_b_rev	@ Reverb.
-
-	.word	se_toy_b_grp
-
-	.word	se_toy_b_1
-	.word	se_toy_b_2
-
-	.end