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

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_w016b.mid | Bin 0 -> 128 bytes
 sound/songs/se_w016b.s        |  72 ----------------------------------
 4 files changed, 4 insertions(+), 73 deletions(-)
 create mode 100644 sound/songs/midi/se_w016b.mid
 delete mode 100644 sound/songs/se_w016b.s

diff --git a/ld_script.txt b/ld_script.txt
index 17eeaeef3..15781cc2a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -767,7 +767,7 @@ SECTIONS {
         sound/songs/se_w081b.o(.rodata);
         sound/songs/se_w088.o(.rodata);
         sound/songs/midi/se_w016.o(.rodata);
-        sound/songs/se_w016b.o(.rodata);
+        sound/songs/midi/se_w016b.o(.rodata);
         sound/songs/midi/se_w003.o(.rodata);
         sound/songs/se_w104.o(.rodata);
         sound/songs/midi/se_w013.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b9a270dea..ad5c1ee66 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1221,5 +1221,8 @@ $(MID_SUBDIR)/se_w015.s: %.s: %.mid
 $(MID_SUBDIR)/se_w016.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w016b.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_w016b.mid b/sound/songs/midi/se_w016b.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6dd7020f92cf93cba6aadbe827e5ac87f38a62cb
GIT binary patch
literal 128
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?IL@@F_8#;`$z
zhk?t1fxVvL0fPg>1e+YD4P3e`Tn>!v1&mw)jO>Zb>=6uHPE70$3|tmW?0QTfDOpA?
W4@PzY<^~%Eh7IhTKm#Oz#sUE94;Cl@

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w016b.s b/sound/songs/se_w016b.s
deleted file mode 100644
index 78f01bbde..000000000
--- a/sound/songs/se_w016b.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w016b_grp, voicegroup128
-	.equ	se_w016b_pri, 4
-	.equ	se_w016b_rev, reverb_set+50
-	.equ	se_w016b_mvl, 127
-	.equ	se_w016b_key, 0
-	.equ	se_w016b_tbs, 1
-	.equ	se_w016b_exg, 0
-	.equ	se_w016b_cmp, 1
-
-	.section .rodata
-	.global	se_w016b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w016b_1:
-	.byte	KEYSH , se_w016b_key+0
-	.byte	TEMPO , 150*se_w016b_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w016b_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v108
-	.byte	W02
-	.byte		PAN   , c_v-19
-	.byte	W04
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 97*se_w016b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+16
-	.byte	W01
-	.byte		VOL   , 84*se_w016b_mvl/mxv
-	.byte	W03
-	.byte		        76*se_w016b_mvl/mxv
-	.byte		PAN   , c_v+2
-	.byte	W02
-	.byte		VOL   , 55*se_w016b_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W02
-	.byte		VOL   , 39*se_w016b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 25*se_w016b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W01
-	.byte		VOL   , 13*se_w016b_mvl/mxv
-	.byte	W03
-	.byte		        7*se_w016b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w016b:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w016b_pri	@ Priority
-	.byte	se_w016b_rev	@ Reverb.
-
-	.word	se_w016b_grp
-
-	.word	se_w016b_1
-
-	.end