From bfb84d3073bd6a2bdcff44c33a2eda24178a217c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:06:03 -0500
Subject: [PATCH] Match se_t_kami2.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_kami2.mid | Bin 0 -> 142 bytes
 sound/songs/se_t_kami2.s        |  80 --------------------------------
 4 files changed, 4 insertions(+), 81 deletions(-)
 create mode 100644 sound/songs/midi/se_t_kami2.mid
 delete mode 100644 sound/songs/se_t_kami2.s

diff --git a/ld_script.txt b/ld_script.txt
index ed31037d7..99347f7a8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -703,7 +703,7 @@ SECTIONS {
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
-        sound/songs/se_t_kami2.o(.rodata);
+        sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
         sound/songs/midi/se_expmax.o(.rodata);
diff --git a/songs.mk b/songs.mk
index aac11ad7b..48b3401bd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1086,6 +1086,9 @@ $(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
 
+$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
+
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_t_kami2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c47731b9450ee91f8d00e7abc8b046b4b6b2e3b3
GIT binary patch
literal 142
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?ILie)$;#IQkx
zhk?t1fxVvL0Yfsw1fv4x2MpfK3=Yf;Zfpz=5)2M(3^tq$#+(d#oEzB7fQr<CbODf-
e0@B$)S{O(tusvYlVcx**#l~*V)?mZ{vIGFe3LQ59

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_kami2.s b/sound/songs/se_t_kami2.s
deleted file mode 100644
index 1c400fe6a..000000000
--- a/sound/songs/se_t_kami2.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_kami2_grp, voicegroup128
-	.equ	se_t_kami2_pri, 3
-	.equ	se_t_kami2_rev, reverb_set+50
-	.equ	se_t_kami2_mvl, 127
-	.equ	se_t_kami2_key, 0
-	.equ	se_t_kami2_tbs, 1
-	.equ	se_t_kami2_exg, 0
-	.equ	se_t_kami2_cmp, 1
-
-	.section .rodata
-	.global	se_t_kami2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_kami2_1:
-	.byte	KEYSH , se_t_kami2_key+0
-	.byte	TEMPO , 220*se_t_kami2_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v+35
-	.byte		TIE   , Dn2 , v112
-	.byte	W03
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W03
-	.byte		        c_v+6
-	.byte	W06
-	.byte		        c_v+0
-	.byte	W09
-	.byte	W15
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v-4
-	.byte	W03
-	.byte	W06
-	.byte		        c_v-13
-	.byte	W09
-	.byte		        c_v-18
-	.byte	W09
-	.byte		VOL   , 102*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-25
-	.byte	W09
-	.byte		VOL   , 97*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W09
-	.byte		VOL   , 92*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W06
-	.byte	W03
-	.byte		VOL   , 83*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		BEND  , c_v-52
-	.byte	W03
-	.byte		VOL   , 64*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		        47*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_kami2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_kami2_pri	@ Priority
-	.byte	se_t_kami2_rev	@ Reverb.
-
-	.word	se_t_kami2_grp
-
-	.word	se_t_kami2_1
-
-	.end