B&W: Added all new Pokémon! Forms now start at 10001.

pokedex/data/csv/evolution_chains.csv

@@ -246,3 +246,85 @@ id,growth_rate_id,baby_trigger_item_id
 252,1,
 253,4,
 254,1,
+255,1,
+256,4,
+257,4,
+258,4,
+259,2,
+260,4,
+261,2,
+262,2,
+263,2,
+264,2,
+265,3,
+266,4,
+267,2,
+268,4,
+269,2,
+270,2,
+271,3,
+272,4,
+273,4,
+274,2,
+275,2,
+276,4,
+277,4,
+278,2,
+279,2,
+280,2,
+281,4,
+282,4,
+283,2,
+284,2,
+285,2,
+286,2,
+287,2,
+288,2,
+289,2,
+290,2,
+291,4,
+292,3,
+293,4,
+294,4,
+295,2,
+296,1,
+297,2,
+298,2,
+299,2,
+300,2,
+301,2,
+302,3,
+303,2,
+304,2,
+305,4,
+306,1,
+307,2,
+308,4,
+309,1,
+310,2,
+311,2,
+312,2,
+313,2,
+314,4,
+315,2,
+316,2,
+317,2,
+318,2,
+319,1,
+320,1,
+321,2,
+322,2,
+323,1,
+324,1,
+325,1,
+326,1,
+327,1,
+328,1,
+329,1,
+330,1,
+331,1,
+332,1,
+333,1,
+334,1,
+335,1,
+336,1,

pokedex/data/csv/pokemon.csv

@@ -349,7 +349,7 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 348,Armaldo,,,3,177,15,682,Plate,4,6,9,1,45,199,70,0,30,0,0
 349,Feebas,,,3,178,6,74,Fish,3,3,9,4,255,61,70,0,20,0,0
 350,Milotic,,,3,178,62,1620,Tender,6,2,9,4,60,213,70,0,20,1,1
-351,Castform,,,3,179,3,8,Weather,9,1,3,4,45,145,70,0,25,0,0
+351,Castform,normal,,3,179,3,8,Weather,9,1,3,4,45,145,70,0,25,0,0
 352,Kecleon,,,3,180,10,220,Color Swap,5,6,2,4,200,132,70,0,20,0,0
 353,Shuppet,,,3,181,6,23,Puppet,1,1,8,4,225,97,35,0,25,0,0
 354,Banette,,,3,181,11,125,Marionette,1,6,8,4,45,179,35,0,25,0,0
@@ -492,15 +492,177 @@ id,name,forme_name,forme_base_pokemon_id,generation_id,evolution_chain_id,height
 491,Darkrai,,,4,252,15,505,Pitch-Black,1,12,,-1,3,210,0,0,120,0,0
 492,Shaymin,land,,4,253,2,21,Gratitude,5,8,,-1,45,64,100,0,120,0,0
 493,Arceus,,,4,254,32,3200,Alpha,4,8,,-1,3,255,0,0,120,0,0
