summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-02-10 15:52:58 -0600
committerGitHub <noreply@github.com>2018-02-10 15:52:58 -0600
commit24f40989d472407dc51653f2a671348126c6e816 (patch)
tree3aa0db9181a57a8dd5456955f7957a1950fe1400 /src/data
parent9b373dbff462614e484c0a5584e089e668bfd469 (diff)
parentf541f5e03adadf0b9315cc642da9a5b377b52c12 (diff)
Merge pull request #34 from xCrystal/master
Some Home disasm ; Misc style fixes, constants and labeling ; Split macros ; Create linkerscript and arrange Sections ; Bump extras
Diffstat (limited to 'src/data')
-rw-r--r--src/data/booster_packs.asm448
-rwxr-xr-xsrc/data/cards.asm917
-rwxr-xr-xsrc/data/decks.asm208
-rw-r--r--[-rwxr-xr-x]src/data/npcs.asm (renamed from src/data/unknownNPCData.asm)3026
-rw-r--r--[-rwxr-xr-x]src/data/warps.asm (renamed from src/data/warp_data.asm)0
5 files changed, 2499 insertions, 2100 deletions
diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
new file mode 100644
index 0000000..8f8d8c2
--- /dev/null
+++ b/src/data/booster_packs.asm
@@ -0,0 +1,448 @@
+BoosterSetRarityAmountTable: ; 1e4d4 (7::64d4)
+; energies, commons, uncommons, rares
+; commons + uncommons + rares needs to be equal to 10 minus the number of energy cards
+; defined in the pack's data below; otherwise, the number of cards in the pack won't be 10.
+ db $01, $05, $03, $01 ; COLOSSEUM >> 4
+ db $01, $05, $03, $01 ; EVOLUTION >> 4
+ db $00, $06, $03, $01 ; MYSTERY >> 4
+ db $00, $06, $03, $01 ; LABORATORY >> 4
+
+; For the energy or energy generation function, there are three options:
+; - Ponter to a function that generates energies (some generate one, some generate a full pack)
+; - A single energy of a specific type
+; - $0000 if no card in the pack is an energy
+
+PackColosseumNeutral:: ; 1e4e4 (7:64e4)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+ db $14 ; Grass Type Chance
+ db $14 ; Fire Type Chance
+ db $14 ; Water Type Chance
+ db $14 ; Lightning Type Chance
+ db $14 ; Fighting Type Chance
+ db $14 ; Psychic Type Chance
+ db $14 ; Colorless Type Chance
+ db $14 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumGrass:: ; 1e4f0 (7:64f0)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GRASS_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $30 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumFire:: ; 1e4fc (7:64fc)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw FIRE_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $30 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumWater:: ; 1e508 (7:6508)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw WATER_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $30 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumLightning:: ; 1e514 (7:6514)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw LIGHTNING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $30 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumFighting:: ; 1e520 (7:6520)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw FIGHTING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $30 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackColosseumTrainer:: ; 1e52c (7:652c)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $30 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionNeutral:: ; 1e538 (7:6538)
+ db EVOLUTION >> 4 ; booster pack set
+ dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+ db $14 ; Grass Type Chance
+ db $14 ; Fire Type Chance
+ db $14 ; Water Type Chance
+ db $14 ; Lightning Type Chance
+ db $14 ; Fighting Type Chance
+ db $14 ; Psychic Type Chance
+ db $14 ; Colorless Type Chance
+ db $14 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionGrass:: ; 1e544 (7:6544)
+ db EVOLUTION >> 4 ; booster pack set
+ dw GRASS_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $30 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionNeutralFireEnergy:: ; 1e550 (7:6550)
+ db EVOLUTION >> 4 ; booster pack set
+ dw FIRE_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $14 ; Grass Type Chance
+ db $14 ; Fire Type Chance
+ db $14 ; Water Type Chance
+ db $14 ; Lightning Type Chance
+ db $14 ; Fighting Type Chance
+ db $14 ; Psychic Type Chance
+ db $14 ; Colorless Type Chance
+ db $14 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionWater:: ; 1e55c (7:655c)
+ db EVOLUTION >> 4 ; booster pack set
+ dw WATER_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $30 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionFighting:: ; 1e568 (7:6568)
+ db EVOLUTION >> 4 ; booster pack set
+ dw FIGHTING_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $30 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionPsychic:: ; 1e574 (7:6574)
+ db EVOLUTION >> 4 ; booster pack set
+ dw PSYCHIC_ENERGY ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $30 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEvolutionTrainer:: ; 1e580 (7:6580)
+ db EVOLUTION >> 4 ; booster pack set
+ dw GenerateEndingEnergy ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $30 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackMysteryNeutral:: ; 1e58c (7:658c)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $11 ; Grass Type Chance
+ db $11 ; Fire Type Chance
+ db $11 ; Water Type Chance
+ db $11 ; Lightning Type Chance
+ db $11 ; Fighting Type Chance
+ db $11 ; Psychic Type Chance
+ db $11 ; Colorless Type Chance
+ db $11 ; Trainer Card Chance
+ db $11 ; Energy Card Chance
+
+PackMysteryGrassColorless:: ; 1e598 (7:6598)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $30 ; Grass Type Chance
+ db $0C ; Fire Type Chance
+ db $0C ; Water Type Chance
+ db $0C ; Lightning Type Chance
+ db $0C ; Fighting Type Chance
+ db $0C ; Psychic Type Chance
+ db $16 ; Colorless Type Chance
+ db $0C ; Trainer Card Chance
+ db $0C ; Energy Card Chance
+
+PackMysteryWaterColorless:: ; 1e5a4 (7:65a4)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $0C ; Grass Type Chance
+ db $0C ; Fire Type Chance
+ db $30 ; Water Type Chance
+ db $0C ; Lightning Type Chance
+ db $0C ; Fighting Type Chance
+ db $0C ; Psychic Type Chance
+ db $16 ; Colorless Type Chance
+ db $0C ; Trainer Card Chance
+ db $0C ; Energy Card Chance
+
+PackMysteryLightningColorless:: ; 1e5b0 (7:65b0)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $0C ; Grass Type Chance
+ db $0C ; Fire Type Chance
+ db $0C ; Water Type Chance
+ db $30 ; Lightning Type Chance
+ db $0C ; Fighting Type Chance
+ db $0C ; Psychic Type Chance
+ db $16 ; Colorless Type Chance
+ db $0C ; Trainer Card Chance
+ db $0C ; Energy Card Chance
+
+PackMysteryFightingColorless:: ; 1e5bc (7:65bc)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $0C ; Grass Type Chance
+ db $0C ; Fire Type Chance
+ db $0C ; Water Type Chance
+ db $0C ; Lightning Type Chance
+ db $30 ; Fighting Type Chance
+ db $0C ; Psychic Type Chance
+ db $16 ; Colorless Type Chance
+ db $0C ; Trainer Card Chance
+ db $0C ; Energy Card Chance
+
+PackMysteryTrainerColorless:: ; 1e5c8 (7:65c8)
+ db MYSTERY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $0C ; Grass Type Chance
+ db $0C ; Fire Type Chance
+ db $0C ; Water Type Chance
+ db $0C ; Lightning Type Chance
+ db $0C ; Fighting Type Chance
+ db $0C ; Psychic Type Chance
+ db $16 ; Colorless Type Chance
+ db $30 ; Trainer Card Chance
+ db $0C ; Energy Card Chance
+
+PackLaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
+ db LABORATORY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $14 ; Grass Type Chance
+ db $14 ; Fire Type Chance
+ db $14 ; Water Type Chance
+ db $14 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $14 ; Psychic Type Chance
+ db $14 ; Colorless Type Chance
+ db $18 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackLaboratoryGrass:: ; 1e5e0 (7:65e0)
+ db LABORATORY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $30 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackLaboratoryWater:: ; 1e5ec (7:65ec)
+ db LABORATORY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $30 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackLaboratoryPsychic:: ; 1e5f8 (7:65f8)
+ db LABORATORY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $30 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $10 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackLaboratoryTrainer:: ; 1e604 (7:6604)
+ db LABORATORY >> 4 ; booster pack set
+ dw $0000 ; energy or energy generation function
+
+; Card Type Chances
+ db $10 ; Grass Type Chance
+ db $10 ; Fire Type Chance
+ db $10 ; Water Type Chance
+ db $10 ; Lightning Type Chance
+ db $10 ; Fighting Type Chance
+ db $10 ; Psychic Type Chance
+ db $10 ; Colorless Type Chance
+ db $30 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEnergyLightningFire:: ; 1e610 (7:6610)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateEnergyBoosterLightningFire ; energy or energy generation function
+
+; Card Type Chances
+ db $00 ; Grass Type Chance
+ db $00 ; Fire Type Chance
+ db $00 ; Water Type Chance
+ db $00 ; Lightning Type Chance
+ db $00 ; Fighting Type Chance
+ db $00 ; Psychic Type Chance
+ db $00 ; Colorless Type Chance
+ db $00 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEnergyWaterFighting:: ; 1e61c (7:661c)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateEnergyBoosterWaterFighting ; energy or energy generation function
+
+; Card Type Chances
+ db $00 ; Grass Type Chance
+ db $00 ; Fire Type Chance
+ db $00 ; Water Type Chance
+ db $00 ; Lightning Type Chance
+ db $00 ; Fighting Type Chance
+ db $00 ; Psychic Type Chance
+ db $00 ; Colorless Type Chance
+ db $00 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackEnergyGrassPsychic:: ; 1e628 (7:6628)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateEnergyBoosterGrassPsychic ; energy or energy generation function
+
+; Card Type Chances
+ db $00 ; Grass Type Chance
+ db $00 ; Fire Type Chance
+ db $00 ; Water Type Chance
+ db $00 ; Lightning Type Chance
+ db $00 ; Fighting Type Chance
+ db $00 ; Psychic Type Chance
+ db $00 ; Colorless Type Chance
+ db $00 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
+
+PackRandomEnergies:: ; 1e634 (7:6634)
+ db COLOSSEUM >> 4 ; booster pack set
+ dw GenerateRandomEnergyBooster ; energy or energy generation function
+
+; Card Type Chances
+ db $00 ; Grass Type Chance
+ db $00 ; Fire Type Chance
+ db $00 ; Water Type Chance
+ db $00 ; Lightning Type Chance
+ db $00 ; Fighting Type Chance
+ db $00 ; Psychic Type Chance
+ db $00 ; Colorless Type Chance
+ db $00 ; Trainer Card Chance
+ db $00 ; Energy Card Chance
diff --git a/src/data/cards.asm b/src/data/cards.asm
index c93a533..b246f59 100755
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -1,3 +1,6 @@
+; TODO: Make card data structures more compact and rearrange the fields for
+; convenience once the meaning of all fields is figured out.
+
CardPointers: ; 30c5c (c:4c5c)
dw $0000
dw GrassEnergyCard
@@ -231,11 +234,11 @@ CardPointers: ; 30c5c (c:4c5c)
dw $0000
BulbasaurCard: ; 30e28 (c:4e28)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx BulbasaurCardGfx ; gfx
tx BulbasaurName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db BULBASAUR
db 40 ; hp
db BASIC ; stage
@@ -282,11 +285,11 @@ BulbasaurCard: ; 30e28 (c:4e28)
db 16
IvysaurCard: ; 30e69 (c:4e69)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx IvysaurCardGfx ; gfx
tx IvysaurName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db IVYSAUR
db 60 ; hp
db STAGE1 ; stage
@@ -333,11 +336,11 @@ IvysaurCard: ; 30e69 (c:4e69)
db 16
Venusaur1Card: ; 30eaa (c:4eaa)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx Venusaur1CardGfx ; gfx
tx VenusaurName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db VENUSAUR1
db 100 ; hp
db STAGE2 ; stage
@@ -384,11 +387,11 @@ Venusaur1Card: ; 30eaa (c:4eaa)
db 0
Venusaur2Card: ; 30eeb (c:4eeb)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx Venusaur2CardGfx ; gfx
tx VenusaurName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db VENUSAUR2
db 100 ; hp
db STAGE2 ; stage
@@ -435,11 +438,11 @@ Venusaur2Card: ; 30eeb (c:4eeb)
db 0
CaterpieCard: ; 30f2c (c:4f2c)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx CaterpieCardGfx ; gfx
tx CaterpieName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db CATERPIE
db 40 ; hp
db BASIC ; stage
@@ -486,11 +489,11 @@ CaterpieCard: ; 30f2c (c:4f2c)
db 19
MetapodCard: ; 30f6d (c:4f6d)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx MetapodCardGfx ; gfx
tx MetapodName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db METAPOD
db 70 ; hp
db STAGE1 ; stage
@@ -537,11 +540,11 @@ MetapodCard: ; 30f6d (c:4f6d)
db 16
ButterfreeCard: ; 30fae (c:4fae)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ButterfreeCardGfx ; gfx
tx ButterfreeName ; name
db DIAMOND ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db BUTTERFREE
db 70 ; hp
db STAGE2 ; stage
@@ -588,11 +591,11 @@ ButterfreeCard: ; 30fae (c:4fae)
db 0
WeedleCard: ; 30fef (c:4fef)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx WeedleCardGfx ; gfx
tx WeedleName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db WEEDLE
db 40 ; hp
db BASIC ; stage
@@ -639,11 +642,11 @@ WeedleCard: ; 30fef (c:4fef)
db 19
KakunaCard: ; 31030 (c:5030)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx KakunaCardGfx ; gfx
tx KakunaName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db KAKUNA
db 80 ; hp
db STAGE1 ; stage
@@ -690,11 +693,11 @@ KakunaCard: ; 31030 (c:5030)
db 16
BeedrillCard: ; 31071 (c:5071)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx BeedrillCardGfx ; gfx
tx BeedrillName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db BEEDRILL
db 80 ; hp
db STAGE2 ; stage
@@ -741,11 +744,11 @@ BeedrillCard: ; 31071 (c:5071)
db 0
EkansCard: ; 310b2 (c:50b2)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx EkansCardGfx ; gfx
tx EkansName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db EKANS
db 40 ; hp
db BASIC ; stage
@@ -792,11 +795,11 @@ EkansCard: ; 310b2 (c:50b2)
db 19
ArbokCard: ; 310f3 (c:50f3)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ArbokCardGfx ; gfx
tx ArbokName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db ARBOK
db 60 ; hp
db STAGE1 ; stage
@@ -843,11 +846,11 @@ ArbokCard: ; 310f3 (c:50f3)
db 0
NidoranFCard: ; 31134 (c:5134)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidoranFCardGfx ; gfx
tx NidoranFName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db NIDORANF
db 60 ; hp
db BASIC ; stage
@@ -894,11 +897,11 @@ NidoranFCard: ; 31134 (c:5134)
db 19
NidorinaCard: ; 31175 (c:5175)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidorinaCardGfx ; gfx
tx NidorinaName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db NIDORINA
db 70 ; hp
db STAGE1 ; stage
@@ -945,11 +948,11 @@ NidorinaCard: ; 31175 (c:5175)
db 16
NidoqueenCard: ; 311b6 (c:51b6)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidoqueenCardGfx ; gfx
tx NidoqueenName ; name
db STAR ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db NIDOQUEEN
db 90 ; hp
db STAGE2 ; stage
@@ -996,11 +999,11 @@ NidoqueenCard: ; 311b6 (c:51b6)
db 0
NidoranMCard: ; 311f7 (c:51f7)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidoranMCardGfx ; gfx
tx NidoranMName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db NIDORANM
db 40 ; hp
db BASIC ; stage
@@ -1047,11 +1050,11 @@ NidoranMCard: ; 311f7 (c:51f7)
db 19
NidorinoCard: ; 31238 (c:5238)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidorinoCardGfx ; gfx
tx NidorinoName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db NIDORINO
db 60 ; hp
db STAGE1 ; stage
@@ -1098,11 +1101,11 @@ NidorinoCard: ; 31238 (c:5238)
db 16
NidokingCard: ; 31279 (c:5279)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx NidokingCardGfx ; gfx
tx NidokingName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db NIDOKING
db 90 ; hp
db STAGE2 ; stage
@@ -1149,11 +1152,11 @@ NidokingCard: ; 31279 (c:5279)
db 0
ZubatCard: ; 312ba (c:52ba)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ZubatCardGfx ; gfx
tx ZubatName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db ZUBAT
db 40 ; hp
db BASIC ; stage
@@ -1200,11 +1203,11 @@ ZubatCard: ; 312ba (c:52ba)
db 16
GolbatCard: ; 312fb (c:52fb)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx GolbatCardGfx ; gfx
tx GolbatName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db GOLBAT
db 60 ; hp
db STAGE1 ; stage
@@ -1251,11 +1254,11 @@ GolbatCard: ; 312fb (c:52fb)
db 0
OddishCard: ; 3133c (c:533c)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx OddishCardGfx ; gfx
tx OddishName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db ODDISH
db 50 ; hp
db BASIC ; stage
@@ -1302,11 +1305,11 @@ OddishCard: ; 3133c (c:533c)
db 16
GloomCard: ; 3137d (c:537d)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx GloomCardGfx ; gfx
tx GloomName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db GLOOM
db 60 ; hp
db STAGE1 ; stage
@@ -1353,11 +1356,11 @@ GloomCard: ; 3137d (c:537d)
db 16
VileplumeCard: ; 313be (c:53be)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx VileplumeCardGfx ; gfx
tx VileplumeName ; name
db STAR ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db VILEPLUME
db 80 ; hp
db STAGE2 ; stage
@@ -1404,11 +1407,11 @@ VileplumeCard: ; 313be (c:53be)
db 0
ParasCard: ; 313ff (c:53ff)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ParasCardGfx ; gfx
tx ParasName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db PARAS
db 40 ; hp
db BASIC ; stage
@@ -1455,11 +1458,11 @@ ParasCard: ; 313ff (c:53ff)
db 16
ParasectCard: ; 31440 (c:5440)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ParasectCardGfx ; gfx
tx ParasectName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db PARASECT
db 60 ; hp
db STAGE1 ; stage
@@ -1506,11 +1509,11 @@ ParasectCard: ; 31440 (c:5440)
db 0
VenonatCard: ; 31481 (c:5481)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx VenonatCardGfx ; gfx
tx VenonatName ; name
db CIRCLE ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db VENONAT
db 40 ; hp
db BASIC ; stage
@@ -1557,11 +1560,11 @@ VenonatCard: ; 31481 (c:5481)
db 19
VenomothCard: ; 314c2 (c:54c2)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx VenomothCardGfx ; gfx
tx VenomothName ; name
db STAR ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db VENOMOTH
db 70 ; hp
db STAGE1 ; stage
@@ -1608,11 +1611,11 @@ VenomothCard: ; 314c2 (c:54c2)
db 0
BellsproutCard: ; 31503 (c:5503)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx BellsproutCardGfx ; gfx
tx BellsproutName ; name
db CIRCLE ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db BELLSPROUT
db 40 ; hp
db BASIC ; stage
@@ -1659,11 +1662,11 @@ BellsproutCard: ; 31503 (c:5503)
db 19
WeepinbellCard: ; 31544 (c:5544)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx WeepinbellCardGfx ; gfx
tx WeepinbellName ; name
db DIAMOND ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db WEEPINBELL
db 70 ; hp
db STAGE1 ; stage
@@ -1710,11 +1713,11 @@ WeepinbellCard: ; 31544 (c:5544)
db 16
VictreebelCard: ; 31585 (c:5585)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx VictreebelCardGfx ; gfx
tx VictreebelName ; name
db STAR ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db VICTREEBEL
db 80 ; hp
db STAGE2 ; stage
@@ -1761,11 +1764,11 @@ VictreebelCard: ; 31585 (c:5585)
db 0
GrimerCard: ; 315c6 (c:55c6)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx GrimerCardGfx ; gfx
tx GrimerName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db GRIMER
db 50 ; hp
db BASIC ; stage
@@ -1812,11 +1815,11 @@ GrimerCard: ; 315c6 (c:55c6)
db 19
MukCard: ; 31607 (c:5607)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx MukCardGfx ; gfx
tx MukName ; name
db STAR ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db MUK
db 70 ; hp
db STAGE1 ; stage
@@ -1863,11 +1866,11 @@ MukCard: ; 31607 (c:5607)
db 0
ExeggcuteCard: ; 31648 (c:5648)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ExeggcuteCardGfx ; gfx
tx ExeggcuteName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db EXEGGCUTE
db 50 ; hp
db BASIC ; stage
@@ -1914,11 +1917,11 @@ ExeggcuteCard: ; 31648 (c:5648)
db 18
ExeggutorCard: ; 31689 (c:5689)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ExeggutorCardGfx ; gfx
tx ExeggutorName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db EXEGGUTOR
db 80 ; hp
db STAGE1 ; stage
@@ -1965,11 +1968,11 @@ ExeggutorCard: ; 31689 (c:5689)
db 0
KoffingCard: ; 316ca (c:56ca)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx KoffingCardGfx ; gfx
tx KoffingName ; name
db CIRCLE ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db KOFFING
db 50 ; hp
db BASIC ; stage
@@ -2016,11 +2019,11 @@ KoffingCard: ; 316ca (c:56ca)
db 16
WeezingCard: ; 3170b (c:570b)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx WeezingCardGfx ; gfx
tx WeezingName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db WEEZING
db 60 ; hp
db STAGE1 ; stage
@@ -2067,11 +2070,11 @@ WeezingCard: ; 3170b (c:570b)
db 0
Tangela1Card: ; 3174c (c:574c)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx Tangela1CardGfx ; gfx
tx TangelaName ; name
db CIRCLE ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db TANGELA1
db 50 ; hp
db BASIC ; stage
@@ -2118,11 +2121,11 @@ Tangela1Card: ; 3174c (c:574c)
db 0
Tangela2Card: ; 3178d (c:578d)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx Tangela2CardGfx ; gfx
tx TangelaName ; name
db CIRCLE ; rarity
- db COLOSSEUM | GB ; set
+ db COLOSSEUM | GB ; sets
db TANGELA2
db 50 ; hp
db BASIC ; stage
@@ -2169,11 +2172,11 @@ Tangela2Card: ; 3178d (c:578d)
db 0
ScytherCard: ; 317ce (c:57ce)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx ScytherCardGfx ; gfx
tx ScytherName ; name
db STAR ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db SCYTHER
db 70 ; hp
db BASIC ; stage
@@ -2220,11 +2223,11 @@ ScytherCard: ; 317ce (c:57ce)
db 0
PinsirCard: ; 3180f (c:580f)
- db GRASS ; type
+ db TYPE_PKMN_GRASS ; type
gfx PinsirCardGfx ; gfx
tx PinsirName ; name
db STAR ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db PINSIR
db 60 ; hp
db BASIC ; stage
@@ -2271,11 +2274,11 @@ PinsirCard: ; 3180f (c:580f)
db 0
CharmanderCard: ; 31850 (c:5850)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx CharmanderCardGfx ; gfx
tx CharmanderName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db CHARMANDER
db 50 ; hp
db BASIC ; stage
@@ -2322,11 +2325,11 @@ CharmanderCard: ; 31850 (c:5850)
db 21
CharmeleonCard: ; 31891 (c:5891)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx CharmeleonCardGfx ; gfx
tx CharmeleonName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db CHARMELEON
db 80 ; hp
db STAGE1 ; stage
@@ -2373,11 +2376,11 @@ CharmeleonCard: ; 31891 (c:5891)
db 18
CharizardCard: ; 318d2 (c:58d2)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx CharizardCardGfx ; gfx
tx CharizardName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db CHARIZARD
db 120 ; hp
db STAGE2 ; stage
@@ -2424,11 +2427,11 @@ CharizardCard: ; 318d2 (c:58d2)
db 0
VulpixCard: ; 31913 (c:5913)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx VulpixCardGfx ; gfx
tx VulpixName ; name
db CIRCLE ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db VULPIX
db 50 ; hp
db BASIC ; stage
@@ -2475,11 +2478,11 @@ VulpixCard: ; 31913 (c:5913)
db 18
Ninetails1Card: ; 31954 (c:5954)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Ninetails1CardGfx ; gfx
tx NinetailsName ; name
db STAR ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db NINETAILS1
db 80 ; hp
db STAGE1 ; stage
@@ -2526,11 +2529,11 @@ Ninetails1Card: ; 31954 (c:5954)
db 0
Ninetails2Card: ; 31995 (c:5995)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Ninetails2CardGfx ; gfx
tx NinetailsName ; name
db STAR ; rarity
- db LABORATORY | GB ; set
+ db LABORATORY | GB ; sets
db NINETAILS2
db 80 ; hp
db STAGE1 ; stage
@@ -2577,11 +2580,11 @@ Ninetails2Card: ; 31995 (c:5995)
db 0
GrowlitheCard: ; 319d6 (c:59d6)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx GrowlitheCardGfx ; gfx
tx GrowlitheName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db GROWLITHE
db 60 ; hp
db BASIC ; stage
@@ -2628,11 +2631,11 @@ GrowlitheCard: ; 319d6 (c:59d6)
db 16
Arcanine1Card: ; 31a17 (c:5a17)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Arcanine1CardGfx ; gfx
tx ArcanineName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db ARCANINE1
db 70 ; hp
db STAGE1 ; stage
@@ -2679,11 +2682,11 @@ Arcanine1Card: ; 31a17 (c:5a17)
db 0
Arcanine2Card: ; 31a58 (c:5a58)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Arcanine2CardGfx ; gfx
tx ArcanineName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db ARCANINE2
db 100 ; hp
db STAGE1 ; stage
@@ -2730,11 +2733,11 @@ Arcanine2Card: ; 31a58 (c:5a58)
db 0
PonytaCard: ; 31a99 (c:5a99)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx PonytaCardGfx ; gfx
tx PonytaName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db PONYTA
db 40 ; hp
db BASIC ; stage
@@ -2781,11 +2784,11 @@ PonytaCard: ; 31a99 (c:5a99)
db 16
RapidashCard: ; 31ada (c:5ada)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx RapidashCardGfx ; gfx
tx RapidashName ; name
db DIAMOND ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db RAPIDASH
db 70 ; hp
db STAGE1 ; stage
@@ -2832,11 +2835,11 @@ RapidashCard: ; 31ada (c:5ada)
db 0
Magmar1Card: ; 31b1b (c:5b1b)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Magmar1CardGfx ; gfx
tx MagmarName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db MAGMAR1
db 50 ; hp
db BASIC ; stage
@@ -2883,11 +2886,11 @@ Magmar1Card: ; 31b1b (c:5b1b)
db 0
Magmar2Card: ; 31b5c (c:5b5c)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Magmar2CardGfx ; gfx
tx MagmarName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db MAGMAR2
db 70 ; hp
db BASIC ; stage
@@ -2934,11 +2937,11 @@ Magmar2Card: ; 31b5c (c:5b5c)
db 3
Flareon1Card: ; 31b9d (c:5b9d)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Flareon1CardGfx ; gfx
tx FlareonName ; name
db DIAMOND ; rarity
- db MYSTERY | GB ; set
+ db MYSTERY | GB ; sets
db FLAREON1
db 60 ; hp
db STAGE1 ; stage
@@ -2985,11 +2988,11 @@ Flareon1Card: ; 31b9d (c:5b9d)
db 0
Flareon2Card: ; 31bde (c:5bde)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Flareon2CardGfx ; gfx
tx FlareonName ; name
db STAR ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db FLAREON2
db 70 ; hp
db STAGE1 ; stage
@@ -3036,11 +3039,11 @@ Flareon2Card: ; 31bde (c:5bde)
db 0
Moltres1Card: ; 31c1f (c:5c1f)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Moltres1CardGfx ; gfx
tx MoltresName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db MOLTRES1
db 70 ; hp
db BASIC ; stage
@@ -3087,11 +3090,11 @@ Moltres1Card: ; 31c1f (c:5c1f)
db 0
Moltres2Card: ; 31c60 (c:5c60)
- db FIRE ; type
+ db TYPE_PKMN_FIRE ; type
gfx Moltres2CardGfx ; gfx
tx MoltresName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db MOLTRES2
db 100 ; hp
db BASIC ; stage
@@ -3138,11 +3141,11 @@ Moltres2Card: ; 31c60 (c:5c60)
db 0
SquirtleCard: ; 31ca1 (c:5ca1)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx SquirtleCardGfx ; gfx
tx SquirtleName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db SQUIRTLE
db 40 ; hp
db BASIC ; stage
@@ -3189,11 +3192,11 @@ SquirtleCard: ; 31ca1 (c:5ca1)
db 21
WartortleCard: ; 31ce2 (c:5ce2)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx WartortleCardGfx ; gfx
tx WartortleName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db WARTORTLE
db 70 ; hp
db STAGE1 ; stage
@@ -3240,11 +3243,11 @@ WartortleCard: ; 31ce2 (c:5ce2)
db 18
BlastoiseCard: ; 31d23 (c:5d23)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx BlastoiseCardGfx ; gfx
tx BlastoiseName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db BLASTOISE
db 100 ; hp
db STAGE2 ; stage
@@ -3291,11 +3294,11 @@ BlastoiseCard: ; 31d23 (c:5d23)
db 0
PsyduckCard: ; 31d64 (c:5d64)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx PsyduckCardGfx ; gfx
tx PsyduckName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db PSYDUCK
db 50 ; hp
db BASIC ; stage
@@ -3342,11 +3345,11 @@ PsyduckCard: ; 31d64 (c:5d64)
db 19
GolduckCard: ; 31da5 (c:5da5)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx GolduckCardGfx ; gfx
tx GolduckName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db GOLDUCK
db 70 ; hp
db STAGE1 ; stage
@@ -3393,11 +3396,11 @@ GolduckCard: ; 31da5 (c:5da5)
db 3
PoliwagCard: ; 31de6 (c:5de6)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx PoliwagCardGfx ; gfx
tx PoliwagName ; name
db CIRCLE ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db POLIWAG
db 40 ; hp
db BASIC ; stage
@@ -3444,11 +3447,11 @@ PoliwagCard: ; 31de6 (c:5de6)
db 19
PoliwhirlCard: ; 31e27 (c:5e27)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx PoliwhirlCardGfx ; gfx
tx PoliwhirlName ; name
db DIAMOND ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db POLIWHIRL
db 60 ; hp
db STAGE1 ; stage
@@ -3495,11 +3498,11 @@ PoliwhirlCard: ; 31e27 (c:5e27)
db 16
PoliwrathCard: ; 31e68 (c:5e68)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx PoliwrathCardGfx ; gfx
tx PoliwrathName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db POLIWRATH
db 90 ; hp
db STAGE2 ; stage
@@ -3546,11 +3549,11 @@ PoliwrathCard: ; 31e68 (c:5e68)
db 0
TentacoolCard: ; 31ea9 (c:5ea9)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx TentacoolCardGfx ; gfx
tx TentacoolName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db TENTACOOL
db 30 ; hp
db BASIC ; stage
@@ -3597,11 +3600,11 @@ TentacoolCard: ; 31ea9 (c:5ea9)
db 19
TentacruelCard: ; 31eea (c:5eea)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx TentacruelCardGfx ; gfx
tx TentacruelName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db TENTACRUEL
db 60 ; hp
db STAGE1 ; stage
@@ -3648,11 +3651,11 @@ TentacruelCard: ; 31eea (c:5eea)
db 0
SeelCard: ; 31f2b (c:5f2b)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx SeelCardGfx ; gfx
tx SeelName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db SEEL
db 60 ; hp
db BASIC ; stage
@@ -3699,11 +3702,11 @@ SeelCard: ; 31f2b (c:5f2b)
db 19
DewgongCard: ; 31f6c (c:5f6c)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx DewgongCardGfx ; gfx
tx DewgongName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db DEWGONG
db 80 ; hp
db STAGE1 ; stage
@@ -3750,11 +3753,11 @@ DewgongCard: ; 31f6c (c:5f6c)
db 0
ShellderCard: ; 31fad (c:5fad)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx ShellderCardGfx ; gfx
tx ShellderName ; name
db CIRCLE ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db SHELLDER
db 30 ; hp
db BASIC ; stage
@@ -3801,11 +3804,11 @@ ShellderCard: ; 31fad (c:5fad)
db 19
CloysterCard: ; 31fee (c:5fee)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx CloysterCardGfx ; gfx
tx CloysterName ; name
db DIAMOND ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db CLOYSTER
db 50 ; hp
db STAGE1 ; stage
@@ -3852,11 +3855,11 @@ CloysterCard: ; 31fee (c:5fee)
db 0
KrabbyCard: ; 3202f (c:602f)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx KrabbyCardGfx ; gfx
tx KrabbyName ; name
db CIRCLE ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db KRABBY
db 50 ; hp
db BASIC ; stage
@@ -3903,11 +3906,11 @@ KrabbyCard: ; 3202f (c:602f)
db 16
KinglerCard: ; 32070 (c:6070)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx KinglerCardGfx ; gfx
tx KinglerName ; name
db DIAMOND ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db KINGLER
db 60 ; hp
db STAGE1 ; stage
@@ -3954,11 +3957,11 @@ KinglerCard: ; 32070 (c:6070)
db 0
HorseaCard: ; 320b1 (c:60b1)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx HorseaCardGfx ; gfx
tx HorseaName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db HORSEA
db 40 ; hp
db BASIC ; stage
@@ -4005,11 +4008,11 @@ HorseaCard: ; 320b1 (c:60b1)
db 19
SeadraCard: ; 320f2 (c:60f2)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx SeadraCardGfx ; gfx
tx SeadraName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db SEADRA
db 60 ; hp
db STAGE1 ; stage
@@ -4056,11 +4059,11 @@ SeadraCard: ; 320f2 (c:60f2)
db 0
GoldeenCard: ; 32133 (c:6133)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx GoldeenCardGfx ; gfx
tx GoldeenName ; name
db CIRCLE ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db GOLDEEN
db 40 ; hp
db BASIC ; stage
@@ -4107,11 +4110,11 @@ GoldeenCard: ; 32133 (c:6133)
db 21
SeakingCard: ; 32174 (c:6174)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx SeakingCardGfx ; gfx
tx SeakingName ; name
db DIAMOND ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db SEAKING
db 70 ; hp
db STAGE1 ; stage
@@ -4158,11 +4161,11 @@ SeakingCard: ; 32174 (c:6174)
db 0
StaryuCard: ; 321b5 (c:61b5)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx StaryuCardGfx ; gfx
tx StaryuName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db STARYU
db 40 ; hp
db BASIC ; stage
@@ -4209,11 +4212,11 @@ StaryuCard: ; 321b5 (c:61b5)
db 19
StarmieCard: ; 321f6 (c:61f6)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx StarmieCardGfx ; gfx
tx StarmieName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db STARMIE
db 60 ; hp
db STAGE1 ; stage
@@ -4260,11 +4263,11 @@ StarmieCard: ; 321f6 (c:61f6)
db 0
MagikarpCard: ; 32237 (c:6237)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx MagikarpCardGfx ; gfx
tx MagikarpName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db MAGIKARP
db 30 ; hp
db BASIC ; stage
@@ -4311,11 +4314,11 @@ MagikarpCard: ; 32237 (c:6237)
db 18
GyaradosCard: ; 32278 (c:6278)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx GyaradosCardGfx ; gfx
tx GyaradosName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db GYARADOS
db 100 ; hp
db STAGE1 ; stage
@@ -4362,11 +4365,11 @@ GyaradosCard: ; 32278 (c:6278)
db 0
LaprasCard: ; 322b9 (c:62b9)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx LaprasCardGfx ; gfx
tx LaprasName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db LAPRAS
db 80 ; hp
db BASIC ; stage
@@ -4413,11 +4416,11 @@ LaprasCard: ; 322b9 (c:62b9)
db 0
Vaporeon1Card: ; 322fa (c:62fa)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx Vaporeon1CardGfx ; gfx
tx VaporeonName ; name
db DIAMOND ; rarity
- db MYSTERY | GB ; set
+ db MYSTERY | GB ; sets
db VAPOREON1
db 60 ; hp
db STAGE1 ; stage
@@ -4464,11 +4467,11 @@ Vaporeon1Card: ; 322fa (c:62fa)
db 0
Vaporeon2Card: ; 3233b (c:633b)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx Vaporeon2CardGfx ; gfx
tx VaporeonName ; name
db STAR ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db VAPOREON2
db 80 ; hp
db STAGE1 ; stage
@@ -4515,11 +4518,11 @@ Vaporeon2Card: ; 3233b (c:633b)
db 0
OmanyteCard: ; 3237c (c:637c)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx OmanyteCardGfx ; gfx
tx OmanyteName ; name
db CIRCLE ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db OMANYTE
db 40 ; hp
db STAGE1 ; stage
@@ -4566,11 +4569,11 @@ OmanyteCard: ; 3237c (c:637c)
db 17
OmastarCard: ; 323bd (c:63bd)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx OmastarCardGfx ; gfx
tx OmastarName ; name
db DIAMOND ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db OMASTAR
db 70 ; hp
db STAGE2 ; stage
@@ -4617,11 +4620,11 @@ OmastarCard: ; 323bd (c:63bd)
db 0
Articuno1Card: ; 323fe (c:63fe)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx Articuno1CardGfx ; gfx
tx ArticunoName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db ARTICUNO1
db 70 ; hp
db BASIC ; stage
@@ -4668,11 +4671,11 @@ Articuno1Card: ; 323fe (c:63fe)
db 0
Articuno2Card: ; 3243f (c:643f)
- db WATER ; type
+ db TYPE_PKMN_WATER ; type
gfx Articuno2CardGfx ; gfx
tx ArticunoName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db ARTICUNO2
db 100 ; hp
db BASIC ; stage
@@ -4719,11 +4722,11 @@ Articuno2Card: ; 3243f (c:643f)
db 0
Pikachu1Card: ; 32480 (c:6480)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Pikachu1CardGfx ; gfx
tx PikachuName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db PIKACHU1
db 40 ; hp
db BASIC ; stage
@@ -4770,11 +4773,11 @@ Pikachu1Card: ; 32480 (c:6480)
db 19
Pikachu2Card: ; 324c1 (c:64c1)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Pikachu2CardGfx ; gfx
tx PikachuName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db PIKACHU2
db 50 ; hp
db BASIC ; stage
@@ -4821,11 +4824,11 @@ Pikachu2Card: ; 324c1 (c:64c1)
db 16
Pikachu3Card: ; 32502 (c:6502)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Pikachu3CardGfx ; gfx
tx PikachuName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db PIKACHU3
db 60 ; hp
db BASIC ; stage
@@ -4872,11 +4875,11 @@ Pikachu3Card: ; 32502 (c:6502)
db 16
Pikachu4Card: ; 32543 (c:6543)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Pikachu4CardGfx ; gfx
tx PikachuName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db PIKACHU4
db 60 ; hp
db BASIC ; stage
@@ -4923,11 +4926,11 @@ Pikachu4Card: ; 32543 (c:6543)
db 16
FlyingPikachuCard: ; 32584 (c:6584)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx FlyingPikachuCardGfx ; gfx
tx FlyingPikachuName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db FLYING_PIKACHU
db 40 ; hp
db BASIC ; stage
@@ -4974,11 +4977,11 @@ FlyingPikachuCard: ; 32584 (c:6584)
db 3
SurfingPikachu1Card: ; 325c5 (c:65c5)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx SurfingPikachu1CardGfx ; gfx
tx SurfingPikachuName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db SURFING_PIKACHU1
db 50 ; hp
db BASIC ; stage
@@ -5025,11 +5028,11 @@ SurfingPikachu1Card: ; 325c5 (c:65c5)
db 0
SurfingPikachu2Card: ; 32606 (c:6606)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx SurfingPikachu2CardGfx ; gfx
tx SurfingPikachuName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db SURFING_PIKACHU2
db 50 ; hp
db BASIC ; stage
@@ -5076,11 +5079,11 @@ SurfingPikachu2Card: ; 32606 (c:6606)
db 0
Raichu1Card: ; 32647 (c:6647)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Raichu1CardGfx ; gfx
tx RaichuName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db RAICHU1
db 80 ; hp
db STAGE1 ; stage
@@ -5127,11 +5130,11 @@ Raichu1Card: ; 32647 (c:6647)
db 0
Raichu2Card: ; 32688 (c:6688)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Raichu2CardGfx ; gfx
tx RaichuName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db RAICHU2
db 90 ; hp
db STAGE1 ; stage
@@ -5178,11 +5181,11 @@ Raichu2Card: ; 32688 (c:6688)
db 0
Magnemite1Card: ; 326c9 (c:66c9)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Magnemite1CardGfx ; gfx
tx MagnemiteName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db MAGNEMITE1
db 40 ; hp
db BASIC ; stage
@@ -5229,11 +5232,11 @@ Magnemite1Card: ; 326c9 (c:66c9)
db 19
Magnemite2Card: ; 3270a (c:670a)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Magnemite2CardGfx ; gfx
tx MagnemiteName ; name
db CIRCLE ; rarity
- db LABORATORY | GB ; set
+ db LABORATORY | GB ; sets
db MAGNEMITE2
db 40 ; hp
db BASIC ; stage
@@ -5280,11 +5283,11 @@ Magnemite2Card: ; 3270a (c:670a)
db 19
Magneton1Card: ; 3274b (c:674b)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Magneton1CardGfx ; gfx
tx MagnetonName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db MAGNETON1
db 60 ; hp
db STAGE1 ; stage
@@ -5331,11 +5334,11 @@ Magneton1Card: ; 3274b (c:674b)
db 0
Magneton2Card: ; 3278c (c:678c)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Magneton2CardGfx ; gfx
tx MagnetonName ; name
db STAR ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db MAGNETON2
db 80 ; hp
db STAGE1 ; stage
@@ -5382,11 +5385,11 @@ Magneton2Card: ; 3278c (c:678c)
db 0
VoltorbCard: ; 327cd (c:67cd)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx VoltorbCardGfx ; gfx
tx VoltorbName ; name
db CIRCLE ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db VOLTORB
db 40 ; hp
db BASIC ; stage
@@ -5433,11 +5436,11 @@ VoltorbCard: ; 327cd (c:67cd)
db 21
Electrode1Card: ; 3280e (c:680e)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Electrode1CardGfx ; gfx
tx ElectrodeName ; name
db STAR ; rarity
- db LABORATORY | GB ; set
+ db LABORATORY | GB ; sets
db ELECTRODE1
db 70 ; hp
db STAGE1 ; stage
@@ -5484,11 +5487,11 @@ Electrode1Card: ; 3280e (c:680e)
db 0
Electrode2Card: ; 3284f (c:684f)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Electrode2CardGfx ; gfx
tx ElectrodeName ; name
db STAR ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db ELECTRODE2
db 90 ; hp
db STAGE1 ; stage
@@ -5535,11 +5538,11 @@ Electrode2Card: ; 3284f (c:684f)
db 0
Electabuzz1Card: ; 32890 (c:6890)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Electabuzz1CardGfx ; gfx
tx ElectabuzzName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db ELECTABUZZ1
db 60 ; hp
db BASIC ; stage
@@ -5586,11 +5589,11 @@ Electabuzz1Card: ; 32890 (c:6890)
db 0
Electabuzz2Card: ; 328d1 (c:68d1)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Electabuzz2CardGfx ; gfx
tx ElectabuzzName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db ELECTABUZZ2
db 70 ; hp
db BASIC ; stage
@@ -5637,11 +5640,11 @@ Electabuzz2Card: ; 328d1 (c:68d1)
db 0
Jolteon1Card: ; 32912 (c:6912)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Jolteon1CardGfx ; gfx
tx JolteonName ; name
db DIAMOND ; rarity
- db MYSTERY | GB ; set
+ db MYSTERY | GB ; sets
db JOLTEON1
db 60 ; hp
db STAGE1 ; stage
@@ -5688,11 +5691,11 @@ Jolteon1Card: ; 32912 (c:6912)
db 0
Jolteon2Card: ; 32953 (c:6953)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Jolteon2CardGfx ; gfx
tx JolteonName ; name
db STAR ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db JOLTEON2
db 70 ; hp
db STAGE1 ; stage
@@ -5739,11 +5742,11 @@ Jolteon2Card: ; 32953 (c:6953)
db 0
Zapdos1Card: ; 32994 (c:6994)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Zapdos1CardGfx ; gfx
tx ZapdosName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db ZAPDOS1
db 80 ; hp
db BASIC ; stage
@@ -5790,11 +5793,11 @@ Zapdos1Card: ; 32994 (c:6994)
db 0
Zapdos2Card: ; 329d5 (c:69d5)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Zapdos2CardGfx ; gfx
tx ZapdosName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db ZAPDOS2
db 90 ; hp
db BASIC ; stage
@@ -5841,11 +5844,11 @@ Zapdos2Card: ; 329d5 (c:69d5)
db 0
Zapdos3Card: ; 32a16 (c:6a16)
- db LIGHTNING ; type
+ db TYPE_PKMN_LIGHTNING ; type
gfx Zapdos3CardGfx ; gfx
tx ZapdosName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db ZAPDOS3
db 100 ; hp
db BASIC ; stage
@@ -5892,11 +5895,11 @@ Zapdos3Card: ; 32a16 (c:6a16)
db 0
SandshrewCard: ; 32a57 (c:6a57)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx SandshrewCardGfx ; gfx
tx SandshrewName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db SANDSHREW
db 40 ; hp
db BASIC ; stage
@@ -5943,11 +5946,11 @@ SandshrewCard: ; 32a57 (c:6a57)
db 19
SandslashCard: ; 32a98 (c:6a98)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx SandslashCardGfx ; gfx
tx SandslashName ; name
db DIAMOND ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db SANDSLASH
db 70 ; hp
db STAGE1 ; stage
@@ -5994,11 +5997,11 @@ SandslashCard: ; 32a98 (c:6a98)
db 0
DiglettCard: ; 32ad9 (c:6ad9)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx DiglettCardGfx ; gfx
tx DiglettName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db DIGLETT
db 30 ; hp
db BASIC ; stage
@@ -6045,11 +6048,11 @@ DiglettCard: ; 32ad9 (c:6ad9)
db 19
DugtrioCard: ; 32b1a (c:6b1a)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx DugtrioCardGfx ; gfx
tx DugtrioName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db DUGTRIO
db 70 ; hp
db STAGE1 ; stage
@@ -6096,11 +6099,11 @@ DugtrioCard: ; 32b1a (c:6b1a)
db 0
MankeyCard: ; 32b5b (c:6b5b)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx MankeyCardGfx ; gfx
tx MankeyName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db MANKEY
db 30 ; hp
db BASIC ; stage
@@ -6147,11 +6150,11 @@ MankeyCard: ; 32b5b (c:6b5b)
db 17
PrimeapeCard: ; 32b9c (c:6b9c)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx PrimeapeCardGfx ; gfx
tx PrimeapeName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db PRIMEAPE
db 70 ; hp
db STAGE1 ; stage
@@ -6198,11 +6201,11 @@ PrimeapeCard: ; 32b9c (c:6b9c)
db 0
MachopCard: ; 32bdd (c:6bdd)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx MachopCardGfx ; gfx
tx MachopName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db MACHOP
db 50 ; hp
db BASIC ; stage
@@ -6249,11 +6252,11 @@ MachopCard: ; 32bdd (c:6bdd)
db 21
MachokeCard: ; 32c1e (c:6c1e)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx MachokeCardGfx ; gfx
tx MachokeName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db MACHOKE
db 80 ; hp
db STAGE1 ; stage
@@ -6300,11 +6303,11 @@ MachokeCard: ; 32c1e (c:6c1e)
db 16
MachampCard: ; 32c5f (c:6c5f)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx MachampCardGfx ; gfx
tx MachampName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db MACHAMP
db 100 ; hp
db STAGE2 ; stage
@@ -6351,11 +6354,11 @@ MachampCard: ; 32c5f (c:6c5f)
db 0
GeodudeCard: ; 32ca0 (c:6ca0)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx GeodudeCardGfx ; gfx
tx GeodudeName ; name
db CIRCLE ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db GEODUDE
db 50 ; hp
db BASIC ; stage
@@ -6402,11 +6405,11 @@ GeodudeCard: ; 32ca0 (c:6ca0)
db 19
GravelerCard: ; 32ce1 (c:6ce1)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx GravelerCardGfx ; gfx
tx GravelerName ; name
db DIAMOND ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db GRAVELER
db 60 ; hp
db STAGE1 ; stage
@@ -6453,11 +6456,11 @@ GravelerCard: ; 32ce1 (c:6ce1)
db 16
GolemCard: ; 32d22 (c:6d22)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx GolemCardGfx ; gfx
tx GolemName ; name
db DIAMOND ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db GOLEM
db 80 ; hp
db STAGE2 ; stage
@@ -6504,11 +6507,11 @@ GolemCard: ; 32d22 (c:6d22)
db 0
OnixCard: ; 32d63 (c:6d63)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx OnixCardGfx ; gfx
tx OnixName ; name
db CIRCLE ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db ONIX
db 90 ; hp
db BASIC ; stage
@@ -6555,11 +6558,11 @@ OnixCard: ; 32d63 (c:6d63)
db 0
CuboneCard: ; 32da4 (c:6da4)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx CuboneCardGfx ; gfx
tx CuboneName ; name
db CIRCLE ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db CUBONE
db 40 ; hp
db BASIC ; stage
@@ -6606,11 +6609,11 @@ CuboneCard: ; 32da4 (c:6da4)
db 19
Marowak1Card: ; 32de5 (c:6de5)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx Marowak1CardGfx ; gfx
tx MarowakName ; name
db DIAMOND ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db MAROWAK1
db 60 ; hp
db STAGE1 ; stage
@@ -6657,11 +6660,11 @@ Marowak1Card: ; 32de5 (c:6de5)
db 0
Marowak2Card: ; 32e26 (c:6e26)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx Marowak2CardGfx ; gfx
tx MarowakName ; name
db DIAMOND ; rarity
- db EVOLUTION | GB ; set
+ db EVOLUTION | GB ; sets
db MAROWAK2
db 70 ; hp
db STAGE1 ; stage
@@ -6708,11 +6711,11 @@ Marowak2Card: ; 32e26 (c:6e26)
db 0
HitmonleeCard: ; 32e67 (c:6e67)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx HitmonleeCardGfx ; gfx
tx HitmonleeName ; name
db STAR ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db HITMONLEE
db 60 ; hp
db BASIC ; stage
@@ -6759,11 +6762,11 @@ HitmonleeCard: ; 32e67 (c:6e67)
db 0
HitmonchanCard: ; 32ea8 (c:6ea8)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx HitmonchanCardGfx ; gfx
tx HitmonchanName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db HITMONCHAN
db 70 ; hp
db BASIC ; stage
@@ -6810,11 +6813,11 @@ HitmonchanCard: ; 32ea8 (c:6ea8)
db 0
RhyhornCard: ; 32ee9 (c:6ee9)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx RhyhornCardGfx ; gfx
tx RhyhornName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db RHYHORN
db 70 ; hp
db BASIC ; stage
@@ -6861,11 +6864,11 @@ RhyhornCard: ; 32ee9 (c:6ee9)
db 16
RhydonCard: ; 32f2a (c:6f2a)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx RhydonCardGfx ; gfx
tx RhydonName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db RHYDON
db 100 ; hp
db STAGE1 ; stage
@@ -6912,11 +6915,11 @@ RhydonCard: ; 32f2a (c:6f2a)
db 0
KabutoCard: ; 32f6b (c:6f6b)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx KabutoCardGfx ; gfx
tx KabutoName ; name
db CIRCLE ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db KABUTO
db 30 ; hp
db STAGE1 ; stage
@@ -6963,11 +6966,11 @@ KabutoCard: ; 32f6b (c:6f6b)
db 19
KabutopsCard: ; 32fac (c:6fac)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx KabutopsCardGfx ; gfx
tx KabutopsName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db KABUTOPS
db 60 ; hp
db STAGE2 ; stage
@@ -7014,11 +7017,11 @@ KabutopsCard: ; 32fac (c:6fac)
db 0
AerodactylCard: ; 32fed (c:6fed)
- db FIGHTING ; type
+ db TYPE_PKMN_FIGHTING ; type
gfx AerodactylCardGfx ; gfx
tx AerodactylName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db AERODACTYL
db 60 ; hp
db STAGE1 ; stage
@@ -7065,11 +7068,11 @@ AerodactylCard: ; 32fed (c:6fed)
db 1
AbraCard: ; 3302e (c:702e)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx AbraCardGfx ; gfx
tx AbraName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db ABRA
db 30 ; hp
db BASIC ; stage
@@ -7116,11 +7119,11 @@ AbraCard: ; 3302e (c:702e)
db 16
KadabraCard: ; 3306f (c:706f)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx KadabraCardGfx ; gfx
tx KadabraName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db KADABRA
db 60 ; hp
db STAGE1 ; stage
@@ -7167,11 +7170,11 @@ KadabraCard: ; 3306f (c:706f)
db 16
AlakazamCard: ; 330b0 (c:70b0)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx AlakazamCardGfx ; gfx
tx AlakazamName ; name
db STAR ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db ALAKAZAM
db 80 ; hp
db STAGE2 ; stage
@@ -7218,11 +7221,11 @@ AlakazamCard: ; 330b0 (c:70b0)
db 0
Slowpoke1Card: ; 330f1 (c:70f1)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Slowpoke1CardGfx ; gfx
tx SlowpokeName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db SLOWPOKE1
db 40 ; hp
db BASIC ; stage
@@ -7269,11 +7272,11 @@ Slowpoke1Card: ; 330f1 (c:70f1)
db 19
Slowpoke2Card: ; 33132 (c:7132)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Slowpoke2CardGfx ; gfx
tx SlowpokeName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db SLOWPOKE2
db 50 ; hp
db BASIC ; stage
@@ -7320,11 +7323,11 @@ Slowpoke2Card: ; 33132 (c:7132)
db 16
SlowbroCard: ; 33173 (c:7173)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx SlowbroCardGfx ; gfx
tx SlowbroName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db SLOWBRO
db 60 ; hp
db STAGE1 ; stage
@@ -7371,11 +7374,11 @@ SlowbroCard: ; 33173 (c:7173)
db 1
Gastly1Card: ; 331b4 (c:71b4)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Gastly1CardGfx ; gfx
tx GastlyName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db GASTLY1
db 30 ; hp
db BASIC ; stage
@@ -7422,11 +7425,11 @@ Gastly1Card: ; 331b4 (c:71b4)
db 16
Gastly2Card: ; 331f5 (c:71f5)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Gastly2CardGfx ; gfx
tx GastlyName ; name
db DIAMOND ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db GASTLY2
db 50 ; hp
db BASIC ; stage
@@ -7473,11 +7476,11 @@ Gastly2Card: ; 331f5 (c:71f5)
db 19
Haunter1Card: ; 33236 (c:7236)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Haunter1CardGfx ; gfx
tx HaunterName ; name
db STAR ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db HAUNTER1
db 50 ; hp
db STAGE1 ; stage
@@ -7524,11 +7527,11 @@ Haunter1Card: ; 33236 (c:7236)
db 16
Haunter2Card: ; 33277 (c:7277)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Haunter2CardGfx ; gfx
tx HaunterName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db HAUNTER2
db 60 ; hp
db STAGE1 ; stage
@@ -7575,11 +7578,11 @@ Haunter2Card: ; 33277 (c:7277)
db 16
GengarCard: ; 332b8 (c:72b8)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx GengarCardGfx ; gfx
tx GengarName ; name
db STAR ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db GENGAR
db 80 ; hp
db STAGE2 ; stage
@@ -7626,11 +7629,11 @@ GengarCard: ; 332b8 (c:72b8)
db 1
DrowzeeCard: ; 332f9 (c:72f9)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx DrowzeeCardGfx ; gfx
tx DrowzeeName ; name
db CIRCLE ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db DROWZEE
db 50 ; hp
db BASIC ; stage
@@ -7677,11 +7680,11 @@ DrowzeeCard: ; 332f9 (c:72f9)
db 19
HypnoCard: ; 3333a (c:733a)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx HypnoCardGfx ; gfx
tx HypnoName ; name
db STAR ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db HYPNO
db 90 ; hp
db STAGE1 ; stage
@@ -7728,11 +7731,11 @@ HypnoCard: ; 3333a (c:733a)
db 0
MrMimeCard: ; 3337b (c:737b)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx MrMimeCardGfx ; gfx
tx MrMimeName ; name
db STAR ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db MR_MIME
db 40 ; hp
db BASIC ; stage
@@ -7779,11 +7782,11 @@ MrMimeCard: ; 3337b (c:737b)
db 3
JynxCard: ; 333bc (c:73bc)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx JynxCardGfx ; gfx
tx JynxName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db JYNX
db 70 ; hp
db BASIC ; stage
@@ -7830,11 +7833,11 @@ JynxCard: ; 333bc (c:73bc)
db 0
Mewtwo1Card: ; 333fd (c:73fd)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mewtwo1CardGfx ; gfx
tx MewtwoName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db MEWTWO1
db 60 ; hp
db BASIC ; stage
@@ -7881,11 +7884,11 @@ Mewtwo1Card: ; 333fd (c:73fd)
db 0
Mewtwo2Card: ; 3343e (c:743e)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mewtwo2CardGfx ; gfx
tx MewtwoName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db MEWTWO2
db 70 ; hp
db BASIC ; stage
@@ -7932,11 +7935,11 @@ Mewtwo2Card: ; 3343e (c:743e)
db 0
Mewtwo3Card: ; 3347f (c:747f)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mewtwo3CardGfx ; gfx
tx MewtwoName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db MEWTWO3
db 70 ; hp
db BASIC ; stage
@@ -7983,11 +7986,11 @@ Mewtwo3Card: ; 3347f (c:747f)
db 0
Mew1Card: ; 334c0 (c:74c0)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mew1CardGfx ; gfx
tx MewName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db MEW1
db 40 ; hp
db BASIC ; stage
@@ -8034,11 +8037,11 @@ Mew1Card: ; 334c0 (c:74c0)
db 3
Mew2Card: ; 33501 (c:7501)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mew2CardGfx ; gfx
tx MewName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db MEW2
db 50 ; hp
db BASIC ; stage
@@ -8085,11 +8088,11 @@ Mew2Card: ; 33501 (c:7501)
db 0
Mew3Card: ; 33542 (c:7542)
- db PSYCHIC ; type
+ db TYPE_PKMN_PSYCHIC ; type
gfx Mew3CardGfx ; gfx
tx MewName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db MEW3
db 50 ; hp
db BASIC ; stage
@@ -8136,11 +8139,11 @@ Mew3Card: ; 33542 (c:7542)
db 8
PidgeyCard: ; 33583 (c:7583)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx PidgeyCardGfx ; gfx
tx PidgeyName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db PIDGEY
db 40 ; hp
db BASIC ; stage
@@ -8187,11 +8190,11 @@ PidgeyCard: ; 33583 (c:7583)
db 18
PidgeottoCard: ; 335c4 (c:75c4)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx PidgeottoCardGfx ; gfx
tx PidgeottoName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db PIDGEOTTO
db 60 ; hp
db STAGE1 ; stage
@@ -8238,11 +8241,11 @@ PidgeottoCard: ; 335c4 (c:75c4)
db 16
Pidgeot1Card: ; 33605 (c:7605)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Pidgeot1CardGfx ; gfx
tx PidgeotName ; name
db STAR ; rarity
- db LABORATORY | GB ; set
+ db LABORATORY | GB ; sets
db PIDGEOT1
db 80 ; hp
db STAGE2 ; stage
@@ -8289,11 +8292,11 @@ Pidgeot1Card: ; 33605 (c:7605)
db 0
Pidgeot2Card: ; 33646 (c:7646)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Pidgeot2CardGfx ; gfx
tx PidgeotName ; name
db STAR ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db PIDGEOT2
db 80 ; hp
db STAGE2 ; stage
@@ -8340,11 +8343,11 @@ Pidgeot2Card: ; 33646 (c:7646)
db 0
RattataCard: ; 33687 (c:7687)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx RattataCardGfx ; gfx
tx RattataName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db RATTATA
db 30 ; hp
db BASIC ; stage
@@ -8391,11 +8394,11 @@ RattataCard: ; 33687 (c:7687)
db 19
RaticateCard: ; 336c8 (c:76c8)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx RaticateCardGfx ; gfx
tx RaticateName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db RATICATE
db 60 ; hp
db STAGE1 ; stage
@@ -8442,11 +8445,11 @@ RaticateCard: ; 336c8 (c:76c8)
db 3
SpearowCard: ; 33709 (c:7709)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx SpearowCardGfx ; gfx
tx SpearowName ; name
db CIRCLE ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db SPEAROW
db 50 ; hp
db BASIC ; stage
@@ -8493,11 +8496,11 @@ SpearowCard: ; 33709 (c:7709)
db 19
FearowCard: ; 3374a (c:774a)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx FearowCardGfx ; gfx
tx FearowName ; name
db DIAMOND ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db FEAROW
db 70 ; hp
db STAGE1 ; stage
@@ -8544,11 +8547,11 @@ FearowCard: ; 3374a (c:774a)
db 0
ClefairyCard: ; 3378b (c:778b)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx ClefairyCardGfx ; gfx
tx ClefairyName ; name
db STAR ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db CLEFAIRY
db 40 ; hp
db BASIC ; stage
@@ -8595,11 +8598,11 @@ ClefairyCard: ; 3378b (c:778b)
db 18
ClefableCard: ; 337cc (c:77cc)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx ClefableCardGfx ; gfx
tx ClefableName ; name
db STAR ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db CLEFABLE
db 70 ; hp
db STAGE1 ; stage
@@ -8646,11 +8649,11 @@ ClefableCard: ; 337cc (c:77cc)
db 0
Jigglypuff1Card: ; 3380d (c:780d)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Jigglypuff1CardGfx ; gfx
tx JigglypuffName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db JIGGLYPUFF1
db 50 ; hp
db BASIC ; stage
@@ -8697,11 +8700,11 @@ Jigglypuff1Card: ; 3380d (c:780d)
db 16
Jigglypuff2Card: ; 3384e (c:784e)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Jigglypuff2CardGfx ; gfx
tx JigglypuffName ; name
db CIRCLE ; rarity
- db EVOLUTION | GB ; set
+ db EVOLUTION | GB ; sets
db JIGGLYPUFF2
db 50 ; hp
db BASIC ; stage
@@ -8748,11 +8751,11 @@ Jigglypuff2Card: ; 3384e (c:784e)
db 16
Jigglypuff3Card: ; 3388f (c:788f)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Jigglypuff3CardGfx ; gfx
tx JigglypuffName ; name
db CIRCLE ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db JIGGLYPUFF3
db 60 ; hp
db BASIC ; stage
@@ -8799,11 +8802,11 @@ Jigglypuff3Card: ; 3388f (c:788f)
db 16
WigglytuffCard: ; 338d0 (c:78d0)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx WigglytuffCardGfx ; gfx
tx WigglytuffName ; name
db STAR ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db WIGGLYTUFF
db 80 ; hp
db STAGE1 ; stage
@@ -8850,11 +8853,11 @@ WigglytuffCard: ; 338d0 (c:78d0)
db 0
Meowth1Card: ; 33911 (c:7911)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Meowth1CardGfx ; gfx
tx MeowthName ; name
db CIRCLE ; rarity
- db COLOSSEUM | GB ; set
+ db COLOSSEUM | GB ; sets
db MEOWTH1
db 50 ; hp
db BASIC ; stage
@@ -8901,11 +8904,11 @@ Meowth1Card: ; 33911 (c:7911)
db 16
Meowth2Card: ; 33952 (c:7952)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Meowth2CardGfx ; gfx
tx MeowthName ; name
db CIRCLE ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db MEOWTH2
db 50 ; hp
db BASIC ; stage
@@ -8952,11 +8955,11 @@ Meowth2Card: ; 33952 (c:7952)
db 16
PersianCard: ; 33993 (c:7993)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx PersianCardGfx ; gfx
tx PersianName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db PERSIAN
db 70 ; hp
db STAGE1 ; stage
@@ -9003,11 +9006,11 @@ PersianCard: ; 33993 (c:7993)
db 0
FarfetchdCard: ; 339d4 (c:79d4)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx FarfetchdCardGfx ; gfx
tx FarfetchdName ; name
db DIAMOND ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db FARFETCHD
db 50 ; hp
db BASIC ; stage
@@ -9054,11 +9057,11 @@ FarfetchdCard: ; 339d4 (c:79d4)
db 3
DoduoCard: ; 33a15 (c:7a15)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx DoduoCardGfx ; gfx
tx DoduoName ; name
db CIRCLE ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db DODUO
db 50 ; hp
db BASIC ; stage
@@ -9105,11 +9108,11 @@ DoduoCard: ; 33a15 (c:7a15)
db 19
DodrioCard: ; 33a56 (c:7a56)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx DodrioCardGfx ; gfx
tx DodrioName ; name
db DIAMOND ; rarity
- db LABORATORY | JUNGLE ; set
+ db LABORATORY | JUNGLE ; sets
db DODRIO
db 70 ; hp
db STAGE1 ; stage
@@ -9156,11 +9159,11 @@ DodrioCard: ; 33a56 (c:7a56)
db 1
LickitungCard: ; 33a97 (c:7a97)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx LickitungCardGfx ; gfx
tx LickitungName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db LICKITUNG
db 90 ; hp
db BASIC ; stage
@@ -9207,11 +9210,11 @@ LickitungCard: ; 33a97 (c:7a97)
db 0
ChanseyCard: ; 33ad8 (c:7ad8)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx ChanseyCardGfx ; gfx
tx ChanseyName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db CHANSEY
db 120 ; hp
db BASIC ; stage
@@ -9258,11 +9261,11 @@ ChanseyCard: ; 33ad8 (c:7ad8)
db 8
KangaskhanCard: ; 33b19 (c:7b19)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx KangaskhanCardGfx ; gfx
tx KangaskhanName ; name
db STAR ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db KANGASKHAN
db 90 ; hp
db BASIC ; stage
@@ -9309,11 +9312,11 @@ KangaskhanCard: ; 33b19 (c:7b19)
db 0
TaurosCard: ; 33b5a (c:7b5a)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx TaurosCardGfx ; gfx
tx TaurosName ; name
db DIAMOND ; rarity
- db MYSTERY | JUNGLE ; set
+ db MYSTERY | JUNGLE ; sets
db TAUROS
db 60 ; hp
db BASIC ; stage
@@ -9360,11 +9363,11 @@ TaurosCard: ; 33b5a (c:7b5a)
db 0
DittoCard: ; 33b9b (c:7b9b)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx DittoCardGfx ; gfx
tx DittoName ; name
db STAR ; rarity
- db LABORATORY | GB ; set
+ db LABORATORY | GB ; sets
db DITTO
db 50 ; hp
db BASIC ; stage
@@ -9411,11 +9414,11 @@ DittoCard: ; 33b9b (c:7b9b)
db 0
EeveeCard: ; 33bdc (c:7bdc)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx EeveeCardGfx ; gfx
tx EeveeName ; name
db CIRCLE ; rarity
- db EVOLUTION | JUNGLE ; set
+ db EVOLUTION | JUNGLE ; sets
db EEVEE
db 50 ; hp
db BASIC ; stage
@@ -9462,11 +9465,11 @@ EeveeCard: ; 33bdc (c:7bdc)
db 17
PorygonCard: ; 33c1d (c:7c1d)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx PorygonCardGfx ; gfx
tx PorygonName ; name
db DIAMOND ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db PORYGON
db 30 ; hp
db BASIC ; stage
@@ -9513,11 +9516,11 @@ PorygonCard: ; 33c1d (c:7c1d)
db 0
SnorlaxCard: ; 33c5e (c:7c5e)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx SnorlaxCardGfx ; gfx
tx SnorlaxName ; name
db STAR ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db SNORLAX
db 90 ; hp
db BASIC ; stage
@@ -9564,11 +9567,11 @@ SnorlaxCard: ; 33c5e (c:7c5e)
db 0
DratiniCard: ; 33c9f (c:7c9f)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx DratiniCardGfx ; gfx
tx DratiniName ; name
db DIAMOND ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db DRATINI
db 40 ; hp
db BASIC ; stage
@@ -9615,11 +9618,11 @@ DratiniCard: ; 33c9f (c:7c9f)
db 18
DragonairCard: ; 33ce0 (c:7ce0)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx DragonairCardGfx ; gfx
tx DragonairName ; name
db STAR ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db DRAGONAIR
db 80 ; hp
db STAGE1 ; stage
@@ -9666,11 +9669,11 @@ DragonairCard: ; 33ce0 (c:7ce0)
db 16
Dragonite1Card: ; 33d21 (c:7d21)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Dragonite1CardGfx ; gfx
tx DragoniteName ; name
db STAR ; rarity
- db PROMOTIONAL | GB ; set
+ db PROMOTIONAL | GB ; sets
db DRAGONITE1
db 100 ; hp
db STAGE2 ; stage
@@ -9717,11 +9720,11 @@ Dragonite1Card: ; 33d21 (c:7d21)
db 0
Dragonite2Card: ; 33d62 (c:7d62)
- db COLORLESS ; type
+ db TYPE_PKMN_COLORLESS ; type
gfx Dragonite2CardGfx ; gfx
tx DragoniteName ; name
db STAR ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db DRAGONITE2
db 100 ; hp
db STAGE2 ; stage
@@ -9768,456 +9771,456 @@ Dragonite2Card: ; 33d62 (c:7d62)
db 0
GrassEnergyCard: ; 33da3 (c:7da3)
- db GRASS_ENERGY_CARD ; type
+ db TYPE_ENERGY_GRASS ; type
gfx GrassEnergyCardGfx ; gfx
tx GrassEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db GRASS_ENERGY
dw GrassEnergyEffectCommands ; effect commands
tx GrassEnergyDescription ; description
dw NONE ; description (cont)
FireEnergyCard: ; 33db1 (c:7db1)
- db FIRE_ENERGY_CARD ; type
+ db TYPE_ENERGY_FIRE ; type
gfx FireEnergyCardGfx ; gfx
tx FireEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db FIRE_ENERGY
dw FireEnergyEffectCommands ; effect commands
tx FireEnergyDescription ; description
dw NONE ; description (cont)
WaterEnergyCard: ; 33dbf (c:7dbf)
- db WATER_ENERGY_CARD ; type
+ db TYPE_ENERGY_WATER ; type
gfx WaterEnergyCardGfx ; gfx
tx WaterEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db WATER_ENERGY
dw WaterEnergyEffectCommands ; effect commands
tx WaterEnergyDescription ; description
dw NONE ; description (cont)
LightningEnergyCard: ; 33dcd (c:7dcd)
- db LIGHTNING_ENERGY_CARD ; type
+ db TYPE_ENERGY_LIGHTNING ; type
gfx LightningEnergyCardGfx ; gfx
tx LightningEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db LIGHTNING_ENERGY
dw LightningEnergyEffectCommands ; effect commands
tx LightningEnergyDescription ; description
dw NONE ; description (cont)
FightingEnergyCard: ; 33ddb (c:7ddb)
- db FIGHTING_ENERGY_CARD ; type
+ db TYPE_ENERGY_FIGHTING ; type
gfx FightingEnergyCardGfx ; gfx
tx FightingEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db FIGHTING_ENERGY
dw FightingEnergyEffectCommands ; effect commands
tx FightingEnergyDescription ; description
dw NONE ; description (cont)
PsychicEnergyCard: ; 33de9 (c:7de9)
- db PSYCHIC_ENERGY_CARD ; type
+ db TYPE_ENERGY_PSYCHIC ; type
gfx PsychicEnergyCardGfx ; gfx
tx PsychicEnergyName ; name
db CIRCLE ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db PSYCHIC_ENERGY
dw PsychicEnergyEffectCommands ; effect commands
tx PsychicEnergyDescription ; description
dw NONE ; description (cont)
DoubleColorlessEnergyCard: ; 33df7 (c:7df7)
- db DOUBLE_COLORLESS_ENERGY_CARD ; type
+ db TYPE_ENERGY_DOUBLE_COLORLESS ; type
gfx DoubleColorlessEnergyCardGfx ; gfx
tx DoubleColorlessEnergyName ; name
db DIAMOND ; rarity
- db ENERGY | NONE ; set
+ db ENERGY | NONE ; sets
db DOUBLE_COLORLESS_ENERGY
dw DoubleColorlessEnergyEffectCommands ; effect commands
tx DoubleColorlessEnergyDescription ; description
dw NONE ; description (cont)
ProfessorOakCard: ; 33e05 (c:7e05)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ProfessorOakCardGfx ; gfx
tx ProfessorOakName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db PROFESSOR_OAK
dw ProfessorOakEffectCommands ; effect commands
tx ProfessorOakDescription ; description
dw NONE ; description (cont)
ImposterProfessorOakCard: ; 33e13 (c:7e13)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ImposterProfessorOakCardGfx ; gfx
tx ImposterProfessorOakName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db IMPOSTER_PROFESSOR_OAK
dw ImposterProfessorOakEffectCommands ; effect commands
tx ImposterProfessorOakDescription ; description
dw NONE ; description (cont)
BillCard: ; 33e21 (c:7e21)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx BillCardGfx ; gfx
tx BillName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db BILL
dw BillEffectCommands ; effect commands
tx BillDescription ; description
dw NONE ; description (cont)
MrFujiCard: ; 33e2f (c:7e2f)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx MrFujiCardGfx ; gfx
tx MrFujiName ; name
db DIAMOND ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db MR_FUJI
dw MrFujiEffectCommands ; effect commands
tx MrFujiDescription ; description
dw NONE ; description (cont)
LassCard: ; 33e3d (c:7e3d)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx LassCardGfx ; gfx
tx LassName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db LASS
dw LassEffectCommands ; effect commands
tx LassDescription ; description
dw NONE ; description (cont)
ImakuniCard: ; 33e4b (c:7e4b)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ImakuniCardGfx ; gfx
tx ImakuniName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db IMAKUNI_CARD
dw ImakuniEffectCommands ; effect commands
tx ImakuniDescription ; description
dw NONE ; description (cont)
PokemonTraderCard: ; 33e59 (c:7e59)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokemonTraderCardGfx ; gfx
tx PokemonTraderName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db POKEMON_TRADER
dw PokemonTraderEffectCommands ; effect commands
tx PokemonTraderDescription ; description
dw NONE ; description (cont)
PokemonBreederCard: ; 33e67 (c:7e67)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokemonBreederCardGfx ; gfx
tx PokemonBreederName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db POKEMON_BREEDER
dw PokemonBreederEffectCommands ; effect commands
tx PokemonBreederDescription ; description
dw NONE ; description (cont)
ClefairyDollCard: ; 33e75 (c:7e75)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ClefairyDollCardGfx ; gfx
tx ClefairyDollName ; name
db STAR ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db CLEFAIRY_DOLL
dw ClefairyDollEffectCommands ; effect commands
tx ClefairyDollDescription ; description
tx ClefairyDollDescriptionCont ; description (cont)
MysteriousFossilCard: ; 33e83 (c:7e83)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx MysteriousFossilCardGfx ; gfx
tx MysteriousFossilName ; name
db CIRCLE ; rarity
- db MYSTERY | FOSSIL ; set
+ db MYSTERY | FOSSIL ; sets
db MYSTERIOUS_FOSSIL
dw MysteriousFossilEffectCommands ; effect commands
tx MysteriousFossilDescription ; description
tx MysteriousFossilDescriptionCont ; description (cont)
EnergyRetrievalCard: ; 33e91 (c:7e91)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx EnergyRetrievalCardGfx ; gfx
tx EnergyRetrievalName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db ENERGY_RETRIEVAL
dw EnergyRetrievalEffectCommands ; effect commands
tx EnergyRetrievalDescription ; description
dw NONE ; description (cont)
SuperEnergyRetrievalCard: ; 33e9f (c:7e9f)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx SuperEnergyRetrievalCardGfx ; gfx
tx SuperEnergyRetrievalName ; name
db PROMOSTAR ; rarity
- db PROMOTIONAL | PRO ; set
+ db PROMOTIONAL | PRO ; sets
db SUPER_ENERGY_RETRIEVAL
dw SuperEnergyRetrievalEffectCommands ; effect commands
tx SuperEnergyRetrievalDescription ; description
dw NONE ; description (cont)
EnergySearchCard: ; 33ead (c:7ead)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx EnergySearchCardGfx ; gfx
tx EnergySearchName ; name
db CIRCLE ; rarity
- db EVOLUTION | FOSSIL ; set
+ db EVOLUTION | FOSSIL ; sets
db ENERGY_SEARCH
dw EnergySearchEffectCommands ; effect commands
tx EnergySearchDescription ; description
dw NONE ; description (cont)
EnergyRemovalCard: ; 33ebb (c:7ebb)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx EnergyRemovalCardGfx ; gfx
tx EnergyRemovalName ; name
db CIRCLE ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db ENERGY_REMOVAL
dw EnergyRemovalEffectCommands ; effect commands
tx EnergyRemovalDescription ; description
dw NONE ; description (cont)
SuperEnergyRemovalCard: ; 33ec9 (c:7ec9)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx SuperEnergyRemovalCardGfx ; gfx
tx SuperEnergyRemovalName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db SUPER_ENERGY_REMOVAL
dw SuperEnergyRemovalEffectCommands ; effect commands
tx SuperEnergyRemovalDescription ; description
dw NONE ; description (cont)
SwitchCard: ; 33ed7 (c:7ed7)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx SwitchCardGfx ; gfx
tx SwitchName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db SWITCH
dw SwitchEffectCommands ; effect commands
tx SwitchDescription ; description
dw NONE ; description (cont)
PokemonCenterCard: ; 33ee5 (c:7ee5)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokemonCenterCardGfx ; gfx
tx PokemonCenterName ; name
db DIAMOND ; rarity
- db MYSTERY | NONE ; set
+ db MYSTERY | NONE ; sets
db POKEMON_CENTER
dw PokemonCenterEffectCommands ; effect commands
tx PokemonCenterDescription ; description
dw NONE ; description (cont)
PokeBallCard: ; 33ef3 (c:7ef3)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokeBallCardGfx ; gfx
tx PokeBallName ; name
db CIRCLE ; rarity
- db COLOSSEUM | JUNGLE ; set
+ db COLOSSEUM | JUNGLE ; sets
db POKE_BALL
dw PokeBallEffectCommands ; effect commands
tx PokeBallDescription ; description
dw NONE ; description (cont)
ScoopUpCard: ; 33f01 (c:7f01)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ScoopUpCardGfx ; gfx
tx ScoopUpName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db SCOOP_UP
dw ScoopUpEffectCommands ; effect commands
tx ScoopUpDescription ; description
dw NONE ; description (cont)
ComputerSearchCard: ; 33f0f (c:7f0f)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ComputerSearchCardGfx ; gfx
tx ComputerSearchName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db COMPUTER_SEARCH
dw ComputerSearchEffectCommands ; effect commands
tx ComputerSearchDescription ; description
dw NONE ; description (cont)
PokedexCard: ; 33f1d (c:7f1d)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokedexCardGfx ; gfx
tx PokedexName ; name
db DIAMOND ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db POKEDEX
dw PokedexEffectCommands ; effect commands
tx PokedexDescription ; description
dw NONE ; description (cont)
PlusPowerCard: ; 33f2b (c:7f2b)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PlusPowerCardGfx ; gfx
tx PlusPowerName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db PLUSPOWER
dw PlusPowerEffectCommands ; effect commands
tx PlusPowerDescription ; description
dw NONE ; description (cont)
DefenderCard: ; 33f39 (c:7f39)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx DefenderCardGfx ; gfx
tx DefenderName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db DEFENDER
dw DefenderEffectCommands ; effect commands
tx DefenderDescription ; description
dw NONE ; description (cont)
ItemFinderCard: ; 33f47 (c:7f47)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ItemFinderCardGfx ; gfx
tx ItemFinderName ; name
db STAR ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db ITEM_FINDER
dw ItemFinderEffectCommands ; effect commands
tx ItemFinderDescription ; description
dw NONE ; description (cont)
GustofWindCard: ; 33f55 (c:7f55)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx GustofWindCardGfx ; gfx
tx GustofWindName ; name
db CIRCLE ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db GUST_OF_WIND
dw GustofWindEffectCommands ; effect commands
tx GustofWindDescription ; description
dw NONE ; description (cont)
DevolutionSprayCard: ; 33f63 (c:7f63)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx DevolutionSprayCardGfx ; gfx
tx DevolutionSprayName ; name
db STAR ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db DEVOLUTION_SPRAY
dw DevolutionSprayEffectCommands ; effect commands
tx DevolutionSprayDescription ; description
tx DevolutionSprayDescriptionCont ; description (cont)
PotionCard: ; 33f71 (c:7f71)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PotionCardGfx ; gfx
tx PotionName ; name
db CIRCLE ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db POTION
dw PotionEffectCommands ; effect commands
tx PotionDescription ; description
dw NONE ; description (cont)
SuperPotionCard: ; 33f7f (c:7f7f)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx SuperPotionCardGfx ; gfx
tx SuperPotionName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db SUPER_POTION
dw SuperPotionEffectCommands ; effect commands
tx SuperPotionDescription ; description
dw NONE ; description (cont)
FullHealCard: ; 33f8d (c:7f8d)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx FullHealCardGfx ; gfx
tx FullHealName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db FULL_HEAL
dw FullHealEffectCommands ; effect commands
tx FullHealDescription ; description
dw NONE ; description (cont)
ReviveCard: ; 33f9b (c:7f9b)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx ReviveCardGfx ; gfx
tx ReviveName ; name
db DIAMOND ; rarity
- db COLOSSEUM | NONE ; set
+ db COLOSSEUM | NONE ; sets
db REVIVE
dw ReviveEffectCommands ; effect commands
tx ReviveDescription ; description
dw NONE ; description (cont)
MaintenanceCard: ; 33fa9 (c:7fa9)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx MaintenanceCardGfx ; gfx
tx MaintenanceName ; name
db DIAMOND ; rarity
- db LABORATORY | NONE ; set
+ db LABORATORY | NONE ; sets
db MAINTENANCE
dw MaintenanceEffectCommands ; effect commands
tx MaintenanceDescription ; description
dw NONE ; description (cont)
PokemonFluteCard: ; 33fb7 (c:7fb7)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx PokemonFluteCardGfx ; gfx
tx PokemonFluteName ; name
db DIAMOND ; rarity
- db EVOLUTION | NONE ; set
+ db EVOLUTION | NONE ; sets
db POKEMON_FLUTE
dw PokemonFluteEffectCommands ; effect commands
tx PokemonFluteDescription ; description
dw NONE ; description (cont)
GamblerCard: ; 33fc5 (c:7fc5)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx GamblerCardGfx ; gfx
tx GamblerName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db GAMBLER
dw GamblerEffectCommands ; effect commands
tx GamblerDescription ; description
dw NONE ; description (cont)
RecycleCard: ; 33fd3 (c:7fd3)
- db TRAINER_CARD ; type
+ db TYPE_TRAINER ; type
gfx RecycleCardGfx ; gfx
tx RecycleName ; name
db CIRCLE ; rarity
- db LABORATORY | FOSSIL ; set
+ db LABORATORY | FOSSIL ; sets
db RECYCLE
dw RecycleEffectCommands ; effect commands
tx RecycleDescription ; description
dw NONE ; description (cont)
rept $1f
-db $ff
+ db $ff
endr
diff --git a/src/data/decks.asm b/src/data/decks.asm
index 78b549d..129b6d9 100755
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
@@ -76,7 +76,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 1, DEVOLUTION_SPRAY
db 1, POTION
db 1, SUPER_POTION
- db 0
+ db 0 ; end
; 30097 (c:4097)
db 8, LIGHTNING_ENERGY
@@ -92,7 +92,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, BULBASAUR
db 4, IVYSAUR
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 300b2 (c:40b2)
db 24, FIRE_ENERGY
@@ -111,7 +111,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 1, POTION
db 1, SUPER_POTION
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 300d3 (c:40d3)
db 4, PSYCHIC_ENERGY
@@ -129,7 +129,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, PIDGEOT2
db 4, JIGGLYPUFF2
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 300f2 (c:40f2)
db 10, PSYCHIC_ENERGY
@@ -153,7 +153,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 1, PROFESSOR_OAK
db 2, POKEMON_BREEDER
db 2, BILL
- db 0
+ db 0 ; end
; 3011d (c:411d)
db 10, PSYCHIC_ENERGY
@@ -168,7 +168,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, HAUNTER1
db 4, GENGAR
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 30136 (c:4136)
db 24, FIRE_ENERGY
@@ -183,7 +183,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 2, SCOOP_UP
db 1, POTION
db 1, SUPER_POTION
- db 0
+ db 0 ; end
; 3014f (c:414f)
db 20, PSYCHIC_ENERGY
@@ -197,7 +197,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, GENGAR
db 4, MEW3
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 30166 (c:4166)
db 24, PSYCHIC_ENERGY
@@ -210,7 +210,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, PORYGON
db 4, VENONAT
db 4, VENOMOTH
- db 0
+ db 0 ; end
; 3017b (c:417b)
db 24, PSYCHIC_ENERGY
@@ -225,7 +225,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 2, SCOOP_UP
db 1, POTION
db 1, SUPER_POTION
- db 0
+ db 0 ; end
; 30194 (c:4194)
db 24, PSYCHIC_ENERGY
@@ -241,7 +241,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 2, SCOOP_UP
db 1, POTION
db 1, SUPER_POTION
- db 0
+ db 0 ; end
; 301af (c:41af)
db 12, LIGHTNING_ENERGY
@@ -257,7 +257,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 4, PIKACHU1
db 4, PIKACHU2
db 4, RAICHU1
- db 0
+ db 0 ; end
; 301ca (c:41ca)
db 24, FIGHTING_ENERGY
@@ -274,7 +274,7 @@ UnnamedDeck: ; 30070 (c:4070)
db 2, SCOOP_UP
db 1, POTION
db 1, SUPER_POTION
- db 0
+ db 0 ; end
UnnamedDeck2: ; 301e7 (c:41e7)
db 4, FIRE_ENERGY
@@ -294,7 +294,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 2, PROFESSOR_OAK
db 2, GUST_OF_WIND
db 2, DOUBLE_COLORLESS_ENERGY
- db 0
+ db 0 ; end
; 3020a (c:420a)
db 4, FIRE_ENERGY
@@ -312,7 +312,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 2, PROFESSOR_OAK
db 2, GUST_OF_WIND
db 2, DOUBLE_COLORLESS_ENERGY
- db 0
+ db 0 ; end
; 30229 (c:4229)
db 4, PSYCHIC_ENERGY
@@ -330,7 +330,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, PIDGEOT1
db 4, JIGGLYPUFF2
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 30248 (c:4248)
db 24, GRASS_ENERGY
@@ -343,7 +343,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, JIGGLYPUFF3
db 4, WEEDLE
db 4, AERODACTYL
- db 0
+ db 0 ; end
; 3025d (c:425d)
db 8, LIGHTNING_ENERGY
@@ -359,7 +359,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, BULBASAUR
db 4, IVYSAUR
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 30278 (c:4278)
db 24, FIRE_ENERGY
@@ -372,7 +372,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, ARTICUNO2
db 4, VAPOREON1
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 3028d (c:428d)
db 20, GRASS_ENERGY
@@ -386,7 +386,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, BULBASAUR
db 4, IVYSAUR
db 4, VENUSAUR2
- db 0
+ db 0 ; end
; 302a4 (c:42a4)
db 24, GRASS_ENERGY
@@ -399,7 +399,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, PARAS
db 4, JIGGLYPUFF3
db 4, WEEDLE
- db 0
+ db 0 ; end
; 302b9 (c:42b9)
db 24, WATER_ENERGY
@@ -412,7 +412,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, TENTACOOL
db 4, AERODACTYL
db 4, POKEMON_BREEDER
- db 0
+ db 0 ; end
; 302ce (c:42ce)
db 24, WATER_ENERGY
@@ -425,7 +425,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, MYSTERIOUS_FOSSIL
db 4, AERODACTYL
db 4, POTION
- db 0
+ db 0 ; end
; 302e3 (c:42e3)
db 24, GRASS_ENERGY
@@ -439,7 +439,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 3, PLUSPOWER
db 2, PROFESSOR_OAK
db 3, BILL
- db 0
+ db 0 ; end
; 302fa (c:42fa)
db 12, LIGHTNING_ENERGY
@@ -455,7 +455,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, PIKACHU1
db 4, PIKACHU2
db 4, RAICHU1
- db 0
+ db 0 ; end
; 30315 (c:4315)
db 4, RAICHU2
@@ -471,7 +471,7 @@ UnnamedDeck2: ; 301e7 (c:41e7)
db 4, KINGLER
db 4, KRABBY
db 4, MAGIKARP
- db 0
+ db 0 ; end
; 30330 (c:4330)
dw $4544
@@ -541,8 +541,7 @@ PracticePlayerDeck: ; 30344 (c:4344)
db 1, RATICATE
db 1, RATICATE
db 1, ALAKAZAM
- db 0
-
+ db 0 ; end
tx PracticePlayerDeckName
SamsPracticeDeck: ; 303b5 (c:43b5)
@@ -602,8 +601,7 @@ SamsPracticeDeck: ; 303b5 (c:43b5)
db 1, RATTATA
db 1, EEVEE
db 1, EEVEE
- db 0
-
+ db 0 ; end
tx SamsPracticeDeckName
CharmanderAndFriendsDeck: ; 30428 (c:4428)
@@ -636,8 +634,7 @@ CharmanderAndFriendsDeck: ; 30428 (c:4428)
db 1, PLUSPOWER
db 2, POTION
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx CharmanderAndFriendsDeckName
CharmanderExtraDeck: ; 30465 (c:4465)
@@ -659,8 +656,7 @@ CharmanderExtraDeck: ; 30465 (c:4465)
db 1, KADABRA
db 1, GASTLY1
db 30, GRASS_ENERGY
- db 0
-
+ db 0 ; end
tx CharmanderExtraDeckName
SquirtleAndFriendsDeck: ; 3048c (c:448c)
@@ -696,8 +692,7 @@ SquirtleAndFriendsDeck: ; 3048c (c:448c)
db 1, ITEM_FINDER
db 1, POTION
db 1, FULL_HEAL
- db 0
-
+ db 0 ; end
tx SquirtleAndFriendsDeckName
SquirtleExtraDeck: ; 304cf (c:44cf)
@@ -721,8 +716,7 @@ SquirtleExtraDeck: ; 304cf (c:44cf)
db 1, MAGNETON1
db 1, ELECTABUZZ2
db 30, GRASS_ENERGY
- db 0
-
+ db 0 ; end
tx SquirtleExtraDeckName
BulbasaurAndFriendsDeck: ; 304fa (c:44fa)
@@ -757,8 +751,7 @@ BulbasaurAndFriendsDeck: ; 304fa (c:44fa)
db 1, DEFENDER
db 2, FULL_HEAL
db 1, REVIVE
- db 0
-
+ db 0 ; end
tx BulbasaurAndFriendsDeckName
BulbasaurExtraDeck: ; 3053b (c:453b)
@@ -781,8 +774,7 @@ BulbasaurExtraDeck: ; 3053b (c:453b)
db 2, POTION
db 1, GUST_OF_WIND
db 30, GRASS_ENERGY
- db 0
-
+ db 0 ; end
tx BulbasaurExtraDeckName
LightningAndFireDeck: ; 30564 (c:4564)
@@ -815,8 +807,7 @@ LightningAndFireDeck: ; 30564 (c:4564)
db 2, PLUSPOWER
db 2, DEFENDER
db 1, POTION
- db 0
-
+ db 0 ; end
tx LightningAndFireDeckName
WaterAndFightingDeck: ; 305a1 (c:45a1)
@@ -845,8 +836,7 @@ WaterAndFightingDeck: ; 305a1 (c:45a1)
db 2, ENERGY_SEARCH
db 3, POTION
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx WaterAndFightingDeckName
GrassAndPsychicDeck: ; 305d6 (c:45d6)
@@ -874,8 +864,7 @@ GrassAndPsychicDeck: ; 305d6 (c:45d6)
db 2, GUST_OF_WIND
db 2, POTION
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx GrassAndPsychicDeckName
LegendaryMoltresDeck: ; 30609 (c:4609)
@@ -897,8 +886,7 @@ LegendaryMoltresDeck: ; 30609 (c:4609)
db 2, SWITCH
db 1, POTION
db 1, SUPER_POTION
- db 0
-
+ db 0 ; end
tx LegendaryMoltresDeckName
LegendaryZapdosDeck: ; 30630 (c:4630)
@@ -917,8 +905,7 @@ LegendaryZapdosDeck: ; 30630 (c:4630)
db 3, PLUSPOWER
db 3, POTION
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx LegendaryZapdosDeckName
LegendaryArticunoDeck: ; 30651 (c:4651)
@@ -936,8 +923,7 @@ LegendaryArticunoDeck: ; 30651 (c:4651)
db 3, SWITCH
db 4, SCOOP_UP
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx LegendaryArticunoDeckName
LegendaryDragoniteDeck: ; 30670 (c:4670)
@@ -960,8 +946,7 @@ LegendaryDragoniteDeck: ; 30670 (c:4670)
db 1, SUPER_ENERGY_RETRIEVAL
db 2, SWITCH
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx LegendaryDragoniteDeckName
FirstStrikeDeck: ; 30699 (c:4699)
@@ -979,8 +964,7 @@ FirstStrikeDeck: ; 30699 (c:4699)
db 2, SWITCH
db 3, GUST_OF_WIND
db 4, BILL
- db 0
-
+ db 0 ; end
tx FirstStrikeDeckName
RockCrusherDeck: ; 306b8 (c:46b8)
@@ -1001,8 +985,7 @@ RockCrusherDeck: ; 306b8 (c:46b8)
db 2, DEFENDER
db 1, SUPER_POTION
db 2, POTION
- db 0
-
+ db 0 ; end
tx RockCrusherDeckName
GoGoRainDanceDeck: ; 306dd (c:46dd)
@@ -1024,8 +1007,7 @@ GoGoRainDanceDeck: ; 306dd (c:46dd)
db 2, SWITCH
db 2, POTION
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx GoGoRainDanceDeckName
ZappingSelfdestructDeck: ; 30704 (c:4704)
@@ -1044,8 +1026,7 @@ ZappingSelfdestructDeck: ; 30704 (c:4704)
db 4, DEFENDER
db 1, GUST_OF_WIND
db 4, POTION
- db 0
-
+ db 0 ; end
tx ZappingSelfdestructDeckName
FlowerPowerDeck: ; 30725 (c:4725)
@@ -1065,8 +1046,7 @@ FlowerPowerDeck: ; 30725 (c:4725)
db 2, ENERGY_RETRIEVAL
db 2, SWITCH
db 2, POTION
- db 0
-
+ db 0 ; end
tx FlowerPowerDeckName
StrangePsyshockDeck: ; 30748 (c:4748)
@@ -1085,8 +1065,7 @@ StrangePsyshockDeck: ; 30748 (c:4748)
db 4, SCOOP_UP
db 4, SWITCH
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx StrangePsyshockDeckName
WondersofScienceDeck: ; 30769 (c:4769)
@@ -1109,8 +1088,7 @@ WondersofScienceDeck: ; 30769 (c:4769)
db 2, POKEDEX
db 2, MAINTENANCE
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx WondersofScienceDeckName
FireChargeDeck: ; 30792 (c:4792)
@@ -1134,8 +1112,7 @@ FireChargeDeck: ; 30792 (c:4792)
db 1, FULL_HEAL
db 3, RECYCLE
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx FireChargeDeckName
ImRonaldDeck: ; 307bd (c:47bd)
@@ -1160,8 +1137,7 @@ ImRonaldDeck: ; 307bd (c:47bd)
db 1, PLUSPOWER
db 1, DEFENDER
db 2, GUST_OF_WIND
- db 0
-
+ db 0 ; end
tx ImRonaldDeckName
PowerfulRonaldDeck: ; 307ea (c:47ea)
@@ -1189,8 +1165,7 @@ PowerfulRonaldDeck: ; 307ea (c:47ea)
db 2, GUST_OF_WIND
db 1, FULL_HEAL
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx PowerfulRonaldDeckName
InvincibleRonaldDeck: ; 3081d (c:481d)
@@ -1214,8 +1189,7 @@ InvincibleRonaldDeck: ; 3081d (c:481d)
db 2, GUST_OF_WIND
db 2, PLUSPOWER
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx InvincibleRonaldDeckName
LegendaryRonaldDeck: ; 30848 (c:4848)
@@ -1239,8 +1213,7 @@ LegendaryRonaldDeck: ; 30848 (c:4848)
db 3, ENERGY_REMOVAL
db 3, SCOOP_UP
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx LegendaryRonaldDeckName
MusclesforBrainsDeck: ; 30873 (c:4873)
@@ -1266,8 +1239,7 @@ MusclesforBrainsDeck: ; 30873 (c:4873)
db 1, SUPER_POTION
db 1, FULL_HEAL
db 1, REVIVE
- db 0
-
+ db 0 ; end
tx MusclesforBrainsDeckName
HeatedBattleDeck: ; 308a2 (c:48a2)
@@ -1287,8 +1259,7 @@ HeatedBattleDeck: ; 308a2 (c:48a2)
db 2, DEFENDER
db 3, POTION
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx HeatedBattleDeckName
LovetoBattleDeck: ; 308c5 (c:48c5)
@@ -1307,8 +1278,7 @@ LovetoBattleDeck: ; 308c5 (c:48c5)
db 4, DEFENDER
db 3, POTION
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx LovetoBattleDeckName
ExcavationDeck: ; 308e6 (c:48e6)
@@ -1330,8 +1300,7 @@ ExcavationDeck: ; 308e6 (c:48e6)
db 2, BILL
db 2, POKEMON_BREEDER
db 4, MYSTERIOUS_FOSSIL
- db 0
-
+ db 0 ; end
tx ExcavationDeckName
BlisteringPokemonDeck: ; 3090d (c:490d)
@@ -1355,8 +1324,7 @@ BlisteringPokemonDeck: ; 3090d (c:490d)
db 3, SWITCH
db 3, DEFENDER
db 2, GUST_OF_WIND
- db 0
-
+ db 0 ; end
tx BlisteringPokemonDeckName
HardPokemonDeck: ; 30938 (c:4938)
@@ -1375,8 +1343,7 @@ HardPokemonDeck: ; 30938 (c:4938)
db 4, DEFENDER
db 3, GUST_OF_WIND
db 2, POTION
- db 0
-
+ db 0 ; end
tx HardPokemonDeckName
WaterfrontPokemonDeck: ; 30959 (c:4959)
@@ -1406,8 +1373,7 @@ WaterfrontPokemonDeck: ; 30959 (c:4959)
db 1, GUST_OF_WIND
db 2, POTION
db 1, SUPER_POTION
- db 0
-
+ db 0 ; end
tx WaterfrontPokemonDeckName
LonelyFriendsDeck: ; 30990 (c:4990)
@@ -1429,8 +1395,7 @@ LonelyFriendsDeck: ; 30990 (c:4990)
db 2, SCOOP_UP
db 4, POTION
db 1, SUPER_POTION
- db 0
-
+ db 0 ; end
tx LonelyFriendsDeckName
SoundoftheWavesDeck: ; 309b7 (c:49b7)
@@ -1451,8 +1416,7 @@ SoundoftheWavesDeck: ; 309b7 (c:49b7)
db 2, ENERGY_REMOVAL
db 3, PLUSPOWER
db 2, FULL_HEAL
- db 0
-
+ db 0 ; end
tx SoundoftheWavesDeckName
PikachuDeck: ; 309dc (c:49dc)
@@ -1473,8 +1437,7 @@ PikachuDeck: ; 309dc (c:49dc)
db 4, POTION
db 2, SUPER_POTION
db 4, FULL_HEAL
- db 0
-
+ db 0 ; end
tx PikachuDeckName
BoomBoomSelfdestructDeck: ; 30a01 (c:4a01)
@@ -1492,8 +1455,7 @@ BoomBoomSelfdestructDeck: ; 30a01 (c:4a01)
db 2, PROFESSOR_OAK
db 2, ENERGY_SEARCH
db 2, DEFENDER
- db 0
-
+ db 0 ; end
tx BoomBoomSelfdestructDeckName
PowerGeneratorDeck: ; 30a20 (c:4a20)
@@ -1517,8 +1479,7 @@ PowerGeneratorDeck: ; 30a20 (c:4a20)
db 2, POKEMON_TRADER
db 2, SWITCH
db 4, DEFENDER
- db 0
-
+ db 0 ; end
tx PowerGeneratorDeckName
EtceteraDeck: ; 30a4b (c:4a4b)
@@ -1546,8 +1507,7 @@ EtceteraDeck: ; 30a4b (c:4a4b)
db 3, POKE_BALL
db 3, PLUSPOWER
db 2, DEFENDER
- db 0
-
+ db 0 ; end
tx EtceteraDeckName
FlowerGardenDeck: ; 30a7e (c:4a7e)
@@ -1571,8 +1531,7 @@ FlowerGardenDeck: ; 30a7e (c:4a7e)
db 2, SWITCH
db 2, POTION
db 1, FULL_HEAL
- db 0
-
+ db 0 ; end
tx FlowerGardenDeckName
KaleidoscopeDeck: ; 30aa9 (c:4aa9)
@@ -1597,8 +1556,7 @@ KaleidoscopeDeck: ; 30aa9 (c:4aa9)
db 2, ENERGY_SEARCH
db 4, SWITCH
db 2, GUST_OF_WIND
- db 0
-
+ db 0 ; end
tx KaleidoscopeDeckName
GhostDeck: ; 30ad6 (c:4ad6)
@@ -1621,8 +1579,7 @@ GhostDeck: ; 30ad6 (c:4ad6)
db 2, POTION
db 1, FULL_HEAL
db 2, RECYCLE
- db 0
-
+ db 0 ; end
tx GhostDeckName
NapTimeDeck: ; 30aff (c:4aff)
@@ -1640,8 +1597,7 @@ NapTimeDeck: ; 30aff (c:4aff)
db 3, PLUSPOWER
db 2, GUST_OF_WIND
db 2, POTION
- db 0
-
+ db 0 ; end
tx NapTimeDeckName
StrangePowerDeck: ; 30b1e (c:4b1e)
@@ -1665,8 +1621,7 @@ StrangePowerDeck: ; 30b1e (c:4b1e)
db 1, ITEM_FINDER
db 1, GUST_OF_WIND
db 1, FULL_HEAL
- db 0
-
+ db 0 ; end
tx StrangePowerDeckName
FlyinPokemonDeck: ; 30b49 (c:4b49)
@@ -1686,8 +1641,7 @@ FlyinPokemonDeck: ; 30b49 (c:4b49)
db 2, LASS
db 2, BILL
db 4, POTION
- db 0
-
+ db 0 ; end
tx FlyinPokemonDeckName
LovelyNidoranDeck: ; 30b6c (c:4b6c)
@@ -1712,8 +1666,7 @@ LovelyNidoranDeck: ; 30b6c (c:4b6c)
db 1, SWITCH
db 2, POKE_BALL
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx LovelyNidoranDeckName
PoisonDeck: ; 30b99 (c:4b99)
@@ -1734,8 +1687,7 @@ PoisonDeck: ; 30b99 (c:4b99)
db 2, POTION
db 2, FULL_HEAL
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx PoisonDeckName
AngerDeck: ; 30bbe (c:4bbe)
@@ -1757,8 +1709,7 @@ AngerDeck: ; 30bbe (c:4bbe)
db 4, PLUSPOWER
db 2, DEFENDER
db 2, GUST_OF_WIND
- db 0
-
+ db 0 ; end
tx AngerDeckName
FlamethrowerDeck: ; 30be5 (c:4be5)
@@ -1781,8 +1732,7 @@ FlamethrowerDeck: ; 30be5 (c:4be5)
db 2, SWITCH
db 2, PLUSPOWER
db 3, GUST_OF_WIND
- db 0
-
+ db 0 ; end
tx FlamethrowerDeckName
ReshuffleDeck: ; 30c0e (c:4c0e)
@@ -1808,8 +1758,7 @@ ReshuffleDeck: ; 30c0e (c:4c0e)
db 2, SWITCH
db 1, POKEMON_CENTER
db 2, POTION
- db 0
-
+ db 0 ; end
tx ReshuffleDeckName
ImakuniDeck: ; 30c3d (c:4c3d)
@@ -1827,6 +1776,5 @@ ImakuniDeck: ; 30c3d (c:4c3d)
db 2, MAINTENANCE
db 2, POKEMON_FLUTE
db 1, GAMBLER
- db 0
-
+ db 0 ; end
tx ImakuniDeckName
diff --git a/src/data/unknownNPCData.asm b/src/data/npcs.asm
index 2786188..d7a3a61 100755..100644
--- a/src/data/unknownNPCData.asm
+++ b/src/data/npcs.asm
@@ -1,1513 +1,1513 @@
-; When you press the a button in front of something it will find a data entry somewhere on this list
-; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
-PointerTable_118f5:
- dw Data_119dd
- dw Data_119dd
- dw Data_119ea
- dw Data_11a11
- dw Data_11a1e
- dw Data_119dd
- dw Data_119dd
- dw Data_11a2b
- dw Data_11a38
- dw Data_11a45
- dw Data_11a52
- dw Data_11a5f
- dw Data_11a6c
- dw Data_11a79
- dw Data_11a86
- dw Data_11a93
- dw Data_11aa0
- dw Data_11aad
- dw Data_11aba
- dw Data_11ac7
- dw Data_11ad4
- dw Data_11ae1
- dw Data_11aee
- dw Data_11afb
- dw Data_11b08
- dw Data_11b15
- dw Data_11b22
- dw Data_11b2f
- dw Data_11b3c
- dw Data_11b49
- dw Data_11b56
- dw SaraData
- dw AmandaData
- dw Data_11b7d
- dw Data_11b8a
- dw Data_11b97
- dw Data_11ba4
- dw Data_11bb1
- dw Data_11bbe
- dw Data_11bcb
- dw Data_11bd8
- dw Data_11be5
- dw Data_11bf2
- dw Data_11bff
- dw Data_11c0c
- dw Data_11c19
- dw Data_11c26
- dw Data_11c40
- dw Data_11c4d
- dw Data_11c5a
- dw Data_11c67
- dw Data_11c74
- dw Data_11c81
- dw Data_11c8e
- dw Data_11c9b
- dw Data_11ca8
- dw Data_11cb5
- dw Data_11cc2
- dw Data_11ccf
- dw Data_11cdc
- dw Data_11ce9
- dw Data_11cf6
- dw Data_11d03
- dw Data_11d10
- dw Data_11d1d
- dw Data_11d2a
- dw Data_11d37
- dw Data_11d44
- dw Data_11d51
- dw Data_11d5e
- dw Data_11d6b
- dw Data_11d78
- dw Data_11d85
- dw Data_11d92
- dw Data_11d9f
- dw Data_11dac
- dw Data_11db9
- dw Data_11dc6
- dw Data_11dd3
- dw Data_11de0
- dw Data_11ded
- dw Data_11dfa
- dw Data_11e07
- dw Data_11e14
- dw Data_11e21
- dw Data_11e2e
- dw Data_11e3b
- dw Data_11e48
- dw Data_11e55
- dw Data_11e62
- dw Data_11e6f
- dw Data_11e7c
- dw Data_11e89
- dw Data_11e96
- dw Data_11ea3
- dw Data_11eb0
- dw Data_11ebd
- dw Data_11eca
- dw Data_11ed7
- dw Data_11ee4
- dw Data_11ef1
- dw Data_11efe
- dw Data_11f0b
- dw Data_11f18
- dw Data_11f1f
- dw Data_11f26
- dw Data_11f2d
- dw Data_11f34
- dw Data_11f3b
- dw Data_11f42
- dw Data_11f49
- dw Data_11f49
- dw Data_11c33
- dw Data_119f7
- dw Data_11a04
- dw Data_11f49
-Data_119dd:
- db $01
- db $02
- db $00
- db $26
- db $00
- dw $5727 ; Pointer to NPC Data
- db $ac
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_119ea:
- db $02
- db $01
- db $04
- db $0e
- db $00
- dw $5c4b ; Pointer to NPC Data
- db $ad
- db $03
- db $02
- db $1a
- db $0f
- db $16
-Data_119f7:
- db $71
- db $01
- db $04
- db $0e
- db $00
- dw $5c4b ; Pointer to NPC Data
- db $ad
- db $03
- db $02
- db $1a
- db $0f
- db $16
-Data_11a04:
- db $72
- db $01
- db $04
- db $0e
- db $00
- dw $5c4b ; Pointer to NPC Data
- db $ad
- db $03
- db $02
- db $1a
- db $0f
- db $16
-Data_11a11:
- db $03
- db $03
- db $04
- db $22
- db $00
- dw $5b4a ; Pointer to NPC Data
- db $ae
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a1e:
- db $04
- db $04
- db $00
- db $0e
- db $00
- dw $5d0d ; Pointer to NPC Data
- db $af
- db $03
- db $04
- db $34
- db $10
- db $15
-Data_11a2b:
- db $07
- db $18
- db $00
- db $0e
- db $00
- dw $561d ; Pointer to NPC Data
- db $b1
- db $03
- db $03
- db $02
- db $02
- db $15
-Data_11a38:
- db $08
- db $18
- db $00
- db $0e
- db $00
- dw $5583 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a45:
- db $09
- db $18
- db $00
- db $0e
- db $00
- dw $55ca ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a52:
- db $0a
- db $18
- db $00
- db $0e
- db $00
- dw $55d5 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a5f:
- db $0b
- db $18
- db $00
- db $0e
- db $00
- dw $55e0 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a6c:
- db $0c
- db $18
- db $00
- db $0e
- db $00
- dw $55f9 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a79:
- db $0d
- db $18
- db $00
- db $0e
- db $00
- dw $58bb ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a86:
- db $0e
- db $21
- db $0a
- db $30
- db $00
- dw $5c64 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11a93:
- db $0f
- db $21
- db $0a
- db $30
- db $00
- dw $5ed1 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11aa0:
- db $10
- db $21
- db $0a
- db $30
- db $00
- dw $609e ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11aad:
- db $11
- db $21
- db $0a
- db $30
- db $00
- dw $6369 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11aba:
- db $12
- db $21
- db $0a
- db $30
- db $00
- dw $6566 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ac7:
- db $13
- db $21
- db $0a
- db $30
- db $00
- dw $684c ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ad4:
- db $14
- db $21
- db $0a
- db $30
- db $00
- dw $6b53 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ae1:
- db $15
- db $21
- db $0a
- db $30
- db $00
- dw $6d45 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11aee:
- db $16
- db $21
- db $0a
- db $30
- db $00
- dw $7025 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11afb:
- db $17
- db $15
- db $00
- db $26
- db $00
- dw $5ef2 ; Pointer to NPC Data
- db $b4
- db $03
- db $1d
- db $1c
- db $03
- db $15
-Data_11b08:
- db $18
- db $15
- db $00
- db $26
- db $00
- dw $6573 ; Pointer to NPC Data
- db $b5
- db $03
- db $1e
- db $1d
- db $03
- db $15
-Data_11b15:
- db $19
- db $1f
- db $04
- db $1a
- db $00
- dw $6d96 ; Pointer to NPC Data
- db $b6
- db $03
- db $27
- db $1e
- db $03
- db $15
-Data_11b22:
- db $1a
- db $0a
- db $00
- db $0e
- db $00
- dw $5dc3 ; Pointer to NPC Data
- db $b7
- db $03
- db $0a
- db $10
- db $03
- db $16
-Data_11b2f:
- db $1b
- db $15
- db $00
- db $16
- db $00
- dw $5f39 ; Pointer to NPC Data
- db $b8
- db $03
- db $1a
- db $21
- db $03
- db $15
-Data_11b3c:
- db $1c
- db $11
- db $00
- db $26
- db $00
- dw $5ff0 ; Pointer to NPC Data
- db $b9
- db $03
- db $1b
- db $1f
- db $03
- db $15
-Data_11b49:
- db $1d
- db $1a
- db $00
- db $16
- db $00
- dw $6017 ; Pointer to NPC Data
- db $ba
- db $03
- db $1c
- db $20
- db $03
- db $15
-Data_11b56:
- db $1e
- db $0b
- db $04
- db $1e
- db $00
- dw $603e ; Pointer to NPC Data
- db $bb
- db $03
- db $0b
- db $11
- db $03
- db $16
-SaraData:
- db SARA ; trainer id
- db $20
- db $00
- db $0e
- db $00
- dw OWSequence_Sara ; Pointer to NPC Data
- db $bc
- db $03
- db SARA_PIC ; battle profile picture
- db $22
- db $03
- db $15
-AmandaData:
- db AMANDA
- db $20
- db $00
- db $16
- db $00
- dw OWSequence_Amanda ; Pointer to NPC Data
- db $bd
- db $03
- db AMANDA_PIC
- db $23
- db $03
- db $15
-Data_11b7d:
- db $21
- db $16
- db $00
- db $26
- db $00
- dw OWSequence_Joshua ; Pointer to NPC Data
- db $be
- db $03
- db $17
- db $24
- db $03
- db $15
-Data_11b8a:
- db $22
- db $08
- db $08
- db $2e
- db $10
- dw $6304 ; Pointer to NPC Data
- db $bf
- db $03
- db $08
- db $12
- db $03
- db $16
-Data_11b97:
- db $23
- db $1c
- db $04
- db $0e
- db $00
- dw $6408 ; Pointer to NPC Data
- db $c0
- db $03
- db $26
- db $25
- db $03
- db $15
-Data_11ba4:
- db $24
- db $17
- db $04
- db $1e
- db $00
- dw $642f ; Pointer to NPC Data
- db $c1
- db $03
- db $18
- db $26
- db $03
- db $15
-Data_11bb1:
- db $25
- db $17
- db $04
- db $1e
- db $00
- dw $6456 ; Pointer to NPC Data
- db $c2
- db $03
- db $19
- db $27
- db $03
- db $15
-Data_11bbe:
- db $26
- db $09
- db $00
- db $16
- db $00
- dw $64ad ; Pointer to NPC Data
- db $c3
- db $03
- db $09
- db $13
- db $03
- db $16
-Data_11bcb:
- db $27
- db $1c
- db $04
- db $0e
- db $00
- dw $65d2 ; Pointer to NPC Data
- db $c4
- db $03
- db $21
- db $28
- db $03
- db $15
-Data_11bd8:
- db $28
- db $1e
- db $00
- db $1e
- db $00
- dw $6701 ; Pointer to NPC Data
- db $c5
- db $03
- db $22
- db $29
- db $03
- db $15
-Data_11be5:
- db $29
- db $1d
- db $04
- db $22
- db $00
- dw $6745 ; Pointer to NPC Data
- db $c6
- db $03
- db $23
- db $2a
- db $03
- db $15
-Data_11bf2:
- db $2a
- db $05
- db $00
- db $1a
- db $00
- dw $679e ; Pointer to NPC Data
- db $c7
- db $03
- db $05
- db $14
- db $03
- db $16
-Data_11bff:
- db $2b
- db $11
- db $04
- db $16
- db $00
- dw $6980 ; Pointer to NPC Data
- db $c8
- db $03
- db $20
- db $2b
- db $03
- db $15
-Data_11c0c:
- db $2c
- db $12
- db $04
- db $1a
- db $00
- dw $6a60 ; Pointer to NPC Data
- db $c9
- db $03
- db $1f
- db $2c
- db $03
- db $15
-Data_11c19:
- db $2d
- db $1c
- db $04
- db $0e
- db $00
- dw $6aa2 ; Pointer to NPC Data
- db $ca
- db $03
- db $28
- db $2d
- db $03
- db $15
-Data_11c26:
- db $2e
- db $0c
- db $00
- db $12
- db $00
- dw $6adf ; Pointer to NPC Data
- db $cb
- db $03
- db $0c
- db $15
- db $03
- db $16
-Data_11c33:
- db $70
- db $0c
- db $03
- db $15
- db $10
- dw $6adf ; Pointer to NPC Data
- db $cb
- db $03
- db $0c
- db $15
- db $03
- db $16
-Data_11c40:
- db $2f
- db $18
- db $00
- db $0e
- db $00
- dw $6cdb ; Pointer to NPC Data
- db $cc
- db $03
- db $11
- db $2e
- db $03
- db $15
-Data_11c4d:
- db $30
- db $18
- db $00
- db $0e
- db $00
- dw $6c11 ; Pointer to NPC Data
- db $cd
- db $03
- db $12
- db $2f
- db $03
- db $15
-Data_11c5a:
- db $31
- db $18
- db $00
- db $0e
- db $00
- dw $6c42 ; Pointer to NPC Data
- db $ce
- db $03
- db $13
- db $30
- db $03
- db $15
-Data_11c67:
- db $32
- db $06
- db $00
- db $0e
- db $00
- dw $6c67 ; Pointer to NPC Data
- db $cf
- db $03
- db $06
- db $16
- db $03
- db $16
-Data_11c74:
- db $33
- db $12
- db $04
- db $1a
- db $00
- dw $6eb3 ; Pointer to NPC Data
- db $d0
- db $03
- db $14
- db $31
- db $03
- db $15
-Data_11c81:
- db $34
- db $13
- db $00
- db $22
- db $00
- dw $6ed8 ; Pointer to NPC Data
- db $d1
- db $03
- db $15
- db $32
- db $03
- db $15
-Data_11c8e:
- db $35
- db $11
- db $04
- db $16
- db $00
- dw $6efd ; Pointer to NPC Data
- db $d2
- db $03
- db $16
- db $33
- db $03
- db $15
-Data_11c9b:
- db $36
- db $07
- db $04
- db $1e
- db $00
- dw $6f22 ; Pointer to NPC Data
- db $d3
- db $03
- db $07
- db $17
- db $03
- db $16
-Data_11ca8:
- db $37
- db $0d
- db $00
- db $12
- db $00
- dw $771f ; Pointer to NPC Data
- db $d4
- db $03
- db $0d
- db $0c
- db $04
- db $17
-Data_11cb5:
- db $38
- db $0e
- db $00
- db $2a
- db $00
- dw $772a ; Pointer to NPC Data
- db $d5
- db $03
- db $0e
- db $0d
- db $04
- db $17
-Data_11cc2:
- db $39
- db $0f
- db $00
- db $26
- db $00
- dw $7735 ; Pointer to NPC Data
- db $d6
- db $03
- db $0f
- db $0e
- db $04
- db $17
-Data_11ccf:
- db $3a
- db $10
- db $00
- db $0e
- db $00
- dw $7740 ; Pointer to NPC Data
- db $d7
- db $03
- db $10
- db $0f
- db $04
- db $17
-Data_11cdc:
- db $3b
- db $21
- db $0a
- db $30
- db $00
- dw $4c3e ; Pointer to NPC Data
- db $b0
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ce9:
- db $3c
- db $21
- db $0a
- db $30
- db $00
- dw $4c3e ; Pointer to NPC Data
- db $b0
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11cf6:
- db $3d
- db $1a
- db $00
- db $16
- db $00
- dw $5c76 ; Pointer to NPC Data
- db $d8
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d03:
- db $3e
- db $23
- db $04
- db $1e
- db $00
- dw $5f83 ; Pointer to NPC Data
- db $d9
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d10:
- db $3f
- db $19
- db $00
- db $1a
- db $00
- dw $5fc0 ; Pointer to NPC Data
- db $da
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d1d:
- db $40
- db $22
- db $00
- db $16
- db $00
- dw $60cf ; Pointer to NPC Data
- db $db
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d2a:
- db $41
- db $1e
- db $00
- db $1e
- db $00
- dw $6111 ; Pointer to NPC Data
- db $dc
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d37:
- db $42
- db $19
- db $00
- db $1a
- db $00
- dw $639a ; Pointer to NPC Data
- db $da
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d44:
- db $43
- db $1e
- db $00
- db $1e
- db $00
- dw $661f ; Pointer to NPC Data
- db $dc
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d51:
- db $44
- db $1b
- db $00
- db $22
- db $00
- dw $69a5 ; Pointer to NPC Data
- db $dd
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d5e:
- db $45
- db $12
- db $04
- db $1a
- db $00
- dw $6b84 ; Pointer to NPC Data
- db $de
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d6b:
- db $46
- db $11
- db $04
- db $16
- db $00
- dw $6e2c ; Pointer to NPC Data
- db $de
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d78:
- db $47
- db $19
- db $00
- db $1a
- db $00
- dw $6de8 ; Pointer to NPC Data
- db $da
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d85:
- db $48
- db $22
- db $00
- db $16
- db $00
- dw $7295 ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d92:
- db $49
- db $22
- db $00
- db $16
- db $00
- dw $726c ; Pointer to NPC Data
- db $b3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11d9f:
- db $4a
- db $22
- db $00
- db $16
- db $00
- dw $7352 ; Pointer to NPC Data
- db $df
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11dac:
- db $4b
- db $13
- db $00
- db $22
- db $00
- dw $5d82 ; Pointer to NPC Data
- db $e0
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11db9:
- db $4c
- db $14
- db $00
- db $16
- db $00
- dw $5d8d ; Pointer to NPC Data
- db $e1
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11dc6:
- db $4d
- db $24
- db $00
- db $16
- db $00
- dw $5d9f ; Pointer to NPC Data
- db $e5
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11dd3:
- db $4e
- db $1d
- db $04
- db $22
- db $00
- dw $5fd2 ; Pointer to NPC Data
- db $dc
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11de0:
- db $4f
- db $1a
- db $00
- db $16
- db $00
- dw $6137 ; Pointer to NPC Data
- db $d8
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ded:
- db $50
- db $1b
- db $00
- db $22
- db $00
- dw $613b ; Pointer to NPC Data
- db $dd
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11dfa:
- db $51
- db $1d
- db $04
- db $22
- db $00
- dw $63d9 ; Pointer to NPC Data
- db $dc
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e07:
- db $52
- db $17
- db $04
- db $1e
- db $00
- dw $63dd ; Pointer to NPC Data
- db $e2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e14:
- db $53
- db $24
- db $00
- db $16
- db $00
- dw $66d8 ; Pointer to NPC Data
- db $e5
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e21:
- db $54
- db $22
- db $00
- db $16
- db $00
- dw $66e3 ; Pointer to NPC Data
- db $db
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e2e:
- db $55
- db $12
- db $04
- db $1a
- db $00
- dw $6850 ; Pointer to NPC Data
- db $de
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e3b:
- db $56
- db $22
- db $00
- db $16
- db $00
- dw $6a30 ; Pointer to NPC Data
- db $db
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e48:
- db $57
- db $19
- db $00
- db $1a
- db $00
- dw $6a3b ; Pointer to NPC Data
- db $da
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e55:
- db $58
- db $1a
- db $00
- db $16
- db $00
- dw $6bc1 ; Pointer to NPC Data
- db $d8
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e62:
- db $59
- db $18
- db $00
- db $0e
- db $00
- dw $6bc5 ; Pointer to NPC Data
- db $e0
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e6f:
- db $5a
- db $13
- db $00
- db $22
- db $00
- dw $6bed ; Pointer to NPC Data
- db $e0
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e7c:
- db $5b
- db $23
- db $04
- db $1e
- db $00
- dw $4c3e ; Pointer to NPC Data
- db $d9
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e89:
- db $5c
- db $15
- db $00
- db $26
- db $00
- dw $6e88 ; Pointer to NPC Data
- db $e4
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11e96:
- db $5d
- db $1b
- db $00
- db $22
- db $00
- dw $709c ; Pointer to NPC Data
- db $dd
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ea3:
- db $5e
- db $22
- db $00
- db $16
- db $00
- dw $70a0 ; Pointer to NPC Data
- db $db
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11eb0:
- db $5f
- db $15
- db $00
- db $26
- db $00
- dw $70a4 ; Pointer to NPC Data
- db $e3
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ebd:
- db $60
- db $17
- db $04
- db $1e
- db $00
- dw $70a8 ; Pointer to NPC Data
- db $e2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11eca:
- db $61
- db $1f
- db $04
- db $1a
- db $00
- dw $70ac ; Pointer to NPC Data
- db $dc
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ed7:
- db $62
- db $19
- db $00
- db $1a
- db $00
- dw $70b0 ; Pointer to NPC Data
- db $da
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11ee4:
- db $63
- db $18
- db $00
- db $0e
- db $00
- dw $58dd ; Pointer to NPC Data
- db $e7
- db $03
- db $29
- db $09
- db $02
- db $15
-Data_11ef1:
- db $64
- db $1a
- db $00
- db $16
- db $00
- dw $7283 ; Pointer to NPC Data
- db $e6
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11efe:
- db $65
- db $18
- db $00
- db $0e
- db $00
- dw $58c6 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11f0b:
- db $66
- db $18
- db $00
- db $0e
- db $00
- dw $58d1 ; Pointer to NPC Data
- db $b2
- db $03
- db $00
- db $00
- db $00
- db $00
-Data_11f18:
- db $67
- db $26
- db $3a
- db $3a
- db $10
- dw $4c3e ; Pointer to NPC Data
-Data_11f1f:
- db $68
- db $27
- db $3b
- db $41
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f26:
- db $69
- db $27
- db $3c
- db $42
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f2d:
- db $6a
- db $27
- db $3d
- db $43
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f34:
- db $6b
- db $27
- db $3e
- db $44
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f3b:
- db $6c
- db $27
- db $3f
- db $45
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f42:
- db $6d
- db $27
- db $40
- db $46
- db $50
- dw $4c3e ; Pointer to NPC Data
-Data_11f49:
- db $00
- db $00
- db $00
- db $1e
- db $00
+; When you press the a button in front of something it will find a data entry somewhere on this list
+; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
+PointerTable_118f5:
+ dw Data_119dd
+ dw Data_119dd
+ dw Data_119ea
+ dw Data_11a11
+ dw Data_11a1e
+ dw Data_119dd
+ dw Data_119dd
+ dw Data_11a2b
+ dw Data_11a38
+ dw Data_11a45
+ dw Data_11a52
+ dw Data_11a5f
+ dw Data_11a6c
+ dw Data_11a79
+ dw Data_11a86
+ dw Data_11a93
+ dw Data_11aa0
+ dw Data_11aad
+ dw Data_11aba
+ dw Data_11ac7
+ dw Data_11ad4
+ dw Data_11ae1
+ dw Data_11aee
+ dw Data_11afb
+ dw Data_11b08
+ dw Data_11b15
+ dw Data_11b22
+ dw Data_11b2f
+ dw Data_11b3c
+ dw Data_11b49
+ dw Data_11b56
+ dw SaraData
+ dw AmandaData
+ dw Data_11b7d
+ dw Data_11b8a
+ dw Data_11b97
+ dw Data_11ba4
+ dw Data_11bb1
+ dw Data_11bbe
+ dw Data_11bcb
+ dw Data_11bd8
+ dw Data_11be5
+ dw Data_11bf2
+ dw Data_11bff
+ dw Data_11c0c
+ dw Data_11c19
+ dw Data_11c26
+ dw Data_11c40
+ dw Data_11c4d
+ dw Data_11c5a
+ dw Data_11c67
+ dw Data_11c74
+ dw Data_11c81
+ dw Data_11c8e
+ dw Data_11c9b
+ dw Data_11ca8
+ dw Data_11cb5
+ dw Data_11cc2
+ dw Data_11ccf
+ dw Data_11cdc
+ dw Data_11ce9
+ dw Data_11cf6
+ dw Data_11d03
+ dw Data_11d10
+ dw Data_11d1d
+ dw Data_11d2a
+ dw Data_11d37
+ dw Data_11d44
+ dw Data_11d51
+ dw Data_11d5e
+ dw Data_11d6b
+ dw Data_11d78
+ dw Data_11d85
+ dw Data_11d92
+ dw Data_11d9f
+ dw Data_11dac
+ dw Data_11db9
+ dw Data_11dc6
+ dw Data_11dd3
+ dw Data_11de0
+ dw Data_11ded
+ dw Data_11dfa
+ dw Data_11e07
+ dw Data_11e14
+ dw Data_11e21
+ dw Data_11e2e
+ dw Data_11e3b
+ dw Data_11e48
+ dw Data_11e55
+ dw Data_11e62
+ dw Data_11e6f
+ dw Data_11e7c
+ dw Data_11e89
+ dw Data_11e96
+ dw Data_11ea3
+ dw Data_11eb0
+ dw Data_11ebd
+ dw Data_11eca
+ dw Data_11ed7
+ dw Data_11ee4
+ dw Data_11ef1
+ dw Data_11efe
+ dw Data_11f0b
+ dw Data_11f18
+ dw Data_11f1f
+ dw Data_11f26
+ dw Data_11f2d
+ dw Data_11f34
+ dw Data_11f3b
+ dw Data_11f42
+ dw Data_11f49
+ dw Data_11f49
+ dw Data_11c33
+ dw Data_119f7
+ dw Data_11a04
+ dw Data_11f49
+Data_119dd:
+ db $01
+ db $02
+ db $00
+ db $26
+ db $00
+ dw $5727 ; Pointer to NPC Data
+ db $ac
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_119ea:
+ db $02
+ db $01
+ db $04
+ db $0e
+ db $00
+ dw $5c4b ; Pointer to NPC Data
+ db $ad
+ db $03
+ db $02
+ db $1a
+ db $0f
+ db $16
+Data_119f7:
+ db $71
+ db $01
+ db $04
+ db $0e
+ db $00
+ dw $5c4b ; Pointer to NPC Data
+ db $ad
+ db $03
+ db $02
+ db $1a
+ db $0f
+ db $16
+Data_11a04:
+ db $72
+ db $01
+ db $04
+ db $0e
+ db $00
+ dw $5c4b ; Pointer to NPC Data
+ db $ad
+ db $03
+ db $02
+ db $1a
+ db $0f
+ db $16
+Data_11a11:
+ db $03
+ db $03
+ db $04
+ db $22
+ db $00
+ dw $5b4a ; Pointer to NPC Data
+ db $ae
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a1e:
+ db $04
+ db $04
+ db $00
+ db $0e
+ db $00
+ dw $5d0d ; Pointer to NPC Data
+ db $af
+ db $03
+ db $04
+ db $34
+ db $10
+ db $15
+Data_11a2b:
+ db $07
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $561d ; Pointer to NPC Data
+ db $b1
+ db $03
+ db $03
+ db $02
+ db $02
+ db $15
+Data_11a38:
+ db $08
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $5583 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a45:
+ db $09
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $55ca ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a52:
+ db $0a
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $55d5 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a5f:
+ db $0b
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $55e0 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a6c:
+ db $0c
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $55f9 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a79:
+ db $0d
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $58bb ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a86:
+ db $0e
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $5c64 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11a93:
+ db $0f
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $5ed1 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11aa0:
+ db $10
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $609e ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11aad:
+ db $11
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $6369 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11aba:
+ db $12
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $6566 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ac7:
+ db $13
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $684c ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ad4:
+ db $14
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $6b53 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ae1:
+ db $15
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $6d45 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11aee:
+ db $16
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $7025 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11afb:
+ db $17
+ db $15
+ db $00
+ db $26
+ db $00
+ dw $5ef2 ; Pointer to NPC Data
+ db $b4
+ db $03
+ db $1d
+ db $1c
+ db $03
+ db $15
+Data_11b08:
+ db $18
+ db $15
+ db $00
+ db $26
+ db $00
+ dw $6573 ; Pointer to NPC Data
+ db $b5
+ db $03
+ db $1e
+ db $1d
+ db $03
+ db $15
+Data_11b15:
+ db $19
+ db $1f
+ db $04
+ db $1a
+ db $00
+ dw $6d96 ; Pointer to NPC Data
+ db $b6
+ db $03
+ db $27
+ db $1e
+ db $03
+ db $15
+Data_11b22:
+ db $1a
+ db $0a
+ db $00
+ db $0e
+ db $00
+ dw $5dc3 ; Pointer to NPC Data
+ db $b7
+ db $03
+ db $0a
+ db $10
+ db $03
+ db $16
+Data_11b2f:
+ db $1b
+ db $15
+ db $00
+ db $16
+ db $00
+ dw $5f39 ; Pointer to NPC Data
+ db $b8
+ db $03
+ db $1a
+ db $21
+ db $03
+ db $15
+Data_11b3c:
+ db $1c
+ db $11
+ db $00
+ db $26
+ db $00
+ dw $5ff0 ; Pointer to NPC Data
+ db $b9
+ db $03
+ db $1b
+ db $1f
+ db $03
+ db $15
+Data_11b49:
+ db $1d
+ db $1a
+ db $00
+ db $16
+ db $00
+ dw $6017 ; Pointer to NPC Data
+ db $ba
+ db $03
+ db $1c
+ db $20
+ db $03
+ db $15
+Data_11b56:
+ db $1e
+ db $0b
+ db $04
+ db $1e
+ db $00
+ dw $603e ; Pointer to NPC Data
+ db $bb
+ db $03
+ db $0b
+ db $11
+ db $03
+ db $16
+SaraData:
+ db SARA ; trainer id
+ db $20
+ db $00
+ db $0e
+ db $00
+ dw OWSequence_Sara ; Pointer to NPC Data
+ db $bc
+ db $03
+ db SARA_PIC ; battle profile picture
+ db $22
+ db $03
+ db $15
+AmandaData:
+ db AMANDA
+ db $20
+ db $00
+ db $16
+ db $00
+ dw OWSequence_Amanda ; Pointer to NPC Data
+ db $bd
+ db $03
+ db AMANDA_PIC ; battle profile picture
+ db $23
+ db $03
+ db $15
+Data_11b7d:
+ db $21
+ db $16
+ db $00
+ db $26
+ db $00
+ dw OWSequence_Joshua ; Pointer to NPC Data
+ db $be
+ db $03
+ db $17
+ db $24
+ db $03
+ db $15
+Data_11b8a:
+ db $22
+ db $08
+ db $08
+ db $2e
+ db $10
+ dw $6304 ; Pointer to NPC Data
+ db $bf
+ db $03
+ db $08
+ db $12
+ db $03
+ db $16
+Data_11b97:
+ db $23
+ db $1c
+ db $04
+ db $0e
+ db $00
+ dw $6408 ; Pointer to NPC Data
+ db $c0
+ db $03
+ db $26
+ db $25
+ db $03
+ db $15
+Data_11ba4:
+ db $24
+ db $17
+ db $04
+ db $1e
+ db $00
+ dw $642f ; Pointer to NPC Data
+ db $c1
+ db $03
+ db $18
+ db $26
+ db $03
+ db $15
+Data_11bb1:
+ db $25
+ db $17
+ db $04
+ db $1e
+ db $00
+ dw $6456 ; Pointer to NPC Data
+ db $c2
+ db $03
+ db $19
+ db $27
+ db $03
+ db $15
+Data_11bbe:
+ db $26
+ db $09
+ db $00
+ db $16
+ db $00
+ dw $64ad ; Pointer to NPC Data
+ db $c3
+ db $03
+ db $09
+ db $13
+ db $03
+ db $16
+Data_11bcb:
+ db $27
+ db $1c
+ db $04
+ db $0e
+ db $00
+ dw $65d2 ; Pointer to NPC Data
+ db $c4
+ db $03
+ db $21
+ db $28
+ db $03
+ db $15
+Data_11bd8:
+ db $28
+ db $1e
+ db $00
+ db $1e
+ db $00
+ dw $6701 ; Pointer to NPC Data
+ db $c5
+ db $03
+ db $22
+ db $29
+ db $03
+ db $15
+Data_11be5:
+ db $29
+ db $1d
+ db $04
+ db $22
+ db $00
+ dw $6745 ; Pointer to NPC Data
+ db $c6
+ db $03
+ db $23
+ db $2a
+ db $03
+ db $15
+Data_11bf2:
+ db $2a
+ db $05
+ db $00
+ db $1a
+ db $00
+ dw $679e ; Pointer to NPC Data
+ db $c7
+ db $03
+ db $05
+ db $14
+ db $03
+ db $16
+Data_11bff:
+ db $2b
+ db $11
+ db $04
+ db $16
+ db $00
+ dw $6980 ; Pointer to NPC Data
+ db $c8
+ db $03
+ db $20
+ db $2b
+ db $03
+ db $15
+Data_11c0c:
+ db $2c
+ db $12
+ db $04
+ db $1a
+ db $00
+ dw $6a60 ; Pointer to NPC Data
+ db $c9
+ db $03
+ db $1f
+ db $2c
+ db $03
+ db $15
+Data_11c19:
+ db $2d
+ db $1c
+ db $04
+ db $0e
+ db $00
+ dw $6aa2 ; Pointer to NPC Data
+ db $ca
+ db $03
+ db $28
+ db $2d
+ db $03
+ db $15
+Data_11c26:
+ db $2e
+ db $0c
+ db $00
+ db $12
+ db $00
+ dw $6adf ; Pointer to NPC Data
+ db $cb
+ db $03
+ db $0c
+ db $15
+ db $03
+ db $16
+Data_11c33:
+ db $70
+ db $0c
+ db $03
+ db $15
+ db $10
+ dw $6adf ; Pointer to NPC Data
+ db $cb
+ db $03
+ db $0c
+ db $15
+ db $03
+ db $16
+Data_11c40:
+ db $2f
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $6cdb ; Pointer to NPC Data
+ db $cc
+ db $03
+ db $11
+ db $2e
+ db $03
+ db $15
+Data_11c4d:
+ db $30
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $6c11 ; Pointer to NPC Data
+ db $cd
+ db $03
+ db $12
+ db $2f
+ db $03
+ db $15
+Data_11c5a:
+ db $31
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $6c42 ; Pointer to NPC Data
+ db $ce
+ db $03
+ db $13
+ db $30
+ db $03
+ db $15
+Data_11c67:
+ db $32
+ db $06
+ db $00
+ db $0e
+ db $00
+ dw $6c67 ; Pointer to NPC Data
+ db $cf
+ db $03
+ db $06
+ db $16
+ db $03
+ db $16
+Data_11c74:
+ db $33
+ db $12
+ db $04
+ db $1a
+ db $00
+ dw $6eb3 ; Pointer to NPC Data
+ db $d0
+ db $03
+ db $14
+ db $31
+ db $03
+ db $15
+Data_11c81:
+ db $34
+ db $13
+ db $00
+ db $22
+ db $00
+ dw $6ed8 ; Pointer to NPC Data
+ db $d1
+ db $03
+ db $15
+ db $32
+ db $03
+ db $15
+Data_11c8e:
+ db $35
+ db $11
+ db $04
+ db $16
+ db $00
+ dw $6efd ; Pointer to NPC Data
+ db $d2
+ db $03
+ db $16
+ db $33
+ db $03
+ db $15
+Data_11c9b:
+ db $36
+ db $07
+ db $04
+ db $1e
+ db $00
+ dw $6f22 ; Pointer to NPC Data
+ db $d3
+ db $03
+ db $07
+ db $17
+ db $03
+ db $16
+Data_11ca8:
+ db $37
+ db $0d
+ db $00
+ db $12
+ db $00
+ dw $771f ; Pointer to NPC Data
+ db $d4
+ db $03
+ db $0d
+ db $0c
+ db $04
+ db $17
+Data_11cb5:
+ db $38
+ db $0e
+ db $00
+ db $2a
+ db $00
+ dw $772a ; Pointer to NPC Data
+ db $d5
+ db $03
+ db $0e
+ db $0d
+ db $04
+ db $17
+Data_11cc2:
+ db $39
+ db $0f
+ db $00
+ db $26
+ db $00
+ dw $7735 ; Pointer to NPC Data
+ db $d6
+ db $03
+ db $0f
+ db $0e
+ db $04
+ db $17
+Data_11ccf:
+ db $3a
+ db $10
+ db $00
+ db $0e
+ db $00
+ dw $7740 ; Pointer to NPC Data
+ db $d7
+ db $03
+ db $10
+ db $0f
+ db $04
+ db $17
+Data_11cdc:
+ db $3b
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $4c3e ; Pointer to NPC Data
+ db $b0
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ce9:
+ db $3c
+ db $21
+ db $0a
+ db $30
+ db $00
+ dw $4c3e ; Pointer to NPC Data
+ db $b0
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11cf6:
+ db $3d
+ db $1a
+ db $00
+ db $16
+ db $00
+ dw $5c76 ; Pointer to NPC Data
+ db $d8
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d03:
+ db $3e
+ db $23
+ db $04
+ db $1e
+ db $00
+ dw $5f83 ; Pointer to NPC Data
+ db $d9
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d10:
+ db $3f
+ db $19
+ db $00
+ db $1a
+ db $00
+ dw $5fc0 ; Pointer to NPC Data
+ db $da
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d1d:
+ db $40
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $60cf ; Pointer to NPC Data
+ db $db
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d2a:
+ db $41
+ db $1e
+ db $00
+ db $1e
+ db $00
+ dw $6111 ; Pointer to NPC Data
+ db $dc
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d37:
+ db $42
+ db $19
+ db $00
+ db $1a
+ db $00
+ dw $639a ; Pointer to NPC Data
+ db $da
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d44:
+ db $43
+ db $1e
+ db $00
+ db $1e
+ db $00
+ dw $661f ; Pointer to NPC Data
+ db $dc
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d51:
+ db $44
+ db $1b
+ db $00
+ db $22
+ db $00
+ dw $69a5 ; Pointer to NPC Data
+ db $dd
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d5e:
+ db $45
+ db $12
+ db $04
+ db $1a
+ db $00
+ dw $6b84 ; Pointer to NPC Data
+ db $de
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d6b:
+ db $46
+ db $11
+ db $04
+ db $16
+ db $00
+ dw $6e2c ; Pointer to NPC Data
+ db $de
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d78:
+ db $47
+ db $19
+ db $00
+ db $1a
+ db $00
+ dw $6de8 ; Pointer to NPC Data
+ db $da
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d85:
+ db $48
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $7295 ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d92:
+ db $49
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $726c ; Pointer to NPC Data
+ db $b3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11d9f:
+ db $4a
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $7352 ; Pointer to NPC Data
+ db $df
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11dac:
+ db $4b
+ db $13
+ db $00
+ db $22
+ db $00
+ dw $5d82 ; Pointer to NPC Data
+ db $e0
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11db9:
+ db $4c
+ db $14
+ db $00
+ db $16
+ db $00
+ dw $5d8d ; Pointer to NPC Data
+ db $e1
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11dc6:
+ db $4d
+ db $24
+ db $00
+ db $16
+ db $00
+ dw $5d9f ; Pointer to NPC Data
+ db $e5
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11dd3:
+ db $4e
+ db $1d
+ db $04
+ db $22
+ db $00
+ dw $5fd2 ; Pointer to NPC Data
+ db $dc
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11de0:
+ db $4f
+ db $1a
+ db $00
+ db $16
+ db $00
+ dw $6137 ; Pointer to NPC Data
+ db $d8
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ded:
+ db $50
+ db $1b
+ db $00
+ db $22
+ db $00
+ dw $613b ; Pointer to NPC Data
+ db $dd
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11dfa:
+ db $51
+ db $1d
+ db $04
+ db $22
+ db $00
+ dw $63d9 ; Pointer to NPC Data
+ db $dc
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e07:
+ db $52
+ db $17
+ db $04
+ db $1e
+ db $00
+ dw $63dd ; Pointer to NPC Data
+ db $e2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e14:
+ db $53
+ db $24
+ db $00
+ db $16
+ db $00
+ dw $66d8 ; Pointer to NPC Data
+ db $e5
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e21:
+ db $54
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $66e3 ; Pointer to NPC Data
+ db $db
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e2e:
+ db $55
+ db $12
+ db $04
+ db $1a
+ db $00
+ dw $6850 ; Pointer to NPC Data
+ db $de
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e3b:
+ db $56
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $6a30 ; Pointer to NPC Data
+ db $db
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e48:
+ db $57
+ db $19
+ db $00
+ db $1a
+ db $00
+ dw $6a3b ; Pointer to NPC Data
+ db $da
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e55:
+ db $58
+ db $1a
+ db $00
+ db $16
+ db $00
+ dw $6bc1 ; Pointer to NPC Data
+ db $d8
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e62:
+ db $59
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $6bc5 ; Pointer to NPC Data
+ db $e0
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e6f:
+ db $5a
+ db $13
+ db $00
+ db $22
+ db $00
+ dw $6bed ; Pointer to NPC Data
+ db $e0
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e7c:
+ db $5b
+ db $23
+ db $04
+ db $1e
+ db $00
+ dw $4c3e ; Pointer to NPC Data
+ db $d9
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e89:
+ db $5c
+ db $15
+ db $00
+ db $26
+ db $00
+ dw $6e88 ; Pointer to NPC Data
+ db $e4
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11e96:
+ db $5d
+ db $1b
+ db $00
+ db $22
+ db $00
+ dw $709c ; Pointer to NPC Data
+ db $dd
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ea3:
+ db $5e
+ db $22
+ db $00
+ db $16
+ db $00
+ dw $70a0 ; Pointer to NPC Data
+ db $db
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11eb0:
+ db $5f
+ db $15
+ db $00
+ db $26
+ db $00
+ dw $70a4 ; Pointer to NPC Data
+ db $e3
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ebd:
+ db $60
+ db $17
+ db $04
+ db $1e
+ db $00
+ dw $70a8 ; Pointer to NPC Data
+ db $e2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11eca:
+ db $61
+ db $1f
+ db $04
+ db $1a
+ db $00
+ dw $70ac ; Pointer to NPC Data
+ db $dc
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ed7:
+ db $62
+ db $19
+ db $00
+ db $1a
+ db $00
+ dw $70b0 ; Pointer to NPC Data
+ db $da
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11ee4:
+ db $63
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $58dd ; Pointer to NPC Data
+ db $e7
+ db $03
+ db $29
+ db $09
+ db $02
+ db $15
+Data_11ef1:
+ db $64
+ db $1a
+ db $00
+ db $16
+ db $00
+ dw $7283 ; Pointer to NPC Data
+ db $e6
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11efe:
+ db $65
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $58c6 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11f0b:
+ db $66
+ db $18
+ db $00
+ db $0e
+ db $00
+ dw $58d1 ; Pointer to NPC Data
+ db $b2
+ db $03
+ db $00
+ db $00
+ db $00
+ db $00
+Data_11f18:
+ db $67
+ db $26
+ db $3a
+ db $3a
+ db $10
+ dw $4c3e ; Pointer to NPC Data
+Data_11f1f:
+ db $68
+ db $27
+ db $3b
+ db $41
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f26:
+ db $69
+ db $27
+ db $3c
+ db $42
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f2d:
+ db $6a
+ db $27
+ db $3d
+ db $43
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f34:
+ db $6b
+ db $27
+ db $3e
+ db $44
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f3b:
+ db $6c
+ db $27
+ db $3f
+ db $45
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f42:
+ db $6d
+ db $27
+ db $40
+ db $46
+ db $50
+ dw $4c3e ; Pointer to NPC Data
+Data_11f49:
+ db $00
+ db $00
+ db $00
+ db $1e
+ db $00
diff --git a/src/data/warp_data.asm b/src/data/warps.asm
index cb34721..cb34721 100755..100644
--- a/src/data/warp_data.asm
+++ b/src/data/warps.asm
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-23 20:15:47 +0000