diff --git a/include/constants/cries.h b/include/constants/cries.h index 7c02d43085..0752ac6138 100644 --- a/include/constants/cries.h +++ b/include/constants/cries.h @@ -651,6 +651,7 @@ enum PokemonCry CRY_URSARING, #if P_GEN_8_CROSS_EVOS CRY_URSALUNA, + CRY_URSALUNA_BLOODMOON, #endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA #if P_FAMILY_SLUGMA @@ -2146,6 +2147,7 @@ enum PokemonCry #endif //P_FAMILY_SILICOBRA #if P_FAMILY_CRAMORANT CRY_CRAMORANT, + CRY_CRAMORANT_GULPING, #endif //P_FAMILY_CRAMORANT #if P_FAMILY_ARROKUDA CRY_ARROKUDA, diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 70c73e2fbd..60207bc2ee 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -648,6 +648,7 @@ gCryTable:: cry Cry_Ursaring .if P_GEN_8_CROSS_EVOS == TRUE cry Cry_Ursaluna + cry Cry_UrsalunaBloodmoon .endif @ P_GEN_8_CROSS_EVOS .endif @ P_FAMILY_TEDDIURSA .if P_FAMILY_SLUGMA == TRUE @@ -2143,6 +2144,7 @@ gCryTable:: .endif @ P_FAMILY_SILICOBRA .if P_FAMILY_CRAMORANT == TRUE cry Cry_Cramorant + cry Cry_CramorantGulping .endif @ P_FAMILY_CRAMORANT .if P_FAMILY_ARROKUDA == TRUE cry Cry_Arrokuda @@ -3202,6 +3204,7 @@ gCryTable_Reverse:: cry_reverse Cry_Ursaring .if P_GEN_8_CROSS_EVOS == TRUE cry_reverse Cry_Ursaluna + cry_reverse Cry_UrsalunaBloodmoon .endif @ P_GEN_8_CROSS_EVOS .endif @ P_FAMILY_TEDDIURSA .if P_FAMILY_SLUGMA == TRUE @@ -4697,6 +4700,7 @@ gCryTable_Reverse:: .endif @ P_FAMILY_SILICOBRA .if P_FAMILY_CRAMORANT == TRUE cry_reverse Cry_Cramorant + cry_reverse Cry_CramorantGulping .endif @ P_FAMILY_CRAMORANT .if P_FAMILY_ARROKUDA == TRUE cry_reverse Cry_Arrokuda diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 39a11d202e..cb80e530dc 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1895,6 +1895,10 @@ Cry_Ursaring:: .align 2 Cry_Ursaluna:: .incbin "sound/direct_sound_samples/cries/ursaluna.bin" + + .align 2 +Cry_UrsalunaBloodmoon:: + .incbin "sound/direct_sound_samples/cries/ursaluna_bloodmoon.bin" .endif @ P_GEN_8_CROSS_EVOS .endif @ P_FAMILY_TEDDIURSA @@ -5460,6 +5464,10 @@ Cry_Sandaconda:: .align 2 Cry_Cramorant:: .incbin "sound/direct_sound_samples/cries/cramorant.bin" + + .align 2 +Cry_CramorantGulping:: + .incbin "sound/direct_sound_samples/cries/cramorant_gulping.bin" .endif @ P_FAMILY_CRAMORANT .if P_FAMILY_ARROKUDA == TRUE diff --git a/sound/direct_sound_samples/cries/cramorant_gulping.wav b/sound/direct_sound_samples/cries/cramorant_gulping.wav new file mode 100644 index 0000000000..981f0256ea Binary files /dev/null and b/sound/direct_sound_samples/cries/cramorant_gulping.wav differ diff --git a/sound/direct_sound_samples/cries/oinkologne_f.wav b/sound/direct_sound_samples/cries/oinkologne_f.wav index f075ebb3cf..a0f55e4c5d 100644 Binary files a/sound/direct_sound_samples/cries/oinkologne_f.wav and b/sound/direct_sound_samples/cries/oinkologne_f.wav differ diff --git a/sound/direct_sound_samples/cries/ursaluna_bloodmoon.wav b/sound/direct_sound_samples/cries/ursaluna_bloodmoon.wav new file mode 100644 index 0000000000..680859434f Binary files /dev/null and b/sound/direct_sound_samples/cries/ursaluna_bloodmoon.wav differ diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 88a9037679..b3142f203e 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -6142,7 +6142,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .bodyColor = BODY_COLOR_BROWN, .noFlip = TRUE, .speciesName = _("Ursaluna"), - .cryId = CRY_URSALUNA, + .cryId = CRY_URSALUNA_BLOODMOON, .natDexNum = NATIONAL_DEX_URSALUNA, .categoryName = _("Peat"), .height = 27, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 904d1e8ce1..dfcd8a93f5 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -3125,7 +3125,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Cramorant"), - .cryId = CRY_CRAMORANT, + .cryId = CRY_CRAMORANT_GULPING, .natDexNum = NATIONAL_DEX_CRAMORANT, .categoryName = _("Gulp"), .height = 8, @@ -3182,7 +3182,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .abilities = { ABILITY_GULP_MISSILE, ABILITY_NONE, ABILITY_NONE }, .bodyColor = BODY_COLOR_BLUE, .speciesName = _("Cramorant"), - .cryId = CRY_CRAMORANT, + .cryId = CRY_CRAMORANT_GULPING, .natDexNum = NATIONAL_DEX_CRAMORANT, .categoryName = _("Gulp"), .height = 8,