diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-08-22 17:45:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-22 17:45:56 -0500 |
| commit | 8e7abad720481b46da460d1072ca5a84671fd3a3 (patch) | |
| tree | 5ec2b39d573a83eaa78c25ca692c642e33bcda38 | |
| parent | f76f3955637478ea58b71a6c9e9c2f72ce05a3af (diff) | |
| parent | d09c290ebaf0be9a9dc4f2f9858ea0e9750df146 (diff) | |
Merge pull request #786 from DizzyEggg/u8
GetAbilityBySpecies's arg from bool8 to u8
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | src/pokemon.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 07bcff2e3..ec125573c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -506,7 +506,7 @@ u8 CalculatePlayerPartyCount(void); u8 CalculateEnemyPartyCount(void); u8 GetMonsStateToDoubles(void); u8 GetMonsStateToDoubles_2(void); -u8 GetAbilityBySpecies(u16 species, bool8 abilityNum); +u8 GetAbilityBySpecies(u16 species, u8 abilityNum); u8 GetMonAbility(struct Pokemon *mon); void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord); u8 GetSecretBaseTrainerPicIndex(void); diff --git a/src/pokemon.c b/src/pokemon.c index cb7be1715..df31bc6b3 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4424,7 +4424,7 @@ u8 GetMonsStateToDoubles_2(void) return (aliveCount > 1) ? PLAYER_HAS_TWO_USABLE_MONS : PLAYER_HAS_ONE_USABLE_MON; } -u8 GetAbilityBySpecies(u16 species, bool8 abilityNum) +u8 GetAbilityBySpecies(u16 species, u8 abilityNum) { if (abilityNum) gLastUsedAbility = gBaseStats[species].abilities[1]; |