Add Brilliant Diamond/Shining Pearl data

pokedex/data/csv/ability_names.csv

@@ -1058,7 +1058,7 @@ ability_id,local_language_id,name
 106,8,Scoppio
 106,9,Aftermath
 106,11,ゆうばく
-106,12,引爆
+106,12,诱爆
 107,1,きけんよち
 107,3,위험예지
 107,4,危險預知
@@ -1298,7 +1298,7 @@ ability_id,local_language_id,name
 130,8,Corpofunesto
 130,9,Cursed Body
 130,11,のろわれボディ
-130,12,诅咒之躯
+130,12,咒术之躯
 131,1,いやしのこころ
 131,3,치유의마음
 131,4,治癒之心

pokedex/data/csv/item_game_indices.csv

@@ -4710,3 +4710,18 @@ item_id,generation_id,game_index
 1656,8,1605
 1657,8,1606
 1658,8,1607
+1659,8,1608
+1660,8,1609
+1661,8,1610
+1662,8,1611
+1663,8,1612
+1664,8,1613
+1665,8,1614
+1666,8,1615
+1667,8,1616
+1668,8,1617
+1669,8,1618
+1670,8,1619
+1671,8,1620
+1672,8,1621
+1673,8,1622

pokedex/data/csv/item_names.csv

@@ -2190,7 +2190,7 @@ item_id,local_language_id,name
 224,8,Spettrotarga
 224,9,Spell Tag
 224,11,のろいのおふだ
-224,12,诅咒之符
+224,12,咒术之符
 225,1,まがったスプーン
 225,3,휘어진스푼
 225,4,彎曲的湯匙
@@ -4022,7 +4022,7 @@ item_id,local_language_id,name
 408,4,寶可追蹤
 408,5,Poké Radar
 408,6,Pokéradar
-408,7,Pokéradar
+408,7,Poké Radar
 408,8,Poké Radar
 408,9,Poké Radar
 408,11,ポケトレ
@@ -4030,31 +4030,31 @@ item_id,local_language_id,name
 409,1,ポイントカード
 409,3,포인트카드
 409,4,點數卡
-409,5,Carte Points
+409,5,Carte à Points
 409,6,Punktekarte
 409,7,Tarjeta Puntos
-409,8,Scheda Punti
+409,8,Scheda punti
 409,9,Point Card
 409,11,ポイントカード
 409,12,点数卡
 410,1,ぼうけんノート
 410,3,모험노트
 410,4,冒險筆記
-410,5,Journal
+410,5,Notes d’Aventure
-410,6,Tagebuch
+410,6,Abenteuernotizen
-410,7,Diario
+410,7,Guía de Viaje
-410,8,Agenda
+410,8,Note di viaggio
-410,9,Journal
+410,9,Guidebook
 410,11,ぼうけんノート
 410,12,冒险笔记
 411,1,シールいれ
 411,3,실상자
 411,4,貼紙盒
-411,5,Boîte Sceaux
+411,5,Boîte à Sceaux
 411,6,Stickerkoffer
-411,7,Caja Sellos
+411,7,Caja de Sellos
 411,8,Portabolli
-411,9,Seal Case
+411,9,Sticker Case
 411,11,シールいれ
 411,12,贴纸盒
 412,1,アクセサリーいれ
@@ -4074,7 +4074,7 @@ item_id,local_language_id,name
 413,6,Stickertüte
 413,7,Bolsa Sellos
 413,8,Bollosacca
-413,9,Seal Bag
+413,9,Sticker Bag
 413,11,シールぶくろ
 413,12,贴纸袋
 414,1,ともだちてちょう
@@ -4090,10 +4090,10 @@ item_id,local_language_id,name
 415,1,はつでんしょキー
 415,3,발전소키
 415,4,發電廠鑰匙
-415,5,Clé Centrale
+415,5,Clé Parc Éolien
 415,6,K-Schlüssel
 415,7,Llave Central
-415,8,Turbinchiave
+415,8,Chiave impianto
 415,9,Works Key
 415,11,はつでんしょキー
 415,12,发电厂钥匙
@@ -4103,7 +4103,7 @@ item_id,local_language_id,name
 416,5,Vieux Grigri
 416,6,Talisman
 416,7,Talismán
-416,8,Arcamuleto
+416,8,Amuleto antico
 416,9,Old Charm
 416,11,こだいのおまもり
 416,12,古代护符
@@ -4113,17 +4113,17 @@ item_id,local_language_id,name
 417,5,Clé Galaxie
 417,6,G-Schlüssel
 417,7,Llave Galaxia
-417,8,Galachiave
+417,8,Chiave Galassia
 417,9,Galactic Key
 417,11,ギンガだんのカギ
 417,12,银河队钥匙
 418,1,あかいくさり
-418,3,빨강쇠사슬
+418,3,빨강사슬
 418,4,紅色鎖鏈
 418,5,Chaîne Rouge
 418,6,Rote Kette
 418,7,Cadena Roja
-418,8,Rossocatena
+418,8,Catena rossa
 418,9,Red Chain
 418,11,あかいくさり
 418,12,红色锁链
@@ -4191,7 +4191,7 @@ item_id,local_language_id,name
 425,3,고라파덕물뿌리개
 425,4,可達鴨噴壺
 425,5,Kwakarrosoir
-425,6,Entonkanne
+425,6,Enton-Kanne
 425,7,Psydugadera
 425,8,Sprayduck
 425,9,Sprayduck
@@ -4200,7 +4200,7 @@ item_id,local_language_id,name
 426,1,ポフィンケース
 426,3,포핀케이스
 426,4,寶芬盒
-426,5,Boîte Poffin
+426,5,Boîte à Poffins
 426,6,Knurspbox
 426,7,Pokochera
 426,8,Portapoffin
@@ -4217,10 +4217,10 @@ item_id,local_language_id,name
 428,1,ルームキー
 428,3,룸키
 428,4,房間鑰匙
-428,5,Clé Chambre
+428,5,Clé de Chambre
-428,6,B-Schlüssel
+428,6,Hotelschlüssel
 428,7,Llave Suite
-428,8,Chiave Suite
+428,8,Chiave suite
 428,9,Suite Key
 428,11,ルームキー
 428,12,房间钥匙
@@ -4237,11 +4237,11 @@ item_id,local_language_id,name
 430,1,みかづきのはね
 430,3,초승달날개
 430,4,新月之羽
-430,5,Lun’Aile
+430,5,Plume Lune
 430,6,Lunarfeder
 430,7,Pluma Lunar
-430,8,Alalunare
+430,8,Piumalunare
-430,9,Lunar Wing
+430,9,Lunar Feather
 430,11,みかづきのはね
 430,12,新月之羽
 431,1,メンバーズカード
@@ -4269,7 +4269,7 @@ item_id,local_language_id,name
 433,4,船票
 433,5,Passe Bateau
 433,6,Bootsticket
-433,7,Ticket Barco
+433,7,Ticket del Barco
 433,8,Biglietto nave
 433,9,S.S. Ticket
 433,11,ふねのチケット
@@ -4308,7 +4308,7 @@ item_id,local_language_id,name
 437,3,교환권1
 437,4,兌換券１
 437,5,Bon 1
-437,6,Kupon 1
+437,6,Coupon 1
 437,7,Cupón 1
 437,8,Coupon 1
 437,9,Coupon 1
@@ -4318,7 +4318,7 @@ item_id,local_language_id,name
 438,3,교환권2
 438,4,兌換券２
 438,5,Bon 2
-438,6,Kupon 2
+438,6,Coupon 2
 438,7,Cupón 2
 438,8,Coupon 2
 438,9,Coupon 2
@@ -4328,7 +4328,7 @@ item_id,local_language_id,name
 439,3,교환권3
 439,4,兌換券３
 439,5,Bon 3
-439,6,Kupon 3
+439,6,Coupon 3
 439,7,Cupón 3
 439,8,Coupon 3
 439,9,Coupon 3
@@ -4337,21 +4337,21 @@ item_id,local_language_id,name
 440,1,そうこのカギ
 440,3,창고열쇠
 440,4,倉庫鑰匙
-440,5,Clé Stockage
+440,5,Clé du Hangar
 440,6,Lagerschlüssel
 440,7,Llave Almacén
-440,8,Depochiave
+440,8,Chiave magazzino
 440,9,Storage Key
 440,11,そうこのカギ
 440,12,仓库钥匙
 441,1,ひでんのくすり
 441,3,비전신약
 441,4,秘傳之藥
-441,5,Potion Secrète
+441,5,Remède Secret
-441,6,Geheimtrank
+441,6,Geheimmedizin
-441,7,Poción Secreta
+441,7,Medicina Secreta
-441,8,Pozione Segreta
+441,8,Rimedio segreto
-441,9,Secret Potion
+441,9,Secret Medicine
 441,11,ひでんのくすり
 441,12,秘传之药
 442,1,はっきんだま
@@ -8611,7 +8611,7 @@ item_id,local_language_id,name
 932,1,そうこのカギ
 932,3,창고열쇠
 932,4,倉庫鑰匙
-932,5,Clé Stockage
+932,5,Clé du Hangar
 932,6,Lagerschlüssel
 932,7,Llave Almacén
 932,8,Chiave magazzino
@@ -8623,7 +8623,7 @@ item_id,local_language_id,name
 933,4,船票
 933,5,Passe Bateau
 933,6,Bootsticket
-933,7,Ticket Barco
+933,7,Ticket del Barco
 933,8,Biglietto nave
 933,9,S.S. Ticket
 933,11,ふねのチケット
@@ -8997,7 +8997,7 @@ item_id,local_language_id,name
 970,8,Mimikyum Z
 970,9,Mimikium Z
 970,11,ミミッキュＺ
-970,12,谜拟ＱＺ
+970,12,谜拟丘Ｚ
 971,1,ルガルガンＺ
 971,3,루가루암Z
 971,4,鬃岩狼人Ｚ
@@ -9057,7 +9057,7 @@ item_id,local_language_id,name
 976,8,Mimikyum Z
 976,9,Mimikium Z
 976,11,ミミッキュＺ
-976,12,谜拟ＱＺ
+976,12,谜拟丘Ｚ
 977,1,ルガルガンＺ
 977,3,루가루암Z
 977,4,鬃岩狼人Ｚ
@@ -15878,3 +15878,153 @@ item_id,local_language_id,name
 1658,9,Reins of Unity
 1658,11,キズナのタヅナ
 1658,12,牵绊缰绳
+1659,1,なぞのかけらＳ
+1659,3,수수께끼의조각S
+1659,4,謎之碎片Ｓ
+1659,5,Éclat Étrange S
+1659,6,Enigmafragment S
+1659,7,Esquirla Extraña S
+1659,8,Frammento insolito S
+1659,9,Mysterious Shard S
+1659,11,なぞのかけらＳ
+1659,12,谜之碎片Ｓ
+1660,1,なぞのかけらＬ
+1660,3,수수께끼의조각L
+1660,4,謎之碎片Ｌ
+1660,5,Éclat Étrange L
+1660,6,Enigmafragment L
+1660,7,Esquirla Extraña L
+1660,8,Frammento insolito L
+1660,9,Mysterious Shard L
+1660,11,なぞのかけらＬ
+1660,12,谜之碎片Ｌ
+1661,1,あなほりドリル
+1661,3,구멍파기드릴
+1661,4,挖洞鑽
+1661,5,Foreuse
+1661,6,Einwegbohrer
+1661,7,Taladro
+1661,8,Trivella
+1661,9,Digger Drill
+1661,11,あなほりドリル
+1661,12,挖洞钻
+1662,1,カントーのせきばん
+1662,3,관동의석판
+1662,4,關都石板
+1662,5,Tablette Kanto
+1662,6,Kanto-Platte
+1662,7,Losa Kanto
+1662,8,Piastra di Kanto
+1662,9,Kanto Slate
+1662,11,カントーのせきばん
+1662,12,关都石板
+1663,1,ジョウトのせきばん
+1663,3,성도의석판
+1663,4,城都石板
+1663,5,Tablette Johto
+1663,6,Johto-Platte
+1663,7,Losa Johto
+1663,8,Piastra di Johto
+1663,9,Johto Slate
+1663,11,ジョウトのせきばん
+1663,12,城都石板
+1664,1,こころのせきばん
+1664,3,마음의석판
+1664,4,心之石板
+1664,5,Tablette Cœur
+1664,6,Gefühlsplatte
+1664,7,Losa Empatía
+1664,8,Piastra del cuore
+1664,9,Soul Slate
+1664,11,こころのせきばん
+1664,12,心之石板
+1665,1,にじのせきばん
+1665,3,무지개의석판
+1665,4,彩虹石板
+1665,5,Tablette Arc-en-ciel
+1665,6,Regenbogenplatte
+1665,7,Losa Arcoíris
+1665,8,Piastra arcobaleno
+1665,9,Rainbow Slate
+1665,11,にじのせきばん
+1665,12,彩虹石板
+1666,1,あらしのせきばん
+1666,3,폭풍의석판
+1666,4,暴風石板
+1666,5,Tablette Tempête
+1666,6,Sturmplatte
+1666,7,Losa Tormenta
+1666,8,Piastra dei venti
+1666,9,Squall Slate
+1666,11,あらしのせきばん
+1666,12,暴风石板
+1667,1,たいかいのせきばん
+1667,3,대해의석판
+1667,4,大海石板
+1667,5,Tablette Océans
+1667,6,Meeresplatte
+1667,7,Losa Mar
+1667,8,Piastra dei mari
+1667,9,Oceanic Slate
+1667,11,たいかいのせきばん
+1667,12,大海石板
+1668,1,たいりくのせきばん
+1668,3,대륙의석판
+1668,4,大陸石板
+1668,5,Tablette Continents
+1668,6,Kontinentplatte
+1668,7,Losa Tierra
+1668,8,Piastra delle terre
+1668,9,Tectonic Slate
+1668,11,たいりくのせきばん
+1668,12,大陆石板
+1669,1,てんくうのせきばん
+1669,3,천공의석판
+1669,4,天空石板
+1669,5,Tablette Cieux
+1669,6,Himmelsplatte
+1669,7,Losa Cielo
+1669,8,Piastra dei cieli
+1669,9,Stratospheric Slate
+1669,11,てんくうのせきばん
+1669,12,天空石板
+1670,1,いでんしのせきばん
+1670,3,유전자의석판
+1670,4,基因石板
+1670,5,Tablette Génétique
+1670,6,Genplatte
+1670,7,Losa Genética
+1670,8,Piastra del gene
+1670,9,Genome Slate
+1670,11,いでんしのせきばん
+1670,12,基因石板
+1671,1,みちびきのせきばん
+1671,3,인도의석판
+1671,4,引導石板
+1671,5,Tablette Guides
+1671,6,Weisungsplatte
+1671,7,Losa Inicio
+1671,8,Piastra degli esordi
+1671,9,Discovery Slate
+1671,11,みちびきのせきばん
+1671,12,引导石板
+1672,1,やぶれたせきばん
+1672,3,깨어진석판
+1672,4,毀壞石板
+1672,5,Tablette Distorsion
+1672,6,Zerrplatte
+1672,7,Losa Distorsión
+1672,8,Piastra distorta
+1672,9,Distortion Slate
+1672,11,やぶれたせきばん
+1672,12,毁坏石板
+1673,1,ＤＳプレイヤー
+1673,3,DS플레이어
+1673,4,ＤＳ播放器
+1673,5,Lecteur DS
+1673,6,DS-Player
+1673,7,Reproductor DS
+1673,8,Lettore DS
+1673,9,DS Sounds
+1673,11,ＤＳプレイヤー
+1673,12,ＤＳ播放器

pokedex/data/csv/items.csv

@@ -1,6 +1,6 @@
 id,identifier,category_id,cost,fling_power,fling_effect_id
 1,master-ball,34,0,,
-2,ultra-ball,34,800,,
+2,ultra-ball,34,1200,,
 3,great-ball,34,600,,
 4,poke-ball,34,200,,
 5,safari-ball,34,0,,
@@ -9,109 +9,109 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 8,nest-ball,33,1000,,
 9,repeat-ball,33,1000,,
 10,timer-ball,33,1000,,
-11,luxury-ball,33,3000,,
+11,luxury-ball,33,1000,,
-12,premier-ball,33,20,,
+12,premier-ball,33,200,,
 13,dusk-ball,33,1000,,
 14,heal-ball,33,300,,
 15,quick-ball,33,1000,,
-16,cherish-ball,33,0,,
+16,cherish-ball,33,200,,
-17,potion,27,200,30,
+17,potion,27,300,30,
-18,antidote,30,200,30,
+18,antidote,30,100,30,
-19,burn-heal,30,200,30,
+19,burn-heal,30,250,30,
-20,ice-heal,30,200,30,
+20,ice-heal,30,250,30,
-21,awakening,30,200,30,
+21,awakening,30,250,30,
 22,paralyze-heal,30,200,30,
 23,full-restore,27,3000,30,
 24,max-potion,27,2500,30,
-25,hyper-potion,27,1500,30,
+25,hyper-potion,27,1200,30,
 26,super-potion,27,700,30,
-27,full-heal,30,400,30,
+27,full-heal,30,600,30,
-28,revive,29,2000,30,
+28,revive,29,1500,30,
 29,max-revive,29,4000,30,
 30,fresh-water,27,200,30,
 31,soda-pop,27,300,30,
-32,lemonade,27,400,30,
+32,lemonade,27,350,30,
-33,moomoo-milk,27,600,30,
+33,moomoo-milk,27,500,30,
 34,energy-powder,27,500,30,
