diff options
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/card_data_constants.asm | 4 | ||||
| -rw-r--r-- | src/constants/duel_constants.asm | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index a98a0c7..5a5898e 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -39,7 +39,9 @@ TYPE_PKMN_UNUSED EQUS "UNUSED_TYPE" const TYPE_TRAINER_UNUSED ; $11 NUM_CARD_TYPES EQU const_value + -1 -TYPE_ENERGY_F EQU 3 +TYPE_PKMN EQU %111 +TYPE_ENERGY_F EQU 3 +TYPE_TRAINER_F EQU 4 ;;; rarity CIRCLE EQU $0 diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 4994c0c..ba4bb3f 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -59,7 +59,12 @@ CARD_LOCATION_BENCH_2 EQU $12 CARD_LOCATION_BENCH_3 EQU $13 CARD_LOCATION_BENCH_4 EQU $14 CARD_LOCATION_BENCH_5 EQU $15 -CARD_LOCATION_JUST_DRAWN EQU $40 + +; card location flags (DUELVARS_CARD_LOCATIONS) +CARD_LOCATION_PLAY_AREA_F EQU 4 ; includes arena and bench +CARD_LOCATION_PLAY_AREA EQU 1 << CARD_LOCATION_PLAY_AREA_F +CARD_LOCATION_JUST_DRAWN_F EQU 6 +CARD_LOCATION_JUST_DRAWN EQU 1 << CARD_LOCATION_JUST_DRAWN_F ; duelist types (DUELVARS_DUELIST_TYPE) DUELIST_TYPE_PLAYER EQU $00 |