From b32e85ac9092e811a9ec96e6681723dc11c392e3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:20:10 -0400
Subject: [PATCH 1/7] Match ph_choice_blend.mid

---
 ld_script.txt                        |   2 +-
 songs.mk                             |   3 ++
 sound/song_table.inc                 |  27 ++++++++----------
 sound/songs/midi/ph_choice_blend.mid | Bin 0 -> 68 bytes
 sound/songs/ph_choice_blend.s        |  40 ---------------------------
 5 files changed, 16 insertions(+), 56 deletions(-)
 create mode 100644 sound/songs/midi/ph_choice_blend.mid
 delete mode 100644 sound/songs/ph_choice_blend.s

diff --git a/ld_script.txt b/ld_script.txt
index 46cdc27a89..c083a186cf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1072,7 +1072,7 @@ SECTIONS {
         sound/songs/ph_thought_blend.o(.rodata);
         sound/songs/ph_thought_held.o(.rodata);
         sound/songs/ph_thought_solo.o(.rodata);
-        sound/songs/ph_choice_blend.o(.rodata);
+        sound/songs/midi/ph_choice_blend.o(.rodata);
         sound/songs/ph_choice_held.o(.rodata);
         sound/songs/ph_choice_solo.o(.rodata);
         sound/songs/ph_mouth_blend.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b194e3180d..6ad3b7cbbb 100644
--- a/songs.mk
+++ b/songs.mk
@@ -633,5 +633,8 @@ $(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid
 $(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076
 
+$(MID_SUBDIR)/ph_choice_blend.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/song_table.inc b/sound/song_table.inc
index 5f3f3303a6..624cabe537 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -249,23 +249,21 @@ gSongTable:: @ 86B49F0
 	song se_w287b, 1, 1             @ Stat Decreased
 	song se_w114, 1, 1              @ Haze
 	song se_w063b, 1, 1             @ Hyper Beam 2
-	@ FRLG SFX below
-	song se_rg_w_door, 1, 1         @ Door
-	song se_rg_card1, 1, 1          @ Trainer Card 1
-	song se_rg_card2, 1, 1          @ Trainer Card 2
-	song se_rg_card3, 1, 1          @ Trainer Card 3
-	song se_rg_bag1, 1, 1           @ Bag Scroll
-	song se_rg_bag2, 1, 1           @ Bag Pocket Change
+	song se_rg_w_door, 1, 1         @ Door (FRLG)
+	song se_rg_card1, 1, 1          @ Trainer Card 1 (FRLG)
+	song se_rg_card2, 1, 1          @ Trainer Card 2 (FRLG)
+	song se_rg_card3, 1, 1          @ Trainer Card 3 (FRLG)
+	song se_rg_bag1, 1, 1           @ Bag Scroll (FRLG)
+	song se_rg_bag2, 1, 1           @ Bag Pocket Change (FRLG)
 	song se_rg_getting, 1, 1        
-	song se_rg_shop, 1, 1           @ Cash Register
-	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn
-	song se_rg_help_op, 1, 1        @ Help Menu Open
-	song se_rg_help_cl, 1, 1        @ Help Menu Close
-	song se_rg_help_ng, 1, 1        @ Help Menu Error
+	song se_rg_shop, 1, 1           @ Cash Register (FRLG)
+	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn (FRLG)
+	song se_rg_help_op, 1, 1        @ Help Menu Open (FRLG)
+	song se_rg_help_cl, 1, 1        @ Help Menu Close (FRLG)
+	song se_rg_help_ng, 1, 1        @ Help Menu Error (FRLG)
 	song se_rg_deomov, 1, 1         @ Deoxys Moves
 	song se_rg_excellent, 1, 1
 	song se_rg_nawamiss, 1, 1
-	@ end FRLG SFX
 	song se_toreeye, 1, 1           @ Trainer's Eye Call
 	song se_toreoff, 1, 1           @ Trainer's Eye Hang Up
 	song se_hantei1, 1, 1           @ Battle Arena Time's Up 1
@@ -273,7 +271,6 @@ gSongTable:: @ 86B49F0
 	song se_curtain, 1, 1           @ Battle Pike Curtain Open
 	song se_curtain1, 1, 1          @ Battle Pike Curtain Close
 	song se_ussoki, 1, 1            @ Sudowoodo
-
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
@@ -547,7 +544,7 @@ gSongTable:: @ 86B49F0
 	song mus_rg_network, 0, 0       @ Pokémon Net Center (FRLG)
 	song mus_rg_okurimono, 0, 0     @ Mystery Gift (FRLG)
 	song mus_rg_kinomikui, 0, 0     @ Dodrio Berry Picking (FRLG)
-	song mus_rg_nanadungeon, 0, 0   @ Mount Ember (FRLG)
+	song mus_rg_nanadungeon, 0, 0   @ Mt. Ember (FRLG)
 	song mus_rg_oshie_tv, 0, 0      @ Teachy TV Lesson (FRLG)
 	song mus_rg_nanashima, 0, 0     @ Sevii Islands (FRLG)
 	song mus_rg_nanaiseki, 0, 0     @ Tanoby Chambers (FRLG)
diff --git a/sound/songs/midi/ph_choice_blend.mid b/sound/songs/midi/ph_choice_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dd36cc3f38e312e7b14992ab8c38350c85212325
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwG|`1A9Hg
N1e<!Z1{(&D6adE24*CE9

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_choice_blend.s b/sound/songs/ph_choice_blend.s
deleted file mode 100644
index b45fc21f10..0000000000
--- a/sound/songs/ph_choice_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_choice_blend_grp, voicegroup130
-	.equ	ph_choice_blend_pri, 4
-	.equ	ph_choice_blend_rev, 0
-	.equ	ph_choice_blend_mvl, 127
-	.equ	ph_choice_blend_key, 0
-	.equ	ph_choice_blend_tbs, 1
-	.equ	ph_choice_blend_exg, 0
-	.equ	ph_choice_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_choice_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_choice_blend_1:
-	.byte	KEYSH , ph_choice_blend_key+0
-	.byte	TEMPO , 120*ph_choice_blend_tbs/2
-	.byte		VOICE , 30
-	.byte		VOL   , 127*ph_choice_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_choice_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_choice_blend_pri	@ Priority
-	.byte	ph_choice_blend_rev	@ Reverb.
-
-	.word	ph_choice_blend_grp
-
-	.word	ph_choice_blend_1
-
-	.end

From 86f80debe2e1fe41810b02d106e25eac1a1386b5 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:21:42 -0400
Subject: [PATCH 2/7] Match ph_choice_held.mid

---
 ld_script.txt                       |   2 +-
 songs.mk                            |   3 ++
 sound/songs/midi/ph_choice_held.mid | Bin 0 -> 79 bytes
 sound/songs/ph_choice_held.s        |  46 ----------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/ph_choice_held.mid
 delete mode 100644 sound/songs/ph_choice_held.s

diff --git a/ld_script.txt b/ld_script.txt
index c083a186cf..06518e6a80 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1073,7 +1073,7 @@ SECTIONS {
         sound/songs/ph_thought_held.o(.rodata);
         sound/songs/ph_thought_solo.o(.rodata);
         sound/songs/midi/ph_choice_blend.o(.rodata);
-        sound/songs/ph_choice_held.o(.rodata);
+        sound/songs/midi/ph_choice_held.o(.rodata);
         sound/songs/ph_choice_solo.o(.rodata);
         sound/songs/ph_mouth_blend.o(.rodata);
         sound/songs/ph_mouth_held.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6ad3b7cbbb..3631f7bb45 100644
--- a/songs.mk
+++ b/songs.mk
@@ -636,5 +636,8 @@ $(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid
 $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_choice_held.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_held.mid b/sound/songs/midi/ph_choice_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..658d7cc432311f486c78c6514a9e3d0db3bcb5f7
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$X&#-~Lo?(JbePcm`4FgCH0Hw1NMF0Q*

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_choice_held.s b/sound/songs/ph_choice_held.s
deleted file mode 100644
index c44bda5795..0000000000
--- a/sound/songs/ph_choice_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_choice_held_grp, voicegroup130
-	.equ	ph_choice_held_pri, 4
-	.equ	ph_choice_held_rev, 0
-	.equ	ph_choice_held_mvl, 127
-	.equ	ph_choice_held_key, 0
-	.equ	ph_choice_held_tbs, 1
-	.equ	ph_choice_held_exg, 0
-	.equ	ph_choice_held_cmp, 1
-
-	.section .rodata
-	.global	ph_choice_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_choice_held_1:
-	.byte	KEYSH , ph_choice_held_key+0
-	.byte	TEMPO , 120*ph_choice_held_tbs/2
-	.byte		VOICE , 31
-	.byte		VOL   , 127*ph_choice_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_choice_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_choice_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_choice_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_choice_held_pri	@ Priority
-	.byte	ph_choice_held_rev	@ Reverb.
-
-	.word	ph_choice_held_grp
-
-	.word	ph_choice_held_1
-
-	.end

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 3/7] 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 06518e6a80..0c7cd6660d 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 3631f7bb45..408122b480 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 0f2b997a1f..0000000000
--- 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

From 458b25ec09d953aa62ee73daa85b8efe23b40967 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:24:20 -0400
Subject: [PATCH 4/7] Match ph_cloth_blend.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 0c7cd6660d..2ad45fa3b4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1048,7 +1048,7 @@ SECTIONS {
         sound/songs/ph_face_blend.o(.rodata);
         sound/songs/ph_face_held.o(.rodata);
         sound/songs/ph_face_solo.o(.rodata);
-        sound/songs/ph_cloth_blend.o(.rodata);
+        sound/songs/midi/ph_cloth_blend.o(.rodata);
         sound/songs/ph_cloth_held.o(.rodata);
         sound/songs/ph_cloth_solo.o(.rodata);
         sound/songs/ph_dress_blend.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 408122b480..00a9c6e264 100644
--- a/songs.mk
+++ b/songs.mk
@@ -642,5 +642,8 @@ $(MID_SUBDIR)/ph_choice_held.s: %.s: %.mid
 $(MID_SUBDIR)/ph_choice_solo.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_cloth_blend.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_cloth_blend.mid b/sound/songs/midi/ph_cloth_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b8a4eff1efe757c5a4d6f8cd49d2da9054ad2e58
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2dw1A9Hg
N1e<!Z1{(&D6ad9J4&nd+

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_cloth_blend.s b/sound/songs/ph_cloth_blend.s
deleted file mode 100644
index e28917588c..0000000000
--- a/sound/songs/ph_cloth_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cloth_blend_grp, voicegroup130
-	.equ	ph_cloth_blend_pri, 4
-	.equ	ph_cloth_blend_rev, 0
-	.equ	ph_cloth_blend_mvl, 127
-	.equ	ph_cloth_blend_key, 0
-	.equ	ph_cloth_blend_tbs, 1
-	.equ	ph_cloth_blend_exg, 0
-	.equ	ph_cloth_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_cloth_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cloth_blend_1:
-	.byte	KEYSH , ph_cloth_blend_key+0
-	.byte	TEMPO , 120*ph_cloth_blend_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 127*ph_cloth_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cloth_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cloth_blend_pri	@ Priority
-	.byte	ph_cloth_blend_rev	@ Reverb.
-
-	.word	ph_cloth_blend_grp
-
-	.word	ph_cloth_blend_1
-
-	.end

From dbe15410ded137271c8fd5710cc4d9dce2d85b2d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:26:06 -0400
Subject: [PATCH 5/7] Match ph_cloth_held.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/ph_cloth_held.mid | Bin 0 -> 79 bytes
 sound/songs/ph_cloth_held.s        |  46 -----------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/ph_cloth_held.mid
 delete mode 100644 sound/songs/ph_cloth_held.s

diff --git a/ld_script.txt b/ld_script.txt
index 2ad45fa3b4..5e69c604ae 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1049,8 +1049,8 @@ SECTIONS {
         sound/songs/ph_face_held.o(.rodata);
         sound/songs/ph_face_solo.o(.rodata);
         sound/songs/midi/ph_cloth_blend.o(.rodata);
-        sound/songs/ph_cloth_held.o(.rodata);
         sound/songs/ph_cloth_solo.o(.rodata);
+        sound/songs/midi/ph_cloth_held.o(.rodata);
         sound/songs/ph_dress_blend.o(.rodata);
         sound/songs/ph_dress_held.o(.rodata);
         sound/songs/ph_dress_solo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 00a9c6e264..186b763831 100644
--- a/songs.mk
+++ b/songs.mk
@@ -645,5 +645,8 @@ $(MID_SUBDIR)/ph_choice_solo.s: %.s: %.mid
 $(MID_SUBDIR)/ph_cloth_blend.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_cloth_held.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_cloth_held.mid b/sound/songs/midi/ph_cloth_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3ef67720400d4fce1969048e4f565756286ee887
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9&N&ai>Ko?(JbePcm`4FgCH0HgyGEdT%j

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_cloth_held.s b/sound/songs/ph_cloth_held.s
deleted file mode 100644
index 6a6929921d..0000000000
--- a/sound/songs/ph_cloth_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cloth_held_grp, voicegroup130
-	.equ	ph_cloth_held_pri, 4
-	.equ	ph_cloth_held_rev, 0
-	.equ	ph_cloth_held_mvl, 127
-	.equ	ph_cloth_held_key, 0
-	.equ	ph_cloth_held_tbs, 1
-	.equ	ph_cloth_held_exg, 0
-	.equ	ph_cloth_held_cmp, 1
-
-	.section .rodata
-	.global	ph_cloth_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cloth_held_1:
-	.byte	KEYSH , ph_cloth_held_key+0
-	.byte	TEMPO , 120*ph_cloth_held_tbs/2
-	.byte		VOICE , 7
-	.byte		VOL   , 127*ph_cloth_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_cloth_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_cloth_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cloth_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cloth_held_pri	@ Priority
-	.byte	ph_cloth_held_rev	@ Reverb.
-
-	.word	ph_cloth_held_grp
-
-	.word	ph_cloth_held_1
-
-	.end

From a94c66139e9dbd89718482ff946819c29f5ab937 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:26:34 -0400
Subject: [PATCH 6/7] Match ph_cloth_solo.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 5e69c604ae..6448679472 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1049,8 +1049,8 @@ SECTIONS {
         sound/songs/ph_face_held.o(.rodata);
         sound/songs/ph_face_solo.o(.rodata);
         sound/songs/midi/ph_cloth_blend.o(.rodata);
-        sound/songs/ph_cloth_solo.o(.rodata);
         sound/songs/midi/ph_cloth_held.o(.rodata);
+        sound/songs/midi/ph_cloth_solo.o(.rodata);
         sound/songs/ph_dress_blend.o(.rodata);
         sound/songs/ph_dress_held.o(.rodata);
         sound/songs/ph_dress_solo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 186b763831..0c2146352a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -648,5 +648,8 @@ $(MID_SUBDIR)/ph_cloth_blend.s: %.s: %.mid
 $(MID_SUBDIR)/ph_cloth_held.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_cloth_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_cloth_solo.mid b/sound/songs/midi/ph_cloth_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..84755426a072c26d44ee0755fde6e20c98a4e19d
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%29m1A9Hg
N1e<!Z1{(&D6ad9r4&(p;

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_cloth_solo.s b/sound/songs/ph_cloth_solo.s
deleted file mode 100644
index 6dc5b50f91..0000000000
--- a/sound/songs/ph_cloth_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cloth_solo_grp, voicegroup130
-	.equ	ph_cloth_solo_pri, 4
-	.equ	ph_cloth_solo_rev, 0
-	.equ	ph_cloth_solo_mvl, 127
-	.equ	ph_cloth_solo_key, 0
-	.equ	ph_cloth_solo_tbs, 1
-	.equ	ph_cloth_solo_exg, 0
-	.equ	ph_cloth_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_cloth_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cloth_solo_1:
-	.byte	KEYSH , ph_cloth_solo_key+0
-	.byte	TEMPO , 120*ph_cloth_solo_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 127*ph_cloth_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cloth_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cloth_solo_pri	@ Priority
-	.byte	ph_cloth_solo_rev	@ Reverb.
-
-	.word	ph_cloth_solo_grp
-
-	.word	ph_cloth_solo_1
-
-	.end

From 2f99b81dd4cce65a9a86833f0d2a61300690c88a Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 3 Oct 2018 17:47:57 -0400
Subject: [PATCH 7/7] Match ph_cure_blend.mid to ph_trap_solo.mid

---
 ld_script.txt                         |  90 ++++++++---------
 songs.mk                              | 135 ++++++++++++++++++++++++++
 sound/songs/midi/ph_cure_blend.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_cure_held.mid     | Bin 0 -> 79 bytes
 sound/songs/midi/ph_cure_solo.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_dress_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_dress_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_dress_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_face_blend.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_face_held.mid     | Bin 0 -> 79 bytes
 sound/songs/midi/ph_face_solo.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_fleece_blend.mid  | Bin 0 -> 68 bytes
 sound/songs/midi/ph_fleece_held.mid   | Bin 0 -> 79 bytes
 sound/songs/midi/ph_fleece_solo.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_foot_blend.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_foot_held.mid     | Bin 0 -> 79 bytes
 sound/songs/midi/ph_foot_solo.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_goat_blend.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_goat_held.mid     | Bin 0 -> 79 bytes
 sound/songs/midi/ph_goat_solo.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_goose_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_goose_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_goose_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_kit_blend.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_kit_held.mid      | Bin 0 -> 79 bytes
 sound/songs/midi/ph_kit_solo.mid      | Bin 0 -> 68 bytes
 sound/songs/midi/ph_lot_blend.mid     | Bin 0 -> 68 bytes
 sound/songs/midi/ph_lot_held.mid      | Bin 0 -> 79 bytes
 sound/songs/midi/ph_lot_solo.mid      | Bin 0 -> 68 bytes
 sound/songs/midi/ph_mouth_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_mouth_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_mouth_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_nurse_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_nurse_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_nurse_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_price_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_price_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_price_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_strut_blend.mid   | Bin 0 -> 68 bytes
 sound/songs/midi/ph_strut_held.mid    | Bin 0 -> 79 bytes
 sound/songs/midi/ph_strut_solo.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_thought_blend.mid | Bin 0 -> 68 bytes
 sound/songs/midi/ph_thought_held.mid  | Bin 0 -> 79 bytes
 sound/songs/midi/ph_thought_solo.mid  | Bin 0 -> 68 bytes
 sound/songs/midi/ph_trap_blend.mid    | Bin 0 -> 68 bytes
 sound/songs/midi/ph_trap_held.mid     | Bin 0 -> 79 bytes
 sound/songs/midi/ph_trap_solo.mid     | Bin 0 -> 68 bytes
 sound/songs/ph_cure_blend.s           |  40 --------
 sound/songs/ph_cure_held.s            |  46 ---------
 sound/songs/ph_cure_solo.s            |  40 --------
 sound/songs/ph_dress_blend.s          |  40 --------
 sound/songs/ph_dress_held.s           |  46 ---------
 sound/songs/ph_dress_solo.s           |  40 --------
 sound/songs/ph_face_blend.s           |  40 --------
 sound/songs/ph_face_held.s            |  46 ---------
 sound/songs/ph_face_solo.s            |  40 --------
 sound/songs/ph_fleece_blend.s         |  40 --------
 sound/songs/ph_fleece_held.s          |  46 ---------
 sound/songs/ph_fleece_solo.s          |  40 --------
 sound/songs/ph_foot_blend.s           |  40 --------
 sound/songs/ph_foot_held.s            |  46 ---------
 sound/songs/ph_foot_solo.s            |  40 --------
 sound/songs/ph_goat_blend.s           |  40 --------
 sound/songs/ph_goat_held.s            |  46 ---------
 sound/songs/ph_goat_solo.s            |  40 --------
 sound/songs/ph_goose_blend.s          |  40 --------
 sound/songs/ph_goose_held.s           |  46 ---------
 sound/songs/ph_goose_solo.s           |  40 --------
 sound/songs/ph_kit_blend.s            |  40 --------
 sound/songs/ph_kit_held.s             |  46 ---------
 sound/songs/ph_kit_solo.s             |  40 --------
 sound/songs/ph_lot_blend.s            |  40 --------
 sound/songs/ph_lot_held.s             |  46 ---------
 sound/songs/ph_lot_solo.s             |  40 --------
 sound/songs/ph_mouth_blend.s          |  40 --------
 sound/songs/ph_mouth_held.s           |  46 ---------
 sound/songs/ph_mouth_solo.s           |  40 --------
 sound/songs/ph_nurse_blend.s          |  40 --------
 sound/songs/ph_nurse_held.s           |  46 ---------
 sound/songs/ph_nurse_solo.s           |  40 --------
 sound/songs/ph_price_blend.s          |  40 --------
 sound/songs/ph_price_held.s           |  46 ---------
 sound/songs/ph_price_solo.s           |  40 --------
 sound/songs/ph_strut_blend.s          |  40 --------
 sound/songs/ph_strut_held.s           |  46 ---------
 sound/songs/ph_strut_solo.s           |  40 --------
 sound/songs/ph_thought_blend.s        |  40 --------
 sound/songs/ph_thought_held.s         |  46 ---------
 sound/songs/ph_thought_solo.s         |  40 --------
 sound/songs/ph_trap_blend.s           |  41 --------
 sound/songs/ph_trap_held.s            |  46 ---------
 sound/songs/ph_trap_solo.s            |  40 --------
 92 files changed, 180 insertions(+), 1936 deletions(-)
 create mode 100644 sound/songs/midi/ph_cure_blend.mid
 create mode 100644 sound/songs/midi/ph_cure_held.mid
 create mode 100644 sound/songs/midi/ph_cure_solo.mid
 create mode 100644 sound/songs/midi/ph_dress_blend.mid
 create mode 100644 sound/songs/midi/ph_dress_held.mid
 create mode 100644 sound/songs/midi/ph_dress_solo.mid
 create mode 100644 sound/songs/midi/ph_face_blend.mid
 create mode 100644 sound/songs/midi/ph_face_held.mid
 create mode 100644 sound/songs/midi/ph_face_solo.mid
 create mode 100644 sound/songs/midi/ph_fleece_blend.mid
 create mode 100644 sound/songs/midi/ph_fleece_held.mid
 create mode 100644 sound/songs/midi/ph_fleece_solo.mid
 create mode 100644 sound/songs/midi/ph_foot_blend.mid
 create mode 100644 sound/songs/midi/ph_foot_held.mid
 create mode 100644 sound/songs/midi/ph_foot_solo.mid
 create mode 100644 sound/songs/midi/ph_goat_blend.mid
 create mode 100644 sound/songs/midi/ph_goat_held.mid
 create mode 100644 sound/songs/midi/ph_goat_solo.mid
 create mode 100644 sound/songs/midi/ph_goose_blend.mid
 create mode 100644 sound/songs/midi/ph_goose_held.mid
 create mode 100644 sound/songs/midi/ph_goose_solo.mid
 create mode 100644 sound/songs/midi/ph_kit_blend.mid
 create mode 100644 sound/songs/midi/ph_kit_held.mid
 create mode 100644 sound/songs/midi/ph_kit_solo.mid
 create mode 100644 sound/songs/midi/ph_lot_blend.mid
 create mode 100644 sound/songs/midi/ph_lot_held.mid
 create mode 100644 sound/songs/midi/ph_lot_solo.mid
 create mode 100644 sound/songs/midi/ph_mouth_blend.mid
 create mode 100644 sound/songs/midi/ph_mouth_held.mid
 create mode 100644 sound/songs/midi/ph_mouth_solo.mid
 create mode 100644 sound/songs/midi/ph_nurse_blend.mid
 create mode 100644 sound/songs/midi/ph_nurse_held.mid
 create mode 100644 sound/songs/midi/ph_nurse_solo.mid
 create mode 100644 sound/songs/midi/ph_price_blend.mid
 create mode 100644 sound/songs/midi/ph_price_held.mid
 create mode 100644 sound/songs/midi/ph_price_solo.mid
 create mode 100644 sound/songs/midi/ph_strut_blend.mid
 create mode 100644 sound/songs/midi/ph_strut_held.mid
 create mode 100644 sound/songs/midi/ph_strut_solo.mid
 create mode 100644 sound/songs/midi/ph_thought_blend.mid
 create mode 100644 sound/songs/midi/ph_thought_held.mid
 create mode 100644 sound/songs/midi/ph_thought_solo.mid
 create mode 100644 sound/songs/midi/ph_trap_blend.mid
 create mode 100644 sound/songs/midi/ph_trap_held.mid
 create mode 100644 sound/songs/midi/ph_trap_solo.mid
 delete mode 100644 sound/songs/ph_cure_blend.s
 delete mode 100644 sound/songs/ph_cure_held.s
 delete mode 100644 sound/songs/ph_cure_solo.s
 delete mode 100644 sound/songs/ph_dress_blend.s
 delete mode 100644 sound/songs/ph_dress_held.s
 delete mode 100644 sound/songs/ph_dress_solo.s
 delete mode 100644 sound/songs/ph_face_blend.s
 delete mode 100644 sound/songs/ph_face_held.s
 delete mode 100644 sound/songs/ph_face_solo.s
 delete mode 100644 sound/songs/ph_fleece_blend.s
 delete mode 100644 sound/songs/ph_fleece_held.s
 delete mode 100644 sound/songs/ph_fleece_solo.s
 delete mode 100644 sound/songs/ph_foot_blend.s
 delete mode 100644 sound/songs/ph_foot_held.s
 delete mode 100644 sound/songs/ph_foot_solo.s
 delete mode 100644 sound/songs/ph_goat_blend.s
 delete mode 100644 sound/songs/ph_goat_held.s
 delete mode 100644 sound/songs/ph_goat_solo.s
 delete mode 100644 sound/songs/ph_goose_blend.s
 delete mode 100644 sound/songs/ph_goose_held.s
 delete mode 100644 sound/songs/ph_goose_solo.s
 delete mode 100644 sound/songs/ph_kit_blend.s
 delete mode 100644 sound/songs/ph_kit_held.s
 delete mode 100644 sound/songs/ph_kit_solo.s
 delete mode 100644 sound/songs/ph_lot_blend.s
 delete mode 100644 sound/songs/ph_lot_held.s
 delete mode 100644 sound/songs/ph_lot_solo.s
 delete mode 100644 sound/songs/ph_mouth_blend.s
 delete mode 100644 sound/songs/ph_mouth_held.s
 delete mode 100644 sound/songs/ph_mouth_solo.s
 delete mode 100644 sound/songs/ph_nurse_blend.s
 delete mode 100644 sound/songs/ph_nurse_held.s
 delete mode 100644 sound/songs/ph_nurse_solo.s
 delete mode 100644 sound/songs/ph_price_blend.s
 delete mode 100644 sound/songs/ph_price_held.s
 delete mode 100644 sound/songs/ph_price_solo.s
 delete mode 100644 sound/songs/ph_strut_blend.s
 delete mode 100644 sound/songs/ph_strut_held.s
 delete mode 100644 sound/songs/ph_strut_solo.s
 delete mode 100644 sound/songs/ph_thought_blend.s
 delete mode 100644 sound/songs/ph_thought_held.s
 delete mode 100644 sound/songs/ph_thought_solo.s
 delete mode 100644 sound/songs/ph_trap_blend.s
 delete mode 100644 sound/songs/ph_trap_held.s
 delete mode 100644 sound/songs/ph_trap_solo.s

diff --git a/ld_script.txt b/ld_script.txt
index 6448679472..fc12789ce2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1042,57 +1042,57 @@ SECTIONS {
         sound/songs/midi/mus_rg_t_tower.o(.rodata);
         sound/songs/midi/mus_rg_slowmasara.o(.rodata);
         sound/songs/midi/mus_rg_tvnoize.o(.rodata);
-        sound/songs/ph_trap_blend.o(.rodata);
-        sound/songs/ph_trap_held.o(.rodata);
-        sound/songs/ph_trap_solo.o(.rodata);
-        sound/songs/ph_face_blend.o(.rodata);
-        sound/songs/ph_face_held.o(.rodata);
-        sound/songs/ph_face_solo.o(.rodata);
+        sound/songs/midi/ph_trap_blend.o(.rodata);
+        sound/songs/midi/ph_trap_held.o(.rodata);
+        sound/songs/midi/ph_trap_solo.o(.rodata);
+        sound/songs/midi/ph_face_blend.o(.rodata);
+        sound/songs/midi/ph_face_held.o(.rodata);
+        sound/songs/midi/ph_face_solo.o(.rodata);
         sound/songs/midi/ph_cloth_blend.o(.rodata);
         sound/songs/midi/ph_cloth_held.o(.rodata);
         sound/songs/midi/ph_cloth_solo.o(.rodata);
-        sound/songs/ph_dress_blend.o(.rodata);
-        sound/songs/ph_dress_held.o(.rodata);
-        sound/songs/ph_dress_solo.o(.rodata);
-        sound/songs/ph_fleece_blend.o(.rodata);
-        sound/songs/ph_fleece_held.o(.rodata);
-        sound/songs/ph_fleece_solo.o(.rodata);
-        sound/songs/ph_kit_blend.o(.rodata);
-        sound/songs/ph_kit_held.o(.rodata);
-        sound/songs/ph_kit_solo.o(.rodata);
-        sound/songs/ph_price_blend.o(.rodata);
-        sound/songs/ph_price_held.o(.rodata);
-        sound/songs/ph_price_solo.o(.rodata);
-        sound/songs/ph_lot_blend.o(.rodata);
-        sound/songs/ph_lot_held.o(.rodata);
-        sound/songs/ph_lot_solo.o(.rodata);
-        sound/songs/ph_goat_blend.o(.rodata);
-        sound/songs/ph_goat_held.o(.rodata);
-        sound/songs/ph_goat_solo.o(.rodata);
-        sound/songs/ph_thought_blend.o(.rodata);
-        sound/songs/ph_thought_held.o(.rodata);
-        sound/songs/ph_thought_solo.o(.rodata);
+        sound/songs/midi/ph_dress_blend.o(.rodata);
+        sound/songs/midi/ph_dress_held.o(.rodata);
+        sound/songs/midi/ph_dress_solo.o(.rodata);
+        sound/songs/midi/ph_fleece_blend.o(.rodata);
+        sound/songs/midi/ph_fleece_held.o(.rodata);
+        sound/songs/midi/ph_fleece_solo.o(.rodata);
+        sound/songs/midi/ph_kit_blend.o(.rodata);
+        sound/songs/midi/ph_kit_held.o(.rodata);
+        sound/songs/midi/ph_kit_solo.o(.rodata);
+        sound/songs/midi/ph_price_blend.o(.rodata);
+        sound/songs/midi/ph_price_held.o(.rodata);
+        sound/songs/midi/ph_price_solo.o(.rodata);
+        sound/songs/midi/ph_lot_blend.o(.rodata);
+        sound/songs/midi/ph_lot_held.o(.rodata);
+        sound/songs/midi/ph_lot_solo.o(.rodata);
+        sound/songs/midi/ph_goat_blend.o(.rodata);
+        sound/songs/midi/ph_goat_held.o(.rodata);
+        sound/songs/midi/ph_goat_solo.o(.rodata);
+        sound/songs/midi/ph_thought_blend.o(.rodata);
+        sound/songs/midi/ph_thought_held.o(.rodata);
+        sound/songs/midi/ph_thought_solo.o(.rodata);
         sound/songs/midi/ph_choice_blend.o(.rodata);
         sound/songs/midi/ph_choice_held.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);
-        sound/songs/ph_foot_blend.o(.rodata);
-        sound/songs/ph_foot_held.o(.rodata);
-        sound/songs/ph_foot_solo.o(.rodata);
-        sound/songs/ph_goose_blend.o(.rodata);
-        sound/songs/ph_goose_held.o(.rodata);
-        sound/songs/ph_goose_solo.o(.rodata);
-        sound/songs/ph_strut_blend.o(.rodata);
-        sound/songs/ph_strut_held.o(.rodata);
-        sound/songs/ph_strut_solo.o(.rodata);
-        sound/songs/ph_cure_blend.o(.rodata);
-        sound/songs/ph_cure_held.o(.rodata);
-        sound/songs/ph_cure_solo.o(.rodata);
-        sound/songs/ph_nurse_blend.o(.rodata);
-        sound/songs/ph_nurse_held.o(.rodata);
-        sound/songs/ph_nurse_solo.o(.rodata);
+        sound/songs/midi/ph_mouth_blend.o(.rodata);
+        sound/songs/midi/ph_mouth_held.o(.rodata);
+        sound/songs/midi/ph_mouth_solo.o(.rodata);
+        sound/songs/midi/ph_foot_blend.o(.rodata);
+        sound/songs/midi/ph_foot_held.o(.rodata);
+        sound/songs/midi/ph_foot_solo.o(.rodata);
+        sound/songs/midi/ph_goose_blend.o(.rodata);
+        sound/songs/midi/ph_goose_held.o(.rodata);
+        sound/songs/midi/ph_goose_solo.o(.rodata);
+        sound/songs/midi/ph_strut_blend.o(.rodata);
+        sound/songs/midi/ph_strut_held.o(.rodata);
+        sound/songs/midi/ph_strut_solo.o(.rodata);
+        sound/songs/midi/ph_cure_blend.o(.rodata);
+        sound/songs/midi/ph_cure_held.o(.rodata);
+        sound/songs/midi/ph_cure_solo.o(.rodata);
+        sound/songs/midi/ph_nurse_blend.o(.rodata);
+        sound/songs/midi/ph_nurse_held.o(.rodata);
+        sound/songs/midi/ph_nurse_solo.o(.rodata);
     } =0
 
     lib_rodata :
diff --git a/songs.mk b/songs.mk
index 0c2146352a..fb0d6b5044 100644
--- a/songs.mk
+++ b/songs.mk
@@ -651,5 +651,140 @@ $(MID_SUBDIR)/ph_cloth_held.s: %.s: %.mid
 $(MID_SUBDIR)/ph_cloth_solo.s: %.s: %.mid
 	$(MID) $< $@ -E -G130 -P4
 
+$(MID_SUBDIR)/ph_cure_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_cure_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_cure_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_dress_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_dress_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_dress_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_face_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_face_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_face_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_fleece_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_fleece_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_fleece_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_foot_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_foot_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_foot_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goat_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goat_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goat_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goose_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goose_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_goose_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_kit_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_kit_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_kit_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_lot_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_lot_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_lot_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_mouth_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_mouth_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_mouth_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_nurse_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_nurse_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_nurse_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_price_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_price_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_price_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_strut_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_strut_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_strut_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_thought_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_thought_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_thought_solo.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_trap_blend.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid
+	$(MID) $< $@ -E -G130 -P4
+
+$(MID_SUBDIR)/ph_trap_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_cure_blend.mid b/sound/songs/midi/ph_cure_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..10ffeaac2f70433db56247ee28f73aef203c00e4
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHP41A9Hg
N1e<!Z1{(&D6adH24+#JO

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_cure_held.mid b/sound/songs/midi/ph_cure_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4640b98d2f3f3f00200ece488f63e9ce816b2794
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%?$FPCDo?(JbePcm`4FgCH0H(ncQ~&?~

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_cure_solo.mid b/sound/songs/midi/ph_cure_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..49ee7d36b8760ea2fc71735f21bfdebd42dd8960
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHnC1A9Hg
N1e<!Z1{(&D6adHa4+{VQ

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_dress_blend.mid b/sound/songs/midi/ph_dress_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..57d469e14782c9bb486c71a25b421829f1469fbc
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2v$1A9Hg
N1e<!Z1{(&D6ad9+4&?v<

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_dress_held.mid b/sound/songs/midi/ph_dress_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5f1fb3a11b85d310889d771cf66655e80dd47e96
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9&N#jt_Bo?(JbePcm`4FgCH0Hiq+FaQ7m

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_dress_solo.mid b/sound/songs/midi/ph_dress_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..1300936af85e9b9062b4f608226cf6c9c22493ff
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2{;1A9Hg
N1e<!Z1{(&D6adAJ4(9*>

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_face_blend.mid b/sound/songs/midi/ph_face_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ecd36ffc54dd29f5fcb8f1ed3aad57603827d371
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2>+1A9Hg
N1e<!Z1{(&D6ad8r4&ML(

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_face_held.mid b/sound/songs/midi/ph_face_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6dbdf778c1977022725a8fd66e70ec1caa1deeba
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9&N!mxq8o?(JbePcm`4FgCH0He(lDgXcg

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_face_solo.mid b/sound/songs/midi/ph_face_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..673dc1fb054310d72026b1586ea7e8386b82151a
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2#&1A9Hg
N1e<!Z1{(&D6ad924&eX*

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_fleece_blend.mid b/sound/songs/midi/ph_fleece_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..aca38b91f2dd9a1f2d531294675cfce468b4bf45
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2Lq1A9Hg
N1e<!Z1{(&D6adAa4(I>?

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_fleece_held.mid b/sound/songs/midi/ph_fleece_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b51a07f890888964784716e49afeef8ef5128bd9
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9&N%dmmHo?(JbePcm`4FgCH0HkjdGXMYp

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_fleece_solo.mid b/sound/songs/midi/ph_fleece_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..58b70e86d5bde5884babfa5c301aecf8cae68137
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2jy1A9Hg
N1e<!Z1{(&D6adA+4(b2^

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_foot_blend.mid b/sound/songs/midi/ph_foot_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e870d40f0082c0a32a5687f7b8f30acbaabd4559
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwGt-1A9Hg
N1e<!Z1{(&D6adFJ4*&oF

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_foot_held.mid b/sound/songs/midi/ph_foot_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..839f937f30234a9ba7f7d5669eb0edc249254910
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%?%CLdGo?(JbePcm`4FgCH0Hz-kO8@`>

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_foot_solo.mid b/sound/songs/midi/ph_foot_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..45841e495d310f91da4d1965a049676f16793c23
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwG__1A9Hg
N1e<!Z1{(&D6adFr4*~!H

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goat_blend.mid b/sound/songs/midi/ph_goat_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0057fabb865ae67e37cd0d2e05d65bb21e578b1a
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwGk)1A9Hg
N1e<!Z1{(&D6adC+4)g#3

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goat_held.mid b/sound/songs/midi/ph_goat_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..8a564dc6e910b0257909240f796c196f07d94a49
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$X$*_UFo?(JbePcm`4FgCH0HsG0KL7v#

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goat_solo.mid b/sound/songs/midi/ph_goat_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dcfea0410c07eed958883b0d7f60d22601dc2420
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwG+?1A9Hg
N1e<!Z1{(&D6adDJ4)y>5

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goose_blend.mid b/sound/songs/midi/ph_goose_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..aa4f91866b2666c900ee1912030c0bd083b2203b
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHhA1A9Hg
N1e<!Z1{(&D6adF+4+8)I

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goose_held.mid b/sound/songs/midi/ph_goose_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ead4a4c9c6068d448604fbb942e8a3e7e1a51520
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%?!LWh7o?(JbePcm`4FgCH0H#$FP5=M^

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_goose_solo.mid b/sound/songs/midi/ph_goose_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..da9714425d71f565add33a27c4eadfe60785c292
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHD01A9Hg
N1e<!Z1{(&D6adGJ4+Q`K

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_kit_blend.mid b/sound/songs/midi/ph_kit_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..96c7e4e07f17178507dc70260df16c7a05c8f32a
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%38?1A9Hg
N1e<!Z1{(&D6adB24(k8_

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_kit_held.mid b/sound/songs/midi/ph_kit_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..143b64a54cce0313974d54252488c4f33a9fcc59
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$Xz_5Y6o?(JbePcm`4FgCH0Hmc8HUIzs

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_kit_solo.mid b/sound/songs/midi/ph_kit_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ce2ae1aea07ce2bc835b837388d74f2da5ff5a5e
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwH3|1A9Hg
N1e<!Z1{(&D6adBa4($K{

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_lot_blend.mid b/sound/songs/midi/ph_lot_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..1da4002822cb4472a6524b4256ec98d1f7d25aba
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHG11A9Hg
N1e<!Z1{(&D6adCJ4)Fj0

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_lot_held.mid b/sound/songs/midi/ph_lot_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2cc6dad1efe84160ddcf3792bf2e0ccabb0dbf5b
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$X#;}3Co?(JbePcm`4FgCH0HqNVJOBUy

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_lot_solo.mid b/sound/songs/midi/ph_lot_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f7adf264fca58d16393ceeac52d4911e2099489d
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHe91A9Hg
N1e<!Z1{(&D6adCr4)Xv2

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_mouth_blend.mid b/sound/songs/midi/ph_mouth_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4934f6af39223b2c13a58d18c98da99bcbabfb72
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwH6}1A9Hg
N1e<!Z1{(&D6adEr4*dWC

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_mouth_held.mid b/sound/songs/midi/ph_mouth_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..7b4a4f2e4a2929cfe3e81cf9441c4c4ad840f388
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%?#IS+Ao?(JbePcm`4FgCH0Hx^@NB{r;

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_mouth_solo.mid b/sound/songs/midi/ph_mouth_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..7cb34e8bbbf57ba57fedb702d7473b16b07ae443
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHV61A9Hg
N1e<!Z1{(&D6adF24*viE

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_nurse_blend.mid b/sound/songs/midi/ph_nurse_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9281f0afe408c9055235887c2b5edf7e636ead15
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb-;jO1A9Hg
N1e<!Z1{(&D6adHr4-5bR

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_nurse_held.mid b/sound/songs/midi/ph_nurse_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6c42c4366d47b6df61825f77317b67fba5f613e4
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%C$gqLEo?(JbePcm`4FgCH0H*g7R{#J2

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_nurse_solo.mid b/sound/songs/midi/ph_nurse_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..6c562ef68c889a32954a3af480e8ec27662c3ab5
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb-;*W1A9Hg
N1e<!Z1{(&D6adI24-NnT

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_price_blend.mid b/sound/songs/midi/ph_price_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..94e63c5778bd7ceb29121b47198a9ee37c04c3c0
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwG$=1A9Hg
N1e<!Z1{(&D6adBr4(<Q|

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_price_held.mid b/sound/songs/midi/ph_price_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..eab4e10047b50f1c87e01e193f88b79a47de0b79
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$X%&>vIlwpERePcm`4FgCH0HjY7F8}}l

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_price_solo.mid b/sound/songs/midi/ph_price_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..efafa7a13d10588d546670018919bd63f3e91418
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwGq+1A9Hg
N1e<!Z1{(&D6adC24)6c~

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_strut_blend.mid b/sound/songs/midi/ph_strut_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..7793b5777283284273342489bf83fbc5fe967077
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwG<@1A9Hg
N1e<!Z1{(&D6adGa4+a1L

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_strut_held.mid b/sound/songs/midi/ph_strut_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9f29295e65340718721ee6ac84f91dcecc3341d7
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9%?&9H&Jo?(JbePcm`4FgCH0H%u*Q2+n{

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_strut_solo.mid b/sound/songs/midi/ph_strut_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..000d111befdc37746336dc9794e0dc17bde40d5e
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwGz<1A9Hg
N1e<!Z1{(&D6adG+4+sDN

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_thought_blend.mid b/sound/songs/midi/ph_thought_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4288adfe49cf769d5aff106b7450daef78c0ba20
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHY71A9Hg
N1e<!Z1{(&D6adDa4)*{6

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_thought_held.mid b/sound/songs/midi/ph_thought_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9fe8f2405fdfefbe68e68be30458a8fe076b86c4
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9$X!?1z9o?(JbePcm`4FgCH0Hu8sLI3~&

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_thought_solo.mid b/sound/songs/midi/ph_thought_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dd6f82a869d303aa1f9623e0fa8ce1b609771970
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkbwHM31A9Hg
N1e<!Z1{(&D6adD+4*388

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_trap_blend.mid b/sound/songs/midi/ph_trap_blend.mid
new file mode 100644
index 0000000000000000000000000000000000000000..fc1546f45db3540ad8e1a2697a108cecdeb8f121
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%23k1A9Hg
O1e<!D1{(%upcDYaj}FxU

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_trap_held.mid b/sound/songs/midi/ph_trap_held.mid
new file mode 100644
index 0000000000000000000000000000000000000000..470877003517a12ce2896b91eb2e2ad35c85203f
GIT binary patch
literal 79
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztH|FiCJQ{10SiU#O7qpN%mZM8q=u*Jpq#
Y5@9&N$gqLElwpERePcm`4FgCH0HX^N9RL6T

literal 0
HcmV?d00001

diff --git a/sound/songs/midi/ph_trap_solo.mid b/sound/songs/midi/ph_trap_solo.mid
new file mode 100644
index 0000000000000000000000000000000000000000..31c6d609f4df881093207a5c16e08f129dc4b728
GIT binary patch
literal 68
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SiU#P(FU!MUkb%2Rs1A9Hg
N1e<!Z1{(&D6ad8a4&DF&

literal 0
HcmV?d00001

diff --git a/sound/songs/ph_cure_blend.s b/sound/songs/ph_cure_blend.s
deleted file mode 100644
index 6a539880f6..0000000000
--- a/sound/songs/ph_cure_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cure_blend_grp, voicegroup130
-	.equ	ph_cure_blend_pri, 4
-	.equ	ph_cure_blend_rev, 0
-	.equ	ph_cure_blend_mvl, 127
-	.equ	ph_cure_blend_key, 0
-	.equ	ph_cure_blend_tbs, 1
-	.equ	ph_cure_blend_exg, 0
-	.equ	ph_cure_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_cure_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cure_blend_1:
-	.byte	KEYSH , ph_cure_blend_key+0
-	.byte	TEMPO , 120*ph_cure_blend_tbs/2
-	.byte		VOICE , 45
-	.byte		VOL   , 127*ph_cure_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cure_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cure_blend_pri	@ Priority
-	.byte	ph_cure_blend_rev	@ Reverb.
-
-	.word	ph_cure_blend_grp
-
-	.word	ph_cure_blend_1
-
-	.end
diff --git a/sound/songs/ph_cure_held.s b/sound/songs/ph_cure_held.s
deleted file mode 100644
index 6dc31cf687..0000000000
--- a/sound/songs/ph_cure_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cure_held_grp, voicegroup130
-	.equ	ph_cure_held_pri, 4
-	.equ	ph_cure_held_rev, 0
-	.equ	ph_cure_held_mvl, 127
-	.equ	ph_cure_held_key, 0
-	.equ	ph_cure_held_tbs, 1
-	.equ	ph_cure_held_exg, 0
-	.equ	ph_cure_held_cmp, 1
-
-	.section .rodata
-	.global	ph_cure_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cure_held_1:
-	.byte	KEYSH , ph_cure_held_key+0
-	.byte	TEMPO , 120*ph_cure_held_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 127*ph_cure_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_cure_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_cure_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cure_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cure_held_pri	@ Priority
-	.byte	ph_cure_held_rev	@ Reverb.
-
-	.word	ph_cure_held_grp
-
-	.word	ph_cure_held_1
-
-	.end
diff --git a/sound/songs/ph_cure_solo.s b/sound/songs/ph_cure_solo.s
deleted file mode 100644
index c3400338fb..0000000000
--- a/sound/songs/ph_cure_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_cure_solo_grp, voicegroup130
-	.equ	ph_cure_solo_pri, 4
-	.equ	ph_cure_solo_rev, 0
-	.equ	ph_cure_solo_mvl, 127
-	.equ	ph_cure_solo_key, 0
-	.equ	ph_cure_solo_tbs, 1
-	.equ	ph_cure_solo_exg, 0
-	.equ	ph_cure_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_cure_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_cure_solo_1:
-	.byte	KEYSH , ph_cure_solo_key+0
-	.byte	TEMPO , 120*ph_cure_solo_tbs/2
-	.byte		VOICE , 47
-	.byte		VOL   , 127*ph_cure_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_cure_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_cure_solo_pri	@ Priority
-	.byte	ph_cure_solo_rev	@ Reverb.
-
-	.word	ph_cure_solo_grp
-
-	.word	ph_cure_solo_1
-
-	.end
diff --git a/sound/songs/ph_dress_blend.s b/sound/songs/ph_dress_blend.s
deleted file mode 100644
index 8cafed3766..0000000000
--- a/sound/songs/ph_dress_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_dress_blend_grp, voicegroup130
-	.equ	ph_dress_blend_pri, 4
-	.equ	ph_dress_blend_rev, 0
-	.equ	ph_dress_blend_mvl, 127
-	.equ	ph_dress_blend_key, 0
-	.equ	ph_dress_blend_tbs, 1
-	.equ	ph_dress_blend_exg, 0
-	.equ	ph_dress_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_dress_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_dress_blend_1:
-	.byte	KEYSH , ph_dress_blend_key+0
-	.byte	TEMPO , 120*ph_dress_blend_tbs/2
-	.byte		VOICE , 9
-	.byte		VOL   , 127*ph_dress_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_dress_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_dress_blend_pri	@ Priority
-	.byte	ph_dress_blend_rev	@ Reverb.
-
-	.word	ph_dress_blend_grp
-
-	.word	ph_dress_blend_1
-
-	.end
diff --git a/sound/songs/ph_dress_held.s b/sound/songs/ph_dress_held.s
deleted file mode 100644
index f1b432e3bb..0000000000
--- a/sound/songs/ph_dress_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_dress_held_grp, voicegroup130
-	.equ	ph_dress_held_pri, 4
-	.equ	ph_dress_held_rev, 0
-	.equ	ph_dress_held_mvl, 127
-	.equ	ph_dress_held_key, 0
-	.equ	ph_dress_held_tbs, 1
-	.equ	ph_dress_held_exg, 0
-	.equ	ph_dress_held_cmp, 1
-
-	.section .rodata
-	.global	ph_dress_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_dress_held_1:
-	.byte	KEYSH , ph_dress_held_key+0
-	.byte	TEMPO , 120*ph_dress_held_tbs/2
-	.byte		VOICE , 10
-	.byte		VOL   , 127*ph_dress_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_dress_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_dress_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_dress_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_dress_held_pri	@ Priority
-	.byte	ph_dress_held_rev	@ Reverb.
-
-	.word	ph_dress_held_grp
-
-	.word	ph_dress_held_1
-
-	.end
diff --git a/sound/songs/ph_dress_solo.s b/sound/songs/ph_dress_solo.s
deleted file mode 100644
index 3162f15d72..0000000000
--- a/sound/songs/ph_dress_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_dress_solo_grp, voicegroup130
-	.equ	ph_dress_solo_pri, 4
-	.equ	ph_dress_solo_rev, 0
-	.equ	ph_dress_solo_mvl, 127
-	.equ	ph_dress_solo_key, 0
-	.equ	ph_dress_solo_tbs, 1
-	.equ	ph_dress_solo_exg, 0
-	.equ	ph_dress_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_dress_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_dress_solo_1:
-	.byte	KEYSH , ph_dress_solo_key+0
-	.byte	TEMPO , 120*ph_dress_solo_tbs/2
-	.byte		VOICE , 11
-	.byte		VOL   , 127*ph_dress_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_dress_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_dress_solo_pri	@ Priority
-	.byte	ph_dress_solo_rev	@ Reverb.
-
-	.word	ph_dress_solo_grp
-
-	.word	ph_dress_solo_1
-
-	.end
diff --git a/sound/songs/ph_face_blend.s b/sound/songs/ph_face_blend.s
deleted file mode 100644
index 143e53726b..0000000000
--- a/sound/songs/ph_face_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_face_blend_grp, voicegroup130
-	.equ	ph_face_blend_pri, 4
-	.equ	ph_face_blend_rev, 0
-	.equ	ph_face_blend_mvl, 127
-	.equ	ph_face_blend_key, 0
-	.equ	ph_face_blend_tbs, 1
-	.equ	ph_face_blend_exg, 0
-	.equ	ph_face_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_face_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_face_blend_1:
-	.byte	KEYSH , ph_face_blend_key+0
-	.byte	TEMPO , 120*ph_face_blend_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 127*ph_face_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_face_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_face_blend_pri	@ Priority
-	.byte	ph_face_blend_rev	@ Reverb.
-
-	.word	ph_face_blend_grp
-
-	.word	ph_face_blend_1
-
-	.end
diff --git a/sound/songs/ph_face_held.s b/sound/songs/ph_face_held.s
deleted file mode 100644
index cfd93fc01c..0000000000
--- a/sound/songs/ph_face_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_face_held_grp, voicegroup130
-	.equ	ph_face_held_pri, 4
-	.equ	ph_face_held_rev, 0
-	.equ	ph_face_held_mvl, 127
-	.equ	ph_face_held_key, 0
-	.equ	ph_face_held_tbs, 1
-	.equ	ph_face_held_exg, 0
-	.equ	ph_face_held_cmp, 1
-
-	.section .rodata
-	.global	ph_face_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_face_held_1:
-	.byte	KEYSH , ph_face_held_key+0
-	.byte	TEMPO , 120*ph_face_held_tbs/2
-	.byte		VOICE , 4
-	.byte		VOL   , 127*ph_face_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_face_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_face_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_face_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_face_held_pri	@ Priority
-	.byte	ph_face_held_rev	@ Reverb.
-
-	.word	ph_face_held_grp
-
-	.word	ph_face_held_1
-
-	.end
diff --git a/sound/songs/ph_face_solo.s b/sound/songs/ph_face_solo.s
deleted file mode 100644
index 83be67615c..0000000000
--- a/sound/songs/ph_face_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_face_solo_grp, voicegroup130
-	.equ	ph_face_solo_pri, 4
-	.equ	ph_face_solo_rev, 0
-	.equ	ph_face_solo_mvl, 127
-	.equ	ph_face_solo_key, 0
-	.equ	ph_face_solo_tbs, 1
-	.equ	ph_face_solo_exg, 0
-	.equ	ph_face_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_face_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_face_solo_1:
-	.byte	KEYSH , ph_face_solo_key+0
-	.byte	TEMPO , 120*ph_face_solo_tbs/2
-	.byte		VOICE , 5
-	.byte		VOL   , 127*ph_face_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_face_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_face_solo_pri	@ Priority
-	.byte	ph_face_solo_rev	@ Reverb.
-
-	.word	ph_face_solo_grp
-
-	.word	ph_face_solo_1
-
-	.end
diff --git a/sound/songs/ph_fleece_blend.s b/sound/songs/ph_fleece_blend.s
deleted file mode 100644
index 4aa50e981e..0000000000
--- a/sound/songs/ph_fleece_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_fleece_blend_grp, voicegroup130
-	.equ	ph_fleece_blend_pri, 4
-	.equ	ph_fleece_blend_rev, 0
-	.equ	ph_fleece_blend_mvl, 127
-	.equ	ph_fleece_blend_key, 0
-	.equ	ph_fleece_blend_tbs, 1
-	.equ	ph_fleece_blend_exg, 0
-	.equ	ph_fleece_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_fleece_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_fleece_blend_1:
-	.byte	KEYSH , ph_fleece_blend_key+0
-	.byte	TEMPO , 120*ph_fleece_blend_tbs/2
-	.byte		VOICE , 12
-	.byte		VOL   , 127*ph_fleece_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_fleece_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_fleece_blend_pri	@ Priority
-	.byte	ph_fleece_blend_rev	@ Reverb.
-
-	.word	ph_fleece_blend_grp
-
-	.word	ph_fleece_blend_1
-
-	.end
diff --git a/sound/songs/ph_fleece_held.s b/sound/songs/ph_fleece_held.s
deleted file mode 100644
index 1074ef9e22..0000000000
--- a/sound/songs/ph_fleece_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_fleece_held_grp, voicegroup130
-	.equ	ph_fleece_held_pri, 4
-	.equ	ph_fleece_held_rev, 0
-	.equ	ph_fleece_held_mvl, 127
-	.equ	ph_fleece_held_key, 0
-	.equ	ph_fleece_held_tbs, 1
-	.equ	ph_fleece_held_exg, 0
-	.equ	ph_fleece_held_cmp, 1
-
-	.section .rodata
-	.global	ph_fleece_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_fleece_held_1:
-	.byte	KEYSH , ph_fleece_held_key+0
-	.byte	TEMPO , 120*ph_fleece_held_tbs/2
-	.byte		VOICE , 13
-	.byte		VOL   , 127*ph_fleece_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_fleece_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_fleece_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_fleece_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_fleece_held_pri	@ Priority
-	.byte	ph_fleece_held_rev	@ Reverb.
-
-	.word	ph_fleece_held_grp
-
-	.word	ph_fleece_held_1
-
-	.end
diff --git a/sound/songs/ph_fleece_solo.s b/sound/songs/ph_fleece_solo.s
deleted file mode 100644
index ada1865bd1..0000000000
--- a/sound/songs/ph_fleece_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_fleece_solo_grp, voicegroup130
-	.equ	ph_fleece_solo_pri, 4
-	.equ	ph_fleece_solo_rev, 0
-	.equ	ph_fleece_solo_mvl, 127
-	.equ	ph_fleece_solo_key, 0
-	.equ	ph_fleece_solo_tbs, 1
-	.equ	ph_fleece_solo_exg, 0
-	.equ	ph_fleece_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_fleece_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_fleece_solo_1:
-	.byte	KEYSH , ph_fleece_solo_key+0
-	.byte	TEMPO , 120*ph_fleece_solo_tbs/2
-	.byte		VOICE , 14
-	.byte		VOL   , 127*ph_fleece_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_fleece_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_fleece_solo_pri	@ Priority
-	.byte	ph_fleece_solo_rev	@ Reverb.
-
-	.word	ph_fleece_solo_grp
-
-	.word	ph_fleece_solo_1
-
-	.end
diff --git a/sound/songs/ph_foot_blend.s b/sound/songs/ph_foot_blend.s
deleted file mode 100644
index 62ebc68a90..0000000000
--- a/sound/songs/ph_foot_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_foot_blend_grp, voicegroup130
-	.equ	ph_foot_blend_pri, 4
-	.equ	ph_foot_blend_rev, 0
-	.equ	ph_foot_blend_mvl, 127
-	.equ	ph_foot_blend_key, 0
-	.equ	ph_foot_blend_tbs, 1
-	.equ	ph_foot_blend_exg, 0
-	.equ	ph_foot_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_foot_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_foot_blend_1:
-	.byte	KEYSH , ph_foot_blend_key+0
-	.byte	TEMPO , 120*ph_foot_blend_tbs/2
-	.byte		VOICE , 36
-	.byte		VOL   , 127*ph_foot_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_foot_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_foot_blend_pri	@ Priority
-	.byte	ph_foot_blend_rev	@ Reverb.
-
-	.word	ph_foot_blend_grp
-
-	.word	ph_foot_blend_1
-
-	.end
diff --git a/sound/songs/ph_foot_held.s b/sound/songs/ph_foot_held.s
deleted file mode 100644
index ebac052879..0000000000
--- a/sound/songs/ph_foot_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_foot_held_grp, voicegroup130
-	.equ	ph_foot_held_pri, 4
-	.equ	ph_foot_held_rev, 0
-	.equ	ph_foot_held_mvl, 127
-	.equ	ph_foot_held_key, 0
-	.equ	ph_foot_held_tbs, 1
-	.equ	ph_foot_held_exg, 0
-	.equ	ph_foot_held_cmp, 1
-
-	.section .rodata
-	.global	ph_foot_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_foot_held_1:
-	.byte	KEYSH , ph_foot_held_key+0
-	.byte	TEMPO , 120*ph_foot_held_tbs/2
-	.byte		VOICE , 37
-	.byte		VOL   , 127*ph_foot_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_foot_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_foot_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_foot_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_foot_held_pri	@ Priority
-	.byte	ph_foot_held_rev	@ Reverb.
-
-	.word	ph_foot_held_grp
-
-	.word	ph_foot_held_1
-
-	.end
diff --git a/sound/songs/ph_foot_solo.s b/sound/songs/ph_foot_solo.s
deleted file mode 100644
index 65c680c279..0000000000
--- a/sound/songs/ph_foot_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_foot_solo_grp, voicegroup130
-	.equ	ph_foot_solo_pri, 4
-	.equ	ph_foot_solo_rev, 0
-	.equ	ph_foot_solo_mvl, 127
-	.equ	ph_foot_solo_key, 0
-	.equ	ph_foot_solo_tbs, 1
-	.equ	ph_foot_solo_exg, 0
-	.equ	ph_foot_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_foot_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_foot_solo_1:
-	.byte	KEYSH , ph_foot_solo_key+0
-	.byte	TEMPO , 120*ph_foot_solo_tbs/2
-	.byte		VOICE , 38
-	.byte		VOL   , 127*ph_foot_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_foot_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_foot_solo_pri	@ Priority
-	.byte	ph_foot_solo_rev	@ Reverb.
-
-	.word	ph_foot_solo_grp
-
-	.word	ph_foot_solo_1
-
-	.end
diff --git a/sound/songs/ph_goat_blend.s b/sound/songs/ph_goat_blend.s
deleted file mode 100644
index a5749b99d4..0000000000
--- a/sound/songs/ph_goat_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goat_blend_grp, voicegroup130
-	.equ	ph_goat_blend_pri, 4
-	.equ	ph_goat_blend_rev, 0
-	.equ	ph_goat_blend_mvl, 127
-	.equ	ph_goat_blend_key, 0
-	.equ	ph_goat_blend_tbs, 1
-	.equ	ph_goat_blend_exg, 0
-	.equ	ph_goat_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_goat_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goat_blend_1:
-	.byte	KEYSH , ph_goat_blend_key+0
-	.byte	TEMPO , 120*ph_goat_blend_tbs/2
-	.byte		VOICE , 24
-	.byte		VOL   , 127*ph_goat_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goat_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goat_blend_pri	@ Priority
-	.byte	ph_goat_blend_rev	@ Reverb.
-
-	.word	ph_goat_blend_grp
-
-	.word	ph_goat_blend_1
-
-	.end
diff --git a/sound/songs/ph_goat_held.s b/sound/songs/ph_goat_held.s
deleted file mode 100644
index 1f71aabf66..0000000000
--- a/sound/songs/ph_goat_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goat_held_grp, voicegroup130
-	.equ	ph_goat_held_pri, 4
-	.equ	ph_goat_held_rev, 0
-	.equ	ph_goat_held_mvl, 127
-	.equ	ph_goat_held_key, 0
-	.equ	ph_goat_held_tbs, 1
-	.equ	ph_goat_held_exg, 0
-	.equ	ph_goat_held_cmp, 1
-
-	.section .rodata
-	.global	ph_goat_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goat_held_1:
-	.byte	KEYSH , ph_goat_held_key+0
-	.byte	TEMPO , 120*ph_goat_held_tbs/2
-	.byte		VOICE , 25
-	.byte		VOL   , 127*ph_goat_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_goat_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_goat_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goat_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goat_held_pri	@ Priority
-	.byte	ph_goat_held_rev	@ Reverb.
-
-	.word	ph_goat_held_grp
-
-	.word	ph_goat_held_1
-
-	.end
diff --git a/sound/songs/ph_goat_solo.s b/sound/songs/ph_goat_solo.s
deleted file mode 100644
index d7c9b8e2f4..0000000000
--- a/sound/songs/ph_goat_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goat_solo_grp, voicegroup130
-	.equ	ph_goat_solo_pri, 4
-	.equ	ph_goat_solo_rev, 0
-	.equ	ph_goat_solo_mvl, 127
-	.equ	ph_goat_solo_key, 0
-	.equ	ph_goat_solo_tbs, 1
-	.equ	ph_goat_solo_exg, 0
-	.equ	ph_goat_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_goat_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goat_solo_1:
-	.byte	KEYSH , ph_goat_solo_key+0
-	.byte	TEMPO , 120*ph_goat_solo_tbs/2
-	.byte		VOICE , 26
-	.byte		VOL   , 127*ph_goat_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goat_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goat_solo_pri	@ Priority
-	.byte	ph_goat_solo_rev	@ Reverb.
-
-	.word	ph_goat_solo_grp
-
-	.word	ph_goat_solo_1
-
-	.end
diff --git a/sound/songs/ph_goose_blend.s b/sound/songs/ph_goose_blend.s
deleted file mode 100644
index 04d5b44cc6..0000000000
--- a/sound/songs/ph_goose_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goose_blend_grp, voicegroup130
-	.equ	ph_goose_blend_pri, 4
-	.equ	ph_goose_blend_rev, 0
-	.equ	ph_goose_blend_mvl, 127
-	.equ	ph_goose_blend_key, 0
-	.equ	ph_goose_blend_tbs, 1
-	.equ	ph_goose_blend_exg, 0
-	.equ	ph_goose_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_goose_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goose_blend_1:
-	.byte	KEYSH , ph_goose_blend_key+0
-	.byte	TEMPO , 120*ph_goose_blend_tbs/2
-	.byte		VOICE , 39
-	.byte		VOL   , 127*ph_goose_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goose_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goose_blend_pri	@ Priority
-	.byte	ph_goose_blend_rev	@ Reverb.
-
-	.word	ph_goose_blend_grp
-
-	.word	ph_goose_blend_1
-
-	.end
diff --git a/sound/songs/ph_goose_held.s b/sound/songs/ph_goose_held.s
deleted file mode 100644
index 40ca71ba7c..0000000000
--- a/sound/songs/ph_goose_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goose_held_grp, voicegroup130
-	.equ	ph_goose_held_pri, 4
-	.equ	ph_goose_held_rev, 0
-	.equ	ph_goose_held_mvl, 127
-	.equ	ph_goose_held_key, 0
-	.equ	ph_goose_held_tbs, 1
-	.equ	ph_goose_held_exg, 0
-	.equ	ph_goose_held_cmp, 1
-
-	.section .rodata
-	.global	ph_goose_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goose_held_1:
-	.byte	KEYSH , ph_goose_held_key+0
-	.byte	TEMPO , 120*ph_goose_held_tbs/2
-	.byte		VOICE , 40
-	.byte		VOL   , 127*ph_goose_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_goose_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_goose_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goose_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goose_held_pri	@ Priority
-	.byte	ph_goose_held_rev	@ Reverb.
-
-	.word	ph_goose_held_grp
-
-	.word	ph_goose_held_1
-
-	.end
diff --git a/sound/songs/ph_goose_solo.s b/sound/songs/ph_goose_solo.s
deleted file mode 100644
index b9c7756785..0000000000
--- a/sound/songs/ph_goose_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_goose_solo_grp, voicegroup130
-	.equ	ph_goose_solo_pri, 4
-	.equ	ph_goose_solo_rev, 0
-	.equ	ph_goose_solo_mvl, 127
-	.equ	ph_goose_solo_key, 0
-	.equ	ph_goose_solo_tbs, 1
-	.equ	ph_goose_solo_exg, 0
-	.equ	ph_goose_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_goose_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_goose_solo_1:
-	.byte	KEYSH , ph_goose_solo_key+0
-	.byte	TEMPO , 120*ph_goose_solo_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 127*ph_goose_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_goose_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_goose_solo_pri	@ Priority
-	.byte	ph_goose_solo_rev	@ Reverb.
-
-	.word	ph_goose_solo_grp
-
-	.word	ph_goose_solo_1
-
-	.end
diff --git a/sound/songs/ph_kit_blend.s b/sound/songs/ph_kit_blend.s
deleted file mode 100644
index 9672a33726..0000000000
--- a/sound/songs/ph_kit_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_kit_blend_grp, voicegroup130
-	.equ	ph_kit_blend_pri, 4
-	.equ	ph_kit_blend_rev, 0
-	.equ	ph_kit_blend_mvl, 127
-	.equ	ph_kit_blend_key, 0
-	.equ	ph_kit_blend_tbs, 1
-	.equ	ph_kit_blend_exg, 0
-	.equ	ph_kit_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_kit_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_kit_blend_1:
-	.byte	KEYSH , ph_kit_blend_key+0
-	.byte	TEMPO , 120*ph_kit_blend_tbs/2
-	.byte		VOICE , 15
-	.byte		VOL   , 127*ph_kit_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_kit_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_kit_blend_pri	@ Priority
-	.byte	ph_kit_blend_rev	@ Reverb.
-
-	.word	ph_kit_blend_grp
-
-	.word	ph_kit_blend_1
-
-	.end
diff --git a/sound/songs/ph_kit_held.s b/sound/songs/ph_kit_held.s
deleted file mode 100644
index 81e4f5a35d..0000000000
--- a/sound/songs/ph_kit_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_kit_held_grp, voicegroup130
-	.equ	ph_kit_held_pri, 4
-	.equ	ph_kit_held_rev, 0
-	.equ	ph_kit_held_mvl, 127
-	.equ	ph_kit_held_key, 0
-	.equ	ph_kit_held_tbs, 1
-	.equ	ph_kit_held_exg, 0
-	.equ	ph_kit_held_cmp, 1
-
-	.section .rodata
-	.global	ph_kit_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_kit_held_1:
-	.byte	KEYSH , ph_kit_held_key+0
-	.byte	TEMPO , 120*ph_kit_held_tbs/2
-	.byte		VOICE , 16
-	.byte		VOL   , 127*ph_kit_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_kit_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_kit_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_kit_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_kit_held_pri	@ Priority
-	.byte	ph_kit_held_rev	@ Reverb.
-
-	.word	ph_kit_held_grp
-
-	.word	ph_kit_held_1
-
-	.end
diff --git a/sound/songs/ph_kit_solo.s b/sound/songs/ph_kit_solo.s
deleted file mode 100644
index 1c2bd0313e..0000000000
--- a/sound/songs/ph_kit_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_kit_solo_grp, voicegroup130
-	.equ	ph_kit_solo_pri, 4
-	.equ	ph_kit_solo_rev, 0
-	.equ	ph_kit_solo_mvl, 127
-	.equ	ph_kit_solo_key, 0
-	.equ	ph_kit_solo_tbs, 1
-	.equ	ph_kit_solo_exg, 0
-	.equ	ph_kit_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_kit_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_kit_solo_1:
-	.byte	KEYSH , ph_kit_solo_key+0
-	.byte	TEMPO , 120*ph_kit_solo_tbs/2
-	.byte		VOICE , 17
-	.byte		VOL   , 127*ph_kit_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_kit_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_kit_solo_pri	@ Priority
-	.byte	ph_kit_solo_rev	@ Reverb.
-
-	.word	ph_kit_solo_grp
-
-	.word	ph_kit_solo_1
-
-	.end
diff --git a/sound/songs/ph_lot_blend.s b/sound/songs/ph_lot_blend.s
deleted file mode 100644
index 7ec53ee79e..0000000000
--- a/sound/songs/ph_lot_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_lot_blend_grp, voicegroup130
-	.equ	ph_lot_blend_pri, 4
-	.equ	ph_lot_blend_rev, 0
-	.equ	ph_lot_blend_mvl, 127
-	.equ	ph_lot_blend_key, 0
-	.equ	ph_lot_blend_tbs, 1
-	.equ	ph_lot_blend_exg, 0
-	.equ	ph_lot_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_lot_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_lot_blend_1:
-	.byte	KEYSH , ph_lot_blend_key+0
-	.byte	TEMPO , 120*ph_lot_blend_tbs/2
-	.byte		VOICE , 21
-	.byte		VOL   , 127*ph_lot_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_lot_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_lot_blend_pri	@ Priority
-	.byte	ph_lot_blend_rev	@ Reverb.
-
-	.word	ph_lot_blend_grp
-
-	.word	ph_lot_blend_1
-
-	.end
diff --git a/sound/songs/ph_lot_held.s b/sound/songs/ph_lot_held.s
deleted file mode 100644
index 09756be1e5..0000000000
--- a/sound/songs/ph_lot_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_lot_held_grp, voicegroup130
-	.equ	ph_lot_held_pri, 4
-	.equ	ph_lot_held_rev, 0
-	.equ	ph_lot_held_mvl, 127
-	.equ	ph_lot_held_key, 0
-	.equ	ph_lot_held_tbs, 1
-	.equ	ph_lot_held_exg, 0
-	.equ	ph_lot_held_cmp, 1
-
-	.section .rodata
-	.global	ph_lot_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_lot_held_1:
-	.byte	KEYSH , ph_lot_held_key+0
-	.byte	TEMPO , 120*ph_lot_held_tbs/2
-	.byte		VOICE , 22
-	.byte		VOL   , 127*ph_lot_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_lot_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_lot_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_lot_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_lot_held_pri	@ Priority
-	.byte	ph_lot_held_rev	@ Reverb.
-
-	.word	ph_lot_held_grp
-
-	.word	ph_lot_held_1
-
-	.end
diff --git a/sound/songs/ph_lot_solo.s b/sound/songs/ph_lot_solo.s
deleted file mode 100644
index 2758ea4770..0000000000
--- a/sound/songs/ph_lot_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_lot_solo_grp, voicegroup130
-	.equ	ph_lot_solo_pri, 4
-	.equ	ph_lot_solo_rev, 0
-	.equ	ph_lot_solo_mvl, 127
-	.equ	ph_lot_solo_key, 0
-	.equ	ph_lot_solo_tbs, 1
-	.equ	ph_lot_solo_exg, 0
-	.equ	ph_lot_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_lot_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_lot_solo_1:
-	.byte	KEYSH , ph_lot_solo_key+0
-	.byte	TEMPO , 120*ph_lot_solo_tbs/2
-	.byte		VOICE , 23
-	.byte		VOL   , 127*ph_lot_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_lot_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_lot_solo_pri	@ Priority
-	.byte	ph_lot_solo_rev	@ Reverb.
-
-	.word	ph_lot_solo_grp
-
-	.word	ph_lot_solo_1
-
-	.end
diff --git a/sound/songs/ph_mouth_blend.s b/sound/songs/ph_mouth_blend.s
deleted file mode 100644
index 07d5425621..0000000000
--- a/sound/songs/ph_mouth_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_mouth_blend_grp, voicegroup130
-	.equ	ph_mouth_blend_pri, 4
-	.equ	ph_mouth_blend_rev, 0
-	.equ	ph_mouth_blend_mvl, 127
-	.equ	ph_mouth_blend_key, 0
-	.equ	ph_mouth_blend_tbs, 1
-	.equ	ph_mouth_blend_exg, 0
-	.equ	ph_mouth_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_mouth_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_mouth_blend_1:
-	.byte	KEYSH , ph_mouth_blend_key+0
-	.byte	TEMPO , 120*ph_mouth_blend_tbs/2
-	.byte		VOICE , 33
-	.byte		VOL   , 127*ph_mouth_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_mouth_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_mouth_blend_pri	@ Priority
-	.byte	ph_mouth_blend_rev	@ Reverb.
-
-	.word	ph_mouth_blend_grp
-
-	.word	ph_mouth_blend_1
-
-	.end
diff --git a/sound/songs/ph_mouth_held.s b/sound/songs/ph_mouth_held.s
deleted file mode 100644
index ce8e1d063a..0000000000
--- a/sound/songs/ph_mouth_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_mouth_held_grp, voicegroup130
-	.equ	ph_mouth_held_pri, 4
-	.equ	ph_mouth_held_rev, 0
-	.equ	ph_mouth_held_mvl, 127
-	.equ	ph_mouth_held_key, 0
-	.equ	ph_mouth_held_tbs, 1
-	.equ	ph_mouth_held_exg, 0
-	.equ	ph_mouth_held_cmp, 1
-
-	.section .rodata
-	.global	ph_mouth_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_mouth_held_1:
-	.byte	KEYSH , ph_mouth_held_key+0
-	.byte	TEMPO , 120*ph_mouth_held_tbs/2
-	.byte		VOICE , 34
-	.byte		VOL   , 127*ph_mouth_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_mouth_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_mouth_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_mouth_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_mouth_held_pri	@ Priority
-	.byte	ph_mouth_held_rev	@ Reverb.
-
-	.word	ph_mouth_held_grp
-
-	.word	ph_mouth_held_1
-
-	.end
diff --git a/sound/songs/ph_mouth_solo.s b/sound/songs/ph_mouth_solo.s
deleted file mode 100644
index 4b9729f162..0000000000
--- a/sound/songs/ph_mouth_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_mouth_solo_grp, voicegroup130
-	.equ	ph_mouth_solo_pri, 4
-	.equ	ph_mouth_solo_rev, 0
-	.equ	ph_mouth_solo_mvl, 127
-	.equ	ph_mouth_solo_key, 0
-	.equ	ph_mouth_solo_tbs, 1
-	.equ	ph_mouth_solo_exg, 0
-	.equ	ph_mouth_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_mouth_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_mouth_solo_1:
-	.byte	KEYSH , ph_mouth_solo_key+0
-	.byte	TEMPO , 120*ph_mouth_solo_tbs/2
-	.byte		VOICE , 35
-	.byte		VOL   , 127*ph_mouth_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_mouth_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_mouth_solo_pri	@ Priority
-	.byte	ph_mouth_solo_rev	@ Reverb.
-
-	.word	ph_mouth_solo_grp
-
-	.word	ph_mouth_solo_1
-
-	.end
diff --git a/sound/songs/ph_nurse_blend.s b/sound/songs/ph_nurse_blend.s
deleted file mode 100644
index 9f44300446..0000000000
--- a/sound/songs/ph_nurse_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_nurse_blend_grp, voicegroup130
-	.equ	ph_nurse_blend_pri, 4
-	.equ	ph_nurse_blend_rev, 0
-	.equ	ph_nurse_blend_mvl, 127
-	.equ	ph_nurse_blend_key, 0
-	.equ	ph_nurse_blend_tbs, 1
-	.equ	ph_nurse_blend_exg, 0
-	.equ	ph_nurse_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_nurse_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_nurse_blend_1:
-	.byte	KEYSH , ph_nurse_blend_key+0
-	.byte	TEMPO , 120*ph_nurse_blend_tbs/2
-	.byte		VOICE , 48
-	.byte		VOL   , 127*ph_nurse_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_nurse_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_nurse_blend_pri	@ Priority
-	.byte	ph_nurse_blend_rev	@ Reverb.
-
-	.word	ph_nurse_blend_grp
-
-	.word	ph_nurse_blend_1
-
-	.end
diff --git a/sound/songs/ph_nurse_held.s b/sound/songs/ph_nurse_held.s
deleted file mode 100644
index 0bce5b0b5d..0000000000
--- a/sound/songs/ph_nurse_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_nurse_held_grp, voicegroup130
-	.equ	ph_nurse_held_pri, 4
-	.equ	ph_nurse_held_rev, 0
-	.equ	ph_nurse_held_mvl, 127
-	.equ	ph_nurse_held_key, 0
-	.equ	ph_nurse_held_tbs, 1
-	.equ	ph_nurse_held_exg, 0
-	.equ	ph_nurse_held_cmp, 1
-
-	.section .rodata
-	.global	ph_nurse_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_nurse_held_1:
-	.byte	KEYSH , ph_nurse_held_key+0
-	.byte	TEMPO , 120*ph_nurse_held_tbs/2
-	.byte		VOICE , 49
-	.byte		VOL   , 127*ph_nurse_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_nurse_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_nurse_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_nurse_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_nurse_held_pri	@ Priority
-	.byte	ph_nurse_held_rev	@ Reverb.
-
-	.word	ph_nurse_held_grp
-
-	.word	ph_nurse_held_1
-
-	.end
diff --git a/sound/songs/ph_nurse_solo.s b/sound/songs/ph_nurse_solo.s
deleted file mode 100644
index 51aa0909b3..0000000000
--- a/sound/songs/ph_nurse_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_nurse_solo_grp, voicegroup130
-	.equ	ph_nurse_solo_pri, 4
-	.equ	ph_nurse_solo_rev, 0
-	.equ	ph_nurse_solo_mvl, 127
-	.equ	ph_nurse_solo_key, 0
-	.equ	ph_nurse_solo_tbs, 1
-	.equ	ph_nurse_solo_exg, 0
-	.equ	ph_nurse_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_nurse_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_nurse_solo_1:
-	.byte	KEYSH , ph_nurse_solo_key+0
-	.byte	TEMPO , 120*ph_nurse_solo_tbs/2
-	.byte		VOICE , 50
-	.byte		VOL   , 127*ph_nurse_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_nurse_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_nurse_solo_pri	@ Priority
-	.byte	ph_nurse_solo_rev	@ Reverb.
-
-	.word	ph_nurse_solo_grp
-
-	.word	ph_nurse_solo_1
-
-	.end
diff --git a/sound/songs/ph_price_blend.s b/sound/songs/ph_price_blend.s
deleted file mode 100644
index 8b27e3df96..0000000000
--- a/sound/songs/ph_price_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_price_blend_grp, voicegroup130
-	.equ	ph_price_blend_pri, 4
-	.equ	ph_price_blend_rev, 0
-	.equ	ph_price_blend_mvl, 127
-	.equ	ph_price_blend_key, 0
-	.equ	ph_price_blend_tbs, 1
-	.equ	ph_price_blend_exg, 0
-	.equ	ph_price_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_price_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_price_blend_1:
-	.byte	KEYSH , ph_price_blend_key+0
-	.byte	TEMPO , 120*ph_price_blend_tbs/2
-	.byte		VOICE , 18
-	.byte		VOL   , 127*ph_price_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_price_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_price_blend_pri	@ Priority
-	.byte	ph_price_blend_rev	@ Reverb.
-
-	.word	ph_price_blend_grp
-
-	.word	ph_price_blend_1
-
-	.end
diff --git a/sound/songs/ph_price_held.s b/sound/songs/ph_price_held.s
deleted file mode 100644
index 920c121c2e..0000000000
--- a/sound/songs/ph_price_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_price_held_grp, voicegroup130
-	.equ	ph_price_held_pri, 4
-	.equ	ph_price_held_rev, 0
-	.equ	ph_price_held_mvl, 127
-	.equ	ph_price_held_key, 0
-	.equ	ph_price_held_tbs, 1
-	.equ	ph_price_held_exg, 0
-	.equ	ph_price_held_cmp, 1
-
-	.section .rodata
-	.global	ph_price_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_price_held_1:
-	.byte	KEYSH , ph_price_held_key+0
-	.byte	TEMPO , 120*ph_price_held_tbs/2
-	.byte		VOICE , 19
-	.byte		VOL   , 117*ph_price_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_price_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_price_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_price_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_price_held_pri	@ Priority
-	.byte	ph_price_held_rev	@ Reverb.
-
-	.word	ph_price_held_grp
-
-	.word	ph_price_held_1
-
-	.end
diff --git a/sound/songs/ph_price_solo.s b/sound/songs/ph_price_solo.s
deleted file mode 100644
index 10b5f202d4..0000000000
--- a/sound/songs/ph_price_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_price_solo_grp, voicegroup130
-	.equ	ph_price_solo_pri, 4
-	.equ	ph_price_solo_rev, 0
-	.equ	ph_price_solo_mvl, 127
-	.equ	ph_price_solo_key, 0
-	.equ	ph_price_solo_tbs, 1
-	.equ	ph_price_solo_exg, 0
-	.equ	ph_price_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_price_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_price_solo_1:
-	.byte	KEYSH , ph_price_solo_key+0
-	.byte	TEMPO , 120*ph_price_solo_tbs/2
-	.byte		VOICE , 20
-	.byte		VOL   , 127*ph_price_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_price_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_price_solo_pri	@ Priority
-	.byte	ph_price_solo_rev	@ Reverb.
-
-	.word	ph_price_solo_grp
-
-	.word	ph_price_solo_1
-
-	.end
diff --git a/sound/songs/ph_strut_blend.s b/sound/songs/ph_strut_blend.s
deleted file mode 100644
index f42a859ebb..0000000000
--- a/sound/songs/ph_strut_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_strut_blend_grp, voicegroup130
-	.equ	ph_strut_blend_pri, 4
-	.equ	ph_strut_blend_rev, 0
-	.equ	ph_strut_blend_mvl, 127
-	.equ	ph_strut_blend_key, 0
-	.equ	ph_strut_blend_tbs, 1
-	.equ	ph_strut_blend_exg, 0
-	.equ	ph_strut_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_strut_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_strut_blend_1:
-	.byte	KEYSH , ph_strut_blend_key+0
-	.byte	TEMPO , 120*ph_strut_blend_tbs/2
-	.byte		VOICE , 42
-	.byte		VOL   , 127*ph_strut_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_strut_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_strut_blend_pri	@ Priority
-	.byte	ph_strut_blend_rev	@ Reverb.
-
-	.word	ph_strut_blend_grp
-
-	.word	ph_strut_blend_1
-
-	.end
diff --git a/sound/songs/ph_strut_held.s b/sound/songs/ph_strut_held.s
deleted file mode 100644
index 14521c1535..0000000000
--- a/sound/songs/ph_strut_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_strut_held_grp, voicegroup130
-	.equ	ph_strut_held_pri, 4
-	.equ	ph_strut_held_rev, 0
-	.equ	ph_strut_held_mvl, 127
-	.equ	ph_strut_held_key, 0
-	.equ	ph_strut_held_tbs, 1
-	.equ	ph_strut_held_exg, 0
-	.equ	ph_strut_held_cmp, 1
-
-	.section .rodata
-	.global	ph_strut_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_strut_held_1:
-	.byte	KEYSH , ph_strut_held_key+0
-	.byte	TEMPO , 120*ph_strut_held_tbs/2
-	.byte		VOICE , 43
-	.byte		VOL   , 127*ph_strut_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_strut_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_strut_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_strut_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_strut_held_pri	@ Priority
-	.byte	ph_strut_held_rev	@ Reverb.
-
-	.word	ph_strut_held_grp
-
-	.word	ph_strut_held_1
-
-	.end
diff --git a/sound/songs/ph_strut_solo.s b/sound/songs/ph_strut_solo.s
deleted file mode 100644
index f06787dd83..0000000000
--- a/sound/songs/ph_strut_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_strut_solo_grp, voicegroup130
-	.equ	ph_strut_solo_pri, 4
-	.equ	ph_strut_solo_rev, 0
-	.equ	ph_strut_solo_mvl, 127
-	.equ	ph_strut_solo_key, 0
-	.equ	ph_strut_solo_tbs, 1
-	.equ	ph_strut_solo_exg, 0
-	.equ	ph_strut_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_strut_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_strut_solo_1:
-	.byte	KEYSH , ph_strut_solo_key+0
-	.byte	TEMPO , 120*ph_strut_solo_tbs/2
-	.byte		VOICE , 44
-	.byte		VOL   , 127*ph_strut_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_strut_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_strut_solo_pri	@ Priority
-	.byte	ph_strut_solo_rev	@ Reverb.
-
-	.word	ph_strut_solo_grp
-
-	.word	ph_strut_solo_1
-
-	.end
diff --git a/sound/songs/ph_thought_blend.s b/sound/songs/ph_thought_blend.s
deleted file mode 100644
index d6616c4e6c..0000000000
--- a/sound/songs/ph_thought_blend.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_thought_blend_grp, voicegroup130
-	.equ	ph_thought_blend_pri, 4
-	.equ	ph_thought_blend_rev, 0
-	.equ	ph_thought_blend_mvl, 127
-	.equ	ph_thought_blend_key, 0
-	.equ	ph_thought_blend_tbs, 1
-	.equ	ph_thought_blend_exg, 0
-	.equ	ph_thought_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_thought_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_thought_blend_1:
-	.byte	KEYSH , ph_thought_blend_key+0
-	.byte	TEMPO , 120*ph_thought_blend_tbs/2
-	.byte		VOICE , 27
-	.byte		VOL   , 127*ph_thought_blend_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_thought_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_thought_blend_pri	@ Priority
-	.byte	ph_thought_blend_rev	@ Reverb.
-
-	.word	ph_thought_blend_grp
-
-	.word	ph_thought_blend_1
-
-	.end
diff --git a/sound/songs/ph_thought_held.s b/sound/songs/ph_thought_held.s
deleted file mode 100644
index 7c0b61821a..0000000000
--- a/sound/songs/ph_thought_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_thought_held_grp, voicegroup130
-	.equ	ph_thought_held_pri, 4
-	.equ	ph_thought_held_rev, 0
-	.equ	ph_thought_held_mvl, 127
-	.equ	ph_thought_held_key, 0
-	.equ	ph_thought_held_tbs, 1
-	.equ	ph_thought_held_exg, 0
-	.equ	ph_thought_held_cmp, 1
-
-	.section .rodata
-	.global	ph_thought_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_thought_held_1:
-	.byte	KEYSH , ph_thought_held_key+0
-	.byte	TEMPO , 120*ph_thought_held_tbs/2
-	.byte		VOICE , 28
-	.byte		VOL   , 127*ph_thought_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_thought_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_thought_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_thought_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_thought_held_pri	@ Priority
-	.byte	ph_thought_held_rev	@ Reverb.
-
-	.word	ph_thought_held_grp
-
-	.word	ph_thought_held_1
-
-	.end
diff --git a/sound/songs/ph_thought_solo.s b/sound/songs/ph_thought_solo.s
deleted file mode 100644
index 876f7aa762..0000000000
--- a/sound/songs/ph_thought_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_thought_solo_grp, voicegroup130
-	.equ	ph_thought_solo_pri, 4
-	.equ	ph_thought_solo_rev, 0
-	.equ	ph_thought_solo_mvl, 127
-	.equ	ph_thought_solo_key, 0
-	.equ	ph_thought_solo_tbs, 1
-	.equ	ph_thought_solo_exg, 0
-	.equ	ph_thought_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_thought_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_thought_solo_1:
-	.byte	KEYSH , ph_thought_solo_key+0
-	.byte	TEMPO , 120*ph_thought_solo_tbs/2
-	.byte		VOICE , 29
-	.byte		VOL   , 127*ph_thought_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_thought_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_thought_solo_pri	@ Priority
-	.byte	ph_thought_solo_rev	@ Reverb.
-
-	.word	ph_thought_solo_grp
-
-	.word	ph_thought_solo_1
-
-	.end
diff --git a/sound/songs/ph_trap_blend.s b/sound/songs/ph_trap_blend.s
deleted file mode 100644
index 34f2541d74..0000000000
--- a/sound/songs/ph_trap_blend.s
+++ /dev/null
@@ -1,41 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_trap_blend_grp, voicegroup130
-	.equ	ph_trap_blend_pri, 4
-	.equ	ph_trap_blend_rev, 0
-	.equ	ph_trap_blend_mvl, 127
-	.equ	ph_trap_blend_key, 0
-	.equ	ph_trap_blend_tbs, 1
-	.equ	ph_trap_blend_exg, 0
-	.equ	ph_trap_blend_cmp, 1
-
-	.section .rodata
-	.global	ph_trap_blend
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_trap_blend_1:
-	.byte	KEYSH , ph_trap_blend_key+0
-	.byte	TEMPO , 120*ph_trap_blend_tbs/2
-	.byte		VOICE , 0
-	.byte		VOL   , 127*ph_trap_blend_mvl/mxv
-	.byte		N44   , Cn3 , v127
-	.byte	W44
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_trap_blend:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_trap_blend_pri	@ Priority
-	.byte	ph_trap_blend_rev	@ Reverb.
-
-	.word	ph_trap_blend_grp
-
-	.word	ph_trap_blend_1
-
-	.end
diff --git a/sound/songs/ph_trap_held.s b/sound/songs/ph_trap_held.s
deleted file mode 100644
index 21b021fccb..0000000000
--- a/sound/songs/ph_trap_held.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_trap_held_grp, voicegroup130
-	.equ	ph_trap_held_pri, 4
-	.equ	ph_trap_held_rev, 0
-	.equ	ph_trap_held_mvl, 127
-	.equ	ph_trap_held_key, 0
-	.equ	ph_trap_held_tbs, 1
-	.equ	ph_trap_held_exg, 0
-	.equ	ph_trap_held_cmp, 1
-
-	.section .rodata
-	.global	ph_trap_held
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_trap_held_1:
-	.byte	KEYSH , ph_trap_held_key+0
-	.byte	TEMPO , 120*ph_trap_held_tbs/2
-	.byte		VOICE , 1
-	.byte		VOL   , 117*ph_trap_held_mvl/mxv
-	.byte		TIE   , Cn3 , v127
-	.byte	W96
-ph_trap_held_1_B1:
-	.byte	W96
-	.byte	GOTO
-	 .word	ph_trap_held_1_B1
-	.byte	W48
-	.byte		EOT   , Cn3 
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_trap_held:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_trap_held_pri	@ Priority
-	.byte	ph_trap_held_rev	@ Reverb.
-
-	.word	ph_trap_held_grp
-
-	.word	ph_trap_held_1
-
-	.end
diff --git a/sound/songs/ph_trap_solo.s b/sound/songs/ph_trap_solo.s
deleted file mode 100644
index c4a711b415..0000000000
--- a/sound/songs/ph_trap_solo.s
+++ /dev/null
@@ -1,40 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	ph_trap_solo_grp, voicegroup130
-	.equ	ph_trap_solo_pri, 4
-	.equ	ph_trap_solo_rev, 0
-	.equ	ph_trap_solo_mvl, 127
-	.equ	ph_trap_solo_key, 0
-	.equ	ph_trap_solo_tbs, 1
-	.equ	ph_trap_solo_exg, 0
-	.equ	ph_trap_solo_cmp, 1
-
-	.section .rodata
-	.global	ph_trap_solo
-	.align	2
-
-@********************** Track  1 **********************@
-
-ph_trap_solo_1:
-	.byte	KEYSH , ph_trap_solo_key+0
-	.byte	TEMPO , 120*ph_trap_solo_tbs/2
-	.byte		VOICE , 2
-	.byte		VOL   , 127*ph_trap_solo_mvl/mxv
-	.byte		N54   , Cn3 , v127
-	.byte	W54
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-ph_trap_solo:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	ph_trap_solo_pri	@ Priority
-	.byte	ph_trap_solo_rev	@ Reverb.
-
-	.word	ph_trap_solo_grp
-
-	.word	ph_trap_solo_1
-
-	.end