From 34a8cc8acd3178dec1546068e8812f654205a130 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:41:05 -0500
Subject: [PATCH] Match se_pc_on.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_pc_on.mid | Bin 0 -> 148 bytes
 sound/songs/se_pc_on.s        |  74 ----------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_pc_on.mid
 delete mode 100644 sound/songs/se_pc_on.s

diff --git a/ld_script.txt b/ld_script.txt
index 7d0944fe5..b688c2c72 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -619,7 +619,7 @@ SECTIONS {
         sound/songs/midi/se_kaifuku.o(.rodata);
         sound/songs/midi/se_pc_login.o(.rodata);
         sound/songs/midi/se_pc_off.o(.rodata);
-        sound/songs/se_pc_on.o(.rodata);
+        sound/songs/midi/se_pc_on.o(.rodata);
         sound/songs/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
diff --git a/songs.mk b/songs.mk
index d7e1c10a3..167298eb1 100644
--- a/songs.mk
+++ b/songs.mk
@@ -984,5 +984,8 @@ $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
 $(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pc_on.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_pc_on.mid b/sound/songs/midi/se_pc_on.mid
new file mode 100644
index 0000000000000000000000000000000000000000..86c0fa1c663d25ea51de5576a9f40378fb8506d0
GIT binary patch
literal 148
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10Sii=M^sU!MUgmCSH}g<*pn
z2ZJmZgB&M=EC&O7J;MVAQ-%o%1w0K23_KG;0$3VC7#Jpa0BH{(?GL2=k@)EH2`MZ<
KeK7TmK&t@wjv-F~

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pc_on.s b/sound/songs/se_pc_on.s
deleted file mode 100644
index d46ced4a6..000000000
--- a/sound/songs/se_pc_on.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_on_grp, voicegroup127
-	.equ	se_pc_on_pri, 5
-	.equ	se_pc_on_rev, reverb_set+50
-	.equ	se_pc_on_mvl, 127
-	.equ	se_pc_on_key, 0
-	.equ	se_pc_on_tbs, 1
-	.equ	se_pc_on_exg, 0
-	.equ	se_pc_on_cmp, 1
-
-	.section .rodata
-	.global	se_pc_on
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_on_1:
-	.byte	KEYSH , se_pc_on_key+0
-	.byte	TEMPO , 144*se_pc_on_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pc_on_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte		N12   , Cn6 , v112
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N04   , Cn5 , v080
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W02
-	.byte	W02
-	.byte		        Gn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn4 
-	.byte	W03
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W02
-	.byte	W02
-	.byte		        Cn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn6 , v100
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 , v080
-	.byte	W02
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_on:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_on_pri	@ Priority
-	.byte	se_pc_on_rev	@ Reverb.
-
-	.word	se_pc_on_grp
-
-	.word	se_pc_on_1
-
-	.end