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

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_fu_zaku2.mid | Bin 0 -> 92 bytes
 sound/songs/se_fu_zaku2.s        |  48 -------------------------------
 4 files changed, 4 insertions(+), 49 deletions(-)
 create mode 100644 sound/songs/midi/se_fu_zaku2.mid
 delete mode 100644 sound/songs/se_fu_zaku2.s

diff --git a/ld_script.txt b/ld_script.txt
index 66081961ee..546d7cb2d7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -602,7 +602,7 @@ SECTIONS {
         sound/songs/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
-        sound/songs/se_fu_zaku2.o(.rodata);
+        sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6430414f00..e604ab9654 100644
--- a/songs.mk
+++ b/songs.mk
@@ -870,5 +870,8 @@ $(MID_SUBDIR)/se_expmax.s: %.s: %.mid
 $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
 
+$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_fu_zaku2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3fc903844624dea4b4ed6c20d853b99823b05be8
GIT binary patch
literal 92
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?IL(q=eN$FPCD
ko?(Jz0b_$D1H%LdAngF8oq@D71JeYX7^Vgr1}2~u0C$)a@&Et;

literal 0
HcmV?d00001

diff --git a/sound/songs/se_fu_zaku2.s b/sound/songs/se_fu_zaku2.s
deleted file mode 100644
index 0ef523654f..0000000000
--- a/sound/songs/se_fu_zaku2.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_fu_zaku2_grp, voicegroup127
-	.equ	se_fu_zaku2_pri, 4
-	.equ	se_fu_zaku2_rev, reverb_set+50
-	.equ	se_fu_zaku2_mvl, 127
-	.equ	se_fu_zaku2_key, 0
-	.equ	se_fu_zaku2_tbs, 1
-	.equ	se_fu_zaku2_exg, 0
-	.equ	se_fu_zaku2_cmp, 1
-
-	.section .rodata
-	.global	se_fu_zaku2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_fu_zaku2_1:
-	.byte	KEYSH , se_fu_zaku2_key+0
-	.byte	TEMPO , 150*se_fu_zaku2_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 110*se_fu_zaku2_mvl/mxv
-	.byte		N01   , An2 , v112
-	.byte	W01
-	.byte		        En3 
-	.byte	W01
-	.byte		        Gn3 
-	.byte	W01
-	.byte	W02
-	.byte		N02   , Cn3 , v092
-	.byte	W01
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_fu_zaku2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_fu_zaku2_pri	@ Priority
-	.byte	se_fu_zaku2_rev	@ Reverb.
-
-	.word	se_fu_zaku2_grp
-
-	.word	se_fu_zaku2_1
-
-	.end