Some ability changes/fixes. #561

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

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 639c15d..6ea398b 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -492,162 +492,162 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 491,Darkrai,4,252,15,505,Pitch-Black,1,12,,-1,3,210,0,0,120,0,505
 492,Shaymin,4,253,2,21,Gratitude,5,8,,-1,45,64,100,0,120,0,506
 493,Arceus,4,254,32,3200,Alpha,4,8,,-1,3,255,0,0,120,0,508
 491,Darkrai,4,252,15,505,Pitch-Black,1,12,,-1,3,210,0,0,120,0,505
 492,Shaymin,4,253,2,21,Gratitude,5,8,,-1,45,64,100,0,120,0,506
 493,Arceus,4,254,32,3200,Alpha,4,8,,-1,3,255,0,0,120,0,508

-494,Victini,5,255,4,40,しょうり,10,,,-1,3,270,100,0,120,0,509
+494,Victini,5,255,4,40,Victory,10,,,-1,3,270,100,0,120,0,509

 495,Snivy,5,256,6,81,Grass Snake,5,,,1,45,28,70,0,20,0,510
 495,Snivy,5,256,6,81,Grass Snake,5,,,1,45,28,70,0,20,0,510

-496,janobii,5,256,8,160,くさへび,5,,,1,45,145,70,0,20,0,511
-497,jarooda,5,256,33,630,ロイヤル,5,,,1,45,238,70,0,20,0,512
+496,Servine,5,256,8,160,Grass Snake,5,,,1,45,145,70,0,20,0,511
+497,Serperior,5,256,33,630,Regal,5,,,1,45,238,70,0,20,0,512

 498,Tepig,5,257,5,99,Fire Pig,8,,,1,45,28,70,0,20,0,513
 498,Tepig,5,257,5,99,Fire Pig,8,,,1,45,28,70,0,20,0,513

-499,chaobuu,5,257,10,555,ひぶた,8,,,1,45,146,70,0,20,0,514
-500,enbuoo,5,257,16,1500,おおひぶた,8,,,1,45,238,70,0,20,0,515
+499,Pignite,5,257,10,555,Fire Pig,8,,,1,45,146,70,0,20,0,514
+500,Emboar,5,257,16,1500,Mega Fire Pig,8,,,1,45,238,70,0,20,0,515

 501,Oshawott,5,258,5,59,Sea Otter,2,,,1,45,28,70,0,20,0,516
 501,Oshawott,5,258,5,59,Sea Otter,2,,,1,45,28,70,0,20,0,516

-502,futachimaru,5,258,8,245,しゅぎょう,2,,,1,45,145,70,0,20,0,517
-503,daikenki,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,518
+502,Dewott,5,258,8,245,Discipline,2,,,1,45,145,70,0,20,0,517
+503,Samurott,5,258,15,946,Formidable,2,,,1,45,238,70,0,20,0,518

 504,Patrat,5,259,5,116,Scout,3,,,4,255,51,70,0,15,0,519
 504,Patrat,5,259,5,116,Scout,3,,,4,255,51,70,0,15,0,519