-35,energy-root,27,1200,30,
+35,energy-root,27,800,30,
-36,heal-powder,30,300,30,
+36,heal-powder,30,450,30,
 37,revival-herb,29,2800,30,
 38,ether,28,1200,30,
 39,max-ether,28,2000,30,
 40,elixir,28,3000,30,
 41,max-elixir,28,4500,30,
-42,lava-cookie,30,350,30,
+42,lava-cookie,30,200,30,
-43,berry-juice,27,200,30,
+43,berry-juice,27,100,30,
-44,sacred-ash,29,50000,30,
+44,sacred-ash,29,200,30,
-45,hp-up,26,10000,30,
+45,hp-up,26,9800,30,
-46,protein,26,10000,30,
+46,protein,26,9800,30,
-47,iron,26,10000,30,
+47,iron,26,9800,30,
-48,carbos,26,10000,30,
+48,carbos,26,9800,30,
-49,calcium,26,10000,30,
+49,calcium,26,9800,30,
-50,rare-candy,26,10000,30,
+50,rare-candy,26,4800,30,
-51,pp-up,26,10000,30,
+51,pp-up,26,9800,30,
-52,zinc,26,10000,30,
+52,zinc,26,9800,30,
-53,pp-max,26,10000,30,
+53,pp-max,26,9800,30,
-54,old-gateau,30,350,30,
+54,old-gateau,30,200,30,
-55,guard-spec,1,1500,30,
+55,guard-spec,1,700,30,
-56,dire-hit,1,1000,30,
+56,dire-hit,1,650,30,
-57,x-attack,1,1000,30,
+57,x-attack,1,500,30,
-58,x-defense,1,2000,30,
+58,x-defense,1,550,30,
-59,x-speed,1,1000,30,
+59,x-speed,1,350,30,
-60,x-accuracy,1,1000,30,
+60,x-accuracy,1,950,30,
-61,x-sp-atk,1,1000,30,
+61,x-sp-atk,1,350,30,
-62,x-sp-def,1,2000,30,
+62,x-sp-def,1,350,30,
-63,poke-doll,11,300,30,
+63,poke-doll,11,1000,30,
-64,fluffy-tail,11,100,30,
+64,fluffy-tail,11,1000,30,
-65,blue-flute,38,20,30,
+65,blue-flute,38,100,30,
-66,yellow-flute,38,20,30,
+66,yellow-flute,38,200,30,
-67,red-flute,38,20,30,
+67,red-flute,38,300,30,
-68,black-flute,11,20,30,
+68,black-flute,11,400,30,
-69,white-flute,11,20,30,
+69,white-flute,11,500,30,
 70,shoal-salt,9,20,30,
 71,shoal-shell,9,20,30,
-72,red-shard,9,1000,30,
+72,red-shard,9,200,30,
-73,blue-shard,9,1000,30,
+73,blue-shard,9,200,30,
-74,yellow-shard,9,1000,30,
+74,yellow-shard,9,200,30,
-75,green-shard,9,1000,30,
+75,green-shard,9,200,30,
-76,super-repel,11,700,30,
+76,super-repel,11,500,30,
-77,max-repel,11,900,30,
+77,max-repel,11,700,30,
-78,escape-rope,11,300,30,
+78,escape-rope,11,550,30,
-79,repel,11,400,30,
+79,repel,11,350,30,
-80,sun-stone,10,3000,30,
+80,sun-stone,10,2100,30,
-81,moon-stone,10,3000,30,
+81,moon-stone,10,2100,30,
-82,fire-stone,10,3000,30,
+82,fire-stone,10,2100,30,
-83,thunder-stone,10,3000,30,
+83,thunder-stone,10,2100,30,
-84,water-stone,10,3000,30,
+84,water-stone,10,2100,30,
-85,leaf-stone,10,3000,30,
+85,leaf-stone,10,2100,30,
 86,tiny-mushroom,24,500,30,
 87,big-mushroom,24,5000,30,
-88,pearl,24,2000,30,
+88,pearl,24,1400,30,
-89,big-pearl,24,8000,30,
+89,big-pearl,24,7500,30,
-90,stardust,24,3000,30,
+90,stardust,24,2000,30,
-91,star-piece,24,12000,30,
+91,star-piece,24,9800,30,
 92,nugget,24,10000,30,
 93,heart-scale,9,100,30,
-94,honey,35,900,30,
+94,honey,35,100,30,
 95,growth-mulch,32,200,30,
 96,damp-mulch,32,200,30,
 97,stable-mulch,32,200,30,
 98,gooey-mulch,32,200,30,
-99,root-fossil,35,7000,100,
+99,root-fossil,35,1000,100,
-100,claw-fossil,35,7000,100,
+100,claw-fossil,35,1000,100,
-101,helix-fossil,35,7000,100,
+101,helix-fossil,35,1000,100,
-102,dome-fossil,35,7000,100,
+102,dome-fossil,35,1000,100,
-103,old-amber,35,10000,100,
+103,old-amber,35,1000,100,
-104,armor-fossil,35,7000,100,
+104,armor-fossil,35,1000,100,
-105,skull-fossil,35,7000,100,
+105,skull-fossil,35,1000,100,
-106,rare-bone,24,5000,100,
+106,rare-bone,24,10000,100,
-107,shiny-stone,10,3000,80,
+107,shiny-stone,10,2100,80,
-108,dusk-stone,10,3000,80,
+108,dusk-stone,10,2100,80,
-109,dawn-stone,10,3000,80,
+109,dawn-stone,10,2100,80,
-110,oval-stone,10,2000,80,
+110,oval-stone,10,2100,80,
 111,odd-keystone,35,2100,80,
-112,adamant-orb,18,0,60,
+112,adamant-orb,18,10000,60,
-113,lustrous-orb,18,0,60,
+113,lustrous-orb,18,10000,60,
 114,grass-mail,25,50,,
 115,flame-mail,25,50,,
 116,bubble-mail,25,50,,
@@ -124,32 +124,32 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 123,air-mail,25,50,,
 124,mosaic-mail,25,50,,
 125,brick-mail,25,50,,
-126,cheri-berry,3,80,10,3
+126,cheri-berry,3,20,10,3
-127,chesto-berry,3,80,10,3
+127,chesto-berry,3,20,10,3
-128,pecha-berry,3,80,10,3
+128,pecha-berry,3,20,10,3
-129,rawst-berry,3,80,10,3
+129,rawst-berry,3,20,10,3
-130,aspear-berry,3,80,10,3
+130,aspear-berry,3,20,10,3
-131,leppa-berry,3,80,10,3
+131,leppa-berry,3,20,10,3
-132,oran-berry,3,80,10,3
+132,oran-berry,3,20,10,3
-133,persim-berry,3,80,10,3
+133,persim-berry,3,20,10,3
-134,lum-berry,3,80,10,3
+134,lum-berry,3,20,10,3
-135,sitrus-berry,3,80,10,3
+135,sitrus-berry,3,20,10,3
-136,figy-berry,6,80,10,3
+136,figy-berry,6,20,10,3
-137,wiki-berry,6,80,10,3
+137,wiki-berry,6,20,10,3
-138,mago-berry,6,80,10,3
+138,mago-berry,6,20,10,3
-139,aguav-berry,6,80,10,3
+139,aguav-berry,6,20,10,3
-140,iapapa-berry,6,80,10,3
+140,iapapa-berry,6,20,10,3
-141,razz-berry,8,200,10,
+141,razz-berry,8,20,10,
 142,bluk-berry,8,20,10,
-143,nanab-berry,8,200,10,
+143,nanab-berry,8,20,10,
 144,wepear-berry,8,20,10,
-145,pinap-berry,8,200,10,
+145,pinap-berry,8,20,10,
-146,pomeg-berry,2,80,10,
+146,pomeg-berry,2,20,10,
-147,kelpsy-berry,2,80,10,
+147,kelpsy-berry,2,20,10,
-148,qualot-berry,2,80,10,
+148,qualot-berry,2,20,10,
-149,hondew-berry,2,80,10,
+149,hondew-berry,2,20,10,
-150,grepa-berry,2,80,10,
+150,grepa-berry,2,20,10,
-151,tamato-berry,2,80,10,
+151,tamato-berry,2,20,10,
 152,cornn-berry,8,20,10,
 153,magost-berry,8,20,10,
 154,rabuta-berry,8,20,10,
@@ -159,120 +159,120 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 158,watmel-berry,8,20,10,
 159,durin-berry,8,20,10,
 160,belue-berry,8,20,10,
-161,occa-berry,7,80,10,
+161,occa-berry,7,20,10,
-162,passho-berry,7,80,10,
+162,passho-berry,7,20,10,
-163,wacan-berry,7,80,10,
+163,wacan-berry,7,20,10,
-164,rindo-berry,7,80,10,
+164,rindo-berry,7,20,10,
-165,yache-berry,7,80,10,
+165,yache-berry,7,20,10,
-166,chople-berry,7,80,10,
+166,chople-berry,7,20,10,
-167,kebia-berry,7,80,10,
+167,kebia-berry,7,20,10,
-168,shuca-berry,7,80,10,
+168,shuca-berry,7,20,10,
-169,coba-berry,7,80,10,
+169,coba-berry,7,20,10,
-170,payapa-berry,7,80,10,
+170,payapa-berry,7,20,10,
-171,tanga-berry,7,80,10,
+171,tanga-berry,7,20,10,
-172,charti-berry,7,80,10,
+172,charti-berry,7,20,10,
-173,kasib-berry,7,80,10,
+173,kasib-berry,7,20,10,
-174,haban-berry,7,80,10,
+174,haban-berry,7,20,10,
-175,colbur-berry,7,80,10,
+175,colbur-berry,7,20,10,
-176,babiri-berry,7,80,10,
+176,babiri-berry,7,20,10,
-177,chilan-berry,7,80,10,
+177,chilan-berry,7,20,10,
-178,liechi-berry,5,80,10,3
+178,liechi-berry,5,20,10,3
-179,ganlon-berry,5,80,10,3
+179,ganlon-berry,5,20,10,3
-180,salac-berry,5,80,10,3
+180,salac-berry,5,20,10,3
-181,petaya-berry,5,80,10,3
+181,petaya-berry,5,20,10,3
-182,apicot-berry,5,80,10,3
+182,apicot-berry,5,20,10,3
-183,lansat-berry,5,80,10,3
+183,lansat-berry,5,20,10,3
-184,starf-berry,5,80,10,3
+184,starf-berry,5,20,10,3
-185,enigma-berry,4,80,10,
+185,enigma-berry,4,20,10,
-186,micle-berry,5,80,10,3
+186,micle-berry,5,20,10,3
-187,custap-berry,5,80,10,
+187,custap-berry,5,20,10,
-188,jaboca-berry,4,80,10,
+188,jaboca-berry,4,20,10,
-189,rowap-berry,4,80,10,
+189,rowap-berry,4,20,10,
-190,bright-powder,12,4000,10,
+190,bright-powder,12,10,10,
-191,white-herb,12,4000,10,4
+191,white-herb,12,100,10,4
 192,macho-brace,14,3000,60,
-193,exp-share,16,0,,
+193,exp-share,16,3000,,
-194,quick-claw,12,4000,80,
+194,quick-claw,12,100,80,
-195,soothe-bell,16,4000,10,
+195,soothe-bell,16,100,10,
-196,mental-herb,12,4000,10,4
+196,mental-herb,12,100,10,4
-197,choice-band,13,4000,10,
+197,choice-band,13,100,10,
-198,kings-rock,12,5000,30,7
+198,kings-rock,12,100,30,7
-199,silver-powder,19,1000,10,
+199,silver-powder,19,100,10,
-200,amulet-coin,16,10000,30,
+200,amulet-coin,16,100,30,
-201,cleanse-tag,16,5000,30,
+201,cleanse-tag,16,200,30,
-202,soul-dew,18,0,30,
+202,soul-dew,18,200,30,
-203,deep-sea-tooth,18,2000,90,
+203,deep-sea-tooth,18,200,90,
-204,deep-sea-scale,18,2000,30,
+204,deep-sea-scale,18,200,30,
-205,smoke-ball,12,4000,30,
+205,smoke-ball,12,200,30,
-206,everstone,16,3000,30,
+206,everstone,16,200,30,
-207,focus-band,12,4000,10,
+207,focus-band,12,200,10,
-208,lucky-egg,16,10000,30,
+208,lucky-egg,16,200,30,
-209,scope-lens,12,4000,30,
+209,scope-lens,12,200,30,
-210,metal-coat,19,2000,30,
+210,metal-coat,19,100,30,
-211,leftovers,12,4000,10,
+211,leftovers,12,200,10,
-212,dragon-scale,10,2000,30,
+212,dragon-scale,10,2100,30,
-213,light-ball,18,1000,30,5
+213,light-ball,18,100,30,5
-214,soft-sand,19,1000,10,
+214,soft-sand,19,100,10,
-215,hard-stone,19,1000,100,
+215,hard-stone,19,100,100,
-216,miracle-seed,19,1000,30,
+216,miracle-seed,19,100,30,
-217,black-glasses,19,1000,30,
+217,black-glasses,19,100,30,
-218,black-belt,19,1000,30,
+218,black-belt,19,100,30,
-219,magnet,19,1000,30,
+219,magnet,19,100,30,
-220,mystic-water,19,1000,30,
+220,mystic-water,19,100,30,
-221,sharp-beak,19,1000,50,
+221,sharp-beak,19,100,50,
-222,poison-barb,19,1000,70,6
+222,poison-barb,19,100,70,6
-223,never-melt-ice,19,1000,30,
+223,never-melt-ice,19,100,30,
-224,spell-tag,19,1000,30,
+224,spell-tag,19,100,30,
-225,twisted-spoon,19,1000,30,
+225,twisted-spoon,19,100,30,
-226,charcoal,19,1000,30,
+226,charcoal,19,9800,30,
-227,dragon-fang,19,1000,70,
+227,dragon-fang,19,100,70,
-228,silk-scarf,19,1000,10,
+228,silk-scarf,19,100,10,
-229,up-grade,10,2000,30,
+229,up-grade,10,2100,30,
-230,shell-bell,12,4000,30,
+230,shell-bell,12,200,30,
-231,sea-incense,19,2000,10,
+231,sea-incense,19,9600,10,
-232,lax-incense,12,5000,10,
+232,lax-incense,12,9600,10,
-233,lucky-punch,18,1000,40,
+233,lucky-punch,18,10,40,
-234,metal-powder,18,1000,10,
+234,metal-powder,18,10,10,
-235,thick-club,18,1000,90,
+235,thick-club,18,500,90,
-236,stick,18,1000,60,
+236,stick,18,200,60,
 237,red-scarf,36,100,10,
 238,blue-scarf,36,100,10,
 239,pink-scarf,36,100,10,
 240,green-scarf,36,100,10,
 241,yellow-scarf,36,100,10,
-242,wide-lens,12,4000,10,
+242,wide-lens,12,200,10,
-243,muscle-band,12,4000,10,
+243,muscle-band,12,200,10,
-244,wise-glasses,12,4000,10,
+244,wise-glasses,12,200,10,
-245,expert-belt,12,4000,10,
+245,expert-belt,12,200,10,
-246,light-clay,12,4000,30,
+246,light-clay,12,200,30,
-247,life-orb,12,4000,30,
+247,life-orb,12,200,30,
-248,power-herb,12,4000,10,
+248,power-herb,12,100,10,
-249,toxic-orb,15,4000,30,1
+249,toxic-orb,15,100,30,1
-250,flame-orb,15,4000,30,2
+250,flame-orb,15,100,30,2
-251,quick-powder,18,1000,10,
+251,quick-powder,18,10,10,
-252,focus-sash,12,4000,10,
+252,focus-sash,12,200,10,
-253,zoom-lens,12,4000,10,
+253,zoom-lens,12,200,10,
-254,metronome,12,4000,30,
+254,metronome,12,200,30,
-255,iron-ball,15,4000,130,
+255,iron-ball,15,200,130,
-256,lagging-tail,15,4000,10,
+256,lagging-tail,15,200,10,
-257,destiny-knot,12,4000,10,
+257,destiny-knot,12,200,10,
-258,black-sludge,12,4000,30,
+258,black-sludge,12,200,30,
-259,icy-rock,12,4000,40,
+259,icy-rock,12,200,40,
-260,smooth-rock,12,4000,10,
+260,smooth-rock,12,200,10,
-261,heat-rock,12,4000,60,
+261,heat-rock,12,200,60,
-262,damp-rock,12,4000,60,
+262,damp-rock,12,200,60,
-263,grip-claw,12,4000,90,
+263,grip-claw,12,200,90,
-264,choice-scarf,13,4000,10,
+264,choice-scarf,13,200,10,
-265,sticky-barb,15,4000,80,
+265,sticky-barb,15,200,80,
 266,power-bracer,14,3000,70,
 267,power-belt,14,3000,70,
 268,power-lens,14,3000,70,
 269,power-band,14,3000,70,
 270,power-anklet,14,3000,70,
 271,power-weight,14,3000,70,
-272,shed-shell,12,4000,10,
+272,shed-shell,12,100,10,
-273,big-root,12,4000,10,
+273,big-root,12,200,10,
-274,choice-specs,13,4000,10,
+274,choice-specs,13,200,10,
 275,flame-plate,17,1000,90,
 276,splash-plate,17,1000,90,
 277,zap-plate,17,1000,90,
@@ -289,112 +289,112 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 288,draco-plate,17,1000,90,
 289,dread-plate,17,1000,90,
 290,iron-plate,17,1000,90,
