summaryrefslogtreecommitdiff
path: root/src/constants
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2016-03-06 20:26:43 +0100
committerxCrystal <rgr.crystal@gmail.com>2016-03-06 20:27:47 +0100
commitd351b99bd529c265d6084c51789006ee378c19be (patch)
treeb7aaff81563cd32c9197d67343aca605677c40dd /src/constants
parent3a04be80b0e7fd12716207e78638cf08171ea471 (diff)
wMoveBuffer and wDamage
Diffstat (limited to 'src/constants')
-rw-r--r--src/constants/card_data_constants.asm13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 44d181b..bc4e6d3 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -58,12 +58,13 @@ WR_FIGHTING EQU $08
WR_PSYCHIC EQU $04
;;; move category (6th param of Pokemon cards move data)
-DAMAGE_NORMAL EQU $0
-DAMAGE_PLUS EQU $1
-DAMAGE_MINUS EQU $2
-DAMAGE_X EQU $3
-POKEMON_POWER EQU $4
-RESIDUAL EQU $80
+DAMAGE_NORMAL EQU $0
+DAMAGE_PLUS EQU $1
+DAMAGE_MINUS EQU $2
+DAMAGE_X EQU $3
+POKEMON_POWER EQU $4
+RESIDUAL_F EQU 7
+RESIDUAL EQU 1 << RESIDUAL_F
;;; flags 1 (8th param of Pokemon cards move data)
INFLICT_POISON EQU %00000001