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

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

diff --git a/ld_script.txt b/ld_script.txt
index 7659f5704..bce10035e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -711,7 +711,7 @@ SECTIONS {
         sound/songs/midi/se_fuusen1.o(.rodata);
         sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/midi/se_fuusen3.o(.rodata);
-        sound/songs/se_toy_kabe.o(.rodata);
+        sound/songs/midi/se_toy_kabe.o(.rodata);
         sound/songs/midi/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 16dfc4fdb..8ad823174 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1164,5 +1164,8 @@ $(MID_SUBDIR)/se_toy_f.s: %.s: %.mid
 $(MID_SUBDIR)/se_toy_g.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_toy_kabe.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_kabe.mid b/sound/songs/midi/se_toy_kabe.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c35be0c0da0a45747e3256946b6067099417aa6d
GIT binary patch
literal 132
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SizA%B|zdi$0DwyGbCc_31
z9tQS$h6fA|3={n786PlMFfwQ|Huy0BnLr_rdbSPh`AqEbjO-?i4IT^(8`vdSf$ArC
RXn-UbArkBoAUQ^$(EwwD9CiQz

literal 0
HcmV?d00001

diff --git a/sound/songs/se_toy_kabe.s b/sound/songs/se_toy_kabe.s
deleted file mode 100644
index bb51229d0..000000000
--- a/sound/songs/se_toy_kabe.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_toy_kabe_grp, voicegroup128
-	.equ	se_toy_kabe_pri, 4
-	.equ	se_toy_kabe_rev, reverb_set+50
-	.equ	se_toy_kabe_mvl, 127
-	.equ	se_toy_kabe_key, 0
-	.equ	se_toy_kabe_tbs, 1
-	.equ	se_toy_kabe_exg, 0
-	.equ	se_toy_kabe_cmp, 1
-
-	.section .rodata
-	.global	se_toy_kabe
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_toy_kabe_1:
-	.byte	KEYSH , se_toy_kabe_key+0
-	.byte	TEMPO , 240*se_toy_kabe_tbs/2
-	.byte		VOICE , 41
-	.byte		BENDR , 12
-	.byte		VOL   , 110*se_toy_kabe_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Fs4 , v127
-	.byte	W01
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		        c_v-23
-	.byte	W01
-	.byte	W01
-	.byte		        c_v+0
-	.byte		N10   , Cn4 
-	.byte	W02
-	.byte	W03
-	.byte	W01
-	.byte		VOL   , 96*se_toy_kabe_mvl/mxv
-	.byte	W02
-	.byte		        82*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte		        45*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte		        20*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte	W03
-	.byte	W01
-	.byte		        110*se_toy_kabe_mvl/mxv
-	.byte		N10   , Cn4 , v040
-	.byte	W02
-	.byte	W03
-	.byte	W01
-	.byte		VOL   , 96*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte		        82*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte		        45*se_toy_kabe_mvl/mxv
-	.byte	W01
-	.byte		        20*se_toy_kabe_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_toy_kabe:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_toy_kabe_pri	@ Priority
-	.byte	se_toy_kabe_rev	@ Reverb.
-
-	.word	se_toy_kabe_grp
-
-	.word	se_toy_kabe_1
-
-	.end