From 4f1ba2c1adb3c5f98ecf0cf669d8c277cbf00f9d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 17:10:54 -0400
Subject: [PATCH] Match se_w025b.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 +
 sound/songs/midi/se_w025b.mid | Bin 0 -> 313 bytes
 sound/songs/se_w025b.s        | 128 ----------------------------------
 4 files changed, 4 insertions(+), 129 deletions(-)
 create mode 100644 sound/songs/midi/se_w025b.mid
 delete mode 100644 sound/songs/se_w025b.s

diff --git a/ld_script.txt b/ld_script.txt
index 9fdb93e40..5613d49f7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -775,7 +775,7 @@ SECTIONS {
         sound/songs/se_w086.o(.rodata);
         sound/songs/midi/se_w004.o(.rodata);
         sound/songs/midi/se_w025.o(.rodata);
-        sound/songs/se_w025b.o(.rodata);
+        sound/songs/midi/se_w025b.o(.rodata);
         sound/songs/se_w152.o(.rodata);
         sound/songs/se_w026.o(.rodata);
         sound/songs/se_w172.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 0a3ae3873..d673014fc 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1236,5 +1236,8 @@ $(MID_SUBDIR)/se_w020.s: %.s: %.mid
 $(MID_SUBDIR)/se_w025.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
+$(MID_SUBDIR)/se_w025b.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_w025b.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ac165424b3e1e2db0f44604370dd606af1c3c720
GIT binary patch
literal 313
zcmYL^%}T>S6otQ;iJdrgr-i7b3vp3F5K%}XSp*7-LKjLw7cRPRA-EH|PJ9D>5lP;l
zeUrXPdPn=SI`{nC!@Z;N`y0?fVTeZK&kteyv@e0uQAqn}g0pAZ3s%-IvktW_IoQJ$
zEGYOcO10oh)$T#~kzgW-stR<y&Sa(NccPyvZ)LEt@?5MNZ|N$>uWr{8U!AJjPWg*m
zYR-jCaJLd1C{Bb8|1UXIbaj<TvyFXAw7vR?`3_A#BzE+7i9_TAch67yYQ9oT<1(4A
b{k%p!Kc<oEMGhJ})pnxo(AZc@rYFryo4`WI

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w025b.s b/sound/songs/se_w025b.s
deleted file mode 100644
index 03b095e6c..000000000
--- a/sound/songs/se_w025b.s
+++ /dev/null
@@ -1,128 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w025b_grp, voicegroup128
-	.equ	se_w025b_pri, 4
-	.equ	se_w025b_rev, reverb_set+50
-	.equ	se_w025b_mvl, 127
-	.equ	se_w025b_key, 0
-	.equ	se_w025b_tbs, 1
-	.equ	se_w025b_exg, 0
-	.equ	se_w025b_cmp, 1
-
-	.section .rodata
-	.global	se_w025b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w025b_1:
-	.byte	KEYSH , se_w025b_key+0
-	.byte	TEMPO , 220*se_w025b_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 110*se_w025b_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N04   , En3 , v127
-	.byte	W01
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v+10
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v-64
-	.byte	W03
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , An2 
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte		BEND  , c_v-28
-	.byte	W01
-	.byte		        c_v-64
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn3 , v060
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-28
-	.byte	W02
-	.byte		        c_v-64
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N10   , Gn2 , v127
-	.byte	W01
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 101*se_w025b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-15
-	.byte	W02
-	.byte		        c_v-20
-	.byte	W01
-	.byte		VOL   , 83*se_w025b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-24
-	.byte	W01
-	.byte		        c_v-30
-	.byte	W01
-	.byte		VOL   , 58*se_w025b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		        c_v-53
-	.byte	W02
-	.byte		VOL   , 25*se_w025b_mvl/mxv
-	.byte		BEND  , c_v-64
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w025b_2:
-	.byte	KEYSH , se_w025b_key+0
-	.byte		VOICE , 5
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w025b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		N03   , Gs2 , v092
-	.byte	W06
-	.byte		PAN   , c_v-7
-	.byte		N03   , Gs2 , v052
-	.byte	W03
-	.byte		N03   
-	.byte	W05
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		N13   
-	.byte	W04
-	.byte		VOL   , 101*se_w025b_mvl/mxv
-	.byte	W02
-	.byte		        83*se_w025b_mvl/mxv
-	.byte	W02
-	.byte		        58*se_w025b_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        25*se_w025b_mvl/mxv
-	.byte	W23
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w025b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w025b_pri	@ Priority
-	.byte	se_w025b_rev	@ Reverb.
-
-	.word	se_w025b_grp
-
-	.word	se_w025b_1
-	.word	se_w025b_2
-
-	.end