diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2020-04-24 20:23:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 20:23:51 +0200 |
| commit | ebd79f9631342cd5969b57eb8215ef1a23becbb9 (patch) | |
| tree | 44a9d03f62e0a462e6efb5ae431daf2520a5186c /src/constants | |
| parent | e360e0102a7332dc9a026327e2cbcce71c6cdcd4 (diff) | |
| parent | 9aa5cba752d247f94179b0c9fc6a558f26f77a47 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/card_data_constants.asm | 13 | ||||
| -rw-r--r-- | src/constants/duel_constants.asm | 26 |
2 files changed, 37 insertions, 2 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 9d4c88f..3f26e4d 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -41,7 +41,7 @@ CARD_DATA_MOVE1_EFFECT_COMMANDS EQU $18 CARD_DATA_MOVE1_FLAG1 EQU $1a CARD_DATA_MOVE1_FLAG2 EQU $1b CARD_DATA_MOVE1_FLAG3 EQU $1c -CARD_DATA_MOVE1_UNKNOWN1 EQU $1d +CARD_DATA_MOVE1_EFFECT_PARAM EQU $1d CARD_DATA_MOVE1_ANIMATION EQU $1e ; TYPE_PKMN card only @@ -55,7 +55,7 @@ CARD_DATA_MOVE2_EFFECT_COMMANDS EQU $2b CARD_DATA_MOVE2_FLAG1 EQU $2d CARD_DATA_MOVE2_FLAG2 EQU $2e CARD_DATA_MOVE2_FLAG3 EQU $2f -CARD_DATA_MOVE2_UNKNOWN1 EQU $30 +CARD_DATA_MOVE2_EFFECT_PARAM EQU $30 CARD_DATA_MOVE2_ANIMATION EQU $31 ; TYPE_PKMN card only @@ -226,3 +226,12 @@ FLAG_3_BIT_1 EQU $1 << FLAG_3_BIT_1_F ; special CARD_DATA_RETREAT_COST values UNABLE_RETREAT EQU $64 + +; attack index constants +FIRST_ATTACK_OR_PKMN_POWER EQU $0 +SECOND_ATTACK EQU $1 + +; whether move with the ATTACHED_ENERGY_BOOST flag +; has limit on attached energy cards boost. +MAX_ENERGY_BOOST_IS_LIMITED EQU $2 +MAX_ENERGY_BOOST_IS_NOT_LIMITED EQU $3 diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index f3e2912..65f58e3 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -224,3 +224,29 @@ EFFECT_FAILED_UNSUCCESSFUL EQU $02 ; wAnimationQueue length ANIMATION_QUEUE_LENGTH EQU 7 + +; wPreviousAIFlags and wCurrentAIFlags constants +AI_FLAG_USED_PLUSPOWER EQU 1 << 0 +AI_FLAG_USED_SWITCH EQU 1 << 1 +AI_FLAG_USED_PROFESSOR_OAK EQU 1 << 2 +AI_FLAG_MODIFIED_HAND EQU 1 << 3 +AI_FLAG_USED_GUST_OF_WIND EQU 1 << 4 + +; used to determine which Trainer cards for AI +; to process in AIProcessHandTrainerCards. +; aside from a few exceptions, these go in chronological order. +AI_TRAINER_CARD_PHASE_01 EQU $1 +AI_TRAINER_CARD_PHASE_02 EQU $2 +AI_TRAINER_CARD_PHASE_03 EQU $3 +AI_TRAINER_CARD_PHASE_04 EQU $4 +AI_TRAINER_CARD_PHASE_05 EQU $5 +AI_TRAINER_CARD_PHASE_06 EQU $6 +AI_TRAINER_CARD_PHASE_07 EQU $7 +AI_TRAINER_CARD_PHASE_08 EQU $8 +AI_TRAINER_CARD_PHASE_09 EQU $9 +AI_TRAINER_CARD_PHASE_10 EQU $a +AI_TRAINER_CARD_PHASE_11 EQU $b +AI_TRAINER_CARD_PHASE_12 EQU $c +AI_TRAINER_CARD_PHASE_13 EQU $d +AI_TRAINER_CARD_PHASE_14 EQU $e +AI_TRAINER_CARD_PHASE_15 EQU $f |