Merge pull request #1547 from GriffinRichards/doc-sounddata

Clean up sound, add CRY_MODE constants

345 files changed, 1238 insertions, 1179 deletions

diff --git a/.github/calcrom/calcrom.pl b/.github/calcrom/calcrom.pl
index c351c7612..37ebcb4d2 100755
--- a/.github/calcrom/calcrom.pl
+++ b/.github/calcrom/calcrom.pl
@@ -63,14 +63,14 @@ while (my $line = <$file>)
 # though. Uniq is pretty fast!
 my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
 
-# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
+# This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that
 # it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
-my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
+my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'";
 
 # This looks for every symbol with an address at the end of it. Some things are
 # given a name based on their type / location, but still have an unknown purpose.
 # For example, FooMap_EventScript_FFFFFFF.
-my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,6\\}'";
+my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,7\\}'";
 
 my $count_cmd = "wc -l";
 
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 62437ccb8..27a439725 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -334,10 +334,10 @@
 	.byte 0x30
 	.endm
 
-	@ Plays the specified (fanfare_number) fanfare.
-	.macro playfanfare fanfare_number:req
+	@ Plays the fanfare specified by the song number. If the specified song is not a fanfare it will instead play the first song in sFanfares.
+	.macro playfanfare songNumber:req
 	.byte 0x31
-	.2byte \fanfare_number
+	.2byte \songNumber
 	.endm
 
 	@ Blocks script execution until all currently-playing fanfares finish.
@@ -1208,10 +1208,10 @@
 	.endm
 
 	@ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes.
-	.macro playmoncry species:req, effect:req
+	.macro playmoncry species:req, mode:req
 	.byte 0xa1
 	.2byte \species
-	.2byte \effect
+	.2byte \mode
 	.endm
 
 	@ Changes the metatile at (x, y) on the current map.
diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc
index 64dd38214..ff87c56d6 100644
--- a/asm/macros/music_voice.inc
+++ b/asm/macros/music_voice.inc
@@ -145,7 +145,7 @@
 	.byte 0xff, 0, 0xff, 0
 	.endm
 
-	.macro cry2 sample:req
+	.macro cry_reverse sample:req
 	.byte 0x30, 60, 0, 0
 	.4byte \sample
 	.byte 0xff, 0, 0xff, 0
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 2c5c9ba04..7e970ed17 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -2,6 +2,7 @@
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
 #include "constants/songs.h"
+#include "constants/sound.h"
 #include "constants/moves.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_anim_script.inc"
@@ -4960,7 +4961,7 @@ Move_ROAR:
 	monbg ANIM_ATTACKER
 	splitbgprio ANIM_ATTACKER
 	setalpha 8, 8
-	createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, 2
+	createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_ROAR
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	call RoarEffect
 	delay 20
@@ -4985,7 +4986,7 @@ RoarEffect:
 
 Move_GROWL:
 	loadspritegfx ANIM_TAG_NOISE_LINE
-	createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, 255
+	createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
 	call RoarEffect
 	delay 10
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1
@@ -8499,14 +8500,15 @@ Move_BLAZE_KICK:
 
 Move_HYPER_VOICE:
 	loadspritegfx ANIM_TAG_THIN_RING
-	createvisualtask SoundTask_PlayCryWithEcho, 5, 0
+	createvisualtask SoundTask_PlayCryWithEcho, 5, FALSE
 	call HyperVoiceEffect
 	waitforvisualfinish
 	delay 8
-	createvisualtask SoundTask_PlayCryWithEcho, 5, 1
+	createvisualtask SoundTask_PlayCryWithEcho, 5, TRUE
 	call HyperVoiceEffect
 	waitforvisualfinish
 	end
+
 HyperVoiceEffect:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, RGB_YELLOW
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, ANIM_ATTACKER, 0
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 720875735..c33932a53 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -44,6 +44,7 @@
 #include "constants/script_menu.h"
 #include "constants/secret_bases.h"
 #include "constants/songs.h"
+#include "constants/sound.h"
 #include "constants/species.h"
 #include "constants/trade.h"
 #include "constants/trainer_hill.h"
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index edbb75ccc..f2e242bbd 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -59,7 +59,7 @@ AncientTomb_EventScript_Registeel::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_REGISTEEL, 2
+	playmoncry SPECIES_REGISTEEL, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 4a4a95cc4..2a6f156e5 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -32,7 +32,7 @@ AquaHideout_B1F_EventScript_Electrode1::
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -59,7 +59,7 @@ AquaHideout_B1F_EventScript_Electrode2::
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 6ab862287..5bd04bfb4 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -303,7 +303,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
-	playmoncry SPECIES_KIRLIA, 0
+	playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
 	waitmoncry
 	pike_getstatus
 	compare VAR_RESULT, PIKE_STATUS_TOXIC
@@ -321,11 +321,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KIRLIA, 0
+	playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
 	waitmoncry
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
 	waitse
-	playmoncry SPECIES_KIRLIA, 0
+	playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
 	waitmoncry
 	closemessage
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
@@ -338,7 +338,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
+	playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
 	waitmoncry
 	pike_getstatus
 	compare VAR_RESULT, PIKE_STATUS_FREEZE
@@ -352,11 +352,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
+	playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
 	waitmoncry
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
 	waitse
-	playmoncry SPECIES_DUSCLOPS, 0
+	playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
 	waitmoncry
 	closemessage
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 8166f9186..9157f0bef 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -72,7 +72,7 @@ BattleFrontier_OutsideEast_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant, MSGBOX_DEFAULT
 	waitmoncry
 	release
@@ -126,7 +126,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo::
 	msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
 	closemessage
 	waitse
-	playmoncry SPECIES_SUDOWOODO, 2
+	playmoncry SPECIES_SUDOWOODO, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_SUDOWOODO
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 647927050..44806858f 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -33,7 +33,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
 	msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 03463729c..cd1583b42 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -79,7 +79,7 @@ BirthIsland_Exterior_EventScript_Deoxys::
 	applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_DEOXYS, 2
+	playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_DEOXYS
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 1bcaa23bf..443915d7e 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -59,7 +59,7 @@ DesertRuins_EventScript_Regirock::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_REGIROCK, 2
+	playmoncry SPECIES_REGIROCK, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc
index 0aba45d3c..cdd9d0cd2 100644
--- a/data/maps/DewfordTown_House1/scripts.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
@@ -13,7 +13,7 @@ DewfordTown_House1_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index 809909a5c..96f408843 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -33,7 +33,7 @@ FallarborTown_EventScript_Azurill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZURILL, 0
+	playmoncry SPECIES_AZURILL, CRY_MODE_NORMAL
 	msgbox FallarborTown_Text_Azurill, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc
index 2b18a9e14..cb92f28f5 100644
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -41,7 +41,7 @@ FallarborTown_Mart_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
 	msgbox FallarborTown_Mart_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index adb55d72e..e35825be7 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -126,7 +126,7 @@ FarawayIsland_Interior_EventScript_Mew::
 	special SetMewAboveGrass
 	message FarawayIsland_Interior_Text_Mew
 	waitse
-	playmoncry SPECIES_MEW, 2
+	playmoncry SPECIES_MEW, CRY_MODE_ENCOUNTER
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq FarawayIsland_Interior_EventScript_FoundMewNorth
 	compare VAR_FACING, DIR_SOUTH
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index 1ef3cffc7..6371d5b0c 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -75,7 +75,7 @@ FortreeCity_EventScript_UseDevonScope::
 	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	applymovement VAR_LAST_TALKED, FortreeCity_Movement_KecleonFlee
diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc
index 3dd58ca34..e25334ee9 100644
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -57,7 +57,7 @@ FortreeCity_House1_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox FortreeCity_House1_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index db17e3474..c416cf147 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -59,7 +59,7 @@ FortreeCity_House4_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox FortreeCity_House4_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc
index 71fcc78ca..eee6d358b 100644
--- a/data/maps/FortreeCity_House5/scripts.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
@@ -13,7 +13,7 @@ FortreeCity_House5_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox FortreeCity_House5_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index af93863b7..d660aadf0 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -92,7 +92,7 @@ IslandCave_EventScript_Regice::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_REGICE, 2
+	playmoncry SPECIES_REGICE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 58fd8ecb2..30f4e99ba 100644
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -9,7 +9,7 @@ LavaridgeTown_House_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox LavaridgeTown_House_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index ab4616cb5..fb82ba47a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, CRY_MODE_NORMAL
 	msgbox LilycoveCity_DepartmentStore_1F_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 34e9e6d90..c2bd21cdc 100644
--- a/data/maps/LilycoveCity_House1/scripts.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
@@ -9,7 +9,7 @@ LilycoveCity_House1_EventScript_Kecleon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_KECLEON, 0
+	playmoncry SPECIES_KECLEON, CRY_MODE_NORMAL
 	msgbox LilycoveCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index 47bbf9aad..296ef02f8 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -32,7 +32,7 @@ MarineCave_End_EventScript_Kyogre::
 	applymovement LOCALID_KYOGRE, MarineCave_End_Movement_KyogreApproach
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_KYOGRE
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index 63036814b..5f568ac77 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -15,7 +15,7 @@ MossdeepCity_House2_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox MossdeepCity_House2_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	closemessage
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 85c0e5ebc..7b7348f4e 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -34,7 +34,7 @@ MossdeepCity_House4_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
 	msgbox MossdeepCity_House4_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index da9e06cff..d79c00c68 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -51,7 +51,7 @@ NavelRock_Bottom_EventScript_Lugia::
 	delay 30
 	delay 50
 	waitse
-	playmoncry SPECIES_LUGIA, 2
+	playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER
 	waitmoncry
 	delay 20
 	setvar VAR_0x8004, SPECIES_LUGIA
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index 4355699ee..e8b3e7e29 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -47,7 +47,7 @@ NavelRock_Top_EventScript_HoOh::
 	setweather WEATHER_NONE
 	doweather
 	waitse
-	playmoncry SPECIES_HO_OH, 2
+	playmoncry SPECIES_HO_OH, CRY_MODE_ENCOUNTER
 	delay 30
 	waitmoncry
 	delay 60
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index ac9572ea8..d924651ce 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -183,7 +183,7 @@ NewMauville_Inside_EventScript_Voltorb1::
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playmoncry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -210,7 +210,7 @@ NewMauville_Inside_EventScript_Voltorb2::
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playmoncry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
@@ -237,7 +237,7 @@ NewMauville_Inside_EventScript_Voltorb3::
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
 	waitse
-	playmoncry SPECIES_VOLTORB, 2
+	playmoncry SPECIES_VOLTORB, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 3c0be269e..27f966e96 100644
--- a/data/maps/PacifidlogTown_House2/scripts.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
@@ -77,7 +77,7 @@ PacifidlogTown_House2_EventScript_HappyAzurill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZURILL, 0
+	playmoncry SPECIES_AZURILL, CRY_MODE_NORMAL
 	msgbox PacifidlogTown_House2_Text_Rurii, MSGBOX_DEFAULT
 	waitmoncry
 	msgbox PacifidlogTown_House2_Text_VeryFriendlyWithTrainer, MSGBOX_DEFAULT
@@ -88,7 +88,7 @@ PacifidlogTown_House2_EventScript_UnhappyAzurill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZURILL, 2
+	playmoncry SPECIES_AZURILL, CRY_MODE_ENCOUNTER
 	msgbox PacifidlogTown_House2_Text_Rururi, MSGBOX_DEFAULT
 	waitmoncry
 	msgbox PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch, MSGBOX_DEFAULT
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 60e08c7b8..f2e169d10 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -95,7 +95,7 @@ Route104_MrBrineysHouse_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox Route104_MrBrineysHouse_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index 03bd51b43..37852c873 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -362,7 +362,7 @@ Route109_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox Route109_Text_ZigzagoonCry, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 3eb92d0f1..c0420fbf6 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -68,7 +68,7 @@ Route114_EventScript_Poochyena::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_POOCHYENA, 2
+	playmoncry SPECIES_POOCHYENA, CRY_MODE_ENCOUNTER
 	msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc
index 548b2c394..9a44179a5 100644
--- a/data/maps/Route119_House/scripts.inc
+++ b/data/maps/Route119_House/scripts.inc
@@ -9,7 +9,7 @@ Route119_House_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox Route119_House_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 9e0e43bd2..588fa17a0 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -210,7 +210,7 @@ Route120_EventScript_StevenBattleKecleon::
 	applymovement LOCALID_BRIDGE_KECLEON, Movement_KecleonAppears
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index eda27c716..7d965e8f3 100644
--- a/data/maps/RustboroCity_Flat2_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
@@ -9,7 +9,7 @@ RustboroCity_Flat2_1F_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
 	msgbox RustboroCity_Flat2_1F_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc
index 70a359df6..549b4246c 100644
--- a/data/maps/RustboroCity_House3/scripts.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
@@ -14,7 +14,7 @@ RustboroCity_House3_EventScript_Pekachu::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIKACHU, 0
+	playmoncry SPECIES_PIKACHU, CRY_MODE_NORMAL
 	msgbox RustboroCity_House3_Text_Pekachu, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index b8ffe49d0..97a158f22 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -307,7 +307,7 @@ RusturfTunnel_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox RusturfTunnel_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
@@ -339,7 +339,7 @@ RusturfTunnel_EventScript_Grunt::
 	message RusturfTunnel_Text_ThankYouLetsGoHomePeeko
 	waitmessage
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	waitbuttonpress
 	waitmoncry
 	closemessage
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index a94d50ec3..4aa94de23 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -92,7 +92,7 @@ SSTidalCorridor_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WINGULL, 0
+	playmoncry SPECIES_WINGULL, CRY_MODE_NORMAL
 	msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index 0406509d2..2b3c02120 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -48,7 +48,7 @@ SkyPillar_Top_EventScript_RayquazaFaceDown::
 SkyPillar_Top_EventScript_Rayquaza::
 	lockall
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE
@@ -105,7 +105,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza::
 	applymovement LOCALID_RAYQUAZA_SLEEPING, SkyPillar_Top_Movement_RayquazaStir
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -113,7 +113,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza::
 	special ShakeCamera
 	waitstate
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 2  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 3bff72816..96e1a7633 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -240,7 +240,7 @@ SlateportCity_PokemonFanClub_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SKITTY, 0
+	playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
 	msgbox SlateportCity_PokemonFanClub_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
@@ -250,7 +250,7 @@ SlateportCity_PokemonFanClub_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
+	playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
 	msgbox SlateportCity_PokemonFanClub_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
@@ -260,7 +260,7 @@ SlateportCity_PokemonFanClub_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, CRY_MODE_NORMAL
 	msgbox SlateportCity_PokemonFanClub_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index a9f9ebb39..f3f8ea024 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -243,7 +243,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter::
 	waitmovement 0
 	delay 60
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
@@ -257,7 +257,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter::
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_GROUDON, 2
+	playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
 	waitmovement 0
@@ -271,7 +271,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter::
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
@@ -343,7 +343,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive::
 	waitmovement 0
 	delay 60
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
@@ -357,7 +357,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive::
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_GROUDON, 2
+	playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreDefend
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonAttack
 	waitmovement 0
@@ -371,7 +371,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive::
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KYOGRE, 2
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER
 	applymovement LOCALID_KYOGRE, SootopolisCity_Movement_KyogreAttack
 	applymovement LOCALID_GROUDON, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
@@ -536,7 +536,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter::
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -544,7 +544,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter::
 	special ShakeCamera
 	waitstate
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 2  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -589,7 +589,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive::
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -597,7 +597,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive::
 	special ShakeCamera
 	waitstate
 	waitse
-	playmoncry SPECIES_RAYQUAZA, 2
+	playmoncry SPECIES_RAYQUAZA, CRY_MODE_ENCOUNTER
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 2  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 1cedf7c57..65df8587f 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -23,7 +23,7 @@ SootopolisCity_House1_EventScript_Kecleon::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_KECLEON, 0
+	playmoncry SPECIES_KECLEON, CRY_MODE_NORMAL
 	msgbox SootopolisCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc
index a1102bdd9..1bc2b62ea 100644
--- a/data/maps/SootopolisCity_House4/scripts.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
@@ -13,7 +13,7 @@ SootopolisCity_House4_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_AZUMARILL, 0
+	playmoncry SPECIES_AZUMARILL, CRY_MODE_NORMAL
 	msgbox SootopolisCity_House4_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index a4c2c4960..4ce90e249 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -68,7 +68,7 @@ SouthernIsland_Interior_EventScript_Lati::
 	waitmovement 0
 	delay 50
 	waitse
-	playmoncry VAR_TEMP_4, 0
+	playmoncry VAR_TEMP_4, CRY_MODE_NORMAL
 	delay 30
 	waitmoncry
 	addobject LOCALID_LATI
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index 2b35b3c51..0036f33b5 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -32,7 +32,7 @@ TerraCave_End_EventScript_Groudon::
 	applymovement LOCALID_GROUDON, TerraCave_End_Movement_GroudonApproach
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_GROUDON, 2
+	playmoncry SPECIES_GROUDON, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_GROUDON
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 9d0485a77..84cdef029 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
@@ -56,7 +56,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIKACHU, 0
+	playmoncry SPECIES_PIKACHU, CRY_MODE_NORMAL
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_Pikachu, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index abffd07ff..6773c0662 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -2,7 +2,7 @@
 CaveOfOrigin_EventScript_LegendaryCry::
 	lockall
 	waitse
-	playmoncry SPECIES_KYOGRE, 2  @ SPECIES_GROUDON in Ruby
+	playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER  @ SPECIES_GROUDON in Ruby
 	waitmoncry
 	setvar VAR_TEMP_5, 1
 	releaseall
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index f5c023147..8d529d5e1 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -114,7 +114,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise::
 	goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon
 	specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
 	waitse
-	playmoncry VAR_0x8005, 0
+	playmoncry VAR_0x8005, CRY_MODE_NORMAL
 	msgbox Route117_PokemonDayCare_Text_WellRaiseYourMon, MSGBOX_DEFAULT
 	waitmoncry
 	special StoreSelectedPokemonInDaycare
@@ -220,7 +220,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon::
 	playse SE_SHOP
 	msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
 	waitse
-	playmoncry VAR_RESULT, 0
+	playmoncry VAR_RESULT, CRY_MODE_NORMAL
 	msgbox Route117_PokemonDayCare_Text_TookBackMon, MSGBOX_DEFAULT
 	waitmoncry
 	specialvar VAR_RESULT, GetDaycareState
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index 414217499..82eca777d 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -70,7 +70,7 @@ EventScript_BattleKecleon::
 	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_KECLEON, 2
+	playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 137af8752..576fa28ad 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -454,7 +454,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
     waitmovement 0
     delay 60
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     delay 120
     waitmoncry
     compare VAR_0x8004, 1
@@ -552,7 +552,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon::
     lock
     faceplayer
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT
     waitmoncry
     release
@@ -562,7 +562,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Skitty::
     lock
     faceplayer
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
     waitmoncry
     release
@@ -572,7 +572,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Poochyena::
     lock
     faceplayer
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT
     waitmoncry
     release
@@ -582,7 +582,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Kecleon::
     lock
     faceplayer
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT
     waitmoncry
     release
@@ -592,7 +592,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Pikachu::
     lock
     faceplayer
     waitse
-    playmoncry VAR_0x8005, 0
+    playmoncry VAR_0x8005, CRY_MODE_NORMAL
     msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT
     waitmoncry
     release
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 571b61e62..e2e985a7a 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -385,7 +385,7 @@ PlayersHouse_1F_EventScript_Vigoroth1::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_VIGOROTH, 0
+	playmoncry SPECIES_VIGOROTH, CRY_MODE_NORMAL
 	msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT
 	waitmoncry
 	release
@@ -395,7 +395,7 @@ PlayersHouse_1F_EventScript_Vigoroth2::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_VIGOROTH, 0
+	playmoncry SPECIES_VIGOROTH, CRY_MODE_NORMAL
 	msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT
 	waitmoncry
 	release
diff --git a/include/constants/sound.h b/include/constants/sound.h
new file mode 100644
index 000000000..dc434bcf8
--- /dev/null
+++ b/include/constants/sound.h
@@ -0,0 +1,48 @@
+#ifndef GUARD_CONSTANTS_SOUND_H
+#define GUARD_CONSTANTS_SOUND_H
+
+#define FANFARE_LEVEL_UP             0
+#define FANFARE_OBTAIN_ITEM          1
+#define FANFARE_EVOLVED              2
+#define FANFARE_OBTAIN_TMHM          3
+#define FANFARE_HEAL                 4
+#define FANFARE_OBTAIN_BADGE         5
+#define FANFARE_MOVE_DELETED         6
+#define FANFARE_OBTAIN_BERRY         7
+#define FANFARE_AWAKEN_LEGEND        8
+#define FANFARE_SLOTS_JACKPOT        9
+#define FANFARE_SLOTS_WIN           10
+#define FANFARE_TOO_BAD             11
+#define FANFARE_RG_POKE_FLUTE       12
+#define FANFARE_RG_OBTAIN_KEY_ITEM  13
+#define FANFARE_RG_DEX_RATING       14
+#define FANFARE_OBTAIN_B_POINTS     15
+#define FANFARE_OBTAIN_SYMBOL       16
+#define FANFARE_REGISTER_MATCH_CALL 17
+
+#define CRY_MODE_NORMAL        0 // Default
+#define CRY_MODE_DOUBLES       1 // Shortened cry for double battles
+#define CRY_MODE_ENCOUNTER     2 // Used when starting a static encounter, or when a Pokémon is "aggressive"
+#define CRY_MODE_HIGH_PITCH    3 // Highest pitch mode, used exclusively by the move Howl
+#define CRY_MODE_ECHO_START    4 // For 1st half of cry used by the move Hyper Voice. Played in reverse
+#define CRY_MODE_FAINT         5 // Used when a Pokémon faints
+#define CRY_MODE_ECHO_END      6 // For 2nd half of cry used by the move Hyper Voice
+#define CRY_MODE_ROAR_1        7 // For 1st cry used by the move Roar
+#define CRY_MODE_ROAR_2        8 // For 2nd cry used by the move Roar
+#define CRY_MODE_GROWL_1       9 // For 1st cry used by the move Growl. Played in reverse
+#define CRY_MODE_GROWL_2      10 // For 2nd cry used by the move Growl
+#define CRY_MODE_WEAK         11 // Used when a Pokémon is unhealthy
+#define CRY_MODE_WEAK_DOUBLES 12 // Equivalent to CRY_MODE_DOUBLES for CRY_MODE_WEAK
+
+// Given to SoundTask_PlayDoubleCry to determine which cry mode to use. Values are arbitrary
+#define DOUBLE_CRY_ROAR  2
+#define DOUBLE_CRY_GROWL 255
+
+#define CRY_PRIORITY_NORMAL 10
+#define CRY_PRIORITY_AMBIENT 1
+
+// Cry volume was changed from 125 in R/S to 120 for FRLG/Em, but was (accidentally?) not updated outside of sound.c
+#define CRY_VOLUME    120
+#define CRY_VOLUME_RS 125
+
+#endif // GUARD_CONSTANTS_SOUND_H
diff --git a/include/sound.h b/include/sound.h
index 25ffa2d6e..a5463a456 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -1,26 +1,7 @@
 #ifndef GUARD_SOUND_H
 #define GUARD_SOUND_H
 
-enum {
-    FANFARE_LEVEL_UP,
-    FANFARE_OBTAIN_ITEM,
-    FANFARE_EVOLVED,
-    FANFARE_OBTAIN_TMHM,
-    FANFARE_HEAL,
-    FANFARE_OBTAIN_BADGE,
-    FANFARE_MOVE_DELETED,
-    FANFARE_OBTAIN_BERRY,
-    FANFARE_AWAKEN_LEGEND,
-    FANFARE_SLOTS_JACKPOT,
-    FANFARE_SLOTS_WIN,
-    FANFARE_TOO_BAD,
-    FANFARE_RG_POKE_FLUTE,
-    FANFARE_RG_OBTAIN_KEY_ITEM,
-    FANFARE_RG_DEX_RATING,
-    FANFARE_OBTAIN_B_POINTS,
-    FANFARE_OBTAIN_SYMBOL,
-    FANFARE_REGISTER_MATCH_CALL,
-};
+#include "constants/sound.h"
 
 void InitMapMusic(void);
 void MapMusicMain(void);
@@ -44,12 +25,12 @@ bool8 IsBGMPausedOrStopped(void);
 void FadeInBGM(u8 speed);
 void FadeOutBGM(u8 speed);
 bool8 IsBGMStopped(void);
