From 395e754760b9a60718e80bfabc2071ce460fdc39 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:22:40 -0400
Subject: [PATCH] Match se_jitensya.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 +++
 sound/songs/midi/se_jitensya.mid | Bin 0 -> 68 bytes
 sound/songs/se_jitensya.s        |  40 -------------------------------
 4 files changed, 4 insertions(+), 41 deletions(-)
 create mode 100644 sound/songs/midi/se_jitensya.mid
 delete mode 100644 sound/songs/se_jitensya.s

diff --git a/ld_script.txt b/ld_script.txt
index 763d4ba4c..436c717ae 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -575,7 +575,7 @@ SECTIONS {
         sound/songs/midi/se_door.o(.rodata);
         sound/songs/se_kaidan.o(.rodata);
         sound/songs/midi/se_dansa.o(.rodata);
-        sound/songs/se_jitensya.o(.rodata);
+        sound/songs/midi/se_jitensya.o(.rodata);
         sound/songs/se_kouka_l.o(.rodata);
         sound/songs/se_kouka_m.o(.rodata);
         sound/songs/se_kouka_h.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c4f5a50d8..647a30595 100644
--- a/songs.mk
+++ b/songs.mk
@@ -915,5 +915,8 @@ $(MID_SUBDIR)/se_jihanki.s: %.s: %.mid
 $(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
 
+$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_jitensya.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9d5de6cbdbd2d6d6ce72687c01eb2d991673f500
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%23k1A9Hg
N1e^MV1{(&D6adB}4+a1L

literal 0
HcmV?d00001

diff --git a/sound/songs/se_jitensya.s b/sound/songs/se_jitensya.s
deleted file mode 100644
index da5d37007..000000000
--- a/sound/songs/se_jitensya.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_jitensya_grp, voicegroup128
-	.equ	se_jitensya_pri, 4
-	.equ	se_jitensya_rev, reverb_set+50
-	.equ	se_jitensya_mvl, 127
-	.equ	se_jitensya_key, 0
-	.equ	se_jitensya_tbs, 1
-	.equ	se_jitensya_exg, 0
-	.equ	se_jitensya_cmp, 1
-
-	.section .rodata
-	.global	se_jitensya
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_jitensya_1:
-	.byte	KEYSH , se_jitensya_key+0
-	.byte	TEMPO , 120*se_jitensya_tbs/2
-	.byte		VOICE , 0
-	.byte		VOL   , 90*se_jitensya_mvl/mxv
-	.byte		N96   , Cn3 , v127
-	.byte	W96
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_jitensya:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_jitensya_pri	@ Priority
-	.byte	se_jitensya_rev	@ Reverb.
-
-	.word	se_jitensya_grp
-
-	.word	se_jitensya_1
-
-	.end