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

---
 ld_script.txt               |   2 +-
 songs.mk                    |   3 ++
 sound/songs/midi/se_kon.mid | Bin 0 -> 103 bytes
 sound/songs/se_kon.s        |  53 ------------------------------------
 4 files changed, 4 insertions(+), 54 deletions(-)
 create mode 100644 sound/songs/midi/se_kon.mid
 delete mode 100644 sound/songs/se_kon.s

diff --git a/ld_script.txt b/ld_script.txt
index d537dceac..d0faf6185 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -620,7 +620,7 @@ SECTIONS {
         sound/songs/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
         sound/songs/se_save.o(.rodata);
-        sound/songs/se_kon.o(.rodata);
+        sound/songs/midi/se_kon.o(.rodata);
         sound/songs/se_kon2.o(.rodata);
         sound/songs/se_kon3.o(.rodata);
         sound/songs/se_kon4.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3179200ec..104f867d2 100644
--- a/songs.mk
+++ b/songs.mk
@@ -930,5 +930,8 @@ $(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid
 $(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
+$(MID_SUBDIR)/se_kon.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_kon.mid
new file mode 100644
index 0000000000000000000000000000000000000000..438d4b04728b28d9d17c7ce03d5ac82c8ce7748e
GIT binary patch
literal 103
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10SilWJi2ug?IL5@$Fdz_5Y6
op5Xz5Bf|vW0-gq61{CRof(#ph(hnIN7$*9ra5nlfFavc10Ax@X+5i9m

literal 0
HcmV?d00001

diff --git a/sound/songs/se_kon.s b/sound/songs/se_kon.s
deleted file mode 100644
index 45a59f4d9..000000000
--- a/sound/songs/se_kon.s
+++ /dev/null
@@ -1,53 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_kon_grp, voicegroup128
-	.equ	se_kon_pri, 4
-	.equ	se_kon_rev, reverb_set+50
-	.equ	se_kon_mvl, 127
-	.equ	se_kon_key, 0
-	.equ	se_kon_tbs, 1
-	.equ	se_kon_exg, 0
-	.equ	se_kon_cmp, 1
-
-	.section .rodata
-	.global	se_kon
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_kon_1:
-	.byte	KEYSH , se_kon_key+0
-	.byte	TEMPO , 150*se_kon_tbs/2
-	.byte		VOICE , 16
-	.byte		VOL   , 100*se_kon_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N12   , Fn4 , v112
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_kon_2:
-	.byte	KEYSH , se_kon_key+0
-	.byte		VOICE , 17
-	.byte		VOL   , 100*se_kon_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , Fn4 , v100
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_kon:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_kon_pri	@ Priority
-	.byte	se_kon_rev	@ Reverb.
-
-	.word	se_kon_grp
-
-	.word	se_kon_1
-	.word	se_kon_2
-
-	.end