clean merge

data/v2/csv/abilities.csv

@@ -187,6 +187,9 @@ id,identifier,generation_id,is_main_series
 186,dark-aura,6,1
 187,fairy-aura,6,1
 188,aura-break,6,1
+189,primordial-sea,6,1
+190,desolate-land,6,1
+191,delta-stream,6,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_names.csv

@@ -1315,6 +1315,27 @@ ability_id,local_language_id,name
 188,7,Rompeaura
 188,8,Frangiaura
 188,9,Aura Break
+189,1,はじまりのうみ
+189,3,시작의바다
+189,5,Mer Primaire
+189,6,Urmeer
+189,7,Mar del Albor
+189,8,Mare Primordiale
+189,9,Primordial Sea
+190,1,おわりのだいち
+190,3,끝의대지
+190,5,Terre Finale
+190,6,Endland
+190,7,Tierra del Ocaso
+190,8,Terra Estrema
+190,9,Desolate Land
+191,1,デルタストリーム
+191,3,델타스트림
+191,5,Souffle Delta
+191,6,Delta-Wind
+191,7,Ráfaga Delta
+191,8,Flusso Delta
+191,9,Delta Stream
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/ability_prose.csv

@@ -567,3 +567,6 @@ The type change takes place just before the move is used."
 186,9,Strengthens []{type:dark} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:dark} moves for all friendly and opposing Pokémon.
 187,9,Strengthens []{type:fairy} moves to 1.33× their power for all friendly and opposing Pokémon.,Strengthens []{type:fairy} moves for all friendly and opposing Pokémon.
 188,9,Makes []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types.,"While this Pokémon is on the field, []{ability:dark-aura} and []{ability:fairy-aura} weaken moves of their respective types to 2/3 their power, rather than strengthening them."
+189,9,,
+190,9,,
+191,9,,

data/v2/csv/berry_firmness_names.csv

@@ -1,6 +1,11 @@
 berry_firmness_id,local_language_id,name
+1,5,Très tendre
 1,9,Very Soft
+2,5,Tendre
 2,9,Soft
+3,5,Ferme
 3,9,Hard
+4,5,Très ferme
 4,9,Very Hard
+5,5,Super ferme
 5,9,Super Hard

data/v2/csv/characteristic_text.csv

@@ -1,31 +1,61 @@
 characteristic_id,local_language_id,message
+1,5,Adore manger
 1,9,Loves to eat
+2,5,Est fier de sa puissance
 2,9,Proud of its power
+3,5,Corps robuste
 3,9,Sturdy body
+4,5,Extrêmement curieux
 4,9,Highly curious
+5,5,Très volontaire
 5,9,Strong willed
+6,5,Aime courir
 6,9,Likes to run
+7,5,S'assoupit souvent
 7,9,Takes plenty of siestas
+8,5,Aime se démener
 8,9,Likes to thrash about
+9,5,Sait encaisser les coups
 9,9,Capable of taking hits
+10,5,Coquin
 10,9,Mischievous
+11,5,Un peu vaniteux
 11,9,Somewhat vain
+12,5,Attentif aux sons
 12,9,Alert to sounds
+13,5,Dort beaucoup
 13,9,Nods off a lot
+14,5,Un peu coléreux
 14,9,A little quick tempered
+15,5,Très obstiné
 15,9,Highly persistent
+16,5,Très astucieux
 16,9,Thoroughly cunning
+17,5,Esprit rebelle
 17,9,Strongly defiant
+18,5,Bête et impulsif
 18,9,Impetuous and silly
+19,5,Éparpille des choses
 19,9,Scatters things often
+20,5,Aime combattre
 20,9,Likes to fight
+21,5,Bonne endurance
 21,9,Good endurance
+22,5,Souvent dans la lune
 22,9,Often lost in thought
+23,5,A horreur de perdre
 23,9,Hates to lose
+24,5,Aime faire le pitre
 24,9,Somewhat of a clown
+25,5,Aime se détendre
 25,9,Likes to relax
+26,5,S'emporte facilement
 26,9,Quick tempered
+27,5,Persévérant
 27,9,Good perseverance
+28,5,Très particulier
 28,9,Very finicky
+29,5,Assez entêté
 29,9,Somewhat stubborn
+30,5,Fuit rapidement
 30,9,Quick to flee

data/v2/csv/contest_type_names.csv

@@ -1,6 +1,11 @@
 contest_type_id,local_language_id,name,flavor,color
+1,5,Sang-froid,Épicé,Rouge
 1,9,Cool,Spicy,Red
+2,5,Beauté,Sec,Bleu
 2,9,Beauty,Dry,Blue
+3,5,Grâce,Sucré,Rose
 3,9,Cute,Sweet,Pink
+4,5,Intelligence,Amère,Vert
 4,9,Smart,Bitter,Green
+5,5,Robustesse,Acide,Jaune
 5,9,Tough,Sour,Yellow

data/v2/csv/encounter_condition_prose.csv

@@ -1,13 +1,19 @@
 encounter_condition_id,local_language_id,name
+1,5,Essaim
 1,6,Schwarm
 1,9,Swarm
+2,5,Période horaire
 2,6,Tageszeit
 2,9,Time of day
+3,5,Poké Radar
 3,6,PokeRadar
 3,9,PokeRadar
+4,5,Jeu GBA dans le Slot 2
 4,6,Spiel der 3. Generation in Slot 2
 4,9,Gen 3 game in slot 2
+5,5,Radio
 5,6,Radio
 5,9,Radio
+6,5,Saison
 6,6,Jahreszeit
 6,9,Season

data/v2/csv/encounter_method_prose.csv

@@ -25,3 +25,11 @@ encounter_method_id,local_language_id,name
 12,9,Fishing in dark spots
 13,6,An dunklen stellen surfen
 13,9,Surfing in dark spots
+14,6,In gelben Blumenfeldern laufen
+14,9,Walking in yellow flowers
+15,6,In violetten Blumenfeldern laufen
+15,9,Walking in purple flowers
+16,6,In roten Blumenfeldern laufen
+16,9,Walking in red flowers
+17,6,Auf unwegsamen Gelände laufen
+17,9,Walking on rough terrain

data/v2/csv/encounter_methods.csv

@@ -1,14 +1,18 @@
 id,identifier,order
 1,walk,1
-2,old-rod,6
-3,good-rod,7
-4,super-rod,8
-5,surf,10
-6,rock-smash,12
-7,headbutt,13
+2,old-rod,10
+3,good-rod,11
+4,super-rod,12
+5,surf,14
+6,rock-smash,16
+7,headbutt,17
 8,dark-grass,5
 9,grass-spots,2
 10,cave-spots,3
 11,bridge-spots,4
-12,super-rod-spots,9
-13,surf-spots,11
+12,super-rod-spots,13
+13,surf-spots,15
+14,yellow-flowers,6
+15,purple-flowers,7
+16,red-flowers,8
+17,rough-terrain,9

data/v2/csv/encounter_slots.csv

@@ -409,3 +409,82 @@ id,version_group_id,encounter_method_id,slot,rarity
 408,14,11,10,4
 409,14,11,11,1
 410,14,11,12,1
+411,15,1,0,10
+412,15,1,1,10
+413,15,1,2,10
+414,15,1,3,10
+415,15,1,4,10
+416,15,1,5,10
+417,15,1,6,10
+418,15,1,7,10
+419,15,1,8,10
+420,15,1,9,5
+421,15,1,10,4
+422,15,1,11,1
+423,15,14,0,10
+424,15,14,1,10
+425,15,14,2,10
+426,15,14,3,10
+427,15,14,4,10
+428,15,14,5,10
+429,15,14,6,10
+430,15,14,7,10
+431,15,14,8,10
+432,15,14,9,5
+433,15,14,10,4
+434,15,14,11,1
+435,15,15,0,10
+436,15,15,1,10
+437,15,15,2,10
+438,15,15,3,10
+439,15,15,4,10
+440,15,15,5,10
+441,15,15,6,10
+442,15,15,7,10
+443,15,15,8,10
+444,15,15,9,5
+445,15,15,10,4
+446,15,15,11,1
+447,15,16,0,10
+448,15,16,1,10
+449,15,16,2,10
+450,15,16,3,10
+451,15,16,4,10
+452,15,16,5,10
+453,15,16,6,10
+454,15,16,7,10
+455,15,16,8,10
+456,15,16,9,5
+457,15,16,10,4
+458,15,16,11,1
+459,15,17,0,10
+460,15,17,1,10
+461,15,17,2,10
+462,15,17,3,10
+463,15,17,4,10
+464,15,17,5,10
+465,15,17,6,10
+466,15,17,7,10
+467,15,17,8,10
+468,15,17,9,5
+469,15,17,10,4
+470,15,17,11,1
+471,15,5,0,50
+472,15,5,1,30
+473,15,5,2,15
+474,15,5,3,4
+475,15,5,4,1
+476,15,6,0,50
+477,15,6,1,30
+478,15,6,2,15
+479,15,6,3,4
+480,15,6,4,1
+481,15,2,0,60
+482,15,2,1,35
+483,15,2,2,5
+484,15,3,0,60
+485,15,3,1,35
+486,15,3,2,5
+487,15,4,0,60
+488,15,4,1,35
+489,15,4,2,5

data/v2/csv/evolution_trigger_prose.csv

@@ -1,9 +1,13 @@
 evolution_trigger_id,local_language_id,name
+1,5,Montée de niveau
 1,6,Levelaufstieg
 1,9,Level up
+2,5,Échange
 2,6,Tausch
 2,9,Trade
+3,5,Utilisation d'un objet
 3,6,Gegenstand nutzen
 3,9,Use item
+4,5,Place dans l'équipe et une Poké Ball
 4,6,Platz im Team und ein Pokéball
 4,9,Shed

data/v2/csv/generation_names.csv

@@ -1,13 +1,19 @@
 generation_id,local_language_id,name
+1,5,Génération I
 1,6,Generation I
 1,9,Generation I
+2,5,Génération II
 2,6,Generation II
 2,9,Generation II
+3,5,Génération III
 3,6,Generation III
 3,9,Generation III
+4,5,Génération IV
 4,6,Generation IV
 4,9,Generation IV
+5,5,Génération V
 5,6,Generation V
 5,9,Generation V
+6,5,Génération VI
 6,6,Generation VI
 6,9,Generation VI

data/v2/csv/growth_rate_prose.csv

@@ -1,13 +1,19 @@
 growth_rate_id,local_language_id,name
+1,5,lente
 1,6,langsam
 1,9,slow
+2,5,moyenne
 2,6,mittel
 2,9,medium
+3,5,rapide
 3,6,schnell
 3,9,fast
+4,5,parabolique
 4,6,mittel langsam
 4,9,medium slow
+5,5,erratique
 5,6,"langsam, dann sehr schnell"
 5,9,slow then very fast
+6,5,fluctuante
 6,6,"schnell, dann sehr langsam"
 6,9,fast then very slow

data/v2/csv/item_fling_effects.csv

@@ -1,4 +1,4 @@
-id,identifier
+id,name
 1,badly-poison
 2,burn
 3,berry-effect

data/v2/csv/language_names.csv

@@ -1,31 +1,41 @@
 language_id,local_language_id,name
 1,1,日本語
+1,5,Japonais
 1,6,Japanisch
 1,9,Japanese
 2,1,正式ローマジ
+2,5,Romaji
 2,6,Rōmaji
 2,9,Official roomaji
 3,1,韓国語
+3,5,Coréen
 3,6,Koreanisch
 3,9,Korean
 4,1,中国語
+4,5,Chinois
 4,6,Chinesisch
 4,9,Chinese
 5,1,フランス語
+5,5,Français
 5,6,Französisch
 5,9,French
 6,1,ドイツ語
+6,5,Allemand
 6,6,Deutsch
 6,9,German
 7,1,西語
+7,5,Espagnol
 7,6,Spanisch
 7,9,Spanish
 8,1,伊語
+8,5,Italien
 8,6,Italienisch
 8,9,Italian
 9,1,英語
+9,5,Anglais
 9,6,Englisch
 9,9,English
 10,1,チェコ語
+10,5,Tchèque
 10,6,Tschechisch
 10,9,Czech

data/v2/csv/location_area_prose.csv

@@ -662,3 +662,24 @@ location_area_id,local_language_id,name
 705,9,
 706,9,
 707,9,
+736,9,Unknown Area 303
+737,9,Unknown Area 304
+738,9,Unknown Area 305
+739,9,Unknown Area 306
+740,9,Unknown Area 307
+741,9,Unknown Area 308
+742,9,Unknown Area 313
+743,9,Unknown Area 314
+744,9,Unknown Area 315
+745,9,Unknown Area 316
+746,9,Unknown Area 317
+748,9,Unknown Area 322
+749,9,Unknown Area 324
+750,9,Unknown Area 326
+751,9,Unknown Area 327
+752,9,Unknown Area 328
+754,9,Unknown Area 343
+755,9,Unknown Area 344
+756,9,Unknown Area 345
+757,9,Unknown Area 347
+758,9,Unknown Area 348

data/v2/csv/location_areas.csv

@@ -662,3 +662,56 @@ id,location_id,game_index,identifier
 705,541,130,
 706,542,131,
 707,540,134,
+708,646,0,
+709,614,0,
+710,611,0,
+711,624,0,
+712,633,0,
+713,591,0,
+714,594,0,
+715,597,0,
+716,602,0,
+717,606,0,
+718,609,0,
+719,612,0,
+720,615,0,
+721,618,0,
+722,621,0,
+723,626,0,
+724,629,0,
+725,631,0,
+726,635,0,
+727,638,0,
+728,641,0,
+729,644,0,
+730,647,0,
+731,650,0,
+732,653,0,
+733,655,0,
+734,593,0,
+735,608,0,
+736,671,0,unknown-area-303
+737,671,0,unknown-area-304
+738,623,0,unknown-area-305
+739,623,0,unknown-area-306
+740,623,0,unknown-area-307
+741,623,0,unknown-area-308
+742,640,0,unknown-area-313
+743,640,0,unknown-area-314
+744,640,0,unknown-area-315
+745,640,0,unknown-area-316
+746,640,0,unknown-area-317
+747,652,0,
+748,657,0,unknown-area-322
+749,657,0,unknown-area-324
+750,657,0,unknown-area-326
+751,657,0,unknown-area-327
+752,657,0,unknown-area-328
+753,672,0,
+754,676,0,unknown-area-343
+755,676,0,unknown-area-344
+756,676,0,unknown-area-345
+757,676,0,unknown-area-347
+758,676,0,unknown-area-348
+759,677,0,
+760,661,0,

data/v2/csv/location_game_indices.csv

@@ -245,9 +245,11 @@ location_id,generation_id,game_index
 262,4,2010
 263,4,2011
 264,4,2012
+264,6,2
 265,4,3000
 266,4,3001
 267,4,3002
+267,6,4
 268,4,3003
 269,4,3004
 270,4,3005
@@ -475,3 +477,107 @@ location_id,generation_id,game_index
 564,5,151
 565,5,152
 566,5,153
+587,6,6
+588,6,8
+589,6,9
+590,6,10
+591,6,12
+592,6,13
+593,6,14
+594,6,16
+595,6,17
+596,6,18
+597,6,20
+598,6,21
+599,6,22
+600,6,24
+601,6,26
+602,6,28
+603,6,29
+604,6,30
+605,6,32
+606,6,34
+607,6,35
+608,6,36
+609,6,38
+610,6,39
+611,6,40
+612,6,42
+613,6,43
+614,6,44
+615,6,46
+616,6,47
+617,6,48
+618,6,50
+619,6,51
+620,6,52
+621,6,54
+622,6,55
+623,6,56
+624,6,58
+625,6,60
+626,6,62
+627,6,63
+628,6,64
+629,6,66
+630,6,67
+631,6,68
+632,6,69
+633,6,70
+634,6,72
+635,6,74
+636,6,75
+637,6,76
+638,6,78
+639,6,79
+640,6,82
+641,6,84
+642,6,85
+643,6,86
+644,6,88
+645,6,89
+646,6,90
+647,6,92
+648,6,93
+649,6,94
+650,6,96
+651,6,97
+652,6,98
+653,6,100
+654,6,101
+655,6,102
+656,6,103
+657,6,104
+658,6,106
+659,6,108
+660,6,110
+661,6,112
+662,6,114
+663,6,116
+664,6,118
+665,6,120
+666,6,122
+667,6,124
+668,6,126
+669,6,128
+670,6,130
+671,6,132
+672,6,134
+673,6,135
+674,6,136
+675,6,138
+676,6,140
+677,6,142
+678,6,144
+679,6,146
+680,6,148
+681,6,150
+682,6,152
+683,6,154
+684,6,156
+685,6,158
+686,6,160
+687,6,162
+688,6,164
+689,6,166
+690,6,168

data/v2/csv/locations.csv

@@ -221,10 +221,10 @@ id,region_id,identifier
 228,2,azalea-town
 229,2,goldenrod-city
 230,2,mahogany-town
-231,2,pewter-city
-232,2,lavender-town
-233,2,indigo-plateau
-234,2,saffron-city
+231,1,pewter-city
+232,1,lavender-town
+233,1,indigo-plateau
+234,1,saffron-city
 236,2,johto-lighthouse
 237,2,team-rocket-hq
 238,2,goldenrod-tunnel
@@ -574,59 +574,106 @@ id,region_id,identifier
 585,3,secret-base
 586,3,hoenn-battle-tower
 587,6,vaniville-town