-291,odd-incense,19,2000,10,
+291,odd-incense,19,9600,10,
-292,rock-incense,19,2000,10,
+292,rock-incense,19,9600,10,
-293,full-incense,15,5000,10,
+293,full-incense,15,9600,10,
-294,wave-incense,19,2000,10,
+294,wave-incense,19,9600,10,
-295,rose-incense,19,2000,10,
+295,rose-incense,19,9600,10,
-296,luck-incense,16,11000,10,
+296,luck-incense,16,9600,10,
-297,pure-incense,16,6000,10,
+297,pure-incense,16,9600,10,
-298,protector,10,2000,80,
+298,protector,10,2100,80,
-299,electirizer,10,2000,80,
+299,electirizer,10,2100,80,
-300,magmarizer,10,2000,80,
+300,magmarizer,10,2100,80,
-301,dubious-disc,10,2000,50,
+301,dubious-disc,10,2100,50,
-302,reaper-cloth,10,2000,10,
+302,reaper-cloth,10,2100,10,
-303,razor-claw,12,5000,80,
+303,razor-claw,12,2100,80,
-304,razor-fang,12,5000,30,7
+304,razor-fang,12,2100,30,7
-305,tm01,37,40000,,
+305,tm01,37,3000,,
-306,tm02,37,1000,,
+306,tm02,37,3000,,
-307,tm03,37,50000,,
+307,tm03,37,3000,,
-308,tm04,37,50000,,
+308,tm04,37,1500,,
-309,tm05,37,50000,,
+309,tm05,37,1000,,
-310,tm06,37,1000,,
+310,tm06,37,3000,,
-311,tm07,37,1000,,
+311,tm07,37,2000,,
-312,tm08,37,50000,,
+312,tm08,37,1500,,
-313,tm09,37,50000,,
+313,tm09,37,2000,,
-314,tm10,37,1000,,
+314,tm10,37,1500,,
-315,tm11,37,1000,,
+315,tm11,37,2000,,
-316,tm12,37,50000,,
+316,tm12,37,1500,,
-317,tm13,37,10000,,
+317,tm13,37,3000,,
-318,tm14,37,1000,,
+318,tm14,37,5500,,
-319,tm15,37,1000,,
+319,tm15,37,7500,,
-320,tm16,37,1000,,
+320,tm16,37,2000,,
-321,tm17,37,10000,,
+321,tm17,37,2000,,
-322,tm18,37,10000,,
+322,tm18,37,2000,,
-323,tm19,37,10000,,
+323,tm19,37,3000,,
-324,tm20,37,100000,,
+324,tm20,37,2000,,
-325,tm21,37,1000,,
+325,tm21,37,3000,,
-326,tm22,37,1000,,
+326,tm22,37,3000,,
-327,tm23,37,10000,,
+327,tm23,37,3000,,
-328,tm24,37,1000,,
+328,tm24,37,3000,,
-329,tm25,37,10000,,
+329,tm25,37,5500,,
-330,tm26,37,1000,,
+330,tm26,37,3000,,
-331,tm27,37,1000,,
+331,tm27,37,3000,,
-332,tm28,37,100000,,
+332,tm28,37,2000,,
-333,tm29,37,1000,,
+333,tm29,37,3000,,
-334,tm30,37,1000,,
+334,tm30,37,3000,,
-335,tm31,37,1000,,
+335,tm31,37,3000,,
-336,tm32,37,10000,,
+336,tm32,37,1000,,
-337,tm33,37,10000,,
+337,tm33,37,2000,,
-338,tm34,37,10000,,
+338,tm34,37,3000,,
-339,tm35,37,10000,,
+339,tm35,37,3000,,
-340,tm36,37,1000,,
+340,tm36,37,3000,,
-341,tm37,37,1000,,
+341,tm37,37,2000,,
-342,tm38,37,1000,,
+342,tm38,37,5500,,
-343,tm39,37,1000,,
+343,tm39,37,3000,,
-344,tm40,37,1000,,
+344,tm40,37,3000,,
-345,tm41,37,10000,,
+345,tm41,37,1500,,
-346,tm42,37,1000,,
+346,tm42,37,3000,,
-347,tm43,37,1000,,
+347,tm43,37,3000,,
-348,tm44,37,100000,,
+348,tm44,37,3000,,
-349,tm45,37,1000,,
+349,tm45,37,3000,,
-350,tm46,37,30000,,
+350,tm46,37,2000,,
-351,tm47,37,1000,,
+351,tm47,37,3000,,
-352,tm48,37,1000,,
+352,tm48,37,3000,,
-353,tm49,37,1000,,
+353,tm49,37,3000,,
-354,tm50,37,10000,,
+354,tm50,37,5500,,
-355,tm51,37,1000,,
+355,tm51,37,2000,,
-356,tm52,37,100000,,
+356,tm52,37,5500,,
-357,tm53,37,1000,,
+357,tm53,37,3000,,
-358,tm54,37,1000,,
+358,tm54,37,2000,,
-359,tm55,37,10000,,
+359,tm55,37,3000,,
-360,tm56,37,1000,,
+360,tm56,37,2000,,
-361,tm57,37,1000,,
+361,tm57,37,3000,,
-362,tm58,37,1000,,
+362,tm58,37,2000,,
-363,tm59,37,100000,,
+363,tm59,37,3000,,
-364,tm60,37,30000,,
+364,tm60,37,3000,,
-365,tm61,37,30000,,
+365,tm61,37,2000,,
-366,tm62,37,30000,,
+366,tm62,37,3000,,
-367,tm63,37,50000,,
+367,tm63,37,2000,,
-368,tm64,37,1000,,
+368,tm64,37,7500,,
-369,tm65,37,1000,,
+369,tm65,37,3000,,
-370,tm66,37,30000,,
+370,tm66,37,3000,,
-371,tm67,37,30000,,
+371,tm67,37,1000,,
-372,tm68,37,30000,,
+372,tm68,37,7500,,
-373,tm69,37,1000,,
+373,tm69,37,1500,,
-374,tm70,37,50000,,
+374,tm70,37,1000,,
-375,tm71,37,50000,,
+375,tm71,37,3000,,
-376,tm72,37,50000,,
+376,tm72,37,3000,,
-377,tm73,37,1000,,
+377,tm73,37,2000,,
-378,tm74,37,1000,,
+378,tm74,37,3000,,
-379,tm75,37,1000,,
+379,tm75,37,1500,,
-380,tm76,37,10000,,
+380,tm76,37,2000,,
-381,tm77,37,1000,,
+381,tm77,37,1500,,
-382,tm78,37,1000,,
+382,tm78,37,3000,,
-383,tm79,37,1000,,
+383,tm79,37,3000,,
-384,tm80,37,1000,,
+384,tm80,37,3000,,
-385,tm81,37,1000,,
+385,tm81,37,3000,,
 386,tm82,37,1000,,
-387,tm83,37,100000,,
+387,tm83,37,3000,,
-388,tm84,37,1000,,
+388,tm84,37,3000,,
-389,tm85,37,1000,,
+389,tm85,37,3000,,
-390,tm86,37,1000,,
+390,tm86,37,3000,,
-391,tm87,37,1000,,
+391,tm87,37,1500,,
-392,tm88,37,20000,,
+392,tm88,37,3000,,
-393,tm89,37,20000,,
+393,tm89,37,3000,,
-394,tm90,37,20000,,
+394,tm90,37,2000,,
-395,tm91,37,20000,,
+395,tm91,37,3000,,
-396,tm92,37,100000,,
+396,tm92,37,5500,,
 397,hm01,37,0,,
 398,hm02,37,0,,
 399,hm03,37,0,,
@@ -456,13 +456,13 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 455,love-ball,39,0,,
 456,park-ball,34,0,,
 457,sport-ball,34,300,,
-458,red-apricorn,40,200,10,
+458,red-apricorn,40,20,10,
-459,blue-apricorn,40,200,10,
+459,blue-apricorn,40,20,10,
-460,yellow-apricorn,40,200,10,
+460,yellow-apricorn,40,20,10,
-461,green-apricorn,40,200,10,
+461,green-apricorn,40,20,10,
-462,pink-apricorn,40,200,10,
+462,pink-apricorn,40,20,10,
-463,white-apricorn,40,200,10,
+463,white-apricorn,40,20,10,
-464,black-apricorn,40,200,10,
+464,black-apricorn,40,20,10,
 465,dowsing-machine,21,0,,
 466,rage-candy-bar,21,350,30,
 467,red-orb,22,0,,
@@ -657,9 +657,9 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 656,dire-hit-3,43,0,,
 657,light-stone,22,0,,
 658,dark-stone,22,0,,
-659,tm93,37,1000,,
+659,tm93,37,2000,,
-660,tm94,37,10000,,
+660,tm94,37,2000,,
-661,tm95,37,1000,,
+661,tm95,37,2500,,
 662,xtransceiver,21,0,,
 663,god-stone,23,0,,
 664,gram-1,22,0,,
@@ -740,11 +740,11 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 742,roller-skates,21,0,,
 743,sprinklotad,21,0,,
 744,tmv-pass,21,0,,
-745,tm96,37,1000,,
+745,tm96,37,2000,,
-746,tm97,37,1000,,
+746,tm97,37,2000,,
-747,tm98,37,1000,,
+747,tm98,37,2000,,
-748,tm99,37,1000,,
+748,tm99,37,2500,,
-749,tm100,37,5000,,
+749,tm100,37,2000,,
 760,latiasite,44,0,80,
 761,latiosite,44,0,80,
 762,common-stone,23,0,,
@@ -961,12 +961,12 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1011,clothing-trunk,23,0,,
 1012,catching-pocket,23,0,,
 1013,battle-pocket,23,0,,
-1014,silver-razz-berry,48,1000,10,
+1014,silver-razz-berry,48,100,10,
-1015,golden-razz-berry,48,5000,10,
+1015,golden-razz-berry,48,500,10,
-1016,silver-nanab-berry,48,1000,10,
+1016,silver-nanab-berry,48,100,10,
-1017,golden-nanab-berry,48,5000,10,
+1017,golden-nanab-berry,48,500,10,
-1018,silver-pinap-berry,48,1000,10,
+1018,silver-pinap-berry,48,100,10,
-1019,golden-pinap-berry,48,5000,10,
+1019,golden-pinap-berry,48,500,10,
 1020,secret-key--letsgo,22,0,,
 1021,ss-ticket--letsgo,22,0,,
 1022,parcel--letsgo,22,0,,
@@ -1606,3 +1606,18 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 1656,carrot-seeds,22,20,,
 1657,ability-patch,26,20,,
 1658,reins-of-unity,22,0,,
+1659,mysterious-shard-s,22,0,,
+1660,mysterious-shard-l,22,0,,
+1661,digger-drill,22,0,,
+1662,kanto-slate,22,0,,
+1663,johto-slate,22,0,,
+1664,soul-slate,22,0,,
+1665,rainbow-slate,22,0,,
+1666,squall-slate,22,0,,
+1667,oceanic-slate,22,0,,
+1668,tectonic-slate,22,0,,
+1669,stratospheric-slate,22,0,,
+1670,genome-slate,22,0,,
+1671,discovery-slate,22,0,,
+1672,distortion-slate,22,0,,
+1673,ds-sounds,21,0,,

pokedex/data/csv/machines.csv

@@ -20,6 +20,7 @@ machine_number,version_group_id,item_id,move_id
 1,18,305,526
 1,19,305,29
 1,20,305,25
+1,21,305,264
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -40,6 +41,7 @@ machine_number,version_group_id,item_id,move_id
 2,18,306,337
 2,19,306,269
 2,20,306,6
+2,21,306,337
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -60,6 +62,7 @@ machine_number,version_group_id,item_id,move_id
 3,18,307,473
 3,19,307,270
 3,20,307,7
+3,21,307,352
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -80,6 +83,7 @@ machine_number,version_group_id,item_id,move_id
 4,18,308,347
 4,19,308,100
 4,20,308,8
+4,21,308,347
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -100,6 +104,7 @@ machine_number,version_group_id,item_id,move_id
 5,18,309,46
 5,19,309,156
 5,20,309,9
+5,21,309,46
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -120,6 +125,7 @@ machine_number,version_group_id,item_id,move_id
 6,18,310,92
 6,19,310,113
 6,20,310,19
+6,21,310,92
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -140,6 +146,7 @@ machine_number,version_group_id,item_id,move_id
 7,18,311,258
 7,19,311,182
 7,20,311,42
+7,21,311,258
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -160,6 +167,7 @@ machine_number,version_group_id,item_id,move_id
 8,18,312,339
 8,19,312,164
 8,20,312,63
+8,21,312,339
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -180,6 +188,7 @@ machine_number,version_group_id,item_id,move_id
 9,18,313,474
 9,19,313,115
 9,20,313,416
+9,21,313,331
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -200,6 +209,7 @@ machine_number,version_group_id,item_id,move_id
 10,18,314,237
 10,19,314,91
 10,20,314,345
+10,21,314,526
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -220,6 +230,7 @@ machine_number,version_group_id,item_id,move_id
 11,18,315,241
 11,19,315,261
 11,20,315,76
+11,21,315,241
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -240,6 +251,7 @@ machine_number,version_group_id,item_id,move_id
 12,18,316,269
 12,19,316,263
 12,20,316,669
+12,21,316,269
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -260,6 +272,7 @@ machine_number,version_group_id,item_id,move_id
 13,18,317,58
 13,19,317,280
 13,20,317,83
+13,21,317,58
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -280,6 +293,7 @@ machine_number,version_group_id,item_id,move_id
 14,18,318,59
 14,19,318,19
 14,20,318,86
+14,21,318,59
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -300,6 +314,7 @@ machine_number,version_group_id,item_id,move_id
 15,18,319,63
 15,19,319,69
 15,20,319,91
+15,21,319,63
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -320,6 +335,7 @@ machine_number,version_group_id,item_id,move_id
 16,18,320,113
 16,19,320,86
 16,20,320,103
+16,21,320,113
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -340,6 +356,7 @@ machine_number,version_group_id,item_id,move_id
 17,18,321,182
 17,19,321,525
 17,20,321,113
+17,21,321,182
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -360,6 +377,7 @@ machine_number,version_group_id,item_id,move_id
 18,18,322,240
 18,19,322,369
 18,20,322,115
+18,21,322,240
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -380,6 +398,7 @@ machine_number,version_group_id,item_id,move_id
 19,18,323,355
 19,19,323,231
 19,20,323,219
+19,21,323,202
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -400,6 +419,7 @@ machine_number,version_group_id,item_id,move_id
 20,18,324,219
 20,19,324,399
 20,20,324,120
+20,21,324,219
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -420,6 +440,7 @@ machine_number,version_group_id,item_id,move_id
 21,18,325,218
 21,19,325,492
 21,20,325,156
+21,21,325,605
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -440,6 +461,7 @@ machine_number,version_group_id,item_id,move_id
 22,18,326,76
 22,19,326,157
 22,20,326,157
+22,21,326,76
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -460,6 +482,7 @@ machine_number,version_group_id,item_id,move_id
 23,18,327,479
 23,19,327,9
 23,20,327,168
+23,21,327,231
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -480,6 +503,7 @@ machine_number,version_group_id,item_id,move_id
 24,18,328,85
 24,19,328,404
 24,20,328,173
+24,21,328,85
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -500,6 +524,7 @@ machine_number,version_group_id,item_id,move_id
 25,18,329,87
 25,19,329,127
 25,20,329,182
+25,21,329,87
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -520,6 +545,7 @@ machine_number,version_group_id,item_id,move_id
 26,18,330,89
 26,19,330,398
 26,20,330,184
+26,21,330,89
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -540,6 +566,7 @@ machine_number,version_group_id,item_id,move_id
 27,18,331,216
 27,19,331,92
 27,20,331,196
+27,21,331,490
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -560,6 +587,7 @@ machine_number,version_group_id,item_id,move_id
 28,18,332,141
 28,19,332,161
 28,20,332,202
+28,21,332,91
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -580,6 +608,7 @@ machine_number,version_group_id,item_id,move_id
 29,18,333,94
 29,19,333,503
 29,20,333,204
+29,21,333,94
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -600,6 +629,7 @@ machine_number,version_group_id,item_id,move_id
 30,18,334,247
 30,19,334,339
 30,20,334,211
+30,21,334,247
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -620,6 +650,7 @@ machine_number,version_group_id,item_id,move_id
 31,18,335,280
 31,19,335,7
 31,20,335,213
+31,21,335,280
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -640,6 +671,7 @@ machine_number,version_group_id,item_id,move_id
 32,18,336,104
 32,19,336,605
 32,20,336,201
+32,21,336,104
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -660,6 +692,7 @@ machine_number,version_group_id,item_id,move_id
 33,18,337,115
 33,19,337,347
 33,20,337,240
+33,21,337,115
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -680,6 +713,7 @@ machine_number,version_group_id,item_id,move_id
 34,18,338,482
 34,19,338,406
 34,20,338,241
+34,21,338,351
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -700,6 +734,7 @@ machine_number,version_group_id,item_id,move_id
 35,18,339,53
 35,19,339,8
 35,20,339,258
+35,21,339,53
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -720,6 +755,7 @@ machine_number,version_group_id,item_id,move_id
 36,18,340,188
 36,19,340,85
 36,20,340,250
+36,21,340,188
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -740,6 +776,7 @@ machine_number,version_group_id,item_id,move_id
 37,18,341,201
 37,19,341,53
 37,20,341,251
+37,21,341,201
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -760,6 +797,7 @@ machine_number,version_group_id,item_id,move_id
 38,18,342,126
 38,19,342,87
 38,20,342,261
+38,21,342,126
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -780,6 +818,7 @@ machine_number,version_group_id,item_id,move_id
 39,18,343,317
 39,19,343,200
 39,20,343,263
+39,21,343,317
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -800,6 +839,7 @@ machine_number,version_group_id,item_id,move_id
 40,18,344,332
 40,19,344,94
 40,20,344,129
