Merge branch 'master' into add-showdown-field-to-pokemon

data/v2/csv/abilities.csv

@@ -302,6 +302,10 @@ id,identifier,generation_id,is_main_series
 301,hospitality,9,1
 302,toxic-chain,9,1
 303,embody-aspect,9,1
+304,tera-shift,9,1
+305,tera-shell,9,1
+306,teraform-zero,9,1
+307,poison-puppeteer,9,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_names.csv

@@ -2938,6 +2938,46 @@ ability_id,local_language_id,name
 303,9,Embody Aspect
 303,11,おもかげやどし
 303,12,面影辉映
+304,1,テラスチェンジ
+304,3,테라체인지
+304,4,太晶變形
+304,5,Téramorphose
+304,6,Tera-Wandel
+304,7,Teracambio
+304,8,Teramorfosi
+304,9,Tera Shift
+304,11,テラスチェンジ
+304,12,太晶变形
+305,1,テラスシェル
+305,3,테라셸
+305,4,太晶甲殼
+305,5,Téra-Carapace
+305,6,Tera-Panzer
+305,7,Teracaparazón
+305,8,Teraguscio
+305,9,Tera Shell
+305,11,テラスシェル
+305,12,太晶甲壳
+306,1,ゼロフォーミング
+306,3,제로포밍
+306,4,歸零化境
+306,5,Téraformation 0
+306,6,Teraforming Null
+306,7,Teraformación 0
+306,8,Zeroformazione
+306,9,Teraform Zero
+306,11,ゼロフォーミング
+306,12,归零化境
+307,1,どくくぐつ
+307,3,독조종
+307,4,毒傀儡
+307,5,Emprise Toxique
+307,6,Giftpuppenspiel
+307,7,Títere Tóxico
+307,8,Malia Tossica
+307,9,Poison Puppeteer
+307,11,どくくぐつ
+307,12,毒傀儡
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/evolution_chains.csv

@@ -534,3 +534,9 @@ id,baby_trigger_item_id
 541,
 542,
 543,
+544,
+545,
+546,
+547,
+548,
+549,

data/v2/csv/move_names.csv

@@ -8635,6 +8635,156 @@ move_id,local_language_id,name
 904,1,ツタこんぼう
 904,9,Ivy Cudgel
 904,11,ツタこんぼう
