Rename phoneme samples to 'vowel_<number>'

60 files changed, 186 insertions, 186 deletions

diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index ba50fa3f4..455763ccf 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -1,6 +1,6 @@
 	.align 2
-DirectSoundWaveData_8456330:: @ 8456330
-	.incbin "sound/direct_sound_samples/synth/sc88_8456330.bin"
+DirectSoundWaveData_Tone1:: @ 8456330
+	.incbin "sound/direct_sound_samples/synth/tone1.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_Organ2:: @ 84569D4
@@ -239,28 +239,28 @@ DirectSoundWaveData_SC88_AccordianFr:: @ 84A5F58
 	.incbin "sound/direct_sound_samples/synth/sc88_22_accordion_fr.bin"
 
 	.align 2
-DirectSoundWaveData_84A7328:: @ 84A7328
-	.incbin "sound/direct_sound_samples/phonemes/84A7328.bin"
+DirectSoundWaveData_Phoneme_Vowel1:: @ 84A7328
+	.incbin "sound/direct_sound_samples/phonemes/vowel_1.bin"
 
 	.align 2
-DirectSoundWaveData_84A7F38:: @ 84A7F38
-	.incbin "sound/direct_sound_samples/phonemes/84A7F38.bin"
+DirectSoundWaveData_Phoneme_Vowel2:: @ 84A7F38
+	.incbin "sound/direct_sound_samples/phonemes/vowel_2.bin"
 
 	.align 2
-DirectSoundWaveData_84A8AC8:: @ 84A8AC8
-	.incbin "sound/direct_sound_samples/phonemes/84A8AC8.bin"
+DirectSoundWaveData_Phoneme_Vowel3:: @ 84A8AC8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_3.bin"
 
 	.align 2
-DirectSoundWaveData_84A9564:: @ 84A9564
-	.incbin "sound/direct_sound_samples/phonemes/84A9564.bin"
+DirectSoundWaveData_Phoneme_Vowel4:: @ 84A9564
+	.incbin "sound/direct_sound_samples/phonemes/vowel_4.bin"
 
 	.align 2
-DirectSoundWaveData_84A9EAC:: @ 84A9EAC
-	.incbin "sound/direct_sound_samples/phonemes/84A9EAC.bin"
+DirectSoundWaveData_Phoneme_Vowel5:: @ 84A9EAC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_5.bin"
 
 	.align 2
-DirectSoundWaveData_84AA8F4:: @ 84AA8F4
-	.incbin "sound/direct_sound_samples/phonemes/84AA8F4.bin"
+DirectSoundWaveData_Phoneme_Vowel6:: @ 84AA8F4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_6.bin"
 
 	.align 2
 Cry_Bulbasaur:: @ 84AB57C
@@ -1815,208 +1815,208 @@ Cry_Chimecho:: @ 8638E88
 	.incbin "sound/direct_sound_samples/cries/cry_chimecho.bin"
 
 	.align 2
-DirectSoundWaveData_8639898:: @ 8639898
-	.incbin "sound/direct_sound_samples/phonemes/8639898.bin"
+DirectSoundWaveData_Phoneme_Vowel7:: @ 8639898
+	.incbin "sound/direct_sound_samples/phonemes/vowel_7.bin"
 
 	.align 2
-DirectSoundWaveData_8639EF8:: @ 8639EF8
-	.incbin "sound/direct_sound_samples/phonemes/8639EF8.bin"
+DirectSoundWaveData_Phoneme_Vowel8:: @ 8639EF8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_8.bin"
 
 	.align 2
-DirectSoundWaveData_863A3DC:: @ 863A3DC
-	.incbin "sound/direct_sound_samples/phonemes/863A3DC.bin"
+DirectSoundWaveData_Phoneme_Vowel9:: @ 863A3DC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_9.bin"
 
 	.align 2
-DirectSoundWaveData_863AD2C:: @ 863AD2C
-	.incbin "sound/direct_sound_samples/phonemes/863AD2C.bin"
+DirectSoundWaveData_Phoneme_Vowel10:: @ 863AD2C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_10.bin"
 
 	.align 2
-DirectSoundWaveData_863B79C:: @ 863B79C
-	.incbin "sound/direct_sound_samples/phonemes/863B79C.bin"
+DirectSoundWaveData_Phoneme_Vowel11:: @ 863B79C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_11.bin"
 
 	.align 2
-DirectSoundWaveData_863BABC:: @ 863BABC
-	.incbin "sound/direct_sound_samples/phonemes/863BABC.bin"
+DirectSoundWaveData_Phoneme_Vowel12:: @ 863BABC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_12.bin"
 
 	.align 2
-DirectSoundWaveData_863C744:: @ 863C744
-	.incbin "sound/direct_sound_samples/phonemes/863C744.bin"
+DirectSoundWaveData_Phoneme_Vowel13:: @ 863C744
+	.incbin "sound/direct_sound_samples/phonemes/vowel_13.bin"
 
 	.align 2
-DirectSoundWaveData_863CD64:: @ 863CD64
-	.incbin "sound/direct_sound_samples/phonemes/863CD64.bin"
+DirectSoundWaveData_Phoneme_Vowel14:: @ 863CD64
+	.incbin "sound/direct_sound_samples/phonemes/vowel_14.bin"
 
 	.align 2
-DirectSoundWaveData_863D0EC:: @ 863D0EC
-	.incbin "sound/direct_sound_samples/phonemes/863D0EC.bin"
+DirectSoundWaveData_Phoneme_Vowel15:: @ 863D0EC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_15.bin"
 
 	.align 2
-DirectSoundWaveData_863DED0:: @ 863DED0
-	.incbin "sound/direct_sound_samples/phonemes/863DED0.bin"
+DirectSoundWaveData_Phoneme_Vowel16:: @ 863DED0
+	.incbin "sound/direct_sound_samples/phonemes/vowel_16.bin"
 
 	.align 2
-DirectSoundWaveData_863E840:: @ 863E840
-	.incbin "sound/direct_sound_samples/phonemes/863E840.bin"
+DirectSoundWaveData_Phoneme_Vowel17:: @ 863E840
+	.incbin "sound/direct_sound_samples/phonemes/vowel_17.bin"
 
 	.align 2
-DirectSoundWaveData_863EBDC:: @ 863EBDC
-	.incbin "sound/direct_sound_samples/phonemes/863EBDC.bin"
+DirectSoundWaveData_Phoneme_Vowel18:: @ 863EBDC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_18.bin"
 
 	.align 2