-void PlayCry1(u16 species, s8 pan);
-void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority);
-void PlayCry3(u16 species, s8 pan, u8 mode);
-void PlayCry4(u16 species, s8 pan, u8 mode);
-void PlayCry5(u16 species, u8 mode);
-void PlayCry6(u16 species, s8 pan, u8 mode);
+void PlayCry_Normal(u16 species, s8 pan);
+void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority);
+void PlayCry_ByMode(u16 species, s8 pan, u8 mode);
+void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode);
+void PlayCry_Script(u16 species, u8 mode);
+void PlayCry_DuckNoRestore(u16 species, s8 pan, u8 mode);
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
 bool8 IsCryFinished(void);
 void StopCryAndClearCrySongs(void);
diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc
index bceb1ccb4..22e743363 100644
--- a/sound/cry_tables.inc
+++ b/sound/cry_tables.inc
@@ -390,392 +390,392 @@ gCryTable::
 	cry Cry_Chimecho
 
 	.align 2
-gCryTable2::
-	cry2 Cry_Bulbasaur
-	cry2 Cry_Ivysaur
-	cry2 Cry_Venusaur
-	cry2 Cry_Charmander
-	cry2 Cry_Charmeleon
-	cry2 Cry_Charizard
-	cry2 Cry_Squirtle
-	cry2 Cry_Wartortle
-	cry2 Cry_Blastoise
-	cry2 Cry_Caterpie
-	cry2 Cry_Metapod
-	cry2 Cry_Butterfree
-	cry2 Cry_Weedle
-	cry2 Cry_Kakuna
-	cry2 Cry_Beedrill
-	cry2 Cry_Pidgey
-	cry2 Cry_Pidgeotto
-	cry2 Cry_Pidgeot
-	cry2 Cry_Rattata
-	cry2 Cry_Raticate
-	cry2 Cry_Spearow
-	cry2 Cry_Fearow
-	cry2 Cry_Ekans
-	cry2 Cry_Arbok
-	cry2 Cry_Pikachu
-	cry2 Cry_Raichu
-	cry2 Cry_Sandshrew
-	cry2 Cry_Sandslash
-	cry2 Cry_NidoranF
-	cry2 Cry_Nidorina
-	cry2 Cry_Nidoqueen
-	cry2 Cry_NidoranM
-	cry2 Cry_Nidorino
-	cry2 Cry_Nidoking
-	cry2 Cry_Clefairy
-	cry2 Cry_Clefable
-	cry2 Cry_Vulpix
-	cry2 Cry_Ninetales
-	cry2 Cry_Jigglypuff
-	cry2 Cry_Wigglytuff
-	cry2 Cry_Zubat
-	cry2 Cry_Golbat
-	cry2 Cry_Oddish
-	cry2 Cry_Gloom
-	cry2 Cry_Vileplume
-	cry2 Cry_Paras
-	cry2 Cry_Parasect
-	cry2 Cry_Venonat
-	cry2 Cry_Venomoth
-	cry2 Cry_Diglett
-	cry2 Cry_Dugtrio
-	cry2 Cry_Meowth
-	cry2 Cry_Persian
-	cry2 Cry_Psyduck
-	cry2 Cry_Golduck
-	cry2 Cry_Mankey
-	cry2 Cry_Primeape
-	cry2 Cry_Growlithe
-	cry2 Cry_Arcanine
-	cry2 Cry_Poliwag
-	cry2 Cry_Poliwhirl
-	cry2 Cry_Poliwrath
-	cry2 Cry_Abra
-	cry2 Cry_Kadabra
-	cry2 Cry_Alakazam
-	cry2 Cry_Machop
-	cry2 Cry_Machoke
-	cry2 Cry_Machamp
-	cry2 Cry_Bellsprout
-	cry2 Cry_Weepinbell
-	cry2 Cry_Victreebel
-	cry2 Cry_Tentacool
-	cry2 Cry_Tentacruel
-	cry2 Cry_Geodude
-	cry2 Cry_Graveler
-	cry2 Cry_Golem
-	cry2 Cry_Ponyta
-	cry2 Cry_Rapidash
-	cry2 Cry_Slowpoke
-	cry2 Cry_Slowbro
-	cry2 Cry_Magnemite
-	cry2 Cry_Magneton
-	cry2 Cry_Farfetchd
-	cry2 Cry_Doduo
-	cry2 Cry_Dodrio
-	cry2 Cry_Seel
-	cry2 Cry_Dewgong
-	cry2 Cry_Grimer
-	cry2 Cry_Muk
-	cry2 Cry_Shellder
-	cry2 Cry_Cloyster
-	cry2 Cry_Gastly
-	cry2 Cry_Haunter
-	cry2 Cry_Gengar
-	cry2 Cry_Onix
-	cry2 Cry_Drowzee
-	cry2 Cry_Hypno
-	cry2 Cry_Krabby
-	cry2 Cry_Kingler
-	cry2 Cry_Voltorb
-	cry2 Cry_Electrode
-	cry2 Cry_Exeggcute
-	cry2 Cry_Exeggutor
-	cry2 Cry_Cubone
-	cry2 Cry_Marowak
-	cry2 Cry_Hitmonlee
-	cry2 Cry_Hitmonchan
-	cry2 Cry_Lickitung
-	cry2 Cry_Koffing
-	cry2 Cry_Weezing
-	cry2 Cry_Rhyhorn
-	cry2 Cry_Rhydon
-	cry2 Cry_Chansey
-	cry2 Cry_Tangela
-	cry2 Cry_Kangaskhan
-	cry2 Cry_Horsea
-	cry2 Cry_Seadra
-	cry2 Cry_Goldeen
-	cry2 Cry_Seaking
-	cry2 Cry_Staryu
-	cry2 Cry_Starmie
-	cry2 Cry_MrMime
-	cry2 Cry_Scyther
-	cry2 Cry_Jynx
-	cry2 Cry_Electabuzz
-	cry2 Cry_Magmar
-	cry2 Cry_Pinsir
-	cry2 Cry_Tauros
-	cry2 Cry_Magikarp
-	cry2 Cry_Gyarados
-	cry2 Cry_Lapras
-	cry2 Cry_Ditto
-	cry2 Cry_Eevee
-	cry2 Cry_Vaporeon
-	cry2 Cry_Jolteon
-	cry2 Cry_Flareon
-	cry2 Cry_Porygon
-	cry2 Cry_Omanyte
-	cry2 Cry_Omastar
-	cry2 Cry_Kabuto
-	cry2 Cry_Kabutops
-	cry2 Cry_Aerodactyl
-	cry2 Cry_Snorlax
-	cry2 Cry_Articuno
-	cry2 Cry_Zapdos
-	cry2 Cry_Moltres
-	cry2 Cry_Dratini
-	cry2 Cry_Dragonair
-	cry2 Cry_Dragonite
-	cry2 Cry_Mewtwo
-	cry2 Cry_Mew
-	cry2 Cry_Chikorita
-	cry2 Cry_Bayleef
-	cry2 Cry_Meganium
-	cry2 Cry_Cyndaquil
-	cry2 Cry_Quilava
-	cry2 Cry_Typhlosion
-	cry2 Cry_Totodile
-	cry2 Cry_Croconaw
-	cry2 Cry_Feraligatr
-	cry2 Cry_Sentret
-	cry2 Cry_Furret
-	cry2 Cry_Hoothoot
-	cry2 Cry_Noctowl
-	cry2 Cry_Ledyba
-	cry2 Cry_Ledian
-	cry2 Cry_Spinarak
-	cry2 Cry_Ariados
-	cry2 Cry_Crobat
-	cry2 Cry_Chinchou
-	cry2 Cry_Lanturn
-	cry2 Cry_Pichu
-	cry2 Cry_Cleffa
-	cry2 Cry_Igglybuff
-	cry2 Cry_Togepi
-	cry2 Cry_Togetic
-	cry2 Cry_Natu
-	cry2 Cry_Xatu
-	cry2 Cry_Mareep
-	cry2 Cry_Flaaffy
-	cry2 Cry_Ampharos
-	cry2 Cry_Bellossom
-	cry2 Cry_Marill
-	cry2 Cry_Azumarill
-	cry2 Cry_Sudowoodo
-	cry2 Cry_Politoed
-	cry2 Cry_Hoppip
-	cry2 Cry_Skiploom
-	cry2 Cry_Jumpluff
-	cry2 Cry_Aipom
-	cry2 Cry_Sunkern
-	cry2 Cry_Sunflora
-	cry2 Cry_Yanma
-	cry2 Cry_Wooper
-	cry2 Cry_Quagsire
-	cry2 Cry_Espeon
-	cry2 Cry_Umbreon
-	cry2 Cry_Murkrow
-	cry2 Cry_Slowking
-	cry2 Cry_Misdreavus
-	cry2 Cry_Unown
-	cry2 Cry_Wobbuffet
-	cry2 Cry_Girafarig
-	cry2 Cry_Pineco
-	cry2 Cry_Forretress
-	cry2 Cry_Dunsparce
-	cry2 Cry_Gligar
-	cry2 Cry_Steelix
-	cry2 Cry_Snubbull
-	cry2 Cry_Granbull
-	cry2 Cry_Qwilfish
-	cry2 Cry_Scizor
-	cry2 Cry_Shuckle
-	cry2 Cry_Heracross
-	cry2 Cry_Sneasel
-	cry2 Cry_Teddiursa
-	cry2 Cry_Ursaring
-	cry2 Cry_Slugma
-	cry2 Cry_Magcargo
-	cry2 Cry_Swinub
-	cry2 Cry_Piloswine
-	cry2 Cry_Corsola
-	cry2 Cry_Remoraid
-	cry2 Cry_Octillery
-	cry2 Cry_Delibird
-	cry2 Cry_Mantine
-	cry2 Cry_Skarmory
-	cry2 Cry_Houndour
-	cry2 Cry_Houndoom
-	cry2 Cry_Kingdra
-	cry2 Cry_Phanpy
-	cry2 Cry_Donphan
-	cry2 Cry_Porygon2
-	cry2 Cry_Stantler
-	cry2 Cry_Smeargle
-	cry2 Cry_Tyrogue
-	cry2 Cry_Hitmontop
-	cry2 Cry_Smoochum
-	cry2 Cry_Elekid
-	cry2 Cry_Magby
-	cry2 Cry_Miltank
-	cry2 Cry_Blissey
-	cry2 Cry_Raikou
-	cry2 Cry_Entei
-	cry2 Cry_Suicune
-	cry2 Cry_Larvitar
-	cry2 Cry_Pupitar
-	cry2 Cry_Tyranitar
-	cry2 Cry_Lugia
-	cry2 Cry_HoOh
-	cry2 Cry_Celebi
-	cry2 Cry_Kecleon
-	cry2 Cry_Roselia
-	cry2 Cry_Torkoal
-	cry2 Cry_Electrike
-	cry2 Cry_Manectric
-	cry2 Cry_Duskull
-	cry2 Cry_Latias
-	cry2 Cry_Wynaut
-	cry2 Cry_Seviper
-	cry2 Cry_Sharpedo
-	cry2 Cry_Zangoose
-	cry2 Cry_Azurill
-	cry2 Cry_Swablu
-	cry2 Cry_Altaria
-	cry2 Cry_Unused265
-	cry2 Cry_Taillow
-	cry2 Cry_Swellow
-	cry2 Cry_Unused268
-	cry2 Cry_Spinda
-	cry2 Cry_Torchic
-	cry2 Cry_Combusken
-	cry2 Cry_Blaziken
-	cry2 Cry_Treecko
-	cry2 Cry_Grovyle
-	cry2 Cry_Sceptile
-	cry2 Cry_Mudkip
-	cry2 Cry_Marshtomp
-	cry2 Cry_Swampert
-	cry2 Cry_Pelipper
-	cry2 Cry_Wingull
-	cry2 Cry_Banette
-	cry2 Cry_Shuppet
-	cry2 Cry_Lotad
-	cry2 Cry_Lombre
-	cry2 Cry_Ludicolo
-	cry2 Cry_Seedot
-	cry2 Cry_Nuzleaf
-	cry2 Cry_Shiftry
-	cry2 Cry_Carvanha
-	cry2 Cry_Wurmple
-	cry2 Cry_Silcoon
-	cry2 Cry_Beautifly
-	cry2 Cry_Cascoon
-	cry2 Cry_Dustox
-	cry2 Cry_Ralts
-	cry2 Cry_Kirlia
-	cry2 Cry_Gardevoir
-	cry2 Cry_Slakoth
-	cry2 Cry_Vigoroth
-	cry2 Cry_Slaking
-	cry2 Cry_Nincada
-	cry2 Cry_Ninjask
-	cry2 Cry_Shedinja
-	cry2 Cry_Makuhita
-	cry2 Cry_Hariyama
-	cry2 Cry_Nosepass
-	cry2 Cry_Glalie
-	cry2 Cry_Plusle
-	cry2 Cry_Minun
-	cry2 Cry_Surskit
-	cry2 Cry_Masquerain
-	cry2 Cry_Skitty
-	cry2 Cry_Delcatty
-	cry2 Cry_Gulpin
-	cry2 Cry_Swalot
-	cry2 Cry_Numel
-	cry2 Cry_Camerupt
-	cry2 Cry_Barboach
-	cry2 Cry_Whiscash
-	cry2 Cry_Corphish
-	cry2 Cry_Crawdaunt
-	cry2 Cry_Spoink
-	cry2 Cry_Grumpig
-	cry2 Cry_Trapinch
-	cry2 Cry_Vibrava
-	cry2 Cry_Flygon
-	cry2 Cry_Cacnea
-	cry2 Cry_Cacturne
-	cry2 Cry_Baltoy
-	cry2 Cry_Claydol
-	cry2 Cry_Lunatone
-	cry2 Cry_Solrock
-	cry2 Cry_Feebas
-	cry2 Cry_Milotic
-	cry2 Cry_Absol
-	cry2 Cry_Meditite
-	cry2 Cry_Medicham
-	cry2 Cry_Spheal
-	cry2 Cry_Sealeo
-	cry2 Cry_Walrein
-	cry2 Cry_Clamperl
-	cry2 Cry_Huntail
-	cry2 Cry_Gorebyss
-	cry2 Cry_Lileep
-	cry2 Cry_Cradily
-	cry2 Cry_Anorith
-	cry2 Cry_Armaldo
-	cry2 Cry_Beldum
-	cry2 Cry_Metang
-	cry2 Cry_Metagross
-	cry2 Cry_Bagon
-	cry2 Cry_Shelgon
-	cry2 Cry_Regirock
-	cry2 Cry_Regice
-	cry2 Cry_Registeel
-	cry2 Cry_Castform
-	cry2 Cry_Volbeat
-	cry2 Cry_Illumise
-	cry2 Cry_Poochyena
-	cry2 Cry_Mightyena
-	cry2 Cry_Dusclops
-	cry2 Cry_Sableye
-	cry2 Cry_Mawile
-	cry2 Cry_Aron
-	cry2 Cry_Lairon
-	cry2 Cry_Aggron
-	cry2 Cry_Relicanth
-	cry2 Cry_Luvdisc
-	cry2 Cry_Groudon
-	cry2 Cry_Kyogre
-	cry2 Cry_Rayquaza
-	cry2 Cry_Salamence
-	cry2 Cry_Breloom
-	cry2 Cry_Shroomish
-	cry2 Cry_Linoone
-	cry2 Cry_Tropius
-	cry2 Cry_Wailmer
-	cry2 Cry_Zigzagoon
-	cry2 Cry_Exploud
-	cry2 Cry_Loudred
-	cry2 Cry_Wailord
-	cry2 Cry_Whismur
-	cry2 Cry_Snorunt
-	cry2 Cry_Latios
-	cry2 Cry_Jirachi
-	cry2 Cry_Deoxys
-	cry2 Cry_Chimecho
+gCryTable_Reverse::
+	cry_reverse Cry_Bulbasaur
+	cry_reverse Cry_Ivysaur
+	cry_reverse Cry_Venusaur
+	cry_reverse Cry_Charmander
+	cry_reverse Cry_Charmeleon
+	cry_reverse Cry_Charizard
+	cry_reverse Cry_Squirtle
+	cry_reverse Cry_Wartortle
+	cry_reverse Cry_Blastoise
+	cry_reverse Cry_Caterpie
+	cry_reverse Cry_Metapod
+	cry_reverse Cry_Butterfree
+	cry_reverse Cry_Weedle
+	cry_reverse Cry_Kakuna
+	cry_reverse Cry_Beedrill
+	cry_reverse Cry_Pidgey
+	cry_reverse Cry_Pidgeotto
+	cry_reverse Cry_Pidgeot
+	cry_reverse Cry_Rattata
+	cry_reverse Cry_Raticate
+	cry_reverse Cry_Spearow
+	cry_reverse Cry_Fearow
+	cry_reverse Cry_Ekans
+	cry_reverse Cry_Arbok
+	cry_reverse Cry_Pikachu
+	cry_reverse Cry_Raichu
+	cry_reverse Cry_Sandshrew
+	cry_reverse Cry_Sandslash
+	cry_reverse Cry_NidoranF
+	cry_reverse Cry_Nidorina
+	cry_reverse Cry_Nidoqueen
+	cry_reverse Cry_NidoranM
+	cry_reverse Cry_Nidorino
+	cry_reverse Cry_Nidoking
+	cry_reverse Cry_Clefairy
+	cry_reverse Cry_Clefable
+	cry_reverse Cry_Vulpix
+	cry_reverse Cry_Ninetales
+	cry_reverse Cry_Jigglypuff
+	cry_reverse Cry_Wigglytuff
+	cry_reverse Cry_Zubat
+	cry_reverse Cry_Golbat
+	cry_reverse Cry_Oddish
+	cry_reverse Cry_Gloom
+	cry_reverse Cry_Vileplume
+	cry_reverse Cry_Paras
+	cry_reverse Cry_Parasect
+	cry_reverse Cry_Venonat
+	cry_reverse Cry_Venomoth
+	cry_reverse Cry_Diglett
+	cry_reverse Cry_Dugtrio
+	cry_reverse Cry_Meowth
+	cry_reverse Cry_Persian
+	cry_reverse Cry_Psyduck
+	cry_reverse Cry_Golduck
+	cry_reverse Cry_Mankey
+	cry_reverse Cry_Primeape
+	cry_reverse Cry_Growlithe
+	cry_reverse Cry_Arcanine
+	cry_reverse Cry_Poliwag
+	cry_reverse Cry_Poliwhirl
+	cry_reverse Cry_Poliwrath
+	cry_reverse Cry_Abra
+	cry_reverse Cry_Kadabra
+	cry_reverse Cry_Alakazam
+	cry_reverse Cry_Machop
+	cry_reverse Cry_Machoke
+	cry_reverse Cry_Machamp
+	cry_reverse Cry_Bellsprout
+	cry_reverse Cry_Weepinbell
+	cry_reverse Cry_Victreebel
+	cry_reverse Cry_Tentacool
+	cry_reverse Cry_Tentacruel
+	cry_reverse Cry_Geodude
+	cry_reverse Cry_Graveler
+	cry_reverse Cry_Golem
+	cry_reverse Cry_Ponyta
+	cry_reverse Cry_Rapidash
+	cry_reverse Cry_Slowpoke
+	cry_reverse Cry_Slowbro
+	cry_reverse Cry_Magnemite
+	cry_reverse Cry_Magneton
+	cry_reverse Cry_Farfetchd
+	cry_reverse Cry_Doduo
+	cry_reverse Cry_Dodrio
+	cry_reverse Cry_Seel
+	cry_reverse Cry_Dewgong
+	cry_reverse Cry_Grimer
+	cry_reverse Cry_Muk
+	cry_reverse Cry_Shellder
+	cry_reverse Cry_Cloyster
+	cry_reverse Cry_Gastly
+	cry_reverse Cry_Haunter
+	cry_reverse Cry_Gengar
+	cry_reverse Cry_Onix
+	cry_reverse Cry_Drowzee
+	cry_reverse Cry_Hypno
+	cry_reverse Cry_Krabby
+	cry_reverse Cry_Kingler
+	cry_reverse Cry_Voltorb
+	cry_reverse Cry_Electrode
+	cry_reverse Cry_Exeggcute
+	cry_reverse Cry_Exeggutor
+	cry_reverse Cry_Cubone
+	cry_reverse Cry_Marowak
+	cry_reverse Cry_Hitmonlee
+	cry_reverse Cry_Hitmonchan
+	cry_reverse Cry_Lickitung
+	cry_reverse Cry_Koffing
+	cry_reverse Cry_Weezing
+	cry_reverse Cry_Rhyhorn
+	cry_reverse Cry_Rhydon
+	cry_reverse Cry_Chansey
+	cry_reverse Cry_Tangela
+	cry_reverse Cry_Kangaskhan
+	cry_reverse Cry_Horsea
+	cry_reverse Cry_Seadra
+	cry_reverse Cry_Goldeen
+	cry_reverse Cry_Seaking
+	cry_reverse Cry_Staryu
+	cry_reverse Cry_Starmie
+	cry_reverse Cry_MrMime
+	cry_reverse Cry_Scyther
+	cry_reverse Cry_Jynx
+	cry_reverse Cry_Electabuzz
+	cry_reverse Cry_Magmar
+	cry_reverse Cry_Pinsir
+	cry_reverse Cry_Tauros
+	cry_reverse Cry_Magikarp
+	cry_reverse Cry_Gyarados
+	cry_reverse Cry_Lapras
+	cry_reverse Cry_Ditto
+	cry_reverse Cry_Eevee
+	cry_reverse Cry_Vaporeon
+	cry_reverse Cry_Jolteon
+	cry_reverse Cry_Flareon
+	cry_reverse Cry_Porygon
+	cry_reverse Cry_Omanyte
+	cry_reverse Cry_Omastar
+	cry_reverse Cry_Kabuto
+	cry_reverse Cry_Kabutops
+	cry_reverse Cry_Aerodactyl
+	cry_reverse Cry_Snorlax
+	cry_reverse Cry_Articuno
+	cry_reverse Cry_Zapdos
+	cry_reverse Cry_Moltres
+	cry_reverse Cry_Dratini
+	cry_reverse Cry_Dragonair
+	cry_reverse Cry_Dragonite
+	cry_reverse Cry_Mewtwo
+	cry_reverse Cry_Mew
+	cry_reverse Cry_Chikorita
+	cry_reverse Cry_Bayleef
+	cry_reverse Cry_Meganium
+	cry_reverse Cry_Cyndaquil
+	cry_reverse Cry_Quilava
+	cry_reverse Cry_Typhlosion
+	cry_reverse Cry_Totodile
+	cry_reverse Cry_Croconaw
+	cry_reverse Cry_Feraligatr
+	cry_reverse Cry_Sentret
+	cry_reverse Cry_Furret
+	cry_reverse Cry_Hoothoot
+	cry_reverse Cry_Noctowl
+	cry_reverse Cry_Ledyba
+	cry_reverse Cry_Ledian
+	cry_reverse Cry_Spinarak
+	cry_reverse Cry_Ariados
+	cry_reverse Cry_Crobat
+	cry_reverse Cry_Chinchou
+	cry_reverse Cry_Lanturn
+	cry_reverse Cry_Pichu
+	cry_reverse Cry_Cleffa
+	cry_reverse Cry_Igglybuff
+	cry_reverse Cry_Togepi
+	cry_reverse Cry_Togetic
+	cry_reverse Cry_Natu
+	cry_reverse Cry_Xatu
+	cry_reverse Cry_Mareep
+	cry_reverse Cry_Flaaffy
+	cry_reverse Cry_Ampharos
+	cry_reverse Cry_Bellossom
+	cry_reverse Cry_Marill
+	cry_reverse Cry_Azumarill
+	cry_reverse Cry_Sudowoodo
+	cry_reverse Cry_Politoed
+	cry_reverse Cry_Hoppip
+	cry_reverse Cry_Skiploom
+	cry_reverse Cry_Jumpluff
+	cry_reverse Cry_Aipom
+	cry_reverse Cry_Sunkern
+	cry_reverse Cry_Sunflora
+	cry_reverse Cry_Yanma
+	cry_reverse Cry_Wooper
+	cry_reverse Cry_Quagsire
+	cry_reverse Cry_Espeon
+	cry_reverse Cry_Umbreon
+	cry_reverse Cry_Murkrow
+	cry_reverse Cry_Slowking
+	cry_reverse Cry_Misdreavus
+	cry_reverse Cry_Unown
+	cry_reverse Cry_Wobbuffet
+	cry_reverse Cry_Girafarig
+	cry_reverse Cry_Pineco
+	cry_reverse Cry_Forretress
+	cry_reverse Cry_Dunsparce
+	cry_reverse Cry_Gligar
+	cry_reverse Cry_Steelix
+	cry_reverse Cry_Snubbull
+	cry_reverse Cry_Granbull
+	cry_reverse Cry_Qwilfish
+	cry_reverse Cry_Scizor
+	cry_reverse Cry_Shuckle
+	cry_reverse Cry_Heracross
+	cry_reverse Cry_Sneasel
+	cry_reverse Cry_Teddiursa
+	cry_reverse Cry_Ursaring
+	cry_reverse Cry_Slugma
+	cry_reverse Cry_Magcargo
+	cry_reverse Cry_Swinub
+	cry_reverse Cry_Piloswine
+	cry_reverse Cry_Corsola
+	cry_reverse Cry_Remoraid
+	cry_reverse Cry_Octillery
+	cry_reverse Cry_Delibird
+	cry_reverse Cry_Mantine
+	cry_reverse Cry_Skarmory
+	cry_reverse Cry_Houndour
+	cry_reverse Cry_Houndoom
+	cry_reverse Cry_Kingdra
+	cry_reverse Cry_Phanpy
+	cry_reverse Cry_Donphan
+	cry_reverse Cry_Porygon2
+	cry_reverse Cry_Stantler
+	cry_reverse Cry_Smeargle
+	cry_reverse Cry_Tyrogue
+	cry_reverse Cry_Hitmontop
+	cry_reverse Cry_Smoochum
+	cry_reverse Cry_Elekid
+	cry_reverse Cry_Magby
+	cry_reverse Cry_Miltank
+	cry_reverse Cry_Blissey
+	cry_reverse Cry_Raikou
+	cry_reverse Cry_Entei
+	cry_reverse Cry_Suicune
+	cry_reverse Cry_Larvitar
+	cry_reverse Cry_Pupitar
+	cry_reverse Cry_Tyranitar
+	cry_reverse Cry_Lugia
+	cry_reverse Cry_HoOh
+	cry_reverse Cry_Celebi
+	cry_reverse Cry_Kecleon
+	cry_reverse Cry_Roselia
+	cry_reverse Cry_Torkoal
+	cry_reverse Cry_Electrike
+	cry_reverse Cry_Manectric
+	cry_reverse Cry_Duskull
+	cry_reverse Cry_Latias
+	cry_reverse Cry_Wynaut
+	cry_reverse Cry_Seviper
+	cry_reverse Cry_Sharpedo
+	cry_reverse Cry_Zangoose
+	cry_reverse Cry_Azurill
+	cry_reverse Cry_Swablu
+	cry_reverse Cry_Altaria
+	cry_reverse Cry_Unused265
+	cry_reverse Cry_Taillow
+	cry_reverse Cry_Swellow
+	cry_reverse Cry_Unused268
+	cry_reverse Cry_Spinda
+	cry_reverse Cry_Torchic
+	cry_reverse Cry_Combusken
+	cry_reverse Cry_Blaziken
+	cry_reverse Cry_Treecko
+	cry_reverse Cry_Grovyle
+	cry_reverse Cry_Sceptile
+	cry_reverse Cry_Mudkip
+	cry_reverse Cry_Marshtomp
+	cry_reverse Cry_Swampert
+	cry_reverse Cry_Pelipper
+	cry_reverse Cry_Wingull
+	cry_reverse Cry_Banette
+	cry_reverse Cry_Shuppet
+	cry_reverse Cry_Lotad
+	cry_reverse Cry_Lombre
+	cry_reverse Cry_Ludicolo
+	cry_reverse Cry_Seedot
+	cry_reverse Cry_Nuzleaf
+	cry_reverse Cry_Shiftry
+	cry_reverse Cry_Carvanha
+	cry_reverse Cry_Wurmple
+	cry_reverse Cry_Silcoon
+	cry_reverse Cry_Beautifly
+	cry_reverse Cry_Cascoon
+	cry_reverse Cry_Dustox
+	cry_reverse Cry_Ralts
+	cry_reverse Cry_Kirlia
+	cry_reverse Cry_Gardevoir
+	cry_reverse Cry_Slakoth
+	cry_reverse Cry_Vigoroth
+	cry_reverse Cry_Slaking
+	cry_reverse Cry_Nincada
+	cry_reverse Cry_Ninjask
+	cry_reverse Cry_Shedinja
+	cry_reverse Cry_Makuhita
+	cry_reverse Cry_Hariyama
+	cry_reverse Cry_Nosepass
+	cry_reverse Cry_Glalie
+	cry_reverse Cry_Plusle
+	cry_reverse Cry_Minun
+	cry_reverse Cry_Surskit
+	cry_reverse Cry_Masquerain
+	cry_reverse Cry_Skitty
+	cry_reverse Cry_Delcatty
+	cry_reverse Cry_Gulpin
+	cry_reverse Cry_Swalot
+	cry_reverse Cry_Numel
+	cry_reverse Cry_Camerupt
+	cry_reverse Cry_Barboach
+	cry_reverse Cry_Whiscash
+	cry_reverse Cry_Corphish
+	cry_reverse Cry_Crawdaunt
+	cry_reverse Cry_Spoink
+	cry_reverse Cry_Grumpig
+	cry_reverse Cry_Trapinch
+	cry_reverse Cry_Vibrava
+	cry_reverse Cry_Flygon
+	cry_reverse Cry_Cacnea
+	cry_reverse Cry_Cacturne
+	cry_reverse Cry_Baltoy
+	cry_reverse Cry_Claydol
+	cry_reverse Cry_Lunatone
+	cry_reverse Cry_Solrock
+	cry_reverse Cry_Feebas
+	cry_reverse Cry_Milotic
+	cry_reverse Cry_Absol
+	cry_reverse Cry_Meditite
+	cry_reverse Cry_Medicham
+	cry_reverse Cry_Spheal
+	cry_reverse Cry_Sealeo
+	cry_reverse Cry_Walrein
+	cry_reverse Cry_Clamperl
+	cry_reverse Cry_Huntail
+	cry_reverse Cry_Gorebyss
+	cry_reverse Cry_Lileep
+	cry_reverse Cry_Cradily
+	cry_reverse Cry_Anorith
+	cry_reverse Cry_Armaldo
+	cry_reverse Cry_Beldum
+	cry_reverse Cry_Metang
+	cry_reverse Cry_Metagross
+	cry_reverse Cry_Bagon
+	cry_reverse Cry_Shelgon
+	cry_reverse Cry_Regirock
+	cry_reverse Cry_Regice
+	cry_reverse Cry_Registeel
+	cry_reverse Cry_Castform
+	cry_reverse Cry_Volbeat
+	cry_reverse Cry_Illumise
+	cry_reverse Cry_Poochyena
+	cry_reverse Cry_Mightyena
+	cry_reverse Cry_Dusclops
+	cry_reverse Cry_Sableye
+	cry_reverse Cry_Mawile
+	cry_reverse Cry_Aron
+	cry_reverse Cry_Lairon
+	cry_reverse Cry_Aggron
+	cry_reverse Cry_Relicanth
+	cry_reverse Cry_Luvdisc
+	cry_reverse Cry_Groudon
+	cry_reverse Cry_Kyogre
+	cry_reverse Cry_Rayquaza
+	cry_reverse Cry_Salamence
+	cry_reverse Cry_Breloom
+	cry_reverse Cry_Shroomish
+	cry_reverse Cry_Linoone
+	cry_reverse Cry_Tropius
+	cry_reverse Cry_Wailmer
+	cry_reverse Cry_Zigzagoon
+	cry_reverse Cry_Exploud
+	cry_reverse Cry_Loudred
+	cry_reverse Cry_Wailord
+	cry_reverse Cry_Whismur
+	cry_reverse Cry_Snorunt
+	cry_reverse Cry_Latios
+	cry_reverse Cry_Jirachi
+	cry_reverse Cry_Deoxys
+	cry_reverse Cry_Chimecho
diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index 508e6a6c4..298088ef4 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -283,24 +283,24 @@ DirectSoundWaveData_bicycle_bell::
 	.incbin "sound/direct_sound_samples/bicycle_bell.bin"
 
 	.align 2
