From 410492dea9d67fd84286ae5955bd3e4f48c692aa Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:42:11 -0500
Subject: [PATCH] Match se_ru_bari.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_ru_bari.mid | Bin 0 -> 142 bytes
 sound/songs/se_ru_bari.s        |  64 --------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_ru_bari.mid
 delete mode 100644 sound/songs/se_ru_bari.s

diff --git a/ld_script.txt b/ld_script.txt
index d092bbeb0..14f0be417 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -657,7 +657,7 @@ SECTIONS {
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
-        sound/songs/se_ru_bari.o(.rodata);
+        sound/songs/midi/se_ru_bari.o(.rodata);
         sound/songs/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
diff --git a/songs.mk b/songs.mk
index df0cb1de9..6891acd9b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1053,5 +1053,8 @@ $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
 
+$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ru_bari.mid
new file mode 100644
index 0000000000000000000000000000000000000000..14b1991e655510e8b2c8c22ddc744d8a07847f60
GIT binary patch
literal 142
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?IL(q}lp$*_UF
zp5Xz51H**q2*!qJ1{lpaA;E*OA%THuLV^XDMrc!GI9SE75vXmVc>!aiIRoRtYQ~8H
S35<;a3``RPfI>hTs2Tw3rXtS(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_bari.s b/sound/songs/se_ru_bari.s
deleted file mode 100644
index ffff1b406..000000000
--- a/sound/songs/se_ru_bari.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_bari_grp, voicegroup127
-	.equ	se_ru_bari_pri, 4
-	.equ	se_ru_bari_rev, reverb_set+50
-	.equ	se_ru_bari_mvl, 127
-	.equ	se_ru_bari_key, 0
-	.equ	se_ru_bari_tbs, 1
-	.equ	se_ru_bari_exg, 0
-	.equ	se_ru_bari_cmp, 1
-
-	.section .rodata
-	.global	se_ru_bari
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_bari_1:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte	TEMPO , 150*se_ru_bari_tbs/2
-	.byte		VOICE , 9
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn5 , v088
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Cn6 , v072
-	.byte	W03
-	.byte		        Cn6 , v056
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_bari_2:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		N01   , Gn2 , v112
-	.byte	W02
-	.byte		VOICE , 123
-	.byte	W01
-	.byte		N01   , Gs4 , v096
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_bari:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_bari_pri	@ Priority
-	.byte	se_ru_bari_rev	@ Reverb.
-
-	.word	se_ru_bari_grp
-
-	.word	se_ru_bari_1
-	.word	se_ru_bari_2
-
-	.end