From 285608666b730ec5f0000b59bbaca7ac6270bae9 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 17:23:38 -0400
Subject: [PATCH] Match se_w043.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 +
 sound/songs/midi/se_w043.mid | Bin 0 -> 245 bytes
 sound/songs/se_w043.s        | 105 -----------------------------------
 4 files changed, 4 insertions(+), 106 deletions(-)
 create mode 100644 sound/songs/midi/se_w043.mid
 delete mode 100644 sound/songs/se_w043.s

diff --git a/ld_script.txt b/ld_script.txt
index 1d1079ec9..d5d894528 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -826,7 +826,7 @@ SECTIONS {
         sound/songs/se_w060.o(.rodata);
         sound/songs/se_w185.o(.rodata);
         sound/songs/midi/se_w014.o(.rodata);
-        sound/songs/se_w043.o(.rodata);
+        sound/songs/midi/se_w043.o(.rodata);
         sound/songs/se_w207.o(.rodata);
         sound/songs/se_w207b.o(.rodata);
         sound/songs/se_w215.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 0e63287c4..91ff944ce 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1257,5 +1257,8 @@ $(MID_SUBDIR)/se_w036.s: %.s: %.mid
 $(MID_SUBDIR)/se_w039.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w043.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_w043.mid b/sound/songs/midi/se_w043.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b4487672298a728689c360385a63e94b573613b4
GIT binary patch
literal 245
zcmYL@F$%&!6hvpUG0I}4DT0+?V<BjfLL|jPAcYuENMT`VA=p_9#v5!(Z?WD$Z{khj
zL>H}QKJV@RpBINcfB*s#QC^&mocgG@zVM?C>WvHrCF&_0y5Z4-ZC?;}p)_95F#7D3
z8Za3%gEV?4IR{oP$W{##R%PVu<d*M@j-3;;&z-ZR!=AzWIz#8o=uAF4tXk7y|NRp-
dj`$xq!n1`t53G{0xF+x_&D4-p%1jYceFGI0H{AdL

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w043.s b/sound/songs/se_w043.s
deleted file mode 100644
index 85abb295e..000000000
--- a/sound/songs/se_w043.s
+++ /dev/null
@@ -1,105 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w043_grp, voicegroup128
-	.equ	se_w043_pri, 4
-	.equ	se_w043_rev, reverb_set+50
-	.equ	se_w043_mvl, 127
-	.equ	se_w043_key, 0
-	.equ	se_w043_tbs, 1
-	.equ	se_w043_exg, 0
-	.equ	se_w043_cmp, 1
-
-	.section .rodata
-	.global	se_w043
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w043_1:
-	.byte	KEYSH , se_w043_key+0
-	.byte	TEMPO , 150*se_w043_tbs/2
-	.byte		VOICE , 18
-	.byte		VOL   , 110*se_w043_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N02   , En3 , v124
-	.byte	W02
-	.byte		        As3 
-	.byte	W04
-	.byte	W01
-	.byte		N03   , En3 , v092
-	.byte	W05
-	.byte	W04
-	.byte		PAN   , c_v-6
-	.byte		N02   , En3 , v076
-	.byte	W02
-	.byte	W01
-	.byte		PAN   , c_v+6
-	.byte		N02   , As3 
-	.byte	W05
-	.byte		PAN   , c_v+0
-	.byte		N03   , En3 , v052
-	.byte	W06
-	.byte	W03
-	.byte		PAN   , c_v-12
-	.byte		N02   , En3 , v056
-	.byte	W03
-	.byte		PAN   , c_v+10
-	.byte		N02   , As3 
-	.byte	W04
-	.byte		PAN   , c_v+0
-	.byte		N03   , En3 , v032
-	.byte	W02
-	.byte	W06
-	.byte	W01
-	.byte		PAN   , c_v-16
-	.byte		N02   , En3 , v044
-	.byte	W02
-	.byte		PAN   , c_v+16
-	.byte		N02   , As3 
-	.byte	W03
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		N03   , En3 , v020
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w043_2:
-	.byte	KEYSH , se_w043_key+0
-	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w043_mvl/mxv
-	.byte		N01   , Cn3 , v040
-	.byte	W03
-	.byte		        En3 
-	.byte	W03
-	.byte	W01
-	.byte		        Gn3 
-	.byte	W05
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w043:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w043_pri	@ Priority
-	.byte	se_w043_rev	@ Reverb.
-
-	.word	se_w043_grp
-
-	.word	se_w043_1
-	.word	se_w043_2
-
-	.end