-496,Deoxys,attack,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
-497,Deoxys,defense,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
-498,Deoxys,speed,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
-499,Wormadam,sandy,413,4,213,5,65,Bagworm,4,2,,8,45,159,70,0,15,0,0
-500,Wormadam,trash,413,4,213,5,65,Bagworm,4,2,,8,45,159,70,0,15,0,0
-501,Giratina,origin,487,4,248,69,6500,Renegade,1,10,,-1,3,220,0,0,120,0,0
-502,Shaymin,sky,492,4,253,4,52,Gratitude,5,8,,-1,45,64,100,0,120,0,0
-503,Rotom,heat,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
-504,Rotom,wash,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
-505,Rotom,frost,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
-506,Rotom,fan,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
-507,Rotom,mow,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+494,bikutini,,,5,255,4,40,しょうり,10,,,-1,3,270,100,0,120,0,0
+495,tsutaaja,,,5,256,6,81,くさへび,5,,,1,45,28,70,0,20,0,0
+496,janobii,,,5,256,8,160,くさへび,5,,,1,45,145,70,0,20,0,0
+497,jarooda,,,5,256,33,630,ロイヤル,5,,,1,45,238,70,0,20,0,0
+498,pokabu,,,5,257,5,99,ひぶた,8,,,1,45,28,70,0,20,0,0
+499,chaobuu,,,5,257,10,555,ひぶた,8,,,1,45,146,70,0,20,0,0
+500,enbuoo,,,5,257,16,1500,おおひぶた,8,,,1,45,238,70,0,20,0,0
+501,mijumaru,,,5,258,5,59,ラッコ,2,,,1,45,28,70,0,20,0,0
+502,futachimaru,,,5,258,8,245,しゅぎょう,2,,,1,45,145,70,0,20,0,0
+503,daikenki,,,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,0
+504,minezumi,,,5,259,5,116,みはり,3,,,4,255,51,70,0,15,0,0
+505,miruhoggu,,,5,259,11,270,けいかい,3,,,4,255,147,70,0,20,0,0
+506,yooterii,,,5,260,4,41,こいぬ,3,,,4,255,55,70,0,15,0,0
+507,haaderia,,,5,260,9,147,ちゅうけん,4,,,4,120,130,70,0,15,0,0
+508,muurando,,,5,260,12,610,かんだい,4,,,4,45,221,70,0,15,0,0
+509,choroneko,,,5,261,4,101,しょうわる,7,,,4,255,56,70,0,20,0,0
+510,reparudasu,,,5,261,11,375,れいこく,7,,,4,90,156,70,0,20,0,0
+511,yanappu,,,5,262,6,105,くさざる,5,,,1,190,63,70,0,20,0,0
+512,yanakkii,,,5,262,11,305,とげざる,5,,,1,75,174,70,0,20,0,0
+513,baoppu,,,5,263,6,110,こうおん,8,,,1,190,63,70,0,20,0,0
+514,baokkii,,,5,263,10,280,ひのこ,8,,,1,75,174,70,0,20,0,0
+515,hiyappu,,,5,264,6,135,みずかけ,2,,,1,190,63,70,0,20,0,0
+516,hiyakkii,,,5,264,10,290,ほうすい,2,,,1,75,174,70,0,20,0,0
+517,munna,,,5,265,6,233,ゆめくい,6,,,4,190,58,70,0,10,0,0
+518,mushaana,,,5,265,11,605,ゆめうつつ,6,,,4,75,170,70,0,10,0,0
+519,mamepato,,,5,266,3,21,こばと,4,,,4,255,53,70,0,15,0,0
+520,hatooboo,,,5,266,6,150,のばと,4,,,4,120,125,70,0,15,0,0
+521,kenhorou,,,5,266,12,290,プライド,4,,,4,45,215,70,0,15,1,1
+522,shimama,,,5,267,8,298,たいでん,1,,,4,190,59,70,0,20,0,0
+523,zeburaika,,,5,267,16,795,らいでん,1,,,4,75,174,70,0,20,0,0
+524,dangoro,,,5,268,4,180,マントル,2,,,4,255,56,70,0,15,0,0
+525,gantoru,,,5,268,9,1020,こうせき,2,,,4,120,137,70,0,15,0,0
+526,gigaiasu,,,5,268,17,2600,こうあつ,2,,,4,45,227,70,0,15,0,0
+527,koromori,,,5,269,4,21,こうもり,2,,,4,190,63,70,0,15,0,0
+528,kokoromori,,,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,0
+529,moguryuu,,,5,270,3,85,もぐら,4,,,4,120,66,70,0,20,0,0
+530,doryuuzu,,,5,270,7,404,ちてい,4,,,4,60,178,70,0,20,0,0
+531,tabunne,,,5,271,11,310,ヒヤリング,6,,,4,255,390,70,0,20,0,0
+532,dokkoraa,,,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,0
+533,dotekkotsu,,,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,0
+534,roobushin,,,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,0
+535,otamaro,,,5,273,5,45,おたま,2,,,4,255,59,70,0,20,0,0
+536,gamagaru,,,5,273,8,170,しんどう,2,,,4,120,134,70,0,20,0,0
+537,gamageroge,,,5,273,15,620,しんどう,2,,,4,45,225,70,0,20,0,0
+538,nageki,,,5,274,13,555,じゅうどう,8,,,0,45,163,70,0,20,0,0
+539,dageki,,,5,275,14,510,からて,2,,,0,45,163,70,0,20,0,0
+540,kurumiru,,,5,276,3,25,さいほう,10,,,4,255,62,70,0,15,0,0
+541,kurumayu,,,5,276,5,73,はごもり,5,,,4,120,133,70,0,15,0,0
+542,hahakomori,,,5,276,12,205,こそだて,10,,,4,45,221,70,0,15,0,0
+543,fushide,,,5,277,4,53,ムカデ,8,,,4,255,52,70,0,15,0,0
+544,hoiiga,,,5,277,12,585,まゆムカデ,4,,,4,120,126,70,0,15,0,0
+545,pendoraa,,,5,277,25,2005,メガムカデ,8,,,4,45,214,70,0,20,0,0
+546,monmen,,,5,278,3,6,わたたま,5,,,4,190,56,70,0,20,0,0
+547,erufuun,,,5,278,7,66,かぜかくれ,5,,,4,75,168,70,0,20,0,0
+548,churine,,,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,0
+549,doredia,,,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,0
+550,basurao,normal,,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0
+551,meguroko,,,5,281,7,152,さばくワニ,3,,,4,180,58,70,0,20,0,0
+552,warubiru,,,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,0
+553,warubiaru,,,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,0
+554,darumakka,,,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,0
+555,hihidaruma,unblue,,5,282,13,929,えんじょう,8,,,4,60,168,70,0,20,0,0
+556,marakacchi,,,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,0
+557,ishizumai,,,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,0
+558,iwaparesu,,,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,0
+559,zuruggu,,,5,285,6,118,だっぴ,10,,,4,180,70,35,0,15,0,0
+560,zuruzukin,,,5,285,11,300,あくとう,8,,,4,90,171,70,0,15,0,0
+561,shinboraa,,,5,286,14,140,とりもどき,1,,,4,45,172,70,0,20,0,0
+562,desumasu,,,5,287,5,15,たましい,1,,,4,190,61,70,0,25,0,0
+563,desukaan,,,5,287,17,765,かんおけ,10,,,4,90,169,70,0,25,0,0
+564,purotooga,,,5,288,7,165,こだいがめ,2,,,1,45,71,70,0,30,0,0
+565,abagoora,,,5,288,12,810,こだいがめ,2,,,1,45,173,70,0,30,0,0
+566,aaken,,,5,289,5,95,さいこどり,10,,,1,45,71,70,0,30,0,0
+567,aakeosu,,,5,289,14,320,さいこどり,10,,,1,45,177,70,0,30,0,0
+568,yabukuron,,,5,290,6,310,ゴミぶくろ,5,,,4,190,66,70,0,20,0,0
+569,dasutodasu,,,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,0
+570,zoroa,,,5,291,7,125,わるぎつね,4,,,1,75,66,70,0,25,0,0
+571,zoroaaku,,,5,291,16,811,ばけぎつね,4,,,1,45,179,70,0,20,0,0
+572,chiraamii,,,5,292,4,58,チンチラ,4,,,6,255,60,70,0,15,0,0
+573,chirachiino,,,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,0
+574,gochimu,,,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,0
+575,gochimiru,,,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,0
+576,gochiruzeru,,,5,293,15,440,てんたい,7,,,6,50,221,70,0,20,0,0
+577,yuniran,,,5,294,3,10,さいぼう,5,,,4,200,58,70,0,20,0,0
+578,daburan,,,5,294,6,80,ぶんかつ,5,,,4,100,130,70,0,20,0,0
+579,rankurusu,,,5,294,10,201,ぞうふく,5,,,4,50,221,70,0,20,0,0
+580,koaruhii,,,5,295,5,55,みずどり,2,,,4,190,61,70,0,20,0,0
+581,suwanna,,,5,295,13,242,しらとり,9,,,4,45,166,70,0,20,0,0
+582,banipucchi,,,5,296,4,57,しんせつ,9,,,4,255,61,70,0,20,0,0
+583,baniricchi,,,5,296,11,410,ひょうせつ,9,,,4,120,138,70,0,20,0,0
+584,baibanira,,,5,296,13,575,ブリザード,9,,,4,45,241,70,0,20,0,0
+585,shikijika,,,5,297,6,195,きせつ,10,,,4,190,67,70,0,20,0,0
+586,mebukijika,,,5,297,19,925,きせつ,3,,,4,75,166,70,0,20,0,0
+587,emonga,,,5,298,4,50,モモンガ,9,,,4,200,150,70,0,20,0,0
+588,kaburumo,,,5,299,5,59,かぶりつき,2,,,4,200,63,70,0,15,0,0
+589,shubarugo,,,5,299,10,330,きへい,4,,,4,75,173,70,0,15,0,0
+590,tamagetake,,,5,300,2,10,きのこ,9,,,4,190,59,70,0,20,0,0
+591,morobareru,,,5,300,6,105,きのこ,9,,,4,75,162,70,0,20,0,0
+592,pururiru,,,5,301,12,330,ふゆう,9,,,4,190,67,70,0,20,1,1
+593,burungeru,,,5,301,22,1350,ふゆう,9,,,4,60,168,70,0,20,1,1
+594,mamanbou,,,5,302,12,316,かいほう,6,,,4,75,165,70,0,40,0,0
+595,bachuru,,,5,303,1,6,くっつき,10,,,4,190,64,70,0,20,0,0
+596,denchura,,,5,303,8,143,でんきグモ,10,,,4,75,165,70,0,20,0,0
+597,tesshiido,,,5,304,6,188,とげのみ,4,,,4,255,61,70,0,20,0,0
+598,nattorei,,,5,304,10,1100,とげだま,4,,,4,90,171,70,0,20,0,0
+599,giaru,,,5,305,3,210,はぐるま,4,,,-1,130,60,70,0,20,0,0
+600,gigiaru,,,5,305,6,510,はぐるま,4,,,-1,60,154,70,0,20,0,0
+601,gigigiaru,,,5,305,6,810,はぐるま,4,,,-1,30,234,70,0,20,0,0
+602,shibishirasu,,,5,306,2,3,でんきうお,9,,,4,190,55,70,0,20,0,0
+603,shibibiiru,,,5,306,12,220,でんきうお,2,,,4,60,142,70,0,20,0,0
+604,shibirudon,,,5,306,21,805,でんきうお,2,,,4,30,232,70,0,20,0,0
+605,riguree,,,5,307,5,90,ブレイン,2,,,4,255,67,70,0,20,0,0
+606,oobemu,,,5,307,10,345,ブレイン,3,,,4,90,170,70,0,20,0,0
+607,hitomoshi,,,5,308,3,31,ろうそく,9,,,4,190,55,70,0,20,0,0
+608,ranpuraa,,,5,308,6,130,ランプ,1,,,4,90,130,70,0,20,0,0
+609,shandera,,,5,308,10,343,いざない,1,,,4,45,234,70,0,20,0,0
+610,kibago,,,5,309,6,180,キバ,5,,,4,75,64,35,0,40,0,0
+611,onondo,,,5,309,10,360,あごオノ,5,,,4,60,144,35,0,40,0,0
+612,ononokusu,,,5,309,18,1055,あごオノ,10,,,4,45,243,35,0,40,0,0
+613,kumashun,,,5,310,5,85,ひょうけつ,9,,,4,120,61,70,0,20,0,0
+614,tsunbeaa,,,5,310,26,2600,とうけつ,9,,,4,60,170,70,0,20,0,0
+615,furiijio,,,5,311,11,1480,けっしょう,2,,,-1,25,170,70,0,25,0,0
+616,chobomaki,,,5,312,4,77,マイマイ,8,,,4,200,61,70,0,15,0,0
+617,agirudaa,,,5,312,8,253,からぬけ,8,,,4,75,173,70,0,15,0,0
+618,maggyo,,,5,313,7,110,トラップ,3,,,4,75,165,70,0,20,0,0
+619,kojofuu,,,5,314,9,200,ぶじゅつ,10,,,4,180,70,70,0,25,0,0
+620,kojondo,,,5,314,14,355,ぶじゅつ,7,,,4,45,179,70,0,25,0,0
+621,kurimugan,,,5,315,16,1390,ほらあな,8,,,4,45,170,70,0,30,0,0
+622,gobitto,,,5,316,10,920,ゴーレム,5,,,-1,190,61,70,0,25,0,0
+623,goruugu,,,5,316,28,3300,ゴーレム,5,,,-1,90,169,70,0,25,0,0
+624,komatana,,,5,317,5,102,はもの,8,,,4,120,68,35,0,20,0,0
+625,kirikizan,,,5,317,16,700,とうじん,8,,,4,45,172,35,0,20,0,0
+626,baffuron,,,5,318,16,946,ずつきうし,3,,,4,45,172,70,0,20,0,0
+627,washibon,,,5,319,5,105,ヒナわし,9,,,0,190,70,70,0,20,0,0
+628,uooguru,,,5,319,15,410,ゆうもう,8,,,0,60,179,70,0,20,0,0
+629,baruchai,,,5,320,5,90,おむつ,3,,,8,190,74,35,0,20,0,0
+630,barujiina,,,5,320,12,395,ほねわし,3,,,8,60,179,35,0,20,0,0
+631,kuitaran,,,5,321,14,580,アリクイ,8,,,4,90,169,70,0,20,0,0
+632,aianto,,,5,322,3,330,てつアリ,4,,,4,90,169,70,0,20,0,0
+633,monozu,,,5,323,8,173,そぼう,2,,,4,45,60,35,0,40,0,0
+634,jiheddo,,,5,323,14,500,らんぼう,2,,,4,45,147,35,0,40,0,0
+635,sazandora,,,5,323,18,1600,きょうぼう,2,,,4,45,270,35,0,40,0,0
+636,meraruba,,,5,324,11,288,たいまつ,9,,,4,45,72,70,0,40,0,0
+637,urugamosu,,,5,324,16,460,たいよう,9,,,4,15,248,70,0,40,0,0
+638,kobaruon,,,5,325,21,2500,てっしん,2,,,-1,3,261,35,0,80,0,0
+639,terakion,,,5,326,19,2600,がんくつ,4,,,-1,3,261,35,0,80,0,0
+640,birijion,,,5,327,20,2000,そうげん,5,,,-1,3,261,35,0,80,0,0
+641,torunerosu,,,5,328,15,630,せんぷう,5,,,0,3,261,90,0,120,0,0
+642,borutorosu,,,5,329,15,610,らいげき,2,,,0,3,261,90,0,120,0,0
+643,reshiramu,,,5,330,32,3300,はくよう,9,,,-1,45,306,0,0,120,0,0
+644,zekuromu,,,5,331,29,3450,こくいん,1,,,-1,45,306,0,0,120,0,0
+645,randorosu,,,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,0
+646,kyuremu,,,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,0
+647,kerudio,,,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,0
+648,meroetta,unred,,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0
+649,genosekuto,,,5,336,15,825,こせいだい,7,,,-1,3,270,0,0,120,0,0
+10001,Deoxys,attack,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
+10002,Deoxys,defense,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
+10003,Deoxys,speed,386,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,0
+10004,Wormadam,sandy,413,4,213,5,65,Bagworm,4,2,,8,45,159,70,0,15,0,0
+10005,Wormadam,trash,413,4,213,5,65,Bagworm,4,2,,8,45,159,70,0,15,0,0
+10006,Shaymin,sky,492,4,253,2,21,Gratitude,5,8,,-1,45,64,100,0,120,0,0
+10007,Giratina,origin,487,4,248,45,7500,Renegade,1,10,,-1,3,220,0,0,120,0,0
+10008,Rotom,heat,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+10009,Rotom,wash,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+10010,Rotom,frost,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+10011,Rotom,fan,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+10012,Rotom,mow,479,4,240,3,3,Plasma,8,1,,-1,45,132,70,0,20,0,0
+10013,Castform,sunny,351,3,179,3,8,てんき,9,,,4,45,147,70,0,25,0,0
+10014,Castform,rain,351,3,179,3,8,てんき,9,,,4,45,147,70,0,25,0,0
+10015,Castform,snow-cloud,351,3,179,3,8,てんき,9,,,4,45,147,70,0,25,0,0
+10016,basurao,alternate,550,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0
+10017,hihidaruma,blue,555,5,282,13,929,えんじょう,8,,,4,60,189,70,0,20,0,0
+10018,meroetta,red,648,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0

