X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/b560e9943fff18f5fd7f94e3756af81e35193c88..fd34c18d404898184554cf5a138073ab9e58ffbf:/pokedex/data/csv/pokemon.csv?ds=sidebyside

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 639c15d..b97bdc3 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -492,7 +492,7 @@ 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
-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
 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
@@ -503,17 +503,17 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 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
 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
+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,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
+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,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
+513,Pansear,5,263,6,110,High Temp,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
+515,Panpour,5,264,6,135,Spray,2,,,1,190,63,70,0,20,0,530
 516,hiyakkii,5,264,10,290,ほうすい,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
@@ -528,17 +528,17 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 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
 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
+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,きんこつ,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
+535,Tympole,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
+540,Sewaddle,5,276,3,25,Sewing,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
@@ -548,7 +548,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 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
+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
 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
@@ -560,7 +560,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 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
+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
 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
@@ -579,22 +579,22 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 578,daburan,5,294,6,80,ぶんかつ,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
 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
+581,Swanna,5,295,13,242,White Bird,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
+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,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
+594,Alomomola,5,302,12,316,Caring,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
+596,Galvantula,5,303,8,143,EleSpider,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
 599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,616
@@ -609,8 +609,8 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 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
 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
+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,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
@@ -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
-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
 10018,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,666