Add CRY_MODE constants

67 files changed, 586 insertions, 556 deletions

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..aea55fcd1 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
@@ -8507,6 +8508,7 @@ Move_HYPER_VOICE:
 	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 bbf25c93c..77af6761b 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 bd2b479f7..5f9444f87 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 8a6d71eb4..ad94337a0 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 e1167ad7e..965e4bbbc 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 6c38a8bd7..6370caec7 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 f07395824..23eaec8c2 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 1ba3c240c..17408a5d1 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 07c397e8c..4ab8104f7 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 acbdb4c8b..089856d77 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 efeae33d1..bff49ede0 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 20ed1e58d..76cbeb848 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 e7e862039..ce558c588 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..82cc4ffac
--- /dev/null
+++ b/include/constants/sound.h
@@ -0,0 +1,41 @@
+#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_END      4 // For 2nd 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_START    6 // For 1st 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
+
+#endif // GUARD_CONSTANTS_SOUND_H
diff --git a/include/sound.h b/include/sound.h
index 25ffa2d6e..5b34b69ba 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);
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/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index 6068b0f33..435c5dcdc 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);
+        PlayCry3(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)
+            PlayCry3(species, pan, CRY_MODE_GROWL_1);
+        else // DOUBLE_CRY_ROAR
+            PlayCry3(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);
+                PlayCry3(species, pan, CRY_MODE_GROWL_2);
                 DestroyAnimVisualTask(taskId);
             }
         }
-        else
+        else // DOUBLE_CRY_ROAR
         {
             if (!IsCryPlaying())
             {
-                PlayCry3(species, pan, 8);
+                PlayCry3(species, pan, CRY_MODE_ROAR_2);
                 DestroyAnimVisualTask(taskId);
             }
         }
@@ -302,10 +302,11 @@ static void SoundTask_PlayCryWithEcho_Step(u8 taskId)
     u16 species = gTasks[taskId].data[1];
     s8 pan = gTasks[taskId].data[2];
 
+    // Note the cases are not in order of execution
     switch (gTasks[taskId].data[9])
     {
     case 2:
-        PlayCry6(species, pan, 4);
+        PlayCry6(species, pan, CRY_MODE_ECHO_END);
         gTasks[taskId].data[9]++;
         break;
     case 1:
@@ -322,9 +323,9 @@ static void SoundTask_PlayCryWithEcho_Step(u8 taskId)
         break;
     default:
         if (gTasks[taskId].data[10] == 0)
-            PlayCry6(species, pan, 6);
+            PlayCry6(species, pan, CRY_MODE_ECHO_START);
         else
-            PlayCry3(species, pan, 6);
+            PlayCry3(species, pan, CRY_MODE_ECHO_START);
 
         DestroyAnimVisualTask(taskId);
         break;
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 1660f6ec1..e45b0c64b 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);
+    PlayCry3(species, 25, CRY_MODE_FAINT);
     LinkOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index a9240b0ac..ac6559687 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);
+    PlayCry3(species, -25, CRY_MODE_FAINT);
     LinkPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index ac330be76..d0aaf01fa 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);
+    PlayCry3(species, 25, CRY_MODE_FAINT);
     OpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index f4e47b434..34559541e 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);
+    PlayCry3(species, -25, CRY_MODE_FAINT);
     PlayerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 91fea6cde..863cdbdea 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);
+    PlayCry3(species, -25, CRY_MODE_FAINT);
     PlayerPartnerBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index c6e649508..5394250ee 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);
+    PlayCry3(species, 25, CRY_MODE_FAINT);
     RecordedOpponentBufferExecCompleted();
 }
 
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 93d059fe9..d634fca5d 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);
+    PlayCry3(species, -25, CRY_MODE_FAINT);
     RecordedPlayerBufferExecCompleted();
 }
 
diff --git a/src/intro.c b/src/intro.c
index 5cf99c97e..00cb42ac2 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, 10, CRY_MODE_NORMAL);
             tState++;
         }
         break;
diff --git a/src/pokeball.c b/src/pokeball.c
index 11f03eefe..4e7386f4f 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]
@@ -666,9 +666,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
         break;
     case 1:
         if (ShouldPlayNormalMonCry(mon) == TRUE)
