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

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_w010.mid | Bin 0 -> 153 bytes
 sound/songs/se_w010.s        |  70 -----------------------------------
 4 files changed, 4 insertions(+), 71 deletions(-)
 create mode 100644 sound/songs/midi/se_w010.mid
 delete mode 100644 sound/songs/se_w010.s

diff --git a/ld_script.txt b/ld_script.txt
index 8606a018f6..b2c8afdc88 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -789,7 +789,7 @@ SECTIONS {
         sound/songs/se_w036.o(.rodata);
         sound/songs/se_w059.o(.rodata);
         sound/songs/se_w059b.o(.rodata);
-        sound/songs/se_w010.o(.rodata);
+        sound/songs/midi/se_w010.o(.rodata);
         sound/songs/se_w011.o(.rodata);
         sound/songs/se_w017.o(.rodata);
         sound/songs/se_w019.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 48d156d647..d857e57038 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1200,5 +1200,8 @@ $(MID_SUBDIR)/se_w006.s: %.s: %.mid
 $(MID_SUBDIR)/se_w007.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w010.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_w010.mid b/sound/songs/midi/se_w010.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4b3c1cfcfdd381d4450ee0aa54f4b86f6c9ef673
GIT binary patch
literal 153
zcmXYq%L&3j6h+S)gJT9)ejqFNSxGvW1|lc}5t3!VfIAyVN=PYFLQ1id@daF+ch7@+
z>oD}d7Qs-|;q%sXBt0`R#g25}WMxCT@_!912jXduyJ0K7yqMcgqV-}Q8XJkO!uEQ4
hwWG2$(Rt-X$OX*Q!g5wIGKWs4fUFg&m40Qedq0s|A{PJv

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w010.s b/sound/songs/se_w010.s
deleted file mode 100644
index 7df3dbd3f5..0000000000
--- a/sound/songs/se_w010.s
+++ /dev/null
@@ -1,70 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w010_grp, voicegroup128
-	.equ	se_w010_pri, 4
-	.equ	se_w010_rev, reverb_set+50
-	.equ	se_w010_mvl, 127
-	.equ	se_w010_key, 0
-	.equ	se_w010_tbs, 1
-	.equ	se_w010_exg, 0
-	.equ	se_w010_cmp, 1
-
-	.section .rodata
-	.global	se_w010
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w010_1:
-	.byte	KEYSH , se_w010_key+0
-	.byte	TEMPO , 220*se_w010_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+14
-	.byte		VOL   , 42*se_w010_mvl/mxv
-	.byte		BEND  , c_v+39
-	.byte		N10   , Gn5 , v092
-	.byte	W01
-	.byte		VOL   , 55*se_w010_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w010_mvl/mxv
-	.byte		BEND  , c_v+23
-	.byte	W01
-	.byte		PAN   , c_v-15
-	.byte		VOL   , 86*se_w010_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 110*se_w010_mvl/mxv
-	.byte		BEND  , c_v-23
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-34
-	.byte	W01
-	.byte		        c_v-55
-	.byte	W01
-	.byte		        c_v-64
-	.byte	W02
-	.byte		VOICE , 21
-	.byte		BEND  , c_v+63
-	.byte		N01   , Cn5 
-	.byte	W02
-	.byte		        Gn5 
-	.byte	W02
-	.byte		        Gn5 , v064
-	.byte	W10
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w010:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w010_pri	@ Priority
-	.byte	se_w010_rev	@ Reverb.
-
-	.word	se_w010_grp
-
-	.word	se_w010_1
-
-	.end