diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-13 11:16:34 -0400 |
commit | e24f3808f47d292776f4e7506217f93756dd19bf (patch) | |
tree | d910619ff23e466bfd4b673381c1642656e3dc5c /include/battle_script_commands.h | |
parent | 74c59af856216332b6c73cbc382edff3518a0eab (diff) | |
parent | 52db3ad5aa83ae70e06eae87f502b09fff55aecc (diff) |
Merge branch 'master' into mail
Diffstat (limited to 'include/battle_script_commands.h')
-rw-r--r-- | include/battle_script_commands.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index ae0d20f28..590944f02 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -43,7 +43,7 @@ void AI_CalcDmg(u8 bankAtk, u8 bankDef); u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); -u8 AI_TypeCalc(u16 move, u16 species, u8 ability); +u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); u8 BankGetTurnOrder(u8 bank); void SetMoveEffect(bool8 primary, u8 certain); void BattleDestroyCursorAt(u8 cursorPosition); |