From 005ac398fb8381c62baf42bba598aac19dfed8e2 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 14:27:30 -0400
Subject: [PATCH] Match se_ban.mid

---
 ld_script.txt               |   2 +-
 songs.mk                    |   3 ++
 sound/songs/midi/se_ban.mid | Bin 0 -> 148 bytes
 sound/songs/se_ban.s        |  70 ------------------------------------
 4 files changed, 4 insertions(+), 71 deletions(-)
 create mode 100644 sound/songs/midi/se_ban.mid
 delete mode 100644 sound/songs/se_ban.s

diff --git a/ld_script.txt b/ld_script.txt
index 7814be677..5bbb215a1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -584,7 +584,7 @@ SECTIONS {
         sound/songs/se_nigeru.o(.rodata);
         sound/songs/se_jido_doa.o(.rodata);
         sound/songs/se_naminori.o(.rodata);
-        sound/songs/se_ban.o(.rodata);
+        sound/songs/midi/se_ban.o(.rodata);
         sound/songs/se_pin.o(.rodata);
         sound/songs/se_boo.o(.rodata);
         sound/songs/se_bowa.o(.rodata);
diff --git a/songs.mk b/songs.mk
index f2f358234..aa41d5c67 100644
--- a/songs.mk
+++ b/songs.mk
@@ -789,5 +789,8 @@ $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid
 $(MID_SUBDIR)/se_a.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
+$(MID_SUBDIR)/se_ban.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_ban.mid b/sound/songs/midi/se_ban.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0722a1c366657f70de365aa9e39650fdd988ba91
GIT binary patch
literal 148
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SizA%B|zdi$0Dw*K`6T=1(
z9tQS$h6fA|3=>T1nHx+P7$z72X(J%5UC-8_4WupWRW`8a0@YYEZ(xsOW)A`~O@K^u
eW_DE|Qy0jTU}on8GF5;~1|TiX++fK7vI+o;hap}7

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ban.s b/sound/songs/se_ban.s
deleted file mode 100644
index c4e39b5cd..000000000
--- a/sound/songs/se_ban.s
+++ /dev/null
@@ -1,70 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ban_grp, voicegroup128
-	.equ	se_ban_pri, 4
-	.equ	se_ban_rev, reverb_set+50
-	.equ	se_ban_mvl, 127
-	.equ	se_ban_key, 0
-	.equ	se_ban_tbs, 1
-	.equ	se_ban_exg, 0
-	.equ	se_ban_cmp, 1
-
-	.section .rodata
-	.global	se_ban
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ban_1:
-	.byte	KEYSH , se_ban_key+0
-	.byte	TEMPO , 240*se_ban_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		VOL   , 110*se_ban_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , En2 , v127
-	.byte	W03
-	.byte		        Dn2 
-	.byte	W03
-	.byte		N06   , Gn1 
-	.byte	W06
-	.byte		N60   , An2 
-	.byte	W12
-	.byte	W24
-	.byte		VOL   , 94*se_ban_mvl/mxv
-	.byte		BEND  , c_v-5
-	.byte	W03
-	.byte		VOL   , 81*se_ban_mvl/mxv
-	.byte	W03
-	.byte		        71*se_ban_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W03
-	.byte		VOL   , 47*se_ban_mvl/mxv
-	.byte	W03
-	.byte		        32*se_ban_mvl/mxv
-	.byte		BEND  , c_v-19
-	.byte	W03
-	.byte		VOL   , 20*se_ban_mvl/mxv
-	.byte	W03
-	.byte		        7*se_ban_mvl/mxv
-	.byte		BEND  , c_v-28
-	.byte	W03
-	.byte		VOL   , 0*se_ban_mvl/mxv
-	.byte		BEND  , c_v-37
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ban:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ban_pri	@ Priority
-	.byte	se_ban_rev	@ Reverb.
-
-	.word	se_ban_grp
-
-	.word	se_ban_1
-
-	.end