mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-14 15:43:43 +01:00
Merge pull request #786 from DizzyEggg/u8
GetAbilityBySpecies's arg from bool8 to u8
This commit is contained in:
commit
8e7abad720
@ -506,7 +506,7 @@ u8 CalculatePlayerPartyCount(void);
|
|||||||
u8 CalculateEnemyPartyCount(void);
|
u8 CalculateEnemyPartyCount(void);
|
||||||
u8 GetMonsStateToDoubles(void);
|
u8 GetMonsStateToDoubles(void);
|
||||||
u8 GetMonsStateToDoubles_2(void);
|
u8 GetMonsStateToDoubles_2(void);
|
||||||
u8 GetAbilityBySpecies(u16 species, bool8 abilityNum);
|
u8 GetAbilityBySpecies(u16 species, u8 abilityNum);
|
||||||
u8 GetMonAbility(struct Pokemon *mon);
|
u8 GetMonAbility(struct Pokemon *mon);
|
||||||
void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord);
|
void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord);
|
||||||
u8 GetSecretBaseTrainerPicIndex(void);
|
u8 GetSecretBaseTrainerPicIndex(void);
|
||||||
|
@ -4424,7 +4424,7 @@ u8 GetMonsStateToDoubles_2(void)
|
|||||||
return (aliveCount > 1) ? PLAYER_HAS_TWO_USABLE_MONS : PLAYER_HAS_ONE_USABLE_MON;
|
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)
|
if (abilityNum)
|
||||||
gLastUsedAbility = gBaseStats[species].abilities[1];
|
gLastUsedAbility = gBaseStats[species].abilities[1];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user