-505,miruhoggu,5,259,11,270,けいかい,3,,,4,255,147,70,0,20,0,520
-506,yooterii,5,260,4,41,こいぬ,3,,,4,255,55,70,0,15,0,521
-507,haaderia,5,260,9,147,ちゅうけん,4,,,4,120,130,70,0,15,0,522
-508,muurando,5,260,12,610,かんだい,4,,,4,45,221,70,0,15,0,523
-509,choroneko,5,261,4,101,しょうわる,7,,,4,255,56,70,0,20,0,524
-510,reparudasu,5,261,11,375,れいこく,7,,,4,90,156,70,0,20,0,525
-511,Pansage,5,262,6,105,くさざる,5,,,1,190,63,70,0,20,0,526
-512,yanakkii,5,262,11,305,とげざる,5,,,1,75,174,70,0,20,0,527
-513,Pansear,5,263,6,110,こうおん,8,,,1,190,63,70,0,20,0,528
-514,baokkii,5,263,10,280,ひのこ,8,,,1,75,174,70,0,20,0,529
-515,Panpour,5,264,6,135,みずかけ,2,,,1,190,63,70,0,20,0,530
-516,hiyakkii,5,264,10,290,ほうすい,2,,,1,75,174,70,0,20,0,531
+505,Watchog,5,259,11,270,Lookout,3,,,4,255,147,70,0,20,0,520
+506,Lillipup,5,260,4,41,Puppy,3,,,4,255,55,70,0,15,0,521
+507,Herdier,5,260,9,147,Loyal Dog,4,,,4,120,130,70,0,15,0,522
+508,Stoutland,5,260,12,610,Big-Hearted,4,,,4,45,221,70,0,15,0,523
+509,Purrloin,5,261,4,101,Devious,7,,,4,255,56,70,0,20,0,524
+510,Liepard,5,261,11,375,Cruel,7,,,4,90,156,70,0,20,0,525
+511,Pansage,5,262,6,105,Grass Monkey,5,,,1,190,63,70,0,20,0,526
+512,Simisage,5,262,11,305,Thorn Monkey,5,,,1,75,174,70,0,20,0,527
+513,Pansear,5,263,6,110,High Temp,8,,,1,190,63,70,0,20,0,528
+514,Simisear,5,263,10,280,Ember,8,,,1,75,174,70,0,20,0,529
+515,Panpour,5,264,6,135,Spray,2,,,1,190,63,70,0,20,0,530
+516,Simipour,5,264,10,290,Geyser,2,,,1,75,174,70,0,20,0,531

 517,Munna,5,265,6,233,Dream Eater,6,,,4,190,58,70,0,10,0,532
 518,Musharna,5,265,11,605,Drowsing,6,,,4,75,170,70,0,10,0,533
 519,Pidove,5,266,3,21,Tiny Pigeon,4,,,4,255,53,70,0,15,0,534
 517,Munna,5,265,6,233,Dream Eater,6,,,4,190,58,70,0,10,0,532
 518,Musharna,5,265,11,605,Drowsing,6,,,4,75,170,70,0,10,0,533
 519,Pidove,5,266,3,21,Tiny Pigeon,4,,,4,255,53,70,0,15,0,534

-520,hatooboo,5,266,6,150,のばと,4,,,4,120,125,70,0,15,0,535
-521,kenhorou,5,266,12,290,プライド,4,,,4,45,215,70,0,15,1,536
+520,Tranquill,5,266,6,150,Wild Pigeon,4,,,4,120,125,70,0,15,0,535
+521,Unfezant,5,266,12,290,Proud,4,,,4,45,215,70,0,15,1,536

 522,Blitzle,5,267,8,298,Electrified,1,,,4,190,59,70,0,20,0,537
 522,Blitzle,5,267,8,298,Electrified,1,,,4,190,59,70,0,20,0,537

-523,zeburaika,5,267,16,795,らいでん,1,,,4,75,174,70,0,20,0,538
-524,dangoro,5,268,4,180,マントル,2,,,4,255,56,70,0,15,0,539
-525,gantoru,5,268,9,1020,こうせき,2,,,4,120,137,70,0,15,0,540
+523,Zebstrika,5,267,16,795,Thunderbolt,1,,,4,75,174,70,0,20,0,538
+524,Roggenrola,5,268,4,180,Mantle,2,,,4,255,56,70,0,15,0,539
+525,Boldore,5,268,9,1020,Ore,2,,,4,120,137,70,0,15,0,540

 526,Gigalith,5,268,17,2600,Compressed,2,,,4,45,227,70,0,15,0,541
 527,Woobat,5,269,4,21,Bat,2,,,4,190,63,70,0,15,0,542
 526,Gigalith,5,268,17,2600,Compressed,2,,,4,45,227,70,0,15,0,541
 527,Woobat,5,269,4,21,Bat,2,,,4,190,63,70,0,15,0,542

-528,kokoromori,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,543
+528,Swoobat,5,269,9,105,Courting,2,,,4,45,149,70,0,15,0,543

 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544
 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544

