From 471aa8eeaca130668655623be332d54051c7335c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:18:51 -0400
Subject: Match se_jihanki.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 8d5181259..d67a65052 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -670,7 +670,7 @@ SECTIONS {
         sound/songs/se_op_basyu.o(.rodata);
         sound/songs/midi/se_bt_start.o(.rodata);
         sound/songs/midi/se_dendou.o(.rodata);
-        sound/songs/se_jihanki.o(.rodata);
+        sound/songs/midi/se_jihanki.o(.rodata);
         sound/songs/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9e796c83d..437a22857 100644
--- a/songs.mk
+++ b/songs.mk
@@ -909,5 +909,8 @@ $(MID_SUBDIR)/se_i.s: %.s: %.mid
 $(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
+$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_jihanki.mid b/sound/songs/midi/se_jihanki.mid
new file mode 100644
index 000000000..ac6436d72
Binary files /dev/null and b/sound/songs/midi/se_jihanki.mid differ
diff --git a/sound/songs/se_jihanki.s b/sound/songs/se_jihanki.s
deleted file mode 100644
index 931dd5b64..000000000
--- a/sound/songs/se_jihanki.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_jihanki_grp, voicegroup128
-	.equ	se_jihanki_pri, 4
-	.equ	se_jihanki_rev, reverb_set+50
-	.equ	se_jihanki_mvl, 127
-	.equ	se_jihanki_key, 0
-	.equ	se_jihanki_tbs, 1
-	.equ	se_jihanki_exg, 0
-	.equ	se_jihanki_cmp, 1
-
-	.section .rodata
-	.global	se_jihanki
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_jihanki_1:
-	.byte	KEYSH , se_jihanki_key+0
-	.byte	TEMPO , 150*se_jihanki_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 110*se_jihanki_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Cn4 , v092
-	.byte	W03
-	.byte		        Cn5 
-	.byte	W03
-	.byte	W03
-	.byte		N02   , En3 , v127
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_jihanki:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_jihanki_pri	@ Priority
-	.byte	se_jihanki_rev	@ Reverb.
-
-	.word	se_jihanki_grp
-
-	.word	se_jihanki_1
-
-	.end
-- 
cgit v1.2.3