From 33872e8899962c1ed81dcff64328795ace0014a2 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 14:40:41 -0400
Subject: [PATCH] Match se_bowa2.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index f1aa96fc2..8fd9ff839 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -579,7 +579,7 @@ SECTIONS {
         sound/songs/se_kouka_l.o(.rodata);
         sound/songs/se_kouka_m.o(.rodata);
         sound/songs/se_kouka_h.o(.rodata);
-        sound/songs/se_bowa2.o(.rodata);
+        sound/songs/midi/se_bowa2.o(.rodata);
         sound/songs/se_poke_dead.o(.rodata);
         sound/songs/se_nigeru.o(.rodata);
         sound/songs/se_jido_doa.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9973061ba..75296b882 100644
--- a/songs.mk
+++ b/songs.mk
@@ -804,5 +804,8 @@ $(MID_SUBDIR)/se_boo.s: %.s: %.mid
 $(MID_SUBDIR)/se_bowa.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4
 
+$(MID_SUBDIR)/se_bowa2.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_bowa2.mid b/sound/songs/midi/se_bowa2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..669bed70026aefd558fc4f8f3687425d21ee9351
GIT binary patch
literal 181
zcmeYb$w*;fU|?flWME;C@C_--2J(a%{ztGdvPy6;{10U2($Ql0ug?ILQfD|2#;}3C
zp5Xz51H%OE6s87k2F3}dDXa~qAliftNFyoNVmQdauo0+SgooiFP{%}P6Xr%|28M|S
v1<Z{G49pW%Vwf9M7?=?jC^H<YVb}!JF$t)&38-{ZfC*bu0EiX=(?F#F2GJ>e

literal 0
HcmV?d00001

diff --git a/sound/songs/se_bowa2.s b/sound/songs/se_bowa2.s
deleted file mode 100644
index 571c45291..000000000
--- a/sound/songs/se_bowa2.s
+++ /dev/null
@@ -1,83 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_bowa2_grp, voicegroup127
-	.equ	se_bowa2_pri, 5
-	.equ	se_bowa2_rev, reverb_set+50
-	.equ	se_bowa2_mvl, 127
-	.equ	se_bowa2_key, 0
-	.equ	se_bowa2_tbs, 1
-	.equ	se_bowa2_exg, 0
-	.equ	se_bowa2_cmp, 1
-
-	.section .rodata
-	.global	se_bowa2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_bowa2_1:
-	.byte	KEYSH , se_bowa2_key+0
-	.byte	TEMPO , 90*se_bowa2_tbs/2
-	.byte		VOICE , 86
-	.byte		VOL   , 100*se_bowa2_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Gn1 , v100
-	.byte	W03
-	.byte		N05   , Fn2 
-	.byte	W03
-	.byte	W03
-	.byte		N06   , Fn2 , v052
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_bowa2_2:
-	.byte	KEYSH , se_bowa2_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 100*se_bowa2_mvl/mxv
-	.byte		BENDR , 12
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn3 , v052
-	.byte	W03
-	.byte		        Cn2 , v112
-	.byte	W03
-	.byte	W03
-	.byte		        Cn1 , v092
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_bowa2_3:
-	.byte	KEYSH , se_bowa2_key+0
-	.byte		VOICE , 124
-	.byte		VOL   , 100*se_bowa2_mvl/mxv
-	.byte		N03   , Gn3 , v052
-	.byte	W03
-	.byte		N06   , Gs4 
-	.byte	W03
-	.byte	W03
-	.byte		        Gs4 , v020
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_bowa2:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_bowa2_pri	@ Priority
-	.byte	se_bowa2_rev	@ Reverb.
-
-	.word	se_bowa2_grp
-
-	.word	se_bowa2_1
-	.word	se_bowa2_2
-	.word	se_bowa2_3
-
-	.end