-530,Excadrill,5,270,7,404,ちてい,4,,,4,60,178,70,0,20,0,545
-531,tabunne,5,271,11,310,ヒヤリング,6,,,4,255,390,70,0,20,0,546
-532,dokkoraa,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,547
-533,dotekkotsu,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,548
-534,roobushin,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,549
-535,otamaro,5,273,5,45,おたま,2,,,4,255,59,70,0,20,0,550
-536,gamagaru,5,273,8,170,しんどう,2,,,4,120,134,70,0,20,0,551
-537,gamageroge,5,273,15,620,しんどう,2,,,4,45,225,70,0,20,0,552
-538,nageki,5,274,13,555,じゅうどう,8,,,0,45,163,70,0,20,0,553
-539,dageki,5,275,14,510,からて,2,,,0,45,163,70,0,20,0,554
-540,Sewaddle,5,276,3,25,さいほう,10,,,4,255,62,70,0,15,0,555
-541,kurumayu,5,276,5,73,はごもり,5,,,4,120,133,70,0,15,0,556
-542,hahakomori,5,276,12,205,こそだて,10,,,4,45,221,70,0,15,0,557
-543,fushide,5,277,4,53,ムカデ,8,,,4,255,52,70,0,15,0,558
-544,hoiiga,5,277,12,585,まゆムカデ,4,,,4,120,126,70,0,15,0,559
-545,pendoraa,5,277,25,2005,メガムカデ,8,,,4,45,214,70,0,20,0,560
-546,monmen,5,278,3,6,わたたま,5,,,4,190,56,70,0,20,0,561
-547,erufuun,5,278,7,66,かぜかくれ,5,,,4,75,168,70,0,20,0,562
-548,churine,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,563
-549,doredia,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,564
-550,basurao,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,565
+530,Excadrill,5,270,7,404,Subterrene,4,,,4,60,178,70,0,20,0,545
+531,Audino,5,271,11,310,Hearing,6,,,4,255,390,70,0,20,0,546
+532,Timburr,5,272,6,125,Muscular,4,,,2,180,61,70,0,20,0,547
+533,Gurdurr,5,272,12,400,Muscular,4,,,2,90,142,70,0,20,0,548
+534,Conkeldurr,5,272,14,870,Muscular,3,,,2,45,227,70,0,20,0,549
+535,Tympole,5,273,5,45,Tadpole,2,,,4,255,59,70,0,20,0,550
+536,Palpitoad,5,273,8,170,Vibration,2,,,4,120,134,70,0,20,0,551
+537,Seismitoad,5,273,15,620,Vibration,2,,,4,45,225,70,0,20,0,552
+538,Throh,5,274,13,555,Judo,8,,,0,45,163,70,0,20,0,553
+539,Sawk,5,275,14,510,Karate,2,,,0,45,163,70,0,20,0,554
+540,Sewaddle,5,276,3,25,Sewing,10,,,4,255,62,70,0,15,0,555
+541,Swadloon,5,276,5,73,Leaf-Wrapped,5,,,4,120,133,70,0,15,0,556
+542,Leavanny,5,276,12,205,Nurturing,10,,,4,45,221,70,0,15,0,557
+543,Venipede,5,277,4,53,Centipede,8,,,4,255,52,70,0,15,0,558
+544,Whirlipede,5,277,12,585,Curlipede,4,,,4,120,126,70,0,15,0,559
+545,Scolipede,5,277,25,2005,Megapede,8,,,4,45,214,70,0,20,0,560
+546,Cottonee,5,278,3,6,Cotton Puff,5,,,4,190,56,70,0,20,0,561
+547,Whimsicott,5,278,7,66,Windveiled,5,,,4,75,168,70,0,20,0,562
+548,Petilil,5,279,5,66,Bulb,5,,,8,190,56,70,0,20,0,563
+549,Lilligant,5,279,11,163,Flowering,5,,,8,75,168,70,0,20,0,564
+550,Basculin,5,280,10,180,Hostile,5,,,4,25,161,70,0,40,0,565

 551,Sandile,5,281,7,152,Desert Croc,3,,,4,180,58,70,0,20,0,567
 551,Sandile,5,281,7,152,Desert Croc,3,,,4,180,58,70,0,20,0,567