pokedex/data/csv/pokemon_abilities.csv

@@ -764,15 +764,282 @@ pokemon_id,ability_id,slot
 491,123,1
 492,30,1
 493,121,1
-496,46,1
-497,46,1
-498,46,1
-499,107,1
-500,107,1
-501,26,1
-502,32,1
-503,26,1
-504,26,1
-505,26,1
-506,26,1
-507,26,1
+494,162,1
+495,65,1
+495,65,2
+496,65,1
+496,65,2
+497,65,1
+497,65,2
+498,66,1
+498,66,2
+499,66,1
+499,66,2
+500,66,1
+500,66,2
+501,67,1
+501,67,2
+502,67,1
+502,67,2
+503,67,1
+503,67,2
+504,50,1
+504,51,2
+505,35,1
+505,51,2
+506,72,1
+506,53,2
+507,22,1
+507,146,2
+508,22,1
+508,146,2
+509,7,1
+509,84,2
+510,7,1
+510,84,2
+511,82,1
+512,82,1
+513,82,1
+514,82,1
+515,82,1
+516,82,1
+517,108,1
+517,28,2
+518,108,1
+518,28,2
+519,145,1
+519,105,2
+520,145,1
+520,105,2
+521,145,1
+521,105,2
+522,31,1
+522,78,2
+523,31,1
+523,78,2
+524,5,1
+525,5,1
+526,5,1
+527,109,1
+527,103,2
+528,109,1
+528,103,2
+529,146,1
+529,159,2
+530,146,1
+530,159,2
+531,131,1
+531,144,2
+532,62,1
+532,125,2
+533,62,1
+533,125,2
+534,62,1
+534,125,2
+535,33,1
+535,93,2
+536,33,1
+536,93,2
+537,33,1
+537,143,2
+538,62,1
+538,39,2
+539,5,1
+539,39,2
+540,68,1
+540,34,2
+541,102,1
+541,34,2
+542,68,1
+542,34,2
+543,38,1
+543,68,2
+544,38,1
+544,68,2
+545,38,1
+545,68,2
+546,158,1
+546,151,2
+547,158,1
+547,151,2
+548,34,1
+548,20,2
+549,34,1
+549,20,2
+550,120,1
+550,91,2
+551,22,1
+551,153,2
+552,22,1
+552,153,2
+553,22,1
+553,153,2
+554,55,1
+555,125,1
+556,11,1
+556,34,2
+557,5,1
+557,75,2
+558,5,1
+558,75,2
+559,61,1
+559,153,2
+560,61,1
+560,153,2
+561,147,1
+561,98,2
+562,152,1
+563,152,1
+564,116,1
+564,5,2
+565,116,1
+565,5,2
+566,129,1
+567,129,1
+568,1,1
+568,60,2
+569,1,1
+569,133,2
+570,149,1
+571,149,1
+572,56,1
+572,101,2
+573,56,1
+573,101,2
+574,119,1
+575,119,1
+576,119,1
+577,142,1
+577,98,2
+578,142,1
+578,98,2
+579,142,1
+579,98,2
+580,51,1
+580,145,2
+581,51,1
+581,145,2
+582,115,1
+583,115,1
+584,115,1
+585,34,1
+585,157,2
+586,34,1
+586,157,2
+587,9,1
+588,68,1
+588,61,2
+589,68,1
+589,75,2
+590,27,1
+591,27,1
+592,11,1
+592,130,2
+593,11,1
+593,130,2
+594,131,1
+594,93,2
+595,14,1
+595,127,2
+596,14,1
+596,127,2
+597,160,1
+598,160,1
+599,57,1
+599,58,2
+600,57,1
+600,58,2
+601,57,1
+601,58,2
+602,26,1
+603,26,1
+604,26,1
+605,140,1
+605,28,2
+606,140,1
+606,28,2
+607,18,1
+607,49,2
+608,18,1
+608,49,2
+609,18,1
+609,49,2
+610,79,1
+610,104,2
+611,79,1
+611,104,2
+612,79,1
+612,104,2
+613,81,1
+614,81,1
+615,26,1
+616,93,1
+616,75,2
+617,93,1
+617,60,2
+618,9,1
+618,7,2
+619,39,1
+619,144,2
+620,39,1
+620,144,2
+621,24,1
+621,125,2
+622,89,1
+622,103,2
+623,89,1
+623,103,2
+624,128,1
+624,39,2
+625,128,1
+625,39,2
+626,120,1
+626,157,2
+627,51,1
+627,125,2
+628,51,1
+628,125,2
+629,145,1
+629,142,2
+630,145,1
+630,142,2
+631,82,1
+631,18,2
+632,68,1
+632,55,2
+633,55,1
+634,55,1
+635,26,1
+636,49,1
+637,49,1
+638,154,1
+639,154,1
+640,154,1
+641,158,1
+642,158,1
+643,163,1
+644,164,1
+645,159,1
+646,46,1
+647,154,1
+648,32,1
+649,88,1
+10001,46,1
+10002,46,1
+10003,46,1
+10004,107,1
+10005,107,1
+10006,32,1
+10007,26,1
+10008,26,1
+10009,26,1
+10010,26,1
+10011,26,1
+10012,26,1
+10013,59,1
+10014,59,1
+10015,59,1
+10016,69,1
+10016,91,2
+10017,125,1
+10018,32,1

