From 12ec9ec536a992e3171ce32f6f2f539169aa4d3f Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:45:34 -0400
Subject: [PATCH] Match se_fu_zaku.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_fu_zaku.mid | Bin 0 -> 124 bytes
 sound/songs/se_fu_zaku.s        |  54 --------------------------------
 4 files changed, 4 insertions(+), 55 deletions(-)
 create mode 100644 sound/songs/midi/se_fu_zaku.mid
 delete mode 100644 sound/songs/se_fu_zaku.s

diff --git a/ld_script.txt b/ld_script.txt
index a2f9064cb..66081961e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -601,7 +601,7 @@ SECTIONS {
         sound/songs/se_jite_pyoko.o(.rodata);
         sound/songs/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
-        sound/songs/se_fu_zaku.o(.rodata);
+        sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/se_fu_zaku2.o(.rodata);
         sound/songs/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
diff --git a/songs.mk b/songs.mk
index acc900b34..6430414f0 100644
--- a/songs.mk
+++ b/songs.mk
@@ -867,5 +867,8 @@ $(MID_SUBDIR)/se_exp.s: %.s: %.mid
 $(MID_SUBDIR)/se_expmax.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5
 
+$(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_fu_zaku.mid b/sound/songs/midi/se_fu_zaku.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dbdb6383b0a609680043553d4eeec03aea7d4342
GIT binary patch
literal 124
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?IL@@6<t$FPCD
po?(KG3uA)~1H%Ld2gU{mAngpKof()WSQ;=jSTe8?kY@oJ2>@x%8;Sq`

literal 0
HcmV?d00001

diff --git a/sound/songs/se_fu_zaku.s b/sound/songs/se_fu_zaku.s
deleted file mode 100644
index b494653ee..000000000
--- a/sound/songs/se_fu_zaku.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_fu_zaku_grp, voicegroup127
-	.equ	se_fu_zaku_pri, 4
-	.equ	se_fu_zaku_rev, reverb_set+50
-	.equ	se_fu_zaku_mvl, 127
-	.equ	se_fu_zaku_key, 0
-	.equ	se_fu_zaku_tbs, 1
-	.equ	se_fu_zaku_exg, 0
-	.equ	se_fu_zaku_cmp, 1
-
-	.section .rodata
-	.global	se_fu_zaku
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_fu_zaku_1:
-	.byte	KEYSH , se_fu_zaku_key+0
-	.byte	TEMPO , 150*se_fu_zaku_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 120*se_fu_zaku_mvl/mxv
-	.byte		N01   , Cn3 , v068
-	.byte	W01
-	.byte		        En3 , v064
-	.byte	W01
-	.byte		        Gn3 
-	.byte	W03
-	.byte		N02   , An2 , v048
-	.byte	W08
-	.byte		N01   , Cn3 , v068
-	.byte	W01
-	.byte		        En3 , v064
-	.byte	W01
-	.byte		        Gn3 
-	.byte	W03
-	.byte		N02   , An2 , v048
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_fu_zaku:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_fu_zaku_pri	@ Priority
-	.byte	se_fu_zaku_rev	@ Reverb.
-
-	.word	se_fu_zaku_grp
-
-	.word	se_fu_zaku_1
-
-	.end