From c8a57d300761a4b103795a5ec4403ecd7b3d4b90 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 15:59:49 -0400
Subject: [PATCH] Match se_tb_kara.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +++
 sound/songs/midi/se_tb_kara.mid | Bin 0 -> 78 bytes
 sound/songs/se_tb_kara.s        |  43 --------------------------------
 4 files changed, 4 insertions(+), 44 deletions(-)
 create mode 100644 sound/songs/midi/se_tb_kara.mid
 delete mode 100644 sound/songs/se_tb_kara.s

diff --git a/ld_script.txt b/ld_script.txt
index 41d1a468d..228bd2e7f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -750,7 +750,7 @@ SECTIONS {
         sound/songs/midi/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
         sound/songs/se_tb_kon.o(.rodata);
-        sound/songs/se_tb_kara.o(.rodata);
+        sound/songs/midi/se_tb_kara.o(.rodata);
         sound/songs/midi/se_bidoro.o(.rodata);
         sound/songs/se_w085.o(.rodata);
         sound/songs/se_w085b.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 59e19cf69..30781e560 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1113,5 +1113,8 @@ $(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid
 $(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2
 
+$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_tb_kara.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a4c2a51d75126aef71c8c70ef93c72e51d7f03f5
GIT binary patch
literal 78
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILl4Uqh&agp*
ahk?t1fxVvL0fQsMga8euh5!aepdtWJjSyY{

literal 0
HcmV?d00001

diff --git a/sound/songs/se_tb_kara.s b/sound/songs/se_tb_kara.s
deleted file mode 100644
index 2b5772256..000000000
--- a/sound/songs/se_tb_kara.s
+++ /dev/null
@@ -1,43 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_tb_kara_grp, voicegroup127
-	.equ	se_tb_kara_pri, 5
-	.equ	se_tb_kara_rev, reverb_set+50
-	.equ	se_tb_kara_mvl, 127
-	.equ	se_tb_kara_key, 0
-	.equ	se_tb_kara_tbs, 1
-	.equ	se_tb_kara_exg, 0
-	.equ	se_tb_kara_cmp, 1
-
-	.section .rodata
-	.global	se_tb_kara
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_tb_kara_1:
-	.byte	KEYSH , se_tb_kara_key+0
-	.byte	TEMPO , 150*se_tb_kara_tbs/2
-	.byte		VOICE , 119
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_tb_kara_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N02   , Gs4 , v040
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_tb_kara:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_tb_kara_pri	@ Priority
-	.byte	se_tb_kara_rev	@ Reverb.
-
-	.word	se_tb_kara_grp
-
-	.word	se_tb_kara_1
-
-	.end