diff options
Diffstat (limited to 'src/engine/boosters.asm')
| -rwxr-xr-x | src/engine/boosters.asm | 36 |
1 files changed, 18 insertions, 18 deletions
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 |