+905,1,エレクトロビーム
+905,3,일렉트로빔
+905,4,電光束
+905,5,Fulgurayon
+905,6,Stromstrahl
+905,7,Electrorrayo
+905,8,Elettroraggio
+905,9,Electro Shot
+905,11,エレクトロビーム
+905,12,电光束
+906,1,テラクラスター
+906,3,테라클러스터
+906,4,晶光星群
+906,5,Pluie Térastrale
+906,6,Tera-Sternhagel
+906,7,Teraclúster
+906,8,Teracluster
+906,9,Tera Starstorm
+906,11,テラクラスター
+906,12,晶光星群
+907,1,きまぐレーザー
+907,3,변덕레이저
+907,4,隨機光
+907,5,Laser Hasard
+907,6,Launenlaser
+907,7,Láser Veleidoso
+907,8,Irregolaser
+907,9,Fickle Beam
+907,11,きまぐレーザー
+907,12,随机光
+908,1,かえんのまもり
+908,3,화염의수호
+908,4,火焰守護
+908,5,Rempart Brûlant
+908,6,Flammenschild
+908,7,Llama Protectora
+908,8,Egida Ignea
+908,9,Burning Bulwark
+908,11,かえんのまもり
+908,12,火焰守护
+909,1,じんらい
+909,3,질풍신뢰
+909,4,迅雷
+909,5,Vif Éclair
+909,6,Sturmblitz
+909,7,Relámpago Súbito
+909,8,Saetta
+909,9,Thunderclap
+909,11,じんらい
+909,12,迅雷
+910,1,パワフルエッジ
+910,3,파워풀에지
+910,4,強刃攻擊
+910,5,Lame Puissante
+910,6,Wuchtklinge
+910,7,Filo Potente
+910,8,Taglio Poderoso
+910,9,Mighty Cleave
+910,11,パワフルエッジ
+910,12,强刃攻击
+911,1,タキオンカッター
+911,3,타키온커터
+911,4,迅子利刃
+911,5,Lame Tachyonique
+911,6,Tachyon-Schnitt
+911,7,Tajo Taquión
+911,8,Tachiontaglio
+911,9,Tachyon Cutter
+911,11,タキオンカッター
+911,12,迅子利刃
+912,1,ハードプレス
+912,3,하드프레스
+912,4,硬壓
+912,5,Pression Extrême
+912,6,Stahlpresse
+912,7,Prensa Metálica
+912,8,Pressa d’Acciaio
+912,9,Hard Press
+912,11,ハードプレス
+912,12,硬压
+913,1,ドラゴンエール
+913,3,드래곤옐
+913,4,龍聲鼓舞
+913,5,Cri Draconique
+913,6,Drachenschrei
+913,7,Bramido Dragón
+913,8,Grido del Drago
+913,9,Dragon Cheer
+913,11,ドラゴンエール
+913,12,龙声鼓舞
+914,1,みわくのボイス
+914,3,매혹의보이스
+914,4,魅誘之聲
+914,5,Voix Envoûtante
+914,6,Lockstimme
+914,7,Canto Encantador
+914,8,Ammaliavoce
+914,9,Alluring Voice
+914,11,みわくのボイス
+914,12,魅诱之声
+915,1,やけっぱち
+915,3,열불내기
+915,4,豁出去
+915,5,Indignition
+915,6,Frustflamme
+915,7,Cólera Ardiente
+915,8,Rabbia Bruciante
+915,9,Temper Flare
+915,11,やけっぱち
+915,12,豁出去
+916,1,サンダーダイブ
+916,3,썬더다이브
+916,4,閃電強襲
+916,5,Volt Assaut
+916,6,Donnerstoß
+916,7,Plancha Voltaica
+916,8,Elettrotuffo
+916,9,Supercell Slam
+916,11,サンダーダイブ
+916,12,闪电强袭
+917,1,サイコノイズ
+917,3,사이코노이즈
+917,4,精神噪音
+917,5,Dissonance Psy
+917,6,Psycholärm
+917,7,Psicorruido
+917,8,Psicorumore
+917,9,Psychic Noise
+917,11,サイコノイズ
+917,12,精神噪音
+918,1,はやてがえし
+918,3,기선제압
+918,4,快手還擊
+918,5,Prio-Parade
+918,6,Schnellkonter
+918,7,Palma Rauda
+918,8,Colpo di Mano
+918,9,Upper Hand
+918,11,はやてがえし
+918,12,快手还击
+919,1,じゃどくのくさり
+919,3,악독사슬
+919,4,邪毒鎖鏈
+919,5,Chaîne Malsaine
+919,6,Giftkettung
+919,7,Cadena Virulenta
+919,8,Intossicatena
+919,9,Malignant Chain
+919,11,じゃどくのくさり
+919,12,邪毒锁链
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag

data/v2/csv/moves.csv

@@ -293,8 +293,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 292,arm-thrust,3,2,15,20,100,0,10,2,30,,5,10,7
 293,camouflage,3,1,,20,,0,7,1,214,,4,2,13
 294,tail-glow,3,7,,20,,0,7,1,322,,2,32,11
-295,luster-purge,3,14,70,5,100,0,10,3,73,50,4,9,22
-296,mist-ball,3,14,70,5,100,0,10,3,72,50,4,4,22
+295,luster-purge,3,14,95,5,100,0,10,3,73,50,4,9,22
+296,mist-ball,3,14,95,5,100,0,10,3,72,50,4,4,22
 297,feather-dance,3,3,,15,100,0,10,1,59,,2,28,19
 298,teeter-dance,3,1,,20,100,0,9,1,200,,3,6,14
 299,blaze-kick,3,10,85,10,90,0,10,2,201,10,2,1,17
@@ -903,6 +903,21 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
 903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
 904,ivy-cudgel,9,12,100,10,100,0,10,2,,,,,
+905,electro-shot,9,13,130,10,100,0,10,3,,,,,
+906,tera-starstorm,9,1,120,5,100,0,11,3,,,,,
+907,fickle-beam,9,16,80,5,100,0,10,3,,,,,
+908,burning-bulwark,9,10,0,10,0,4,7,1,,,,,
+909,thunderclap,9,13,70,5,100,1,10,3,,,,,
+910,mighty-cleave,9,6,95,5,100,0,10,2,,,,,
+911,tachyon-cutter,9,9,50,10,0,0,10,3,,,,,
+912,hard-press,9,9,0,10,100,0,10,2,,,,,
+913,dragon-cheer,9,16,0,15,0,0,15,1,,,,,
+914,alluring-voice,9,18,80,10,100,0,10,3,,,,,
+915,temper-flare,9,10,75,10,100,0,10,2,,,,,
+916,supercell-slam,9,13,100,15,95,0,10,2,,,,,
+917,psychic-noise,9,14,75,10,100,0,10,3,,,,,
+918,upper-hand,9,2,65,15,100,3,10,2,,,,,
+919,malignant-chain,9,4,100,5,100,0,10,3,,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokedexes.csv