-552,warubiru,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,568
-553,warubiaru,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,569
-554,darumakka,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,570
+552,Krokorok,5,281,10,334,Desert Croc,3,,,4,90,123,70,0,20,0,568
+553,Krookodile,5,281,15,963,Intimidation,8,,,4,45,229,70,0,20,0,569
+554,Darumaka,5,282,6,375,Zen Charm,8,,,4,120,63,70,0,20,0,570

 555,Darmanitan,5,282,13,929,Blazing,8,,,4,60,168,70,0,20,0,571
 555,Darmanitan,5,282,13,929,Blazing,8,,,4,60,168,70,0,20,0,571

-556,marakacchi,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,573
-557,ishizumai,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,574
-558,iwaparesu,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,575
-559,zuruggu,5,285,6,118,だっぴ,10,,,4,180,70,35,0,15,0,576
-560,zuruzukin,5,285,11,300,あくとう,8,,,4,90,171,70,0,15,0,577
-561,shinboraa,5,286,14,140,とりもどき,1,,,4,45,172,70,0,20,0,578
-562,desumasu,5,287,5,15,たましい,1,,,4,190,61,70,0,25,0,579
+556,Maractus,5,283,10,280,Cactus,5,,,4,255,161,70,0,20,0,573
+557,Dwebble,5,284,3,145,Rock Inn,8,,,4,190,65,70,0,20,0,574
+558,Crustle,5,284,14,2000,Stone Home,8,,,4,75,166,70,0,20,0,575
+559,Scraggy,5,285,6,118,Shedding,10,,,4,180,70,35,0,15,0,576
+560,Scrafty,5,285,11,300,Hoodlum,8,,,4,90,171,70,0,15,0,577
+561,Sigilyph,5,286,14,140,Avianoid,1,,,4,45,172,70,0,20,0,578
+562,Yamask,5,287,5,15,Spirit,1,,,4,190,61,70,0,25,0,579

 563,Cofagrigus,5,287,17,765,Coffin,10,,,4,90,169,70,0,25,0,580
 563,Cofagrigus,5,287,17,765,Coffin,10,,,4,90,169,70,0,25,0,580

-564,purotooga,5,288,7,165,こだいがめ,2,,,1,45,71,70,0,30,0,581
-565,abagoora,5,288,12,810,こだいがめ,2,,,1,45,173,70,0,30,0,582
-566,aaken,5,289,5,95,さいこどり,10,,,1,45,71,70,0,30,0,583
-567,aakeosu,5,289,14,320,さいこどり,10,,,1,45,177,70,0,30,0,584
-568,yabukuron,5,290,6,310,ゴミぶくろ,5,,,4,190,66,70,0,20,0,585
-569,dasutodasu,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,586
+564,Tirtouga,5,288,7,165,Prototurtle,2,,,1,45,71,70,0,30,0,581
+565,Carracosta,5,288,12,810,Prototurtle,2,,,1,45,173,70,0,30,0,582
+566,Archen,5,289,5,95,First Bird,10,,,1,45,71,70,0,30,0,583
+567,Archeops,5,289,14,320,First Bird,10,,,1,45,177,70,0,30,0,584
+568,Trubbish,5,290,6,310,Trash Bag,5,,,4,190,66,70,0,20,0,585
+569,Garbodor,5,290,19,1073,Trash Heap,5,,,4,60,166,70,0,20,0,586

 570,Zorua,5,291,7,125,Tricky Fox,4,,,1,75,66,70,0,25,0,587
 571,Zoroark,5,291,16,811,Illusion Fox,4,,,1,45,179,70,0,20,0,588
 572,Minccino,5,292,4,58,Chinchilla,4,,,6,255,60,70,0,15,0,589
 570,Zorua,5,291,7,125,Tricky Fox,4,,,1,75,66,70,0,25,0,587
 571,Zoroark,5,291,16,811,Illusion Fox,4,,,1,45,179,70,0,20,0,588
 572,Minccino,5,292,4,58,Chinchilla,4,,,6,255,60,70,0,15,0,589

-573,chirachiino,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,590
-574,gochimu,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,591
-575,gochimiru,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,592
+573,Cinccino,5,292,5,75,Scarf,4,,,6,60,165,70,0,15,0,590
+574,Gothita,5,293,4,58,Fixation,7,,,6,200,58,70,0,20,0,591
+575,Gothorita,5,293,7,180,Manipulate,7,,,6,100,137,70,0,20,0,592

 576,Gothitelle,5,293,15,440,Astral Body,7,,,6,50,221,70,0,20,0,593
 576,Gothitelle,5,293,15,440,Astral Body,7,,,6,50,221,70,0,20,0,593

