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

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w020.mid | Bin 0 -> 174 bytes
 sound/songs/se_w020.s        |  81 -----------------------------------
 4 files changed, 4 insertions(+), 82 deletions(-)
 create mode 100644 sound/songs/midi/se_w020.mid
 delete mode 100644 sound/songs/se_w020.s

diff --git a/ld_script.txt b/ld_script.txt
index 5d530a207..ee8306694 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -804,7 +804,7 @@ SECTIONS {
         sound/songs/se_w039.o(.rodata);
         sound/songs/se_w054.o(.rodata);
         sound/songs/se_w077.o(.rodata);
-        sound/songs/se_w020.o(.rodata);
+        sound/songs/midi/se_w020.o(.rodata);
         sound/songs/se_w082.o(.rodata);
         sound/songs/se_w047.o(.rodata);
         sound/songs/se_w195.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 89acf5a99..429add01e 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1230,5 +1230,8 @@ $(MID_SUBDIR)/se_w017.s: %.s: %.mid
 $(MID_SUBDIR)/se_w019.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w020.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_w020.mid
new file mode 100644
index 0000000000000000000000000000000000000000..eec8ccae97e610b548b1f3222c7f0b5428b6be6b
GIT binary patch
literal 174
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILs%1E!#;`$z
zhk?t1fxVvL0fPg>1haa^4P4ehwk?o$0n*k$+5$+M18Hv{ZNk`K#=yD(s0FH?=>dZo
gBZC!Gn++p_15~Fi6N58cGlMor9|Ob;6=t9#0ROBfKL7v#

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w020.s b/sound/songs/se_w020.s
deleted file mode 100644
index 6f4e90c64..000000000
--- a/sound/songs/se_w020.s
+++ /dev/null
@@ -1,81 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w020_grp, voicegroup128
-	.equ	se_w020_pri, 4
-	.equ	se_w020_rev, reverb_set+50
-	.equ	se_w020_mvl, 127
-	.equ	se_w020_key, 0
-	.equ	se_w020_tbs, 1
-	.equ	se_w020_exg, 0
-	.equ	se_w020_cmp, 1
-
-	.section .rodata
-	.global	se_w020
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w020_1:
-	.byte	KEYSH , se_w020_key+0
-	.byte	TEMPO , 150*se_w020_tbs/2
-	.byte		VOICE , 38
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w020_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N05   , Fs2 , v127
-	.byte	W01
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v-3
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v-5
-	.byte	W01
-	.byte		PAN   , c_v-8
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v-12
-	.byte	W06
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N11   
-	.byte	W02
-	.byte		BEND  , c_v-10
-	.byte	W01
-	.byte		        c_v-6
-	.byte	W01
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v-4
-	.byte	W01
-	.byte		        c_v+0
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v-3
-	.byte	W02
-	.byte		        c_v+3
-	.byte	W01
-	.byte		PAN   , c_v-8
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v-21
-	.byte	W01
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v-28
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w020:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w020_pri	@ Priority
-	.byte	se_w020_rev	@ Reverb.
-
-	.word	se_w020_grp
-
-	.word	se_w020_1
-
-	.end