From 3f7e0884713997b9c548d7cc940b4e615057921c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:59:59 -0500
Subject: [PATCH] Match se_regi.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_regi.mid | Bin 0 -> 130 bytes
 sound/songs/se_regi.s        |  63 -----------------------------------
 4 files changed, 4 insertions(+), 64 deletions(-)
 create mode 100644 sound/songs/midi/se_regi.mid
 delete mode 100644 sound/songs/se_regi.s

diff --git a/ld_script.txt b/ld_script.txt
index 59f7811cda..d5c4eafabb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -710,7 +710,7 @@ SECTIONS {
         sound/songs/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
-        sound/songs/se_regi.o(.rodata);
+        sound/songs/midi/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
         sound/songs/midi/se_c_maku_u.o(.rodata);
         sound/songs/midi/se_c_maku_d.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 2c0f873102..1e626a8fca 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1005,5 +1005,8 @@ $(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
 $(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
 
+$(MID_SUBDIR)/se_regi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_regi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..28b727cb5ea4f01c8d1de2fb5f9d64ed21812380
GIT binary patch
literal 130
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10SiSLb8+ug?IL(qcHk#;`$z
zhk?DG;Q@m^!vy<!#s+%^#tAMd%ndFKOcNqK1R5e47!f+;84mI>Yy>KQ$Y8-V(Zz<j
O5vXipq>Vr$L>U0+I2~~S

literal 0
HcmV?d00001

diff --git a/sound/songs/se_regi.s b/sound/songs/se_regi.s
deleted file mode 100644
index 2bc43c5159..0000000000
--- a/sound/songs/se_regi.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_regi_grp, voicegroup127
-	.equ	se_regi_pri, 5
-	.equ	se_regi_rev, reverb_set+50
-	.equ	se_regi_mvl, 127
-	.equ	se_regi_key, 0
-	.equ	se_regi_tbs, 1
-	.equ	se_regi_exg, 0
-	.equ	se_regi_cmp, 1
-
-	.section .rodata
-	.global	se_regi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_regi_1:
-	.byte	KEYSH , se_regi_key+0
-	.byte	TEMPO , 128*se_regi_tbs/2
-	.byte		VOICE , 6
-	.byte		BENDR , 12
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		N03   , Gs3 , v100
-	.byte	W05
-	.byte		N16   , Fn5 , v072
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_regi_2:
-	.byte	KEYSH , se_regi_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W02
-	.byte		N03   , Gs3 , v060
-	.byte	W05
-	.byte		N16   , Fn5 
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_regi:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_regi_pri	@ Priority
-	.byte	se_regi_rev	@ Reverb.
-
-	.word	se_regi_grp
-
-	.word	se_regi_1
-	.word	se_regi_2
-
-	.end