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

Updated OW_SYNCHRONIZE_NATURE statement in ScriptGiveMonParameterized (#4271)

Browse source 
Fixes an issue where the nature of a Deoxys would be randomized even if one was set at the time of calling givemon or the functions related to it.
This commit is contained in:
LOuroboros 2024-03-14 18:02:19 -03:00 committed by GitHub
parent 6804e82c0a
commit 15aa909944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/script_pokemon_util.c
View file

@ -299,10 +299,14 @@ u32 ScriptGiveMonParameterized(u16 species, u8 level, u16 item, u8 ball, u8 natu
u16 targetSpecies; u16 targetSpecies;
// check whether to use a specific nature or a random one // check whether to use a specific nature or a random one
if (OW_SYNCHRONIZE_NATURE >= GEN_6 && (gSpeciesInfo[species].eggGroups[0] == EGG_GROUP_NO_EGGS_DISCOVERED || OW_SYNCHRONIZE_NATURE == GEN_7)) if (nature >= NUM_NATURES)
{
if (OW_SYNCHRONIZE_NATURE >= GEN_6
&& (gSpeciesInfo[species].eggGroups[0] == EGG_GROUP_NO_EGGS_DISCOVERED || OW_SYNCHRONIZE_NATURE == GEN_7))
nature = PickWildMonNature(); nature = PickWildMonNature();
else if (nature >= NUM_NATURES) else
nature = Random() % NUM_NATURES; nature = Random() % NUM_NATURES;
}
// create a Pokémon with basic data // create a Pokémon with basic data
if ((gender == MON_MALE && genderRatio != MON_FEMALE && genderRatio != MON_GENDERLESS) if ((gender == MON_MALE && genderRatio != MON_FEMALE && genderRatio != MON_GENDERLESS)