From 83c843474a8a890b2e379657d081067cc0be910e Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:40:34 -0500
Subject: [PATCH] Match se_rg_w_door.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_rg_w_door.mid | Bin 0 -> 168 bytes
 sound/songs/se_rg_w_door.s        |  84 ------------------------------
 4 files changed, 4 insertions(+), 85 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_w_door.mid
 delete mode 100644 sound/songs/se_rg_w_door.s

diff --git a/ld_script.txt b/ld_script.txt
index a12e90a7b..d092bbeb0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -863,7 +863,7 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/se_rg_w_door.o(.rodata);
+        sound/songs/midi/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
         sound/songs/midi/se_rg_card2.o(.rodata);
         sound/songs/midi/se_rg_card3.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e104c6730..df0cb1de9 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1050,5 +1050,8 @@ $(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
 
+$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_w_door.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e0b6ba957cef014e9eef23f2e25f6b9a40e74d5a
GIT binary patch
literal 168
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10U22wKPRU!MUgrNeNbo?!!f
zJ;Mak6b7q$<_1#+1}g^U2~G)Y8`uk&8k`syH?X@hvxl=G^f)sdjA7U)!o$FB&hU`I
zfrWvOVPd=q(?bSfMg~nr20KQEFh+(LMutqrjqIvG6{U;}HH?k%3_z|pkXz3QGztLg
CV<e6M

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_w_door.s b/sound/songs/se_rg_w_door.s
deleted file mode 100644
index 9c2349018..000000000
--- a/sound/songs/se_rg_w_door.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_w_door_grp, voicegroup129
-	.equ	se_rg_w_door_pri, 5
-	.equ	se_rg_w_door_rev, reverb_set+50
-	.equ	se_rg_w_door_mvl, 127
-	.equ	se_rg_w_door_key, 0
-	.equ	se_rg_w_door_tbs, 1
-	.equ	se_rg_w_door_exg, 0
-	.equ	se_rg_w_door_cmp, 1
-
-	.section .rodata
-	.global	se_rg_w_door
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_w_door_1:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte	TEMPO , 110*se_rg_w_door_tbs/2
-	.byte		VOICE , 127
-	.byte		VOL   , 100*se_rg_w_door_mvl/mxv
-	.byte		N03   , Fn2 , v100
-	.byte		N03   , As2 , v127
-	.byte	W06
-	.byte		N08   , Fs3 , v096
-	.byte	W06
-	.byte		VOL   , 88*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        54*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        68*se_rg_w_door_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_w_door_2:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 43*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W04
-	.byte		        c_v-50
-	.byte		N10   , Bn5 , v052
-	.byte	W02
-	.byte		BEND  , c_v-45
-	.byte	W01
-	.byte		        c_v-23
-	.byte	W01
-	.byte		        c_v-2
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		        c_v+28
-	.byte	W01
-	.byte		        c_v+41
-	.byte	W01
-	.byte		VOL   , 29*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+53
-	.byte	W01
-	.byte		        c_v+60
-	.byte	W02
-	.byte		VOL   , 18*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W09
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_w_door:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_w_door_pri	@ Priority
-	.byte	se_rg_w_door_rev	@ Reverb.
-
-	.word	se_rg_w_door_grp
-
-	.word	se_rg_w_door_1
-	.word	se_rg_w_door_2
-
-	.end