pokedex/data/csv/pokemon_dex_numbers.csv

@@ -1713,10 +1713,10 @@ pokemon_id,pokedex_id,pokedex_number
 491,1,491
 492,1,492
 493,1,493
-496,4,202
-497,4,202
-498,4,202
-499,5,46
-499,6,46
-500,5,46
-500,6,46
+10001,4,202
+10002,4,202
+10003,4,202
+10004,5,46
+10004,6,46
+10005,5,46
+10005,6,46

pokedex/data/csv/pokemon_egg_groups.csv

@@ -638,15 +638,209 @@ pokemon_id,egg_group_id
 491,15
 492,15
 493,15
-496,15
-497,15
-498,15
-499,3
-500,3
-501,15
-502,15
-503,11
-504,11
-505,11
-506,11
-507,11
+494,15
+495,5
+495,7
+496,5
+496,7
+497,5
+497,7
+498,5
+499,5
+500,5
+501,5
+502,5
+503,5
+504,5
+505,5
+506,5
+507,5
+508,5
+509,5
+510,5
+511,5
+512,5
+513,5
+514,5
+515,5
+516,5
+517,5
+518,5
+519,4
+520,4
+521,4
+522,5
+523,5
+524,10
+525,10
+526,10
+527,4
+527,5
+528,4
+528,5
+529,5
+530,5
+531,6
+532,8
+533,8
+534,8
+535,2
+536,2
+537,2
+538,8
+539,8
+540,3
+541,3
+542,3
+543,3
+544,3
+545,3
+546,6
+546,7
+547,6
+547,7
+548,7
+549,7
+550,12
+551,5
+552,5
+553,5
+554,5
+555,5
+556,7
+557,3
+557,10
+558,3
+558,10
+559,5
+559,14
+560,5
+560,14
+561,4
+562,10
+562,11
+563,10
+563,11
+564,2
+564,9
+565,2
+565,9
+566,4
+566,9
+567,4
+567,9
+568,10
+569,10
+570,5
+571,5
+572,5
+573,5
+574,8
+575,8
+576,8
+577,11
+578,11
+579,11
+580,2
+580,4
+581,2
+581,4
+582,10
+583,10
+584,10
+585,5
+586,5
+587,5
+588,3
+589,3
+590,7
+591,7
+592,11
+593,11
+594,2
+594,12
+595,3
+596,3
+597,7
+597,10
+598,7
+598,10
+599,10
+600,10
+601,10
+602,11
+603,11
+604,11
+605,8
+606,8
+607,11
+608,11
+609,11
+610,1
+610,14
+611,1
+611,14
+612,1
+612,14
+613,5
+614,5
+615,10
+616,3
+617,3
+618,2
+618,11
+619,5
+619,8
+620,5
+620,8
+621,1
+621,14
+622,10
+623,10
+624,8
+625,8
+626,5
+627,4
+628,4
+629,4
+630,4
+631,5
+632,3
+633,14
+634,14
+635,14
+636,3
+637,3
+638,15
+639,15
+640,15
+641,15
+642,15
+643,15
+644,15
+645,15
+646,15
+647,15
+648,15
+649,15
+10001,15
+10002,15
+10003,15
+10004,3
+10005,3
+10006,15
+10007,15
+10008,11
+10009,11
+10010,11
+10011,11
+10012,11
+10013,6
+10013,11
+10014,6
+10014,11
+10015,6
+10015,11
+10016,12
+10017,5
+10018,15

