From 88a4693cde13f3a9f007e8d9a08e9bb6be5536a3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:05:36 -0400
Subject: [PATCH] Match se_hashi.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 +++
 sound/song_table.inc          |   2 +-
 sound/songs/midi/se_hashi.mid | Bin 0 -> 86 bytes
 sound/songs/se_hashi.s        |  46 ----------------------------------
 5 files changed, 5 insertions(+), 48 deletions(-)
 create mode 100644 sound/songs/midi/se_hashi.mid
 delete mode 100644 sound/songs/se_hashi.s

diff --git a/ld_script.txt b/ld_script.txt
index a62ecf6c7..7749d881a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -635,7 +635,7 @@ SECTIONS {
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
         sound/songs/se_mizu.o(.rodata);
-        sound/songs/se_hashi.o(.rodata);
+        sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ee9ffe35d..166e7db22 100644
--- a/songs.mk
+++ b/songs.mk
@@ -891,5 +891,8 @@ $(MID_SUBDIR)/se_hantei1.s: %.s: %.mid
 $(MID_SUBDIR)/se_hantei2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_hashi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 1fddaefd7..5d71dd57f 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -72,7 +72,7 @@ gSongTable:: @ 86B49F0
 	song se_toy_b, 2, 2             @ Note B
 	song se_toy_c1, 2, 2            @ Note High C
 	song se_mizu, 2, 2              @ Puddle
-	song se_hashi, 2, 2             @ Boardwalk
+	song se_hashi, 2, 2             @ Fortree Walkways
 	song se_daugi, 1, 1             @ Slots - Credits
 	song se_pinpon, 1, 1            @ Ding-dong!
 	song se_fuusen1, 2, 2           @ Red Balloon
diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_hashi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..fdd772c182ae341731c56ecce42157bba8a6e457
GIT binary patch
literal 86
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILQe`+G#jrty
hhk?t1fxVvL0fPg>1e<!s1{(&}3C=*;nSlwY7y#5i5>fyF

literal 0
HcmV?d00001

diff --git a/sound/songs/se_hashi.s b/sound/songs/se_hashi.s
deleted file mode 100644
index ba2ed43ce..000000000
--- a/sound/songs/se_hashi.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_hashi_grp, voicegroup128
-	.equ	se_hashi_pri, 4
-	.equ	se_hashi_rev, reverb_set+50
-	.equ	se_hashi_mvl, 127
-	.equ	se_hashi_key, 0
-	.equ	se_hashi_tbs, 1
-	.equ	se_hashi_exg, 0
-	.equ	se_hashi_cmp, 1
-
-	.section .rodata
-	.global	se_hashi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_hashi_1:
-	.byte	KEYSH , se_hashi_key+0
-	.byte	TEMPO , 150*se_hashi_tbs/2
-	.byte		VOICE , 26
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_hashi_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Cn3 , v127
-	.byte	W03
-	.byte	W03
-	.byte		        Gn3 
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_hashi:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_hashi_pri	@ Priority
-	.byte	se_hashi_rev	@ Reverb.
-
-	.word	se_hashi_grp
-
-	.word	se_hashi_1
-
-	.end