-DirectSoundWaveData_863F390:: @ 863F390
-	.incbin "sound/direct_sound_samples/phonemes/863F390.bin"
+DirectSoundWaveData_Phoneme_Vowel19:: @ 863F390
+	.incbin "sound/direct_sound_samples/phonemes/vowel_19.bin"
 
 	.align 2
-DirectSoundWaveData_86400EC:: @ 86400EC
-	.incbin "sound/direct_sound_samples/phonemes/86400EC.bin"
+DirectSoundWaveData_Phoneme_Vowel20:: @ 86400EC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_20.bin"
 
 	.align 2
-DirectSoundWaveData_8640330:: @ 8640330
-	.incbin "sound/direct_sound_samples/phonemes/8640330.bin"
+DirectSoundWaveData_Phoneme_Vowel21:: @ 8640330
+	.incbin "sound/direct_sound_samples/phonemes/vowel_21.bin"
 
 	.align 2
-DirectSoundWaveData_8641170:: @ 8641170
-	.incbin "sound/direct_sound_samples/phonemes/8641170.bin"
+DirectSoundWaveData_Phoneme_Vowel22:: @ 8641170
+	.incbin "sound/direct_sound_samples/phonemes/vowel_22.bin"
 
 	.align 2
-DirectSoundWaveData_8641AC4:: @ 8641AC4
-	.incbin "sound/direct_sound_samples/phonemes/8641AC4.bin"
+DirectSoundWaveData_Phoneme_Vowel23:: @ 8641AC4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_23.bin"
 
 	.align 2
-DirectSoundWaveData_8641E18:: @ 8641E18
-	.incbin "sound/direct_sound_samples/phonemes/8641E18.bin"
+DirectSoundWaveData_Phoneme_Vowel24:: @ 8641E18
+	.incbin "sound/direct_sound_samples/phonemes/vowel_24.bin"
 
 	.align 2
-DirectSoundWaveData_864244C:: @ 864244C
-	.incbin "sound/direct_sound_samples/phonemes/864244C.bin"
+DirectSoundWaveData_Phoneme_Vowel25:: @ 864244C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_25.bin"
 
 	.align 2
-DirectSoundWaveData_86430B8:: @ 86430B8
-	.incbin "sound/direct_sound_samples/phonemes/86430B8.bin"
+DirectSoundWaveData_Phoneme_Vowel26:: @ 86430B8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_26.bin"
 
 	.align 2
-DirectSoundWaveData_8643650:: @ 8643650
-	.incbin "sound/direct_sound_samples/phonemes/8643650.bin"
+DirectSoundWaveData_Phoneme_Vowel27:: @ 8643650
+	.incbin "sound/direct_sound_samples/phonemes/vowel_27.bin"
 
 	.align 2
-DirectSoundWaveData_8644154:: @ 8644154
-	.incbin "sound/direct_sound_samples/phonemes/8644154.bin"
+DirectSoundWaveData_Phoneme_Vowel28:: @ 8644154
+	.incbin "sound/direct_sound_samples/phonemes/vowel_28.bin"
 
 	.align 2
-DirectSoundWaveData_8644758:: @ 8644758
-	.incbin "sound/direct_sound_samples/phonemes/8644758.bin"
+DirectSoundWaveData_Phoneme_Vowel29:: @ 8644758
+	.incbin "sound/direct_sound_samples/phonemes/vowel_29.bin"
 
 	.align 2
-DirectSoundWaveData_8644950:: @ 8644950
-	.incbin "sound/direct_sound_samples/phonemes/8644950.bin"
+DirectSoundWaveData_Phoneme_Vowel30:: @ 8644950
+	.incbin "sound/direct_sound_samples/phonemes/vowel_30.bin"
 
 	.align 2
-DirectSoundWaveData_86452B4:: @ 86452B4
-	.incbin "sound/direct_sound_samples/phonemes/86452B4.bin"
+DirectSoundWaveData_Phoneme_Vowel31:: @ 86452B4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_31.bin"
 
 	.align 2
-DirectSoundWaveData_8646240:: @ 8646240
-	.incbin "sound/direct_sound_samples/phonemes/8646240.bin"
+DirectSoundWaveData_Phoneme_Vowel32:: @ 8646240
+	.incbin "sound/direct_sound_samples/phonemes/vowel_32.bin"
 
 	.align 2
-DirectSoundWaveData_8646878:: @ 8646878
-	.incbin "sound/direct_sound_samples/phonemes/8646878.bin"
+DirectSoundWaveData_Phoneme_Vowel33:: @ 8646878
+	.incbin "sound/direct_sound_samples/phonemes/vowel_33.bin"
 
 	.align 2
-DirectSoundWaveData_864734C:: @ 864734C
-	.incbin "sound/direct_sound_samples/phonemes/864734C.bin"
+DirectSoundWaveData_Phoneme_Vowel34:: @ 864734C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_34.bin"
 
 	.align 2
-DirectSoundWaveData_8648290:: @ 8648290
-	.incbin "sound/direct_sound_samples/phonemes/8648290.bin"
+DirectSoundWaveData_Phoneme_Vowel35:: @ 8648290
+	.incbin "sound/direct_sound_samples/phonemes/vowel_35.bin"
 
 	.align 2
-DirectSoundWaveData_8648808:: @ 8648808
-	.incbin "sound/direct_sound_samples/phonemes/8648808.bin"
+DirectSoundWaveData_Phoneme_Vowel36:: @ 8648808
+	.incbin "sound/direct_sound_samples/phonemes/vowel_36.bin"
 
 	.align 2
-DirectSoundWaveData_8649654:: @ 8649654
-	.incbin "sound/direct_sound_samples/phonemes/8649654.bin"
+DirectSoundWaveData_Phoneme_Vowel37:: @ 8649654
+	.incbin "sound/direct_sound_samples/phonemes/vowel_37.bin"
 
 	.align 2
-DirectSoundWaveData_864A55C:: @ 864A55C
-	.incbin "sound/direct_sound_samples/phonemes/864A55C.bin"
+DirectSoundWaveData_Phoneme_Vowel38:: @ 864A55C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_38.bin"
 
 	.align 2