pokedex/data/csv/pokemon_evolution.csv

@@ -245,5 +245,79 @@ from_pokemon_id,to_pokemon_id,evolution_trigger_id,trigger_item_id,minimum_level
 299,476,1,,,,10,,,,,,,
 356,477,2,,,,,302,,,,,,
 361,478,3,109,,female,,,,,,,,
-412,499,1,,20,female,,,,,,,,
-412,500,1,,20,female,,,,,,,,
+495,496,1,,17,,,,,,,,,
+496,497,1,,36,,,,,,,,,
+498,499,1,,17,,,,,,,,,
+499,500,1,,36,,,,,,,,,
+501,502,1,,17,,,,,,,,,
+502,503,1,,36,,,,,,,,,
+504,505,1,,20,,,,,,,,,
+506,507,1,,16,,,,,,,,,
+507,508,1,,32,,,,,,,,,
+509,510,1,,20,,,,,,,,,
+511,512,3,85,,,,,,,,,,
+513,514,3,82,,,,,,,,,,
+515,516,3,84,,,,,,,,,,
+517,518,3,81,,,,,,,,,,
+519,520,1,,21,,,,,,,,,
+520,521,1,,32,,,,,,,,,
+522,523,1,,27,,,,,,,,,
+524,525,1,,25,,,,,,,,,
+525,526,2,,,,,,,,,,,
+527,528,1,,,,,,,,220,,,
+529,530,1,,31,,,,,,,,,
+532,533,1,,25,,,,,,,,,
+533,534,2,,,,,,,,,,,
+535,536,1,,25,,,,,,,,,
+536,537,1,,36,,,,,,,,,
+540,541,1,,20,,,,,,,,,
+541,542,1,,,,,,,,220,,,
+543,544,1,,22,,,,,,,,,
+544,545,1,,30,,,,,,,,,
+546,547,3,80,,,,,,,,,,
+548,549,3,80,,,,,,,,,,
+551,552,1,,29,,,,,,,,,
+552,553,1,,40,,,,,,,,,
+554,555,1,,35,,,,,,,,,
+557,558,1,,34,,,,,,,,,
+559,560,1,,39,,,,,,,,,
+562,563,1,,34,,,,,,,,,
+564,565,1,,37,,,,,,,,,
+566,567,1,,37,,,,,,,,,
+568,569,1,,36,,,,,,,,,
+570,571,1,,30,,,,,,,,,
+572,573,3,107,,,,,,,,,,
+574,575,1,,32,,,,,,,,,
+575,576,1,,41,,,,,,,,,
+577,578,1,,32,,,,,,,,,
+578,579,1,,41,,,,,,,,,
+580,581,1,,35,,,,,,,,,
+582,583,1,,35,,,,,,,,,
+583,584,1,,47,,,,,,,,,
+585,586,1,,34,,,,,,,,,
+588,589,2,,,,,,,,,,,
+590,591,1,,39,,,,,,,,,
+592,593,1,,40,,,,,,,,,
+595,596,1,,36,,,,,,,,,
+597,598,1,,40,,,,,,,,,
+599,600,1,,38,,,,,,,,,
+600,601,1,,49,,,,,,,,,
+602,603,1,,39,,,,,,,,,
+603,604,3,83,,,,,,,,,,
+605,606,1,,42,,,,,,,,,
+607,608,1,,41,,,,,,,,,
+608,609,3,108,,,,,,,,,,
+610,611,1,,38,,,,,,,,,
+611,612,1,,48,,,,,,,,,
+613,614,1,,37,,,,,,,,,
+616,617,2,,,,,,,,,,,
+619,620,1,,50,,,,,,,,,
+622,623,1,,43,,,,,,,,,
+624,625,1,,52,,,,,,,,,
+627,628,1,,54,,,,,,,,,
+629,630,1,,54,,,,,,,,,
+633,634,1,,50,,,,,,,,,
+634,635,1,,64,,,,,,,,,
+636,637,1,,59,,,,,,,,,
+412,10006,1,,20,female,,,,,,,,
+412,10007,1,,20,female,,,,,,,,