-DirectSoundWaveData_8725A2C::
-	.incbin "sound/direct_sound_samples/8725A2C.bin"
+DirectSoundWaveData_unknown_1::
+	.incbin "sound/direct_sound_samples/unknown_01.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_pizzicato_strings::
 	.incbin "sound/direct_sound_samples/sc88pro_pizzicato_strings.bin"
 
 	.align 2
-DirectSoundWaveData_872762C::
-	.incbin "sound/direct_sound_samples/872762C.bin"
+DirectSoundWaveData_unknown_2::
+	.incbin "sound/direct_sound_samples/unknown_02.bin"
 
 	.align 2
-DirectSoundWaveData_872921C::
-	.incbin "sound/direct_sound_samples/872921C.bin"
+DirectSoundWaveData_unknown_3::
+	.incbin "sound/direct_sound_samples/unknown_03.bin"
 
 	.align 2
-DirectSoundWaveData_872A5D0::
-	.incbin "sound/direct_sound_samples/872A5D0.bin"
+DirectSoundWaveData_unknown_4::
+	.incbin "sound/direct_sound_samples/unknown_04.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_wind::
@@ -311,32 +311,32 @@ DirectSoundWaveData_sc88pro_bubbles::
 	.incbin "sound/direct_sound_samples/sc88pro_bubbles.bin"
 
 	.align 2
-DirectSoundWaveData_872EEA8::
-	.incbin "sound/direct_sound_samples/872EEA8.bin"
+DirectSoundWaveData_unknown_5::
+	.incbin "sound/direct_sound_samples/unknown_05.bin"
 
 	.align 2
-DirectSoundWaveData_87301B0::
-	.incbin "sound/direct_sound_samples/87301B0.bin"
+DirectSoundWaveData_unknown_6::
+	.incbin "sound/direct_sound_samples/unknown_06.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_30303_mega_bass::
 	.incbin "sound/direct_sound_samples/trinity_30303_mega_bass.bin"
 
 	.align 2
-DirectSoundWaveData_8734298::
-	.incbin "sound/direct_sound_samples/8734298.bin"
+DirectSoundWaveData_unknown_7::
+	.incbin "sound/direct_sound_samples/unknown_07.bin"
 
 	.align 2
-DirectSoundWaveData_87364A8::
-	.incbin "sound/direct_sound_samples/87364A8.bin"
+DirectSoundWaveData_unknown_8::
+	.incbin "sound/direct_sound_samples/unknown_08.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_tubular_bell::
 	.incbin "sound/direct_sound_samples/sc88pro_tubular_bell.bin"
 
 	.align 2
-DirectSoundWaveData_87385E4::
-	.incbin "sound/direct_sound_samples/87385E4.bin"
+DirectSoundWaveData_unknown_9::
+	.incbin "sound/direct_sound_samples/unknown_09.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_big_boned::
@@ -351,40 +351,40 @@ DirectSoundWaveData_sc88pro_xylophone::
 	.incbin "sound/direct_sound_samples/sc88pro_xylophone.bin"
 
 	.align 2
-DirectSoundWaveData_873ECD8::
-	.incbin "sound/direct_sound_samples/873ECD8.bin"
+DirectSoundWaveData_unknown_10::
+	.incbin "sound/direct_sound_samples/unknown_10.bin"
 
 	.align 2
-DirectSoundWaveData_8740818::
-	.incbin "sound/direct_sound_samples/8740818.bin"
+DirectSoundWaveData_unknown_11::
+	.incbin "sound/direct_sound_samples/unknown_11.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_accordion::
 	.incbin "sound/direct_sound_samples/sc88pro_accordion.bin"
 
 	.align 2
-DirectSoundWaveData_87424B0::
-	.incbin "sound/direct_sound_samples/87424B0.bin"
+DirectSoundWaveData_unknown_12::
+	.incbin "sound/direct_sound_samples/unknown_12.bin"
 
 	.align 2
-DirectSoundWaveData_87430C0::
-	.incbin "sound/direct_sound_samples/87430C0.bin"
+DirectSoundWaveData_unknown_13::
+	.incbin "sound/direct_sound_samples/unknown_13.bin"
 
 	.align 2
-DirectSoundWaveData_8743C50::
-	.incbin "sound/direct_sound_samples/8743C50.bin"
+DirectSoundWaveData_unknown_14::
+	.incbin "sound/direct_sound_samples/unknown_14.bin"
 
 	.align 2
-DirectSoundWaveData_87446EC::
-	.incbin "sound/direct_sound_samples/87446EC.bin"
+DirectSoundWaveData_unknown_15::
+	.incbin "sound/direct_sound_samples/unknown_15.bin"
 
 	.align 2
-DirectSoundWaveData_8745034::
-	.incbin "sound/direct_sound_samples/8745034.bin"
+DirectSoundWaveData_unknown_16::
+	.incbin "sound/direct_sound_samples/unknown_16.bin"
 
 	.align 2
-DirectSoundWaveData_8745A7C::
-	.incbin "sound/direct_sound_samples/8745A7C.bin"
+DirectSoundWaveData_unknown_17::
+	.incbin "sound/direct_sound_samples/unknown_17.bin"
 
 	.align 2
 Cry_Bulbasaur::
@@ -1943,8 +1943,8 @@ DirectSoundWaveData_register_noise::
 	.incbin "sound/direct_sound_samples/register_noise.bin"
 
 	.align 2
-DirectSoundWaveData_88D6978::
-	.incbin "sound/direct_sound_samples/88D6978.bin"
+DirectSoundWaveData_unknown_18::
+	.incbin "sound/direct_sound_samples/unknown_18.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_nylon_str_guitar::
@@ -1955,208 +1955,208 @@ DirectSoundWaveData_sd90_special_scream_drive::
 	.incbin "sound/direct_sound_samples/sd90_special_scream_drive.bin"
 
 	.align 2
-DirectSoundWaveData_88DBBC0::
-	.incbin "sound/direct_sound_samples/88DBBC0.bin"
+DirectSoundWaveData_Phoneme_1::
+	.incbin "sound/direct_sound_samples/phonemes/01.bin"
 
 	.align 2
-DirectSoundWaveData_88DC220::
-	.incbin "sound/direct_sound_samples/88DC220.bin"
+DirectSoundWaveData_Phoneme_2::
+	.incbin "sound/direct_sound_samples/phonemes/02.bin"
 
 	.align 2
-DirectSoundWaveData_88DC704::
-	.incbin "sound/direct_sound_samples/88DC704.bin"
+DirectSoundWaveData_Phoneme_3::
+	.incbin "sound/direct_sound_samples/phonemes/03.bin"
 
 	.align 2
-DirectSoundWaveData_88DD054::
-	.incbin "sound/direct_sound_samples/88DD054.bin"
+DirectSoundWaveData_Phoneme_4::
+	.incbin "sound/direct_sound_samples/phonemes/04.bin"
 
 	.align 2
-DirectSoundWaveData_88DDAC4::
-	.incbin "sound/direct_sound_samples/88DDAC4.bin"
+DirectSoundWaveData_Phoneme_5::
+	.incbin "sound/direct_sound_samples/phonemes/05.bin"
 
 	.align 2
-DirectSoundWaveData_88DDDE4::
-	.incbin "sound/direct_sound_samples/88DDDE4.bin"
+DirectSoundWaveData_Phoneme_6::
+	.incbin "sound/direct_sound_samples/phonemes/06.bin"
 
 	.align 2
-DirectSoundWaveData_88DEA6C::
-	.incbin "sound/direct_sound_samples/88DEA6C.bin"
+DirectSoundWaveData_Phoneme_7::
+	.incbin "sound/direct_sound_samples/phonemes/07.bin"
 
 	.align 2
-DirectSoundWaveData_88DF08C::
-	.incbin "sound/direct_sound_samples/88DF08C.bin"
+DirectSoundWaveData_Phoneme_8::
+	.incbin "sound/direct_sound_samples/phonemes/08.bin"
 
 	.align 2
-DirectSoundWaveData_88DF414::
-	.incbin "sound/direct_sound_samples/88DF414.bin"
+DirectSoundWaveData_Phoneme_9::
+	.incbin "sound/direct_sound_samples/phonemes/09.bin"
 
 	.align 2
-DirectSoundWaveData_88E01F8::
-	.incbin "sound/direct_sound_samples/88E01F8.bin"
+DirectSoundWaveData_Phoneme_10::
+	.incbin "sound/direct_sound_samples/phonemes/10.bin"
 
 	.align 2
-DirectSoundWaveData_88E0B68::
-	.incbin "sound/direct_sound_samples/88E0B68.bin"
+DirectSoundWaveData_Phoneme_11::
+	.incbin "sound/direct_sound_samples/phonemes/11.bin"
 
 	.align 2
-DirectSoundWaveData_88E0F04::
-	.incbin "sound/direct_sound_samples/88E0F04.bin"
+DirectSoundWaveData_Phoneme_12::
+	.incbin "sound/direct_sound_samples/phonemes/12.bin"
 
 	.align 2
-DirectSoundWaveData_88E16B8::
-	.incbin "sound/direct_sound_samples/88E16B8.bin"
+DirectSoundWaveData_Phoneme_13::
+	.incbin "sound/direct_sound_samples/phonemes/13.bin"
 
 	.align 2
-DirectSoundWaveData_88E2414::
-	.incbin "sound/direct_sound_samples/88E2414.bin"
+DirectSoundWaveData_Phoneme_14::
+	.incbin "sound/direct_sound_samples/phonemes/14.bin"
 
 	.align 2
-DirectSoundWaveData_88E2658::
-	.incbin "sound/direct_sound_samples/88E2658.bin"
+DirectSoundWaveData_Phoneme_15::
+	.incbin "sound/direct_sound_samples/phonemes/15.bin"
 
 	.align 2
-DirectSoundWaveData_88E3498::
-	.incbin "sound/direct_sound_samples/88E3498.bin"
+DirectSoundWaveData_Phoneme_16::
+	.incbin "sound/direct_sound_samples/phonemes/16.bin"
 
 	.align 2
-DirectSoundWaveData_88E3DEC::
-	.incbin "sound/direct_sound_samples/88E3DEC.bin"
+DirectSoundWaveData_Phoneme_17::
+	.incbin "sound/direct_sound_samples/phonemes/17.bin"
 
 	.align 2
-DirectSoundWaveData_88E4140::
-	.incbin "sound/direct_sound_samples/88E4140.bin"
+DirectSoundWaveData_Phoneme_18::
+	.incbin "sound/direct_sound_samples/phonemes/18.bin"
 
 	.align 2
-DirectSoundWaveData_88E4774::
-	.incbin "sound/direct_sound_samples/88E4774.bin"
+DirectSoundWaveData_Phoneme_19::
+	.incbin "sound/direct_sound_samples/phonemes/19.bin"
 
 	.align 2
-DirectSoundWaveData_88E53E0::
-	.incbin "sound/direct_sound_samples/88E53E0.bin"
+DirectSoundWaveData_Phoneme_20::
+	.incbin "sound/direct_sound_samples/phonemes/20.bin"
 
 	.align 2
-DirectSoundWaveData_88E5978::
-	.incbin "sound/direct_sound_samples/88E5978.bin"
+DirectSoundWaveData_Phoneme_21::
+	.incbin "sound/direct_sound_samples/phonemes/21.bin"
 
 	.align 2
-DirectSoundWaveData_88E647C::
-	.incbin "sound/direct_sound_samples/88E647C.bin"
+DirectSoundWaveData_Phoneme_22::
+	.incbin "sound/direct_sound_samples/phonemes/22.bin"
 
 	.align 2
-DirectSoundWaveData_88E6A80::
-	.incbin "sound/direct_sound_samples/88E6A80.bin"
+DirectSoundWaveData_Phoneme_23::
+	.incbin "sound/direct_sound_samples/phonemes/23.bin"
 
 	.align 2
-DirectSoundWaveData_88E6C78::
-	.incbin "sound/direct_sound_samples/88E6C78.bin"
+DirectSoundWaveData_Phoneme_24::
+	.incbin "sound/direct_sound_samples/phonemes/24.bin"
 
 	.align 2
-DirectSoundWaveData_88E75DC::
-	.incbin "sound/direct_sound_samples/88E75DC.bin"
+DirectSoundWaveData_Phoneme_25::
+	.incbin "sound/direct_sound_samples/phonemes/25.bin"
 
 	.align 2
-DirectSoundWaveData_88E8568::
-	.incbin "sound/direct_sound_samples/88E8568.bin"
+DirectSoundWaveData_Phoneme_26::
+	.incbin "sound/direct_sound_samples/phonemes/26.bin"
 
 	.align 2
-DirectSoundWaveData_88E8BA0::
-	.incbin "sound/direct_sound_samples/88E8BA0.bin"
+DirectSoundWaveData_Phoneme_27::
+	.incbin "sound/direct_sound_samples/phonemes/27.bin"
 
 	.align 2
-DirectSoundWaveData_88E9674::
-	.incbin "sound/direct_sound_samples/88E9674.bin"
+DirectSoundWaveData_Phoneme_28::
+	.incbin "sound/direct_sound_samples/phonemes/28.bin"
 
 	.align 2
-DirectSoundWaveData_88EA5B8::
-	.incbin "sound/direct_sound_samples/88EA5B8.bin"
+DirectSoundWaveData_Phoneme_29::
+	.incbin "sound/direct_sound_samples/phonemes/29.bin"
 
 	.align 2
-DirectSoundWaveData_88EAB30::
-	.incbin "sound/direct_sound_samples/88EAB30.bin"
+DirectSoundWaveData_Phoneme_30::
+	.incbin "sound/direct_sound_samples/phonemes/30.bin"
 
 	.align 2
-DirectSoundWaveData_88EB97C::
-	.incbin "sound/direct_sound_samples/88EB97C.bin"
+DirectSoundWaveData_Phoneme_31::
+	.incbin "sound/direct_sound_samples/phonemes/31.bin"
 
 	.align 2
-DirectSoundWaveData_88EC884::
-	.incbin "sound/direct_sound_samples/88EC884.bin"
+DirectSoundWaveData_Phoneme_32::
+	.incbin "sound/direct_sound_samples/phonemes/32.bin"
 
 	.align 2
-DirectSoundWaveData_88ED358::
-	.incbin "sound/direct_sound_samples/88ED358.bin"
+DirectSoundWaveData_Phoneme_33::
+	.incbin "sound/direct_sound_samples/phonemes/33.bin"
 
 	.align 2
-DirectSoundWaveData_88EDEEC::
-	.incbin "sound/direct_sound_samples/88EDEEC.bin"
+DirectSoundWaveData_Phoneme_34::
+	.incbin "sound/direct_sound_samples/phonemes/34.bin"
 
 	.align 2
-DirectSoundWaveData_88EE8C4::
-	.incbin "sound/direct_sound_samples/88EE8C4.bin"
+DirectSoundWaveData_Phoneme_35::
+	.incbin "sound/direct_sound_samples/phonemes/35.bin"
 
 	.align 2
-DirectSoundWaveData_88EEF04::
-	.incbin "sound/direct_sound_samples/88EEF04.bin"
+DirectSoundWaveData_Phoneme_36::
+	.incbin "sound/direct_sound_samples/phonemes/36.bin"
 
 	.align 2
-DirectSoundWaveData_88EF9E4::
-	.incbin "sound/direct_sound_samples/88EF9E4.bin"
+DirectSoundWaveData_Phoneme_37::
+	.incbin "sound/direct_sound_samples/phonemes/37.bin"
 
 	.align 2
-DirectSoundWaveData_88F0020::
-	.incbin "sound/direct_sound_samples/88F0020.bin"
+DirectSoundWaveData_Phoneme_38::
+	.incbin "sound/direct_sound_samples/phonemes/38.bin"
 
 	.align 2
-DirectSoundWaveData_88F0738::
-	.incbin "sound/direct_sound_samples/88F0738.bin"
+DirectSoundWaveData_Phoneme_39::
+	.incbin "sound/direct_sound_samples/phonemes/39.bin"
 
 	.align 2
-DirectSoundWaveData_88F1074::
-	.incbin "sound/direct_sound_samples/88F1074.bin"
+DirectSoundWaveData_Phoneme_40::
+	.incbin "sound/direct_sound_samples/phonemes/40.bin"
 
 	.align 2
-DirectSoundWaveData_88F1830::
-	.incbin "sound/direct_sound_samples/88F1830.bin"
+DirectSoundWaveData_Phoneme_41::
+	.incbin "sound/direct_sound_samples/phonemes/41.bin"
 
 	.align 2
-DirectSoundWaveData_88F1D94::
-	.incbin "sound/direct_sound_samples/88F1D94.bin"
+DirectSoundWaveData_Phoneme_42::
+	.incbin "sound/direct_sound_samples/phonemes/42.bin"
 
 	.align 2
-DirectSoundWaveData_88F2B08::
-	.incbin "sound/direct_sound_samples/88F2B08.bin"
+DirectSoundWaveData_Phoneme_43::
+	.incbin "sound/direct_sound_samples/phonemes/43.bin"
 
 	.align 2
-DirectSoundWaveData_88F2F84::
-	.incbin "sound/direct_sound_samples/88F2F84.bin"
+DirectSoundWaveData_Phoneme_44::
+	.incbin "sound/direct_sound_samples/phonemes/44.bin"
 
 	.align 2
