From 1d241702f225b5be32dcba80cefcefa617320985 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:30:17 -0400
Subject: [PATCH] Match se_elebeta.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 964b3148e..cb244a70e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -653,7 +653,7 @@ SECTIONS {
         sound/songs/se_t_koame_e.o(.rodata);
         sound/songs/se_t_kami.o(.rodata);
         sound/songs/se_t_kami2.o(.rodata);
-        sound/songs/se_elebeta.o(.rodata);
+        sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/se_hinsi.o(.rodata);
         sound/songs/se_expmax.o(.rodata);
         sound/songs/se_tamakoro.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 131183fa7..c7af5bc13 100644
--- a/songs.mk
+++ b/songs.mk
@@ -855,5 +855,8 @@ $(MID_SUBDIR)/se_door.s: %.s: %.mid
 $(MID_SUBDIR)/se_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
+$(MID_SUBDIR)/se_elebeta.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_elebeta.mid b/sound/songs/midi/se_elebeta.mid
new file mode 100644
index 0000000000000000000000000000000000000000..66ee5fd1fc7ae20bbdff305b154c7c2d31f7d868
GIT binary patch
literal 104
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?ILl4dxd#;`$z
oiGjVI;Q@mK!vw#8#)t+#1|%gS3<sqdHUi}*Iw~|qG&+Li0B<)K4gdfE

literal 0
HcmV?d00001

diff --git a/sound/songs/se_elebeta.s b/sound/songs/se_elebeta.s
deleted file mode 100644
index ad19476d5..000000000
--- a/sound/songs/se_elebeta.s
+++ /dev/null
@@ -1,71 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_elebeta_grp, voicegroup128
-	.equ	se_elebeta_pri, 4
-	.equ	se_elebeta_rev, reverb_set+50
-	.equ	se_elebeta_mvl, 127
-	.equ	se_elebeta_key, 0
-	.equ	se_elebeta_tbs, 1
-	.equ	se_elebeta_exg, 0
-	.equ	se_elebeta_cmp, 1
-
-	.section .rodata
-	.global	se_elebeta
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_elebeta_1:
-	.byte	KEYSH , se_elebeta_key+0
-	.byte	TEMPO , 150*se_elebeta_tbs/2
-	.byte		VOICE , 38
-	.byte		BENDR , 2
-	.byte		VOL   , 100*se_elebeta_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Fs4 , v080
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte		EOT   
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_elebeta_2:
-	.byte	KEYSH , se_elebeta_key+0
-	.byte		VOICE , 27
-	.byte		VOL   , 100*se_elebeta_mvl/mxv
-	.byte		TIE   , Fn3 , v032
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_elebeta:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_elebeta_pri	@ Priority
-	.byte	se_elebeta_rev	@ Reverb.
-
-	.word	se_elebeta_grp
-
-	.word	se_elebeta_1
-	.word	se_elebeta_2
-
-	.end