From 607195c779295b058642d324f95b0ba1c2113239 Mon Sep 17 00:00:00 2001 From: Eric Lay Date: Sat, 29 Apr 2023 21:52:56 -0500 Subject: [PATCH] error catching/better parsing --- pokeData/abomasnow | 2 +- pokeData/abra | 2 +- pokeData/absol | 2 +- pokeData/accelgor | 4 +- pokeData/aegislash | 30 ++++++++++++--- pokeData/aerodactyl | 2 +- pokeData/aggron | 18 ++------- pokeData/aipom | 2 +- pokeData/alakazam | 4 +- pokeData/alcremie | 2 +- pokeData/alomomola | 2 +- pokeData/altaria | 2 +- pokeData/amaura | 2 +- pokeData/ambipom | 4 +- pokeData/amoonguss | 51 +++++++++++++++++++------ pokeData/ampharos | 4 +- pokeData/anorith | 2 +- pokeData/appletun | 4 +- pokeData/applin | 4 +- pokeData/araquanid | 2 +- pokeData/arcanine | 4 +- pokeData/arceus | 2 +- pokeData/archen | 4 +- pokeData/archeops | 4 +- pokeData/arctovish | 2 +- pokeData/arctozolt | 2 +- pokeData/ariados | 2 +- pokeData/armaldo | 4 +- pokeData/aromatisse | 4 +- pokeData/aron | 2 +- pokeData/arrokuda | 17 ++++++--- pokeData/articuno | 2 +- pokeData/audino | 2 +- pokeData/aurorus | 4 +- pokeData/avalugg | 2 +- pokeData/axew | 2 +- pokeData/azelf | 2 +- pokeData/azumarill | 2 +- pokeData/azurill | 2 +- pokeData/bagon | 2 +- pokeData/baltoy | 2 +- pokeData/banette | 2 +- pokeData/barbaracle | 4 +- pokeData/barboach | 2 +- pokeData/barraskewda | 2 +- pokeData/basculegion | 89 +++++++++++++++++++++++++++++++++++++++++-- pokeData/basculin | 67 +++++++++++++++++++++++++++++--- pokeData/bastiodon | 4 +- pokeData/bayleef | 4 +- pokeData/beartic | 2 +- pokeData/beautifly | 6 +-- pokeData/beedrill | 15 ++++++++ pokeData/beheeyem | 2 +- pokeData/beldum | 2 +- pokeData/bellossom | 6 +-- pokeData/bellsprout | 12 ++++-- pokeData/bewear | 2 +- pokeData/bibarel | 2 +- pokeData/bidoof | 2 +- pokeData/binacle | 2 +- pokeData/bisharp | 2 +- pokeData/blacephalon | 2 +- pokeData/blastoise | 2 +- pokeData/blaziken | 4 +- pokeData/blipbug | 2 +- pokeData/blissey | 4 +- pokeData/blitzle | 2 +- pokeData/boldore | 2 +- pokeData/boltund | 2 +- pokeData/bonsly | 2 +- pokeData/bouffalant | 2 +- pokeData/bounsweet | 2 +- pokeData/braixen | 4 +- pokeData/braviary | 2 +- pokeData/breloom | 7 ++-- pokeData/brionne | 2 +- pokeData/bronzong | 19 ++++++++- pokeData/bronzor | 2 +- pokeData/bruxish | 2 +- pokeData/budew | 2 +- pokeData/buizel | 2 +- pokeData/bulbasaur | 5 +-- pokeData/buneary | 2 +- pokeData/bunnelby | 2 +- pokeData/burmy | 4 +- pokeData/butterfree | 40 +++++++++++++++++-- pokeData/buzzwole | 2 +- pokeData/cacnea | 2 +- pokeData/cacturne | 2 +- pokeData/calyrex | 2 +- pokeData/camerupt | 2 +- pokeData/carkol | 2 +- pokeData/carnivine | 2 +- pokeData/carracosta | 4 +- pokeData/carvanha | 2 +- pokeData/cascoon | 6 +-- pokeData/castform | 2 +- pokeData/celebi | 2 +- pokeData/celesteela | 2 +- pokeData/centiskorch | 2 +- pokeData/chandelure | 4 +- pokeData/chansey | 12 +++++- pokeData/charizard | 2 +- pokeData/charjabug | 2 +- pokeData/charmeleon | 15 +++++--- pokeData/chatot | 2 +- pokeData/cherrim | 2 +- pokeData/cherubi | 4 +- pokeData/chesnaught | 4 +- pokeData/chespin | 2 +- pokeData/chewtle | 8 +++- pokeData/chikorita | 2 +- pokeData/chimchar | 2 +- pokeData/chimecho | 2 +- pokeData/chinchou | 2 +- pokeData/chingling | 2 +- pokeData/cinccino | 2 +- pokeData/cinderace | 2 +- pokeData/clamperl | 4 +- pokeData/clauncher | 2 +- pokeData/clawitzer | 2 +- pokeData/claydol | 2 +- pokeData/clefable | 2 +- pokeData/clefairy | 2 +- pokeData/cleffa | 2 +- pokeData/clobbopus | 2 +- pokeData/cloyster | 2 +- pokeData/coalossal | 2 +- pokeData/cobalion | 4 +- pokeData/cofagrigus | 4 +- pokeData/combee | 2 +- pokeData/combusken | 4 +- pokeData/comfey | 2 +- pokeData/conkeldurr | 4 +- pokeData/copperajah | 2 +- pokeData/corphish | 2 +- pokeData/corsola | 2 +- pokeData/corviknight | 5 ++- pokeData/corvisquire | 9 +---- pokeData/cosmoem | 4 +- pokeData/cosmog | 4 +- pokeData/cottonee | 2 +- pokeData/crabominable | 2 +- pokeData/crabrawler | 2 +- pokeData/cradily | 4 +- pokeData/cramorant | 2 +- pokeData/cranidos | 4 +- pokeData/crawdaunt | 2 +- pokeData/cresselia | 2 +- pokeData/croagunk | 2 +- pokeData/crobat | 2 +- pokeData/croconaw | 4 +- pokeData/crustle | 2 +- pokeData/cryogonal | 2 +- pokeData/cubchoo | 2 +- pokeData/cubone | 5 ++- pokeData/cufant | 2 +- pokeData/cursola | 2 +- pokeData/cutiefly | 2 +- pokeData/cyndaquil | 2 +- pokeData/darkrai | 2 +- pokeData/darmanitan | 58 +++++++++++++++++++++++++--- pokeData/dartrix | 2 +- pokeData/darumaka | 2 +- pokeData/decidueye | 2 +- pokeData/deerling | 2 +- pokeData/deino | 2 +- pokeData/delcatty | 2 +- pokeData/delibird | 2 +- pokeData/delphox | 4 +- pokeData/deoxys | 61 ++++++++++++++++++++++++++--- pokeData/dewgong | 2 +- pokeData/dewott | 4 +- pokeData/dewpider | 2 +- pokeData/dhelmise | 2 +- pokeData/dialga | 2 +- pokeData/diancie | 2 +- pokeData/diggersby | 2 +- pokeData/diglett | 2 +- pokeData/ditto | 2 +- pokeData/dodrio | 2 +- pokeData/doduo | 5 ++- pokeData/donphan | 14 ++++--- pokeData/dottler | 2 +- pokeData/doublade | 4 +- pokeData/dracovish | 2 +- pokeData/dracozolt | 2 +- pokeData/dragalge | 2 +- pokeData/dragapult | 2 +- pokeData/dragonair | 2 +- pokeData/dragonite | 2 +- pokeData/drakloak | 2 +- pokeData/drampa | 2 +- pokeData/drapion | 2 +- pokeData/dratini | 2 +- pokeData/drednaw | 2 +- pokeData/dreepy | 2 +- pokeData/drifblim | 2 +- pokeData/drifloon | 2 +- pokeData/drilbur | 88 ++++++++++++++++++++++++++++++++++++++++-- pokeData/drizzile | 2 +- pokeData/drowzee | 4 +- pokeData/druddigon | 2 +- pokeData/dubwool | 2 +- pokeData/ducklett | 2 +- pokeData/dugtrio | 2 +- pokeData/dunsparce | 2 +- pokeData/duosion | 2 +- pokeData/duraludon | 13 ++++--- pokeData/durant | 2 +- pokeData/dusclops | 2 +- pokeData/dusknoir | 4 +- pokeData/duskull | 2 +- pokeData/dustox | 6 +-- pokeData/dwebble | 2 +- pokeData/eelektrik | 2 +- pokeData/eelektross | 4 +- pokeData/eevee | 9 ++++- pokeData/eiscue | 21 +++++++--- pokeData/eldegoss | 2 +- pokeData/electabuzz | 2 +- pokeData/electivire | 4 +- pokeData/electrike | 2 +- pokeData/electrode | 5 +-- pokeData/elekid | 2 +- pokeData/elgyem | 20 +++++----- pokeData/emboar | 4 +- pokeData/emolga | 2 +- pokeData/empoleon | 4 +- pokeData/enamorus | 38 ++++++++++++++++-- pokeData/entei | 2 +- pokeData/escavalier | 4 +- pokeData/espeon | 6 +-- pokeData/espurr | 2 +- pokeData/eternatus | 2 +- pokeData/excadrill | 2 +- pokeData/exeggcute | 2 +- pokeData/exeggutor | 7 ++-- pokeData/exploud | 4 +- pokeData/falinks | 2 +- pokeData/farfetchd | 5 ++- pokeData/feebas | 2 +- pokeData/fennekin | 2 +- pokeData/feraligatr | 4 +- pokeData/ferroseed | 5 +-- pokeData/ferrothorn | 4 +- pokeData/finneon | 2 +- pokeData/flaaffy | 17 +-------- pokeData/flabebe | 2 +- pokeData/flapple | 4 +- pokeData/flareon | 6 +-- pokeData/fletchinder | 4 +- pokeData/fletchling | 2 +- pokeData/floatzel | 2 +- pokeData/floette | 4 +- pokeData/florges | 4 +- pokeData/flygon | 4 +- pokeData/fomantis | 2 +- pokeData/foongus | 5 ++- pokeData/forretress | 4 +- pokeData/fraxure | 2 +- pokeData/frillish | 2 +- pokeData/froakie | 2 +- pokeData/frogadier | 4 +- pokeData/froslass | 6 +-- pokeData/frosmoth | 2 +- pokeData/furfrou | 2 +- pokeData/furret | 2 +- pokeData/gabite | 2 +- pokeData/gallade | 6 +-- pokeData/galvantula | 4 +- pokeData/garbodor | 2 +- pokeData/garchomp | 4 +- pokeData/gardevoir | 6 +-- pokeData/gastly | 2 +- pokeData/gastrodon | 16 +------- pokeData/genesect | 13 ++++--- pokeData/gengar | 2 +- pokeData/geodude | 2 +- pokeData/gible | 2 +- pokeData/gigalith | 4 +- pokeData/girafarig | 2 +- pokeData/giratina | 35 +++++++++++++---- pokeData/glaceon | 6 +-- pokeData/glalie | 6 +-- pokeData/glameow | 2 +- pokeData/glastrier | 2 +- pokeData/gligar | 2 +- pokeData/gliscor | 2 +- pokeData/gloom | 61 ++++++++++++++++------------- pokeData/gogoat | 4 +- pokeData/golbat | 2 +- pokeData/goldeen | 5 ++- pokeData/golduck | 2 +- pokeData/golem | 14 +------ pokeData/golett | 2 +- pokeData/golisopod | 2 +- pokeData/golurk | 2 +- pokeData/goodra | 2 +- pokeData/gorebyss | 4 +- pokeData/gossifleur | 2 +- pokeData/gothita | 2 +- pokeData/gothitelle | 2 +- pokeData/gothorita | 2 +- pokeData/gourgeist | 67 +++++++++++++++++++++++++++++--- pokeData/granbull | 2 +- pokeData/grapploct | 2 +- pokeData/graveler | 2 +- pokeData/greedent | 2 +- pokeData/greninja | 4 +- pokeData/grimer | 2 +- pokeData/grimmsnarl | 2 +- pokeData/grookey | 2 +- pokeData/grotle | 4 +- pokeData/groudon | 2 +- pokeData/grovyle | 4 +- pokeData/growlithe | 2 +- pokeData/grubbin | 2 +- pokeData/grumpig | 2 +- pokeData/gulpin | 2 +- pokeData/gumshoos | 2 +- pokeData/gurdurr | 2 +- pokeData/guzzlord | 2 +- pokeData/gyarados | 2 +- pokeData/hakamo-o | 2 +- pokeData/happiny | 2 +- pokeData/hariyama | 2 +- pokeData/hatenna | 2 +- pokeData/hatterene | 2 +- pokeData/hattrem | 2 +- pokeData/haunter | 2 +- pokeData/haxorus | 4 +- pokeData/heatmor | 2 +- pokeData/heatran | 2 +- pokeData/heliolisk | 7 ++-- pokeData/helioptile | 5 +-- pokeData/heracross | 2 +- pokeData/herdier | 2 +- pokeData/hippopotas | 2 +- pokeData/hippowdon | 2 +- pokeData/hitmonchan | 4 +- pokeData/hitmonlee | 4 +- pokeData/hitmontop | 27 +++++++++++-- pokeData/ho-oh | 2 +- pokeData/honchkrow | 2 +- pokeData/honedge | 2 +- pokeData/hoopa | 2 +- pokeData/hoothoot | 2 +- pokeData/hoppip | 45 ++++++++++++++++++++-- pokeData/horsea | 2 +- pokeData/houndoom | 2 +- pokeData/houndour | 2 +- pokeData/huntail | 4 +- pokeData/hydreigon | 4 +- pokeData/hypno | 33 +--------------- pokeData/igglybuff | 2 +- pokeData/illumise | 2 +- pokeData/impidimp | 2 +- pokeData/incineroar | 2 +- pokeData/indeedee | 56 ++++++++++++++++++++++++--- pokeData/infernape | 4 +- pokeData/inkay | 2 +- pokeData/inteleon | 2 +- pokeData/ivysaur | 2 +- pokeData/jangmo-o | 2 +- pokeData/jellicent | 2 +- pokeData/jigglypuff | 2 +- pokeData/jirachi | 4 +- pokeData/jolteon | 20 ++++++++-- pokeData/joltik | 2 +- pokeData/jumpluff | 4 +- pokeData/jynx | 2 +- pokeData/kabuto | 5 ++- pokeData/kabutops | 4 +- pokeData/kadabra | 2 +- pokeData/kangaskhan | 10 ++++- pokeData/karrablast | 11 +++++- pokeData/kartana | 2 +- pokeData/kecleon | 2 +- pokeData/keldeo | 36 ++++++++++++++--- pokeData/kingdra | 2 +- pokeData/kingler | 2 +- pokeData/kirlia | 20 +++++++--- pokeData/klang | 2 +- pokeData/kleavor | 4 +- pokeData/klink | 2 +- pokeData/klinklang | 2 +- pokeData/koffing | 2 +- pokeData/komala | 2 +- pokeData/kommo-o | 5 ++- pokeData/krabby | 2 +- pokeData/kricketot | 2 +- pokeData/kricketune | 2 +- pokeData/krokorok | 2 +- pokeData/krookodile | 4 +- pokeData/kubfu | 2 +- pokeData/kyogre | 2 +- pokeData/kyurem | 4 +- pokeData/lairon | 2 +- pokeData/lampent | 4 +- pokeData/landorus | 49 +++++++++++++++++++++--- pokeData/lanturn | 2 +- pokeData/lapras | 2 +- pokeData/larvesta | 2 +- pokeData/larvitar | 2 +- pokeData/latias | 2 +- pokeData/latios | 2 +- pokeData/leafeon | 6 +-- pokeData/leavanny | 2 +- pokeData/ledian | 2 +- pokeData/ledyba | 2 +- pokeData/lickilicky | 2 +- pokeData/lickitung | 2 +- pokeData/liepard | 2 +- pokeData/lileep | 2 +- pokeData/lilligant | 2 +- pokeData/lillipup | 2 +- pokeData/linoone | 2 +- pokeData/litleo | 3 +- pokeData/litten | 2 +- pokeData/litwick | 2 +- pokeData/lombre | 2 +- pokeData/lopunny | 2 +- pokeData/lotad | 2 +- pokeData/loudred | 8 +--- pokeData/lucario | 2 +- pokeData/ludicolo | 4 +- pokeData/lugia | 2 +- pokeData/lumineon | 2 +- pokeData/lunala | 4 +- pokeData/lunatone | 2 +- pokeData/lurantis | 2 +- pokeData/luvdisc | 2 +- pokeData/luxio | 2 +- pokeData/luxray | 4 +- pokeData/lycanroc | 51 ++++++++++++++++++++++--- pokeData/machamp | 4 +- pokeData/machoke | 2 +- pokeData/machop | 48 +++++++++++++++++++++-- pokeData/magby | 9 ++++- pokeData/magcargo | 2 +- pokeData/magearna | 2 +- pokeData/magikarp | 2 +- pokeData/magmar | 9 ++++- pokeData/magmortar | 4 +- pokeData/magnemite | 2 +- pokeData/magneton | 2 +- pokeData/magnezone | 2 +- pokeData/makuhita | 2 +- pokeData/malamar | 4 +- pokeData/mamoswine | 2 +- pokeData/manaphy | 4 +- pokeData/mandibuzz | 2 +- pokeData/manectric | 5 ++- pokeData/mankey | 2 +- pokeData/mantine | 2 +- pokeData/mantyke | 2 +- pokeData/maractus | 2 +- pokeData/mareanie | 2 +- pokeData/mareep | 2 +- pokeData/marill | 2 +- pokeData/marowak | 2 +- pokeData/marshadow | 2 +- pokeData/marshtomp | 4 +- pokeData/masquerain | 6 +-- pokeData/mawile | 2 +- pokeData/medicham | 2 +- pokeData/meditite | 2 +- pokeData/meganium | 4 +- pokeData/melmetal | 2 +- pokeData/meloetta | 31 ++++++++++++--- pokeData/meltan | 2 +- pokeData/meowstic | 32 +++++++++++++--- pokeData/meowth | 4 +- pokeData/mesprit | 2 +- pokeData/metagross | 2 +- pokeData/metang | 2 +- pokeData/mew | 2 +- pokeData/mewtwo | 2 +- pokeData/mienfoo | 2 +- pokeData/mienshao | 2 +- pokeData/mightyena | 2 +- pokeData/milcery | 5 +-- pokeData/milotic | 2 +- pokeData/miltank | 2 +- pokeData/mime-jr | 2 +- pokeData/mimikyu | 30 ++++++++++++--- pokeData/minccino | 2 +- pokeData/minior | 37 +++++++++++++++--- pokeData/minun | 2 +- pokeData/misdreavus | 2 +- pokeData/mismagius | 2 +- pokeData/moltres | 2 +- pokeData/monferno | 4 +- pokeData/morelull | 47 ++++++++++++++++++++--- pokeData/morgrem | 2 +- pokeData/morpeko | 22 ++++++++--- pokeData/mothim | 6 +-- pokeData/mr-mime | 2 +- pokeData/mr-rime | 2 +- pokeData/mudbray | 2 +- pokeData/mudkip | 7 +--- pokeData/mudsdale | 2 +- pokeData/muk | 5 ++- pokeData/munchlax | 4 +- pokeData/munna | 5 ++- pokeData/murkrow | 2 +- pokeData/musharna | 2 +- pokeData/naganadel | 2 +- pokeData/natu | 2 +- pokeData/necrozma | 2 +- pokeData/nickit | 2 +- pokeData/nidoking | 4 +- pokeData/nidoqueen | 4 +- pokeData/nidoran-f | 2 +- pokeData/nidoran-m | 2 +- pokeData/nidorina | 2 +- pokeData/nidorino | 2 +- pokeData/nihilego | 2 +- pokeData/nincada | 4 +- pokeData/ninetales | 2 +- pokeData/ninjask | 6 +-- pokeData/noctowl | 13 ++++++- pokeData/noibat | 2 +- pokeData/noivern | 2 +- pokeData/nosepass | 2 +- pokeData/numel | 2 +- pokeData/nuzleaf | 14 +++++-- pokeData/obstagoon | 2 +- pokeData/octillery | 2 +- pokeData/oddish | 4 +- pokeData/omanyte | 2 +- pokeData/omastar | 4 +- pokeData/onix | 2 +- pokeData/oranguru | 2 +- pokeData/orbeetle | 2 +- pokeData/oricorio | 25 +++++++++--- pokeData/oshawott | 2 +- pokeData/overqwil | 2 +- pokeData/pachirisu | 16 +++++++- pokeData/palkia | 2 +- pokeData/palossand | 2 +- pokeData/palpitoad | 2 +- pokeData/pancham | 2 +- pokeData/pangoro | 4 +- pokeData/panpour | 2 +- pokeData/pansage | 2 +- pokeData/pansear | 2 +- pokeData/paras | 14 ++++--- pokeData/parasect | 2 +- pokeData/passimian | 2 +- pokeData/patrat | 2 +- pokeData/pawniard | 2 +- pokeData/pelipper | 2 +- pokeData/perrserker | 4 +- pokeData/persian | 4 +- pokeData/petilil | 2 +- pokeData/phanpy | 44 ++++++++++++--------- pokeData/pheromosa | 2 +- pokeData/phione | 4 +- pokeData/pichu | 2 +- pokeData/pidgeot | 2 +- pokeData/pidove | 2 +- pokeData/pignite | 4 +- pokeData/pikachu | 2 +- pokeData/pikipek | 2 +- pokeData/piloswine | 2 +- pokeData/pincurchin | 2 +- pokeData/pineco | 2 +- pokeData/pinsir | 2 +- pokeData/piplup | 2 +- pokeData/plusle | 2 +- pokeData/poipole | 2 +- pokeData/politoed | 4 +- pokeData/poliwag | 4 +- pokeData/poliwhirl | 4 +- pokeData/poliwrath | 4 +- pokeData/polteageist | 2 +- pokeData/ponyta | 2 +- pokeData/poochyena | 2 +- pokeData/popplio | 2 +- pokeData/porygon | 2 +- pokeData/porygon-z | 4 +- pokeData/porygon2 | 70 +++++++++++++++++----------------- pokeData/primarina | 2 +- pokeData/primeape | 2 +- pokeData/prinplup | 4 +- pokeData/probopass | 4 +- pokeData/psyduck | 2 +- pokeData/pumpkaboo | 67 +++++++++++++++++++++++++++++--- pokeData/pupitar | 2 +- pokeData/purrloin | 6 +-- pokeData/purugly | 2 +- pokeData/pyroar | 4 +- pokeData/pyukumuku | 2 +- pokeData/quagsire | 4 +- pokeData/quilava | 4 +- pokeData/quilladin | 4 +- pokeData/qwilfish | 2 +- pokeData/raboot | 2 +- pokeData/raichu | 2 +- pokeData/raikou | 2 +- pokeData/ralts | 4 +- pokeData/rampardos | 4 +- pokeData/rapidash | 2 +- pokeData/rayquaza | 2 +- pokeData/regice | 2 +- pokeData/regidrago | 2 +- pokeData/regieleki | 2 +- pokeData/regigigas | 17 +-------- pokeData/regirock | 2 +- pokeData/registeel | 2 +- pokeData/relicanth | 2 +- pokeData/remoraid | 2 +- pokeData/reshiram | 4 +- pokeData/reuniclus | 2 +- pokeData/rhydon | 2 +- pokeData/rhyhorn | 2 +- pokeData/rhyperior | 4 +- pokeData/ribombee | 2 +- pokeData/rillaboom | 2 +- pokeData/riolu | 2 +- pokeData/rockruff | 2 +- pokeData/roggenrola | 2 +- pokeData/rolycoly | 2 +- pokeData/rookidee | 2 +- pokeData/roselia | 2 +- pokeData/roserade | 2 +- pokeData/rotom | 2 +- pokeData/rowlet | 2 +- pokeData/rufflet | 2 +- pokeData/runerigus | 4 +- pokeData/sableye | 2 +- pokeData/salamence | 4 +- pokeData/salandit | 2 +- pokeData/salazzle | 2 +- pokeData/samurott | 4 +- pokeData/sandaconda | 2 +- pokeData/sandile | 2 +- pokeData/sandshrew | 2 +- pokeData/sandslash | 2 +- pokeData/sandygast | 2 +- pokeData/sawk | 2 +- pokeData/sawsbuck | 14 ++++--- pokeData/scatterbug | 2 +- pokeData/sceptile | 4 +- pokeData/scizor | 6 +-- pokeData/scolipede | 2 +- pokeData/scorbunny | 2 +- pokeData/scrafty | 2 +- pokeData/scraggy | 2 +- pokeData/scyther | 4 +- pokeData/seadra | 2 +- pokeData/seaking | 2 +- pokeData/sealeo | 2 +- pokeData/seedot | 2 +- pokeData/seel | 2 +- pokeData/seismitoad | 2 +- pokeData/sentret | 12 +++++- pokeData/serperior | 4 +- pokeData/servine | 4 +- pokeData/seviper | 2 +- pokeData/sewaddle | 2 +- pokeData/sharpedo | 2 +- pokeData/shaymin | 59 +++++++++++++++++++++++++--- pokeData/shedinja | 6 +-- pokeData/shelgon | 4 +- pokeData/shellder | 2 +- pokeData/shellos | 2 +- pokeData/shelmet | 2 +- pokeData/shieldon | 4 +- pokeData/shiftry | 54 +++++++++++++++++++++++--- pokeData/shiinotic | 2 +- pokeData/shinx | 30 ++++++++++++++- pokeData/shroomish | 2 +- pokeData/shuckle | 2 +- pokeData/shuppet | 2 +- pokeData/sigilyph | 2 +- pokeData/silcoon | 6 +-- pokeData/silicobra | 2 +- pokeData/silvally | 2 +- pokeData/simipour | 4 +- pokeData/simisage | 4 +- pokeData/simisear | 34 +++++++++-------- pokeData/sinistea | 2 +- pokeData/sirfetchd | 5 +-- pokeData/sizzlipede | 2 +- pokeData/skarmory | 2 +- pokeData/skiddo | 2 +- pokeData/skiploom | 2 +- pokeData/skitty | 2 +- pokeData/skorupi | 2 +- pokeData/skrelp | 2 +- pokeData/skuntank | 2 +- pokeData/skwovet | 2 +- pokeData/slaking | 2 +- pokeData/slakoth | 2 +- pokeData/slowbro | 4 +- pokeData/slowking | 4 +- pokeData/slowpoke | 4 +- pokeData/slugma | 2 +- pokeData/slurpuff | 4 +- pokeData/smeargle | 2 +- pokeData/smoochum | 2 +- pokeData/sneasel | 4 +- pokeData/sneasler | 4 +- pokeData/snivy | 2 +- pokeData/snom | 2 +- pokeData/snorlax | 2 +- pokeData/snorunt | 4 +- pokeData/snover | 2 +- pokeData/snubbull | 2 +- pokeData/sobble | 2 +- pokeData/solgaleo | 4 +- pokeData/solosis | 5 ++- pokeData/solrock | 2 +- pokeData/spectrier | 2 +- pokeData/spewpa | 4 +- pokeData/spheal | 2 +- pokeData/spinarak | 2 +- pokeData/spinda | 2 +- pokeData/spiritomb | 2 +- pokeData/spoink | 2 +- pokeData/spritzee | 2 +- pokeData/squirtle | 8 ++-- pokeData/stakataka | 2 +- pokeData/stantler | 2 +- pokeData/staraptor | 4 +- pokeData/staravia | 2 +- pokeData/starly | 2 +- pokeData/starmie | 2 +- pokeData/staryu | 2 +- pokeData/steelix | 2 +- pokeData/steenee | 2 +- pokeData/stonjourner | 2 +- pokeData/stoutland | 2 +- pokeData/stufful | 2 +- pokeData/stunfisk | 2 +- pokeData/stunky | 2 +- pokeData/sudowoodo | 2 +- pokeData/suicune | 2 +- pokeData/sunflora | 2 +- pokeData/sunkern | 2 +- pokeData/surskit | 2 +- pokeData/swablu | 2 +- pokeData/swadloon | 2 +- pokeData/swalot | 4 +- pokeData/swampert | 4 +- pokeData/swanna | 2 +- pokeData/swellow | 2 +- pokeData/swinub | 45 ++++++++++++++++++++-- pokeData/swirlix | 2 +- pokeData/swoobat | 4 +- pokeData/sylveon | 6 +-- pokeData/taillow | 2 +- pokeData/talonflame | 4 +- pokeData/tangela | 2 +- pokeData/tangrowth | 2 +- pokeData/tapu-bulu | 2 +- pokeData/tapu-fini | 2 +- pokeData/tapu-koko | 2 +- pokeData/tapu-lele | 2 +- pokeData/tauros | 2 +- pokeData/teddiursa | 5 ++- pokeData/tentacool | 2 +- pokeData/tentacruel | 2 +- pokeData/tepig | 2 +- pokeData/terrakion | 4 +- pokeData/thievul | 43 ++++++++++++++++++--- pokeData/throh | 2 +- pokeData/thundurus | 76 +++++++++++++++++++++++++++++++++--- pokeData/thwackey | 2 +- pokeData/timburr | 2 +- pokeData/tirtouga | 4 +- pokeData/togedemaru | 2 +- pokeData/togekiss | 4 +- pokeData/togepi | 2 +- pokeData/togetic | 4 +- pokeData/torchic | 2 +- pokeData/torkoal | 2 +- pokeData/tornadus | 34 ++++++++++++++--- pokeData/torracat | 2 +- pokeData/torterra | 4 +- pokeData/totodile | 2 +- pokeData/toucannon | 2 +- pokeData/toxapex | 2 +- pokeData/toxel | 2 +- pokeData/toxicroak | 2 +- pokeData/toxtricity | 47 ++++++++++++++++++++--- pokeData/tranquill | 2 +- pokeData/trapinch | 2 +- pokeData/treecko | 2 +- pokeData/tropius | 2 +- pokeData/trubbish | 41 +++++++++----------- pokeData/trumbeak | 2 +- pokeData/tsareena | 2 +- pokeData/turtonator | 2 +- pokeData/turtwig | 2 +- pokeData/tympole | 2 +- pokeData/tynamo | 2 +- pokeData/type-null | 2 +- pokeData/typhlosion | 4 +- pokeData/tyranitar | 2 +- pokeData/tyrantrum | 13 ++----- pokeData/tyrogue | 4 +- pokeData/tyrunt | 2 +- pokeData/umbreon | 6 +-- pokeData/unfezant | 2 +- pokeData/unown | 2 +- pokeData/ursaluna | 2 +- pokeData/ursaring | 2 +- pokeData/urshifu | 22 ++++++++--- pokeData/uxie | 11 ++---- pokeData/vanillish | 2 +- pokeData/vanillite | 2 +- pokeData/vanilluxe | 2 +- pokeData/vaporeon | 6 +-- pokeData/venipede | 2 +- pokeData/venomoth | 2 +- pokeData/venonat | 2 +- pokeData/venusaur | 2 +- pokeData/vespiquen | 31 ++++++++++++++- pokeData/vibrava | 2 +- pokeData/victini | 4 +- pokeData/victreebel | 4 +- pokeData/vigoroth | 2 +- pokeData/vikavolt | 2 +- pokeData/vileplume | 6 +-- pokeData/virizion | 4 +- pokeData/vivillon | 4 +- pokeData/volbeat | 2 +- pokeData/volcanion | 2 +- pokeData/volcarona | 4 +- pokeData/voltorb | 2 +- pokeData/vullaby | 2 +- pokeData/vulpix | 2 +- pokeData/wailmer | 2 +- pokeData/wailord | 2 +- pokeData/walrein | 2 +- pokeData/wartortle | 2 +- pokeData/watchog | 2 +- pokeData/weavile | 6 +-- pokeData/weepinbell | 2 +- pokeData/weezing | 2 +- pokeData/whimsicott | 2 +- pokeData/whirlipede | 2 +- pokeData/whiscash | 2 +- pokeData/whismur | 2 +- pokeData/wigglytuff | 2 +- pokeData/wimpod | 2 +- pokeData/wingull | 2 +- pokeData/wishiwashi | 29 +++++++++++--- pokeData/wobbuffet | 2 +- pokeData/woobat | 2 +- pokeData/wooloo | 2 +- pokeData/wooper | 4 +- pokeData/wormadam | 61 ++++++++++++++++++++++++++--- pokeData/wurmple | 6 +-- pokeData/wynaut | 2 +- pokeData/wyrdeer | 2 +- pokeData/xatu | 2 +- pokeData/xerneas | 2 +- pokeData/xurkitree | 2 +- pokeData/yamask | 4 +- pokeData/yamper | 2 +- pokeData/yanma | 2 +- pokeData/yanmega | 2 +- pokeData/yungoos | 2 +- pokeData/yveltal | 2 +- pokeData/zacian | 2 +- pokeData/zamazenta | 2 +- pokeData/zangoose | 2 +- pokeData/zapdos | 2 +- pokeData/zarude | 2 +- pokeData/zebstrika | 2 +- pokeData/zekrom | 4 +- pokeData/zeraora | 2 +- pokeData/zigzagoon | 2 +- pokeData/zoroark | 2 +- pokeData/zorua | 2 +- pokeData/zubat | 2 +- pokeData/zweilous | 2 +- pokeData/zygarde | 26 ++++++++++--- pokeParse | 34 ++++++++++++----- 884 files changed, 3080 insertions(+), 1588 deletions(-) diff --git a/pokeData/abomasnow b/pokeData/abomasnow index 0b48070..f2cdfa7 100644 --- a/pokeData/abomasnow +++ b/pokeData/abomasnow @@ -17,7 +17,7 @@ speed: 60 Genus: Frost Tree Pokémon - Happiness: 50 Pokedex ID: 460 + Happiness: 50 Pokedex ID: 479 Base Exp: 173 Capture Rate: 60 Height: 22 Weight: 1355 diff --git a/pokeData/abra b/pokeData/abra index dd1bc42..94cf8bc 100644 --- a/pokeData/abra +++ b/pokeData/abra @@ -16,7 +16,7 @@ speed: 90 Genus: Psi Pokémon - Happiness: 50 Pokedex ID: 63 + Happiness: 50 Pokedex ID: 69 Base Exp: 62 Capture Rate: 200 Height: 9 Weight: 195 diff --git a/pokeData/absol b/pokeData/absol index 674612e..ce49b33 100644 --- a/pokeData/absol +++ b/pokeData/absol @@ -18,7 +18,7 @@ speed: 75 Genus: Disaster Pokémon - Happiness: 35 Pokedex ID: 359 + Happiness: 35 Pokedex ID: 389 Base Exp: 163 Capture Rate: 30 Height: 12 Weight: 470 diff --git a/pokeData/accelgor b/pokeData/accelgor index 25b3f2c..203262e 100644 --- a/pokeData/accelgor +++ b/pokeData/accelgor @@ -17,7 +17,7 @@ speed: 145 Genus: Shell Out Pokémon - Happiness: 50 Pokedex ID: 617 + Happiness: 50 Pokedex ID: 618 Base Exp: 173 Capture Rate: 75 Height: 8 Weight: 253 @@ -64,4 +64,4 @@ takes effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/aegislash b/pokeData/aegislash index 364c9db..7eda5c3 100644 --- a/pokeData/aegislash +++ b/pokeData/aegislash @@ -1,5 +1,5 @@ - Type Pokémon + Spritzee Fairy Type Pokémon Generations of kings were attended by these Pokémon, which used @@ -10,15 +10,35 @@ Honedge ► Doublade ► Aegislash ↞--------| STATS |--------↠ + hp: 78 + attack: 52 + defense: 60 + special-attack: 63 + special-defense: 65 + speed: 23 Genus: Royal Sword Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 50 Pokedex ID: 682 + Base Exp: 68 Capture Rate: 45 + Height: 2 Weight: 5 Types: + Fairy ↞---------------|ABILITIES|---------------↠ + Healer: - Location Areas: + Friendly Pokémon next to this + Pokémon in double and triple + battles each have a 30% chance + of being cured of any major status + ailment after each turn. + + Aroma-veil: + + Protects allies against moves + that affect their mental state. + + + Location Areas Unknown diff --git a/pokeData/aerodactyl b/pokeData/aerodactyl index fe20975..06fbed3 100644 --- a/pokeData/aerodactyl +++ b/pokeData/aerodactyl @@ -15,7 +15,7 @@ speed: 130 Genus: Fossil Pokémon - Happiness: 50 Pokedex ID: 142 + Happiness: 50 Pokedex ID: 173 Base Exp: 180 Capture Rate: 45 Height: 18 Weight: 590 diff --git a/pokeData/aggron b/pokeData/aggron index dc5a9a1..8c09d12 100644 --- a/pokeData/aggron +++ b/pokeData/aggron @@ -19,7 +19,7 @@ speed: 50 Genus: Iron Armor Pokémon - Happiness: 35 Pokedex ID: 306 + Happiness: 35 Pokedex ID: 332 Base Exp: 265 Capture Rate: 45 Height: 21 Weight: 3600 @@ -31,19 +31,7 @@ Sturdy: - When this Pokémon is at full - HP, any hit that would knock - it out will instead leave it - with 1 HP. Regardless of its - current HP, it is also immune - to the one-hit KO moves: fissure, - guillotine, horn drill, and sheer - cold. - - If this Pokémon is holding - a focus sash, this ability takes - precedence and the item will - not be consumed. + Rock-head: @@ -62,4 +50,4 @@ usual weight for its species. - Location Areas: + Location Areas Unknown diff --git a/pokeData/aipom b/pokeData/aipom index 3d135e4..8a6a95e 100644 --- a/pokeData/aipom +++ b/pokeData/aipom @@ -17,7 +17,7 @@ speed: 85 Genus: Long Tail Pokémon - Happiness: 70 Pokedex ID: 190 + Happiness: 70 Pokedex ID: 219 Base Exp: 72 Capture Rate: 45 Height: 8 Weight: 115 diff --git a/pokeData/alakazam b/pokeData/alakazam index b031da9..d6de5ab 100644 --- a/pokeData/alakazam +++ b/pokeData/alakazam @@ -17,7 +17,7 @@ speed: 120 Genus: Psi Pokémon - Happiness: 50 Pokedex ID: 65 + Happiness: 50 Pokedex ID: 71 Base Exp: 250 Capture Rate: 50 Height: 15 Weight: 480 @@ -99,4 +99,4 @@ damage each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/alcremie b/pokeData/alcremie index 363e65d..fa17077 100644 --- a/pokeData/alcremie +++ b/pokeData/alcremie @@ -36,4 +36,4 @@ that affect their mental state. - Location Areas: + Location Areas Unknown diff --git a/pokeData/alomomola b/pokeData/alomomola index 7317469..608f779 100644 --- a/pokeData/alomomola +++ b/pokeData/alomomola @@ -15,7 +15,7 @@ speed: 65 Genus: Caring Pokémon - Happiness: 70 Pokedex ID: 594 + Happiness: 70 Pokedex ID: 595 Base Exp: 165 Capture Rate: 75 Height: 12 Weight: 316 diff --git a/pokeData/altaria b/pokeData/altaria index 6d5385d..30e8453 100644 --- a/pokeData/altaria +++ b/pokeData/altaria @@ -19,7 +19,7 @@ speed: 80 Genus: Humming Pokémon - Happiness: 50 Pokedex ID: 334 + Happiness: 50 Pokedex ID: 362 Base Exp: 172 Capture Rate: 45 Height: 11 Weight: 206 diff --git a/pokeData/amaura b/pokeData/amaura index 6c41254..fc46dbc 100644 --- a/pokeData/amaura +++ b/pokeData/amaura @@ -17,7 +17,7 @@ speed: 46 Genus: Tundra Pokémon - Happiness: 50 Pokedex ID: 698 + Happiness: 50 Pokedex ID: 699 Base Exp: 72 Capture Rate: 45 Height: 13 Weight: 252 diff --git a/pokeData/ambipom b/pokeData/ambipom index 192c57a..fd90292 100644 --- a/pokeData/ambipom +++ b/pokeData/ambipom @@ -16,7 +16,7 @@ speed: 115 Genus: Long Tail Pokémon - Happiness: 100 Pokedex ID: 424 + Happiness: 100 Pokedex ID: 220 Base Exp: 169 Capture Rate: 45 Height: 12 Weight: 203 @@ -72,4 +72,4 @@ hits. - Location Areas: + Location Areas Unknown diff --git a/pokeData/amoonguss b/pokeData/amoonguss index 53ba229..7c03912 100644 --- a/pokeData/amoonguss +++ b/pokeData/amoonguss @@ -1,24 +1,53 @@ - Type Pokémon + Amoonguss Grass Type Pokémon - It lures prey close by dancing - and waving its arm caps, which - resemble Poké Balls, in a swaying - motion. - Evolution Chain - Foongus ► Amoonguss + + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 114 + attack: 85 + defense: 70 + special-attack: 85 + special-defense: 80 + speed: 30 - Genus: Mushroom Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 75 - Height: Weight: + Genus: + Happiness: Pokedex ID: + Base Exp: 162 Capture Rate: + Height: 6 Weight: 105 Types: + Grass + Poison ↞---------------|ABILITIES|---------------↠ + Effect-spore: + + Whenever a move makes contact + with this Pokémon, the move's + user has a 30% chance of being + paralyzed, poisoned, or put to + sleep, chosen at random. + + Nothing is done to compensate + if the move's user is immune + to one of these ailments; there + is simply a lower chance that + the move's user will be affected. + + Regenerator: + + This Pokémon regains 1/3 of + its maximum HP when it is switched + out for another Pokémon under + any circumstances other than + having fainted. + + This ability does not take + effect when a battle ends. + Location Areas: Unova route 10 area diff --git a/pokeData/ampharos b/pokeData/ampharos index 6ae485e..e893c65 100644 --- a/pokeData/ampharos +++ b/pokeData/ampharos @@ -17,7 +17,7 @@ speed: 55 Genus: Light Pokémon - Happiness: 70 Pokedex ID: 181 + Happiness: 70 Pokedex ID: 210 Base Exp: 230 Capture Rate: 45 Height: 14 Weight: 615 @@ -55,4 +55,4 @@ lose their effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/anorith b/pokeData/anorith index a4d6cfe..ba7e026 100644 --- a/pokeData/anorith +++ b/pokeData/anorith @@ -18,7 +18,7 @@ speed: 75 Genus: Old Shrimp Pokémon - Happiness: 50 Pokedex ID: 347 + Happiness: 50 Pokedex ID: 375 Base Exp: 71 Capture Rate: 45 Height: 7 Weight: 125 diff --git a/pokeData/appletun b/pokeData/appletun index bf51f5b..c56702b 100644 --- a/pokeData/appletun +++ b/pokeData/appletun @@ -9,7 +9,7 @@ Evolution Chain Applin ► Flapple -Stage 2 Forms: + Stage 2 Forms: flapple appletun @@ -51,4 +51,4 @@ Stage 2 Forms: moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/applin b/pokeData/applin index 123517a..bf5deb2 100644 --- a/pokeData/applin +++ b/pokeData/applin @@ -9,7 +9,7 @@ Evolution Chain Applin ► Flapple -Stage 2 Forms: + Stage 2 Forms: flapple appletun @@ -50,4 +50,4 @@ Stage 2 Forms: and bomb-based moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/araquanid b/pokeData/araquanid index 6fa414b..86254c6 100644 --- a/pokeData/araquanid +++ b/pokeData/araquanid @@ -48,4 +48,4 @@ Pokémon's substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/arcanine b/pokeData/arcanine index b5de556..1ca78f9 100644 --- a/pokeData/arcanine +++ b/pokeData/arcanine @@ -17,7 +17,7 @@ speed: 95 Genus: Legendary Pokémon - Happiness: 50 Pokedex ID: 59 + Happiness: 50 Pokedex ID: 64 Base Exp: 194 Capture Rate: 75 Height: 19 Weight: 1550 @@ -79,4 +79,4 @@ any way. - Location Areas: + Location Areas Unknown diff --git a/pokeData/arceus b/pokeData/arceus index b7e3d3d..2838efd 100644 --- a/pokeData/arceus +++ b/pokeData/arceus @@ -16,7 +16,7 @@ speed: 120 Genus: Alpha Pokémon - Happiness: 0 Pokedex ID: 493 + Happiness: 0 Pokedex ID: 494 Base Exp: 324 Capture Rate: 3 Height: 32 Weight: 3200 diff --git a/pokeData/archen b/pokeData/archen index 4a98656..63d8fc1 100644 --- a/pokeData/archen +++ b/pokeData/archen @@ -17,7 +17,7 @@ speed: 70 Genus: First Bird Pokémon - Happiness: 50 Pokedex ID: 566 + Happiness: 50 Pokedex ID: 567 Base Exp: 71 Capture Rate: 45 Height: 5 Weight: 95 @@ -34,4 +34,4 @@ half its HP or less. - Location Areas: + Location Areas Unknown diff --git a/pokeData/archeops b/pokeData/archeops index 9f0fee0..f6e8439 100644 --- a/pokeData/archeops +++ b/pokeData/archeops @@ -17,7 +17,7 @@ speed: 110 Genus: First Bird Pokémon - Happiness: 50 Pokedex ID: 567 + Happiness: 50 Pokedex ID: 568 Base Exp: 177 Capture Rate: 45 Height: 14 Weight: 320 @@ -34,4 +34,4 @@ half its HP or less. - Location Areas: + Location Areas Unknown diff --git a/pokeData/arctovish b/pokeData/arctovish index a7d4115..8d90d56 100644 --- a/pokeData/arctovish +++ b/pokeData/arctovish @@ -51,4 +51,4 @@ double Speed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/arctozolt b/pokeData/arctozolt index 8f227df..bd15abf 100644 --- a/pokeData/arctozolt +++ b/pokeData/arctozolt @@ -65,4 +65,4 @@ double Speed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ariados b/pokeData/ariados index 1f3820c..c55396b 100644 --- a/pokeData/ariados +++ b/pokeData/ariados @@ -17,7 +17,7 @@ speed: 40 Genus: Long Leg Pokémon - Happiness: 70 Pokedex ID: 168 + Happiness: 70 Pokedex ID: 200 Base Exp: 140 Capture Rate: 90 Height: 11 Weight: 335 diff --git a/pokeData/armaldo b/pokeData/armaldo index fdb5ce4..bb0ffc3 100644 --- a/pokeData/armaldo +++ b/pokeData/armaldo @@ -19,7 +19,7 @@ speed: 45 Genus: Plate Pokémon - Happiness: 50 Pokedex ID: 348 + Happiness: 50 Pokedex ID: 376 Base Exp: 173 Capture Rate: 45 Height: 15 Weight: 682 @@ -46,4 +46,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/aromatisse b/pokeData/aromatisse index 0832fb2..b1042d7 100644 --- a/pokeData/aromatisse +++ b/pokeData/aromatisse @@ -17,7 +17,7 @@ speed: 29 Genus: Fragrance Pokémon - Happiness: 50 Pokedex ID: 683 + Happiness: 50 Pokedex ID: 684 Base Exp: 162 Capture Rate: 140 Height: 8 Weight: 155 @@ -40,4 +40,4 @@ that affect their mental state. - Location Areas: + Location Areas Unknown diff --git a/pokeData/aron b/pokeData/aron index 66f42fc..ad31393 100644 --- a/pokeData/aron +++ b/pokeData/aron @@ -19,7 +19,7 @@ speed: 30 Genus: Iron Armor Pokémon - Happiness: 35 Pokedex ID: 304 + Happiness: 35 Pokedex ID: 330 Base Exp: 66 Capture Rate: 180 Height: 4 Weight: 600 diff --git a/pokeData/arrokuda b/pokeData/arrokuda index b522b1b..10b75b7 100644 --- a/pokeData/arrokuda +++ b/pokeData/arrokuda @@ -1,8 +1,13 @@ Arrokuda Water Type Pokémon - - Single Stage Evolution Pokémon + If it sees any movement around + it, this Pokémon charges for + it straightaway, leading with + its sharply pointed jaw. It’s + very proud of that jaw. + Evolution Chain + Arrokuda ► Barraskewda ↞--------| STATS |--------↠ hp: 41 @@ -12,9 +17,9 @@ special-defense: 30 speed: 66 - Genus: - Happiness: Pokedex ID: 846 - Base Exp: 56 Capture Rate: + Genus: Rush Pokémon + Happiness: 50 Pokedex ID: 846 + Base Exp: 56 Capture Rate: 255 Height: 5 Weight: 10 Types: @@ -35,4 +40,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/articuno b/pokeData/articuno index 1f34b9e..c1d92dd 100644 --- a/pokeData/articuno +++ b/pokeData/articuno @@ -16,7 +16,7 @@ speed: 85 Genus: Freeze Pokémon - Happiness: 35 Pokedex ID: 144 + Happiness: 35 Pokedex ID: 176 Base Exp: 290 Capture Rate: 3 Height: 17 Weight: 554 diff --git a/pokeData/audino b/pokeData/audino index 849d0e4..7686e90 100644 --- a/pokeData/audino +++ b/pokeData/audino @@ -16,7 +16,7 @@ speed: 50 Genus: Hearing Pokémon - Happiness: 50 Pokedex ID: 531 + Happiness: 50 Pokedex ID: 532 Base Exp: 390 Capture Rate: 255 Height: 11 Weight: 310 diff --git a/pokeData/aurorus b/pokeData/aurorus index 933b173..703f2cc 100644 --- a/pokeData/aurorus +++ b/pokeData/aurorus @@ -18,7 +18,7 @@ speed: 58 Genus: Tundra Pokémon - Happiness: 50 Pokedex ID: 699 + Happiness: 50 Pokedex ID: 700 Base Exp: 104 Capture Rate: 45 Height: 27 Weight: 2250 @@ -54,4 +54,4 @@ will stay. - Location Areas: + Location Areas Unknown diff --git a/pokeData/avalugg b/pokeData/avalugg index ea29656..21fe617 100644 --- a/pokeData/avalugg +++ b/pokeData/avalugg @@ -59,4 +59,4 @@ not be consumed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/axew b/pokeData/axew index fcf8ac2..9dd432f 100644 --- a/pokeData/axew +++ b/pokeData/axew @@ -17,7 +17,7 @@ speed: 57 Genus: Tusk Pokémon - Happiness: 35 Pokedex ID: 610 + Happiness: 35 Pokedex ID: 611 Base Exp: 64 Capture Rate: 75 Height: 6 Weight: 180 diff --git a/pokeData/azelf b/pokeData/azelf index 050af19..47516cd 100644 --- a/pokeData/azelf +++ b/pokeData/azelf @@ -16,7 +16,7 @@ speed: 115 Genus: Willpower Pokémon - Happiness: 140 Pokedex ID: 482 + Happiness: 140 Pokedex ID: 483 Base Exp: 290 Capture Rate: 3 Height: 3 Weight: 3 diff --git a/pokeData/azumarill b/pokeData/azumarill index 67da127..0d7895f 100644 --- a/pokeData/azumarill +++ b/pokeData/azumarill @@ -18,7 +18,7 @@ speed: 50 Genus: Aqua Rabbit Pokémon - Happiness: 50 Pokedex ID: 184 + Happiness: 50 Pokedex ID: 213 Base Exp: 210 Capture Rate: 75 Height: 8 Weight: 285 diff --git a/pokeData/azurill b/pokeData/azurill index aa8aedf..8d55dd5 100644 --- a/pokeData/azurill +++ b/pokeData/azurill @@ -16,7 +16,7 @@ speed: 20 Genus: Polka Dot Pokémon - Happiness: 50 Pokedex ID: 298 + Happiness: 50 Pokedex ID: 211 Base Exp: 38 Capture Rate: 150 Height: 2 Weight: 20 diff --git a/pokeData/bagon b/pokeData/bagon index 78b65d0..75d779e 100644 --- a/pokeData/bagon +++ b/pokeData/bagon @@ -16,7 +16,7 @@ speed: 50 Genus: Rock Head Pokémon - Happiness: 35 Pokedex ID: 371 + Happiness: 35 Pokedex ID: 401 Base Exp: 60 Capture Rate: 45 Height: 6 Weight: 421 diff --git a/pokeData/baltoy b/pokeData/baltoy index 1f4526d..5b95134 100644 --- a/pokeData/baltoy +++ b/pokeData/baltoy @@ -19,7 +19,7 @@ speed: 55 Genus: Clay Doll Pokémon - Happiness: 50 Pokedex ID: 343 + Happiness: 50 Pokedex ID: 371 Base Exp: 60 Capture Rate: 255 Height: 5 Weight: 215 diff --git a/pokeData/banette b/pokeData/banette index 3dcbb2c..d9a2f67 100644 --- a/pokeData/banette +++ b/pokeData/banette @@ -19,7 +19,7 @@ speed: 65 Genus: Marionette Pokémon - Happiness: 35 Pokedex ID: 354 + Happiness: 35 Pokedex ID: 382 Base Exp: 159 Capture Rate: 45 Height: 11 Weight: 125 diff --git a/pokeData/barbaracle b/pokeData/barbaracle index 54f9560..7f9bac3 100644 --- a/pokeData/barbaracle +++ b/pokeData/barbaracle @@ -17,7 +17,7 @@ speed: 68 Genus: Collective Pokémon - Happiness: 50 Pokedex ID: 689 + Happiness: 50 Pokedex ID: 690 Base Exp: 175 Capture Rate: 45 Height: 13 Weight: 960 @@ -56,4 +56,4 @@ steal from a trained Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/barboach b/pokeData/barboach index 905ba66..7a856da 100644 --- a/pokeData/barboach +++ b/pokeData/barboach @@ -19,7 +19,7 @@ speed: 60 Genus: Whiskers Pokémon - Happiness: 50 Pokedex ID: 339 + Happiness: 50 Pokedex ID: 367 Base Exp: 58 Capture Rate: 190 Height: 4 Weight: 19 diff --git a/pokeData/barraskewda b/pokeData/barraskewda index 25b5e3c..097d80e 100644 --- a/pokeData/barraskewda +++ b/pokeData/barraskewda @@ -40,4 +40,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/basculegion b/pokeData/basculegion index 93501c8..79dfd2a 100644 --- a/pokeData/basculegion +++ b/pokeData/basculegion @@ -1,5 +1,5 @@ - Type Pokémon + Basculegion-male Water Type Pokémon Clads itself in the souls of comrades that perished before @@ -11,15 +11,96 @@ Basculin ► Basculegion ↞--------| STATS |--------↠ + hp: 120 + attack: 112 + defense: 65 + special-attack: 80 + special-defense: 75 + speed: 78 Genus: - Happiness: 135 Pokedex ID: + Happiness: 135 Pokedex ID: 902 Base Exp: Capture Rate: - Height: Weight: + Height: 30 Weight: 1100 Types: + Water + Ghost ↞---------------|ABILITIES|---------------↠ + Rattled: - Location Areas: + This Pokémon's Speed rises + one stage with each hit from + a damaging dark-, ghost-, or + bug-type move. + + Adaptability: + + This Pokémon inflicts twice + as much damage with moves whose + types match its own, rather than + the usual same-type attack bonus + of 1.5×. + + Mold-breaker: + + This Pokémon's moves completely + ignore abilities that could hinder + or prevent their effect on the + target. + + For example, this Pokémon's + moves ignore abilities that would + fully negate them, such as water + absorb; abilities that would + prevent any of their effects, + such as clear body, shell armor, + or sticky hold; and abilities + that grant any general protective + benefit, such as simple, snow + cloak, or thick fat. If an ability + could either hinder or help this + Pokémon's moves, e.g. dry skin + or unaware, the ability is ignored + either way. + + Abilities that do not fit this + description, even if they could + hinder moves in some other way, + are not affected. For example, + cursed body only affects potential + future uses of the move, while + liquid ooze and shadow tag can + only hinder a move's effect on + the user. This ablity cannot + ignore type or form changes granted + by abilities, for example color + change or forecast; nor effects + that were caused by abilities + but are no longer tied to an + ability, such as the rain from + drizzle. This ability cannot + ignore multitype at all. + + An ability ignored by this + ability is only nullified while + the move is being used. For example, + this Pokémon's moves can paralyze + a Pokémon with limber, but Limber + will activate and heal the paralysis + immediately thereafter, and this + Pokémon's spikes are not affected + by this ability after they have + been placed. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + This ability functions identically + to teravolt and turboblaze. + + + Location Areas Unknown diff --git a/pokeData/basculin b/pokeData/basculin index fd69997..f49a7f2 100644 --- a/pokeData/basculin +++ b/pokeData/basculin @@ -1,5 +1,5 @@ - Type Pokémon + Sandile Ground Type Pokémon Red and blue Basculin get along so poorly, they’ll start fighting @@ -9,15 +9,72 @@ Basculin ► Basculegion ↞--------| STATS |--------↠ + hp: 50 + attack: 72 + defense: 35 + special-attack: 35 + special-defense: 35 + speed: 65 Genus: Hostile Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 25 - Height: Weight: + Happiness: 50 Pokedex ID: 551 + Base Exp: 58 Capture Rate: 25 + Height: 7 Weight: 152 Types: + Ground + Dark ↞---------------|ABILITIES|---------------↠ + Intimidate: - Location Areas: + When this Pokémon enters battle, + the opponent's Attack is lowered + by one stage. In a double battle, + both opponents are affected. + + This ability also takes effect + when acquired during a battle, + but will not take effect again + if lost and reobtained without + leaving battle. + + This ability has no effect + on an opponent that has a substitute. + + Overworld: If the first Pokémon + in the party has this ability, + any random encounter with a Pokémon + five or more levels lower than + it has a 50% chance of being + skipped. + + Moxie: + + This Pokémon's Attack rises + one stage upon knocking out another + Pokémon, even a friendly Pokémon. + + This ability does not take + effect when the Pokémon indirectly + causes another Pokémon to faint, + e.g. through poison or spikes. + + If this Pokémon knocks out + a Pokémon with mummy, the former's + ability will change without taking + effect. + + Anger-point: + + Whenever this Pokémon receives + a critical hit, its Attack rises + to the maximum of 6 stages. + + This ability will still take + effect if the critical hit is + received by a substitute. + + + Location Areas Unknown diff --git a/pokeData/bastiodon b/pokeData/bastiodon index 10a7dd8..1dc8a36 100644 --- a/pokeData/bastiodon +++ b/pokeData/bastiodon @@ -16,7 +16,7 @@ speed: 30 Genus: Shield Pokémon - Happiness: 70 Pokedex ID: 411 + Happiness: 70 Pokedex ID: 439 Base Exp: 173 Capture Rate: 45 Height: 13 Weight: 1495 @@ -60,4 +60,4 @@ and yawn are not flagged as sound-based. - Location Areas: + Location Areas Unknown diff --git a/pokeData/bayleef b/pokeData/bayleef index 2df6add..2f593db 100644 --- a/pokeData/bayleef +++ b/pokeData/bayleef @@ -16,7 +16,7 @@ speed: 60 Genus: Leaf Pokémon - Happiness: 70 Pokedex ID: 153 + Happiness: 70 Pokedex ID: 185 Base Exp: 142 Capture Rate: 45 Height: 12 Weight: 158 @@ -49,4 +49,4 @@ in the meantime. - Location Areas: + Location Areas Unknown diff --git a/pokeData/beartic b/pokeData/beartic index 5f4d1bc..711ef26 100644 --- a/pokeData/beartic +++ b/pokeData/beartic @@ -17,7 +17,7 @@ speed: 50 Genus: Freezing Pokémon - Happiness: 50 Pokedex ID: 614 + Happiness: 50 Pokedex ID: 615 Base Exp: 177 Capture Rate: 60 Height: 26 Weight: 2600 diff --git a/pokeData/beautifly b/pokeData/beautifly index 6935c28..bacc94f 100644 --- a/pokeData/beautifly +++ b/pokeData/beautifly @@ -11,11 +11,11 @@ Evolution Chain Wurmple ► Silcoon ► Beautifly -Stage 2 Forms: + Stage 2 Forms: silcoon cascoon -Stage 3 Forms: + Stage 3 Forms: beautifly dustox @@ -28,7 +28,7 @@ Stage 3 Forms: speed: 65 Genus: Butterfly Pokémon - Happiness: 70 Pokedex ID: 267 + Happiness: 70 Pokedex ID: 292 Base Exp: 178 Capture Rate: 45 Height: 10 Weight: 284 diff --git a/pokeData/beedrill b/pokeData/beedrill index d2af400..75d8e25 100644 --- a/pokeData/beedrill +++ b/pokeData/beedrill @@ -46,3 +46,18 @@ Location Areas: + Ilex forest area + Johto route 34 area + Johto route 35 area + Johto route 36 area + Johto route 37 area + Johto route 38 area + Johto route 39 area + Lake of rage area + Kanto route 26 area + Kanto route 27 area + Kanto route 2 south towards viridian city + Kanto route 2 north towards pewter city + Viridian forest area + Unova route 12 area + Azalea town area diff --git a/pokeData/beheeyem b/pokeData/beheeyem index 13475ab..e9af784 100644 --- a/pokeData/beheeyem +++ b/pokeData/beheeyem @@ -17,7 +17,7 @@ speed: 40 Genus: Cerebral Pokémon - Happiness: 50 Pokedex ID: 606 + Happiness: 50 Pokedex ID: 607 Base Exp: 170 Capture Rate: 90 Height: 10 Weight: 345 diff --git a/pokeData/beldum b/pokeData/beldum index 36600e9..7b50b72 100644 --- a/pokeData/beldum +++ b/pokeData/beldum @@ -19,7 +19,7 @@ speed: 30 Genus: Iron Ball Pokémon - Happiness: 35 Pokedex ID: 374 + Happiness: 35 Pokedex ID: 404 Base Exp: 60 Capture Rate: 3 Height: 6 Weight: 952 diff --git a/pokeData/bellossom b/pokeData/bellossom index d78be19..9ddf6b4 100644 --- a/pokeData/bellossom +++ b/pokeData/bellossom @@ -8,7 +8,7 @@ Evolution Chain Oddish ► Gloom ► Vileplume -Stage 3 Forms: + Stage 3 Forms: vileplume bellossom @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 50 Genus: Flower Pokémon - Happiness: 50 Pokedex ID: 182 + Happiness: 50 Pokedex ID: 50 Base Exp: 245 Capture Rate: 45 Height: 4 Weight: 58 @@ -47,4 +47,4 @@ Stage 3 Forms: ailment after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/bellsprout b/pokeData/bellsprout index 0bb48bd..b25e4ff 100644 --- a/pokeData/bellsprout +++ b/pokeData/bellsprout @@ -1,8 +1,12 @@ Bellsprout Grass Type Pokémon + A carnivorous Pokémon that traps + and eats bugs. It uses its root + feet to soak up needed moisture. - Single Stage Evolution Pokémon + Evolution Chain + Bellsprout ► Weepinbell ► Victreebel ↞--------| STATS |--------↠ hp: 50 @@ -12,9 +16,9 @@ special-defense: 30 speed: 40 - Genus: - Happiness: Pokedex ID: 69 - Base Exp: 60 Capture Rate: + Genus: Flower Pokémon + Happiness: 70 Pokedex ID: 75 + Base Exp: 60 Capture Rate: 255 Height: 7 Weight: 40 Types: diff --git a/pokeData/bewear b/pokeData/bewear index 8f2386e..f3bd996 100644 --- a/pokeData/bewear +++ b/pokeData/bewear @@ -69,4 +69,4 @@ a target's Berry. - Location Areas: + Location Areas Unknown diff --git a/pokeData/bibarel b/pokeData/bibarel index c97466f..98ad86d 100644 --- a/pokeData/bibarel +++ b/pokeData/bibarel @@ -17,7 +17,7 @@ speed: 71 Genus: Beaver Pokémon - Happiness: 70 Pokedex ID: 400 + Happiness: 70 Pokedex ID: 430 Base Exp: 144 Capture Rate: 127 Height: 10 Weight: 315 diff --git a/pokeData/bidoof b/pokeData/bidoof index e2042cc..f682819 100644 --- a/pokeData/bidoof +++ b/pokeData/bidoof @@ -16,7 +16,7 @@ speed: 31 Genus: Plump Mouse Pokémon - Happiness: 70 Pokedex ID: 399 + Happiness: 70 Pokedex ID: 429 Base Exp: 50 Capture Rate: 255 Height: 5 Weight: 200 diff --git a/pokeData/binacle b/pokeData/binacle index 683fd6c..6f5a7f9 100644 --- a/pokeData/binacle +++ b/pokeData/binacle @@ -17,7 +17,7 @@ speed: 50 Genus: Two-Handed Pokémon - Happiness: 50 Pokedex ID: 688 + Happiness: 50 Pokedex ID: 689 Base Exp: 61 Capture Rate: 120 Height: 5 Weight: 310 diff --git a/pokeData/bisharp b/pokeData/bisharp index 8e39000..6f7c87a 100644 --- a/pokeData/bisharp +++ b/pokeData/bisharp @@ -17,7 +17,7 @@ speed: 70 Genus: Sword Blade Pokémon - Happiness: 35 Pokedex ID: 625 + Happiness: 35 Pokedex ID: 626 Base Exp: 172 Capture Rate: 45 Height: 16 Weight: 700 diff --git a/pokeData/blacephalon b/pokeData/blacephalon index d3f8138..854983f 100644 --- a/pokeData/blacephalon +++ b/pokeData/blacephalon @@ -34,4 +34,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/blastoise b/pokeData/blastoise index 94d862d..13ebd09 100644 --- a/pokeData/blastoise +++ b/pokeData/blastoise @@ -40,4 +40,4 @@ turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/blaziken b/pokeData/blaziken index 9c47bdb..e0fe659 100644 --- a/pokeData/blaziken +++ b/pokeData/blaziken @@ -19,7 +19,7 @@ speed: 80 Genus: Blaze Pokémon - Happiness: 50 Pokedex ID: 257 + Happiness: 50 Pokedex ID: 282 Base Exp: 265 Capture Rate: 45 Height: 19 Weight: 520 @@ -42,4 +42,4 @@ one stage after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/blipbug b/pokeData/blipbug index beca534..67e6d0c 100644 --- a/pokeData/blipbug +++ b/pokeData/blipbug @@ -62,4 +62,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/blissey b/pokeData/blissey index 8bd75d7..b7238b5 100644 --- a/pokeData/blissey +++ b/pokeData/blissey @@ -17,7 +17,7 @@ speed: 55 Genus: Happiness Pokémon - Happiness: 140 Pokedex ID: 242 + Happiness: 140 Pokedex ID: 128 Base Exp: 635 Capture Rate: 30 Height: 15 Weight: 468 @@ -64,4 +64,4 @@ ailment after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/blitzle b/pokeData/blitzle index 9558e27..75a43b7 100644 --- a/pokeData/blitzle +++ b/pokeData/blitzle @@ -17,7 +17,7 @@ speed: 76 Genus: Electrified Pokémon - Happiness: 70 Pokedex ID: 522 + Happiness: 70 Pokedex ID: 523 Base Exp: 59 Capture Rate: 190 Height: 8 Weight: 298 diff --git a/pokeData/boldore b/pokeData/boldore index 541df01..12151a9 100644 --- a/pokeData/boldore +++ b/pokeData/boldore @@ -17,7 +17,7 @@ speed: 20 Genus: Ore Pokémon - Happiness: 50 Pokedex ID: 525 + Happiness: 50 Pokedex ID: 526 Base Exp: 137 Capture Rate: 120 Height: 9 Weight: 1020 diff --git a/pokeData/boltund b/pokeData/boltund index c6b553f..ca0411c 100644 --- a/pokeData/boltund +++ b/pokeData/boltund @@ -38,4 +38,4 @@ stages upon having any stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/bonsly b/pokeData/bonsly index a51dd6e..4dc5504 100644 --- a/pokeData/bonsly +++ b/pokeData/bonsly @@ -17,7 +17,7 @@ speed: 10 Genus: Bonsai Pokémon - Happiness: 50 Pokedex ID: 438 + Happiness: 50 Pokedex ID: 214 Base Exp: 58 Capture Rate: 255 Height: 5 Weight: 150 diff --git a/pokeData/bouffalant b/pokeData/bouffalant index d571dc3..a8e6bfc 100644 --- a/pokeData/bouffalant +++ b/pokeData/bouffalant @@ -15,7 +15,7 @@ speed: 55 Genus: Bash Buffalo Pokémon - Happiness: 50 Pokedex ID: 626 + Happiness: 50 Pokedex ID: 627 Base Exp: 172 Capture Rate: 45 Height: 16 Weight: 946 diff --git a/pokeData/bounsweet b/pokeData/bounsweet index feab652..e1baf30 100644 --- a/pokeData/bounsweet +++ b/pokeData/bounsweet @@ -57,4 +57,4 @@ sleeping. - Location Areas: + Location Areas Unknown diff --git a/pokeData/braixen b/pokeData/braixen index c353da6..b504229 100644 --- a/pokeData/braixen +++ b/pokeData/braixen @@ -17,7 +17,7 @@ speed: 73 Genus: Fox Pokémon - Happiness: 70 Pokedex ID: 654 + Happiness: 70 Pokedex ID: 655 Base Exp: 143 Capture Rate: 45 Height: 10 Weight: 145 @@ -40,4 +40,4 @@ move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/braviary b/pokeData/braviary index f967261..ce4f478 100644 --- a/pokeData/braviary +++ b/pokeData/braviary @@ -17,7 +17,7 @@ speed: 80 Genus: Valiant Pokémon - Happiness: 50 Pokedex ID: 628 + Happiness: 50 Pokedex ID: 629 Base Exp: 179 Capture Rate: 60 Height: 15 Weight: 410 diff --git a/pokeData/breloom b/pokeData/breloom index 32df5fd..8a8b695 100644 --- a/pokeData/breloom +++ b/pokeData/breloom @@ -7,7 +7,8 @@ stretchy arms. Breloom’s fighting technique puts boxers to shame. - Single Stage Evolution Pokémon + Evolution Chain + Shroomish ► Breloom ↞--------| STATS |--------↠ hp: 60 @@ -18,7 +19,7 @@ speed: 70 Genus: Mushroom Pokémon - Happiness: 70 Pokedex ID: 286 + Happiness: 70 Pokedex ID: 312 Base Exp: 161 Capture Rate: 90 Height: 12 Weight: 392 @@ -65,4 +66,4 @@ power boost for rollout. - Location Areas: + Location Areas Unknown diff --git a/pokeData/brionne b/pokeData/brionne index 5278696..3083d8c 100644 --- a/pokeData/brionne +++ b/pokeData/brionne @@ -40,4 +40,4 @@ type is Water. - Location Areas: + Location Areas Unknown diff --git a/pokeData/bronzong b/pokeData/bronzong index acf3948..0036de0 100644 --- a/pokeData/bronzong +++ b/pokeData/bronzong @@ -17,7 +17,7 @@ speed: 33 Genus: Bronze Bell Pokémon - Happiness: 50 Pokedex ID: 437 + Happiness: 50 Pokedex ID: 461 Base Exp: 175 Capture Rate: 90 Height: 13 Weight: 1870 @@ -51,3 +51,20 @@ Location Areas: + Mt coronet 2f + Mt coronet 3f + Mt coronet exterior snowfall + Mt coronet exterior blizzard + Mt coronet 4f + Mt coronet 4f small room + Mt coronet 5f + Mt coronet 6f + Mt coronet 1f from exterior + Turnback cave pillar 1 + Turnback cave pillar 2 + Turnback cave pillar 3 + Turnback cave before pillar 1 + Turnback cave between pillars 1 and 2 + Turnback cave between pillars 2 and 3 + Turnback cave after pillar 3 + Abundant shrine area diff --git a/pokeData/bronzor b/pokeData/bronzor index bd6359c..947420f 100644 --- a/pokeData/bronzor +++ b/pokeData/bronzor @@ -17,7 +17,7 @@ speed: 23 Genus: Bronze Pokémon - Happiness: 50 Pokedex ID: 436 + Happiness: 50 Pokedex ID: 460 Base Exp: 60 Capture Rate: 255 Height: 5 Weight: 605 diff --git a/pokeData/bruxish b/pokeData/bruxish index 954991b..1c7cb16 100644 --- a/pokeData/bruxish +++ b/pokeData/bruxish @@ -46,4 +46,4 @@ Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/budew b/pokeData/budew index 7458653..d77f524 100644 --- a/pokeData/budew +++ b/pokeData/budew @@ -17,7 +17,7 @@ speed: 55 Genus: Bud Pokémon - Happiness: 50 Pokedex ID: 406 + Happiness: 50 Pokedex ID: 341 Base Exp: 56 Capture Rate: 255 Height: 2 Weight: 12 diff --git a/pokeData/buizel b/pokeData/buizel index 4d2224a..24022bb 100644 --- a/pokeData/buizel +++ b/pokeData/buizel @@ -17,7 +17,7 @@ speed: 85 Genus: Sea Weasel Pokémon - Happiness: 70 Pokedex ID: 418 + Happiness: 70 Pokedex ID: 446 Base Exp: 66 Capture Rate: 190 Height: 7 Weight: 295 diff --git a/pokeData/bulbasaur b/pokeData/bulbasaur index d91fb45..e0852ce 100644 --- a/pokeData/bulbasaur +++ b/pokeData/bulbasaur @@ -43,7 +43,4 @@ a stat modifier. - Location Areas: - Cerulean city area - Pallet town area - Lumiose city area + Location Areas Unknown diff --git a/pokeData/buneary b/pokeData/buneary index 4241b72..613a926 100644 --- a/pokeData/buneary +++ b/pokeData/buneary @@ -17,7 +17,7 @@ speed: 85 Genus: Rabbit Pokémon - Happiness: 0 Pokedex ID: 427 + Happiness: 0 Pokedex ID: 454 Base Exp: 70 Capture Rate: 190 Height: 4 Weight: 55 diff --git a/pokeData/bunnelby b/pokeData/bunnelby index 85a2214..338945b 100644 --- a/pokeData/bunnelby +++ b/pokeData/bunnelby @@ -16,7 +16,7 @@ speed: 57 Genus: Digging Pokémon - Happiness: 50 Pokedex ID: 659 + Happiness: 50 Pokedex ID: 660 Base Exp: 47 Capture Rate: 255 Height: 4 Weight: 50 diff --git a/pokeData/burmy b/pokeData/burmy index 1e696b1..62ad75d 100644 --- a/pokeData/burmy +++ b/pokeData/burmy @@ -8,7 +8,7 @@ Evolution Chain Burmy ► Wormadam -Stage 2 Forms: + Stage 2 Forms: wormadam mothim @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 36 Genus: Bagworm Pokémon - Happiness: 70 Pokedex ID: 412 + Happiness: 70 Pokedex ID: 440 Base Exp: 45 Capture Rate: 120 Height: 2 Weight: 34 diff --git a/pokeData/butterfree b/pokeData/butterfree index 241653e..3a08add 100644 --- a/pokeData/butterfree +++ b/pokeData/butterfree @@ -1,5 +1,5 @@ - Type Pokémon + Butterfree Bug Type Pokémon In battle, it flaps its wings at high speed to release highly @@ -8,16 +8,48 @@ Caterpie ► Metapod ► Butterfree ↞--------| STATS |--------↠ + hp: 60 + attack: 45 + defense: 50 + special-attack: 90 + special-defense: 80 + speed: 70 Genus: Butterfly Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 50 Pokedex ID: 12 + Base Exp: 198 Capture Rate: 45 + Height: 11 Weight: 320 Types: + Bug + Flying ↞---------------|ABILITIES|---------------↠ + Compound-eyes: + + This Pokémon's moves have 1.3× + their accuracy. + + This ability has no effect + on the one-hit KO moves (fissure, + guillotine, horn drill, and sheer + cold). + + Overworld: If the first Pokémon + in the party has this ability, + the chance of a wild Pokémon + holding a particular item is + raised from 50%, 5%, or 1% to + 60%, 20%, or 5%, respectively. + + Tinted-lens: + + This Pokémon deals twice as + much damage with moves that are + not very effective against the + target. + Location Areas: Ilex forest area diff --git a/pokeData/buzzwole b/pokeData/buzzwole index c416382..0cadc76 100644 --- a/pokeData/buzzwole +++ b/pokeData/buzzwole @@ -34,4 +34,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cacnea b/pokeData/cacnea index bbb81bd..7ed7f29 100644 --- a/pokeData/cacnea +++ b/pokeData/cacnea @@ -20,7 +20,7 @@ speed: 35 Genus: Cactus Pokémon - Happiness: 35 Pokedex ID: 331 + Happiness: 35 Pokedex ID: 359 Base Exp: 67 Capture Rate: 190 Height: 4 Weight: 513 diff --git a/pokeData/cacturne b/pokeData/cacturne index 7117ca2..85977c5 100644 --- a/pokeData/cacturne +++ b/pokeData/cacturne @@ -19,7 +19,7 @@ speed: 55 Genus: Scarecrow Pokémon - Happiness: 35 Pokedex ID: 332 + Happiness: 35 Pokedex ID: 360 Base Exp: 166 Capture Rate: 60 Height: 13 Weight: 774 diff --git a/pokeData/calyrex b/pokeData/calyrex index b44d765..bbcc1aa 100644 --- a/pokeData/calyrex +++ b/pokeData/calyrex @@ -38,4 +38,4 @@ a target's Berry. - Location Areas: + Location Areas Unknown diff --git a/pokeData/camerupt b/pokeData/camerupt index ed3944a..fce9a8b 100644 --- a/pokeData/camerupt +++ b/pokeData/camerupt @@ -19,7 +19,7 @@ speed: 40 Genus: Eruption Pokémon - Happiness: 70 Pokedex ID: 323 + Happiness: 70 Pokedex ID: 351 Base Exp: 161 Capture Rate: 150 Height: 19 Weight: 2200 diff --git a/pokeData/carkol b/pokeData/carkol index 80e9998..13dc187 100644 --- a/pokeData/carkol +++ b/pokeData/carkol @@ -69,4 +69,4 @@ o wisp. - Location Areas: + Location Areas Unknown diff --git a/pokeData/carnivine b/pokeData/carnivine index 4d8d536..5975586 100644 --- a/pokeData/carnivine +++ b/pokeData/carnivine @@ -16,7 +16,7 @@ speed: 46 Genus: Bug Catcher Pokémon - Happiness: 70 Pokedex ID: 455 + Happiness: 70 Pokedex ID: 475 Base Exp: 159 Capture Rate: 200 Height: 14 Weight: 270 diff --git a/pokeData/carracosta b/pokeData/carracosta index a6bd0a1..fa74c63 100644 --- a/pokeData/carracosta +++ b/pokeData/carracosta @@ -17,7 +17,7 @@ speed: 32 Genus: Prototurtle Pokémon - Happiness: 50 Pokedex ID: 565 + Happiness: 50 Pokedex ID: 566 Base Exp: 173 Capture Rate: 45 Height: 12 Weight: 810 @@ -61,4 +61,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/carvanha b/pokeData/carvanha index 4f25579..a39284f 100644 --- a/pokeData/carvanha +++ b/pokeData/carvanha @@ -19,7 +19,7 @@ speed: 65 Genus: Savage Pokémon - Happiness: 35 Pokedex ID: 318 + Happiness: 35 Pokedex ID: 346 Base Exp: 61 Capture Rate: 225 Height: 8 Weight: 208 diff --git a/pokeData/cascoon b/pokeData/cascoon index d6406c5..0d4e8bb 100644 --- a/pokeData/cascoon +++ b/pokeData/cascoon @@ -11,11 +11,11 @@ Evolution Chain Wurmple ► Silcoon ► Beautifly -Stage 2 Forms: + Stage 2 Forms: silcoon cascoon -Stage 3 Forms: + Stage 3 Forms: beautifly dustox @@ -28,7 +28,7 @@ Stage 3 Forms: speed: 15 Genus: Cocoon Pokémon - Happiness: 70 Pokedex ID: 268 + Happiness: 70 Pokedex ID: 293 Base Exp: 72 Capture Rate: 120 Height: 7 Weight: 115 diff --git a/pokeData/castform b/pokeData/castform index 1c54fe4..0d28f58 100644 --- a/pokeData/castform +++ b/pokeData/castform @@ -17,7 +17,7 @@ speed: 70 Genus: Weather Pokémon - Happiness: 70 Pokedex ID: 351 + Happiness: 70 Pokedex ID: 379 Base Exp: 147 Capture Rate: 45 Height: 3 Weight: 8 diff --git a/pokeData/celebi b/pokeData/celebi index 0b9eb26..2ce4bcc 100644 --- a/pokeData/celebi +++ b/pokeData/celebi @@ -16,7 +16,7 @@ speed: 100 Genus: Time Travel Pokémon - Happiness: 100 Pokedex ID: 251 + Happiness: 100 Pokedex ID: 276 Base Exp: 300 Capture Rate: 45 Height: 6 Weight: 50 diff --git a/pokeData/celesteela b/pokeData/celesteela index 9fae27b..3c12a3c 100644 --- a/pokeData/celesteela +++ b/pokeData/celesteela @@ -33,4 +33,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/centiskorch b/pokeData/centiskorch index 6dc8e37..d446399 100644 --- a/pokeData/centiskorch +++ b/pokeData/centiskorch @@ -91,4 +91,4 @@ or magma armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chandelure b/pokeData/chandelure index e9a44d4..d7e9a93 100644 --- a/pokeData/chandelure +++ b/pokeData/chandelure @@ -17,7 +17,7 @@ speed: 80 Genus: Luring Pokémon - Happiness: 50 Pokedex ID: 609 + Happiness: 50 Pokedex ID: 610 Base Exp: 260 Capture Rate: 45 Height: 10 Weight: 343 @@ -70,4 +70,4 @@ light screen, reflect, and safeguard. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chansey b/pokeData/chansey index 135cc18..7800ae5 100644 --- a/pokeData/chansey +++ b/pokeData/chansey @@ -16,7 +16,7 @@ speed: 50 Genus: Egg Pokémon - Happiness: 140 Pokedex ID: 113 + Happiness: 140 Pokedex ID: 127 Base Exp: 395 Capture Rate: 30 Height: 11 Weight: 346 @@ -64,3 +64,13 @@ Location Areas: + Sinnoh route 209 area + Sinnoh route 210 south towards solaceon town + Kanto route 13 area + Kanto route 14 area + Kanto route 15 area + Cerulean cave 2f + Cerulean cave b1f + Kanto safari zone middle + Kanto safari zone area 1 east + Kanto safari zone area 2 north diff --git a/pokeData/charizard b/pokeData/charizard index d8decc9..e871cf0 100644 --- a/pokeData/charizard +++ b/pokeData/charizard @@ -42,4 +42,4 @@ HP in damage after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/charjabug b/pokeData/charjabug index 1aa3cb3..86109a2 100644 --- a/pokeData/charjabug +++ b/pokeData/charjabug @@ -33,4 +33,4 @@ power increased to 1.3×. - Location Areas: + Location Areas Unknown diff --git a/pokeData/charmeleon b/pokeData/charmeleon index 21bee5a..3322132 100644 --- a/pokeData/charmeleon +++ b/pokeData/charmeleon @@ -1,8 +1,11 @@ Charmeleon Fire Type Pokémon - - Single Stage Evolution Pokémon + When it swings its burning tail, + it elevates the temperature to + unbearably high levels. + Evolution Chain + Charmander ► Charmeleon ► Charizard ↞--------| STATS |--------↠ hp: 58 @@ -12,9 +15,9 @@ special-defense: 65 speed: 80 - Genus: - Happiness: Pokedex ID: 5 - Base Exp: 142 Capture Rate: + Genus: Flame Pokémon + Happiness: 50 Pokedex ID: 5 + Base Exp: 142 Capture Rate: 45 Height: 11 Weight: 190 Types: @@ -37,4 +40,4 @@ HP in damage after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chatot b/pokeData/chatot index d7ab7a0..c7b9010 100644 --- a/pokeData/chatot +++ b/pokeData/chatot @@ -15,7 +15,7 @@ speed: 91 Genus: Music Note Pokémon - Happiness: 35 Pokedex ID: 441 + Happiness: 35 Pokedex ID: 462 Base Exp: 144 Capture Rate: 30 Height: 5 Weight: 19 diff --git a/pokeData/cherrim b/pokeData/cherrim index 7ab5692..7ff1c20 100644 --- a/pokeData/cherrim +++ b/pokeData/cherrim @@ -17,7 +17,7 @@ speed: 85 Genus: Blossom Pokémon - Happiness: 50 Pokedex ID: 421 + Happiness: 50 Pokedex ID: 449 Base Exp: 158 Capture Rate: 75 Height: 5 Weight: 93 diff --git a/pokeData/cherubi b/pokeData/cherubi index 1378a62..afad566 100644 --- a/pokeData/cherubi +++ b/pokeData/cherubi @@ -16,7 +16,7 @@ speed: 35 Genus: Cherry Pokémon - Happiness: 50 Pokedex ID: 420 + Happiness: 50 Pokedex ID: 448 Base Exp: 55 Capture Rate: 190 Height: 4 Weight: 33 @@ -34,4 +34,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chesnaught b/pokeData/chesnaught index 8291fec..9f31058 100644 --- a/pokeData/chesnaught +++ b/pokeData/chesnaught @@ -17,7 +17,7 @@ speed: 64 Genus: Spiny Armor Pokémon - Happiness: 70 Pokedex ID: 652 + Happiness: 70 Pokedex ID: 653 Base Exp: 239 Capture Rate: 45 Height: 16 Weight: 900 @@ -40,4 +40,4 @@ and bomb-based moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chespin b/pokeData/chespin index debb1aa..6e7e6a5 100644 --- a/pokeData/chespin +++ b/pokeData/chespin @@ -17,7 +17,7 @@ speed: 38 Genus: Spiny Nut Pokémon - Happiness: 70 Pokedex ID: 650 + Happiness: 70 Pokedex ID: 651 Base Exp: 63 Capture Rate: 45 Height: 4 Weight: 90 diff --git a/pokeData/chewtle b/pokeData/chewtle index 04f97f8..d1f2150 100644 --- a/pokeData/chewtle +++ b/pokeData/chewtle @@ -32,7 +32,11 @@ Shell-armor: - + Moves cannot score critical + hits against this Pokémon. + + This ability functions identically + to battle armor. Swift-swim: @@ -43,4 +47,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/chikorita b/pokeData/chikorita index d517aea..8ac6aee 100644 --- a/pokeData/chikorita +++ b/pokeData/chikorita @@ -17,7 +17,7 @@ speed: 45 Genus: Leaf Pokémon - Happiness: 70 Pokedex ID: 152 + Happiness: 70 Pokedex ID: 184 Base Exp: 64 Capture Rate: 45 Height: 9 Weight: 64 diff --git a/pokeData/chimchar b/pokeData/chimchar index ff9dba6..046d272 100644 --- a/pokeData/chimchar +++ b/pokeData/chimchar @@ -17,7 +17,7 @@ speed: 61 Genus: Chimp Pokémon - Happiness: 70 Pokedex ID: 390 + Happiness: 70 Pokedex ID: 420 Base Exp: 62 Capture Rate: 45 Height: 5 Weight: 62 diff --git a/pokeData/chimecho b/pokeData/chimecho index 57a7d9b..43dac09 100644 --- a/pokeData/chimecho +++ b/pokeData/chimecho @@ -19,7 +19,7 @@ speed: 65 Genus: Wind Chime Pokémon - Happiness: 70 Pokedex ID: 358 + Happiness: 70 Pokedex ID: 388 Base Exp: 159 Capture Rate: 45 Height: 6 Weight: 10 diff --git a/pokeData/chinchou b/pokeData/chinchou index d588860..a32eab4 100644 --- a/pokeData/chinchou +++ b/pokeData/chinchou @@ -16,7 +16,7 @@ speed: 67 Genus: Angler Pokémon - Happiness: 50 Pokedex ID: 170 + Happiness: 50 Pokedex ID: 201 Base Exp: 66 Capture Rate: 190 Height: 5 Weight: 120 diff --git a/pokeData/chingling b/pokeData/chingling index ebc485a..a4f108c 100644 --- a/pokeData/chingling +++ b/pokeData/chingling @@ -17,7 +17,7 @@ speed: 45 Genus: Bell Pokémon - Happiness: 70 Pokedex ID: 433 + Happiness: 70 Pokedex ID: 387 Base Exp: 57 Capture Rate: 120 Height: 2 Weight: 6 diff --git a/pokeData/cinccino b/pokeData/cinccino index 4d011b5..242c13f 100644 --- a/pokeData/cinccino +++ b/pokeData/cinccino @@ -17,7 +17,7 @@ speed: 115 Genus: Scarf Pokémon - Happiness: 50 Pokedex ID: 573 + Happiness: 50 Pokedex ID: 574 Base Exp: 165 Capture Rate: 60 Height: 5 Weight: 75 diff --git a/pokeData/cinderace b/pokeData/cinderace index ee7f52f..b5e8924 100644 --- a/pokeData/cinderace +++ b/pokeData/cinderace @@ -39,4 +39,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/clamperl b/pokeData/clamperl index 884b076..466d51f 100644 --- a/pokeData/clamperl +++ b/pokeData/clamperl @@ -11,7 +11,7 @@ Evolution Chain Clamperl ► Huntail -Stage 2 Forms: + Stage 2 Forms: huntail gorebyss @@ -24,7 +24,7 @@ Stage 2 Forms: speed: 32 Genus: Bivalve Pokémon - Happiness: 70 Pokedex ID: 366 + Happiness: 70 Pokedex ID: 396 Base Exp: 69 Capture Rate: 255 Height: 4 Weight: 525 diff --git a/pokeData/clauncher b/pokeData/clauncher index d613dbd..e9b0635 100644 --- a/pokeData/clauncher +++ b/pokeData/clauncher @@ -17,7 +17,7 @@ speed: 44 Genus: Water Gun Pokémon - Happiness: 50 Pokedex ID: 692 + Happiness: 50 Pokedex ID: 693 Base Exp: 66 Capture Rate: 225 Height: 5 Weight: 83 diff --git a/pokeData/clawitzer b/pokeData/clawitzer index cd65c0d..2422653 100644 --- a/pokeData/clawitzer +++ b/pokeData/clawitzer @@ -17,7 +17,7 @@ speed: 59 Genus: Howitzer Pokémon - Happiness: 50 Pokedex ID: 693 + Happiness: 50 Pokedex ID: 694 Base Exp: 100 Capture Rate: 55 Height: 13 Weight: 353 diff --git a/pokeData/claydol b/pokeData/claydol index 4e17a94..96b3efa 100644 --- a/pokeData/claydol +++ b/pokeData/claydol @@ -19,7 +19,7 @@ speed: 75 Genus: Clay Doll Pokémon - Happiness: 50 Pokedex ID: 344 + Happiness: 50 Pokedex ID: 372 Base Exp: 175 Capture Rate: 90 Height: 15 Weight: 1080 diff --git a/pokeData/clefable b/pokeData/clefable index bd709e7..584d4dc 100644 --- a/pokeData/clefable +++ b/pokeData/clefable @@ -17,7 +17,7 @@ speed: 60 Genus: Fairy Pokémon - Happiness: 140 Pokedex ID: 36 + Happiness: 140 Pokedex ID: 38 Base Exp: 242 Capture Rate: 25 Height: 13 Weight: 400 diff --git a/pokeData/clefairy b/pokeData/clefairy index 98b0c6b..e508104 100644 --- a/pokeData/clefairy +++ b/pokeData/clefairy @@ -17,7 +17,7 @@ speed: 35 Genus: Fairy Pokémon - Happiness: 140 Pokedex ID: 35 + Happiness: 140 Pokedex ID: 37 Base Exp: 113 Capture Rate: 150 Height: 6 Weight: 75 diff --git a/pokeData/cleffa b/pokeData/cleffa index 17b726f..a0cf3dd 100644 --- a/pokeData/cleffa +++ b/pokeData/cleffa @@ -16,7 +16,7 @@ speed: 15 Genus: Star Shape Pokémon - Happiness: 140 Pokedex ID: 173 + Happiness: 140 Pokedex ID: 36 Base Exp: 44 Capture Rate: 150 Height: 3 Weight: 30 diff --git a/pokeData/clobbopus b/pokeData/clobbopus index 4e04e8f..bbb8445 100644 --- a/pokeData/clobbopus +++ b/pokeData/clobbopus @@ -52,4 +52,4 @@ power boost for rollout. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cloyster b/pokeData/cloyster index 983d2b5..4fa2ea4 100644 --- a/pokeData/cloyster +++ b/pokeData/cloyster @@ -17,7 +17,7 @@ speed: 70 Genus: Bivalve Pokémon - Happiness: 50 Pokedex ID: 91 + Happiness: 50 Pokedex ID: 99 Base Exp: 184 Capture Rate: 60 Height: 15 Weight: 1325 diff --git a/pokeData/coalossal b/pokeData/coalossal index b993948..f27ee44 100644 --- a/pokeData/coalossal +++ b/pokeData/coalossal @@ -70,4 +70,4 @@ o wisp. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cobalion b/pokeData/cobalion index 24b2d3f..cea58be 100644 --- a/pokeData/cobalion +++ b/pokeData/cobalion @@ -16,7 +16,7 @@ speed: 108 Genus: Iron Will Pokémon - Happiness: 35 Pokedex ID: 638 + Happiness: 35 Pokedex ID: 639 Base Exp: 290 Capture Rate: 3 Height: 21 Weight: 2500 @@ -36,4 +36,4 @@ any way. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cofagrigus b/pokeData/cofagrigus index 80538c8..bcb3147 100644 --- a/pokeData/cofagrigus +++ b/pokeData/cofagrigus @@ -8,7 +8,7 @@ Evolution Chain Yamask ► Cofagrigus -Stage 2 Forms: + Stage 2 Forms: cofagrigus runerigus @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 30 Genus: Coffin Pokémon - Happiness: 50 Pokedex ID: 563 + Happiness: 50 Pokedex ID: 564 Base Exp: 169 Capture Rate: 90 Height: 17 Weight: 765 diff --git a/pokeData/combee b/pokeData/combee index cd30662..4e6168f 100644 --- a/pokeData/combee +++ b/pokeData/combee @@ -16,7 +16,7 @@ speed: 70 Genus: Tiny Bee Pokémon - Happiness: 50 Pokedex ID: 415 + Happiness: 50 Pokedex ID: 443 Base Exp: 49 Capture Rate: 120 Height: 3 Weight: 55 diff --git a/pokeData/combusken b/pokeData/combusken index 89832c6..7ec6f57 100644 --- a/pokeData/combusken +++ b/pokeData/combusken @@ -19,7 +19,7 @@ speed: 55 Genus: Young Fowl Pokémon - Happiness: 50 Pokedex ID: 256 + Happiness: 50 Pokedex ID: 281 Base Exp: 142 Capture Rate: 45 Height: 9 Weight: 195 @@ -42,4 +42,4 @@ one stage after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/comfey b/pokeData/comfey index 6b1cc1b..e182a16 100644 --- a/pokeData/comfey +++ b/pokeData/comfey @@ -49,4 +49,4 @@ losing the temporary ability. - Location Areas: + Location Areas Unknown diff --git a/pokeData/conkeldurr b/pokeData/conkeldurr index 5dc8275..b24eb76 100644 --- a/pokeData/conkeldurr +++ b/pokeData/conkeldurr @@ -16,7 +16,7 @@ speed: 45 Genus: Muscular Pokémon - Happiness: 50 Pokedex ID: 534 + Happiness: 50 Pokedex ID: 535 Base Exp: 253 Capture Rate: 45 Height: 14 Weight: 870 @@ -68,4 +68,4 @@ attack". - Location Areas: + Location Areas Unknown diff --git a/pokeData/copperajah b/pokeData/copperajah index 429994d..87c827a 100644 --- a/pokeData/copperajah +++ b/pokeData/copperajah @@ -52,4 +52,4 @@ usual weight for its species. - Location Areas: + Location Areas Unknown diff --git a/pokeData/corphish b/pokeData/corphish index 25af828..cc4a2e1 100644 --- a/pokeData/corphish +++ b/pokeData/corphish @@ -17,7 +17,7 @@ speed: 35 Genus: Ruffian Pokémon - Happiness: 50 Pokedex ID: 341 + Happiness: 50 Pokedex ID: 369 Base Exp: 62 Capture Rate: 205 Height: 6 Weight: 115 diff --git a/pokeData/corsola b/pokeData/corsola index 41fe1dd..f93e5cd 100644 --- a/pokeData/corsola +++ b/pokeData/corsola @@ -17,7 +17,7 @@ speed: 35 Genus: Coral Pokémon - Happiness: 50 Pokedex ID: 222 + Happiness: 50 Pokedex ID: 254 Base Exp: 144 Capture Rate: 60 Height: 6 Weight: 50 diff --git a/pokeData/corviknight b/pokeData/corviknight index b0a5d15..e1a5030 100644 --- a/pokeData/corviknight +++ b/pokeData/corviknight @@ -6,7 +6,8 @@ The black luster of its steel body could drive terror into the heart of any foe. - Single Stage Evolution Pokémon + Evolution Chain + Rookidee ► Corvisquire ► Corviknight ↞--------| STATS |--------↠ hp: 98 @@ -73,4 +74,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/corvisquire b/pokeData/corvisquire index a9408be..88f655b 100644 --- a/pokeData/corvisquire +++ b/pokeData/corvisquire @@ -61,12 +61,7 @@ Big-pecks: - This Pokémon's Defense cannot - be lowered by other Pokémon. - - This Pokémon can still be passed - negative Defense modifiers through - heart swap or guard swap. + - Location Areas: + Location Areas Unknown diff --git a/pokeData/cosmoem b/pokeData/cosmoem index 070da71..f69462a 100644 --- a/pokeData/cosmoem +++ b/pokeData/cosmoem @@ -9,7 +9,7 @@ Evolution Chain Cosmog ► Cosmoem ► Solgaleo -Stage 3 Forms: + Stage 3 Forms: solgaleo lunala @@ -48,4 +48,4 @@ Stage 3 Forms: not be consumed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cosmog b/pokeData/cosmog index 9bbeeb1..eeedfac 100644 --- a/pokeData/cosmog +++ b/pokeData/cosmog @@ -7,7 +7,7 @@ Evolution Chain Cosmog ► Cosmoem ► Solgaleo -Stage 3 Forms: + Stage 3 Forms: solgaleo lunala @@ -46,4 +46,4 @@ Stage 3 Forms: modifiers affect damage as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cottonee b/pokeData/cottonee index 97db076..cf1fddc 100644 --- a/pokeData/cottonee +++ b/pokeData/cottonee @@ -17,7 +17,7 @@ speed: 66 Genus: Cotton Puff Pokémon - Happiness: 50 Pokedex ID: 546 + Happiness: 50 Pokedex ID: 547 Base Exp: 56 Capture Rate: 190 Height: 3 Weight: 6 diff --git a/pokeData/crabominable b/pokeData/crabominable index d6736d6..e673a85 100644 --- a/pokeData/crabominable +++ b/pokeData/crabominable @@ -63,4 +63,4 @@ received by a substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/crabrawler b/pokeData/crabrawler index 8d36e4f..856cf21 100644 --- a/pokeData/crabrawler +++ b/pokeData/crabrawler @@ -62,4 +62,4 @@ received by a substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cradily b/pokeData/cradily index d4b57a4..532fd87 100644 --- a/pokeData/cradily +++ b/pokeData/cradily @@ -19,7 +19,7 @@ speed: 43 Genus: Barnacle Pokémon - Happiness: 50 Pokedex ID: 346 + Happiness: 50 Pokedex ID: 374 Base Exp: 173 Capture Rate: 45 Height: 15 Weight: 604 @@ -67,4 +67,4 @@ ability. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cramorant b/pokeData/cramorant index 1106079..0bc4e06 100644 --- a/pokeData/cramorant +++ b/pokeData/cramorant @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/cranidos b/pokeData/cranidos index 8b56611..f3733ab 100644 --- a/pokeData/cranidos +++ b/pokeData/cranidos @@ -16,7 +16,7 @@ speed: 58 Genus: Head Butt Pokémon - Happiness: 70 Pokedex ID: 408 + Happiness: 70 Pokedex ID: 436 Base Exp: 70 Capture Rate: 45 Height: 9 Weight: 315 @@ -104,4 +104,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/crawdaunt b/pokeData/crawdaunt index 88efc7d..569a763 100644 --- a/pokeData/crawdaunt +++ b/pokeData/crawdaunt @@ -20,7 +20,7 @@ speed: 55 Genus: Rogue Pokémon - Happiness: 50 Pokedex ID: 342 + Happiness: 50 Pokedex ID: 370 Base Exp: 164 Capture Rate: 155 Height: 11 Weight: 328 diff --git a/pokeData/cresselia b/pokeData/cresselia index 86d656e..5da6d82 100644 --- a/pokeData/cresselia +++ b/pokeData/cresselia @@ -16,7 +16,7 @@ speed: 85 Genus: Lunar Pokémon - Happiness: 100 Pokedex ID: 488 + Happiness: 100 Pokedex ID: 489 Base Exp: 300 Capture Rate: 3 Height: 15 Weight: 856 diff --git a/pokeData/croagunk b/pokeData/croagunk index 89e1af8..814218a 100644 --- a/pokeData/croagunk +++ b/pokeData/croagunk @@ -17,7 +17,7 @@ speed: 50 Genus: Toxic Mouth Pokémon - Happiness: 100 Pokedex ID: 453 + Happiness: 100 Pokedex ID: 473 Base Exp: 60 Capture Rate: 140 Height: 7 Weight: 230 diff --git a/pokeData/crobat b/pokeData/crobat index b7cb56e..1275cd7 100644 --- a/pokeData/crobat +++ b/pokeData/crobat @@ -17,7 +17,7 @@ speed: 130 Genus: Bat Pokémon - Happiness: 50 Pokedex ID: 169 + Happiness: 50 Pokedex ID: 46 Base Exp: 268 Capture Rate: 90 Height: 18 Weight: 750 diff --git a/pokeData/croconaw b/pokeData/croconaw index c46333d..40bcbe1 100644 --- a/pokeData/croconaw +++ b/pokeData/croconaw @@ -17,7 +17,7 @@ speed: 58 Genus: Big Jaw Pokémon - Happiness: 70 Pokedex ID: 159 + Happiness: 70 Pokedex ID: 191 Base Exp: 142 Capture Rate: 45 Height: 11 Weight: 250 @@ -54,4 +54,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/crustle b/pokeData/crustle index 35eacf0..60b523f 100644 --- a/pokeData/crustle +++ b/pokeData/crustle @@ -17,7 +17,7 @@ speed: 45 Genus: Stone Home Pokémon - Happiness: 50 Pokedex ID: 558 + Happiness: 50 Pokedex ID: 559 Base Exp: 170 Capture Rate: 75 Height: 14 Weight: 2000 diff --git a/pokeData/cryogonal b/pokeData/cryogonal index 8bb5742..87e38b7 100644 --- a/pokeData/cryogonal +++ b/pokeData/cryogonal @@ -16,7 +16,7 @@ speed: 105 Genus: Crystallizing Pokémon - Happiness: 50 Pokedex ID: 615 + Happiness: 50 Pokedex ID: 616 Base Exp: 180 Capture Rate: 25 Height: 11 Weight: 1480 diff --git a/pokeData/cubchoo b/pokeData/cubchoo index 5327021..3fbc4f0 100644 --- a/pokeData/cubchoo +++ b/pokeData/cubchoo @@ -17,7 +17,7 @@ speed: 40 Genus: Chill Pokémon - Happiness: 50 Pokedex ID: 613 + Happiness: 50 Pokedex ID: 614 Base Exp: 61 Capture Rate: 120 Height: 5 Weight: 85 diff --git a/pokeData/cubone b/pokeData/cubone index fe923af..6ad4256 100644 --- a/pokeData/cubone +++ b/pokeData/cubone @@ -5,7 +5,8 @@ skull helmet, no one has ever seen Cubone's real face. - Single Stage Evolution Pokémon + Evolution Chain + Cubone ► Marowak ↞--------| STATS |--------↠ hp: 50 @@ -16,7 +17,7 @@ speed: 35 Genus: Lonely Pokémon - Happiness: 50 Pokedex ID: 104 + Happiness: 50 Pokedex ID: 113 Base Exp: 64 Capture Rate: 190 Height: 4 Weight: 65 diff --git a/pokeData/cufant b/pokeData/cufant index 500da61..aade2a7 100644 --- a/pokeData/cufant +++ b/pokeData/cufant @@ -53,4 +53,4 @@ usual weight for its species. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cursola b/pokeData/cursola index eaef367..4d29955 100644 --- a/pokeData/cursola +++ b/pokeData/cursola @@ -42,4 +42,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/cutiefly b/pokeData/cutiefly index b793375..2e29c30 100644 --- a/pokeData/cutiefly +++ b/pokeData/cutiefly @@ -68,4 +68,4 @@ sleeping. - Location Areas: + Location Areas Unknown diff --git a/pokeData/cyndaquil b/pokeData/cyndaquil index 6b73dda..06b96f4 100644 --- a/pokeData/cyndaquil +++ b/pokeData/cyndaquil @@ -16,7 +16,7 @@ speed: 65 Genus: Fire Mouse Pokémon - Happiness: 70 Pokedex ID: 155 + Happiness: 70 Pokedex ID: 187 Base Exp: 62 Capture Rate: 45 Height: 5 Weight: 79 diff --git a/pokeData/darkrai b/pokeData/darkrai index 207f9aa..30285bf 100644 --- a/pokeData/darkrai +++ b/pokeData/darkrai @@ -16,7 +16,7 @@ speed: 125 Genus: Pitch-Black Pokémon - Happiness: 0 Pokedex ID: 491 + Happiness: 0 Pokedex ID: 492 Base Exp: 270 Capture Rate: 3 Height: 15 Weight: 505 diff --git a/pokeData/darmanitan b/pokeData/darmanitan index dce3c6e..2b5492e 100644 --- a/pokeData/darmanitan +++ b/pokeData/darmanitan @@ -1,5 +1,5 @@ - Type Pokémon + Maractus Grass Type Pokémon Its internal fire burns at 2,500° F, making enough power that it @@ -9,15 +9,63 @@ Darumaka ► Darmanitan ↞--------| STATS |--------↠ + hp: 75 + attack: 86 + defense: 67 + special-attack: 106 + special-defense: 67 + speed: 60 Genus: Blazing Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 60 - Height: Weight: + Happiness: 50 Pokedex ID: 556 + Base Exp: 161 Capture Rate: 60 + Height: 10 Weight: 280 Types: + Grass ↞---------------|ABILITIES|---------------↠ + Water-absorb: - Location Areas: + Whenever a water-type move + hits this Pokémon, it heals for + 1/4 of its maximum HP, negating + any other effect on it. + + Water moves will ignore this + Pokémon's substitute. + + Chlorophyll: + + This Pokémon's Speed is doubled + during strong sunlight. + + This bonus does not count as + a stat modifier. + + Storm-drain: + + All other Pokémon's single-target + water-type moves are redirected + to this Pokémon, if it is an + eligible target. Other Pokémon's + Water moves raise this Pokémon's + Special Attack one stage, negating + any other effect on it, and cannot + miss it. + + If the move's intended target + also has this ability, the move + is not redirected. When multiple + Pokémon with this ability are + possible targets for redirection, + the move is redirected to the + one with the highest Speed stat, + or, in the case of a tie, to + a random tied Pokémon. follow + me takes precedence over this + ability. + + + Location Areas Unknown diff --git a/pokeData/dartrix b/pokeData/dartrix index dfe3187..a4bb27a 100644 --- a/pokeData/dartrix +++ b/pokeData/dartrix @@ -41,4 +41,4 @@ will not make contact. - Location Areas: + Location Areas Unknown diff --git a/pokeData/darumaka b/pokeData/darumaka index 61fafce..da59825 100644 --- a/pokeData/darumaka +++ b/pokeData/darumaka @@ -17,7 +17,7 @@ speed: 50 Genus: Zen Charm Pokémon - Happiness: 50 Pokedex ID: 554 + Happiness: 50 Pokedex ID: 555 Base Exp: 63 Capture Rate: 120 Height: 6 Weight: 375 diff --git a/pokeData/decidueye b/pokeData/decidueye index ee5905f..cc219ac 100644 --- a/pokeData/decidueye +++ b/pokeData/decidueye @@ -40,4 +40,4 @@ will not make contact. - Location Areas: + Location Areas Unknown diff --git a/pokeData/deerling b/pokeData/deerling index 4904c5a..f00fa66 100644 --- a/pokeData/deerling +++ b/pokeData/deerling @@ -17,7 +17,7 @@ speed: 75 Genus: Season Pokémon - Happiness: 70 Pokedex ID: 585 + Happiness: 70 Pokedex ID: 586 Base Exp: 67 Capture Rate: 190 Height: 6 Weight: 195 diff --git a/pokeData/deino b/pokeData/deino index 1555bd2..79eacb5 100644 --- a/pokeData/deino +++ b/pokeData/deino @@ -17,7 +17,7 @@ speed: 38 Genus: Irate Pokémon - Happiness: 35 Pokedex ID: 633 + Happiness: 35 Pokedex ID: 634 Base Exp: 60 Capture Rate: 45 Height: 8 Weight: 173 diff --git a/pokeData/delcatty b/pokeData/delcatty index a110aa3..ae245a3 100644 --- a/pokeData/delcatty +++ b/pokeData/delcatty @@ -20,7 +20,7 @@ speed: 90 Genus: Prim Pokémon - Happiness: 70 Pokedex ID: 301 + Happiness: 70 Pokedex ID: 327 Base Exp: 140 Capture Rate: 60 Height: 11 Weight: 326 diff --git a/pokeData/delibird b/pokeData/delibird index 2e19dff..939f77e 100644 --- a/pokeData/delibird +++ b/pokeData/delibird @@ -16,7 +16,7 @@ speed: 75 Genus: Delivery Pokémon - Happiness: 50 Pokedex ID: 225 + Happiness: 50 Pokedex ID: 257 Base Exp: 116 Capture Rate: 45 Height: 9 Weight: 160 diff --git a/pokeData/delphox b/pokeData/delphox index 91624d1..b7298c2 100644 --- a/pokeData/delphox +++ b/pokeData/delphox @@ -17,7 +17,7 @@ speed: 104 Genus: Fox Pokémon - Happiness: 70 Pokedex ID: 655 + Happiness: 70 Pokedex ID: 656 Base Exp: 240 Capture Rate: 45 Height: 15 Weight: 390 @@ -41,4 +41,4 @@ move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/deoxys b/pokeData/deoxys index d25a47a..7234452 100644 --- a/pokeData/deoxys +++ b/pokeData/deoxys @@ -1,24 +1,73 @@ - Type Pokémon + Vespiquen Bug Type Pokémon The DNA of a space virus underwent a sudden mutation upon exposure to a laser beam and resulted in DEOXYS. The crystalline organ - on ’s chest appears + on Vespiquen’s chest appears to be its brain. Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 70 + attack: 80 + defense: 102 + special-attack: 80 + special-defense: 102 + speed: 40 Genus: DNA Pokémon - Happiness: 0 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 0 Pokedex ID: 416 + Base Exp: 166 Capture Rate: 3 + Height: 12 Weight: 385 Types: + Bug + Flying ↞---------------|ABILITIES|---------------↠ + Pressure: - Location Areas: + Moves targetting this Pokémon + use one extra PP. + + This ability stacks if multiple + targets have it. This ability + still affects moves that fail + or miss. This ability does not + affect ally moves that target + either the entire field or just + its side, nor this Pokémon's + self-targetted moves; it does, + however, affect single-targetted + ally moves aimed at this Pokémon, + ally moves that target all other + Pokémon, and opponents' moves + that target the entire field. + If this ability raises a move's + PP cost above its remaining PP, + it will use all remaining PP. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + Overworld: If the lead Pokémon + has this ability, higher-levelled + Pokémon have their encounter + rate increased. + + Unnerve: + + Opposing Pokémon cannot eat + held Berries while this Pokémon + is in battle. + + Affected Pokémon can still + use bug bite or pluck to eat + a target's Berry. + + + Location Areas Unknown diff --git a/pokeData/dewgong b/pokeData/dewgong index 84fb2c7..3768c39 100644 --- a/pokeData/dewgong +++ b/pokeData/dewgong @@ -17,7 +17,7 @@ speed: 70 Genus: Sea Lion Pokémon - Happiness: 70 Pokedex ID: 87 + Happiness: 70 Pokedex ID: 95 Base Exp: 166 Capture Rate: 75 Height: 17 Weight: 1200 diff --git a/pokeData/dewott b/pokeData/dewott index bdaf9d1..fe7cb12 100644 --- a/pokeData/dewott +++ b/pokeData/dewott @@ -16,7 +16,7 @@ speed: 60 Genus: Discipline Pokémon - Happiness: 70 Pokedex ID: 502 + Happiness: 70 Pokedex ID: 503 Base Exp: 145 Capture Rate: 45 Height: 8 Weight: 245 @@ -41,4 +41,4 @@ to battle armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dewpider b/pokeData/dewpider index 0d01d87..f89a959 100644 --- a/pokeData/dewpider +++ b/pokeData/dewpider @@ -48,4 +48,4 @@ Pokémon's substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dhelmise b/pokeData/dhelmise index c4837f0..2106b77 100644 --- a/pokeData/dhelmise +++ b/pokeData/dhelmise @@ -33,4 +33,4 @@ have 1.5× power. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dialga b/pokeData/dialga index 08f2eb1..cfea9ea 100644 --- a/pokeData/dialga +++ b/pokeData/dialga @@ -15,7 +15,7 @@ speed: 90 Genus: Temporal Pokémon - Happiness: 0 Pokedex ID: 483 + Happiness: 0 Pokedex ID: 484 Base Exp: 340 Capture Rate: 3 Height: 54 Weight: 6830 diff --git a/pokeData/diancie b/pokeData/diancie index a849990..a04d93d 100644 --- a/pokeData/diancie +++ b/pokeData/diancie @@ -43,4 +43,4 @@ to white smoke in battle. - Location Areas: + Location Areas Unknown diff --git a/pokeData/diggersby b/pokeData/diggersby index 20d6304..5ecea27 100644 --- a/pokeData/diggersby +++ b/pokeData/diggersby @@ -18,7 +18,7 @@ speed: 78 Genus: Digging Pokémon - Happiness: 50 Pokedex ID: 660 + Happiness: 50 Pokedex ID: 661 Base Exp: 148 Capture Rate: 127 Height: 10 Weight: 424 diff --git a/pokeData/diglett b/pokeData/diglett index bd1a431..71a6d7a 100644 --- a/pokeData/diglett +++ b/pokeData/diglett @@ -17,7 +17,7 @@ speed: 95 Genus: Mole Pokémon - Happiness: 50 Pokedex ID: 50 + Happiness: 50 Pokedex ID: 55 Base Exp: 53 Capture Rate: 255 Height: 2 Weight: 8 diff --git a/pokeData/ditto b/pokeData/ditto index f201e40..5356453 100644 --- a/pokeData/ditto +++ b/pokeData/ditto @@ -16,7 +16,7 @@ speed: 48 Genus: Transform Pokémon - Happiness: 50 Pokedex ID: 132 + Happiness: 50 Pokedex ID: 156 Base Exp: 101 Capture Rate: 35 Height: 3 Weight: 40 diff --git a/pokeData/dodrio b/pokeData/dodrio index b0e1544..44b7f8e 100644 --- a/pokeData/dodrio +++ b/pokeData/dodrio @@ -17,7 +17,7 @@ speed: 110 Genus: Triple Bird Pokémon - Happiness: 70 Pokedex ID: 85 + Happiness: 70 Pokedex ID: 93 Base Exp: 165 Capture Rate: 45 Height: 18 Weight: 852 diff --git a/pokeData/doduo b/pokeData/doduo index e617e8b..8c77984 100644 --- a/pokeData/doduo +++ b/pokeData/doduo @@ -5,7 +5,8 @@ poor flying with its fast foot speed. Leaves giant footprints. - Single Stage Evolution Pokémon + Evolution Chain + Doduo ► Dodrio ↞--------| STATS |--------↠ hp: 35 @@ -16,7 +17,7 @@ speed: 75 Genus: Twin Bird Pokémon - Happiness: 70 Pokedex ID: 84 + Happiness: 70 Pokedex ID: 92 Base Exp: 62 Capture Rate: 190 Height: 14 Weight: 392 diff --git a/pokeData/donphan b/pokeData/donphan index 6d498cf..a9adb61 100644 --- a/pokeData/donphan +++ b/pokeData/donphan @@ -1,8 +1,12 @@ Donphan Ground Type Pokémon - - Single Stage Evolution Pokémon + It has sharp, hard tusks and + a rugged hide. Its TACKLE is + strong enough to knock down a + house. + Evolution Chain + Phanpy ► Donphan ↞--------| STATS |--------↠ hp: 90 @@ -12,9 +16,9 @@ special-defense: 60 speed: 50 - Genus: - Happiness: Pokedex ID: 232 - Base Exp: 175 Capture Rate: + Genus: Armor Pokémon + Happiness: 70 Pokedex ID: 264 + Base Exp: 175 Capture Rate: 60 Height: 11 Weight: 1200 Types: diff --git a/pokeData/dottler b/pokeData/dottler index f211460..f385495 100644 --- a/pokeData/dottler +++ b/pokeData/dottler @@ -63,4 +63,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/doublade b/pokeData/doublade index 66dd8e5..49f6caa 100644 --- a/pokeData/doublade +++ b/pokeData/doublade @@ -18,7 +18,7 @@ speed: 35 Genus: Sword Pokémon - Happiness: 50 Pokedex ID: 680 + Happiness: 50 Pokedex ID: 681 Base Exp: 157 Capture Rate: 90 Height: 8 Weight: 45 @@ -43,4 +43,4 @@ rate is doubled. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dracovish b/pokeData/dracovish index 679092d..666c830 100644 --- a/pokeData/dracovish +++ b/pokeData/dracovish @@ -50,4 +50,4 @@ of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dracozolt b/pokeData/dracozolt index f7696ea..e0462f1 100644 --- a/pokeData/dracozolt +++ b/pokeData/dracozolt @@ -67,4 +67,4 @@ of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dragalge b/pokeData/dragalge index be754c2..a04cf14 100644 --- a/pokeData/dragalge +++ b/pokeData/dragalge @@ -18,7 +18,7 @@ speed: 44 Genus: Mock Kelp Pokémon - Happiness: 50 Pokedex ID: 691 + Happiness: 50 Pokedex ID: 692 Base Exp: 173 Capture Rate: 55 Height: 18 Weight: 815 diff --git a/pokeData/dragapult b/pokeData/dragapult index 1d5cc23..065e734 100644 --- a/pokeData/dragapult +++ b/pokeData/dragapult @@ -56,4 +56,4 @@ afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dragonair b/pokeData/dragonair index b4befb0..187699e 100644 --- a/pokeData/dragonair +++ b/pokeData/dragonair @@ -17,7 +17,7 @@ speed: 70 Genus: Dragon Pokémon - Happiness: 35 Pokedex ID: 148 + Happiness: 35 Pokedex ID: 180 Base Exp: 147 Capture Rate: 45 Height: 40 Weight: 165 diff --git a/pokeData/dragonite b/pokeData/dragonite index 186e19d..1716128 100644 --- a/pokeData/dragonite +++ b/pokeData/dragonite @@ -17,7 +17,7 @@ speed: 80 Genus: Dragon Pokémon - Happiness: 35 Pokedex ID: 149 + Happiness: 35 Pokedex ID: 181 Base Exp: 300 Capture Rate: 45 Height: 22 Weight: 2100 diff --git a/pokeData/drakloak b/pokeData/drakloak index aee7135..087b0ff 100644 --- a/pokeData/drakloak +++ b/pokeData/drakloak @@ -55,4 +55,4 @@ afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/drampa b/pokeData/drampa index 63f0e55..e7327d7 100644 --- a/pokeData/drampa +++ b/pokeData/drampa @@ -51,4 +51,4 @@ to air lock. - Location Areas: + Location Areas Unknown diff --git a/pokeData/drapion b/pokeData/drapion index 354168b..840d229 100644 --- a/pokeData/drapion +++ b/pokeData/drapion @@ -17,7 +17,7 @@ speed: 95 Genus: Ogre Scorpion Pokémon - Happiness: 50 Pokedex ID: 452 + Happiness: 50 Pokedex ID: 472 Base Exp: 175 Capture Rate: 45 Height: 13 Weight: 615 diff --git a/pokeData/dratini b/pokeData/dratini index d1609e3..73e1fd8 100644 --- a/pokeData/dratini +++ b/pokeData/dratini @@ -17,7 +17,7 @@ speed: 50 Genus: Dragon Pokémon - Happiness: 35 Pokedex ID: 147 + Happiness: 35 Pokedex ID: 179 Base Exp: 60 Capture Rate: 45 Height: 18 Weight: 33 diff --git a/pokeData/drednaw b/pokeData/drednaw index 1ec1604..8dee4d4 100644 --- a/pokeData/drednaw +++ b/pokeData/drednaw @@ -49,4 +49,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/dreepy b/pokeData/dreepy index 786f358..92b1a9c 100644 --- a/pokeData/dreepy +++ b/pokeData/dreepy @@ -56,4 +56,4 @@ afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/drifblim b/pokeData/drifblim index 6f6aeb4..e64437b 100644 --- a/pokeData/drifblim +++ b/pokeData/drifblim @@ -17,7 +17,7 @@ speed: 80 Genus: Blimp Pokémon - Happiness: 50 Pokedex ID: 426 + Happiness: 50 Pokedex ID: 453 Base Exp: 174 Capture Rate: 60 Height: 12 Weight: 150 diff --git a/pokeData/drifloon b/pokeData/drifloon index bf32c89..a2564c6 100644 --- a/pokeData/drifloon +++ b/pokeData/drifloon @@ -16,7 +16,7 @@ speed: 70 Genus: Balloon Pokémon - Happiness: 50 Pokedex ID: 425 + Happiness: 50 Pokedex ID: 452 Base Exp: 70 Capture Rate: 125 Height: 4 Weight: 12 diff --git a/pokeData/drilbur b/pokeData/drilbur index ea8e3b6..e685877 100644 --- a/pokeData/drilbur +++ b/pokeData/drilbur @@ -1,5 +1,5 @@ - Type Pokémon + Drilbur Ground Type Pokémon It can dig through the ground at a speed of 30 mph. It could @@ -9,16 +9,96 @@ Drilbur ► Excadrill ↞--------| STATS |--------↠ + hp: 60 + attack: 85 + defense: 40 + special-attack: 30 + special-defense: 45 + speed: 68 Genus: Mole Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 120 - Height: Weight: + Happiness: 50 Pokedex ID: 530 + Base Exp: 66 Capture Rate: 120 + Height: 3 Weight: 85 Types: + Ground ↞---------------|ABILITIES|---------------↠ + Sand-rush: + + This Pokémon's Speed is doubled + during a sandstorm, and it does + not take sandstorm damage, regardless + of type. + + Sand-force: + + During a sandstorm, this Pokémon's + rock-, ground-, and steel-type + moves have 1.3× their base power. + This Pokémon does not take sandstorm + damage, regardless of type. + + Mold-breaker: + + This Pokémon's moves completely + ignore abilities that could hinder + or prevent their effect on the + target. + + For example, this Pokémon's + moves ignore abilities that would + fully negate them, such as water + absorb; abilities that would + prevent any of their effects, + such as clear body, shell armor, + or sticky hold; and abilities + that grant any general protective + benefit, such as simple, snow + cloak, or thick fat. If an ability + could either hinder or help this + Pokémon's moves, e.g. dry skin + or unaware, the ability is ignored + either way. + + Abilities that do not fit this + description, even if they could + hinder moves in some other way, + are not affected. For example, + cursed body only affects potential + future uses of the move, while + liquid ooze and shadow tag can + only hinder a move's effect on + the user. This ablity cannot + ignore type or form changes granted + by abilities, for example color + change or forecast; nor effects + that were caused by abilities + but are no longer tied to an + ability, such as the rain from + drizzle. This ability cannot + ignore multitype at all. + + An ability ignored by this + ability is only nullified while + the move is being used. For example, + this Pokémon's moves can paralyze + a Pokémon with limber, but Limber + will activate and heal the paralysis + immediately thereafter, and this + Pokémon's spikes are not affected + by this ability after they have + been placed. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + This ability functions identically + to teravolt and turboblaze. + Location Areas: Chargestone cave 1f diff --git a/pokeData/drizzile b/pokeData/drizzile index d4d962e..82e267d 100644 --- a/pokeData/drizzile +++ b/pokeData/drizzile @@ -40,4 +40,4 @@ than the usual double damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/drowzee b/pokeData/drowzee index 1779f0b..831d82d 100644 --- a/pokeData/drowzee +++ b/pokeData/drowzee @@ -17,7 +17,7 @@ speed: 42 Genus: Hypnosis Pokémon - Happiness: 70 Pokedex ID: 96 + Happiness: 70 Pokedex ID: 105 Base Exp: 66 Capture Rate: 190 Height: 10 Weight: 324 @@ -74,7 +74,7 @@ Inner-focus: - This Pokémon cannot flinch. + Location Areas: diff --git a/pokeData/druddigon b/pokeData/druddigon index a7168c3..da553ec 100644 --- a/pokeData/druddigon +++ b/pokeData/druddigon @@ -16,7 +16,7 @@ speed: 48 Genus: Cave Pokémon - Happiness: 50 Pokedex ID: 621 + Happiness: 50 Pokedex ID: 622 Base Exp: 170 Capture Rate: 45 Height: 16 Weight: 1390 diff --git a/pokeData/dubwool b/pokeData/dubwool index 5b43e29..7054aa3 100644 --- a/pokeData/dubwool +++ b/pokeData/dubwool @@ -44,4 +44,4 @@ and bomb-based moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ducklett b/pokeData/ducklett index 30e437c..da92a72 100644 --- a/pokeData/ducklett +++ b/pokeData/ducklett @@ -17,7 +17,7 @@ speed: 55 Genus: Water Bird Pokémon - Happiness: 70 Pokedex ID: 580 + Happiness: 70 Pokedex ID: 581 Base Exp: 61 Capture Rate: 190 Height: 5 Weight: 55 diff --git a/pokeData/dugtrio b/pokeData/dugtrio index 0aa832f..ab7f5b3 100644 --- a/pokeData/dugtrio +++ b/pokeData/dugtrio @@ -17,7 +17,7 @@ speed: 120 Genus: Mole Pokémon - Happiness: 50 Pokedex ID: 51 + Happiness: 50 Pokedex ID: 56 Base Exp: 149 Capture Rate: 50 Height: 7 Weight: 333 diff --git a/pokeData/dunsparce b/pokeData/dunsparce index a1f26dd..5d9bb7c 100644 --- a/pokeData/dunsparce +++ b/pokeData/dunsparce @@ -17,7 +17,7 @@ speed: 45 Genus: Land Snake Pokémon - Happiness: 50 Pokedex ID: 206 + Happiness: 50 Pokedex ID: 237 Base Exp: 145 Capture Rate: 190 Height: 15 Weight: 140 diff --git a/pokeData/duosion b/pokeData/duosion index a70ed1b..114d5c9 100644 --- a/pokeData/duosion +++ b/pokeData/duosion @@ -17,7 +17,7 @@ speed: 30 Genus: Mitosis Pokémon - Happiness: 50 Pokedex ID: 578 + Happiness: 50 Pokedex ID: 579 Base Exp: 130 Capture Rate: 100 Height: 6 Weight: 80 diff --git a/pokeData/duraludon b/pokeData/duraludon index 2330eba..218a660 100644 --- a/pokeData/duraludon +++ b/pokeData/duraludon @@ -1,7 +1,10 @@ Duraludon Steel Type Pokémon - + Its body resembles polished + metal, and it’s both lightweight + and strong. The only drawback + is that it rusts easily. Single Stage Evolution Pokémon ↞--------| STATS |--------↠ @@ -12,9 +15,9 @@ special-defense: 50 speed: 85 - Genus: - Happiness: Pokedex ID: 884 - Base Exp: 187 Capture Rate: + Genus: Alloy Pokémon + Happiness: 50 Pokedex ID: 884 + Base Exp: 187 Capture Rate: 45 Height: 18 Weight: 400 Types: @@ -38,4 +41,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/durant b/pokeData/durant index 8b90a95..0a6585f 100644 --- a/pokeData/durant +++ b/pokeData/durant @@ -16,7 +16,7 @@ speed: 109 Genus: Iron Ant Pokémon - Happiness: 50 Pokedex ID: 632 + Happiness: 50 Pokedex ID: 633 Base Exp: 169 Capture Rate: 90 Height: 3 Weight: 330 diff --git a/pokeData/dusclops b/pokeData/dusclops index 0172513..8ae8935 100644 --- a/pokeData/dusclops +++ b/pokeData/dusclops @@ -20,7 +20,7 @@ speed: 25 Genus: Beckon Pokémon - Happiness: 35 Pokedex ID: 356 + Happiness: 35 Pokedex ID: 384 Base Exp: 159 Capture Rate: 90 Height: 16 Weight: 306 diff --git a/pokeData/dusknoir b/pokeData/dusknoir index 9053a6e..3afb7c2 100644 --- a/pokeData/dusknoir +++ b/pokeData/dusknoir @@ -17,7 +17,7 @@ speed: 45 Genus: Gripper Pokémon - Happiness: 35 Pokedex ID: 477 + Happiness: 35 Pokedex ID: 385 Base Exp: 263 Capture Rate: 45 Height: 22 Weight: 1066 @@ -71,4 +71,4 @@ at random. - Location Areas: + Location Areas Unknown diff --git a/pokeData/duskull b/pokeData/duskull index 40c01ed..c01c3ac 100644 --- a/pokeData/duskull +++ b/pokeData/duskull @@ -19,7 +19,7 @@ speed: 25 Genus: Requiem Pokémon - Happiness: 35 Pokedex ID: 355 + Happiness: 35 Pokedex ID: 383 Base Exp: 59 Capture Rate: 190 Height: 8 Weight: 150 diff --git a/pokeData/dustox b/pokeData/dustox index 7bb90c8..0c0f426 100644 --- a/pokeData/dustox +++ b/pokeData/dustox @@ -10,11 +10,11 @@ Evolution Chain Wurmple ► Silcoon ► Beautifly -Stage 2 Forms: + Stage 2 Forms: silcoon cascoon -Stage 3 Forms: + Stage 3 Forms: beautifly dustox @@ -27,7 +27,7 @@ Stage 3 Forms: speed: 65 Genus: Poison Moth Pokémon - Happiness: 70 Pokedex ID: 269 + Happiness: 70 Pokedex ID: 294 Base Exp: 173 Capture Rate: 45 Height: 12 Weight: 316 diff --git a/pokeData/dwebble b/pokeData/dwebble index 281f33c..a933d53 100644 --- a/pokeData/dwebble +++ b/pokeData/dwebble @@ -16,7 +16,7 @@ speed: 55 Genus: Rock Inn Pokémon - Happiness: 50 Pokedex ID: 557 + Happiness: 50 Pokedex ID: 558 Base Exp: 65 Capture Rate: 190 Height: 3 Weight: 145 diff --git a/pokeData/eelektrik b/pokeData/eelektrik index 19a84c2..837e421 100644 --- a/pokeData/eelektrik +++ b/pokeData/eelektrik @@ -17,7 +17,7 @@ speed: 40 Genus: EleFish Pokémon - Happiness: 70 Pokedex ID: 603 + Happiness: 70 Pokedex ID: 604 Base Exp: 142 Capture Rate: 60 Height: 12 Weight: 220 diff --git a/pokeData/eelektross b/pokeData/eelektross index 57130ec..88fc057 100644 --- a/pokeData/eelektross +++ b/pokeData/eelektross @@ -17,7 +17,7 @@ speed: 50 Genus: EleFish Pokémon - Happiness: 70 Pokedex ID: 604 + Happiness: 70 Pokedex ID: 605 Base Exp: 232 Capture Rate: 30 Height: 21 Weight: 805 @@ -38,4 +38,4 @@ is not disabled during roost. - Location Areas: + Location Areas Unknown diff --git a/pokeData/eevee b/pokeData/eevee index f6bcdf7..a2c4ab7 100644 --- a/pokeData/eevee +++ b/pokeData/eevee @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 55 Genus: Evolution Pokémon - Happiness: 50 Pokedex ID: 133 + Happiness: 50 Pokedex ID: 157 Base Exp: 65 Capture Rate: 45 Height: 3 Weight: 65 @@ -72,3 +72,8 @@ Stage 2 Forms: Location Areas: + Castelia city area + Kalos route 10 area + Celadon city celadon mansion + Goldenrod city bills house + Hearthome city area diff --git a/pokeData/eiscue b/pokeData/eiscue index 1556aaf..9ee6507 100644 --- a/pokeData/eiscue +++ b/pokeData/eiscue @@ -1,5 +1,5 @@ - Type Pokémon + Eiscue-ice Ice Type Pokémon It drifted in on the flow of ocean waters from a frigid place. @@ -9,15 +9,26 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 75 + attack: 80 + defense: 110 + special-attack: 65 + special-defense: 90 + speed: 50 Genus: Penguin Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 60 - Height: Weight: + Happiness: 50 Pokedex ID: 875 + Base Exp: 165 Capture Rate: 60 + Height: 14 Weight: 890 Types: + Ice ↞---------------|ABILITIES|---------------↠ + Ice-face: - Location Areas: + + + + Location Areas Unknown diff --git a/pokeData/eldegoss b/pokeData/eldegoss index 7c772c3..e54cc9d 100644 --- a/pokeData/eldegoss +++ b/pokeData/eldegoss @@ -57,4 +57,4 @@ the move's user will be affected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/electabuzz b/pokeData/electabuzz index 96612f0..3ea4034 100644 --- a/pokeData/electabuzz +++ b/pokeData/electabuzz @@ -16,7 +16,7 @@ speed: 105 Genus: Electric Pokémon - Happiness: 50 Pokedex ID: 125 + Happiness: 50 Pokedex ID: 146 Base Exp: 172 Capture Rate: 45 Height: 11 Weight: 300 diff --git a/pokeData/electivire b/pokeData/electivire index 9c52fba..cc65882 100644 --- a/pokeData/electivire +++ b/pokeData/electivire @@ -16,7 +16,7 @@ speed: 95 Genus: Thunderbolt Pokémon - Happiness: 50 Pokedex ID: 466 + Happiness: 50 Pokedex ID: 147 Base Exp: 270 Capture Rate: 30 Height: 18 Weight: 1386 @@ -59,4 +59,4 @@ rate increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/electrike b/pokeData/electrike index 19bad08..7e01514 100644 --- a/pokeData/electrike +++ b/pokeData/electrike @@ -20,7 +20,7 @@ speed: 65 Genus: Lightning Pokémon - Happiness: 50 Pokedex ID: 309 + Happiness: 50 Pokedex ID: 335 Base Exp: 59 Capture Rate: 120 Height: 6 Weight: 152 diff --git a/pokeData/electrode b/pokeData/electrode index 20b47f0..c464679 100644 --- a/pokeData/electrode +++ b/pokeData/electrode @@ -1,5 +1,5 @@ - Electrode Electric Type Pokémon + Electrode Type Pokémon It stores electric energy under very high pressure. It often @@ -17,12 +17,11 @@ speed: 150 Genus: Ball Pokémon - Happiness: 70 Pokedex ID: 101 + Happiness: 70 Pokedex ID: 110 Base Exp: 172 Capture Rate: 60 Height: 12 Weight: 666 Types: - Electric ↞---------------|ABILITIES|---------------↠ diff --git a/pokeData/elekid b/pokeData/elekid index cd3b2ff..3e5d99c 100644 --- a/pokeData/elekid +++ b/pokeData/elekid @@ -17,7 +17,7 @@ speed: 95 Genus: Electric Pokémon - Happiness: 50 Pokedex ID: 239 + Happiness: 50 Pokedex ID: 145 Base Exp: 72 Capture Rate: 45 Height: 6 Weight: 235 diff --git a/pokeData/elgyem b/pokeData/elgyem index 3b0d883..2560bd7 100644 --- a/pokeData/elgyem +++ b/pokeData/elgyem @@ -1,5 +1,5 @@ - Elgyem Psychic Type Pokémon + Beheeyem Psychic Type Pokémon It uses its strong psychic power to squeeze its opponent’s brain, @@ -9,17 +9,17 @@ Elgyem ► Beheeyem ↞--------| STATS |--------↠ - hp: 55 - attack: 55 - defense: 55 - special-attack: 85 - special-defense: 55 - speed: 30 + hp: 75 + attack: 75 + defense: 75 + special-attack: 125 + special-defense: 95 + speed: 40 Genus: Cerebral Pokémon - Happiness: 50 Pokedex ID: 605 - Base Exp: 67 Capture Rate: 255 - Height: 5 Weight: 90 + Happiness: 50 Pokedex ID: 606 + Base Exp: 170 Capture Rate: 255 + Height: 10 Weight: 345 Types: Psychic diff --git a/pokeData/emboar b/pokeData/emboar index f99c393..ed43df1 100644 --- a/pokeData/emboar +++ b/pokeData/emboar @@ -17,7 +17,7 @@ speed: 65 Genus: Mega Fire Pig Pokémon - Happiness: 70 Pokedex ID: 500 + Happiness: 70 Pokedex ID: 501 Base Exp: 238 Capture Rate: 45 Height: 16 Weight: 1500 @@ -47,4 +47,4 @@ jump kick and high jump kick. - Location Areas: + Location Areas Unknown diff --git a/pokeData/emolga b/pokeData/emolga index 44fa55e..1d12f6e 100644 --- a/pokeData/emolga +++ b/pokeData/emolga @@ -16,7 +16,7 @@ speed: 103 Genus: Sky Squirrel Pokémon - Happiness: 50 Pokedex ID: 587 + Happiness: 50 Pokedex ID: 588 Base Exp: 150 Capture Rate: 200 Height: 4 Weight: 50 diff --git a/pokeData/empoleon b/pokeData/empoleon index 45ec357..8dcf57a 100644 --- a/pokeData/empoleon +++ b/pokeData/empoleon @@ -17,7 +17,7 @@ speed: 60 Genus: Emperor Pokémon - Happiness: 70 Pokedex ID: 395 + Happiness: 70 Pokedex ID: 425 Base Exp: 239 Capture Rate: 45 Height: 17 Weight: 845 @@ -45,4 +45,4 @@ with each stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/enamorus b/pokeData/enamorus index 8458b73..44d2f48 100644 --- a/pokeData/enamorus +++ b/pokeData/enamorus @@ -1,5 +1,5 @@ - Type Pokémon + Enamorus-incarnate Fairy Type Pokémon When it flies to this land from across the sea, the bitter winter @@ -10,15 +10,45 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 74 + attack: 115 + defense: 70 + special-attack: 135 + special-defense: 80 + speed: 106 Genus: - Happiness: 3 Pokedex ID: + Happiness: 3 Pokedex ID: 905 Base Exp: Capture Rate: - Height: Weight: + Height: 16 Weight: 480 Types: + Fairy + Flying ↞---------------|ABILITIES|---------------↠ + Cute-charm: - Location Areas: + Whenever a move makes contact + with this Pokémon, the move's + user has a 30% chance of being + infatuated. + + Overworld: If the first Pokémon + in the party has this ability, + any wild Pokémon whose species + can be either gender has a 2/3 + chance of being set to the opposite + gender, and a 1/3 chance of having + a random gender as usual. + + Contrary: + + Whenever this Pokémon's stats + would be raised, they are instead + lowered by the same amount, and + vice versa. + + + Location Areas Unknown diff --git a/pokeData/entei b/pokeData/entei index fd7ba46..0cb1edf 100644 --- a/pokeData/entei +++ b/pokeData/entei @@ -16,7 +16,7 @@ speed: 100 Genus: Volcano Pokémon - Happiness: 35 Pokedex ID: 244 + Happiness: 35 Pokedex ID: 269 Base Exp: 290 Capture Rate: 3 Height: 21 Weight: 1980 diff --git a/pokeData/escavalier b/pokeData/escavalier index 1893d48..e2e8fe9 100644 --- a/pokeData/escavalier +++ b/pokeData/escavalier @@ -17,7 +17,7 @@ speed: 20 Genus: Cavalry Pokémon - Happiness: 50 Pokedex ID: 589 + Happiness: 50 Pokedex ID: 590 Base Exp: 173 Capture Rate: 75 Height: 10 Weight: 330 @@ -52,4 +52,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/espeon b/pokeData/espeon index 7a74183..28f194d 100644 --- a/pokeData/espeon +++ b/pokeData/espeon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 110 Genus: Sun Pokémon - Happiness: 50 Pokedex ID: 196 + Happiness: 50 Pokedex ID: 161 Base Exp: 184 Capture Rate: 45 Height: 9 Weight: 265 @@ -80,4 +80,4 @@ Stage 2 Forms: back. - Location Areas: + Location Areas Unknown diff --git a/pokeData/espurr b/pokeData/espurr index e1a994f..0773e9e 100644 --- a/pokeData/espurr +++ b/pokeData/espurr @@ -17,7 +17,7 @@ speed: 68 Genus: Restraint Pokémon - Happiness: 50 Pokedex ID: 677 + Happiness: 50 Pokedex ID: 678 Base Exp: 71 Capture Rate: 190 Height: 3 Weight: 35 diff --git a/pokeData/eternatus b/pokeData/eternatus index 9a801e7..ab06352 100644 --- a/pokeData/eternatus +++ b/pokeData/eternatus @@ -59,4 +59,4 @@ rate increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/excadrill b/pokeData/excadrill index 66e6c6f..6f640ca 100644 --- a/pokeData/excadrill +++ b/pokeData/excadrill @@ -17,7 +17,7 @@ speed: 88 Genus: Subterrene Pokémon - Happiness: 50 Pokedex ID: 530 + Happiness: 50 Pokedex ID: 531 Base Exp: 178 Capture Rate: 60 Height: 7 Weight: 404 diff --git a/pokeData/exeggcute b/pokeData/exeggcute index 39c2e6f..5c54323 100644 --- a/pokeData/exeggcute +++ b/pokeData/exeggcute @@ -16,7 +16,7 @@ speed: 40 Genus: Egg Pokémon - Happiness: 50 Pokedex ID: 102 + Happiness: 50 Pokedex ID: 111 Base Exp: 65 Capture Rate: 90 Height: 4 Weight: 25 diff --git a/pokeData/exeggutor b/pokeData/exeggutor index 266dad5..4c0bf24 100644 --- a/pokeData/exeggutor +++ b/pokeData/exeggutor @@ -5,8 +5,7 @@ one of its heads will drop off and continue on as an EXEGGCUTE. - Evolution Chain - Exeggcute ► Exeggutor + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 95 @@ -17,7 +16,7 @@ speed: 55 Genus: Coconut Pokémon - Happiness: 50 Pokedex ID: 103 + Happiness: 50 Pokedex ID: 112 Base Exp: 186 Capture Rate: 45 Height: 20 Weight: 1200 @@ -46,4 +45,4 @@ sunlight. - Location Areas: + Location Areas Unknown diff --git a/pokeData/exploud b/pokeData/exploud index 7a6f36f..77682e5 100644 --- a/pokeData/exploud +++ b/pokeData/exploud @@ -20,7 +20,7 @@ speed: 68 Genus: Loud Noise Pokémon - Happiness: 50 Pokedex ID: 295 + Happiness: 50 Pokedex ID: 321 Base Exp: 245 Capture Rate: 45 Height: 15 Weight: 840 @@ -56,4 +56,4 @@ affect damage as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/falinks b/pokeData/falinks index e31c60d..ae5fb97 100644 --- a/pokeData/falinks +++ b/pokeData/falinks @@ -43,4 +43,4 @@ with each stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/farfetchd b/pokeData/farfetchd index 0ad62a0..c9e0caa 100644 --- a/pokeData/farfetchd +++ b/pokeData/farfetchd @@ -4,7 +4,8 @@ The sprig of green onions it holds is its weapon. It is used much like a metal sword. - Single Stage Evolution Pokémon + Evolution Chain + Farfetchd ► Sirfetchd ↞--------| STATS |--------↠ hp: 52 @@ -15,7 +16,7 @@ speed: 60 Genus: Wild Duck Pokémon - Happiness: 50 Pokedex ID: 83 + Happiness: 50 Pokedex ID: 91 Base Exp: 132 Capture Rate: 45 Height: 8 Weight: 150 diff --git a/pokeData/feebas b/pokeData/feebas index 677e37f..d0feead 100644 --- a/pokeData/feebas +++ b/pokeData/feebas @@ -20,7 +20,7 @@ speed: 80 Genus: Fish Pokémon - Happiness: 50 Pokedex ID: 349 + Happiness: 50 Pokedex ID: 377 Base Exp: 40 Capture Rate: 255 Height: 6 Weight: 74 diff --git a/pokeData/fennekin b/pokeData/fennekin index da0c944..286bf0c 100644 --- a/pokeData/fennekin +++ b/pokeData/fennekin @@ -17,7 +17,7 @@ speed: 60 Genus: Fox Pokémon - Happiness: 70 Pokedex ID: 653 + Happiness: 70 Pokedex ID: 654 Base Exp: 61 Capture Rate: 45 Height: 4 Weight: 94 diff --git a/pokeData/feraligatr b/pokeData/feraligatr index c88eb3f..2943682 100644 --- a/pokeData/feraligatr +++ b/pokeData/feraligatr @@ -17,7 +17,7 @@ speed: 78 Genus: Big Jaw Pokémon - Happiness: 70 Pokedex ID: 160 + Happiness: 70 Pokedex ID: 192 Base Exp: 239 Capture Rate: 45 Height: 23 Weight: 888 @@ -54,4 +54,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ferroseed b/pokeData/ferroseed index 7f709dc..4343a2e 100644 --- a/pokeData/ferroseed +++ b/pokeData/ferroseed @@ -5,8 +5,7 @@ by shooting a barrage of spikes, which gives it a chance to escape by rolling away. - Evolution Chain - Ferroseed ► Ferrothorn + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 44 @@ -17,7 +16,7 @@ speed: 10 Genus: Thorn Seed Pokémon - Happiness: 50 Pokedex ID: 597 + Happiness: 50 Pokedex ID: 598 Base Exp: 61 Capture Rate: 255 Height: 6 Weight: 188 diff --git a/pokeData/ferrothorn b/pokeData/ferrothorn index 54e3da0..20cde08 100644 --- a/pokeData/ferrothorn +++ b/pokeData/ferrothorn @@ -17,7 +17,7 @@ speed: 20 Genus: Thorn Pod Pokémon - Happiness: 50 Pokedex ID: 598 + Happiness: 50 Pokedex ID: 599 Base Exp: 171 Capture Rate: 90 Height: 10 Weight: 1100 @@ -58,4 +58,4 @@ do not trigger this ability. - Location Areas: + Location Areas Unknown diff --git a/pokeData/finneon b/pokeData/finneon index bd17a11..ef6e53b 100644 --- a/pokeData/finneon +++ b/pokeData/finneon @@ -17,7 +17,7 @@ speed: 66 Genus: Wing Fish Pokémon - Happiness: 70 Pokedex ID: 456 + Happiness: 70 Pokedex ID: 476 Base Exp: 66 Capture Rate: 190 Height: 4 Weight: 70 diff --git a/pokeData/flaaffy b/pokeData/flaaffy index 9e946bb..0e4f201 100644 --- a/pokeData/flaaffy +++ b/pokeData/flaaffy @@ -17,7 +17,7 @@ speed: 45 Genus: Wool Pokémon - Happiness: 70 Pokedex ID: 180 + Happiness: 70 Pokedex ID: 209 Base Exp: 128 Capture Rate: 120 Height: 8 Weight: 133 @@ -28,20 +28,7 @@ Static: - Whenever a move makes contact - with this Pokémon, the move's - user has a 30% chance of being - paralyzed. - - Pokémon that are immune to - electric-type moves can still - be paralyzed by this ability. - - Overworld: If the lead Pokémon - has this ability, there is a - 50% chance that encounters will - be with an electric Pokémon, - if applicable. + Plus: diff --git a/pokeData/flabebe b/pokeData/flabebe index af9cf54..5843d30 100644 --- a/pokeData/flabebe +++ b/pokeData/flabebe @@ -17,7 +17,7 @@ speed: 42 Genus: Single Bloom Pokémon - Happiness: 70 Pokedex ID: 669 + Happiness: 70 Pokedex ID: 670 Base Exp: 61 Capture Rate: 225 Height: 1 Weight: 1 diff --git a/pokeData/flapple b/pokeData/flapple index c6f9702..5586c43 100644 --- a/pokeData/flapple +++ b/pokeData/flapple @@ -8,7 +8,7 @@ Evolution Chain Applin ► Flapple -Stage 2 Forms: + Stage 2 Forms: flapple appletun @@ -60,4 +60,4 @@ Stage 2 Forms: rate increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/flareon b/pokeData/flareon index 126a9fb..d695f8f 100644 --- a/pokeData/flareon +++ b/pokeData/flareon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 65 Genus: Flame Pokémon - Happiness: 50 Pokedex ID: 136 + Happiness: 50 Pokedex ID: 160 Base Exp: 184 Capture Rate: 45 Height: 9 Weight: 250 @@ -68,4 +68,4 @@ Stage 2 Forms: a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/fletchinder b/pokeData/fletchinder index 9f99cf8..df7b0bf 100644 --- a/pokeData/fletchinder +++ b/pokeData/fletchinder @@ -18,7 +18,7 @@ speed: 84 Genus: Ember Pokémon - Happiness: 50 Pokedex ID: 662 + Happiness: 50 Pokedex ID: 663 Base Exp: 134 Capture Rate: 120 Height: 7 Weight: 160 @@ -51,4 +51,4 @@ by one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/fletchling b/pokeData/fletchling index dc4927c..d995c45 100644 --- a/pokeData/fletchling +++ b/pokeData/fletchling @@ -17,7 +17,7 @@ speed: 62 Genus: Tiny Robin Pokémon - Happiness: 50 Pokedex ID: 661 + Happiness: 50 Pokedex ID: 662 Base Exp: 56 Capture Rate: 255 Height: 3 Weight: 17 diff --git a/pokeData/floatzel b/pokeData/floatzel index d2d51b9..36a908d 100644 --- a/pokeData/floatzel +++ b/pokeData/floatzel @@ -17,7 +17,7 @@ speed: 115 Genus: Sea Weasel Pokémon - Happiness: 70 Pokedex ID: 419 + Happiness: 70 Pokedex ID: 447 Base Exp: 173 Capture Rate: 75 Height: 11 Weight: 335 diff --git a/pokeData/floette b/pokeData/floette index bdcdc46..61e8fec 100644 --- a/pokeData/floette +++ b/pokeData/floette @@ -18,7 +18,7 @@ speed: 52 Genus: Single Bloom Pokémon - Happiness: 70 Pokedex ID: 670 + Happiness: 70 Pokedex ID: 671 Base Exp: 130 Capture Rate: 120 Height: 2 Weight: 9 @@ -40,4 +40,4 @@ up its item. - Location Areas: + Location Areas Unknown diff --git a/pokeData/florges b/pokeData/florges index e55bf51..3a413ea 100644 --- a/pokeData/florges +++ b/pokeData/florges @@ -18,7 +18,7 @@ speed: 75 Genus: Garden Pokémon - Happiness: 70 Pokedex ID: 671 + Happiness: 70 Pokedex ID: 672 Base Exp: 248 Capture Rate: 45 Height: 11 Weight: 100 @@ -40,4 +40,4 @@ up its item. - Location Areas: + Location Areas Unknown diff --git a/pokeData/flygon b/pokeData/flygon index 0496009..9e66e44 100644 --- a/pokeData/flygon +++ b/pokeData/flygon @@ -19,7 +19,7 @@ speed: 100 Genus: Mystic Pokémon - Happiness: 50 Pokedex ID: 330 + Happiness: 50 Pokedex ID: 358 Base Exp: 260 Capture Rate: 45 Height: 20 Weight: 820 @@ -41,4 +41,4 @@ is not disabled during roost. - Location Areas: + Location Areas Unknown diff --git a/pokeData/fomantis b/pokeData/fomantis index 86d895e..a447b74 100644 --- a/pokeData/fomantis +++ b/pokeData/fomantis @@ -50,4 +50,4 @@ vice versa. - Location Areas: + Location Areas Unknown diff --git a/pokeData/foongus b/pokeData/foongus index b5930a2..720cdf8 100644 --- a/pokeData/foongus +++ b/pokeData/foongus @@ -5,7 +5,8 @@ Poké Ball pattern, then releases poison spores. Why it resembles a Poké Ball is unknown. - Single Stage Evolution Pokémon + Evolution Chain + Foongus ► Amoonguss ↞--------| STATS |--------↠ hp: 69 @@ -16,7 +17,7 @@ speed: 15 Genus: Mushroom Pokémon - Happiness: 50 Pokedex ID: 590 + Happiness: 50 Pokedex ID: 591 Base Exp: 59 Capture Rate: 190 Height: 2 Weight: 10 diff --git a/pokeData/forretress b/pokeData/forretress index e2d57fd..c21ad7b 100644 --- a/pokeData/forretress +++ b/pokeData/forretress @@ -17,7 +17,7 @@ speed: 40 Genus: Bagworm Pokémon - Happiness: 70 Pokedex ID: 205 + Happiness: 70 Pokedex ID: 236 Base Exp: 163 Capture Rate: 75 Height: 12 Weight: 1258 @@ -49,4 +49,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/fraxure b/pokeData/fraxure index 9049d8d..901377a 100644 --- a/pokeData/fraxure +++ b/pokeData/fraxure @@ -17,7 +17,7 @@ speed: 67 Genus: Axe Jaw Pokémon - Happiness: 35 Pokedex ID: 611 + Happiness: 35 Pokedex ID: 612 Base Exp: 144 Capture Rate: 60 Height: 10 Weight: 360 diff --git a/pokeData/frillish b/pokeData/frillish index 6369039..d2ab54a 100644 --- a/pokeData/frillish +++ b/pokeData/frillish @@ -17,7 +17,7 @@ speed: 40 Genus: Floating Pokémon - Happiness: 50 Pokedex ID: 592 + Happiness: 50 Pokedex ID: 593 Base Exp: 67 Capture Rate: 190 Height: 12 Weight: 330 diff --git a/pokeData/froakie b/pokeData/froakie index 9a6c35a..cf802ae 100644 --- a/pokeData/froakie +++ b/pokeData/froakie @@ -18,7 +18,7 @@ speed: 71 Genus: Bubble Frog Pokémon - Happiness: 70 Pokedex ID: 656 + Happiness: 70 Pokedex ID: 657 Base Exp: 63 Capture Rate: 45 Height: 3 Weight: 70 diff --git a/pokeData/frogadier b/pokeData/frogadier index 63de533..199ed65 100644 --- a/pokeData/frogadier +++ b/pokeData/frogadier @@ -17,7 +17,7 @@ speed: 97 Genus: Bubble Frog Pokémon - Happiness: 70 Pokedex ID: 657 + Happiness: 70 Pokedex ID: 658 Base Exp: 142 Capture Rate: 45 Height: 6 Weight: 109 @@ -42,4 +42,4 @@ just before the move is used. - Location Areas: + Location Areas Unknown diff --git a/pokeData/froslass b/pokeData/froslass index 3019ec4..fa7ca78 100644 --- a/pokeData/froslass +++ b/pokeData/froslass @@ -8,7 +8,7 @@ Evolution Chain Snorunt ► Glalie -Stage 2 Forms: + Stage 2 Forms: glalie froslass @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 110 Genus: Snow Land Pokémon - Happiness: 50 Pokedex ID: 478 + Happiness: 50 Pokedex ID: 392 Base Exp: 168 Capture Rate: 75 Height: 13 Weight: 266 @@ -52,4 +52,4 @@ Stage 2 Forms: afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/frosmoth b/pokeData/frosmoth index 2dac8a1..fe07313 100644 --- a/pokeData/frosmoth +++ b/pokeData/frosmoth @@ -52,4 +52,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/furfrou b/pokeData/furfrou index 2bd16ed..198d711 100644 --- a/pokeData/furfrou +++ b/pokeData/furfrou @@ -16,7 +16,7 @@ speed: 102 Genus: Poodle Pokémon - Happiness: 70 Pokedex ID: 676 + Happiness: 70 Pokedex ID: 677 Base Exp: 165 Capture Rate: 160 Height: 12 Weight: 280 diff --git a/pokeData/furret b/pokeData/furret index 6884823..009fa5b 100644 --- a/pokeData/furret +++ b/pokeData/furret @@ -17,7 +17,7 @@ speed: 90 Genus: Long Body Pokémon - Happiness: 70 Pokedex ID: 162 + Happiness: 70 Pokedex ID: 194 Base Exp: 145 Capture Rate: 90 Height: 18 Weight: 325 diff --git a/pokeData/gabite b/pokeData/gabite index 25affce..827452b 100644 --- a/pokeData/gabite +++ b/pokeData/gabite @@ -17,7 +17,7 @@ speed: 82 Genus: Cave Pokémon - Happiness: 50 Pokedex ID: 444 + Happiness: 50 Pokedex ID: 465 Base Exp: 144 Capture Rate: 45 Height: 14 Weight: 560 diff --git a/pokeData/gallade b/pokeData/gallade index 9481b1c..4087c4a 100644 --- a/pokeData/gallade +++ b/pokeData/gallade @@ -7,7 +7,7 @@ Evolution Chain Ralts ► Kirlia ► Gardevoir -Stage 3 Forms: + Stage 3 Forms: gardevoir gallade @@ -20,7 +20,7 @@ Stage 3 Forms: speed: 80 Genus: Blade Pokémon - Happiness: 35 Pokedex ID: 475 + Happiness: 35 Pokedex ID: 308 Base Exp: 259 Capture Rate: 45 Height: 16 Weight: 520 @@ -49,4 +49,4 @@ Stage 3 Forms: any way. - Location Areas: + Location Areas Unknown diff --git a/pokeData/galvantula b/pokeData/galvantula index bcfa322..d05d6ec 100644 --- a/pokeData/galvantula +++ b/pokeData/galvantula @@ -17,7 +17,7 @@ speed: 108 Genus: EleSpider Pokémon - Happiness: 50 Pokedex ID: 596 + Happiness: 50 Pokedex ID: 597 Base Exp: 165 Capture Rate: 75 Height: 8 Weight: 143 @@ -66,4 +66,4 @@ rate is increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/garbodor b/pokeData/garbodor index ee383c9..9e39e2a 100644 --- a/pokeData/garbodor +++ b/pokeData/garbodor @@ -17,7 +17,7 @@ speed: 75 Genus: Trash Heap Pokémon - Happiness: 50 Pokedex ID: 569 + Happiness: 50 Pokedex ID: 570 Base Exp: 166 Capture Rate: 60 Height: 19 Weight: 1073 diff --git a/pokeData/garchomp b/pokeData/garchomp index e17527d..5b2e4a5 100644 --- a/pokeData/garchomp +++ b/pokeData/garchomp @@ -17,7 +17,7 @@ speed: 102 Genus: Mach Pokémon - Happiness: 50 Pokedex ID: 445 + Happiness: 50 Pokedex ID: 466 Base Exp: 300 Capture Rate: 45 Height: 19 Weight: 950 @@ -52,4 +52,4 @@ to iron barbs. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gardevoir b/pokeData/gardevoir index 957ea29..76f2361 100644 --- a/pokeData/gardevoir +++ b/pokeData/gardevoir @@ -10,7 +10,7 @@ Evolution Chain Ralts ► Kirlia ► Gardevoir -Stage 3 Forms: + Stage 3 Forms: gardevoir gallade @@ -23,7 +23,7 @@ Stage 3 Forms: speed: 80 Genus: Embrace Pokémon - Happiness: 35 Pokedex ID: 282 + Happiness: 35 Pokedex ID: 307 Base Exp: 259 Capture Rate: 45 Height: 16 Weight: 484 @@ -80,4 +80,4 @@ Stage 3 Forms: moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gastly b/pokeData/gastly index 8c07ec9..821d065 100644 --- a/pokeData/gastly +++ b/pokeData/gastly @@ -17,7 +17,7 @@ speed: 80 Genus: Gas Pokémon - Happiness: 50 Pokedex ID: 92 + Happiness: 50 Pokedex ID: 100 Base Exp: 62 Capture Rate: 190 Height: 13 Weight: 1 diff --git a/pokeData/gastrodon b/pokeData/gastrodon index e464ff1..80faf31 100644 --- a/pokeData/gastrodon +++ b/pokeData/gastrodon @@ -17,7 +17,7 @@ speed: 39 Genus: Sea Slug Pokémon - Happiness: 50 Pokedex ID: 423 + Happiness: 50 Pokedex ID: 451 Base Exp: 166 Capture Rate: 75 Height: 9 Weight: 299 @@ -76,16 +76,4 @@ damage, regardless of type. - Location Areas: - Canalave city area - Pastoria city area - Valley windworks area - Fuego ironworks area - Sinnoh route 205 south towards floaroma town - Sinnoh route 212 east towards pastoria city - Sinnoh route 213 area - Sinnoh route 218 area - Sinnoh route 221 area - Sinnoh route 222 area - Sinnoh route 224 area - Sinnoh sea route 230 area + Location Areas Unknown diff --git a/pokeData/genesect b/pokeData/genesect index 622749d..baef041 100644 --- a/pokeData/genesect +++ b/pokeData/genesect @@ -1,7 +1,10 @@ Genesect Bug Type Pokémon - + Over 300 million years ago, + it was feared as the strongest + of hunters. It has been modified + by Team Plasma. Single Stage Evolution Pokémon ↞--------| STATS |--------↠ @@ -12,9 +15,9 @@ special-defense: 95 speed: 99 - Genus: - Happiness: Pokedex ID: 649 - Base Exp: 300 Capture Rate: + Genus: Paleozoic Pokémon + Happiness: 0 Pokedex ID: 650 + Base Exp: 300 Capture Rate: 3 Height: 15 Weight: 825 Types: @@ -37,4 +40,4 @@ when acquired during a battle. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gengar b/pokeData/gengar index 8b3d704..f20af9a 100644 --- a/pokeData/gengar +++ b/pokeData/gengar @@ -17,7 +17,7 @@ speed: 110 Genus: Shadow Pokémon - Happiness: 50 Pokedex ID: 94 + Happiness: 50 Pokedex ID: 102 Base Exp: 250 Capture Rate: 45 Height: 15 Weight: 405 diff --git a/pokeData/geodude b/pokeData/geodude index e173228..d5634b8 100644 --- a/pokeData/geodude +++ b/pokeData/geodude @@ -17,7 +17,7 @@ speed: 20 Genus: Rock Pokémon - Happiness: 70 Pokedex ID: 74 + Happiness: 70 Pokedex ID: 80 Base Exp: 60 Capture Rate: 255 Height: 4 Weight: 200 diff --git a/pokeData/gible b/pokeData/gible index e6b37f3..61a4562 100644 --- a/pokeData/gible +++ b/pokeData/gible @@ -17,7 +17,7 @@ speed: 42 Genus: Land Shark Pokémon - Happiness: 50 Pokedex ID: 443 + Happiness: 50 Pokedex ID: 464 Base Exp: 60 Capture Rate: 45 Height: 7 Weight: 205 diff --git a/pokeData/gigalith b/pokeData/gigalith index 7ca5b3f..0e6e45b 100644 --- a/pokeData/gigalith +++ b/pokeData/gigalith @@ -17,7 +17,7 @@ speed: 25 Genus: Compressed Pokémon - Happiness: 50 Pokedex ID: 526 + Happiness: 50 Pokedex ID: 527 Base Exp: 258 Capture Rate: 45 Height: 17 Weight: 2600 @@ -73,4 +73,4 @@ damage, regardless of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/girafarig b/pokeData/girafarig index fa511d0..6b50b94 100644 --- a/pokeData/girafarig +++ b/pokeData/girafarig @@ -17,7 +17,7 @@ speed: 85 Genus: Long Neck Pokémon - Happiness: 70 Pokedex ID: 203 + Happiness: 70 Pokedex ID: 234 Base Exp: 159 Capture Rate: 60 Height: 15 Weight: 415 diff --git a/pokeData/giratina b/pokeData/giratina index cdfc135..62c9253 100644 --- a/pokeData/giratina +++ b/pokeData/giratina @@ -1,19 +1,40 @@ - Type Pokémon + Cresselia Psychic Type Pokémon - + A Pokémon that is said to live + in a world on the reverse side + of ours. It appears in an ancient + cemetery. Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 120 + attack: 70 + defense: 120 + special-attack: 75 + special-defense: 130 + speed: 85 - Genus: - Happiness: Pokedex ID: - Base Exp: Capture Rate: - Height: Weight: + Genus: Renegade Pokémon + Happiness: 0 Pokedex ID: 488 + Base Exp: 300 Capture Rate: 3 + Height: 15 Weight: 856 Types: + Psychic ↞---------------|ABILITIES|---------------↠ + Levitate: - Location Areas: + This Pokémon is immune to ground-type + moves, spikes, toxic spikes, + and arena trap. + + This ability is disabled during + gravity or ingrain, or while + holding an iron ball. This ability + is not disabled during roost. + + + Location Areas Unknown diff --git a/pokeData/glaceon b/pokeData/glaceon index 782fc6c..25fef03 100644 --- a/pokeData/glaceon +++ b/pokeData/glaceon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 65 Genus: Fresh Snow Pokémon - Happiness: 35 Pokedex ID: 471 + Happiness: 35 Pokedex ID: 164 Base Exp: 184 Capture Rate: 45 Height: 8 Weight: 259 @@ -59,4 +59,4 @@ Stage 2 Forms: of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/glalie b/pokeData/glalie index 1f0862a..5e0fb90 100644 --- a/pokeData/glalie +++ b/pokeData/glalie @@ -10,7 +10,7 @@ Evolution Chain Snorunt ► Glalie -Stage 2 Forms: + Stage 2 Forms: glalie froslass @@ -23,7 +23,7 @@ Stage 2 Forms: speed: 80 Genus: Face Pokémon - Happiness: 50 Pokedex ID: 362 + Happiness: 50 Pokedex ID: 391 Base Exp: 168 Capture Rate: 75 Height: 15 Weight: 2565 @@ -57,4 +57,4 @@ Stage 2 Forms: respectively. - Location Areas: + Location Areas Unknown diff --git a/pokeData/glameow b/pokeData/glameow index a998006..7719e25 100644 --- a/pokeData/glameow +++ b/pokeData/glameow @@ -16,7 +16,7 @@ speed: 85 Genus: Catty Pokémon - Happiness: 70 Pokedex ID: 431 + Happiness: 70 Pokedex ID: 456 Base Exp: 62 Capture Rate: 190 Height: 5 Weight: 39 diff --git a/pokeData/glastrier b/pokeData/glastrier index c99f542..30a3787 100644 --- a/pokeData/glastrier +++ b/pokeData/glastrier @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/gligar b/pokeData/gligar index 56bb9e2..e20b4b8 100644 --- a/pokeData/gligar +++ b/pokeData/gligar @@ -17,7 +17,7 @@ speed: 85 Genus: Fly Scorpion Pokémon - Happiness: 70 Pokedex ID: 207 + Happiness: 70 Pokedex ID: 238 Base Exp: 86 Capture Rate: 60 Height: 11 Weight: 648 diff --git a/pokeData/gliscor b/pokeData/gliscor index b16b5db..29642a6 100644 --- a/pokeData/gliscor +++ b/pokeData/gliscor @@ -17,7 +17,7 @@ speed: 95 Genus: Fang Scorpion Pokémon - Happiness: 70 Pokedex ID: 472 + Happiness: 70 Pokedex ID: 239 Base Exp: 179 Capture Rate: 30 Height: 20 Weight: 425 diff --git a/pokeData/gloom b/pokeData/gloom index 6aeef47..b32d497 100644 --- a/pokeData/gloom +++ b/pokeData/gloom @@ -1,5 +1,5 @@ - Gloom Grass Type Pokémon + Venonat Bug Type Pokémon The fluid that oozes from its mouth isn't drool. It is a nectar @@ -8,51 +8,58 @@ Evolution Chain Oddish ► Gloom ► Vileplume -Stage 3 Forms: + Stage 3 Forms: vileplume bellossom ↞--------| STATS |--------↠ hp: 60 - attack: 65 - defense: 70 - special-attack: 85 - special-defense: 75 - speed: 40 + attack: 55 + defense: 50 + special-attack: 40 + special-defense: 55 + speed: 45 Genus: Weed Pokémon - Happiness: 50 Pokedex ID: 44 - Base Exp: 138 Capture Rate: 120 - Height: 8 Weight: 86 + Happiness: 50 Pokedex ID: 48 + Base Exp: 61 Capture Rate: 120 + Height: 10 Weight: 300 Types: - Grass + Bug Poison ↞---------------|ABILITIES|---------------↠ - Chlorophyll: + Compound-eyes: - This Pokémon's Speed is doubled - during strong sunlight. + This Pokémon's moves have 1.3× + their accuracy. - This bonus does not count as - a stat modifier. + This ability has no effect + on the one-hit KO moves (fissure, + guillotine, horn drill, and sheer + cold). - Stench: + Overworld: If the first Pokémon + in the party has this ability, + the chance of a wild Pokémon + holding a particular item is + raised from 50%, 5%, or 1% to + 60%, 20%, or 5%, respectively. - This Pokémon's damaging moves - have a 10% chance to make the - target flinch with each hit if - they do not already cause flinching - as a secondary effect. + Tinted-lens: - This ability does not stack - with a held item. + This Pokémon deals twice as + much damage with moves that are + not very effective against the + target. - Overworld: The wild encounter - rate is halved while this Pokémon - is first in the party. + Run-away: + + This Pokémon is always successful + fleeing from wild battles, even + if trapped by a move or ability. Location Areas: diff --git a/pokeData/gogoat b/pokeData/gogoat index 103834a..1de25b4 100644 --- a/pokeData/gogoat +++ b/pokeData/gogoat @@ -18,7 +18,7 @@ speed: 68 Genus: Mount Pokémon - Happiness: 70 Pokedex ID: 673 + Happiness: 70 Pokedex ID: 674 Base Exp: 186 Capture Rate: 45 Height: 17 Weight: 910 @@ -40,4 +40,4 @@ terrain is in effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/golbat b/pokeData/golbat index 92e17e4..32cafb8 100644 --- a/pokeData/golbat +++ b/pokeData/golbat @@ -17,7 +17,7 @@ speed: 90 Genus: Bat Pokémon - Happiness: 50 Pokedex ID: 42 + Happiness: 50 Pokedex ID: 45 Base Exp: 159 Capture Rate: 90 Height: 16 Weight: 550 diff --git a/pokeData/goldeen b/pokeData/goldeen index b90dc92..98d81c5 100644 --- a/pokeData/goldeen +++ b/pokeData/goldeen @@ -5,7 +5,8 @@ elegant ballroom dress, giving it the nickname of the Water Queen. - Single Stage Evolution Pokémon + Evolution Chain + Goldeen ► Seaking ↞--------| STATS |--------↠ hp: 45 @@ -16,7 +17,7 @@ speed: 63 Genus: Goldfish Pokémon - Happiness: 50 Pokedex ID: 118 + Happiness: 50 Pokedex ID: 135 Base Exp: 64 Capture Rate: 225 Height: 6 Weight: 150 diff --git a/pokeData/golduck b/pokeData/golduck index 349bd4b..05fa4ea 100644 --- a/pokeData/golduck +++ b/pokeData/golduck @@ -17,7 +17,7 @@ speed: 85 Genus: Duck Pokémon - Happiness: 50 Pokedex ID: 55 + Happiness: 50 Pokedex ID: 60 Base Exp: 175 Capture Rate: 75 Height: 17 Weight: 766 diff --git a/pokeData/golem b/pokeData/golem index e7af145..ce956c9 100644 --- a/pokeData/golem +++ b/pokeData/golem @@ -17,7 +17,7 @@ speed: 45 Genus: Megaton Pokémon - Happiness: 70 Pokedex ID: 76 + Happiness: 70 Pokedex ID: 82 Base Exp: 223 Capture Rate: 45 Height: 14 Weight: 3000 @@ -56,17 +56,7 @@ Sand-veil: - During a sandstorm, this Pokémon - has 1.25× its evasion, and it - does not take sandstorm damage - regardless of type. - - The evasion bonus does not - count as a stat modifier. - - Overworld: If the lead Pokémon - has this ability, the wild encounter - rate is halved in a sandstorm. + Location Areas: diff --git a/pokeData/golett b/pokeData/golett index 0c3ea6e..8d9d937 100644 --- a/pokeData/golett +++ b/pokeData/golett @@ -17,7 +17,7 @@ speed: 35 Genus: Automaton Pokémon - Happiness: 50 Pokedex ID: 622 + Happiness: 50 Pokedex ID: 623 Base Exp: 61 Capture Rate: 190 Height: 10 Weight: 920 diff --git a/pokeData/golisopod b/pokeData/golisopod index 682bb54..eb78e11 100644 --- a/pokeData/golisopod +++ b/pokeData/golisopod @@ -35,4 +35,4 @@ it switches out. - Location Areas: + Location Areas Unknown diff --git a/pokeData/golurk b/pokeData/golurk index 7dc3ca9..bf9d7b8 100644 --- a/pokeData/golurk +++ b/pokeData/golurk @@ -17,7 +17,7 @@ speed: 55 Genus: Automaton Pokémon - Happiness: 50 Pokedex ID: 623 + Happiness: 50 Pokedex ID: 624 Base Exp: 169 Capture Rate: 90 Height: 28 Weight: 3300 diff --git a/pokeData/goodra b/pokeData/goodra index b11baa5..4c1b0d2 100644 --- a/pokeData/goodra +++ b/pokeData/goodra @@ -45,4 +45,4 @@ Speed by one stage on contact. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gorebyss b/pokeData/gorebyss index d32649c..1ef9701 100644 --- a/pokeData/gorebyss +++ b/pokeData/gorebyss @@ -12,7 +12,7 @@ Evolution Chain Clamperl ► Huntail -Stage 2 Forms: + Stage 2 Forms: huntail gorebyss @@ -25,7 +25,7 @@ Stage 2 Forms: speed: 52 Genus: South Sea Pokémon - Happiness: 70 Pokedex ID: 368 + Happiness: 70 Pokedex ID: 398 Base Exp: 170 Capture Rate: 60 Height: 18 Weight: 226 diff --git a/pokeData/gossifleur b/pokeData/gossifleur index 864f1c7..bef843d 100644 --- a/pokeData/gossifleur +++ b/pokeData/gossifleur @@ -57,4 +57,4 @@ the move's user will be affected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gothita b/pokeData/gothita index dbf0624..3602a72 100644 --- a/pokeData/gothita +++ b/pokeData/gothita @@ -17,7 +17,7 @@ speed: 45 Genus: Fixation Pokémon - Happiness: 50 Pokedex ID: 574 + Happiness: 50 Pokedex ID: 575 Base Exp: 58 Capture Rate: 200 Height: 4 Weight: 58 diff --git a/pokeData/gothitelle b/pokeData/gothitelle index 6380f44..5d43d29 100644 --- a/pokeData/gothitelle +++ b/pokeData/gothitelle @@ -17,7 +17,7 @@ speed: 65 Genus: Astral Body Pokémon - Happiness: 50 Pokedex ID: 576 + Happiness: 50 Pokedex ID: 577 Base Exp: 245 Capture Rate: 50 Height: 15 Weight: 440 diff --git a/pokeData/gothorita b/pokeData/gothorita index 4a7de9a..d4d7dd2 100644 --- a/pokeData/gothorita +++ b/pokeData/gothorita @@ -17,7 +17,7 @@ speed: 55 Genus: Manipulate Pokémon - Happiness: 50 Pokedex ID: 575 + Happiness: 50 Pokedex ID: 576 Base Exp: 137 Capture Rate: 100 Height: 7 Weight: 180 diff --git a/pokeData/gourgeist b/pokeData/gourgeist index 24c9851..722b952 100644 --- a/pokeData/gourgeist +++ b/pokeData/gourgeist @@ -1,5 +1,5 @@ - Type Pokémon + Gourgeist-average Ghost Type Pokémon Singing in eerie voices, they wander town streets on the night @@ -9,15 +9,72 @@ Pumpkaboo ► Gourgeist ↞--------| STATS |--------↠ + hp: 65 + attack: 90 + defense: 122 + special-attack: 58 + special-defense: 75 + speed: 84 Genus: Pumpkin Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 60 - Height: Weight: + Happiness: 50 Pokedex ID: 711 + Base Exp: 173 Capture Rate: 60 + Height: 9 Weight: 125 Types: + Ghost + Grass ↞---------------|ABILITIES|---------------↠ + Pickup: - Location Areas: + At the end of each turn, if + another Pokémon consumed or Flung + a held item that turn, this Pokémon + picks up the item if it is not + already holding one. After each + battle, this Pokémon has a 10% + chance of picking up an item + if it is not already holding + one. + + The air balloon and eject button + cannot be picked up. + + The items that may be found + vary by game, and, since Pokémon + Emerald, by the Pokémon's level. + This ability is checked after + the battle ends, at which point + any temporary ability changes + have worn off. + + Frisk: + + When this Pokémon enters battle, + it reveals an opposing Pokémon's + held item to all participating + trainers. + + In a double battle, if one + opponent has an item, this Pokémon + will Frisk that Pokémon; if both + have an item, it will Frisk one + at random. + + Insomnia: + + This Pokémon cannot be asleep. + + This causes rest to fail altogether. + If a Pokémon is asleep and acquires + this ability, it will immediately + wake up; this includes when regaining + a lost ability upon leaving battle. + + This ability functions identically + to vital spirit in battle. + + + Location Areas Unknown diff --git a/pokeData/granbull b/pokeData/granbull index 25cfdaf..e4e8418 100644 --- a/pokeData/granbull +++ b/pokeData/granbull @@ -17,7 +17,7 @@ speed: 45 Genus: Fairy Pokémon - Happiness: 70 Pokedex ID: 210 + Happiness: 70 Pokedex ID: 241 Base Exp: 158 Capture Rate: 75 Height: 14 Weight: 487 diff --git a/pokeData/grapploct b/pokeData/grapploct index 86e897c..a550e5a 100644 --- a/pokeData/grapploct +++ b/pokeData/grapploct @@ -52,4 +52,4 @@ power boost for rollout. - Location Areas: + Location Areas Unknown diff --git a/pokeData/graveler b/pokeData/graveler index 1d73c8e..5e781e2 100644 --- a/pokeData/graveler +++ b/pokeData/graveler @@ -17,7 +17,7 @@ speed: 35 Genus: Rock Pokémon - Happiness: 70 Pokedex ID: 75 + Happiness: 70 Pokedex ID: 81 Base Exp: 137 Capture Rate: 120 Height: 10 Weight: 1050 diff --git a/pokeData/greedent b/pokeData/greedent index 7f2e8c3..0e9cfff 100644 --- a/pokeData/greedent +++ b/pokeData/greedent @@ -41,4 +41,4 @@ threshold. - Location Areas: + Location Areas Unknown diff --git a/pokeData/greninja b/pokeData/greninja index 4504eac..6c8f10c 100644 --- a/pokeData/greninja +++ b/pokeData/greninja @@ -18,7 +18,7 @@ speed: 122 Genus: Ninja Pokémon - Happiness: 70 Pokedex ID: 658 + Happiness: 70 Pokedex ID: 659 Base Exp: 239 Capture Rate: 45 Height: 15 Weight: 400 @@ -44,4 +44,4 @@ just before the move is used. - Location Areas: + Location Areas Unknown diff --git a/pokeData/grimer b/pokeData/grimer index 05b6f88..9adaaef 100644 --- a/pokeData/grimer +++ b/pokeData/grimer @@ -17,7 +17,7 @@ speed: 25 Genus: Sludge Pokémon - Happiness: 70 Pokedex ID: 88 + Happiness: 70 Pokedex ID: 96 Base Exp: 65 Capture Rate: 190 Height: 9 Weight: 300 diff --git a/pokeData/grimmsnarl b/pokeData/grimmsnarl index 900e4e0..3427106 100644 --- a/pokeData/grimmsnarl +++ b/pokeData/grimmsnarl @@ -64,4 +64,4 @@ steal from a trained Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/grookey b/pokeData/grookey index a1497f1..f072155 100644 --- a/pokeData/grookey +++ b/pokeData/grookey @@ -41,4 +41,4 @@ terrain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/grotle b/pokeData/grotle index f10a315..9912a4a 100644 --- a/pokeData/grotle +++ b/pokeData/grotle @@ -16,7 +16,7 @@ speed: 36 Genus: Grove Pokémon - Happiness: 70 Pokedex ID: 388 + Happiness: 70 Pokedex ID: 418 Base Exp: 142 Capture Rate: 45 Height: 11 Weight: 970 @@ -41,4 +41,4 @@ to battle armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/groudon b/pokeData/groudon index 40f7202..6f63521 100644 --- a/pokeData/groudon +++ b/pokeData/groudon @@ -18,7 +18,7 @@ speed: 90 Genus: Continent Pokémon - Happiness: 0 Pokedex ID: 383 + Happiness: 0 Pokedex ID: 413 Base Exp: 335 Capture Rate: 3 Height: 35 Weight: 9500 diff --git a/pokeData/grovyle b/pokeData/grovyle index 27d3e49..471ea1e 100644 --- a/pokeData/grovyle +++ b/pokeData/grovyle @@ -18,7 +18,7 @@ speed: 95 Genus: Wood Gecko Pokémon - Happiness: 50 Pokedex ID: 253 + Happiness: 50 Pokedex ID: 278 Base Exp: 142 Capture Rate: 45 Height: 9 Weight: 216 @@ -49,4 +49,4 @@ takes effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/growlithe b/pokeData/growlithe index 34f569a..d69a7b9 100644 --- a/pokeData/growlithe +++ b/pokeData/growlithe @@ -16,7 +16,7 @@ speed: 60 Genus: Puppy Pokémon - Happiness: 50 Pokedex ID: 58 + Happiness: 50 Pokedex ID: 63 Base Exp: 70 Capture Rate: 190 Height: 7 Weight: 190 diff --git a/pokeData/grubbin b/pokeData/grubbin index 15e5f1f..55d10ea 100644 --- a/pokeData/grubbin +++ b/pokeData/grubbin @@ -38,4 +38,4 @@ rate is increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/grumpig b/pokeData/grumpig index 3bb3502..8904cf3 100644 --- a/pokeData/grumpig +++ b/pokeData/grumpig @@ -20,7 +20,7 @@ speed: 80 Genus: Manipulate Pokémon - Happiness: 70 Pokedex ID: 326 + Happiness: 70 Pokedex ID: 354 Base Exp: 165 Capture Rate: 60 Height: 9 Weight: 715 diff --git a/pokeData/gulpin b/pokeData/gulpin index 089eeff..5e5ae47 100644 --- a/pokeData/gulpin +++ b/pokeData/gulpin @@ -19,7 +19,7 @@ speed: 40 Genus: Stomach Pokémon - Happiness: 70 Pokedex ID: 316 + Happiness: 70 Pokedex ID: 344 Base Exp: 60 Capture Rate: 225 Height: 4 Weight: 103 diff --git a/pokeData/gumshoos b/pokeData/gumshoos index 1ab28ff..f3a02c9 100644 --- a/pokeData/gumshoos +++ b/pokeData/gumshoos @@ -46,4 +46,4 @@ of 1.5×. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gurdurr b/pokeData/gurdurr index e9d5d47..ff2c4ab 100644 --- a/pokeData/gurdurr +++ b/pokeData/gurdurr @@ -17,7 +17,7 @@ speed: 40 Genus: Muscular Pokémon - Happiness: 50 Pokedex ID: 533 + Happiness: 50 Pokedex ID: 534 Base Exp: 142 Capture Rate: 90 Height: 12 Weight: 400 diff --git a/pokeData/guzzlord b/pokeData/guzzlord index ab3e2d6..870292e 100644 --- a/pokeData/guzzlord +++ b/pokeData/guzzlord @@ -33,4 +33,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/gyarados b/pokeData/gyarados index a32a201..12cce9f 100644 --- a/pokeData/gyarados +++ b/pokeData/gyarados @@ -17,7 +17,7 @@ speed: 81 Genus: Atrocious Pokémon - Happiness: 50 Pokedex ID: 130 + Happiness: 50 Pokedex ID: 154 Base Exp: 189 Capture Rate: 45 Height: 65 Weight: 2350 diff --git a/pokeData/hakamo-o b/pokeData/hakamo-o index 8bfd005..508487d 100644 --- a/pokeData/hakamo-o +++ b/pokeData/hakamo-o @@ -55,4 +55,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/happiny b/pokeData/happiny index 0508df5..0182409 100644 --- a/pokeData/happiny +++ b/pokeData/happiny @@ -16,7 +16,7 @@ speed: 30 Genus: Playhouse Pokémon - Happiness: 140 Pokedex ID: 440 + Happiness: 140 Pokedex ID: 126 Base Exp: 110 Capture Rate: 130 Height: 6 Weight: 244 diff --git a/pokeData/hariyama b/pokeData/hariyama index 6be1c44..91c172c 100644 --- a/pokeData/hariyama +++ b/pokeData/hariyama @@ -19,7 +19,7 @@ speed: 50 Genus: Arm Thrust Pokémon - Happiness: 70 Pokedex ID: 297 + Happiness: 70 Pokedex ID: 323 Base Exp: 166 Capture Rate: 200 Height: 23 Weight: 2538 diff --git a/pokeData/hatenna b/pokeData/hatenna index 8825ea0..bec62d3 100644 --- a/pokeData/hatenna +++ b/pokeData/hatenna @@ -71,4 +71,4 @@ back. - Location Areas: + Location Areas Unknown diff --git a/pokeData/hatterene b/pokeData/hatterene index d525ca8..82b068f 100644 --- a/pokeData/hatterene +++ b/pokeData/hatterene @@ -71,4 +71,4 @@ back. - Location Areas: + Location Areas Unknown diff --git a/pokeData/hattrem b/pokeData/hattrem index 5222c9a..9d50718 100644 --- a/pokeData/hattrem +++ b/pokeData/hattrem @@ -70,4 +70,4 @@ back. - Location Areas: + Location Areas Unknown diff --git a/pokeData/haunter b/pokeData/haunter index e25c30d..3045983 100644 --- a/pokeData/haunter +++ b/pokeData/haunter @@ -17,7 +17,7 @@ speed: 95 Genus: Gas Pokémon - Happiness: 50 Pokedex ID: 93 + Happiness: 50 Pokedex ID: 101 Base Exp: 142 Capture Rate: 90 Height: 16 Weight: 1 diff --git a/pokeData/haxorus b/pokeData/haxorus index d0af380..afae150 100644 --- a/pokeData/haxorus +++ b/pokeData/haxorus @@ -17,7 +17,7 @@ speed: 97 Genus: Axe Jaw Pokémon - Happiness: 35 Pokedex ID: 612 + Happiness: 35 Pokedex ID: 613 Base Exp: 270 Capture Rate: 45 Height: 18 Weight: 1055 @@ -107,4 +107,4 @@ a target's Berry. - Location Areas: + Location Areas Unknown diff --git a/pokeData/heatmor b/pokeData/heatmor index 48eb23a..3d7fa7b 100644 --- a/pokeData/heatmor +++ b/pokeData/heatmor @@ -16,7 +16,7 @@ speed: 65 Genus: Anteater Pokémon - Happiness: 50 Pokedex ID: 631 + Happiness: 50 Pokedex ID: 632 Base Exp: 169 Capture Rate: 90 Height: 14 Weight: 580 diff --git a/pokeData/heatran b/pokeData/heatran index f098637..548b177 100644 --- a/pokeData/heatran +++ b/pokeData/heatran @@ -16,7 +16,7 @@ speed: 77 Genus: Lava Dome Pokémon - Happiness: 100 Pokedex ID: 485 + Happiness: 100 Pokedex ID: 486 Base Exp: 300 Capture Rate: 3 Height: 17 Weight: 4300 diff --git a/pokeData/heliolisk b/pokeData/heliolisk index ad3b5bc..48b41b8 100644 --- a/pokeData/heliolisk +++ b/pokeData/heliolisk @@ -5,8 +5,7 @@ generate energy. A single Heliolisk can generate sufficient electricity to power a skyscraper. - Evolution Chain - Helioptile ► Heliolisk + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 62 @@ -17,7 +16,7 @@ speed: 109 Genus: Generator Pokémon - Happiness: 50 Pokedex ID: 695 + Happiness: 50 Pokedex ID: 696 Base Exp: 168 Capture Rate: 75 Height: 10 Weight: 210 @@ -61,4 +60,4 @@ HP in damage after each turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/helioptile b/pokeData/helioptile index a6fc666..4f26a07 100644 --- a/pokeData/helioptile +++ b/pokeData/helioptile @@ -5,8 +5,7 @@ They can generate their energy from basking in the sun, so eating food is not a requirement. - Evolution Chain - Helioptile ► Heliolisk + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 44 @@ -17,7 +16,7 @@ speed: 70 Genus: Generator Pokémon - Happiness: 50 Pokedex ID: 694 + Happiness: 50 Pokedex ID: 695 Base Exp: 58 Capture Rate: 190 Height: 5 Weight: 60 diff --git a/pokeData/heracross b/pokeData/heracross index d4e28b8..65108a8 100644 --- a/pokeData/heracross +++ b/pokeData/heracross @@ -16,7 +16,7 @@ speed: 85 Genus: Single Horn Pokémon - Happiness: 50 Pokedex ID: 214 + Happiness: 50 Pokedex ID: 244 Base Exp: 175 Capture Rate: 45 Height: 15 Weight: 540 diff --git a/pokeData/herdier b/pokeData/herdier index 6202ca5..e4f756b 100644 --- a/pokeData/herdier +++ b/pokeData/herdier @@ -17,7 +17,7 @@ speed: 60 Genus: Loyal Dog Pokémon - Happiness: 50 Pokedex ID: 507 + Happiness: 50 Pokedex ID: 508 Base Exp: 130 Capture Rate: 120 Height: 9 Weight: 147 diff --git a/pokeData/hippopotas b/pokeData/hippopotas index f878cdb..4cc3060 100644 --- a/pokeData/hippopotas +++ b/pokeData/hippopotas @@ -16,7 +16,7 @@ speed: 32 Genus: Hippo Pokémon - Happiness: 50 Pokedex ID: 449 + Happiness: 50 Pokedex ID: 469 Base Exp: 66 Capture Rate: 140 Height: 8 Weight: 495 diff --git a/pokeData/hippowdon b/pokeData/hippowdon index 71cf6e6..2940de8 100644 --- a/pokeData/hippowdon +++ b/pokeData/hippowdon @@ -17,7 +17,7 @@ speed: 47 Genus: Heavyweight Pokémon - Happiness: 50 Pokedex ID: 450 + Happiness: 50 Pokedex ID: 470 Base Exp: 184 Capture Rate: 60 Height: 20 Weight: 3000 diff --git a/pokeData/hitmonchan b/pokeData/hitmonchan index 27e016d..4fcac67 100644 --- a/pokeData/hitmonchan +++ b/pokeData/hitmonchan @@ -8,7 +8,7 @@ Evolution Chain Tyrogue ► Hitmonlee -Stage 2 Forms: + Stage 2 Forms: hitmonlee hitmonchan hitmontop @@ -22,7 +22,7 @@ Stage 2 Forms: speed: 76 Genus: Punching Pokémon - Happiness: 50 Pokedex ID: 107 + Happiness: 50 Pokedex ID: 117 Base Exp: 159 Capture Rate: 45 Height: 14 Weight: 502 diff --git a/pokeData/hitmonlee b/pokeData/hitmonlee index 9054ca3..99a9e8e 100644 --- a/pokeData/hitmonlee +++ b/pokeData/hitmonlee @@ -8,7 +8,7 @@ Evolution Chain Tyrogue ► Hitmonlee -Stage 2 Forms: + Stage 2 Forms: hitmonlee hitmonchan hitmontop @@ -22,7 +22,7 @@ Stage 2 Forms: speed: 87 Genus: Kicking Pokémon - Happiness: 50 Pokedex ID: 106 + Happiness: 50 Pokedex ID: 116 Base Exp: 159 Capture Rate: 45 Height: 15 Weight: 498 diff --git a/pokeData/hitmontop b/pokeData/hitmontop index c29876d..a3572ee 100644 --- a/pokeData/hitmontop +++ b/pokeData/hitmontop @@ -7,7 +7,7 @@ Evolution Chain Tyrogue ► Hitmonlee -Stage 2 Forms: + Stage 2 Forms: hitmonlee hitmonchan hitmontop @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 70 Genus: Handstand Pokémon - Happiness: 50 Pokedex ID: 237 + Happiness: 50 Pokedex ID: 118 Base Exp: 159 Capture Rate: 45 Height: 14 Weight: 480 @@ -32,7 +32,26 @@ Stage 2 Forms: Intimidate: - + When this Pokémon enters battle, + the opponent's Attack is lowered + by one stage. In a double battle, + both opponents are affected. + + This ability also takes effect + when acquired during a battle, + but will not take effect again + if lost and reobtained without + leaving battle. + + This ability has no effect + on an opponent that has a substitute. + + Overworld: If the first Pokémon + in the party has this ability, + any random encounter with a Pokémon + five or more levels lower than + it has a 50% chance of being + skipped. Technician: @@ -54,4 +73,4 @@ Stage 2 Forms: its Speed rises one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ho-oh b/pokeData/ho-oh index 99083bb..96ee33b 100644 --- a/pokeData/ho-oh +++ b/pokeData/ho-oh @@ -16,7 +16,7 @@ speed: 90 Genus: Rainbow Pokémon - Happiness: 0 Pokedex ID: 250 + Happiness: 0 Pokedex ID: 275 Base Exp: 340 Capture Rate: 3 Height: 38 Weight: 1990 diff --git a/pokeData/honchkrow b/pokeData/honchkrow index 842cc69..0e195a0 100644 --- a/pokeData/honchkrow +++ b/pokeData/honchkrow @@ -16,7 +16,7 @@ speed: 71 Genus: Big Boss Pokémon - Happiness: 35 Pokedex ID: 430 + Happiness: 35 Pokedex ID: 228 Base Exp: 177 Capture Rate: 30 Height: 9 Weight: 273 diff --git a/pokeData/honedge b/pokeData/honedge index 134b0e6..393b7eb 100644 --- a/pokeData/honedge +++ b/pokeData/honedge @@ -18,7 +18,7 @@ speed: 28 Genus: Sword Pokémon - Happiness: 50 Pokedex ID: 679 + Happiness: 50 Pokedex ID: 680 Base Exp: 65 Capture Rate: 180 Height: 8 Weight: 20 diff --git a/pokeData/hoopa b/pokeData/hoopa index 0e11ce5..219929b 100644 --- a/pokeData/hoopa +++ b/pokeData/hoopa @@ -33,4 +33,4 @@ move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/hoothoot b/pokeData/hoothoot index db2b65c..2b9ad2c 100644 --- a/pokeData/hoothoot +++ b/pokeData/hoothoot @@ -17,7 +17,7 @@ speed: 50 Genus: Owl Pokémon - Happiness: 50 Pokedex ID: 163 + Happiness: 50 Pokedex ID: 195 Base Exp: 52 Capture Rate: 255 Height: 7 Weight: 212 diff --git a/pokeData/hoppip b/pokeData/hoppip index 0a07e35..de12d42 100644 --- a/pokeData/hoppip +++ b/pokeData/hoppip @@ -1,5 +1,5 @@ - Type Pokémon + Hoppip Grass Type Pokémon To keep from being blown away by the wind, they gather in clusters. @@ -9,16 +9,53 @@ Hoppip ► Skiploom ► Jumpluff ↞--------| STATS |--------↠ + hp: 35 + attack: 35 + defense: 40 + special-attack: 35 + special-defense: 55 + speed: 50 Genus: Cottonweed Pokémon - Happiness: 70 Pokedex ID: - Base Exp: Capture Rate: 255 - Height: Weight: + Happiness: 70 Pokedex ID: 216 + Base Exp: 50 Capture Rate: 255 + Height: 4 Weight: 5 Types: + Grass + Flying ↞---------------|ABILITIES|---------------↠ + Chlorophyll: + + This Pokémon's Speed is doubled + during strong sunlight. + + This bonus does not count as + a stat modifier. + + Leaf-guard: + + This Pokémon cannot be given + a major status ailment during + strong sunlight. + + This ability does not heal + prior status ailments. rest will + fail altogether with this ability + in effect. yawn will immediately + fail if used on this Pokémon + during strong sunlight, and an + already-used Yawn will fail if + the weather turns to strong sunlight + in the meantime. + + Infiltrator: + + This Pokémon's moves ignore + light screen, reflect, and safeguard. + Location Areas: Fuego ironworks area diff --git a/pokeData/horsea b/pokeData/horsea index d4157e3..8d45b59 100644 --- a/pokeData/horsea +++ b/pokeData/horsea @@ -17,7 +17,7 @@ speed: 60 Genus: Dragon Pokémon - Happiness: 50 Pokedex ID: 116 + Happiness: 50 Pokedex ID: 132 Base Exp: 59 Capture Rate: 225 Height: 4 Weight: 80 diff --git a/pokeData/houndoom b/pokeData/houndoom index 53fd87e..af70363 100644 --- a/pokeData/houndoom +++ b/pokeData/houndoom @@ -16,7 +16,7 @@ speed: 95 Genus: Dark Pokémon - Happiness: 35 Pokedex ID: 229 + Happiness: 35 Pokedex ID: 262 Base Exp: 175 Capture Rate: 45 Height: 14 Weight: 350 diff --git a/pokeData/houndour b/pokeData/houndour index f0bfc41..c71185d 100644 --- a/pokeData/houndour +++ b/pokeData/houndour @@ -17,7 +17,7 @@ speed: 65 Genus: Dark Pokémon - Happiness: 35 Pokedex ID: 228 + Happiness: 35 Pokedex ID: 261 Base Exp: 66 Capture Rate: 120 Height: 6 Weight: 108 diff --git a/pokeData/huntail b/pokeData/huntail index 9839d73..83abf5c 100644 --- a/pokeData/huntail +++ b/pokeData/huntail @@ -10,7 +10,7 @@ Evolution Chain Clamperl ► Huntail -Stage 2 Forms: + Stage 2 Forms: huntail gorebyss @@ -23,7 +23,7 @@ Stage 2 Forms: speed: 52 Genus: Deep Sea Pokémon - Happiness: 70 Pokedex ID: 367 + Happiness: 70 Pokedex ID: 397 Base Exp: 170 Capture Rate: 60 Height: 17 Weight: 270 diff --git a/pokeData/hydreigon b/pokeData/hydreigon index fe0f489..630bf27 100644 --- a/pokeData/hydreigon +++ b/pokeData/hydreigon @@ -18,7 +18,7 @@ speed: 98 Genus: Brutal Pokémon - Happiness: 35 Pokedex ID: 635 + Happiness: 35 Pokedex ID: 636 Base Exp: 300 Capture Rate: 45 Height: 18 Weight: 1600 @@ -40,4 +40,4 @@ is not disabled during roost. - Location Areas: + Location Areas Unknown diff --git a/pokeData/hypno b/pokeData/hypno index 554665f..9862777 100644 --- a/pokeData/hypno +++ b/pokeData/hypno @@ -17,7 +17,7 @@ speed: 67 Genus: Hypnosis Pokémon - Happiness: 70 Pokedex ID: 97 + Happiness: 70 Pokedex ID: 106 Base Exp: 169 Capture Rate: 75 Height: 16 Weight: 756 @@ -41,36 +41,7 @@ Forewarn: - When this Pokémon enters battle, - it reveals the move with the - highest base power known by any - opposing Pokémon to all participating - trainers. - - In the event of a tie, one - is chosen at random. - - Moves without a listed base - power are assigned one as follows: - - Power | Moves -----: | ----- - 160 | One-hit KO moves: fissure, - guillotine, horn drill, and sheer - cold - 120 | Counter moves: counter, - metal burst, and mirror coat - 80 | Variable power or set - damage: crush grip, dragon rage, - electro ball, endeavor, final - gambit, flail, frustration, grass - knot, gyro ball, heat crash, - heavy slam, hidden power, low - kick, natural gift, night shade, - psywave, return, reversal, seismic - toss, sonic boom, trump card, - and wring out - 0 | Any such move not listed + Inner-focus: diff --git a/pokeData/igglybuff b/pokeData/igglybuff index c32d161..425896b 100644 --- a/pokeData/igglybuff +++ b/pokeData/igglybuff @@ -17,7 +17,7 @@ speed: 15 Genus: Balloon Pokémon - Happiness: 50 Pokedex ID: 174 + Happiness: 50 Pokedex ID: 41 Base Exp: 42 Capture Rate: 170 Height: 3 Weight: 10 diff --git a/pokeData/illumise b/pokeData/illumise index 2ae3313..780a37a 100644 --- a/pokeData/illumise +++ b/pokeData/illumise @@ -15,7 +15,7 @@ speed: 85 Genus: Firefly Pokémon - Happiness: 70 Pokedex ID: 314 + Happiness: 70 Pokedex ID: 340 Base Exp: 151 Capture Rate: 150 Height: 6 Weight: 177 diff --git a/pokeData/impidimp b/pokeData/impidimp index df456a9..ad2b45b 100644 --- a/pokeData/impidimp +++ b/pokeData/impidimp @@ -65,4 +65,4 @@ steal from a trained Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/incineroar b/pokeData/incineroar index 2a15799..d02eb17 100644 --- a/pokeData/incineroar +++ b/pokeData/incineroar @@ -59,4 +59,4 @@ skipped. - Location Areas: + Location Areas Unknown diff --git a/pokeData/indeedee b/pokeData/indeedee index e3268ae..748f305 100644 --- a/pokeData/indeedee +++ b/pokeData/indeedee @@ -1,5 +1,5 @@ - Type Pokémon + Indeedee-male Psychic Type Pokémon It uses the horns on its head to sense the emotions of others. @@ -9,15 +9,61 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 60 + attack: 65 + defense: 55 + special-attack: 105 + special-defense: 95 + speed: 95 Genus: Emotion Pokémon - Happiness: 140 Pokedex ID: - Base Exp: Capture Rate: 30 - Height: Weight: + Happiness: 140 Pokedex ID: 876 + Base Exp: 166 Capture Rate: 30 + Height: 9 Weight: 280 Types: + Psychic + Normal ↞---------------|ABILITIES|---------------↠ + Inner-focus: - Location Areas: + This Pokémon cannot flinch. + + Synchronize: + + Whenever this Pokémon is burned, + paralyzed, or poisoned, the Pokémon + who gave this Pokémon that ailment + is also given the ailment. + + This ability passes back bad + poison when this Pokémon is badly + poisoned. This ability cannot + pass on a status ailment that + the Pokémon did not directly + receive from another Pokémon, + such as the poison from toxic + spikes or the burn from a flame + orb. + + Overworld: If the lead Pokémon + has this ability, wild Pokémon + have a 50% chance of having the + lead Pokémon's nature, and a + 50% chance of being given a random + nature as usual, including the + lead Pokémon's nature. This does + not work on Pokémon received + outside of battle or roaming + legendaries. + + Psychic-surge: + + When this Pokémon enters battle, + it changes the terrain to psychic + terrain. + + + Location Areas Unknown diff --git a/pokeData/infernape b/pokeData/infernape index 374e684..c93bc52 100644 --- a/pokeData/infernape +++ b/pokeData/infernape @@ -16,7 +16,7 @@ speed: 108 Genus: Flame Pokémon - Happiness: 70 Pokedex ID: 392 + Happiness: 70 Pokedex ID: 422 Base Exp: 240 Capture Rate: 45 Height: 12 Weight: 550 @@ -45,4 +45,4 @@ attack". - Location Areas: + Location Areas Unknown diff --git a/pokeData/inkay b/pokeData/inkay index cd0d838..51ce51a 100644 --- a/pokeData/inkay +++ b/pokeData/inkay @@ -17,7 +17,7 @@ speed: 45 Genus: Revolving Pokémon - Happiness: 50 Pokedex ID: 686 + Happiness: 50 Pokedex ID: 687 Base Exp: 58 Capture Rate: 190 Height: 4 Weight: 35 diff --git a/pokeData/inteleon b/pokeData/inteleon index e931553..ddf561c 100644 --- a/pokeData/inteleon +++ b/pokeData/inteleon @@ -41,4 +41,4 @@ than the usual double damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ivysaur b/pokeData/ivysaur index 5be2475..5cfc97e 100644 --- a/pokeData/ivysaur +++ b/pokeData/ivysaur @@ -43,4 +43,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/jangmo-o b/pokeData/jangmo-o index f619848..522561a 100644 --- a/pokeData/jangmo-o +++ b/pokeData/jangmo-o @@ -55,4 +55,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/jellicent b/pokeData/jellicent index 5c53720..7830e0a 100644 --- a/pokeData/jellicent +++ b/pokeData/jellicent @@ -17,7 +17,7 @@ speed: 60 Genus: Floating Pokémon - Happiness: 50 Pokedex ID: 593 + Happiness: 50 Pokedex ID: 594 Base Exp: 168 Capture Rate: 60 Height: 22 Weight: 1350 diff --git a/pokeData/jigglypuff b/pokeData/jigglypuff index c8f8e24..7675639 100644 --- a/pokeData/jigglypuff +++ b/pokeData/jigglypuff @@ -17,7 +17,7 @@ speed: 20 Genus: Balloon Pokémon - Happiness: 50 Pokedex ID: 39 + Happiness: 50 Pokedex ID: 42 Base Exp: 95 Capture Rate: 170 Height: 5 Weight: 55 diff --git a/pokeData/jirachi b/pokeData/jirachi index 56c7886..6c3519a 100644 --- a/pokeData/jirachi +++ b/pokeData/jirachi @@ -19,7 +19,7 @@ speed: 100 Genus: Wish Pokémon - Happiness: 100 Pokedex ID: 385 + Happiness: 100 Pokedex ID: 415 Base Exp: 300 Capture Rate: 3 Height: 3 Weight: 11 @@ -48,4 +48,4 @@ secret power is unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/jolteon b/pokeData/jolteon index 42d2aef..b75c084 100644 --- a/pokeData/jolteon +++ b/pokeData/jolteon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 130 Genus: Lightning Pokémon - Happiness: 50 Pokedex ID: 135 + Happiness: 50 Pokedex ID: 159 Base Exp: 184 Capture Rate: 45 Height: 8 Weight: 245 @@ -38,7 +38,19 @@ Stage 2 Forms: Volt-absorb: - + Whenever an electric-type move + hits this Pokémon, it heals for + 1/4 of its maximum HP, negating + any other effect on it. + + This ability will not take + effect if this Pokémon is ground-type + and thus immune to Electric moves. + Electric moves will ignore this + Pokémon's substitute. + + This effect includes non-damaging + moves, i.e. thunder wave. Quick-feet: @@ -53,4 +65,4 @@ Stage 2 Forms: rate is halved. - Location Areas: + Location Areas Unknown diff --git a/pokeData/joltik b/pokeData/joltik index 327b300..11d6f33 100644 --- a/pokeData/joltik +++ b/pokeData/joltik @@ -17,7 +17,7 @@ speed: 65 Genus: Attaching Pokémon - Happiness: 50 Pokedex ID: 595 + Happiness: 50 Pokedex ID: 596 Base Exp: 64 Capture Rate: 190 Height: 1 Weight: 6 diff --git a/pokeData/jumpluff b/pokeData/jumpluff index 7c44bc7..92f1783 100644 --- a/pokeData/jumpluff +++ b/pokeData/jumpluff @@ -17,7 +17,7 @@ speed: 110 Genus: Cottonweed Pokémon - Happiness: 70 Pokedex ID: 189 + Happiness: 70 Pokedex ID: 218 Base Exp: 207 Capture Rate: 45 Height: 8 Weight: 30 @@ -57,4 +57,4 @@ light screen, reflect, and safeguard. - Location Areas: + Location Areas Unknown diff --git a/pokeData/jynx b/pokeData/jynx index 32e14d6..e50d024 100644 --- a/pokeData/jynx +++ b/pokeData/jynx @@ -16,7 +16,7 @@ speed: 95 Genus: Human Shape Pokémon - Happiness: 50 Pokedex ID: 124 + Happiness: 50 Pokedex ID: 144 Base Exp: 159 Capture Rate: 45 Height: 14 Weight: 406 diff --git a/pokeData/kabuto b/pokeData/kabuto index 7c72e25..b5552cc 100644 --- a/pokeData/kabuto +++ b/pokeData/kabuto @@ -5,7 +5,8 @@ from a fossil found in what was once the ocean floor eons ago. - Single Stage Evolution Pokémon + Evolution Chain + Kabuto ► Kabutops ↞--------| STATS |--------↠ hp: 30 @@ -16,7 +17,7 @@ speed: 55 Genus: Shellfish Pokémon - Happiness: 50 Pokedex ID: 140 + Happiness: 50 Pokedex ID: 171 Base Exp: 71 Capture Rate: 45 Height: 5 Weight: 115 diff --git a/pokeData/kabutops b/pokeData/kabutops index 439fb42..58b5dd8 100644 --- a/pokeData/kabutops +++ b/pokeData/kabutops @@ -17,7 +17,7 @@ speed: 80 Genus: Shellfish Pokémon - Happiness: 50 Pokedex ID: 141 + Happiness: 50 Pokedex ID: 172 Base Exp: 173 Capture Rate: 45 Height: 13 Weight: 405 @@ -54,4 +54,4 @@ hit of a multiple-hit move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/kadabra b/pokeData/kadabra index 1671884..d1ad91f 100644 --- a/pokeData/kadabra +++ b/pokeData/kadabra @@ -16,7 +16,7 @@ speed: 105 Genus: Psi Pokémon - Happiness: 50 Pokedex ID: 64 + Happiness: 50 Pokedex ID: 70 Base Exp: 140 Capture Rate: 100 Height: 13 Weight: 565 diff --git a/pokeData/kangaskhan b/pokeData/kangaskhan index 044c181..6777f4b 100644 --- a/pokeData/kangaskhan +++ b/pokeData/kangaskhan @@ -15,7 +15,7 @@ speed: 90 Genus: Parent Pokémon - Happiness: 50 Pokedex ID: 115 + Happiness: 50 Pokedex ID: 131 Base Exp: 172 Capture Rate: 45 Height: 22 Weight: 800 @@ -26,7 +26,13 @@ Early-bird: - + This Pokémon's remaining sleep + turn count falls by 2 rather + than 1. + + If this Pokémon's sleep counter + is at 1, it will fall to 0 and + then the Pokémon will wake up. Scrappy: diff --git a/pokeData/karrablast b/pokeData/karrablast index 1cc3ddb..17b6443 100644 --- a/pokeData/karrablast +++ b/pokeData/karrablast @@ -17,7 +17,7 @@ speed: 60 Genus: Clamping Pokémon - Happiness: 50 Pokedex ID: 588 + Happiness: 50 Pokedex ID: 589 Base Exp: 63 Capture Rate: 200 Height: 5 Weight: 59 @@ -28,7 +28,14 @@ Swarm: - + When this Pokémon has 1/3 or + less of its HP remaining, its + bug-type moves inflict 1.5× as + much regular damage. + + Overworld: If the lead Pokémon + has this ability, the wild encounter + rate is increased. Shed-skin: diff --git a/pokeData/kartana b/pokeData/kartana index c15aebf..c824dc5 100644 --- a/pokeData/kartana +++ b/pokeData/kartana @@ -34,4 +34,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/kecleon b/pokeData/kecleon index a10b7d6..46bfc2a 100644 --- a/pokeData/kecleon +++ b/pokeData/kecleon @@ -16,7 +16,7 @@ speed: 40 Genus: Color Swap Pokémon - Happiness: 70 Pokedex ID: 352 + Happiness: 70 Pokedex ID: 380 Base Exp: 154 Capture Rate: 200 Height: 10 Weight: 220 diff --git a/pokeData/keldeo b/pokeData/keldeo index 81a7569..205c43f 100644 --- a/pokeData/keldeo +++ b/pokeData/keldeo @@ -1,5 +1,5 @@ - Type Pokémon + Meloetta-aria Normal Type Pokémon By blasting water from its hooves, it can glide across water. It @@ -8,15 +8,41 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 100 + attack: 77 + defense: 77 + special-attack: 128 + special-defense: 128 + speed: 90 Genus: Colt Pokémon - Happiness: 35 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 35 Pokedex ID: 648 + Base Exp: 270 Capture Rate: 3 + Height: 6 Weight: 65 Types: + Normal + Psychic ↞---------------|ABILITIES|---------------↠ + Serene-grace: - Location Areas: + This Pokémon's moves have twice + their usual effect chance. + + An effect chance is a move's + chance to inflict a status ailment, + cause a stat change, or make + the target flinch in addition + to the move's main effect. For + example, flamethrower's chance + of burning the target is doubled, + but protect's chance of success + and air cutter's increased critical + hit rate are unaffected. + + secret power is unaffected. + + + Location Areas Unknown diff --git a/pokeData/kingdra b/pokeData/kingdra index 9a50074..304b85f 100644 --- a/pokeData/kingdra +++ b/pokeData/kingdra @@ -17,7 +17,7 @@ speed: 85 Genus: Dragon Pokémon - Happiness: 50 Pokedex ID: 230 + Happiness: 50 Pokedex ID: 134 Base Exp: 270 Capture Rate: 45 Height: 18 Weight: 1520 diff --git a/pokeData/kingler b/pokeData/kingler index 49a9102..ab248fc 100644 --- a/pokeData/kingler +++ b/pokeData/kingler @@ -17,7 +17,7 @@ speed: 75 Genus: Pincer Pokémon - Happiness: 50 Pokedex ID: 99 + Happiness: 50 Pokedex ID: 108 Base Exp: 166 Capture Rate: 60 Height: 13 Weight: 600 diff --git a/pokeData/kirlia b/pokeData/kirlia index 0a5b697..692c524 100644 --- a/pokeData/kirlia +++ b/pokeData/kirlia @@ -1,8 +1,18 @@ Kirlia Psychic Type Pokémon - - Single Stage Evolution Pokémon + It is said that a KIRLIA that + is exposed to the positive emotions + of its TRAINER grows beautiful. + Kirlia controls psychokinetic + powers with its highly developed + brain. + Evolution Chain + Ralts ► Kirlia ► Gardevoir + + Stage 3 Forms: + gardevoir + gallade ↞--------| STATS |--------↠ hp: 38 @@ -12,9 +22,9 @@ special-defense: 55 speed: 50 - Genus: - Happiness: Pokedex ID: 281 - Base Exp: 97 Capture Rate: + Genus: Emotion Pokémon + Happiness: 35 Pokedex ID: 306 + Base Exp: 97 Capture Rate: 120 Height: 8 Weight: 202 Types: diff --git a/pokeData/klang b/pokeData/klang index b8dfe9a..41e2e71 100644 --- a/pokeData/klang +++ b/pokeData/klang @@ -17,7 +17,7 @@ speed: 50 Genus: Gear Pokémon - Happiness: 50 Pokedex ID: 600 + Happiness: 50 Pokedex ID: 601 Base Exp: 154 Capture Rate: 60 Height: 6 Weight: 510 diff --git a/pokeData/kleavor b/pokeData/kleavor index 8f18cee..6a1cb18 100644 --- a/pokeData/kleavor +++ b/pokeData/kleavor @@ -11,7 +11,7 @@ Evolution Chain Scyther ► Scizor -Stage 2 Forms: + Stage 2 Forms: scizor kleavor @@ -71,4 +71,4 @@ Stage 2 Forms: its Speed rises one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/klink b/pokeData/klink index ae948aa..706fce3 100644 --- a/pokeData/klink +++ b/pokeData/klink @@ -17,7 +17,7 @@ speed: 30 Genus: Gear Pokémon - Happiness: 50 Pokedex ID: 599 + Happiness: 50 Pokedex ID: 600 Base Exp: 60 Capture Rate: 130 Height: 3 Weight: 210 diff --git a/pokeData/klinklang b/pokeData/klinklang index ce1a0b8..ff6e510 100644 --- a/pokeData/klinklang +++ b/pokeData/klinklang @@ -16,7 +16,7 @@ speed: 90 Genus: Gear Pokémon - Happiness: 50 Pokedex ID: 601 + Happiness: 50 Pokedex ID: 602 Base Exp: 260 Capture Rate: 30 Height: 6 Weight: 810 diff --git a/pokeData/koffing b/pokeData/koffing index b2c4f7a..a4c9f08 100644 --- a/pokeData/koffing +++ b/pokeData/koffing @@ -17,7 +17,7 @@ speed: 35 Genus: Poison Gas Pokémon - Happiness: 50 Pokedex ID: 109 + Happiness: 50 Pokedex ID: 121 Base Exp: 68 Capture Rate: 190 Height: 6 Weight: 10 diff --git a/pokeData/komala b/pokeData/komala index 1a77777..0f99cea 100644 --- a/pokeData/komala +++ b/pokeData/komala @@ -35,4 +35,4 @@ use sleep talk; and so on. - Location Areas: + Location Areas Unknown diff --git a/pokeData/kommo-o b/pokeData/kommo-o index 8305e74..b02f488 100644 --- a/pokeData/kommo-o +++ b/pokeData/kommo-o @@ -5,7 +5,8 @@ them by jingling the scales on its tail. Weak opponents will crack and flee in panic. - Single Stage Evolution Pokémon + Evolution Chain + Jangmo-o ► Hakamo-o ► Kommo-o ↞--------| STATS |--------↠ hp: 75 @@ -54,4 +55,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/krabby b/pokeData/krabby index 040130d..7ada074 100644 --- a/pokeData/krabby +++ b/pokeData/krabby @@ -16,7 +16,7 @@ speed: 50 Genus: River Crab Pokémon - Happiness: 50 Pokedex ID: 98 + Happiness: 50 Pokedex ID: 107 Base Exp: 65 Capture Rate: 225 Height: 4 Weight: 65 diff --git a/pokeData/kricketot b/pokeData/kricketot index d5394c5..25e00b7 100644 --- a/pokeData/kricketot +++ b/pokeData/kricketot @@ -17,7 +17,7 @@ speed: 25 Genus: Cricket Pokémon - Happiness: 70 Pokedex ID: 401 + Happiness: 70 Pokedex ID: 431 Base Exp: 39 Capture Rate: 255 Height: 3 Weight: 22 diff --git a/pokeData/kricketune b/pokeData/kricketune index 47c8a01..8ae501e 100644 --- a/pokeData/kricketune +++ b/pokeData/kricketune @@ -17,7 +17,7 @@ speed: 65 Genus: Cricket Pokémon - Happiness: 70 Pokedex ID: 402 + Happiness: 70 Pokedex ID: 432 Base Exp: 134 Capture Rate: 45 Height: 10 Weight: 255 diff --git a/pokeData/krokorok b/pokeData/krokorok index d88654d..e6fc995 100644 --- a/pokeData/krokorok +++ b/pokeData/krokorok @@ -17,7 +17,7 @@ speed: 74 Genus: Desert Croc Pokémon - Happiness: 50 Pokedex ID: 552 + Happiness: 50 Pokedex ID: 553 Base Exp: 123 Capture Rate: 90 Height: 10 Weight: 334 diff --git a/pokeData/krookodile b/pokeData/krookodile index 6cc04c5..4568f91 100644 --- a/pokeData/krookodile +++ b/pokeData/krookodile @@ -17,7 +17,7 @@ speed: 92 Genus: Intimidation Pokémon - Happiness: 50 Pokedex ID: 553 + Happiness: 50 Pokedex ID: 554 Base Exp: 260 Capture Rate: 45 Height: 15 Weight: 963 @@ -77,4 +77,4 @@ received by a substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/kubfu b/pokeData/kubfu index 6d261ce..3c2314b 100644 --- a/pokeData/kubfu +++ b/pokeData/kubfu @@ -31,4 +31,4 @@ This Pokémon cannot flinch. - Location Areas: + Location Areas Unknown diff --git a/pokeData/kyogre b/pokeData/kyogre index 0a7854a..20fa42c 100644 --- a/pokeData/kyogre +++ b/pokeData/kyogre @@ -18,7 +18,7 @@ speed: 90 Genus: Sea Basin Pokémon - Happiness: 0 Pokedex ID: 382 + Happiness: 0 Pokedex ID: 412 Base Exp: 335 Capture Rate: 3 Height: 45 Weight: 3520 diff --git a/pokeData/kyurem b/pokeData/kyurem index adbae77..8cf4b5d 100644 --- a/pokeData/kyurem +++ b/pokeData/kyurem @@ -16,7 +16,7 @@ speed: 95 Genus: Boundary Pokémon - Happiness: 0 Pokedex ID: 646 + Happiness: 0 Pokedex ID: 647 Base Exp: 330 Capture Rate: 3 Height: 30 Weight: 3250 @@ -58,4 +58,4 @@ rate increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/lairon b/pokeData/lairon index 7f9e43c..db3a5a0 100644 --- a/pokeData/lairon +++ b/pokeData/lairon @@ -19,7 +19,7 @@ speed: 40 Genus: Iron Armor Pokémon - Happiness: 35 Pokedex ID: 305 + Happiness: 35 Pokedex ID: 331 Base Exp: 151 Capture Rate: 90 Height: 9 Weight: 1200 diff --git a/pokeData/lampent b/pokeData/lampent index 12e9287..e729200 100644 --- a/pokeData/lampent +++ b/pokeData/lampent @@ -17,7 +17,7 @@ speed: 55 Genus: Lamp Pokémon - Happiness: 50 Pokedex ID: 608 + Happiness: 50 Pokedex ID: 609 Base Exp: 130 Capture Rate: 90 Height: 6 Weight: 130 @@ -70,4 +70,4 @@ light screen, reflect, and safeguard. - Location Areas: + Location Areas Unknown diff --git a/pokeData/landorus b/pokeData/landorus index df9dba1..e44a1b7 100644 --- a/pokeData/landorus +++ b/pokeData/landorus @@ -1,5 +1,5 @@ - Type Pokémon + Kyurem Dragon Type Pokémon Lands visited by Landorus grant such bountiful crops that it @@ -8,15 +8,54 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 125 + attack: 130 + defense: 90 + special-attack: 130 + special-defense: 90 + speed: 95 Genus: Abundance Pokémon - Happiness: 90 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 90 Pokedex ID: 646 + Base Exp: 330 Capture Rate: 3 + Height: 30 Weight: 3250 Types: + Dragon + Ice ↞---------------|ABILITIES|---------------↠ + Pressure: - Location Areas: + Moves targetting this Pokémon + use one extra PP. + + This ability stacks if multiple + targets have it. This ability + still affects moves that fail + or miss. This ability does not + affect ally moves that target + either the entire field or just + its side, nor this Pokémon's + self-targetted moves; it does, + however, affect single-targetted + ally moves aimed at this Pokémon, + ally moves that target all other + Pokémon, and opponents' moves + that target the entire field. + If this ability raises a move's + PP cost above its remaining PP, + it will use all remaining PP. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + Overworld: If the lead Pokémon + has this ability, higher-levelled + Pokémon have their encounter + rate increased. + + + Location Areas Unknown diff --git a/pokeData/lanturn b/pokeData/lanturn index 36ac2ed..474b7b5 100644 --- a/pokeData/lanturn +++ b/pokeData/lanturn @@ -17,7 +17,7 @@ speed: 67 Genus: Light Pokémon - Happiness: 50 Pokedex ID: 171 + Happiness: 50 Pokedex ID: 202 Base Exp: 161 Capture Rate: 75 Height: 12 Weight: 225 diff --git a/pokeData/lapras b/pokeData/lapras index 5383a6c..4fb2b47 100644 --- a/pokeData/lapras +++ b/pokeData/lapras @@ -16,7 +16,7 @@ speed: 60 Genus: Transport Pokémon - Happiness: 50 Pokedex ID: 131 + Happiness: 50 Pokedex ID: 155 Base Exp: 187 Capture Rate: 45 Height: 25 Weight: 2200 diff --git a/pokeData/larvesta b/pokeData/larvesta index a3ab898..e8db124 100644 --- a/pokeData/larvesta +++ b/pokeData/larvesta @@ -17,7 +17,7 @@ speed: 60 Genus: Torch Pokémon - Happiness: 50 Pokedex ID: 636 + Happiness: 50 Pokedex ID: 637 Base Exp: 72 Capture Rate: 45 Height: 11 Weight: 288 diff --git a/pokeData/larvitar b/pokeData/larvitar index 9c8daa0..523d7d4 100644 --- a/pokeData/larvitar +++ b/pokeData/larvitar @@ -17,7 +17,7 @@ speed: 41 Genus: Rock Skin Pokémon - Happiness: 35 Pokedex ID: 246 + Happiness: 35 Pokedex ID: 271 Base Exp: 60 Capture Rate: 45 Height: 6 Weight: 720 diff --git a/pokeData/latias b/pokeData/latias index 586fdc2..e8d1428 100644 --- a/pokeData/latias +++ b/pokeData/latias @@ -18,7 +18,7 @@ speed: 110 Genus: Eon Pokémon - Happiness: 90 Pokedex ID: 380 + Happiness: 90 Pokedex ID: 410 Base Exp: 300 Capture Rate: 3 Height: 14 Weight: 400 diff --git a/pokeData/latios b/pokeData/latios index ceaf62d..87855ec 100644 --- a/pokeData/latios +++ b/pokeData/latios @@ -18,7 +18,7 @@ speed: 110 Genus: Eon Pokémon - Happiness: 90 Pokedex ID: 381 + Happiness: 90 Pokedex ID: 411 Base Exp: 300 Capture Rate: 3 Height: 20 Weight: 600 diff --git a/pokeData/leafeon b/pokeData/leafeon index 83482de..2fd9a52 100644 --- a/pokeData/leafeon +++ b/pokeData/leafeon @@ -7,7 +7,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -26,7 +26,7 @@ Stage 2 Forms: speed: 95 Genus: Verdant Pokémon - Happiness: 35 Pokedex ID: 470 + Happiness: 35 Pokedex ID: 163 Base Exp: 184 Capture Rate: 45 Height: 10 Weight: 255 @@ -60,4 +60,4 @@ Stage 2 Forms: a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/leavanny b/pokeData/leavanny index c8b47fd..7d3e800 100644 --- a/pokeData/leavanny +++ b/pokeData/leavanny @@ -17,7 +17,7 @@ speed: 92 Genus: Nurturing Pokémon - Happiness: 70 Pokedex ID: 542 + Happiness: 70 Pokedex ID: 543 Base Exp: 225 Capture Rate: 45 Height: 12 Weight: 205 diff --git a/pokeData/ledian b/pokeData/ledian index d088f06..6726037 100644 --- a/pokeData/ledian +++ b/pokeData/ledian @@ -17,7 +17,7 @@ speed: 85 Genus: Five Star Pokémon - Happiness: 70 Pokedex ID: 166 + Happiness: 70 Pokedex ID: 198 Base Exp: 137 Capture Rate: 90 Height: 14 Weight: 356 diff --git a/pokeData/ledyba b/pokeData/ledyba index 2af0ad8..5fb9214 100644 --- a/pokeData/ledyba +++ b/pokeData/ledyba @@ -17,7 +17,7 @@ speed: 55 Genus: Five Star Pokémon - Happiness: 70 Pokedex ID: 165 + Happiness: 70 Pokedex ID: 197 Base Exp: 53 Capture Rate: 255 Height: 10 Weight: 108 diff --git a/pokeData/lickilicky b/pokeData/lickilicky index 03ef69e..4f74f42 100644 --- a/pokeData/lickilicky +++ b/pokeData/lickilicky @@ -17,7 +17,7 @@ speed: 50 Genus: Licking Pokémon - Happiness: 50 Pokedex ID: 463 + Happiness: 50 Pokedex ID: 120 Base Exp: 180 Capture Rate: 30 Height: 17 Weight: 1400 diff --git a/pokeData/lickitung b/pokeData/lickitung index 5468b84..079ba27 100644 --- a/pokeData/lickitung +++ b/pokeData/lickitung @@ -17,7 +17,7 @@ speed: 30 Genus: Licking Pokémon - Happiness: 50 Pokedex ID: 108 + Happiness: 50 Pokedex ID: 119 Base Exp: 77 Capture Rate: 45 Height: 12 Weight: 655 diff --git a/pokeData/liepard b/pokeData/liepard index f67aee7..e9ca2e2 100644 --- a/pokeData/liepard +++ b/pokeData/liepard @@ -17,7 +17,7 @@ speed: 106 Genus: Cruel Pokémon - Happiness: 50 Pokedex ID: 510 + Happiness: 50 Pokedex ID: 511 Base Exp: 156 Capture Rate: 90 Height: 11 Weight: 375 diff --git a/pokeData/lileep b/pokeData/lileep index b794692..216a7de 100644 --- a/pokeData/lileep +++ b/pokeData/lileep @@ -20,7 +20,7 @@ speed: 23 Genus: Sea Lily Pokémon - Happiness: 50 Pokedex ID: 345 + Happiness: 50 Pokedex ID: 373 Base Exp: 71 Capture Rate: 45 Height: 10 Weight: 238 diff --git a/pokeData/lilligant b/pokeData/lilligant index c7c1767..ed63b06 100644 --- a/pokeData/lilligant +++ b/pokeData/lilligant @@ -18,7 +18,7 @@ speed: 90 Genus: Flowering Pokémon - Happiness: 50 Pokedex ID: 549 + Happiness: 50 Pokedex ID: 550 Base Exp: 168 Capture Rate: 75 Height: 11 Weight: 163 diff --git a/pokeData/lillipup b/pokeData/lillipup index e575f04..f571436 100644 --- a/pokeData/lillipup +++ b/pokeData/lillipup @@ -17,7 +17,7 @@ speed: 55 Genus: Puppy Pokémon - Happiness: 50 Pokedex ID: 506 + Happiness: 50 Pokedex ID: 507 Base Exp: 55 Capture Rate: 255 Height: 4 Weight: 41 diff --git a/pokeData/linoone b/pokeData/linoone index 1dd2525..1fd0adc 100644 --- a/pokeData/linoone +++ b/pokeData/linoone @@ -19,7 +19,7 @@ speed: 100 Genus: Rushing Pokémon - Happiness: 50 Pokedex ID: 264 + Happiness: 50 Pokedex ID: 289 Base Exp: 147 Capture Rate: 90 Height: 5 Weight: 325 diff --git a/pokeData/litleo b/pokeData/litleo index 42e41f6..dbdb222 100644 --- a/pokeData/litleo +++ b/pokeData/litleo @@ -17,7 +17,7 @@ speed: 72 Genus: Lion Cub Pokémon - Happiness: 70 Pokedex ID: 667 + Happiness: 70 Pokedex ID: 668 Base Exp: 74 Capture Rate: 220 Height: 6 Weight: 135 @@ -67,3 +67,4 @@ Location Areas: + Kalos route 22 area diff --git a/pokeData/litten b/pokeData/litten index 69cbec6..924479f 100644 --- a/pokeData/litten +++ b/pokeData/litten @@ -58,4 +58,4 @@ skipped. - Location Areas: + Location Areas Unknown diff --git a/pokeData/litwick b/pokeData/litwick index 10fd754..0d1dea3 100644 --- a/pokeData/litwick +++ b/pokeData/litwick @@ -17,7 +17,7 @@ speed: 20 Genus: Candle Pokémon - Happiness: 50 Pokedex ID: 607 + Happiness: 50 Pokedex ID: 608 Base Exp: 55 Capture Rate: 190 Height: 3 Weight: 31 diff --git a/pokeData/lombre b/pokeData/lombre index a5bb7cc..588036d 100644 --- a/pokeData/lombre +++ b/pokeData/lombre @@ -18,7 +18,7 @@ speed: 50 Genus: Jolly Pokémon - Happiness: 50 Pokedex ID: 271 + Happiness: 50 Pokedex ID: 296 Base Exp: 119 Capture Rate: 120 Height: 12 Weight: 325 diff --git a/pokeData/lopunny b/pokeData/lopunny index 595e2a9..1506c9e 100644 --- a/pokeData/lopunny +++ b/pokeData/lopunny @@ -17,7 +17,7 @@ speed: 105 Genus: Rabbit Pokémon - Happiness: 140 Pokedex ID: 428 + Happiness: 140 Pokedex ID: 455 Base Exp: 168 Capture Rate: 60 Height: 12 Weight: 333 diff --git a/pokeData/lotad b/pokeData/lotad index 8aa95ad..ba99903 100644 --- a/pokeData/lotad +++ b/pokeData/lotad @@ -17,7 +17,7 @@ speed: 30 Genus: Water Weed Pokémon - Happiness: 50 Pokedex ID: 270 + Happiness: 50 Pokedex ID: 295 Base Exp: 44 Capture Rate: 255 Height: 5 Weight: 26 diff --git a/pokeData/loudred b/pokeData/loudred index bdab67a..2ac2ba4 100644 --- a/pokeData/loudred +++ b/pokeData/loudred @@ -18,7 +18,7 @@ speed: 48 Genus: Big Voice Pokémon - Happiness: 50 Pokedex ID: 294 + Happiness: 50 Pokedex ID: 320 Base Exp: 126 Capture Rate: 120 Height: 10 Weight: 405 @@ -54,8 +54,4 @@ affect damage as usual. - Location Areas: - Mt coronet exterior snowfall - Mt coronet exterior blizzard - Hoenn victory road 1f - Desert underpass area + Location Areas Unknown diff --git a/pokeData/lucario b/pokeData/lucario index 5b6a18f..9c73d4e 100644 --- a/pokeData/lucario +++ b/pokeData/lucario @@ -16,7 +16,7 @@ speed: 90 Genus: Aura Pokémon - Happiness: 50 Pokedex ID: 448 + Happiness: 50 Pokedex ID: 468 Base Exp: 184 Capture Rate: 45 Height: 12 Weight: 540 diff --git a/pokeData/ludicolo b/pokeData/ludicolo index 3eff513..c751e68 100644 --- a/pokeData/ludicolo +++ b/pokeData/ludicolo @@ -19,7 +19,7 @@ speed: 70 Genus: Carefree Pokémon - Happiness: 50 Pokedex ID: 272 + Happiness: 50 Pokedex ID: 297 Base Exp: 240 Capture Rate: 45 Height: 15 Weight: 550 @@ -52,4 +52,4 @@ will immediately be healed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/lugia b/pokeData/lugia index 339d293..51b780e 100644 --- a/pokeData/lugia +++ b/pokeData/lugia @@ -16,7 +16,7 @@ speed: 110 Genus: Diving Pokémon - Happiness: 0 Pokedex ID: 249 + Happiness: 0 Pokedex ID: 274 Base Exp: 340 Capture Rate: 3 Height: 52 Weight: 2160 diff --git a/pokeData/lumineon b/pokeData/lumineon index 55e2717..a2b586e 100644 --- a/pokeData/lumineon +++ b/pokeData/lumineon @@ -17,7 +17,7 @@ speed: 91 Genus: Neon Pokémon - Happiness: 70 Pokedex ID: 457 + Happiness: 70 Pokedex ID: 477 Base Exp: 161 Capture Rate: 75 Height: 12 Weight: 240 diff --git a/pokeData/lunala b/pokeData/lunala index 83e9457..93496a2 100644 --- a/pokeData/lunala +++ b/pokeData/lunala @@ -8,7 +8,7 @@ Evolution Chain Cosmog ► Cosmoem ► Solgaleo -Stage 3 Forms: + Stage 3 Forms: solgaleo lunala @@ -40,4 +40,4 @@ Stage 3 Forms: This ability cannot be nullified. - Location Areas: + Location Areas Unknown diff --git a/pokeData/lunatone b/pokeData/lunatone index ea8342a..24918df 100644 --- a/pokeData/lunatone +++ b/pokeData/lunatone @@ -19,7 +19,7 @@ speed: 70 Genus: Meteorite Pokémon - Happiness: 50 Pokedex ID: 337 + Happiness: 50 Pokedex ID: 365 Base Exp: 161 Capture Rate: 45 Height: 10 Weight: 1680 diff --git a/pokeData/lurantis b/pokeData/lurantis index 364d3ca..851e516 100644 --- a/pokeData/lurantis +++ b/pokeData/lurantis @@ -51,4 +51,4 @@ vice versa. - Location Areas: + Location Areas Unknown diff --git a/pokeData/luvdisc b/pokeData/luvdisc index c6c5d16..ab340a0 100644 --- a/pokeData/luvdisc +++ b/pokeData/luvdisc @@ -17,7 +17,7 @@ speed: 97 Genus: Rendezvous Pokémon - Happiness: 70 Pokedex ID: 370 + Happiness: 70 Pokedex ID: 400 Base Exp: 116 Capture Rate: 225 Height: 6 Weight: 87 diff --git a/pokeData/luxio b/pokeData/luxio index 5cb719d..51c5167 100644 --- a/pokeData/luxio +++ b/pokeData/luxio @@ -17,7 +17,7 @@ speed: 60 Genus: Spark Pokémon - Happiness: 100 Pokedex ID: 404 + Happiness: 100 Pokedex ID: 434 Base Exp: 127 Capture Rate: 120 Height: 9 Weight: 305 diff --git a/pokeData/luxray b/pokeData/luxray index df6b49b..4c0799a 100644 --- a/pokeData/luxray +++ b/pokeData/luxray @@ -16,7 +16,7 @@ speed: 70 Genus: Gleam Eyes Pokémon - Happiness: 50 Pokedex ID: 405 + Happiness: 50 Pokedex ID: 435 Base Exp: 262 Capture Rate: 45 Height: 14 Weight: 420 @@ -72,4 +72,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/lycanroc b/pokeData/lycanroc index 3251223..b5f9829 100644 --- a/pokeData/lycanroc +++ b/pokeData/lycanroc @@ -1,5 +1,5 @@ - Type Pokémon + Lycanroc-midday Rock Type Pokémon Its quick movements confuse its enemies. Well equipped with @@ -10,15 +10,56 @@ Rockruff ► Lycanroc ↞--------| STATS |--------↠ + hp: 75 + attack: 115 + defense: 65 + special-attack: 55 + special-defense: 65 + speed: 112 Genus: Wolf Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 90 - Height: Weight: + Happiness: 50 Pokedex ID: 745 + Base Exp: 170 Capture Rate: 90 + Height: 8 Weight: 250 Types: + Rock ↞---------------|ABILITIES|---------------↠ + Keen-eye: - Location Areas: + This Pokémon cannot have its + accuracy lowered. + + This ability does not prevent + any accuracy losses other than + stat modifiers, such as the accuracy + cut from fog; nor does it prevent + other Pokémon's evasion from + making this Pokémon's moves less + accurate. This Pokémon can still + be passed negative accuracy modifiers + through heart swap. + + Overworld: If the first Pokémon + in the party has this ability, + any random encounter with a Pokémon + five or more levels lower than + it has a 50% chance of being + skipped. + + Sand-rush: + + This Pokémon's Speed is doubled + during a sandstorm, and it does + not take sandstorm damage, regardless + of type. + + Steadfast: + + Whenever this Pokémon flinches, + its Speed rises one stage. + + + Location Areas Unknown diff --git a/pokeData/machamp b/pokeData/machamp index 9d00c13..51ead74 100644 --- a/pokeData/machamp +++ b/pokeData/machamp @@ -17,7 +17,7 @@ speed: 55 Genus: Superpower Pokémon - Happiness: 50 Pokedex ID: 68 + Happiness: 50 Pokedex ID: 74 Base Exp: 253 Capture Rate: 45 Height: 16 Weight: 1300 @@ -57,4 +57,4 @@ its Speed rises one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/machoke b/pokeData/machoke index 29e879e..052ef05 100644 --- a/pokeData/machoke +++ b/pokeData/machoke @@ -17,7 +17,7 @@ speed: 45 Genus: Superpower Pokémon - Happiness: 50 Pokedex ID: 67 + Happiness: 50 Pokedex ID: 73 Base Exp: 142 Capture Rate: 90 Height: 15 Weight: 705 diff --git a/pokeData/machop b/pokeData/machop index b80ef1f..6353377 100644 --- a/pokeData/machop +++ b/pokeData/machop @@ -1,5 +1,5 @@ - Type Pokémon + Tentacool Water Type Pokémon Loves to build its muscles. It trains in all styles of martial @@ -9,16 +9,56 @@ Machop ► Machoke ► Machamp ↞--------| STATS |--------↠ + hp: 40 + attack: 40 + defense: 35 + special-attack: 50 + special-defense: 100 + speed: 70 Genus: Superpower Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 180 - Height: Weight: + Happiness: 50 Pokedex ID: 72 + Base Exp: 67 Capture Rate: 180 + Height: 9 Weight: 455 Types: + Water + Poison ↞---------------|ABILITIES|---------------↠ + Clear-body: + + This Pokémon cannot have its + stats lowered by other Pokémon. + + This ability does not prevent + any stat losses other than stat + modifiers, such as the Speed + cut from paralysis. This Pokémon + can still be passed negative + stat modifiers through guard + swap, heart swap, or power swap. + + This ability functions identically + to white smoke in battle. + + Liquid-ooze: + + Whenever a Pokémon would heal + after hitting this Pokémon with + a leeching move like absorb, + it instead loses as many HP as + it would usually gain. + + dream eater is unaffected. + + Rain-dish: + + This Pokémon heals for 1/16 + of its maximum HP after each + turn during rain. + Location Areas: Mt coronet 1f route 207 diff --git a/pokeData/magby b/pokeData/magby index 63f9e11..abeb327 100644 --- a/pokeData/magby +++ b/pokeData/magby @@ -17,7 +17,7 @@ speed: 83 Genus: Live Coal Pokémon - Happiness: 50 Pokedex ID: 240 + Happiness: 50 Pokedex ID: 148 Base Exp: 73 Capture Rate: 45 Height: 7 Weight: 214 @@ -63,3 +63,10 @@ Location Areas: + Stark mountain area + Stark mountain entrance + Stark mountain inside + Sinnoh route 227 area + Johto route 34 area + Virbank complex outer + Virbank complex inner diff --git a/pokeData/magcargo b/pokeData/magcargo index 5ef835c..5211df3 100644 --- a/pokeData/magcargo +++ b/pokeData/magcargo @@ -17,7 +17,7 @@ speed: 30 Genus: Lava Pokémon - Happiness: 70 Pokedex ID: 219 + Happiness: 70 Pokedex ID: 250 Base Exp: 151 Capture Rate: 75 Height: 8 Weight: 550 diff --git a/pokeData/magearna b/pokeData/magearna index f2b3d9f..8cf7c60 100644 --- a/pokeData/magearna +++ b/pokeData/magearna @@ -33,4 +33,4 @@ any Pokémon faints. - Location Areas: + Location Areas Unknown diff --git a/pokeData/magikarp b/pokeData/magikarp index 69a4ffb..7478bee 100644 --- a/pokeData/magikarp +++ b/pokeData/magikarp @@ -17,7 +17,7 @@ speed: 80 Genus: Fish Pokémon - Happiness: 50 Pokedex ID: 129 + Happiness: 50 Pokedex ID: 153 Base Exp: 40 Capture Rate: 255 Height: 9 Weight: 100 diff --git a/pokeData/magmar b/pokeData/magmar index 1997875..44e4c7d 100644 --- a/pokeData/magmar +++ b/pokeData/magmar @@ -17,7 +17,7 @@ speed: 93 Genus: Spitfire Pokémon - Happiness: 50 Pokedex ID: 126 + Happiness: 50 Pokedex ID: 149 Base Exp: 173 Capture Rate: 45 Height: 13 Weight: 445 @@ -63,3 +63,10 @@ Location Areas: + Fuego ironworks area + Burned tower b1f + Mt silver 1f + Pokemon mansion 3f + Pokemon mansion b1f + Mt ember area + Johto safari zone zone peak diff --git a/pokeData/magmortar b/pokeData/magmortar index 2e132a2..91fc255 100644 --- a/pokeData/magmortar +++ b/pokeData/magmortar @@ -17,7 +17,7 @@ speed: 83 Genus: Blast Pokémon - Happiness: 50 Pokedex ID: 467 + Happiness: 50 Pokedex ID: 150 Base Exp: 270 Capture Rate: 30 Height: 16 Weight: 680 @@ -62,4 +62,4 @@ rate increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/magnemite b/pokeData/magnemite index 7d16bb0..8b04100 100644 --- a/pokeData/magnemite +++ b/pokeData/magnemite @@ -17,7 +17,7 @@ speed: 45 Genus: Magnet Pokémon - Happiness: 50 Pokedex ID: 81 + Happiness: 50 Pokedex ID: 88 Base Exp: 65 Capture Rate: 190 Height: 3 Weight: 60 diff --git a/pokeData/magneton b/pokeData/magneton index 29c0476..f8b3dcd 100644 --- a/pokeData/magneton +++ b/pokeData/magneton @@ -17,7 +17,7 @@ speed: 70 Genus: Magnet Pokémon - Happiness: 50 Pokedex ID: 82 + Happiness: 50 Pokedex ID: 89 Base Exp: 163 Capture Rate: 60 Height: 10 Weight: 600 diff --git a/pokeData/magnezone b/pokeData/magnezone index 3520699..2847319 100644 --- a/pokeData/magnezone +++ b/pokeData/magnezone @@ -16,7 +16,7 @@ speed: 60 Genus: Magnet Area Pokémon - Happiness: 50 Pokedex ID: 462 + Happiness: 50 Pokedex ID: 90 Base Exp: 268 Capture Rate: 30 Height: 12 Weight: 1800 diff --git a/pokeData/makuhita b/pokeData/makuhita index 5335b4e..82f414a 100644 --- a/pokeData/makuhita +++ b/pokeData/makuhita @@ -20,7 +20,7 @@ speed: 25 Genus: Guts Pokémon - Happiness: 70 Pokedex ID: 296 + Happiness: 70 Pokedex ID: 322 Base Exp: 47 Capture Rate: 180 Height: 10 Weight: 864 diff --git a/pokeData/malamar b/pokeData/malamar index 73712f8..9878194 100644 --- a/pokeData/malamar +++ b/pokeData/malamar @@ -17,7 +17,7 @@ speed: 73 Genus: Overturning Pokémon - Happiness: 50 Pokedex ID: 687 + Happiness: 50 Pokedex ID: 688 Base Exp: 169 Capture Rate: 80 Height: 15 Weight: 470 @@ -54,4 +54,4 @@ light screen, reflect, and safeguard. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mamoswine b/pokeData/mamoswine index cea3290..35a5099 100644 --- a/pokeData/mamoswine +++ b/pokeData/mamoswine @@ -17,7 +17,7 @@ speed: 80 Genus: Twin Tusk Pokémon - Happiness: 50 Pokedex ID: 473 + Happiness: 50 Pokedex ID: 253 Base Exp: 265 Capture Rate: 50 Height: 25 Weight: 2910 diff --git a/pokeData/manaphy b/pokeData/manaphy index 1b49ec6..8c67e8e 100644 --- a/pokeData/manaphy +++ b/pokeData/manaphy @@ -16,7 +16,7 @@ speed: 100 Genus: Seafaring Pokémon - Happiness: 70 Pokedex ID: 490 + Happiness: 70 Pokedex ID: 491 Base Exp: 270 Capture Rate: 3 Height: 3 Weight: 14 @@ -32,4 +32,4 @@ turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mandibuzz b/pokeData/mandibuzz index c1429bb..ac7e089 100644 --- a/pokeData/mandibuzz +++ b/pokeData/mandibuzz @@ -17,7 +17,7 @@ speed: 80 Genus: Bone Vulture Pokémon - Happiness: 35 Pokedex ID: 630 + Happiness: 35 Pokedex ID: 631 Base Exp: 179 Capture Rate: 60 Height: 12 Weight: 395 diff --git a/pokeData/manectric b/pokeData/manectric index dc286ec..43b1bf0 100644 --- a/pokeData/manectric +++ b/pokeData/manectric @@ -7,7 +7,8 @@ fires. When it enters a battle, Manectric creates thunderclouds. - Single Stage Evolution Pokémon + Evolution Chain + Electrike ► Manectric ↞--------| STATS |--------↠ hp: 70 @@ -18,7 +19,7 @@ speed: 105 Genus: Discharge Pokémon - Happiness: 50 Pokedex ID: 310 + Happiness: 50 Pokedex ID: 336 Base Exp: 166 Capture Rate: 45 Height: 15 Weight: 402 diff --git a/pokeData/mankey b/pokeData/mankey index f8473fa..2c09d0d 100644 --- a/pokeData/mankey +++ b/pokeData/mankey @@ -17,7 +17,7 @@ speed: 70 Genus: Pig Monkey Pokémon - Happiness: 70 Pokedex ID: 56 + Happiness: 70 Pokedex ID: 61 Base Exp: 61 Capture Rate: 190 Height: 5 Weight: 280 diff --git a/pokeData/mantine b/pokeData/mantine index 311e377..bc95fec 100644 --- a/pokeData/mantine +++ b/pokeData/mantine @@ -17,7 +17,7 @@ speed: 70 Genus: Kite Pokémon - Happiness: 50 Pokedex ID: 226 + Happiness: 50 Pokedex ID: 259 Base Exp: 170 Capture Rate: 25 Height: 21 Weight: 2200 diff --git a/pokeData/mantyke b/pokeData/mantyke index 676f2b8..d49e4af 100644 --- a/pokeData/mantyke +++ b/pokeData/mantyke @@ -16,7 +16,7 @@ speed: 50 Genus: Kite Pokémon - Happiness: 50 Pokedex ID: 458 + Happiness: 50 Pokedex ID: 258 Base Exp: 69 Capture Rate: 25 Height: 10 Weight: 650 diff --git a/pokeData/maractus b/pokeData/maractus index 1df7276..08a9f6b 100644 --- a/pokeData/maractus +++ b/pokeData/maractus @@ -16,7 +16,7 @@ speed: 60 Genus: Cactus Pokémon - Happiness: 50 Pokedex ID: 556 + Happiness: 50 Pokedex ID: 557 Base Exp: 161 Capture Rate: 255 Height: 10 Weight: 280 diff --git a/pokeData/mareanie b/pokeData/mareanie index c941e5e..5548997 100644 --- a/pokeData/mareanie +++ b/pokeData/mareanie @@ -55,4 +55,4 @@ effect when a battle ends. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mareep b/pokeData/mareep index bb0ef6e..0a12d82 100644 --- a/pokeData/mareep +++ b/pokeData/mareep @@ -17,7 +17,7 @@ speed: 35 Genus: Wool Pokémon - Happiness: 70 Pokedex ID: 179 + Happiness: 70 Pokedex ID: 208 Base Exp: 56 Capture Rate: 235 Height: 6 Weight: 78 diff --git a/pokeData/marill b/pokeData/marill index 8a01d04..8b60922 100644 --- a/pokeData/marill +++ b/pokeData/marill @@ -17,7 +17,7 @@ speed: 40 Genus: Aqua Mouse Pokémon - Happiness: 50 Pokedex ID: 183 + Happiness: 50 Pokedex ID: 212 Base Exp: 88 Capture Rate: 190 Height: 4 Weight: 85 diff --git a/pokeData/marowak b/pokeData/marowak index 4eaa099..4321e8d 100644 --- a/pokeData/marowak +++ b/pokeData/marowak @@ -17,7 +17,7 @@ speed: 45 Genus: Bone Keeper Pokémon - Happiness: 50 Pokedex ID: 105 + Happiness: 50 Pokedex ID: 114 Base Exp: 149 Capture Rate: 75 Height: 10 Weight: 450 diff --git a/pokeData/marshadow b/pokeData/marshadow index a5eb137..77eb951 100644 --- a/pokeData/marshadow +++ b/pokeData/marshadow @@ -41,4 +41,4 @@ power boost for rollout. - Location Areas: + Location Areas Unknown diff --git a/pokeData/marshtomp b/pokeData/marshtomp index a316af0..1f5d951 100644 --- a/pokeData/marshtomp +++ b/pokeData/marshtomp @@ -19,7 +19,7 @@ speed: 50 Genus: Mud Fish Pokémon - Happiness: 50 Pokedex ID: 259 + Happiness: 50 Pokedex ID: 284 Base Exp: 142 Capture Rate: 45 Height: 7 Weight: 280 @@ -44,4 +44,4 @@ effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/masquerain b/pokeData/masquerain index 517d6c4..98a1879 100644 --- a/pokeData/masquerain +++ b/pokeData/masquerain @@ -20,7 +20,7 @@ speed: 80 Genus: Eyeball Pokémon - Happiness: 70 Pokedex ID: 284 + Happiness: 70 Pokedex ID: 310 Base Exp: 159 Capture Rate: 75 Height: 8 Weight: 36 @@ -64,6 +64,4 @@ a target's Berry. - Location Areas: - Sinnoh route 229 area - Kalos route 3 area + Location Areas Unknown diff --git a/pokeData/mawile b/pokeData/mawile index c69a218..745dc66 100644 --- a/pokeData/mawile +++ b/pokeData/mawile @@ -19,7 +19,7 @@ speed: 50 Genus: Deceiver Pokémon - Happiness: 50 Pokedex ID: 303 + Happiness: 50 Pokedex ID: 329 Base Exp: 133 Capture Rate: 45 Height: 6 Weight: 115 diff --git a/pokeData/medicham b/pokeData/medicham index 56a4e8f..eabf9bf 100644 --- a/pokeData/medicham +++ b/pokeData/medicham @@ -19,7 +19,7 @@ speed: 80 Genus: Meditate Pokémon - Happiness: 70 Pokedex ID: 308 + Happiness: 70 Pokedex ID: 334 Base Exp: 144 Capture Rate: 90 Height: 13 Weight: 315 diff --git a/pokeData/meditite b/pokeData/meditite index eb94a26..e5c9944 100644 --- a/pokeData/meditite +++ b/pokeData/meditite @@ -20,7 +20,7 @@ speed: 60 Genus: Meditate Pokémon - Happiness: 70 Pokedex ID: 307 + Happiness: 70 Pokedex ID: 333 Base Exp: 56 Capture Rate: 180 Height: 6 Weight: 112 diff --git a/pokeData/meganium b/pokeData/meganium index 7492a8c..653eb1a 100644 --- a/pokeData/meganium +++ b/pokeData/meganium @@ -16,7 +16,7 @@ speed: 80 Genus: Herb Pokémon - Happiness: 70 Pokedex ID: 154 + Happiness: 70 Pokedex ID: 186 Base Exp: 236 Capture Rate: 45 Height: 18 Weight: 1005 @@ -49,4 +49,4 @@ in the meantime. - Location Areas: + Location Areas Unknown diff --git a/pokeData/melmetal b/pokeData/melmetal index 47a9335..c6f0a86 100644 --- a/pokeData/melmetal +++ b/pokeData/melmetal @@ -37,4 +37,4 @@ attack". - Location Areas: + Location Areas Unknown diff --git a/pokeData/meloetta b/pokeData/meloetta index d140139..2ce8cc5 100644 --- a/pokeData/meloetta +++ b/pokeData/meloetta @@ -1,5 +1,5 @@ - Type Pokémon + Genesect Bug Type Pokémon Its melodies are sung with a special vocalization method that @@ -8,15 +8,36 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 71 + attack: 120 + defense: 95 + special-attack: 120 + special-defense: 95 + speed: 99 Genus: Melody Pokémon - Happiness: 100 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 100 Pokedex ID: 649 + Base Exp: 300 Capture Rate: 3 + Height: 15 Weight: 825 Types: + Bug + Steel ↞---------------|ABILITIES|---------------↠ + Download: - Location Areas: + When this Pokémon enters battle, + its Attack or Special Attack, + whichever corresponds to its + opponents' weaker total defensive + stat, rises one stage. In the + event of a tie, Special Attack + is raised. + + This ability also takes effect + when acquired during a battle. + + + Location Areas Unknown diff --git a/pokeData/meltan b/pokeData/meltan index 1b08eb6..9c0b4d9 100644 --- a/pokeData/meltan +++ b/pokeData/meltan @@ -42,4 +42,4 @@ rate. - Location Areas: + Location Areas Unknown diff --git a/pokeData/meowstic b/pokeData/meowstic index 95427dc..c6c064e 100644 --- a/pokeData/meowstic +++ b/pokeData/meowstic @@ -1,5 +1,5 @@ - Type Pokémon + Honedge Steel Type Pokémon When in danger, it raises its ears and releases enough psychic @@ -9,15 +9,37 @@ Espurr ► Meowstic ↞--------| STATS |--------↠ + hp: 45 + attack: 80 + defense: 100 + special-attack: 35 + special-defense: 37 + speed: 28 Genus: Constraint Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 75 - Height: Weight: + Happiness: 50 Pokedex ID: 679 + Base Exp: 65 Capture Rate: 75 + Height: 8 Weight: 20 Types: + Steel + Ghost ↞---------------|ABILITIES|---------------↠ + No-guard: - Location Areas: + Moves used by or against this + Pokémon never miss. + + One-hit KO moves are unaffected. + Moves affected by this ability + can hit Pokémon during the preparation + turn of moves like dig or fly. + + Overworld: If the lead Pokémon + has this ability, the wild encounter + rate is doubled. + + + Location Areas Unknown diff --git a/pokeData/meowth b/pokeData/meowth index 63beefb..220caeb 100644 --- a/pokeData/meowth +++ b/pokeData/meowth @@ -8,7 +8,7 @@ Evolution Chain Meowth ► Persian -Stage 2 Forms: + Stage 2 Forms: persian perrserker @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 90 Genus: Scratch Cat Pokémon - Happiness: 50 Pokedex ID: 52 + Happiness: 50 Pokedex ID: 57 Base Exp: 58 Capture Rate: 255 Height: 4 Weight: 42 diff --git a/pokeData/mesprit b/pokeData/mesprit index 467fbfd..271e8ff 100644 --- a/pokeData/mesprit +++ b/pokeData/mesprit @@ -15,7 +15,7 @@ speed: 80 Genus: Emotion Pokémon - Happiness: 140 Pokedex ID: 481 + Happiness: 140 Pokedex ID: 482 Base Exp: 290 Capture Rate: 3 Height: 3 Weight: 3 diff --git a/pokeData/metagross b/pokeData/metagross index 32f26e4..65b623b 100644 --- a/pokeData/metagross +++ b/pokeData/metagross @@ -20,7 +20,7 @@ speed: 70 Genus: Iron Leg Pokémon - Happiness: 35 Pokedex ID: 376 + Happiness: 35 Pokedex ID: 406 Base Exp: 300 Capture Rate: 3 Height: 16 Weight: 5500 diff --git a/pokeData/metang b/pokeData/metang index 9fca3ab..c2d92f4 100644 --- a/pokeData/metang +++ b/pokeData/metang @@ -20,7 +20,7 @@ speed: 50 Genus: Iron Claw Pokémon - Happiness: 35 Pokedex ID: 375 + Happiness: 35 Pokedex ID: 405 Base Exp: 147 Capture Rate: 3 Height: 12 Weight: 2025 diff --git a/pokeData/mew b/pokeData/mew index 48e09ad..3f36e66 100644 --- a/pokeData/mew +++ b/pokeData/mew @@ -16,7 +16,7 @@ speed: 100 Genus: New Species Pokémon - Happiness: 100 Pokedex ID: 151 + Happiness: 100 Pokedex ID: 183 Base Exp: 300 Capture Rate: 45 Height: 4 Weight: 40 diff --git a/pokeData/mewtwo b/pokeData/mewtwo index 84578f7..07db88f 100644 --- a/pokeData/mewtwo +++ b/pokeData/mewtwo @@ -16,7 +16,7 @@ speed: 130 Genus: Genetic Pokémon - Happiness: 0 Pokedex ID: 150 + Happiness: 0 Pokedex ID: 182 Base Exp: 340 Capture Rate: 3 Height: 20 Weight: 1220 diff --git a/pokeData/mienfoo b/pokeData/mienfoo index 97f696f..e0dc775 100644 --- a/pokeData/mienfoo +++ b/pokeData/mienfoo @@ -17,7 +17,7 @@ speed: 65 Genus: Martial Arts Pokémon - Happiness: 50 Pokedex ID: 619 + Happiness: 50 Pokedex ID: 620 Base Exp: 70 Capture Rate: 180 Height: 9 Weight: 200 diff --git a/pokeData/mienshao b/pokeData/mienshao index 78357c1..4d8b379 100644 --- a/pokeData/mienshao +++ b/pokeData/mienshao @@ -17,7 +17,7 @@ speed: 105 Genus: Martial Arts Pokémon - Happiness: 50 Pokedex ID: 620 + Happiness: 50 Pokedex ID: 621 Base Exp: 179 Capture Rate: 45 Height: 14 Weight: 355 diff --git a/pokeData/mightyena b/pokeData/mightyena index a365f0c..8d0ca39 100644 --- a/pokeData/mightyena +++ b/pokeData/mightyena @@ -19,7 +19,7 @@ speed: 70 Genus: Bite Pokémon - Happiness: 70 Pokedex ID: 262 + Happiness: 70 Pokedex ID: 287 Base Exp: 147 Capture Rate: 127 Height: 10 Weight: 370 diff --git a/pokeData/milcery b/pokeData/milcery index 544127b..6abffff 100644 --- a/pokeData/milcery +++ b/pokeData/milcery @@ -4,8 +4,7 @@ This Pokémon was born from sweet-smelling particles in the air. Its body is made of cream. - Evolution Chain - Milcery ► Alcremie + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 45 @@ -36,4 +35,4 @@ that affect their mental state. - Location Areas: + Location Areas Unknown diff --git a/pokeData/milotic b/pokeData/milotic index 8fcfc11..32ac73d 100644 --- a/pokeData/milotic +++ b/pokeData/milotic @@ -17,7 +17,7 @@ speed: 81 Genus: Tender Pokémon - Happiness: 50 Pokedex ID: 350 + Happiness: 50 Pokedex ID: 378 Base Exp: 189 Capture Rate: 60 Height: 62 Weight: 1620 diff --git a/pokeData/miltank b/pokeData/miltank index 4684185..74f9e68 100644 --- a/pokeData/miltank +++ b/pokeData/miltank @@ -15,7 +15,7 @@ speed: 100 Genus: Milk Cow Pokémon - Happiness: 50 Pokedex ID: 241 + Happiness: 50 Pokedex ID: 267 Base Exp: 172 Capture Rate: 45 Height: 12 Weight: 755 diff --git a/pokeData/mime-jr b/pokeData/mime-jr index fb74ff2..e9bc43c 100644 --- a/pokeData/mime-jr +++ b/pokeData/mime-jr @@ -17,7 +17,7 @@ speed: 60 Genus: Mime Pokémon - Happiness: 50 Pokedex ID: 439 + Happiness: 50 Pokedex ID: 139 Base Exp: 62 Capture Rate: 145 Height: 6 Weight: 130 diff --git a/pokeData/mimikyu b/pokeData/mimikyu index 308a5fe..b94806b 100644 --- a/pokeData/mimikyu +++ b/pokeData/mimikyu @@ -1,5 +1,5 @@ - Type Pokémon + Mimikyu-disguised Ghost Type Pokémon Its actual appearance is unknown. A scholar who saw what was under @@ -8,15 +8,35 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 55 + attack: 90 + defense: 80 + special-attack: 50 + special-defense: 105 + speed: 96 Genus: Disguise Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 50 Pokedex ID: 778 + Base Exp: 167 Capture Rate: 45 + Height: 2 Weight: 7 Types: + Ghost + Fairy ↞---------------|ABILITIES|---------------↠ + Disguise: - Location Areas: + If this Pokémon is in its Disguised + Form and takes damage from a + move, it switches to its Busted + Form and the damage is prevented. + Other effects are not prevented. + + This ability cannot be copied + or replaced. This ability only + takes effect for Mimikyu. + + + Location Areas Unknown diff --git a/pokeData/minccino b/pokeData/minccino index 2f350f4..3a05245 100644 --- a/pokeData/minccino +++ b/pokeData/minccino @@ -17,7 +17,7 @@ speed: 75 Genus: Chinchilla Pokémon - Happiness: 50 Pokedex ID: 572 + Happiness: 50 Pokedex ID: 573 Base Exp: 60 Capture Rate: 255 Height: 4 Weight: 58 diff --git a/pokeData/minior b/pokeData/minior index 2c265be..c50ebbf 100644 --- a/pokeData/minior +++ b/pokeData/minior @@ -1,5 +1,5 @@ - Type Pokémon + Minior-red-meteor Rock Type Pokémon Originally making its home in the ozone layer, it hurtles to @@ -8,15 +8,42 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 60 + attack: 60 + defense: 100 + special-attack: 60 + special-defense: 100 + speed: 60 Genus: Meteor Pokémon - Happiness: 70 Pokedex ID: - Base Exp: Capture Rate: 30 - Height: Weight: + Happiness: 70 Pokedex ID: 774 + Base Exp: 154 Capture Rate: 30 + Height: 3 Weight: 400 Types: + Rock + Flying ↞---------------|ABILITIES|---------------↠ + Shields-down: - Location Areas: + When this Pokémon enters battle + and at the end of each turn, + if its HP is 50% or above, it + changes into Meteor Form; otherwise, + it changes into Core Form. In + Meteor Form, it cannot be given + a major status ailment (though + existing ones are not cured), + cannot become drowsy from yawn, + and cannot use rest (which will + simply fail). + + This ability cannot be copied, + replaced, or nullified. This + ability only takes effect for + Minior. + + + Location Areas Unknown diff --git a/pokeData/minun b/pokeData/minun index d08eaea..57e44f0 100644 --- a/pokeData/minun +++ b/pokeData/minun @@ -18,7 +18,7 @@ speed: 95 Genus: Cheering Pokémon - Happiness: 70 Pokedex ID: 312 + Happiness: 70 Pokedex ID: 338 Base Exp: 142 Capture Rate: 200 Height: 4 Weight: 42 diff --git a/pokeData/misdreavus b/pokeData/misdreavus index a1a9366..4fcd6d9 100644 --- a/pokeData/misdreavus +++ b/pokeData/misdreavus @@ -17,7 +17,7 @@ speed: 85 Genus: Screech Pokémon - Happiness: 35 Pokedex ID: 200 + Happiness: 35 Pokedex ID: 229 Base Exp: 87 Capture Rate: 45 Height: 7 Weight: 10 diff --git a/pokeData/mismagius b/pokeData/mismagius index f7b1dc3..873ef4a 100644 --- a/pokeData/mismagius +++ b/pokeData/mismagius @@ -17,7 +17,7 @@ speed: 105 Genus: Magical Pokémon - Happiness: 35 Pokedex ID: 429 + Happiness: 35 Pokedex ID: 230 Base Exp: 173 Capture Rate: 45 Height: 9 Weight: 44 diff --git a/pokeData/moltres b/pokeData/moltres index 4faf99a..b8050b9 100644 --- a/pokeData/moltres +++ b/pokeData/moltres @@ -16,7 +16,7 @@ speed: 90 Genus: Flame Pokémon - Happiness: 35 Pokedex ID: 146 + Happiness: 35 Pokedex ID: 178 Base Exp: 290 Capture Rate: 3 Height: 20 Weight: 600 diff --git a/pokeData/monferno b/pokeData/monferno index ff2badd..0a63e92 100644 --- a/pokeData/monferno +++ b/pokeData/monferno @@ -17,7 +17,7 @@ speed: 81 Genus: Playful Pokémon - Happiness: 70 Pokedex ID: 391 + Happiness: 70 Pokedex ID: 421 Base Exp: 142 Capture Rate: 45 Height: 9 Weight: 220 @@ -46,4 +46,4 @@ attack". - Location Areas: + Location Areas Unknown diff --git a/pokeData/morelull b/pokeData/morelull index 72238e9..f910046 100644 --- a/pokeData/morelull +++ b/pokeData/morelull @@ -1,5 +1,5 @@ - Type Pokémon + Morelull Grass Type Pokémon It scatters spores that flicker and glow. Anyone seeing these @@ -9,15 +9,52 @@ Morelull ► Shiinotic ↞--------| STATS |--------↠ + hp: 40 + attack: 35 + defense: 55 + special-attack: 65 + special-defense: 75 + speed: 15 Genus: Illuminating Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 190 - Height: Weight: + Happiness: 50 Pokedex ID: 755 + Base Exp: 57 Capture Rate: 190 + Height: 2 Weight: 15 Types: + Grass + Fairy ↞---------------|ABILITIES|---------------↠ + Illuminate: - Location Areas: + Overworld: If the lead Pokémon + has this ability, the wild encounter + rate is doubled. + + This ability has no effect + in battle. + + Effect-spore: + + Whenever a move makes contact + with this Pokémon, the move's + user has a 30% chance of being + paralyzed, poisoned, or put to + sleep, chosen at random. + + Nothing is done to compensate + if the move's user is immune + to one of these ailments; there + is simply a lower chance that + the move's user will be affected. + + Rain-dish: + + This Pokémon heals for 1/16 + of its maximum HP after each + turn during rain. + + + Location Areas Unknown diff --git a/pokeData/morgrem b/pokeData/morgrem index 2d6bae1..e5cecbd 100644 --- a/pokeData/morgrem +++ b/pokeData/morgrem @@ -65,4 +65,4 @@ steal from a trained Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/morpeko b/pokeData/morpeko index 6a4a02d..4f03602 100644 --- a/pokeData/morpeko +++ b/pokeData/morpeko @@ -1,5 +1,5 @@ - Type Pokémon + Morpeko-full-belly Electric Type Pokémon As it eats the seeds stored up in its pocket-like pouches, @@ -9,15 +9,27 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 58 + attack: 95 + defense: 58 + special-attack: 70 + special-defense: 58 + speed: 97 Genus: Two-Sided Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 180 - Height: Weight: + Happiness: 50 Pokedex ID: 877 + Base Exp: 153 Capture Rate: 180 + Height: 3 Weight: 30 Types: + Electric + Dark ↞---------------|ABILITIES|---------------↠ + Hunger-switch: - Location Areas: + + + + Location Areas Unknown diff --git a/pokeData/mothim b/pokeData/mothim index f7516a7..9f7d12a 100644 --- a/pokeData/mothim +++ b/pokeData/mothim @@ -7,7 +7,7 @@ Evolution Chain Burmy ► Wormadam -Stage 2 Forms: + Stage 2 Forms: wormadam mothim @@ -20,7 +20,7 @@ Stage 2 Forms: speed: 66 Genus: Moth Pokémon - Happiness: 70 Pokedex ID: 414 + Happiness: 70 Pokedex ID: 442 Base Exp: 148 Capture Rate: 45 Height: 9 Weight: 233 @@ -49,4 +49,4 @@ Stage 2 Forms: target. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mr-mime b/pokeData/mr-mime index 361229a..0e7870a 100644 --- a/pokeData/mr-mime +++ b/pokeData/mr-mime @@ -16,7 +16,7 @@ speed: 90 Genus: Barrier Pokémon - Happiness: 50 Pokedex ID: 122 + Happiness: 50 Pokedex ID: 140 Base Exp: 161 Capture Rate: 45 Height: 13 Weight: 545 diff --git a/pokeData/mr-rime b/pokeData/mr-rime index 421853b..cfc6415 100644 --- a/pokeData/mr-rime +++ b/pokeData/mr-rime @@ -45,4 +45,4 @@ of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mudbray b/pokeData/mudbray index 72defa5..2091f53 100644 --- a/pokeData/mudbray +++ b/pokeData/mudbray @@ -44,4 +44,4 @@ This Pokémon cannot flinch. - Location Areas: + Location Areas Unknown diff --git a/pokeData/mudkip b/pokeData/mudkip index 75b39c4..ad2da23 100644 --- a/pokeData/mudkip +++ b/pokeData/mudkip @@ -20,7 +20,7 @@ speed: 40 Genus: Mud Fish Pokémon - Happiness: 50 Pokedex ID: 258 + Happiness: 50 Pokedex ID: 283 Base Exp: 62 Capture Rate: 45 Height: 4 Weight: 76 @@ -31,10 +31,7 @@ Torrent: - When this Pokémon has 1/3 or - less of its HP remaining, its - water-type moves inflict 1.5× - as much regular damage. + Damp: diff --git a/pokeData/mudsdale b/pokeData/mudsdale index 1172daa..e3788ad 100644 --- a/pokeData/mudsdale +++ b/pokeData/mudsdale @@ -45,4 +45,4 @@ This Pokémon cannot flinch. - Location Areas: + Location Areas Unknown diff --git a/pokeData/muk b/pokeData/muk index 05a4aef..9a89ef4 100644 --- a/pokeData/muk +++ b/pokeData/muk @@ -5,7 +5,8 @@ vile sludge. It is so toxic, even its footprints contain poison. - Single Stage Evolution Pokémon + Evolution Chain + Grimer ► Muk ↞--------| STATS |--------↠ hp: 105 @@ -16,7 +17,7 @@ speed: 50 Genus: Sludge Pokémon - Happiness: 70 Pokedex ID: 89 + Happiness: 70 Pokedex ID: 97 Base Exp: 175 Capture Rate: 75 Height: 12 Weight: 300 diff --git a/pokeData/munchlax b/pokeData/munchlax index 1d2dfca..5d3d65b 100644 --- a/pokeData/munchlax +++ b/pokeData/munchlax @@ -17,7 +17,7 @@ speed: 5 Genus: Big Eater Pokémon - Happiness: 50 Pokedex ID: 446 + Happiness: 50 Pokedex ID: 174 Base Exp: 78 Capture Rate: 50 Height: 6 Weight: 1050 @@ -64,4 +64,4 @@ threshold. - Location Areas: + Location Areas Unknown diff --git a/pokeData/munna b/pokeData/munna index cada4c5..5467457 100644 --- a/pokeData/munna +++ b/pokeData/munna @@ -5,7 +5,8 @@ People whose dreams are eaten by them forget what the dreams had been about. - Single Stage Evolution Pokémon + Evolution Chain + Munna ► Musharna ↞--------| STATS |--------↠ hp: 76 @@ -16,7 +17,7 @@ speed: 24 Genus: Dream Eater Pokémon - Happiness: 50 Pokedex ID: 517 + Happiness: 50 Pokedex ID: 518 Base Exp: 58 Capture Rate: 190 Height: 6 Weight: 233 diff --git a/pokeData/murkrow b/pokeData/murkrow index 64f68d7..bbdc447 100644 --- a/pokeData/murkrow +++ b/pokeData/murkrow @@ -17,7 +17,7 @@ speed: 91 Genus: Darkness Pokémon - Happiness: 35 Pokedex ID: 198 + Happiness: 35 Pokedex ID: 227 Base Exp: 81 Capture Rate: 30 Height: 5 Weight: 21 diff --git a/pokeData/musharna b/pokeData/musharna index fc44fcd..52da449 100644 --- a/pokeData/musharna +++ b/pokeData/musharna @@ -17,7 +17,7 @@ speed: 29 Genus: Drowsing Pokémon - Happiness: 50 Pokedex ID: 518 + Happiness: 50 Pokedex ID: 519 Base Exp: 170 Capture Rate: 75 Height: 11 Weight: 605 diff --git a/pokeData/naganadel b/pokeData/naganadel index 327f767..14ac3ad 100644 --- a/pokeData/naganadel +++ b/pokeData/naganadel @@ -34,4 +34,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/natu b/pokeData/natu index e859756..60c12d5 100644 --- a/pokeData/natu +++ b/pokeData/natu @@ -17,7 +17,7 @@ speed: 70 Genus: Tiny Bird Pokémon - Happiness: 50 Pokedex ID: 177 + Happiness: 50 Pokedex ID: 206 Base Exp: 64 Capture Rate: 190 Height: 2 Weight: 20 diff --git a/pokeData/necrozma b/pokeData/necrozma index d341853..39632e6 100644 --- a/pokeData/necrozma +++ b/pokeData/necrozma @@ -36,4 +36,4 @@ turboblaze. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nickit b/pokeData/nickit index b349f54..1b484ab 100644 --- a/pokeData/nickit +++ b/pokeData/nickit @@ -54,4 +54,4 @@ in this turn. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nidoking b/pokeData/nidoking index dfdeaca..6d1f90e 100644 --- a/pokeData/nidoking +++ b/pokeData/nidoking @@ -16,7 +16,7 @@ speed: 85 Genus: Drill Pokémon - Happiness: 50 Pokedex ID: 34 + Happiness: 50 Pokedex ID: 35 Base Exp: 253 Capture Rate: 45 Height: 14 Weight: 620 @@ -66,4 +66,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nidoqueen b/pokeData/nidoqueen index 558a195..d4c8a26 100644 --- a/pokeData/nidoqueen +++ b/pokeData/nidoqueen @@ -17,7 +17,7 @@ speed: 76 Genus: Drill Pokémon - Happiness: 50 Pokedex ID: 31 + Happiness: 50 Pokedex ID: 32 Base Exp: 253 Capture Rate: 45 Height: 13 Weight: 600 @@ -67,4 +67,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nidoran-f b/pokeData/nidoran-f index 68e9033..fe7fd89 100644 --- a/pokeData/nidoran-f +++ b/pokeData/nidoran-f @@ -17,7 +17,7 @@ speed: 41 Genus: Poison Pin Pokémon - Happiness: 50 Pokedex ID: 29 + Happiness: 50 Pokedex ID: 30 Base Exp: 55 Capture Rate: 235 Height: 4 Weight: 70 diff --git a/pokeData/nidoran-m b/pokeData/nidoran-m index e196fe2..b06aef6 100644 --- a/pokeData/nidoran-m +++ b/pokeData/nidoran-m @@ -17,7 +17,7 @@ speed: 50 Genus: Poison Pin Pokémon - Happiness: 50 Pokedex ID: 32 + Happiness: 50 Pokedex ID: 33 Base Exp: 55 Capture Rate: 235 Height: 5 Weight: 90 diff --git a/pokeData/nidorina b/pokeData/nidorina index c260179..4f06a20 100644 --- a/pokeData/nidorina +++ b/pokeData/nidorina @@ -16,7 +16,7 @@ speed: 56 Genus: Poison Pin Pokémon - Happiness: 50 Pokedex ID: 30 + Happiness: 50 Pokedex ID: 31 Base Exp: 128 Capture Rate: 120 Height: 8 Weight: 200 diff --git a/pokeData/nidorino b/pokeData/nidorino index 8f53113..72f1d81 100644 --- a/pokeData/nidorino +++ b/pokeData/nidorino @@ -17,7 +17,7 @@ speed: 65 Genus: Poison Pin Pokémon - Happiness: 50 Pokedex ID: 33 + Happiness: 50 Pokedex ID: 34 Base Exp: 128 Capture Rate: 120 Height: 9 Weight: 195 diff --git a/pokeData/nihilego b/pokeData/nihilego index 4eed949..c211dae 100644 --- a/pokeData/nihilego +++ b/pokeData/nihilego @@ -34,4 +34,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nincada b/pokeData/nincada index ba061d2..fa322b3 100644 --- a/pokeData/nincada +++ b/pokeData/nincada @@ -10,7 +10,7 @@ Evolution Chain Nincada ► Ninjask -Stage 2 Forms: + Stage 2 Forms: ninjask shedinja @@ -23,7 +23,7 @@ Stage 2 Forms: speed: 40 Genus: Trainee Pokémon - Happiness: 50 Pokedex ID: 290 + Happiness: 50 Pokedex ID: 316 Base Exp: 53 Capture Rate: 255 Height: 5 Weight: 55 diff --git a/pokeData/ninetales b/pokeData/ninetales index eca5592..521219c 100644 --- a/pokeData/ninetales +++ b/pokeData/ninetales @@ -17,7 +17,7 @@ speed: 100 Genus: Fox Pokémon - Happiness: 50 Pokedex ID: 38 + Happiness: 50 Pokedex ID: 40 Base Exp: 177 Capture Rate: 75 Height: 11 Weight: 199 diff --git a/pokeData/ninjask b/pokeData/ninjask index d6afad1..63440d5 100644 --- a/pokeData/ninjask +++ b/pokeData/ninjask @@ -10,7 +10,7 @@ Evolution Chain Nincada ► Ninjask -Stage 2 Forms: + Stage 2 Forms: ninjask shedinja @@ -23,7 +23,7 @@ Stage 2 Forms: speed: 160 Genus: Ninja Pokémon - Happiness: 50 Pokedex ID: 291 + Happiness: 50 Pokedex ID: 317 Base Exp: 160 Capture Rate: 120 Height: 8 Weight: 120 @@ -44,4 +44,4 @@ Stage 2 Forms: light screen, reflect, and safeguard. - Location Areas: + Location Areas Unknown diff --git a/pokeData/noctowl b/pokeData/noctowl index b02f388..5687a48 100644 --- a/pokeData/noctowl +++ b/pokeData/noctowl @@ -17,7 +17,7 @@ speed: 70 Genus: Owl Pokémon - Happiness: 50 Pokedex ID: 164 + Happiness: 50 Pokedex ID: 196 Base Exp: 158 Capture Rate: 90 Height: 16 Weight: 408 @@ -29,7 +29,16 @@ Insomnia: - + This Pokémon cannot be asleep. + + This causes rest to fail altogether. + If a Pokémon is asleep and acquires + this ability, it will immediately + wake up; this includes when regaining + a lost ability upon leaving battle. + + This ability functions identically + to vital spirit in battle. Keen-eye: diff --git a/pokeData/noibat b/pokeData/noibat index 0c9924b..e4f9b68 100644 --- a/pokeData/noibat +++ b/pokeData/noibat @@ -53,4 +53,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/noivern b/pokeData/noivern index 5f9decd..23cc880 100644 --- a/pokeData/noivern +++ b/pokeData/noivern @@ -53,4 +53,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/nosepass b/pokeData/nosepass index 40beb38..7026fd5 100644 --- a/pokeData/nosepass +++ b/pokeData/nosepass @@ -20,7 +20,7 @@ speed: 30 Genus: Compass Pokémon - Happiness: 70 Pokedex ID: 299 + Happiness: 70 Pokedex ID: 324 Base Exp: 75 Capture Rate: 255 Height: 10 Weight: 970 diff --git a/pokeData/numel b/pokeData/numel index 3ca74a7..b3d71cf 100644 --- a/pokeData/numel +++ b/pokeData/numel @@ -19,7 +19,7 @@ speed: 35 Genus: Numb Pokémon - Happiness: 70 Pokedex ID: 322 + Happiness: 70 Pokedex ID: 350 Base Exp: 61 Capture Rate: 255 Height: 7 Weight: 240 diff --git a/pokeData/nuzleaf b/pokeData/nuzleaf index 32efb91..d8b12d9 100644 --- a/pokeData/nuzleaf +++ b/pokeData/nuzleaf @@ -1,8 +1,14 @@ Nuzleaf Grass Type Pokémon + NUZLEAF live in densely overgrown + forests. They occasionally venture + out of the forest to startle + people. Nuzleaf dislikes + having its long nose pinched. - Single Stage Evolution Pokémon + Evolution Chain + Seedot ► Nuzleaf ► Shiftry ↞--------| STATS |--------↠ hp: 70 @@ -12,9 +18,9 @@ special-defense: 40 speed: 60 - Genus: - Happiness: Pokedex ID: 274 - Base Exp: 119 Capture Rate: + Genus: Wily Pokémon + Happiness: 50 Pokedex ID: 299 + Base Exp: 119 Capture Rate: 120 Height: 10 Weight: 280 Types: diff --git a/pokeData/obstagoon b/pokeData/obstagoon index e48814e..6526869 100644 --- a/pokeData/obstagoon +++ b/pokeData/obstagoon @@ -62,4 +62,4 @@ with each stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/octillery b/pokeData/octillery index bada0b2..2c6ac84 100644 --- a/pokeData/octillery +++ b/pokeData/octillery @@ -17,7 +17,7 @@ speed: 45 Genus: Jet Pokémon - Happiness: 50 Pokedex ID: 224 + Happiness: 50 Pokedex ID: 256 Base Exp: 168 Capture Rate: 75 Height: 9 Weight: 285 diff --git a/pokeData/oddish b/pokeData/oddish index 5d4a1f8..e40140a 100644 --- a/pokeData/oddish +++ b/pokeData/oddish @@ -8,7 +8,7 @@ Evolution Chain Oddish ► Gloom ► Vileplume -Stage 3 Forms: + Stage 3 Forms: vileplume bellossom @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 30 Genus: Weed Pokémon - Happiness: 50 Pokedex ID: 43 + Happiness: 50 Pokedex ID: 47 Base Exp: 64 Capture Rate: 255 Height: 5 Weight: 54 diff --git a/pokeData/omanyte b/pokeData/omanyte index b9aaf53..99d92fa 100644 --- a/pokeData/omanyte +++ b/pokeData/omanyte @@ -16,7 +16,7 @@ speed: 35 Genus: Spiral Pokémon - Happiness: 50 Pokedex ID: 138 + Happiness: 50 Pokedex ID: 169 Base Exp: 71 Capture Rate: 45 Height: 4 Weight: 75 diff --git a/pokeData/omastar b/pokeData/omastar index 19a9280..550a80a 100644 --- a/pokeData/omastar +++ b/pokeData/omastar @@ -17,7 +17,7 @@ speed: 55 Genus: Spiral Pokémon - Happiness: 50 Pokedex ID: 139 + Happiness: 50 Pokedex ID: 170 Base Exp: 173 Capture Rate: 45 Height: 10 Weight: 350 @@ -54,4 +54,4 @@ hit of a multiple-hit move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/onix b/pokeData/onix index d8bdd29..5739b7d 100644 --- a/pokeData/onix +++ b/pokeData/onix @@ -17,7 +17,7 @@ speed: 70 Genus: Rock Snake Pokémon - Happiness: 50 Pokedex ID: 95 + Happiness: 50 Pokedex ID: 103 Base Exp: 77 Capture Rate: 45 Height: 88 Weight: 2100 diff --git a/pokeData/oranguru b/pokeData/oranguru index db8939b..396f0e6 100644 --- a/pokeData/oranguru +++ b/pokeData/oranguru @@ -45,4 +45,4 @@ up its item. - Location Areas: + Location Areas Unknown diff --git a/pokeData/orbeetle b/pokeData/orbeetle index cd96e2d..3b98fc6 100644 --- a/pokeData/orbeetle +++ b/pokeData/orbeetle @@ -60,4 +60,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/oricorio b/pokeData/oricorio index 54a98b7..13ff8ae 100644 --- a/pokeData/oricorio +++ b/pokeData/oricorio @@ -1,5 +1,5 @@ - Type Pokémon + Oricorio-baile Fire Type Pokémon It beats its wings together to create fire. As it moves @@ -9,15 +9,30 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 75 + attack: 70 + defense: 70 + special-attack: 98 + special-defense: 70 + speed: 93 Genus: Dancing Pokémon - Happiness: 70 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 70 Pokedex ID: 741 + Base Exp: 167 Capture Rate: 45 + Height: 6 Weight: 34 Types: + Fire + Flying ↞---------------|ABILITIES|---------------↠ + Dancer: - Location Areas: + Whenever another Pokémon uses + a dance move, this Pokémon will + use the same move immediately + afterwards. + + + Location Areas Unknown diff --git a/pokeData/oshawott b/pokeData/oshawott index c2d0b08..f0b5eb4 100644 --- a/pokeData/oshawott +++ b/pokeData/oshawott @@ -17,7 +17,7 @@ speed: 45 Genus: Sea Otter Pokémon - Happiness: 70 Pokedex ID: 501 + Happiness: 70 Pokedex ID: 502 Base Exp: 62 Capture Rate: 45 Height: 5 Weight: 59 diff --git a/pokeData/overqwil b/pokeData/overqwil index ceb0e73..48ed3b7 100644 --- a/pokeData/overqwil +++ b/pokeData/overqwil @@ -67,4 +67,4 @@ skipped. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pachirisu b/pokeData/pachirisu index c235d00..c349157 100644 --- a/pokeData/pachirisu +++ b/pokeData/pachirisu @@ -16,7 +16,7 @@ speed: 95 Genus: EleSquirrel Pokémon - Happiness: 100 Pokedex ID: 417 + Happiness: 100 Pokedex ID: 445 Base Exp: 142 Capture Rate: 200 Height: 4 Weight: 39 @@ -56,7 +56,19 @@ Volt-absorb: - + Whenever an electric-type move + hits this Pokémon, it heals for + 1/4 of its maximum HP, negating + any other effect on it. + + This ability will not take + effect if this Pokémon is ground-type + and thus immune to Electric moves. + Electric moves will ignore this + Pokémon's substitute. + + This effect includes non-damaging + moves, i.e. thunder wave. Location Areas: diff --git a/pokeData/palkia b/pokeData/palkia index 141c465..fcb7c1d 100644 --- a/pokeData/palkia +++ b/pokeData/palkia @@ -16,7 +16,7 @@ speed: 100 Genus: Spatial Pokémon - Happiness: 0 Pokedex ID: 484 + Happiness: 0 Pokedex ID: 485 Base Exp: 340 Capture Rate: 3 Height: 42 Weight: 3360 diff --git a/pokeData/palossand b/pokeData/palossand index da4dbf4..521ebef 100644 --- a/pokeData/palossand +++ b/pokeData/palossand @@ -49,4 +49,4 @@ rate is halved in a sandstorm. - Location Areas: + Location Areas Unknown diff --git a/pokeData/palpitoad b/pokeData/palpitoad index 45c8fae..99cf412 100644 --- a/pokeData/palpitoad +++ b/pokeData/palpitoad @@ -17,7 +17,7 @@ speed: 69 Genus: Vibration Pokémon - Happiness: 50 Pokedex ID: 536 + Happiness: 50 Pokedex ID: 537 Base Exp: 134 Capture Rate: 120 Height: 8 Weight: 170 diff --git a/pokeData/pancham b/pokeData/pancham index bb62ed0..6233515 100644 --- a/pokeData/pancham +++ b/pokeData/pancham @@ -18,7 +18,7 @@ speed: 43 Genus: Playful Pokémon - Happiness: 50 Pokedex ID: 674 + Happiness: 50 Pokedex ID: 675 Base Exp: 70 Capture Rate: 220 Height: 6 Weight: 80 diff --git a/pokeData/pangoro b/pokeData/pangoro index ca432c9..c4595e7 100644 --- a/pokeData/pangoro +++ b/pokeData/pangoro @@ -18,7 +18,7 @@ speed: 58 Genus: Daunting Pokémon - Happiness: 50 Pokedex ID: 675 + Happiness: 50 Pokedex ID: 676 Base Exp: 173 Capture Rate: 65 Height: 21 Weight: 1360 @@ -107,4 +107,4 @@ affect damage as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/panpour b/pokeData/panpour index 9c62b76..5d07b30 100644 --- a/pokeData/panpour +++ b/pokeData/panpour @@ -17,7 +17,7 @@ speed: 64 Genus: Spray Pokémon - Happiness: 70 Pokedex ID: 515 + Happiness: 70 Pokedex ID: 516 Base Exp: 63 Capture Rate: 190 Height: 6 Weight: 135 diff --git a/pokeData/pansage b/pokeData/pansage index fefb915..75374a9 100644 --- a/pokeData/pansage +++ b/pokeData/pansage @@ -17,7 +17,7 @@ speed: 64 Genus: Grass Monkey Pokémon - Happiness: 70 Pokedex ID: 511 + Happiness: 70 Pokedex ID: 512 Base Exp: 63 Capture Rate: 190 Height: 6 Weight: 105 diff --git a/pokeData/pansear b/pokeData/pansear index aa411d9..f565fe2 100644 --- a/pokeData/pansear +++ b/pokeData/pansear @@ -17,7 +17,7 @@ speed: 64 Genus: High Temp Pokémon - Happiness: 70 Pokedex ID: 513 + Happiness: 70 Pokedex ID: 514 Base Exp: 63 Capture Rate: 190 Height: 6 Weight: 110 diff --git a/pokeData/paras b/pokeData/paras index 1df1696..cda6133 100644 --- a/pokeData/paras +++ b/pokeData/paras @@ -1,8 +1,12 @@ Paras Bug Type Pokémon - - Single Stage Evolution Pokémon + Burrows to suck tree roots. + The mushrooms on its back grow + by draw­ ing nutrients from the + bug host. + Evolution Chain + Paras ► Parasect ↞--------| STATS |--------↠ hp: 35 @@ -12,9 +16,9 @@ special-defense: 55 speed: 25 - Genus: - Happiness: Pokedex ID: 46 - Base Exp: 57 Capture Rate: + Genus: Mushroom Pokémon + Happiness: 70 Pokedex ID: 51 + Base Exp: 57 Capture Rate: 190 Height: 3 Weight: 54 Types: diff --git a/pokeData/parasect b/pokeData/parasect index ee555b3..d8ef13c 100644 --- a/pokeData/parasect +++ b/pokeData/parasect @@ -17,7 +17,7 @@ speed: 30 Genus: Mushroom Pokémon - Happiness: 70 Pokedex ID: 47 + Happiness: 70 Pokedex ID: 52 Base Exp: 142 Capture Rate: 75 Height: 10 Weight: 295 diff --git a/pokeData/passimian b/pokeData/passimian index d090135..50e4170 100644 --- a/pokeData/passimian +++ b/pokeData/passimian @@ -41,4 +41,4 @@ with each stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/patrat b/pokeData/patrat index 2633481..3c56ee2 100644 --- a/pokeData/patrat +++ b/pokeData/patrat @@ -17,7 +17,7 @@ speed: 42 Genus: Scout Pokémon - Happiness: 70 Pokedex ID: 504 + Happiness: 70 Pokedex ID: 505 Base Exp: 51 Capture Rate: 255 Height: 5 Weight: 116 diff --git a/pokeData/pawniard b/pokeData/pawniard index 8365386..f7858e1 100644 --- a/pokeData/pawniard +++ b/pokeData/pawniard @@ -17,7 +17,7 @@ speed: 60 Genus: Sharp Blade Pokémon - Happiness: 35 Pokedex ID: 624 + Happiness: 35 Pokedex ID: 625 Base Exp: 68 Capture Rate: 120 Height: 5 Weight: 102 diff --git a/pokeData/pelipper b/pokeData/pelipper index cb1fedb..f78c007 100644 --- a/pokeData/pelipper +++ b/pokeData/pelipper @@ -16,7 +16,7 @@ speed: 65 Genus: Water Bird Pokémon - Happiness: 50 Pokedex ID: 279 + Happiness: 50 Pokedex ID: 304 Base Exp: 154 Capture Rate: 45 Height: 12 Weight: 280 diff --git a/pokeData/perrserker b/pokeData/perrserker index 663525e..4a86621 100644 --- a/pokeData/perrserker +++ b/pokeData/perrserker @@ -8,7 +8,7 @@ Evolution Chain Meowth ► Persian -Stage 2 Forms: + Stage 2 Forms: persian perrserker @@ -48,4 +48,4 @@ Stage 2 Forms: - Location Areas: + Location Areas Unknown diff --git a/pokeData/persian b/pokeData/persian index 3123801..f5964e5 100644 --- a/pokeData/persian +++ b/pokeData/persian @@ -8,7 +8,7 @@ Evolution Chain Meowth ► Persian -Stage 2 Forms: + Stage 2 Forms: persian perrserker @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 115 Genus: Classy Cat Pokémon - Happiness: 50 Pokedex ID: 53 + Happiness: 50 Pokedex ID: 58 Base Exp: 154 Capture Rate: 90 Height: 10 Weight: 320 diff --git a/pokeData/petilil b/pokeData/petilil index 7307dc1..d96a7bb 100644 --- a/pokeData/petilil +++ b/pokeData/petilil @@ -17,7 +17,7 @@ speed: 30 Genus: Bulb Pokémon - Happiness: 50 Pokedex ID: 548 + Happiness: 50 Pokedex ID: 549 Base Exp: 56 Capture Rate: 190 Height: 5 Weight: 66 diff --git a/pokeData/phanpy b/pokeData/phanpy index 95ac9e8..d580170 100644 --- a/pokeData/phanpy +++ b/pokeData/phanpy @@ -1,5 +1,5 @@ - Phanpy Ground Type Pokémon + Zigzagoon Normal Type Pokémon It swings its long snout around play­ fully, but because it is @@ -9,20 +9,20 @@ Phanpy ► Donphan ↞--------| STATS |--------↠ - hp: 90 - attack: 60 - defense: 60 - special-attack: 40 - special-defense: 40 - speed: 40 + hp: 38 + attack: 30 + defense: 41 + special-attack: 30 + special-defense: 41 + speed: 60 Genus: Long Nose Pokémon - Happiness: 70 Pokedex ID: 231 - Base Exp: 66 Capture Rate: 120 - Height: 5 Weight: 335 + Happiness: 70 Pokedex ID: 263 + Base Exp: 56 Capture Rate: 120 + Height: 4 Weight: 175 Types: - Ground + Normal ↞---------------|ABILITIES|---------------↠ @@ -49,19 +49,25 @@ any temporary ability changes have worn off. - Sand-veil: + Gluttony: - During a sandstorm, this Pokémon - has 1.25× its evasion, and it - does not take sandstorm damage - regardless of type. + This Pokémon eats any held + Berry triggered by low HP when + it falls below 50% of its HP, + regardless of the Berry's usual + threshold. - The evasion bonus does not - count as a stat modifier. + Quick-feet: + + Whenever this Pokémon has a + major status ailment, it has + 1.5× its Speed. This Pokémon + is not affected by the usual + Speed cut from paralysis. Overworld: If the lead Pokémon has this ability, the wild encounter - rate is halved in a sandstorm. + rate is halved. Location Areas: diff --git a/pokeData/pheromosa b/pokeData/pheromosa index 5f291dc..a3e53b9 100644 --- a/pokeData/pheromosa +++ b/pokeData/pheromosa @@ -33,4 +33,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/phione b/pokeData/phione index 5283eb8..5d65b05 100644 --- a/pokeData/phione +++ b/pokeData/phione @@ -17,7 +17,7 @@ speed: 80 Genus: Sea Drifter Pokémon - Happiness: 70 Pokedex ID: 489 + Happiness: 70 Pokedex ID: 490 Base Exp: 216 Capture Rate: 30 Height: 4 Weight: 31 @@ -33,4 +33,4 @@ turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pichu b/pokeData/pichu index 7ee859a..38d8810 100644 --- a/pokeData/pichu +++ b/pokeData/pichu @@ -17,7 +17,7 @@ speed: 60 Genus: Tiny Mouse Pokémon - Happiness: 50 Pokedex ID: 172 + Happiness: 50 Pokedex ID: 25 Base Exp: 41 Capture Rate: 190 Height: 3 Weight: 20 diff --git a/pokeData/pidgeot b/pokeData/pidgeot index cc1a1aa..7908a5c 100644 --- a/pokeData/pidgeot +++ b/pokeData/pidgeot @@ -64,4 +64,4 @@ heart swap or guard swap. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pidove b/pokeData/pidove index e754321..24ffe94 100644 --- a/pokeData/pidove +++ b/pokeData/pidove @@ -17,7 +17,7 @@ speed: 43 Genus: Tiny Pigeon Pokémon - Happiness: 50 Pokedex ID: 519 + Happiness: 50 Pokedex ID: 520 Base Exp: 53 Capture Rate: 255 Height: 3 Weight: 21 diff --git a/pokeData/pignite b/pokeData/pignite index 5c5141f..7875d17 100644 --- a/pokeData/pignite +++ b/pokeData/pignite @@ -17,7 +17,7 @@ speed: 55 Genus: Fire Pig Pokémon - Happiness: 70 Pokedex ID: 499 + Happiness: 70 Pokedex ID: 500 Base Exp: 146 Capture Rate: 45 Height: 10 Weight: 555 @@ -41,4 +41,4 @@ moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pikachu b/pokeData/pikachu index 47972b9..bda590f 100644 --- a/pokeData/pikachu +++ b/pokeData/pikachu @@ -17,7 +17,7 @@ speed: 90 Genus: Mouse Pokémon - Happiness: 50 Pokedex ID: 25 + Happiness: 50 Pokedex ID: 26 Base Exp: 112 Capture Rate: 190 Height: 4 Weight: 60 diff --git a/pokeData/pikipek b/pokeData/pikipek index 5fb5bb7..77fc9df 100644 --- a/pokeData/pikipek +++ b/pokeData/pikipek @@ -83,4 +83,4 @@ have worn off. - Location Areas: + Location Areas Unknown diff --git a/pokeData/piloswine b/pokeData/piloswine index c45cdf3..76c70fb 100644 --- a/pokeData/piloswine +++ b/pokeData/piloswine @@ -17,7 +17,7 @@ speed: 50 Genus: Swine Pokémon - Happiness: 50 Pokedex ID: 221 + Happiness: 50 Pokedex ID: 252 Base Exp: 158 Capture Rate: 75 Height: 11 Weight: 558 diff --git a/pokeData/pincurchin b/pokeData/pincurchin index 96a766a..1ad13dd 100644 --- a/pokeData/pincurchin +++ b/pokeData/pincurchin @@ -60,4 +60,4 @@ terrain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pineco b/pokeData/pineco index 24513d1..568d0ec 100644 --- a/pokeData/pineco +++ b/pokeData/pineco @@ -17,7 +17,7 @@ speed: 15 Genus: Bagworm Pokémon - Happiness: 70 Pokedex ID: 204 + Happiness: 70 Pokedex ID: 235 Base Exp: 58 Capture Rate: 190 Height: 6 Weight: 72 diff --git a/pokeData/pinsir b/pokeData/pinsir index 7571a65..0a08279 100644 --- a/pokeData/pinsir +++ b/pokeData/pinsir @@ -15,7 +15,7 @@ speed: 85 Genus: Stag Beetle Pokémon - Happiness: 50 Pokedex ID: 127 + Happiness: 50 Pokedex ID: 151 Base Exp: 175 Capture Rate: 45 Height: 15 Weight: 550 diff --git a/pokeData/piplup b/pokeData/piplup index 9a17ebf..919000a 100644 --- a/pokeData/piplup +++ b/pokeData/piplup @@ -17,7 +17,7 @@ speed: 40 Genus: Penguin Pokémon - Happiness: 70 Pokedex ID: 393 + Happiness: 70 Pokedex ID: 423 Base Exp: 63 Capture Rate: 45 Height: 4 Weight: 52 diff --git a/pokeData/plusle b/pokeData/plusle index 1d2ebc3..5d20cf6 100644 --- a/pokeData/plusle +++ b/pokeData/plusle @@ -19,7 +19,7 @@ speed: 95 Genus: Cheering Pokémon - Happiness: 70 Pokedex ID: 311 + Happiness: 70 Pokedex ID: 337 Base Exp: 142 Capture Rate: 200 Height: 4 Weight: 42 diff --git a/pokeData/poipole b/pokeData/poipole index 2ac9215..774b602 100644 --- a/pokeData/poipole +++ b/pokeData/poipole @@ -32,4 +32,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/politoed b/pokeData/politoed index 7608286..a2ad579 100644 --- a/pokeData/politoed +++ b/pokeData/politoed @@ -8,7 +8,7 @@ Evolution Chain Poliwag ► Poliwhirl ► Poliwrath -Stage 3 Forms: + Stage 3 Forms: poliwrath politoed @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 70 Genus: Frog Pokémon - Happiness: 50 Pokedex ID: 186 + Happiness: 50 Pokedex ID: 68 Base Exp: 250 Capture Rate: 45 Height: 11 Weight: 339 diff --git a/pokeData/poliwag b/pokeData/poliwag index d68d8e8..8ac939a 100644 --- a/pokeData/poliwag +++ b/pokeData/poliwag @@ -8,7 +8,7 @@ Evolution Chain Poliwag ► Poliwhirl ► Poliwrath -Stage 3 Forms: + Stage 3 Forms: poliwrath politoed @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 90 Genus: Tadpole Pokémon - Happiness: 50 Pokedex ID: 60 + Happiness: 50 Pokedex ID: 65 Base Exp: 60 Capture Rate: 255 Height: 6 Weight: 124 diff --git a/pokeData/poliwhirl b/pokeData/poliwhirl index b40b21d..112f745 100644 --- a/pokeData/poliwhirl +++ b/pokeData/poliwhirl @@ -8,7 +8,7 @@ Evolution Chain Poliwag ► Poliwhirl ► Poliwrath -Stage 3 Forms: + Stage 3 Forms: poliwrath politoed @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 90 Genus: Tadpole Pokémon - Happiness: 50 Pokedex ID: 61 + Happiness: 50 Pokedex ID: 66 Base Exp: 135 Capture Rate: 120 Height: 10 Weight: 200 diff --git a/pokeData/poliwrath b/pokeData/poliwrath index 077a9d9..35e38ab 100644 --- a/pokeData/poliwrath +++ b/pokeData/poliwrath @@ -8,7 +8,7 @@ Evolution Chain Poliwag ► Poliwhirl ► Poliwrath -Stage 3 Forms: + Stage 3 Forms: poliwrath politoed @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 70 Genus: Tadpole Pokémon - Happiness: 50 Pokedex ID: 62 + Happiness: 50 Pokedex ID: 67 Base Exp: 255 Capture Rate: 45 Height: 13 Weight: 540 diff --git a/pokeData/polteageist b/pokeData/polteageist index 1294910..80798ef 100644 --- a/pokeData/polteageist +++ b/pokeData/polteageist @@ -43,4 +43,4 @@ afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ponyta b/pokeData/ponyta index cfaa1cb..92a1b8b 100644 --- a/pokeData/ponyta +++ b/pokeData/ponyta @@ -17,7 +17,7 @@ speed: 90 Genus: Fire Horse Pokémon - Happiness: 50 Pokedex ID: 77 + Happiness: 50 Pokedex ID: 83 Base Exp: 82 Capture Rate: 190 Height: 10 Weight: 300 diff --git a/pokeData/poochyena b/pokeData/poochyena index 402a191..c044f7f 100644 --- a/pokeData/poochyena +++ b/pokeData/poochyena @@ -19,7 +19,7 @@ speed: 35 Genus: Bite Pokémon - Happiness: 70 Pokedex ID: 261 + Happiness: 70 Pokedex ID: 286 Base Exp: 56 Capture Rate: 255 Height: 5 Weight: 136 diff --git a/pokeData/popplio b/pokeData/popplio index 106bcb3..521e26f 100644 --- a/pokeData/popplio +++ b/pokeData/popplio @@ -41,4 +41,4 @@ type is Water. - Location Areas: + Location Areas Unknown diff --git a/pokeData/porygon b/pokeData/porygon index 5862a89..9110186 100644 --- a/pokeData/porygon +++ b/pokeData/porygon @@ -17,7 +17,7 @@ speed: 40 Genus: Virtual Pokémon - Happiness: 50 Pokedex ID: 137 + Happiness: 50 Pokedex ID: 166 Base Exp: 79 Capture Rate: 45 Height: 8 Weight: 365 diff --git a/pokeData/porygon-z b/pokeData/porygon-z index a659569..790b5cd 100644 --- a/pokeData/porygon-z +++ b/pokeData/porygon-z @@ -17,7 +17,7 @@ speed: 90 Genus: Virtual Pokémon - Happiness: 50 Pokedex ID: 474 + Happiness: 50 Pokedex ID: 168 Base Exp: 268 Capture Rate: 30 Height: 9 Weight: 340 @@ -57,4 +57,4 @@ are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/porygon2 b/pokeData/porygon2 index 2dbf969..74c6b4a 100644 --- a/pokeData/porygon2 +++ b/pokeData/porygon2 @@ -1,5 +1,5 @@ - Porygon2 Normal Type Pokémon + Spinarak Bug Type Pokémon This upgraded version of PORYGON is designed for space exploration. @@ -8,55 +8,53 @@ Porygon ► Porygon2 ► Porygon-z ↞--------| STATS |--------↠ - hp: 85 - attack: 80 - defense: 90 - special-attack: 105 - special-defense: 95 - speed: 60 + hp: 40 + attack: 60 + defense: 40 + special-attack: 40 + special-defense: 40 + speed: 30 Genus: Virtual Pokémon - Happiness: 50 Pokedex ID: 233 - Base Exp: 180 Capture Rate: 45 - Height: 6 Weight: 325 + Happiness: 50 Pokedex ID: 167 + Base Exp: 50 Capture Rate: 45 + Height: 5 Weight: 85 Types: - Normal + Bug + Poison ↞---------------|ABILITIES|---------------↠ - Trace: + Swarm: - When this Pokémon enters battle, - it copies a random opponent's - ability. + When this Pokémon has 1/3 or + less of its HP remaining, its + bug-type moves inflict 1.5× as + much regular damage. - This ability cannot copy flower - gift, forecast, illusion, imposter, - multitype, trace, wonder guard, - or zen mode. + Overworld: If the lead Pokémon + has this ability, the wild encounter + rate is increased. - Download: + Insomnia: - When this Pokémon enters battle, - its Attack or Special Attack, - whichever corresponds to its - opponents' weaker total defensive - stat, rises one stage. In the - event of a tie, Special Attack - is raised. + This Pokémon cannot be asleep. - This ability also takes effect - when acquired during a battle. + This causes rest to fail altogether. + If a Pokémon is asleep and acquires + this ability, it will immediately + wake up; this includes when regaining + a lost ability upon leaving battle. - Analytic: + This ability functions identically + to vital spirit in battle. - This Pokémon's moves have 1.3× - their power when it moves last - in a turn. + Sniper: - future sight and doom desire - are unaffected. + This Pokémon inflicts triple + damage with critical hits, rather + than the usual double damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/primarina b/pokeData/primarina index 8b66f9e..a0780ca 100644 --- a/pokeData/primarina +++ b/pokeData/primarina @@ -42,4 +42,4 @@ type is Water. - Location Areas: + Location Areas Unknown diff --git a/pokeData/primeape b/pokeData/primeape index 186dd1c..e63f8ee 100644 --- a/pokeData/primeape +++ b/pokeData/primeape @@ -17,7 +17,7 @@ speed: 95 Genus: Pig Monkey Pokémon - Happiness: 70 Pokedex ID: 57 + Happiness: 70 Pokedex ID: 62 Base Exp: 159 Capture Rate: 75 Height: 10 Weight: 320 diff --git a/pokeData/prinplup b/pokeData/prinplup index 11010cb..339b0a6 100644 --- a/pokeData/prinplup +++ b/pokeData/prinplup @@ -17,7 +17,7 @@ speed: 50 Genus: Penguin Pokémon - Happiness: 70 Pokedex ID: 394 + Happiness: 70 Pokedex ID: 424 Base Exp: 142 Capture Rate: 45 Height: 8 Weight: 230 @@ -44,4 +44,4 @@ with each stat lowered. - Location Areas: + Location Areas Unknown diff --git a/pokeData/probopass b/pokeData/probopass index a272fe8..56796a6 100644 --- a/pokeData/probopass +++ b/pokeData/probopass @@ -16,7 +16,7 @@ speed: 40 Genus: Compass Pokémon - Happiness: 70 Pokedex ID: 476 + Happiness: 70 Pokedex ID: 325 Base Exp: 184 Capture Rate: 60 Height: 14 Weight: 3400 @@ -67,4 +67,4 @@ damage, regardless of type. - Location Areas: + Location Areas Unknown diff --git a/pokeData/psyduck b/pokeData/psyduck index 034e367..3357d62 100644 --- a/pokeData/psyduck +++ b/pokeData/psyduck @@ -17,7 +17,7 @@ speed: 55 Genus: Duck Pokémon - Happiness: 50 Pokedex ID: 54 + Happiness: 50 Pokedex ID: 59 Base Exp: 64 Capture Rate: 190 Height: 8 Weight: 196 diff --git a/pokeData/pumpkaboo b/pokeData/pumpkaboo index 574a3b4..57da972 100644 --- a/pokeData/pumpkaboo +++ b/pokeData/pumpkaboo @@ -1,5 +1,5 @@ - Type Pokémon + Pumpkaboo-average Ghost Type Pokémon The pumpkin body is inhabited by a spirit trapped in this world. @@ -9,15 +9,72 @@ Pumpkaboo ► Gourgeist ↞--------| STATS |--------↠ + hp: 49 + attack: 66 + defense: 70 + special-attack: 44 + special-defense: 55 + speed: 51 Genus: Pumpkin Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 120 - Height: Weight: + Happiness: 50 Pokedex ID: 710 + Base Exp: 67 Capture Rate: 120 + Height: 4 Weight: 50 Types: + Ghost + Grass ↞---------------|ABILITIES|---------------↠ + Pickup: - Location Areas: + At the end of each turn, if + another Pokémon consumed or Flung + a held item that turn, this Pokémon + picks up the item if it is not + already holding one. After each + battle, this Pokémon has a 10% + chance of picking up an item + if it is not already holding + one. + + The air balloon and eject button + cannot be picked up. + + The items that may be found + vary by game, and, since Pokémon + Emerald, by the Pokémon's level. + This ability is checked after + the battle ends, at which point + any temporary ability changes + have worn off. + + Frisk: + + When this Pokémon enters battle, + it reveals an opposing Pokémon's + held item to all participating + trainers. + + In a double battle, if one + opponent has an item, this Pokémon + will Frisk that Pokémon; if both + have an item, it will Frisk one + at random. + + Insomnia: + + This Pokémon cannot be asleep. + + This causes rest to fail altogether. + If a Pokémon is asleep and acquires + this ability, it will immediately + wake up; this includes when regaining + a lost ability upon leaving battle. + + This ability functions identically + to vital spirit in battle. + + + Location Areas Unknown diff --git a/pokeData/pupitar b/pokeData/pupitar index cee819a..f9d0f3f 100644 --- a/pokeData/pupitar +++ b/pokeData/pupitar @@ -17,7 +17,7 @@ speed: 51 Genus: Hard Shell Pokémon - Happiness: 35 Pokedex ID: 247 + Happiness: 35 Pokedex ID: 272 Base Exp: 144 Capture Rate: 45 Height: 12 Weight: 1520 diff --git a/pokeData/purrloin b/pokeData/purrloin index 84e9157..082fd25 100644 --- a/pokeData/purrloin +++ b/pokeData/purrloin @@ -17,7 +17,7 @@ speed: 66 Genus: Devious Pokémon - Happiness: 50 Pokedex ID: 509 + Happiness: 50 Pokedex ID: 510 Base Exp: 56 Capture Rate: 255 Height: 4 Weight: 101 @@ -52,9 +52,7 @@ Prankster: - This Pokémon's non-damaging - moves have their priority increased - by one stage. + Location Areas: diff --git a/pokeData/purugly b/pokeData/purugly index 1e8af94..ad1269a 100644 --- a/pokeData/purugly +++ b/pokeData/purugly @@ -17,7 +17,7 @@ speed: 112 Genus: Tiger Cat Pokémon - Happiness: 70 Pokedex ID: 432 + Happiness: 70 Pokedex ID: 457 Base Exp: 158 Capture Rate: 75 Height: 10 Weight: 438 diff --git a/pokeData/pyroar b/pokeData/pyroar index 3441b33..9a340f4 100644 --- a/pokeData/pyroar +++ b/pokeData/pyroar @@ -16,7 +16,7 @@ speed: 106 Genus: Royal Pokémon - Happiness: 70 Pokedex ID: 668 + Happiness: 70 Pokedex ID: 669 Base Exp: 177 Capture Rate: 65 Height: 15 Weight: 815 @@ -65,4 +65,4 @@ effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/pyukumuku b/pokeData/pyukumuku index 53f10fd..e13ef81 100644 --- a/pokeData/pyukumuku +++ b/pokeData/pyukumuku @@ -49,4 +49,4 @@ modifiers affect damage as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/quagsire b/pokeData/quagsire index 22e345b..ebe22d0 100644 --- a/pokeData/quagsire +++ b/pokeData/quagsire @@ -8,7 +8,7 @@ Evolution Chain Wooper ► Quagsire -Stage 2 Forms: + Stage 2 Forms: quagsire clodsire @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 35 Genus: Water Fish Pokémon - Happiness: 50 Pokedex ID: 195 + Happiness: 50 Pokedex ID: 226 Base Exp: 151 Capture Rate: 90 Height: 14 Weight: 750 diff --git a/pokeData/quilava b/pokeData/quilava index 57ac49c..ad807c4 100644 --- a/pokeData/quilava +++ b/pokeData/quilava @@ -17,7 +17,7 @@ speed: 80 Genus: Volcano Pokémon - Happiness: 70 Pokedex ID: 156 + Happiness: 70 Pokedex ID: 188 Base Exp: 142 Capture Rate: 45 Height: 9 Weight: 190 @@ -54,4 +54,4 @@ o wisp. - Location Areas: + Location Areas Unknown diff --git a/pokeData/quilladin b/pokeData/quilladin index 1cd9b0d..0edb22b 100644 --- a/pokeData/quilladin +++ b/pokeData/quilladin @@ -17,7 +17,7 @@ speed: 57 Genus: Spiny Armor Pokémon - Happiness: 70 Pokedex ID: 651 + Happiness: 70 Pokedex ID: 652 Base Exp: 142 Capture Rate: 45 Height: 7 Weight: 290 @@ -39,4 +39,4 @@ and bomb-based moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/qwilfish b/pokeData/qwilfish index 8bb078e..0552339 100644 --- a/pokeData/qwilfish +++ b/pokeData/qwilfish @@ -17,7 +17,7 @@ speed: 85 Genus: Balloon Pokémon - Happiness: 50 Pokedex ID: 211 + Happiness: 50 Pokedex ID: 242 Base Exp: 88 Capture Rate: 45 Height: 5 Weight: 39 diff --git a/pokeData/raboot b/pokeData/raboot index 8f13bf0..735f9d0 100644 --- a/pokeData/raboot +++ b/pokeData/raboot @@ -38,4 +38,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/raichu b/pokeData/raichu index 2aa5a8d..ece3f91 100644 --- a/pokeData/raichu +++ b/pokeData/raichu @@ -16,7 +16,7 @@ speed: 110 Genus: Mouse Pokémon - Happiness: 50 Pokedex ID: 26 + Happiness: 50 Pokedex ID: 27 Base Exp: 243 Capture Rate: 75 Height: 8 Weight: 300 diff --git a/pokeData/raikou b/pokeData/raikou index e118082..6c035a2 100644 --- a/pokeData/raikou +++ b/pokeData/raikou @@ -16,7 +16,7 @@ speed: 115 Genus: Thunder Pokémon - Happiness: 35 Pokedex ID: 243 + Happiness: 35 Pokedex ID: 268 Base Exp: 290 Capture Rate: 3 Height: 19 Weight: 1780 diff --git a/pokeData/ralts b/pokeData/ralts index f8a0788..dda6871 100644 --- a/pokeData/ralts +++ b/pokeData/ralts @@ -11,7 +11,7 @@ Evolution Chain Ralts ► Kirlia ► Gardevoir -Stage 3 Forms: + Stage 3 Forms: gardevoir gallade @@ -24,7 +24,7 @@ Stage 3 Forms: speed: 40 Genus: Feeling Pokémon - Happiness: 35 Pokedex ID: 280 + Happiness: 35 Pokedex ID: 305 Base Exp: 40 Capture Rate: 235 Height: 4 Weight: 66 diff --git a/pokeData/rampardos b/pokeData/rampardos index 64f9c16..c43eecc 100644 --- a/pokeData/rampardos +++ b/pokeData/rampardos @@ -16,7 +16,7 @@ speed: 58 Genus: Head Butt Pokémon - Happiness: 70 Pokedex ID: 409 + Happiness: 70 Pokedex ID: 437 Base Exp: 173 Capture Rate: 45 Height: 16 Weight: 1025 @@ -104,4 +104,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/rapidash b/pokeData/rapidash index 20e004a..d717c3d 100644 --- a/pokeData/rapidash +++ b/pokeData/rapidash @@ -17,7 +17,7 @@ speed: 105 Genus: Fire Horse Pokémon - Happiness: 50 Pokedex ID: 78 + Happiness: 50 Pokedex ID: 84 Base Exp: 175 Capture Rate: 60 Height: 17 Weight: 950 diff --git a/pokeData/rayquaza b/pokeData/rayquaza index 9d1f2e2..9b830f0 100644 --- a/pokeData/rayquaza +++ b/pokeData/rayquaza @@ -19,7 +19,7 @@ speed: 95 Genus: Sky High Pokémon - Happiness: 0 Pokedex ID: 384 + Happiness: 0 Pokedex ID: 414 Base Exp: 340 Capture Rate: 45 Height: 70 Weight: 2065 diff --git a/pokeData/regice b/pokeData/regice index b8a48c2..a03d30c 100644 --- a/pokeData/regice +++ b/pokeData/regice @@ -18,7 +18,7 @@ speed: 50 Genus: Iceberg Pokémon - Happiness: 35 Pokedex ID: 378 + Happiness: 35 Pokedex ID: 408 Base Exp: 290 Capture Rate: 3 Height: 18 Weight: 1750 diff --git a/pokeData/regidrago b/pokeData/regidrago index bbabbc7..892773c 100644 --- a/pokeData/regidrago +++ b/pokeData/regidrago @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/regieleki b/pokeData/regieleki index 3a6e9ae..220305b 100644 --- a/pokeData/regieleki +++ b/pokeData/regieleki @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/regigigas b/pokeData/regigigas index db9ddb6..a19f02b 100644 --- a/pokeData/regigigas +++ b/pokeData/regigigas @@ -15,7 +15,7 @@ speed: 100 Genus: Colossal Pokémon - Happiness: 0 Pokedex ID: 486 + Happiness: 0 Pokedex ID: 487 Base Exp: 335 Capture Rate: 3 Height: 37 Weight: 4200 @@ -26,20 +26,7 @@ Slow-start: - This Pokémon's Attack and Speed - are halved for five turns upon - entering battle. - - This ability also takes effect - when acquired during battle. - If this Pokémon loses its ability - before the five turns are up, - its Attack and Speed return to - normal; if it then regains this - ability without leaving battle, - its Attack and Speed are halved - again, but the counter keeps - counting from where it was. + Location Areas: diff --git a/pokeData/regirock b/pokeData/regirock index c0cf7f4..9d87435 100644 --- a/pokeData/regirock +++ b/pokeData/regirock @@ -16,7 +16,7 @@ speed: 50 Genus: Rock Peak Pokémon - Happiness: 35 Pokedex ID: 377 + Happiness: 35 Pokedex ID: 407 Base Exp: 290 Capture Rate: 3 Height: 17 Weight: 2300 diff --git a/pokeData/registeel b/pokeData/registeel index 3b2fff5..20aa81a 100644 --- a/pokeData/registeel +++ b/pokeData/registeel @@ -17,7 +17,7 @@ speed: 50 Genus: Iron Pokémon - Happiness: 35 Pokedex ID: 379 + Happiness: 35 Pokedex ID: 409 Base Exp: 290 Capture Rate: 3 Height: 19 Weight: 2050 diff --git a/pokeData/relicanth b/pokeData/relicanth index 25b8484..b919254 100644 --- a/pokeData/relicanth +++ b/pokeData/relicanth @@ -18,7 +18,7 @@ speed: 55 Genus: Longevity Pokémon - Happiness: 50 Pokedex ID: 369 + Happiness: 50 Pokedex ID: 399 Base Exp: 170 Capture Rate: 25 Height: 10 Weight: 234 diff --git a/pokeData/remoraid b/pokeData/remoraid index 5abfaa8..924da45 100644 --- a/pokeData/remoraid +++ b/pokeData/remoraid @@ -17,7 +17,7 @@ speed: 65 Genus: Jet Pokémon - Happiness: 50 Pokedex ID: 223 + Happiness: 50 Pokedex ID: 255 Base Exp: 60 Capture Rate: 190 Height: 6 Weight: 120 diff --git a/pokeData/reshiram b/pokeData/reshiram index 1744ede..f53c246 100644 --- a/pokeData/reshiram +++ b/pokeData/reshiram @@ -16,7 +16,7 @@ speed: 90 Genus: Vast White Pokémon - Happiness: 0 Pokedex ID: 643 + Happiness: 0 Pokedex ID: 644 Base Exp: 340 Capture Rate: 3 Height: 32 Weight: 3300 @@ -85,4 +85,4 @@ to mold breaker and teravolt. - Location Areas: + Location Areas Unknown diff --git a/pokeData/reuniclus b/pokeData/reuniclus index c663c57..5dff133 100644 --- a/pokeData/reuniclus +++ b/pokeData/reuniclus @@ -17,7 +17,7 @@ speed: 30 Genus: Multiplying Pokémon - Happiness: 50 Pokedex ID: 579 + Happiness: 50 Pokedex ID: 580 Base Exp: 245 Capture Rate: 50 Height: 10 Weight: 201 diff --git a/pokeData/rhydon b/pokeData/rhydon index c09f283..741203f 100644 --- a/pokeData/rhydon +++ b/pokeData/rhydon @@ -16,7 +16,7 @@ speed: 40 Genus: Drill Pokémon - Happiness: 50 Pokedex ID: 112 + Happiness: 50 Pokedex ID: 124 Base Exp: 170 Capture Rate: 60 Height: 19 Weight: 1200 diff --git a/pokeData/rhyhorn b/pokeData/rhyhorn index 5ac4b06..6fdb3cf 100644 --- a/pokeData/rhyhorn +++ b/pokeData/rhyhorn @@ -17,7 +17,7 @@ speed: 25 Genus: Spikes Pokémon - Happiness: 50 Pokedex ID: 111 + Happiness: 50 Pokedex ID: 123 Base Exp: 69 Capture Rate: 120 Height: 10 Weight: 1150 diff --git a/pokeData/rhyperior b/pokeData/rhyperior index de60567..b6cf2a5 100644 --- a/pokeData/rhyperior +++ b/pokeData/rhyperior @@ -17,7 +17,7 @@ speed: 40 Genus: Drill Pokémon - Happiness: 50 Pokedex ID: 464 + Happiness: 50 Pokedex ID: 125 Base Exp: 268 Capture Rate: 30 Height: 24 Weight: 2828 @@ -77,4 +77,4 @@ jump kick and high jump kick. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ribombee b/pokeData/ribombee index ed5de83..bbc633f 100644 --- a/pokeData/ribombee +++ b/pokeData/ribombee @@ -67,4 +67,4 @@ sleeping. - Location Areas: + Location Areas Unknown diff --git a/pokeData/rillaboom b/pokeData/rillaboom index 64680f3..2db2a3f 100644 --- a/pokeData/rillaboom +++ b/pokeData/rillaboom @@ -40,4 +40,4 @@ terrain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/riolu b/pokeData/riolu index 4c072e6..5b9b6c6 100644 --- a/pokeData/riolu +++ b/pokeData/riolu @@ -17,7 +17,7 @@ speed: 60 Genus: Emanation Pokémon - Happiness: 50 Pokedex ID: 447 + Happiness: 50 Pokedex ID: 467 Base Exp: 57 Capture Rate: 75 Height: 7 Weight: 202 diff --git a/pokeData/rockruff b/pokeData/rockruff index b2973f3..b0dfcfa 100644 --- a/pokeData/rockruff +++ b/pokeData/rockruff @@ -73,4 +73,4 @@ its Speed rises one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/roggenrola b/pokeData/roggenrola index cd0b2d8..72378b8 100644 --- a/pokeData/roggenrola +++ b/pokeData/roggenrola @@ -16,7 +16,7 @@ speed: 15 Genus: Mantle Pokémon - Happiness: 50 Pokedex ID: 524 + Happiness: 50 Pokedex ID: 525 Base Exp: 56 Capture Rate: 255 Height: 4 Weight: 180 diff --git a/pokeData/rolycoly b/pokeData/rolycoly index c44ee0e..e614b0c 100644 --- a/pokeData/rolycoly +++ b/pokeData/rolycoly @@ -58,4 +58,4 @@ o wisp. - Location Areas: + Location Areas Unknown diff --git a/pokeData/rookidee b/pokeData/rookidee index 70465e0..63e5eee 100644 --- a/pokeData/rookidee +++ b/pokeData/rookidee @@ -69,4 +69,4 @@ heart swap or guard swap. - Location Areas: + Location Areas Unknown diff --git a/pokeData/roselia b/pokeData/roselia index 3e09d0e..3bd0ac2 100644 --- a/pokeData/roselia +++ b/pokeData/roselia @@ -19,7 +19,7 @@ speed: 65 Genus: Thorn Pokémon - Happiness: 50 Pokedex ID: 315 + Happiness: 50 Pokedex ID: 342 Base Exp: 140 Capture Rate: 150 Height: 3 Weight: 20 diff --git a/pokeData/roserade b/pokeData/roserade index 5a1e1a4..d0f13ef 100644 --- a/pokeData/roserade +++ b/pokeData/roserade @@ -16,7 +16,7 @@ speed: 90 Genus: Bouquet Pokémon - Happiness: 50 Pokedex ID: 407 + Happiness: 50 Pokedex ID: 343 Base Exp: 258 Capture Rate: 75 Height: 9 Weight: 145 diff --git a/pokeData/rotom b/pokeData/rotom index 8253131..f0c9b9d 100644 --- a/pokeData/rotom +++ b/pokeData/rotom @@ -15,7 +15,7 @@ speed: 91 Genus: Plasma Pokémon - Happiness: 50 Pokedex ID: 479 + Happiness: 50 Pokedex ID: 480 Base Exp: 154 Capture Rate: 45 Height: 3 Weight: 3 diff --git a/pokeData/rowlet b/pokeData/rowlet index d4684ef..90266be 100644 --- a/pokeData/rowlet +++ b/pokeData/rowlet @@ -40,4 +40,4 @@ will not make contact. - Location Areas: + Location Areas Unknown diff --git a/pokeData/rufflet b/pokeData/rufflet index 90e888e..d6113c1 100644 --- a/pokeData/rufflet +++ b/pokeData/rufflet @@ -17,7 +17,7 @@ speed: 60 Genus: Eaglet Pokémon - Happiness: 50 Pokedex ID: 627 + Happiness: 50 Pokedex ID: 628 Base Exp: 70 Capture Rate: 190 Height: 5 Weight: 105 diff --git a/pokeData/runerigus b/pokeData/runerigus index 7142278..9a8c2f4 100644 --- a/pokeData/runerigus +++ b/pokeData/runerigus @@ -8,7 +8,7 @@ Evolution Chain Yamask ► Cofagrigus -Stage 2 Forms: + Stage 2 Forms: cofagrigus runerigus @@ -36,4 +36,4 @@ Stage 2 Forms: - Location Areas: + Location Areas Unknown diff --git a/pokeData/sableye b/pokeData/sableye index fa5ff4a..3b766d1 100644 --- a/pokeData/sableye +++ b/pokeData/sableye @@ -19,7 +19,7 @@ speed: 50 Genus: Darkness Pokémon - Happiness: 35 Pokedex ID: 302 + Happiness: 35 Pokedex ID: 328 Base Exp: 133 Capture Rate: 45 Height: 5 Weight: 110 diff --git a/pokeData/salamence b/pokeData/salamence index 0a4721c..b17d6b2 100644 --- a/pokeData/salamence +++ b/pokeData/salamence @@ -20,7 +20,7 @@ speed: 100 Genus: Dragon Pokémon - Happiness: 35 Pokedex ID: 373 + Happiness: 35 Pokedex ID: 403 Base Exp: 300 Capture Rate: 45 Height: 15 Weight: 1026 @@ -70,4 +70,4 @@ effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/salandit b/pokeData/salandit index b70494d..a70b402 100644 --- a/pokeData/salandit +++ b/pokeData/salandit @@ -45,4 +45,4 @@ infatuation is cleared. - Location Areas: + Location Areas Unknown diff --git a/pokeData/salazzle b/pokeData/salazzle index b4f873d..0b192a4 100644 --- a/pokeData/salazzle +++ b/pokeData/salazzle @@ -44,4 +44,4 @@ infatuation is cleared. - Location Areas: + Location Areas Unknown diff --git a/pokeData/samurott b/pokeData/samurott index c6783e1..fb13efc 100644 --- a/pokeData/samurott +++ b/pokeData/samurott @@ -17,7 +17,7 @@ speed: 70 Genus: Formidable Pokémon - Happiness: 70 Pokedex ID: 503 + Happiness: 70 Pokedex ID: 504 Base Exp: 238 Capture Rate: 45 Height: 15 Weight: 946 @@ -42,4 +42,4 @@ to battle armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sandaconda b/pokeData/sandaconda index 42862ef..7c15081 100644 --- a/pokeData/sandaconda +++ b/pokeData/sandaconda @@ -52,4 +52,4 @@ rate is halved in a sandstorm. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sandile b/pokeData/sandile index 7a321d1..fcdb5c0 100644 --- a/pokeData/sandile +++ b/pokeData/sandile @@ -17,7 +17,7 @@ speed: 65 Genus: Desert Croc Pokémon - Happiness: 50 Pokedex ID: 551 + Happiness: 50 Pokedex ID: 552 Base Exp: 58 Capture Rate: 180 Height: 7 Weight: 152 diff --git a/pokeData/sandshrew b/pokeData/sandshrew index bbbc418..e9dbba5 100644 --- a/pokeData/sandshrew +++ b/pokeData/sandshrew @@ -17,7 +17,7 @@ speed: 40 Genus: Mouse Pokémon - Happiness: 50 Pokedex ID: 27 + Happiness: 50 Pokedex ID: 28 Base Exp: 60 Capture Rate: 255 Height: 6 Weight: 120 diff --git a/pokeData/sandslash b/pokeData/sandslash index fe118fe..ae0a3b5 100644 --- a/pokeData/sandslash +++ b/pokeData/sandslash @@ -17,7 +17,7 @@ speed: 65 Genus: Mouse Pokémon - Happiness: 50 Pokedex ID: 28 + Happiness: 50 Pokedex ID: 29 Base Exp: 158 Capture Rate: 90 Height: 10 Weight: 295 diff --git a/pokeData/sandygast b/pokeData/sandygast index 011f0c6..3c5c3bb 100644 --- a/pokeData/sandygast +++ b/pokeData/sandygast @@ -48,4 +48,4 @@ rate is halved in a sandstorm. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sawk b/pokeData/sawk index 033830e..a7e0233 100644 --- a/pokeData/sawk +++ b/pokeData/sawk @@ -16,7 +16,7 @@ speed: 85 Genus: Karate Pokémon - Happiness: 50 Pokedex ID: 539 + Happiness: 50 Pokedex ID: 540 Base Exp: 163 Capture Rate: 45 Height: 14 Weight: 510 diff --git a/pokeData/sawsbuck b/pokeData/sawsbuck index 1ff9630..92d850a 100644 --- a/pokeData/sawsbuck +++ b/pokeData/sawsbuck @@ -1,8 +1,12 @@ Sawsbuck Normal Type Pokémon - - Single Stage Evolution Pokémon + They migrate according to the + seasons. People can tell the + season by looking at Sawsbuck’s + horns. + Evolution Chain + Deerling ► Sawsbuck ↞--------| STATS |--------↠ hp: 80 @@ -12,9 +16,9 @@ special-defense: 70 speed: 95 - Genus: - Happiness: Pokedex ID: 586 - Base Exp: 166 Capture Rate: + Genus: Season Pokémon + Happiness: 70 Pokedex ID: 587 + Base Exp: 166 Capture Rate: 75 Height: 19 Weight: 925 Types: diff --git a/pokeData/scatterbug b/pokeData/scatterbug index d253b0f..6cddad1 100644 --- a/pokeData/scatterbug +++ b/pokeData/scatterbug @@ -17,7 +17,7 @@ speed: 35 Genus: Scatterdust Pokémon - Happiness: 70 Pokedex ID: 664 + Happiness: 70 Pokedex ID: 665 Base Exp: 40 Capture Rate: 255 Height: 3 Weight: 25 diff --git a/pokeData/sceptile b/pokeData/sceptile index 412c532..0fa877f 100644 --- a/pokeData/sceptile +++ b/pokeData/sceptile @@ -19,7 +19,7 @@ speed: 120 Genus: Forest Pokémon - Happiness: 50 Pokedex ID: 254 + Happiness: 50 Pokedex ID: 279 Base Exp: 265 Capture Rate: 45 Height: 17 Weight: 522 @@ -50,4 +50,4 @@ takes effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/scizor b/pokeData/scizor index 5f7b9ac..9c3764d 100644 --- a/pokeData/scizor +++ b/pokeData/scizor @@ -7,7 +7,7 @@ Evolution Chain Scyther ► Scizor -Stage 2 Forms: + Stage 2 Forms: scizor kleavor @@ -20,7 +20,7 @@ Stage 2 Forms: speed: 65 Genus: Pincer Pokémon - Happiness: 50 Pokedex ID: 212 + Happiness: 50 Pokedex ID: 142 Base Exp: 175 Capture Rate: 25 Height: 18 Weight: 1180 @@ -61,4 +61,4 @@ Stage 2 Forms: weight for its species. - Location Areas: + Location Areas Unknown diff --git a/pokeData/scolipede b/pokeData/scolipede index 7219733..4a6e0e9 100644 --- a/pokeData/scolipede +++ b/pokeData/scolipede @@ -17,7 +17,7 @@ speed: 112 Genus: Megapede Pokémon - Happiness: 50 Pokedex ID: 545 + Happiness: 50 Pokedex ID: 546 Base Exp: 243 Capture Rate: 45 Height: 25 Weight: 2005 diff --git a/pokeData/scorbunny b/pokeData/scorbunny index 6b98b6c..aaa5f8b 100644 --- a/pokeData/scorbunny +++ b/pokeData/scorbunny @@ -39,4 +39,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/scrafty b/pokeData/scrafty index 75d95b9..aa7939d 100644 --- a/pokeData/scrafty +++ b/pokeData/scrafty @@ -17,7 +17,7 @@ speed: 58 Genus: Hoodlum Pokémon - Happiness: 50 Pokedex ID: 560 + Happiness: 50 Pokedex ID: 561 Base Exp: 171 Capture Rate: 90 Height: 11 Weight: 300 diff --git a/pokeData/scraggy b/pokeData/scraggy index 2155101..6be5a0b 100644 --- a/pokeData/scraggy +++ b/pokeData/scraggy @@ -17,7 +17,7 @@ speed: 48 Genus: Shedding Pokémon - Happiness: 35 Pokedex ID: 559 + Happiness: 35 Pokedex ID: 560 Base Exp: 70 Capture Rate: 180 Height: 6 Weight: 118 diff --git a/pokeData/scyther b/pokeData/scyther index 80ef657..0d8c82d 100644 --- a/pokeData/scyther +++ b/pokeData/scyther @@ -8,7 +8,7 @@ Evolution Chain Scyther ► Scizor -Stage 2 Forms: + Stage 2 Forms: scizor kleavor @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 105 Genus: Mantis Pokémon - Happiness: 50 Pokedex ID: 123 + Happiness: 50 Pokedex ID: 141 Base Exp: 100 Capture Rate: 45 Height: 15 Weight: 560 diff --git a/pokeData/seadra b/pokeData/seadra index 911a90f..b382a01 100644 --- a/pokeData/seadra +++ b/pokeData/seadra @@ -17,7 +17,7 @@ speed: 85 Genus: Dragon Pokémon - Happiness: 50 Pokedex ID: 117 + Happiness: 50 Pokedex ID: 133 Base Exp: 154 Capture Rate: 75 Height: 12 Weight: 250 diff --git a/pokeData/seaking b/pokeData/seaking index fce4878..4079275 100644 --- a/pokeData/seaking +++ b/pokeData/seaking @@ -16,7 +16,7 @@ speed: 68 Genus: Goldfish Pokémon - Happiness: 50 Pokedex ID: 119 + Happiness: 50 Pokedex ID: 136 Base Exp: 158 Capture Rate: 60 Height: 13 Weight: 390 diff --git a/pokeData/sealeo b/pokeData/sealeo index 354bd4a..1713cb4 100644 --- a/pokeData/sealeo +++ b/pokeData/sealeo @@ -20,7 +20,7 @@ speed: 45 Genus: Ball Roll Pokémon - Happiness: 50 Pokedex ID: 364 + Happiness: 50 Pokedex ID: 394 Base Exp: 144 Capture Rate: 120 Height: 11 Weight: 876 diff --git a/pokeData/seedot b/pokeData/seedot index b315765..96f4ce8 100644 --- a/pokeData/seedot +++ b/pokeData/seedot @@ -20,7 +20,7 @@ speed: 30 Genus: Acorn Pokémon - Happiness: 50 Pokedex ID: 273 + Happiness: 50 Pokedex ID: 298 Base Exp: 44 Capture Rate: 255 Height: 5 Weight: 40 diff --git a/pokeData/seel b/pokeData/seel index 0c13c6d..5bd80e2 100644 --- a/pokeData/seel +++ b/pokeData/seel @@ -16,7 +16,7 @@ speed: 45 Genus: Sea Lion Pokémon - Happiness: 70 Pokedex ID: 86 + Happiness: 70 Pokedex ID: 94 Base Exp: 65 Capture Rate: 190 Height: 11 Weight: 900 diff --git a/pokeData/seismitoad b/pokeData/seismitoad index 4400c88..70f1b99 100644 --- a/pokeData/seismitoad +++ b/pokeData/seismitoad @@ -17,7 +17,7 @@ speed: 74 Genus: Vibration Pokémon - Happiness: 50 Pokedex ID: 537 + Happiness: 50 Pokedex ID: 538 Base Exp: 255 Capture Rate: 45 Height: 15 Weight: 620 diff --git a/pokeData/sentret b/pokeData/sentret index b78d51a..9cb208f 100644 --- a/pokeData/sentret +++ b/pokeData/sentret @@ -17,7 +17,7 @@ speed: 20 Genus: Scout Pokémon - Happiness: 70 Pokedex ID: 161 + Happiness: 70 Pokedex ID: 193 Base Exp: 43 Capture Rate: 255 Height: 8 Weight: 60 @@ -69,3 +69,13 @@ Location Areas: + Sinnoh route 202 area + Johto route 29 area + Johto route 43 area + Kanto route 1 area + Five isle meadow area + Water path area + Canyon entrance area + Kalos route 6 area + Johto safari zone zone swamp + Johto safari zone zone wetland diff --git a/pokeData/serperior b/pokeData/serperior index 7f11684..6c0784f 100644 --- a/pokeData/serperior +++ b/pokeData/serperior @@ -17,7 +17,7 @@ speed: 113 Genus: Regal Pokémon - Happiness: 70 Pokedex ID: 497 + Happiness: 70 Pokedex ID: 498 Base Exp: 238 Capture Rate: 45 Height: 33 Weight: 630 @@ -41,4 +41,4 @@ vice versa. - Location Areas: + Location Areas Unknown diff --git a/pokeData/servine b/pokeData/servine index c08ec9d..6e8b7f3 100644 --- a/pokeData/servine +++ b/pokeData/servine @@ -17,7 +17,7 @@ speed: 83 Genus: Grass Snake Pokémon - Happiness: 70 Pokedex ID: 496 + Happiness: 70 Pokedex ID: 497 Base Exp: 145 Capture Rate: 45 Height: 8 Weight: 160 @@ -41,4 +41,4 @@ vice versa. - Location Areas: + Location Areas Unknown diff --git a/pokeData/seviper b/pokeData/seviper index ee5a40d..dae090e 100644 --- a/pokeData/seviper +++ b/pokeData/seviper @@ -18,7 +18,7 @@ speed: 65 Genus: Fang Snake Pokémon - Happiness: 70 Pokedex ID: 336 + Happiness: 70 Pokedex ID: 364 Base Exp: 160 Capture Rate: 90 Height: 27 Weight: 525 diff --git a/pokeData/sewaddle b/pokeData/sewaddle index 1d79a24..54b11a2 100644 --- a/pokeData/sewaddle +++ b/pokeData/sewaddle @@ -17,7 +17,7 @@ speed: 42 Genus: Sewing Pokémon - Happiness: 70 Pokedex ID: 540 + Happiness: 70 Pokedex ID: 541 Base Exp: 62 Capture Rate: 255 Height: 3 Weight: 25 diff --git a/pokeData/sharpedo b/pokeData/sharpedo index fde7f03..24fe298 100644 --- a/pokeData/sharpedo +++ b/pokeData/sharpedo @@ -19,7 +19,7 @@ speed: 95 Genus: Brutal Pokémon - Happiness: 35 Pokedex ID: 319 + Happiness: 35 Pokedex ID: 347 Base Exp: 161 Capture Rate: 60 Height: 18 Weight: 888 diff --git a/pokeData/shaymin b/pokeData/shaymin index 7c71fcc..14fb6af 100644 --- a/pokeData/shaymin +++ b/pokeData/shaymin @@ -1,5 +1,5 @@ - Type Pokémon + Arceus Normal Type Pokémon It lives in flower patches and avoids detection by curling up @@ -8,15 +8,64 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 120 + attack: 120 + defense: 120 + special-attack: 120 + special-defense: 120 + speed: 120 Genus: Gratitude Pokémon - Happiness: 100 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 100 Pokedex ID: 493 + Base Exp: 324 Capture Rate: 45 + Height: 32 Weight: 3200 Types: + Normal ↞---------------|ABILITIES|---------------↠ + Multitype: - Location Areas: + If this Pokémon is holding + an elemental Plate, its type + and form change to match the + Plate. + + This Pokémon's held item, whether + or not it is a Plate, cannot + be taken by covet or thief, nor + removed by knock off, nor traded + by switcheroo or trick. Covet, + Thief, and Knock Off still inflict + damage against this Pokémon. + Unlike with sticky hold, this + Pokémon cannot use fling, Switcheroo, + or Trick to lose its item itself, + nor gain an item through Switcheroo + or Trick if it does not have + one. + + This ability has no effect + for any Pokémon other than arceus. + This ability cannot be traded + with skill swap, nor copied with + role play or trace, nor disabled + with gastro acid, nor changed + with worry seed. This Pokémon + cannot use Skill Swap or Role + Play to lose its ability itself. + mold breaker cannot ignore this + ability. + + If a Pokémon Transforms into + an Arceus with this ability, + it will Transform into Arceus's + default, normal-type form. If + the Transforming Pokémon is holding + a Plate, this ability will then + activate and change the Pokémon + into the corresponding form. + + + Location Areas Unknown diff --git a/pokeData/shedinja b/pokeData/shedinja index 9426776..e5e612e 100644 --- a/pokeData/shedinja +++ b/pokeData/shedinja @@ -12,7 +12,7 @@ Evolution Chain Nincada ► Ninjask -Stage 2 Forms: + Stage 2 Forms: ninjask shedinja @@ -25,7 +25,7 @@ Stage 2 Forms: speed: 40 Genus: Shed Pokémon - Happiness: 50 Pokedex ID: 292 + Happiness: 50 Pokedex ID: 318 Base Exp: 83 Capture Rate: 45 Height: 8 Weight: 12 @@ -66,4 +66,4 @@ Stage 2 Forms: as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/shelgon b/pokeData/shelgon index ec56401..b8ac99e 100644 --- a/pokeData/shelgon +++ b/pokeData/shelgon @@ -19,7 +19,7 @@ speed: 50 Genus: Endurance Pokémon - Happiness: 35 Pokedex ID: 372 + Happiness: 35 Pokedex ID: 402 Base Exp: 147 Capture Rate: 45 Height: 11 Weight: 1105 @@ -45,4 +45,4 @@ damage from weather. - Location Areas: + Location Areas Unknown diff --git a/pokeData/shellder b/pokeData/shellder index 9535a60..f9e9f2f 100644 --- a/pokeData/shellder +++ b/pokeData/shellder @@ -17,7 +17,7 @@ speed: 40 Genus: Bivalve Pokémon - Happiness: 50 Pokedex ID: 90 + Happiness: 50 Pokedex ID: 98 Base Exp: 61 Capture Rate: 190 Height: 3 Weight: 40 diff --git a/pokeData/shellos b/pokeData/shellos index 1c6bebd..1b0505c 100644 --- a/pokeData/shellos +++ b/pokeData/shellos @@ -17,7 +17,7 @@ speed: 34 Genus: Sea Slug Pokémon - Happiness: 50 Pokedex ID: 422 + Happiness: 50 Pokedex ID: 450 Base Exp: 65 Capture Rate: 190 Height: 3 Weight: 63 diff --git a/pokeData/shelmet b/pokeData/shelmet index e7c7bb6..2223658 100644 --- a/pokeData/shelmet +++ b/pokeData/shelmet @@ -17,7 +17,7 @@ speed: 25 Genus: Snail Pokémon - Happiness: 50 Pokedex ID: 616 + Happiness: 50 Pokedex ID: 617 Base Exp: 61 Capture Rate: 200 Height: 4 Weight: 77 diff --git a/pokeData/shieldon b/pokeData/shieldon index 287b51e..fd0aa4d 100644 --- a/pokeData/shieldon +++ b/pokeData/shieldon @@ -17,7 +17,7 @@ speed: 30 Genus: Shield Pokémon - Happiness: 70 Pokedex ID: 410 + Happiness: 70 Pokedex ID: 438 Base Exp: 70 Capture Rate: 45 Height: 5 Weight: 570 @@ -61,4 +61,4 @@ and yawn are not flagged as sound-based. - Location Areas: + Location Areas Unknown diff --git a/pokeData/shiftry b/pokeData/shiftry index 85e2b51..39c7aef 100644 --- a/pokeData/shiftry +++ b/pokeData/shiftry @@ -1,23 +1,67 @@ - Type Pokémon + Shiftry Grass Type Pokémon It lives quietly in the deep forest. It is said to create chilly winter winds with the fans it holds. - Single Stage Evolution Pokémon + Evolution Chain + Seedot ► Nuzleaf ► Shiftry ↞--------| STATS |--------↠ + hp: 90 + attack: 100 + defense: 60 + special-attack: 90 + special-defense: 60 + speed: 80 Genus: Wicked Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 50 Pokedex ID: 300 + Base Exp: 240 Capture Rate: 45 + Height: 13 Weight: 596 Types: + Grass + Dark ↞---------------|ABILITIES|---------------↠ + Chlorophyll: + + This Pokémon's Speed is doubled + during strong sunlight. + + This bonus does not count as + a stat modifier. + + Early-bird: + + This Pokémon's remaining sleep + turn count falls by 2 rather + than 1. + + If this Pokémon's sleep counter + is at 1, it will fall to 0 and + then the Pokémon will wake up. + + Pickpocket: + + Whenever a move makes contact + with this Pokémon, if it does + not have a held item, it steals + the attacker's held item. + + This Pokémon cannot steal upon + being knocked out. It can steal + if the attacker has a substitute, + but cannot steal when its own + Substitute is hit. If a move + hits multiple times, only the + last hit triggers this ability. + If this Pokémon is wild, it cannot + steal from a trained Pokémon. + Location Areas: Nature sanctuary area diff --git a/pokeData/shiinotic b/pokeData/shiinotic index d329345..1ce40c9 100644 --- a/pokeData/shiinotic +++ b/pokeData/shiinotic @@ -58,4 +58,4 @@ turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/shinx b/pokeData/shinx index f31003e..13cb378 100644 --- a/pokeData/shinx +++ b/pokeData/shinx @@ -16,7 +16,7 @@ speed: 45 Genus: Flash Pokémon - Happiness: 50 Pokedex ID: 403 + Happiness: 50 Pokedex ID: 433 Base Exp: 53 Capture Rate: 235 Height: 5 Weight: 95 @@ -73,3 +73,31 @@ Location Areas: + Valley windworks area + Fuego ironworks area + Sinnoh route 202 area + Sinnoh route 203 area + Sinnoh route 204 south towards jubilife city + Sinnoh route 204 north towards floaroma town + Johto route 29 area + Johto route 33 area + National park area + Johto route 36 area + Johto route 37 area + Johto route 38 area + Johto route 39 area + Johto route 46 area + Johto route 48 area + Kanto route 1 area + Kanto route 2 south towards viridian city + Kanto route 3 area + Kanto route 5 area + Kanto route 7 area + Kanto route 8 area + Kanto route 11 area + Kanto route 14 area + Kanto route 15 area + Kanto route 16 area + Kanto route 17 area + Kanto route 18 area + Kanto route 2 north towards pewter city diff --git a/pokeData/shroomish b/pokeData/shroomish index de005f4..32f2dd9 100644 --- a/pokeData/shroomish +++ b/pokeData/shroomish @@ -20,7 +20,7 @@ speed: 35 Genus: Mushroom Pokémon - Happiness: 70 Pokedex ID: 285 + Happiness: 70 Pokedex ID: 311 Base Exp: 59 Capture Rate: 255 Height: 4 Weight: 45 diff --git a/pokeData/shuckle b/pokeData/shuckle index f416678..4efb6ac 100644 --- a/pokeData/shuckle +++ b/pokeData/shuckle @@ -15,7 +15,7 @@ speed: 5 Genus: Mold Pokémon - Happiness: 50 Pokedex ID: 213 + Happiness: 50 Pokedex ID: 243 Base Exp: 177 Capture Rate: 190 Height: 6 Weight: 205 diff --git a/pokeData/shuppet b/pokeData/shuppet index b4c1cf8..5d0a863 100644 --- a/pokeData/shuppet +++ b/pokeData/shuppet @@ -20,7 +20,7 @@ speed: 45 Genus: Puppet Pokémon - Happiness: 35 Pokedex ID: 353 + Happiness: 35 Pokedex ID: 381 Base Exp: 59 Capture Rate: 225 Height: 6 Weight: 23 diff --git a/pokeData/sigilyph b/pokeData/sigilyph index 75599b4..e5f9434 100644 --- a/pokeData/sigilyph +++ b/pokeData/sigilyph @@ -16,7 +16,7 @@ speed: 97 Genus: Avianoid Pokémon - Happiness: 50 Pokedex ID: 561 + Happiness: 50 Pokedex ID: 562 Base Exp: 172 Capture Rate: 45 Height: 14 Weight: 140 diff --git a/pokeData/silcoon b/pokeData/silcoon index 397abdc..3d6a49f 100644 --- a/pokeData/silcoon +++ b/pokeData/silcoon @@ -11,11 +11,11 @@ Evolution Chain Wurmple ► Silcoon ► Beautifly -Stage 2 Forms: + Stage 2 Forms: silcoon cascoon -Stage 3 Forms: + Stage 3 Forms: beautifly dustox @@ -28,7 +28,7 @@ Stage 3 Forms: speed: 15 Genus: Cocoon Pokémon - Happiness: 70 Pokedex ID: 266 + Happiness: 70 Pokedex ID: 291 Base Exp: 72 Capture Rate: 120 Height: 6 Weight: 100 diff --git a/pokeData/silicobra b/pokeData/silicobra index 62732bd..4fd2f86 100644 --- a/pokeData/silicobra +++ b/pokeData/silicobra @@ -51,4 +51,4 @@ rate is halved in a sandstorm. - Location Areas: + Location Areas Unknown diff --git a/pokeData/silvally b/pokeData/silvally index a54ea05..d88f0f6 100644 --- a/pokeData/silvally +++ b/pokeData/silvally @@ -38,4 +38,4 @@ Silvally. - Location Areas: + Location Areas Unknown diff --git a/pokeData/simipour b/pokeData/simipour index 8092f16..e2acd11 100644 --- a/pokeData/simipour +++ b/pokeData/simipour @@ -17,7 +17,7 @@ speed: 101 Genus: Geyser Pokémon - Happiness: 70 Pokedex ID: 516 + Happiness: 70 Pokedex ID: 517 Base Exp: 174 Capture Rate: 75 Height: 10 Weight: 290 @@ -42,4 +42,4 @@ as much regular damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/simisage b/pokeData/simisage index 0a1391c..a69bede 100644 --- a/pokeData/simisage +++ b/pokeData/simisage @@ -17,7 +17,7 @@ speed: 101 Genus: Thorn Monkey Pokémon - Happiness: 70 Pokedex ID: 512 + Happiness: 70 Pokedex ID: 513 Base Exp: 174 Capture Rate: 75 Height: 11 Weight: 305 @@ -42,4 +42,4 @@ as much regular damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/simisear b/pokeData/simisear index 90b0fbf..91e8408 100644 --- a/pokeData/simisear +++ b/pokeData/simisear @@ -1,5 +1,5 @@ - Simisear Fire Type Pokémon + Panpour Water Type Pokémon It loves sweets because they become energy for the fire burning @@ -8,33 +8,37 @@ Pansear ► Simisear ↞--------| STATS |--------↠ - hp: 75 - attack: 98 - defense: 63 - special-attack: 98 - special-defense: 63 - speed: 101 + hp: 50 + attack: 53 + defense: 48 + special-attack: 53 + special-defense: 48 + speed: 64 Genus: Ember Pokémon - Happiness: 70 Pokedex ID: 514 - Base Exp: 174 Capture Rate: 75 - Height: 10 Weight: 280 + Happiness: 70 Pokedex ID: 515 + Base Exp: 63 Capture Rate: 75 + Height: 6 Weight: 135 Types: - Fire + Water ↞---------------|ABILITIES|---------------↠ Gluttony: - + This Pokémon eats any held + Berry triggered by low HP when + it falls below 50% of its HP, + regardless of the Berry's usual + threshold. - Blaze: + Torrent: When this Pokémon has 1/3 or less of its HP remaining, its - fire-type moves inflict 1.5× + water-type moves inflict 1.5× as much regular damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sinistea b/pokeData/sinistea index 2683619..c744adc 100644 --- a/pokeData/sinistea +++ b/pokeData/sinistea @@ -43,4 +43,4 @@ afterward. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sirfetchd b/pokeData/sirfetchd index 51a4fe1..e247cf6 100644 --- a/pokeData/sirfetchd +++ b/pokeData/sirfetchd @@ -6,8 +6,7 @@ evolution. When this Pokémon’s leek withers, it will retire from combat. - Evolution Chain - Farfetchd ► Sirfetchd + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ hp: 62 @@ -42,4 +41,4 @@ affect damage as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sizzlipede b/pokeData/sizzlipede index 20aa47f..086b091 100644 --- a/pokeData/sizzlipede +++ b/pokeData/sizzlipede @@ -91,4 +91,4 @@ or magma armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/skarmory b/pokeData/skarmory index 55c968d..23369c1 100644 --- a/pokeData/skarmory +++ b/pokeData/skarmory @@ -16,7 +16,7 @@ speed: 70 Genus: Armor Bird Pokémon - Happiness: 50 Pokedex ID: 227 + Happiness: 50 Pokedex ID: 260 Base Exp: 163 Capture Rate: 25 Height: 17 Weight: 505 diff --git a/pokeData/skiddo b/pokeData/skiddo index 4a482a2..b53ba51 100644 --- a/pokeData/skiddo +++ b/pokeData/skiddo @@ -17,7 +17,7 @@ speed: 52 Genus: Mount Pokémon - Happiness: 70 Pokedex ID: 672 + Happiness: 70 Pokedex ID: 673 Base Exp: 70 Capture Rate: 200 Height: 9 Weight: 310 diff --git a/pokeData/skiploom b/pokeData/skiploom index 9656b89..77beae0 100644 --- a/pokeData/skiploom +++ b/pokeData/skiploom @@ -16,7 +16,7 @@ speed: 80 Genus: Cottonweed Pokémon - Happiness: 70 Pokedex ID: 188 + Happiness: 70 Pokedex ID: 217 Base Exp: 119 Capture Rate: 120 Height: 6 Weight: 10 diff --git a/pokeData/skitty b/pokeData/skitty index 38d550e..9a1876c 100644 --- a/pokeData/skitty +++ b/pokeData/skitty @@ -19,7 +19,7 @@ speed: 50 Genus: Kitten Pokémon - Happiness: 70 Pokedex ID: 300 + Happiness: 70 Pokedex ID: 326 Base Exp: 52 Capture Rate: 255 Height: 6 Weight: 110 diff --git a/pokeData/skorupi b/pokeData/skorupi index af05b08..5e4adec 100644 --- a/pokeData/skorupi +++ b/pokeData/skorupi @@ -17,7 +17,7 @@ speed: 65 Genus: Scorpion Pokémon - Happiness: 50 Pokedex ID: 451 + Happiness: 50 Pokedex ID: 471 Base Exp: 66 Capture Rate: 120 Height: 8 Weight: 120 diff --git a/pokeData/skrelp b/pokeData/skrelp index 6b4a04f..b83138a 100644 --- a/pokeData/skrelp +++ b/pokeData/skrelp @@ -17,7 +17,7 @@ speed: 30 Genus: Mock Kelp Pokémon - Happiness: 50 Pokedex ID: 690 + Happiness: 50 Pokedex ID: 691 Base Exp: 64 Capture Rate: 225 Height: 5 Weight: 73 diff --git a/pokeData/skuntank b/pokeData/skuntank index 585bc75..de2e265 100644 --- a/pokeData/skuntank +++ b/pokeData/skuntank @@ -17,7 +17,7 @@ speed: 84 Genus: Skunk Pokémon - Happiness: 50 Pokedex ID: 435 + Happiness: 50 Pokedex ID: 459 Base Exp: 168 Capture Rate: 60 Height: 10 Weight: 380 diff --git a/pokeData/skwovet b/pokeData/skwovet index edf01fd..7eb26fa 100644 --- a/pokeData/skwovet +++ b/pokeData/skwovet @@ -40,4 +40,4 @@ threshold. - Location Areas: + Location Areas Unknown diff --git a/pokeData/slaking b/pokeData/slaking index eaa71ec..b6aef60 100644 --- a/pokeData/slaking +++ b/pokeData/slaking @@ -19,7 +19,7 @@ speed: 100 Genus: Lazy Pokémon - Happiness: 70 Pokedex ID: 289 + Happiness: 70 Pokedex ID: 315 Base Exp: 252 Capture Rate: 45 Height: 20 Weight: 1305 diff --git a/pokeData/slakoth b/pokeData/slakoth index 46a47ce..23144f7 100644 --- a/pokeData/slakoth +++ b/pokeData/slakoth @@ -19,7 +19,7 @@ speed: 30 Genus: Slacker Pokémon - Happiness: 70 Pokedex ID: 287 + Happiness: 70 Pokedex ID: 313 Base Exp: 56 Capture Rate: 255 Height: 8 Weight: 240 diff --git a/pokeData/slowbro b/pokeData/slowbro index 12c36fa..582da3a 100644 --- a/pokeData/slowbro +++ b/pokeData/slowbro @@ -8,7 +8,7 @@ Evolution Chain Slowpoke ► Slowbro -Stage 2 Forms: + Stage 2 Forms: slowbro slowking @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 30 Genus: Hermit Crab Pokémon - Happiness: 50 Pokedex ID: 80 + Happiness: 50 Pokedex ID: 86 Base Exp: 172 Capture Rate: 75 Height: 16 Weight: 785 diff --git a/pokeData/slowking b/pokeData/slowking index 19f3eac..932849b 100644 --- a/pokeData/slowking +++ b/pokeData/slowking @@ -8,7 +8,7 @@ Evolution Chain Slowpoke ► Slowbro -Stage 2 Forms: + Stage 2 Forms: slowbro slowking @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 30 Genus: Royal Pokémon - Happiness: 50 Pokedex ID: 199 + Happiness: 50 Pokedex ID: 87 Base Exp: 172 Capture Rate: 70 Height: 20 Weight: 795 diff --git a/pokeData/slowpoke b/pokeData/slowpoke index a0442ac..6d8d2c4 100644 --- a/pokeData/slowpoke +++ b/pokeData/slowpoke @@ -8,7 +8,7 @@ Evolution Chain Slowpoke ► Slowbro -Stage 2 Forms: + Stage 2 Forms: slowbro slowking @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 15 Genus: Dopey Pokémon - Happiness: 50 Pokedex ID: 79 + Happiness: 50 Pokedex ID: 85 Base Exp: 63 Capture Rate: 190 Height: 12 Weight: 360 diff --git a/pokeData/slugma b/pokeData/slugma index e9c6e56..ccdc32c 100644 --- a/pokeData/slugma +++ b/pokeData/slugma @@ -17,7 +17,7 @@ speed: 20 Genus: Lava Pokémon - Happiness: 70 Pokedex ID: 218 + Happiness: 70 Pokedex ID: 249 Base Exp: 50 Capture Rate: 190 Height: 7 Weight: 350 diff --git a/pokeData/slurpuff b/pokeData/slurpuff index f287350..fa777e2 100644 --- a/pokeData/slurpuff +++ b/pokeData/slurpuff @@ -17,7 +17,7 @@ speed: 72 Genus: Meringue Pokémon - Happiness: 50 Pokedex ID: 685 + Happiness: 50 Pokedex ID: 686 Base Exp: 168 Capture Rate: 140 Height: 8 Weight: 50 @@ -46,4 +46,4 @@ takes effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/smeargle b/pokeData/smeargle index fe5c802..6a835cb 100644 --- a/pokeData/smeargle +++ b/pokeData/smeargle @@ -16,7 +16,7 @@ speed: 75 Genus: Painter Pokémon - Happiness: 70 Pokedex ID: 235 + Happiness: 70 Pokedex ID: 266 Base Exp: 88 Capture Rate: 45 Height: 12 Weight: 580 diff --git a/pokeData/smoochum b/pokeData/smoochum index 2929415..f5e00f3 100644 --- a/pokeData/smoochum +++ b/pokeData/smoochum @@ -17,7 +17,7 @@ speed: 65 Genus: Kiss Pokémon - Happiness: 50 Pokedex ID: 238 + Happiness: 50 Pokedex ID: 143 Base Exp: 61 Capture Rate: 45 Height: 4 Weight: 60 diff --git a/pokeData/sneasel b/pokeData/sneasel index ece63c2..19b4d68 100644 --- a/pokeData/sneasel +++ b/pokeData/sneasel @@ -8,7 +8,7 @@ Evolution Chain Sneasel ► Weavile -Stage 2 Forms: + Stage 2 Forms: weavile sneasler @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 115 Genus: Sharp Claw Pokémon - Happiness: 35 Pokedex ID: 215 + Happiness: 35 Pokedex ID: 245 Base Exp: 86 Capture Rate: 60 Height: 9 Weight: 280 diff --git a/pokeData/sneasler b/pokeData/sneasler index a7dacb7..74e82ef 100644 --- a/pokeData/sneasler +++ b/pokeData/sneasler @@ -11,7 +11,7 @@ Evolution Chain Sneasel ► Weavile -Stage 2 Forms: + Stage 2 Forms: weavile sneasler @@ -77,4 +77,4 @@ Stage 2 Forms: mummy. - Location Areas: + Location Areas Unknown diff --git a/pokeData/snivy b/pokeData/snivy index 0498d2a..d20c74a 100644 --- a/pokeData/snivy +++ b/pokeData/snivy @@ -17,7 +17,7 @@ speed: 63 Genus: Grass Snake Pokémon - Happiness: 70 Pokedex ID: 495 + Happiness: 70 Pokedex ID: 496 Base Exp: 62 Capture Rate: 45 Height: 6 Weight: 81 diff --git a/pokeData/snom b/pokeData/snom index 1661ee1..8b0b19a 100644 --- a/pokeData/snom +++ b/pokeData/snom @@ -52,4 +52,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/snorlax b/pokeData/snorlax index 946990e..9ada01b 100644 --- a/pokeData/snorlax +++ b/pokeData/snorlax @@ -17,7 +17,7 @@ speed: 30 Genus: Sleeping Pokémon - Happiness: 50 Pokedex ID: 143 + Happiness: 50 Pokedex ID: 175 Base Exp: 189 Capture Rate: 25 Height: 21 Weight: 4600 diff --git a/pokeData/snorunt b/pokeData/snorunt index 60b3c89..c83c668 100644 --- a/pokeData/snorunt +++ b/pokeData/snorunt @@ -11,7 +11,7 @@ Evolution Chain Snorunt ► Glalie -Stage 2 Forms: + Stage 2 Forms: glalie froslass @@ -24,7 +24,7 @@ Stage 2 Forms: speed: 50 Genus: Snow Hat Pokémon - Happiness: 50 Pokedex ID: 361 + Happiness: 50 Pokedex ID: 390 Base Exp: 60 Capture Rate: 190 Height: 7 Weight: 168 diff --git a/pokeData/snover b/pokeData/snover index 7fb4552..49d1779 100644 --- a/pokeData/snover +++ b/pokeData/snover @@ -17,7 +17,7 @@ speed: 40 Genus: Frost Tree Pokémon - Happiness: 50 Pokedex ID: 459 + Happiness: 50 Pokedex ID: 478 Base Exp: 67 Capture Rate: 120 Height: 10 Weight: 505 diff --git a/pokeData/snubbull b/pokeData/snubbull index bf42223..9e1fbb8 100644 --- a/pokeData/snubbull +++ b/pokeData/snubbull @@ -17,7 +17,7 @@ speed: 30 Genus: Fairy Pokémon - Happiness: 70 Pokedex ID: 209 + Happiness: 70 Pokedex ID: 240 Base Exp: 60 Capture Rate: 190 Height: 6 Weight: 78 diff --git a/pokeData/sobble b/pokeData/sobble index ddb42ad..ae5292f 100644 --- a/pokeData/sobble +++ b/pokeData/sobble @@ -41,4 +41,4 @@ than the usual double damage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/solgaleo b/pokeData/solgaleo index c118a8e..b582aba 100644 --- a/pokeData/solgaleo +++ b/pokeData/solgaleo @@ -10,7 +10,7 @@ Evolution Chain Cosmog ► Cosmoem ► Solgaleo -Stage 3 Forms: + Stage 3 Forms: solgaleo lunala @@ -47,4 +47,4 @@ Stage 3 Forms: turboblaze. - Location Areas: + Location Areas Unknown diff --git a/pokeData/solosis b/pokeData/solosis index a251dcf..d3c5c06 100644 --- a/pokeData/solosis +++ b/pokeData/solosis @@ -17,7 +17,7 @@ speed: 20 Genus: Cell Pokémon - Happiness: 50 Pokedex ID: 577 + Happiness: 50 Pokedex ID: 578 Base Exp: 58 Capture Rate: 200 Height: 3 Weight: 10 @@ -28,7 +28,8 @@ Overcoat: - + This Pokémon does not take + damage from weather. Magic-guard: diff --git a/pokeData/solrock b/pokeData/solrock index 64418e5..af87f39 100644 --- a/pokeData/solrock +++ b/pokeData/solrock @@ -16,7 +16,7 @@ speed: 70 Genus: Meteorite Pokémon - Happiness: 50 Pokedex ID: 338 + Happiness: 50 Pokedex ID: 366 Base Exp: 161 Capture Rate: 45 Height: 12 Weight: 1540 diff --git a/pokeData/spectrier b/pokeData/spectrier index 6a1766c..430d4f8 100644 --- a/pokeData/spectrier +++ b/pokeData/spectrier @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/spewpa b/pokeData/spewpa index d992e20..c5a967f 100644 --- a/pokeData/spewpa +++ b/pokeData/spewpa @@ -18,7 +18,7 @@ speed: 29 Genus: Scatterdust Pokémon - Happiness: 70 Pokedex ID: 665 + Happiness: 70 Pokedex ID: 666 Base Exp: 75 Capture Rate: 120 Height: 3 Weight: 84 @@ -43,4 +43,4 @@ allied Pokémon have it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/spheal b/pokeData/spheal index e2ff4fd..ba6e370 100644 --- a/pokeData/spheal +++ b/pokeData/spheal @@ -20,7 +20,7 @@ speed: 25 Genus: Clap Pokémon - Happiness: 50 Pokedex ID: 363 + Happiness: 50 Pokedex ID: 393 Base Exp: 58 Capture Rate: 255 Height: 8 Weight: 395 diff --git a/pokeData/spinarak b/pokeData/spinarak index 2260dcf..c08a3c2 100644 --- a/pokeData/spinarak +++ b/pokeData/spinarak @@ -17,7 +17,7 @@ speed: 30 Genus: String Spit Pokémon - Happiness: 70 Pokedex ID: 167 + Happiness: 70 Pokedex ID: 199 Base Exp: 50 Capture Rate: 255 Height: 5 Weight: 85 diff --git a/pokeData/spinda b/pokeData/spinda index f5790cf..e7c30de 100644 --- a/pokeData/spinda +++ b/pokeData/spinda @@ -15,7 +15,7 @@ speed: 60 Genus: Spot Panda Pokémon - Happiness: 70 Pokedex ID: 327 + Happiness: 70 Pokedex ID: 355 Base Exp: 126 Capture Rate: 255 Height: 11 Weight: 50 diff --git a/pokeData/spiritomb b/pokeData/spiritomb index 69c596c..0bd8d65 100644 --- a/pokeData/spiritomb +++ b/pokeData/spiritomb @@ -16,7 +16,7 @@ speed: 35 Genus: Forbidden Pokémon - Happiness: 50 Pokedex ID: 442 + Happiness: 50 Pokedex ID: 463 Base Exp: 170 Capture Rate: 100 Height: 10 Weight: 1080 diff --git a/pokeData/spoink b/pokeData/spoink index 47df696..8a45901 100644 --- a/pokeData/spoink +++ b/pokeData/spoink @@ -19,7 +19,7 @@ speed: 60 Genus: Bounce Pokémon - Happiness: 70 Pokedex ID: 325 + Happiness: 70 Pokedex ID: 353 Base Exp: 66 Capture Rate: 255 Height: 7 Weight: 306 diff --git a/pokeData/spritzee b/pokeData/spritzee index 8f385de..7bbbd11 100644 --- a/pokeData/spritzee +++ b/pokeData/spritzee @@ -17,7 +17,7 @@ speed: 23 Genus: Perfume Pokémon - Happiness: 50 Pokedex ID: 682 + Happiness: 50 Pokedex ID: 683 Base Exp: 68 Capture Rate: 200 Height: 2 Weight: 5 diff --git a/pokeData/squirtle b/pokeData/squirtle index c1a0798..7acf719 100644 --- a/pokeData/squirtle +++ b/pokeData/squirtle @@ -4,7 +4,8 @@ After birth, its back swells and hardens into a shell. Powerfully sprays foam from its mouth. - Single Stage Evolution Pokémon + Evolution Chain + Squirtle ► Wartortle ► Blastoise ↞--------| STATS |--------↠ hp: 44 @@ -38,7 +39,4 @@ turn during rain. - Location Areas: - Vermilion city area - Pallet town area - Lumiose city area + Location Areas Unknown diff --git a/pokeData/stakataka b/pokeData/stakataka index 1ce789f..96e590f 100644 --- a/pokeData/stakataka +++ b/pokeData/stakataka @@ -33,4 +33,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/stantler b/pokeData/stantler index 0302121..6972a77 100644 --- a/pokeData/stantler +++ b/pokeData/stantler @@ -17,7 +17,7 @@ speed: 85 Genus: Big Horn Pokémon - Happiness: 70 Pokedex ID: 234 + Happiness: 70 Pokedex ID: 265 Base Exp: 163 Capture Rate: 45 Height: 14 Weight: 712 diff --git a/pokeData/staraptor b/pokeData/staraptor index 7d735d7..499376d 100644 --- a/pokeData/staraptor +++ b/pokeData/staraptor @@ -16,7 +16,7 @@ speed: 100 Genus: Predator Pokémon - Happiness: 70 Pokedex ID: 398 + Happiness: 70 Pokedex ID: 428 Base Exp: 218 Capture Rate: 45 Height: 12 Weight: 249 @@ -62,4 +62,4 @@ jump kick and high jump kick. - Location Areas: + Location Areas Unknown diff --git a/pokeData/staravia b/pokeData/staravia index e25263e..0828079 100644 --- a/pokeData/staravia +++ b/pokeData/staravia @@ -17,7 +17,7 @@ speed: 80 Genus: Starling Pokémon - Happiness: 70 Pokedex ID: 397 + Happiness: 70 Pokedex ID: 427 Base Exp: 119 Capture Rate: 120 Height: 6 Weight: 155 diff --git a/pokeData/starly b/pokeData/starly index 5e74891..9022a5a 100644 --- a/pokeData/starly +++ b/pokeData/starly @@ -16,7 +16,7 @@ speed: 60 Genus: Starling Pokémon - Happiness: 70 Pokedex ID: 396 + Happiness: 70 Pokedex ID: 426 Base Exp: 49 Capture Rate: 255 Height: 3 Weight: 20 diff --git a/pokeData/starmie b/pokeData/starmie index 93af701..b5b1c25 100644 --- a/pokeData/starmie +++ b/pokeData/starmie @@ -17,7 +17,7 @@ speed: 115 Genus: Mysterious Pokémon - Happiness: 50 Pokedex ID: 121 + Happiness: 50 Pokedex ID: 138 Base Exp: 182 Capture Rate: 60 Height: 11 Weight: 800 diff --git a/pokeData/staryu b/pokeData/staryu index 2ed265a..fc2bf25 100644 --- a/pokeData/staryu +++ b/pokeData/staryu @@ -17,7 +17,7 @@ speed: 85 Genus: Star Shape Pokémon - Happiness: 50 Pokedex ID: 120 + Happiness: 50 Pokedex ID: 137 Base Exp: 68 Capture Rate: 225 Height: 8 Weight: 345 diff --git a/pokeData/steelix b/pokeData/steelix index fad8b41..4334c3d 100644 --- a/pokeData/steelix +++ b/pokeData/steelix @@ -17,7 +17,7 @@ speed: 30 Genus: Iron Snake Pokémon - Happiness: 50 Pokedex ID: 208 + Happiness: 50 Pokedex ID: 104 Base Exp: 179 Capture Rate: 25 Height: 92 Weight: 4000 diff --git a/pokeData/steenee b/pokeData/steenee index 0521fa6..4cb2c13 100644 --- a/pokeData/steenee +++ b/pokeData/steenee @@ -58,4 +58,4 @@ sleeping. - Location Areas: + Location Areas Unknown diff --git a/pokeData/stonjourner b/pokeData/stonjourner index 79736d9..a3898fb 100644 --- a/pokeData/stonjourner +++ b/pokeData/stonjourner @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/stoutland b/pokeData/stoutland index 0b06115..6b41eaa 100644 --- a/pokeData/stoutland +++ b/pokeData/stoutland @@ -17,7 +17,7 @@ speed: 80 Genus: Big-Hearted Pokémon - Happiness: 50 Pokedex ID: 508 + Happiness: 50 Pokedex ID: 509 Base Exp: 250 Capture Rate: 45 Height: 12 Weight: 610 diff --git a/pokeData/stufful b/pokeData/stufful index 2852690..bdd6a53 100644 --- a/pokeData/stufful +++ b/pokeData/stufful @@ -75,4 +75,4 @@ a random gender as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/stunfisk b/pokeData/stunfisk index a54a47c..81c71e0 100644 --- a/pokeData/stunfisk +++ b/pokeData/stunfisk @@ -17,7 +17,7 @@ speed: 32 Genus: Trap Pokémon - Happiness: 70 Pokedex ID: 618 + Happiness: 70 Pokedex ID: 619 Base Exp: 165 Capture Rate: 75 Height: 7 Weight: 110 diff --git a/pokeData/stunky b/pokeData/stunky index 50a17e0..37bfcb0 100644 --- a/pokeData/stunky +++ b/pokeData/stunky @@ -17,7 +17,7 @@ speed: 74 Genus: Skunk Pokémon - Happiness: 50 Pokedex ID: 434 + Happiness: 50 Pokedex ID: 458 Base Exp: 66 Capture Rate: 225 Height: 4 Weight: 192 diff --git a/pokeData/sudowoodo b/pokeData/sudowoodo index 2fc2c9f..c26601d 100644 --- a/pokeData/sudowoodo +++ b/pokeData/sudowoodo @@ -17,7 +17,7 @@ speed: 30 Genus: Imitation Pokémon - Happiness: 50 Pokedex ID: 185 + Happiness: 50 Pokedex ID: 215 Base Exp: 144 Capture Rate: 65 Height: 12 Weight: 380 diff --git a/pokeData/suicune b/pokeData/suicune index 84faa45..50fd284 100644 --- a/pokeData/suicune +++ b/pokeData/suicune @@ -15,7 +15,7 @@ speed: 85 Genus: Aurora Pokémon - Happiness: 35 Pokedex ID: 245 + Happiness: 35 Pokedex ID: 270 Base Exp: 290 Capture Rate: 3 Height: 20 Weight: 1870 diff --git a/pokeData/sunflora b/pokeData/sunflora index 53aab8d..21c5b03 100644 --- a/pokeData/sunflora +++ b/pokeData/sunflora @@ -17,7 +17,7 @@ speed: 30 Genus: Sun Pokémon - Happiness: 70 Pokedex ID: 192 + Happiness: 70 Pokedex ID: 222 Base Exp: 149 Capture Rate: 120 Height: 8 Weight: 85 diff --git a/pokeData/sunkern b/pokeData/sunkern index 3d611a3..c23bd40 100644 --- a/pokeData/sunkern +++ b/pokeData/sunkern @@ -17,7 +17,7 @@ speed: 30 Genus: Seed Pokémon - Happiness: 70 Pokedex ID: 191 + Happiness: 70 Pokedex ID: 221 Base Exp: 36 Capture Rate: 235 Height: 3 Weight: 18 diff --git a/pokeData/surskit b/pokeData/surskit index 06010ec..098e65e 100644 --- a/pokeData/surskit +++ b/pokeData/surskit @@ -19,7 +19,7 @@ speed: 65 Genus: Pond Skater Pokémon - Happiness: 70 Pokedex ID: 283 + Happiness: 70 Pokedex ID: 309 Base Exp: 54 Capture Rate: 200 Height: 5 Weight: 17 diff --git a/pokeData/swablu b/pokeData/swablu index b039d24..e16e19a 100644 --- a/pokeData/swablu +++ b/pokeData/swablu @@ -19,7 +19,7 @@ speed: 50 Genus: Cotton Bird Pokémon - Happiness: 50 Pokedex ID: 333 + Happiness: 50 Pokedex ID: 361 Base Exp: 62 Capture Rate: 255 Height: 4 Weight: 12 diff --git a/pokeData/swadloon b/pokeData/swadloon index df92744..b0492bd 100644 --- a/pokeData/swadloon +++ b/pokeData/swadloon @@ -18,7 +18,7 @@ speed: 42 Genus: Leaf-Wrapped Pokémon - Happiness: 70 Pokedex ID: 541 + Happiness: 70 Pokedex ID: 542 Base Exp: 133 Capture Rate: 120 Height: 5 Weight: 73 diff --git a/pokeData/swalot b/pokeData/swalot index c87ef6e..19f588e 100644 --- a/pokeData/swalot +++ b/pokeData/swalot @@ -19,7 +19,7 @@ speed: 55 Genus: Poison Bag Pokémon - Happiness: 70 Pokedex ID: 317 + Happiness: 70 Pokedex ID: 345 Base Exp: 163 Capture Rate: 75 Height: 17 Weight: 800 @@ -64,4 +64,4 @@ threshold. - Location Areas: + Location Areas Unknown diff --git a/pokeData/swampert b/pokeData/swampert index 487a3ba..e29472a 100644 --- a/pokeData/swampert +++ b/pokeData/swampert @@ -19,7 +19,7 @@ speed: 60 Genus: Mud Fish Pokémon - Happiness: 50 Pokedex ID: 260 + Happiness: 50 Pokedex ID: 285 Base Exp: 268 Capture Rate: 45 Height: 15 Weight: 819 @@ -44,4 +44,4 @@ effect. - Location Areas: + Location Areas Unknown diff --git a/pokeData/swanna b/pokeData/swanna index c2eed2e..60bf124 100644 --- a/pokeData/swanna +++ b/pokeData/swanna @@ -16,7 +16,7 @@ speed: 98 Genus: White Bird Pokémon - Happiness: 70 Pokedex ID: 581 + Happiness: 70 Pokedex ID: 582 Base Exp: 166 Capture Rate: 45 Height: 13 Weight: 242 diff --git a/pokeData/swellow b/pokeData/swellow index 6749fa9..32ca70e 100644 --- a/pokeData/swellow +++ b/pokeData/swellow @@ -21,7 +21,7 @@ speed: 125 Genus: Swallow Pokémon - Happiness: 70 Pokedex ID: 277 + Happiness: 70 Pokedex ID: 302 Base Exp: 159 Capture Rate: 45 Height: 7 Weight: 198 diff --git a/pokeData/swinub b/pokeData/swinub index 08cd1f9..768d59f 100644 --- a/pokeData/swinub +++ b/pokeData/swinub @@ -1,5 +1,5 @@ - Type Pokémon + Swinub Ice Type Pokémon It rubs its snout on the ground to find and dig up food. It @@ -9,16 +9,53 @@ Swinub ► Piloswine ► Mamoswine ↞--------| STATS |--------↠ + hp: 50 + attack: 50 + defense: 40 + special-attack: 30 + special-defense: 30 + speed: 50 Genus: Pig Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 225 - Height: Weight: + Happiness: 50 Pokedex ID: 251 + Base Exp: 50 Capture Rate: 225 + Height: 4 Weight: 65 Types: + Ice + Ground ↞---------------|ABILITIES|---------------↠ + Oblivious: + + This Pokémon cannot be infatuated + and is immune to captivate. + + If a Pokémon is infatuated + and acquires this ability, its + infatuation is cleared. + + Snow-cloak: + + During hail, this Pokémon has + 1.25× its evasion, and it does + not take hail damage regardless + of type. + + The evasion bonus does not + count as a stat modifier. + + Overworld: If the lead Pokémon + has this ability, the wild encounter + rate is halved in snow. + + Thick-fat: + + This Pokémon takes half as + much damage from fire- and ice-type + moves. + Location Areas: Acuity lakefront area diff --git a/pokeData/swirlix b/pokeData/swirlix index f4ff818..aa6ca6b 100644 --- a/pokeData/swirlix +++ b/pokeData/swirlix @@ -17,7 +17,7 @@ speed: 49 Genus: Cotton Candy Pokémon - Happiness: 50 Pokedex ID: 684 + Happiness: 50 Pokedex ID: 685 Base Exp: 68 Capture Rate: 200 Height: 4 Weight: 35 diff --git a/pokeData/swoobat b/pokeData/swoobat index 3eb79dd..40b6e12 100644 --- a/pokeData/swoobat +++ b/pokeData/swoobat @@ -17,7 +17,7 @@ speed: 114 Genus: Courting Pokémon - Happiness: 50 Pokedex ID: 528 + Happiness: 50 Pokedex ID: 529 Base Exp: 149 Capture Rate: 45 Height: 9 Weight: 105 @@ -83,4 +83,4 @@ after doubling. - Location Areas: + Location Areas Unknown diff --git a/pokeData/sylveon b/pokeData/sylveon index f0b3281..7821687 100644 --- a/pokeData/sylveon +++ b/pokeData/sylveon @@ -7,7 +7,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -26,7 +26,7 @@ Stage 2 Forms: speed: 60 Genus: Intertwining Pokémon - Happiness: 50 Pokedex ID: 700 + Happiness: 50 Pokedex ID: 165 Base Exp: 184 Capture Rate: 45 Height: 10 Weight: 235 @@ -58,4 +58,4 @@ Stage 2 Forms: 1.3× their power. - Location Areas: + Location Areas Unknown diff --git a/pokeData/taillow b/pokeData/taillow index c102507..08d871c 100644 --- a/pokeData/taillow +++ b/pokeData/taillow @@ -20,7 +20,7 @@ speed: 85 Genus: Tiny Swallow Pokémon - Happiness: 70 Pokedex ID: 276 + Happiness: 70 Pokedex ID: 301 Base Exp: 54 Capture Rate: 200 Height: 3 Weight: 23 diff --git a/pokeData/talonflame b/pokeData/talonflame index ebfd253..b9450a0 100644 --- a/pokeData/talonflame +++ b/pokeData/talonflame @@ -17,7 +17,7 @@ speed: 126 Genus: Scorching Pokémon - Happiness: 50 Pokedex ID: 663 + Happiness: 50 Pokedex ID: 664 Base Exp: 175 Capture Rate: 45 Height: 12 Weight: 245 @@ -50,4 +50,4 @@ by one stage. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tangela b/pokeData/tangela index e3156f3..411fd39 100644 --- a/pokeData/tangela +++ b/pokeData/tangela @@ -17,7 +17,7 @@ speed: 60 Genus: Vine Pokémon - Happiness: 50 Pokedex ID: 114 + Happiness: 50 Pokedex ID: 129 Base Exp: 87 Capture Rate: 45 Height: 10 Weight: 350 diff --git a/pokeData/tangrowth b/pokeData/tangrowth index e87d5cc..fb6fa39 100644 --- a/pokeData/tangrowth +++ b/pokeData/tangrowth @@ -17,7 +17,7 @@ speed: 50 Genus: Vine Pokémon - Happiness: 50 Pokedex ID: 465 + Happiness: 50 Pokedex ID: 130 Base Exp: 187 Capture Rate: 30 Height: 20 Weight: 1286 diff --git a/pokeData/tapu-bulu b/pokeData/tapu-bulu index 21c0740..7edf4b7 100644 --- a/pokeData/tapu-bulu +++ b/pokeData/tapu-bulu @@ -41,4 +41,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tapu-fini b/pokeData/tapu-fini index 7f17e2d..156934d 100644 --- a/pokeData/tapu-fini +++ b/pokeData/tapu-fini @@ -41,4 +41,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tapu-koko b/pokeData/tapu-koko index 5975fd0..565be86 100644 --- a/pokeData/tapu-koko +++ b/pokeData/tapu-koko @@ -41,4 +41,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tapu-lele b/pokeData/tapu-lele index 604097f..7c7cbe2 100644 --- a/pokeData/tapu-lele +++ b/pokeData/tapu-lele @@ -40,4 +40,4 @@ moves aimed at it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tauros b/pokeData/tauros index d7a72a2..4cec9f1 100644 --- a/pokeData/tauros +++ b/pokeData/tauros @@ -16,7 +16,7 @@ speed: 110 Genus: Wild Bull Pokémon - Happiness: 50 Pokedex ID: 128 + Happiness: 50 Pokedex ID: 152 Base Exp: 172 Capture Rate: 45 Height: 14 Weight: 884 diff --git a/pokeData/teddiursa b/pokeData/teddiursa index 8b3b988..0dc9e99 100644 --- a/pokeData/teddiursa +++ b/pokeData/teddiursa @@ -5,7 +5,8 @@ mark glows. It always licks its paws because they are soaked with honey. - Single Stage Evolution Pokémon + Evolution Chain + Teddiursa ► Ursaring ► Ursaluna ↞--------| STATS |--------↠ hp: 60 @@ -16,7 +17,7 @@ speed: 40 Genus: Little Bear Pokémon - Happiness: 70 Pokedex ID: 216 + Happiness: 70 Pokedex ID: 247 Base Exp: 66 Capture Rate: 120 Height: 6 Weight: 88 diff --git a/pokeData/tentacool b/pokeData/tentacool index 040ca62..5b6e6c6 100644 --- a/pokeData/tentacool +++ b/pokeData/tentacool @@ -17,7 +17,7 @@ speed: 70 Genus: Jellyfish Pokémon - Happiness: 50 Pokedex ID: 72 + Happiness: 50 Pokedex ID: 78 Base Exp: 67 Capture Rate: 190 Height: 9 Weight: 455 diff --git a/pokeData/tentacruel b/pokeData/tentacruel index 4d6ed42..cfd929d 100644 --- a/pokeData/tentacruel +++ b/pokeData/tentacruel @@ -17,7 +17,7 @@ speed: 100 Genus: Jellyfish Pokémon - Happiness: 50 Pokedex ID: 73 + Happiness: 50 Pokedex ID: 79 Base Exp: 180 Capture Rate: 60 Height: 16 Weight: 550 diff --git a/pokeData/tepig b/pokeData/tepig index cdb7f97..b50587c 100644 --- a/pokeData/tepig +++ b/pokeData/tepig @@ -17,7 +17,7 @@ speed: 45 Genus: Fire Pig Pokémon - Happiness: 70 Pokedex ID: 498 + Happiness: 70 Pokedex ID: 499 Base Exp: 62 Capture Rate: 45 Height: 5 Weight: 99 diff --git a/pokeData/terrakion b/pokeData/terrakion index 088c0bf..8c0e939 100644 --- a/pokeData/terrakion +++ b/pokeData/terrakion @@ -16,7 +16,7 @@ speed: 108 Genus: Cavern Pokémon - Happiness: 35 Pokedex ID: 639 + Happiness: 35 Pokedex ID: 640 Base Exp: 290 Capture Rate: 3 Height: 19 Weight: 2600 @@ -36,4 +36,4 @@ any way. - Location Areas: + Location Areas Unknown diff --git a/pokeData/thievul b/pokeData/thievul index 8134108..70c2533 100644 --- a/pokeData/thievul +++ b/pokeData/thievul @@ -1,5 +1,5 @@ - Type Pokémon + Thievul Dark Type Pokémon It secretly marks potential targets with a scent. By following @@ -10,15 +10,48 @@ Nickit ► Thievul ↞--------| STATS |--------↠ + hp: 70 + attack: 58 + defense: 58 + special-attack: 87 + special-defense: 92 + speed: 90 Genus: Fox Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 127 - Height: Weight: + Happiness: 50 Pokedex ID: 828 + Base Exp: 159 Capture Rate: 127 + Height: 12 Weight: 199 Types: + Dark ↞---------------|ABILITIES|---------------↠ + Run-away: - Location Areas: + This Pokémon is always successful + fleeing from wild battles, even + if trapped by a move or ability. + + Unburden: + + When this Pokémon uses or loses + its held item, its Speed is doubled. + If it gains another item or leaves + battle, this bonus is lost. + + This includes when the Pokémon + drops its item because of knock + off. This bonus does not count + as a stat modifier. There is + no notification when this ability + takes effect. + + Stakeout: + + This Pokémon's moves have double + power against Pokémon that switched + in this turn. + + + Location Areas Unknown diff --git a/pokeData/throh b/pokeData/throh index 2e30a5e..4c04d07 100644 --- a/pokeData/throh +++ b/pokeData/throh @@ -16,7 +16,7 @@ speed: 45 Genus: Judo Pokémon - Happiness: 50 Pokedex ID: 538 + Happiness: 50 Pokedex ID: 539 Base Exp: 163 Capture Rate: 45 Height: 13 Weight: 555 diff --git a/pokeData/thundurus b/pokeData/thundurus index 84fdd5f..01cfbc0 100644 --- a/pokeData/thundurus +++ b/pokeData/thundurus @@ -1,5 +1,5 @@ - Type Pokémon + Reshiram Dragon Type Pokémon Countless charred remains mar the landscape of places through @@ -7,15 +7,81 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 100 + attack: 120 + defense: 100 + special-attack: 150 + special-defense: 120 + speed: 90 Genus: Bolt Strike Pokémon - Happiness: 90 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 90 Pokedex ID: 643 + Base Exp: 340 Capture Rate: 3 + Height: 32 Weight: 3300 Types: + Dragon + Fire ↞---------------|ABILITIES|---------------↠ + Turboblaze: - Location Areas: + This Pokémon's moves completely + ignore abilities that could hinder + or prevent their effect on the + target. + + For example, this Pokémon's + moves ignore abilities that would + fully negate them, such as water + absorb; abilities that would + prevent any of their effects, + such as clear body, shell armor, + or sticky hold; and abilities + that grant any general protective + benefit, such as simple, snow + cloak, or thick fat. If an ability + could either hinder or help this + Pokémon's moves, e.g. dry skin + or unaware, the ability is ignored + either way. + + Abilities that do not fit this + description, even if they could + hinder moves in some other way, + are not affected. For example, + cursed body only affects potential + future uses of the move, while + liquid ooze and shadow tag can + only hinder a move's effect on + the user. This ablity cannot + ignore type or form changes granted + by abilities, for example color + change or forecast; nor effects + that were caused by abilities + but are no longer tied to an + ability, such as the rain from + drizzle. This ability cannot + ignore multitype at all. + + An ability ignored by this + ability is only nullified while + the move is being used. For example, + this Pokémon's moves can paralyze + a Pokémon with limber, but Limber + will activate and heal the paralysis + immediately thereafter, and this + Pokémon's spikes are not affected + by this ability after they have + been placed. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + This ability functions identically + to mold breaker and teravolt. + + + Location Areas Unknown diff --git a/pokeData/thwackey b/pokeData/thwackey index c5047fc..5e750f2 100644 --- a/pokeData/thwackey +++ b/pokeData/thwackey @@ -40,4 +40,4 @@ terrain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/timburr b/pokeData/timburr index 764ce87..ee8afb1 100644 --- a/pokeData/timburr +++ b/pokeData/timburr @@ -18,7 +18,7 @@ speed: 35 Genus: Muscular Pokémon - Happiness: 70 Pokedex ID: 532 + Happiness: 70 Pokedex ID: 533 Base Exp: 61 Capture Rate: 180 Height: 6 Weight: 125 diff --git a/pokeData/tirtouga b/pokeData/tirtouga index d490e31..60c5be7 100644 --- a/pokeData/tirtouga +++ b/pokeData/tirtouga @@ -16,7 +16,7 @@ speed: 22 Genus: Prototurtle Pokémon - Happiness: 50 Pokedex ID: 564 + Happiness: 50 Pokedex ID: 565 Base Exp: 71 Capture Rate: 45 Height: 7 Weight: 165 @@ -60,4 +60,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/togedemaru b/pokeData/togedemaru index eb43f79..263ce03 100644 --- a/pokeData/togedemaru +++ b/pokeData/togedemaru @@ -82,4 +82,4 @@ not be consumed. - Location Areas: + Location Areas Unknown diff --git a/pokeData/togekiss b/pokeData/togekiss index f97a68c..4834266 100644 --- a/pokeData/togekiss +++ b/pokeData/togekiss @@ -16,7 +16,7 @@ speed: 80 Genus: Jubilee Pokémon - Happiness: 50 Pokedex ID: 468 + Happiness: 50 Pokedex ID: 205 Base Exp: 273 Capture Rate: 30 Height: 15 Weight: 380 @@ -67,4 +67,4 @@ normal. - Location Areas: + Location Areas Unknown diff --git a/pokeData/togepi b/pokeData/togepi index dc1a840..a0821c6 100644 --- a/pokeData/togepi +++ b/pokeData/togepi @@ -17,7 +17,7 @@ speed: 20 Genus: Spike Ball Pokémon - Happiness: 50 Pokedex ID: 175 + Happiness: 50 Pokedex ID: 203 Base Exp: 49 Capture Rate: 190 Height: 3 Weight: 15 diff --git a/pokeData/togetic b/pokeData/togetic index 3711ba1..ed0009a 100644 --- a/pokeData/togetic +++ b/pokeData/togetic @@ -17,7 +17,7 @@ speed: 40 Genus: Happiness Pokémon - Happiness: 50 Pokedex ID: 176 + Happiness: 50 Pokedex ID: 204 Base Exp: 142 Capture Rate: 75 Height: 6 Weight: 32 @@ -68,4 +68,4 @@ normal. - Location Areas: + Location Areas Unknown diff --git a/pokeData/torchic b/pokeData/torchic index fdb8ac3..38a2aea 100644 --- a/pokeData/torchic +++ b/pokeData/torchic @@ -19,7 +19,7 @@ speed: 45 Genus: Chick Pokémon - Happiness: 50 Pokedex ID: 255 + Happiness: 50 Pokedex ID: 280 Base Exp: 62 Capture Rate: 45 Height: 4 Weight: 25 diff --git a/pokeData/torkoal b/pokeData/torkoal index d253908..51da7ca 100644 --- a/pokeData/torkoal +++ b/pokeData/torkoal @@ -16,7 +16,7 @@ speed: 20 Genus: Coal Pokémon - Happiness: 50 Pokedex ID: 324 + Happiness: 50 Pokedex ID: 352 Base Exp: 165 Capture Rate: 90 Height: 5 Weight: 804 diff --git a/pokeData/tornadus b/pokeData/tornadus index b10e4d4..5081c4a 100644 --- a/pokeData/tornadus +++ b/pokeData/tornadus @@ -1,5 +1,5 @@ - Type Pokémon + Thundurus-incarnate Electric Type Pokémon The lower half of its body is wrapped in a cloud of energy. @@ -8,15 +8,39 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 79 + attack: 115 + defense: 70 + special-attack: 125 + special-defense: 80 + speed: 111 Genus: Cyclone Pokémon - Happiness: 90 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 90 Pokedex ID: 642 + Base Exp: 290 Capture Rate: 3 + Height: 15 Weight: 610 Types: + Electric + Flying ↞---------------|ABILITIES|---------------↠ + Prankster: - Location Areas: + This Pokémon's non-damaging + moves have their priority increased + by one stage. + + Defiant: + + When any of this Pokémon's + stats are lowered, its Attack + rises by two stages. + + If multiple stats are lowered + at once, this ability takes effect + with each stat lowered. + + + Location Areas Unknown diff --git a/pokeData/torracat b/pokeData/torracat index 65aebca..7458cf0 100644 --- a/pokeData/torracat +++ b/pokeData/torracat @@ -57,4 +57,4 @@ skipped. - Location Areas: + Location Areas Unknown diff --git a/pokeData/torterra b/pokeData/torterra index 2dd4578..a52a65f 100644 --- a/pokeData/torterra +++ b/pokeData/torterra @@ -16,7 +16,7 @@ speed: 56 Genus: Continent Pokémon - Happiness: 70 Pokedex ID: 389 + Happiness: 70 Pokedex ID: 419 Base Exp: 236 Capture Rate: 45 Height: 22 Weight: 3100 @@ -42,4 +42,4 @@ to battle armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/totodile b/pokeData/totodile index c5f62a6..0e59cd8 100644 --- a/pokeData/totodile +++ b/pokeData/totodile @@ -17,7 +17,7 @@ speed: 43 Genus: Big Jaw Pokémon - Happiness: 70 Pokedex ID: 158 + Happiness: 70 Pokedex ID: 190 Base Exp: 63 Capture Rate: 45 Height: 6 Weight: 95 diff --git a/pokeData/toucannon b/pokeData/toucannon index b91f7b4..6d0b1bf 100644 --- a/pokeData/toucannon +++ b/pokeData/toucannon @@ -80,4 +80,4 @@ stats are unaffected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/toxapex b/pokeData/toxapex index 35e60a2..3b8076f 100644 --- a/pokeData/toxapex +++ b/pokeData/toxapex @@ -54,4 +54,4 @@ effect when a battle ends. - Location Areas: + Location Areas Unknown diff --git a/pokeData/toxel b/pokeData/toxel index bbe488d..b0adb80 100644 --- a/pokeData/toxel +++ b/pokeData/toxel @@ -78,4 +78,4 @@ switcheroo, work as usual. - Location Areas: + Location Areas Unknown diff --git a/pokeData/toxicroak b/pokeData/toxicroak index 752a0cc..91c1b2e 100644 --- a/pokeData/toxicroak +++ b/pokeData/toxicroak @@ -16,7 +16,7 @@ speed: 85 Genus: Toxic Mouth Pokémon - Happiness: 50 Pokedex ID: 454 + Happiness: 50 Pokedex ID: 474 Base Exp: 172 Capture Rate: 75 Height: 13 Weight: 444 diff --git a/pokeData/toxtricity b/pokeData/toxtricity index 9b864c9..46c1e47 100644 --- a/pokeData/toxtricity +++ b/pokeData/toxtricity @@ -1,5 +1,5 @@ - Type Pokémon + Toxtricity-amped Electric Type Pokémon When this Pokémon sounds as if it’s strumming a guitar, it’s @@ -10,15 +10,52 @@ Toxel ► Toxtricity ↞--------| STATS |--------↠ + hp: 75 + attack: 98 + defense: 70 + special-attack: 114 + special-defense: 70 + speed: 75 Genus: Punk Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 50 Pokedex ID: 849 + Base Exp: 176 Capture Rate: 45 + Height: 16 Weight: 400 Types: + Electric + Poison ↞---------------|ABILITIES|---------------↠ + Punk-rock: - Location Areas: + + + Plus: + + This Pokémon has 1.5× its Special + Attack if any friendly Pokémon + has plus or minus. + + This bonus does not count as + a stat modifier. If either ability + is disabled by gastro acid, both + lose their effect. + + Technician: + + This Pokémon's moves have 1.5× + their power if their base power + is 60 or less. + + This includes moves of variable + power, such as hidden power and + magnitude, when their power is + 60 or less. helping hand's power + boost is taken into account for + any move, as is defense curl's + power boost for rollout. + + + Location Areas Unknown diff --git a/pokeData/tranquill b/pokeData/tranquill index b6e58da..22f4e63 100644 --- a/pokeData/tranquill +++ b/pokeData/tranquill @@ -16,7 +16,7 @@ speed: 65 Genus: Wild Pigeon Pokémon - Happiness: 50 Pokedex ID: 520 + Happiness: 50 Pokedex ID: 521 Base Exp: 125 Capture Rate: 120 Height: 6 Weight: 150 diff --git a/pokeData/trapinch b/pokeData/trapinch index 2e90b45..c5f91cd 100644 --- a/pokeData/trapinch +++ b/pokeData/trapinch @@ -19,7 +19,7 @@ speed: 10 Genus: Ant Pit Pokémon - Happiness: 50 Pokedex ID: 328 + Happiness: 50 Pokedex ID: 356 Base Exp: 58 Capture Rate: 255 Height: 7 Weight: 150 diff --git a/pokeData/treecko b/pokeData/treecko index 280b3b6..5f0f475 100644 --- a/pokeData/treecko +++ b/pokeData/treecko @@ -18,7 +18,7 @@ speed: 70 Genus: Wood Gecko Pokémon - Happiness: 50 Pokedex ID: 252 + Happiness: 50 Pokedex ID: 277 Base Exp: 62 Capture Rate: 45 Height: 5 Weight: 50 diff --git a/pokeData/tropius b/pokeData/tropius index aaa37f7..8747344 100644 --- a/pokeData/tropius +++ b/pokeData/tropius @@ -19,7 +19,7 @@ speed: 51 Genus: Fruit Pokémon - Happiness: 70 Pokedex ID: 357 + Happiness: 70 Pokedex ID: 386 Base Exp: 161 Capture Rate: 200 Height: 20 Weight: 1000 diff --git a/pokeData/trubbish b/pokeData/trubbish index 9a38888..6282a1a 100644 --- a/pokeData/trubbish +++ b/pokeData/trubbish @@ -1,5 +1,5 @@ - Trubbish Poison Type Pokémon + Garbodor Poison Type Pokémon Inhaling the gas they belch will make you sleep for a week. @@ -9,17 +9,17 @@ Trubbish ► Garbodor ↞--------| STATS |--------↠ - hp: 50 - attack: 50 - defense: 62 - special-attack: 40 - special-defense: 62 - speed: 65 + hp: 80 + attack: 95 + defense: 82 + special-attack: 60 + special-defense: 82 + speed: 75 Genus: Trash Bag Pokémon - Happiness: 50 Pokedex ID: 568 - Base Exp: 66 Capture Rate: 190 - Height: 6 Weight: 310 + Happiness: 50 Pokedex ID: 569 + Base Exp: 166 Capture Rate: 190 + Height: 19 Weight: 1073 Types: Poison @@ -41,22 +41,15 @@ rate is halved while this Pokémon is first in the party. - Sticky-hold: + Weak-armor: - This Pokémon's hold item cannot - be removed by other Pokémon. + Whenever a physical move hits + this Pokémon, its Speed rises + one stage and its Defense falls + one stage. - Damaging moves that would remove - this Pokémon's item can still - inflict damage against this Pokémon, - e.g. knock off or pluck. This - Pokémon can still use moves that - involve the loss of its own item, - e.g. fling or trick. - - Overworld: If the lead Pokémon - has this ability, the encounter - rate while fishing is increased. + This ability triggers on every + hit of a multiple-hit move. Aftermath: diff --git a/pokeData/trumbeak b/pokeData/trumbeak index 5e3c56c..260e788 100644 --- a/pokeData/trumbeak +++ b/pokeData/trumbeak @@ -82,4 +82,4 @@ have worn off. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tsareena b/pokeData/tsareena index e136c7b..ac45155 100644 --- a/pokeData/tsareena +++ b/pokeData/tsareena @@ -56,4 +56,4 @@ sleeping. - Location Areas: + Location Areas Unknown diff --git a/pokeData/turtonator b/pokeData/turtonator index 80a03ba..bc1250b 100644 --- a/pokeData/turtonator +++ b/pokeData/turtonator @@ -35,4 +35,4 @@ to battle armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/turtwig b/pokeData/turtwig index b11f025..0cb93a6 100644 --- a/pokeData/turtwig +++ b/pokeData/turtwig @@ -17,7 +17,7 @@ speed: 31 Genus: Tiny Leaf Pokémon - Happiness: 70 Pokedex ID: 387 + Happiness: 70 Pokedex ID: 417 Base Exp: 64 Capture Rate: 45 Height: 4 Weight: 102 diff --git a/pokeData/tympole b/pokeData/tympole index ad934ce..6a95ee6 100644 --- a/pokeData/tympole +++ b/pokeData/tympole @@ -16,7 +16,7 @@ speed: 64 Genus: Tadpole Pokémon - Happiness: 50 Pokedex ID: 535 + Happiness: 50 Pokedex ID: 536 Base Exp: 59 Capture Rate: 255 Height: 5 Weight: 45 diff --git a/pokeData/tynamo b/pokeData/tynamo index 0c9ef88..b8e9a5c 100644 --- a/pokeData/tynamo +++ b/pokeData/tynamo @@ -17,7 +17,7 @@ speed: 60 Genus: EleFish Pokémon - Happiness: 70 Pokedex ID: 602 + Happiness: 70 Pokedex ID: 603 Base Exp: 55 Capture Rate: 190 Height: 2 Weight: 3 diff --git a/pokeData/type-null b/pokeData/type-null index 815401b..2cb2aa4 100644 --- a/pokeData/type-null +++ b/pokeData/type-null @@ -35,4 +35,4 @@ to shell armor. - Location Areas: + Location Areas Unknown diff --git a/pokeData/typhlosion b/pokeData/typhlosion index aa1d1be..2274d68 100644 --- a/pokeData/typhlosion +++ b/pokeData/typhlosion @@ -17,7 +17,7 @@ speed: 100 Genus: Volcano Pokémon - Happiness: 70 Pokedex ID: 157 + Happiness: 70 Pokedex ID: 189 Base Exp: 240 Capture Rate: 45 Height: 17 Weight: 795 @@ -54,4 +54,4 @@ o wisp. - Location Areas: + Location Areas Unknown diff --git a/pokeData/tyranitar b/pokeData/tyranitar index 5c7c7d6..6c585ef 100644 --- a/pokeData/tyranitar +++ b/pokeData/tyranitar @@ -17,7 +17,7 @@ speed: 61 Genus: Armor Pokémon - Happiness: 35 Pokedex ID: 248 + Happiness: 35 Pokedex ID: 273 Base Exp: 300 Capture Rate: 45 Height: 20 Weight: 2020 diff --git a/pokeData/tyrantrum b/pokeData/tyrantrum index 6d53520..af0167e 100644 --- a/pokeData/tyrantrum +++ b/pokeData/tyrantrum @@ -18,7 +18,7 @@ speed: 71 Genus: Despot Pokémon - Happiness: 50 Pokedex ID: 697 + Happiness: 50 Pokedex ID: 698 Base Exp: 182 Capture Rate: 45 Height: 25 Weight: 2700 @@ -35,14 +35,7 @@ Rock-head: - This Pokémon does not receive - recoil damage from its recoil - moves. - - struggle's recoil is unaffected. - This ability does not prevent - crash damage from missing with - jump kick or high jump kick. + - Location Areas: + Location Areas Unknown diff --git a/pokeData/tyrogue b/pokeData/tyrogue index 2bc2adc..fcfcc6e 100644 --- a/pokeData/tyrogue +++ b/pokeData/tyrogue @@ -8,7 +8,7 @@ Evolution Chain Tyrogue ► Hitmonlee -Stage 2 Forms: + Stage 2 Forms: hitmonlee hitmonchan hitmontop @@ -22,7 +22,7 @@ Stage 2 Forms: speed: 35 Genus: Scuffle Pokémon - Happiness: 50 Pokedex ID: 236 + Happiness: 50 Pokedex ID: 115 Base Exp: 42 Capture Rate: 75 Height: 7 Weight: 210 diff --git a/pokeData/tyrunt b/pokeData/tyrunt index 4d98870..8b6ca6f 100644 --- a/pokeData/tyrunt +++ b/pokeData/tyrunt @@ -17,7 +17,7 @@ speed: 48 Genus: Royal Heir Pokémon - Happiness: 50 Pokedex ID: 696 + Happiness: 50 Pokedex ID: 697 Base Exp: 72 Capture Rate: 45 Height: 8 Weight: 260 diff --git a/pokeData/umbreon b/pokeData/umbreon index 8d5a9b3..d6d3643 100644 --- a/pokeData/umbreon +++ b/pokeData/umbreon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 65 Genus: Moonlight Pokémon - Happiness: 35 Pokedex ID: 197 + Happiness: 35 Pokedex ID: 162 Base Exp: 184 Capture Rate: 45 Height: 10 Weight: 270 @@ -69,4 +69,4 @@ Stage 2 Forms: This Pokémon cannot flinch. - Location Areas: + Location Areas Unknown diff --git a/pokeData/unfezant b/pokeData/unfezant index 1ada706..28a8512 100644 --- a/pokeData/unfezant +++ b/pokeData/unfezant @@ -17,7 +17,7 @@ speed: 93 Genus: Proud Pokémon - Happiness: 50 Pokedex ID: 521 + Happiness: 50 Pokedex ID: 522 Base Exp: 244 Capture Rate: 45 Height: 12 Weight: 290 diff --git a/pokeData/unown b/pokeData/unown index 8f936b0..c9de4d6 100644 --- a/pokeData/unown +++ b/pokeData/unown @@ -16,7 +16,7 @@ speed: 48 Genus: Symbol Pokémon - Happiness: 70 Pokedex ID: 201 + Happiness: 70 Pokedex ID: 231 Base Exp: 118 Capture Rate: 225 Height: 5 Weight: 50 diff --git a/pokeData/ursaluna b/pokeData/ursaluna index 12a3067..985826e 100644 --- a/pokeData/ursaluna +++ b/pokeData/ursaluna @@ -54,4 +54,4 @@ a target's Berry. - Location Areas: + Location Areas Unknown diff --git a/pokeData/ursaring b/pokeData/ursaring index 53123a6..f72b22e 100644 --- a/pokeData/ursaring +++ b/pokeData/ursaring @@ -17,7 +17,7 @@ speed: 55 Genus: Hibernator Pokémon - Happiness: 70 Pokedex ID: 217 + Happiness: 70 Pokedex ID: 248 Base Exp: 175 Capture Rate: 60 Height: 18 Weight: 1258 diff --git a/pokeData/urshifu b/pokeData/urshifu index 1174abd..0ada297 100644 --- a/pokeData/urshifu +++ b/pokeData/urshifu @@ -1,5 +1,5 @@ - Type Pokémon + Urshifu-single-strike Fighting Type Pokémon This form of Urshifu is a strong believer in the one-hit KO. @@ -10,15 +10,27 @@ Kubfu ► Urshifu ↞--------| STATS |--------↠ + hp: 100 + attack: 130 + defense: 100 + special-attack: 63 + special-defense: 60 + speed: 97 Genus: Wushu Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 50 Pokedex ID: 892 + Base Exp: 275 Capture Rate: 3 + Height: 19 Weight: 1050 Types: + Fighting + Dark ↞---------------|ABILITIES|---------------↠ + Unseen-fist: - Location Areas: + + + + Location Areas Unknown diff --git a/pokeData/uxie b/pokeData/uxie index e1a37e5..062c4a4 100644 --- a/pokeData/uxie +++ b/pokeData/uxie @@ -1,10 +1,7 @@ Uxie Psychic Type Pokémon - Known as “The Being of Knowledge. - ” It is said that it can wipe - out the memory of those who see - its eyes. + Single Stage Evolution Pokémon ↞--------| STATS |--------↠ @@ -15,9 +12,9 @@ special-defense: 130 speed: 95 - Genus: Knowledge Pokémon - Happiness: 140 Pokedex ID: 480 - Base Exp: 290 Capture Rate: 3 + Genus: + Happiness: Pokedex ID: + Base Exp: 290 Capture Rate: Height: 3 Weight: 3 Types: diff --git a/pokeData/vanillish b/pokeData/vanillish index 6795603..5e6d170 100644 --- a/pokeData/vanillish +++ b/pokeData/vanillish @@ -17,7 +17,7 @@ speed: 59 Genus: Icy Snow Pokémon - Happiness: 50 Pokedex ID: 583 + Happiness: 50 Pokedex ID: 584 Base Exp: 138 Capture Rate: 120 Height: 11 Weight: 410 diff --git a/pokeData/vanillite b/pokeData/vanillite index 1a888f5..e3801c4 100644 --- a/pokeData/vanillite +++ b/pokeData/vanillite @@ -17,7 +17,7 @@ speed: 44 Genus: Fresh Snow Pokémon - Happiness: 50 Pokedex ID: 582 + Happiness: 50 Pokedex ID: 583 Base Exp: 61 Capture Rate: 255 Height: 4 Weight: 57 diff --git a/pokeData/vanilluxe b/pokeData/vanilluxe index 8e4ecb1..767cd86 100644 --- a/pokeData/vanilluxe +++ b/pokeData/vanilluxe @@ -18,7 +18,7 @@ speed: 79 Genus: Snowstorm Pokémon - Happiness: 50 Pokedex ID: 584 + Happiness: 50 Pokedex ID: 585 Base Exp: 268 Capture Rate: 45 Height: 13 Weight: 575 diff --git a/pokeData/vaporeon b/pokeData/vaporeon index 4bdffe7..6d47eb5 100644 --- a/pokeData/vaporeon +++ b/pokeData/vaporeon @@ -8,7 +8,7 @@ Evolution Chain Eevee ► Vaporeon -Stage 2 Forms: + Stage 2 Forms: vaporeon jolteon flareon @@ -27,7 +27,7 @@ Stage 2 Forms: speed: 65 Genus: Bubble Jet Pokémon - Happiness: 50 Pokedex ID: 134 + Happiness: 50 Pokedex ID: 158 Base Exp: 184 Capture Rate: 45 Height: 10 Weight: 290 @@ -53,4 +53,4 @@ Stage 2 Forms: turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/venipede b/pokeData/venipede index 17a72c0..c2d2849 100644 --- a/pokeData/venipede +++ b/pokeData/venipede @@ -17,7 +17,7 @@ speed: 57 Genus: Centipede Pokémon - Happiness: 50 Pokedex ID: 543 + Happiness: 50 Pokedex ID: 544 Base Exp: 52 Capture Rate: 255 Height: 4 Weight: 53 diff --git a/pokeData/venomoth b/pokeData/venomoth index 5374a26..56cef9d 100644 --- a/pokeData/venomoth +++ b/pokeData/venomoth @@ -17,7 +17,7 @@ speed: 90 Genus: Poison Moth Pokémon - Happiness: 70 Pokedex ID: 49 + Happiness: 70 Pokedex ID: 54 Base Exp: 158 Capture Rate: 75 Height: 15 Weight: 125 diff --git a/pokeData/venonat b/pokeData/venonat index 6f601c8..29b189f 100644 --- a/pokeData/venonat +++ b/pokeData/venonat @@ -17,7 +17,7 @@ speed: 45 Genus: Insect Pokémon - Happiness: 70 Pokedex ID: 48 + Happiness: 70 Pokedex ID: 53 Base Exp: 61 Capture Rate: 190 Height: 10 Weight: 300 diff --git a/pokeData/venusaur b/pokeData/venusaur index b893849..8aa5539 100644 --- a/pokeData/venusaur +++ b/pokeData/venusaur @@ -43,4 +43,4 @@ a stat modifier. - Location Areas: + Location Areas Unknown diff --git a/pokeData/vespiquen b/pokeData/vespiquen index ab91778..ca796ea 100644 --- a/pokeData/vespiquen +++ b/pokeData/vespiquen @@ -16,7 +16,7 @@ speed: 40 Genus: Beehive Pokémon - Happiness: 50 Pokedex ID: 416 + Happiness: 50 Pokedex ID: 444 Base Exp: 166 Capture Rate: 45 Height: 12 Weight: 385 @@ -28,7 +28,34 @@ Pressure: - + Moves targetting this Pokémon + use one extra PP. + + This ability stacks if multiple + targets have it. This ability + still affects moves that fail + or miss. This ability does not + affect ally moves that target + either the entire field or just + its side, nor this Pokémon's + self-targetted moves; it does, + however, affect single-targetted + ally moves aimed at this Pokémon, + ally moves that target all other + Pokémon, and opponents' moves + that target the entire field. + If this ability raises a move's + PP cost above its remaining PP, + it will use all remaining PP. + + When this Pokémon enters battle, + all participating trainers are + notified that it has this ability. + + Overworld: If the lead Pokémon + has this ability, higher-levelled + Pokémon have their encounter + rate increased. Unnerve: diff --git a/pokeData/vibrava b/pokeData/vibrava index 9774e4d..53c0c00 100644 --- a/pokeData/vibrava +++ b/pokeData/vibrava @@ -20,7 +20,7 @@ speed: 70 Genus: Vibration Pokémon - Happiness: 50 Pokedex ID: 329 + Happiness: 50 Pokedex ID: 357 Base Exp: 119 Capture Rate: 120 Height: 11 Weight: 153 diff --git a/pokeData/victini b/pokeData/victini index 2884d5b..0aa9617 100644 --- a/pokeData/victini +++ b/pokeData/victini @@ -16,7 +16,7 @@ speed: 100 Genus: Victory Pokémon - Happiness: 100 Pokedex ID: 494 + Happiness: 100 Pokedex ID: 495 Base Exp: 300 Capture Rate: 3 Height: 4 Weight: 40 @@ -35,4 +35,4 @@ in battle. - Location Areas: + Location Areas Unknown diff --git a/pokeData/victreebel b/pokeData/victreebel index 7833565..a722604 100644 --- a/pokeData/victreebel +++ b/pokeData/victreebel @@ -17,7 +17,7 @@ speed: 70 Genus: Flycatcher Pokémon - Happiness: 70 Pokedex ID: 71 + Happiness: 70 Pokedex ID: 77 Base Exp: 221 Capture Rate: 45 Height: 17 Weight: 155 @@ -44,4 +44,4 @@ threshold. - Location Areas: + Location Areas Unknown diff --git a/pokeData/vigoroth b/pokeData/vigoroth index a27ba7b..d34049e 100644 --- a/pokeData/vigoroth +++ b/pokeData/vigoroth @@ -20,7 +20,7 @@ speed: 90 Genus: Wild Monkey Pokémon - Happiness: 70 Pokedex ID: 288 + Happiness: 70 Pokedex ID: 314 Base Exp: 154 Capture Rate: 120 Height: 14 Weight: 465 diff --git a/pokeData/vikavolt b/pokeData/vikavolt index d2ece73..ba84f3c 100644 --- a/pokeData/vikavolt +++ b/pokeData/vikavolt @@ -40,4 +40,4 @@ is not disabled during roost. - Location Areas: + Location Areas Unknown diff --git a/pokeData/vileplume b/pokeData/vileplume index f6c2b56..1566d51 100644 --- a/pokeData/vileplume +++ b/pokeData/vileplume @@ -8,7 +8,7 @@ Evolution Chain Oddish ► Gloom ► Vileplume -Stage 3 Forms: + Stage 3 Forms: vileplume bellossom @@ -21,7 +21,7 @@ Stage 3 Forms: speed: 50 Genus: Flower Pokémon - Happiness: 50 Pokedex ID: 45 + Happiness: 50 Pokedex ID: 49 Base Exp: 245 Capture Rate: 45 Height: 12 Weight: 186 @@ -54,4 +54,4 @@ Stage 3 Forms: the move's user will be affected. - Location Areas: + Location Areas Unknown diff --git a/pokeData/virizion b/pokeData/virizion index 9c97ab3..d9180d3 100644 --- a/pokeData/virizion +++ b/pokeData/virizion @@ -16,7 +16,7 @@ speed: 108 Genus: Grassland Pokémon - Happiness: 35 Pokedex ID: 640 + Happiness: 35 Pokedex ID: 641 Base Exp: 290 Capture Rate: 3 Height: 20 Weight: 2000 @@ -36,4 +36,4 @@ any way. - Location Areas: + Location Areas Unknown diff --git a/pokeData/vivillon b/pokeData/vivillon index ecf1edb..93daddb 100644 --- a/pokeData/vivillon +++ b/pokeData/vivillon @@ -18,7 +18,7 @@ speed: 89 Genus: Scale Pokémon - Happiness: 70 Pokedex ID: 666 + Happiness: 70 Pokedex ID: 667 Base Exp: 185 Capture Rate: 45 Height: 12 Weight: 170 @@ -74,4 +74,4 @@ allied Pokémon have it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/volbeat b/pokeData/volbeat index f691a81..749cfde 100644 --- a/pokeData/volbeat +++ b/pokeData/volbeat @@ -19,7 +19,7 @@ speed: 85 Genus: Firefly Pokémon - Happiness: 70 Pokedex ID: 313 + Happiness: 70 Pokedex ID: 339 Base Exp: 151 Capture Rate: 150 Height: 7 Weight: 177 diff --git a/pokeData/volcanion b/pokeData/volcanion index 74d5ef8..7a19502 100644 --- a/pokeData/volcanion +++ b/pokeData/volcanion @@ -37,4 +37,4 @@ Pokémon's substitute. - Location Areas: + Location Areas Unknown diff --git a/pokeData/volcarona b/pokeData/volcarona index 54885b1..f545808 100644 --- a/pokeData/volcarona +++ b/pokeData/volcarona @@ -17,7 +17,7 @@ speed: 100 Genus: Sun Pokémon - Happiness: 50 Pokedex ID: 637 + Happiness: 50 Pokedex ID: 638 Base Exp: 275 Capture Rate: 15 Height: 16 Weight: 460 @@ -56,4 +56,4 @@ rate is increased. - Location Areas: + Location Areas Unknown diff --git a/pokeData/voltorb b/pokeData/voltorb index 67e5f86..48bb9da 100644 --- a/pokeData/voltorb +++ b/pokeData/voltorb @@ -17,7 +17,7 @@ speed: 100 Genus: Ball Pokémon - Happiness: 70 Pokedex ID: 100 + Happiness: 70 Pokedex ID: 109 Base Exp: 66 Capture Rate: 190 Height: 5 Weight: 104 diff --git a/pokeData/vullaby b/pokeData/vullaby index a8c52a2..606a360 100644 --- a/pokeData/vullaby +++ b/pokeData/vullaby @@ -17,7 +17,7 @@ speed: 60 Genus: Diapered Pokémon - Happiness: 35 Pokedex ID: 629 + Happiness: 35 Pokedex ID: 630 Base Exp: 74 Capture Rate: 190 Height: 5 Weight: 90 diff --git a/pokeData/vulpix b/pokeData/vulpix index 0a71ad9..80fbb74 100644 --- a/pokeData/vulpix +++ b/pokeData/vulpix @@ -17,7 +17,7 @@ speed: 65 Genus: Fox Pokémon - Happiness: 50 Pokedex ID: 37 + Happiness: 50 Pokedex ID: 39 Base Exp: 60 Capture Rate: 190 Height: 6 Weight: 99 diff --git a/pokeData/wailmer b/pokeData/wailmer index 7770ed0..8981283 100644 --- a/pokeData/wailmer +++ b/pokeData/wailmer @@ -19,7 +19,7 @@ speed: 60 Genus: Ball Whale Pokémon - Happiness: 50 Pokedex ID: 320 + Happiness: 50 Pokedex ID: 348 Base Exp: 80 Capture Rate: 125 Height: 20 Weight: 1300 diff --git a/pokeData/wailord b/pokeData/wailord index 7f28c14..c75d569 100644 --- a/pokeData/wailord +++ b/pokeData/wailord @@ -19,7 +19,7 @@ speed: 60 Genus: Float Whale Pokémon - Happiness: 50 Pokedex ID: 321 + Happiness: 50 Pokedex ID: 349 Base Exp: 175 Capture Rate: 60 Height: 145 Weight: 3980 diff --git a/pokeData/walrein b/pokeData/walrein index 3311356..4be09dc 100644 --- a/pokeData/walrein +++ b/pokeData/walrein @@ -17,7 +17,7 @@ speed: 65 Genus: Ice Break Pokémon - Happiness: 50 Pokedex ID: 365 + Happiness: 50 Pokedex ID: 395 Base Exp: 265 Capture Rate: 45 Height: 14 Weight: 1506 diff --git a/pokeData/wartortle b/pokeData/wartortle index c3d2de7..6522a05 100644 --- a/pokeData/wartortle +++ b/pokeData/wartortle @@ -40,4 +40,4 @@ turn during rain. - Location Areas: + Location Areas Unknown diff --git a/pokeData/watchog b/pokeData/watchog index fd0dc9e..0386901 100644 --- a/pokeData/watchog +++ b/pokeData/watchog @@ -17,7 +17,7 @@ speed: 77 Genus: Lookout Pokémon - Happiness: 70 Pokedex ID: 505 + Happiness: 70 Pokedex ID: 506 Base Exp: 147 Capture Rate: 255 Height: 11 Weight: 270 diff --git a/pokeData/weavile b/pokeData/weavile index a59a3d4..b6f6ddc 100644 --- a/pokeData/weavile +++ b/pokeData/weavile @@ -8,7 +8,7 @@ Evolution Chain Sneasel ► Weavile -Stage 2 Forms: + Stage 2 Forms: weavile sneasler @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 125 Genus: Sharp Claw Pokémon - Happiness: 35 Pokedex ID: 461 + Happiness: 35 Pokedex ID: 246 Base Exp: 179 Capture Rate: 45 Height: 11 Weight: 340 @@ -80,4 +80,4 @@ Stage 2 Forms: steal from a trained Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/weepinbell b/pokeData/weepinbell index cc55d3f..37fcff3 100644 --- a/pokeData/weepinbell +++ b/pokeData/weepinbell @@ -17,7 +17,7 @@ speed: 55 Genus: Flycatcher Pokémon - Happiness: 70 Pokedex ID: 70 + Happiness: 70 Pokedex ID: 76 Base Exp: 137 Capture Rate: 120 Height: 10 Weight: 64 diff --git a/pokeData/weezing b/pokeData/weezing index d642335..14dbe0c 100644 --- a/pokeData/weezing +++ b/pokeData/weezing @@ -16,7 +16,7 @@ speed: 60 Genus: Poison Gas Pokémon - Happiness: 50 Pokedex ID: 110 + Happiness: 50 Pokedex ID: 122 Base Exp: 172 Capture Rate: 60 Height: 12 Weight: 95 diff --git a/pokeData/whimsicott b/pokeData/whimsicott index 70c4d78..d2aac29 100644 --- a/pokeData/whimsicott +++ b/pokeData/whimsicott @@ -17,7 +17,7 @@ speed: 116 Genus: Windveiled Pokémon - Happiness: 50 Pokedex ID: 547 + Happiness: 50 Pokedex ID: 548 Base Exp: 168 Capture Rate: 75 Height: 7 Weight: 66 diff --git a/pokeData/whirlipede b/pokeData/whirlipede index 3cbed10..59db5af 100644 --- a/pokeData/whirlipede +++ b/pokeData/whirlipede @@ -17,7 +17,7 @@ speed: 47 Genus: Curlipede Pokémon - Happiness: 50 Pokedex ID: 544 + Happiness: 50 Pokedex ID: 545 Base Exp: 126 Capture Rate: 120 Height: 12 Weight: 585 diff --git a/pokeData/whiscash b/pokeData/whiscash index 35b51b5..81dd199 100644 --- a/pokeData/whiscash +++ b/pokeData/whiscash @@ -19,7 +19,7 @@ speed: 60 Genus: Whiskers Pokémon - Happiness: 50 Pokedex ID: 340 + Happiness: 50 Pokedex ID: 368 Base Exp: 164 Capture Rate: 75 Height: 9 Weight: 236 diff --git a/pokeData/whismur b/pokeData/whismur index 2a5274f..16e7153 100644 --- a/pokeData/whismur +++ b/pokeData/whismur @@ -19,7 +19,7 @@ speed: 28 Genus: Whisper Pokémon - Happiness: 50 Pokedex ID: 293 + Happiness: 50 Pokedex ID: 319 Base Exp: 48 Capture Rate: 190 Height: 6 Weight: 163 diff --git a/pokeData/wigglytuff b/pokeData/wigglytuff index 2cbd3b6..ef7ad75 100644 --- a/pokeData/wigglytuff +++ b/pokeData/wigglytuff @@ -17,7 +17,7 @@ speed: 45 Genus: Balloon Pokémon - Happiness: 50 Pokedex ID: 40 + Happiness: 50 Pokedex ID: 43 Base Exp: 218 Capture Rate: 50 Height: 10 Weight: 120 diff --git a/pokeData/wimpod b/pokeData/wimpod index 159c8d0..2108c27 100644 --- a/pokeData/wimpod +++ b/pokeData/wimpod @@ -36,4 +36,4 @@ it switches out. - Location Areas: + Location Areas Unknown diff --git a/pokeData/wingull b/pokeData/wingull index cd2ca15..d6dbc8a 100644 --- a/pokeData/wingull +++ b/pokeData/wingull @@ -20,7 +20,7 @@ speed: 85 Genus: Seagull Pokémon - Happiness: 50 Pokedex ID: 278 + Happiness: 50 Pokedex ID: 303 Base Exp: 54 Capture Rate: 190 Height: 6 Weight: 95 diff --git a/pokeData/wishiwashi b/pokeData/wishiwashi index 77e99c3..f91893a 100644 --- a/pokeData/wishiwashi +++ b/pokeData/wishiwashi @@ -1,5 +1,5 @@ - Type Pokémon + Wishiwashi-solo Water Type Pokémon When it’s in trouble, its eyes moisten and begin to shine. @@ -9,15 +9,34 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 45 + attack: 20 + defense: 20 + special-attack: 25 + special-defense: 25 + speed: 40 Genus: Small Fry Pokémon - Happiness: 50 Pokedex ID: - Base Exp: Capture Rate: 60 - Height: Weight: + Happiness: 50 Pokedex ID: 746 + Base Exp: 61 Capture Rate: 60 + Height: 2 Weight: 3 Types: + Water ↞---------------|ABILITIES|---------------↠ + Schooling: - Location Areas: + If this Pokémon is a wishiwashi + and level 20 or above, then when + it enters battle and at the start + of each turn, it becomes Schooling + Form if its HP is 25% or higher + and Solo Form otherwise. + + This ability cannot be replaced, + copied, or nullified. + + + Location Areas Unknown diff --git a/pokeData/wobbuffet b/pokeData/wobbuffet index 660101a..436e147 100644 --- a/pokeData/wobbuffet +++ b/pokeData/wobbuffet @@ -17,7 +17,7 @@ speed: 33 Genus: Patient Pokémon - Happiness: 50 Pokedex ID: 202 + Happiness: 50 Pokedex ID: 233 Base Exp: 142 Capture Rate: 45 Height: 13 Weight: 285 diff --git a/pokeData/woobat b/pokeData/woobat index b5b0ac5..5bd3880 100644 --- a/pokeData/woobat +++ b/pokeData/woobat @@ -17,7 +17,7 @@ speed: 72 Genus: Bat Pokémon - Happiness: 50 Pokedex ID: 527 + Happiness: 50 Pokedex ID: 528 Base Exp: 65 Capture Rate: 190 Height: 4 Weight: 21 diff --git a/pokeData/wooloo b/pokeData/wooloo index b4b77eb..44506af 100644 --- a/pokeData/wooloo +++ b/pokeData/wooloo @@ -45,4 +45,4 @@ and bomb-based moves. - Location Areas: + Location Areas Unknown diff --git a/pokeData/wooper b/pokeData/wooper index c0c6a8f..351838a 100644 --- a/pokeData/wooper +++ b/pokeData/wooper @@ -8,7 +8,7 @@ Evolution Chain Wooper ► Quagsire -Stage 2 Forms: + Stage 2 Forms: quagsire clodsire @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 15 Genus: Water Fish Pokémon - Happiness: 50 Pokedex ID: 194 + Happiness: 50 Pokedex ID: 225 Base Exp: 42 Capture Rate: 255 Height: 4 Weight: 85 diff --git a/pokeData/wormadam b/pokeData/wormadam index 2d1bb74..11c3164 100644 --- a/pokeData/wormadam +++ b/pokeData/wormadam @@ -1,22 +1,71 @@ - Type Pokémon + Chatot Normal Type Pokémon When BURMY evolved, its cloak became a part of this Pokémon’s body. The cloak is never shed. - Single Stage Evolution Pokémon + Evolution Chain + Burmy ► Wormadam + + Stage 2 Forms: + wormadam + mothim ↞--------| STATS |--------↠ + hp: 76 + attack: 65 + defense: 45 + special-attack: 92 + special-defense: 42 + speed: 91 Genus: Bagworm Pokémon - Happiness: 70 Pokedex ID: - Base Exp: Capture Rate: 45 - Height: Weight: + Happiness: 70 Pokedex ID: 441 + Base Exp: 144 Capture Rate: 45 + Height: 5 Weight: 19 Types: + Normal + Flying ↞---------------|ABILITIES|---------------↠ + Keen-eye: - Location Areas: + This Pokémon cannot have its + accuracy lowered. + + This ability does not prevent + any accuracy losses other than + stat modifiers, such as the accuracy + cut from fog; nor does it prevent + other Pokémon's evasion from + making this Pokémon's moves less + accurate. This Pokémon can still + be passed negative accuracy modifiers + through heart swap. + + Overworld: If the first Pokémon + in the party has this ability, + any random encounter with a Pokémon + five or more levels lower than + it has a 50% chance of being + skipped. + + Tangled-feet: + + When this Pokémon is confused, + it has twice its evasion. + + Big-pecks: + + This Pokémon's Defense cannot + be lowered by other Pokémon. + + This Pokémon can still be passed + negative Defense modifiers through + heart swap or guard swap. + + + Location Areas Unknown diff --git a/pokeData/wurmple b/pokeData/wurmple index 4eb7378..218a1af 100644 --- a/pokeData/wurmple +++ b/pokeData/wurmple @@ -11,11 +11,11 @@ Evolution Chain Wurmple ► Silcoon ► Beautifly -Stage 2 Forms: + Stage 2 Forms: silcoon cascoon -Stage 3 Forms: + Stage 3 Forms: beautifly dustox @@ -28,7 +28,7 @@ Stage 3 Forms: speed: 20 Genus: Worm Pokémon - Happiness: 70 Pokedex ID: 265 + Happiness: 70 Pokedex ID: 290 Base Exp: 56 Capture Rate: 255 Height: 3 Weight: 36 diff --git a/pokeData/wynaut b/pokeData/wynaut index 96531df..b1f2b75 100644 --- a/pokeData/wynaut +++ b/pokeData/wynaut @@ -19,7 +19,7 @@ speed: 23 Genus: Bright Pokémon - Happiness: 50 Pokedex ID: 360 + Happiness: 50 Pokedex ID: 232 Base Exp: 52 Capture Rate: 125 Height: 6 Weight: 140 diff --git a/pokeData/wyrdeer b/pokeData/wyrdeer index a1d9e5e..1e177fe 100644 --- a/pokeData/wyrdeer +++ b/pokeData/wyrdeer @@ -74,4 +74,4 @@ other effect on it. - Location Areas: + Location Areas Unknown diff --git a/pokeData/xatu b/pokeData/xatu index 3788aab..afc62e6 100644 --- a/pokeData/xatu +++ b/pokeData/xatu @@ -17,7 +17,7 @@ speed: 95 Genus: Mystic Pokémon - Happiness: 50 Pokedex ID: 178 + Happiness: 50 Pokedex ID: 207 Base Exp: 165 Capture Rate: 75 Height: 15 Weight: 150 diff --git a/pokeData/xerneas b/pokeData/xerneas index 8a2f42b..f6bf641 100644 --- a/pokeData/xerneas +++ b/pokeData/xerneas @@ -31,4 +31,4 @@ all friendly and opposing Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/xurkitree b/pokeData/xurkitree index 01585c2..214bbb8 100644 --- a/pokeData/xurkitree +++ b/pokeData/xurkitree @@ -33,4 +33,4 @@ another Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/yamask b/pokeData/yamask index af46afd..98961e9 100644 --- a/pokeData/yamask +++ b/pokeData/yamask @@ -8,7 +8,7 @@ Evolution Chain Yamask ► Cofagrigus -Stage 2 Forms: + Stage 2 Forms: cofagrigus runerigus @@ -21,7 +21,7 @@ Stage 2 Forms: speed: 30 Genus: Spirit Pokémon - Happiness: 50 Pokedex ID: 562 + Happiness: 50 Pokedex ID: 563 Base Exp: 61 Capture Rate: 190 Height: 5 Weight: 15 diff --git a/pokeData/yamper b/pokeData/yamper index ca1009b..3b07fcd 100644 --- a/pokeData/yamper +++ b/pokeData/yamper @@ -39,4 +39,4 @@ bug-type move. - Location Areas: + Location Areas Unknown diff --git a/pokeData/yanma b/pokeData/yanma index 0f98257..c45aa89 100644 --- a/pokeData/yanma +++ b/pokeData/yanma @@ -17,7 +17,7 @@ speed: 95 Genus: Clear Wing Pokémon - Happiness: 70 Pokedex ID: 193 + Happiness: 70 Pokedex ID: 223 Base Exp: 78 Capture Rate: 75 Height: 12 Weight: 380 diff --git a/pokeData/yanmega b/pokeData/yanmega index 4d7e481..149c3ee 100644 --- a/pokeData/yanmega +++ b/pokeData/yanmega @@ -16,7 +16,7 @@ speed: 95 Genus: Ogre Darner Pokémon - Happiness: 70 Pokedex ID: 469 + Happiness: 70 Pokedex ID: 224 Base Exp: 180 Capture Rate: 30 Height: 19 Weight: 515 diff --git a/pokeData/yungoos b/pokeData/yungoos index 2a700cb..954a966 100644 --- a/pokeData/yungoos +++ b/pokeData/yungoos @@ -46,4 +46,4 @@ of 1.5×. - Location Areas: + Location Areas Unknown diff --git a/pokeData/yveltal b/pokeData/yveltal index 5d37fab..e3ae3ef 100644 --- a/pokeData/yveltal +++ b/pokeData/yveltal @@ -33,4 +33,4 @@ all friendly and opposing Pokémon. - Location Areas: + Location Areas Unknown diff --git a/pokeData/zacian b/pokeData/zacian index 9895f19..db67dfa 100644 --- a/pokeData/zacian +++ b/pokeData/zacian @@ -30,4 +30,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/zamazenta b/pokeData/zamazenta index 405fe42..ac3d509 100644 --- a/pokeData/zamazenta +++ b/pokeData/zamazenta @@ -31,4 +31,4 @@ - Location Areas: + Location Areas Unknown diff --git a/pokeData/zangoose b/pokeData/zangoose index 1ac8492..4e9f0ff 100644 --- a/pokeData/zangoose +++ b/pokeData/zangoose @@ -17,7 +17,7 @@ speed: 90 Genus: Cat Ferret Pokémon - Happiness: 70 Pokedex ID: 335 + Happiness: 70 Pokedex ID: 363 Base Exp: 160 Capture Rate: 90 Height: 13 Weight: 403 diff --git a/pokeData/zapdos b/pokeData/zapdos index ec5c1c2..6b47a58 100644 --- a/pokeData/zapdos +++ b/pokeData/zapdos @@ -16,7 +16,7 @@ speed: 100 Genus: Electric Pokémon - Happiness: 35 Pokedex ID: 145 + Happiness: 35 Pokedex ID: 177 Base Exp: 290 Capture Rate: 3 Height: 16 Weight: 526 diff --git a/pokeData/zarude b/pokeData/zarude index dd9500e..db1445e 100644 --- a/pokeData/zarude +++ b/pokeData/zarude @@ -44,4 +44,4 @@ in the meantime. - Location Areas: + Location Areas Unknown diff --git a/pokeData/zebstrika b/pokeData/zebstrika index 5b48561..915e206 100644 --- a/pokeData/zebstrika +++ b/pokeData/zebstrika @@ -17,7 +17,7 @@ speed: 116 Genus: Thunderbolt Pokémon - Happiness: 70 Pokedex ID: 523 + Happiness: 70 Pokedex ID: 524 Base Exp: 174 Capture Rate: 75 Height: 16 Weight: 795 diff --git a/pokeData/zekrom b/pokeData/zekrom index 3db343c..5f511c2 100644 --- a/pokeData/zekrom +++ b/pokeData/zekrom @@ -16,7 +16,7 @@ speed: 90 Genus: Deep Black Pokémon - Happiness: 0 Pokedex ID: 644 + Happiness: 0 Pokedex ID: 645 Base Exp: 340 Capture Rate: 3 Height: 29 Weight: 3450 @@ -85,4 +85,4 @@ to mold breaker and turboblaze. - Location Areas: + Location Areas Unknown diff --git a/pokeData/zeraora b/pokeData/zeraora index 73e2397..6a6be0f 100644 --- a/pokeData/zeraora +++ b/pokeData/zeraora @@ -43,4 +43,4 @@ moves, i.e. thunder wave. - Location Areas: + Location Areas Unknown diff --git a/pokeData/zigzagoon b/pokeData/zigzagoon index c4d3b1e..44869e9 100644 --- a/pokeData/zigzagoon +++ b/pokeData/zigzagoon @@ -19,7 +19,7 @@ speed: 60 Genus: Tiny Raccoon Pokémon - Happiness: 50 Pokedex ID: 263 + Happiness: 50 Pokedex ID: 288 Base Exp: 56 Capture Rate: 255 Height: 4 Weight: 175 diff --git a/pokeData/zoroark b/pokeData/zoroark index 4810395..35c42f0 100644 --- a/pokeData/zoroark +++ b/pokeData/zoroark @@ -17,7 +17,7 @@ speed: 105 Genus: Illusion Fox Pokémon - Happiness: 50 Pokedex ID: 571 + Happiness: 50 Pokedex ID: 572 Base Exp: 179 Capture Rate: 45 Height: 16 Weight: 811 diff --git a/pokeData/zorua b/pokeData/zorua index 9ae2d41..ce08ea9 100644 --- a/pokeData/zorua +++ b/pokeData/zorua @@ -17,7 +17,7 @@ speed: 65 Genus: Tricky Fox Pokémon - Happiness: 50 Pokedex ID: 570 + Happiness: 50 Pokedex ID: 571 Base Exp: 66 Capture Rate: 75 Height: 7 Weight: 125 diff --git a/pokeData/zubat b/pokeData/zubat index e8417a2..5e524bc 100644 --- a/pokeData/zubat +++ b/pokeData/zubat @@ -17,7 +17,7 @@ speed: 55 Genus: Bat Pokémon - Happiness: 50 Pokedex ID: 41 + Happiness: 50 Pokedex ID: 44 Base Exp: 49 Capture Rate: 255 Height: 8 Weight: 75 diff --git a/pokeData/zweilous b/pokeData/zweilous index cc23e12..e778b46 100644 --- a/pokeData/zweilous +++ b/pokeData/zweilous @@ -17,7 +17,7 @@ speed: 58 Genus: Hostile Pokémon - Happiness: 35 Pokedex ID: 634 + Happiness: 35 Pokedex ID: 635 Base Exp: 147 Capture Rate: 45 Height: 14 Weight: 500 diff --git a/pokeData/zygarde b/pokeData/zygarde index b55b2bb..165d99e 100644 --- a/pokeData/zygarde +++ b/pokeData/zygarde @@ -1,5 +1,5 @@ - Type Pokémon + Zygarde-50 Dragon Type Pokémon When the Kalos region’s ecosystem falls into disarray, it appears @@ -8,15 +8,31 @@ Single Stage Evolution Pokémon ↞--------| STATS |--------↠ + hp: 108 + attack: 100 + defense: 121 + special-attack: 81 + special-defense: 95 + speed: 95 Genus: Order Pokémon - Happiness: 0 Pokedex ID: - Base Exp: Capture Rate: 3 - Height: Weight: + Happiness: 0 Pokedex ID: 718 + Base Exp: 300 Capture Rate: 3 + Height: 50 Weight: 3050 Types: + Dragon + Ground ↞---------------|ABILITIES|---------------↠ + Aura-break: - Location Areas: + While this Pokémon is on the + field, dark aura and fairy aura + weaken moves of their respective + types to 2/3 their power, rather + than strengthening them. + + + Location Areas Unknown diff --git a/pokeParse b/pokeParse index fddb4eb..81b01e8 100755 --- a/pokeParse +++ b/pokeParse @@ -4,16 +4,25 @@ POKEMON="$1" ### Set temp files to hold raw data -DATADIR="/home/ez/Git/fuzzy-pokedex/pokeData" +DATADIR="/usr/bin/fuzzy-pokedex/pokeData" ### GET various pokeAPI endpoint URLs -endpoint_POKEMON="$(curl -s "https://pokeapi.co/api/v2/pokemon/$POKEMON")" endpoint_SPECIES="$(curl -s "https://pokeapi.co/api/v2/pokemon-species/$POKEMON")" +ID="$(jq -r '.order' <<< "$endpoint_SPECIES")" +endpoint_POKEMON="$(curl -s "https://pokeapi.co/api/v2/pokemon/$POKEMON")" endpoint_ENCOUNTER="$(curl -s "https://pokeapi.co/api/v2/pokemon/$POKEMON/encounters")" endpoint_CHAIN="$(curl -s "$(jq -r '.evolution_chain["url"]' <<< "$endpoint_SPECIES")")" +### Test for alt_endpoint +if NAME="$(jq -e -r '[.name]' <<< "$endpoint_POKEMON")" && [[ -n "$NAME" ]] + then + : + else + endpoint_POKEMON="$(curl -s "https://pokeapi.co/api/v2/pokemon/$ID")" +fi + ### Parse JSON for attributes and assign to vars -IFS=$'\t' read -r NAME HEIGHT WEIGHT ID BASEX < <( jq -r '[.name, .height, .weight, .id, .base_experience] | @tsv' <<< "$endpoint_POKEMON") +IFS=$'\t' read -r NAME HEIGHT WEIGHT BASEX < <( jq -e -r '[.name, .height, .weight, .base_experience] | @tsv' <<< "$endpoint_POKEMON") IFS=$'\t' read -r BASEHAPPY CAPTURE GENUS < <( jq -r '[.base_happiness, .capture_rate, .genera[7].genus] | @tsv' <<< "$endpoint_SPECIES") mapfile -t TYPE < <(jq -r '.types[].type["name"]' <<< "$endpoint_POKEMON"); TYPE_ITEM="${TYPE[0]}" mapfile -t STAT < <(jq -r '.stats[].stat["name"]' <<< "$endpoint_POKEMON") @@ -77,7 +86,7 @@ printf "\n Types:\n" for ((i=0; i<${#TYPE[@]}; i++)); do TYPE_LIST_ITEM="${TYPE[i]}" printf " %s\n" "${TYPE_LIST_ITEM^}" -done +done; printf "\n%s\n\n" " ↞---------------|ABILITIES|---------------↠" for ((i=0; i<${#ABILITIES[@]}; i++)); do ABILITY_NAME="$(awk '{print $1}' <<< "${ABILITIES[i]}")" @@ -86,10 +95,15 @@ for ((i=0; i<${#ABILITIES[@]}; i++)); do < <(curl -s "$(awk '{print $2}' <<< "${ABILITIES[i]}")")))" printf " %s:\n\n" "${ABILITY_NAME^}" printf " %s\n\n" "$EFFECT_ENTRY" -done -printf "\n Location Areas:\n"; -for ((i=0; i<${#LOCATE[@]}; i++)); do - LOCATION_ITEM="$(sed 's/-/ /g' <<< "${LOCATE[i]}")"; - printf " %s\n" "${LOCATION_ITEM^}"; -done; } > "$DATADIR/$POKEMON" +done; +if [[ -n "$LOCATE" ]] + then + printf "\n Location Areas:\n"; + for ((i=0; i<${#LOCATE[@]}; i++)); do + LOCATION_ITEM="$(sed 's/-/ /g' <<< "${LOCATE[i]}")"; + printf " %s\n" "${LOCATION_ITEM^}"; + done; + else + printf "\n Location Areas Unknown\n"; +fi; } > "$DATADIR/$POKEMON"