diff options
| author | dannye <33dannye@gmail.com> | 2020-12-20 13:02:16 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-20 13:02:16 -0600 |
| commit | 614af9729f8b3fe30d52bace28eae083e1bc6127 (patch) | |
| tree | 65d13c1041593dad9ba34c9acb5cbca476894227 /src/constants | |
| parent | b02e5e9cf9e424eacfa8dfffc769b35a3dadfee2 (diff) | |
| parent | f13ddf25bf61c79200c56666184fe84b579ad1cc (diff) | |
Merge branch 'master' of https://github.com/xCrystal/poketcg
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/duel_constants.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 4d2daf2..8255afe 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -189,16 +189,16 @@ UNAFFECTED_BY_WEAKNESS_RESISTANCE_F EQU 7 ; effect command constants (TryExecuteEffectCommandFunction) ; ordered by (roughly) execution time -EFFECTCMDTYPE_INITIAL_EFFECT_1 EQU $01 -EFFECTCMDTYPE_INITIAL_EFFECT_2 EQU $02 -EFFECTCMDTYPE_DISCARD_ENERGY EQU $06 -EFFECTCMDTYPE_REQUIRE_SELECTION EQU $05 -EFFECTCMDTYPE_BEFORE_DAMAGE EQU $03 -EFFECTCMDTYPE_AFTER_DAMAGE EQU $04 -EFFECTCMDTYPE_SWITCH_DEFENDING_PKMN EQU $0a -EFFECTCMDTYPE_PKMN_POWER_TRIGGER EQU $07 -EFFECTCMDTYPE_AI EQU $09 -EFFECTCMDTYPE_AI_SELECTION EQU $08 +EFFECTCMDTYPE_INITIAL_EFFECT_1 EQU $01 +EFFECTCMDTYPE_INITIAL_EFFECT_2 EQU $02 +EFFECTCMDTYPE_DISCARD_ENERGY EQU $06 +EFFECTCMDTYPE_REQUIRE_SELECTION EQU $05 +EFFECTCMDTYPE_BEFORE_DAMAGE EQU $03 +EFFECTCMDTYPE_AFTER_DAMAGE EQU $04 +EFFECTCMDTYPE_AI_SELECTION EQU $08 +EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN EQU $0a +EFFECTCMDTYPE_PKMN_POWER_TRIGGER EQU $07 +EFFECTCMDTYPE_AI EQU $09 ; wDamageEffectiveness constants WEAKNESS EQU 1 |