diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-29 00:52:32 -0600 |
| commit | 70743f4b951bb84ca33fd2151e55b2f5018eb6c5 (patch) | |
| tree | 7298959f4e81c88adeac0c26b9016b9d197da1fd /include/pokemon.h | |
| parent | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (diff) | |
| parent | 54da96309186b98263b4434911e1c5b8d4b4e3ec (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 1eb052f4e..480c8d9b9 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -642,8 +642,8 @@ u8 CheckPartyPokerus(struct Pokemon *party, u8 selection); u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection); void UpdatePartyPokerusTime(u16 days); void PartySpreadPokerus(struct Pokemon *party); -s8 GetMonFlavourRelation(struct Pokemon *mon, u8 a2); -s8 GetFlavourRelationByPersonality(u32 personality, u8 a2); +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2); +s8 GetFlavorRelationByPersonality(u32 personality, u8 a2); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); u8 GetDefaultMoveTarget(u8 atkBank); u16 PlayerGenderToFrontTrainerPicId(u8 playerGender); |