-DirectSoundWaveData_864B030:: @ 864B030
-	.incbin "sound/direct_sound_samples/phonemes/864B030.bin"
+DirectSoundWaveData_Phoneme_Vowel39:: @ 864B030
+	.incbin "sound/direct_sound_samples/phonemes/vowel_39.bin"
 
 	.align 2
-DirectSoundWaveData_864BBC4:: @ 864BBC4
-	.incbin "sound/direct_sound_samples/phonemes/864BBC4.bin"
+DirectSoundWaveData_Phoneme_Vowel40:: @ 864BBC4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_40.bin"
 
 	.align 2
-DirectSoundWaveData_864C59C:: @ 864C59C
-	.incbin "sound/direct_sound_samples/phonemes/864C59C.bin"
+DirectSoundWaveData_Phoneme_Vowel41:: @ 864C59C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_41.bin"
 
 	.align 2
-DirectSoundWaveData_864CBDC:: @ 864CBDC
-	.incbin "sound/direct_sound_samples/phonemes/864CBDC.bin"
+DirectSoundWaveData_Phoneme_Vowel42:: @ 864CBDC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_42.bin"
 
 	.align 2
-DirectSoundWaveData_864D6BC:: @ 864D6BC
-	.incbin "sound/direct_sound_samples/phonemes/864D6BC.bin"
+DirectSoundWaveData_Phoneme_Vowel43:: @ 864D6BC
+	.incbin "sound/direct_sound_samples/phonemes/vowel_43.bin"
 
 	.align 2
-DirectSoundWaveData_864DCF8:: @ 864DCF8
-	.incbin "sound/direct_sound_samples/phonemes/864DCF8.bin"
+DirectSoundWaveData_Phoneme_Vowel44:: @ 864DCF8
+	.incbin "sound/direct_sound_samples/phonemes/vowel_44.bin"
 
 	.align 2
-DirectSoundWaveData_864E410:: @ 864E410
-	.incbin "sound/direct_sound_samples/phonemes/864E410.bin"
+DirectSoundWaveData_Phoneme_Vowel45:: @ 864E410
+	.incbin "sound/direct_sound_samples/phonemes/vowel_45.bin"
 
 	.align 2
-DirectSoundWaveData_864ED4C:: @ 864ED4C
-	.incbin "sound/direct_sound_samples/phonemes/864ED4C.bin"
+DirectSoundWaveData_Phoneme_Vowel46:: @ 864ED4C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_46.bin"
 
 	.align 2
-DirectSoundWaveData_864F508:: @ 864F508
-	.incbin "sound/direct_sound_samples/phonemes/864F508.bin"
+DirectSoundWaveData_Phoneme_Vowel47:: @ 864F508
+	.incbin "sound/direct_sound_samples/phonemes/vowel_47.bin"
 
 	.align 2
-DirectSoundWaveData_864FA6C:: @ 864FA6C
-	.incbin "sound/direct_sound_samples/phonemes/864FA6C.bin"
+DirectSoundWaveData_Phoneme_Vowel48:: @ 864FA6C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_48.bin"
 
 	.align 2
-DirectSoundWaveData_86507E0:: @ 86507E0
-	.incbin "sound/direct_sound_samples/phonemes/86507E0.bin"
+DirectSoundWaveData_Phoneme_Vowel49:: @ 86507E0
+	.incbin "sound/direct_sound_samples/phonemes/vowel_49.bin"
 
 	.align 2
-DirectSoundWaveData_8650C5C:: @ 8650C5C
-	.incbin "sound/direct_sound_samples/phonemes/8650C5C.bin"
+DirectSoundWaveData_Phoneme_Vowel50:: @ 8650C5C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_50.bin"
 
 	.align 2
-DirectSoundWaveData_8651148:: @ 8651148
-	.incbin "sound/direct_sound_samples/phonemes/8651148.bin"
+DirectSoundWaveData_Phoneme_Vowel51:: @ 8651148
+	.incbin "sound/direct_sound_samples/phonemes/vowel_51.bin"
 
 	.align 2
-DirectSoundWaveData_8651910:: @ 8651910
-	.incbin "sound/direct_sound_samples/phonemes/8651910.bin"
+DirectSoundWaveData_Phoneme_Vowel52:: @ 8651910
+	.incbin "sound/direct_sound_samples/phonemes/vowel_52.bin"
 
 	.align 2
-DirectSoundWaveData_865250C:: @ 865250C
-	.incbin "sound/direct_sound_samples/phonemes/865250C.bin"
+DirectSoundWaveData_Phoneme_Vowel53:: @ 865250C
+	.incbin "sound/direct_sound_samples/phonemes/vowel_53.bin"
 
 	.align 2
-DirectSoundWaveData_8652884:: @ 8652884
-	.incbin "sound/direct_sound_samples/phonemes/8652884.bin"
+DirectSoundWaveData_Phoneme_Vowel54:: @ 8652884
+	.incbin "sound/direct_sound_samples/phonemes/vowel_54.bin"
 
 	.align 2
-DirectSoundWaveData_8653040:: @ 8653040
-	.incbin "sound/direct_sound_samples/phonemes/8653040.bin"
+DirectSoundWaveData_Phoneme_Vowel55:: @ 8653040
+	.incbin "sound/direct_sound_samples/phonemes/vowel_55.bin"
 
 	.align 2
-DirectSoundWaveData_8653CA4:: @ 8653CA4
-	.incbin "sound/direct_sound_samples/phonemes/8653CA4.bin"
+DirectSoundWaveData_Phoneme_Vowel56:: @ 8653CA4
+	.incbin "sound/direct_sound_samples/phonemes/vowel_56.bin"
 
 	.align 2
-DirectSoundWaveData_8654170:: @ 8654170
-	.incbin "sound/direct_sound_samples/phonemes/8654170.bin"
+DirectSoundWaveData_Phoneme_Vowel57:: @ 8654170
+	.incbin "sound/direct_sound_samples/phonemes/vowel_57.bin"
 
 	.align 2
 DirectSoundWaveData_SC88_AccordionFr_Copy:: @ 8654C20
