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

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w004.mid | Bin 0 -> 172 bytes
 sound/songs/se_w004.s        |  75 -----------------------------------
 4 files changed, 4 insertions(+), 76 deletions(-)
 create mode 100644 sound/songs/midi/se_w004.mid
 delete mode 100644 sound/songs/se_w004.s

diff --git a/ld_script.txt b/ld_script.txt
index 5703e4585c..b6d2b9f6ea 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -773,7 +773,7 @@ SECTIONS {
         sound/songs/se_w013.o(.rodata);
         sound/songs/se_w196.o(.rodata);
         sound/songs/se_w086.o(.rodata);
-        sound/songs/se_w004.o(.rodata);
+        sound/songs/midi/se_w004.o(.rodata);
         sound/songs/se_w025.o(.rodata);
         sound/songs/se_w025b.o(.rodata);
         sound/songs/se_w152.o(.rodata);
diff --git a/songs.mk b/songs.mk
index da7a1020b9..0c4890e7ab 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1191,5 +1191,8 @@ $(MID_SUBDIR)/se_ussoki.s: %.s: %.mid
 $(MID_SUBDIR)/se_w003.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w004.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_w004.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a27538d817926c1d58e42a69f84d8b02c11b4e36
GIT binary patch
literal 172
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILa%DKc#;}3C
zo<W3%fy;s60fPg>1e<!s4P0hGwknYJ0Mdet4K@rwngPfMsc~eOU>CyFU<VRY5JDKH
u$8eC9VWS)egDe+=94CV;2LsSxE>DJumL|-NmJEzQnh8iVY~->4=>h;G?Ic$K

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w004.s b/sound/songs/se_w004.s
deleted file mode 100644
index c78a30d121..0000000000
--- a/sound/songs/se_w004.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w004_grp, voicegroup128
-	.equ	se_w004_pri, 4
-	.equ	se_w004_rev, reverb_set+50
-	.equ	se_w004_mvl, 127
-	.equ	se_w004_key, 0
-	.equ	se_w004_tbs, 1
-	.equ	se_w004_exg, 0
-	.equ	se_w004_cmp, 1
-
-	.section .rodata
-	.global	se_w004
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w004_1:
-	.byte	KEYSH , se_w004_key+0
-	.byte	TEMPO , 150*se_w004_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 120*se_w004_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn3 , v127
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		BEND  , c_v-27
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		BEND  , c_v-47
-	.byte	W01
-	.byte		        c_v-64
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte		N02   , Dn3 , v084
-	.byte	W02
-	.byte		BEND  , c_v-32
-	.byte	W18
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w004_2:
-	.byte	KEYSH , se_w004_key+0
-	.byte		VOICE , 5
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 120*se_w004_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		N03   , An2 , v052
-	.byte	W04
-	.byte		N02   
-	.byte	W02
-	.byte		PAN   , c_v-8
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w004:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w004_pri	@ Priority
-	.byte	se_w004_rev	@ Reverb.
-
-	.word	se_w004_grp
-
-	.word	se_w004_1
-	.word	se_w004_2
-
-	.end