@@ -30,4 +30,4 @@ id,region_id,identifier,is_main_series
 30,9,hisui,1
 31,10,paldea,1
 32,10,kitakami,1
-33,10,indigo-disk,1
+33,10,blueberry,1

data/v2/csv/pokemon.csv

@@ -1016,6 +1016,14 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 1015,munkidori,1015,10,122,,1099,1
 1016,fezandipiti,1016,14,301,,1100,1
 1017,ogerpon,1017,12,398,,1101,1
+1018,archaludon,1018,20,600,,1102,1
+1019,hydrapple,1019,18,930,,1103,1
+1020,gouging-fire,1020,35,5900,,1104,1
+1021,raging-bolt,1021,52,4800,,1105,1
+1022,iron-boulder,1022,15,1625,,1106,1
+1023,iron-crown,1023,16,1560,,1107,1
+1024,terapagos,1024,2,65,,1108,1
+1025,pecharunt,1025,3,3,,1109,1
 10001,deoxys-attack,386,17,608,270,515,0
 10002,deoxys-defense,386,17,608,270,516,0
 10003,deoxys-speed,386,17,608,270,517,0
@@ -1291,3 +1299,5 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10273,ogerpon-wellspring-mask,1017,12,398,,,0
 10274,ogerpon-hearthflame-mask,1017,12,398,,,0
 10275,ogerpon-cornerstone-mask,1017,12,398,,,0
+10276,terapagos-terastal,1024,3,160,,,0
+10277,terapagos-stellar,1024,17,770,,,0

data/v2/csv/pokemon_abilities.csv

@@ -2426,6 +2426,18 @@ pokemon_id,ability_id,is_hidden,slot
 1016,302,0,1
 1016,101,1,3
 1017,128,0,1
+1018,192,0,1
+1018,5,0,2
+1018,242,1,3
+1019,300,0,1
+1019,144,0,2
+1019,60,1,3
+1020,281,0,1
+1021,281,0,1
+1022,282,0,1
+1023,282,0,1
+1024,304,0,1
+1025,307,0,1
 10001,46,0,1
 10002,46,0,1
 10003,46,0,1
@@ -2926,3 +2938,5 @@ pokemon_id,ability_id,is_hidden,slot
 10273,11,0,1
 10274,104,0,1
 10275,5,0,1
+10276,305,0,1
+10277,306,0,1

data/v2/csv/pokemon_form_names.csv

@@ -517,6 +517,12 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 1017,9,Teal Mask,
 1017,11,みどりのめん,
 1017,12,碧草面具,
+1024,1,ノーマルフォルム,
+1024,5,Forme Normale,
+1024,7,Forma normal,
+1024,8,Forma Normale,
+1024,9,Normal Form,
+1024,11,ノーマルフォルム,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -3578,3 +3584,15 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10444,9,Cornerstone Mask,
 10444,11,いしずえのめん,
 10444,12,礎石面具,
+10445,1,テラスタルフォルム,
+10445,5,Forme Téracristal,
+10445,6,Terakristall-Form,
+10445,7,Forma teracristal,
+10445,8,Forma Teracristal,
+10445,9,Terastal Form,
+10445,11,テラスタルフォルム,
+10446,1,ステラフォルム,
+10446,6,Stellarform,
+10446,7,Forma astral,
+10446,9,Stellar Form,
+10446,11,ステラフォルム,

data/v2/csv/pokemon_forms.csv

@@ -1016,6 +1016,14 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 1015,munkidori,,1015,26,1,0,0,1,1375
 1016,fezandipiti,,1016,26,1,0,0,1,1376
 1017,ogerpon,,1017,26,1,0,0,1,1377
