diff options
author | dannye <33dannye@gmail.com> | 2020-12-05 23:03:40 -0600 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2020-12-05 23:03:40 -0600 |
commit | b1dfed568a346d407f8925a6561c27c23c96adfa (patch) | |
tree | eb73f16b923fcb26a3a7230f00e72c5687762e9f /src/constants | |
parent | ff2d704ab42fdabb33a222a497d15ddb84bd314f (diff) | |
parent | 66a5ec1006d54e0e48d544bc0514fba169d47954 (diff) |
Merge branch 'master' of https://github.com/pret/poketcg
Diffstat (limited to 'src/constants')
-rw-r--r-- | src/constants/duel_constants.asm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 344cff1..28199e5 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -118,8 +118,15 @@ PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 -CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed -PSN_DBLPSN EQU $f0 ; poisoned or double poisoned + +DOUBLE_POISONED_F EQU 6 +POISONED_F EQU 7 + + +CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed +PSN_DBLPSN EQU $f0 ; poisoned or double poisoned +PSN_DAMAGE EQU 10 +DBLPSN_DAMAGE EQU 20 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) |