From 85ec6ccf460d54d1373af179e8c783d666bb004c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 17:17:26 -0400
Subject: [PATCH] Match se_w030.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w030.mid | Bin 0 -> 148 bytes
 sound/songs/se_w030.s        |  67 -----------------------------------
 4 files changed, 4 insertions(+), 68 deletions(-)
 create mode 100644 sound/songs/midi/se_w030.mid
 delete mode 100644 sound/songs/se_w030.s

diff --git a/ld_script.txt b/ld_script.txt
index 7cd40e6a83..4ff9d58de2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -800,7 +800,7 @@ SECTIONS {
         sound/songs/se_w057.o(.rodata);
         sound/songs/se_w056.o(.rodata);
         sound/songs/se_w250.o(.rodata);
-        sound/songs/se_w030.o(.rodata);
+        sound/songs/midi/se_w030.o(.rodata);
         sound/songs/se_w039.o(.rodata);
         sound/songs/se_w054.o(.rodata);
         sound/songs/se_w077.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4083c4423b..817b080653 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1248,5 +1248,8 @@ $(MID_SUBDIR)/se_w028.s: %.s: %.mid
 $(MID_SUBDIR)/se_w029.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w030.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_w030.mid b/sound/songs/midi/se_w030.mid
new file mode 100644
index 0000000000000000000000000000000000000000..426cdfea4a7783544448d4a8d6642ab455a0d47a
GIT binary patch
literal 148
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILN@h49%CJF%
zhk?t1fxVvL0fQsMg!p>KhIj_X140ZFJb+9OAX9~5LbL|c26kr#t^lASSH=zOK@40*
eK&CH{nFtXL1u_dDqKS+R(F_b5*z5U#RsjG!ry=+N

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w030.s b/sound/songs/se_w030.s
deleted file mode 100644
index 35097ca846..0000000000
--- a/sound/songs/se_w030.s
+++ /dev/null
@@ -1,67 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w030_grp, voicegroup128
-	.equ	se_w030_pri, 4
-	.equ	se_w030_rev, reverb_set+50
-	.equ	se_w030_mvl, 127
-	.equ	se_w030_key, 0
-	.equ	se_w030_tbs, 1
-	.equ	se_w030_exg, 0
-	.equ	se_w030_cmp, 1
-
-	.section .rodata
-	.global	se_w030
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w030_1:
-	.byte	KEYSH , se_w030_key+0
-	.byte	TEMPO , 150*se_w030_tbs/2
-	.byte		VOICE , 21
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w030_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N01   , Bn5 , v127
-	.byte	W02
-	.byte		VOICE , 18
-	.byte		N01   , Cn4 
-	.byte	W02
-	.byte		VOICE , 36
-	.byte		N06   , Gn5 , v040
-	.byte	W02
-	.byte		VOL   , 58*se_w030_mvl/mxv
-	.byte		PAN   , c_v+16
-	.byte		BEND  , c_v+5
-	.byte	W01
-	.byte		VOL   , 71*se_w030_mvl/mxv
-	.byte		PAN   , c_v-14
-	.byte		BEND  , c_v+13
-	.byte	W01
-	.byte		VOL   , 84*se_w030_mvl/mxv
-	.byte		PAN   , c_v+16
-	.byte		BEND  , c_v+21
-	.byte	W01
-	.byte		VOL   , 97*se_w030_mvl/mxv
-	.byte		PAN   , c_v-14
-	.byte		BEND  , c_v+33
-	.byte	W01
-	.byte		VOL   , 110*se_w030_mvl/mxv
-	.byte	W14
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w030:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w030_pri	@ Priority
-	.byte	se_w030_rev	@ Reverb.
-
-	.word	se_w030_grp
-
-	.word	se_w030_1
-
-	.end