From e7464b39a37637acfdcf92f7b5ec1c8bad673ac7 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 14:57:35 -0500
Subject: [PATCH] Match se_mizu.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 486562547c..de01ac9b48 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -685,7 +685,7 @@ SECTIONS {
         sound/songs/se_toy_a.o(.rodata);
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
-        sound/songs/se_mizu.o(.rodata);
+        sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
diff --git a/songs.mk b/songs.mk
index dd65ffce7c..db9fc76903 100644
--- a/songs.mk
+++ b/songs.mk
@@ -951,5 +951,8 @@ $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
 $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
+$(MID_SUBDIR)/se_mizu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_mizu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dfdc85619c902bd033522c570937a4fa5f319abd
GIT binary patch
literal 105
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILvS2tM&ai>K
wo<W3%fy;s60fRcjgn$CZ2Mp$n44#Y)0Sv4g*mHowK|tYppl}jMj0vb80ATeObpQYW

literal 0
HcmV?d00001

diff --git a/sound/songs/se_mizu.s b/sound/songs/se_mizu.s
deleted file mode 100644
index f1c0d5e860..0000000000
--- a/sound/songs/se_mizu.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mizu_grp, voicegroup128
-	.equ	se_mizu_pri, 4
-	.equ	se_mizu_rev, reverb_set+50
-	.equ	se_mizu_mvl, 127
-	.equ	se_mizu_key, 0
-	.equ	se_mizu_tbs, 1
-	.equ	se_mizu_exg, 0
-	.equ	se_mizu_cmp, 1
-
-	.section .rodata
-	.global	se_mizu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mizu_1:
-	.byte	KEYSH , se_mizu_key+0
-	.byte	TEMPO , 150*se_mizu_tbs/2
-	.byte		VOICE , 23
-	.byte		VOL   , 20*se_mizu_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-25
-	.byte		N03   , Gs4 , v112
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v+9
-	.byte	W04
-	.byte	W02
-	.byte		VOL   , 17*se_mizu_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte		N02   , Gs4 , v127
-	.byte	W01
-	.byte		BEND  , c_v+34
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mizu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mizu_pri	@ Priority
-	.byte	se_mizu_rev	@ Reverb.
-
-	.word	se_mizu_grp
-
-	.word	se_mizu_1
-
-	.end