From da9b55ea616961ec2e41d3d9b630e22c828f1b9f Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:07:23 -0400
Subject: [PATCH] Match se_hazure.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_hazure.mid | Bin 0 -> 99 bytes
 sound/songs/se_hazure.s        |  55 ---------------------------------
 4 files changed, 4 insertions(+), 56 deletions(-)
 create mode 100644 sound/songs/midi/se_hazure.mid
 delete mode 100644 sound/songs/se_hazure.s

diff --git a/ld_script.txt b/ld_script.txt
index 7749d881a4..f6e3f90448 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -596,7 +596,7 @@ SECTIONS {
         sound/songs/se_o.o(.rodata);
         sound/songs/se_n.o(.rodata);
         sound/songs/se_seikai.o(.rodata);
-        sound/songs/se_hazure.o(.rodata);
+        sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/se_jite_pyoko.o(.rodata);
         sound/songs/se_mu_pachi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 166e7db228..5b7bc5a4ab 100644
--- a/songs.mk
+++ b/songs.mk
@@ -894,5 +894,8 @@ $(MID_SUBDIR)/se_hantei2.s: %.s: %.mid
 $(MID_SUBDIR)/se_hashi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
+$(MID_SUBDIR)/se_hazure.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_hazure.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c3c52f88fa538a55b52b328f130600f564b91148
GIT binary patch
literal 99
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SizA%B|zdi$0%821W48sNy
h9tQS$h6fA|3=<6MnHvlkfV2pdt`~yxIYBf~Cjb_975o4I

literal 0
HcmV?d00001

diff --git a/sound/songs/se_hazure.s b/sound/songs/se_hazure.s
deleted file mode 100644
index 9bd29f6b54..0000000000
--- a/sound/songs/se_hazure.s
+++ /dev/null
@@ -1,55 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_hazure_grp, voicegroup127
-	.equ	se_hazure_pri, 4
-	.equ	se_hazure_rev, reverb_set+50
-	.equ	se_hazure_mvl, 127
-	.equ	se_hazure_key, 0
-	.equ	se_hazure_tbs, 1
-	.equ	se_hazure_exg, 0
-	.equ	se_hazure_cmp, 1
-
-	.section .rodata
-	.global	se_hazure
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_hazure_1:
-	.byte	KEYSH , se_hazure_key+0
-	.byte	TEMPO , 240*se_hazure_tbs/2
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_hazure_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn2 , v127
-	.byte	W03
-	.byte		        Cn2 , v020
-	.byte	W03
-	.byte		N18   , Cn2 , v127
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N09   , Cn2 , v020
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_hazure:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_hazure_pri	@ Priority
-	.byte	se_hazure_rev	@ Reverb.
-
-	.word	se_hazure_grp
-
-	.word	se_hazure_1
-
-	.end