-            PlayCry3(species, pan, 0);
+            PlayCry3(species, pan, CRY_MODE_NORMAL);
         else
-            PlayCry3(species, pan, 11);
+            PlayCry3(species, pan, CRY_MODE_WEAK);
         gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
         DestroyTask(taskId);
         break;
@@ -681,9 +681,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
         if (gTasks[taskId].tCryTaskFrames == 0)
         {
             if (ShouldPlayNormalMonCry(mon) == TRUE)
-                PlayCry4(species, pan, 1);
+                PlayCry4(species, pan, CRY_MODE_DOUBLES);
             else
-                PlayCry4(species, pan, 12);
+                PlayCry4(species, pan, CRY_MODE_WEAK_DOUBLES);
 
             gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
             DestroyTask(taskId);
@@ -720,9 +720,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId)
             break;
         }
         if (ShouldPlayNormalMonCry(mon) == TRUE)
-            PlayCry4(species, pan, 0);
+            PlayCry4(species, pan, CRY_MODE_NORMAL);
         else
-            PlayCry4(species, pan, 11);
+            PlayCry4(species, pan, CRY_MODE_WEAK);
 
         gBattleSpritesDataPtr->healthBoxesData[battlerId].waitForCry = FALSE;
         DestroyTask(taskId);
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 5a4858620..ca31a0045 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);
+            PlayCry3(summary->species2, 0, CRY_MODE_NORMAL);
         else
-            PlayCry3(summary->species2, 0, 11);
+            PlayCry3(summary->species2, 0, CRY_MODE_WEAK);
     }
 }
 
diff --git a/src/sound.c b/src/sound.c
index 8c3cd3997..ee5113f89 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);
@@ -303,21 +303,21 @@ bool8 IsBGMStopped(void)
 void PlayCry1(u16 species, s8 pan)
 {
     m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85);
-    PlayCryInternal(species, pan, CRY_VOLUME, 10, 0);
+    PlayCryInternal(species, pan, CRY_VOLUME, 10, CRY_MODE_NORMAL);
     gPokemonCryBGMDuckingCounter = 2;
     RestoreBGMVolumeAfterPokemonCry();
 }
 
 void PlayCry2(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)
 {
-    if (mode == 1)
+    if (mode == CRY_MODE_DOUBLES)
     {
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, 1);
+        PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
     }
     else
     {
@@ -330,9 +330,9 @@ void PlayCry3(u16 species, s8 pan, u8 mode)
 
 void PlayCry4(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, 10, mode);
     }
     else
     {
@@ -344,9 +344,9 @@ void PlayCry4(u16 species, s8 pan, u8 mode)
 
 void PlayCry6(u16 species, s8 pan, u8 mode) // not present in R/S
 {
-    if (mode == 1)
+    if (mode == CRY_MODE_DOUBLES)
     {
-        PlayCryInternal(species, pan, CRY_VOLUME, 10, 1);
+        PlayCryInternal(species, pan, CRY_VOLUME, 10, mode);
     }
     else
     {
@@ -366,7 +366,7 @@ void PlayCry5(u16 species, u8 mode)
 
 void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
 {
-    bool32 v0;
+    bool32 reverse;
     u32 release;
     u32 length;
     u32 pitch;
@@ -375,76 +375,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_END:
         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_START:
         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,26 +467,26 @@ 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;
 
     switch (table)
     {
     case 0:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]);
+          reverse ? &gCryTable_Reverse[(128 * 0) + index] : &gCryTable[(128 * 0) + index]);
         break;
     case 1:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]);
+          reverse ? &gCryTable_Reverse[(128 * 1) + index] : &gCryTable[(128 * 1) + index]);
         break;
     case 2:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]);
+          reverse ? &gCryTable_Reverse[(128 * 2) + index] : &gCryTable[(128 * 2) + index]);
         break;
     case 3:
         gMPlay_PokemonCry = SetPokemonCryTone(
-          v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]);
+          reverse ? &gCryTable_Reverse[(128 * 3) + index] : &gCryTable[(128 * 3) + index]);
         break;
     }
 }