-577,yuniran,5,294,3,10,さいぼう,5,,,4,200,58,70,0,20,0,594
-578,daburan,5,294,6,80,ぶんかつ,5,,,4,100,130,70,0,20,0,595
+577,Solosis,5,294,3,10,Cell,5,,,4,200,58,70,0,20,0,594
+578,Duosion,5,294,6,80,Mitosis,5,,,4,100,130,70,0,20,0,595

 579,Reuniclus,5,294,10,201,Multiplying,5,,,4,50,221,70,0,20,0,596
 579,Reuniclus,5,294,10,201,Multiplying,5,,,4,50,221,70,0,20,0,596

-580,koaruhii,5,295,5,55,みずどり,2,,,4,190,61,70,0,20,0,597
-581,suwanna,5,295,13,242,しらとり,9,,,4,45,166,70,0,20,0,598
-582,banipucchi,5,296,4,57,しんせつ,9,,,4,255,61,70,0,20,0,599
-583,baniricchi,5,296,11,410,ひょうせつ,9,,,4,120,138,70,0,20,0,600
-584,baibanira,5,296,13,575,ブリザード,9,,,4,45,241,70,0,20,0,601
-585,shikijika,5,297,6,195,きせつ,10,,,4,190,67,70,0,20,0,602
-586,mebukijika,5,297,19,925,きせつ,3,,,4,75,166,70,0,20,0,603
-587,emonga,5,298,4,50,モモンガ,9,,,4,200,150,70,0,20,0,604
-588,kaburumo,5,299,5,59,かぶりつき,2,,,4,200,63,70,0,15,0,605
-589,shubarugo,5,299,10,330,きへい,4,,,4,75,173,70,0,15,0,606
-590,tamagetake,5,300,2,10,きのこ,9,,,4,190,59,70,0,20,0,607
-591,morobareru,5,300,6,105,きのこ,9,,,4,75,162,70,0,20,0,608
-592,pururiru,5,301,12,330,ふゆう,9,,,4,190,67,70,0,20,1,609
-593,burungeru,5,301,22,1350,ふゆう,9,,,4,60,168,70,0,20,1,610
-594,Alomomola,5,302,12,316,かいほう,6,,,4,75,165,70,0,40,0,611
-595,bachuru,5,303,1,6,くっつき,10,,,4,190,64,70,0,20,0,612
-596,denchura,5,303,8,143,でんきグモ,10,,,4,75,165,70,0,20,0,613
-597,tesshiido,5,304,6,188,とげのみ,4,,,4,255,61,70,0,20,0,614
-598,nattorei,5,304,10,1100,とげだま,4,,,4,90,171,70,0,20,0,615
+580,Ducklett,5,295,5,55,Water Bird,2,,,4,190,61,70,0,20,0,597
+581,Swanna,5,295,13,242,White Bird,9,,,4,45,166,70,0,20,0,598
+582,Vanillite,5,296,4,57,Fresh Snow,9,,,4,255,61,70,0,20,0,599
+583,Vanillish,5,296,11,410,Icy Snow,9,,,4,120,138,70,0,20,0,600
+584,Vanilluxe,5,296,13,575,Snowstorm,9,,,4,45,241,70,0,20,0,601
+585,Deerling,5,297,6,195,Season,10,,,4,190,67,70,0,20,0,602
+586,Sawsbuck,5,297,19,925,Season,3,,,4,75,166,70,0,20,0,603
+587,Emolga,5,298,4,50,Sky Squirrel,9,,,4,200,150,70,0,20,0,604
+588,Karrablast,5,299,5,59,Clamping,2,,,4,200,63,70,0,15,0,605
+589,Escavalier,5,299,10,330,Cavalry,4,,,4,75,173,70,0,15,0,606
+590,Foongus,5,300,2,10,Mushroom,9,,,4,190,59,70,0,20,0,607
+591,Amoonguss,5,300,6,105,Mushroom,9,,,4,75,162,70,0,20,0,608
+592,Frillish,5,301,12,330,Floating,9,,,4,190,67,70,0,20,1,609
+593,Jellicent,5,301,22,1350,Floating,9,,,4,60,168,70,0,20,1,610
+594,Alomomola,5,302,12,316,Caring,6,,,4,75,165,70,0,40,0,611
+595,Joltik,5,303,1,6,Attaching,10,,,4,190,64,70,0,20,0,612
+596,Galvantula,5,303,8,143,EleSpider,10,,,4,75,165,70,0,20,0,613
+597,Ferroseed,5,304,6,188,Thorn Seed,4,,,4,255,61,70,0,20,0,614
+598,Ferrothorn,5,304,10,1100,Thorn Pod,4,,,4,90,171,70,0,20,0,615

 599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,616
 599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,616

