diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:37:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-01 23:39:54 -0400 |
| commit | 17fd3bccf7a6dd49362f2d280ba2f6670cb5ac0f (patch) | |
| tree | df66ddc51a60e6de70e3cdfbb6924a52a4c6ab6f /include/battle_script_commands.h | |
| parent | bb10a4dd57fdbdd9b2c0e3962adef705d8ab8f39 (diff) | |
| parent | 63210c07897e86953bf093397eee5a33e95b8c91 (diff) | |
Merge branch 'master' into secret_base
Diffstat (limited to 'include/battle_script_commands.h')
| -rw-r--r-- | include/battle_script_commands.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 590944f02..a466abc04 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -25,6 +25,7 @@ #define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 +#define VARIOUS_EMIT_YESNOBOX 13 #define VARIOUS_WAIT_CRY 18 #define VARIOUS_RETURN_OPPONENT_MON1 19 #define VARIOUS_RETURN_OPPONENT_MON2 20 @@ -41,15 +42,18 @@ #define STAT_CHANGE_WORKED 0 #define STAT_CHANGE_DIDNT_WORK 1 +#define WINDOW_CLEAR 0x1 +#define WINDOW_x80 0x80 + void AI_CalcDmg(u8 bankAtk, u8 bankDef); u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef); u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); u8 BankGetTurnOrder(u8 bank); void SetMoveEffect(bool8 primary, u8 certain); -void BattleDestroyCursorAt(u8 cursorPosition); -void BattleCreateCursorAt(u8 cursorPosition); +void BattleDestroyYesNoCursorAt(u8 cursorPosition); +void BattleCreateYesNoCursorAt(u8 cursorPosition); void BufferMoveToLearnIntoBattleTextBuff2(void); -void sub_8056A3C(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); +void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); bool8 UproarWakeUpCheck(u8 bank); extern void (* const gBattleScriptingCommandsTable[])(void); |