diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:22 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:29 -0600 |
| commit | 4767f21f2e72ae89ab542d61a86d5fbbe85df1a2 (patch) | |
| tree | 985706af891626bcf4335ad26758dbdcef617cf5 /constants | |
| parent | 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (diff) | |
Port updated battle_script macros from pokeemerald
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/battle_script_constants.inc | 13 | ||||
| -rw-r--r-- | constants/misc_constants.inc | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/constants/battle_script_constants.inc b/constants/battle_script_constants.inc new file mode 100644 index 000000000..291807e0d --- /dev/null +++ b/constants/battle_script_constants.inc @@ -0,0 +1,13 @@ +@ various + .set VARIOUS_CANCEL_MULTI_TURN_MOVES, 0 + .set VARIOUS_SET_MAGIC_COAT_TARGET, 1 + .set VARIOUS_IS_RUNNING_IMPOSSIBLE, 2 + .set VARIOUS_GET_MOVE_TARGET, 3 + .set VARIOUS_RESET_INTIMIDATE_TRACE_BITS, 5 + .set VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP, 6 + .set VARIOUS_EMIT_YESNOBOX, 13 + .set VARIOUS_WAIT_CRY, 18 + .set VARIOUS_RETURN_OPPONENT_MON1, 19 + .set VARIOUS_RETURN_OPPONENT_MON2, 20 + .set VARIOUS_SET_TELEPORT_OUTCOME, 25 + .set VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC, 26 diff --git a/constants/misc_constants.inc b/constants/misc_constants.inc index 5f4330928..bf90fcd1e 100644 --- a/constants/misc_constants.inc +++ b/constants/misc_constants.inc @@ -45,7 +45,3 @@ .equiv PLAYER_TYPE1, 2 .equiv PLAYER_TYPE2, 3 .equiv CURRENT_MOVE, 4 - - .equiv LESS_THAN, 0 - .equiv GREATER_THAN, 1 - .equiv EQUAL, 2 |