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

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_track_door.mid | Bin 0 -> 127 bytes
 sound/songs/se_track_door.s        |  61 -----------------------------
 4 files changed, 4 insertions(+), 62 deletions(-)
 create mode 100644 sound/songs/midi/se_track_door.mid
 delete mode 100644 sound/songs/se_track_door.s

diff --git a/ld_script.txt b/ld_script.txt
index bce10035e..22f2214b6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -686,7 +686,7 @@ SECTIONS {
         sound/songs/se_track_move.o(.rodata);
         sound/songs/se_track_stop.o(.rodata);
         sound/songs/se_track_haiki.o(.rodata);
-        sound/songs/se_track_door.o(.rodata);
+        sound/songs/midi/se_track_door.o(.rodata);
         sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
         sound/songs/midi/se_save.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 8ad823174..07ec6b889 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1167,5 +1167,8 @@ $(MID_SUBDIR)/se_toy_g.s: %.s: %.mid
 $(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_track_door.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_track_door.mid b/sound/songs/midi/se_track_door.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5cc1dbad8c488d686294824607520294f0544152
GIT binary patch
literal 127
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILQfD~8!LWh7
zp5Xz51H%M^80H282IdJiF^mm142%;zVwf5{7?=>s<rxmLFibR1U~V*EV4CQmz}N_s
L2GUF*8mJ5avfLaU

literal 0
HcmV?d00001

diff --git a/sound/songs/se_track_door.s b/sound/songs/se_track_door.s
deleted file mode 100644
index 8805c7b61..000000000
--- a/sound/songs/se_track_door.s
+++ /dev/null
@@ -1,61 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_track_door_grp, voicegroup128
-	.equ	se_track_door_pri, 4
-	.equ	se_track_door_rev, reverb_set+50
-	.equ	se_track_door_mvl, 127
-	.equ	se_track_door_key, 0
-	.equ	se_track_door_tbs, 1
-	.equ	se_track_door_exg, 0
-	.equ	se_track_door_cmp, 1
-
-	.section .rodata
-	.global	se_track_door
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_track_door_1:
-	.byte	KEYSH , se_track_door_key+0
-	.byte	TEMPO , 150*se_track_door_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 110*se_track_door_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn2 , v092
-	.byte	W06
-	.byte		N01   , Cn3 
-	.byte	W02
-	.byte		N02   , Cn4 
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_track_door_2:
-	.byte		VOL   , 110*se_track_door_mvl/mxv
-	.byte	KEYSH , se_track_door_key+0
-	.byte		VOICE , 4
-	.byte		N03   , Cn2 , v032
-	.byte	W05
-	.byte		N01   , Cn4 
-	.byte	W01
-	.byte	W02
-	.byte		N02   
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_track_door:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_track_door_pri	@ Priority
-	.byte	se_track_door_rev	@ Reverb.
-
-	.word	se_track_door_grp
-
-	.word	se_track_door_1
-	.word	se_track_door_2
-
-	.end