diff --git a/sound/direct_sound_samples/phonemes/84A7328.aif b/sound/direct_sound_samples/phonemes/vowel_1.aif
index 9521d0b6e..9521d0b6e 100644
--- a/sound/direct_sound_samples/phonemes/84A7328.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_1.aif
diff --git a/sound/direct_sound_samples/phonemes/863AD2C.aif b/sound/direct_sound_samples/phonemes/vowel_10.aif
index 3b136fa43..3b136fa43 100644
--- a/sound/direct_sound_samples/phonemes/863AD2C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_10.aif
diff --git a/sound/direct_sound_samples/phonemes/863B79C.aif b/sound/direct_sound_samples/phonemes/vowel_11.aif
index fd72512cf..fd72512cf 100644
--- a/sound/direct_sound_samples/phonemes/863B79C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_11.aif
diff --git a/sound/direct_sound_samples/phonemes/863BABC.aif b/sound/direct_sound_samples/phonemes/vowel_12.aif
index 6f7794bec..6f7794bec 100644
--- a/sound/direct_sound_samples/phonemes/863BABC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_12.aif
diff --git a/sound/direct_sound_samples/phonemes/863C744.aif b/sound/direct_sound_samples/phonemes/vowel_13.aif
index 89b845f21..89b845f21 100644
--- a/sound/direct_sound_samples/phonemes/863C744.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_13.aif
diff --git a/sound/direct_sound_samples/phonemes/863CD64.aif b/sound/direct_sound_samples/phonemes/vowel_14.aif
index 1d99a3a93..1d99a3a93 100644
--- a/sound/direct_sound_samples/phonemes/863CD64.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_14.aif
diff --git a/sound/direct_sound_samples/phonemes/863D0EC.aif b/sound/direct_sound_samples/phonemes/vowel_15.aif
index 883398129..883398129 100644
--- a/sound/direct_sound_samples/phonemes/863D0EC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_15.aif
diff --git a/sound/direct_sound_samples/phonemes/863DED0.aif b/sound/direct_sound_samples/phonemes/vowel_16.aif
index 776815e63..776815e63 100644
--- a/sound/direct_sound_samples/phonemes/863DED0.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_16.aif
diff --git a/sound/direct_sound_samples/phonemes/863E840.aif b/sound/direct_sound_samples/phonemes/vowel_17.aif
index 545bd1292..545bd1292 100644
--- a/sound/direct_sound_samples/phonemes/863E840.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_17.aif
diff --git a/sound/direct_sound_samples/phonemes/863EBDC.aif b/sound/direct_sound_samples/phonemes/vowel_18.aif
index c0a3be10d..c0a3be10d 100644
--- a/sound/direct_sound_samples/phonemes/863EBDC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_18.aif
diff --git a/sound/direct_sound_samples/phonemes/863F390.aif b/sound/direct_sound_samples/phonemes/vowel_19.aif
index d26ecdd6d..d26ecdd6d 100644
--- a/sound/direct_sound_samples/phonemes/863F390.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_19.aif
diff --git a/sound/direct_sound_samples/phonemes/84A7F38.aif b/sound/direct_sound_samples/phonemes/vowel_2.aif
index 2519572e2..2519572e2 100644
--- a/sound/direct_sound_samples/phonemes/84A7F38.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_2.aif
diff --git a/sound/direct_sound_samples/phonemes/86400EC.aif b/sound/direct_sound_samples/phonemes/vowel_20.aif
index 2b51201a4..2b51201a4 100644
--- a/sound/direct_sound_samples/phonemes/86400EC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_20.aif
diff --git a/sound/direct_sound_samples/phonemes/8640330.aif b/sound/direct_sound_samples/phonemes/vowel_21.aif
index cf5ac4e03..cf5ac4e03 100644
--- a/sound/direct_sound_samples/phonemes/8640330.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_21.aif
diff --git a/sound/direct_sound_samples/phonemes/8641170.aif b/sound/direct_sound_samples/phonemes/vowel_22.aif
index 606742e60..606742e60 100644
--- a/sound/direct_sound_samples/phonemes/8641170.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_22.aif
diff --git a/sound/direct_sound_samples/phonemes/8641AC4.aif b/sound/direct_sound_samples/phonemes/vowel_23.aif
index 71d4987d6..71d4987d6 100644
--- a/sound/direct_sound_samples/phonemes/8641AC4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_23.aif
diff --git a/sound/direct_sound_samples/phonemes/8641E18.aif b/sound/direct_sound_samples/phonemes/vowel_24.aif
index 070c44a37..070c44a37 100644
--- a/sound/direct_sound_samples/phonemes/8641E18.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_24.aif
diff --git a/sound/direct_sound_samples/phonemes/864244C.aif b/sound/direct_sound_samples/phonemes/vowel_25.aif
index b0ca84a38..b0ca84a38 100644
--- a/sound/direct_sound_samples/phonemes/864244C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_25.aif
diff --git a/sound/direct_sound_samples/phonemes/86430B8.aif b/sound/direct_sound_samples/phonemes/vowel_26.aif
index f44101b23..f44101b23 100644
--- a/sound/direct_sound_samples/phonemes/86430B8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_26.aif
diff --git a/sound/direct_sound_samples/phonemes/8643650.aif b/sound/direct_sound_samples/phonemes/vowel_27.aif
index a33809d42..a33809d42 100644
--- a/sound/direct_sound_samples/phonemes/8643650.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_27.aif
diff --git a/sound/direct_sound_samples/phonemes/8644154.aif b/sound/direct_sound_samples/phonemes/vowel_28.aif
index 6a005efcc..6a005efcc 100644
--- a/sound/direct_sound_samples/phonemes/8644154.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_28.aif
diff --git a/sound/direct_sound_samples/phonemes/8644758.aif b/sound/direct_sound_samples/phonemes/vowel_29.aif
index 62f9493fd..62f9493fd 100644
--- a/sound/direct_sound_samples/phonemes/8644758.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_29.aif
diff --git a/sound/direct_sound_samples/phonemes/84A8AC8.aif b/sound/direct_sound_samples/phonemes/vowel_3.aif
index d411e6612..d411e6612 100644
--- a/sound/direct_sound_samples/phonemes/84A8AC8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_3.aif
diff --git a/sound/direct_sound_samples/phonemes/8644950.aif b/sound/direct_sound_samples/phonemes/vowel_30.aif
index 5767bd6d9..5767bd6d9 100644
--- a/sound/direct_sound_samples/phonemes/8644950.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_30.aif
diff --git a/sound/direct_sound_samples/phonemes/86452B4.aif b/sound/direct_sound_samples/phonemes/vowel_31.aif
index 33e328a82..33e328a82 100644
--- a/sound/direct_sound_samples/phonemes/86452B4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_31.aif
diff --git a/sound/direct_sound_samples/phonemes/8646240.aif b/sound/direct_sound_samples/phonemes/vowel_32.aif
index 548e740c8..548e740c8 100644
--- a/sound/direct_sound_samples/phonemes/8646240.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_32.aif
diff --git a/sound/direct_sound_samples/phonemes/8646878.aif b/sound/direct_sound_samples/phonemes/vowel_33.aif
index cbbe09266..cbbe09266 100644
--- a/sound/direct_sound_samples/phonemes/8646878.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_33.aif
diff --git a/sound/direct_sound_samples/phonemes/864734C.aif b/sound/direct_sound_samples/phonemes/vowel_34.aif
index 8bdf7faaa..8bdf7faaa 100644
--- a/sound/direct_sound_samples/phonemes/864734C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_34.aif
diff --git a/sound/direct_sound_samples/phonemes/8648290.aif b/sound/direct_sound_samples/phonemes/vowel_35.aif
index f96f8853b..f96f8853b 100644
--- a/sound/direct_sound_samples/phonemes/8648290.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_35.aif
diff --git a/sound/direct_sound_samples/phonemes/8648808.aif b/sound/direct_sound_samples/phonemes/vowel_36.aif
index ab9abbf79..ab9abbf79 100644
--- a/sound/direct_sound_samples/phonemes/8648808.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_36.aif
diff --git a/sound/direct_sound_samples/phonemes/8649654.aif b/sound/direct_sound_samples/phonemes/vowel_37.aif
index 9d21d0ab4..9d21d0ab4 100644
--- a/sound/direct_sound_samples/phonemes/8649654.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_37.aif
diff --git a/sound/direct_sound_samples/phonemes/864A55C.aif b/sound/direct_sound_samples/phonemes/vowel_38.aif
index c037ed4af..c037ed4af 100644
--- a/sound/direct_sound_samples/phonemes/864A55C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_38.aif
diff --git a/sound/direct_sound_samples/phonemes/864B030.aif b/sound/direct_sound_samples/phonemes/vowel_39.aif
index ac1f8b66f..ac1f8b66f 100644
--- a/sound/direct_sound_samples/phonemes/864B030.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_39.aif
diff --git a/sound/direct_sound_samples/phonemes/84A9564.aif b/sound/direct_sound_samples/phonemes/vowel_4.aif
index 3bc1aa839..3bc1aa839 100644
--- a/sound/direct_sound_samples/phonemes/84A9564.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_4.aif
diff --git a/sound/direct_sound_samples/phonemes/864BBC4.aif b/sound/direct_sound_samples/phonemes/vowel_40.aif
index 1fd9111c8..1fd9111c8 100644
--- a/sound/direct_sound_samples/phonemes/864BBC4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_40.aif
diff --git a/sound/direct_sound_samples/phonemes/864C59C.aif b/sound/direct_sound_samples/phonemes/vowel_41.aif
index 5d6ae2282..5d6ae2282 100644
--- a/sound/direct_sound_samples/phonemes/864C59C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_41.aif
diff --git a/sound/direct_sound_samples/phonemes/864CBDC.aif b/sound/direct_sound_samples/phonemes/vowel_42.aif
index f26700690..f26700690 100644
--- a/sound/direct_sound_samples/phonemes/864CBDC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_42.aif
diff --git a/sound/direct_sound_samples/phonemes/864D6BC.aif b/sound/direct_sound_samples/phonemes/vowel_43.aif
index 3ba97a9fc..3ba97a9fc 100644
--- a/sound/direct_sound_samples/phonemes/864D6BC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_43.aif
diff --git a/sound/direct_sound_samples/phonemes/864DCF8.aif b/sound/direct_sound_samples/phonemes/vowel_44.aif
index 37f1be4b1..37f1be4b1 100644
--- a/sound/direct_sound_samples/phonemes/864DCF8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_44.aif
diff --git a/sound/direct_sound_samples/phonemes/864E410.aif b/sound/direct_sound_samples/phonemes/vowel_45.aif
index 4b3facb99..4b3facb99 100644
--- a/sound/direct_sound_samples/phonemes/864E410.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_45.aif
diff --git a/sound/direct_sound_samples/phonemes/864ED4C.aif b/sound/direct_sound_samples/phonemes/vowel_46.aif
index 8a4d7653b..8a4d7653b 100644
--- a/sound/direct_sound_samples/phonemes/864ED4C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_46.aif
diff --git a/sound/direct_sound_samples/phonemes/864F508.aif b/sound/direct_sound_samples/phonemes/vowel_47.aif
index db5bae244..db5bae244 100644
--- a/sound/direct_sound_samples/phonemes/864F508.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_47.aif
diff --git a/sound/direct_sound_samples/phonemes/864FA6C.aif b/sound/direct_sound_samples/phonemes/vowel_48.aif
index 6612dd54d..6612dd54d 100644
--- a/sound/direct_sound_samples/phonemes/864FA6C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_48.aif
diff --git a/sound/direct_sound_samples/phonemes/86507E0.aif b/sound/direct_sound_samples/phonemes/vowel_49.aif
index 441eecfcd..441eecfcd 100644
--- a/sound/direct_sound_samples/phonemes/86507E0.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_49.aif
diff --git a/sound/direct_sound_samples/phonemes/84A9EAC.aif b/sound/direct_sound_samples/phonemes/vowel_5.aif
index 3bacf3676..3bacf3676 100644
--- a/sound/direct_sound_samples/phonemes/84A9EAC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_5.aif
diff --git a/sound/direct_sound_samples/phonemes/8650C5C.aif b/sound/direct_sound_samples/phonemes/vowel_50.aif
index 95670cf0a..95670cf0a 100644
--- a/sound/direct_sound_samples/phonemes/8650C5C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_50.aif
diff --git a/sound/direct_sound_samples/phonemes/8651148.aif b/sound/direct_sound_samples/phonemes/vowel_51.aif
index 0fadcba8e..0fadcba8e 100644
--- a/sound/direct_sound_samples/phonemes/8651148.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_51.aif
diff --git a/sound/direct_sound_samples/phonemes/8651910.aif b/sound/direct_sound_samples/phonemes/vowel_52.aif
index 6017c55b4..6017c55b4 100644
--- a/sound/direct_sound_samples/phonemes/8651910.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_52.aif
diff --git a/sound/direct_sound_samples/phonemes/865250C.aif b/sound/direct_sound_samples/phonemes/vowel_53.aif
index 2327b6d65..2327b6d65 100644
--- a/sound/direct_sound_samples/phonemes/865250C.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_53.aif
diff --git a/sound/direct_sound_samples/phonemes/8652884.aif b/sound/direct_sound_samples/phonemes/vowel_54.aif
index 19ceca0d0..19ceca0d0 100644
--- a/sound/direct_sound_samples/phonemes/8652884.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_54.aif
diff --git a/sound/direct_sound_samples/phonemes/8653040.aif b/sound/direct_sound_samples/phonemes/vowel_55.aif
index 8438d301a..8438d301a 100644
--- a/sound/direct_sound_samples/phonemes/8653040.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_55.aif
diff --git a/sound/direct_sound_samples/phonemes/8653CA4.aif b/sound/direct_sound_samples/phonemes/vowel_56.aif
index 74d4bcf4a..74d4bcf4a 100644
--- a/sound/direct_sound_samples/phonemes/8653CA4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_56.aif
diff --git a/sound/direct_sound_samples/phonemes/8654170.aif b/sound/direct_sound_samples/phonemes/vowel_57.aif
index dfef8a82b..dfef8a82b 100644
--- a/sound/direct_sound_samples/phonemes/8654170.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_57.aif
diff --git a/sound/direct_sound_samples/phonemes/84AA8F4.aif b/sound/direct_sound_samples/phonemes/vowel_6.aif
index 5ddaa153d..5ddaa153d 100644
--- a/sound/direct_sound_samples/phonemes/84AA8F4.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_6.aif
diff --git a/sound/direct_sound_samples/phonemes/8639898.aif b/sound/direct_sound_samples/phonemes/vowel_7.aif
index 4b15a94b7..4b15a94b7 100644
--- a/sound/direct_sound_samples/phonemes/8639898.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_7.aif
diff --git a/sound/direct_sound_samples/phonemes/8639EF8.aif b/sound/direct_sound_samples/phonemes/vowel_8.aif
index 74c129073..74c129073 100644
--- a/sound/direct_sound_samples/phonemes/8639EF8.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_8.aif
diff --git a/sound/direct_sound_samples/phonemes/863A3DC.aif b/sound/direct_sound_samples/phonemes/vowel_9.aif
index 359972c16..359972c16 100644
--- a/sound/direct_sound_samples/phonemes/863A3DC.aif
+++ b/sound/direct_sound_samples/phonemes/vowel_9.aif
diff --git a/sound/direct_sound_samples/synth/sc88_8456330.aif b/sound/direct_sound_samples/synth/tone1.aif
index 199ead811..199ead811 100644
--- a/sound/direct_sound_samples/synth/sc88_8456330.aif
+++ b/sound/direct_sound_samples/synth/tone1.aif
diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc
index 0d4c94121..1d7c46c83 100644
--- a/sound/voice_groups.inc
+++ b/sound/voice_groups.inc
@@ -9,7 +9,7 @@ voicegroup_pokemon_cry:: @ 842FC8
 	voice_square_2 2, 0, 0, 9, 2  @ 842FCD0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FCDC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FCE8
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235  @ 842FCF4
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235  @ 842FCF4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD0C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 842FD18
@@ -507,7 +507,7 @@ voicegroup_843129C:: @ 843129C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312E4
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 84312FC
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 235  @ 8431308
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 235  @ 8431308
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431314
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8431320
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843132C
@@ -4061,7 +4061,7 @@ voicegroup_843B424:: @ 843B424
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B46C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B478
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B484
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 204, 51, 242  @ 843B490
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 204, 51, 242  @ 843B490
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B49C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B4A8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B4B4
@@ -4152,7 +4152,7 @@ voicegroup_843B844:: @ 843B844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B88C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B898
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8A4
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242  @ 843B8B0
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242  @ 843B8B0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8C8
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843B8D4
@@ -5146,7 +5146,7 @@ voicegroup_843E5BC:: @ 843E5BC
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E604
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E610
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E61C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 188, 51, 242  @ 843E628
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 188, 51, 242  @ 843E628
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E634
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E640
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843E64C
@@ -5408,7 +5408,7 @@ voicegroup_843F1BC:: @ 843F1BC
 	voice_programmable_wave_alt ProgrammableWaveData_84553FC, 0, 7, 15, 0  @ 843F204
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F210
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F21C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 51, 242  @ 843F228
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 51, 242  @ 843F228
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F234
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F240
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 843F24C
@@ -8387,7 +8387,7 @@ voicegroup_8447A00:: @ 8447A00
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A48
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A54
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A60
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 8447A6C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 8447A6C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A78
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A84
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8447A90
@@ -9391,7 +9391,7 @@ voicegroup_844A7F0:: @ 844A7F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A838
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A844
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A850
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 844A85C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 844A85C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A868
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A874
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844A880
@@ -9784,7 +9784,7 @@ voicegroup_844B9F0:: @ 844B9F0
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA38
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA44
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA50
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 165, 72, 249  @ 844BA5C
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 165, 72, 249  @ 844BA5C
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA68
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA74
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 844BA80
@@ -12006,7 +12006,7 @@ voicegroup_8451F90:: @ 8451F90
 	voice_directsound_no_resample 60, 0, DirectSoundWaveData_Ring, 255, 249, 0, 165  @ 8451F90
 	voice_directsound_alt 60, 0, DirectSoundWaveData_Ring, 255, 0, 255, 165  @ 8451F9C
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitSnare4, 255, 0, 255, 165  @ 8451FA8
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 242, 0, 127  @ 8451FB4
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 242, 0, 127  @ 8451FB4
 	voice_noise_alt 0, 0, 1, 0, 1  @ 8451FC0
 	voice_noise_alt 1, 0, 1, 0, 1  @ 8451FCC
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitTimbale2, 255, 0, 255, 165  @ 8451FD8
@@ -12031,7 +12031,7 @@ voicegroup_8451F90:: @ 8451F90
 	voice_noise_alt 0, 0, 7, 15, 1  @ 84520BC
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_CarCrash, 255, 0, 255, 127  @ 84520C8
 	voice_noise_alt 1, 0, 7, 15, 1  @ 84520D4
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 246, 0, 127  @ 84520E0
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 246, 0, 127  @ 84520E0
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_PinkNoise, 255, 0, 255, 127  @ 84520EC
 	voice_square_1_alt 19, 2, 0, 2, 0, 0  @ 84520F8
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_WaspySynth, 255, 0, 255, 127  @ 8452104
@@ -12046,7 +12046,7 @@ voicegroup_8451F90:: @ 8451F90
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitClosedHiHat, 255, 127, 0, 188  @ 8452170
 	voice_directsound 60, 0, DirectSoundWaveData_Noise1, 255, 249, 0, 165  @ 845217C
 	voice_square_1 0, 0, 4, 6, 0, 0  @ 8452188
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 13, 0, 255, 127  @ 8452194
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 13, 0, 255, 127  @ 8452194
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 13, 0, 255, 127  @ 84521A0
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_JPSuperSaw, 255, 0, 255, 127  @ 84521AC
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_Piano1, 255, 252, 0, 204  @ 84521B8
@@ -12057,7 +12057,7 @@ voicegroup_8451F90:: @ 8451F90
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_TubularBell, 255, 226, 0, 127  @ 84521F4
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_DrumKitCrashCymbal1, 26, 0, 255, 127  @ 8452200
 	voice_square_1_alt 0, 2, 0, 1, 0, 0  @ 845220C