pokedex/data/csv/pokemon_form_groups.csv

@@ -12,3 +12,6 @@ pokemon_id,is_battle_only,description
 487,0,"Forms have different stats.  Giratina transforms into Origin Forme in the [Distortion World]{location} or while holding a [Griseous Orb]{item}.  Otherwise, it assumes its Altered Forme.  The Griseous Orb returns to the bag upon entering the Wi-Fi Club or the Union Room."
 492,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme upon using a [Gracidea]{item}.  It reverts to Land Forme at night, when [frozen]{mechanic}, or upon entering the Wi-Fi Club or the Union Room, and stays in Land Forme until the Gracidea is used again.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a fateful encounter Shaymin."
 493,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."
+550,0,Not yet known
+555,0,Not yet known
+648,0,Not yet known

pokedex/data/csv/pokemon_form_sprites.csv

@@ -77,3 +77,9 @@ id,pokemon_id,introduced_in_version_group_id,name,is_default
 76,493,8,water,0
 77,172,3,,1
 78,172,10,spiky-eared,0
+79,550,11,normal,1
+80,550,11,alternate,0
+81,555,11,unblue,1
+82,555,11,blue,0
+83,648,11,unred,1
+84,648,11,red,0

pokedex/data/csv/pokemon_internal_ids.csv