+40,21,344,332
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -820,6 +860,7 @@ machine_number,version_group_id,item_id,move_id
 41,18,345,259
 41,19,345,89
 41,20,345,270
+41,21,345,259
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -840,6 +881,7 @@ machine_number,version_group_id,item_id,move_id
 42,18,346,263
 42,19,346,120
 42,20,346,279
+42,21,346,263
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -860,6 +902,7 @@ machine_number,version_group_id,item_id,move_id
 43,18,347,488
 43,19,347,247
 43,20,347,280
+43,21,347,521
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -880,6 +923,7 @@ machine_number,version_group_id,item_id,move_id
 44,18,348,156
 44,19,348,583
 44,20,348,286
+44,21,348,156
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -900,6 +944,7 @@ machine_number,version_group_id,item_id,move_id
 45,18,349,213
 45,19,349,76
 45,20,349,291
+45,21,349,213
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -920,6 +965,7 @@ machine_number,version_group_id,item_id,move_id
 46,18,350,168
 46,19,350,126
 46,20,350,311
+46,21,350,168
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -940,6 +986,7 @@ machine_number,version_group_id,item_id,move_id
 47,18,351,490
 47,19,351,57
 47,20,351,313
+47,21,351,211
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -960,6 +1007,7 @@ machine_number,version_group_id,item_id,move_id
 48,18,352,496
 48,19,352,63
 48,20,352,317
+48,21,352,285
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -980,6 +1028,7 @@ machine_number,version_group_id,item_id,move_id
 49,18,353,497
 49,19,353,276
 49,20,353,328
+49,21,353,503
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -1000,6 +1049,7 @@ machine_number,version_group_id,item_id,move_id
 50,18,354,315
 50,19,354,355
 50,20,354,331
+50,21,354,315
 51,8,355,355
 51,9,355,355
 51,10,355,355
@@ -1011,6 +1061,7 @@ machine_number,version_group_id,item_id,move_id
 51,18,355,211
 51,19,355,59
 51,20,355,333
+51,21,355,355
 52,8,356,411
 52,9,356,411
 52,10,356,411
@@ -1022,6 +1073,7 @@ machine_number,version_group_id,item_id,move_id
 52,18,356,411
 52,19,356,188
 52,20,356,340
+52,21,356,411
 53,8,357,412
 53,9,357,412
 53,10,357,412
@@ -1033,6 +1085,7 @@ machine_number,version_group_id,item_id,move_id
 53,18,357,412
 53,19,357,72
 53,20,357,341
+53,21,357,412
 54,8,358,206
 54,9,358,206
 54,10,358,206
@@ -1044,6 +1097,7 @@ machine_number,version_group_id,item_id,move_id
 54,18,358,206
 54,19,358,430
 54,20,358,350
+54,21,358,206
 55,8,359,362
 55,9,359,362
 55,10,359,362
@@ -1055,6 +1109,7 @@ machine_number,version_group_id,item_id,move_id
 55,18,359,503
 55,19,359,58
 55,20,359,362
+55,21,359,362
 56,8,360,374
 56,9,360,374
 56,10,360,374
@@ -1066,6 +1121,7 @@ machine_number,version_group_id,item_id,move_id
 56,18,360,374
 56,19,360,446
 56,20,360,369
+56,21,360,374
 57,8,361,451
 57,9,361,451
 57,10,361,451
@@ -1077,6 +1133,7 @@ machine_number,version_group_id,item_id,move_id
 57,18,361,451
 57,19,361,6
 57,20,361,371
+57,21,361,451
 58,8,362,203
 58,9,362,203
 58,10,362,203
@@ -1088,6 +1145,7 @@ machine_number,version_group_id,item_id,move_id
 58,18,362,507
 58,19,362,529
 58,20,362,372
+58,21,362,203
 59,8,363,406
 59,9,363,406
 59,10,363,406
@@ -1099,6 +1157,7 @@ machine_number,version_group_id,item_id,move_id
 59,18,363,693
 59,19,363,138
 59,20,363,374
+59,21,363,406
 60,8,364,409
 60,9,364,409
 60,10,364,409
@@ -1110,6 +1169,7 @@ machine_number,version_group_id,item_id,move_id
 60,18,364,511
 60,19,364,224
 60,20,364,384
+60,21,364,409
 61,8,365,261
 61,9,365,261
 61,10,365,261
@@ -1120,6 +1180,7 @@ machine_number,version_group_id,item_id,move_id
 61,17,365,261
 61,18,365,261
 61,20,365,385
+61,21,365,261
 62,8,366,318
 62,9,366,318
 62,10,366,318
@@ -1130,6 +1191,7 @@ machine_number,version_group_id,item_id,move_id
 62,17,366,512
 62,18,366,512
 62,20,366,683
+62,21,366,405
 63,8,367,373
 63,9,367,373
 63,10,367,373
@@ -1140,6 +1202,7 @@ machine_number,version_group_id,item_id,move_id
 63,17,367,373
 63,18,367,373
 63,20,367,409
+63,21,367,417
 64,8,368,153
 64,9,368,153
 64,10,368,153
@@ -1150,6 +1213,7 @@ machine_number,version_group_id,item_id,move_id
 64,17,368,153
 64,18,368,153
 64,20,368,419
+64,21,368,153
 65,8,369,421
 65,9,369,421
 65,10,369,421
@@ -1160,6 +1224,7 @@ machine_number,version_group_id,item_id,move_id
 65,17,369,421
 65,18,369,421
 65,20,369,421
+65,21,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
@@ -1170,6 +1235,7 @@ machine_number,version_group_id,item_id,move_id
 66,17,370,371
 66,18,370,371
 66,20,370,422
+66,21,370,371
 67,8,371,278
 67,9,371,278
 67,10,371,278
@@ -1180,6 +1246,7 @@ machine_number,version_group_id,item_id,move_id
 67,17,371,684
 67,18,371,684
 67,20,371,423
+67,21,371,278
 68,8,372,416
 68,9,372,416
 68,10,372,416
@@ -1190,6 +1257,7 @@ machine_number,version_group_id,item_id,move_id
 68,17,372,416
 68,18,372,416
 68,20,372,424
+68,21,372,416
 69,8,373,397
 69,9,373,397
 69,10,373,397
@@ -1200,6 +1268,7 @@ machine_number,version_group_id,item_id,move_id
 69,17,373,397
 69,18,373,397
 69,20,373,427
+69,21,373,397
 70,8,374,148
 70,9,374,148
 70,10,374,148
@@ -1210,6 +1279,7 @@ machine_number,version_group_id,item_id,move_id
 70,17,374,694
 70,18,374,694
 70,20,374,433
+70,21,374,148
 71,8,375,444
 71,9,375,444
 71,10,375,444
@@ -1220,6 +1290,7 @@ machine_number,version_group_id,item_id,move_id
 71,17,375,444
 71,18,375,444
 71,20,375,472
+71,21,375,444
 72,8,376,419
 72,9,376,419
 72,10,376,419
@@ -1230,6 +1301,7 @@ machine_number,version_group_id,item_id,move_id
 72,17,376,521
 72,18,376,521
 72,20,376,478
+72,21,376,419
 73,8,377,86
 73,9,377,86
 73,10,377,86
@@ -1240,6 +1312,7 @@ machine_number,version_group_id,item_id,move_id
 73,17,377,86
 73,18,377,86
 73,20,377,440
+73,21,377,86
 74,8,378,360
 74,9,378,360
 74,10,378,360
@@ -1250,6 +1323,7 @@ machine_number,version_group_id,item_id,move_id
 74,17,378,360
 74,18,378,360
 74,20,378,474
+74,21,378,360
 75,8,379,14
 75,9,379,14
 75,10,379,14
@@ -1260,6 +1334,7 @@ machine_number,version_group_id,item_id,move_id
 75,17,379,14
 75,18,379,14
 75,20,379,490
+75,21,379,14
 76,8,380,446
 76,9,380,446
 76,10,380,446
@@ -1270,6 +1345,7 @@ machine_number,version_group_id,item_id,move_id
 76,17,380,19
 76,18,380,19
 76,20,380,496
+76,21,380,446
 77,8,381,244
 77,9,381,244
 77,10,381,244
@@ -1280,6 +1356,7 @@ machine_number,version_group_id,item_id,move_id
 77,17,381,244
 77,18,381,244
 77,20,381,506
+77,21,381,244
 78,8,382,445
 78,9,382,445
 78,10,382,445
@@ -1290,6 +1367,7 @@ machine_number,version_group_id,item_id,move_id
 78,17,382,523
 78,18,382,523
 78,20,382,512
+78,21,382,555
 79,8,383,399
 79,9,383,399
 79,10,383,399
@@ -1300,6 +1378,7 @@ machine_number,version_group_id,item_id,move_id
 79,17,383,524
 79,18,383,524
 79,20,383,514
+79,21,383,399
 80,8,384,157
 80,9,384,157
 80,10,384,157
@@ -1310,6 +1389,7 @@ machine_number,version_group_id,item_id,move_id
 80,17,384,157
 80,18,384,157
 80,20,384,521
+80,21,384,157
 81,8,385,404
 81,9,385,404
 81,10,385,404
@@ -1320,6 +1400,7 @@ machine_number,version_group_id,item_id,move_id
 81,17,385,404
 81,18,385,404
 81,20,385,523
+81,21,385,404
 82,8,386,214
 82,9,386,214
 82,10,386,214
@@ -1330,6 +1411,7 @@ machine_number,version_group_id,item_id,move_id
 82,17,386,525
 82,18,386,525
 82,20,386,527
+82,21,386,214
 83,8,387,363
 83,9,387,363
 83,10,387,363
@@ -1340,6 +1422,7 @@ machine_number,version_group_id,item_id,move_id
 83,17,387,611
 83,18,387,611
 83,20,387,534
+83,21,387,523
 84,8,388,398
 84,9,388,398
 84,10,388,398
@@ -1350,6 +1433,7 @@ machine_number,version_group_id,item_id,move_id
 84,17,388,398
 84,18,388,398
 84,20,388,541
+84,21,388,398
 85,8,389,138
 85,9,389,138
 85,10,389,138
@@ -1360,6 +1444,7 @@ machine_number,version_group_id,item_id,move_id
 85,17,389,138
 85,18,389,138
 85,20,389,555
+85,21,389,138
 86,8,390,447
 86,9,390,447
 86,10,390,447
@@ -1370,6 +1455,7 @@ machine_number,version_group_id,item_id,move_id
 86,17,390,447
 86,18,390,447
 86,20,390,566
+86,21,390,447
 87,8,391,207
 87,9,391,207
 87,10,391,207
@@ -1380,6 +1466,7 @@ machine_number,version_group_id,item_id,move_id
 87,17,391,207
 87,18,391,207
 87,20,391,577
+87,21,391,207
 88,8,392,365
 88,9,392,365
 88,10,392,365
@@ -1390,6 +1477,7 @@ machine_number,version_group_id,item_id,move_id
 88,17,392,214
 88,18,392,214
 88,20,392,580
+88,21,392,365
 89,8,393,369
 89,9,393,369
 89,10,393,369
@@ -1400,6 +1488,7 @@ machine_number,version_group_id,item_id,move_id
 89,17,393,369
 89,18,393,369
 89,20,393,581
+89,21,393,369
 90,8,394,164
 90,9,394,164
 90,10,394,164
@@ -1410,6 +1499,7 @@ machine_number,version_group_id,item_id,move_id
 90,17,394,164
 90,18,394,164
 90,20,394,604
+90,21,394,164
 91,8,395,430
 91,9,395,430
 91,10,395,430
@@ -1420,6 +1510,7 @@ machine_number,version_group_id,item_id,move_id
 91,17,395,430
 91,18,395,430
 91,20,395,678
+91,21,395,430
 92,8,396,433
 92,9,396,433
 92,10,396,433
@@ -1430,6 +1521,7 @@ machine_number,version_group_id,item_id,move_id
 92,17,396,433
 92,18,396,433
 92,20,396,595
+92,21,396,433
 93,11,659,528
 93,14,659,528
 93,15,659,528
@@ -1437,6 +1529,7 @@ machine_number,version_group_id,item_id,move_id
 93,17,659,528
 93,18,659,528
 93,20,659,598
+93,21,659,15
 94,11,660,249
 94,14,660,249
 94,15,660,249
@@ -1444,6 +1537,7 @@ machine_number,version_group_id,item_id,move_id
 94,17,660,57
 94,18,660,57
 94,20,660,206
+94,21,660,19
 95,11,661,555
 95,14,661,555
 95,15,661,555
@@ -1451,31 +1545,37 @@ machine_number,version_group_id,item_id,move_id
 95,17,661,555
 95,18,661,555
 95,20,661,403
+95,21,661,57
 96,15,745,267
 96,16,745,267
 96,17,745,267
 96,18,745,267
 96,20,745,684
+96,21,745,70
 97,15,746,399
 97,16,746,399
 97,17,746,399
 97,18,746,399
 97,20,746,693
+97,21,746,432
 98,15,747,612
 98,16,747,612
 98,17,747,127
 98,18,747,127
 98,20,747,707
+98,21,747,249
 99,15,748,605
 99,16,748,605
 99,17,748,605
 99,18,748,605
 99,20,748,784
+99,21,748,127
 100,15,749,590
 100,16,749,590
 100,17,749,590
 100,18,749,590
 100,20,1188,14
+100,21,1288,431
 101,1,397,15
 101,2,397,15
 101,3,397,15

pokedex/data/csv/move_changelog.csv

@@ -196,3 +196,4 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 738,20,,90,15,100,,,,
 739,20,,90,15,100,,,,
 740,20,,90,15,100,,,,
+824,21,,130,,,,,,

pokedex/data/csv/move_names.csv

@@ -118,7 +118,7 @@ move_id,local_language_id,name
 12,8,Ghigliottina
 12,9,Guillotine
 12,11,ハサミギロチン
-12,12,断头钳
+12,12,极落钳
 13,1,かまいたち
 13,3,칼바람
 13,4,旋風刀
@@ -148,7 +148,7 @@ move_id,local_language_id,name
 15,8,Taglio
 15,9,Cut
 15,11,いあいぎり
-15,12,居合斩
+15,12,居合劈
 16,1,かぜおこし
 16,3,바람일으키기
 16,4,起風
@@ -658,7 +658,7 @@ move_id,local_language_id,name
 66,8,Sottomissione
 66,9,Submission
 66,11,じごくぐるま
-66,12,地狱翻滚
+66,12,深渊翻滚
 67,1,けたぐり
 67,3,안다리걸기
 67,4,踢倒
@@ -1198,7 +1198,7 @@ move_id,local_language_id,name
 120,8,Autodistruzione
 120,9,Self-Destruct
 120,11,じばく
-120,12,自爆
+120,12,玉石俱碎
 121,1,タマゴばくだん
 121,3,알폭탄
 121,4,炸蛋
@@ -1408,7 +1408,7 @@ move_id,local_language_id,name
 141,8,Sanguisuga
 141,9,Leech Life
 141,11,きゅうけつ
-141,12,吸血
+141,12,汲取
 142,1,あくまのキッス
 142,3,악마의키스
 142,4,惡魔之吻
@@ -1578,7 +1578,7 @@ move_id,local_language_id,name
 158,8,Iperzanna
 158,9,Hyper Fang
 158,11,ひっさつまえば
-158,12,必杀门牙
+158,12,终结门牙
 159,1,かくばる
 159,3,각지기
 159,4,稜角化
@@ -1738,7 +1738,7 @@ move_id,local_language_id,name
 174,8,Maledizione
 174,9,Curse
 174,11,のろい
-174,12,诅咒
+174,12,咒术
 175,1,じたばた
 175,3,바둥바둥
 175,4,抓狂
@@ -1788,7 +1788,7 @@ move_id,local_language_id,name
 179,8,Contropiede
 179,9,Reversal
 179,11,きしかいせい
-179,12,起死回生
+179,12,绝处逢生
 180,1,うらみ
 180,3,원한
 180,4,怨恨
@@ -1838,7 +1838,7 @@ move_id,local_language_id,name
 184,8,Visotruce
 184,9,Scary Face
 184,11,こわいかお
-184,12,鬼面
+184,12,可怕面孔
 185,1,だましうち
 185,3,속여때리기
 185,4,出奇一擊
@@ -1948,7 +1948,7 @@ move_id,local_language_id,name
 195,8,Ultimocanto
 195,9,Perish Song
 195,11,ほろびのうた
-195,12,灭亡之歌
+195,12,终焉之歌
 196,1,こごえるかぜ
 196,3,얼다바람
 196,4,冰凍之風
@@ -2608,7 +2608,7 @@ move_id,local_language_id,name
 261,8,Fuocofatuo
 261,9,Will-O-Wisp
 261,11,おにび
-261,12,鬼火
+261,12,磷火
 262,1,おきみやげ
 262,3,추억의선물
 262,4,臨別禮物
@@ -2888,7 +2888,7 @@ move_id,local_language_id,name
 289,8,Scippo
 289,9,Snatch
 289,11,よこどり
-289,12,抢夺
+289,12,化为己用
 290,1,ひみつのちから
 290,3,비밀의힘
 290,4,秘密之力
@@ -3278,7 +3278,7 @@ move_id,local_language_id,name
 328,8,Sabbiotomba
 328,9,Sand Tomb
 328,11,すなじごく
-328,12,流沙地狱
+328,12,流沙深渊
 329,1,ぜったいれいど
 329,3,절대영도
 329,4,絕對零度
@@ -4028,7 +4028,7 @@ move_id,local_language_id,name
 403,8,Eterelama
 403,9,Air Slash
 403,11,エアスラッシュ