-600,gigiaru,5,305,6,510,はぐるま,4,,,-1,60,154,70,0,20,0,617
-601,gigigiaru,5,305,6,810,はぐるま,4,,,-1,30,234,70,0,20,0,618
-602,shibishirasu,5,306,2,3,でんきうお,9,,,4,190,55,70,0,20,0,619
-603,shibibiiru,5,306,12,220,でんきうお,2,,,4,60,142,70,0,20,0,620
-604,shibirudon,5,306,21,805,でんきうお,2,,,4,30,232,70,0,20,0,621
-605,riguree,5,307,5,90,ブレイン,2,,,4,255,67,70,0,20,0,622
-606,oobemu,5,307,10,345,ブレイン,3,,,4,90,170,70,0,20,0,623
-607,hitomoshi,5,308,3,31,ろうそく,9,,,4,190,55,70,0,20,0,624
-608,ranpuraa,5,308,6,130,ランプ,1,,,4,90,130,70,0,20,0,625
-609,shandera,5,308,10,343,いざない,1,,,4,45,234,70,0,20,0,626
+600,Klang,5,305,6,510,Gear,4,,,-1,60,154,70,0,20,0,617
+601,Klinklang,5,305,6,810,Gear,4,,,-1,30,234,70,0,20,0,618
+602,Tynamo,5,306,2,3,EleFish,9,,,4,190,55,70,0,20,0,619
+603,Eelektrik,5,306,12,220,EleFish,2,,,4,60,142,70,0,20,0,620
+604,Eelektross,5,306,21,805,EleFish,2,,,4,30,232,70,0,20,0,621
+605,Elgyem,5,307,5,90,Cerebral,2,,,4,255,67,70,0,20,0,622
+606,Beheeyem,5,307,10,345,Cerebral,3,,,4,90,170,70,0,20,0,623
+607,Litwick,5,308,3,31,Candle,9,,,4,190,55,70,0,20,0,624
+608,Lampent,5,308,6,130,Lamp,1,,,4,90,130,70,0,20,0,625
+609,Chandelure,5,308,10,343,Luring,1,,,4,45,234,70,0,20,0,626

 610,Axew,5,309,6,180,Tusk,5,,,4,75,64,35,0,40,0,627
 610,Axew,5,309,6,180,Tusk,5,,,4,75,64,35,0,40,0,627

