Enumerate card type constants

3 files changed, 44 insertions, 42 deletions

diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm
index e68046f..a0b5108 100644
--- a/src/constants/card_data_constants.asm
+++ b/src/constants/card_data_constants.asm
@@ -2,22 +2,18 @@ PKMN_CARD_DATA_LENGTH   EQU $41
 TRN_CARD_DATA_LENGTH    EQU $0e
 ENERGY_CARD_DATA_LENGTH EQU $0e
 
-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
+	const_def
+	const FIRE        ; $0
+	const GRASS       ; $1
+	const LIGHTNING   ; $2
+	const WATER       ; $3
+	const FIGHTING    ; $4
+	const PSYCHIC     ; $5
+	const COLORLESS   ; $6
+	const UNUSED_TYPE ; $7
+NUM_TYPES EQU const_value
 
 ;;; card types
 TYPE_PKMN_FIRE               EQUS "FIRE"
@@ -28,16 +24,18 @@ 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
+const_value set TYPE_PKMN_UNUSED + 1 - TYPE_PKMN_FIRE
+	const TYPE_ENERGY_FIRE              ; $8
+	const TYPE_ENERGY_GRASS             ; $9
+	const TYPE_ENERGY_LIGHTNING         ; $A
+	const TYPE_ENERGY_WATER             ; $B
+	const TYPE_ENERGY_FIGHTING          ; $C
+	const TYPE_ENERGY_PSYCHIC           ; $D
+	const TYPE_ENERGY_DOUBLE_COLORLESS  ; $E
+	const TYPE_ENERGY_UNUSED            ; $F
+	const TYPE_TRAINER                  ; $10
+	const TYPE_TRAINER_UNUSED           ; $11
+NUM_CARD_TYPES EQU const_value + -1
 
 TYPE_ENERGY_F EQU 3
 
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm
index dc34f9a..ee964b3 100644
--- a/src/constants/duel_constants.asm
+++ b/src/constants/duel_constants.asm
@@ -1,3 +1,7 @@
+DECK_NAME_SIZE   EQU  24
+DECK_SIZE        EQU  60
+BENCH_SIZE       EQU   5
+
 PLAYER_TURN   EQUS "wPlayerDuelVariables >> $8"
 OPPONENT_TURN EQUS "wOpponentDuelVariables >> $8"
 
diff --git a/src/engine/boosters.asm b/src/engine/boosters.asm
index a0968c6..16063e5 100755
--- a/src/engine/boosters.asm
+++ b/src/engine/boosters.asm
@@ -141,7 +141,7 @@ GetCardType: ; 1e2a0 (7:62a0)
 	push hl
 	push bc
 	ld hl, CardTypeTable
-	cp $11
+	cp NUM_CARD_TYPES
 	jr nc, .loadType
 	ld c, a
 	ld b, $00
@@ -153,23 +153,23 @@ GetCardType: ; 1e2a0 (7:62a0)
 	ret
 
 CardTypeTable:  ; 1e2b1 (7:62b1)
-	db BOOSTER_CARD_TYPE_FIRE
-	db BOOSTER_CARD_TYPE_GRASS
-	db BOOSTER_CARD_TYPE_LIGHTNING
-	db BOOSTER_CARD_TYPE_WATER
-	db BOOSTER_CARD_TYPE_FIGHTING
-	db BOOSTER_CARD_TYPE_PSYCHIC
-	db BOOSTER_CARD_TYPE_COLORLESS
-	db BOOSTER_CARD_TYPE_TRAINER
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_ENERGY
-	db BOOSTER_CARD_TYPE_TRAINER
-	db BOOSTER_CARD_TYPE_TRAINER
+	db BOOSTER_CARD_TYPE_FIRE      ; TYPE_PKMN_FIRE
+	db BOOSTER_CARD_TYPE_GRASS     ; TYPE_PKMN_GRASS
+	db BOOSTER_CARD_TYPE_LIGHTNING ; TYPE_PKMN_LIGHTNING
+	db BOOSTER_CARD_TYPE_WATER     ; TYPE_PKMN_WATER
+	db BOOSTER_CARD_TYPE_FIGHTING  ; TYPE_PKMN_FIGHTING
+	db BOOSTER_CARD_TYPE_PSYCHIC   ; TYPE_PKMN_PSYCHIC
+	db BOOSTER_CARD_TYPE_COLORLESS ; TYPE_PKMN_COLORLESS
+	db BOOSTER_CARD_TYPE_TRAINER   ; TYPE_PKMN_UNUSED
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_FIRE
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_GRASS
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_LIGHTNING
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_WATER
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_FIGHTING
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_PSYCHIC
+	db BOOSTER_CARD_TYPE_ENERGY    ; TYPE_ENERGY_COLORLESS
+	db BOOSTER_CARD_TYPE_TRAINER   ; TYPE_ENERGY_UNUSED
+	db BOOSTER_CARD_TYPE_TRAINER   ; TYPE_TRAINER
 
 FindTotalTypeChances: ; 1e2c2 (7:62c2)
 	ld c, NUM_BOOSTER_CARD_TYPES