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

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

diff --git a/ld_script.txt b/ld_script.txt
index 74ab2a5e5..23f98c8a6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -639,7 +639,7 @@ SECTIONS {
         sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
-        sound/songs/se_fuusen2.o(.rodata);
+        sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/se_fuusen3.o(.rodata);
         sound/songs/se_toy_kabe.o(.rodata);
         sound/songs/se_toy_dango.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1c8597da0..09f6a5875 100644
--- a/songs.mk
+++ b/songs.mk
@@ -879,5 +879,8 @@ $(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid
 $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
+$(MID_SUBDIR)/se_fuusen2.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_fuusen2.mid b/sound/songs/midi/se_fuusen2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4efc1a525daf670e2275ba49fd48ce1a88e7a421
GIT binary patch
literal 110
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SizA%B|zdi$0%9h~(6T=1(
z9tQS$h6fA|3={n8nH&5W7$^7_Fal}j2`(m#4K57K2gDgBI2JH9I5IFz@bF-4@L*sB
G8Ug?*>=};$

literal 0
HcmV?d00001

diff --git a/sound/songs/se_fuusen2.s b/sound/songs/se_fuusen2.s
deleted file mode 100644
index 065b91adf..000000000
--- a/sound/songs/se_fuusen2.s
+++ /dev/null
@@ -1,52 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_fuusen2_grp, voicegroup128
-	.equ	se_fuusen2_pri, 4
-	.equ	se_fuusen2_rev, reverb_set+50
-	.equ	se_fuusen2_mvl, 127
-	.equ	se_fuusen2_key, 0
-	.equ	se_fuusen2_tbs, 1
-	.equ	se_fuusen2_exg, 0
-	.equ	se_fuusen2_cmp, 1
-
-	.section .rodata
-	.global	se_fuusen2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_fuusen2_1:
-	.byte	KEYSH , se_fuusen2_key+0
-	.byte	TEMPO , 240*se_fuusen2_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		VOL   , 105*se_fuusen2_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn4 , v127
-	.byte	W04
-	.byte		N01   , Gn4 , v112
-	.byte	W02
-	.byte	W02
-	.byte		        Gs3 , v052
-	.byte	W04
-	.byte		VOICE , 23
-	.byte		N02   , Fn3 , v112
-	.byte	W04
-	.byte		N01   , Cn4 , v072
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_fuusen2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_fuusen2_pri	@ Priority
-	.byte	se_fuusen2_rev	@ Reverb.
-
-	.word	se_fuusen2_grp
-
-	.word	se_fuusen2_1
-
-	.end