From 6fd2d4ad3b5e7ee1ccb8b6d1f9a15d84a89524e0 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:22:56 -0400
Subject: [PATCH] Match ph_choice_solo.mid

---
 ld_script.txt                       |   2 +-
 songs.mk                            |   3 +++
 sound/songs/midi/ph_choice_solo.mid | Bin 0 -> 68 bytes
 sound/songs/ph_choice_solo.s        |  40 ----------------------------
 4 files changed, 4 insertions(+), 41 deletions(-)
 create mode 100644 sound/songs/midi/ph_choice_solo.mid
 delete mode 100644 sound/songs/ph_choice_solo.s

diff --git a/ld_script.txt b/ld_script.txt
index 06518e6a8..0c7cd6660 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1074,7 +1074,7 @@ SECTIONS {
         sound/songs/ph_thought_solo.o(.rodata);
         sound/songs/midi/ph_choice_blend.o(.rodata);
         sound/songs/midi/ph_choice_held.o(.rodata);
-        sound/songs/ph_choice_solo.o(.rodata);
+        sound/songs/midi/ph_choice_solo.o(.rodata);
         sound/songs/ph_mouth_blend.o(.rodata);
         sound/songs/ph_mouth_held.o(.rodata);
         sound/songs/ph_mouth_solo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3631f7bb4..408122b48 100644
--- a/songs.mk
+++ b/songs.mk
@@ -639,5 +639,8 @@ $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid
 $(MID_SUBDIR)/ph_choice_held.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_choice_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/ph_choice_solo.mid b/sound/songs/midi/ph_choice_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e72f7d22eb6a69a8df7c883c1d70ff3af3efe59e
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwGh(1A9Hg
N1e<!Z1{(&D6adEa4*UQB

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_choice_solo.s b/sound/songs/ph_choice_solo.s
deleted file mode 100644
index 0f2b997a1..000000000
--- a/sound/songs/ph_choice_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_choice_solo_grp, voicegroup130
-	.equ	ph_choice_solo_pri, 4
-	.equ	ph_choice_solo_rev, 0
-	.equ	ph_choice_solo_mvl, 127
-	.equ	ph_choice_solo_key, 0
-	.equ	ph_choice_solo_tbs, 1
-	.equ	ph_choice_solo_exg, 0
-	.equ	ph_choice_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_choice_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_choice_solo_1:
-	.byte	KEYSH , ph_choice_solo_key+0
-	.byte	TEMPO , 120*ph_choice_solo_tbs/2
-	.byte		VOICE , 32
-	.byte		VOL   , 127*ph_choice_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_choice_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_choice_solo_pri	@ Priority
-	.byte	ph_choice_solo_rev	@ Reverb.
-
-	.word	ph_choice_solo_grp
-
-	.word	ph_choice_solo_1
-
-	.end