From 98831e29bb0065cc4446c4f0e2ae7266ac918cc3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:45:44 -0500
Subject: [PATCH] Match se_ru_gasyan.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_ru_gasyan.mid | Bin 0 -> 184 bytes
 sound/songs/se_ru_gasyan.s        |  83 ------------------------------
 4 files changed, 4 insertions(+), 84 deletions(-)
 create mode 100644 sound/songs/midi/se_ru_gasyan.mid
 delete mode 100644 sound/songs/se_ru_gasyan.s

diff --git a/ld_script.txt b/ld_script.txt
index f7dbccf45..759db90d7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -656,7 +656,7 @@ SECTIONS {
         sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/midi/se_ru_gashin.o(.rodata);
-        sound/songs/se_ru_gasyan.o(.rodata);
+        sound/songs/midi/se_ru_gasyan.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);
diff --git a/songs.mk b/songs.mk
index 25e0f9ff1..819a73997 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1059,5 +1059,8 @@ $(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
 $(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
+$(MID_SUBDIR)/se_ru_gasyan.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_ru_gasyan.mid b/sound/songs/midi/se_ru_gasyan.mid
new file mode 100644
index 0000000000000000000000000000000000000000..486eabb9be57b7a8b7fede6266d748966370b087
GIT binary patch
literal 184
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SiU#P(FU!MUg<->4*nPCHa
zJ;MVA2ZjmG6^sqe49pWefV2k#P|SysA&hZCNC9I*2#A}^#E{3xP{uI9BLk#>@c~0U
rP&NT9i!jre;UEjcMxdD!T^tx2T^N|5G~+~HAm5jP3Cd@J@qt<aFdr+?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_gasyan.s b/sound/songs/se_ru_gasyan.s
deleted file mode 100644
index 8cf3f12ea..000000000
--- a/sound/songs/se_ru_gasyan.s
+++ /dev/null
@@ -1,83 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_gasyan_grp, voicegroup128
-	.equ	se_ru_gasyan_pri, 4
-	.equ	se_ru_gasyan_rev, reverb_set+50
-	.equ	se_ru_gasyan_mvl, 127
-	.equ	se_ru_gasyan_key, 0
-	.equ	se_ru_gasyan_tbs, 1
-	.equ	se_ru_gasyan_exg, 0
-	.equ	se_ru_gasyan_cmp, 1
-
-	.section .rodata
-	.global	se_ru_gasyan
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_gasyan_1:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte	TEMPO , 120*se_ru_gasyan_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 , v120
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W01
-	.byte		BEND  , c_v+12
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		N01   , Cn5 , v112
-	.byte	W01
-	.byte		BEND  , c_v+35
-	.byte	W01
-	.byte	W01
-	.byte		        c_v+46
-	.byte	W01
-	.byte		        c_v+54
-	.byte		N01   , Cn4 , v104
-	.byte	W01
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		N01   , Cn5 , v096
-	.byte	W01
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_gasyan_2:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		N01   , Gs3 , v064
-	.byte	W03
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Fn4 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W03
-	.byte		        Fn4 
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_gasyan:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_gasyan_pri	@ Priority
-	.byte	se_ru_gasyan_rev	@ Reverb.
-
-	.word	se_ru_gasyan_grp
-
-	.word	se_ru_gasyan_1
-	.word	se_ru_gasyan_2
-
-	.end