-611,onondo,5,309,10,360,あごオノ,5,,,4,60,144,35,0,40,0,628
-612,ononokusu,5,309,18,1055,あごオノ,10,,,4,45,243,35,0,40,0,629
-613,kumashun,5,310,5,85,ひょうけつ,9,,,4,120,61,70,0,20,0,630
-614,tsunbeaa,5,310,26,2600,とうけつ,9,,,4,60,170,70,0,20,0,631
-615,furiijio,5,311,11,1480,けっしょう,2,,,-1,25,170,70,0,25,0,632
-616,chobomaki,5,312,4,77,マイマイ,8,,,4,200,61,70,0,15,0,633
-617,agirudaa,5,312,8,253,からぬけ,8,,,4,75,173,70,0,15,0,634
-618,maggyo,5,313,7,110,トラップ,3,,,4,75,165,70,0,20,0,635
-619,kojofuu,5,314,9,200,ぶじゅつ,10,,,4,180,70,70,0,25,0,636
-620,kojondo,5,314,14,355,ぶじゅつ,7,,,4,45,179,70,0,25,0,637
-621,kurimugan,5,315,16,1390,ほらあな,8,,,4,45,170,70,0,30,0,638
-622,gobitto,5,316,10,920,ゴーレム,5,,,-1,190,61,70,0,25,0,639
-623,goruugu,5,316,28,3300,ゴーレム,5,,,-1,90,169,70,0,25,0,640
-624,komatana,5,317,5,102,はもの,8,,,4,120,68,35,0,20,0,641
-625,kirikizan,5,317,16,700,とうじん,8,,,4,45,172,35,0,20,0,642
-626,baffuron,5,318,16,946,ずつきうし,3,,,4,45,172,70,0,20,0,643
-627,washibon,5,319,5,105,ヒナわし,9,,,0,190,70,70,0,20,0,644
+611,Fraxure,5,309,10,360,Axe Jaw,5,,,4,60,144,35,0,40,0,628
+612,Haxorus,5,309,18,1055,Axe Jaw,10,,,4,45,243,35,0,40,0,629
+613,Cubchoo,5,310,5,85,Chill,9,,,4,120,61,70,0,20,0,630
+614,Beartic,5,310,26,2600,Freezing,9,,,4,60,170,70,0,20,0,631
+615,Cryogonal,5,311,11,1480,Crystallizing,2,,,-1,25,170,70,0,25,0,632
+616,Shelmet,5,312,4,77,Snail,8,,,4,200,61,70,0,15,0,633
+617,Accelgor,5,312,8,253,Shell Out,8,,,4,75,173,70,0,15,0,634
+618,Stunfisk,5,313,7,110,Trap,3,,,4,75,165,70,0,20,0,635
+619,Mienfoo,5,314,9,200,Martial Arts,10,,,4,180,70,70,0,25,0,636
+620,Mienshao,5,314,14,355,Martial Arts,7,,,4,45,179,70,0,25,0,637
+621,Druddigon,5,315,16,1390,Cave,8,,,4,45,170,70,0,30,0,638
+622,Golett,5,316,10,920,Automaton,5,,,-1,190,61,70,0,25,0,639
+623,Golurk,5,316,28,3300,Automaton,5,,,-1,90,169,70,0,25,0,640
+624,Pawniard,5,317,5,102,Sharp Blade,8,,,4,120,68,35,0,20,0,641
+625,Bisharp,5,317,16,700,Sword Blade,8,,,4,45,172,35,0,20,0,642
+626,Bouffalant,5,318,16,946,Bash Buffalo,3,,,4,45,172,70,0,20,0,643
+627,Rufflet,5,319,5,105,Eaglet,9,,,0,190,70,70,0,20,0,644

 628,Braviary,5,319,15,410,Valiant,8,,,0,60,179,70,0,20,0,645
 628,Braviary,5,319,15,410,Valiant,8,,,0,60,179,70,0,20,0,645

