atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added option to disable species cries (#4791)

Browse source 
* Added option to disable cries

* Update src/pokemon.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
Eduardo Quezada 2024-06-15 16:07:13 -04:00 committed by GitHub
parent e5e38c13f3
commit 1eb0b3261f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config/pokemon.h
View file

@ -41,6 +41,7 @@
// Other settings
#define P_CUSTOM_GENDER_DIFF_ICONS TRUE // If TRUE, will give more Pokémon custom icons for their female forms, i.e. Hippopotas and Hippowdon
#define P_FOOTPRINTS TRUE // If TRUE, Pokémon will have footprints (as was the case up to Gen 5 and in BDSP). Disabling this saves some ROM space.
#define P_CRIES_ENABLED TRUE // If TRUE, Pokémon will have cries. Disabling this saves around a LOT of ROM space (over 25%!), but instead we recommend disabling individual unused Pokémon families in include/config/species_enabled.h.
#define P_LEGENDARY_PERFECT_IVS GEN_LATEST // Since Gen 6, Legendaries, Mythicals and Ultra Beasts found in the wild or given through gifts have at least 3 perfect IVs.
#define P_EV_CAP GEN_LATEST // Since Gen 6, the max EVs per stat is 252 instead of 255.
#define P_SHOW_TERA_TYPE GEN_8 // Since Gen 9, the Tera Type is shown on the summary screen.

4
sound/cry_tables.inc
View file

@ -1,5 +1,6 @@
.align 2
gCryTable::
.if P_CRIES_ENABLED == TRUE
.if P_FAMILY_BULBASAUR == TRUE
cry Cry_Bulbasaur
cry Cry_Ivysaur
@ -2423,9 +2424,11 @@ gCryTable::
.if P_FAMILY_PECHARUNT == TRUE
cry Cry_Pecharunt
.endif @ P_FAMILY_PECHARUNT
.endif @ P_CRIES_ENABLED
.align 2
gCryTable_Reverse::
.if P_CRIES_ENABLED == TRUE
.if P_FAMILY_BULBASAUR == TRUE
cry_reverse Cry_Bulbasaur
cry_reverse Cry_Ivysaur
@ -4849,3 +4852,4 @@ gCryTable_Reverse::
.if P_FAMILY_PECHARUNT == TRUE
cry_reverse Cry_Pecharunt
.endif @ P_FAMILY_PECHARUNT
.endif @ P_CRIES_ENABLED

2
sound/direct_sound_data.inc
View file

@ -386,6 +386,7 @@ DirectSoundWaveData_unknown_16::
DirectSoundWaveData_unknown_17::
.incbin "sound/direct_sound_samples/unknown_17.bin"
.if P_CRIES_ENABLED == TRUE
.if P_FAMILY_BULBASAUR == TRUE
.align 2
Cry_Bulbasaur::
@ -6153,6 +6154,7 @@ Cry_Terapagos::
Cry_Pecharunt::
.incbin "sound/direct_sound_samples/cries/pecharunt.bin"
.endif @ P_FAMILY_PECHARUNT
.endif @ P_CRIES_ENABLED
.align 2
DirectSoundWaveData_register_noise::

4
src/pokemon.c
View file

@ -6828,8 +6828,8 @@ void HealBoxPokemon(struct BoxPokemon *boxMon)
u16 GetCryIdBySpecies(u16 species)
{
species = SanitizeSpeciesId(species);
if (gSpeciesInfo[species].cryId >= CRY_COUNT)
return 0;
if (P_CRIES_ENABLED == FALSE || gSpeciesInfo[species].cryId >= CRY_COUNT)
return CRY_NONE;
return gSpeciesInfo[species].cryId;
}

3
src/sound.c
View file

@ -5,6 +5,7 @@
#include "m4a.h"
#include "main.h"
#include "pokemon.h"
#include "constants/cries.h"
#include "constants/songs.h"
#include "task.h"
@ -460,7 +461,7 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode)
SetPokemonCryPriority(priority);
species = GetCryIdBySpecies(species);
if (species != 0)
if (species != CRY_NONE)
{
species--;
gMPlay_PokemonCry = SetPokemonCryTone(reverse ? &gCryTable_Reverse[species] : &gCryTable[species]);