From 47c9bd4189fc700cf19018f427dd4621e0115ba9 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:46:02 -0400
Subject: [PATCH] Match se_w007.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 +
 sound/songs/midi/se_w007.mid | Bin 0 -> 308 bytes
 sound/songs/se_w007.s        | 138 -----------------------------------
 4 files changed, 4 insertions(+), 139 deletions(-)
 create mode 100644 sound/songs/midi/se_w007.mid
 delete mode 100644 sound/songs/se_w007.s

diff --git a/ld_script.txt b/ld_script.txt
index dd758635b..8606a018f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -781,7 +781,7 @@ SECTIONS {
         sound/songs/se_w172.o(.rodata);
         sound/songs/se_w172b.o(.rodata);
         sound/songs/se_w053.o(.rodata);
-        sound/songs/se_w007.o(.rodata);
+        sound/songs/midi/se_w007.o(.rodata);
         sound/songs/se_w092.o(.rodata);
         sound/songs/se_w221.o(.rodata);
         sound/songs/se_w221b.o(.rodata);
diff --git a/songs.mk b/songs.mk
index dd899e461..48d156d64 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1197,5 +1197,8 @@ $(MID_SUBDIR)/se_w004.s: %.s: %.mid
 $(MID_SUBDIR)/se_w006.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
+$(MID_SUBDIR)/se_w007.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_w007.mid b/sound/songs/midi/se_w007.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2f75754f3bc4bdac169647796357bdb039f6d773
GIT binary patch
literal 308
zcmYk1Jx&8b427T9lXx+RCKOAtX{ZoEG)U}hel!grkRpK;2_)JSk?6R<h8w_5CO1fK
zlAA0h%FkBM&;D%rjVH4yfHnw>Y&`k;G}l4>?kLGp)UWI=-%#IRJ6d7cMwAL?C(wX3
z0)7S+t#L=VqNt^{G6ItM0EjyxG>FGN5gLTw64!(aiZV6mJc;sR+A%*eO-(aX(A)#d
zeDlWU0bjME7EbS3OQ#R4!(;hy^32kA(sPpY|3;KkJ_ISTYGKh$kt@1K$WvG-eZp^X
Q%ijffp}tXvUG43{AB-VC9RL6T

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w007.s b/sound/songs/se_w007.s
deleted file mode 100644
index 5a3916361..000000000
--- a/sound/songs/se_w007.s
+++ /dev/null
@@ -1,138 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w007_grp, voicegroup128
-	.equ	se_w007_pri, 4
-	.equ	se_w007_rev, reverb_set+50
-	.equ	se_w007_mvl, 127
-	.equ	se_w007_key, 0
-	.equ	se_w007_tbs, 1
-	.equ	se_w007_exg, 0
-	.equ	se_w007_cmp, 1
-
-	.section .rodata
-	.global	se_w007
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w007_1:
-	.byte	KEYSH , se_w007_key+0
-	.byte	TEMPO , 220*se_w007_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 110*se_w007_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N06   , Cn3 , v127
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v-21
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-40
-	.byte	W01
-	.byte		        c_v-64
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N06   , En3 
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v-21
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte		BEND  , c_v-40
-	.byte	W01
-	.byte		        c_v-64
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N09   , An2 
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v-19
-	.byte	W01
-	.byte		        c_v-29
-	.byte	W01
-	.byte		VOL   , 86*se_w007_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W02
-	.byte		VOL   , 69*se_w007_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W01
-	.byte		VOL   , 53*se_w007_mvl/mxv
-	.byte		BEND  , c_v-56
-	.byte	W01
-	.byte		VOL   , 20*se_w007_mvl/mxv
-	.byte		BEND  , c_v-64
-	.byte	W01
-	.byte		VOICE , 29
-	.byte		VOL   , 110*se_w007_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N48   
-	.byte	W03
-	.byte	W02
-	.byte		PAN   , c_v-8
-	.byte	W04
-	.byte		        c_v+5
-	.byte	W03
-	.byte		        c_v-6
-	.byte	W04
-	.byte		        c_v+6
-	.byte	W03
-	.byte		        c_v-3
-	.byte	W08
-	.byte	W03
-	.byte		VOL   , 78*se_w007_mvl/mxv
-	.byte	W04
-	.byte		        64*se_w007_mvl/mxv
-	.byte	W03
-	.byte		        51*se_w007_mvl/mxv
-	.byte	W04
-	.byte		        38*se_w007_mvl/mxv
-	.byte	W04
-	.byte		        25*se_w007_mvl/mxv
-	.byte	W03
-	.byte		        12*se_w007_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w007_2:
-	.byte	KEYSH , se_w007_key+0
-	.byte		VOICE , 5
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w007_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		N03   , Gs2 , v052
-	.byte	W06
-	.byte		PAN   , c_v-7
-	.byte		N03   
-	.byte	W06
-	.byte		PAN   , c_v+0
-	.byte		N03   
-	.byte	W12
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w007:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w007_pri	@ Priority
-	.byte	se_w007_rev	@ Reverb.
-
-	.word	se_w007_grp
-
-	.word	se_w007_1
-	.word	se_w007_2
-
-	.end