From 3cfee40c8282556b9fa11ad8d85dd9f954e1d04c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:07:05 -0500
Subject: [PATCH] Match se_mu_pachi.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 7209dd0e0e..05fe9d5aba 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -650,7 +650,7 @@ SECTIONS {
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
-        sound/songs/se_mu_pachi.o(.rodata);
+        sound/songs/midi/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3a9d1b8f10..7ecf87dbbb 100644
--- a/songs.mk
+++ b/songs.mk
@@ -957,5 +957,8 @@ $(MID_SUBDIR)/se_mizu.s: %.s: %.mid
 $(MID_SUBDIR)/se_moter.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4
 
+$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -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 5b5813ab24..69e1134af9 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -36,7 +36,7 @@ gSongTable:: @ 86B49F0
 	song se_hazure, 1, 1            @ Failure
 	song se_exp, 1, 1               @ Exp. Bar
 	song se_jite_pyoko, 1, 1        @ Bunny Hop
-	song se_mu_pachi, 1, 1
+	song se_mu_pachi, 1, 1          @ Toggle Switch
 	song se_tk_kasya, 1, 1          @ Mossdeep Gym/Trick House Switch
 	song se_fu_zaku, 1, 1
 	song se_fu_zaku2, 1, 1
diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_mu_pachi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3d909dadb30270969a39745d209965975e03343c
GIT binary patch
literal 87
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILQe!w!#jt_B
go?(K0J!6AC1LJ`@h6w>cW&i`rgn$ST%?MNt03i<)j{pDw

literal 0
HcmV?d00001

diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s
deleted file mode 100644
index dbea6603a8..0000000000
--- a/sound/songs/se_mu_pachi.s
+++ /dev/null
@@ -1,47 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mu_pachi_grp, voicegroup127
-	.equ	se_mu_pachi_pri, 4
-	.equ	se_mu_pachi_rev, reverb_set+50
-	.equ	se_mu_pachi_mvl, 127
-	.equ	se_mu_pachi_key, 0
-	.equ	se_mu_pachi_tbs, 1
-	.equ	se_mu_pachi_exg, 0
-	.equ	se_mu_pachi_cmp, 1
-
-	.section .rodata
-	.global	se_mu_pachi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mu_pachi_1:
-	.byte	KEYSH , se_mu_pachi_key+0
-	.byte	TEMPO , 150*se_mu_pachi_tbs/2
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_mu_pachi_mvl/mxv
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		VOICE , 126
-	.byte		N01   , Gs4 
-	.byte	W01
-	.byte	W03
-	.byte	W01
-	.byte		        Gs4 , v088
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mu_pachi:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mu_pachi_pri	@ Priority
-	.byte	se_mu_pachi_rev	@ Reverb.
-
-	.word	se_mu_pachi_grp
-
-	.word	se_mu_pachi_1
-
-	.end