Skip to content

Commit 4c289d5

Browse files
authored
Merge branch 'master' into missing-form-info
2 parents 962601c + b7ba914 commit 4c289d5

File tree

3 files changed

+160
-5
lines changed

3 files changed

+160
-5
lines changed

data/v2/csv/ability_names.csv

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,161 +2669,223 @@ ability_id,local_language_id,name
26692669
267,9,As One
26702670
267,11,じんばいったい
26712671
267,12,人马一体
2672+
268,1,とれないにおい
26722673
268,5,Odeur Tenace
26732674
268,6,Duftschwade
26742675
268,7,Olor Persistente
26752676
268,8,Odore Tenace
26762677
268,9,Lingering Aroma
2678+
268,11,とれないにおい
2679+
269,1,こぼれダネ
26772680
269,5,Semencier
26782681
269,6,Streusaat
26792682
269,7,Disemillar
26802683
269,8,Spargisemi
26812684
269,9,Seed Sower
2685+
269,11,こぼれダネ
2686+
270,1,ねつこうかん
26822687
270,5,Thermodynamique
26832688
270,6,Thermowandel
26842689
270,7,Termoscambio
26852690
270,8,Termoscambio
26862691
270,9,Thermal Exchange
2692+
270,11,ねつこうかん
2693+
271,1,いかりのこうら
26872694
271,5,Courroupace
26882695
271,6,Wutpanzer
26892696
271,7,Coraza Ira
26902697
271,8,Iraguscio
26912698
271,9,Anger Shell
2699+
271,11,いかりのこうら
2700+
272,1,きよめのしお
26922701
272,5,Sel Purificateur
26932702
272,6,Läutersalz
26942703
272,7,Sal Purificadora
26952704
272,8,Sale Purificante
26962705
272,9,Purifying Salt
2706+
272,11,きよめのしお
2707+
273,1,こんがりボディ
26972708
273,5,Bien Cuit
26982709
273,6,Knusperkruste
26992710
273,7,Cuerpo Horneado
27002711
273,8,Bentostato
27012712
273,9,Well-Baked Body
2713+
273,11,こんがりボディ
2714+
274,1,かぜのり
27022715
274,5,Aéroporté
27032716
274,6,Windreiter
27042717
274,7,Surcavientos
27052718
274,8,Vento Propizio
27062719
274,9,Wind Rider
2720+
274,11,かぜのり
2721+
275,1,ばんけん
27072722
275,5,Chien de Garde
27082723
275,6,Wachhund
27092724
275,7,Perro Guardián
27102725
275,8,Cane da Guardia
27112726
275,9,Guard Dog
2727+
275,11,ばんけん
2728+
276,1,いわはこび
27122729
276,5,Porte-Roche
27132730
276,6,Steinträger
27142731
276,7,Transportarrocas
27152732
276,8,Portamassi
27162733
276,9,Rocky Payload
2734+
276,11,いわはこび
2735+
277,1,ふうりょくでんき
27172736
277,5,Turbine Éolienne
27182737
277,6,Windkraft
27192738
277,7,Energía Eólica
27202739
277,8,Energia Eolica
27212740
277,9,Wind Power
2741+
277,11,ふうりょくでんき
2742+
278,1,マイティチェンジ
27222743
278,5,Supermutation
27232744
278,6,Superwechsel
27242745
278,7,Cambio Heroico
27252746
278,8,Supercambio
27262747
278,9,Zero to Hero
2748+
278,11,マイティチェンジ
2749+
279,1,しれいとう
27272750
279,5,Commandant
27282751
279,6,Kommandant
27292752
279,7,Comandar
27302753
279,8,Torre di Comando
27312754
279,9,Commander
2755+
279,11,しれいとう
2756+
280,1,でんきにかえる
27322757
280,5,Grecharge
27332758
280,6,Dynamo
27342759
280,7,Dinamo
27352760
280,8,Convertivolt
27362761
280,9,Electromorphosis
2762+
280,11,でんきにかえる
2763+
281,1,こだいかっせい
27372764
281,5,Paléosynthèse
27382765
281,6,Paläosynthese
27392766
281,7,Paleosíntesis
27402767
281,8,Paleoattivazione
27412768
281,9,Protosynthesis
2769+
281,11,こだいかっせい
2770+
282,1,クォークチャージ
27422771
282,5,Charge Quantique
27432772
282,6,Quantenantrieb
27442773
282,7,Carga Cuark
27452774
282,8,Carica Quark
27462775
282,9,Quark Drive
2776+
282,11,クォークチャージ
2777+
283,1,おうごんのからだ
27472778
283,5,Corps en Or
27482779
283,6,Goldkörper
27492780
283,7,Cuerpo Áureo
27502781
283,8,Corpo Aureo
27512782
283,9,Good as Gold
2783+
283,11,おうごんのからだ
2784+
284,1,わざわいのうつわ
27522785
284,5,Urne du Fléau
27532786
284,6,Unheilsgefäß
27542787
284,7,Caldero Debacle
27552788
284,8,Vaso Nefasto
27562789
284,9,Vessel of Ruin
2790+
284,11,わざわいのうつわ
2791+
285,1,わざわいのつるぎ
27572792
285,5,Épée du Fléau
27582793
285,6,Unheilsschwert
27592794
285,7,Espada Debacle
27602795
285,8,Spada Nefasta
27612796
285,9,Sword of Ruin
2797+
285,11,わざわいのつるぎ
2798+
286,1,わざわいのおふだ
27622799
286,5,Bois du Fléau
27632800
286,6,Unheilstafeln
27642801
286,7,Tablilla Debacle
27652802
286,8,Amuleto Nefasto
27662803
286,9,Tablets of Ruin
2804+
286,11,わざわいのおふだ
2805+
287,1,わざわいのたま
27672806
287,5,Perles du Fléau
27682807
287,6,Unheilsjuwelen
27692808
287,7,Abalorio Debacle
27702809
287,8,Monile Nefasto
27712810
287,9,Beads of Ruin
2811+
287,11,わざわいのたま
2812+
288,1,ひひいろのこどう
27722813
288,5,Pouls Orichalque
27732814
288,6,Orichalkum-Puls
27742815
288,7,Latido Oricalco
27752816
288,8,Ritmo d’Oricalco
27762817
288,9,Orichalcum Pulse
2818+
288,11,ひひいろのこどう
2819+
289,1,ハドロンエンジン
27772820
289,5,Moteur à Hadrons
27782821
289,6,Hadronen-Motor
27792822
289,7,Motor Hadrónico
27802823
289,8,Motore Adronico
27812824
289,9,Hadron Engine
2825+
289,11,ハドロンエンジン
2826+
290,1,びんじょう
27822827
290,5,Opportuniste
27832828
290,6,Profiteur
27842829
290,7,Oportunista
27852830
290,8,Scrocco
27862831
290,9,Opportunist
2832+
290,11,びんじょう
2833+
291,1,はんすう
27872834
291,5,Ruminant
27882835
291,6,Wiederkäuer
27892836
291,7,Rumia
27902837
291,8,Ruminante
27912838
291,9,Cud Chew
2839+
291,11,はんすう
2840+
292,1,きれあじ
27922841
292,5,Incisif
27932842
292,6,Scharfkantig
27942843
292,7,Cortante
27952844
292,8,Affilama
27962845
292,9,Sharpness
2846+
292,11,きれあじ
2847+
293,1,そうだいしょう
27972848
293,5,Général Suprême
27982849
293,6,Feldherr
27992850
293,7,General Supremo
28002851
293,8,Generale Supremo
28012852
293,9,Supreme Overlord
2853+
293,11,そうだいしょう
2854+
294,1,きょうえん
28022855
294,5,Collab
28032856
294,6,Synchronauftritt
28042857
294,7,Unísono
28052858
294,8,Coprotagonismo
28062859
294,9,Costar
2860+
294,11,きょうえん
2861+
295,1,どくげしょう
28072862
295,5,Dépôt Toxique
28082863
295,6,Giftbelag
28092864
295,7,Capa Tóxica
28102865
295,8,Mantossina
28112866
295,9,Toxic Debris
2867+
295,11,どくげしょう
2868+
296,1,テイルアーマー
28122869
296,5,Armure Caudale
28132870
296,6,Schweifrüstung
28142871
296,7,Cola Armadura
28152872
296,8,Codarmatura
28162873
296,9,Armor Tail
2874+
296,11,テイルアーマー
2875+
297,1,どしょく
28172876
297,5,Absorbe-Terre
28182877
297,6,Bodenschmaus
28192878
297,7,Geofagia
28202879
297,8,Mangiaterra
28212880
297,9,Earth Eater
2881+
297,11,どしょく
2882+
298,1,きんしのちから
28222883
298,5,Force Fongique
28232884
298,6,Myzelienkraft
28242885
298,7,Poder Fúngico
28252886
298,8,Micoforza
28262887
298,9,Mycelium Might
2888+
298,11,きんしのちから
28272889
10001,9,Mountaineer
28282890
10002,9,Wave Rider
28292891
10003,9,Skater