-588,6,aquacorde-town
-589,6,santalune-forest
-590,6,santalune-city
-591,6,lumiose-city
-592,6,camphrier-town
-593,6,parfum-palace
-594,6,connecting-cave
-595,6,cyllage-city
-596,6,ambrette-town
-597,6,glittering-cave
-598,6,geosenge-town
-599,6,reflection-cave
-600,6,shalour-city
-601,6,coumarine-city
-602,6,sea-spirits-den
-603,6,kalos-power-plant
-604,6,laverre-city
-605,6,poke-ball-factory
-606,6,lost-hotel
-607,6,dendemille-town
-608,6,frost-cavern
-609,6,anistar-city
-610,6,couriway-town
-611,6,terminus-cave
-612,6,snowbelle-city
-613,6,pokemon-village
-614,6,kalos-victory-road
-615,6,chamber-of-emptiness
-616,6,pokemon-league
-617,6,kiloude-city
-618,6,azure-bay
-619,6,battle-chateau
-620,6,battle-maison
-621,6,tower-of-mastery
-622,6,kalos-route-1
-623,6,kalos-route-2
-624,6,kalos-route-3
-625,6,kalos-route-4
-626,6,kalos-route-5
-627,6,kalos-route-6
-628,6,kalos-route-7
-629,6,kalos-route-8
-630,6,kalos-route-9
-631,6,kalos-route-10
-632,6,kalos-route-11
-633,6,kalos-route-12
-634,6,kalos-route-13
-635,6,kalos-route-14
-636,6,kalos-route-15
-637,6,kalos-route-16
-638,6,kalos-route-17
-639,6,kalos-route-18
-640,6,kalos-route-19
-641,6,kalos-route-20
-642,6,kalos-route-21
-643,6,kalos-route-22
+588,6,kalos-route-1
+589,6,vaniville-pathway
+590,6,aquacorde-town
+591,6,kalos-route-2
+592,6,avance-trail
+593,6,santalune-forest
+594,6,kalos-route-3
+595,6,ouvert-way
+596,6,santalune-city
+597,6,kalos-route-4
+598,6,parterre-way
+599,6,lumiose-city
+600,6,prism-tower
+601,6,lysandre-labs
+602,6,kalos-route-5
+603,6,versant-road
+604,6,camphrier-town
+605,6,shabboneau-castle
+606,6,kalos-route-6
+607,6,palais-lane
+608,6,parfum-palace
+609,6,kalos-route-7
+610,6,rivière-walk
+611,6,cyllage-city
+612,6,kalos-route-8
+613,6,muraille-coast
+614,6,ambrette-town
+615,6,kalos-route-9
+616,6,spikes-passage
+617,6,battle-chateau
+618,6,kalos-route-10
+619,6,menhir-trail
+620,6,geosenge-town
+621,6,kalos-route-11
+622,6,miroir-way
+623,6,reflection-cave
+624,6,shalour-city
+625,6,tower-of-mastery
+626,6,kalos-route-12
+627,6,fourrage-road
+628,6,coumarine-city
+629,6,kalos-route-13
+630,6,lumiose-badlands
+631,6,kalos-route-14
+632,6,laverre-nature-trail
+633,6,laverre-city
+634,6,poke-ball-factory
+635,6,kalos-route-15
+636,6,brun-way
+637,6,dendemille-town
+638,6,kalos-route-16
+639,6,melancolie-path
+640,6,frost-cavern
+641,6,kalos-route-17
+642,6,mamoswine-road
+643,6,anistar-city
+644,6,kalos-route-18
+645,6,vallee-etroite-way
+646,6,couriway-town
+647,6,kalos-route-19
+648,6,grande-vallee-way
+649,6,snowbelle-city
+650,6,kalos-route-20
+651,6,winding-woods
+652,6,pokemon-village
+653,6,kalos-route-21
+654,6,dernière-way
+655,6,kalos-route-22
+656,6,detourner-way
+657,6,victory-road
+658,6,pokemon-league
+659,6,kiloude-city
+660,6,battle-maison
+661,6,azure-bay
+662,6,dendemille-gate
+663,6,couriway-gate
+664,6,ambrette-gate
+665,6,lumiose-gate
+666,6,shalour-gate
+667,6,coumarine-gate
+668,6,laverre-gate
+669,6,anistar-gate
+670,6,snowbelle-gate
+671,6,glittering-cave
+672,6,connecting-cave
+673,6,zubat-roost
+674,6,kalos-power-plant
+675,6,team-flare-secret-hq
+676,6,terminus-cave
+677,6,lost-hotel
+678,6,chamber-of-emptiness
+679,6,sea-spirits-den
+680,6,friend-safari
+681,6,blazing-chamber
+682,6,flood-chamber
+683,6,ironworks-chamber
+684,6,dragonmark-chamber
+685,6,radiant-chamber
+686,6,pokemon-league-gate
+687,6,lumiose-station
+688,6,kiloude-station
+689,6,ambrette-aquarium
+690,6,unknown-dungeon

data/v2/csv/machines.csv

@@ -14,6 +14,7 @@ machine_number,version_group_id,item_id,move_id
 1,13,305,264
 1,14,305,468
 1,15,305,468
+1,16,305,468
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -29,6 +30,7 @@ machine_number,version_group_id,item_id,move_id
 2,13,306,337
 2,14,306,337
 2,15,306,337
+2,16,306,337
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -44,6 +46,7 @@ machine_number,version_group_id,item_id,move_id
 3,13,307,352
 3,14,307,473
 3,15,307,473
+3,16,307,473
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -59,6 +62,7 @@ machine_number,version_group_id,item_id,move_id
 4,13,308,347
 4,14,308,347
 4,15,308,347
+4,16,308,347
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -74,6 +78,7 @@ machine_number,version_group_id,item_id,move_id
 5,13,309,46
 5,14,309,46
 5,15,309,46
+5,16,309,46
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -89,6 +94,7 @@ machine_number,version_group_id,item_id,move_id
 6,13,310,92
 6,14,310,92
 6,15,310,92
+6,16,310,92
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -104,6 +110,7 @@ machine_number,version_group_id,item_id,move_id
 7,13,311,258
 7,14,311,258
 7,15,311,258
+7,16,311,258
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -119,6 +126,7 @@ machine_number,version_group_id,item_id,move_id
 8,13,312,339
 8,14,312,339
 8,15,312,339
+8,16,312,339
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -134,6 +142,7 @@ machine_number,version_group_id,item_id,move_id
 9,13,313,331
 9,14,313,474
 9,15,313,474
+9,16,313,474
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -149,6 +158,7 @@ machine_number,version_group_id,item_id,move_id
 10,13,314,237
 10,14,314,237
 10,15,314,237
+10,16,314,237
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -164,6 +174,7 @@ machine_number,version_group_id,item_id,move_id
 11,13,315,241
 11,14,315,241
 11,15,315,241
+11,16,315,241
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -179,6 +190,7 @@ machine_number,version_group_id,item_id,move_id
 12,13,316,269
 12,14,316,269
 12,15,316,269
+12,16,316,269
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -194,6 +206,7 @@ machine_number,version_group_id,item_id,move_id
 13,13,317,58
 13,14,317,58
 13,15,317,58
+13,16,317,58
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -209,6 +222,7 @@ machine_number,version_group_id,item_id,move_id
 14,13,318,59
 14,14,318,59
 14,15,318,59
+14,16,318,59
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -224,6 +238,7 @@ machine_number,version_group_id,item_id,move_id
 15,13,319,63
 15,14,319,63
 15,15,319,63
+15,16,319,63
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -239,6 +254,7 @@ machine_number,version_group_id,item_id,move_id
 16,13,320,113
 16,14,320,113
 16,15,320,113
+16,16,320,113
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -254,6 +270,7 @@ machine_number,version_group_id,item_id,move_id
 17,13,321,182
 17,14,321,182
 17,15,321,182
+17,16,321,182
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -269,6 +286,7 @@ machine_number,version_group_id,item_id,move_id
 18,13,322,240
 18,14,322,240
 18,15,322,240
+18,16,322,240
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -284,6 +302,7 @@ machine_number,version_group_id,item_id,move_id
 19,13,323,202
 19,14,323,477
 19,15,323,355
+19,16,323,355
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -299,6 +318,7 @@ machine_number,version_group_id,item_id,move_id
 20,13,324,219
 20,14,324,219
 20,15,324,219
+20,16,324,219
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -314,6 +334,7 @@ machine_number,version_group_id,item_id,move_id
 21,13,325,218
 21,14,325,218
 21,15,325,218
+21,16,325,218
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -329,6 +350,7 @@ machine_number,version_group_id,item_id,move_id
 22,13,326,76
 22,14,326,76
 22,15,326,76
+22,16,326,76
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -344,6 +366,7 @@ machine_number,version_group_id,item_id,move_id
 23,13,327,231
 23,14,327,479
 23,15,327,479
+23,16,327,479
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -359,6 +382,7 @@ machine_number,version_group_id,item_id,move_id
 24,13,328,85
 24,14,328,85
 24,15,328,85
+24,16,328,85
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -374,6 +398,7 @@ machine_number,version_group_id,item_id,move_id
 25,13,329,87
 25,14,329,87
 25,15,329,87
+25,16,329,87
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -389,6 +414,7 @@ machine_number,version_group_id,item_id,move_id
 26,13,330,89
 26,14,330,89
 26,15,330,89
+26,16,330,89
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -404,6 +430,7 @@ machine_number,version_group_id,item_id,move_id
 27,13,331,216
 27,14,331,216
 27,15,331,216
+27,16,331,216
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -419,6 +446,7 @@ machine_number,version_group_id,item_id,move_id
 28,13,332,91
 28,14,332,91
 28,15,332,91
+28,16,332,91
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -434,6 +462,7 @@ machine_number,version_group_id,item_id,move_id
 29,13,333,94
 29,14,333,94
 29,15,333,94
+29,16,333,94
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -449,6 +478,7 @@ machine_number,version_group_id,item_id,move_id
 30,13,334,247
 30,14,334,247
 30,15,334,247
+30,16,334,247
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -464,6 +494,7 @@ machine_number,version_group_id,item_id,move_id
 31,13,335,280
 31,14,335,280
 31,15,335,280
+31,16,335,280
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -479,6 +510,7 @@ machine_number,version_group_id,item_id,move_id
 32,13,336,104
 32,14,336,104
 32,15,336,104
+32,16,336,104
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -494,6 +526,7 @@ machine_number,version_group_id,item_id,move_id
 33,13,337,115
 33,14,337,115
 33,15,337,115
+33,16,337,115
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -509,6 +542,7 @@ machine_number,version_group_id,item_id,move_id
 34,13,338,351
 34,14,338,482
 34,15,338,482
+34,16,338,482
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -524,6 +558,7 @@ machine_number,version_group_id,item_id,move_id
 35,13,339,53
 35,14,339,53
 35,15,339,53
+35,16,339,53
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -539,6 +574,7 @@ machine_number,version_group_id,item_id,move_id
 36,13,340,188
 36,14,340,188
 36,15,340,188
+36,16,340,188
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -554,6 +590,7 @@ machine_number,version_group_id,item_id,move_id
 37,13,341,201
 37,14,341,201
 37,15,341,201
+37,16,341,201
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -569,6 +606,7 @@ machine_number,version_group_id,item_id,move_id
 38,13,342,126
 38,14,342,126
 38,15,342,126
+38,16,342,126
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -584,6 +622,7 @@ machine_number,version_group_id,item_id,move_id
 39,13,343,317
 39,14,343,317
 39,15,343,317
+39,16,343,317
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -599,6 +638,7 @@ machine_number,version_group_id,item_id,move_id
 40,13,344,332
 40,14,344,332
 40,15,344,332
+40,16,344,332
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -614,6 +654,7 @@ machine_number,version_group_id,item_id,move_id
 41,13,345,259
 41,14,345,259
 41,15,345,259
+41,16,345,259
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -629,6 +670,7 @@ machine_number,version_group_id,item_id,move_id
 42,13,346,263
 42,14,346,263
 42,15,346,263
+42,16,346,263
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -644,6 +686,7 @@ machine_number,version_group_id,item_id,move_id
 43,13,347,290
 43,14,347,488
 43,15,347,488
+43,16,347,488
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -659,6 +702,7 @@ machine_number,version_group_id,item_id,move_id
 44,13,348,156
 44,14,348,156
 44,15,348,156
+44,16,348,156
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -674,6 +718,7 @@ machine_number,version_group_id,item_id,move_id
 45,13,349,213
 45,14,349,213
 45,15,349,213
+45,16,349,213
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -689,6 +734,7 @@ machine_number,version_group_id,item_id,move_id
 46,13,350,168
 46,14,350,168
 46,15,350,168
+46,16,350,168
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -704,6 +750,7 @@ machine_number,version_group_id,item_id,move_id
 47,13,351,211
 47,14,351,490
 47,15,351,490
+47,16,351,490
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -719,6 +766,7 @@ machine_number,version_group_id,item_id,move_id
 48,13,352,285
 48,14,352,496
 48,15,352,496
+48,16,352,496
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -734,6 +782,7 @@ machine_number,version_group_id,item_id,move_id
 49,13,353,289
 49,14,353,497
 49,15,353,497
+49,16,353,497
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -749,272 +798,323 @@ machine_number,version_group_id,item_id,move_id
 50,13,354,315
 50,14,354,315
 50,15,354,315
+50,16,354,315
 51,8,355,355
 51,9,355,355
 51,10,355,355
 51,11,355,502
 51,14,355,502
 51,15,355,211
+51,16,355,211
 52,8,356,411
 52,9,356,411
 52,10,356,411
 52,11,356,411
 52,14,356,411
 52,15,356,411
+52,16,356,411
 53,8,357,412
 53,9,357,412
 53,10,357,412
 53,11,357,412
 53,14,357,412
 53,15,357,412
+53,16,357,412
 54,8,358,206
 54,9,358,206
 54,10,358,206
 54,11,358,206
 54,14,358,206
 54,15,358,206
+54,16,358,206
 55,8,359,362
 55,9,359,362
 55,10,359,362
 55,11,359,503
 55,14,359,503
 55,15,359,503
+55,16,359,503
 56,8,360,374
 56,9,360,374
 56,10,360,374
 56,11,360,374
 56,14,360,374
 56,15,360,374
+56,16,360,374
 57,8,361,451
 57,9,361,451
 57,10,361,451
 57,11,361,451
 57,14,361,451
 57,15,361,451
+57,16,361,451
 58,8,362,203
 58,9,362,203
 58,10,362,203
 58,11,362,507
 58,14,362,507
 58,15,362,507
+58,16,362,507
 59,8,363,406
 59,9,363,406
 59,10,363,406
 59,11,363,510
 59,14,363,510
 59,15,363,510
+59,16,363,510
 60,8,364,409
 60,9,364,409
 60,10,364,409
 60,11,364,511
 60,14,364,511
 60,15,364,511
+60,16,364,511
 61,8,365,261
 61,9,365,261
 61,10,365,261
 61,11,365,261
 61,14,365,261
 61,15,365,261
+61,16,365,261
 62,8,366,318
 62,9,366,318
 62,10,366,318
 62,11,366,512
 62,14,366,512
 62,15,366,512
+62,16,366,512
 63,8,367,373
 63,9,367,373
 63,10,367,373
 63,11,367,373
 63,14,367,373
 63,15,367,373
+63,16,367,373
 64,8,368,153
 64,9,368,153
 64,10,368,153
 64,11,368,153
 64,14,368,153
 64,15,368,153
+64,16,368,153
 65,8,369,421
 65,9,369,421
 65,10,369,421
 65,11,369,421
 65,14,369,421
 65,15,369,421
+65,16,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
 66,11,370,371
 66,14,370,371
 66,15,370,371
+66,16,370,371
 67,8,371,278
 67,9,371,278
 67,10,371,278
 67,11,371,514
 67,14,371,514
 67,15,371,514
+67,16,371,514
 68,8,372,416
 68,9,372,416
 68,10,372,416
 68,11,372,416
 68,14,372,416
 68,15,372,416
+68,16,372,416
 69,8,373,397
 69,9,373,397
 69,10,373,397
 69,11,373,397
 69,14,373,397
 69,15,373,397
+69,16,373,397
 70,8,374,148
 70,9,374,148
 70,10,374,148
 70,11,374,148
 70,14,374,148
 70,15,374,148
+70,16,374,148
 71,8,375,444
 71,9,375,444
 71,10,375,444
 71,11,375,444
 71,14,375,444
 71,15,375,444
+71,16,375,444
 72,8,376,419
 72,9,376,419
 72,10,376,419
 72,11,376,521
 72,14,376,521
 72,15,376,521
+72,16,376,521
 73,8,377,86
 73,9,377,86
 73,10,377,86
 73,11,377,86
 73,14,377,86
 73,15,377,86
+73,16,377,86
 74,8,378,360
 74,9,378,360
 74,10,378,360
 74,11,378,360
 74,14,378,360
 74,15,378,360
+74,16,378,360
 75,8,379,14
 75,9,379,14
 75,10,379,14
 75,11,379,14
 75,14,379,14
 75,15,379,14
+75,16,379,14
 76,8,380,446
 76,9,380,446
 76,10,380,446
 76,11,380,522
 76,14,380,522
 76,15,380,522
+76,16,380,522
 77,8,381,244
 77,9,381,244
 77,10,381,244
 77,11,381,244
 77,14,381,244
 77,15,381,244
+77,16,381,244
 78,8,382,445
 78,9,382,445
 78,10,382,445
 78,11,382,523
 78,14,382,523
 78,15,382,523
+78,16,382,523
 79,8,383,399
 79,9,383,399
 79,10,383,399
 79,11,383,524
 79,14,383,524
 79,15,383,524
+79,16,383,524
 80,8,384,157
 80,9,384,157
 80,10,384,157
 80,11,384,157
 80,14,384,157
 80,15,384,157
+80,16,384,157
 81,8,385,404
 81,9,385,404
 81,10,385,404
 81,11,385,404
 81,14,385,404
 81,15,385,404
+81,16,385,404
 82,8,386,214
 82,9,386,214
 82,10,386,214
 82,11,386,525
 82,14,386,525
 82,15,386,525
+82,16,386,525
 83,8,387,363
 83,9,387,363
 83,10,387,363
 83,11,387,526
 83,14,387,526
 83,15,387,611
+83,16,387,611
 84,8,388,398
 84,9,388,398
 84,10,388,398
 84,11,388,398
 84,14,388,398
 84,15,388,398
+84,16,388,398
 85,8,389,138
 85,9,389,138
 85,10,389,138
 85,11,389,138
 85,14,389,138
 85,15,389,138
+85,16,389,138
 86,8,390,447
 86,9,390,447
 86,10,390,447
 86,11,390,447
 86,14,390,447
 86,15,390,447
+86,16,390,447
 87,8,391,207
 87,9,391,207
 87,10,391,207
 87,11,391,207
 87,14,391,207
 87,15,391,207
+87,16,391,207
 88,8,392,365
 88,9,392,365
 88,10,392,365
 88,11,392,365
 88,14,392,365
 88,15,392,214