-403,12,空气斩
+403,12,空气之刃
 404,1,シザークロス
 404,3,시저크로스
 404,4,十字剪
@@ -4918,7 +4918,7 @@ move_id,local_language_id,name
 492,8,Ripicca
 492,9,Foul Play
 492,11,イカサマ
-492,12,欺诈
+492,12,移花接木
 493,1,シンプルビーム
 493,3,심플빔
 493,4,單純光束
@@ -5098,7 +5098,7 @@ move_id,local_language_id,name
 510,8,Bruciatutto
 510,9,Incinerate
 510,11,やきつくす
-510,12,烧尽
+510,12,烧净
 511,1,さきおくり
 511,3,순서미루기
 511,4,延後
@@ -5168,7 +5168,7 @@ move_id,local_language_id,name
 517,8,Marchiatura
 517,9,Inferno
 517,11,れんごく
-517,12,炼狱
+517,12,烈火深渊
 518,1,みずのちかい
 518,3,물의맹세
 518,4,水之誓約
@@ -5708,7 +5708,7 @@ move_id,local_language_id,name
 571,8,Boscomalocchio
 571,9,Forest’s Curse
 571,11,もりののろい
-571,12,森林诅咒
+571,12,森林咒术
 572,1,はなふぶき
 572,3,꽃보라
 572,4,落英繽紛
@@ -6108,7 +6108,7 @@ move_id,local_language_id,name
 611,8,Assillo
 611,9,Infestation
 611,11,まとわりつく
-611,12,死缠烂打
+611,12,纠缠不休
 612,1,グロウパンチ
 612,3,그로우펀치
 612,4,增強拳
@@ -6128,7 +6128,7 @@ move_id,local_language_id,name
 613,8,Ali del Fato
 613,9,Oblivion Wing
 613,11,デスウイング
-613,12,死亡之翼
+613,12,归天之翼
 614,1,サウザンアロー
 614,3,사우전드애로
 614,4,千箭齊發
@@ -6748,7 +6748,7 @@ move_id,local_language_id,name
 675,8,Colpo Infernale
 675,9,Throat Chop
 675,11,じごくづき
-675,12,地狱突刺
+675,12,深渊突刺
 676,1,かふんだんご
 676,3,꽃가루경단
 676,4,花粉團
@@ -7378,7 +7378,7 @@ move_id,local_language_id,name
 738,8,Bombafrush
 738,9,Sappy Seed
 738,11,すくすくボンバー
-738,12,茁茁轰炸
+738,12,茁茁炸弹
 739,1,こちこちフロスト
 739,3,꽁꽁프로스트
 739,4,冰冰霜凍

pokedex/data/csv/moves.csv

@@ -822,7 +822,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 821,freezing-glare,8,14,90,10,100,0,10,3,1,10,,,
 822,fiery-wrath,8,17,90,10,100,0,11,3,1,20,,,
 823,thunderous-kick,8,2,90,10,100,0,10,2,1,100,,,
-824,glacial-lance,8,15,130,5,100,0,11,2,1,,,,
+824,glacial-lance,8,15,120,5,100,0,11,2,1,,,,
 825,astral-barrage,8,8,120,5,100,0,11,3,1,,,,
 826,eerie-spell,8,14,80,5,100,0,10,3,1,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,

pokedex/data/csv/pokedex_version_groups.csv

@@ -7,6 +7,7 @@ pokedex_id,version_group_id
 4,5
 4,6
 5,8
+5,21
 6,9
 7,10
 8,11

pokedex/data/csv/pokemon.csv

@@ -13,10 +13,10 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 12,butterfree,12,11,320,198,16,1
 13,weedle,13,3,32,39,17,1
 14,kakuna,14,6,100,72,18,1
-15,beedrill,15,10,295,178,19,1
+15,beedrill,15,10,295,198,19,1
 16,pidgey,16,3,18,50,21,1
 17,pidgeotto,17,11,300,122,22,1
-18,pidgeot,18,15,395,216,23,1
+18,pidgeot,18,15,395,240,23,1
 19,rattata,19,3,35,51,25,1
 20,raticate,20,7,185,145,27,1
 21,spearow,21,3,20,52,30,1
@@ -69,12 +69,12 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 68,machamp,68,16,1300,253,109,1
 69,bellsprout,69,7,40,60,110,1
 70,weepinbell,70,10,64,137,111,1
-71,victreebel,71,17,155,221,112,1
+71,victreebel,71,17,155,245,112,1
 72,tentacool,72,9,455,67,113,1
 73,tentacruel,73,16,550,180,114,1
 74,geodude,74,4,200,60,115,1
 75,graveler,75,10,1050,137,117,1
-76,golem,76,14,3000,223,119,1
+76,golem,76,14,3000,248,119,1
 77,ponyta,77,10,300,82,121,1
 78,rapidash,78,17,950,175,123,1
 79,slowpoke,79,12,360,63,125,1
@@ -152,13 +152,13 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 151,mew,151,4,40,300,248,1
 152,chikorita,152,9,64,64,249,1
 153,bayleef,153,12,158,142,250,1
-154,meganium,154,18,1005,236,251,1
+154,meganium,154,18,1005,263,251,1
 155,cyndaquil,155,5,79,62,252,1
 156,quilava,156,9,190,142,253,1
-157,typhlosion,157,17,795,240,254,1
+157,typhlosion,157,17,795,267,254,1
 158,totodile,158,6,95,63,255,1
 159,croconaw,159,11,250,142,256,1
-160,feraligatr,160,23,888,239,257,1
+160,feraligatr,160,23,888,265,257,1
 161,sentret,161,8,60,43,258,1
 162,furret,162,18,325,145,259,1
 163,hoothoot,163,7,212,52,260,1
@@ -179,7 +179,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 178,xatu,178,15,150,165,272,1
 179,mareep,179,6,78,56,273,1
 180,flaaffy,180,8,133,128,274,1
-181,ampharos,181,14,615,230,275,1
+181,ampharos,181,14,615,255,275,1
 182,bellossom,182,4,58,245,79,1
 183,marill,183,4,85,88,278,1
 184,azumarill,184,8,285,210,279,1
@@ -187,7 +187,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 186,politoed,186,11,339,250,102,1
 187,hoppip,187,4,5,50,282,1
 188,skiploom,188,6,10,119,283,1
-189,jumpluff,189,8,30,207,284,1
+189,jumpluff,189,8,30,230,284,1
 190,aipom,190,8,115,72,285,1
 191,sunkern,191,3,18,36,287,1
 192,sunflora,192,8,85,149,288,1
@@ -265,9 +265,9 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 264,linoone,264,5,325,147,363,1
 265,wurmple,265,3,36,56,365,1
 266,silcoon,266,6,100,72,366,1
-267,beautifly,267,10,284,178,367,1
+267,beautifly,267,10,284,198,367,1
 268,cascoon,268,7,115,72,368,1
-269,dustox,269,12,316,173,369,1
+269,dustox,269,12,316,193,369,1
 270,lotad,270,5,26,44,370,1
 271,lombre,271,12,325,119,371,1
 272,ludicolo,272,15,550,240,372,1
@@ -287,7 +287,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 286,breloom,286,12,392,161,389,1
 287,slakoth,287,8,240,56,390,1
 288,vigoroth,288,14,465,154,391,1
-289,slaking,289,20,1305,252,392,1
+289,slaking,289,20,1305,285,392,1
 290,nincada,290,5,55,53,393,1
 291,ninjask,291,8,120,160,394,1
 292,shedinja,292,8,12,83,395,1
@@ -384,19 +384,19 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 383,groudon,383,35,9500,335,509,1
 384,rayquaza,384,70,2065,340,511,1
 385,jirachi,385,3,11,300,513,1
-386,deoxys-normal,386,17,608,270,514,1
+386,deoxys-normal,386,17,608,300,514,1
 387,turtwig,387,4,102,64,518,1
 388,grotle,388,11,970,142,519,1
-389,torterra,389,22,3100,236,520,1
+389,torterra,389,22,3100,263,520,1
 390,chimchar,390,5,62,62,521,1
 391,monferno,391,9,220,142,522,1
-392,infernape,392,12,550,240,523,1
+392,infernape,392,12,550,267,523,1
 393,piplup,393,4,52,63,524,1
 394,prinplup,394,8,230,142,525,1
-395,empoleon,395,17,845,239,526,1
+395,empoleon,395,17,845,265,526,1
 396,starly,396,3,20,49,527,1
 397,staravia,397,6,155,119,528,1
-398,staraptor,398,12,249,218,529,1
+398,staraptor,398,12,249,243,529,1
 399,bidoof,399,5,200,50,530,1
 400,bibarel,400,10,315,144,531,1
 401,kricketot,401,3,22,39,532,1
@@ -487,11 +487,11 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 486,regigigas,486,37,4200,335,599,1
 487,giratina-altered,487,45,7500,340,600,1
 488,cresselia,488,15,856,300,602,1
-489,phione,489,4,31,216,603,1
+489,phione,489,4,31,240,603,1
-490,manaphy,490,3,14,270,604,1
+490,manaphy,490,3,14,300,604,1
-491,darkrai,491,15,505,270,605,1
+491,darkrai,491,15,505,300,605,1
-492,shaymin-land,492,2,21,270,606,1
+492,shaymin-land,492,2,21,300,606,1
-493,arceus,493,32,3200,324,608,1
+493,arceus,493,32,3200,360,608,1
 494,victini,494,4,40,300,609,1
 495,snivy,495,6,81,62,610,1
 496,servine,496,8,160,145,611,1
@@ -897,12 +897,12 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 896,glastrier,896,22,8000,290,1088,1
 897,spectrier,897,20,445,290,1089,1
 898,calyrex,898,11,77,250,1090,1
-10001,deoxys-attack,386,17,608,270,515,0
+10001,deoxys-attack,386,17,608,300,515,0
-10002,deoxys-defense,386,17,608,270,516,0
+10002,deoxys-defense,386,17,608,300,516,0
-10003,deoxys-speed,386,17,608,270,517,0
+10003,deoxys-speed,386,17,608,300,517,0
 10004,wormadam-sandy,413,5,65,148,543,0
 10005,wormadam-trash,413,5,65,148,544,0
-10006,shaymin-sky,492,4,52,270,607,0
+10006,shaymin-sky,492,4,52,300,607,0
 10007,giratina-origin,487,69,6500,340,601,0
 10008,rotom-heat,479,3,3,182,588,0
 10009,rotom-wash,479,3,3,182,589,0

pokedex/data/csv/pokemon_evolution.csv

@@ -14,17 +14,17 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 13,20,1,,20,,,,,,,,,,,,,,0,0
 14,22,1,,20,,,,,,,,,,,,,,0,0
 15,24,1,,22,,,,,,,,,,,,,,0,0
-16,25,1,,,,,,,,,160,,,,,,,0,0
+16,25,1,,,,,,,,,220,,,,,,,0,0
 17,26,3,83,,,,,,,,,,,,,,,0,0
 18,28,1,,22,,,,,,,,,,,,,,0,0
 19,30,1,,16,,,,,,,,,,,,,,0,0
 20,31,3,81,,,,,,,,,,,,,,,0,0
 21,33,1,,16,,,,,,,,,,,,,,0,0
 22,34,3,81,,,,,,,,,,,,,,,0,0
-23,35,1,,,,,,,,,160,,,,,,,0,0
+23,35,1,,,,,,,,,220,,,,,,,0,0
 24,36,3,81,,,,,,,,,,,,,,,0,0
 25,38,3,82,,,,,,,,,,,,,,,0,0
-26,39,1,,,,,,,,,160,,,,,,,0,0
+26,39,1,,,,,,,,,220,,,,,,,0,0
 27,40,3,81,,,,,,,,,,,,,,,0,0
 28,42,1,,22,,,,,,,,,,,,,,0,0
 29,44,1,,21,,,,,,,,,,,,,,0,0
@@ -79,7 +79,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 78,136,3,82,,,,,,,,,,,,,,,0,0
 79,139,1,,40,,,,,,,,,,,,,,0,0
 80,141,1,,40,,,,,,,,,,,,,,0,0
-81,143,1,,,,,,,,,160,,,,,,,0,0
+81,143,1,,,,,,,,,220,,,,,,,0,0
 82,148,1,,30,,,,,,,,,,,,,,0,0
 83,149,1,,55,,,,,,,,,,,,,,0,0
 84,153,1,,16,,,,,,,,,,,,,,0,0
@@ -92,14 +92,14 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 91,164,1,,20,,,,,,,,,,,,,,0,0
 92,166,1,,18,,,,,,,,,,,,,,0,0
 93,168,1,,22,,,,,,,,,,,,,,0,0
-94,169,1,,,,,,,,,160,,,,,,,0,0
+94,169,1,,,,,,,,,220,,,,,,,0,0
 95,171,1,,27,,,,,,,,,,,,,,0,0
-96,176,1,,,,,,,,,160,,,,,,,0,0
+96,176,1,,,,,,,,,220,,,,,,,0,0
 97,178,1,,25,,,,,,,,,,,,,,0,0
 98,180,1,,15,,,,,,,,,,,,,,0,0
 99,181,1,,30,,,,,,,,,,,,,,0,0
 100,182,3,80,,,,,,,,,,,,,,,0,0
-101,183,1,,,,,,,,,160,,,,,,,0,0
+101,183,1,,,,,,,,,220,,,,,,,0,0
 102,184,1,,18,,,,,,,,,,,,,,0,0
 103,185,1,,,,,,,102,,,,,,,,,0,0
 104,186,2,,,,,198,,,,,,,,,,,0,0
@@ -107,8 +107,8 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 106,189,1,,27,,,,,,,,,,,,,,0,0
 107,192,3,80,,,,,,,,,,,,,,,0,0
 108,195,1,,20,,,,,,,,,,,,,,0,0
-109,196,1,,,,,,day,,,160,,,,,,,0,0
+109,196,1,,,,,,day,,,220,,,,,,,0,0
-110,197,1,,,,,,night,,,160,,,,,,,0,0
+110,197,1,,,,,,night,,,220,,,,,,,0,0
 111,199,2,,,,,198,,,,,,,,,,,0,0
 112,202,1,,15,,,,,,,,,,,,,,0,0
 113,205,1,,31,,,,,,,,,,,,,,0,0
@@ -125,7 +125,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 124,232,1,,25,,,,,,,,,,,,,,0,0
 125,233,2,,,,,229,,,,,,,,,,,0,0
 126,237,1,,20,,,,,,,,,,0,,,,0,0
-127,242,1,,,,,,,,,160,,,,,,,0,0
+127,242,1,,,,,,,,,220,,,,,,,0,0
 128,247,1,,30,,,,,,,,,,,,,,0,0
 129,248,1,,55,,,,,,,,,,,,,,0,0
 130,253,1,,16,,,,,,,,,,,,,,0,0
@@ -162,7 +162,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 161,306,1,,42,,,,,,,,,,,,,,0,0
 162,308,1,,37,,,,,,,,,,,,,,0,0
 163,310,1,,26,,,,,,,,,,,,,,0,0
-164,315,1,,,,,,day,,,160,,,,,,,0,0
+164,315,1,,,,,,day,,,220,,,,,,,0,0
 165,317,1,,26,,,,,,,,,,,,,,0,0
 166,319,1,,30,,,,,,,,,,,,,,0,0
 167,321,1,,40,,,,,,,,,,,,,,0,0
@@ -213,7 +213,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 212,423,1,,30,,,,,,,,,,,,,,0,0
 213,424,1,,,,,,,458,,,,,,,,,0,0
 214,426,1,,28,,,,,,,,,,,,,,0,0
-215,428,1,,,,,,,,,160,,,,,,,0,0
+215,428,1,,,,,,,,,220,,,,,,,0,0
 216,429,3,108,,,,,,,,,,,,,,,0,0
 217,430,3,108,,,,,,,,,,,,,,,0,0
 218,432,1,,38,,,,,,,,,,,,,,0,0
@@ -221,7 +221,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 220,437,1,,33,,,,,,,,,,,,,,0,0
 221,444,1,,24,,,,,,,,,,,,,,0,0
 222,445,1,,48,,,,,,,,,,,,,,0,0
-223,448,1,,,,,,day,,,160,,,,,,,0,0
+223,448,1,,,,,,day,,,220,,,,,,,0,0
 224,450,1,,34,,,,,,,,,,,,,,0,0
 225,452,1,,40,,,,,,,,,,,,,,0,0
 226,454,1,,37,,,,,,,,,,,,,,0,0

pokedex/data/csv/pokemon_form_names.csv

@@ -46,11 +46,14 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 386,12,普通形态,
 412,1,くさきのミノ,
 412,3,초목도롱,
+412,4,草木蓑衣,
 412,5,Cape Plante,Cheniti Plante
 412,6,Pflanzenumhang,
 412,7,Tronco Planta,
 412,8,Manto Pianta,
 412,9,Plant Cloak,Plant Burmy
+412,11,くさきのミノ,
+412,12,草木蓑衣,
 413,1,くさきのミノ,
 413,3,초목도롱,
 413,4,草木蓑衣,
@@ -719,18 +722,24 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10033,12,速度形态,
 10034,1,すなちのミノ,
 10034,3,모래땅도롱,
+10034,4,砂土蓑衣,
 10034,5,Cape Sable,Cheniti Sable
 10034,6,Sandumhang,
 10034,7,Tronco Arena,
 10034,8,Manto Sabbia,
 10034,9,Sandy Cloak,Sandy Burmy
+10034,11,すなちのミノ,
+10034,12,砂土蓑衣,
 10035,1,ゴミのミノ,
 10035,3,슈레도롱,