@@ -1280,15 +1280,15 @@ pokemon_id,generation_id,internal_id
 491,4,491
 492,4,492
 493,4,493
-496,4,496
-497,4,497
-498,4,498
-499,4,499
-500,4,500
-501,4,501
-502,4,502
-503,4,503
-504,4,504
-505,4,505
-506,4,506
-507,4,507
+10001,4,496
+10002,4,497
+10003,4,498
+10004,4,499
+10005,4,500
+10006,4,502
+10007,4,501
+10008,4,503
+10009,4,504
+10010,4,505
+10011,4,506
+10012,4,507

pokedex/data/csv/pokemon_items.csv

@@ -1743,16 +1743,16 @@ pokemon_id,version_id,item_id,rarity
 492,14,134,100
 492,15,134,100
 492,16,134,100
-499,12,199,5
-499,13,199,5
-499,14,199,5
-499,15,199,5
-499,16,199,5
-500,12,199,5
-500,13,199,5
-500,14,199,5
-500,15,199,5
-500,16,199,5
-502,14,134,100
-502,15,134,100
-502,16,134,100
+10004,12,199,5
+10004,13,199,5
+10004,14,199,5
+10004,15,199,5
+10004,16,199,5
+10005,12,199,5
+10005,13,199,5
+10005,14,199,5
+10005,15,199,5
+10005,16,199,5
+10006,14,134,100
+10006,15,134,100
+10006,16,134,100

pokedex/data/csv/pokemon_types.csv

@@ -715,24 +715,260 @@ pokemon_id,type_id,slot
 491,17,1
 492,12,1
 493,1,1