-	voice_directsound 60, 0, DirectSoundWaveData_8456330, 255, 252, 0, 127  @ 8452218
+	voice_directsound 60, 0, DirectSoundWaveData_Tone1, 255, 252, 0, 127  @ 8452218
 	voice_square_1_alt 0, 1, 0, 2, 0, 0  @ 8452224
 	voice_directsound 60, 0, DirectSoundWaveData_SC88_PizzicatoStrings, 255, 127, 0, 127  @ 8452230
 	voice_noise_alt 0, 1, 6, 0, 0  @ 845223C
@@ -12125,12 +12125,12 @@ voicegroup_8451F90:: @ 8451F90
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452524
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 8452530
 	voice_square_1 0, 2, 0, 0, 15, 0  @ 845253C
-	voice_directsound 60, 0, DirectSoundWaveData_84A7328, 255, 0, 255, 165  @ 8452548
-	voice_directsound 60, 0, DirectSoundWaveData_84A7F38, 255, 0, 255, 165  @ 8452554
-	voice_directsound 60, 0, DirectSoundWaveData_84A8AC8, 255, 0, 255, 165  @ 8452560
-	voice_directsound 60, 0, DirectSoundWaveData_84A9564, 255, 0, 255, 165  @ 845256C
-	voice_directsound 60, 0, DirectSoundWaveData_84A9EAC, 255, 0, 255, 165  @ 8452578
-	voice_directsound 60, 0, DirectSoundWaveData_84AA8F4, 255, 0, 255, 165  @ 8452584
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel1, 255, 0, 255, 165  @ 8452548
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel2, 255, 0, 255, 165  @ 8452554
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel3, 255, 0, 255, 165  @ 8452560
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel4, 255, 0, 255, 165  @ 845256C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel5, 255, 0, 255, 165  @ 8452578
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel6, 255, 0, 255, 165  @ 8452584
 
 	.align 2
 voicegroup_8452590:: @ 8452590
