Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Added Indigo Disk cries (#4164)

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone 2024-02-09 15:46:09 -03:00 committed by GitHub
parent f873c6f93b
commit 6da1be01a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 104 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/constants/cries.h
View File

@ -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,
};

44
sound/cry_tables.inc
View File

@ -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

44
sound/direct_sound_data.inc
View File

@ -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"

BIN
sound/direct_sound_samples/cries/archaludon.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/gouging_fire.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/hydrapple.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/iron_boulder.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/iron_crown.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/pecharunt.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/raging_bolt.aif Normal file
View File

Binary file not shown.

BIN
sound/direct_sound_samples/cries/terapagos.aif Normal file
View File

Binary file not shown.

4
src/data/pokemon/species_info/gen_8.h
View File

@ -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,

12
src/data/pokemon/species_info/gen_9.h
View File

@ -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,