+10035,4,垃圾蓑衣,
 10035,5,Cape Déchet,Cheniti Déchet
 10035,6,Lumpenumhang,
 10035,7,Tronco Basura,
 10035,8,Manto Scarti,
 10035,9,Trash Cloak,Trash Burmy
+10035,11,ゴミのミノ,
+10035,12,垃圾蓑衣,
 10036,1,すなちのミノ,
 10036,3,모래땅도롱,
 10036,4,砂土蓑衣,

pokedex/data/csv/pokemon_species.csv

@@ -11,18 +11,18 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 10,caterpie,1,,4,5,14,2,4,255,50,0,15,0,2,0,0,0,10,
 11,metapod,1,10,4,5,2,2,4,120,50,0,15,0,2,0,0,0,11,
 12,butterfree,1,11,4,9,13,2,4,45,50,0,15,1,2,0,0,0,12,
-13,weedle,1,,5,3,14,2,4,255,70,0,15,0,2,0,0,0,13,
+13,weedle,1,,5,3,14,2,4,255,50,0,15,0,2,0,0,0,13,
-14,kakuna,1,13,5,10,2,2,4,120,70,0,15,0,2,0,0,0,14,
+14,kakuna,1,13,5,10,2,2,4,120,50,0,15,0,2,0,0,0,14,
-15,beedrill,1,14,5,10,13,2,4,45,70,0,15,0,2,1,0,0,15,177
+15,beedrill,1,14,5,10,13,2,4,45,50,0,15,0,2,1,0,0,15,177
-16,pidgey,1,,6,3,9,2,4,255,70,0,15,0,4,0,0,0,16,
+16,pidgey,1,,6,3,9,2,4,255,50,0,15,0,4,0,0,0,16,
-17,pidgeotto,1,16,6,3,9,2,4,120,70,0,15,0,4,0,0,0,17,
+17,pidgeotto,1,16,6,3,9,2,4,120,50,0,15,0,4,0,0,0,17,
-18,pidgeot,1,17,6,3,9,2,4,45,70,0,15,0,4,1,0,0,18,
+18,pidgeot,1,17,6,3,9,2,4,45,50,0,15,0,4,1,0,0,18,
-19,rattata,1,,7,7,8,3,4,255,70,0,15,1,2,0,0,0,19,
+19,rattata,1,,7,7,8,3,4,255,50,0,15,1,2,0,0,0,19,
-20,raticate,1,19,7,3,8,3,4,127,70,0,15,1,2,0,0,0,20,
+20,raticate,1,19,7,3,8,3,4,127,50,0,15,1,2,0,0,0,20,
-21,spearow,1,,8,3,9,6,4,255,70,0,15,0,2,0,0,0,21,
+21,spearow,1,,8,3,9,6,4,255,50,0,15,0,2,0,0,0,21,
-22,fearow,1,21,8,3,9,6,4,90,70,0,15,0,2,0,0,0,22,
+22,fearow,1,21,8,3,9,6,4,90,50,0,15,0,2,0,0,0,22,
-23,ekans,1,,9,7,2,3,4,255,70,0,20,0,2,0,0,0,23,54
+23,ekans,1,,9,7,2,3,4,255,50,0,20,0,2,0,0,0,23,54
-24,arbok,1,23,9,7,2,3,4,90,70,0,20,0,2,0,0,0,24,55
+24,arbok,1,23,9,7,2,3,4,90,50,0,20,0,2,0,0,0,24,55
 25,pikachu,1,172,10,10,8,2,4,190,50,0,10,1,2,0,0,0,26,16
 26,raichu,1,25,10,10,6,2,4,75,50,0,10,1,2,0,0,0,27,17
 27,sandshrew,1,,11,10,6,6,4,255,50,0,20,0,2,0,0,0,28,
@@ -44,18 +44,18 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 43,oddish,1,,18,2,7,3,4,255,50,0,20,0,4,0,0,0,47,
 44,gloom,1,43,18,2,12,3,4,120,50,0,20,1,4,0,0,0,48,
 45,vileplume,1,44,18,8,12,3,4,45,50,0,20,1,4,0,0,0,49,
-46,paras,1,,19,8,14,2,4,190,70,0,20,0,2,0,0,0,51,
+46,paras,1,,19,8,14,2,4,190,50,0,20,0,2,0,0,0,51,
-47,parasect,1,46,19,8,14,2,4,75,70,0,20,0,2,0,0,0,52,
+47,parasect,1,46,19,8,14,2,4,75,50,0,20,0,2,0,0,0,52,
-48,venonat,1,,20,7,12,2,4,190,70,0,20,0,2,0,0,0,53,
+48,venonat,1,,20,7,12,2,4,190,50,0,20,0,2,0,0,0,53,
-49,venomoth,1,48,20,7,13,2,4,75,70,0,20,0,2,0,0,0,54,
+49,venomoth,1,48,20,7,13,2,4,75,50,0,20,0,2,0,0,0,54,
 50,diglett,1,,21,3,5,1,4,255,50,0,20,0,2,0,0,0,55,
 51,dugtrio,1,50,21,3,11,1,4,50,50,0,20,0,2,0,0,0,56,
 52,meowth,1,,22,10,8,8,4,255,50,0,20,0,2,0,0,0,57,58
 53,persian,1,52,22,10,8,8,4,90,50,0,20,0,2,0,0,0,58,59
 54,psyduck,1,,23,10,6,9,4,190,50,0,20,0,2,0,0,0,59,
 55,golduck,1,54,23,2,6,9,4,75,50,0,20,0,2,0,0,0,60,
-56,mankey,1,,24,3,6,4,4,190,70,0,20,0,2,0,0,0,61,
+56,mankey,1,,24,3,6,4,4,190,50,0,20,0,2,0,0,0,61,
-57,primeape,1,56,24,3,6,4,4,75,70,0,20,0,2,0,0,0,62,
+57,primeape,1,56,24,3,6,4,4,75,50,0,20,0,2,0,0,0,62,
 58,growlithe,1,,25,3,8,3,2,190,50,0,20,0,1,0,0,0,63,
 59,arcanine,1,58,25,3,8,3,2,75,50,0,20,0,1,0,0,0,64,
 60,poliwag,1,,26,2,7,9,4,255,50,0,20,0,4,0,0,0,65,
@@ -67,14 +67,14 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 66,machop,1,,28,4,6,4,2,180,50,0,20,0,4,0,0,0,72,98
 67,machoke,1,66,28,4,12,4,2,90,50,0,20,0,4,0,0,0,73,99
 68,machamp,1,67,28,4,12,4,2,45,50,0,20,0,4,0,0,0,74,100
-69,bellsprout,1,,29,5,12,2,4,255,70,0,20,0,4,0,0,0,75,
+69,bellsprout,1,,29,5,12,2,4,255,50,0,20,0,4,0,0,0,75,
-70,weepinbell,1,69,29,5,5,2,4,120,70,0,20,0,4,0,0,0,76,
+70,weepinbell,1,69,29,5,5,2,4,120,50,0,20,0,4,0,0,0,76,
-71,victreebel,1,70,29,5,5,2,4,45,70,0,20,0,4,0,0,0,77,
+71,victreebel,1,70,29,5,5,2,4,45,50,0,20,0,4,0,0,0,77,
 72,tentacool,1,,30,2,10,7,4,190,50,0,20,0,1,0,0,0,78,
 73,tentacruel,1,72,30,2,10,7,4,60,50,0,20,0,1,0,0,0,79,
-74,geodude,1,,31,3,4,4,4,255,70,0,15,0,4,0,0,0,80,
+74,geodude,1,,31,3,4,4,4,255,50,0,15,0,4,0,0,0,80,
-75,graveler,1,74,31,3,12,4,4,120,70,0,15,0,4,0,0,0,81,
+75,graveler,1,74,31,3,12,4,4,120,50,0,15,0,4,0,0,0,81,
-76,golem,1,75,31,3,12,4,4,45,70,0,15,0,4,0,0,0,82,
+76,golem,1,75,31,3,12,4,4,45,50,0,15,0,4,0,0,0,82,
 77,ponyta,1,,32,10,8,3,4,190,50,0,20,0,2,0,0,0,83,
 78,rapidash,1,77,32,10,8,3,4,60,50,0,20,0,2,0,0,0,84,
 79,slowpoke,1,,33,6,8,9,4,190,50,0,20,0,2,0,0,0,85,
@@ -82,24 +82,24 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 81,magnemite,1,,34,4,4,6,-1,190,50,0,20,0,2,0,0,0,88,
 82,magneton,1,81,34,4,11,6,-1,60,50,0,20,0,2,0,0,0,89,
 83,farfetchd,1,,35,3,9,3,4,45,50,0,20,0,2,0,0,0,91,
-84,doduo,1,,36,3,7,3,4,190,70,0,20,1,2,0,0,0,92,
+84,doduo,1,,36,3,7,3,4,190,50,0,20,1,2,0,0,0,92,
-85,dodrio,1,84,36,3,7,3,4,45,70,0,20,1,2,0,0,0,93,
+85,dodrio,1,84,36,3,7,3,4,45,50,0,20,1,2,0,0,0,93,
-86,seel,1,,37,9,3,7,4,190,70,0,20,0,2,0,0,0,94,
+86,seel,1,,37,9,3,7,4,190,50,0,20,0,2,0,0,0,94,
-87,dewgong,1,86,37,9,3,7,4,75,70,0,20,0,2,0,0,0,95,
+87,dewgong,1,86,37,9,3,7,4,75,50,0,20,0,2,0,0,0,95,
-88,grimer,1,,38,7,4,8,4,190,70,0,20,0,2,0,0,0,96,
+88,grimer,1,,38,7,4,8,4,190,50,0,20,0,2,0,0,0,96,
-89,muk,1,88,38,7,4,8,4,75,70,0,20,0,2,0,0,0,97,
+89,muk,1,88,38,7,4,8,4,75,50,0,20,0,2,0,0,0,97,
 90,shellder,1,,39,7,1,7,4,190,50,0,20,0,1,0,0,0,98,
 91,cloyster,1,90,39,7,1,7,4,60,50,0,20,0,1,0,0,0,99,
 92,gastly,1,,40,7,1,1,4,190,50,0,20,0,4,0,0,0,100,112
 93,haunter,1,92,40,7,4,1,4,90,50,0,20,0,4,0,0,0,101,113
 94,gengar,1,93,40,7,6,1,4,45,50,0,20,0,4,1,0,0,102,114
 95,onix,1,,41,4,2,1,4,45,50,0,25,0,2,0,0,0,103,175
-96,drowzee,1,,42,10,12,3,4,190,70,0,20,0,2,0,0,0,105,
+96,drowzee,1,,42,10,12,3,4,190,50,0,20,0,2,0,0,0,105,
-97,hypno,1,96,42,10,12,3,4,75,70,0,20,1,2,0,0,0,106,
+97,hypno,1,96,42,10,12,3,4,75,50,0,20,1,2,0,0,0,106,
 98,krabby,1,,43,8,14,9,4,225,50,0,20,0,2,0,0,0,107,
 99,kingler,1,98,43,8,14,9,4,60,50,0,20,0,2,0,0,0,108,
-100,voltorb,1,,44,8,1,8,-1,190,70,0,20,0,2,0,0,0,109,
+100,voltorb,1,,44,8,1,8,-1,190,50,0,20,0,2,0,0,0,109,
-101,electrode,1,100,44,8,1,8,-1,60,70,0,20,0,2,0,0,0,110,
+101,electrode,1,100,44,8,1,8,-1,60,50,0,20,0,2,0,0,0,110,
 102,exeggcute,1,,45,6,11,2,4,90,50,0,20,0,1,0,0,0,111,
 103,exeggutor,1,102,45,10,7,2,4,45,50,0,20,0,1,0,0,0,112,
 104,cubone,1,,46,3,6,4,4,190,50,0,20,0,2,0,0,0,113,
@@ -150,23 +150,23 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 149,dragonite,1,148,76,3,6,9,4,45,35,0,40,0,1,0,0,0,181,78
 150,mewtwo,1,,77,7,6,5,-1,3,0,0,120,0,1,1,1,0,182,196
 151,mew,1,,78,6,6,5,-1,45,100,0,120,0,4,0,0,1,183,
-152,chikorita,2,,79,5,8,3,1,45,70,0,20,0,4,0,0,0,184,
+152,chikorita,2,,79,5,8,3,1,45,50,0,20,0,4,0,0,0,184,
-153,bayleef,2,152,79,5,8,3,1,45,70,0,20,0,4,0,0,0,185,
+153,bayleef,2,152,79,5,8,3,1,45,50,0,20,0,4,0,0,0,185,
-154,meganium,2,153,79,5,8,3,1,45,70,0,20,1,4,0,0,0,186,
+154,meganium,2,153,79,5,8,3,1,45,50,0,20,1,4,0,0,0,186,
-155,cyndaquil,2,,80,10,12,3,1,45,70,0,20,0,4,0,0,0,187,
+155,cyndaquil,2,,80,10,12,3,1,45,50,0,20,0,4,0,0,0,187,
-156,quilava,2,155,80,10,8,3,1,45,70,0,20,0,4,0,0,0,188,
+156,quilava,2,155,80,10,8,3,1,45,50,0,20,0,4,0,0,0,188,
-157,typhlosion,2,156,80,10,8,3,1,45,70,0,20,0,4,0,0,0,189,
+157,typhlosion,2,156,80,10,8,3,1,45,50,0,20,0,4,0,0,0,189,
-158,totodile,2,,81,2,6,9,1,45,70,0,20,0,4,0,0,0,190,
+158,totodile,2,,81,2,6,9,1,45,50,0,20,0,4,0,0,0,190,
-159,croconaw,2,158,81,2,6,9,1,45,70,0,20,0,4,0,0,0,191,
+159,croconaw,2,158,81,2,6,9,1,45,50,0,20,0,4,0,0,0,191,
-160,feraligatr,2,159,81,2,6,9,1,45,70,0,20,0,4,0,0,0,192,
+160,feraligatr,2,159,81,2,6,9,1,45,50,0,20,0,4,0,0,0,192,
-161,sentret,2,,82,3,8,3,4,255,70,0,15,0,2,0,0,0,193,
+161,sentret,2,,82,3,8,3,4,255,50,0,15,0,2,0,0,0,193,
-162,furret,2,161,82,3,8,3,4,90,70,0,15,0,2,0,0,0,194,
+162,furret,2,161,82,3,8,3,4,90,50,0,15,0,2,0,0,0,194,
 163,hoothoot,2,,83,3,9,2,4,255,50,0,15,0,2,0,0,0,195,
 164,noctowl,2,163,83,3,9,2,4,90,50,0,15,0,2,0,0,0,196,
-165,ledyba,2,,84,8,9,2,4,255,70,0,15,1,3,0,0,0,197,
+165,ledyba,2,,84,8,9,2,4,255,50,0,15,1,3,0,0,0,197,
-166,ledian,2,165,84,8,9,2,4,90,70,0,15,1,3,0,0,0,198,
+166,ledian,2,165,84,8,9,2,4,90,50,0,15,1,3,0,0,0,198,
-167,spinarak,2,,85,5,14,2,4,255,70,0,15,0,3,0,0,0,199,
+167,spinarak,2,,85,5,14,2,4,255,50,0,15,0,3,0,0,0,199,
-168,ariados,2,167,85,8,14,2,4,90,70,0,15,0,3,0,0,0,200,
+168,ariados,2,167,85,8,14,2,4,90,50,0,15,0,3,0,0,0,200,
 169,crobat,2,42,17,7,13,1,4,90,50,0,15,0,2,0,0,0,46,25
 170,chinchou,2,,86,2,3,7,4,190,50,0,20,0,1,0,0,0,201,
 171,lanturn,2,170,86,2,3,7,4,75,50,0,20,0,1,0,0,0,202,
@@ -177,21 +177,21 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 176,togetic,2,175,87,9,12,2,1,75,50,0,10,0,3,0,0,0,204,
 177,natu,2,,88,5,9,2,4,190,50,0,20,0,2,0,0,0,206,
 178,xatu,2,177,88,5,9,2,4,75,50,0,20,1,2,0,0,0,207,
-179,mareep,2,,89,9,8,3,4,235,70,0,20,0,4,0,0,0,208,45
+179,mareep,2,,89,9,8,3,4,235,50,0,20,0,4,0,0,0,208,45
-180,flaaffy,2,179,89,6,6,3,4,120,70,0,20,0,4,0,0,0,209,46
+180,flaaffy,2,179,89,6,6,3,4,120,50,0,20,0,4,0,0,0,209,46
-181,ampharos,2,180,89,10,6,3,4,45,70,0,20,0,4,1,0,0,210,47
+181,ampharos,2,180,89,10,6,3,4,45,50,0,20,0,4,1,0,0,210,47
 182,bellossom,2,44,18,5,12,3,4,45,50,0,20,0,4,0,0,0,50,
 183,marill,2,298,90,2,6,9,4,190,50,0,10,0,3,0,0,0,212,
 184,azumarill,2,183,90,2,6,9,4,75,50,0,10,0,3,0,0,0,213,
 185,sudowoodo,2,438,91,3,12,2,4,65,50,0,20,1,2,0,0,0,215,
 186,politoed,2,61,26,5,12,9,4,45,50,0,20,1,4,0,0,0,68,
