From 64ae0f244d57b04b1db8cd69f9d46066905cfe79 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:49:48 -0500
Subject: [PATCH] Match se_pn_off.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_pn_off.mid | Bin 0 -> 227 bytes
 sound/songs/se_pn_off.s        |  86 ---------------------------------
 4 files changed, 4 insertions(+), 87 deletions(-)
 create mode 100644 sound/songs/midi/se_pn_off.mid
 delete mode 100644 sound/songs/se_pn_off.s

diff --git a/ld_script.txt b/ld_script.txt
index 9844b8948..e315957a3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -726,7 +726,7 @@ SECTIONS {
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
         sound/songs/se_pn_on.o(.rodata);
-        sound/songs/se_pn_off.o(.rodata);
+        sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 06a091f82..3692eff79 100644
--- a/songs.mk
+++ b/songs.mk
@@ -993,5 +993,8 @@ $(MID_SUBDIR)/se_pin.s: %.s: %.mid
 $(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
+$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pn_off.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2fba0d159c00c25add39fdb565aff5936b401d45
GIT binary patch
literal 227
zcmYL?F$%&!6h!AIOA;+?Y|<p;2KFK%Y_|}CkU~gnA*AyHnj7r4o<eV+H_?-<vq56@
zn3=zC>-Ka6kU$V4uiJCaw1ht>QF#WxkCW~Ozrt_o@Km^$8Hzc|8Hx<)1#hfjn@x0W
zKvpu+FdK+9%qH~H9`3|yX3bt#fzkhq2CoGk=?))k#qrrdt)q4%wF9+|T9W;=hdXi9
L4%9koNul-&O|dc_

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pn_off.s
deleted file mode 100644
index b77a55fc7..000000000
--- a/sound/songs/se_pn_off.s
+++ /dev/null
@@ -1,86 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pn_off_grp, voicegroup127
-	.equ	se_pn_off_pri, 5
-	.equ	se_pn_off_rev, reverb_set+50
-	.equ	se_pn_off_mvl, 127
-	.equ	se_pn_off_key, 0
-	.equ	se_pn_off_tbs, 1
-	.equ	se_pn_off_exg, 0
-	.equ	se_pn_off_cmp, 1
-
-	.section .rodata
-	.global	se_pn_off
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pn_off_1:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte	TEMPO , 144*se_pn_off_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W03
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W03
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pn_off_2:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 50*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W02
-	.byte	W01
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W02
-	.byte	W01
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pn_off:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pn_off_pri	@ Priority
-	.byte	se_pn_off_rev	@ Reverb.
-
-	.word	se_pn_off_grp
-
-	.word	se_pn_off_1
-	.word	se_pn_off_2
-
-	.end