-DirectSoundWaveData_88F3470::
-	.incbin "sound/direct_sound_samples/88F3470.bin"
+DirectSoundWaveData_Phoneme_45::
+	.incbin "sound/direct_sound_samples/phonemes/45.bin"
 
 	.align 2
-DirectSoundWaveData_88F3C38::
-	.incbin "sound/direct_sound_samples/88F3C38.bin"
+DirectSoundWaveData_Phoneme_46::
+	.incbin "sound/direct_sound_samples/phonemes/46.bin"
 
 	.align 2
-DirectSoundWaveData_88F4834::
-	.incbin "sound/direct_sound_samples/88F4834.bin"
+DirectSoundWaveData_Phoneme_47::
+	.incbin "sound/direct_sound_samples/phonemes/47.bin"
 
 	.align 2
-DirectSoundWaveData_88F4BAC::
-	.incbin "sound/direct_sound_samples/88F4BAC.bin"
+DirectSoundWaveData_Phoneme_48::
+	.incbin "sound/direct_sound_samples/phonemes/48.bin"
 
 	.align 2
-DirectSoundWaveData_88F5368::
-	.incbin "sound/direct_sound_samples/88F5368.bin"
+DirectSoundWaveData_Phoneme_49::
+	.incbin "sound/direct_sound_samples/phonemes/49.bin"
 
 	.align 2
-DirectSoundWaveData_88F5FCC::
-	.incbin "sound/direct_sound_samples/88F5FCC.bin"
+DirectSoundWaveData_Phoneme_50::
+	.incbin "sound/direct_sound_samples/phonemes/50.bin"
 
 	.align 2
-DirectSoundWaveData_88F6498::
-	.incbin "sound/direct_sound_samples/88F6498.bin"
+DirectSoundWaveData_Phoneme_51::
+	.incbin "sound/direct_sound_samples/phonemes/51.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_accordion_duplicate::
diff --git a/sound/direct_sound_samples/88DBBC0.aif b/sound/direct_sound_samples/phonemes/01.aif
index 4b15a94b7..4b15a94b7 100644
--- a/sound/direct_sound_samples/88DBBC0.aif
+++ b/sound/direct_sound_samples/phonemes/01.aif
diff --git a/sound/direct_sound_samples/88DC220.aif b/sound/direct_sound_samples/phonemes/02.aif
index 74c129073..74c129073 100644
--- a/sound/direct_sound_samples/88DC220.aif
+++ b/sound/direct_sound_samples/phonemes/02.aif
diff --git a/sound/direct_sound_samples/88DC704.aif b/sound/direct_sound_samples/phonemes/03.aif
index 359972c16..359972c16 100644
--- a/sound/direct_sound_samples/88DC704.aif
+++ b/sound/direct_sound_samples/phonemes/03.aif
diff --git a/sound/direct_sound_samples/88DD054.aif b/sound/direct_sound_samples/phonemes/04.aif
index 3b136fa43..3b136fa43 100644
--- a/sound/direct_sound_samples/88DD054.aif
+++ b/sound/direct_sound_samples/phonemes/04.aif
diff --git a/sound/direct_sound_samples/88DDAC4.aif b/sound/direct_sound_samples/phonemes/05.aif
index fd72512cf..fd72512cf 100644
--- a/sound/direct_sound_samples/88DDAC4.aif
+++ b/sound/direct_sound_samples/phonemes/05.aif
diff --git a/sound/direct_sound_samples/88DDDE4.aif b/sound/direct_sound_samples/phonemes/06.aif
index 6f7794bec..6f7794bec 100644
--- a/sound/direct_sound_samples/88DDDE4.aif
+++ b/sound/direct_sound_samples/phonemes/06.aif
diff --git a/sound/direct_sound_samples/88DEA6C.aif b/sound/direct_sound_samples/phonemes/07.aif
index 89b845f21..89b845f21 100644
--- a/sound/direct_sound_samples/88DEA6C.aif
+++ b/sound/direct_sound_samples/phonemes/07.aif
diff --git a/sound/direct_sound_samples/88DF08C.aif b/sound/direct_sound_samples/phonemes/08.aif
index 1d99a3a93..1d99a3a93 100644
--- a/sound/direct_sound_samples/88DF08C.aif
+++ b/sound/direct_sound_samples/phonemes/08.aif
diff --git a/sound/direct_sound_samples/88DF414.aif b/sound/direct_sound_samples/phonemes/09.aif
index 883398129..883398129 100644
--- a/sound/direct_sound_samples/88DF414.aif
+++ b/sound/direct_sound_samples/phonemes/09.aif
diff --git a/sound/direct_sound_samples/88E01F8.aif b/sound/direct_sound_samples/phonemes/10.aif
index 776815e63..776815e63 100644
--- a/sound/direct_sound_samples/88E01F8.aif
+++ b/sound/direct_sound_samples/phonemes/10.aif
diff --git a/sound/direct_sound_samples/88E0B68.aif b/sound/direct_sound_samples/phonemes/11.aif
index 545bd1292..545bd1292 100644
--- a/sound/direct_sound_samples/88E0B68.aif
+++ b/sound/direct_sound_samples/phonemes/11.aif
diff --git a/sound/direct_sound_samples/88E0F04.aif b/sound/direct_sound_samples/phonemes/12.aif
index c0a3be10d..c0a3be10d 100644
--- a/sound/direct_sound_samples/88E0F04.aif
+++ b/sound/direct_sound_samples/phonemes/12.aif
diff --git a/sound/direct_sound_samples/88E16B8.aif b/sound/direct_sound_samples/phonemes/13.aif
index d26ecdd6d..d26ecdd6d 100644
--- a/sound/direct_sound_samples/88E16B8.aif
+++ b/sound/direct_sound_samples/phonemes/13.aif
diff --git a/sound/direct_sound_samples/88E2414.aif b/sound/direct_sound_samples/phonemes/14.aif
index 2b51201a4..2b51201a4 100644
--- a/sound/direct_sound_samples/88E2414.aif
+++ b/sound/direct_sound_samples/phonemes/14.aif
diff --git a/sound/direct_sound_samples/88E2658.aif b/sound/direct_sound_samples/phonemes/15.aif
index cf5ac4e03..cf5ac4e03 100644
--- a/sound/direct_sound_samples/88E2658.aif
+++ b/sound/direct_sound_samples/phonemes/15.aif
diff --git a/sound/direct_sound_samples/88E3498.aif b/sound/direct_sound_samples/phonemes/16.aif
index 606742e60..606742e60 100644
--- a/sound/direct_sound_samples/88E3498.aif
+++ b/sound/direct_sound_samples/phonemes/16.aif
diff --git a/sound/direct_sound_samples/88E3DEC.aif b/sound/direct_sound_samples/phonemes/17.aif
index 71d4987d6..71d4987d6 100644
--- a/sound/direct_sound_samples/88E3DEC.aif
+++ b/sound/direct_sound_samples/phonemes/17.aif
diff --git a/sound/direct_sound_samples/88E4140.aif b/sound/direct_sound_samples/phonemes/18.aif
index 070c44a37..070c44a37 100644
--- a/sound/direct_sound_samples/88E4140.aif
+++ b/sound/direct_sound_samples/phonemes/18.aif
diff --git a/sound/direct_sound_samples/88E4774.aif b/sound/direct_sound_samples/phonemes/19.aif
index b0ca84a38..b0ca84a38 100644
--- a/sound/direct_sound_samples/88E4774.aif
+++ b/sound/direct_sound_samples/phonemes/19.aif
diff --git a/sound/direct_sound_samples/88E53E0.aif b/sound/direct_sound_samples/phonemes/20.aif
index f44101b23..f44101b23 100644
--- a/sound/direct_sound_samples/88E53E0.aif
+++ b/sound/direct_sound_samples/phonemes/20.aif
diff --git a/sound/direct_sound_samples/88E5978.aif b/sound/direct_sound_samples/phonemes/21.aif
index a33809d42..a33809d42 100644
--- a/sound/direct_sound_samples/88E5978.aif
+++ b/sound/direct_sound_samples/phonemes/21.aif
diff --git a/sound/direct_sound_samples/88E647C.aif b/sound/direct_sound_samples/phonemes/22.aif
index 6a005efcc..6a005efcc 100644
--- a/sound/direct_sound_samples/88E647C.aif
+++ b/sound/direct_sound_samples/phonemes/22.aif
diff --git a/sound/direct_sound_samples/88E6A80.aif b/sound/direct_sound_samples/phonemes/23.aif
index 62f9493fd..62f9493fd 100644
--- a/sound/direct_sound_samples/88E6A80.aif
+++ b/sound/direct_sound_samples/phonemes/23.aif
diff --git a/sound/direct_sound_samples/88E6C78.aif b/sound/direct_sound_samples/phonemes/24.aif
index 5767bd6d9..5767bd6d9 100644
--- a/sound/direct_sound_samples/88E6C78.aif
+++ b/sound/direct_sound_samples/phonemes/24.aif
diff --git a/sound/direct_sound_samples/88E75DC.aif b/sound/direct_sound_samples/phonemes/25.aif
index 33e328a82..33e328a82 100644
--- a/sound/direct_sound_samples/88E75DC.aif
+++ b/sound/direct_sound_samples/phonemes/25.aif
diff --git a/sound/direct_sound_samples/88E8568.aif b/sound/direct_sound_samples/phonemes/26.aif
index 548e740c8..548e740c8 100644
--- a/sound/direct_sound_samples/88E8568.aif
+++ b/sound/direct_sound_samples/phonemes/26.aif
diff --git a/sound/direct_sound_samples/88E8BA0.aif b/sound/direct_sound_samples/phonemes/27.aif
index cbbe09266..cbbe09266 100644
--- a/sound/direct_sound_samples/88E8BA0.aif
+++ b/sound/direct_sound_samples/phonemes/27.aif
diff --git a/sound/direct_sound_samples/88E9674.aif b/sound/direct_sound_samples/phonemes/28.aif
index 8bdf7faaa..8bdf7faaa 100644
--- a/sound/direct_sound_samples/88E9674.aif
+++ b/sound/direct_sound_samples/phonemes/28.aif
diff --git a/sound/direct_sound_samples/88EA5B8.aif b/sound/direct_sound_samples/phonemes/29.aif
index f96f8853b..f96f8853b 100644
--- a/sound/direct_sound_samples/88EA5B8.aif
+++ b/sound/direct_sound_samples/phonemes/29.aif
diff --git a/sound/direct_sound_samples/88EAB30.aif b/sound/direct_sound_samples/phonemes/30.aif
index ab9abbf79..ab9abbf79 100644
--- a/sound/direct_sound_samples/88EAB30.aif
+++ b/sound/direct_sound_samples/phonemes/30.aif
diff --git a/sound/direct_sound_samples/88EB97C.aif b/sound/direct_sound_samples/phonemes/31.aif
index 9d21d0ab4..9d21d0ab4 100644
--- a/sound/direct_sound_samples/88EB97C.aif
+++ b/sound/direct_sound_samples/phonemes/31.aif
diff --git a/sound/direct_sound_samples/88EC884.aif b/sound/direct_sound_samples/phonemes/32.aif
index c037ed4af..c037ed4af 100644
--- a/sound/direct_sound_samples/88EC884.aif
+++ b/sound/direct_sound_samples/phonemes/32.aif
diff --git a/sound/direct_sound_samples/88ED358.aif b/sound/direct_sound_samples/phonemes/33.aif
index ac1f8b66f..ac1f8b66f 100644
--- a/sound/direct_sound_samples/88ED358.aif
+++ b/sound/direct_sound_samples/phonemes/33.aif
diff --git a/sound/direct_sound_samples/88EDEEC.aif b/sound/direct_sound_samples/phonemes/34.aif
index 1fd9111c8..1fd9111c8 100644
--- a/sound/direct_sound_samples/88EDEEC.aif
+++ b/sound/direct_sound_samples/phonemes/34.aif
diff --git a/sound/direct_sound_samples/88EE8C4.aif b/sound/direct_sound_samples/phonemes/35.aif
index 5d6ae2282..5d6ae2282 100644
--- a/sound/direct_sound_samples/88EE8C4.aif
+++ b/sound/direct_sound_samples/phonemes/35.aif
diff --git a/sound/direct_sound_samples/88EEF04.aif b/sound/direct_sound_samples/phonemes/36.aif
index f26700690..f26700690 100644
--- a/sound/direct_sound_samples/88EEF04.aif
+++ b/sound/direct_sound_samples/phonemes/36.aif
diff --git a/sound/direct_sound_samples/88EF9E4.aif b/sound/direct_sound_samples/phonemes/37.aif
index 3ba97a9fc..3ba97a9fc 100644
--- a/sound/direct_sound_samples/88EF9E4.aif
+++ b/sound/direct_sound_samples/phonemes/37.aif
diff --git a/sound/direct_sound_samples/88F0020.aif b/sound/direct_sound_samples/phonemes/38.aif
index 37f1be4b1..37f1be4b1 100644
--- a/sound/direct_sound_samples/88F0020.aif
+++ b/sound/direct_sound_samples/phonemes/38.aif
diff --git a/sound/direct_sound_samples/88F0738.aif b/sound/direct_sound_samples/phonemes/39.aif
index 4b3facb99..4b3facb99 100644
--- a/sound/direct_sound_samples/88F0738.aif
+++ b/sound/direct_sound_samples/phonemes/39.aif
diff --git a/sound/direct_sound_samples/88F1074.aif b/sound/direct_sound_samples/phonemes/40.aif
index 8a4d7653b..8a4d7653b 100644
--- a/sound/direct_sound_samples/88F1074.aif
+++ b/sound/direct_sound_samples/phonemes/40.aif
diff --git a/sound/direct_sound_samples/88F1830.aif b/sound/direct_sound_samples/phonemes/41.aif
index db5bae244..db5bae244 100644
--- a/sound/direct_sound_samples/88F1830.aif
+++ b/sound/direct_sound_samples/phonemes/41.aif
diff --git a/sound/direct_sound_samples/88F1D94.aif b/sound/direct_sound_samples/phonemes/42.aif
index 6612dd54d..6612dd54d 100644
--- a/sound/direct_sound_samples/88F1D94.aif
+++ b/sound/direct_sound_samples/phonemes/42.aif
diff --git a/sound/direct_sound_samples/88F2B08.aif b/sound/direct_sound_samples/phonemes/43.aif
index 441eecfcd..441eecfcd 100644
--- a/sound/direct_sound_samples/88F2B08.aif
+++ b/sound/direct_sound_samples/phonemes/43.aif
diff --git a/sound/direct_sound_samples/88F2F84.aif b/sound/direct_sound_samples/phonemes/44.aif
index 95670cf0a..95670cf0a 100644
--- a/sound/direct_sound_samples/88F2F84.aif
+++ b/sound/direct_sound_samples/phonemes/44.aif
diff --git a/sound/direct_sound_samples/88F3470.aif b/sound/direct_sound_samples/phonemes/45.aif
index 0fadcba8e..0fadcba8e 100644
--- a/sound/direct_sound_samples/88F3470.aif
+++ b/sound/direct_sound_samples/phonemes/45.aif
diff --git a/sound/direct_sound_samples/88F3C38.aif b/sound/direct_sound_samples/phonemes/46.aif
index 6017c55b4..6017c55b4 100644
--- a/sound/direct_sound_samples/88F3C38.aif
+++ b/sound/direct_sound_samples/phonemes/46.aif
diff --git a/sound/direct_sound_samples/88F4834.aif b/sound/direct_sound_samples/phonemes/47.aif
index 2327b6d65..2327b6d65 100644
--- a/sound/direct_sound_samples/88F4834.aif
+++ b/sound/direct_sound_samples/phonemes/47.aif
diff --git a/sound/direct_sound_samples/88F4BAC.aif b/sound/direct_sound_samples/phonemes/48.aif
index 19ceca0d0..19ceca0d0 100644
--- a/sound/direct_sound_samples/88F4BAC.aif
+++ b/sound/direct_sound_samples/phonemes/48.aif
diff --git a/sound/direct_sound_samples/88F5368.aif b/sound/direct_sound_samples/phonemes/49.aif
index 8438d301a..8438d301a 100644
--- a/sound/direct_sound_samples/88F5368.aif
+++ b/sound/direct_sound_samples/phonemes/49.aif
diff --git a/sound/direct_sound_samples/88F5FCC.aif b/sound/direct_sound_samples/phonemes/50.aif
index 74d4bcf4a..74d4bcf4a 100644
--- a/sound/direct_sound_samples/88F5FCC.aif
+++ b/sound/direct_sound_samples/phonemes/50.aif
diff --git a/sound/direct_sound_samples/88F6498.aif b/sound/direct_sound_samples/phonemes/51.aif
index dfef8a82b..dfef8a82b 100644
--- a/sound/direct_sound_samples/88F6498.aif
+++ b/sound/direct_sound_samples/phonemes/51.aif
diff --git a/sound/direct_sound_samples/8725A2C.aif b/sound/direct_sound_samples/unknown_01.aif
index ee6ff45b7..ee6ff45b7 100644
--- a/sound/direct_sound_samples/8725A2C.aif
+++ b/sound/direct_sound_samples/unknown_01.aif
diff --git a/sound/direct_sound_samples/872762C.aif b/sound/direct_sound_samples/unknown_02.aif
index 2e09d0822..2e09d0822 100644
--- a/sound/direct_sound_samples/872762C.aif
+++ b/sound/direct_sound_samples/unknown_02.aif
diff --git a/sound/direct_sound_samples/872921C.aif b/sound/direct_sound_samples/unknown_03.aif
index 49f24936f..49f24936f 100644
--- a/sound/direct_sound_samples/872921C.aif
+++ b/sound/direct_sound_samples/unknown_03.aif
diff --git a/sound/direct_sound_samples/872A5D0.aif b/sound/direct_sound_samples/unknown_04.aif
index 5c55d91ed..5c55d91ed 100644
--- a/sound/direct_sound_samples/872A5D0.aif
+++ b/sound/direct_sound_samples/unknown_04.aif
diff --git a/sound/direct_sound_samples/872EEA8.aif b/sound/direct_sound_samples/unknown_05.aif
index 515818a4d..515818a4d 100644
--- a/sound/direct_sound_samples/872EEA8.aif
+++ b/sound/direct_sound_samples/unknown_05.aif
diff --git a/sound/direct_sound_samples/87301B0.aif b/sound/direct_sound_samples/unknown_06.aif
index 102830efa..102830efa 100644
--- a/sound/direct_sound_samples/87301B0.aif
+++ b/sound/direct_sound_samples/unknown_06.aif
diff --git a/sound/direct_sound_samples/8734298.aif b/sound/direct_sound_samples/unknown_07.aif
index 556be0238..556be0238 100644
--- a/sound/direct_sound_samples/8734298.aif
+++ b/sound/direct_sound_samples/unknown_07.aif
diff --git a/sound/direct_sound_samples/87364A8.aif b/sound/direct_sound_samples/unknown_08.aif
index dd80b1185..dd80b1185 100644
--- a/sound/direct_sound_samples/87364A8.aif
+++ b/sound/direct_sound_samples/unknown_08.aif
diff --git a/sound/direct_sound_samples/87385E4.aif b/sound/direct_sound_samples/unknown_09.aif
index ebd46eeaa..ebd46eeaa 100644
--- a/sound/direct_sound_samples/87385E4.aif
+++ b/sound/direct_sound_samples/unknown_09.aif
diff --git a/sound/direct_sound_samples/873ECD8.aif b/sound/direct_sound_samples/unknown_10.aif
index 6a11945c5..6a11945c5 100644
--- a/sound/direct_sound_samples/873ECD8.aif
+++ b/sound/direct_sound_samples/unknown_10.aif
diff --git a/sound/direct_sound_samples/8740818.aif b/sound/direct_sound_samples/unknown_11.aif
index a0fb49f89..a0fb49f89 100644
--- a/sound/direct_sound_samples/8740818.aif
+++ b/sound/direct_sound_samples/unknown_11.aif
diff --git a/sound/direct_sound_samples/87424B0.aif b/sound/direct_sound_samples/unknown_12.aif
index 9521d0b6e..9521d0b6e 100644
--- a/sound/direct_sound_samples/87424B0.aif
+++ b/sound/direct_sound_samples/unknown_12.aif
diff --git a/sound/direct_sound_samples/87430C0.aif b/sound/direct_sound_samples/unknown_13.aif
index 2519572e2..2519572e2 100644
--- a/sound/direct_sound_samples/87430C0.aif
+++ b/sound/direct_sound_samples/unknown_13.aif
diff --git a/sound/direct_sound_samples/8743C50.aif b/sound/direct_sound_samples/unknown_14.aif
index d411e6612..d411e6612 100644
--- a/sound/direct_sound_samples/8743C50.aif
+++ b/sound/direct_sound_samples/unknown_14.aif
diff --git a/sound/direct_sound_samples/87446EC.aif b/sound/direct_sound_samples/unknown_15.aif
index 3bc1aa839..3bc1aa839 100644
--- a/sound/direct_sound_samples/87446EC.aif
+++ b/sound/direct_sound_samples/unknown_15.aif
diff --git a/sound/direct_sound_samples/8745034.aif b/sound/direct_sound_samples/unknown_16.aif
index 3bacf3676..3bacf3676 100644
--- a/sound/direct_sound_samples/8745034.aif
+++ b/sound/direct_sound_samples/unknown_16.aif
diff --git a/sound/direct_sound_samples/8745A7C.aif b/sound/direct_sound_samples/unknown_17.aif
index 5ddaa153d..5ddaa153d 100644
--- a/sound/direct_sound_samples/8745A7C.aif
+++ b/sound/direct_sound_samples/unknown_17.aif
diff --git a/sound/direct_sound_samples/88D6978.aif b/sound/direct_sound_samples/unknown_18.aif
index e1715fd03..e1715fd03 100644
--- a/sound/direct_sound_samples/88D6978.aif
+++ b/sound/direct_sound_samples/unknown_18.aif
diff --git a/sound/programmable_wave_data.inc b/sound/programmable_wave_data.inc
index 45da43b00..3e354d88a 100644
--- a/sound/programmable_wave_data.inc
+++ b/sound/programmable_wave_data.inc
@@ -1,74 +1,78 @@
-ProgrammableWaveData_86B4830::
-	.incbin "sound/programmable_wave_samples/86B4830.pcm"
+ProgrammableWaveData_1::
+	.incbin "sound/programmable_wave_samples/01.pcm"
 
-ProgrammableWaveData_86B4840::
-	.incbin "sound/programmable_wave_samples/86B4840.pcm"
+ProgrammableWaveData_2::
+	.incbin "sound/programmable_wave_samples/02.pcm"
 
-ProgrammableWaveData_86B4850::
-	.incbin "sound/programmable_wave_samples/86B4850.pcm"
+ProgrammableWaveData_3::
+	.incbin "sound/programmable_wave_samples/03.pcm"
 
-ProgrammableWaveData_86B4860::
-	.incbin "sound/programmable_wave_samples/86B4860.pcm"
+ProgrammableWaveData_4::
+	.incbin "sound/programmable_wave_samples/04.pcm"
 
-ProgrammableWaveData_86B4870::
-	.incbin "sound/programmable_wave_samples/86B4870.pcm"
+ProgrammableWaveData_5::
+	.incbin "sound/programmable_wave_samples/05.pcm"
 
-ProgrammableWaveData_86B4880::
-	.incbin "sound/programmable_wave_samples/86B4880.pcm"
+ProgrammableWaveData_6::
+	.incbin "sound/programmable_wave_samples/06.pcm"
 
-ProgrammableWaveData_86B4890::
-	.incbin "sound/programmable_wave_samples/86B4890.pcm"
+ProgrammableWaveData_7::
+	.incbin "sound/programmable_wave_samples/07.pcm"
 
-ProgrammableWaveData_86B48A0::
-	.incbin "sound/programmable_wave_samples/86B48A0.pcm"
+ProgrammableWaveData_8::
+	.incbin "sound/programmable_wave_samples/08.pcm"
 
-ProgrammableWaveData_86B48B0::
-	.incbin "sound/programmable_wave_samples/86B48B0.pcm"
+ProgrammableWaveData_9::
+	.incbin "sound/programmable_wave_samples/09.pcm"
 
-ProgrammableWaveData_86B48C0::
-	.incbin "sound/programmable_wave_samples/86B48C0.pcm"
+ProgrammableWaveData_10::
+	.incbin "sound/programmable_wave_samples/10.pcm"
 
-ProgrammableWaveData_86B48D0::
-	.incbin "sound/programmable_wave_samples/86B48D0.pcm"
+ProgrammableWaveData_11::
+	.incbin "sound/programmable_wave_samples/11.pcm"
 
