diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-10 18:01:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-10 18:01:45 +0200 |
| commit | 57e5624e0619b8d96fb43ff68d9eeefe734b1a4f (patch) | |
| tree | f62c13b0836f07817ee3dbd716c74947179d4ee1 /include | |
| parent | 8914645231c9301579ed39bdd9200ad50e5296d0 (diff) | |
battle9 is being worked on
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_controllers.h | 1 | ||||
| -rw-r--r-- | include/battle_script_commands.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h index eea544b55..e36c95fbe 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -84,5 +84,6 @@ void Emit_x32(u8 bufferId); void EmitPrintString(u8 bufferId, u16 stringId); void EmitResetActionMoveSelection(u8 bufferId, u8 caseId); void EmitBallThrow(u8 bufferId, u8 caseId); +void EmitCmd_x21(u8 bufferId, u8 arg1, u16 arg2); #endif // GUARD_BATTLE_CONTROLLERS_H 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); |