-496,14,1
-497,14,1
-498,14,1
-499,7,1
-499,5,2
-500,7,1
-500,9,2
-501,8,1
-501,16,2
-502,12,1
-502,3,2
-503,13,1
-503,8,2
-504,13,1
-504,8,2
-505,13,1
-505,8,2
-506,13,1
-506,8,2
-507,13,1
-507,8,2
+494,14,1
+494,10,2
+495,12,1
+496,12,1
+497,12,1
+498,10,1
+499,10,1
+499,2,2
+500,10,1
+500,2,2
+501,11,1
+502,11,1
+503,11,1
+504,1,1
+505,1,1
+506,1,1
+507,1,1
+508,1,1
+509,17,1
+510,17,1
+511,12,1
+512,12,1
+513,10,1
+514,10,1
+515,11,1
+516,11,1
+517,14,1
+518,14,1
+519,1,1
+519,3,2
+520,1,1
+520,3,2
+521,1,1
+521,3,2
+522,13,1
+523,13,1
+524,6,1
+525,6,1
+526,6,1
+527,14,1
+527,3,2
+528,14,1
+528,3,2
+529,5,1
+530,5,1
+530,9,2
+531,1,1
+532,2,1
+533,2,1
+534,2,1
+535,11,1
+536,11,1
+536,5,2
+537,11,1
+537,5,2
+538,2,1
+539,2,1
+540,7,1
+540,12,2
+541,7,1
+541,12,2
+542,7,1
+542,12,2
+543,7,1
+543,4,2
+544,7,1
+544,4,2
+545,7,1
+545,4,2
+546,12,1
+547,12,1
+548,12,1
+549,12,1
+550,11,1
+551,5,1
+551,17,2
+552,5,1
+552,17,2
+553,5,1
+553,17,2
+554,10,1
+555,10,1
+556,12,1
+557,7,1
+557,6,2
+558,7,1
+558,6,2
+559,17,1
+559,2,2
+560,17,1
+560,2,2
+561,14,1
+561,3,2
+562,8,1
+563,8,1
+564,11,1
+564,6,2
+565,11,1
+565,6,2
+566,6,1
+566,3,2
+567,6,1
+567,3,2
+568,4,1
+569,4,1
+570,17,1
+571,17,1
+572,1,1
+573,1,1
+574,14,1
+575,14,1
+576,14,1
+577,14,1
+578,14,1
+579,14,1
+580,11,1
+580,3,2
+581,11,1
+581,3,2
+582,15,1
+583,15,1
+584,15,1
+585,1,1
+585,12,2
+586,1,1
+586,12,2
+587,13,1
+587,3,2
+588,7,1
+589,7,1
+589,9,2
+590,12,1
+590,4,2
+591,12,1
+591,4,2
+592,11,1
+592,8,2
+593,11,1
+593,8,2
+594,11,1
+595,7,1
+595,13,2
+596,7,1
+596,13,2
+597,12,1
+597,9,2
+598,12,1
+598,9,2
+599,9,1
+600,9,1
+601,9,1
+602,13,1
+603,13,1
+604,13,1
+605,14,1
+606,14,1
+607,8,1
+607,10,2
+608,8,1
+608,10,2
+609,8,1
+609,10,2
+610,16,1
+611,16,1
+612,16,1
+613,15,1
+614,15,1
+615,15,1
+616,7,1
+617,7,1
+618,5,1
+618,13,2
+619,2,1
+620,2,1
+621,16,1
+622,5,1
+622,8,2
+623,5,1
+623,8,2
+624,17,1
+624,9,2
+625,17,1
+625,9,2
+626,1,1
+627,1,1
+627,3,2
+628,1,1
+628,3,2
+629,17,1
+629,3,2
+630,17,1
+630,3,2
+631,10,1
+632,7,1
+632,9,2
+633,17,1
+633,16,2
+634,17,1
+634,16,2
+635,17,1
+635,16,2
+636,7,1
+636,10,2
+637,7,1
+637,10,2
+638,9,1
+638,2,2
+639,6,1
+639,2,2
+640,12,1
+640,2,2
+641,3,1
+642,13,1
+642,3,2
+643,16,1
+643,10,2
+644,16,1
+644,13,2
+645,5,1
+645,3,2
+646,16,1
+646,15,2
+647,11,1
+647,2,2
+648,1,1
+648,14,2
+649,7,1
+649,9,2
+10001,14,1
+10002,14,1
+10003,14,1
+10004,7,1
+10004,5,2
+10005,7,1
+10005,9,2
+10006,12,1
+10006,3,2
+10007,8,1
+10007,16,2
+10008,13,1
+10008,10,2
+10009,13,1
+10009,11,2
+10010,13,1
+10010,15,2
+10011,13,1
+10011,3,2
+10012,13,1
+10012,12,2
+10013,10,1
+10014,11,1
+10015,15,1
+10016,11,1
+10017,10,1
+10017,14,2
+10018,1,1
+10018,2,2

pokedex/db/tables.py

@@ -462,7 +462,7 @@ class Pokemon(TableBase):
     weight = Column(Integer, nullable=False)
     species = Column(Unicode(16), nullable=False)
     color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False)
-    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False)
+    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=True)
     habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True)
     gender_rate = Column(Integer, nullable=False)
     capture_rate = Column(Integer, nullable=False)