-ProgrammableWaveData_86B48E0::
-	.incbin "sound/programmable_wave_samples/86B48E0.pcm"
+ProgrammableWaveData_12::
+	.incbin "sound/programmable_wave_samples/12.pcm"
 
-ProgrammableWaveData_86B48F0::
-	.incbin "sound/programmable_wave_samples/86B48F0.pcm"
+ProgrammableWaveData_13::
+	.incbin "sound/programmable_wave_samples/13.pcm"
 
-ProgrammableWaveData_86B4900::
-	.incbin "sound/programmable_wave_samples/86B4900.pcm"
+ProgrammableWaveData_14::
+	.incbin "sound/programmable_wave_samples/14.pcm"
 
-ProgrammableWaveData_86B4910::
-	.incbin "sound/programmable_wave_samples/86B4910.pcm"
+ProgrammableWaveData_15::
+	.incbin "sound/programmable_wave_samples/15.pcm"
 
-ProgrammableWaveData_86B4920::
-	.incbin "sound/programmable_wave_samples/86B4920.pcm"
+ProgrammableWaveData_16::
+	.incbin "sound/programmable_wave_samples/16.pcm"
 
-ProgrammableWaveData_Unused_86B4930::
-	.incbin "sound/programmable_wave_samples/unused_86B4930.pcm"
+@ Unused
+ProgrammableWaveData_17::
+	.incbin "sound/programmable_wave_samples/17.pcm"
 
-ProgrammableWaveData_Unused_86B4940::
-	.incbin "sound/programmable_wave_samples/unused_86B4940.pcm"
+@ Unused
+ProgrammableWaveData_18::
+	.incbin "sound/programmable_wave_samples/18.pcm"
 
-ProgrammableWaveData_Unused_86B4950::
-	.incbin "sound/programmable_wave_samples/unused_86B4950.pcm"
+@ Unused
+ProgrammableWaveData_19::
+	.incbin "sound/programmable_wave_samples/19.pcm"
 
-ProgrammableWaveData_Unused_86B4960::
-	.incbin "sound/programmable_wave_samples/unused_86B4960.pcm"
+@ Unused
+ProgrammableWaveData_20::
+	.incbin "sound/programmable_wave_samples/20.pcm"
 
-ProgrammableWaveData_86B4970::
-	.incbin "sound/programmable_wave_samples/86B4970.pcm"
+ProgrammableWaveData_21::
+	.incbin "sound/programmable_wave_samples/21.pcm"
 
-ProgrammableWaveData_86B4980::
-	.incbin "sound/programmable_wave_samples/86B4980.pcm"
+ProgrammableWaveData_22::
+	.incbin "sound/programmable_wave_samples/22.pcm"
 
-ProgrammableWaveData_86B4990::
-	.incbin "sound/programmable_wave_samples/86B4990.pcm"
+ProgrammableWaveData_23::
+	.incbin "sound/programmable_wave_samples/23.pcm"
 
-ProgrammableWaveData_86B49A0::
-	.incbin "sound/programmable_wave_samples/86B49A0.pcm"
+ProgrammableWaveData_24::
+	.incbin "sound/programmable_wave_samples/24.pcm"
 
-ProgrammableWaveData_86B49B0::
-	.incbin "sound/programmable_wave_samples/86B49B0.pcm"
+ProgrammableWaveData_25::
+	.incbin "sound/programmable_wave_samples/25.pcm"
diff --git a/sound/programmable_wave_samples/86B4830.pcm b/sound/programmable_wave_samples/01.pcm
index a0ca8fed9..a0ca8fed9 100644
--- a/sound/programmable_wave_samples/86B4830.pcm
+++ b/sound/programmable_wave_samples/01.pcm
diff --git a/sound/programmable_wave_samples/86B4840.pcm b/sound/programmable_wave_samples/02.pcm
index 25be9c018..25be9c018 100644
--- a/sound/programmable_wave_samples/86B4840.pcm
+++ b/sound/programmable_wave_samples/02.pcm
diff --git a/sound/programmable_wave_samples/86B4850.pcm b/sound/programmable_wave_samples/03.pcm
index 5d9585aca..5d9585aca 100644
--- a/sound/programmable_wave_samples/86B4850.pcm
+++ b/sound/programmable_wave_samples/03.pcm
diff --git a/sound/programmable_wave_samples/86B4860.pcm b/sound/programmable_wave_samples/04.pcm
index 25ff1b371..25ff1b371 100644
--- a/sound/programmable_wave_samples/86B4860.pcm
+++ b/sound/programmable_wave_samples/04.pcm
diff --git a/sound/programmable_wave_samples/86B4870.pcm b/sound/programmable_wave_samples/05.pcm
index d0b69f04a..d0b69f04a 100644
--- a/sound/programmable_wave_samples/86B4870.pcm
+++ b/sound/programmable_wave_samples/05.pcm
diff --git a/sound/programmable_wave_samples/86B4880.pcm b/sound/programmable_wave_samples/06.pcm
index d0fa1932d..d0fa1932d 100644
--- a/sound/programmable_wave_samples/86B4880.pcm
+++ b/sound/programmable_wave_samples/06.pcm
diff --git a/sound/programmable_wave_samples/86B4890.pcm b/sound/programmable_wave_samples/07.pcm
index 81afd79c5..81afd79c5 100644
--- a/sound/programmable_wave_samples/86B4890.pcm
+++ b/sound/programmable_wave_samples/07.pcm
diff --git a/sound/programmable_wave_samples/86B48A0.pcm b/sound/programmable_wave_samples/08.pcm
index ce4c8ae12..ce4c8ae12 100644
--- a/sound/programmable_wave_samples/86B48A0.pcm
+++ b/sound/programmable_wave_samples/08.pcm
diff --git a/sound/programmable_wave_samples/86B48B0.pcm b/sound/programmable_wave_samples/09.pcm
index 199da8913..199da8913 100644
--- a/sound/programmable_wave_samples/86B48B0.pcm
+++ b/sound/programmable_wave_samples/09.pcm
diff --git a/sound/programmable_wave_samples/86B48C0.pcm b/sound/programmable_wave_samples/10.pcm
index 9dc074493..9dc074493 100644
--- a/sound/programmable_wave_samples/86B48C0.pcm
+++ b/sound/programmable_wave_samples/10.pcm
diff --git a/sound/programmable_wave_samples/86B48D0.pcm b/sound/programmable_wave_samples/11.pcm
index 89b2cc2d1..89b2cc2d1 100644
--- a/sound/programmable_wave_samples/86B48D0.pcm
+++ b/sound/programmable_wave_samples/11.pcm
diff --git a/sound/programmable_wave_samples/86B48E0.pcm b/sound/programmable_wave_samples/12.pcm
index b6d6ce2d2..b6d6ce2d2 100644
--- a/sound/programmable_wave_samples/86B48E0.pcm
+++ b/sound/programmable_wave_samples/12.pcm
diff --git a/sound/programmable_wave_samples/86B48F0.pcm b/sound/programmable_wave_samples/13.pcm
index 8ded871e3..8ded871e3 100644
--- a/sound/programmable_wave_samples/86B48F0.pcm
+++ b/sound/programmable_wave_samples/13.pcm
diff --git a/sound/programmable_wave_samples/86B4900.pcm b/sound/programmable_wave_samples/14.pcm
index f5e51d5a9..f5e51d5a9 100644
--- a/sound/programmable_wave_samples/86B4900.pcm
+++ b/sound/programmable_wave_samples/14.pcm
diff --git a/sound/programmable_wave_samples/86B4910.pcm b/sound/programmable_wave_samples/15.pcm
index 0d7192617..0d7192617 100644
--- a/sound/programmable_wave_samples/86B4910.pcm
+++ b/sound/programmable_wave_samples/15.pcm
diff --git a/sound/programmable_wave_samples/86B4920.pcm b/sound/programmable_wave_samples/16.pcm
index 2aae22d26..2aae22d26 100644
--- a/sound/programmable_wave_samples/86B4920.pcm
+++ b/sound/programmable_wave_samples/16.pcm
diff --git a/sound/programmable_wave_samples/unused_86B4930.pcm b/sound/programmable_wave_samples/17.pcm
index a5f6b81fa..a5f6b81fa 100644
--- a/sound/programmable_wave_samples/unused_86B4930.pcm
+++ b/sound/programmable_wave_samples/17.pcm
diff --git a/sound/programmable_wave_samples/unused_86B4940.pcm b/sound/programmable_wave_samples/18.pcm
index c69e825be..c69e825be 100644
--- a/sound/programmable_wave_samples/unused_86B4940.pcm
+++ b/sound/programmable_wave_samples/18.pcm
diff --git a/sound/programmable_wave_samples/unused_86B4950.pcm b/sound/programmable_wave_samples/19.pcm
index ab072b363..ab072b363 100644
--- a/sound/programmable_wave_samples/unused_86B4950.pcm
+++ b/sound/programmable_wave_samples/19.pcm
diff --git a/sound/programmable_wave_samples/unused_86B4960.pcm b/sound/programmable_wave_samples/20.pcm
index 01f5db609..01f5db609 100644
--- a/sound/programmable_wave_samples/unused_86B4960.pcm
+++ b/sound/programmable_wave_samples/20.pcm
diff --git a/sound/programmable_wave_samples/86B4970.pcm b/sound/programmable_wave_samples/21.pcm
index 57f17e87b..57f17e87b 100644
--- a/sound/programmable_wave_samples/86B4970.pcm
+++ b/sound/programmable_wave_samples/21.pcm
diff --git a/sound/programmable_wave_samples/86B4980.pcm b/sound/programmable_wave_samples/22.pcm
index 5d0e2ced7..5d0e2ced7 100644
--- a/sound/programmable_wave_samples/86B4980.pcm
+++ b/sound/programmable_wave_samples/22.pcm
diff --git a/sound/programmable_wave_samples/86B4990.pcm b/sound/programmable_wave_samples/23.pcm
index 130ae8257..130ae8257 100644
--- a/sound/programmable_wave_samples/86B4990.pcm
+++ b/sound/programmable_wave_samples/23.pcm
diff --git a/sound/programmable_wave_samples/86B49A0.pcm b/sound/programmable_wave_samples/24.pcm
index 085a0bd7f..085a0bd7f 100644
--- a/sound/programmable_wave_samples/86B49A0.pcm
+++ b/sound/programmable_wave_samples/24.pcm
diff --git a/sound/programmable_wave_samples/86B49B0.pcm b/sound/programmable_wave_samples/25.pcm
index 8d306e7a4..8d306e7a4 100644
--- a/sound/programmable_wave_samples/86B49B0.pcm
+++ b/sound/programmable_wave_samples/25.pcm
diff --git a/sound/voicegroups/voicegroup001.inc b/sound/voicegroups/voicegroup001.inc
index 9960daf4a..20a2795dc 100644
--- a/sound/voicegroups/voicegroup001.inc
+++ b/sound/voicegroups/voicegroup001.inc
@@ -11,7 +11,7 @@ voicegroup001::
 	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -19,7 +19,7 @@ voicegroup001::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 6, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
 	voice_square_2 60, 0, 3, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup010.inc b/sound/voicegroups/voicegroup010.inc
index e2b38fcbd..8d0f7a56d 100644
--- a/sound/voicegroups/voicegroup010.inc
+++ b/sound/voicegroups/voicegroup010.inc
@@ -81,7 +81,7 @@ voicegroup010::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup011.inc b/sound/voicegroups/voicegroup011.inc
index a8655cb8c..5527cc369 100644
--- a/sound/voicegroups/voicegroup011.inc
+++ b/sound/voicegroups/voicegroup011.inc
@@ -74,7 +74,7 @@ voicegroup011::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup012.inc b/sound/voicegroups/voicegroup012.inc
index d92c270cb..2fe7cf818 100644
--- a/sound/voicegroups/voicegroup012.inc
+++ b/sound/voicegroups/voicegroup012.inc
@@ -87,8 +87,8 @@ voicegroup012::
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1
diff --git a/sound/voicegroups/voicegroup013.inc b/sound/voicegroups/voicegroup013.inc
index f17ad599a..f99c6f3cd 100644
--- a/sound/voicegroups/voicegroup013.inc
+++ b/sound/voicegroups/voicegroup013.inc
@@ -87,7 +87,7 @@ voicegroup013::
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup014.inc b/sound/voicegroups/voicegroup014.inc
index c3136f2fd..6ce0897d1 100644
--- a/sound/voicegroups/voicegroup014.inc
+++ b/sound/voicegroups/voicegroup014.inc
@@ -81,8 +81,8 @@ voicegroup014::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
 
diff --git a/sound/voicegroups/voicegroup015.inc b/sound/voicegroups/voicegroup015.inc
index 81e200180..a52847635 100644
--- a/sound/voicegroups/voicegroup015.inc
+++ b/sound/voicegroups/voicegroup015.inc
@@ -74,14 +74,14 @@ voicegroup015::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup017.inc b/sound/voicegroups/voicegroup017.inc
index f963fb77e..06738d297 100644
--- a/sound/voicegroups/voicegroup017.inc
+++ b/sound/voicegroups/voicegroup017.inc
@@ -74,18 +74,18 @@ voicegroup017::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 1, 1, 7, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
 	voice_square_1_alt 60, 0, 0, 2, 1, 1, 7, 2
 	voice_square_2_alt 60, 0, 3, 1, 1, 7, 2
 	voice_square_1_alt 60, 0, 0, 3, 1, 1, 7, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 3
 	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 2
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 2
 	voice_square_2_alt 60, 0, 1, 1, 2, 6, 2
diff --git a/sound/voicegroups/voicegroup018.inc b/sound/voicegroups/voicegroup018.inc
index 0364349f0..30b63bb26 100644
--- a/sound/voicegroups/voicegroup018.inc
+++ b/sound/voicegroups/voicegroup018.inc
@@ -81,7 +81,7 @@ voicegroup018::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup019.inc b/sound/voicegroups/voicegroup019.inc
index d15be40a1..a983659c3 100644
--- a/sound/voicegroups/voicegroup019.inc
+++ b/sound/voicegroups/voicegroup019.inc
@@ -81,7 +81,7 @@ voicegroup019::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 2
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1
diff --git a/sound/voicegroups/voicegroup022.inc b/sound/voicegroups/voicegroup022.inc
index 2a1bba75d..877f57d6c 100644
--- a/sound/voicegroups/voicegroup022.inc
+++ b/sound/voicegroups/voicegroup022.inc
@@ -30,11 +30,11 @@ voicegroup022::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 0
 	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup023.inc b/sound/voicegroups/voicegroup023.inc
index df0f663a7..eede8dc01 100644
--- a/sound/voicegroups/voicegroup023.inc
+++ b/sound/voicegroups/voicegroup023.inc
@@ -81,7 +81,7 @@ voicegroup023::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1
diff --git a/sound/voicegroups/voicegroup024.inc b/sound/voicegroups/voicegroup024.inc
index d4e139704..3806b462d 100644
--- a/sound/voicegroups/voicegroup024.inc
+++ b/sound/voicegroups/voicegroup024.inc
@@ -81,7 +81,7 @@ voicegroup024::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
@@ -89,6 +89,6 @@ voicegroup024::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup025.inc b/sound/voicegroups/voicegroup025.inc
index 1be1beea6..344962946 100644
--- a/sound/voicegroups/voicegroup025.inc
+++ b/sound/voicegroups/voicegroup025.inc
@@ -81,7 +81,7 @@ voicegroup025::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup026.inc b/sound/voicegroups/voicegroup026.inc
index 501241166..d18047d58 100644
--- a/sound/voicegroups/voicegroup026.inc
+++ b/sound/voicegroups/voicegroup026.inc
@@ -81,7 +81,7 @@ voicegroup026::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 9, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
diff --git a/sound/voicegroups/voicegroup027.inc b/sound/voicegroups/voicegroup027.inc
index ef84f846e..517ee87d4 100644
--- a/sound/voicegroups/voicegroup027.inc
+++ b/sound/voicegroups/voicegroup027.inc
@@ -73,7 +73,7 @@ voicegroup027::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -81,7 +81,7 @@ voicegroup027::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup028.inc b/sound/voicegroups/voicegroup028.inc
index 6d1071850..9af19f187 100644
--- a/sound/voicegroups/voicegroup028.inc
+++ b/sound/voicegroups/voicegroup028.inc
@@ -81,6 +81,6 @@ voicegroup028::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 2, 0, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_2 60, 0, 3, 0, 4, 0, 0
 
diff --git a/sound/voicegroups/voicegroup029.inc b/sound/voicegroups/voicegroup029.inc
index e65818f90..7c801afcb 100644
--- a/sound/voicegroups/voicegroup029.inc
+++ b/sound/voicegroups/voicegroup029.inc
@@ -81,7 +81,7 @@ voicegroup029::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 0, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 0
diff --git a/sound/voicegroups/voicegroup031.inc b/sound/voicegroups/voicegroup031.inc
index a24251c78..178d7ec63 100644
--- a/sound/voicegroups/voicegroup031.inc
+++ b/sound/voicegroups/voicegroup031.inc
@@ -26,7 +26,7 @@ voicegroup031::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup032.inc b/sound/voicegroups/voicegroup032.inc
index f50eb844b..dc60bbdf3 100644
--- a/sound/voicegroups/voicegroup032.inc
+++ b/sound/voicegroups/voicegroup032.inc
@@ -74,14 +74,14 @@ voicegroup032::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup034.inc b/sound/voicegroups/voicegroup034.inc
index 6dc04e97a..fe973b84c 100644
--- a/sound/voicegroups/voicegroup034.inc
+++ b/sound/voicegroups/voicegroup034.inc
@@ -83,5 +83,5 @@ voicegroup034::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 2
+	voice_programmable_wave 60, 0, ProgrammableWaveData_16, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup035.inc b/sound/voicegroups/voicegroup035.inc
index 359a43a8c..2c3ac4bdd 100644
--- a/sound/voicegroups/voicegroup035.inc
+++ b/sound/voicegroups/voicegroup035.inc
@@ -81,8 +81,8 @@ voicegroup035::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 6, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 6, 1
 
diff --git a/sound/voicegroups/voicegroup036.inc b/sound/voicegroups/voicegroup036.inc
index b3ef9cfbc..c3d2df146 100644
--- a/sound/voicegroups/voicegroup036.inc
+++ b/sound/voicegroups/voicegroup036.inc
@@ -73,7 +73,7 @@ voicegroup036::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup037.inc b/sound/voicegroups/voicegroup037.inc
index d05a4c6e2..057891c01 100644
--- a/sound/voicegroups/voicegroup037.inc
+++ b/sound/voicegroups/voicegroup037.inc
@@ -81,12 +81,12 @@ voicegroup037::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup038.inc b/sound/voicegroups/voicegroup038.inc
index 61ecc6746..bcb211d6f 100644
--- a/sound/voicegroups/voicegroup038.inc
+++ b/sound/voicegroups/voicegroup038.inc
@@ -81,5 +81,5 @@ voicegroup038::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup039.inc b/sound/voicegroups/voicegroup039.inc
index 887f238dc..9e8d16df0 100644
--- a/sound/voicegroups/voicegroup039.inc
+++ b/sound/voicegroups/voicegroup039.inc
@@ -83,7 +83,7 @@ voicegroup039::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup040.inc b/sound/voicegroups/voicegroup040.inc
index 4e523072a..f390cb3d8 100644
--- a/sound/voicegroups/voicegroup040.inc
+++ b/sound/voicegroups/voicegroup040.inc
@@ -83,7 +83,7 @@ voicegroup040::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup041.inc b/sound/voicegroups/voicegroup041.inc
index 101a6ddb7..def4e46b0 100644
--- a/sound/voicegroups/voicegroup041.inc
+++ b/sound/voicegroups/voicegroup041.inc
@@ -83,7 +83,7 @@ voicegroup041::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup042.inc b/sound/voicegroups/voicegroup042.inc
index 55fa84d60..1298ddbd5 100644
--- a/sound/voicegroups/voicegroup042.inc
+++ b/sound/voicegroups/voicegroup042.inc
@@ -83,7 +83,7 @@ voicegroup042::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup044.inc b/sound/voicegroups/voicegroup044.inc
index 838f58fbd..9a057754b 100644
--- a/sound/voicegroups/voicegroup044.inc
+++ b/sound/voicegroups/voicegroup044.inc
@@ -80,5 +80,5 @@ voicegroup044::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup045.inc b/sound/voicegroups/voicegroup045.inc
index 9647f7e45..2e2016e43 100644
--- a/sound/voicegroups/voicegroup045.inc
+++ b/sound/voicegroups/voicegroup045.inc
@@ -4,10 +4,10 @@ voicegroup045::
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 1
 	voice_square_1_alt 60, 0, 0, 3, 1, 2, 6, 0
 	voice_square_2_alt 60, 0, 3, 1, 2, 6, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 0, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 1, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 1, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_keysplit voicegroup005, KeySplitTable1
diff --git a/sound/voicegroups/voicegroup046.inc b/sound/voicegroups/voicegroup046.inc
index e8165dcc6..f653241e3 100644
--- a/sound/voicegroups/voicegroup046.inc
+++ b/sound/voicegroups/voicegroup046.inc
@@ -1,10 +1,10 @@
 	.align 2
 voicegroup046::
 	voice_keysplit voicegroup005, KeySplitTable1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 1, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_14, 0, 1, 12, 0
 	voice_square_1_alt 60, 0, 0, 0, 1, 1, 9, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216
 	voice_square_2_alt 60, 0, 1, 0, 2, 6, 3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup047.inc b/sound/voicegroups/voicegroup047.inc
index 80faa09c3..84fa9335a 100644
--- a/sound/voicegroups/voicegroup047.inc
+++ b/sound/voicegroups/voicegroup047.inc
@@ -81,9 +81,9 @@ voicegroup047::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 1, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 1, 7, 15, 2
 	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup048.inc b/sound/voicegroups/voicegroup048.inc
index c81ebf39f..eeb5b682a 100644
--- a/sound/voicegroups/voicegroup048.inc
+++ b/sound/voicegroups/voicegroup048.inc
@@ -73,7 +73,7 @@ voicegroup048::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -84,7 +84,7 @@ voicegroup048::
 	voice_square_1_alt 60, 0, 0, 3, 0, 3, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 3, 3, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 12, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 12, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 2, 4, 0
diff --git a/sound/voicegroups/voicegroup049.inc b/sound/voicegroups/voicegroup049.inc
index 4ece4cb76..b6b0774cf 100644
--- a/sound/voicegroups/voicegroup049.inc
+++ b/sound/voicegroups/voicegroup049.inc
@@ -83,7 +83,7 @@ voicegroup049::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 1, 7, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 4, 2
 	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup050.inc b/sound/voicegroups/voicegroup050.inc
index 6f401b959..6b45664eb 100644
--- a/sound/voicegroups/voicegroup050.inc
+++ b/sound/voicegroups/voicegroup050.inc
@@ -83,7 +83,7 @@ voicegroup050::
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup052.inc b/sound/voicegroups/voicegroup052.inc
index ce6c19e3a..438e2d5f1 100644
--- a/sound/voicegroups/voicegroup052.inc
+++ b/sound/voicegroups/voicegroup052.inc
@@ -29,7 +29,7 @@ voicegroup052::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -82,9 +82,9 @@ voicegroup052::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 1, 6, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 7, 6, 1
diff --git a/sound/voicegroups/voicegroup053.inc b/sound/voicegroups/voicegroup053.inc
index f9c21afe3..e5f1a4d7e 100644
--- a/sound/voicegroups/voicegroup053.inc
+++ b/sound/voicegroups/voicegroup053.inc
@@ -83,7 +83,7 @@ voicegroup053::
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup054.inc b/sound/voicegroups/voicegroup054.inc
index 4cd90843c..ddd17ed99 100644
--- a/sound/voicegroups/voicegroup054.inc
+++ b/sound/voicegroups/voicegroup054.inc
@@ -82,7 +82,7 @@ voicegroup054::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup055.inc b/sound/voicegroups/voicegroup055.inc
index aa9f7d113..9157030e8 100644
--- a/sound/voicegroups/voicegroup055.inc
+++ b/sound/voicegroups/voicegroup055.inc
@@ -82,8 +82,8 @@ voicegroup055::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 0, 7, 15, 2
 	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup056.inc b/sound/voicegroups/voicegroup056.inc
index 42f779100..ec543b9b3 100644
--- a/sound/voicegroups/voicegroup056.inc
+++ b/sound/voicegroups/voicegroup056.inc
@@ -87,7 +87,7 @@ voicegroup056::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup057.inc b/sound/voicegroups/voicegroup057.inc
index 6bd58e87e..391b7cf8b 100644
--- a/sound/voicegroups/voicegroup057.inc
+++ b/sound/voicegroups/voicegroup057.inc
@@ -82,7 +82,7 @@ voicegroup057::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 1, 4, 10, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 1, 4, 10, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup058.inc b/sound/voicegroups/voicegroup058.inc
index af043d943..56dff5f5b 100644
--- a/sound/voicegroups/voicegroup058.inc
+++ b/sound/voicegroups/voicegroup058.inc
@@ -75,7 +75,7 @@ voicegroup058::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup059.inc b/sound/voicegroups/voicegroup059.inc
index f0c4d3415..5a45d437d 100644
--- a/sound/voicegroups/voicegroup059.inc
+++ b/sound/voicegroups/voicegroup059.inc
@@ -5,8 +5,8 @@ voicegroup059::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
@@ -82,11 +82,11 @@ voicegroup059::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 2
 	voice_square_2_alt 60, 0, 2, 0, 1, 6, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
 
