diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
| commit | 1ac177723de817a85533adc3e984425d3ab86e00 (patch) | |
| tree | 3f5ce54362ad9a8c75e21c52f78ce3b4bcd460f2 /include/battle_script_commands.h | |
| parent | eff1ad330031633b2a28f2b9e8bc8f5e5258826a (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into field_poison
Diffstat (limited to 'include/battle_script_commands.h')
| -rw-r--r-- | include/battle_script_commands.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index ebfeabccc..80fabaa64 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -1,6 +1,10 @@ #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H #define GUARD_BATTLE_SCRIPT_COMMANDS_H +#define NO_ACC_CALC 0xFFFE +#define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF +#define ACC_CURR_MOVE 0 + #define CMP_EQUAL 0x0 #define CMP_NOT_EQUAL 0x1 #define CMP_GREATER_THAN 0x2 @@ -21,7 +25,7 @@ #define VARIOUS_CANCEL_MULTI_TURN_MOVES 0 #define VARIOUS_SET_MAGIC_COAT_TARGET 1 -#define VARIOUS_CAN_RUN_FROM_BATTLE 2 +#define VARIOUS_IS_RUNNING_IMPOSSIBLE 2 #define VARIOUS_GET_MOVE_TARGET 3 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 |