diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-26 17:52:36 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-26 17:52:36 -0600 |
| commit | fea25ae342192c6b8658cacc58707e5f6e65edae (patch) | |
| tree | 1abe51854a27ab393fde0aba87e874d870c1c714 /src/constants | |
| parent | 21fa3a7f123d915511b4ef699e610cd2718ccaaa (diff) | |
Clean up move effect flags
use generic constant names for unnamed flags, so that if they are
named in the future, it will not be a chore
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/card_data_constants.asm | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 8228d2f..7c1359c 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -38,33 +38,28 @@ POKEMON_POWER EQU $4 RESIDUAL EQU $80 ;;; flags 1 (8th param of Pokemon cards move data) -INFLICT_POISON EQU $1 -INFLICT_SLEEP EQU $2 -INFLICT_PARALYSIS EQU $4 -INFLICT_CONFUSION EQU $8 -LOW_RECOIL EQU $10 -DAMAGE_TO_OPPONENT_BENCH EQU $20 -HIGH_RECOIL EQU $40 -DRAW_CARD EQU $80 +INFLICT_POISON EQU %00000001 +INFLICT_SLEEP EQU %00000010 +INFLICT_PARALYSIS EQU %00000100 +INFLICT_CONFUSION EQU %00001000 +LOW_RECOIL EQU %00010000 +DAMAGE_TO_OPPONENT_BENCH EQU %00100000 +HIGH_RECOIL EQU %01000000 +DRAW_CARD EQU %10000000 ;;; flags 2 (9th param of Pokemon cards move data) ; bits 5, 6 and 7 cover a wide variety of effects -SWITCH_OPPONENT_POKEMON EQU $1 -HEAL_USER EQU $2 -NULLIFY_OR_WEAKEN_ATTACK EQU $4 -DISCARD_ENERGY EQU $8 -ATTACHED_ENERGY_BOOST EQU $10 -; EQU $20 -; EQU $40 -; EQU $80 +SWITCH_OPPONENT_POKEMON EQU %00000001 +HEAL_USER EQU %00000010 +NULLIFY_OR_WEAKEN_ATTACK EQU %00000100 +DISCARD_ENERGY EQU %00001000 +ATTACHED_ENERGY_BOOST EQU %00010000 +FLAG_2_BIT_5 EQU %00100000 +FLAG_2_BIT_6 EQU %01000000 +FLAG_2_BIT_7 EQU %10000000 ;;; flags 2 (10th param of Pokemon cards move data) ; bit 1 covers a wide variety of effects ; bits 2-7 are unused -BOOST_IF_TAKEN_DAMAGE EQU $1 -; EQU $2 - - - - - +BOOST_IF_TAKEN_DAMAGE EQU %00000001 +FLAG_3_BIT_1 EQU %00000010 |