diff --git a/sound/voicegroups/voicegroup061.inc b/sound/voicegroups/voicegroup061.inc
index af4640094..d73730ecb 100644
--- a/sound/voicegroups/voicegroup061.inc
+++ b/sound/voicegroups/voicegroup061.inc
@@ -83,8 +83,8 @@ voicegroup061::
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup062.inc b/sound/voicegroups/voicegroup062.inc
index d3745820e..ad2e6cad7 100644
--- a/sound/voicegroups/voicegroup062.inc
+++ b/sound/voicegroups/voicegroup062.inc
@@ -29,7 +29,7 @@ voicegroup062::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup063.inc b/sound/voicegroups/voicegroup063.inc
index bd316ea2c..966ae2080 100644
--- a/sound/voicegroups/voicegroup063.inc
+++ b/sound/voicegroups/voicegroup063.inc
@@ -83,8 +83,8 @@ voicegroup063::
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup064.inc b/sound/voicegroups/voicegroup064.inc
index e617f0ffd..fa56af03e 100644
--- a/sound/voicegroups/voicegroup064.inc
+++ b/sound/voicegroups/voicegroup064.inc
@@ -82,7 +82,7 @@ voicegroup064::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup065.inc b/sound/voicegroups/voicegroup065.inc
index d435a0a30..163bce0c7 100644
--- a/sound/voicegroups/voicegroup065.inc
+++ b/sound/voicegroups/voicegroup065.inc
@@ -83,11 +83,11 @@ voicegroup065::
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup066.inc b/sound/voicegroups/voicegroup066.inc
index d5bffde63..af4a7f841 100644
--- a/sound/voicegroups/voicegroup066.inc
+++ b/sound/voicegroups/voicegroup066.inc
@@ -82,7 +82,7 @@ voicegroup066::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 3
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup067.inc b/sound/voicegroups/voicegroup067.inc
index dffd21a70..ed8ccef4f 100644
--- a/sound/voicegroups/voicegroup067.inc
+++ b/sound/voicegroups/voicegroup067.inc
@@ -83,8 +83,8 @@ voicegroup067::
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup068.inc b/sound/voicegroups/voicegroup068.inc
index fc3f7246d..787ce997b 100644
--- a/sound/voicegroups/voicegroup068.inc
+++ b/sound/voicegroups/voicegroup068.inc
@@ -83,8 +83,8 @@ voicegroup068::
 	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup069.inc b/sound/voicegroups/voicegroup069.inc
index 477fd538b..26ea29405 100644
--- a/sound/voicegroups/voicegroup069.inc
+++ b/sound/voicegroups/voicegroup069.inc
@@ -83,7 +83,7 @@ voicegroup069::
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup070.inc b/sound/voicegroups/voicegroup070.inc
index aaa407802..59a43180d 100644
--- a/sound/voicegroups/voicegroup070.inc
+++ b/sound/voicegroups/voicegroup070.inc
@@ -83,7 +83,7 @@ voicegroup070::
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup071.inc b/sound/voicegroups/voicegroup071.inc
index c6c7414e3..a4cb9c721 100644
--- a/sound/voicegroups/voicegroup071.inc
+++ b/sound/voicegroups/voicegroup071.inc
@@ -83,7 +83,7 @@ voicegroup071::
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup072.inc b/sound/voicegroups/voicegroup072.inc
index 7c040a3e7..50fa4e4cf 100644
--- a/sound/voicegroups/voicegroup072.inc
+++ b/sound/voicegroups/voicegroup072.inc
@@ -82,8 +82,8 @@ voicegroup072::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup073.inc b/sound/voicegroups/voicegroup073.inc
index 9692cc87d..b10ab81d1 100644
--- a/sound/voicegroups/voicegroup073.inc
+++ b/sound/voicegroups/voicegroup073.inc
@@ -82,7 +82,7 @@ voicegroup073::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup074.inc b/sound/voicegroups/voicegroup074.inc
index 5be06711b..1c3c67f8d 100644
--- a/sound/voicegroups/voicegroup074.inc
+++ b/sound/voicegroups/voicegroup074.inc
@@ -82,12 +82,12 @@ voicegroup074::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup075.inc b/sound/voicegroups/voicegroup075.inc
index 72b144a13..86af71af4 100644
--- a/sound/voicegroups/voicegroup075.inc
+++ b/sound/voicegroups/voicegroup075.inc
@@ -82,10 +82,10 @@ voicegroup075::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup076.inc b/sound/voicegroups/voicegroup076.inc
index a4eadcef3..378a8ff66 100644
--- a/sound/voicegroups/voicegroup076.inc
+++ b/sound/voicegroups/voicegroup076.inc
@@ -82,8 +82,8 @@ voicegroup076::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup077.inc b/sound/voicegroups/voicegroup077.inc
index 08f0e5e38..994d9f411 100644
--- a/sound/voicegroups/voicegroup077.inc
+++ b/sound/voicegroups/voicegroup077.inc
@@ -82,7 +82,7 @@ voicegroup077::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup078.inc b/sound/voicegroups/voicegroup078.inc
index b6dba9dca..e3ef10feb 100644
--- a/sound/voicegroups/voicegroup078.inc
+++ b/sound/voicegroups/voicegroup078.inc
@@ -82,7 +82,7 @@ voicegroup078::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup079.inc b/sound/voicegroups/voicegroup079.inc
index ecea4eca1..42b51faea 100644
--- a/sound/voicegroups/voicegroup079.inc
+++ b/sound/voicegroups/voicegroup079.inc
@@ -39,7 +39,7 @@ voicegroup079::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 6, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -82,9 +82,9 @@ voicegroup079::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 5
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 4, 4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2
diff --git a/sound/voicegroups/voicegroup080.inc b/sound/voicegroups/voicegroup080.inc
index a6827083c..6d627ad92 100644
--- a/sound/voicegroups/voicegroup080.inc
+++ b/sound/voicegroups/voicegroup080.inc
@@ -82,7 +82,7 @@ voicegroup080::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup082.inc b/sound/voicegroups/voicegroup082.inc
index 9aa1d7c5b..b6b5506f1 100644
--- a/sound/voicegroups/voicegroup082.inc
+++ b/sound/voicegroups/voicegroup082.inc
@@ -82,8 +82,8 @@ voicegroup082::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 4, 4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup083.inc b/sound/voicegroups/voicegroup083.inc
index 09cee33e1..4f2fcd809 100644
--- a/sound/voicegroups/voicegroup083.inc
+++ b/sound/voicegroups/voicegroup083.inc
@@ -82,6 +82,6 @@ voicegroup083::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 6, 4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 6, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup084.inc b/sound/voicegroups/voicegroup084.inc
index ee994d84d..510b37c23 100644
--- a/sound/voicegroups/voicegroup084.inc
+++ b/sound/voicegroups/voicegroup084.inc
@@ -87,7 +87,7 @@ voicegroup084::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup085.inc b/sound/voicegroups/voicegroup085.inc
index bd2cc348f..6260fb198 100644
--- a/sound/voicegroups/voicegroup085.inc
+++ b/sound/voicegroups/voicegroup085.inc
@@ -83,8 +83,8 @@ voicegroup085::
 	voice_square_1_alt 60, 0, 0, 2, 1, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 13, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 13, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup086.inc b/sound/voicegroups/voicegroup086.inc
index 482a7729e..d5298f9b0 100644
--- a/sound/voicegroups/voicegroup086.inc
+++ b/sound/voicegroups/voicegroup086.inc
@@ -83,7 +83,7 @@ voicegroup086::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup087.inc b/sound/voicegroups/voicegroup087.inc
index d9295b3fe..1ccb69ea5 100644
--- a/sound/voicegroups/voicegroup087.inc
+++ b/sound/voicegroups/voicegroup087.inc
@@ -29,7 +29,7 @@ voicegroup087::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -83,7 +83,7 @@ voicegroup087::
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup088.inc b/sound/voicegroups/voicegroup088.inc
index 82afd10f6..8f6f21688 100644
--- a/sound/voicegroups/voicegroup088.inc
+++ b/sound/voicegroups/voicegroup088.inc
@@ -6,7 +6,7 @@ voicegroup088::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -82,12 +82,12 @@ voicegroup088::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 6, 2
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup089.inc b/sound/voicegroups/voicegroup089.inc
index 7d71119ba..4b5e7d57b 100644
--- a/sound/voicegroups/voicegroup089.inc
+++ b/sound/voicegroups/voicegroup089.inc
@@ -82,9 +82,9 @@ voicegroup089::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 3
 	voice_square_2_alt 60, 0, 2, 0, 2, 4, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup090.inc b/sound/voicegroups/voicegroup090.inc
index f66d09b65..4039ad8d1 100644
--- a/sound/voicegroups/voicegroup090.inc
+++ b/sound/voicegroups/voicegroup090.inc
@@ -82,7 +82,7 @@ voicegroup090::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 2, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup091.inc b/sound/voicegroups/voicegroup091.inc
index df866235e..28a64ab48 100644
--- a/sound/voicegroups/voicegroup091.inc
+++ b/sound/voicegroups/voicegroup091.inc
@@ -82,8 +82,8 @@ voicegroup091::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 5, 2
 	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 2, 6, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup092.inc b/sound/voicegroups/voicegroup092.inc
index 9b91a44aa..90e285817 100644
--- a/sound/voicegroups/voicegroup092.inc
+++ b/sound/voicegroups/voicegroup092.inc
@@ -82,7 +82,7 @@ voicegroup092::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup093.inc b/sound/voicegroups/voicegroup093.inc
index 44149b083..8cea35733 100644
--- a/sound/voicegroups/voicegroup093.inc
+++ b/sound/voicegroups/voicegroup093.inc
@@ -82,7 +82,7 @@ voicegroup093::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup094.inc b/sound/voicegroups/voicegroup094.inc
index 21cab6cd2..b52e95892 100644
--- a/sound/voicegroups/voicegroup094.inc
+++ b/sound/voicegroups/voicegroup094.inc
@@ -82,7 +82,7 @@ voicegroup094::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup095.inc b/sound/voicegroups/voicegroup095.inc
index 0c791dc9e..96b531f8e 100644
--- a/sound/voicegroups/voicegroup095.inc
+++ b/sound/voicegroups/voicegroup095.inc
@@ -82,7 +82,7 @@ voicegroup095::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 3
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup096.inc b/sound/voicegroups/voicegroup096.inc
index 8fe0892e6..b0cb653ca 100644
--- a/sound/voicegroups/voicegroup096.inc
+++ b/sound/voicegroups/voicegroup096.inc
@@ -84,7 +84,7 @@ voicegroup096::
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup097.inc b/sound/voicegroups/voicegroup097.inc
index e18409347..fb0542dac 100644
--- a/sound/voicegroups/voicegroup097.inc
+++ b/sound/voicegroups/voicegroup097.inc
@@ -82,7 +82,7 @@ voicegroup097::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup098.inc b/sound/voicegroups/voicegroup098.inc
index 001bd5222..3a927368b 100644
--- a/sound/voicegroups/voicegroup098.inc
+++ b/sound/voicegroups/voicegroup098.inc
@@ -82,7 +82,7 @@ voicegroup098::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -125,7 +125,7 @@ voicegroup098::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_10, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
 	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup099.inc b/sound/voicegroups/voicegroup099.inc
index f4031beeb..e750f9583 100644
--- a/sound/voicegroups/voicegroup099.inc
+++ b/sound/voicegroups/voicegroup099.inc
@@ -82,7 +82,7 @@ voicegroup099::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 7, 0
 	voice_square_1_alt 60, 0, 0, 1, 2, 1, 5, 0
 	voice_square_2_alt 60, 0, 1, 2, 1, 5, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup100.inc b/sound/voicegroups/voicegroup100.inc
index fa936e959..577d05c35 100644
--- a/sound/voicegroups/voicegroup100.inc
+++ b/sound/voicegroups/voicegroup100.inc
@@ -29,7 +29,7 @@ voicegroup100::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -85,7 +85,7 @@ voicegroup100::
 	voice_square_2_alt 60, 0, 2, 1, 1, 4, 1
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup101.inc b/sound/voicegroups/voicegroup101.inc
index 5527ec796..768c18dea 100644
--- a/sound/voicegroups/voicegroup101.inc
+++ b/sound/voicegroups/voicegroup101.inc
@@ -6,7 +6,7 @@ voicegroup101::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 1, 5, 2, 4
 	voice_square_2_alt 60, 0, 1, 1, 5, 2, 4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -74,7 +74,7 @@ voicegroup101::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -82,12 +82,12 @@ voicegroup101::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 1, 1, 6, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 4, 6, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 1, 4, 6, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup103.inc b/sound/voicegroups/voicegroup103.inc
index e60c3c1aa..cc743edb2 100644
--- a/sound/voicegroups/voicegroup103.inc
+++ b/sound/voicegroups/voicegroup103.inc
@@ -83,8 +83,8 @@ voicegroup103::
 	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 0, 10, 1
@@ -92,7 +92,7 @@ voicegroup103::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup104.inc b/sound/voicegroups/voicegroup104.inc
index 9ca1a8848..c1b623918 100644
--- a/sound/voicegroups/voicegroup104.inc
+++ b/sound/voicegroups/voicegroup104.inc
@@ -83,8 +83,8 @@ voicegroup104::
 	voice_square_1_alt 60, 0, 0, 1, 2, 0, 12, 5
 	voice_square_2_alt 60, 0, 0, 0, 0, 10, 4
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 2, 0, 12, 5
@@ -92,7 +92,7 @@ voicegroup104::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup105.inc b/sound/voicegroups/voicegroup105.inc
index c3bfdec9a..a1a1bc2d6 100644
--- a/sound/voicegroups/voicegroup105.inc
+++ b/sound/voicegroups/voicegroup105.inc
@@ -82,5 +82,5 @@ voicegroup105::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 4
 	voice_square_2_alt 60, 0, 2, 0, 2, 9, 4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup106.inc b/sound/voicegroups/voicegroup106.inc
index 834b9a8a2..1a1125be8 100644
--- a/sound/voicegroups/voicegroup106.inc
+++ b/sound/voicegroups/voicegroup106.inc
@@ -6,7 +6,7 @@ voicegroup106::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -74,7 +74,7 @@ voicegroup106::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -84,10 +84,10 @@ voicegroup106::
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup107.inc b/sound/voicegroups/voicegroup107.inc
index e2945809e..c43a518ec 100644
--- a/sound/voicegroups/voicegroup107.inc
+++ b/sound/voicegroups/voicegroup107.inc
@@ -6,7 +6,7 @@ voicegroup107::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -74,7 +74,7 @@ voicegroup107::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -84,10 +84,10 @@ voicegroup107::
 	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup108.inc b/sound/voicegroups/voicegroup108.inc
index b53907010..a92ee43c6 100644
--- a/sound/voicegroups/voicegroup108.inc
+++ b/sound/voicegroups/voicegroup108.inc
@@ -84,15 +84,15 @@ voicegroup108::
 	voice_square_2_alt 60, 0, 0, 0, 0, 9, 2
 	voice_square_2_alt 60, 0, 1, 0, 0, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup109.inc b/sound/voicegroups/voicegroup109.inc
index 52942e9ec..a99914373 100644
--- a/sound/voicegroups/voicegroup109.inc
+++ b/sound/voicegroups/voicegroup109.inc
@@ -82,5 +82,5 @@ voicegroup109::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 0, 13, 1
 	voice_square_2_alt 60, 0, 0, 0, 0, 12, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup110.inc b/sound/voicegroups/voicegroup110.inc
index a13facb2c..25b6fdaae 100644
--- a/sound/voicegroups/voicegroup110.inc
+++ b/sound/voicegroups/voicegroup110.inc
@@ -83,8 +83,8 @@ voicegroup110::
 	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 0, 10, 1
@@ -92,7 +92,7 @@ voicegroup110::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup111.inc b/sound/voicegroups/voicegroup111.inc
index 546ed3a46..27b418f46 100644
--- a/sound/voicegroups/voicegroup111.inc
+++ b/sound/voicegroups/voicegroup111.inc
@@ -83,8 +83,8 @@ voicegroup111::
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
@@ -92,7 +92,7 @@ voicegroup111::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup112.inc b/sound/voicegroups/voicegroup112.inc
index ad1c4a1b7..9cb2f415a 100644
--- a/sound/voicegroups/voicegroup112.inc
+++ b/sound/voicegroups/voicegroup112.inc
@@ -4,7 +4,7 @@ voicegroup112::
 	voice_keysplit voicegroup005, KeySplitTable1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_21, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup113.inc b/sound/voicegroups/voicegroup113.inc
index cfe06aa97..0fa279c8a 100644
--- a/sound/voicegroups/voicegroup113.inc
+++ b/sound/voicegroups/voicegroup113.inc
@@ -1,16 +1,16 @@
 	.align 2
 voicegroup113::
 	voice_keysplit_all voicegroup002
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4990, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49B0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49A0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4980, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48B0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48C0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48D0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48E0, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48F0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_23, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_25, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_24, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_21, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_22, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_9, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_10, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_11, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_12, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_13, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -39,7 +39,7 @@ voicegroup113::
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -87,7 +87,7 @@ voicegroup113::
 	voice_square_2_alt 60, 0, 3, 0, 7, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup115.inc b/sound/voicegroups/voicegroup115.inc
index afdfebaf7..eb4f52b87 100644
--- a/sound/voicegroups/voicegroup115.inc
+++ b/sound/voicegroups/voicegroup115.inc
@@ -87,9 +87,9 @@ voicegroup115::
 	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
 	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_21, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 1, 9, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
diff --git a/sound/voicegroups/voicegroup116.inc b/sound/voicegroups/voicegroup116.inc
index c5b16797a..a86a87f5d 100644
--- a/sound/voicegroups/voicegroup116.inc
+++ b/sound/voicegroups/voicegroup116.inc
@@ -82,12 +82,12 @@ voicegroup116::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
 	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 3, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_21, 0, 3, 6, 5
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_21, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup117.inc b/sound/voicegroups/voicegroup117.inc
index da6a16d7a..3a86ec4f5 100644
--- a/sound/voicegroups/voicegroup117.inc
+++ b/sound/voicegroups/voicegroup117.inc
@@ -81,5 +81,5 @@ voicegroup117::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup118.inc b/sound/voicegroups/voicegroup118.inc
index 129831d75..89e66b21d 100644
--- a/sound/voicegroups/voicegroup118.inc
+++ b/sound/voicegroups/voicegroup118.inc
@@ -81,10 +81,10 @@ voicegroup118::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup119.inc b/sound/voicegroups/voicegroup119.inc
index 063ed24b9..8b7fe24c7 100644
--- a/sound/voicegroups/voicegroup119.inc
+++ b/sound/voicegroups/voicegroup119.inc
@@ -81,7 +81,7 @@ voicegroup119::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_2 60, 0, 1, 0, 1, 9, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -90,5 +90,5 @@ voicegroup119::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup120.inc b/sound/voicegroups/voicegroup120.inc
index f80380fc4..2c104fb10 100644
--- a/sound/voicegroups/voicegroup120.inc
+++ b/sound/voicegroups/voicegroup120.inc
@@ -81,7 +81,7 @@ voicegroup120::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 7, 1
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
@@ -90,5 +90,5 @@ voicegroup120::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup121.inc b/sound/voicegroups/voicegroup121.inc
index 2c9e9fa3e..f09ddd774 100644
--- a/sound/voicegroups/voicegroup121.inc
+++ b/sound/voicegroups/voicegroup121.inc
@@ -81,7 +81,7 @@ voicegroup121::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
 	voice_square_2 60, 0, 0, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 0, 0, 1, 7, 1
diff --git a/sound/voicegroups/voicegroup122.inc b/sound/voicegroups/voicegroup122.inc
index ca64a7c00..65356a3d1 100644
--- a/sound/voicegroups/voicegroup122.inc
+++ b/sound/voicegroups/voicegroup122.inc
@@ -81,7 +81,7 @@ voicegroup122::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 0, 1, 9, 1
 	voice_square_1 60, 0, 0, 3, 0, 0, 9, 1
 
diff --git a/sound/voicegroups/voicegroup124.inc b/sound/voicegroups/voicegroup124.inc
index 6f5d263b3..274d76dcd 100644
--- a/sound/voicegroups/voicegroup124.inc
+++ b/sound/voicegroups/voicegroup124.inc
@@ -81,7 +81,7 @@ voicegroup124::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 2, 0, 1, 7, 1
diff --git a/sound/voicegroups/voicegroup125.inc b/sound/voicegroups/voicegroup125.inc
index afe16b0b0..644002abf 100644
--- a/sound/voicegroups/voicegroup125.inc
+++ b/sound/voicegroups/voicegroup125.inc
@@ -81,7 +81,7 @@ voicegroup125::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup126.inc b/sound/voicegroups/voicegroup126.inc
index a2e663cf1..51959b4f1 100644
--- a/sound/voicegroups/voicegroup126.inc
+++ b/sound/voicegroups/voicegroup126.inc
@@ -81,7 +81,7 @@ voicegroup126::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2 60, 0, 3, 1, 1, 6, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 3, 1, 1, 6, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup128.inc b/sound/voicegroups/voicegroup128.inc
index ce4904626..69b52d29d 100644
--- a/sound/voicegroups/voicegroup128.inc
+++ b/sound/voicegroups/voicegroup128.inc
@@ -8,17 +8,17 @@ voicegroup128::
 	voice_noise_alt 60, 0, 1, 0, 1, 0, 1
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_1, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_2, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 1, 0, 2, 0, 0
 	voice_square_1 60, 0, 103, 3, 2, 7, 0, 0
 	voice_square_2 60, 0, 3, 2, 7, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127
-	voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_3, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
-	voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_4, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
 	voice_square_1 60, 0, 103, 0, 0, 7, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127
@@ -26,22 +26,22 @@ voicegroup128::
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 0, 0, 7, 15, 1
-	voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_5, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 1, 0, 7, 15, 1
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127
-	voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
 	voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127
 	voice_square_1 60, 0, 103, 0, 0, 0, 15, 0
-	voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_directsound_alt 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_7, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0
-	voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_8, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
 	voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188
-	voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_9, 255, 249, 0, 165
 	voice_square_1 60, 0, 0, 0, 4, 6, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127
@@ -60,10 +60,10 @@ voicegroup128::
 	voice_noise_alt 60, 0, 0, 1, 6, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_10, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127
 	voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0
-	voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_11, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165
 	voice_noise_alt 60, 0, 0, 5, 7, 15, 1
@@ -122,10 +122,10 @@ voicegroup128::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_87424B0, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_87430C0, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8743C50, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_87446EC, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8745034, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8745A7C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_12, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_13, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_14, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_15, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_16, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_17, 255, 0, 255, 165
 
diff --git a/sound/voicegroups/voicegroup129.inc b/sound/voicegroups/voicegroup129.inc
index ad94d1f70..8e136bdf4 100644
--- a/sound/voicegroups/voicegroup129.inc
+++ b/sound/voicegroups/voicegroup129.inc
@@ -5,11 +5,11 @@ voicegroup129::
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_1, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
 	voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249
 	voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_18, 255, 0, 206, 204
 	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38
 	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup130.inc b/sound/voicegroups/voicegroup130.inc
index 6f06938aa..7044bb38e 100644
--- a/sound/voicegroups/voicegroup130.inc
+++ b/sound/voicegroups/voicegroup130.inc
@@ -1,56 +1,56 @@
 	.align 2
 voicegroup130::