-187,hoppip,2,,92,6,6,3,4,255,70,0,20,0,4,0,0,0,216,
+187,hoppip,2,,92,6,6,3,4,255,50,0,20,0,4,0,0,0,216,
-188,skiploom,2,187,92,5,6,3,4,120,70,0,20,0,4,0,0,0,217,
+188,skiploom,2,187,92,5,6,3,4,120,50,0,20,0,4,0,0,0,217,
-189,jumpluff,2,188,92,2,6,3,4,45,70,0,20,0,4,0,0,0,218,
+189,jumpluff,2,188,92,2,6,3,4,45,50,0,20,0,4,0,0,0,218,
-190,aipom,2,,93,7,6,2,4,45,70,0,20,1,3,0,0,0,219,
+190,aipom,2,,93,7,6,2,4,45,50,0,20,1,3,0,0,0,219,
-191,sunkern,2,,94,10,1,3,4,235,70,0,20,0,4,0,0,0,221,
+191,sunkern,2,,94,10,1,3,4,235,50,0,20,0,4,0,0,0,221,
-192,sunflora,2,191,94,10,12,3,4,120,70,0,20,0,4,0,0,0,222,
+192,sunflora,2,191,94,10,12,3,4,120,50,0,20,0,4,0,0,0,222,
-193,yanma,2,,95,8,13,2,4,75,70,0,20,0,2,0,0,0,223,
+193,yanma,2,,95,8,13,2,4,75,50,0,20,0,2,0,0,0,223,
 194,wooper,2,,96,2,7,9,4,255,50,0,20,1,2,0,0,0,225,18
 195,quagsire,2,194,96,2,6,9,4,90,50,0,20,1,2,0,0,0,226,19
 196,espeon,2,133,67,7,8,8,1,45,50,0,35,0,2,0,0,0,161,5
@@ -199,25 +199,25 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 198,murkrow,2,,97,1,9,2,4,30,35,0,20,1,4,0,0,0,227,
 199,slowking,2,79,33,6,6,9,4,70,50,0,20,0,2,0,0,0,87,
 200,misdreavus,2,,98,4,1,1,4,45,35,0,25,0,3,0,0,0,229,183
-201,unown,2,,99,1,1,5,-1,225,70,0,40,0,2,0,0,0,231,
+201,unown,2,,99,1,1,5,-1,225,50,0,40,0,2,0,0,0,231,
 202,wobbuffet,2,360,100,2,5,1,4,45,50,0,20,1,2,0,0,0,233,
-203,girafarig,2,,101,10,8,3,4,60,70,0,20,1,2,0,0,0,234,
+203,girafarig,2,,101,10,8,3,4,60,50,0,20,1,2,0,0,0,234,
-204,pineco,2,,102,4,1,2,4,190,70,0,20,0,2,0,0,0,235,56
+204,pineco,2,,102,4,1,2,4,190,50,0,20,0,2,0,0,0,235,56
-205,forretress,2,204,102,7,1,2,4,75,70,0,20,0,2,0,0,0,236,57
+205,forretress,2,204,102,7,1,2,4,75,50,0,20,0,2,0,0,0,236,57
 206,dunsparce,2,,103,10,2,1,4,190,50,0,20,0,2,0,0,0,237,
-207,gligar,2,,104,7,9,4,4,60,70,0,20,1,4,0,0,0,238,
+207,gligar,2,,104,7,9,4,4,60,50,0,20,1,4,0,0,0,238,
 208,steelix,2,95,41,4,2,1,4,25,50,0,25,1,2,1,0,0,104,176
-209,snubbull,2,,105,6,12,8,6,190,70,0,20,0,3,0,0,0,240,
+209,snubbull,2,,105,6,12,8,6,190,50,0,20,0,3,0,0,0,240,
-210,granbull,2,209,105,7,6,8,6,75,70,0,20,0,3,0,0,0,241,
+210,granbull,2,209,105,7,6,8,6,75,50,0,20,0,3,0,0,0,241,
 211,qwilfish,2,,106,4,3,7,4,45,50,0,20,0,2,0,0,0,242,
 212,scizor,2,123,58,8,13,3,4,25,50,0,25,1,2,1,0,0,142,189
 213,shuckle,2,,107,10,14,4,4,190,50,0,20,0,4,0,0,0,243,
 214,heracross,2,,108,2,12,2,4,45,50,0,25,1,1,1,0,0,244,
 215,sneasel,2,,109,1,6,2,4,60,35,0,20,1,4,0,0,0,245,181
-216,teddiursa,2,,110,3,6,4,4,120,70,0,20,0,2,0,0,0,247,
+216,teddiursa,2,,110,3,6,4,4,120,50,0,20,0,2,0,0,0,247,
-217,ursaring,2,216,110,3,6,4,4,60,70,0,20,1,2,0,0,0,248,
+217,ursaring,2,216,110,3,6,4,4,60,50,0,20,1,2,0,0,0,248,
-218,slugma,2,,111,8,2,4,4,190,70,0,20,0,2,0,0,0,249,
+218,slugma,2,,111,8,2,4,4,190,50,0,20,0,2,0,0,0,249,
-219,magcargo,2,218,111,8,2,4,4,75,70,0,20,0,2,0,0,0,250,
+219,magcargo,2,218,111,8,2,4,4,75,50,0,20,0,2,0,0,0,250,
 220,swinub,2,,112,3,8,1,4,225,50,0,20,0,1,0,0,0,251,
 221,piloswine,2,220,112,3,8,1,4,75,50,0,20,1,1,0,0,0,252,
 222,corsola,2,,113,6,14,7,6,60,50,0,20,0,3,0,0,0,254,
@@ -229,11 +229,11 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 228,houndour,2,,118,1,8,6,4,120,35,0,20,0,1,0,0,0,261,
 229,houndoom,2,228,118,1,8,6,4,45,35,0,20,1,1,1,0,0,262,
 230,kingdra,2,117,54,2,5,7,4,45,50,0,20,0,2,0,0,0,134,
-231,phanpy,2,,119,2,8,6,4,120,70,0,20,0,2,0,0,0,263,
+231,phanpy,2,,119,2,8,6,4,120,50,0,20,0,2,0,0,0,263,
-232,donphan,2,231,119,4,8,6,4,60,70,0,20,1,2,0,0,0,264,
+232,donphan,2,231,119,4,8,6,4,60,50,0,20,1,2,0,0,0,264,
 233,porygon2,2,137,68,8,7,8,-1,45,50,0,20,0,2,0,0,0,167,
-234,stantler,2,,120,3,8,2,4,45,70,0,20,0,1,0,0,0,265,
+234,stantler,2,,120,3,8,2,4,45,50,0,20,0,1,0,0,0,265,
-235,smeargle,2,,121,9,6,8,4,45,70,0,20,0,3,0,0,0,266,
+235,smeargle,2,,121,9,6,8,4,45,50,0,20,0,3,0,0,0,266,
 236,tyrogue,2,,47,7,12,8,0,75,50,1,25,0,2,0,0,0,115,
 237,hitmontop,2,236,47,3,6,8,0,45,50,0,25,0,2,0,0,0,118,
 238,smoochum,2,,59,6,12,8,8,45,50,1,25,0,2,0,0,0,143,
@@ -259,73 +259,73 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 258,mudkip,3,,132,2,8,9,1,45,50,0,20,0,4,0,0,0,283,
 259,marshtomp,3,258,132,2,6,9,1,45,50,0,20,0,4,0,0,0,284,
 260,swampert,3,259,132,2,6,9,1,45,50,0,20,0,4,1,0,0,285,
-261,poochyena,3,,133,4,8,3,4,255,70,0,15,0,2,0,0,0,286,
+261,poochyena,3,,133,4,8,3,4,255,50,0,15,0,2,0,0,0,286,
-262,mightyena,3,261,133,4,8,3,4,127,70,0,15,0,2,0,0,0,287,
+262,mightyena,3,261,133,4,8,3,4,127,50,0,15,0,2,0,0,0,287,
 263,zigzagoon,3,,134,3,8,3,4,255,50,0,15,0,2,0,0,0,288,
 264,linoone,3,263,134,9,8,3,4,90,50,0,15,0,2,0,0,0,289,
-265,wurmple,3,,135,8,14,2,4,255,70,0,15,0,2,0,0,0,290,
+265,wurmple,3,,135,8,14,2,4,255,50,0,15,0,2,0,0,0,290,
-266,silcoon,3,265,135,9,1,2,4,120,70,0,15,0,2,0,0,0,291,
+266,silcoon,3,265,135,9,1,2,4,120,50,0,15,0,2,0,0,0,291,
-267,beautifly,3,266,135,10,13,2,4,45,70,0,15,1,2,0,0,0,292,
+267,beautifly,3,266,135,10,13,2,4,45,50,0,15,1,2,0,0,0,292,
-268,cascoon,3,265,135,7,1,2,4,120,70,0,15,0,2,0,0,0,293,
+268,cascoon,3,265,135,7,1,2,4,120,50,0,15,0,2,0,0,0,293,
-269,dustox,3,268,135,5,13,2,4,45,70,0,15,1,2,0,0,0,294,
+269,dustox,3,268,135,5,13,2,4,45,50,0,15,1,2,0,0,0,294,
 270,lotad,3,,136,5,14,9,4,255,50,0,15,0,4,0,0,0,295,
 271,lombre,3,270,136,5,12,9,4,120,50,0,15,0,4,0,0,0,296,
 272,ludicolo,3,271,136,5,12,9,4,45,50,0,15,1,4,0,0,0,297,
 273,seedot,3,,137,3,7,2,4,255,50,0,15,0,4,0,0,0,298,
 274,nuzleaf,3,273,137,3,12,2,4,120,50,0,15,1,4,0,0,0,299,
 275,shiftry,3,274,137,3,12,2,4,45,50,0,15,1,4,0,0,0,300,
-276,taillow,3,,138,2,9,3,4,200,70,0,15,0,4,0,0,0,301,
+276,taillow,3,,138,2,9,3,4,200,50,0,15,0,4,0,0,0,301,
-277,swellow,3,276,138,2,9,3,4,45,70,0,15,0,4,0,0,0,302,
+277,swellow,3,276,138,2,9,3,4,45,50,0,15,0,4,0,0,0,302,
 278,wingull,3,,139,9,9,7,4,190,50,0,20,0,2,0,0,0,303,
 279,pelipper,3,278,139,10,9,7,4,45,50,0,20,0,2,0,0,0,304,
 280,ralts,3,,140,9,12,8,4,235,35,0,20,0,1,0,0,0,305,9
 281,kirlia,3,280,140,9,12,8,4,120,35,0,20,0,1,0,0,0,306,10
 282,gardevoir,3,281,140,9,12,8,4,45,35,0,20,0,1,1,0,0,307,11
-283,surskit,3,,141,2,14,9,4,200,70,0,15,0,2,0,0,0,309,
+283,surskit,3,,141,2,14,9,4,200,50,0,15,0,2,0,0,0,309,
-284,masquerain,3,283,141,2,13,9,4,75,70,0,15,0,2,0,0,0,310,
+284,masquerain,3,283,141,2,13,9,4,75,50,0,15,0,2,0,0,0,310,
-285,shroomish,3,,142,3,7,2,4,255,70,0,15,0,6,0,0,0,311,
+285,shroomish,3,,142,3,7,2,4,255,50,0,15,0,6,0,0,0,311,
-286,breloom,3,285,142,5,6,2,4,90,70,0,15,0,6,0,0,0,312,
+286,breloom,3,285,142,5,6,2,4,90,50,0,15,0,6,0,0,0,312,
-287,slakoth,3,,143,3,8,2,4,255,70,0,15,0,1,0,0,0,313,
+287,slakoth,3,,143,3,8,2,4,255,50,0,15,0,1,0,0,0,313,
-288,vigoroth,3,287,143,9,6,2,4,120,70,0,15,0,1,0,0,0,314,
+288,vigoroth,3,287,143,9,6,2,4,120,50,0,15,0,1,0,0,0,314,
-289,slaking,3,288,143,3,12,2,4,45,70,0,15,0,1,0,0,0,315,
+289,slaking,3,288,143,3,12,2,4,45,50,0,15,0,1,0,0,0,315,
 290,nincada,3,,144,4,14,2,4,255,50,0,15,0,5,0,0,0,316,
 291,ninjask,3,290,144,10,13,2,4,120,50,0,15,0,5,0,0,0,317,
 292,shedinja,3,290,144,3,5,2,-1,45,50,0,15,0,5,0,0,0,318,
 293,whismur,3,,145,6,6,1,4,190,50,0,20,0,4,0,0,0,319,
 294,loudred,3,293,145,2,6,1,4,120,50,0,20,0,4,0,0,0,320,
 295,exploud,3,294,145,2,6,1,4,45,50,0,20,0,4,0,0,0,321,
-296,makuhita,3,,146,10,12,4,2,180,70,0,20,0,6,0,0,0,322,
+296,makuhita,3,,146,10,12,4,2,180,50,0,20,0,6,0,0,0,322,
-297,hariyama,3,296,146,3,12,4,2,200,70,0,20,0,6,0,0,0,323,
+297,hariyama,3,296,146,3,12,4,2,200,50,0,20,0,6,0,0,0,323,
 298,azurill,3,,90,2,7,9,6,150,50,1,10,0,3,0,0,0,211,
-299,nosepass,3,,147,4,12,1,4,255,70,0,20,0,2,0,0,0,324,
+299,nosepass,3,,147,4,12,1,4,255,50,0,20,0,2,0,0,0,324,
-300,skitty,3,,148,6,8,2,6,255,70,0,15,0,3,0,0,0,326,
+300,skitty,3,,148,6,8,2,6,255,50,0,15,0,3,0,0,0,326,
-301,delcatty,3,300,148,7,8,2,6,60,70,0,15,0,3,0,0,0,327,
+301,delcatty,3,300,148,7,8,2,6,60,50,0,15,0,3,0,0,0,327,
 302,sableye,3,,149,7,12,1,4,45,35,0,25,0,4,1,0,0,328,
 303,mawile,3,,150,1,12,1,4,45,50,0,20,0,3,1,0,0,329,
 304,aron,3,,151,4,8,4,4,180,35,0,35,0,1,0,0,0,330,149
 305,lairon,3,304,151,4,8,4,4,90,35,0,35,0,1,0,0,0,331,150
 306,aggron,3,305,151,4,6,4,4,45,35,0,35,0,1,1,0,0,332,151
-307,meditite,3,,152,2,12,4,4,180,70,0,20,1,2,0,0,0,333,
+307,meditite,3,,152,2,12,4,4,180,50,0,20,1,2,0,0,0,333,
-308,medicham,3,307,152,8,12,4,4,90,70,0,20,1,2,1,0,0,334,
+308,medicham,3,307,152,8,12,4,4,90,50,0,20,1,2,1,0,0,334,
 309,electrike,3,,153,5,8,3,4,120,50,0,20,0,1,0,0,0,335,
 310,manectric,3,309,153,10,8,3,4,45,50,0,20,0,1,1,0,0,336,
-311,plusle,3,,154,10,6,3,4,200,70,0,20,0,2,0,0,0,337,
+311,plusle,3,,154,10,6,3,4,200,50,0,20,0,2,0,0,0,337,
-312,minun,3,,155,10,6,3,4,200,70,0,20,0,2,0,0,0,338,
+312,minun,3,,155,10,6,3,4,200,50,0,20,0,2,0,0,0,338,
-313,volbeat,3,,156,4,6,2,0,150,70,0,15,0,5,0,0,0,339,
+313,volbeat,3,,156,4,6,2,0,150,50,0,15,0,5,0,0,0,339,
-314,illumise,3,,157,7,12,2,8,150,70,0,15,0,6,0,0,0,340,
+314,illumise,3,,157,7,12,2,8,150,50,0,15,0,6,0,0,0,340,
 315,roselia,3,406,158,5,12,3,4,150,50,0,20,1,4,0,0,0,342,
-316,gulpin,3,,159,5,4,3,4,225,70,0,20,1,6,0,0,0,344,
+316,gulpin,3,,159,5,4,3,4,225,50,0,20,1,6,0,0,0,344,
-317,swalot,3,316,159,7,4,3,4,75,70,0,20,1,6,0,0,0,345,
+317,swalot,3,316,159,7,4,3,4,75,50,0,20,1,6,0,0,0,345,
 318,carvanha,3,,160,8,3,7,4,225,35,0,20,0,1,0,0,0,346,
 319,sharpedo,3,318,160,2,3,7,4,60,35,0,20,0,1,1,0,0,347,
 320,wailmer,3,,161,2,3,7,4,125,50,0,40,0,6,0,0,0,348,
 321,wailord,3,320,161,2,3,7,4,60,50,0,40,0,6,0,0,0,349,
-322,numel,3,,162,10,8,4,4,255,70,0,20,1,2,0,0,0,350,
+322,numel,3,,162,10,8,4,4,255,50,0,20,1,2,0,0,0,350,
-323,camerupt,3,322,162,8,8,4,4,150,70,0,20,1,2,1,0,0,351,
+323,camerupt,3,322,162,8,8,4,4,150,50,0,20,1,2,1,0,0,351,
 324,torkoal,3,,163,3,8,4,4,90,50,0,20,0,2,0,0,0,352,
-325,spoink,3,,164,1,4,4,4,255,70,0,20,0,3,0,0,0,353,
+325,spoink,3,,164,1,4,4,4,255,50,0,20,0,3,0,0,0,353,
-326,grumpig,3,325,164,7,6,4,4,60,70,0,20,0,3,0,0,0,354,
+326,grumpig,3,325,164,7,6,4,4,60,50,0,20,0,3,0,0,0,354,
-327,spinda,3,,165,3,6,4,4,255,70,0,15,0,3,0,0,0,355,
+327,spinda,3,,165,3,6,4,4,255,50,0,15,0,3,0,0,0,355,
 328,trapinch,3,,166,3,14,6,4,255,50,0,20,0,4,0,0,0,356,
 329,vibrava,3,328,166,5,13,6,4,120,50,0,20,0,4,0,0,0,357,
 330,flygon,3,329,166,5,9,6,4,45,50,0,20,0,4,0,0,0,358,
