summaryrefslogtreecommitdiff
path: root/src/constants
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-03-05 14:40:38 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-03-05 14:40:38 +0100
commit4f740092b306c1652131fe37dde65d35a42a0b6b (patch)
tree78c635aceb2dde9ac92790b48a3482350d3ae20d /src/constants
parent613e12b1e2da06f593bd24b434ca96063923ff8b (diff)
no need for CARD_ prefix in status constants
Diffstat (limited to 'src/constants')
-rw-r--r--src/constants/duel_constants.asm14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index 0ba6715..87bfdba 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -39,9 +39,11 @@ CARD_LOCATION_BENCH_5 EQU $15
; status condition constants
; two statuses can be combined if they are identified by a different nybble
-CARD_NOSTATUS EQU $00
-CARD_CONFUSED EQU $01
-CARD_ASLEEP EQU $02
-CARD_PARALYZED EQU $03
-CARD_POISONED EQU $80
-CARD_DOUBLE_POISONED EQU $c0
+CARD_NOSTATUS EQU $00
+CONFUSED EQU $01
+ASLEEP EQU $02
+PARALYZED EQU $03
+POISONED EQU $80
+DOUBLE_POISONED EQU $c0
+
+PASSIVE_STATUS_MASK EQU $f ; confused, asleep or paralyzed