+88,16,392,214
 89,8,393,369
 89,9,393,369
 89,10,393,369
 89,11,393,369
 89,14,393,369
 89,15,393,369
+89,16,393,369
 90,8,394,164
 90,9,394,164
 90,10,394,164
 90,11,394,164
 90,14,394,164
 90,15,394,164
+90,16,394,164
 91,8,395,430
 91,9,395,430
 91,10,395,430
 91,11,395,430
 91,14,395,430
 91,15,395,430
+91,16,395,430
 92,8,396,433
 92,9,396,433
 92,10,396,433
 92,11,396,433
 92,14,396,433
 92,15,396,433
+92,16,396,433
 93,11,659,528
 93,14,659,528
 93,15,659,528
+93,16,397,528
 94,11,660,249
 94,14,660,249
 94,15,660,249
+94,16,398,290
 95,11,661,555
 95,14,661,555
 95,15,661,555
+95,16,399,555
 96,15,745,267
+96,16,400,267
 97,15,746,399
+97,16,401,399
 98,15,747,612
+98,16,402,612
 99,15,748,605
+99,16,403,605
 100,15,749,590
+100,16,404,590
 101,1,397,15
 101,2,397,15
 101,3,397,15
@@ -1030,6 +1130,7 @@ machine_number,version_group_id,item_id,move_id
 101,13,397,15
 101,14,397,15
 101,15,397,15
+101,16,405,15
 102,1,398,19
 102,2,398,19
 102,3,398,19
@@ -1045,6 +1146,7 @@ machine_number,version_group_id,item_id,move_id
 102,13,398,19
 102,14,398,19
 102,15,398,19
+102,16,406,19
 103,1,399,57
 103,2,399,57
 103,3,399,57
@@ -1060,6 +1162,7 @@ machine_number,version_group_id,item_id,move_id
 103,13,399,57
 103,14,399,57
 103,15,399,57
+103,16,407,57
 104,1,400,70
 104,2,400,70
 104,3,400,70
@@ -1075,6 +1178,7 @@ machine_number,version_group_id,item_id,move_id
 104,13,400,70
 104,14,400,70
 104,15,400,70
+104,16,408,70
 105,1,401,148
 105,2,401,148
 105,3,401,148
@@ -1090,6 +1194,7 @@ machine_number,version_group_id,item_id,move_id
 105,13,401,148
 105,14,401,127
 105,15,401,127
+105,16,409,127
 106,3,402,250
 106,4,402,250
 106,5,402,249
@@ -1102,6 +1207,7 @@ machine_number,version_group_id,item_id,move_id
 106,12,402,249
 106,13,402,249
 106,14,402,291
+106,16,410,249
 107,3,403,127
 107,4,403,127
 107,5,403,127
@@ -1112,6 +1218,7 @@ machine_number,version_group_id,item_id,move_id
 107,10,403,127
 107,12,403,127
 107,13,403,127
+107,16,411,291
 108,5,404,291
 108,6,404,291
 108,7,404,291

data/v2/csv/move_battle_style_prose.csv

@@ -1,4 +1,7 @@
 move_battle_style_id,local_language_id,name
+1,5,Attaque
 1,9,Attack
+2,5,Défense
 2,9,Defense
+3,5,Assistance
 3,9,Support

data/v2/csv/move_damage_class_prose.csv

@@ -1,10 +1,13 @@
 move_damage_class_id,local_language_id,name,description
 1,1,へんか,ダメージない
+1,5,statut,Aucun dégât
 1,6,status,Kein Schaden
 1,9,status,No damage
 2,1,ぶつり,ぶつりのダメージ。こうげきとぼうぎょを行使する
+2,5,physique,"Dégâts physique, influencés par l'Attaque et la Défense"
 2,6,physich,"Physischer Schaden, beeinflusst von Angriff und Verteidigung"
 2,9,physical,"Physical damage, controlled by Attack and Defense"
 3,1,とくしゅ,とくしゅのダメージ。とくこうととくぼうを行使する
+3,5,spéciale,"Dégâts spéciaux, influencés par l'Attaque Spéciale et la Défense Spéciale"
 3,6,spezial,"Spezieller Schaden, beeinflusst von Spezialangriff und Spezialverteidigung"
 3,9,special,"Special damage, controlled by Special Attack and Special Defense"

data/v2/csv/move_effect_changelog.csv

@@ -26,3 +26,4 @@ id,effect_id,changed_in_version_group_id
 25,27,8
 26,224,11
 27,255,8
+28,187,11

data/v2/csv/move_effect_changelog_prose.csv

@@ -26,3 +26,4 @@ move_effect_changelog_id,local_language_id,effect
 25,9,Lasts either two or three turns.
 26,9,"If the target is not under the effect of []{move:detect} or []{move:protect}, this move will fail."
 27,9,The user receieves 1/2 of the damage dealt in recoil.
+28,9,The barriers are destroyed even if this move has [no effect]{mechanic:no-effect}.

data/v2/csv/move_effect_prose.csv

@@ -12,7 +12,7 @@ move_effect_id,local_language_id,short_effect,effect
 
 Moves that [fail]{mechanic:fail}ed, [miss]{mechanic:miss}ed, had [no effect]{mechanic:no-effect}, or were [block]{mechanic:block}ed are still copied.
 
-Assist moves, time-delayed moves, “meta” moves that operate on other moves/Pokémon/abilities, and some other special moves cannot be copied and are ignored; if the last move to hit the user was such a move, the previous move will be used instead.  The full list of ignored moves is: []{move:acupressure}, []{move:assist}, []{move:chatter}, []{move:copycat}, []{move:counter}, []{move:curse}, []{move:doom-desire}, []{move:feint}, []{move:focus-punch}, []{move:future-sight}, []{move:helping-hand}, []{move:magic-coat}, []{move:me-first}, []{move:metronome}, []{move:mimic}, []{move:mirror-coat}, []{move:mirror-move}, []{move:nature-power}, []{move:perish-song}, []{move:psych-up}, []{move:role-play}, []{move:sketch}, []{move:sleep-talk}, []{move:snatch}, []{move:spit-up}, []{move:struggle}, and []{move:transform}.
+Assist moves, time-delayed moves, “meta” moves that operate on other moves/Pokémon/abilities, and some other special moves cannot be copied and are ignored; if the last move to hit the user was such a move, the previous move will be used instead.  The full list of ignored moves is: []{move:acid-armor}, []{move:acupressure}, []{move:after-you}, []{move:agility}, []{move:ally-switch}, []{move:amnesia}, []{move:aqua-ring}, []{move:aromatherapy}, []{move:aromatic-mist}, []{move:assist}, []{move:autotomize}, []{move:barrier}, []{move:baton-pass}, []{move:belch}, []{move:belly-drum}, []{move:bide}, []{move:bulk-up}, []{move:calm-mind}, []{move:camouflage}, []{move:celebrate}, []{move:charge}, []{move:coil}, []{move:conversion}, []{move:conversion-2}, []{move:copycat}, []{move:cosmic-power}, []{move:cotton-guard}, []{move:counter}, []{move:crafty-shield}, []{move:curse}, []{move:defend-order}, []{move:defense-curl}, []{move:destiny-bond}, []{move:detect}, []{move:doom-desire}, []{move:double-team}, []{move:dragon-dance}, []{move:electric-terrain}, []{move:endure}, []{move:final-gambit}, []{move:flower-shield}, []{move:focus-energy}, []{move:focus-punch}, []{move:follow-me}, []{move:future-sight}, []{move:geomancy}, []{move:grassy-terrain}, []{move:gravity}, []{move:growth}, []{move:grudge}, []{move:guard-split}, []{move:hail}, []{move:happy-hour}, []{move:harden}, []{move:haze}, []{move:heal-bell}, []{move:heal-order}, []{move:heal-pulse}, []{move:healing-wish}, []{move:helping-hand}, []{move:hold-hands}, []{move:hone-claws}, []{move:howl}, []{move:imprison}, []{move:ingrain}, []{move:ion-deluge}, []{move:iron-defense}, []{move:kings-shield}, []{move:light-screen}, []{move:lucky-chant}, []{move:lunar-dance}, []{move:magic-coat}, []{move:magnet-rise}, []{move:magnetic-flux}, []{move:mat-block}, []{move:me-first}, []{move:meditate}, []{move:metronome}, []{move:milk-drink}, []{move:mimic}, []{move:minimize}, []{move:mirror-coat}, []{move:mirror-move}, []{move:mist}, []{move:misty-terrain}, []{move:moonlight}, []{move:morning-sun}, []{move:mud-sport}, []{move:nasty-plot}, []{move:nature-power}, []{move:perish-song}, []{move:power-split}, []{move:power-trick}, []{move:protect}, []{move:psych-up}, []{move:quick-guard}, []{move:quiver-dance}, []{move:rage-powder}, []{move:rain-dance}, []{move:recover}, []{move:recycle}, []{move:reflect}, []{move:reflect-type}, []{move:refresh}, []{move:rest}, []{move:rock-polish}, []{move:role-play}, []{move:roost}, []{move:rototiller}, []{move:safeguard}, []{move:sandstorm}, []{move:shadow-blast}, []{move:shadow-bolt}, []{move:shadow-half}, []{move:shadow-rush}, []{move:shadow-shed}, []{move:shadow-sky}, []{move:shadow-storm}, []{move:shadow-wave}, []{move:sharpen}, []{move:shell-smash}, []{move:shift-gear}, []{move:sketch}, []{move:slack-off}, []{move:sleep-talk}, []{move:snatch}, []{move:soft-boiled}, []{move:spikes}, []{move:spiky-shield}, []{move:spit-up}, []{move:splash}, []{move:stealth-rock}, []{move:sticky-web}, []{move:stockpile}, []{move:struggle}, []{move:substitute}, []{move:sunny-day}, []{move:swallow}, []{move:swords-dance}, []{move:synthesis}, []{move:tail-glow}, []{move:tailwind}, []{move:teleport}, []{move:toxic-spikes}, []{move:transform}, []{move:water-sport}, []{move:wide-guard}, []{move:wish}, []{move:withdraw} and []{move:work-up}.
 
 This move cannot be selected by []{move:assist}, []{move:metronome}, or []{move:sleep-talk}, nor forced by []{move:encore}."
 11,9,Raises the user's Attack by one stage.,Raises the user's [Attack]{mechanic:attack} by one [stage]{mechanic:stage}.
