Merge branch 'master' of git@veekun.com:pokedex into HEAD

[zzz-pokedex.git] / pokedex / data / csv / pokemon.csv

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index fad6b15..6b06b6d 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -384,7 +384,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,evolut
 383,Groudon,,,3,199,,,,35,9500,Continent,red,6,rough terrain,-1,5,218,0,,0,0,0
 384,Rayquaza,,,3,200,,,,70,2065,Sky High,green,2,rare,-1,3,220,0,,0,0,0
 385,Jirachi,,,3,201,,,,3,11,Wish,yellow,12,mountain,-1,3,215,100,,0,0,0
-386,Deoxys,normal,,3,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+386,Deoxys,,,3,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
 387,Turtwig,,,4,203,,,,4,102,Tiny Leaf,green,8,,1,45,64,70,,0,0,0
 388,Grotle,,,4,203,387,1,18,11,970,Grove,green,8,,1,45,141,70,,0,0,0
 389,Torterra,,,4,203,388,1,32,22,3100,Continent,green*,8,,1,45,208,70,,0,0,0
@@ -411,7 +411,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,evolut
 410,Shieldon,,,4,212,,,,5,570,Shield,gray,8,,1,45,99,70,,0,0,0
 411,Bastiodon,,,4,212,410,1,30,13,1495,Shield,gray,8,,1,45,199,70,,0,0,0
 412,Burmy,,,4,213,,,,2,34,Bagworm,gray,2,,4,120,61,70,,0,0,0
-413,Wormadam,grass,,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+413,Wormadam,plant,,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
 414,Mothim,,,4,213,412,2,20,9,233,Moth,yellow,13,,0,45,159,70,,0,0,0
 415,Combee,,,4,214,,,,3,55,Tiny Bee,yellow,11,,1,120,63,70,,0,1,0
 416,Vespiquen,,,4,214,415,3,21,12,385,Beehive,yellow,9,,8,45,188,70,,0,0,0
@@ -485,17 +485,22 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,evolut
 484,Palkia,,,4,245,,,,42,3360,Spatial,purple,6,,-1,30,220,0,,0,0,0
 485,Heatran,,,4,246,,,,17,4300,Lava Dome,brown,8,,4,3,215,100,,0,0,0
 486,Regigigas,,,4,247,,,,37,4200,Colossal,white,12,,-1,3,220,0,,0,0,0
-487,Giratina,,,4,248,,,,45,7500,Renegade,black,10,,-1,3,220,0,,0,0,0
+487,Giratina,altered,,4,248,,,,45,7500,Renegade,black,10,,-1,3,220,0,,0,0,0
 488,Cresselia,,,4,249,,,,15,856,Lunar,yellow,14,,8,3,210,100,,0,0,0
 489,Phione,,,4,250,,,,4,31,Sea Drifter,blue,4,,-1,30,165,70,,1,0,0
 490,Manaphy,,,4,250,489,21,,3,14,Seafaring,blue,12,,-1,3,215,70,,0,0,0
 491,Darkrai,,,4,252,,,,15,505,Pitch-Black,black,12,,-1,3,210,0,,0,0,0
-492,Shaymin,,,4,253,,,,2,21,Gratitude,green,8,,-1,45,64,100,,0,0,0
+492,Shaymin,land,,4,253,,,,2,21,Gratitude,green,8,,-1,45,64,100,,0,0,0
 493,Arceus,,,4,254,,,,32,3200,Alpha,gray,8,,-1,3,255,0,,0,0,0
-494,Pokemon494,,,,0,,,,0,0,,,0,,-1,3,255,0,,0,0,0
-495,Pokemon495,,,,0,,,,0,0,,,0,,-1,3,255,0,,0,0,0
-496,Deoxys,attack,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-497,Deoxys,defense,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-498,Deoxys,speed,386,,,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
-499,Wormadam,ground,413,,,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
-500,Wormadam,steel,413,,,,,,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+496,Deoxys,attack,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+497,Deoxys,defense,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+498,Deoxys,speed,386,4,202,,,,17,608,DNA,red,12,rare,-1,3,215,0,,0,0,0
+499,Wormadam,sandy,413,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+500,Wormadam,trash,413,4,213,412,3,20,5,65,Bagworm,gray,2,,8,45,159,70,,0,0,0
+501,Giratina,origin,487,4,248,,,,69,6500,Renegade,black,10,,-1,3,220,0,,0,0,0
+502,Shaymin,sky,492,4,253,,,,4,52,Gratitude,green,8,,-1,45,64,100,,0,0,0
+503,Rotom,heat,479,4,240,,,,3,3,Plasma,red,1,,-1,45,132,70,,0,0,0
+504,Rotom,wash,479,4,240,,,,3,3,Plasma,red,1,,-1,45,132,70,,0,0,0
+505,Rotom,frost,479,4,240,,,,3,3,Plasma,red,1,,-1,45,132,70,,0,0,0
+506,Rotom,fan,479,4,240,,,,3,3,Plasma,red,1,,-1,45,132,70,,0,0,0
+507,Rotom,mow,479,4,240,,,,3,3,Plasma,red,1,,-1,45,132,70,,0,0,0