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

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

diff --git a/ld_script.txt b/ld_script.txt
index 23f98c8a6..c2c122a1a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -640,7 +640,7 @@ SECTIONS {
         sound/songs/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
         sound/songs/midi/se_fuusen2.o(.rodata);
-        sound/songs/se_fuusen3.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_doku.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 09f6a5875..0cbbbf098 100644
--- a/songs.mk
+++ b/songs.mk
@@ -882,5 +882,8 @@ $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid
 $(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
+$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_fuusen3.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ae40e0008c67721da8a93b7cab74655077cc037c
GIT binary patch
literal 142
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SizA%B|zdi$0Dwg2@6T=1(
z9tQS$h6fA|3=<sdnHn4!7$$fWFgAEFFivnZVFvOU4~R2N@QGn;@BvDN0O=40rU}kK
a+8M})h%-)bFkozO0P@{|v^xVM&=LUI-61gm

literal 0
HcmV?d00001

diff --git a/sound/songs/se_fuusen3.s b/sound/songs/se_fuusen3.s
deleted file mode 100644
index 0756c9618..000000000
--- a/sound/songs/se_fuusen3.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_fuusen3_grp, voicegroup128
-	.equ	se_fuusen3_pri, 4
-	.equ	se_fuusen3_rev, reverb_set+50
-	.equ	se_fuusen3_mvl, 127
-	.equ	se_fuusen3_key, 0
-	.equ	se_fuusen3_tbs, 1
-	.equ	se_fuusen3_exg, 0
-	.equ	se_fuusen3_cmp, 1
-
-	.section .rodata
-	.global	se_fuusen3
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_fuusen3_1:
-	.byte	KEYSH , se_fuusen3_key+0
-	.byte	TEMPO , 240*se_fuusen3_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		VOL   , 105*se_fuusen3_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Fn3 , v127
-	.byte	W02
-	.byte		N01   , Cn4 , v112
-	.byte	W02
-	.byte		N03   , Fn3 , v052
-	.byte	W02
-	.byte	W02
-	.byte		VOICE , 23
-	.byte		N01   , En4 , v092
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W03
-	.byte		        Gn3 
-	.byte	W01
-	.byte		        En4 
-	.byte	W02
-	.byte		        En3 , v048
-	.byte	W01
-	.byte		        Bn3 
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_fuusen3:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_fuusen3_pri	@ Priority
-	.byte	se_fuusen3_rev	@ Reverb.
-
-	.word	se_fuusen3_grp
-
-	.word	se_fuusen3_1
-
-	.end