@@ -593,7 +593,7 @@ Items taken or given away by []{move:covet}, []{move:knock-off}, []{move:switche
 186,9,Inflicts double damage if the user takes damage before attacking this turn.,"Inflicts [regular damage]{mechanic:regular-damage}.  If the target damaged the user this turn and was the last to do so, this move has double power.
 
 []{move:pain-split} does not count as damaging the user."
-187,9,Destroys Reflect and Light Screen.,"Destroys any []{move:light-screen} or []{move:reflect} on the target's side of the [field]{mechanic:field}, then inflicts [regular damage]{mechanic:regular-damage}.  The barriers are destroyed even if this move has [no effect]{mechanic:no-effect}."
+187,9,Destroys Reflect and Light Screen.,"Destroys any []{move:light-screen} or []{move:reflect} on the target's side of the [field]{mechanic:field}, then inflicts [regular damage]{mechanic:regular-damage}."
 188,9,Target sleeps at the end of the next turn.,"Puts the target to [sleep]{mechanic:sleep} at the end of the next turn.  Ignores [accuracy]{mechanic:accuracy} and [evasion]{mechanic:evasion} modifiers.  If the target leaves the [field]{mechanic:field}, this effect is canceled.  If the target has a status effect when this move is used, this move will [fail]{mechanic:fail}.
 
 If the target is protected by []{move:safeguard} when this move is used, this move will [fail]{mechanic:fail}.
@@ -1030,7 +1030,7 @@ The target's other type will affect damage as usual.  If this move's type is cha
 354,9,Protects all friendly Pokémon from non-damaging moves.,"Protects all friendly Pokémon from non-damaging moves for the rest of the turn.
 
 Unlike other blocking moves, this move may be used consecutively without its chance of success falling."
-355,9,Raises the Defense of all []{type:grass} Pokémon in battle,Raises the Defense of all []{type:grass} Pokémon in battle.
+355,9,Raises the Defense of all []{type:grass} Pokémon in battle.,Raises the Defense of all []{type:grass} Pokémon in battle.
 356,9,"For five turns, heals all Pokémon on the ground for 1/16 max HP each turn and strengthens their []{type:grass} moves to 1.5× their power.","For five turns, heals all Pokémon on the ground for 1/16 their max HP each turn and strengthens their []{type:grass} moves to 1.5× their power.
 
 Changes []{move:nature-power} to []{move:energy-ball}."

data/v2/csv/move_meta_ailment_names.csv

@@ -1,21 +1,41 @@
 move_meta_ailment_id,local_language_id,name
+-1,5,????
 -1,9,????
+0,5,Aucun
 0,9,none
+1,5,Paralysie
 1,9,Paralysis
+2,5,Sommeil
 2,9,Sleep
+3,5,Gel
 3,9,Freeze
+4,5,Brûlure
 4,9,Burn
+5,5,Empoisonnement
 5,9,Poison
+6,5,Confusion
 6,9,Confusion
+7,5,Attraction
 7,9,Infatuation
+8,5,Piège
 8,9,Trap
+9,5,Cauchemar
 9,9,Nightmare
+12,5,Tourmente
 12,9,Torment
+13,5,Entrave
 13,9,Disable
+14,5,Bâillement
 14,9,Yawn
+15,5,Anti-Soin
 15,9,Heal Block
+17,5,Aucune immunité aux types
 17,9,No type immunity
+18,5,Vampigraine
 18,9,Leech Seed
+19,5,Embargo
 19,9,Embargo
+20,5,Requiem
 20,9,Perish Song
+21,5,Racines
 21,9,Ingrain

data/v2/csv/move_names.csv

@@ -4318,6 +4318,30 @@ move_id,local_language_id,name
 617,7,Luz Aniquiladora
 617,8,Luce Nefasta
 617,9,Light of Ruin
+618,1,こんげんのはどう
+618,5,Onde Originelle
+618,6,Ursprungswoge
+618,7,Pulso Primigenio
+618,8,Primopulsar
+618,9,Origin Pulse
+619,1,だんがいのつるぎ
+619,5,Lame Pangéenne
+619,6,Abgrundsklinge
+619,7,Filo del Abismo
+619,8,Spade Telluriche
+619,9,Precipice Blades
+620,1,ガリョウテンセイ
+620,5,Draco Ascension
+620,6,Zenitstürmer
+620,7,Ascenso Draco
+620,8,Ascesa del Drago
+620,9,Dragon Ascent
+621,1,いじげんラッシュ
+621,5,Furie Dimension
+621,6,Dimensionswahn
+621,7,Cerco Dimensión
+621,8,Urtodimensionale
+621,9,Hyperspace Fury
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag

data/v2/csv/moves.csv

@@ -596,7 +596,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 595,mystical-fire,6,10,65,10,100,0,10,3,72,100,,,
 596,spiky-shield,6,12,,10,,4,7,1,362,,,,
 597,aromatic-mist,6,18,,20,,0,3,1,363,,,,
-598,eerie-impulse,6,13,,15,100,0,10,1,59,,,,
+598,eerie-impulse,6,13,,15,100,0,10,1,369,,,,
 599,venom-drench,6,4,,20,100,0,11,1,364,100,,,
 600,powder,6,7,,20,100,1,10,1,365,,,,
 601,geomancy,6,18,,10,,0,7,1,366,,,,
@@ -616,8 +616,12 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 615,thousand-waves,6,5,90,10,100,0,11,2,10007,,,,
 616,lands-wrath,6,5,90,10,100,0,11,2,1,,,,
 617,light-of-ruin,6,18,140,5,90,0,10,3,270,,,,
+618,origin-pulse,6,11,110,10,85,0,11,3,1,,,,
+619,precipice-blades,6,5,120,10,85,0,11,2,1,,,,
+620,dragon-ascent,6,3,120,5,100,0,10,2,230,,,,
+621,hyperspace-fury,6,17,100,5,,0,10,2,360,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
-10002,shadow-blast,3,10002,80,,100,0,10,3,44,,,,
+10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,
 10004,shadow-bolt,3,10002,75,,100,0,10,3,7,10,,,
 10005,shadow-break,3,10002,75,,100,0,10,2,1,,,,

data/v2/csv/pal_park_area_names.csv

@@ -1,6 +1,11 @@
 pal_park_area_id,local_language_id,name
+1,5,Forêt
 1,9,Forest
+2,5,Plaine
 2,9,Field
+3,5,Montagne
 3,9,Mountain
+4,5,Étang
 4,9,Pond
+5,5,Mer
 5,9,Sea

data/v2/csv/pokeathlon_stat_names.csv

@@ -1,6 +1,11 @@
 pokeathlon_stat_id,local_language_id,name
+1,5,Vitesse
 1,9,Speed
+2,5,Force
 2,9,Power
+3,5,Habileté
 3,9,Skill
+4,5,Endurance
 4,9,Stamina
+5,5,Saut
 5,9,Jump

data/v2/csv/pokedex_prose.csv

@@ -1,27 +1,43 @@
 pokedex_id,local_language_id,name,description
+1,5,National,Pokédex National complet
 1,6,National,Komplette Nationale Dex
 1,9,National,Entire National dex
+2,5,Kanto,Pokédex régional de Kanto dans Rouge/Bleu/Jaune
 2,6,Kanto,Rot/Blau/Gelb Kanto Dex
 2,9,Kanto,Red/Blue/Yellow Kanto dex
+3,5,Johto initial,"Pokédex régional de Johto dans Or/Argent/Cristal, appellé ""Nouveau"" Pokédex dans le jeu"
 3,6,Original Johto,"Gold/Silber/Kristall Johto Dex — Auch der ""Neue"" Pokédex im Spiel genannt"
 3,9,Original Johto,"Gold/Silver/Crystal Johto dex—called the ""New"" Pokédex in-game"
-4,6,Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
-4,9,Hoenn,Ruby/Sapphire/Emerald Hoenn dex
+4,5,Hoenn initial,Pokédex régional d'Hoenn dans Rubis/Saphir/Émeraude
+4,6,Original Hoenn,Rubin/Saphir/Smaragd Hoenn Dex
+4,9,Original Hoenn,Ruby/Sapphire/Emerald Hoenn dex
+5,5,Sinnoh initial,Pokédex régional de Sinnoh dans Diamant/Perle
 5,6,Original Sinnoh,Diamant/Perl Sinnoh Dex
 5,9,Original Sinnoh,Diamond/Pearl Sinnoh dex
+6,5,Sinnoh étendu,Pokédex régional de Sinnoh dans Platine
 6,6,Erweitertes Sinnoh,Platin Sinnoh Dex — eine erweiterte Version von Diamant und Perl
 6,9,Extended Sinnoh,Platinum Sinnoh dex—an extended version of Diamond and Pearl's
+7,5,Johto amélioré,"Pokédex régional de Johto dans Or HeartGold/Argent SoulSilver, mis à jour pour la 4ème génération"
 7,6,Aktualisiertes Johto,HeartGold/SoulSilver Johto Dex — Dex aus Gold/Silber/Kristall um Fähigkeiten basierende Entwicklungen aus Generation IV erweitert
 7,9,Updated Johto,"HeartGold/SoulSilver Johto dex—Gold/Silver/Crystal's, extended to add move-based Generation IV evolutions"
+8,5,Unys initial,Pokédex régional d'Unys dans Noir/Blanc
 8,6,Original Einall,Schwarz/Weiß Einall Dex
 8,9,Original Unova,Black/White Unova dex
+9,5,Unys amélioré,Pokédex régional d'Unys dans Noir 2/Blanc 2
 9,6,Aktualisiertes Einall,Schwarz 2/Weiß 2 Einall Dex
 9,9,Updated Unova,Black 2/White 2 Unova dex
+11,5,Galerie,Ordre de la Galerie dans Pokémon Conquest
 11,6,Gallerie,Pokémon Conquest Galerie Reihenfolge
 11,9,Gallery,Pokémon Conquest gallery order
+12,5,Kalos : Centre,
 12,6,Kalos-Zentral,
 12,9,Central Kalos,
+13,5,Kalos : Côtes,
 13,6,Kalos-Küste,
 13,9,Coastal Kalos,
+14,5,Kalos : Monts,
 14,6,Kalos-Gebirge,
 14,9,Mountain Kalos,
+15,5,Hoenn amélioré,"Pokédex régional d'Hoenn dans Rubis Oméga/Saphir Alpha, mis à jour pour les nouvelles évolutions"
+15,6,Neue Hoenn,Omega Rubin/Alpha Saphir Hoenn Dex — Dex aus Rubin/Saphir/Smaragd um Neue Entwicklungen erweitert
+15,9,New Hoenn,"Omega Ruby/Alpha Sapphire Hoenn Dex—Ruby/Sapphire/Emerald's, updated to add new evolutions"

data/v2/csv/pokedex_version_groups.csv

@@ -14,3 +14,4 @@ pokedex_id,version_group_id
 12,15
 13,15
 14,15
+15,16

data/v2/csv/pokedexes.csv

@@ -12,3 +12,4 @@ id,region_id,identifier,is_main_series
 12,6,kalos-central,1
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
+15,3,updated-hoenn,1

data/v2/csv/pokemon_abilities.csv

@@ -1833,3 +1833,36 @@ pokemon_id,ability_id,is_hidden,slot
 10061,180,1,3
 10062,26,0,1
 10063,26,0,1
+10064,33,0,1
+10065,31,0,1
+10066,156,0,1
+10067,182,0,1
+10068,39,0,1
+10069,131,0,1
+10070,173,0,1
+10071,75,0,1
+10072,159,0,1
+10073,99,0,1
+10074,174,0,1
+10075,156,0,1
+10076,181,0,1
+10077,189,0,1
+10078,190,0,1
+10079,191,0,1
+10080,9,0,1
+10080,31,1,3
+10081,9,0,1
+10081,31,1,3
+10082,9,0,1
+10082,31,1,3
+10083,9,0,1
+10083,31,1,3
+10084,9,0,1
+10084,31,1,3
+10085,9,0,1
+10085,31,1,3
+10086,170,0,1
+10087,125,0,1
+10088,113,0,1
+10089,184,0,1
+10090,91,0,1

data/v2/csv/pokemon_color_names.csv

@@ -1,41 +1,51 @@
 pokemon_color_id,local_language_id,name
 1,1,黒い
+1,5,Noir
 1,6,Schwarz
 1,8,Nero
 1,9,Black
 2,1,青い
+2,5,Bleu
 2,6,Blau
 2,8,Blu
 2,9,Blue
 3,1,茶色
+3,5,Brun
 3,6,Braun
 3,8,Marrone
 3,9,Brown
 4,1,灰色
+4,5,Gris
 4,6,Grau
 4,8,Grigio
 4,9,Gray
 5,1,緑
+5,5,Vert
 5,6,Grün
 5,8,Verde
 5,9,Green
 6,1,ピンク
+6,5,Rose
 6,6,Rosa
 6,8,Rosa
 6,9,Pink
 7,1,パーパル
+7,5,Violet
 7,6,Violett
 7,8,Viola
 7,9,Purple
 8,1,赤い
+8,5,Rouge
 8,6,Rot
 8,8,Rosso
 8,9,Red
 9,1,白い
+9,5,Blanc
 9,6,Weiß
 9,8,Bianco
 9,9,White
 10,1,黄色
+10,5,Jaune
 10,6,Gelb
 10,8,Giallo
 10,9,Yellow

data/v2/csv/pokemon_evolution.csv

@@ -359,7 +359,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 359,715,1,,48,,,,,,,,,,,,,,0,0
 360,678,1,,25,,,,,,,,,,,,,,0,0
 361,700,1,,,,,,,,18,,,2,,,,,0,0
-362,462,1,,,,634,,,,,,,,,,,,0,0
-363,470,1,,,,641,,,,,,,,,,,,0,0
-364,471,1,,,,608,,,,,,,,,,,,0,0
-365,476,1,,,,634,,,,,,,,,,,,0,0
+362,462,1,,,,629,,,,,,,,,,,,0,0
+363,470,1,,,,650,,,,,,,,,,,,0,0
+364,471,1,,,,640,,,,,,,,,,,,0,0
+365,476,1,,,,629,,,,,,,,,,,,0,0

data/v2/csv/pokemon_game_indices.csv

@@ -8326,3 +8326,30 @@ pokemon_id,version_id,game_index
 10023,22,703
 10024,21,705
 10024,22,705
+10064,25,799
+10065,25,800
+10066,25,801
+10067,25,802
+10068,25,803
+10069,25,804
+10070,25,805
+10071,25,806
+10072,25,807
+10073,25,808
+10074,25,809
+10075,25,810
+10076,25,811
+10077,25,812
+10078,25,813
+10079,25,814
+10080,25,815
+10081,25,816
+10082,25,817
+10083,25,818
+10084,25,819
+10085,25,820
+10086,25,821
+10087,25,822
+10088,25,823
+10089,25,824
+10090,25,825

data/v2/csv/pokemon_habitat_names.csv

@@ -1,10 +1,19 @@
 pokemon_habitat_id,local_language_id,name
+1,5,grottes
 1,9,cave
+2,5,forêts
 2,9,forest
+3,5,champs
 3,9,grassland
+4,5,montagnes
 4,9,mountain
+5,5,rares
 5,9,rare
+6,5,milieux hostiles
 6,9,rough terrain
+7,5,mers
 7,9,sea
+8,5,urbains
 8,9,urban
+9,5,marécages
 9,9,water's edge

data/v2/csv/pokemon_stats.csv

@@ -4703,3 +4703,165 @@ pokemon_id,stat_id,base_stat,effort
 10063,4,160,3
 10063,5,120,0
 10063,6,110,0
+10064,1,100,0
+10064,2,150,3
+10064,3,110,0
+10064,4,95,0
+10064,5,110,0
+10064,6,70,0
+10065,1,70,0
+10065,2,110,0
+10065,3,75,0
+10065,4,145,0
+10065,5,85,0
+10065,6,145,3
+10066,1,50,0
+10066,2,85,1
+10066,3,125,1
+10066,4,85,0
+10066,5,115,0
+10066,6,20,0
+10067,1,75,0
+10067,2,110,0
+10067,3,110,0
+10067,4,110,0
+10067,5,105,2
+10067,6,80,0
+10068,1,68,0
+10068,2,165,3
+10068,3,95,0
+10068,4,65,0
+10068,5,115,0
+10068,6,110,0
+10069,1,103,2
+10069,2,60,0
+10069,3,126,0
+10069,4,80,0
+10069,5,126,0
+10069,6,50,0
+10070,1,70,0
+10070,2,140,2
+10070,3,70,0
+10070,4,110,0
+10070,5,65,0
+10070,6,105,0
+10071,1,95,0
+10071,2,75,0
+10071,3,180,2
+10071,4,130,0
+10071,5,80,0
+10071,6,30,0
+10072,1,75,0
+10072,2,125,0
+10072,3,230,2
+10072,4,55,0
+10072,5,95,0
+10072,6,30,0
+10073,1,83,0
+10073,2,80,0
+10073,3,80,0
+10073,4,135,0
+10073,5,80,0
+10073,6,121,3
+10074,1,80,2
+10074,2,120,0
+10074,3,80,0
+10074,4,120,0
+10074,5,80,0
+10074,6,100,0
+10075,1,50,0
+10075,2,160,0
+10075,3,110,1
+10075,4,160,0
+10075,5,110,2
+10075,6,110,0
+10076,1,80,0
+10076,2,145,0
+10076,3,150,3
+10076,4,105,0
+10076,5,110,0
+10076,6,110,0
+10077,1,100,0
+10077,2,150,0
+10077,3,90,0
+10077,4,180,3
+10077,5,160,0
+10077,6,90,0
+10078,1,100,0
+10078,2,180,3
+10078,3,160,0
+10078,4,150,0
+10078,5,90,0
+10078,6,90,0
+10079,1,105,0
+10079,2,180,2
+10079,3,100,0
+10079,4,180,1
+10079,5,100,0
+10079,6,115,0
+10080,1,35,0
+10080,2,55,0
+10080,3,40,0
+10080,4,50,0
+10080,5,50,0
+10080,6,90,2
+10081,1,35,0
+10081,2,55,0
+10081,3,40,0
+10081,4,50,0
+10081,5,50,0
+10081,6,90,2
+10082,1,35,0
+10082,2,55,0
+10082,3,40,0
+10082,4,50,0
+10082,5,50,0
+10082,6,90,2
+10083,1,35,0
+10083,2,55,0
+10083,3,40,0
+10083,4,50,0
+10083,5,50,0
+10083,6,90,2
+10084,1,35,0
+10084,2,55,0
+10084,3,40,0
+10084,4,50,0
+10084,5,50,0
+10084,6,90,2
+10085,1,35,0
+10085,2,55,0
+10085,3,40,0
+10085,4,50,0
+10085,5,50,0
+10085,6,90,2
+10086,1,80,0
+10086,2,160,0
+10086,3,60,0
+10086,4,170,3
+10086,5,130,0
+10086,6,80,0
+10087,1,70,0
+10087,2,120,1
+10087,3,100,0
+10087,4,145,1
+10087,5,105,0
+10087,6,20,0
+10088,1,65,0
+10088,2,136,0
+10088,3,94,0
+10088,4,54,0
+10088,5,96,0
+10088,6,135,2
+10089,1,95,0
+10089,2,145,3
+10089,3,130,0
+10089,4,120,0
+10089,5,90,0
+10089,6,120,0
+10090,1,65,0
+10090,2,150,2
+10090,3,40,0
+10090,4,15,0
+10090,5,80,1
+10090,6,145,0

data/v2/csv/pokemon_types.csv

@@ -1178,3 +1178,49 @@ pokemon_id,type_id,slot
 10062,14,2
 10063,16,1
 10063,14,2
+10064,11,1
+10064,5,2
+10065,12,1
+10065,16,2
+10066,17,1
+10066,8,2
+10067,16,1
+10067,18,2
+10068,14,1
+10068,2,2
+10069,1,1
+10069,18,2
+10070,11,1
+10070,17,2
+10071,11,1
+10071,14,2
+10072,9,1
+10072,5,2
+10073,1,1
+10073,3,2
+10074,15,1
+10075,6,1
+10075,18,2
+10076,9,1
+10076,14,2
+10077,11,1
+10078,5,1
+10078,10,2
+10079,16,1
+10079,3,2
+10080,13,1
+10081,13,1
+10082,13,1
+10083,13,1
+10084,13,1
+10085,13,1
+10086,14,1
+10086,17,2
+10087,10,1
+10087,5,2
+10088,1,1
+10088,2,2
+10089,16,1
+10089,3,2
+10090,7,1
+10090,4,2

data/v2/csv/region_names.csv

@@ -1,13 +1,31 @@
 region_id,local_language_id,name
+1,1,カントー地方
+1,5,Kanto
 1,6,Kanto
+1,8,Kanto
 1,9,Kanto
+2,1,ジョウト地方
+2,5,Johto
 2,6,Johto
+2,8,Johto
 2,9,Johto
+3,1,ホウエン地方
+3,5,Hoenn
 3,6,Hoenn
+3,8,Hoenn
 3,9,Hoenn
+4,1,シンオウ地方
+4,5,Sinnoh
 4,6,Sinnoh
+4,8,Sinnoh
 4,9,Sinnoh
+5,1,イッシュ地方
+5,5,Unys
 5,6,Einall
+5,8,Unima
 5,9,Unova
+6,1,カロス地方
+6,5,Kalos
 6,6,Kalos
+6,8,Kalos
 6,9,Kalos

data/v2/csv/stat_names.csv

@@ -1,33 +1,49 @@
 stat_id,local_language_id,name
 1,1,HP
+1,5,PV
 1,6,KP
+1,7,PS
 1,8,PS
 1,9,HP
 2,1,こうげき
+2,5,Attaque
 2,6,Angriff
+2,7,Ataque
 2,8,Attacco
 2,9,Attack
 3,1,ぼうぎょ
+3,5,Défense
 3,6,Verteidigung
+3,7,Defensa
 3,8,Difesa
 3,9,Defense
 4,1,とくこう
+4,5,Attaque Spéciale
 4,6,Spezialangriff
+4,7,Ataque Especial
 4,8,Attacco Speciale
 4,9,Special Attack
 5,1,とくぼう
+5,5,Défense Spéciale
 5,6,Spezialverteidigung
+5,7,Defensa Especial
 5,8,Difesa Speciale
 5,9,Special Defense
 6,1,すばやさ
+6,5,Vitesse
 6,6,Initiative
+6,7,Velocidad
 6,8,Velocità
 6,9,Speed
 7,1,めいちゅう
+7,5,Précision
 7,6,Genauigkeit
+7,7,Precisión
 7,8,precisione
 7,9,accuracy
 8,1,かいひ
+8,5,Esquive
 8,6,Fluchtwert
+8,7,Evasión
 8,8,elusione
 8,9,evasion

data/v2/csv/type_names.csv

@@ -132,5 +132,7 @@ type_id,local_language_id,name
 10001,8,???
 10001,9,???
 10002,1,ダーク
+10002,5,Obscur
+10002,6,Crypto
 10002,8,Ombra
 10002,9,Shadow

data/v2/csv/version_group_pokemon_move_methods.csv

@@ -64,3 +64,9 @@ version_group_id,pokemon_move_method_id
 15,4
 15,6
 15,10
+16,1
+16,2
+16,3
+16,4
+16,6
+16,10

data/v2/csv/version_group_regions.csv

@@ -15,3 +15,4 @@ version_group_id,region_id
 11,5
 14,5
 15,6
+16,3

data/v2/csv/version_groups.csv

@@ -14,3 +14,4 @@ id,identifier,generation_id,order
 13,xd,3,8
 14,black-2-white-2,5,14
 15,x-y,6,15
+16,omega-ruby-alpha-sapphire,6,16

data/v2/csv/version_names.csv

@@ -1,49 +1,131 @@
 version_id,local_language_id,name
+1,1,赤
+1,5,Rouge
 1,6,Rot
+1,8,Rossa
 1,9,Red
+2,1,緑
+2,5,Bleu
 2,6,Blau
+2,8,Blu
 2,9,Blue
+3,1,ピカチュウ
+3,5,Jaune
 3,6,Gelb
+3,8,Gialla
 3,9,Yellow
+4,1,金
+4,5,Or
 4,6,Gold
+4,8,Oro
 4,9,Gold
+5,1,銀
+5,5,Argent
 5,6,Silber
+5,8,Argento
 5,9,Silver
+6,1,クリスタル
+6,5,Cristal
 6,6,Kristall
+6,8,Cristallo
 6,9,Crystal
+7,1,ルビー
+7,5,Rubis
 7,6,Rubin
+7,8,Rubino
 7,9,Ruby
+8,1,サファイア
+8,5,Saphir
 8,6,Saphir
+8,8,Zaffiro
 8,9,Sapphire
+9,1,エメラルド
+9,5,Émeraude
 9,6,Smaragd
+9,8,Smeraldo
 9,9,Emerald
+10,1,ファイアレッド
+10,5,Rouge Feu
 10,6,Feuerrot
+10,8,Rosso Fuoco
 10,9,FireRed
+11,1,リーフグリーン
+11,5,Vert Feuille
 11,6,Blattgrün
+11,8,Verde Foglia
 11,9,LeafGreen
+12,1,ダイヤモンド
+12,5,Diamant
 12,6,Diamant
+12,8,Diamante
 12,9,Diamond
+13,1,パール
+13,5,Perle
 13,6,Perl
+13,8,Perla
 13,9,Pearl
+14,1,プラチナ
+14,5,Platine
 14,6,Platin
+14,8,Platino
 14,9,Platinum
+15,1,ハートゴールド
+15,5,Or HeartGold
 15,6,HeartGold
+15,8,Oro HeartGold
 15,9,HeartGold
+16,1,ソウルシルバー
+16,5,Argent SoulSilver
 16,6,SoulSilver
+16,8,Argento SoulSilver
 16,9,SoulSilver
+17,1,ブラック
+17,5,Noir
 17,6,Schwarz
+17,8,Nera
 17,9,Black
+18,1,ホワイト
+18,5,Blanc
 18,6,Weiß
+18,8,Bianca
 18,9,White
+19,1,コロシアム
+19,5,Colosseum
 19,6,Colosseum
+19,8,Colosseum
 19,9,Colosseum
+20,1,XD
+20,5,XD
 20,6,XD
+20,8,XD
 20,9,XD
+21,1,ブラック2
+21,5,Noir 2
 21,6,Schwarz 2
+21,8,Nera 2
 21,9,Black 2
+22,1,ホワイト2
+22,5,Blanc 2
 22,6,Weiß 2
+22,8,Bianca 2
 22,9,White 2
+23,1,X
+23,5,X
 23,6,X
+23,8,X
 23,9,X
+24,1,Y
+24,5,Y
 24,6,Y
+24,8,Y
 24,9,Y
+25,1,オメガルビー
+25,5,Rubis Oméga
+25,6,Omega Rubin
+25,8,Rubino Omega
+25,9,Omega Ruby
+26,1,アルファサファイア
+26,5,Saphir Alpha
+26,6,Alpha Saphir
+26,8,Zaffiro Alpha
+26,9,Alpha Sapphire

data/v2/csv/versions.csv

@@ -23,3 +23,5 @@ id,version_group_id,identifier
 22,14,white-2
 23,15,x
 24,15,y
+25,16,omega-ruby
+26,16,alpha-sapphire

pokemon_v2/README.md

@@ -50,14 +50,14 @@
       <td>
 		<ul>
 			<li><a href="#pal-park-areas">Pal Park Areas</a></li>
-			<li><a href="#pokedexes">Pokedexes</a></li>
-			<li><a href="#pokemon">Pokemon</a></li>
-			<li><a href="#pokemon-colors">Pokemon Colors</a></li>
-			<li><a href="#pokemon-forms">Pokemon Forms</a></li>
-			<li><a href="#pokemon-habitats">Pokemon Habitats</a></li>
-			<li><a href="#pokemon-shapes">Pokemon Shapes</a></li>
-			<li><a href="#pokemon-species">Pokemon Species</a></li>
-			<li><a href="#pokeathlon-stats">Pokeathlon Stats</a></li>
+			<li><a href="#pokedexes">Pokédexes</a></li>
+			<li><a href="#pokemon">Pokémon</a></li>
+			<li><a href="#pokemon-colors">Pokémon Colors</a></li>
+			<li><a href="#pokemon-forms">Pokémon Forms</a></li>
+			<li><a href="#pokemon-habitats">Pokémon Habitats</a></li>
+			<li><a href="#pokemon-shapes">Pokémon Shapes</a></li>
+			<li><a href="#pokemon-species">Pokémon Species</a></li>
+			<li><a href="#pokeathlon-stats">Pokéathlon Stats</a></li>
 			<li><a href="#regions">Regions</a></li>
 			<li><a href="#stats">Stats</a></li>
 			<li><a href="#super-contest-effects">Super Contest Effects</a></li>
@@ -95,7 +95,7 @@ Calling any api endpoint without a resource id or name will return a paginated l
 | count    | The total number of resources abailable from this api | integer |
 | next     | The url for the next 'page' in the list               | string  |
 | previous | The url for the previous page in the list             | boolean |
-| results  | I list of non-named api resources                     | list [APIResource](#apiresource) |
+| results  | The list of non-named api resources                     | list [APIResource](#apiresource) |
 
 
 ###### example response for named resources
@@ -119,7 +119,7 @@ Calling any api endpoint without a resource id or name will return a paginated l
 | count    | The total number of resources abailable from this api | integer |
 | next     | The url for the next 'page' in the list               | string  |
 | previous | The url for the previous page in the list             | boolean |
-| results  | I list of named api resources                    	   | list [NamedAPIResource](#namedapiresource) |
+| results  | The list of named api resources                    	   | list [NamedAPIResource](#namedapiresource) |
 
 
 
@@ -287,7 +287,7 @@ Flavors determine whether a pokemon will benefit or suffer from eating a berry b
 <h1 id="contests-section">Contests</h1>
 
 ## Contest Types
-Contest types are categories judges used to weigh a pokemons condition in pokemon contests. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Contest_condition) for greater detail.
+Contest types are categories judges used to weigh a pokémon's condition in pokemon contests. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Contest_condition) for greater detail.
 
 ### GET api/v2/contest-type/{id or name}
 
@@ -410,7 +410,7 @@ Super contest effects refer to the effects of moves when used in super contests.
 <h1 id="encounters-section">Encounters</h1>
 
 ## Encounter Methods
-Methods by which the player might can encounter pokemon in the wild, e.g., walking in tall grass. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Wild_Pokémon) for greater detail.
+Methods by which the player might can encounter pokémon in the wild, e.g., walking in tall grass. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Wild_Pokémon) for greater detail.
 
 ### GET api/v2/encounter-method/{id or name}
 
@@ -446,7 +446,7 @@ Methods by which the player might can encounter pokemon in the wild, e.g., walki
 
 
 ## Encounter Conditions
-Conditions which affect what pokemon might appear in the wild, e.g., day or night.
+Conditions which affect what pokémon might appear in the wild, e.g., day or night.
 
 ### GET api/v2/encounter-condition/{id or name}
 
@@ -529,7 +529,7 @@ Encounter condition values are the various states that an encounter condition ca
 <h1 id="evolution-section">Evolution</h1>
 
 ## Evolution Chains
-Evolution chains are essentially family trees. They start with the lowest stage within a family and detail evolution conditions for each as well as pokemon they can evolve into up through the hierarchy.
+Evolution chains are essentially family trees. They start with the lowest stage within a family and detail evolution conditions for each as well as pokémon they can evolve into up through the hierarchy.
 
 ### GET api/v2/evolution-chain/{id}
 
@@ -588,44 +588,44 @@ Evolution chains are essentially family trees. They start with the lowest stage
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | id                | The identifier for this evolution chain resource                                                                                                                   | integer |
-| baby_trigger_item | The item that a pokemon would be holding when mating that would trigger the egg hatching a baby pokemon rather than a basic pokemon                                | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
-| chain             | The base chain link object. Each link contains evolution details for a pokemon in the chain. Each link references the next pokemon in the natural evolution order. | [ChainLink](#chainlink) |
+| baby_trigger_item | The item that a pokémon would be holding when mating that would trigger the egg hatching a baby pokémon rather than a basic pokémon                                | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
+| chain             | The base chain link object. Each link contains evolution details for a pokémon in the chain. Each link references the next pokémon in the natural evolution order. | [ChainLink](#chainlink) |
 
 #### ChainLink
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| is_baby           | Whether or not this link is for a baby pokemon. This would only ever be true on the base link. | boolean |
+| is_baby           | Whether or not this link is for a baby pokémon. This would only ever be true on the base link. | boolean |
 | species           | The pokemon species at this point in the evolution chain                                       | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
-| evolution_details | All details regarding the specific details of the referenced pokemon species evolution         | [EvolutionDetail](#evolutiondetail) |
-| evolves_to        | A List of chain objects.                                                                       | [ChainLink](#chainlink) |
+| evolution_details | All details regarding the specific details of the referenced pokémon species evolution         | [EvolutionDetail](#evolutiondetail) |
+| evolves_to        | A List of chain objects.                                                                       | list [ChainLink](#chainlink) |
 
 #### EvolutionDetail
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| item                    | The item required to cause evolution this into pokemon species                                                                                                              | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
-| trigger                 | The type of event that triggers evolution into this pokemon species                                                                                                         | [NamedAPIResource](#namedapiresource) ([EvolutionTrigger](#evolution-triggers)) |
-| gender                  | The gender the evolving pokemon species must be in order to evolve into this pokemon species                                                                                | [NamedAPIResource](#namedapiresource) ([Gender](#genders)) |
-| held_item               | The item the evolving pokemon species must be holding during the evolution trigger event to evolve into this pokemon species                                                | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
-| known_move              | The move that must be known by the evolving pokemon species during the evolution trigger event in order to evolve into this pokemon species                                 | [NamedAPIResource](#namedapiresource) ([Move](#moves)) |
-| known_move_type         | The evolving pokemon species must know a move with this type during the evolution trigger event in order to evolve into this pokemon species                                | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
+| item                    | The item required to cause evolution this into pokémon species                                                                                                              | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
+| trigger                 | The type of event that triggers evolution into this pokémon species                                                                                                         | [NamedAPIResource](#namedapiresource) ([EvolutionTrigger](#evolution-triggers)) |
+| gender                  | The gender the evolving pokémon species must be in order to evolve into this pokémon species                                                                                | [NamedAPIResource](#namedapiresource) ([Gender](#genders)) |
+| held_item               | The item the evolving pokémon species must be holding during the evolution trigger event to evolve into this pokémon species                                                | [NamedAPIResource](#namedapiresource) ([Item](#items)) |
+| known_move              | The move that must be known by the evolving pokémon species during the evolution trigger event in order to evolve into this pokémon species                                 | [NamedAPIResource](#namedapiresource) ([Move](#moves)) |
+| known_move_type         | The evolving pokémon species must know a move with this type during the evolution trigger event in order to evolve into this pokémon species                                | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
 | location                | The location the evolution must be triggered at.                                                                                                                            | [NamedAPIResource](#namedapiresource) ([Location](#locations)) |
-| min_level               | The minimum required level of the evolving pokemon species to evolve into this pokemon species                                                                              | integer |
-| min_hapiness            | The minimum required level of happiness the evolving pokemon species to evolve into this pokemon species                                                                    | integer |
-| min_beauty              | The minimum required level of beauty the evolving pokemon species to evolve into this pokemon species                                                                       | integer |
-| min_affection           | The minimum required level of affection the evolving pokemon species to evolve into this pokemon species                                                                    | integer |
-| needs_overworld_rain    | Whether or not it must be raining in the overworld to cause evolution this pokemon species                                                                                  | boolean |
-| party_species           | The pokemon species that must be in the players party in order for the evolving pokemon species to evolve into this pokemon species                                         | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
-| party_type              | The player must have a pokemon of this type in their party during the evolution trigger event in order for the evolving pokemon species to evolve into this pokemon species | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
+| min_level               | The minimum required level of the evolving pokémon species to evolve into this pokémon species                                                                              | integer |
+| min_happiness           | The minimum required level of happiness the evolving pokémon species to evolve into this pokémon species                                                                    | integer |
+| min_beauty              | The minimum required level of beauty the evolving pokémon species to evolve into this pokémon species                                                                    | integer |
+| min_affection           | The minimum required level of affection the evolving pokémon species to evolve into this pokémon species                                                                    | integer |
+| needs_overworld_rain    | Whether or not it must be raining in the overworld to cause evolution this pokémon species                                                                                  | boolean |
+| party_species           | The pokémon species that must be in the players party in order for the evolving pokémon species to evolve into this pokémon species                                        | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| party_type              | The player must have a pokémon of this type in their party during the evolution trigger event in order for the evolving pokémon species to evolve into this pokémon species | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
 | relative_physical_stats | The required relation between the Pokémon's Attack and Defense stats. 1 means Attack > Defense. 0 means Attack = Defense. -1 means Attack < Defense.                         | integer |
 | time_of_day             | The required time of day. Day or night.                                                                                                                                     | string |
-| trade_species           | Pokemon species for which this one must be traded.                                                                                                                          | [NamedAPIResource](#namedapiresource) ([Pokemon Species](#pokemon-species)) |
+| trade_species           | Pokémon species for which this one must be traded.                                                                                                                          | [NamedAPIResource](#namedapiresource) ([Pokémon Species](#pokemon-species)) |
 | turn_upside_down        | Whether or not the 3DS needs to be turned upside-down as this Pokémon levels up.                                                                                            | boolean |
 
 
 ## Evolution Triggers
-Evolution triggers are the events and conditions that cause a pokemon to evolve. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Methods_of_evolution) for greater detail.
+Evolution triggers are the events and conditions that cause a pokémon to evolve. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Methods_of_evolution) for greater detail.
 
 ### GET api/v2/evolution-trigger/{id or name}
 
@@ -659,7 +659,7 @@ Evolution triggers are the events and conditions that cause a pokemon to evolve.
 | id              | The identifier for this evolution trigger resource                | integer |
 | name            | The name for this evolution trigger resource                      | string |
 | names           | The name of this evolution trigger listed in different languages  | list [Name](#resourcename) |
-| pokemon_species | A list of pokemon species that result from this evolution trigger | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| pokemon_species | A list of pokémon species that result from this evolution trigger | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
 
@@ -720,14 +720,14 @@ A generation is a grouping of the Pokémon games that separates them based on th
 | names           | The name of this generation listed in different languages         | list [Name](#resourcename) |
 | main_region     | The main region travelled in this generation                      | [NamedAPIResource](#namedapiresource) ([Region](#regions)) |
 | moves           | A list of moves that were introduced in this generation           | list [NamedAPIResource](#namedapiresource) ([Move](#moves)) |
-| pokemon_species | A list of pokemon species that were introduced in this generation | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| pokemon_species | A list of pokémon species that were introduced in this generation | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 | types           | A list of types that were introduced in this generation           | list [NamedAPIResource](#namedapiresource) ([Type](#types)) |
 | version_groups  | A list of version groups that were introduced in this generation  | list [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 
 
 ## Pokedexes
-A Pokédex is a handheld electronic encyclopedia device; one which is capable of recording and retaining information of the various Pokémon in a given region with the exception of the national dex and some smaller dexes related to portions of a region. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokedex) for greater detail.
+A Pokédex is a handheld electronic encyclopedia device; one which is capable of recording and retaining information of the various Pokémon in a given region with the exception of the national dex and some smaller dexes related to portions of a region. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokedex) for greater detail. (Note: no official plural of 'pokédex' is known, 'standard' -(e)s is used here)
 
 ### GET api/v2/pokedex/{id or name}
 
@@ -776,21 +776,21 @@ A Pokédex is a handheld electronic encyclopedia device; one which is capable of
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id              | The identifier for this pokedex resource                                     | integer |
-| name            | The name for this pokedex resource                                           | string |
-| is_main_series  | Whether or not this pokedex originated in the main series of the video games | boolean |
-| descriptions    | The description of this pokedex listed in different languages                | list [Description](#description) |
-| names           | The name of this pokedex listed in different languages                       | list [Name](#resourcename) |
-| pokemon_entries | A list of pokemon catalogued in this pokedex and their indexes               | list [PokemonEntry](#pokemonentry) |
-| region          | The region this pokedex catalogues pokemon for                               | [NamedAPIResource](#namedapiresource) ([Region](#regions)) |
-| version_groups  | A list of version groups this pokedex is relevent to                         | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
+| id              | The identifier for this pokédex resource                                     | integer |
+| name            | The name for this pokédex resource                                           | string  |
+| is_main_series  | Whether or not this pokédex originated in the main series of the video games | boolean |
+| descriptions    | The description of this pokédex listed in different languages                | list [Description](#description) |
+| names           | The name of this pokédex listed in different languages                       | list [Name](#resourcename) |
+| pokemon_entries | A list of pokémon catalogued in this pokédex and their indexes               | list [PokemonEntry](#pokemonentry) |
+| region          | The region this pokédex catalogues pokémon for                               | [NamedAPIResource](#namedapiresource) ([Region](#regions)) |
+| version_groups  | A list of version groups this pokédex is relevent to                         | list [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 #### PokemonEntry
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| entry_number    | The index of this pokemon species entry within the pokedex | integer |
-| pokemon_species | The pokemon species being encountered                      | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| entry_number    | The index of this pokémon species entry within the pokédex | integer |
+| pokemon_species | The pokémon species being encountered                      | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
 
@@ -829,7 +829,7 @@ Versions of the games, e.g., Red, Blue or Yellow.
 | id            | The identifier for this version resource               | integer |
 | name          | The name for this version resource                     | string  |
 | names         | The name of this version listed in different languages | list [Name](#resourcename) |
-| version_group | The version group this version belongs to              | list [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
+| version_group | The version group this version belongs to              | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 
 ## Version Groups
@@ -912,8 +912,8 @@ An item is an object in the games which the player can pick up, keep in their ba
 		"url": "http://pokeapi.co/api/v2/item-category/34/"
 	},
 	"effect_entries": [{
-		"effect": "Used in battle\n:   [Catches]{mechanic:catch} a wild Pokémon without fail.\n\n    If used in a trainer battle, nothing happens and the ball is lost.",
-		"short_effect": "Catches a wild Pokémon every time.",
+		"effect": "Used in battle\n:   [Catches]{mechanic:catch} a wild Pokémon without fail.\n\n    If used in a trainer battle, nothing happens and the ball is lost.",
+		"short_effect": "Catches a wild Pokémon every time.",
 		"language": {
 			"name": "en",
 			"url": "http://pokeapi.co/api/v2/language/9/"
@@ -980,7 +980,7 @@ An item is an object in the games which the player can pick up, keep in their ba
 | flavor_text_entries | The flavor text of this ability listed in different languages        | list [VersionGroupFlavorText](#versiongroupflavortext) |
 | game_indices        | A list of game indices relevent to this item by generation           | list [GenerationGameIndex](#generationgameindex) |
 | names               | The name of this item listed in different languages                  | list [Name](#resourcename) |
-| held_by_pokemon     | A list of pokemon that might be found in the wild holding this item  | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
+| held_by_pokemon     | A list of pokémon that might be found in the wild holding this item  | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
 | baby_trigger_for    | An evolution chain this item requires to produce a bay during mating | list [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
 
 
@@ -1024,7 +1024,7 @@ Item attributes define particular aspects of items, e.g. "usable in battle" or "
 | ---- | ----------- | --------- |
 | id           | The identifier for this item attribute resource                      | integer |
 | name         | The name for this item attribute resource                            | string |
-| items        | A list of items that have this attribute                             | list [Item](#items) |
+| items        | A list of items that have this attribute                             | list [NamedAPIResource](#namedapiresource) ([Item](#items)) |
 | names        | The name of this item attribute listed in different languages        | list [Name](#resourcename) |
 | descriptions | The description of this item attribute listed in different languages | list [Description](#description) |
 
@@ -1066,9 +1066,9 @@ Item categories determine where items will be placed in the players bag.
 | ---- | ----------- | --------- |
 | id     | The identifier for this item category resource               | integer |
 | name   | The name for this item category resource                     | string |
-| items  | A list of items that are a part of this category             | list [Item](#items) |
+| items  | A list of items that are a part of this category             | list [NamedAPIResource](#namedapiresource) ([Item](#items)) |
 | names  | The name of this item category listed in different languages | list [Name](#resourcename) |
-| pocket | The pocket items in this category would be put in            | list [NamedAPIResource](#namedapiresource) ([ItemPocket](#item-pockets)) |
+| pocket | The pocket items in this category would be put in            | [NamedAPIResource](#namedapiresource) ([ItemPocket](#item-pockets)) |
 
 
 ## Item Fling Effects
@@ -1141,14 +1141,14 @@ Pockets within the players bag used for storing items by category.
 | ---- | ----------- | --------- |
 | id         | The identifier for this item pocket resource                    | integer |
 | name       | The name for this item pocket resource                          | string |
-| categories | A list of item categories that are relevent to this item pocket | list [ItemCategory](#item-categories) |
+| categories | A list of item categories that are relevent to this item pocket | list [NamedAPIResource](#namedapiresource) ([ItemCategory](#item-categories)) |
 | names      | The name of this item pocket listed in different languages      | list [Name](#resourcename) |
 
 
 <h1 id="moves-section">Moves</h1>
 
 ## Moves
-Moves are the skills of pokemon in battle.  In battle, a Pokémon uses one move each turn. Some moves (including those learned by Hidden Machine) can be used outside of battle as well, usually for the purpose of removing obstacles or exploring new areas.
+Moves are the skills of pokémon in battle.  In battle, a Pokémon uses one move each turn. Some moves (including those learned by Hidden Machine) can be used outside of battle as well, usually for the purpose of removing obstacles or exploring new areas.
 
 ### GET api/v2/move/{id or name}
 
@@ -1263,7 +1263,7 @@ Moves are the skills of pokemon in battle.  In battle, a Pokémon uses one move
 | priority       | A value between -8 and 8. Sets the order in which moves are executed during battle. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Priority) for greater detail. | integer  |
 | power          | The base power of this move with a value of 0 if it does not have a base power                                                                                            | integer |
 | contest_combos | A detail of normal and super contest combos that require this move                                                                                                        | list [ContestComboSets](#contestcombosets) |
-| contest_type   | The type of appeal this move gives a pokemon when used in a contest                                                                                                       | [NamedAPIResource](#namedapiresource) ([ContestType](#contest-types)) |
+| contest_type   | The type of appeal this move gives a pokémon when used in a contest                                                                                                       | [NamedAPIResource](#namedapiresource) ([ContestType](#contest-types)) |
 | contest_effect | The effect the move has when used in a contest                                                                                                                            | [NamedAPIResource](#namedapiresource) ([ContestEffect](#contest-effects)) |
 | damage_class   | The type of damage the move inflicts on the target, e.g. physical                                                                                                         | [NamedAPIResource](#namedapiresource) ([MoveDamageClass](#move-damage-classes)) |
 | effect_entries | The effect of this move listed in different languages                                                                                                                     | list [VerboseEffect](#verboseeffect) |
@@ -1274,8 +1274,8 @@ Moves are the skills of pokemon in battle.  In battle, a Pokémon uses one move
 | past_values    | A list of move resource value changes across ersion groups of the game                                                                                                    | list [PastMoveStatValues](#pastmovestatvalues) |
 | stat_changes   | A list of stats this moves effects and how much it effects them                                                                                                           | list [MoveStatChange](#movestatchange) |
 | contest_effect | The effect the move has when used in a super contest                                                                                                                      | [NamedAPIResource](#namedapiresource) ([ContestEffect](#contest-effects)) |
-| target         | The type of target that will recieve the effects of the attack                                                                                                            | [MoveTarget](#move-targets) |
-| type           | The elemental type of this move                                                                                                                                           | [Type](#types) |
+| target         | The type of target that will recieve the effects of the attack                                                                                                            | [NamedAPIResource](#namedapiresource) ([MoveTarget](#move-targets)) |
+| type           | The elemental type of this move                                                                                                                                           | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
 
 #### ContestComboSets
  
@@ -1302,18 +1302,18 @@ Moves are the skills of pokemon in battle.  In battle, a Pokémon uses one move
 | min_turns      | The minimum number of turns this move continues to take effect. Null if it always only lasts one turn. | integer |
 | max_turns      | The maximum number of turns this move continues to take effect. Null if it always only lasts one turn. | integer |
 | drain          | HP drain (if positive) or Recoil damage (if negative), in percent of damage done                       | integer |
-| healing        | The amount of hp gained by the attacking pokemon, in percent of it's maximum HP                        | integer |
+| healing        | The amount of hp gained by the attacking pokémon, in percent of it's maximum HP                        | integer |
 | crit_rate      | Critical hit rate bonus                                                                                | integer |
 | ailment_chance | The likelyhood this attack will cause an ailment                                                       | integer |
-| flinch_chance  | The likelyhood this attack will cause the target pokemon to flinch                                     | integer |
-| stat_chance    | The likelyhood this attack will cause a stat change in the target pokemon                              | integer |
+| flinch_chance  | The likelyhood this attack will cause the target pokémon to flinch                                     | integer |
+| stat_chance    | The likelyhood this attack will cause a stat change in the target pokémon                              | integer |
 
 #### MoveStatChange
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | change | The amount of change    | integer |
-| stat   | The stat being affected | [NamedAPIResource](#namedapiresource) [Stat](#stats) |
+| stat   | The stat being affected | [NamedAPIResource](#namedapiresource) ([Stat](#stats)) |
 
 #### PastMoveStatValues
 
@@ -1324,7 +1324,7 @@ Moves are the skills of pokemon in battle.  In battle, a Pokémon uses one move
 | power          | The base power of this move with a value of 0 if it does not have a base power | integer |
 | pp             | Power points. The number of times this move can be used                        | integer |
 | effect_entries | The effect of this move listed in different languages                          | list [VerboseEffect](#verboseeffect) |
-| type           | The elemental type of this move                                                | [Type](#types) |
+| type           | The elemental type of this move                                                | [NamedAPIResource](#namedapiresource) ([Type](#types)) |
 | version group  | The version group in which these move stat values were in effect               | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 
@@ -1435,7 +1435,7 @@ Very general categories that loosely group move effects.
 
 
 ## Move Damage Classes
-Damage classes moves can have, e.g. physical, special, or non-damaging.
+Damage classes moves can have, e.g. physical, special, or status (non-damaging).
 
 ### GET api/v2/move-damage-class/{id or name}
 
@@ -1473,7 +1473,7 @@ Damage classes moves can have, e.g. physical, special, or non-damaging.
 
 
 ## Move Learn Methods
-Methods by which pokemon can learn moves.
+Methods by which pokémon can learn moves.
 
 ### GET api/v2/move-learn-method/{id or name}
 
@@ -1491,7 +1491,7 @@ Methods by which pokemon can learn moves.
 		}
 	}],
 	"descriptions": [{
-		"description": "Wird gelernt, wenn ein Pokémon ein bestimmtes Level erreicht.",
+		"description": "Wird gelernt, wenn ein Pokémon ein bestimmtes Level erreicht.",
 		"language": {
 			"name": "de",
 			"url": "http://pokeapi.co/api/v2/language/6/"
@@ -1518,7 +1518,7 @@ Methods by which pokemon can learn moves.
 
 
 ## Move Targets
-Targets moves can be directed at during battle. Targets can be pokemon, environments or even other moves.
+Targets moves can be directed at during battle. Targets can be pokémon, environments or even other moves.
 
 ### GET api/v2/move-target/{id or name}
 
@@ -1686,21 +1686,35 @@ Location areas are sections of areas, such as floors in a building or cave. Each
 | id                     | The identifier for this location resource                                                                                                    | integer |
 | name                   | The name for this location resource                                                                                                          | string  |
 | game_index             | The internal id of an api resource within game data                                                                                          | integer |
-| encounter_method_rates | A list of methods in which pokemon may be encountered in this area and how likely the method will occur depending on the version of the game | list [EncounterMethodRate](#encountermethodrate) |
+| encounter_method_rates | A list of methods in which pokémon may be encountered in this area and how likely the method will occur depending on the version of the game | list [EncounterMethodRate](#encountermethodrate) |
 | location               | The region this location can be found in                                                                                                     | [NamedAPIResource](#namedapiresource) ([Region](#regions)) |
 | names                  | The name of this location area listed in different languages                                                                                 | list [Name](#resourcename) |
-| pokemon_encounters     | A list of pokemon that can be encountered in this area along with version specific details about the encounter                               | list [PokemonEncounter](#pokemonencounter) |
+| pokemon_encounters     | A list of pokémon that can be encountered in this area along with version specific details about the encounter                               | list [PokemonEncounter](#pokemonencounter) |
+
+#### EncounterMethodRate
+
+| Name | Description | Data Type |
+| ---- | ----------- | --------- |
+| encounter_method | The method in which pokémon may be encountered in an area.     | [EncounterMethod](#encountermehtod) |
+| version_details  | The chance of the encounter to occur on a version of the game. | list [EncounterVersionDetails](#encounterversiondetails) |
+
+#### EncounterVersionDetails
+
+| Name    | Description | Data Type |
+| ------- | ----------- | --------- |
+| rate    | The chance of an encounter to occur.                                            | integer |
+| version | The version of the game in which the encounter can occur with the given chance. | [NamedAPIResource](#namedapiresource) ([Version](#version)) |
 
 #### PokemonEncounter
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| pokemon         | The pokemon being encountered                                                                    | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
-| version_details | A list of versions and encounters with pokemon that might happen in the referenced location area | list [VersionEncounterDetail](#versionencounterdetail) |
+| pokemon         | The pokémon being encountered                                                                    | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
+| version_details | A list of versions and encounters with pokémon that might happen in the referenced location area | list [VersionEncounterDetail](#versionencounterdetail) |
 
 
 ## Pal Park Areas
-Areas used for grouping pokemon encounters in Pal Park. They're like habitats that are specific to Pal Park.
+Areas used for grouping pokémon encounters in Pal Park. They're like habitats that are specific to Pal Park.
 
 ### GET api/v2/pal-park-area/{id or name}
 
@@ -1737,19 +1751,19 @@ Areas used for grouping pokemon encounters in Pal Park. They're like habitats th
 | id                 | The identifier for this pal park area resource                        | integer |
 | name               | The name for this pal park area resource                              | string |
 | names              | The name of this pal park area listed in different languages          | list [Name](#resourcename) |
-| pokemon_encounters | A list of pokemon encountered in thi pal park area along with details | list [PalParkEncounterSpecies](#palparkencounterspecies) |
+| pokemon_encounters | A list of pokémon encountered in thi pal park area along with details | list [PalParkEncounterSpecies](#palparkencounterspecies) |
 
 #### PalParkEncounterSpecies
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| base_score      | The base score given to the player when this pokemon is caught during a pal park run | integer |
-| rate            | The base rate for encountering this pokemon in this pal park area                    | integer |
-| pokemon_species | The pokemon species being encountered                                                | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemonspecies)) |
+| base_score      | The base score given to the player when this pokémon is caught during a pal park run | integer |
+| rate            | The base rate for encountering this pokémon in this pal park area                    | integer |
+| pokemon_species | The pokémon species being encountered                                                | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemonspecies)) |
 
 
 ## Regions
-A region is an organized area of the pokemon world. Most often, the main difference between regions is the species of pokemon that can be encountered within them.
+A region is an organized area of the pokémon world. Most often, the main difference between regions is the species of pokémon that can be encountered within them.
 
 ### GET api/v2/region/{id or name}
 
@@ -1796,15 +1810,15 @@ A region is an organized area of the pokemon world. Most often, the main differe
 | locations       | A list of locations that can be found in this region      | [NamedAPIResource](#namedapiresource) ([Location](#locations)) |
 | main_generation | The generation this region was introduced in              | [NamedAPIResource](#namedapiresource) ([Generation](#generations)) |
 | names           | The name of this region listed in different languages     | list [Name](#resourcename) |
-| pokedexes       | A list of pokedexes that catalogue pokemon in this region | [NamedAPIResource](#namedapiresource) ([Pokedex](#pokedexes)) |
-| version_groups  | A list of version groups where this region can be visited | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
+| pokedexes       | A list of pokédexes that catalogue pokemon in this region | list [NamedAPIResource](#namedapiresource) ([Pokedex](#pokedexes)) |
+| version_groups  | A list of version groups where this region can be visited | list [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 
 <h1 id="pokemon-section">Pokemon</h1>
 
 ## Abilities
 
-Abilities provide passive effects for pokemon in battle or in the overworld. Pokemon have mutiple possible abilities but can have only one ability at a time. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Ability) for greater detail.
+Abilities provide passive effects for pokémon in battle or in the overworld. Pokémon have mutiple possible abilities but can have only one ability at a time. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Ability) for greater detail.
 
 ### GET api/v2/ability/{id or name}
 
@@ -1827,8 +1841,8 @@ Abilities provide passive effects for pokemon in battle or in the overworld. Pok
 		}
 	}],
 	"effect_entries": [{
-		"effect": "This Pokémon's damaging moves have a 10% chance to make the target [flinch]{mechanic:flinch} with each hit if they do not already cause flinching as a secondary effect.\n\nThis ability does not stack with a held item.\n\nOverworld: The wild encounter rate is halved while this Pokémon is first in the party.",
-		"short_effect": "Has a 10% chance of making target Pokémon [flinch]{mechanic:flinch} with each hit.",
+		"effect": "This Pokémon's damaging moves have a 10% chance to make the target [flinch]{mechanic:flinch} with each hit if they do not already cause flinching as a secondary effect.\n\nThis ability does not stack with a held item.\n\nOverworld: The wild encounter rate is halved while this Pokémon is first in the party.",
+		"short_effect": "Has a 10% chance of making target Pokémon [flinch]{mechanic:flinch} with each hit.",
 		"language": {
 			"name": "en",
 			"url": "http://pokeapi.co/api/v2/language/9/"
@@ -1883,7 +1897,7 @@ Abilities provide passive effects for pokemon in battle or in the overworld. Pok
 | effect_entries      | The effect of this ability listed in different languages                     | list [VerboseEffect](#verboseeffect) |
 | effect_changes      | The list of previous effects this ability has had across version groups      | list [AbilityEffectChange](#abilityeffectchange) |
 | flavor_text_entries | The flavor text of this ability listed in different languages                | list [VersionGroupFlavorText](#versiongroupflavortext) |
-| pokemon             | A list of pokemon that could potentially have this ability                   | list [AbilityPokemon](#abilitypokemon) |
+| pokemon             | A list of pokémon that could potentially have this ability                   | list [AbilityPokemon](#abilitypokemon) |
 
 #### AbilityEffectChange
 
@@ -1904,9 +1918,9 @@ Abilities provide passive effects for pokemon in battle or in the overworld. Pok
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| is_hidden | Whether or not this a hidden ability for the referenced pokemon                                                                                          | boolean |
-| slot      | Pokemon have 3 ability 'slots' which hold references to possible abilities they could have. This is the slot of this ability for the referenced pokemon. | integer |
-| pokemon   | The pokemon this ability could belong to                                                                                                                 | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
+| is_hidden | Whether or not this a hidden ability for the referenced pokémon                                                                                          | boolean |
+| slot      | Pokémon have 3 ability 'slots' which hold references to possible abilities they could have. This is the slot of this ability for the referenced pokémon. | integer |
+| pokemon   | The pokémon this ability could belong to                                                                                                                 | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
 
 
 ## Characteristics
@@ -1944,7 +1958,7 @@ Characteristics indicate which stat contains a Pokémon's highest IV. A Pokémon
 | ---- | ----------- | --------- |
 | id              | The identifier for this characteristic resource                                                                        | integer |
 | gene_modulo     | The remainder of the highest stat/IV divided by 5                                                                      | integer |
-| possible_values | The possible values of the highest stat that would result in a pokemon recieving this characteristic when divided by 5 | [integer] |
+| possible_values | The possible values of the highest stat that would result in a pokémon recieving this characteristic when divided by 5 | list integer |
 | descriptions    | The descriptions of this characteristic listed in different languages                                                  | list [Description](#description) |
 
 
@@ -1983,11 +1997,11 @@ Egg Groups are categories which determine which Pokémon are able to interbreed.
 | id              | The identifier for this egg group resource                       | integer |
 | name            | The name for this egg group resource                             | string  |
 | names           | The name of this egg group listed in different languages         | list [Name](#resourcename) |
-| pokemon_species | A list of all pokemon species that are members of this egg group | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| pokemon_species | A list of all pokémon species that are members of this egg group | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
 ## Genders
-Genders were introduced in Generation II for the purposes of breeding pokemon but can also rsult in visual differences or even different evolutionary lines. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Gender) for greater detail. 
+Genders were introduced in Generation II for the purposes of breeding pokémon but can also rsult in visual differences or even different evolutionary lines. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Gender) for greater detail. 
 
 ### GET api/v2/gender/{id or name}
 
@@ -2020,8 +2034,8 @@ Genders were introduced in Generation II for the purposes of breeding pokemon bu
 | ---- | ----------- | --------- |
 | id                      | The identifier for this gender resource                                                        | integer |
 | name                    | The name for this gender resource                                                              | string |
-| pokemon_species_details | A list of pokemon species that can be this gender and how likely it is that they will be       | list [PokemonSpeciesGender](#pokemonspeciesgender) |
-| required_for_evolution  | A list of pokemon species that required this gender in order for a pokemon to evolve into them | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| pokemon_species_details | A list of pokémon species that can be this gender and how likely it is that they will be       | list [PokemonSpeciesGender](#pokemonspeciesgender) |
+| required_for_evolution  | A list of pokémon species that required this gender in order for a pokémon to evolve into them | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
 #### PokemonSpeciesGender
@@ -2033,7 +2047,7 @@ Genders were introduced in Generation II for the purposes of breeding pokemon bu
 
 
 ## Growth Rates
-Growth rates are the speed with which pokemon gain levels through experience. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Experience) for greater detail. 
+Growth rates are the speed with which pokémon gain levels through experience. Check out [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Experience) for greater detail. 
 
 ### GET api/v2/growth-rate/{id or name}
 
@@ -2070,10 +2084,10 @@ Growth rates are the speed with which pokemon gain levels through experience. Ch
 | ---- | ----------- | --------- |
 | id              | The identifier for this gender resource                                                       | integer |
 | name            | The name for this gender resource                                                             | string |
-| formula         | The formula used to calculate the rate at which the pokemon species gains level               | string |
+| formula         | The formula used to calculate the rate at which the pokémon species gains level               | string |
 | descriptions    | The descriptions of this characteristic listed in different languages                         | list [Description](#description) |
 | levels          | A list of levels and the amount of experienced needed to atain them based on this growth rate | list [GrowthRateExperienceLevel](#growthrateexperiencelevel) |
-| pokemon_species | A list of pokemon species that gain levels at this growth rate                                | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| pokemon_species | A list of pokémon species that gain levels at this growth rate                                | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 #### GrowthRateExperienceLevel
 
@@ -2084,7 +2098,7 @@ Growth rates are the speed with which pokemon gain levels through experience. Ch
 
 
 ## Natures
-Natures influence how a pokemon's stats grow. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Nature) for greater detail.
+Natures influence how a pokémon's stats grow. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Nature) for greater detail.
 
 ### GET api/v2/nature/{id or name}
 
@@ -2143,12 +2157,12 @@ Natures influence how a pokemon's stats grow. See [Bulbapedia](http://bulbapedia
 | ---- | ----------- | --------- |
 | id                            | The identifier for this nature resource                                                                               | integer |
 | name                          | The name for this nature resource                                                                                     | string  |
-| decreased_stat                | The stat decreased by 10% in pokemon with this nature                                                                 | [NamedAPIResource](#namedapiresource) ([Stat](#stats)) | 
-| increased_stat                | The stat increased by 10% in pokemon with this nature                                                                 | [NamedAPIResource](#namedapiresource) ([Stat](#stats)) |
-| hates_flavor                  | The flavor hated by pokemon with this nature                                                                          | [NamedAPIResource](#namedapiresource) ([BerryFlavor](#berry-flavors)) |
-| likes_flavor                  | The flavor liked by pokemon with this nature                                                                          | [NamedAPIResource](#namedapiresource) ([BerryFlavor](#berry-flavors)) |
-| pokeathlon_stat_changes       | A list of pokeathlon stats this nature effects and how much it effects them                                           | list [NatureStatChange](#naturestatchange) |
-| move_battle_style_preferences | A list of battle styles and how likely a pokemon with this nature is to use them in the Battle Palace or Battle Tent. | list [MoveBattleStylePreference](#movebattlestylepreference) |
+| decreased_stat                | The stat decreased by 10% in pokémon with this nature                                                                 | [NamedAPIResource](#namedapiresource) ([Stat](#stats)) | 
+| increased_stat                | The stat increased by 10% in pokémon with this nature                                                                 | [NamedAPIResource](#namedapiresource) ([Stat](#stats)) |
+| hates_flavor                  | The flavor hated by pokémon with this nature                                                                          | [NamedAPIResource](#namedapiresource) ([BerryFlavor](#berry-flavors)) |
+| likes_flavor                  | The flavor liked by pokémon with this nature                                                                          | [NamedAPIResource](#namedapiresource) ([BerryFlavor](#berry-flavors)) |
+| pokeathlon_stat_changes       | A list of pokéathlon stats this nature effects and how much it effects them                                           | list [NatureStatChange](#naturestatchange) |
+| move_battle_style_preferences | A list of battle styles and how likely a pokémon with this nature is to use them in the Battle Palace or Battle Tent. | list [MoveBattleStylePreference](#movebattlestylepreference) |
 | names                         | The name of this nature listed in different languages                                                                 | list [Name](#resourcename) |
 
 #### NatureStatChange
@@ -2167,8 +2181,8 @@ Natures influence how a pokemon's stats grow. See [Bulbapedia](http://bulbapedia
 | move_battle_style  | The move battle style                                         | [NamedAPIResource](#namedapiresource) ([MoveBattleStyle](#move-battle-styles)) |
 
 
-## Pokeathlon Stats
-Pokeathlon Stats are different attributes of a pokemons performance in pokeathlons. In Pokeathlons, competitions happen on different courses; one for each of the different pokeathlon stats. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokéathlon) for greater detail.
+## Pokéathlon Stats
+Pokéathlon Stats are different attributes of a pokémon's performance in pokeathlons. In Pokéathlons, competitions happen on different courses; one for each of the different pokeathlon stats. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokéathlon) for greater detail.
 
 ### GET api/v2/pokeathlon-stat/{id or name}
 
@@ -2210,29 +2224,29 @@ Pokeathlon Stats are different attributes of a pokemons performance in pokeathlo
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id                | The identifier for this pokeathlon stat resource                    | integer |
-| name              | The name for this pokeathlon stat resource                          | string |
-| names             | The name of this pokeathlon stat listed in different languages      | list [Name](#resourcename) |
-| affecting_natures | A detail of natures which affect this pokeathlon stat positively or negatively | [NaturePokeathlonStatAffectSets](#naturepokeathlonstataffectsets) |
+| id                | The identifier for this pokéathlon stat resource                    | integer |
+| name              | The name for this pokéathlon stat resource                          | string  |
+| names             | The name of this pokéathlon stat listed in different languages      | list [Name](#resourcename) |
+| affecting_natures | A detail of natures which affect this pokéathlon stat positively or negatively | [NaturePokeathlonStatAffectSets](#naturepokeathlonstataffectsets) |
 
 #### NaturePokeathlonStatAffectSets
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| increase | A list of natures and how they change the referenced pokeathlon stat | list [NaturePokeathlonStatAffect](#naturepokeathlonstataffect) |
-| decrease | A list of natures and how they change the referenced pokeathlon stat | list [NaturePokeathlonStatAffect](#naturepokeathlonstataffect) |
+| increase | A list of natures and how they change the referenced pokéathlon stat | list [NaturePokeathlonStatAffect](#naturepokeathlonstataffect) |
+| decrease | A list of natures and how they change the referenced pokéathlon stat | list [NaturePokeathlonStatAffect](#naturepokeathlonstataffect) |
 
 #### NaturePokeathlonStatAffect
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| max_change | The maximum amount of change to the referenced pokeathlon stat | integer |
+| max_change | The maximum amount of change to the referenced pokéathlon stat | integer |
 | nature     | The nature causing the change                                  | [NamedAPIResource](#namedapiresource) ([Nature](#natures)) |
 
 
 
-## Pokemon
-Pokemon are the creatures that inhabit the world of the pokemon games. They can be caught using pokeballs and trained by battling with other pokemon. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokémon_(species)) for greater detail.
+## Pokémon
+Pokémon are the creatures that inhabit the world of the pokemon games. They can be caught using pokéballs and trained by battling with other pokémon. See [Bulbapedia](http://bulbapedia.bulbagarden.net/wiki/Pokémon_(species)) for greater detail.
 
 ### GET api/v2/pokemon/{id or name}
 
@@ -2350,48 +2364,48 @@ Pokemon are the creatures that inhabit the world of the pokemon games. They can
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id                       | The identifier for this pokemon resource                                                         | integer |
-| name                     | The name for this pokemon resource                                                               | string |
-| base_experience          | The base experience gained for defeating this pokemon                                            | integer |
-| height                   | The height of this pokemon                                                                       | integer |
-| is_default               | Set for exactly one pokemon used as the default for each species                                 | boolean |
+| id                       | The identifier for this pokémon resource                                                         | integer |
+| name                     | The name for this pokémon resource                                                               | string  |
+| base_experience          | The base experience gained for defeating this pokémon                                            | integer |
+| height                   | The height of this pokémon                                                                       | integer |
+| is_default               | Set for exactly one pokémon used as the default for each species                                 | boolean |
 | order                    | Order for sorting. Almost national order, except families are grouped together.                  | integer |
-| weight                   | The weight of this pokemon                                                                       | integer |
-| abilities                | A list of abilities this pokemon could potentially have                                          | list [PokemonAbility](#pokemonability) |
-| forms                    | A list of forms this pokemon can take on                                                         | list [NamedAPIResource](#namedapiresource) ([PokemonForm](#pokemon-forms)) |
-| game_indices             | A list of game indices relevent to pokemon item by generation                                    | list [VersionGameIndex](#versiongameindex) |
-| held_items               | A list of items this pokemon may be holding when encountered                                     | list [NamedAPIResource](#namedapiresource) ([Item](#items)) |
+| weight                   | The mass of this pokémon                                                                         | integer |
+| abilities                | A list of abilities this pokémon could potentially have                                          | list [PokemonAbility](#pokemonability) |
+| forms                    | A list of forms this pokémon can take on                                                         | list [NamedAPIResource](#namedapiresource) ([PokemonForm](#pokemon-forms)) |
+| game_indices             | A list of game indices relevent to pokémon item by generation                                    | list [VersionGameIndex](#versiongameindex) |
+| held_items               | A list of items this pokémon may be holding when encountered                                     | list [NamedAPIResource](#namedapiresource) ([Item](#items)) |
 | location_area_encounters | A list of location areas as well as encounter details pertaining to specific versions            | list [LocationAreaEncounter](#locationareaencounter) |
-| moves                    | A list of moves along with learn methods and level details pertaining to specific version groups | [NamedAPIResource](#namedapiresource) ([Move](#moves)) |
-| species                  | The species this pokemon belongs to                                                              | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
-| stats                    | A list of base stat values for this pokemon                                                      | list [NamedAPIResource](#namedapiresource) ([Stat](#stats)) | 
-| types                    | A list of details showing types this pokemon has                                                 | list [PokemonType](#pokemontype) |
+| moves                    | A list of moves along with learn methods and level details pertaining to specific version groups | list [NamedAPIResource](#namedapiresource) ([Move](#moves)) |
+| species                  | The species this pokémon belongs to                                                              | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| stats                    | A list of base stat values for this pokémon                                                      | list [NamedAPIResource](#namedapiresource) ([Stat](#stats)) | 
+| types                    | A list of details showing types this pokémon has                                                 | list [PokemonType](#pokemontype) |
 
 #### PokemonAbility
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | is_hidden | Whether or not this is a hidden ability                | boolean |
-| slot      | The slot this ability occupies in this pokemon species | integer |
-| ability   | The ability the pokemon may have                       | [NamedAPIResource](#namedapiresource) ([Ability](#abilities)) |
+| slot      | The slot this ability occupies in this pokémon species | integer |
+| ability   | The ability the pokémon may have                       | [NamedAPIResource](#namedapiresource) ([Ability](#abilities)) |
 
 #### PokemonType
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| slot | The order the pokemons types are listed in | integer |
-| type | The type the referenced pokemon has        | string |
+| slot | The order the pokémon types are listed in | integer |
+| type | The type the referenced pokémon has       | string  |
 
 #### LocationAreaEncounter
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| location_area   | The location area the referenced pokemon can be encountered in                  | [APIResource](#apiresource) ([LocationArea](#location-areas)) |
-| version_details | A list of versions and encounters with the referenced pokemon that might happen | list [VersionEncounterDetail](#versionencounterdetail) |
+| location_area   | The location area the referenced pokémon can be encountered in                  | [APIResource](#apiresource) ([LocationArea](#location-areas)) |
+| version_details | A list of versions and encounters with the referenced pokémon that might happen | list [VersionEncounterDetail](#versionencounterdetail) |
 
 
-## Pokemon Colors
-Colors used for sorting pokemon in a pokedex. The color listed in the Pokédex is usually the color most apparent or covering each Pokémon's body. No orange category exists; Pokémon that are primarily orange are listed as red or brown.
+## Pokémon Colors
+Colors used for sorting pokémon in a pokédex. The color listed in the Pokédex is usually the color most apparent or covering each Pokémon's body. No orange category exists; Pokémon that are primarily orange are listed as red or brown.
 
 ### GET api/v2/pokemon-color/{id or name}
 
@@ -2421,14 +2435,14 @@ Colors used for sorting pokemon in a pokedex. The color listed in the Pokédex i
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id              | The identifier for this pokemon color resource               | integer |
-| name            | The name for this pokemon color resource                     | string |
-| names           | The name of this pokemon color listed in different languages | list [Name](#resourcename) |
-| pokemon_species | A list of the pokemon species that have this color           | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| id              | The identifier for this pokémon color resource               | integer |
+| name            | The name for this pokémon color resource                     | string |
+| names           | The name of this pokémon color listed in different languages | list [Name](#resourcename) |
+| pokemon_species | A list of the pokémon species that have this color           | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
-## Pokemon Forms
-Some pokemon have the ability to take on different forms. At times, these differences are purely cosmetic and have no bearing on the difference in the Pokémon's stats from another; however, several Pokémon differ in stats (other than HP), type, and Ability depending on their form.
+## Pokémon Forms
+Some pokémon have the ability to take on different forms. At times, these differences are purely cosmetic and have no bearing on the difference in the Pokémon's stats from another; however, several Pokémon differ in stats (other than HP), type, and Ability depending on their form.
 
 ### GET api/v2/pokemon-form/{id or name}
 
@@ -2461,20 +2475,20 @@ Some pokemon have the ability to take on different forms. At times, these differ
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id             | The identifier for this pokemon color resource                                                                                                            | integer |
-| name           | The name for this pokemon color resource                                                                                                                  | string |
+| id             | The identifier for this pokémon form resource                                                                                                            | integer |
+| name           | The name for this pokémon form resource                                                                                                                  | string  |
 | order          | The order in which forms should be sorted within all forms. Multiple forms may have equal order, in which case they should fall back on sorting by name. | integer |
 | form_order     | The order in which forms should be sorted within a species' forms                                                                                        | integer |
-| is_default     | True for exactly one form used as the default for each pokemon                                                                                            | boolean |
+| is_default     | True for exactly one form used as the default for each pokémon                                                                                           | boolean |
 | is_battle_only | Whether or not this form can only happen during battle                                                                                                   | boolean |
 | is_mega        | Whether or not this form requires mega evolution                                                                                                         | boolean |
 | form_name      | The name of this form                                                                                                                                    | string  |
-| pokemon        | The pokemon that can take on this form                                                                                                                    | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
-| version_group  | The version group this pokemon form was introduced in                                                                                                     | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
+| pokemon        | The pokémon that can take on this form                                                                                                                   | [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
+| version_group  | The version group this pokémon form was introduced in                                                                                                    | [NamedAPIResource](#namedapiresource) ([VersionGroup](#version-groups)) |
 
 
-## Pokemon Habitats
-Habitats are generally different terrain pokemon can be found in but can also be areas designated for rare or legendary pokemon.
+## Pokémon Habitats
+Habitats are generally different terrain pokémon can be found in but can also be areas designated for rare or legendary pokémon.
 
 ### GET api/v2/pokemon-habitat/{id or name}
 
@@ -2508,14 +2522,14 @@ Habitats are generally different terrain pokemon can be found in but can also be
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id              | The identifier for this pokemon habitat resource                | integer |
-| name            | The name for this pokemon habitat resource                      | string |
-| names           | The name of this pokemon habitat listed in different languages  | list [Name](#resourcename) |
-| pokemon_species | A list of the pokemon species that can be found in this habitat | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| id              | The identifier for this pokémon habitat resource                | integer |
+| name            | The name for this pokémon habitat resource                      | string |
+| names           | The name of this pokémon habitat listed in different languages  | list [Name](#resourcename) |
+| pokemon_species | A list of the pokémon species that can be found in this habitat | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 
-## Pokemon Shapes
-Shapes used for sorting pokemon in a pokedex. 
+## Pokémon Shapes
+Shapes used for sorting pokémon in a pokédex. 
 
 ### GET api/v2/pokemon-shape/{id or name}
 
@@ -2558,11 +2572,11 @@ Shapes used for sorting pokemon in a pokedex.
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| id              | The identifier for this pokemon shape resource                            | integer |
-| name            | The name for this pokemon shape resource                                  | string |
-| awesome_names   | The "scientific" name of this pokemon shape listed in different languages | list [AwesomeName](#awesomename) |
-| names           | The name of this pokemon shape listed in different languages              | list [Name](#resourcename) |
-| pokemon_species | A list of the pokemon species that have this shape                        | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| id              | The identifier for this pokémon shape resource                            | integer |
+| name            | The name for this pokémon shape resource                                  | string  |
+| awesome_names   | The "scientific" name of this pokémon shape listed in different languages | list [AwesomeName](#awesomename) |
+| names           | The name of this pokémon shape listed in different languages              | list [Name](#resourcename) |
+| pokemon_species | A list of the pokémon species that have this shape                        | list [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
 
 #### AwesomeName
 
@@ -2572,8 +2586,8 @@ Shapes used for sorting pokemon in a pokedex.
 | language     | The language this "scientific" name is in                                  | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
 
 
-## Pokemon Species
-A Pokemon Species forms the basis for at least one pokemon. Attributes of a Pokemon species are shared across all varieties of pokemon within the species. A good example is Wormadam; Wormadam is the species which can be found in three different varieties, Wormadam-Trash, Wormadam-Sandy and Wormadam-Plant.  
+## Pokémon Species
+A Pokémon Species forms the basis for at least one pokémon. Attributes of a Pokémon species are shared across all varieties of pokémon within the species. A good example is Wormadam; Wormadam is the species which can be found in three different varieties, Wormadam-Trash, Wormadam-Sandy and Wormadam-Plant.  
 
 ### GET api/v2/pokemon-species/{id or name}
 
@@ -2663,44 +2677,44 @@ A Pokemon Species forms the basis for at least one pokemon. Attributes of a Poke
 
 | Name | Description | Data Type | 
 | ---- | ----------- | --------- |
-| id                     | The identifier for this pokemon species resource                                                                                                   | integer | 
-| name                   | The name for this pokemon species resource                                                                                                         | string |
+| id                     | The identifier for this pokémon species resource                                                                                                   | integer | 
+| name                   | The name for this pokémon species resource                                                                                                         | string |
 | order                  | The order in which species should be sorted.  Based on National Dex order, except families are grouped together and sorted by stage.               | integer |
 | gender_rate            | The chance of this Pokémon being female, in eighths; or -1 for genderless                                                                          | integer |
 | capture_rate           | The base capture rate; up to 255. The higher the number, the easier the catch.                                                                     | integer |
-| base_happiness         | The happiness when caught by a normal pokeball; up to 255. The higher the number, the happier the pokemon.                                         | integer |
-| is_baby                | Whether or not this is a baby pokemon                                                                                                              | boolean |
+| base_happiness         | The happiness when caught by a normal pokéball; up to 255. The higher the number, the happier the pokémon.                                         | integer |
+| is_baby                | Whether or not this is a baby pokémon                                                                                                              | boolean |
 | hatch_counter          | Initial hatch counter: one must walk 255 × (hatch_counter + 1) steps before this Pokémon's egg hatches, unless utilizing bonuses like Flame Body's | integer |
-| has_gender_differences | Whether or not this pokemon can have different genders                                                                                             | boolean |
-| forms_switchable       | Whether or not this pokemon has multiple forms and can switch between them                                                                         | boolean |
-| growth_rate            | The rate at which this pokemon species gains levels                                                                                                | [NamedAPIResource](#namedapiresource) ([GrowthRate](#growth-rates)) |
-| pokedex_numbers        | A list of pokedexes and the indexes reserved within them for this pokemon species                                                                  | list [PokemonSpeciesDexEntry](#pokemonspeciesdexentry) |
-| egg_groups             | A list of egg groups this pokemon species is a member of                                                                                           | list [NamedAPIResource](#namedapiresource) ([EggGroup](#egg-groups)) |
-| color                  | The color of this pokemon for gimmicky pokedex search                                                                                              | list [NamedAPIResource](#namedapiresource) ([PokemonColor](#pokemon-colors)) |
-| shape                  | The shape of this pokemon for gimmicky pokedex search                                                                                              | list [NamedAPIResource](#namedapiresource) ([PokemonShape](#pokemon-shapes)) |
-| evolves_from_species   | The pokemon species that evolves into this pokemon_species                                                                                         | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
-| evolution_chain        | The evolution chain this pokemon species is a member of                                                                                            | [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
-| habitat                | The habitat this pokemon species can be encountered in                                                                                             | [NamedAPIResource](#namedapiresource) ([PokemonHabitat](#pokemon-habitats)) |
-| generation             | The generation this pokemon species was introduced in                                                                                              | [NamedAPIResource](#namedapiresource) ([Generation](#generations)) |
-| names                  | The name of this pokemon species listed in different languages                                                                                     | list [Name](#resourcename) |
-| pal_park_encounters    | A list of encounters that can be had with this pokemon species in pal park                                                                         | list [PalParkEncounterArea](#palparkencounterarea) |
-| form_descriptions      | Descriptions of different forms pokemon take on within the pokemon species		                                                                    | list [Description](#description) |
-| genera                 | The genus of this pokemon species listed in multiple languages                                                                                     | [Genus](#genus) |
-| varieties              | A list of the pokemon that exist within this pokemon species                                                                                       | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
+| has_gender_differences | Whether or not this pokémon can have different genders                                                                                             | boolean |
+| forms_switchable       | Whether or not this pokémon has multiple forms and can switch between them                                                                         | boolean |
+| growth_rate            | The rate at which this pokémon species gains levels                                                                                                | [NamedAPIResource](#namedapiresource) ([GrowthRate](#growth-rates)) |
+| pokedex_numbers        | A list of pokedexes and the indexes reserved within them for this pokémon species                                                                  | list [PokemonSpeciesDexEntry](#pokemonspeciesdexentry) |
+| egg_groups             | A list of egg groups this pokémon species is a member of                                                                                           | list [NamedAPIResource](#namedapiresource) ([EggGroup](#egg-groups)) |
+| color                  | The color of this pokémon for gimmicky pokedex search                                                                                              | list [NamedAPIResource](#namedapiresource) ([PokemonColor](#pokemon-colors)) |
+| shape                  | The shape of this pokémon for gimmicky pokedex search                                                                                              | list [NamedAPIResource](#namedapiresource) ([PokemonShape](#pokemon-shapes)) |
+| evolves_from_species   | The pokémon species that evolves into this pokemon_species                                                                                         | [NamedAPIResource](#namedapiresource) ([PokemonSpecies](#pokemon-species)) |
+| evolution_chain        | The evolution chain this pokémon species is a member of                                                                                            | [APIResource](#apiresource) ([EvolutionChain](#evolution-chains)) |
+| habitat                | The habitat this pokémon species can be encountered in                                                                                             | [NamedAPIResource](#namedapiresource) ([PokemonHabitat](#pokemon-habitats)) |
+| generation             | The generation this pokémon species was introduced in                                                                                              | [NamedAPIResource](#namedapiresource) ([Generation](#generations)) |
+| names                  | The name of this pokémon species listed in different languages                                                                                     | list [Name](#resourcename) |
+| pal_park_encounters    | A list of encounters that can be had with this pokémon species in pal park                                                                         | list [PalParkEncounterArea](#palparkencounterarea) |
+| form_descriptions      | Descriptions of different forms pokémon take on within the pokémon species		                                                                  | list [Description](#description) |
+| genera                 | The genus of this pokémon species listed in multiple languages                                                                                     | [Genus](#genus) |
+| varieties              | A list of the pokémon that exist within this pokémon species                                                                                       | list [NamedAPIResource](#namedapiresource) ([Pokemon](#pokemon)) |
 
 #### Genus
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| genus    | The localized genus for the referenced pokemon species | string |
+| genus    | The localized genus for the referenced pokémon species | string |
 | language | The language this genus is in                          | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
 
 #### PokemonSpeciesDexEntry
 
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
-| entry_number | The index number within the pokedex                       | integer |
-| name         | The pokdex the referenced pokemon species can be found in | [NamedAPIResource](#namedapiresource) ([Pokedex](#pokedexes)) |
+| entry_number | The index number within the pokédex                        | integer |
+| name         | The pokédex the referenced pokémon species can be found in | [NamedAPIResource](#namedapiresource) ([Pokedex](#pokedexes)) |
 
 #### PalParkEncounterArea
 
@@ -2712,7 +2726,7 @@ A Pokemon Species forms the basis for at least one pokemon. Attributes of a Poke
 
 
 ## Stats
-Stats determine certain aspects of battles. Each pokemon has a value for each stat which grows as they gain levels and can be altered momenarily by effects in battles.
+Stats determine certain aspects of battles. Each pokémon has a value for each stat which grows as they gain levels and can be altered momenarily by effects in battles.
 
 ### GET api/v2/stat/{id or name}
 
@@ -2802,7 +2816,7 @@ Stats determine certain aspects of battles. Each pokemon has a value for each st
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | increase | A list of natures and how they change the referenced stat | list [NatureStatAffect](#naturestataffect) |
-| decrease | A list of nature sand how they change the referenced stat | list [NatureStatAffect](#naturestataffect) |
+| decrease | A list of natures and how they change the referenced stat | list [NatureStatAffect](#naturestataffect) |
 
 #### NatureStatAffect
 
@@ -2957,7 +2971,7 @@ Languages for translations of api resource information.
 | id       | The identifier for this language resource                                                     | integer |
 | name     | The name for this language resource                                                           | string  |
 | official | Whether or not the games are published in this language                                       | boolean |
-| is639    | The two-letter code of the country where this language is spoken. Note that it is not unique. | string |
+| iso639   | The two-letter code of the country where this language is spoken. Note that it is not unique. | string  |
 | iso3166  | The two-letter code of the language. Note that it is not unique.                              | string  |
 | names    | The name of this language listed in different languages                                       | list [Name](#resourcename) |
 
@@ -2977,7 +2991,7 @@ Languages for translations of api resource information.
 | Name | Description | Data Type | 
 | ---- | ----------- | --------- |
 | description | The localized description for an api resource in a specific language | string |
-| language    | The language this name is in                                         | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
+| language    | The language this description is in                                  | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
 
 
 #### Effect
@@ -3004,7 +3018,7 @@ Languages for translations of api resource information.
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | flavor_text | The localized name for an api resource in a specific language | string |
-| language    | The language this name is in                                  | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
+| language    | The language this flavor text is in                           | [NamedAPIResource](#namedapiresource) ([Language](#languages)) |
 
 
 #### GenerationGameIndex
@@ -3053,7 +3067,7 @@ Languages for translations of api resource information.
 | Name | Description | Data Type |
 | ---- | ----------- | --------- |
 | game_index | The internal id of an api resource within game data | integer |
-| version    | The version relevent to this game index             | [NamedAPIResource](#namedapiresource) ([Version](#versions)) |
+| version    | The version relevant to this game index             | [NamedAPIResource](#namedapiresource) ([Version](#versions)) |
 
 
 #### VersionGroupFlavorText

pokemon_v2/migrations/0001_squashed_0002_auto_20151228_0417.py

@@ -6,6 +6,8 @@ from django.db import models, migrations
 
 class Migration(migrations.Migration):
 
+    replaces = [(b'pokemon_v2', '0001_squashed_0003_auto_20151119_1409'), (b'pokemon_v2', '0002_auto_20151228_0417')]
+
     dependencies = [
     ]
 
@@ -2860,7 +2862,7 @@ class Migration(migrations.Migration):
             name='AbilityChangeEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('ability_change', models.ForeignKey(related_name='abilitychangeeffecttext', blank=True, to='pokemon_v2.AbilityChange', null=True)),
                 ('language', models.ForeignKey(related_name='abilitychangeeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
             ],
@@ -2873,7 +2875,7 @@ class Migration(migrations.Migration):
             name='AbilityEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('short_effect', models.CharField(max_length=300)),
                 ('ability', models.ForeignKey(related_name='abilityeffecttext', blank=True, to='pokemon_v2.Ability', null=True)),
                 ('language', models.ForeignKey(related_name='abilityeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
@@ -2887,7 +2889,7 @@ class Migration(migrations.Migration):
             name='ItemEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('short_effect', models.CharField(max_length=300)),
                 ('item', models.ForeignKey(related_name='itemeffecttext', blank=True, to='pokemon_v2.Item', null=True)),
                 ('language', models.ForeignKey(related_name='itemeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
@@ -2901,7 +2903,7 @@ class Migration(migrations.Migration):
             name='ContestEffectEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('contest_effect', models.ForeignKey(related_name='contesteffecteffecttext', blank=True, to='pokemon_v2.ContestEffect', null=True)),
                 ('language', models.ForeignKey(related_name='contesteffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
             ],
@@ -2914,7 +2916,7 @@ class Migration(migrations.Migration):
             name='MoveEffectChangeEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('language', models.ForeignKey(related_name='moveeffectchangeeffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
                 ('move_effect_change', models.ForeignKey(related_name='moveeffectchangeeffecttext', blank=True, to='pokemon_v2.MoveEffectChange', null=True)),
             ],
@@ -2927,7 +2929,7 @@ class Migration(migrations.Migration):
             name='MoveEffectEffectText',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
                 ('short_effect', models.CharField(max_length=300)),
                 ('language', models.ForeignKey(related_name='moveeffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
                 ('move_effect', models.ForeignKey(blank=True, to='pokemon_v2.MoveEffect', null=True)),
@@ -3046,7 +3048,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('item_fling_effect', models.ForeignKey(related_name='itemflingeffecteffecttext', blank=True, to='pokemon_v2.ItemFlingEffect', null=True)),
                 ('language', models.ForeignKey(related_name='itemflingeffecteffecttext_language', blank=True, to='pokemon_v2.Language', null=True)),
-                ('effect', models.CharField(max_length=4000)),
+                ('effect', models.CharField(max_length=6000)),
             ],
             options={
                 'abstract': False,

pokemon_v2/models.py

@@ -63,7 +63,7 @@ class HasGender(models.Model):
 
 class HasEffect(models.Model):
 
-  effect = models.CharField(max_length=4000)
+  effect = models.CharField(max_length=6000)
 
   class Meta:
     abstract = True

pokemon_v2/serializers.py

@@ -2338,8 +2338,10 @@ class PokemonDetailSerializer(serializers.ModelSerializer):
         method_objects = MoveLearnMethod.objects.all()
         method_data = MoveLearnMethodSummarySerializer(method_objects, many=True, context=self.context).data
 
-        # Get moves related to this pokemon and pull out unique Move IDs
-        pokemon_moves = PokemonMove.objects.filter(pokemon_id=obj).order_by('level')
+        # Get moves related to this pokemon and pull out unique Move IDs.  Note that it's important to order
+        # by the same column we're using to determine if the entries are unique.  Otherwise distinct() will
+        # return apparent duplicates.
+        pokemon_moves = PokemonMove.objects.filter(pokemon_id=obj).order_by('move_id')
         move_ids = pokemon_moves.values('move_id').distinct()
         move_list = []
 

pokemon_v2/tests.py

@@ -1849,17 +1849,11 @@ class APIData():
         return pokemon_item
 
     @classmethod
-    def setup_pokemon_move_data(self, pokemon, level=0, order=1):
-
-        move = self.setup_move_data(
-            name='mv for pkmn')
+    def setup_pokemon_move_data(self, pokemon, move, version_group, level=0, order=1):
 
         move_learn_method = self.setup_move_learn_method_data(
             name='mv lrn mthd for pkmn')
 
-        version_group = self.setup_version_group_data(
-            name='ver grp for pkmn')
-
         pokemon_move = PokemonMove.objects.create (
             pokemon = pokemon,
             version_group = version_group,
@@ -3613,9 +3607,22 @@ class APITests(APIData, APITestCase):
         pokemon_stat = self.setup_pokemon_stat_data(pokemon=pokemon)
         pokemon_type = self.setup_pokemon_type_data(pokemon=pokemon)
         pokemon_item = self.setup_pokemon_item_data(pokemon=pokemon)
-        pokemon_move = self.setup_pokemon_move_data(pokemon=pokemon)
         pokemon_sprites = self.setup_pokemon_sprites_data(pokemon=pokemon)
         pokemon_game_index = self.setup_pokemon_game_index_data(pokemon=pokemon, game_index=10)
+        # To test issue #85, we will create one move that has multiple
+        # learn levels in different version groups.  Later, we'll
+        # assert that we only got one move record back.
+        pokemon_move = self.setup_move_data(name='mv for pkmn')
+        pokemon_moves = []
+        for move in range(0,4):
+            version_group = self.setup_version_group_data(
+                name='ver grp '+str(move)+' for pkmn')
+            new_move = self.setup_pokemon_move_data(
+                    pokemon=pokemon,
+                    move=pokemon_move,
+                    version_group=version_group,
+                    level=move)
+            pokemon_moves.append(new_move)
         
         encounter_method = self.setup_encounter_method_data(name='encntr mthd for lctn area')
         location_area1 = self.setup_location_area_data(name='lctn1 area for base pkmn')
@@ -3661,14 +3668,56 @@ class APITests(APIData, APITestCase):
         self.assertEqual(response.data['held_items'][0]['version_details'][0]['rarity'], pokemon_item.rarity)
         self.assertEqual(response.data['held_items'][0]['version_details'][0]['version']['name'], pokemon_item.version.name)
         self.assertEqual(response.data['held_items'][0]['version_details'][0]['version']['url'], '{}{}/version/{}/'.format(test_host, api_v2, pokemon_item.version.pk))
-        # move params
-        self.assertEqual(response.data['moves'][0]['move']['name'], pokemon_move.move.name)
-        self.assertEqual(response.data['moves'][0]['move']['url'], '{}{}/move/{}/'.format(test_host, api_v2, pokemon_move.move.pk))
-        self.assertEqual(response.data['moves'][0]['version_group_details'][0]['level_learned_at'], pokemon_move.level)
-        self.assertEqual(response.data['moves'][0]['version_group_details'][0]['version_group']['name'], pokemon_move.version_group.name)
-        self.assertEqual(response.data['moves'][0]['version_group_details'][0]['version_group']['url'], '{}{}/version-group/{}/'.format(test_host, api_v2, pokemon_move.version_group.pk))
-        self.assertEqual(response.data['moves'][0]['version_group_details'][0]['move_learn_method']['name'], pokemon_move.move_learn_method.name)
-        self.assertEqual(response.data['moves'][0]['version_group_details'][0]['move_learn_method']['url'], '{}{}/move-learn-method/{}/'.format(test_host, api_v2, pokemon_move.move_learn_method.pk))
+        # move params -- Make sure that we only got one move back,
+        # but that we got all of the distinct version group and learn
+        # level values. (See issue #85)
+        # Number of Moves
+        expected = 1
+        actual = len(response.data['moves'])
+        self.assertEqual(expected, actual)
+        # Move name
+        expected = pokemon_moves[0].move.name
+        actual = response.data['moves'][0]['move']['name']
+        self.assertEqual(expected, actual)
+        # Move URL
+        expected = '{}{}/move/{}/'.format(
+            test_host,
+            api_v2,
+            pokemon_moves[0].move.pk)
+        actual = response.data['moves'][0]['move']['url']
+        self.assertEqual(expected, actual)
+        # Numbver of version groups
+        expected = len(pokemon_moves)
+        actual = len(response.data['moves'][0]['version_group_details'])
+        self.assertEqual(expected, actual)
+        for i in range(0,len(pokemon_moves)):
+            version = response.data['moves'][0]['version_group_details'][i]
+            # Learn Level
+            expected = pokemon_moves[i].level
+            actual = version['level_learned_at']
+            self.assertEqual(expected ,actual)
+            # Version Group Name
+            expected = pokemon_moves[i].version_group.name
+            actual = version['version_group']['name']
+            self.assertEqual(expected, actual)
+            # Version Group URL
+            expected = '{}{}/version-group/{}/'.format(
+                test_host,
+                api_v2,
+                pokemon_moves[i].version_group.pk)
+            actual = version['version_group']['url']
+            self.assertEqual(expected, actual)
+            # Learn Method Name
+            expected = pokemon_moves[i].move_learn_method.name
+            actual = version['move_learn_method']['name']
+            self.assertEqual(expected, actual)
+            # Learn Method URL
+            expected = '{}{}/move-learn-method/{}/'.format(
+                test_host,
+                api_v2,
+                pokemon_moves[i].move_learn_method.pk)
+            actual = version['move_learn_method']['url']
+            self.assertEqual(expected, actual)
         # game indices params
         self.assertEqual(response.data['game_indices'][0]['game_index'], pokemon_game_index.game_index)
         self.assertEqual(response.data['game_indices'][0]['version']['name'], pokemon_game_index.version.name)

templates/pages/docsv2.html

@@ -136,9 +136,9 @@
 
     <h2 id="wrap">Wrappers</h2>
 
-    <p class="lead">V2 Doesn't have any wrappers yet!</p>
-
-    <p>Building something using the API? Help us out! Build a wrapper and let us know. We'll post it right here.</p>
+    <ul>
+      <li><b>Node</b> - <a href='https://github.com/TheTommyTwitch/pokedex-promise-v2'>Pokedex Promise v2</a> by Thomas Asadurian.</li>
+    </ul>
 
     {% markdown %}