@@ -12934,57 +12934,57 @@ voicegroup_84549C0:: @ 84549C0
 
 	.align 2
 voicegroup_84549F0:: @ 84549F0
-	voice_directsound 60, 0, DirectSoundWaveData_8639898, 255, 0, 255, 0  @ 84549F0
-	voice_directsound 60, 0, DirectSoundWaveData_8639EF8, 255, 0, 255, 0  @ 84549FC
-	voice_directsound 60, 0, DirectSoundWaveData_863A3DC, 255, 0, 255, 0  @ 8454A08
-	voice_directsound 60, 0, DirectSoundWaveData_863AD2C, 255, 0, 255, 0  @ 8454A14
-	voice_directsound 60, 0, DirectSoundWaveData_863B79C, 255, 0, 255, 0  @ 8454A20
-	voice_directsound 60, 0, DirectSoundWaveData_863BABC, 255, 0, 255, 0  @ 8454A2C
-	voice_directsound 60, 0, DirectSoundWaveData_863C744, 255, 0, 255, 0  @ 8454A38
-	voice_directsound 60, 0, DirectSoundWaveData_863CD64, 255, 0, 255, 0  @ 8454A44
-	voice_directsound 60, 0, DirectSoundWaveData_863D0EC, 255, 0, 255, 0  @ 8454A50
-	voice_directsound 60, 0, DirectSoundWaveData_863DED0, 255, 0, 255, 0  @ 8454A5C
-	voice_directsound 60, 0, DirectSoundWaveData_863E840, 255, 0, 255, 0  @ 8454A68
-	voice_directsound 60, 0, DirectSoundWaveData_863EBDC, 255, 0, 255, 0  @ 8454A74
-	voice_directsound 60, 0, DirectSoundWaveData_863F390, 255, 0, 255, 0  @ 8454A80
-	voice_directsound 60, 0, DirectSoundWaveData_86400EC, 255, 0, 255, 0  @ 8454A8C
-	voice_directsound 60, 0, DirectSoundWaveData_8640330, 255, 0, 255, 0  @ 8454A98
-	voice_directsound 60, 0, DirectSoundWaveData_8641170, 255, 0, 255, 0  @ 8454AA4
-	voice_directsound 60, 0, DirectSoundWaveData_8641AC4, 255, 0, 255, 0  @ 8454AB0
-	voice_directsound 60, 0, DirectSoundWaveData_8641E18, 255, 0, 255, 0  @ 8454ABC
-	voice_directsound 60, 0, DirectSoundWaveData_864244C, 255, 0, 255, 0  @ 8454AC8
-	voice_directsound 60, 0, DirectSoundWaveData_86430B8, 255, 0, 255, 0  @ 8454AD4
-	voice_directsound 60, 0, DirectSoundWaveData_8643650, 255, 0, 255, 0  @ 8454AE0
-	voice_directsound 60, 0, DirectSoundWaveData_8644154, 255, 0, 255, 0  @ 8454AEC
-	voice_directsound 60, 0, DirectSoundWaveData_8644758, 255, 0, 255, 0  @ 8454AF8
-	voice_directsound 60, 0, DirectSoundWaveData_8644950, 255, 0, 255, 0  @ 8454B04
-	voice_directsound 60, 0, DirectSoundWaveData_86452B4, 255, 0, 255, 0  @ 8454B10
-	voice_directsound 60, 0, DirectSoundWaveData_8646240, 255, 0, 255, 0  @ 8454B1C
-	voice_directsound 60, 0, DirectSoundWaveData_8646878, 255, 0, 255, 0  @ 8454B28
-	voice_directsound 60, 0, DirectSoundWaveData_864734C, 255, 0, 255, 0  @ 8454B34
-	voice_directsound 60, 0, DirectSoundWaveData_8648290, 255, 0, 255, 0  @ 8454B40
-	voice_directsound 60, 0, DirectSoundWaveData_8648808, 255, 0, 255, 0  @ 8454B4C
-	voice_directsound 60, 0, DirectSoundWaveData_8649654, 255, 0, 255, 0  @ 8454B58
-	voice_directsound 60, 0, DirectSoundWaveData_864A55C, 255, 0, 255, 0  @ 8454B64
-	voice_directsound 60, 0, DirectSoundWaveData_864B030, 255, 0, 255, 0  @ 8454B70
-	voice_directsound 60, 0, DirectSoundWaveData_864BBC4, 255, 0, 255, 0  @ 8454B7C
-	voice_directsound 60, 0, DirectSoundWaveData_864C59C, 255, 0, 255, 0  @ 8454B88
-	voice_directsound 60, 0, DirectSoundWaveData_864CBDC, 255, 0, 255, 0  @ 8454B94
-	voice_directsound 60, 0, DirectSoundWaveData_864D6BC, 255, 0, 255, 0  @ 8454BA0
-	voice_directsound 60, 0, DirectSoundWaveData_864DCF8, 255, 0, 255, 0  @ 8454BAC
-	voice_directsound 60, 0, DirectSoundWaveData_864E410, 255, 0, 255, 0  @ 8454BB8
-	voice_directsound 60, 0, DirectSoundWaveData_864ED4C, 255, 0, 255, 0  @ 8454BC4
-	voice_directsound 60, 0, DirectSoundWaveData_864F508, 255, 0, 255, 0  @ 8454BD0
-	voice_directsound 60, 0, DirectSoundWaveData_864FA6C, 255, 0, 255, 0  @ 8454BDC
-	voice_directsound 60, 0, DirectSoundWaveData_86507E0, 255, 0, 255, 0  @ 8454BE8
-	voice_directsound 60, 0, DirectSoundWaveData_8650C5C, 255, 0, 255, 0  @ 8454BF4
-	voice_directsound 60, 0, DirectSoundWaveData_8651148, 255, 0, 255, 0  @ 8454C00
-	voice_directsound 60, 0, DirectSoundWaveData_8651910, 255, 0, 255, 0  @ 8454C0C
-	voice_directsound 60, 0, DirectSoundWaveData_865250C, 255, 0, 255, 0  @ 8454C18
-	voice_directsound 60, 0, DirectSoundWaveData_8652884, 255, 0, 255, 0  @ 8454C24
-	voice_directsound 60, 0, DirectSoundWaveData_8653040, 255, 0, 255, 0  @ 8454C30
-	voice_directsound 60, 0, DirectSoundWaveData_8653CA4, 255, 0, 255, 0  @ 8454C3C
-	voice_directsound 60, 0, DirectSoundWaveData_8654170, 255, 0, 255, 0  @ 8454C48
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel7, 255, 0, 255, 0  @ 84549F0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel8, 255, 0, 255, 0  @ 84549FC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel9, 255, 0, 255, 0  @ 8454A08
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel10, 255, 0, 255, 0  @ 8454A14
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel11, 255, 0, 255, 0  @ 8454A20
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel12, 255, 0, 255, 0  @ 8454A2C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel13, 255, 0, 255, 0  @ 8454A38
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel14, 255, 0, 255, 0  @ 8454A44
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel15, 255, 0, 255, 0  @ 8454A50
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel16, 255, 0, 255, 0  @ 8454A5C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel17, 255, 0, 255, 0  @ 8454A68
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel18, 255, 0, 255, 0  @ 8454A74
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel19, 255, 0, 255, 0  @ 8454A80
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel20, 255, 0, 255, 0  @ 8454A8C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel21, 255, 0, 255, 0  @ 8454A98
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel22, 255, 0, 255, 0  @ 8454AA4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel23, 255, 0, 255, 0  @ 8454AB0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel24, 255, 0, 255, 0  @ 8454ABC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel25, 255, 0, 255, 0  @ 8454AC8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel26, 255, 0, 255, 0  @ 8454AD4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel27, 255, 0, 255, 0  @ 8454AE0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel28, 255, 0, 255, 0  @ 8454AEC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel29, 255, 0, 255, 0  @ 8454AF8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel30, 255, 0, 255, 0  @ 8454B04
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel31, 255, 0, 255, 0  @ 8454B10
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel32, 255, 0, 255, 0  @ 8454B1C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel33, 255, 0, 255, 0  @ 8454B28
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel34, 255, 0, 255, 0  @ 8454B34
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel35, 255, 0, 255, 0  @ 8454B40
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel36, 255, 0, 255, 0  @ 8454B4C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel37, 255, 0, 255, 0  @ 8454B58
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel38, 255, 0, 255, 0  @ 8454B64
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel39, 255, 0, 255, 0  @ 8454B70
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel40, 255, 0, 255, 0  @ 8454B7C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel41, 255, 0, 255, 0  @ 8454B88
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel42, 255, 0, 255, 0  @ 8454B94
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel43, 255, 0, 255, 0  @ 8454BA0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel44, 255, 0, 255, 0  @ 8454BAC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel45, 255, 0, 255, 0  @ 8454BB8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel46, 255, 0, 255, 0  @ 8454BC4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel47, 255, 0, 255, 0  @ 8454BD0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel48, 255, 0, 255, 0  @ 8454BDC
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel49, 255, 0, 255, 0  @ 8454BE8
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel50, 255, 0, 255, 0  @ 8454BF4
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel51, 255, 0, 255, 0  @ 8454C00
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel52, 255, 0, 255, 0  @ 8454C0C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel53, 255, 0, 255, 0  @ 8454C18
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel54, 255, 0, 255, 0  @ 8454C24
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel55, 255, 0, 255, 0  @ 8454C30
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel56, 255, 0, 255, 0  @ 8454C3C
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_Vowel57, 255, 0, 255, 0  @ 8454C48
 
 	.align 2
 voicegroup_8454C54:: @ 8454C54