From 44d003140b0ce0133b5858a59aaa82779caaaa64 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 14:34:21 -0400
Subject: [PATCH] Match se_bidoro.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_bidoro.mid | Bin 0 -> 135 bytes
 sound/songs/se_bidoro.s        |  61 ---------------------------------
 4 files changed, 4 insertions(+), 62 deletions(-)
 create mode 100644 sound/songs/midi/se_bidoro.mid
 delete mode 100644 sound/songs/se_bidoro.s

diff --git a/ld_script.txt b/ld_script.txt
index bc158cc09..c2b66abc8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -681,7 +681,7 @@ SECTIONS {
         sound/songs/se_tb_start.o(.rodata);
         sound/songs/se_tb_kon.o(.rodata);
         sound/songs/se_tb_kara.o(.rodata);
-        sound/songs/se_bidoro.o(.rodata);
+        sound/songs/midi/se_bidoro.o(.rodata);
         sound/songs/se_w085.o(.rodata);
         sound/songs/se_w085b.o(.rodata);
         sound/songs/se_w231.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7fc259865..7ec2151a3 100644
--- a/songs.mk
+++ b/songs.mk
@@ -795,5 +795,8 @@ $(MID_SUBDIR)/se_ban.s: %.s: %.mid
 $(MID_SUBDIR)/se_basabasa.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
 
+$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_bidoro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a0b639ba4c109a60a7577e89c59048283d0fd6e3
GIT binary patch
literal 135
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SiU#P(FU!MUg6~=HthG7G{
z0)q$#!vh8fh6xTOj13M9K%sgd--cm=HIQ%30AxEeOt1m6Z5Y_W>fB41K-wNKSTaJ?
P8Z$PygVbrV08Iw~$B!S+

literal 0
HcmV?d00001

diff --git a/sound/songs/se_bidoro.s b/sound/songs/se_bidoro.s
deleted file mode 100644
index 6130a39a2..000000000
--- a/sound/songs/se_bidoro.s
+++ /dev/null
@@ -1,61 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_bidoro_grp, voicegroup128
-	.equ	se_bidoro_pri, 5
-	.equ	se_bidoro_rev, reverb_set+50
-	.equ	se_bidoro_mvl, 127
-	.equ	se_bidoro_key, 0
-	.equ	se_bidoro_tbs, 1
-	.equ	se_bidoro_exg, 0
-	.equ	se_bidoro_cmp, 1
-
-	.section .rodata
-	.global	se_bidoro
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_bidoro_1:
-	.byte	KEYSH , se_bidoro_key+0
-	.byte	TEMPO , 120*se_bidoro_tbs/2
-	.byte		VOICE , 28
-	.byte		VOL   , 26*se_bidoro_mvl/mxv
-	.byte		BENDR , 8
-	.byte		BEND  , c_v+0
-	.byte		N01   , En3 , v116
-	.byte	W01
-	.byte		VOL   , 105*se_bidoro_mvl/mxv
-	.byte		BEND  , c_v-4
-	.byte		N01   , Bn2 
-	.byte	W01
-	.byte		BEND  , c_v+3
-	.byte		N01   , Cn3 
-	.byte	W04
-	.byte	W04
-	.byte		BEND  , c_v+0
-	.byte		N04   , Bn3 
-	.byte	W02
-	.byte		VOL   , 26*se_bidoro_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte	W01
-	.byte		VOL   , 105*se_bidoro_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		        c_v-23
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_bidoro:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_bidoro_pri	@ Priority
-	.byte	se_bidoro_rev	@ Reverb.
-
-	.word	se_bidoro_grp
-
-	.word	se_bidoro_1
-
-	.end