@@ -333,8 +333,8 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 332,cacturne,3,331,167,5,12,6,4,60,35,0,20,1,4,0,0,0,360,
 333,swablu,3,,168,2,9,2,4,255,50,0,20,0,5,0,0,0,361,
 334,altaria,3,333,168,2,9,2,4,45,50,0,20,0,5,1,0,0,362,
-335,zangoose,3,,169,9,6,3,4,90,70,0,20,0,5,0,0,0,363,
+335,zangoose,3,,169,9,6,3,4,90,50,0,20,0,5,0,0,0,363,
-336,seviper,3,,170,1,2,3,4,90,70,0,20,0,6,0,0,0,364,
+336,seviper,3,,170,1,2,3,4,90,50,0,20,0,6,0,0,0,364,
 337,lunatone,3,,171,10,1,1,-1,45,50,0,25,0,3,0,0,0,365,
 338,solrock,3,,172,8,1,1,-1,45,50,0,25,0,3,0,0,0,366,
 339,barboach,3,,173,4,3,9,4,190,50,0,20,0,2,0,0,0,367,
@@ -349,14 +349,14 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 348,armaldo,3,347,177,4,6,9,1,45,50,0,30,0,5,0,0,0,376,172
 349,feebas,3,,178,3,3,9,4,255,50,0,20,0,5,0,0,0,377,
 350,milotic,3,349,178,6,2,9,4,60,50,0,20,1,5,0,0,0,378,
-351,castform,3,,179,4,1,3,4,45,70,0,25,0,2,1,0,0,379,
+351,castform,3,,179,4,1,3,4,45,50,0,25,0,2,1,0,0,379,
-352,kecleon,3,,180,5,6,2,4,200,70,0,20,0,4,0,0,0,380,
+352,kecleon,3,,180,5,6,2,4,200,50,0,20,0,4,0,0,0,380,
 353,shuppet,3,,181,1,1,8,4,225,35,0,25,0,3,0,0,0,381,
 354,banette,3,353,181,1,6,8,4,45,35,0,25,0,3,1,0,0,382,
 355,duskull,3,,182,1,4,2,4,190,35,0,25,0,3,0,0,0,383,69
 356,dusclops,3,355,182,1,12,2,4,90,35,0,25,0,3,0,0,0,384,70
-357,tropius,3,,183,5,8,2,4,200,70,0,25,0,1,0,0,0,386,
+357,tropius,3,,183,5,8,2,4,200,50,0,25,0,1,0,0,0,386,
-358,chimecho,3,433,184,2,4,3,4,45,70,0,25,0,3,0,0,0,388,53
+358,chimecho,3,433,184,2,4,3,4,45,50,0,25,0,3,0,0,0,388,53
 359,absol,3,,185,9,8,4,4,30,35,0,25,0,4,1,0,0,389,
 360,wynaut,3,,100,2,6,1,4,125,50,1,20,0,2,0,0,0,232,
 361,snorunt,3,,186,4,12,1,4,190,50,0,20,0,2,0,0,0,390,93
@@ -364,11 +364,11 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 363,spheal,3,,187,2,3,7,4,255,50,0,20,0,4,0,0,0,393,60
 364,sealeo,3,363,187,2,3,7,4,120,50,0,20,0,4,0,0,0,394,61
 365,walrein,3,364,187,2,8,7,4,45,50,0,20,0,4,0,0,0,395,62
-366,clamperl,3,,188,2,1,7,4,255,70,0,20,0,5,0,0,0,396,
+366,clamperl,3,,188,2,1,7,4,255,50,0,20,0,5,0,0,0,396,
-367,huntail,3,366,188,2,2,7,4,60,70,0,20,0,5,0,0,0,397,
+367,huntail,3,366,188,2,2,7,4,60,50,0,20,0,5,0,0,0,397,
-368,gorebyss,3,366,188,6,2,7,4,60,70,0,20,0,5,0,0,0,398,
+368,gorebyss,3,366,188,6,2,7,4,60,50,0,20,0,5,0,0,0,398,
 369,relicanth,3,,189,4,3,7,1,25,50,0,40,1,1,0,0,0,399,
-370,luvdisc,3,,190,6,3,7,6,225,70,0,20,0,3,0,0,0,400,
+370,luvdisc,3,,190,6,3,7,6,225,50,0,20,0,3,0,0,0,400,
 371,bagon,3,,191,2,12,6,4,45,35,0,40,0,1,0,0,0,401,
 372,shelgon,3,371,191,9,8,6,4,45,35,0,40,0,1,0,0,0,402,
 373,salamence,3,372,191,2,8,6,4,45,35,0,40,0,1,1,0,0,403,
@@ -385,39 +385,39 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 384,rayquaza,3,,200,5,2,5,-1,45,0,0,120,0,1,1,1,0,414,200
 385,jirachi,3,,201,10,12,4,-1,3,100,0,120,0,1,0,0,1,415,
 386,deoxys,3,,202,8,12,5,-1,3,0,0,120,0,1,1,0,1,416,
-387,turtwig,4,,203,5,8,,1,45,70,0,20,0,4,0,0,0,417,
+387,turtwig,4,,203,5,8,,1,45,50,0,20,0,4,0,0,0,417,
-388,grotle,4,387,203,5,8,,1,45,70,0,20,0,4,0,0,0,418,
+388,grotle,4,387,203,5,8,,1,45,50,0,20,0,4,0,0,0,418,
-389,torterra,4,388,203,5,8,,1,45,70,0,20,0,4,0,0,0,419,
+389,torterra,4,388,203,5,8,,1,45,50,0,20,0,4,0,0,0,419,
-390,chimchar,4,,204,3,6,,1,45,70,0,20,0,4,0,0,0,420,115
+390,chimchar,4,,204,3,6,,1,45,50,0,20,0,4,0,0,0,420,115
-391,monferno,4,390,204,3,6,,1,45,70,0,20,0,4,0,0,0,421,116
+391,monferno,4,390,204,3,6,,1,45,50,0,20,0,4,0,0,0,421,116
-392,infernape,4,391,204,3,6,,1,45,70,0,20,0,4,0,0,0,422,117
+392,infernape,4,391,204,3,6,,1,45,50,0,20,0,4,0,0,0,422,117
-393,piplup,4,,205,2,12,,1,45,70,0,20,0,4,0,0,0,423,133
+393,piplup,4,,205,2,12,,1,45,50,0,20,0,4,0,0,0,423,133
-394,prinplup,4,393,205,2,6,,1,45,70,0,20,0,4,0,0,0,424,134
+394,prinplup,4,393,205,2,6,,1,45,50,0,20,0,4,0,0,0,424,134
-395,empoleon,4,394,205,2,6,,1,45,70,0,20,0,4,0,0,0,425,135
+395,empoleon,4,394,205,2,6,,1,45,50,0,20,0,4,0,0,0,425,135
-396,starly,4,,206,3,9,,4,255,70,0,15,1,4,0,0,0,426,26
+396,starly,4,,206,3,9,,4,255,50,0,15,1,4,0,0,0,426,26
-397,staravia,4,396,206,3,9,,4,120,70,0,15,1,4,0,0,0,427,27
+397,staravia,4,396,206,3,9,,4,120,50,0,15,1,4,0,0,0,427,27
-398,staraptor,4,397,206,3,9,,4,45,70,0,15,1,4,0,0,0,428,28
+398,staraptor,4,397,206,3,9,,4,45,50,0,15,1,4,0,0,0,428,28
-399,bidoof,4,,207,3,8,,4,255,70,0,15,1,2,0,0,0,429,29
+399,bidoof,4,,207,3,8,,4,255,50,0,15,1,2,0,0,0,429,29
-400,bibarel,4,399,207,3,6,,4,127,70,0,15,1,2,0,0,0,430,30
+400,bibarel,4,399,207,3,6,,4,127,50,0,15,1,2,0,0,0,430,30
-401,kricketot,4,,208,8,12,,4,255,70,0,15,1,4,0,0,0,431,
+401,kricketot,4,,208,8,12,,4,255,50,0,15,1,4,0,0,0,431,
-402,kricketune,4,401,208,8,13,,4,45,70,0,15,1,4,0,0,0,432,
+402,kricketune,4,401,208,8,13,,4,45,50,0,15,1,4,0,0,0,432,
 403,shinx,4,,209,2,8,,4,235,50,0,20,1,4,0,0,0,433,34
 404,luxio,4,403,209,2,8,,4,120,100,0,20,1,4,0,0,0,434,35
 405,luxray,4,404,209,2,8,,4,45,50,0,20,1,4,0,0,0,435,36
 406,budew,4,,158,5,12,,4,255,50,1,20,0,4,0,0,0,341,
 407,roserade,4,315,158,5,12,,4,75,50,0,20,1,4,0,0,0,343,
-408,cranidos,4,,211,2,6,,1,45,70,0,30,0,5,0,0,0,436,
+408,cranidos,4,,211,2,6,,1,45,50,0,30,0,5,0,0,0,436,
-409,rampardos,4,408,211,2,6,,1,45,70,0,30,0,5,0,0,0,437,
+409,rampardos,4,408,211,2,6,,1,45,50,0,30,0,5,0,0,0,437,
-410,shieldon,4,,212,4,8,,1,45,70,0,30,0,5,0,0,0,438,163
+410,shieldon,4,,212,4,8,,1,45,50,0,30,0,5,0,0,0,438,163
-411,bastiodon,4,410,212,4,8,,1,45,70,0,30,0,5,0,0,0,439,164
+411,bastiodon,4,410,212,4,8,,1,45,50,0,30,0,5,0,0,0,439,164
-412,burmy,4,,213,5,5,,4,120,70,0,15,0,2,1,0,0,440,
+412,burmy,4,,213,5,5,,4,120,50,0,15,0,2,1,0,0,440,
-413,wormadam,4,412,213,5,5,,8,45,70,0,15,0,2,0,0,0,441,
+413,wormadam,4,412,213,5,5,,8,45,50,0,15,0,2,0,0,0,441,
-414,mothim,4,412,213,10,13,,0,45,70,0,15,0,2,0,0,0,442,
+414,mothim,4,412,213,10,13,,0,45,50,0,15,0,2,0,0,0,442,
 415,combee,4,,214,10,11,,1,120,50,0,15,1,4,0,0,0,443,
 416,vespiquen,4,415,214,10,13,,8,45,50,0,15,0,4,0,0,0,444,
 417,pachirisu,4,,215,9,8,,4,200,100,0,10,1,2,0,0,0,445,
-418,buizel,4,,216,3,8,,4,190,70,0,20,1,2,0,0,0,446,
+418,buizel,4,,216,3,8,,4,190,50,0,20,1,2,0,0,0,446,
-419,floatzel,4,418,216,3,8,,4,75,70,0,20,1,2,0,0,0,447,
+419,floatzel,4,418,216,3,8,,4,75,50,0,20,1,2,0,0,0,447,
 420,cherubi,4,,217,6,11,,4,190,50,0,20,0,2,0,0,0,448,
 421,cherrim,4,420,217,7,7,,4,75,50,0,20,0,2,1,0,0,449,
 422,shellos,4,,218,7,2,,4,190,50,0,20,0,2,0,0,0,450,
@@ -429,9 +429,9 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 428,lopunny,4,427,220,3,6,,4,60,140,0,20,0,2,1,0,0,455,
 429,mismagius,4,200,98,7,1,,4,45,35,0,25,0,3,0,0,0,230,184
 430,honchkrow,4,198,97,1,9,,4,30,35,0,20,0,4,0,0,0,228,
-431,glameow,4,,221,4,8,,6,190,70,0,20,0,3,0,0,0,456,
+431,glameow,4,,221,4,8,,6,190,50,0,20,0,3,0,0,0,456,
-432,purugly,4,431,221,4,8,,6,75,70,0,20,0,3,0,0,0,457,
+432,purugly,4,431,221,4,8,,6,75,50,0,20,0,3,0,0,0,457,
-433,chingling,4,,184,10,12,,4,120,70,1,25,0,3,0,0,0,387,52
+433,chingling,4,,184,10,12,,4,120,50,1,25,0,3,0,0,0,387,52
 434,stunky,4,,223,7,8,,4,225,50,0,20,0,2,0,0,0,458,
 435,skuntank,4,434,223,7,8,,4,60,50,0,20,0,2,0,0,0,459,
 436,bronzor,4,,224,5,1,,-1,255,50,0,20,0,2,0,0,0,460,
@@ -453,9 +453,9 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 452,drapion,4,451,234,7,14,,4,45,50,0,20,0,1,0,0,0,472,157
 453,croagunk,4,,235,2,12,,4,140,100,0,10,1,2,0,0,0,473,88
 454,toxicroak,4,453,235,2,12,,4,75,50,0,20,1,2,0,0,0,474,89
-455,carnivine,4,,236,5,10,,4,200,70,0,25,0,1,0,0,0,475,186
+455,carnivine,4,,236,5,10,,4,200,50,0,25,0,1,0,0,0,475,186
-456,finneon,4,,237,2,3,,4,190,70,0,20,1,5,0,0,0,476,
+456,finneon,4,,237,2,3,,4,190,50,0,20,1,5,0,0,0,476,
-457,lumineon,4,456,237,2,3,,4,75,70,0,20,1,5,0,0,0,477,
+457,lumineon,4,456,237,2,3,,4,75,50,0,20,1,5,0,0,0,477,
 458,mantyke,4,,116,2,9,,4,25,50,1,25,0,1,0,0,0,258,
 459,snover,4,,239,9,6,,4,120,50,0,20,1,1,0,0,0,478,
 460,abomasnow,4,459,239,9,6,,4,60,50,0,20,1,1,1,0,0,479,
@@ -467,14 +467,14 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 466,electivire,4,125,60,10,6,,2,30,50,0,25,0,2,0,0,0,147,
 467,magmortar,4,126,61,8,6,,2,30,50,0,25,0,2,0,0,0,150,
 468,togekiss,4,176,87,9,9,,1,30,50,0,10,0,3,0,0,0,205,
-469,yanmega,4,193,95,5,13,,4,30,70,0,20,0,2,0,0,0,224,
+469,yanmega,4,193,95,5,13,,4,30,50,0,20,0,2,0,0,0,224,
 470,leafeon,4,133,67,5,8,,1,45,35,0,35,0,2,0,0,0,163,7
 471,glaceon,4,133,67,2,8,,1,45,35,0,35,0,2,0,0,0,164,8
-472,gliscor,4,207,104,7,9,,4,30,70,0,20,0,4,0,0,0,239,
+472,gliscor,4,207,104,7,9,,4,30,50,0,20,0,4,0,0,0,239,
 473,mamoswine,4,221,112,3,8,,4,50,50,0,20,1,1,0,0,0,253,
 474,porygon-z,4,233,68,8,4,,-1,30,50,0,20,0,2,0,0,0,168,
 475,gallade,4,281,140,9,12,,0,45,35,0,20,0,1,1,0,0,308,12
-476,probopass,4,299,147,4,11,,4,60,70,0,20,0,2,0,0,0,325,
+476,probopass,4,299,147,4,11,,4,60,50,0,20,0,2,0,0,0,325,
 477,dusknoir,4,356,182,1,4,,4,45,35,0,25,0,3,0,0,0,385,71
 478,froslass,4,361,186,9,4,,8,75,50,0,20,0,2,0,0,0,392,95
 479,rotom,4,,240,8,1,,-1,45,50,0,20,0,2,1,0,0,480,
@@ -487,8 +487,8 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 486,regigigas,4,,247,9,12,,-1,3,0,0,120,0,1,0,1,0,487,
 487,giratina,4,,248,1,10,,-1,3,0,0,120,0,1,1,1,0,488,
 488,cresselia,4,,249,10,2,,8,3,100,0,120,0,1,0,1,0,489,
-489,phione,4,,250,2,4,,-1,30,70,0,40,0,1,0,0,1,490,
+489,phione,4,,250,2,4,,-1,30,50,0,40,0,1,0,0,1,490,
-490,manaphy,4,,250,2,12,,-1,3,70,0,10,0,1,0,0,1,491,
+490,manaphy,4,,250,2,12,,-1,3,50,0,10,0,1,0,0,1,491,
 491,darkrai,4,,252,1,12,,-1,3,0,0,120,0,1,0,0,1,492,
 492,shaymin,4,,253,5,8,,-1,45,100,0,120,0,4,1,0,1,493,
 493,arceus,4,,254,9,8,,-1,3,0,0,120,0,1,1,0,1,494,199

pokedex/data/csv/version_group_pokemon_move_methods.csv

@@ -92,3 +92,8 @@ version_group_id,pokemon_move_method_id
 20,3
 20,4
 20,10
+21,1
+21,2
+21,3
+21,4
+21,10

pokedex/data/csv/version_group_regions.csv

@@ -20,3 +20,4 @@ version_group_id,region_id
 18,7
 19,1
 20,8
+21,4

pokedex/data/csv/version_groups.csv

@@ -19,3 +19,4 @@ id,identifier,generation_id,order
 18,ultra-sun-ultra-moon,7,18
 19,lets-go-pikachu-lets-go-eevee,7,19
 20,sword-shield,8,20
+21,brilliant-diamond-shining-pearl,8,21

pokedex/data/csv/version_names.csv

@@ -213,3 +213,5 @@ version_id,local_language_id,name
 32,9,"Let’s Go, Eevee!"
 33,9,Sword
 34,9,Shield
+35,9,Brilliant Diamond
+36,9,Shining Pearl

pokedex/data/csv/versions.csv

@@ -33,3 +33,5 @@ id,version_group_id,identifier
 32,19,lets-go-eevee
 33,20,sword
 34,20,shield
+35,21,brilliant-diamond
+36,21,shining-pearl