+1018,archaludon,,1018,27,1,0,0,1,1381
+1019,hydrapple,,1019,27,1,0,0,1,1382
+1020,gouging-fire,,1020,27,1,0,0,1,1383
+1021,raging-bolt,,1021,27,1,0,0,1,1384
+1022,iron-boulder,,1022,27,1,0,0,1,1385
+1023,iron-crown,,1023,27,1,0,0,1,1386
+1024,terapagos,,1024,27,1,0,0,1,1387
+1025,pecharunt,,1025,27,1,0,0,1,1388
 10001,unown-b,b,201,3,0,0,0,2,299
 10002,unown-c,c,201,3,0,0,0,3,300
 10003,unown-d,d,201,3,0,0,0,4,301
@@ -1460,3 +1468,5 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10442,ogerpon-wellspring-mask,wellspring-mask,10273,26,0,0,0,2,1378
 10443,ogerpon-hearthflame-mask,hearthflame-mask,10274,26,0,0,0,3,1379
 10444,ogerpon-cornerstone-mask,cornerstone-mask,10275,26,0,0,0,4,1380
+10445,terapagos-terastal,terastal,10276,27,0,1,0,2,1389
+10446,terapagos-stellar,stellar,10277,27,0,1,0,3,1390

data/v2/csv/pokemon_species.csv

@@ -1016,3 +1016,11 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 1015,munkidori,9,,541,1,,,-1,3,0,0,50,0,1,0,1,0,1017,
 1016,fezandipiti,9,,542,1,,,-1,3,0,0,50,0,1,0,1,0,1018,
 1017,ogerpon,9,,543,5,,,-1,5,0,0,50,0,1,0,1,0,1019,
+1018,archaludon,9,884,465,9,,,4,10,50,0,30,0,2,0,0,0,1020,
+1019,hydrapple,9,1011,442,5,,,4,10,50,0,20,0,5,0,0,0,1021,
+1020,gouging-fire,9,,544,3,,,-1,10,0,0,50,0,1,0,0,0,1022,
+1021,raging-bolt,9,,545,10,,,-1,10,0,0,50,0,1,0,0,0,1023,
+1022,iron-boulder,9,,547,4,,,-1,10,0,0,50,0,1,0,0,0,1024,
+1023,iron-crown,9,,546,2,,,-1,10,0,0,50,0,1,0,0,0,1025,
+1024,terapagos,9,,548,2,,,-1,255,50,0,5,0,1,0,1,0,1026,
+1025,pecharunt,9,,549,7,,,-1,3,0,0,20,0,1,0,0,1,1027,

data/v2/csv/pokemon_species_names.csv

@@ -11179,3 +11179,82 @@ pokemon_species_id,local_language_id,name,genus
 1017,9,Ogerpon,
 1017,11,オーガポン,
 1017,12,厄诡椪,
+1018,1,ブリジュラス,ごうきんポケモン
+1018,3,브리두라스,
+1018,4,鋁鋼橋龍,
+1018,5,Pondralugon,
+1018,6,Briduradon,
+1018,7,Archaludon,
+1018,8,Archaludon,
+1018,9,Archaludon,Alloy Pokémon
+1018,11,ブリジュラス,ごうきんポケモン
+1018,12,铝钢桥龙,
+1019,1,カミツオロチ,りんごオロチポケモン
+1019,3,과미드라,
+1019,4,蜜集大蛇,
+1019,5,Pomdorochi,
+1019,6,Hydrapfel,
+1019,7,Hydrapple,
+1019,8,Hydrapple,
+1019,9,Hydrapple,Apple Hydra Pokémon
+1019,11,カミツオロチ,りんごオロチポケモン
+1019,12,蜜集大蛇,
+1020,1,ウガツホムラ,パラドックスポケモン
+1020,3,꿰뚫는화염,
+1020,4,破空焰,
+1020,5,Feu-Perçant,
+1020,6,Keilflamme,
+1020,7,Flamariete,
+1020,8,Vampeaguzze,
+1020,9,Gouging Fire,Paladox Pokémon
+1020,11,ウガツホムラ,パラドックスポケモン
+1020,12,破空焰,
+1021,1,タケルライコ,パラドックスポケモン
+1021,3,날뛰는우레,
+1021,4,猛雷鼓,
+1021,5,Ire-Foudre,
+1021,6,Furienblitz,
+1021,7,Electrofuria,
+1021,8,Furiatonante,
+1021,9,Raging Bolt,Paladox Pokémon
+1021,11,タケルライコ,パラドックスポケモン
+1021,12,猛雷鼓,
+1022,1,テツノイワオ,パラドックスポケモン
+1022,3,무쇠암석,
+1022,4,铁磐岩,
+1022,5,Roc-de-Fer,
+1022,6,Eisenfels,
+1022,7,Ferromole,
+1022,8,Massoferreo,
+1022,9,Iron Boulder,Paladox Pokémon
+1022,11,テツノイワオ,パラドックスポケモン
+1022,12,鐵磐岩,
+1023,1,テツノカシラ,パラドックスポケモン
+1023,3,무쇠감투,
+1023,4,铁头壳,
+1023,5,Chef-de-Fer,
+1023,6,Eisenhaupt,
+1023,7,Ferrotesta,
+1023,8,Capoferreo,
+1023,9,Iron Crown,Paladox Pokémon
+1023,11,テツノカシラ,パラドックスポケモン
+1023,12,鐵頭殼,
+1024,1,テラパゴス,テラスタルポケモン
+1024,3,테라파고스,
+1024,4,太樂巴戈斯,
+1024,5,Terapagos,
+1024,6,Terapagos,
+1024,7,Terapagos,
+1024,8,Terapagos,
+1024,9,Terapagos,Tera Pokémon
+1024,11,テラパゴス,テラスタルポケモン
+1024,12,太乐巴戈斯,
+1025,1,モモワロウ,しはいポケモン
+1025,4,桃歹郎,
+1025,5,Pêchaminus,
+1025,6,Infamomo,
+1025,7,Pecharunt,
+1025,8,Pecharunt,
+1025,9,Pecharunt,Subjugation Pokémon
+1025,11,モモワロウ,しはいポケモン
+1025,12,桃歹郎,