data/v2/csv/pokemon_form_names.csv

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,33 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
480480
905,1,けしんフォルム,
481481
905,9,Incarnate Forme, Incarnate Enamorus
482482
905,11,けしんフォルム,
483+
916,1,オスのすがた,
484+
916,9,Male,
485+
916,11,オスのすがた,
486+
917,1,ふたふしフォルム,
487+
917,9,Two-Segment Form,
488+
917,11,ふたふしフォルム,
489+
934,1,ナイーブフォルム,
490+
934,9,Zero Form,
491+
934,11,ナイーブフォルム,
492+
946,1,4ひきかぞく,
493+
946,9,Family of Four,
494+
946,11,4ひきかぞく,
495+
952,1,そったすがた,
496+
952,9,Curly Form,
497+
952,11,そったすがた,
498+
960,1,グリーンフェザー,
499+
960,9,Green Plumage,
500+
960,11,グリーンフェザー,
501+
976,1,はこフォルム,
502+
976,9,Chest Form,
503+
976,11,はこフォルム,
504+
998,1,かんぜんけいたい,
505+
998,9,Apex Build,
506+
998,11,かんぜんけいたい,
507+
999,1,コンプリートモード,
508+
999,9,Ultimate Mode,
509+
999,11,コンプリートモード,
483510
10001,1,B,
484511
10001,3,B,
485512
10001,5,B,Zarbi B
@@ -3435,3 +3462,69 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
34353462
10418,6,Tiergeistform,Enamorus (Tiergeist)
34363463
10418,9,Therian Forme,Therian Enamorus
34373464
10418,11,れいじゅうフォルム,
3465+
10419,1,パルデアのすがた,
3466+
10419,9,Paldean Form,
3467+
10419,11,パルデアのすがた,
3468+
10420,1,パルデアのすがた,
3469+
10420,9,Paldean Form,
3470+
10420,11,パルデアのすがた,
3471+
10421,1,パルデアのすがた,
3472+
10421,9,Paldean Form,
3473+
10421,11,パルデアのすがた,
3474+
10422,1,パルデアのすがた,
3475+
10422,9,Paldean Form,
3476+
10422,11,パルデアのすがた,
3477+
10423,1,メスのすがた,
3478+
10423,9,Female,
3479+
10423,11,メスのすがた,
3480+
10424,1,みつふしフォルム,
3481+
10424,9,Three-Segment Form,
3482+
10424,11,みつふしフォルム,
3483+
10425,1,マイティフォルム,
3484+
10425,9,Hero Form,
3485+
10425,11,マイティフォルム,
3486+
10426,1,3びきかぞく,
3487+
10426,9,Family of Three,
3488+
10426,11,3びきかぞく,
3489+
10427,1,たれたすがた,
3490+
10427,9,Droopy Form,
3491+
10427,11,たれたすがた,
3492+
10428,1,のびたすがた,
3493+
10428,9,Stretchy Form,
3494+
10428,11,のびたすがた,
3495+
10429,1,ブルーフェザー,
3496+
10429,9,Blue Plumage,
3497+
10429,11,ブルーフェザー,
3498+
10430,1,イエローフェザー,
3499+
10430,9,Yellow Plumage,
3500+
10430,11,イエローフェザー,
3501+
10431,1,ホワイトフェザー,
3502+
10431,9,White Plumage,
3503+
10431,11,ホワイトフェザー,
3504+
10432,1,とほフォルム,
3505+
10432,9,Roaming Form,
3506+
10432,11,とほフォルム,
3507+
10433,1,せいげんけいたい,
3508+
10433,9,Limited Build,
3509+
10433,11,せいげんけいたい,
3510+
10434,1,しっそうけいたい,
3511+
10434,9,Sprinting Build,
3512+
10434,11,しっそうけいたい,
3513+
10435,1,ゆうえいけいたい,
3514+
10435,9,Swimming Build,
3515+
10435,11,ゆうえいけいたい,
3516+
10436,1,かっくうけいたい,
3517+
10436,9,Gliding Build,
3518+
10436,11,かっくうけいたい,
3519+
10437,1,リミテッドモード,
3520+
10437,9,Low-Power Mode,
3521+
10437,11,リミテッドモード,
3522+
10438,1,ドライブモード,
3523+
10438,9,Drive Mode,
3524+
10438,11,ドライブモード,
3525+
10439,1,フロートモード,
3526+
10439,9,Aquatic Mode,
3527+
10439,11,フロートモード,
3528+
10440,1,グライドモード,
3529+
10440,9,Glide Mode,
3530+
10440,11,グライドモード,

