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

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_toy_dango.mid | Bin 0 -> 100 bytes
 sound/songs/se_toy_dango.s        |  52 ------------------------------
 4 files changed, 4 insertions(+), 53 deletions(-)
 create mode 100644 sound/songs/midi/se_toy_dango.mid
 delete mode 100644 sound/songs/se_toy_dango.s

diff --git a/ld_script.txt b/ld_script.txt
index 0fe264ed8..ab22da693 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -712,7 +712,7 @@ SECTIONS {
         sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/midi/se_fuusen3.o(.rodata);
         sound/songs/se_toy_kabe.o(.rodata);
-        sound/songs/se_toy_dango.o(.rodata);
+        sound/songs/midi/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/midi/se_t_ame.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e3df6beea..5b707e9c1 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1152,6 +1152,9 @@ $(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_dango.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
 
diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_toy_dango.mid
new file mode 100644
index 0000000000000000000000000000000000000000..baa1ed24e602b8921b885b431ee8cd384b24dd1e
GIT binary patch
literal 100
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILGG;iS!mvSv
xhk?t1fxVvL0fPg>1djs71`h^?15%6=eCrt-d>I%Is4z{iv0!YlVPFDk1pxKc76kwR

literal 0
HcmV?d00001

diff --git a/sound/songs/se_toy_dango.s b/sound/songs/se_toy_dango.s
deleted file mode 100644
index b8469a5a0..000000000
--- a/sound/songs/se_toy_dango.s
+++ /dev/null
@@ -1,52 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_toy_dango_grp, voicegroup128
-	.equ	se_toy_dango_pri, 4
-	.equ	se_toy_dango_rev, reverb_set+50
-	.equ	se_toy_dango_mvl, 127
-	.equ	se_toy_dango_key, 0
-	.equ	se_toy_dango_tbs, 1
-	.equ	se_toy_dango_exg, 0
-	.equ	se_toy_dango_cmp, 1
-
-	.section .rodata
-	.global	se_toy_dango
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_toy_dango_1:
-	.byte	KEYSH , se_toy_dango_key+0
-	.byte	TEMPO , 150*se_toy_dango_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_toy_dango_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Cn4 , v112
-	.byte	W01
-	.byte		VOICE , 26
-	.byte	W01
-	.byte		N01   , Fn4 , v127
-	.byte	W01
-	.byte	W01
-	.byte		VOICE , 36
-	.byte	W02
-	.byte		N01   , Cn3 , v056
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_toy_dango:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_toy_dango_pri	@ Priority
-	.byte	se_toy_dango_rev	@ Reverb.
-
-	.word	se_toy_dango_grp
-
-	.word	se_toy_dango_1
-
-	.end