diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 17:31:00 -0500 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 17:31:00 -0500 |
| commit | e8ec8efa902ea56cf17bdcd908067247d13ee28d (patch) | |
| tree | ba708ba6b0e0125148de6de2c48713d0b64d70de /src/constants/card_data_constants.asm | |
| parent | 5930b53dd28705197ebfc1a905ea3175552ba39a (diff) | |
| parent | 9fab715759ddf919b0c4bb9a01095c4c225fcac0 (diff) | |
Merge in master (and update some macros)
Diffstat (limited to 'src/constants/card_data_constants.asm')
| -rw-r--r-- | src/constants/card_data_constants.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 3f26e4d..cfb855b 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -116,7 +116,7 @@ TYPE_ENERGY EQU const_value const TYPE_ENERGY_UNUSED ; $0f const TYPE_TRAINER ; $10 const TYPE_TRAINER_UNUSED ; $11 -NUM_CARD_TYPES EQU const_value + -1 +NUM_CARD_TYPES EQU const_value - 1 TYPE_PKMN EQU %111 TYPE_ENERGY_F EQU 3 @@ -146,6 +146,7 @@ PRO EQU $8 BASIC EQU $00 STAGE1 EQU $01 STAGE2 EQU $02 +STAGE2_WITHOUT_STAGE1 EQU $03 ; CARD_DATA_WEAKNESS and CARD_DATA_RESISTANCE constants WR_FIRE EQU $80 |