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

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +++
 sound/songs/midi/se_kaifuku.mid | Bin 0 -> 91 bytes
 sound/songs/se_kaifuku.s        |  46 --------------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/se_kaifuku.mid
 delete mode 100644 sound/songs/se_kaifuku.s

diff --git a/ld_script.txt b/ld_script.txt
index 16596f7acf..138590628f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -565,7 +565,7 @@ SECTIONS {
     ALIGN(4)
     {
         sound/songs/midi/mus_dummy.o(.rodata);
-        sound/songs/se_kaifuku.o(.rodata);
+        sound/songs/midi/se_kaifuku.o(.rodata);
         sound/songs/se_pc_login.o(.rodata);
         sound/songs/se_pc_off.o(.rodata);
         sound/songs/se_pc_on.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4e9ad717ad..fdeaf431f4 100644
--- a/songs.mk
+++ b/songs.mk
@@ -924,5 +924,8 @@ $(MID_SUBDIR)/se_jyuni.s: %.s: %.mid
 $(MID_SUBDIR)/se_kaidan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5
 
+$(MID_SUBDIR)/se_kaifuku.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_kaifuku.mid b/sound/songs/midi/se_kaifuku.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4375a705d79e11da4f581e4673554cade3506263
GIT binary patch
literal 91
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Sidq0ukzdi$0N{it@G{Xk=
edWHuKRtytt3YZ#f7?@!6fhdp=KTwDfr~?3(R~7&O

literal 0
HcmV?d00001

diff --git a/sound/songs/se_kaifuku.s b/sound/songs/se_kaifuku.s
deleted file mode 100644
index ecaf63c92b..0000000000
--- a/sound/songs/se_kaifuku.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_kaifuku_grp, voicegroup127
-	.equ	se_kaifuku_pri, 5
-	.equ	se_kaifuku_rev, reverb_set+50
-	.equ	se_kaifuku_mvl, 127
-	.equ	se_kaifuku_key, 0
-	.equ	se_kaifuku_tbs, 1
-	.equ	se_kaifuku_exg, 0
-	.equ	se_kaifuku_cmp, 1
-
-	.section .rodata
-	.global	se_kaifuku
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_kaifuku_1:
-	.byte	KEYSH , se_kaifuku_key+0
-	.byte	TEMPO , 132*se_kaifuku_tbs/2
-	.byte		VOICE , 91
-	.byte		VOL   , 100*se_kaifuku_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Cn3 , v112
-	.byte	W04
-	.byte		N02   
-	.byte	W04
-	.byte		VOICE , 90
-	.byte		N15   
-	.byte	W16
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_kaifuku:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_kaifuku_pri	@ Priority
-	.byte	se_kaifuku_rev	@ Reverb.
-
-	.word	se_kaifuku_grp
-
-	.word	se_kaifuku_1
-
-	.end