dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Change abilities in base stats to array

Browse Source
This commit is contained in:
DizzyEggg
2019-05-14 15:42:55 +02:00
committed by huderlem
parent 33979f0fa6
commit 4ae1e014bc
9 changed files with 417 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon.c
+3 -3
View File
@@ -2248,7 +2248,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &iv);
}
if (gBaseStats[species].ability2)
if (gBaseStats[species].abilities[1])
{
value = personality & 1;
SetBoxMonData(boxMon, MON_DATA_ABILITY_NUM, &value);
@@ -4432,9 +4432,9 @@ u8 GetMonsStateToDoubles_2(void)
u8 GetAbilityBySpecies(u16 species, bool8 abilityNum)
{
if (abilityNum)
gLastUsedAbility = gBaseStats[species].ability2;
gLastUsedAbility = gBaseStats[species].abilities[1];
else
gLastUsedAbility = gBaseStats[species].ability1;
gLastUsedAbility = gBaseStats[species].abilities[0];
return gLastUsedAbility;
}