Skip to content

Commit ba99279

Browse files
committed
Merge branch 'master' of https://github.com/PokeAPI/pokeapi
2 parents a77600a + 571fbb1 commit ba99279

File tree

5 files changed

+212
-47
lines changed

5 files changed

+212
-47
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/location_area_prose.csv

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ location_area_id,local_language_id,name
103103
141,9,Road 201
104104
142,9,Road 202
105105
143,9,Road 203
106-
144,9,Road 204 (south, towards Jubilife City)
107-
145,9,Road 204 (north, towards Floaroma Town)
108-
146,9,Road 205 (south, towards Floaroma Town)
109-
147,9,Road 205 (east, towards Eterna City)
106+
144,9,"Road 204 (south, towards Jubilife City)"
107+
145,9,"Road 204 (north, towards Floaroma Town)"
108+
146,9,"Road 205 (south, towards Floaroma Town)"
109+
147,9,"Road 205 (east, towards Eterna City)"
110110
148,9,Road 206
111111
149,9,Road 207
112112
150,9,Road 208
@@ -116,12 +116,12 @@ location_area_id,local_language_id,name
116116
154,9,Lost Tower (3F)
117117
155,9,Lost Tower (4F)
118118
156,9,Lost Tower (5F)
119-
157,9,Road 210 (south, towards Solaceon Town)
120-
158,9,Road 210 (west, towards Celestic Town)
121-
159,9,Road 211 (west, towards Eterna City)
122-
160,9,Road 211 (east, towards Celestic Town)
123-
161,9,Road 212 (north, towards Hearthome City)
124-
162,9,Road 212 (east, towards Pastoria City)
119+
157,9,"Road 210 (south, towards Solaceon Town)"
120+
158,9,"Road 210 (west, towards Celestic Town)"
121+
159,9,"Road 211 (west, towards Eterna City)"
122+
160,9,"Road 211 (east, towards Celestic Town)"
123+
161,9,"Road 212 (north, towards Hearthome City)"
124+
162,9,"Road 212 (east, towards Pastoria City)"
125125
163,9,Road 213
126126
164,9,Road 214
127127
165,9,Road 215
@@ -251,7 +251,7 @@ location_area_id,local_language_id,name
251251
293,9,Rock Tunnel (B1F)
252252
294,9,Victory Road 1 (1F)
253253
295,9,Road 1
254-
296,9,Road 2 (south, towards Viridian City)
254+
296,9,"Road 2 (south, towards Viridian City)"
255255
297,9,Road 3
256256
298,9,Road 4
257257
299,9,Road 5
@@ -275,7 +275,7 @@ location_area_id,local_language_id,name
275275
317,9,Digletts Cave
276276
318,9,Victory Road 1 (2F)
277277
319,9,Victory Road 1 (3F)
278-
320,9,Road 2 (north, towards Pewter City)
278+
320,9,"Road 2 (north, towards Pewter City)"
279279
321,9,Viridian Forest
280280
323,9,Cerulean Cave (1F)
281281
324,9,Cerulean Cave (2F)
@@ -300,9 +300,9 @@ location_area_id,local_language_id,name
300300
343,9,Pokemon Mansion (3F)
301301
344,9,Pokemon Mansion (B1F)
302302
345,9,Safari Zone (middle)
303-
346,9,Safari Zone (Area 1, east)
304-
347,9,Safari Zone (Area 2, north)
305-
348,9,Safari Zone (Area 3, west)
303+
346,9,"Safari Zone (Area 1, east)"
304+
347,9,"Safari Zone (Area 2, north)"
305+
348,9,"Safari Zone (Area 3, west)"
306306
349,9,S.S. Anne dock
307307
350,9,Petalburg City
308308
351,9,Slateport City
@@ -318,7 +318,7 @@ location_area_id,local_language_id,name
318318
361,9,Granite Cave (1F)
319319
362,9,Granite Cave (B1F)
320320
363,9,Granite Cave (B2F)
321-
364,9,Granite Cave (1F/small Room)
321+
364,9,Granite Cave (1F/small room)
322322
365,9,Petalburg Woods
323323
366,9,Jagged Pass
324324
367,9,Fiery Path
@@ -415,7 +415,7 @@ location_area_id,local_language_id,name
415415
488,9,Mount Ember
416416
489,9,Mount Ember (cave)
417417
490,9,Mount Ember (inside)
418-
491,9,Mount Ember (1F, cave behind team rocket)
418+
491,9,"Mount Ember (1F, cave behind team rocket)"
419419
492,9,Mount Ember (B1F)
420420
493,9,Mount Ember (B2F)
421421
494,9,Mount Ember (B3F)

0 commit comments

Comments
 (0)