-	voice_directsound 60, 0, DirectSoundWaveData_88DBBC0, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DC220, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DC704, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DD054, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DDAC4, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DDDE4, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DEA6C, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DF08C, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88DF414, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E01F8, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E0B68, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E0F04, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E16B8, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E2414, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E2658, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E3498, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E3DEC, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E4140, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E4774, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E53E0, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E5978, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E647C, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E6A80, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E6C78, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E75DC, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E8568, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E8BA0, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88E9674, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EA5B8, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EAB30, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EB97C, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EC884, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88ED358, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EDEEC, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EE8C4, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EEF04, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88EF9E4, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F0020, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F0738, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F1074, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F1830, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F1D94, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F2B08, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F2F84, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F3470, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F3C38, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F4834, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F4BAC, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F5368, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F5FCC, 255, 0, 255, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88F6498, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_1, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_2, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_3, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_4, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_5, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_6, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_7, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_9, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_10, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_11, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_12, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_13, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_14, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_15, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_16, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_17, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_18, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_19, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_20, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_21, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_22, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_23, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_24, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_25, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_26, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_27, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_28, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_29, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_30, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_31, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_32, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_33, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_34, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_35, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_36, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_37, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_38, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_39, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_40, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_41, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_42, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_43, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_44, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_45, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_46, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_47, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_48, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_49, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_50, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_Phoneme_51, 255, 0, 255, 0
 	voice_keysplit_all voicegroup001
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup131.inc b/sound/voicegroups/voicegroup131.inc
index e0e8c6cee..029afa5be 100644
--- a/sound/voicegroups/voicegroup131.inc
+++ b/sound/voicegroups/voicegroup131.inc
@@ -92,7 +92,7 @@ voicegroup131::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 9, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 9, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup132.inc b/sound/voicegroups/voicegroup132.inc
index 2e7dbc825..2806916bc 100644
--- a/sound/voicegroups/voicegroup132.inc
+++ b/sound/voicegroups/voicegroup132.inc
@@ -82,9 +82,9 @@ voicegroup132::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 5
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 4, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 4, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2
@@ -92,7 +92,7 @@ voicegroup132::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 2, 9, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup133.inc b/sound/voicegroups/voicegroup133.inc
index 23bfa9249..be70f6ae3 100644
--- a/sound/voicegroups/voicegroup133.inc
+++ b/sound/voicegroups/voicegroup133.inc
@@ -87,12 +87,12 @@ voicegroup133::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup134.inc b/sound/voicegroups/voicegroup134.inc
index 2266c55de..1bc01fed0 100644
--- a/sound/voicegroups/voicegroup134.inc
+++ b/sound/voicegroups/voicegroup134.inc
@@ -87,7 +87,7 @@ voicegroup134::
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup136.inc b/sound/voicegroups/voicegroup136.inc
index 672c9435c..0428c8c00 100644
--- a/sound/voicegroups/voicegroup136.inc
+++ b/sound/voicegroups/voicegroup136.inc
@@ -86,8 +86,8 @@ voicegroup136::
 	voice_square_2_alt 60, 0, 0, 0, 5, 0, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0
 	voice_square_2_alt 60, 0, 3, 2, 4, 10, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 1, 5, 0, 3
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 5, 0, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 1, 5, 0, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 1, 5, 0, 3
 	voice_square_2_alt 60, 0, 1, 0, 1, 10, 2
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup137.inc b/sound/voicegroups/voicegroup137.inc
index 494b82d37..cf7422cd2 100644
--- a/sound/voicegroups/voicegroup137.inc
+++ b/sound/voicegroups/voicegroup137.inc
@@ -87,8 +87,8 @@ voicegroup137::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 2, 4, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 2, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 2, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 2, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup138.inc b/sound/voicegroups/voicegroup138.inc
index 599dd92ff..227538f5d 100644
--- a/sound/voicegroups/voicegroup138.inc
+++ b/sound/voicegroups/voicegroup138.inc
@@ -92,7 +92,7 @@ voicegroup138::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup139.inc b/sound/voicegroups/voicegroup139.inc
index 32250fd92..e8969de57 100644
--- a/sound/voicegroups/voicegroup139.inc
+++ b/sound/voicegroups/voicegroup139.inc
@@ -92,7 +92,7 @@ voicegroup139::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup140.inc b/sound/voicegroups/voicegroup140.inc
index a12a9f30a..8206cca1d 100644
--- a/sound/voicegroups/voicegroup140.inc
+++ b/sound/voicegroups/voicegroup140.inc
@@ -3,5 +3,5 @@ voicegroup140::
 	voice_keysplit_all voicegroup001
 	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup141.inc b/sound/voicegroups/voicegroup141.inc
index 6373309ed..1e556a21b 100644
--- a/sound/voicegroups/voicegroup141.inc
+++ b/sound/voicegroups/voicegroup141.inc
@@ -83,9 +83,9 @@ voicegroup141::
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
 	voice_square_2_alt 60, 0, 3, 0, 2, 7, 3
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 1, 7, 0, 6
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 2, 9, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 2, 9, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup142.inc b/sound/voicegroups/voicegroup142.inc
index 3764a327f..af5b809bf 100644
--- a/sound/voicegroups/voicegroup142.inc
+++ b/sound/voicegroups/voicegroup142.inc
@@ -83,5 +83,5 @@ voicegroup142::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4
 	voice_square_2_alt 60, 0, 2, 0, 2, 5, 5
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_14, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup143.inc b/sound/voicegroups/voicegroup143.inc
index 346c644d8..9cb286ac1 100644
--- a/sound/voicegroups/voicegroup143.inc
+++ b/sound/voicegroups/voicegroup143.inc
@@ -83,7 +83,7 @@ voicegroup143::
 	voice_square_2_alt 60, 0, 3, 0, 2, 3, 2
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup144.inc b/sound/voicegroups/voicegroup144.inc
index 60bd142ad..87830a387 100644
--- a/sound/voicegroups/voicegroup144.inc
+++ b/sound/voicegroups/voicegroup144.inc
@@ -83,7 +83,7 @@ voicegroup144::
 	voice_square_2_alt 60, 0, 3, 0, 2, 4, 2
 	voice_square_2_alt 60, 0, 1, 0, 2, 4, 3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup145.inc b/sound/voicegroups/voicegroup145.inc
index 374987162..96cda70e4 100644
--- a/sound/voicegroups/voicegroup145.inc
+++ b/sound/voicegroups/voicegroup145.inc
@@ -92,7 +92,7 @@ voicegroup145::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup146.inc b/sound/voicegroups/voicegroup146.inc
index fcbfedcfe..b0f1b92d6 100644
--- a/sound/voicegroups/voicegroup146.inc
+++ b/sound/voicegroups/voicegroup146.inc
@@ -92,7 +92,7 @@ voicegroup146::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup147.inc b/sound/voicegroups/voicegroup147.inc
index de4c5a02f..476781582 100644
--- a/sound/voicegroups/voicegroup147.inc
+++ b/sound/voicegroups/voicegroup147.inc
@@ -83,5 +83,5 @@ voicegroup147::
 	voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1
 	voice_square_2_alt 60, 0, 2, 0, 0, 6, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 4, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 2, 4, 2
 
diff --git a/sound/voicegroups/voicegroup148.inc b/sound/voicegroups/voicegroup148.inc
index ba25340f0..4fc324df8 100644
--- a/sound/voicegroups/voicegroup148.inc
+++ b/sound/voicegroups/voicegroup148.inc
@@ -87,7 +87,7 @@ voicegroup148::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup149.inc b/sound/voicegroups/voicegroup149.inc
index 50c47bc35..c0239fef9 100644
--- a/sound/voicegroups/voicegroup149.inc
+++ b/sound/voicegroups/voicegroup149.inc
@@ -87,10 +87,10 @@ voicegroup149::
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup150.inc b/sound/voicegroups/voicegroup150.inc
index 97de70ac6..c51150d78 100644
--- a/sound/voicegroups/voicegroup150.inc
+++ b/sound/voicegroups/voicegroup150.inc
@@ -83,7 +83,7 @@ voicegroup150::
 	voice_square_2_alt 60, 0, 1, 0, 1, 4, 6
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup151.inc b/sound/voicegroups/voicegroup151.inc
index c7e150baf..29571169d 100644
--- a/sound/voicegroups/voicegroup151.inc
+++ b/sound/voicegroups/voicegroup151.inc
@@ -87,5 +87,5 @@ voicegroup151::
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup152.inc b/sound/voicegroups/voicegroup152.inc
index 19340b82c..06ccc3ae9 100644
--- a/sound/voicegroups/voicegroup152.inc
+++ b/sound/voicegroups/voicegroup152.inc
@@ -82,9 +82,9 @@ voicegroup152::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1
 	voice_square_2_alt 60, 0, 3, 0, 1, 5, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 4, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 4, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1
@@ -92,7 +92,7 @@ voicegroup152::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 2, 9, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup153.inc b/sound/voicegroups/voicegroup153.inc
index 4284b8991..7206c7ba3 100644
--- a/sound/voicegroups/voicegroup153.inc
+++ b/sound/voicegroups/voicegroup153.inc
@@ -92,7 +92,7 @@ voicegroup153::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48A0, 0, 1, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_8, 0, 1, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup154.inc b/sound/voicegroups/voicegroup154.inc
index e38e7a448..ce70e65d5 100644
--- a/sound/voicegroups/voicegroup154.inc
+++ b/sound/voicegroups/voicegroup154.inc
@@ -87,10 +87,10 @@ voicegroup154::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_4, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 0, 12, 0
 
diff --git a/sound/voicegroups/voicegroup155.inc b/sound/voicegroups/voicegroup155.inc
index 87cd50498..8150754aa 100644
--- a/sound/voicegroups/voicegroup155.inc
+++ b/sound/voicegroups/voicegroup155.inc
@@ -83,13 +83,13 @@ voicegroup155::
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
 	voice_square_2_alt 60, 0, 3, 0, 3, 6, 2
 	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 3, 6, 5
 	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_3, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 1, 9, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
diff --git a/sound/voicegroups/voicegroup156.inc b/sound/voicegroups/voicegroup156.inc
index 76291c1e6..374464fff 100644
--- a/sound/voicegroups/voicegroup156.inc
+++ b/sound/voicegroups/voicegroup156.inc
@@ -3,7 +3,7 @@ voicegroup156::
 	voice_keysplit_all voicegroup002
 	voice_keysplit voicegroup005, KeySplitTable1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup157.inc b/sound/voicegroups/voicegroup157.inc
index 66cd6ff1c..7dd93abd0 100644
--- a/sound/voicegroups/voicegroup157.inc
+++ b/sound/voicegroups/voicegroup157.inc
@@ -82,12 +82,12 @@ voicegroup157::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
 	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 3, 6, 5
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup158.inc b/sound/voicegroups/voicegroup158.inc
index 6a8ca184b..50fa56606 100644
--- a/sound/voicegroups/voicegroup158.inc
+++ b/sound/voicegroups/voicegroup158.inc
@@ -84,15 +84,15 @@ voicegroup158::
 	voice_square_2_alt 60, 0, 3, 0, 1, 10, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup159.inc b/sound/voicegroups/voicegroup159.inc
index 7ee1e3a56..f1d204656 100644
--- a/sound/voicegroups/voicegroup159.inc
+++ b/sound/voicegroups/voicegroup159.inc
@@ -82,7 +82,7 @@ voicegroup159::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6
 	voice_square_2_alt 60, 0, 1, 1, 5, 1, 6
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 1, 7, 0, 6
 	voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup160.inc b/sound/voicegroups/voicegroup160.inc
index faff81095..160d0cad8 100644
--- a/sound/voicegroups/voicegroup160.inc
+++ b/sound/voicegroups/voicegroup160.inc
@@ -87,5 +87,5 @@ voicegroup160::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup161.inc b/sound/voicegroups/voicegroup161.inc
index 71374e1a0..c334fa264 100644
--- a/sound/voicegroups/voicegroup161.inc
+++ b/sound/voicegroups/voicegroup161.inc
@@ -87,7 +87,7 @@ voicegroup161::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup162.inc b/sound/voicegroups/voicegroup162.inc
index 53edb3b0e..3a532b23e 100644
--- a/sound/voicegroups/voicegroup162.inc
+++ b/sound/voicegroups/voicegroup162.inc
@@ -92,5 +92,5 @@ voicegroup162::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup163.inc b/sound/voicegroups/voicegroup163.inc
index 86ff86ef9..cd7c6ebef 100644
--- a/sound/voicegroups/voicegroup163.inc
+++ b/sound/voicegroups/voicegroup163.inc
@@ -58,7 +58,7 @@ voicegroup163::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_keysplit voicegroup007, KeySplitTable3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_18, 255, 0, 206, 204
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -92,7 +92,7 @@ voicegroup163::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_14, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup164.inc b/sound/voicegroups/voicegroup164.inc
index fe48fbfb9..d64cfd33a 100644
--- a/sound/voicegroups/voicegroup164.inc
+++ b/sound/voicegroups/voicegroup164.inc
@@ -82,7 +82,7 @@ voicegroup164::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 2
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -92,7 +92,7 @@ voicegroup164::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup165.inc b/sound/voicegroups/voicegroup165.inc
index e633e5671..c3262766c 100644
--- a/sound/voicegroups/voicegroup165.inc
+++ b/sound/voicegroups/voicegroup165.inc
@@ -92,7 +92,7 @@ voicegroup165::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup166.inc b/sound/voicegroups/voicegroup166.inc
index e4ac4a28e..edd94624c 100644
--- a/sound/voicegroups/voicegroup166.inc
+++ b/sound/voicegroups/voicegroup166.inc
@@ -87,12 +87,12 @@ voicegroup166::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup167.inc b/sound/voicegroups/voicegroup167.inc
index 307379eb9..0213b7aec 100644
--- a/sound/voicegroups/voicegroup167.inc
+++ b/sound/voicegroups/voicegroup167.inc
@@ -84,7 +84,7 @@ voicegroup167::
 	voice_square_2_alt 60, 0, 3, 0, 2, 8, 3
 	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 0, 6, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup168.inc b/sound/voicegroups/voicegroup168.inc
index 05dbf3954..ea6b59d2e 100644
--- a/sound/voicegroups/voicegroup168.inc
+++ b/sound/voicegroups/voicegroup168.inc
@@ -92,7 +92,7 @@ voicegroup168::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_14, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup169.inc b/sound/voicegroups/voicegroup169.inc
index 220425ff0..77ee6ffee 100644
--- a/sound/voicegroups/voicegroup169.inc
+++ b/sound/voicegroups/voicegroup169.inc
@@ -75,7 +75,7 @@ voicegroup169::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup170.inc b/sound/voicegroups/voicegroup170.inc
index 68c29a6c9..43c8ae6df 100644
--- a/sound/voicegroups/voicegroup170.inc
+++ b/sound/voicegroups/voicegroup170.inc
@@ -81,7 +81,7 @@ voicegroup170::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
 	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup171.inc b/sound/voicegroups/voicegroup171.inc
index 76eee5f8a..f4ae315ce 100644
--- a/sound/voicegroups/voicegroup171.inc
+++ b/sound/voicegroups/voicegroup171.inc
@@ -81,7 +81,7 @@ voicegroup171::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 1
 	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
 	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
 	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
@@ -89,6 +89,6 @@ voicegroup171::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
 	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_6, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_7, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup172.inc b/sound/voicegroups/voicegroup172.inc
index 3e04a358c..ffd981c83 100644
--- a/sound/voicegroups/voicegroup172.inc
+++ b/sound/voicegroups/voicegroup172.inc
@@ -92,7 +92,7 @@ voicegroup172::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_14, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup173.inc b/sound/voicegroups/voicegroup173.inc
index ee4a2c866..46979c625 100644
--- a/sound/voicegroups/voicegroup173.inc
+++ b/sound/voicegroups/voicegroup173.inc
@@ -92,7 +92,7 @@ voicegroup173::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup174.inc b/sound/voicegroups/voicegroup174.inc
index 82be8ccf9..ab7d43fc7 100644
--- a/sound/voicegroups/voicegroup174.inc
+++ b/sound/voicegroups/voicegroup174.inc
@@ -92,7 +92,7 @@ voicegroup174::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_2, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -131,7 +131,7 @@ voicegroup174::
 	voice_keysplit_all voicegroup177
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 9, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
@@ -156,5 +156,5 @@ voicegroup174::
 	voice_keysplit_all voicegroup002
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup176.inc b/sound/voicegroups/voicegroup176.inc
index 9743d50e2..ee3c97e49 100644
--- a/sound/voicegroups/voicegroup176.inc
+++ b/sound/voicegroups/voicegroup176.inc
@@ -35,7 +35,7 @@ voicegroup176::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup178.inc b/sound/voicegroups/voicegroup178.inc
index 1dc6971d7..026d7bb3d 100644
--- a/sound/voicegroups/voicegroup178.inc
+++ b/sound/voicegroups/voicegroup178.inc
@@ -87,5 +87,5 @@ voicegroup178::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 0, 15, 1
 
diff --git a/sound/voicegroups/voicegroup179.inc b/sound/voicegroups/voicegroup179.inc
index b7df91e68..e69cace5b 100644
--- a/sound/voicegroups/voicegroup179.inc
+++ b/sound/voicegroups/voicegroup179.inc
@@ -87,5 +87,5 @@ voicegroup179::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup180.inc b/sound/voicegroups/voicegroup180.inc
index 82e98196d..ea182d38e 100644
--- a/sound/voicegroups/voicegroup180.inc
+++ b/sound/voicegroups/voicegroup180.inc
@@ -92,7 +92,7 @@ voicegroup180::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup182.inc b/sound/voicegroups/voicegroup182.inc
index 1fb444fec..ec3955495 100644
--- a/sound/voicegroups/voicegroup182.inc
+++ b/sound/voicegroups/voicegroup182.inc
@@ -87,5 +87,5 @@ voicegroup182::
 	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup183.inc b/sound/voicegroups/voicegroup183.inc
index 92b953fc4..ff49e3763 100644
--- a/sound/voicegroups/voicegroup183.inc
+++ b/sound/voicegroups/voicegroup183.inc
@@ -83,7 +83,7 @@ voicegroup183::
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
 	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup184.inc b/sound/voicegroups/voicegroup184.inc
index e0d1c958d..86f392e65 100644
--- a/sound/voicegroups/voicegroup184.inc
+++ b/sound/voicegroups/voicegroup184.inc
@@ -3,7 +3,7 @@ voicegroup184::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup185.inc b/sound/voicegroups/voicegroup185.inc
index 8417a2407..879a4e888 100644
--- a/sound/voicegroups/voicegroup185.inc
+++ b/sound/voicegroups/voicegroup185.inc
@@ -84,10 +84,10 @@ voicegroup185::
 	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_16, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_15, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_5, 0, 7, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup187.inc b/sound/voicegroups/voicegroup187.inc
index 46c5c1f9d..640912505 100644
--- a/sound/voicegroups/voicegroup187.inc
+++ b/sound/voicegroups/voicegroup187.inc
@@ -92,7 +92,7 @@ voicegroup187::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 0, 12, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup188.inc b/sound/voicegroups/voicegroup188.inc
index c6afe243b..8556bcd4d 100644
--- a/sound/voicegroups/voicegroup188.inc
+++ b/sound/voicegroups/voicegroup188.inc
@@ -92,7 +92,7 @@ voicegroup188::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup190.inc b/sound/voicegroups/voicegroup190.inc
index 6faa27c62..25a84e84e 100644
--- a/sound/voicegroups/voicegroup190.inc
+++ b/sound/voicegroups/voicegroup190.inc
@@ -1,6 +1,6 @@
 	.align 2
 voicegroup190::
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_1, 0, 7, 15, 2
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index 6068b0f33..6b14d3863 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -168,7 +168,7 @@ void SoundTask_PlayCryHighPitch(u8 taskId)
     }
 
     if (species != SPECIES_NONE)
-        PlayCry3(species, pan, 3);
+        PlayCry_ByMode(species, pan, CRY_MODE_HIGH_PITCH);
 
     DestroyAnimVisualTask(taskId);
 }
@@ -219,10 +219,10 @@ void SoundTask_PlayDoubleCry(u8 taskId)
 
     if (species != SPECIES_NONE)
     {
-        if (gBattleAnimArgs[1] == 0xFF)
-            PlayCry3(species, pan, 9);
-        else
-            PlayCry3(species, pan, 7);
+        if (gBattleAnimArgs[1] == DOUBLE_CRY_GROWL)
+            PlayCry_ByMode(species, pan, CRY_MODE_GROWL_1);
+        else // DOUBLE_CRY_ROAR
+            PlayCry_ByMode(species, pan, CRY_MODE_ROAR_1);
 
         gTasks[taskId].func = SoundTask_PlayDoubleCry_Step;
     }
@@ -243,19 +243,19 @@ static void SoundTask_PlayDoubleCry_Step(u8 taskId)
     }
     else
     {
-        if (gTasks[taskId].data[0] == 0xFF)
+        if (gTasks[taskId].data[0] == DOUBLE_CRY_GROWL)
         {
             if (!IsCryPlaying())
             {
-                PlayCry3(species, pan, 10);
+                PlayCry_ByMode(species, pan, CRY_MODE_GROWL_2);
                 DestroyAnimVisualTask(taskId);
             }
         }
-        else
+        else // DOUBLE_CRY_ROAR
         {
             if (!IsCryPlaying())
             {
-                PlayCry3(species, pan, 8);
+                PlayCry_ByMode(species, pan, CRY_MODE_ROAR_2);
                 DestroyAnimVisualTask(taskId);
             }
         }
@@ -275,12 +275,18 @@ void SoundTask_WaitForCry(u8 taskId)
     }
 }
 
+
+#define tSpecies data[1]
+#define tPan     data[2]
+#define tState   data[9]
+#define tLastCry data[10] // If it's not the last cry, don't try to restore the BGM, because another is coming
+
 void SoundTask_PlayCryWithEcho(u8 taskId)
 {
     u16 species;
     s8 pan;
 
-    gTasks[taskId].data[10] = gBattleAnimArgs[0];
+    gTasks[taskId].tLastCry = gBattleAnimArgs[0];
     pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
 
     if (IsContest())
@@ -288,8 +294,8 @@ void SoundTask_PlayCryWithEcho(u8 taskId)
     else
         species = gAnimBattlerSpecies[gBattleAnimAttacker];
 
-    gTasks[taskId].data[1] = species;
-    gTasks[taskId].data[2] = pan;
+    gTasks[taskId].tSpecies = species;
+    gTasks[taskId].tPan = pan;
 
     if (species != SPECIES_NONE)
         gTasks[taskId].func = SoundTask_PlayCryWithEcho_Step;
@@ -299,38 +305,44 @@ void SoundTask_PlayCryWithEcho(u8 taskId)
 
 static void SoundTask_PlayCryWithEcho_Step(u8 taskId)
 {
-    u16 species = gTasks[taskId].data[1];
-    s8 pan = gTasks[taskId].data[2];
+    u16 species = gTasks[taskId].tSpecies;
+    s8 pan = gTasks[taskId].tPan;
 
-    switch (gTasks[taskId].data[9])
+    // Note the cases are not in order of execution
+    switch (gTasks[taskId].tState)
     {
     case 2:
-        PlayCry6(species, pan, 4);
-        gTasks[taskId].data[9]++;
+        PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_START);
+        gTasks[taskId].tState++;
         break;
     case 1:
     case 3:
     case 4:
-        gTasks[taskId].data[9]++;
+        gTasks[taskId].tState++;
         break;
     case 5:
         if (IsCryPlaying())
             break;
     case 0:
         StopCryAndClearCrySongs();
-        gTasks[taskId].data[9]++;
+        gTasks[taskId].tState++;
         break;
     default:
-        if (gTasks[taskId].data[10] == 0)
-            PlayCry6(species, pan, 6);
+        if (!gTasks[taskId].tLastCry)
+            PlayCry_DuckNoRestore(species, pan, CRY_MODE_ECHO_END);
         else
-            PlayCry3(species, pan, 6);
+            PlayCry_ByMode(species, pan, CRY_MODE_ECHO_END);
 
         DestroyAnimVisualTask(taskId);
         break;
     }
 }
 
+#undef tSpecies
+#undef tPan
+#undef tState
+#undef tLastCry
+
 void SoundTask_PlaySE1WithPanning(u8 taskId)
 {
     u16 songId = gBattleAnimArgs[0];
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 1660f6ec1..efc327091 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1681,7 +1681,7 @@ static void LinkOpponentHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, 25, 5);
+    PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
     LinkOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index a9240b0ac..682618c07 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1513,7 +1513,7 @@ static void LinkPartnerHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, -25, 5);
+    PlayCry_ByMode(species, -25, CRY_MODE_FAINT);
     LinkPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index ac330be76..2bea4183b 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1847,7 +1847,7 @@ static void OpponentHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, 25, 5);
+    PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
     OpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index f4e47b434..02dc7ce29 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2926,7 +2926,7 @@ static void PlayerHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, -25, 5);
+    PlayCry_ByMode(species, -25, CRY_MODE_FAINT);
     PlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 91fea6cde..745354795 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1763,7 +1763,7 @@ static void PlayerPartnerHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, -25, 5);
+    PlayCry_ByMode(species, -25, CRY_MODE_FAINT);
     PlayerPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index c6e649508..0af395693 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -1621,7 +1621,7 @@ static void RecordedOpponentHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, 25, 5);
+    PlayCry_ByMode(species, 25, CRY_MODE_FAINT);
     RecordedOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 93d059fe9..264e27344 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -1644,7 +1644,7 @@ static void RecordedPlayerHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry3(species, -25, 5);
