diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 14:03:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 14:03:15 -0400 |
| commit | 9c6cee5d6c44820913786ff0c8b448be53ced95d (patch) | |
| tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /include | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
| parent | 1d4234bd7e295c553485b7d676d42c838e4762c4 (diff) | |
Merge pull request #100 from jiangzhengwenjz/PIE2
closer PokemonUseItemEffects2
Diffstat (limited to 'include')
| -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 5ec4443c6..c5ee4eda5 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -610,8 +610,8 @@ u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex); void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex); void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex); bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex); -bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex, u8 e); -bool8 PokemonUseItemEffects2(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 moveIndex, u8 e); +bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e); +bool8 PokemonUseItemEffects2(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId); u8 GetNature(struct Pokemon *mon); |