From 08a565dadd67db5c7b4d185aa316d9ac18e586b7 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 17:12:04 -0400
Subject: [PATCH] Match se_w026.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 5613d49f7..e18106f6d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -777,7 +777,7 @@ SECTIONS {
         sound/songs/midi/se_w025.o(.rodata);
         sound/songs/midi/se_w025b.o(.rodata);
         sound/songs/se_w152.o(.rodata);
-        sound/songs/se_w026.o(.rodata);
+        sound/songs/midi/se_w026.o(.rodata);
         sound/songs/se_w172.o(.rodata);
         sound/songs/se_w172b.o(.rodata);
         sound/songs/se_w053.o(.rodata);
diff --git a/songs.mk b/songs.mk
index d673014fc..082112fce 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1239,5 +1239,8 @@ $(MID_SUBDIR)/se_w025.s: %.s: %.mid
 $(MID_SUBDIR)/se_w025b.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_w026.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_w026.mid b/sound/songs/midi/se_w026.mid
new file mode 100644
index 0000000000000000000000000000000000000000..d43366801aa54a55c534f1414a94166131949d83
GIT binary patch
literal 141
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si6%%Fnug?ILieWe)#;`$z
zhk?t1fxVvL0fPy{1m_&42MpGX8`w)3xy*q=9!wk96M?h~(*`aFMs_bC)0lAsmj@HO
d36QA>lvM?4XFR|J)FJ>B;bCrYW?%){0RZ{|9v%Py

literal 0
HcmV?d00001

diff --git a/sound/songs/se_w026.s b/sound/songs/se_w026.s
deleted file mode 100644
index d7e9f8425..000000000
--- a/sound/songs/se_w026.s
+++ /dev/null
@@ -1,71 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w026_grp, voicegroup128
-	.equ	se_w026_pri, 4
-	.equ	se_w026_rev, reverb_set+50
-	.equ	se_w026_mvl, 127
-	.equ	se_w026_key, 0
-	.equ	se_w026_tbs, 1
-	.equ	se_w026_exg, 0
-	.equ	se_w026_cmp, 1
-
-	.section .rodata
-	.global	se_w026
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w026_1:
-	.byte	KEYSH , se_w026_key+0
-	.byte	TEMPO , 180*se_w026_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w026_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte		N19   , Gn3 , v108
-	.byte	W02
-	.byte		BEND  , c_v-5
-	.byte	W01
-	.byte		VOL   , 101*se_w026_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v+8
-	.byte	W02
-	.byte		VOL   , 84*se_w026_mvl/mxv
-	.byte		BEND  , c_v+4
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 64*se_w026_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W02
-	.byte		VOL   , 45*se_w026_mvl/mxv
-	.byte		BEND  , c_v-31
-	.byte	W02
-	.byte		VOL   , 32*se_w026_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOICE , 2
-	.byte	W01
-	.byte		VOL   , 13*se_w026_mvl/mxv
-	.byte		BEND  , c_v-52
-	.byte	W08
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w026:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w026_pri	@ Priority
-	.byte	se_w026_rev	@ Reverb.
-
-	.word	se_w026_grp
-
-	.word	se_w026_1
-
-	.end