+    PlayCry_ByMode(species, -25, CRY_MODE_FAINT);
     RecordedPlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index a26f31b92..78a57a0f7 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -616,7 +616,7 @@ static void SafariHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry1(species, 25);
+    PlayCry_Normal(species, 25);
     SafariBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index d018fe1c0..29e8d2b7d 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -1415,7 +1415,9 @@ static void WallyHandleFaintingCry(void)
 {
     u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
-    PlayCry1(species, 25);
+    // Seems that it doesn't bother using CRY_MODE_FAINT because
+    // Wally's Pokémon during the tutorial is never intended to faint.
+    PlayCry_Normal(species, 25);
     WallyBufferExecCompleted();
 }
 
diff --git a/src/contest_util.c b/src/contest_util.c
index 37a5dedcd..6fd74a68a 100644
--- a/src/contest_util.c
+++ b/src/contest_util.c
@@ -1578,7 +1578,7 @@ static void SpriteCB_WinnerMonSlideIn(struct Sprite *sprite)
     {
         if (++sprite->data[0] == 10)
         {
-            PlayCry1(sprite->data[1], 0);
+            PlayCry_Normal(sprite->data[1], 0);
             sprite->data[1] = 0;
         }
     }
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index e680b56d3..b94678174 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -3056,16 +3056,16 @@ static const u16 sDebug_BerryResults[MAX_RFU_PLAYERS][4] =
 };
 
 static const u8 sJPText_Vowels[] = _("あいうえおかき");
-static const u8 sText_ABCDEFG[] = _("ABCDEFG");
-static const u8 sText_0123456[] = _("0123456");
+static const u8 sText_Letters[] = _("ABCDEFG");
+static const u8 sText_Digits[] = _("0123456");
 
 static const u8 *const sDebug_PlayerNames[] =
 {
     sJPText_Vowels,
     sJPText_Vowels,
     sJPText_Vowels,
-    sText_ABCDEFG,
-    sText_0123456
+    sText_Letters,
+    sText_Digits
 };
 
 static void Debug_UpdateNumPlayers(void)
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 1d583343f..99ff26821 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1094,7 +1094,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
     case T_EVOSTATE_INTRO_CRY:
         if (!IsTextPrinterActive(0))
         {
-            PlayCry1(gTasks[taskId].tPreEvoSpecies, 0);
+            PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0);
             gTasks[taskId].tState++;
         }
         break;
diff --git a/src/field_effect.c b/src/field_effect.c
index 574bec879..3f0ba2455 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2565,15 +2565,17 @@ bool8 FldEff_FieldMoveShowMon(void)
     return FALSE;
 }
 
+#define SHOW_MON_CRY_NO_DUCKING (1 << 31)
+
 bool8 FldEff_FieldMoveShowMonInit(void)
 {
     struct Pokemon *pokemon;
-    u32 flag = gFieldEffectArguments[0] & 0x80000000;
+    bool32 noDucking = gFieldEffectArguments[0] & SHOW_MON_CRY_NO_DUCKING;
     pokemon = &gPlayerParty[(u8)gFieldEffectArguments[0]];
     gFieldEffectArguments[0] = GetMonData(pokemon, MON_DATA_SPECIES);
     gFieldEffectArguments[1] = GetMonData(pokemon, MON_DATA_OT_ID);
     gFieldEffectArguments[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
-    gFieldEffectArguments[0] |= flag;
+    gFieldEffectArguments[0] |= noDucking;
     FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON);
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     return FALSE;
@@ -2913,17 +2915,17 @@ static bool8 SlideIndoorBannerOffscreen(struct Task *task)
 
 static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality)
 {
-    u16 v0;
+    bool16 noDucking;
     u8 monSprite;
     struct Sprite *sprite;
-    v0 = (species & 0x80000000) >> 16;
-    species &= 0x7fffffff;
+    noDucking = (species & SHOW_MON_CRY_NO_DUCKING) >> 16;
+    species &= ~SHOW_MON_CRY_NO_DUCKING;
     monSprite = CreateMonSprite_FieldMove(species, otId, personality, 320, 80, 0);
     sprite = &gSprites[monSprite];
     sprite->callback = SpriteCallbackDummy;
     sprite->oam.priority = 0;
     sprite->sSpecies = species;
-    sprite->data[6] = v0;
+    sprite->data[6] = noDucking;
     return monSprite;
 }
 
@@ -2935,13 +2937,9 @@ static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite)
         sprite->sOnscreenTimer = 30;
         sprite->callback = SpriteCB_FieldMoveMonWaitAfterCry;
         if (sprite->data[6])
-        {
-            PlayCry2(sprite->sSpecies, 0, 0x7d, 0xa);
-        }
+            PlayCry_NormalNoDucking(sprite->sSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
         else
-        {
-            PlayCry1(sprite->sSpecies, 0);
-        }
+            PlayCry_Normal(sprite->sSpecies, 0);
     }
 }
 
@@ -3021,7 +3019,7 @@ static void SurfFieldEffect_ShowMon(struct Task *task)
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     if (ObjectEventCheckHeldMovementStatus(objectEvent))
     {
-        gFieldEffectArguments[0] = task->tMonId | 0x80000000;
+        gFieldEffectArguments[0] = task->tMonId | SHOW_MON_CRY_NO_DUCKING;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->tState++;
     }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 84f7d8fe6..94334052c 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -982,7 +982,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
     if (currMon->species != SPECIES_EGG)
     {
         StopCryAndClearCrySongs();
-        PlayCry1(currMon->species, 0);
+        PlayCry_Normal(currMon->species, 0);
     }
     HallOfFame_PrintMonInfo(currMon, 0, 14);
 
diff --git a/src/intro.c b/src/intro.c
index 5cf99c97e..3e805dca4 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1925,7 +1925,7 @@ static void Task_Scene3_Groudon(u8 taskId)
             tScreenX = 80;
             tScreenY = 41;
             tDelay = 16;
-            PlayCryInternal(SPECIES_GROUDON, 0, 100, 10, 0);
+            PlayCryInternal(SPECIES_GROUDON, 0, 100, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL);
             tState++;
         }
         break;
@@ -2127,7 +2127,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
             {
                 tDelay = 1;
                 tState++;
-                PlayCryInternal(SPECIES_KYOGRE, 0, 120, 10, 0);
+                PlayCryInternal(SPECIES_KYOGRE, 0, 120, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL);
             }
         }
         break;
diff --git a/src/m4a_1.s b/src/m4a_1.s
index 62b913c86..f71a5546e 100644
--- a/src/m4a_1.s
+++ b/src/m4a_1.s
@@ -302,7 +302,7 @@ _081DD044:
 	ldrb r0, [r4, o_SoundChannel_type]
 	tst r0, TONEDATA_TYPE_CMP | TONEDATA_TYPE_REV
 	beq _081DD068
-	bl sub_82DF49C
+	bl SoundMainRAM_Unk1
 	b _081DD228
 _081DD068:
 	mov r10, r10, lsl 16
@@ -465,8 +465,9 @@ _081DD25E:
 	.pool
 	thumb_func_end SoundMainRAM
 
-	arm_func_start sub_82DF49C
-sub_82DF49C:
+@ Not present in GBA SDK 3.0
+	arm_func_start SoundMainRAM_Unk1
+SoundMainRAM_Unk1:
 	ldr r6, [r4, o_SoundChannel_wav]
 	ldrb r0, [r4, o_SoundChannel_statusFlags]
 	tst r0, SOUND_CHANNEL_SF_SPECIAL
@@ -505,10 +506,10 @@ _081DD2B4:
 	ldrb r0, [r4, o_SoundChannel_type]
 	tst r0, TONEDATA_TYPE_REV
 	bne _081DD3C0
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	mov r0, r1
 	add r3, r3, 0x1
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	sub r1, r1, r0
 _081DD308:
 	ldr r6, [r5]
@@ -534,11 +535,11 @@ _081DD310:
 	b _081DD364
 _081DD358:
 	add r3, r3, lr
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	mov r0, r1
 _081DD364:
 	add r3, r3, 0x1
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	sub r1, r1, r0
 _081DD370:
 	adds r5, r5, 0x40000000
@@ -565,10 +566,10 @@ _081DD3B0:
 	b _081DD3B0
 _081DD3C0:
 	sub r3, r3, 0x1
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	mov r0, r1
 	sub r3, r3, 0x1
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	sub r1, r1, r0
 _081DD3D8:
 	ldr r6, [r5]
@@ -594,11 +595,11 @@ _081DD3E0:
 	b _081DD434
 _081DD428:
 	sub r3, r3, lr
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	mov r0, r1
 _081DD434:
 	sub r3, r3, 0x1
-	bl sub_82DF758
+	bl SoundMainRAM_Unk2
 	sub r1, r1, r0
 _081DD440:
 	adds r5, r5, 0x40000000
@@ -663,10 +664,11 @@ _081DD4F4:
 	str r7, [r5, 0x630]
 	str r6, [r5], 0x4
 	pop {r8,r12,pc}
-	arm_func_end sub_82DF49C
+	arm_func_end SoundMainRAM_Unk1
 
-	arm_func_start sub_82DF758
-sub_82DF758:
+@ Not present in GBA SDK 3.0
+	arm_func_start SoundMainRAM_Unk2
+SoundMainRAM_Unk2:
 	push {r0,r2,r5-r7,lr}
 	mov r0, r3, lsr 6
 	ldr r1, [r4, o_SoundChannel_xpi]
@@ -704,7 +706,7 @@ _081DD594:
 	ldrsb r1, [r5, r0]
 	pop {r0,r2,r5-r7,pc}
 	.pool
-	arm_func_end sub_82DF758
+	arm_func_end SoundMainRAM_Unk2
 
 	thumb_func_start SoundMainBTM
 SoundMainBTM:
diff --git a/src/overworld.c b/src/overworld.c
index 9a5c41a7f..a44d3c050 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1254,7 +1254,7 @@ static void PlayAmbientCry(void)
         return;
     pan = (Random() % 88) + 212;
     volume = (Random() % 30) + 50;
-    PlayCry2(sAmbientCrySpecies, pan, volume, 1);
+    PlayCry_NormalNoDucking(sAmbientCrySpecies, pan, volume, CRY_PRIORITY_AMBIENT);
 }
 
 void UpdateAmbientCry(s16 *state, u16 *delayCounter)
diff --git a/src/pokeball.c b/src/pokeball.c
index 11f03eefe..a0800d38f 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -641,7 +641,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
 #define tCryTaskSpecies         data[0]
 #define tCryTaskPan             data[1]
 #define tCryTaskWantedCry       data[2]
-#define tCryTaskBattler            data[3]
+#define tCryTaskBattler         data[3]
 #define tCryTaskMonSpriteId     data[4]
 #define tCryTaskMonPtr1         data[5]
 #define tCryTaskMonPtr2         data[6]
@@ -665,10 +665,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
             gTasks[taskId].tCryTaskState = wantedCry + 1;
         break;
     case 1:
+        // Play single cry
         if (ShouldPlayNormalMonCry(mon) == TRUE)
-            PlayCry3(species, pan, 0);
+            PlayCry_ByMode(species, pan, CRY_MODE_NORMAL);
         else
-            PlayCry3(species, pan, 11);
+            PlayCry_ByMode(species, pan, CRY_MODE_WEAK);
         gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
         DestroyTask(taskId);
         break;
@@ -680,10 +681,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
     case 20:
         if (gTasks[taskId].tCryTaskFrames == 0)
         {
+            // Play first doubles cry
             if (ShouldPlayNormalMonCry(mon) == TRUE)
-                PlayCry4(species, pan, 1);
+                PlayCry_ReleaseDouble(species, pan, CRY_MODE_DOUBLES);
             else
-                PlayCry4(species, pan, 12);
+                PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK_DOUBLES);
 
             gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
             DestroyTask(taskId);
@@ -719,10 +721,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
             gTasks[taskId].tCryTaskFrames--;
             break;
         }
+        // Play second doubles cry
         if (ShouldPlayNormalMonCry(mon) == TRUE)
-            PlayCry4(species, pan, 0);
+            PlayCry_ReleaseDouble(species, pan, CRY_MODE_NORMAL);
         else
-            PlayCry4(species, pan, 11);
+            PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK);
 
         gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
         DestroyTask(taskId);
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index da9b7767c..98a76421c 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -945,7 +945,7 @@ static void SpriteCB_MonJumpForPokeblock(struct Sprite* sprite)
 
     // Play cry at jump peak
     if (sprite->sSpeed == 0)
-        PlayCry1(sprite->sSpecies, 0);
+        PlayCry_Normal(sprite->sSpecies, 0);
 
     if (sprite->sSpeed == 9)
         sprite->callback = SpriteCallbackDummy;
diff --git a/src/pokedex.c b/src/pokedex.c
index 58676b215..b41937302 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3309,7 +3309,7 @@ static void Task_LoadInfoScreen(u8 taskId)
             if (!gTasks[taskId].tSkipCry)
             {
                 StopCryAndClearCrySongs();
-                PlayCry2(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, 125, 10);
+                PlayCry_NormalNoDucking(NationalPokedexNumToSpecies(sPokedexListItem->dexNum), 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
             }
             else
             {
@@ -4010,7 +4010,7 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
     case 6:
         if (!gPaletteFade.active)
         {
-            PlayCry1(NationalPokedexNumToSpecies(dexNum), 0);
+            PlayCry_Normal(NationalPokedexNumToSpecies(dexNum), 0);
             gTasks[taskId].tPalTimer = 0;
             gTasks[taskId].func = Task_HandleCaughtMonPageInput;
         }
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 4c9bfe15c..28e2bd163 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -345,7 +345,7 @@ void CryScreenPlayButton(u16 species)
 
 static void PlayCryScreenCry(u16 species)
 {
-    PlayCry2(species, 0, 125, 10);
+    PlayCry_NormalNoDucking(species, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL);
     sDexCryScreen->cryState = 1;
 }
 
diff --git a/src/pokemon.c b/src/pokemon.c
index 0f943734b..1607e1a40 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6690,14 +6690,14 @@ void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry,
     {
         // No animation, only check if cry needs to be played
         if (!noCry)
-            PlayCry1(species, pan);
+            PlayCry_Normal(species, pan);
         sprite->callback = SpriteCallbackDummy;
     }
     else
     {
         if (!noCry)
         {
-            PlayCry1(species, pan);
+            PlayCry_Normal(species, pan);
             if (HasTwoFramesAnimation(species))
                 StartSpriteAnim(sprite, 1);
         }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 82c173413..c5aeb6b47 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -3929,9 +3929,9 @@ static void PlayMonCry(void)
     if (!summary->isEgg)
     {
         if (ShouldPlayNormalMonCry(&sMonSummaryScreen->currentMon) == TRUE)
-            PlayCry3(summary->species2, 0, 0);
+            PlayCry_ByMode(summary->species2, 0, CRY_MODE_NORMAL);
         else
-            PlayCry3(summary->species2, 0, 11);
+            PlayCry_ByMode(summary->species2, 0, CRY_MODE_WEAK);
     }
 }
 
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 51498fa1d..634b0651a 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -3064,7 +3064,7 @@ static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite)
         ChasesAway_SetRayquazaAnim(sprite, 3, 48, 16);
         sprite->x2 = 1;
         gSprites[sprite->sTailSpriteId].x2 = 1;
-        PlayCry1(SPECIES_RAYQUAZA, 0);
+        PlayCry_Normal(SPECIES_RAYQUAZA, 0);
         CreateTask(Task_ChasesAway_AnimateRing, 0);
     }
     else
diff --git a/src/roulette.c b/src/roulette.c
index ac4212d47..5b870fb60 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -4449,13 +4449,13 @@ static void SetBallStuck(struct Sprite *sprite)
     if (sRoulette->useTaillow)
     {
         if (sprite->sStuckOnWheelLeft)
-            PlayCry1(SPECIES_TAILLOW, -63);
+            PlayCry_Normal(SPECIES_TAILLOW, -63);
         else
-            PlayCry1(SPECIES_TAILLOW, 63);
+            PlayCry_Normal(SPECIES_TAILLOW, 63);
     }
     else
     {
-        PlayCry1(SPECIES_SHROOMISH, -63);
+        PlayCry_Normal(SPECIES_SHROOMISH, -63);
     }
 
     slotsToSkip = 2;
@@ -4719,9 +4719,9 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
         {
             m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP);
             if (sRoulette->ball->sStuckOnWheelLeft == 0)
-                PlayCry1(SPECIES_TAILLOW, 63);
+                PlayCry_Normal(SPECIES_TAILLOW, 63);
             else
-                PlayCry1(SPECIES_TAILLOW, -63);
+                PlayCry_Normal(SPECIES_TAILLOW, -63);
             StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 2);
             sprite->data[1] = 45;
             sprite->callback = SpriteCB_Taillow_PickUpBall;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 144712860..6007fb493 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2027,7 +2027,7 @@ bool8 ScrCmd_playmoncry(struct ScriptContext *ctx)
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u16 mode = VarGet(ScriptReadHalfword(ctx));
 
-    PlayCry5(species, mode);
+    PlayCry_Script(species, mode);
     return FALSE;
 }
 
diff --git a/src/sound.c b/src/sound.c
index 8c3cd3997..ad9993b54 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -26,7 +26,7 @@ static u16 sFanfareCounter;
 bool8 gDisableMusic;
 
 extern struct ToneData gCryTable[];
-extern struct ToneData gCryTable2[];
+extern struct ToneData gCryTable_Reverse[];
 
 static void Task_Fanfare(u8 taskId);
 static void CreateFanfareTask(void);
@@ -54,8 +54,6 @@ static const struct Fanfare sFanfares[] = {
     [FANFARE_REGISTER_MATCH_CALL] = { MUS_REGISTER_MATCH_CALL, 135 },
 };
 
-#define CRY_VOLUME  120 // was 125 in R/S
-
 void InitMapMusic(void)
 {
     gDisableMusic = FALSE;
@@ -300,73 +298,76 @@ bool8 IsBGMStopped(void)
     return FALSE;
 }
 
-void PlayCry1(u16 species, s8 pan)
+void PlayCry_Normal(u16 species, s8 pan)
 {
     m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-    PlayCryInternal(species, pan, CRY_VOLUME, 10, 0);
+    PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
 }
 
-void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority)
+void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority)
 {
-    PlayCryInternal(species, pan, volume, priority, 0);
+    PlayCryInternal(species, pan, volume, priority, CRY_MODE_NORMAL);
 }
 
-void PlayCry3(u16 species, s8 pan, u8 mode)
+// Assuming it's not CRY_MODE_DOUBLES, this is equivalent to PlayCry_Normal except it allows other modes.
+void PlayCry_ByMode(u16 species, s8 pan, u8 mode)
 {
-    if (mode == 1)
+    if (mode == CRY_MODE_DOUBLES)
     {
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, 1);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
     }
     else
     {
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
         gPokemonCryBGMDuckingCounter = 2;
         RestoreBGMVolumeAfterPokemonCry();
     }
 }
 
-void PlayCry4(u16 species, s8 pan, u8 mode)
+// Used when releasing multiple Pokémon at once in battle.
+void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode)
 {
-    if (mode == 1)
+    if (mode == CRY_MODE_DOUBLES)
     {
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, 1);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
     }
     else
     {
         if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI))
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
     }
 }
 
-void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
+// Duck the BGM but don't restore it. Not present in R/S
+void PlayCry_DuckNoRestore(u16 species, s8 pan, u8 mode)
 {
-    if (mode == 1)
+    if (mode == CRY_MODE_DOUBLES)
     {
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, 1);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
     }
     else
     {
         m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
+        PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
         gPokemonCryBGMDuckingCounter = 2;
     }
 }
 
-void PlayCry5(u16 species, u8 mode)
+void PlayCry_Script(u16 species, u8 mode)
 {
     m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-    PlayCryInternal(species, 0, CRY_VOLUME, 10, mode);
+    PlayCryInternal(species, 0, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
 }
 
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
 {
-    bool32 v0;
+    bool32 reverse;
     u32 release;
     u32 length;
     u32 pitch;
@@ -375,76 +376,80 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
     u8 table;
 
     species--;
+    
+    // Set default values
+    // May be overridden depending on mode.
     length = 140;
-    v0 = FALSE;
+    reverse = FALSE;
     release = 0;
     pitch = 15360;
     chorus = 0;
 
     switch (mode)
     {
-    case 0:
+    case CRY_MODE_NORMAL:
         break;
-    case 1:
+    case CRY_MODE_DOUBLES:
         length = 20;
         release = 225;
         break;
-    case 2:
+    case CRY_MODE_ENCOUNTER:
         release = 225;
         pitch = 15600;
         chorus = 20;
         volume = 90;
         break;
-    case 3:
+    case CRY_MODE_HIGH_PITCH:
         length = 50;
         release = 200;
         pitch = 15800;
         chorus = 20;
         volume = 90;
         break;
-    case 4:
+    case CRY_MODE_ECHO_START:
         length = 25;
-        v0 = TRUE;
+        reverse = TRUE;
         release = 100;
         pitch = 15600;
         chorus = 192;
         volume = 90;
         break;
-    case 5:
+    case CRY_MODE_FAINT:
         release = 200;
         pitch = 14440;
         break;
-    case 6:
+    case CRY_MODE_ECHO_END:
         release = 220;
         pitch = 15555;
         chorus = 192;
         volume = 70;
         break;
-    case 7:
+    case CRY_MODE_ROAR_1:
         length = 10;
         release = 100;
         pitch = 14848;
         break;
-    case 8:
+    case CRY_MODE_ROAR_2:
         length = 60;
         release = 225;
         pitch = 15616;
         break;
-    case 9:
+    case CRY_MODE_GROWL_1:
         length = 15;
-        v0 = TRUE;
+        reverse = TRUE;
         release = 125;
         pitch = 15200;
         break;
-    case 10:
+    case CRY_MODE_GROWL_2:
         length = 100;
         release = 225;
         pitch = 15200;
         break;
-    case 12:
+    case CRY_MODE_WEAK_DOUBLES:
         length = 20;
         release = 225;
-    case 11:
+        // fallthrough
+    case CRY_MODE_WEAK:
         pitch = 15000;
         break;
     }
@@ -463,28 +468,29 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
     // If you wish to expand pokemon, you need to
     // append new cases to the switch.
     species = SpeciesToCryId(species);
-    index = species & 0x7F;
+    index = species % 128;
     table = species / 128;
 
+    #define GET_CRY(speciesIndex, tableId, reversed) \
+        ((reversed) ? &gCryTable_Reverse[(128 * (tableId)) + (speciesIndex)] : &gCryTable[(128 * (tableId)) + (speciesIndex)])
+
     switch (table)
     {
     case 0:
-        gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]);
+        gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 0, reverse));
         break;
     case 1:
-        gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]);
+        gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 1, reverse));
         break;
     case 2:
-        gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]);
+        gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 2, reverse));
         break;
     case 3:
-        gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]);
+        gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 3, reverse));
         break;
     }
+
+    #undef GET_CRY
 }
 
 bool8 IsCryFinished(void)
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 403964684..ca393c4d8 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -532,7 +532,7 @@ static void Task_WaitForStarterSprite(u8 taskId)
 
 static void Task_AskConfirmStarter(u8 taskId)
 {
-    PlayCry1(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0);
+    PlayCry_Normal(GetStarterPokemon(gTasks[taskId].tStarterSelection), 0);
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
     AddTextPrinterParameterized(0, FONT_NORMAL, gText_ConfirmStarterChoice, 0, 1, 0, NULL);
     ScheduleBgCopyTilemapToVram(0);
diff --git a/src/trade.c b/src/trade.c
index 4089cf1df..ffed77eef 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3398,7 +3398,7 @@ static bool8 AnimateTradeSequenceCable(void)
         DrawTextOnTradeWindow(0, gStringVar4, 0);
 
         if (sTradeData->monSpecies[TRADE_PLAYER] != SPECIES_EGG)
-            PlayCry1(sTradeData->monSpecies[TRADE_PLAYER], 0);
+            PlayCry_Normal(sTradeData->monSpecies[TRADE_PLAYER], 0);
 
         sTradeData->state = TS_STATE_BYE_BYE;
         sTradeData->timer = 0;
@@ -3869,7 +3869,7 @@ static bool8 AnimateTradeSequenceWireless(void)
         DrawTextOnTradeWindow(0, gStringVar4, 0);
 
         if (sTradeData->monSpecies[TRADE_PLAYER] != SPECIES_EGG)
-            PlayCry1(sTradeData->monSpecies[TRADE_PLAYER], 0);
+            PlayCry_Normal(sTradeData->monSpecies[TRADE_PLAYER], 0);
 
         sTradeData->state = TS_STATE_BYE_BYE;
         sTradeData->timer = 0;