enums for hoenn cries

3 files changed, 279 insertions, 135 deletions

diff --git a/include/constants/hoenn_cries.h b/include/constants/hoenn_cries.h
new file mode 100644
index 000000000..5f66c215f
--- /dev/null
+++ b/include/constants/hoenn_cries.h
@@ -0,0 +1,143 @@
+#ifndef GUARD_CONSTANTS_HOENN_CRIES_H
+#define GUARD_CONSTANTS_HOENN_CRIES_H
+
+enum
+{
+    CRY_TREECKO = 273,
+    CRY_GROVYLE = 274,
+    CRY_SCEPTILE = 275,
+    CRY_TORCHIC = 270,
+    CRY_COMBUSKEN = 271,
+    CRY_BLAZIKEN = 272,
+    CRY_MUDKIP = 276,
+    CRY_MARSHTOMP = 277,
+    CRY_SWAMPERT = 278,
+    CRY_POOCHYENA = 359,
+    CRY_MIGHTYENA = 360,
+    CRY_ZIGZAGOON = 378,
+    CRY_LINOONE = 375,
+    CRY_WURMPLE = 290,
+    CRY_SILCOON = 291,
+    CRY_BEAUTIFLY = 292,
+    CRY_CASCOON = 293,
+    CRY_DUSTOX = 294,
+    CRY_LOTAD = 283,
+    CRY_LOMBRE = 284,
+    CRY_LUDICOLO = 285,
+    CRY_SEEDOT = 286,
+    CRY_NUZLEAF = 287,
+    CRY_SHIFTRY = 288,
+    CRY_NINCADA = 301,
+    CRY_NINJASK = 302,
+    CRY_SHEDINJA = 303,
+    CRY_TAILLOW = 266,
+    CRY_SWELLOW = 267,
+    CRY_SHROOMISH = 374,
+    CRY_BRELOOM = 373,
+    CRY_SPINDA = 269,
+    CRY_WINGULL = 280,
+    CRY_PELIPPER = 279,
+    CRY_SURSKIT = 310,
+    CRY_MASQUERAIN = 311,
+    CRY_WAILMER = 377,
+    CRY_WAILORD = 381,
+    CRY_SKITTY = 312,
+    CRY_DELCATTY = 313,
+    CRY_KECLEON = 251,
+    CRY_BALTOY = 329,
+    CRY_CLAYDOL = 330,
+    CRY_NOSEPASS = 306,
+    CRY_TORKOAL = 253,
+    CRY_SABLEYE = 362,
+    CRY_BARBOACH = 318,
+    CRY_WHISCASH = 319,
+    CRY_LUVDISC = 368,
+    CRY_CORPHISH = 320,
+    CRY_CRAWDAUNT = 321,
+    CRY_FEEBAS = 333,
+    CRY_MILOTIC = 334,
+    CRY_CARVANHA = 289,
+    CRY_SHARPEDO = 260,
+    CRY_TRAPINCH = 324,
+    CRY_VIBRAVA = 325,
+    CRY_FLYGON = 326,
+    CRY_MAKUHITA = 304,
+    CRY_HARIYAMA = 305,
+    CRY_ELECTRIKE = 254,
+    CRY_MANECTRIC = 255,
+    CRY_NUMEL = 316,
+    CRY_CAMERUPT = 317,
+    CRY_SPHEAL = 338,
+    CRY_SEALEO = 339,
+    CRY_WALREIN = 340,
+    CRY_CACNEA = 327,
+    CRY_CACTURNE = 328,
+    CRY_SNORUNT = 383,
+    CRY_GLALIE = 307,
+    CRY_LUNATONE = 331,
+    CRY_SOLROCK = 332,
+    CRY_AZURILL = 262,
+    CRY_SPOINK = 322,
+    CRY_GRUMPIG = 323,
+    CRY_PLUSLE = 308,
+    CRY_MINUN = 309,
+    CRY_MAWILE = 363,
+    CRY_MEDITITE = 336,
+    CRY_MEDICHAM = 337,
+    CRY_SWABLU = 263,
+    CRY_ALTARIA = 264,
+    CRY_WYNAUT = 258,
+    CRY_DUSKULL = 256,
+    CRY_DUSCLOPS = 361,
+    CRY_ROSELIA = 252,
+    CRY_SLAKOTH = 298,
+    CRY_VIGOROTH = 299,
+    CRY_SLAKING = 300,
+    CRY_GULPIN = 314,
+    CRY_SWALOT = 315,
+    CRY_TROPIUS = 376,
+    CRY_WHISMUR = 382,
+    CRY_LOUDRED = 380,
+    CRY_EXPLOUD = 379,
+    CRY_CLAMPERL = 341,
+    CRY_HUNTAIL = 342,
+    CRY_GOREBYSS = 343,
+    CRY_ABSOL = 335,
+    CRY_SHUPPET = 282,
+    CRY_BANETTE = 281,
+    CRY_SEVIPER = 259,
+    CRY_ZANGOOSE = 261,
+    CRY_RELICANTH = 367,
+    CRY_ARON = 364,
+    CRY_LAIRON = 365,
+    CRY_AGGRON = 366,
+    CRY_CASTFORM = 356,
+    CRY_VOLBEAT = 357,
+    CRY_ILLUMISE = 358,
+    CRY_LILEEP = 344,
+    CRY_CRADILY = 345,
+    CRY_ANORITH = 346,
+    CRY_ARMALDO = 347,
+    CRY_RALTS = 295,
+    CRY_KIRLIA = 296,
+    CRY_GARDEVOIR = 297,
+    CRY_BAGON = 351,
+    CRY_SHELGON = 352,
+    CRY_SALAMENCE = 372,
+    CRY_BELDUM = 348,
+    CRY_METANG = 349,
+    CRY_METAGROSS = 350,
+    CRY_REGIROCK = 353,
+    CRY_REGICE = 354,
+    CRY_REGISTEEL = 355,
+    CRY_KYOGRE = 370,
+    CRY_GROUDON = 369,
+    CRY_RAYQUAZA = 371,
+    CRY_LATIAS = 257,
+    CRY_LATIOS = 384,
+    CRY_JIRACHI = 385,
+    CRY_DEOXYS = 386,
+    CRY_CHIMECHO = 387,
+};
+
+#endif
diff --git a/src/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h
index 450657cd0..2eef1eb88 100644
--- a/src/data/pokemon/cry_ids.h
+++ b/src/data/pokemon/cry_ids.h
@@ -2,139 +2,139 @@
 
 static const u16 sHoennSpeciesIdToCryId[] =
 {
-    [SPECIES_TREECKO - HOENN_MON_SPECIES_START] = 273,
-    [SPECIES_GROVYLE - HOENN_MON_SPECIES_START] = 274,
-    [SPECIES_SCEPTILE - HOENN_MON_SPECIES_START] = 275,
-    [SPECIES_TORCHIC - HOENN_MON_SPECIES_START] = 270,
-    [SPECIES_COMBUSKEN - HOENN_MON_SPECIES_START] = 271,
-    [SPECIES_BLAZIKEN - HOENN_MON_SPECIES_START] = 272,
-    [SPECIES_MUDKIP - HOENN_MON_SPECIES_START] = 276,
-    [SPECIES_MARSHTOMP - HOENN_MON_SPECIES_START] = 277,
-    [SPECIES_SWAMPERT - HOENN_MON_SPECIES_START] = 278,
-    [SPECIES_POOCHYENA - HOENN_MON_SPECIES_START] = 359,
-    [SPECIES_MIGHTYENA - HOENN_MON_SPECIES_START] = 360,
-    [SPECIES_ZIGZAGOON - HOENN_MON_SPECIES_START] = 378,
-    [SPECIES_LINOONE - HOENN_MON_SPECIES_START] = 375,
-    [SPECIES_WURMPLE - HOENN_MON_SPECIES_START] = 290,
-    [SPECIES_SILCOON - HOENN_MON_SPECIES_START] = 291,
-    [SPECIES_BEAUTIFLY - HOENN_MON_SPECIES_START] = 292,
-    [SPECIES_CASCOON - HOENN_MON_SPECIES_START] = 293,
-    [SPECIES_DUSTOX - HOENN_MON_SPECIES_START] = 294,
-    [SPECIES_LOTAD - HOENN_MON_SPECIES_START] = 283,
-    [SPECIES_LOMBRE - HOENN_MON_SPECIES_START] = 284,
-    [SPECIES_LUDICOLO - HOENN_MON_SPECIES_START] = 285,
-    [SPECIES_SEEDOT - HOENN_MON_SPECIES_START] = 286,
-    [SPECIES_NUZLEAF - HOENN_MON_SPECIES_START] = 287,
-    [SPECIES_SHIFTRY - HOENN_MON_SPECIES_START] = 288,
-    [SPECIES_NINCADA - HOENN_MON_SPECIES_START] = 301,
-    [SPECIES_NINJASK - HOENN_MON_SPECIES_START] = 302,
-    [SPECIES_SHEDINJA - HOENN_MON_SPECIES_START] = 303,
-    [SPECIES_TAILLOW - HOENN_MON_SPECIES_START] = 266,
-    [SPECIES_SWELLOW - HOENN_MON_SPECIES_START] = 267,
-    [SPECIES_SHROOMISH - HOENN_MON_SPECIES_START] = 374,
-    [SPECIES_BRELOOM - HOENN_MON_SPECIES_START] = 373,
-    [SPECIES_SPINDA - HOENN_MON_SPECIES_START] = 269,
-    [SPECIES_WINGULL - HOENN_MON_SPECIES_START] = 280,
-    [SPECIES_PELIPPER - HOENN_MON_SPECIES_START] = 279,
-    [SPECIES_SURSKIT - HOENN_MON_SPECIES_START] = 310,
-    [SPECIES_MASQUERAIN - HOENN_MON_SPECIES_START] = 311,
-    [SPECIES_WAILMER - HOENN_MON_SPECIES_START] = 377,
-    [SPECIES_WAILORD - HOENN_MON_SPECIES_START] = 381,
-    [SPECIES_SKITTY - HOENN_MON_SPECIES_START] = 312,
-    [SPECIES_DELCATTY - HOENN_MON_SPECIES_START] = 313,
-    [SPECIES_KECLEON - HOENN_MON_SPECIES_START] = 251,
-    [SPECIES_BALTOY - HOENN_MON_SPECIES_START] = 329,
-    [SPECIES_CLAYDOL - HOENN_MON_SPECIES_START] = 330,
-    [SPECIES_NOSEPASS - HOENN_MON_SPECIES_START] = 306,
-    [SPECIES_TORKOAL - HOENN_MON_SPECIES_START] = 253,
-    [SPECIES_SABLEYE - HOENN_MON_SPECIES_START] = 362,
-    [SPECIES_BARBOACH - HOENN_MON_SPECIES_START] = 318,
-    [SPECIES_WHISCASH - HOENN_MON_SPECIES_START] = 319,
-    [SPECIES_LUVDISC - HOENN_MON_SPECIES_START] = 368,
-    [SPECIES_CORPHISH - HOENN_MON_SPECIES_START] = 320,
-    [SPECIES_CRAWDAUNT - HOENN_MON_SPECIES_START] = 321,
-    [SPECIES_FEEBAS - HOENN_MON_SPECIES_START] = 333,
-    [SPECIES_MILOTIC - HOENN_MON_SPECIES_START] = 334,
-    [SPECIES_CARVANHA - HOENN_MON_SPECIES_START] = 289,
-    [SPECIES_SHARPEDO - HOENN_MON_SPECIES_START] = 260,
-    [SPECIES_TRAPINCH - HOENN_MON_SPECIES_START] = 324,
-    [SPECIES_VIBRAVA - HOENN_MON_SPECIES_START] = 325,
-    [SPECIES_FLYGON - HOENN_MON_SPECIES_START] = 326,
-    [SPECIES_MAKUHITA - HOENN_MON_SPECIES_START] = 304,
-    [SPECIES_HARIYAMA - HOENN_MON_SPECIES_START] = 305,
-    [SPECIES_ELECTRIKE - HOENN_MON_SPECIES_START] = 254,
-    [SPECIES_MANECTRIC - HOENN_MON_SPECIES_START] = 255,
-    [SPECIES_NUMEL - HOENN_MON_SPECIES_START] = 316,
-    [SPECIES_CAMERUPT - HOENN_MON_SPECIES_START] = 317,
-    [SPECIES_SPHEAL - HOENN_MON_SPECIES_START] = 338,
-    [SPECIES_SEALEO - HOENN_MON_SPECIES_START] = 339,
-    [SPECIES_WALREIN - HOENN_MON_SPECIES_START] = 340,
-    [SPECIES_CACNEA - HOENN_MON_SPECIES_START] = 327,
-    [SPECIES_CACTURNE - HOENN_MON_SPECIES_START] = 328,
-    [SPECIES_SNORUNT - HOENN_MON_SPECIES_START] = 383,
-    [SPECIES_GLALIE - HOENN_MON_SPECIES_START] = 307,
-    [SPECIES_LUNATONE - HOENN_MON_SPECIES_START] = 331,
-    [SPECIES_SOLROCK - HOENN_MON_SPECIES_START] = 332,
-    [SPECIES_AZURILL - HOENN_MON_SPECIES_START] = 262,
-    [SPECIES_SPOINK - HOENN_MON_SPECIES_START] = 322,
-    [SPECIES_GRUMPIG - HOENN_MON_SPECIES_START] = 323,
-    [SPECIES_PLUSLE - HOENN_MON_SPECIES_START] = 308,
-    [SPECIES_MINUN - HOENN_MON_SPECIES_START] = 309,
-    [SPECIES_MAWILE - HOENN_MON_SPECIES_START] = 363,
-    [SPECIES_MEDITITE - HOENN_MON_SPECIES_START] = 336,
-    [SPECIES_MEDICHAM - HOENN_MON_SPECIES_START] = 337,
-    [SPECIES_SWABLU - HOENN_MON_SPECIES_START] = 263,
-    [SPECIES_ALTARIA - HOENN_MON_SPECIES_START] = 264,
-    [SPECIES_WYNAUT - HOENN_MON_SPECIES_START] = 258,
-    [SPECIES_DUSKULL - HOENN_MON_SPECIES_START] = 256,
-    [SPECIES_DUSCLOPS - HOENN_MON_SPECIES_START] = 361,
-    [SPECIES_ROSELIA - HOENN_MON_SPECIES_START] = 252,
-    [SPECIES_SLAKOTH - HOENN_MON_SPECIES_START] = 298,
-    [SPECIES_VIGOROTH - HOENN_MON_SPECIES_START] = 299,
-    [SPECIES_SLAKING - HOENN_MON_SPECIES_START] = 300,
-    [SPECIES_GULPIN - HOENN_MON_SPECIES_START] = 314,
-    [SPECIES_SWALOT - HOENN_MON_SPECIES_START] = 315,
-    [SPECIES_TROPIUS - HOENN_MON_SPECIES_START] = 376,
-    [SPECIES_WHISMUR - HOENN_MON_SPECIES_START] = 382,
-    [SPECIES_LOUDRED - HOENN_MON_SPECIES_START] = 380,
-    [SPECIES_EXPLOUD - HOENN_MON_SPECIES_START] = 379,
-    [SPECIES_CLAMPERL - HOENN_MON_SPECIES_START] = 341,
-    [SPECIES_HUNTAIL - HOENN_MON_SPECIES_START] = 342,
-    [SPECIES_GOREBYSS - HOENN_MON_SPECIES_START] = 343,
-    [SPECIES_ABSOL - HOENN_MON_SPECIES_START] = 335,
-    [SPECIES_SHUPPET - HOENN_MON_SPECIES_START] = 282,
-    [SPECIES_BANETTE - HOENN_MON_SPECIES_START] = 281,
-    [SPECIES_SEVIPER - HOENN_MON_SPECIES_START] = 259,
-    [SPECIES_ZANGOOSE - HOENN_MON_SPECIES_START] = 261,
-    [SPECIES_RELICANTH - HOENN_MON_SPECIES_START] = 367,
-    [SPECIES_ARON - HOENN_MON_SPECIES_START] = 364,
-    [SPECIES_LAIRON - HOENN_MON_SPECIES_START] = 365,
-    [SPECIES_AGGRON - HOENN_MON_SPECIES_START] = 366,
-    [SPECIES_CASTFORM - HOENN_MON_SPECIES_START] = 356,
-    [SPECIES_VOLBEAT - HOENN_MON_SPECIES_START] = 357,
-    [SPECIES_ILLUMISE - HOENN_MON_SPECIES_START] = 358,
-    [SPECIES_LILEEP - HOENN_MON_SPECIES_START] = 344,
-    [SPECIES_CRADILY - HOENN_MON_SPECIES_START] = 345,
-    [SPECIES_ANORITH - HOENN_MON_SPECIES_START] = 346,
-    [SPECIES_ARMALDO - HOENN_MON_SPECIES_START] = 347,
-    [SPECIES_RALTS - HOENN_MON_SPECIES_START] = 295,
-    [SPECIES_KIRLIA - HOENN_MON_SPECIES_START] = 296,
-    [SPECIES_GARDEVOIR - HOENN_MON_SPECIES_START] = 297,
-    [SPECIES_BAGON - HOENN_MON_SPECIES_START] = 351,
-    [SPECIES_SHELGON - HOENN_MON_SPECIES_START] = 352,
-    [SPECIES_SALAMENCE - HOENN_MON_SPECIES_START] = 372,
-    [SPECIES_BELDUM - HOENN_MON_SPECIES_START] = 348,
-    [SPECIES_METANG - HOENN_MON_SPECIES_START] = 349,
-    [SPECIES_METAGROSS - HOENN_MON_SPECIES_START] = 350,
-    [SPECIES_REGIROCK - HOENN_MON_SPECIES_START] = 353,
-    [SPECIES_REGICE - HOENN_MON_SPECIES_START] = 354,
-    [SPECIES_REGISTEEL - HOENN_MON_SPECIES_START] = 355,
-    [SPECIES_KYOGRE - HOENN_MON_SPECIES_START] = 370,
-    [SPECIES_GROUDON - HOENN_MON_SPECIES_START] = 369,
-    [SPECIES_RAYQUAZA - HOENN_MON_SPECIES_START] = 371,
-    [SPECIES_LATIAS - HOENN_MON_SPECIES_START] = 257,
-    [SPECIES_LATIOS - HOENN_MON_SPECIES_START] = 384,
-    [SPECIES_JIRACHI - HOENN_MON_SPECIES_START] = 385,
-    [SPECIES_DEOXYS - HOENN_MON_SPECIES_START] = 386,
-    [SPECIES_CHIMECHO - HOENN_MON_SPECIES_START] = 387,
+    [SPECIES_TREECKO - HOENN_MON_SPECIES_START] = CRY_TREECKO,
+    [SPECIES_GROVYLE - HOENN_MON_SPECIES_START] = CRY_GROVYLE,
+    [SPECIES_SCEPTILE - HOENN_MON_SPECIES_START] = CRY_SCEPTILE,
+    [SPECIES_TORCHIC - HOENN_MON_SPECIES_START] = CRY_TORCHIC,
+    [SPECIES_COMBUSKEN - HOENN_MON_SPECIES_START] = CRY_COMBUSKEN,
+    [SPECIES_BLAZIKEN - HOENN_MON_SPECIES_START] = CRY_BLAZIKEN,
+    [SPECIES_MUDKIP - HOENN_MON_SPECIES_START] = CRY_MUDKIP,
+    [SPECIES_MARSHTOMP - HOENN_MON_SPECIES_START] = CRY_MARSHTOMP,
+    [SPECIES_SWAMPERT - HOENN_MON_SPECIES_START] = CRY_SWAMPERT,
+    [SPECIES_POOCHYENA - HOENN_MON_SPECIES_START] = CRY_POOCHYENA,
+    [SPECIES_MIGHTYENA - HOENN_MON_SPECIES_START] = CRY_MIGHTYENA,
+    [SPECIES_ZIGZAGOON - HOENN_MON_SPECIES_START] = CRY_ZIGZAGOON,
+    [SPECIES_LINOONE - HOENN_MON_SPECIES_START] = CRY_LINOONE,
+    [SPECIES_WURMPLE - HOENN_MON_SPECIES_START] = CRY_WURMPLE,
+    [SPECIES_SILCOON - HOENN_MON_SPECIES_START] = CRY_SILCOON,
+    [SPECIES_BEAUTIFLY - HOENN_MON_SPECIES_START] = CRY_BEAUTIFLY,
+    [SPECIES_CASCOON - HOENN_MON_SPECIES_START] = CRY_CASCOON,
+    [SPECIES_DUSTOX - HOENN_MON_SPECIES_START] = CRY_DUSTOX,
+    [SPECIES_LOTAD - HOENN_MON_SPECIES_START] = CRY_LOTAD,
+    [SPECIES_LOMBRE - HOENN_MON_SPECIES_START] = CRY_LOMBRE,
+    [SPECIES_LUDICOLO - HOENN_MON_SPECIES_START] = CRY_LUDICOLO,
+    [SPECIES_SEEDOT - HOENN_MON_SPECIES_START] = CRY_SEEDOT,
+    [SPECIES_NUZLEAF - HOENN_MON_SPECIES_START] = CRY_NUZLEAF,
+    [SPECIES_SHIFTRY - HOENN_MON_SPECIES_START] = CRY_SHIFTRY,
+    [SPECIES_NINCADA - HOENN_MON_SPECIES_START] = CRY_NINCADA,
+    [SPECIES_NINJASK - HOENN_MON_SPECIES_START] = CRY_NINJASK,
+    [SPECIES_SHEDINJA - HOENN_MON_SPECIES_START] = CRY_SHEDINJA,
+    [SPECIES_TAILLOW - HOENN_MON_SPECIES_START] = CRY_TAILLOW,
+    [SPECIES_SWELLOW - HOENN_MON_SPECIES_START] = CRY_SWELLOW,
+    [SPECIES_SHROOMISH - HOENN_MON_SPECIES_START] = CRY_SHROOMISH,
+    [SPECIES_BRELOOM - HOENN_MON_SPECIES_START] = CRY_BRELOOM,
+    [SPECIES_SPINDA - HOENN_MON_SPECIES_START] = CRY_SPINDA,
+    [SPECIES_WINGULL - HOENN_MON_SPECIES_START] = CRY_WINGULL,
+    [SPECIES_PELIPPER - HOENN_MON_SPECIES_START] = CRY_PELIPPER,
+    [SPECIES_SURSKIT - HOENN_MON_SPECIES_START] = CRY_SURSKIT,
+    [SPECIES_MASQUERAIN - HOENN_MON_SPECIES_START] = CRY_MASQUERAIN,
+    [SPECIES_WAILMER - HOENN_MON_SPECIES_START] = CRY_WAILMER,
+    [SPECIES_WAILORD - HOENN_MON_SPECIES_START] = CRY_WAILORD,
+    [SPECIES_SKITTY - HOENN_MON_SPECIES_START] = CRY_SKITTY,
+    [SPECIES_DELCATTY - HOENN_MON_SPECIES_START] = CRY_DELCATTY,
+    [SPECIES_KECLEON - HOENN_MON_SPECIES_START] = CRY_KECLEON,
+    [SPECIES_BALTOY - HOENN_MON_SPECIES_START] = CRY_BALTOY,
+    [SPECIES_CLAYDOL - HOENN_MON_SPECIES_START] = CRY_CLAYDOL,
+    [SPECIES_NOSEPASS - HOENN_MON_SPECIES_START] = CRY_NOSEPASS,
+    [SPECIES_TORKOAL - HOENN_MON_SPECIES_START] = CRY_TORKOAL,
+    [SPECIES_SABLEYE - HOENN_MON_SPECIES_START] = CRY_SABLEYE,
+    [SPECIES_BARBOACH - HOENN_MON_SPECIES_START] = CRY_BARBOACH,
+    [SPECIES_WHISCASH - HOENN_MON_SPECIES_START] = CRY_WHISCASH,
+    [SPECIES_LUVDISC - HOENN_MON_SPECIES_START] = CRY_LUVDISC,
+    [SPECIES_CORPHISH - HOENN_MON_SPECIES_START] = CRY_CORPHISH,
+    [SPECIES_CRAWDAUNT - HOENN_MON_SPECIES_START] = CRY_CRAWDAUNT,
+    [SPECIES_FEEBAS - HOENN_MON_SPECIES_START] = CRY_FEEBAS,
+    [SPECIES_MILOTIC - HOENN_MON_SPECIES_START] = CRY_MILOTIC,
+    [SPECIES_CARVANHA - HOENN_MON_SPECIES_START] = CRY_CARVANHA,
+    [SPECIES_SHARPEDO - HOENN_MON_SPECIES_START] = CRY_SHARPEDO,
+    [SPECIES_TRAPINCH - HOENN_MON_SPECIES_START] = CRY_TRAPINCH,
+    [SPECIES_VIBRAVA - HOENN_MON_SPECIES_START] = CRY_VIBRAVA,
+    [SPECIES_FLYGON - HOENN_MON_SPECIES_START] = CRY_FLYGON,
+    [SPECIES_MAKUHITA - HOENN_MON_SPECIES_START] = CRY_MAKUHITA,
+    [SPECIES_HARIYAMA - HOENN_MON_SPECIES_START] = CRY_HARIYAMA,
+    [SPECIES_ELECTRIKE - HOENN_MON_SPECIES_START] = CRY_ELECTRIKE,
+    [SPECIES_MANECTRIC - HOENN_MON_SPECIES_START] = CRY_MANECTRIC,
+    [SPECIES_NUMEL - HOENN_MON_SPECIES_START] = CRY_NUMEL,
+    [SPECIES_CAMERUPT - HOENN_MON_SPECIES_START] = CRY_CAMERUPT,
+    [SPECIES_SPHEAL - HOENN_MON_SPECIES_START] = CRY_SPHEAL,
+    [SPECIES_SEALEO - HOENN_MON_SPECIES_START] = CRY_SEALEO,
+    [SPECIES_WALREIN - HOENN_MON_SPECIES_START] = CRY_WALREIN,
+    [SPECIES_CACNEA - HOENN_MON_SPECIES_START] = CRY_CACNEA,
+    [SPECIES_CACTURNE - HOENN_MON_SPECIES_START] = CRY_CACTURNE,
+    [SPECIES_SNORUNT - HOENN_MON_SPECIES_START] = CRY_SNORUNT,
+    [SPECIES_GLALIE - HOENN_MON_SPECIES_START] = CRY_GLALIE,
+    [SPECIES_LUNATONE - HOENN_MON_SPECIES_START] = CRY_LUNATONE,
+    [SPECIES_SOLROCK - HOENN_MON_SPECIES_START] = CRY_SOLROCK,
+    [SPECIES_AZURILL - HOENN_MON_SPECIES_START] = CRY_AZURILL,
+    [SPECIES_SPOINK - HOENN_MON_SPECIES_START] = CRY_SPOINK,
+    [SPECIES_GRUMPIG - HOENN_MON_SPECIES_START] = CRY_GRUMPIG,
+    [SPECIES_PLUSLE - HOENN_MON_SPECIES_START] = CRY_PLUSLE,
+    [SPECIES_MINUN - HOENN_MON_SPECIES_START] = CRY_MINUN,
+    [SPECIES_MAWILE - HOENN_MON_SPECIES_START] = CRY_MAWILE,
+    [SPECIES_MEDITITE - HOENN_MON_SPECIES_START] = CRY_MEDITITE,
+    [SPECIES_MEDICHAM - HOENN_MON_SPECIES_START] = CRY_MEDICHAM,
+    [SPECIES_SWABLU - HOENN_MON_SPECIES_START] = CRY_SWABLU,
+    [SPECIES_ALTARIA - HOENN_MON_SPECIES_START] = CRY_ALTARIA,
+    [SPECIES_WYNAUT - HOENN_MON_SPECIES_START] = CRY_WYNAUT,
+    [SPECIES_DUSKULL - HOENN_MON_SPECIES_START] = CRY_DUSKULL,
+    [SPECIES_DUSCLOPS - HOENN_MON_SPECIES_START] = CRY_DUSCLOPS,
+    [SPECIES_ROSELIA - HOENN_MON_SPECIES_START] = CRY_ROSELIA,
+    [SPECIES_SLAKOTH - HOENN_MON_SPECIES_START] = CRY_SLAKOTH,
+    [SPECIES_VIGOROTH - HOENN_MON_SPECIES_START] = CRY_VIGOROTH,
+    [SPECIES_SLAKING - HOENN_MON_SPECIES_START] = CRY_SLAKING,
+    [SPECIES_GULPIN - HOENN_MON_SPECIES_START] = CRY_GULPIN,
+    [SPECIES_SWALOT - HOENN_MON_SPECIES_START] = CRY_SWALOT,
+    [SPECIES_TROPIUS - HOENN_MON_SPECIES_START] = CRY_TROPIUS,
+    [SPECIES_WHISMUR - HOENN_MON_SPECIES_START] = CRY_WHISMUR,
+    [SPECIES_LOUDRED - HOENN_MON_SPECIES_START] = CRY_LOUDRED,
+    [SPECIES_EXPLOUD - HOENN_MON_SPECIES_START] = CRY_EXPLOUD,
+    [SPECIES_CLAMPERL - HOENN_MON_SPECIES_START] = CRY_CLAMPERL,
+    [SPECIES_HUNTAIL - HOENN_MON_SPECIES_START] = CRY_HUNTAIL,
+    [SPECIES_GOREBYSS - HOENN_MON_SPECIES_START] = CRY_GOREBYSS,
+    [SPECIES_ABSOL - HOENN_MON_SPECIES_START] = CRY_ABSOL,
+    [SPECIES_SHUPPET - HOENN_MON_SPECIES_START] = CRY_SHUPPET,
+    [SPECIES_BANETTE - HOENN_MON_SPECIES_START] = CRY_BANETTE,
+    [SPECIES_SEVIPER - HOENN_MON_SPECIES_START] = CRY_SEVIPER,
+    [SPECIES_ZANGOOSE - HOENN_MON_SPECIES_START] = CRY_ZANGOOSE,
+    [SPECIES_RELICANTH - HOENN_MON_SPECIES_START] = CRY_RELICANTH,
+    [SPECIES_ARON - HOENN_MON_SPECIES_START] = CRY_ARON,
+    [SPECIES_LAIRON - HOENN_MON_SPECIES_START] = CRY_LAIRON,
+    [SPECIES_AGGRON - HOENN_MON_SPECIES_START] = CRY_AGGRON,
+    [SPECIES_CASTFORM - HOENN_MON_SPECIES_START] = CRY_CASTFORM,
+    [SPECIES_VOLBEAT - HOENN_MON_SPECIES_START] = CRY_VOLBEAT,
+    [SPECIES_ILLUMISE - HOENN_MON_SPECIES_START] = CRY_ILLUMISE,
+    [SPECIES_LILEEP - HOENN_MON_SPECIES_START] = CRY_LILEEP,
+    [SPECIES_CRADILY - HOENN_MON_SPECIES_START] = CRY_CRADILY,
+    [SPECIES_ANORITH - HOENN_MON_SPECIES_START] = CRY_ANORITH,
+    [SPECIES_ARMALDO - HOENN_MON_SPECIES_START] = CRY_ARMALDO,
+    [SPECIES_RALTS - HOENN_MON_SPECIES_START] = CRY_RALTS,
+    [SPECIES_KIRLIA - HOENN_MON_SPECIES_START] = CRY_KIRLIA,
+    [SPECIES_GARDEVOIR - HOENN_MON_SPECIES_START] = CRY_GARDEVOIR,
+    [SPECIES_BAGON - HOENN_MON_SPECIES_START] = CRY_BAGON,
+    [SPECIES_SHELGON - HOENN_MON_SPECIES_START] = CRY_SHELGON,
+    [SPECIES_SALAMENCE - HOENN_MON_SPECIES_START] = CRY_SALAMENCE,
+    [SPECIES_BELDUM - HOENN_MON_SPECIES_START] = CRY_BELDUM,
+    [SPECIES_METANG - HOENN_MON_SPECIES_START] = CRY_METANG,
+    [SPECIES_METAGROSS - HOENN_MON_SPECIES_START] = CRY_METAGROSS,
+    [SPECIES_REGIROCK - HOENN_MON_SPECIES_START] = CRY_REGIROCK,
+    [SPECIES_REGICE - HOENN_MON_SPECIES_START] = CRY_REGICE,
+    [SPECIES_REGISTEEL - HOENN_MON_SPECIES_START] = CRY_REGISTEEL,
+    [SPECIES_KYOGRE - HOENN_MON_SPECIES_START] = CRY_KYOGRE,
+    [SPECIES_GROUDON - HOENN_MON_SPECIES_START] = CRY_GROUDON,
+    [SPECIES_RAYQUAZA - HOENN_MON_SPECIES_START] = CRY_RAYQUAZA,
+    [SPECIES_LATIAS - HOENN_MON_SPECIES_START] = CRY_LATIAS,
+    [SPECIES_LATIOS - HOENN_MON_SPECIES_START] = CRY_LATIOS,
+    [SPECIES_JIRACHI - HOENN_MON_SPECIES_START] = CRY_JIRACHI,
+    [SPECIES_DEOXYS - HOENN_MON_SPECIES_START] = CRY_DEOXYS,
+    [SPECIES_CHIMECHO - HOENN_MON_SPECIES_START] = CRY_CHIMECHO,
 };
diff --git a/src/pokemon.c b/src/pokemon.c
index 755c59555..b948e4033 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -32,6 +32,7 @@
 #include "constants/items.h"
 #include "constants/item_effects.h"
 #include "constants/species.h"
+#include "constants/hoenn_cries.h"
 #include "constants/pokemon.h"
 #include "constants/abilities.h"
 #include "constants/flags.h"