From 1d08ff3a60d55fb2a91720e8e625c241c70e8596 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:30:05 -0400
Subject: [PATCH] Match se_track_haiki.mid

---
 ld_script.txt                       |   2 +-
 songs.mk                            |   3 ++
 sound/songs/midi/se_track_haiki.mid | Bin 0 -> 76 bytes
 sound/songs/se_track_haiki.s        |  49 ----------------------------
 4 files changed, 4 insertions(+), 50 deletions(-)
 create mode 100644 sound/songs/midi/se_track_haiki.mid
 delete mode 100644 sound/songs/se_track_haiki.s

diff --git a/ld_script.txt b/ld_script.txt
index 22f2214b6b..ba1054eb53 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -685,7 +685,7 @@ SECTIONS {
         sound/songs/midi/se_hi_turun.o(.rodata);
         sound/songs/se_track_move.o(.rodata);
         sound/songs/se_track_stop.o(.rodata);
-        sound/songs/se_track_haiki.o(.rodata);
+        sound/songs/midi/se_track_haiki.o(.rodata);
         sound/songs/midi/se_track_door.o(.rodata);
         sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 07ec6b8898..1cc20ee561 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1170,5 +1170,8 @@ $(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid
 $(MID_SUBDIR)/se_track_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_track_haiki.mid
new file mode 100644
index 0000000000000000000000000000000000000000..42db7fd0e0612b6c2954faf85000b902285aae0c
GIT binary patch
literal 76
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILl4dwi!LWh7
Xo?(K!3|oUc1H*&>8PSFS29Oc}KtB+e

literal 0
HcmV?d00001

diff --git a/sound/songs/se_track_haiki.s b/sound/songs/se_track_haiki.s
deleted file mode 100644
index 88737eb882..0000000000
--- a/sound/songs/se_track_haiki.s
+++ /dev/null
@@ -1,49 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_track_haiki_grp, voicegroup127
-	.equ	se_track_haiki_pri, 4
-	.equ	se_track_haiki_rev, reverb_set+50
-	.equ	se_track_haiki_mvl, 127
-	.equ	se_track_haiki_key, 0
-	.equ	se_track_haiki_tbs, 1
-	.equ	se_track_haiki_exg, 0
-	.equ	se_track_haiki_cmp, 1
-
-	.section .rodata
-	.global	se_track_haiki
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_track_haiki_1:
-	.byte	KEYSH , se_track_haiki_key+0
-	.byte	TEMPO , 150*se_track_haiki_tbs/2
-	.byte		VOICE , 120
-	.byte		VOL   , 127*se_track_haiki_mvl/mxv
-	.byte		N06   , Bn3 , v028
-	.byte	W03
-	.byte	W03
-	.byte		N21   , Gs4 
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_track_haiki:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_track_haiki_pri	@ Priority
-	.byte	se_track_haiki_rev	@ Reverb.
-
-	.word	se_track_haiki_grp
-
-	.word	se_track_haiki_1
-
-	.end