From 9d803b24a6845e359f8a567a8eaec8c0974595c1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:40:38 -0400
Subject: [PATCH] Match se_w003.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w003.mid | Bin 0 -> 113 bytes
 sound/songs/se_w003.s        |  52 -----------------------------------
 4 files changed, 4 insertions(+), 53 deletions(-)
 create mode 100644 sound/songs/midi/se_w003.mid
 delete mode 100644 sound/songs/se_w003.s

diff --git a/ld_script.txt b/ld_script.txt
index 10369c86cd..5703e4585c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -768,7 +768,7 @@ SECTIONS {
         sound/songs/se_w088.o(.rodata);
         sound/songs/se_w016.o(.rodata);
         sound/songs/se_w016b.o(.rodata);
-        sound/songs/se_w003.o(.rodata);
+        sound/songs/midi/se_w003.o(.rodata);
         sound/songs/se_w104.o(.rodata);
         sound/songs/se_w013.o(.rodata);
         sound/songs/se_w196.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 13dcb43180..da7a1020b9 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1188,5 +1188,8 @@ $(MID_SUBDIR)/se_u.s: %.s: %.mid
 $(MID_SUBDIR)/se_ussoki.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5
 
+$(MID_SUBDIR)/se_w003.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_w003.mid b/sound/songs/midi/se_w003.mid
new file mode 100644
index 0000000000000000000000000000000000000000..80e7a52a755fe952c1f1c8992d517ba340e7955c
GIT binary patch
literal 113
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILa$q>X#IQkx
zhk?DGfy<NO0fPg>1or}_26qOg4P5376Cxd$8X_4OHgJK&RY2m52ZR_VBqT63Brxy-
G%>e)zZy5~$

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w003.s b/sound/songs/se_w003.s
deleted file mode 100644
index 736ab98026..0000000000
--- a/sound/songs/se_w003.s
+++ /dev/null
@@ -1,52 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w003_grp, voicegroup128
-	.equ	se_w003_pri, 4
-	.equ	se_w003_rev, reverb_set+50
-	.equ	se_w003_mvl, 127
-	.equ	se_w003_key, 0
-	.equ	se_w003_tbs, 1
-	.equ	se_w003_exg, 0
-	.equ	se_w003_cmp, 1
-
-	.section .rodata
-	.global	se_w003
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w003_1:
-	.byte	KEYSH , se_w003_key+0
-	.byte	TEMPO , 150*se_w003_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w003_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		BEND  , c_v+0
-	.byte		N02   , Bn3 , v112
-	.byte	W04
-	.byte		PAN   , c_v-9
-	.byte		N02   , Fn5 , v064
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		N02   , Bn3 , v036
-	.byte	W03
-	.byte		VOICE , 18
-	.byte		N02   , Cn6 , v096
-	.byte	W15
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w003:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w003_pri	@ Priority
-	.byte	se_w003_rev	@ Reverb.
-
-	.word	se_w003_grp
-
-	.word	se_w003_1
-
-	.end