diff --git a/include/constants/cries.h b/include/constants/cries.h index 03aa9c558e..40c6dafc1e 100644 --- a/include/constants/cries.h +++ b/include/constants/cries.h @@ -2025,7 +2025,7 @@ enum { CRY_APPLETUN, #if P_GEN_9_CROSS_EVOS CRY_DIPPLIN, - //CRY_HYDRAPPLE, + CRY_HYDRAPPLE, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_APPLIN #if P_FAMILY_SILICOBRA @@ -2114,7 +2114,7 @@ enum { #if P_FAMILY_DURALUDON CRY_DURALUDON, #if P_GEN_9_CROSS_EVOS - //CRY_ARCHALUDON, + CRY_ARCHALUDON, #endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DURALUDON #if P_FAMILY_DREEPY @@ -2409,22 +2409,22 @@ enum { CRY_OGERPON, #endif //P_FAMILY_OGERPON #if P_FAMILY_GOUGING_FIRE - //CRY_GOUGING_FIRE, + CRY_GOUGING_FIRE, #endif //P_FAMILY_GOUGING_FIRE #if P_FAMILY_RAGING_BOLT - //CRY_RAGING_BOLT, + CRY_RAGING_BOLT, #endif //P_FAMILY_RAGING_BOLT #if P_FAMILY_IRON_BOULDER - //CRY_IRON_BOULDER, + CRY_IRON_BOULDER, #endif //P_FAMILY_IRON_BOULDER #if P_FAMILY_IRON_CROWN - //CRY_IRON_CROWN, + CRY_IRON_CROWN, #endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS - //CRY_TERAPAGOS, + CRY_TERAPAGOS, #endif //P_FAMILY_TERAPAGOS #if P_FAMILY_PECHARUNT - //CRY_PECHARUNT, + CRY_PECHARUNT, #endif //P_FAMILY_PECHARUNT CRY_COUNT, }; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 6d0c9b97dc..383dd2512e 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -2022,6 +2022,7 @@ gCryTable:: cry Cry_Appletun .if P_GEN_9_CROSS_EVOS == TRUE cry Cry_Dipplin + cry Cry_Hydrapple .endif @ P_GEN_9_CROSS_EVOS .endif @ P_FAMILY_APPLIN .if P_FAMILY_SILICOBRA == TRUE @@ -2109,6 +2110,9 @@ gCryTable:: .endif @ P_FAMILY_ARCTOVISH .if P_FAMILY_DURALUDON == TRUE cry Cry_Duraludon +.if P_GEN_9_CROSS_EVOS == TRUE + cry Cry_Archaludon +.endif @ P_GEN_9_CROSS_EVOS .endif @ P_FAMILY_DURALUDON .if P_FAMILY_DREEPY == TRUE cry Cry_Dreepy @@ -2401,6 +2405,24 @@ gCryTable:: .if P_FAMILY_OGERPON == TRUE cry Cry_Ogerpon .endif @ P_FAMILY_OGERPON +.if P_FAMILY_GOUGING_FIRE == TRUE + cry Cry_GougingFire +.endif @ P_FAMILY_GOUGING_FIRE +.if P_FAMILY_RAGING_BOLT == TRUE + cry Cry_RagingBolt +.endif @ P_FAMILY_RAGING_BOLT +.if P_FAMILY_IRON_BOULDER == TRUE + cry Cry_IronBoulder +.endif @ P_FAMILY_IRON_BOULDER +.if P_FAMILY_IRON_CROWN == TRUE + cry Cry_IronCrown +.endif @ P_FAMILY_IRON_CROWN +.if P_FAMILY_TERAPAGOS == TRUE + cry Cry_Terapagos +.endif @ P_FAMILY_TERAPAGOS +.if P_FAMILY_PECHARUNT == TRUE + cry Cry_Pecharunt +.endif @ P_FAMILY_PECHARUNT .align 2 gCryTable_Reverse:: @@ -4426,6 +4448,7 @@ gCryTable_Reverse:: cry_reverse Cry_Appletun .if P_GEN_9_CROSS_EVOS == TRUE cry_reverse Cry_Dipplin + cry_reverse Cry_Hydrapple .endif @ P_GEN_9_CROSS_EVOS .endif @ P_FAMILY_APPLIN .if P_FAMILY_SILICOBRA == TRUE @@ -4513,6 +4536,9 @@ gCryTable_Reverse:: .endif @ P_FAMILY_ARCTOVISH .if P_FAMILY_DURALUDON == TRUE cry_reverse Cry_Duraludon +.if P_GEN_9_CROSS_EVOS == TRUE + cry_reverse Cry_Archaludon +.endif @ P_GEN_9_CROSS_EVOS .endif @ P_FAMILY_DURALUDON .if P_FAMILY_DREEPY == TRUE cry_reverse Cry_Dreepy @@ -4805,3 +4831,21 @@ gCryTable_Reverse:: .if P_FAMILY_OGERPON == TRUE cry_reverse Cry_Ogerpon .endif @ P_FAMILY_OGERPON +.if P_FAMILY_GOUGING_FIRE == TRUE + cry_reverse Cry_GougingFire +.endif @ P_FAMILY_GOUGING_FIRE +.if P_FAMILY_RAGING_BOLT == TRUE + cry_reverse Cry_RagingBolt +.endif @ P_FAMILY_RAGING_BOLT +.if P_FAMILY_IRON_BOULDER == TRUE + cry_reverse Cry_IronBoulder +.endif @ P_FAMILY_IRON_BOULDER +.if P_FAMILY_IRON_CROWN == TRUE + cry_reverse Cry_IronCrown +.endif @ P_FAMILY_IRON_CROWN +.if P_FAMILY_TERAPAGOS == TRUE + cry_reverse Cry_Terapagos +.endif @ P_FAMILY_TERAPAGOS +.if P_FAMILY_PECHARUNT == TRUE + cry_reverse Cry_Pecharunt +.endif @ P_FAMILY_PECHARUNT diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 8a915b6de1..d73504a1ff 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -5210,6 +5210,10 @@ Cry_Appletun:: .align 2 Cry_Dipplin:: .incbin "sound/direct_sound_samples/cries/dipplin.bin" + + .align 2 +Cry_Hydrapple:: + .incbin "sound/direct_sound_samples/cries/hydrapple.bin" .endif @ P_GEN_9_CROSS_EVOS .endif @ P_FAMILY_APPLIN @@ -5417,6 +5421,10 @@ Cry_Arctovish:: .align 2 Cry_Duraludon:: .incbin "sound/direct_sound_samples/cries/duraludon.bin" + + .align 2 +Cry_Archaludon:: + .incbin "sound/direct_sound_samples/cries/archaludon.bin" .endif @ P_FAMILY_DURALUDON .if P_FAMILY_DREEPY == TRUE @@ -6110,6 +6118,42 @@ Cry_Ogerpon:: .incbin "sound/direct_sound_samples/cries/ogerpon.bin" .endif @ P_FAMILY_OGERPON +.if P_FAMILY_GOUGING_FIRE == TRUE + .align 2 +Cry_GougingFire:: + .incbin "sound/direct_sound_samples/cries/gouging_fire.bin" +.endif @ P_FAMILY_GOUGING_FIRE + +.if P_FAMILY_RAGING_BOLT == TRUE + .align 2 +Cry_RagingBolt:: + .incbin "sound/direct_sound_samples/cries/raging_bolt.bin" +.endif @ P_FAMILY_RAGING_BOLT + +.if P_FAMILY_IRON_BOULDER == TRUE + .align 2 +Cry_IronBoulder:: + .incbin "sound/direct_sound_samples/cries/iron_boulder.bin" +.endif @ P_FAMILY_IRON_BOULDER + +.if P_FAMILY_IRON_CROWN == TRUE + .align 2 +Cry_IronCrown:: + .incbin "sound/direct_sound_samples/cries/iron_crown.bin" +.endif @ P_FAMILY_IRON_CROWN + +.if P_FAMILY_TERAPAGOS == TRUE + .align 2 +Cry_Terapagos:: + .incbin "sound/direct_sound_samples/cries/terapagos.bin" +.endif @ P_FAMILY_TERAPAGOS + +.if P_FAMILY_PECHARUNT == TRUE + .align 2 +Cry_Pecharunt:: + .incbin "sound/direct_sound_samples/cries/pecharunt.bin" +.endif @ P_FAMILY_PECHARUNT + .align 2 DirectSoundWaveData_register_noise:: .incbin "sound/direct_sound_samples/register_noise.bin" diff --git a/sound/direct_sound_samples/cries/archaludon.aif b/sound/direct_sound_samples/cries/archaludon.aif new file mode 100644 index 0000000000..8fbf45fdec Binary files /dev/null and b/sound/direct_sound_samples/cries/archaludon.aif differ diff --git a/sound/direct_sound_samples/cries/gouging_fire.aif b/sound/direct_sound_samples/cries/gouging_fire.aif new file mode 100644 index 0000000000..996a7d8070 Binary files /dev/null and b/sound/direct_sound_samples/cries/gouging_fire.aif differ diff --git a/sound/direct_sound_samples/cries/hydrapple.aif b/sound/direct_sound_samples/cries/hydrapple.aif new file mode 100644 index 0000000000..a9d306e93c Binary files /dev/null and b/sound/direct_sound_samples/cries/hydrapple.aif differ diff --git a/sound/direct_sound_samples/cries/iron_boulder.aif b/sound/direct_sound_samples/cries/iron_boulder.aif new file mode 100644 index 0000000000..15c1b632b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_boulder.aif differ diff --git a/sound/direct_sound_samples/cries/iron_crown.aif b/sound/direct_sound_samples/cries/iron_crown.aif new file mode 100644 index 0000000000..b67a9c7089 Binary files /dev/null and b/sound/direct_sound_samples/cries/iron_crown.aif differ diff --git a/sound/direct_sound_samples/cries/pecharunt.aif b/sound/direct_sound_samples/cries/pecharunt.aif new file mode 100644 index 0000000000..024e6bb587 Binary files /dev/null and b/sound/direct_sound_samples/cries/pecharunt.aif differ diff --git a/sound/direct_sound_samples/cries/raging_bolt.aif b/sound/direct_sound_samples/cries/raging_bolt.aif new file mode 100644 index 0000000000..5b787e8116 Binary files /dev/null and b/sound/direct_sound_samples/cries/raging_bolt.aif differ diff --git a/sound/direct_sound_samples/cries/terapagos.aif b/sound/direct_sound_samples/cries/terapagos.aif new file mode 100644 index 0000000000..a99810cca9 Binary files /dev/null and b/sound/direct_sound_samples/cries/terapagos.aif differ diff --git a/src/data/pokemon/species_info/gen_8.h b/src/data/pokemon/species_info/gen_8.h index 80b0a7c706..efd5077297 100644 --- a/src/data/pokemon/species_info/gen_8.h +++ b/src/data/pokemon/species_info/gen_8.h @@ -1963,7 +1963,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_SUPERSWEET_SYRUP, ABILITY_REGENERATOR, ABILITY_STICKY_HOLD }, .bodyColor = BODY_COLOR_GREEN, .speciesName = _("Hydrapple"), - //.cryId = CRY_HYDRAPPLE, + .cryId = CRY_HYDRAPPLE, .natDexNum = NATIONAL_DEX_HYDRAPPLE, .categoryName = _("Apple Hydra"), .height = 18, @@ -4319,7 +4319,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_STAMINA, ABILITY_STURDY, ABILITY_STALWART }, .bodyColor = BODY_COLOR_WHITE, .speciesName = _("Archaludon"), - //.cryId = CRY_ARCHALUDON, + .cryId = CRY_ARCHALUDON, .natDexNum = NATIONAL_DEX_ARCHALUDON, .categoryName = _("Alloy"), .height = 20, diff --git a/src/data/pokemon/species_info/gen_9.h b/src/data/pokemon/species_info/gen_9.h index f5a80108bb..183a77c0fb 100644 --- a/src/data/pokemon/species_info/gen_9.h +++ b/src/data/pokemon/species_info/gen_9.h @@ -5454,7 +5454,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .bodyColor = BODY_COLOR_BROWN, .isParadoxForm = TRUE, .speciesName = _("GouginFire"), - //.cryId = CRY_GOUGING_FIRE, + .cryId = CRY_GOUGING_FIRE, .natDexNum = NATIONAL_DEX_GOUGING_FIRE, .categoryName = _("Paradox"), .height = 35, @@ -5504,7 +5504,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .bodyColor = BODY_COLOR_YELLOW, .isParadoxForm = TRUE, .speciesName = _("RagingBolt"), - //.cryId = CRY_RAGING_BOLT, + .cryId = CRY_RAGING_BOLT, .natDexNum = NATIONAL_DEX_RAGING_BOLT, .categoryName = _("Paradox"), .height = 52, @@ -5554,7 +5554,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .bodyColor = BODY_COLOR_GRAY, .isParadoxForm = TRUE, .speciesName = _("IronBouldr"), - //.cryId = CRY_IRON_BOULDER, + .cryId = CRY_IRON_BOULDER, .natDexNum = NATIONAL_DEX_IRON_BOULDER, .categoryName = _("Paradox"), .height = 15, @@ -5603,7 +5603,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .bodyColor = BODY_COLOR_BLUE, .isParadoxForm = TRUE, .speciesName = _("Iron Crown"), - //.cryId = CRY_IRON_CROWN, + .cryId = CRY_IRON_CROWN, .natDexNum = NATIONAL_DEX_IRON_CROWN, .categoryName = _("Paradox"), .height = 16, @@ -5642,13 +5642,13 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ .bodyColor = BODY_COLOR_BLUE, \ .speciesName = _("Terapagos"), \ + .cryId = CRY_TERAPAGOS, \ .natDexNum = NATIONAL_DEX_TERAPAGOS, \ .categoryName = _("Tera"), \ LEARNSETS(Terapagos), \ .formSpeciesIdTable = sTerapagosFormSpeciesIdTable, \ .formChangeTable = sTerapagosFormChangeTable, \ .isLegendary = TRUE - //.cryId = CRY_TERAPAGOS, //FOOTPRINT(Terapagos) [SPECIES_TERAPAGOS_NORMAL] = @@ -5777,7 +5777,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .bodyColor = BODY_COLOR_PURPLE, .isMythical = TRUE, .speciesName = _("Pecharunt"), - //.cryId = CRY_PECHARUNT, + .cryId = CRY_PECHARUNT, .natDexNum = NATIONAL_DEX_PECHARUNT, .categoryName = _("Subjugation"), .height = 3,