More accurate card type constants

1 files changed, 33 insertions, 21 deletions

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index 637eb90..e68046f 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -6,28 +6,40 @@ DECK_NAME_SIZE   EQU  24
 DECK_SIZE        EQU  60
 BENCH_SIZE       EQU   5
 
+;;; generic types
+; double up as Pokemon card types
+FIRE        EQU $0
+GRASS       EQU $1
+LIGHTNING   EQU $2
+WATER       EQU $3
+FIGHTING    EQU $4
+PSYCHIC     EQU $5
+COLORLESS   EQU $6
+UNUSED_TYPE EQU $7
+
+NUM_TYPES EQU UNUSED_TYPE + 1 - FIRE
+
 ;;; card types
-FIRE      EQU $0
-GRASS     EQU $1
-LIGHTNING EQU $2
-WATER     EQU $3
-FIGHTING  EQU $4
-PSYCHIC   EQU $5
-COLORLESS EQU $6
-
-FIRE_ENERGY_CARD             EQU $8
-GRASS_ENERGY_CARD            EQU $9
-LIGHTNING_ENERGY_CARD        EQU $A
-WATER_ENERGY_CARD            EQU $B
-FIGHTING_ENERGY_CARD         EQU $C
-PSYCHIC_ENERGY_CARD          EQU $D
-DOUBLE_COLORLESS_ENERGY_CARD EQU $E
-
-TRAINER_CARD EQU $10
-
-NUM_TYPES EQU FIRE_ENERGY_CARD - FIRE
-
-ENERGY_CARD_F EQU 3
+TYPE_PKMN_FIRE               EQUS "FIRE"
+TYPE_PKMN_GRASS              EQUS "GRASS"
+TYPE_PKMN_LIGHTNING          EQUS "LIGHTNING"
+TYPE_PKMN_WATER              EQUS "WATER"
+TYPE_PKMN_FIGHTING           EQUS "FIGHTING"
+TYPE_PKMN_PSYCHIC            EQUS "PSYCHIC"
+TYPE_PKMN_COLORLESS          EQUS "COLORLESS"
+TYPE_PKMN_UNUSED             EQUS "UNUSED_TYPE"
+TYPE_ENERGY_FIRE             EQU $8
+TYPE_ENERGY_GRASS            EQU $9
+TYPE_ENERGY_LIGHTNING        EQU $A
+TYPE_ENERGY_WATER            EQU $B
+TYPE_ENERGY_FIGHTING         EQU $C
+TYPE_ENERGY_PSYCHIC          EQU $D
+TYPE_ENERGY_DOUBLE_COLORLESS EQU $E
+TYPE_ENERGY_UNUSED           EQU $F
+TYPE_TRAINER                 EQU $10
+TYPE_TRAINER_UNUSED          EQU $11
+
+TYPE_ENERGY_F EQU 3
 
 ;;; rarity
 CIRCLE    EQU $0