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

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w029.mid | Bin 0 -> 194 bytes
 sound/songs/se_w029.s        |  87 -----------------------------------
 4 files changed, 4 insertions(+), 88 deletions(-)
 create mode 100644 sound/songs/midi/se_w029.mid
 delete mode 100644 sound/songs/se_w029.s

diff --git a/ld_script.txt b/ld_script.txt
index af20a656e..7cd40e6a8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -796,7 +796,7 @@ SECTIONS {
         sound/songs/midi/se_w028.o(.rodata);
         sound/songs/midi/se_w013b.o(.rodata);
         sound/songs/se_w044.o(.rodata);
-        sound/songs/se_w029.o(.rodata);
+        sound/songs/midi/se_w029.o(.rodata);
         sound/songs/se_w057.o(.rodata);
         sound/songs/se_w056.o(.rodata);
         sound/songs/se_w250.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4de674bba..4083c4423 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1245,5 +1245,8 @@ $(MID_SUBDIR)/se_w026.s: %.s: %.mid
 $(MID_SUBDIR)/se_w028.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w029.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_w029.mid b/sound/songs/midi/se_w029.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4cde4e2d54d3a50e6e6dd46c8d82d0516e4c100c
GIT binary patch
literal 194
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILn#gc~iD82X
z4+ED21G_B40|o(x2`crB8`uqiY(>TmT<#3)PC%vsP$&jSI{<~e8QANAOg|=u1jYsx
z28In>evB}^YCyeQ!3;3%5WP$rK&C^rL-YbwSpdxd8lc7iWScT`8L|RpfDQuye&s50

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w029.s b/sound/songs/se_w029.s
deleted file mode 100644
index 1f85e9449..000000000
--- a/sound/songs/se_w029.s
+++ /dev/null
@@ -1,87 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w029_grp, voicegroup128
-	.equ	se_w029_pri, 4
-	.equ	se_w029_rev, reverb_set+50
-	.equ	se_w029_mvl, 127
-	.equ	se_w029_key, 0
-	.equ	se_w029_tbs, 1
-	.equ	se_w029_exg, 0
-	.equ	se_w029_cmp, 1
-
-	.section .rodata
-	.global	se_w029
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w029_1:
-	.byte	KEYSH , se_w029_key+0
-	.byte	TEMPO , 150*se_w029_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 25*se_w029_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte		N07   , Cn1 , v127
-	.byte	W01
-	.byte		VOL   , 41*se_w029_mvl/mxv
-	.byte		BEND  , c_v-31
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte		VOL   , 57*se_w029_mvl/mxv
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 79*se_w029_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		PAN   , c_v+11
-	.byte		VOL   , 110*se_w029_mvl/mxv
-	.byte		BEND  , c_v+14
-	.byte	W02
-	.byte		        c_v+32
-	.byte	W01
-	.byte		PAN   , c_v+14
-	.byte	W01
-	.byte		VOL   , 25*se_w029_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte		N07   , Dn1 
-	.byte	W01
-	.byte		PAN   , c_v+19
-	.byte		VOL   , 41*se_w029_mvl/mxv
-	.byte		BEND  , c_v-31
-	.byte	W01
-	.byte		VOL   , 57*se_w029_mvl/mxv
-	.byte		BEND  , c_v-16
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 79*se_w029_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 110*se_w029_mvl/mxv
-	.byte		BEND  , c_v+14
-	.byte	W01
-	.byte		PAN   , c_v-8
-	.byte		BEND  , c_v+32
-	.byte	W02
-	.byte		PAN   , c_v-11
-	.byte	W03
-	.byte		        c_v-15
-	.byte	W05
-	.byte		VOL   , 110*se_w029_mvl/mxv
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w029:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w029_pri	@ Priority
-	.byte	se_w029_rev	@ Reverb.
-
-	.word	se_w029_grp
-
-	.word	se_w029_1
-
-	.end