-629,baruchai,5,320,5,90,おむつ,3,,,8,190,74,35,0,20,0,646
-630,barujiina,5,320,12,395,ほねわし,3,,,8,60,179,35,0,20,0,647
-631,kuitaran,5,321,14,580,アリクイ,8,,,4,90,169,70,0,20,0,648
-632,aianto,5,322,3,330,てつアリ,4,,,4,90,169,70,0,20,0,649
-633,monozu,5,323,8,173,そぼう,2,,,4,45,60,35,0,40,0,650
-634,jiheddo,5,323,14,500,らんぼう,2,,,4,45,147,35,0,40,0,651
-635,sazandora,5,323,18,1600,きょうぼう,2,,,4,45,270,35,0,40,0,652
-636,meraruba,5,324,11,288,たいまつ,9,,,4,45,72,70,0,40,0,653
-637,urugamosu,5,324,16,460,たいよう,9,,,4,15,248,70,0,40,0,654
-638,kobaruon,5,325,21,2500,てっしん,2,,,-1,3,261,35,0,80,0,655
-639,terakion,5,326,19,2600,がんくつ,4,,,-1,3,261,35,0,80,0,656
-640,birijion,5,327,20,2000,そうげん,5,,,-1,3,261,35,0,80,0,657
-641,torunerosu,5,328,15,630,せんぷう,5,,,0,3,261,90,0,120,0,658
-642,borutorosu,5,329,15,610,らいげき,2,,,0,3,261,90,0,120,0,659
+629,Vullaby,5,320,5,90,Diapered,3,,,8,190,74,35,0,20,0,646
+630,Mandibuzz,5,320,12,395,Bone Vulture,3,,,8,60,179,35,0,20,0,647
+631,Heatmor,5,321,14,580,Anteater,8,,,4,90,169,70,0,20,0,648
+632,Durant,5,322,3,330,Iron Ant,4,,,4,90,169,70,0,20,0,649
+633,Deino,5,323,8,173,Irate,2,,,4,45,60,35,0,40,0,650
+634,Zweilous,5,323,14,500,Hostile,2,,,4,45,147,35,0,40,0,651
+635,Hydreigon,5,323,18,1600,Brutal,2,,,4,45,270,35,0,40,0,652
+636,Larvesta,5,324,11,288,Torch,9,,,4,45,72,70,0,40,0,653
+637,Volcarona,5,324,16,460,Sun,9,,,4,15,248,70,0,40,0,654
+638,Cobalion,5,325,21,2500,Iron Will,2,,,-1,3,261,35,0,80,0,655
+639,Terrakion,5,326,19,2600,Cavern,4,,,-1,3,261,35,0,80,0,656
+640,Virizion,5,327,20,2000,Grassland,5,,,-1,3,261,35,0,80,0,657
+641,Tornadus,5,328,15,630,Cyclone,5,,,0,3,261,90,0,120,0,658
+642,Thundurus,5,329,15,610,Bolt Strike,2,,,0,3,261,90,0,120,0,659

 643,Reshiram,5,330,32,3300,Vast White,9,,,-1,45,306,0,0,120,0,660
 644,Zekrom,5,331,29,3450,Deep Black,1,,,-1,45,306,0,0,120,0,661
 643,Reshiram,5,330,32,3300,Vast White,9,,,-1,45,306,0,0,120,0,660
 644,Zekrom,5,331,29,3450,Deep Black,1,,,-1,45,306,0,0,120,0,661

-645,randorosu,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,662
-646,kyuremu,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,663
-647,kerudio,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,664
-648,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,665
-649,genosekuto,5,336,15,825,こせいだい,7,,,-1,3,270,0,0,120,0,667
+645,Landorus,5,332,15,680,Abundance,3,,,0,3,270,90,0,120,0,662
+646,Kyurem,5,333,30,3250,Boundary,4,,,-1,3,297,0,0,120,0,663
+647,Keldeo,5,334,14,485,Colt,10,,,-1,3,261,35,0,80,0,664
+648,Meloetta,5,335,6,65,Melody,9,,,-1,3,270,100,0,120,0,665
+649,Genesect,5,336,15,825,Paleozoic,7,,,-1,3,270,0,0,120,0,667

 10001,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,419
 10002,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,420
 10003,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,421
 10001,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,419
 10002,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,420
 10003,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,421


@@ -660,9 +660,9 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 10010,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,489
 10011,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,488
 10012,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,491
 10010,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,489
 10011,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,488
 10012,Rotom,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,491

-10013,Castform,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,379
-10014,Castform,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,380
-10015,Castform,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,381
-10016,basurao,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,566
+10013,Castform,3,179,3,8,Weather,9,1,3,4,45,147,70,0,25,0,379
+10014,Castform,3,179,3,8,Weather,9,1,3,4,45,147,70,0,25,0,380
+10015,Castform,3,179,3,8,Weather,9,1,3,4,45,147,70,0,25,0,381
+10016,Basculin,5,280,10,180,Hostile,5,,,4,25,161,70,0,40,0,566

 10017,Darmanitan,5,282,13,929,Blazing,8,,,4,60,189,70,0,20,0,572
 10017,Darmanitan,5,282,13,929,Blazing,8,,,4,60,189,70,0,20,0,572

-10018,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,666
+10018,Meloetta,5,335,6,65,Melody,9,,,-1,3,270,100,0,120,0,666