diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-10 20:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-10 20:06:25 -0400 |
| commit | 4fb008844030283ad34cb0802b088b4dd7c9891c (patch) | |
| tree | 6854c5ea9c5311b677bfbcae0616f0979b754060 /constants/trainer_data_constants.asm | |
| parent | 9e4a00af4523cdfacbb6b245679e2e60fbc6b375 (diff) | |
| parent | c086de0c986330b09cd5e9fa384b950107ee4955 (diff) | |
Merge pull request #740 from Rangi42/master
Remove enum; add const_skip and const_next
Diffstat (limited to 'constants/trainer_data_constants.asm')
| -rw-r--r-- | constants/trainer_data_constants.asm | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/constants/trainer_data_constants.asm b/constants/trainer_data_constants.asm index 00c1c6c38..0f8932535 100644 --- a/constants/trainer_data_constants.asm +++ b/constants/trainer_data_constants.asm @@ -4,16 +4,14 @@ const TRNATTR_ITEM2 ; 1 const TRNATTR_BASEMONEY ; 2 const TRNATTR_AI_MOVE_WEIGHTS ; 3 - const TRNATTR_AI2 ; 4 + const_skip ; high TRNATTR_AI_MOVE_WEIGHTS byte const TRNATTR_AI_ITEM_SWITCH ; 5 - const TRNATTR_AI4 ; 6 + const_skip ; high TRNATTR_AI_ITEM_SWITCH byte NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) ; AIScoringPointers indexes (see engine/battle/ai/move.asm) const_def - const NO_AI -const_value = 0 shift_const AI_BASIC shift_const AI_SETUP shift_const AI_TYPES @@ -24,27 +22,24 @@ const_value = 0 shift_const AI_CAUTIOUS shift_const AI_STATUS shift_const AI_RISKY - shift_const AI_10 - shift_const AI_11 - shift_const AI_12 - shift_const AI_13 - shift_const AI_14 - shift_const AI_15 +NO_AI EQU 0 ; TRNATTR_AI_ITEM_SWITCH bit flags -CONTEXT_USE_F EQU 6 -UNKNOWN_USE_F EQU 5 -ALWAYS_USE_F EQU 4 -SWITCH_SOMETIMES_F EQU 2 -SWITCH_RARELY_F EQU 1 -SWITCH_OFTEN_F EQU 0 + const_def + const SWITCH_OFTEN_F ; 0 + const SWITCH_RARELY_F ; 1 + const SWITCH_SOMETIMES_F ; 2 + const_skip ; 3 + const ALWAYS_USE_F ; 4 + const UNKNOWN_USE_F ; 5 + const CONTEXT_USE_F ; 6 -CONTEXT_USE EQU 1 << CONTEXT_USE_F -UNKNOWN_USE EQU 1 << UNKNOWN_USE_F -ALWAYS_USE EQU 1 << ALWAYS_USE_F -SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F -SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F +SWITCH_RARELY EQU 1 << SWITCH_RARELY_F +SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F +ALWAYS_USE EQU 1 << ALWAYS_USE_F +UNKNOWN_USE EQU 1 << UNKNOWN_USE_F +CONTEXT_USE EQU 1 << CONTEXT_USE_F ; TrainerTypes indexes (see engine/battle/read_trainer_party.asm) const_def |