From e2e53a86c7a4f363820b795975689cc25c424803 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Fri, 28 Sep 2018 22:02:01 -0400
Subject: [PATCH] Match mus_me_kinomi.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 5e69c9be42..5ebbaf7bd2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -870,7 +870,7 @@ SECTIONS {
         sound/songs/midi/mus_b_tower.o(.rodata);
         sound/songs/mus_swimeye.o(.rodata);
         sound/songs/midi/mus_dan03.o(.rodata);
-        sound/songs/mus_me_kinomi.o(.rodata);
+        sound/songs/midi/mus_me_kinomi.o(.rodata);
         sound/songs/mus_me_tama.o(.rodata);
         sound/songs/midi/mus_me_b_big.o(.rodata);
         sound/songs/midi/mus_me_b_small.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 83a78e05e9..fbff3ae44b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -261,6 +261,9 @@ $(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid
 $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid
 	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
 
+$(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
+	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+
 $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
 	$(MID) $< $@ -G017 -R$(STD_REVERB)
 
diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..30fbd360749d9498d8ecbf3bb110dbd1bb5e4195
GIT binary patch
literal 484
zcmZXQ%}T>S6opT8s4`433l{-5eFEJTQUnblC7aMm8H#~`n+k%vF5I}#wys?DXCB0#
zJb*uauX=(hrgRa$d(XLN?o1MMI|R^x!_Q01=#Je9)>lI8d55YZ*6DuZh4LAyk$d&o
z#H(!M;1RPV7f%UDz0H_<Og*Mvr=e~jW&?6SZu*RU#`%o%yKMb$KUH5%yvb{B_vXD^
zjC&CCKG`QXeVV)D6tz@aeLHyPg=GtiKzow_ScF<kLWms(+NHmh{&Db8rZ2JdwKw&F
zWk-u?2V#f5cInsB4{9|;@t3ydTs-srg*<{a$7QWnHz?!<Y?oFS!iFTTRmc%+$Pw1%
X0o-jPT2X1atZ7A6x^6L5S^R0g;x2Y@

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_me_kinomi.s b/sound/songs/mus_me_kinomi.s
deleted file mode 100644
index bd8696c1d5..0000000000
--- a/sound/songs/mus_me_kinomi.s
+++ /dev/null
@@ -1,167 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_me_kinomi_grp, voicegroup012
-	.equ	mus_me_kinomi_pri, 5
-	.equ	mus_me_kinomi_rev, reverb_set+50
-	.equ	mus_me_kinomi_mvl, 127
-	.equ	mus_me_kinomi_key, 0
-	.equ	mus_me_kinomi_tbs, 1
-	.equ	mus_me_kinomi_exg, 0
-	.equ	mus_me_kinomi_cmp, 1
-
-	.section .rodata
-	.global	mus_me_kinomi
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_me_kinomi_1:
-	.byte	KEYSH , mus_me_kinomi_key+0
-	.byte	W12
-	.byte	TEMPO , 140*mus_me_kinomi_tbs/2
-	.byte		VOICE , 13
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 90*mus_me_kinomi_mvl/mxv
-	.byte		N04   , Fn4 , v092
-	.byte	W04
-	.byte		        Fn4 , v080
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        Cn4 , v092
-	.byte	W04
-	.byte		        Cn4 , v080
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        Cn5 , v092
-	.byte	W08
-	.byte		        Dn5 
-	.byte	W08
-	.byte		        Cn5 
-	.byte	W08
-	.byte		        Fn5 
-	.byte	W04
-	.byte		        Fn5 , v080
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		N04   
-	.byte	W36
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_me_kinomi_2:
-	.byte	KEYSH , mus_me_kinomi_key+0
-	.byte	W12
-	.byte		VOICE , 13
-	.byte		PAN   , c_v+31
-	.byte		VOL   , 90*mus_me_kinomi_mvl/mxv
-	.byte	W24
-	.byte		N04   , Gn4 , v092
-	.byte	W08
-	.byte		        As4 
-	.byte	W08
-	.byte		        Gn4 
-	.byte	W08
-	.byte		N16   , An4 
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_me_kinomi_3:
-	.byte	KEYSH , mus_me_kinomi_key+0
-	.byte	W12
-	.byte		VOICE , 1
-	.byte		VOL   , 90*mus_me_kinomi_mvl/mxv
-	.byte		PAN   , c_v-32
-	.byte		N24   , Fn3 , v080
-	.byte	W24
-	.byte		N04   , Gn3 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N16   , Fn3 
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_me_kinomi_4:
-	.byte	KEYSH , mus_me_kinomi_key+0
-	.byte	W12
-	.byte		VOICE , 1
-	.byte		VOL   , 90*mus_me_kinomi_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N24   , An2 , v080
-	.byte	W24
-	.byte		N04   , As2 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N16   , An2 
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_me_kinomi_5:
-	.byte	KEYSH , mus_me_kinomi_key+0
-	.byte	W12
-	.byte		VOICE , 100
-	.byte		VOL   , 90*mus_me_kinomi_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N04   , Cn5 , v060
-	.byte	W08
-	.byte		PAN   , c_v-49
-	.byte		N04   , Cn5 , v020
-	.byte	W16
-	.byte		VOICE , 101
-	.byte		PAN   , c_v-1
-	.byte		N04   , As3 , v060
-	.byte	W08
-	.byte		        Gn3 
-	.byte	W08
-	.byte		PAN   , c_v+50
-	.byte		N04   , Gn3 , v020
-	.byte	W08
-	.byte		VOICE , 100
-	.byte		PAN   , c_v+0
-	.byte		N04   , An3 , v060
-	.byte	W08
-	.byte		PAN   , c_v-48
-	.byte		N04   , An3 , v020
-	.byte	W16
-	.byte		VOICE , 101
-	.byte		PAN   , c_v+0
-	.byte		N04   , An3 , v060
-	.byte	W08
-	.byte		PAN   , c_v+50
-	.byte		N04   , An3 , v020
-	.byte	W16
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_me_kinomi:
-	.byte	5	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_me_kinomi_pri	@ Priority
-	.byte	mus_me_kinomi_rev	@ Reverb.
-
-	.word	mus_me_kinomi_grp
-
-	.word	mus_me_kinomi_1
-	.word	mus_me_kinomi_2
-	.word	mus_me_kinomi_3
-	.word	mus_me_kinomi_4
-	.word	mus_me_kinomi_5
-
-	.end