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

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_fu_zuzuzu.mid | Bin 0 -> 140 bytes
 sound/songs/se_fu_zuzuzu.s        |  73 ------------------------------
 4 files changed, 4 insertions(+), 74 deletions(-)
 create mode 100644 sound/songs/midi/se_fu_zuzuzu.mid
 delete mode 100644 sound/songs/se_fu_zuzuzu.s

diff --git a/ld_script.txt b/ld_script.txt
index 546d7cb2d..a28b20104 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -603,7 +603,7 @@ SECTIONS {
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
-        sound/songs/se_fu_zuzuzu.o(.rodata);
+        sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
         sound/songs/se_ru_bari.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e604ab965..4c60a2385 100644
--- a/songs.mk
+++ b/songs.mk
@@ -873,5 +873,8 @@ $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
 $(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
 
+$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_fu_zuzuzu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..962113ad3d72f781777be0ec1c2faa461beee513
GIT binary patch
literal 140
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SiU#P(FU!MUg70qy<j$s3P
zJ;Mac0*(et28Ib11&j?A42%;j6F_{%2^KLRK2SaY%J+ft9iV(0sColVh<*(apBZQc
E0C<ESu>b%7

literal 0
HcmV?d00001

diff --git a/sound/songs/se_fu_zuzuzu.s b/sound/songs/se_fu_zuzuzu.s
deleted file mode 100644
index b0df814d0..000000000
--- a/sound/songs/se_fu_zuzuzu.s
+++ /dev/null
@@ -1,73 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_fu_zuzuzu_grp, voicegroup127
-	.equ	se_fu_zuzuzu_pri, 4
-	.equ	se_fu_zuzuzu_rev, reverb_set+50
-	.equ	se_fu_zuzuzu_mvl, 127
-	.equ	se_fu_zuzuzu_key, 0
-	.equ	se_fu_zuzuzu_tbs, 1
-	.equ	se_fu_zuzuzu_exg, 0
-	.equ	se_fu_zuzuzu_cmp, 1
-
-	.section .rodata
-	.global	se_fu_zuzuzu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_fu_zuzuzu_1:
-	.byte	KEYSH , se_fu_zuzuzu_key+0
-	.byte	TEMPO , 120*se_fu_zuzuzu_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 127*se_fu_zuzuzu_mvl/mxv
-	.byte		N08   , An2 , v112
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		N01   , Gs2 
-	.byte	W01
-	.byte	W01
-	.byte		N08   , An2 , v096
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W01
-	.byte		N01   , Gs2 , v092
-	.byte	W01
-	.byte		N08   , An2 , v080
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		N01   , Gs2 , v076
-	.byte	W01
-	.byte		N08   , An2 , v064
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N01   , Gs2 , v060
-	.byte	W02
-	.byte		N09   , An2 , v048
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		N01   , Gs2 , v040
-	.byte	W01
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_fu_zuzuzu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_fu_zuzuzu_pri	@ Priority
-	.byte	se_fu_zuzuzu_rev	@ Reverb.
-
-	.word	se_fu_zuzuzu_grp
-
-	.word	se_fu_zuzuzu_1
-
-	.end