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

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

diff --git a/ld_script.txt b/ld_script.txt
index 8f9a17f9a..496abf74e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -748,7 +748,7 @@ SECTIONS {
         sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/midi/se_tamago.o(.rodata);
-        sound/songs/se_tb_start.o(.rodata);
+        sound/songs/midi/se_tb_start.o(.rodata);
         sound/songs/midi/se_tb_kon.o(.rodata);
         sound/songs/midi/se_tb_kara.o(.rodata);
         sound/songs/midi/se_bidoro.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9ae716102..a9b52604e 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1119,5 +1119,8 @@ $(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid
 $(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
+$(MID_SUBDIR)/se_tb_start.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_tb_start.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c88e2a8ea33fc617095e26e0041cfa6882d3ce76
GIT binary patch
literal 153
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILa$`84!mvSv
zhk;9hfnAv40fQsMglGlE4eXwb>_v?1^^EMrKtWd~pa78e1xiQ(=};ie4Wttp8=@JQ
e5vEBo9CT;c$d$mrUeE9lXw*bM8_q^QunGWu6CxS_

literal 0
HcmV?d00001

diff --git a/sound/songs/se_tb_start.s b/sound/songs/se_tb_start.s
deleted file mode 100644
index 136cb1a4b..000000000
--- a/sound/songs/se_tb_start.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_tb_start_grp, voicegroup128
-	.equ	se_tb_start_pri, 5
-	.equ	se_tb_start_rev, reverb_set+50
-	.equ	se_tb_start_mvl, 127
-	.equ	se_tb_start_key, 0
-	.equ	se_tb_start_tbs, 1
-	.equ	se_tb_start_exg, 0
-	.equ	se_tb_start_cmp, 1
-
-	.section .rodata
-	.global	se_tb_start
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_tb_start_1:
-	.byte	KEYSH , se_tb_start_key+0
-	.byte	TEMPO , 150*se_tb_start_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v-32
-	.byte		VOL   , 16*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N09   , Gn5 , v032
-	.byte	W01
-	.byte		VOL   , 63*se_tb_start_mvl/mxv
-	.byte	W01
-	.byte		        98*se_tb_start_mvl/mxv
-	.byte	W01
-	.byte		        110*se_tb_start_mvl/mxv
-	.byte	W01
-	.byte		        99*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+5
-	.byte	W02
-	.byte		VOL   , 63*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+13
-	.byte	W01
-	.byte		VOL   , 22*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+21
-	.byte	W01
-	.byte		VOL   , 9*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+33
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_tb_start_2:
-	.byte	KEYSH , se_tb_start_key+0
-	.byte		VOICE , 71
-	.byte		PAN   , c_v+32
-	.byte		VOL   , 110*se_tb_start_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N09   , Fs4 , v060
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_tb_start:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_tb_start_pri	@ Priority
-	.byte	se_tb_start_rev	@ Reverb.
-
-	.word	se_tb_start_grp
-
-	.word	se_tb_start_1
-	.word	se_tb_start_2
-
-	.end