From de8013c6d10084dff4c8df6546e556071dc6ba64 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:47:27 -0400
Subject: [PATCH] Match se_kouka_m.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_kouka_m.mid | Bin 0 -> 123 bytes
 sound/songs/se_kouka_m.s        |  82 --------------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)
 create mode 100644 sound/songs/midi/se_kouka_m.mid
 delete mode 100644 sound/songs/se_kouka_m.s

diff --git a/ld_script.txt b/ld_script.txt
index 4461d2535..8e73eaef8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -577,7 +577,7 @@ SECTIONS {
         sound/songs/midi/se_dansa.o(.rodata);
         sound/songs/midi/se_jitensya.o(.rodata);
         sound/songs/midi/se_kouka_l.o(.rodata);
-        sound/songs/se_kouka_m.o(.rodata);
+        sound/songs/midi/se_kouka_m.o(.rodata);
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
         sound/songs/se_poke_dead.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 5b20250be..dd65ffce7 100644
--- a/songs.mk
+++ b/songs.mk
@@ -948,5 +948,8 @@ $(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid
 $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
+$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_kouka_m.mid
new file mode 100644
index 0000000000000000000000000000000000000000..d98bd00272d1a55e7e59be5fd6c26437c72c333f
GIT binary patch
literal 123
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10U2($Ql0ug?ILQfD|&%dmmH
zp5Xz51H%NX6y^pi1|VCWVS;@MGf+&i!JdH`p<J5bAOpijpz?_}^~{Yn3?NzvNQ(lM
F004J_9R~ma

literal 0
HcmV?d00001

diff --git a/sound/songs/se_kouka_m.s b/sound/songs/se_kouka_m.s
deleted file mode 100644
index b285c1566..000000000
--- a/sound/songs/se_kouka_m.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_kouka_m_grp, voicegroup127
-	.equ	se_kouka_m_pri, 5
-	.equ	se_kouka_m_rev, reverb_set+50
-	.equ	se_kouka_m_mvl, 127
-	.equ	se_kouka_m_key, 0
-	.equ	se_kouka_m_tbs, 1
-	.equ	se_kouka_m_exg, 0
-	.equ	se_kouka_m_cmp, 1
-
-	.section .rodata
-	.global	se_kouka_m
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_kouka_m_1:
-	.byte	KEYSH , se_kouka_m_key+0
-	.byte	TEMPO , 90*se_kouka_m_tbs/2
-	.byte		VOICE , 125
-	.byte		VOL   , 110*se_kouka_m_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , As2 , v100
-	.byte	W03
-	.byte		BEND  , c_v-33
-	.byte		N36   , Ds3 
-	.byte	W03
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_kouka_m_2:
-	.byte	KEYSH , se_kouka_m_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 110*se_kouka_m_mvl/mxv
-	.byte		N03   , Cn3 , v127
-	.byte	W03
-	.byte		N18   
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_kouka_m:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_kouka_m_pri	@ Priority
-	.byte	se_kouka_m_rev	@ Reverb.
-
-	.word	se_kouka_m_grp
-
-	.word	se_kouka_m_1
-	.word	se_kouka_m_2
-
-	.end