data/v2/csv/pokemon_stats.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5462,7 +5462,7 @@ pokemon_id,stat_id,base_stat,effort
54625462
911,1,104,0
54635463
911,2,75,0
54645464
911,3,100,0
5465-
911,4,100,3
5465+
911,4,110,3
54665466
911,5,75,0
54675467
911,6,66,0
54685468
912,1,55,0
@@ -5514,7 +5514,7 @@ pokemon_id,stat_id,base_stat,effort
55145514
919,5,86,0
55155515
919,6,35,0
55165516
920,1,33,0
5517-
920,2,43,1
5517+
920,2,46,1
55185518
920,3,40,0
55195519
920,4,21,0
55205520
920,5,25,0
@@ -5620,7 +5620,7 @@ pokemon_id,stat_id,base_stat,effort
56205620
937,3,90,0
56215621
937,4,125,3
56225622
937,5,109,0
5623-
937,6,36,0
5623+
937,6,39,0
56245624
938,1,50,0
56255625
938,2,62,1
56265626
938,3,40,0
@@ -5750,7 +5750,7 @@ pokemon_id,stat_id,base_stat,effort
57505750
959,1,70,0
57515751
959,2,103,2
57525752
959,3,85,0
5753-
959,4,80,0
5753+
959,4,60,0
57545754
959,5,85,0
57555755
959,6,82,0
57565756
960,1,82,0
@@ -5915,7 +5915,7 @@ pokemon_id,stat_id,base_stat,effort
59155915
988,4,140,3
59165916
988,5,110,0
59175917
988,6,110,0
5918-
989,1,124,0
5918+
989,1,154,0
59195919
989,2,140,3
59205920
989,3,108,0
59215921
989,4,50,0

0 commit comments

Comments
 (0)