data/v2/csv/pokemon_stats.csv

@@ -6101,6 +6101,54 @@ pokemon_id,stat_id,base_stat,effort
 1017,4,60,0
 1017,5,96,0
 1017,6,110,0
+1018,1,90,0
+1018,2,105,0
+1018,3,130,3
+1018,4,125,0
+1018,5,65,0
+1018,6,85,0
+1019,1,106,0
+1019,2,80,0
+1019,3,110,0
+1019,4,120,3
+1019,5,80,0
+1019,6,44,0
+1020,1,105,0
+1020,2,115,0
+1020,3,121,3
+1020,4,65,0
+1020,5,93,0
+1020,6,91,0
+1021,1,125,0
+1021,2,73,0
+1021,3,91,0
+1021,4,137,3
+1021,5,89,0
+1021,6,75,0
+1022,1,90,0
+1022,2,120,0
+1022,3,80,0
+1022,4,68,0
+1022,5,108,0
+1022,6,124,3
+1023,1,90,0
+1023,2,72,0
+1023,3,100,0
+1023,4,122,3
+1023,5,108,0
+1023,6,98,0
+1024,1,90,0
+1024,2,65,0
+1024,3,85,1
+1024,4,65,0
+1024,5,85,0
+1024,6,60,0
+1025,1,88,0
+1025,2,88,0
+1025,3,160,3
+1025,4,88,0
+1025,5,88,0
+1025,6,88,0
 10001,1,50,0
 10001,2,180,2
 10001,3,20,0
@@ -7751,3 +7799,15 @@ pokemon_id,stat_id,base_stat,effort
 10275,4,60,0
 10275,5,96,0
 10275,6,110,0
+10276,1,95,0
+10276,2,95,0
+10276,3,110,2
+10276,4,105,0
+10276,5,110,2
+10276,6,85,0
+10277,1,95,3
+10277,2,95,0
+10277,3,110,0
+10277,4,105,0
+10277,5,110,0
+10277,6,85,0

data/v2/csv/pokemon_types.csv

@@ -1535,6 +1535,21 @@ pokemon_id,type_id,slot
 1016,4,1
 1016,18,2
 1017,12,1
+1018,9,1
+1018,16,2
+1019,12,1
+1019,16,2
+1020,10,1
+1020,16,2
+1021,13,1
+1021,16,2
+1022,6,1
+1022,14,2
+1023,9,1
+1023,14,2
+1024,1,1
+1025,4,1
+1025,8,2
 10001,14,1
 10002,14,1
 10003,14,1
@@ -2010,3 +2025,5 @@ pokemon_id,type_id,slot
 10274,10,2
 10275,12,1
 10275,6,2
+10276,1,1
+10277,1,1