Sun and moon data (#305)

* badges

* Added CSV from Veekun

* added sprites from Veekun website

* quick fixes for an Exception

* bumped dependencies version

* add comment on how to upgrade to Django 1.11

* added some reminds to caching, our official wrappers and the true cost of the server

* remove index.html from sprites

* update to conform django-rest-framework 3.3.0 guidelines

* lint

README.md

@@ -10,7 +10,7 @@ http://pokeapi.co
 
 ## Fair use policy
 
-PokéAPI is open and free to use. However, we will ban IP addresses that abuse this privilege. This API is used primarily for educational purposes, and we do not want people inhibiting the education of others. See the fair use guide on the docs for more information.
+PokéAPI is open and free to use. However, we will ban IP addresses that abuse this privilege. This API is used primarily for educational purposes, and we do not want people inhibiting the education of others. See the fair use guide on the docs for more information. Moreover, we strongly suggest to cache request made, see the [Wrapper section](#official-wrappers) below.
 
 ## Join Us On Slack!
 Have a question or just want to discuss new ideas and improvements? Hit us up on slack. Consider talking with us here before creating new issue.
@@ -44,9 +44,13 @@ Ask your company to also support this open source project by [becoming a sponsor
 <a href="https://opencollective.com/pokeapi/sponsor/8/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/pokeapi/sponsor/9/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/9/avatar.svg"></a>
 
+## Official Wrappers
 
-
-
+* Node server-side [PokeAPI/pokedex-promise-v2](https://github.com/PokeAPI/pokedex-promise-v2) | _Auto caching_
+* Browser client-side [PokeAPI/pokeapi-js-wrapper](https://github.com/PokeAPI/pokeapi-js-wrapper) | _Auto caching_
+* Java/Kotlin [PokeAPI/pokekotlin](https://github.com/PokeAPI/pokekotlin)
+* Python [GregHilmes/pokebase](https://github.com/GregHilmes/pokebase) | _Auto caching_
+* Python V1 APIs [PokeAPI/pykemon](https://github.com/PokeAPI/pykemon)
 
 ## DEPRECATION
 

config/urls.py

@@ -14,6 +14,9 @@ from pokemon_v2 import urls as pokemon_v2_urls
 # need to make sure v2 urls resolve last so angular routes have control
 # v2 = [ url(r'^', include(pokemon_v2_urls)) ]
 
+# Update to Django 1.11 requires below to be implemented
+# https://stackoverflow.com/questions/38744285/django-urls-error-view-must-be-a-callable-or-a-list-tuple-in-the-case-of-includ
+
 urlpatterns = [
 
     url(r'^admin/', include(admin.site.urls)),

data/v2/build.py

@@ -1168,6 +1168,11 @@ def build_moves():
 
     for index, info in enumerate(data):
         if index > 0:
+            _move_effect = None
+            try:
+                _move_effect = MoveEffect.objects.get(pk = int(info[6])) if info[6] != '' else None
+            except:
+                pass
 
             model = MoveChange (
                 move = Move.objects.get(pk = int(info[0])),
@@ -1181,7 +1186,7 @@ def build_moves():
 
                 accuracy = int(info[5]) if info[5] != '' else None,
 
-                move_effect = MoveEffect.objects.get(pk = int(info[6])) if info[6] != '' else None,
+                move_effect =  _move_effect,
 
                 move_effect_chance = int(info[7]) if info[7] != '' else None
             )

data/v2/csv/abilities.csv

@@ -190,6 +190,47 @@ id,identifier,generation_id,is_main_series
 189,primordial-sea,6,1
 190,desolate-land,6,1
 191,delta-stream,6,1
+192,stamina,7,1
+193,wimp-out,7,1
+194,emergency-exit,7,1
+195,water-compaction,7,1
+196,merciless,7,1
+197,shields-down,7,1
+198,stakeout,7,1
+199,water-bubble,7,1
+200,steelworker,7,1
+201,berserk,7,1
+202,slush-rush,7,1
+203,long-reach,7,1
+204,liquid-voice,7,1
+205,triage,7,1
+206,galvanize,7,1
+207,surge-surfer,7,1
+208,schooling,7,1
+209,disguise,7,1
+210,battle-bond,7,1
+211,power-construct,7,1
+212,corrosion,7,1
+213,comatose,7,1
+214,queenly-majesty,7,1
+215,innards-out,7,1
+216,dancer,7,1
+217,battery,7,1
+218,fluffy,7,1
+219,dazzling,7,1
+220,soul-heart,7,1
+221,tangling-hair,7,1
+222,receiver,7,1
+223,power-of-alchemy,7,1
+224,beast-boost,7,1
+225,rks-system,7,1
+226,electric-surge,7,1
+227,psychic-surge,7,1
+228,misty-surge,7,1
+229,grassy-surge,7,1
+230,full-metal-body,7,1
+231,shadow-shield,7,1
+232,prism-armor,7,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_prose.csv

@@ -567,6 +567,77 @@ 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,,
+189,9,"Creates heavy rain, which has all the properties of Rain Dance, cannot be replaced, and causes damaging Fire moves to fail.","When this Pokémon enters battle or gains this ability, the weather becomes heavy rain.  Heavy rain has all the properties of []{move:rain-dance} and also causes damaging Fire moves to fail.
+
+Heavy rain ends when this Pokémon leaves battle or loses this ability, or when this ability is nullified.  The weather cannot otherwise be changed except by the effects of []{ability:delta-stream} and []{ability:desolate-land}.
+
+[]{ability:air-lock} and []{ability:cloud-nine} will prevent the effects of heavy rain, including allowing Fire moves to work, but will not allow the weather to be changed."
+190,9,"Creates extremely harsh sunlight, which has all the properties of Sunny Day, cannot be replaced, and causes damaging Water moves to fail.","When this Pokémon enters battle or gains this ability, the weather becomes extremely harsh sunlight.  Extremely harsh sunlight has all the properties of []{move:sunny-day} and also causes damaging Water moves to fail.
+
+Extremely harsh sunlight ends when this Pokémon leaves battle or loses this ability, or when this ability is nullified.  The weather cannot otherwise be changed except by the effects of []{ability:delta-stream} and []{ability:primordial-sea}.
+
+[]{ability:air-lock} and []{ability:cloud-nine} will prevent the effects of extremely harsh sunlight, including allowing Water moves to work, but will not allow the weather to be changed."
+191,9,"Creates a mysterious air current, which cannot be replaced and causes moves to never be super effective against Flying Pokémon.","When this Pokémon enters battle or gains this ability, the weather becomes a mysterious air current.  A mysterious air current causes moves to not be super effective against Flying; they do neutral damage instead.  []{ability:anticipation} and []{move:stealth-rock} are not affected.
+
+The mysterious air current ends when this Pokémon leaves battle or loses this ability, or when this ability is nullified.  The weather cannot otherwise be changed except by the effects of []{ability:desolate-land} and []{ability:primordial-sea}.
+
+[]{ability:air-lock} and []{ability:cloud-nine} will prevent the effect of a mysterious air current, but will not allow the weather to be changed."
+192,9,Raises this Pokémon's Defense by one stage when it takes damage from a move.,Raises this Pokémon's Defense by one stage when it takes damage from a move.
+193,9,This Pokémon automatically switches out when its HP drops below half.,"After this Pokémon is hit by a move, if that move caused this Pokémon's HP to drop below half, it switches out."
+194,9,This Pokémon automatically switches out when its HP drops below half.,"After this Pokémon is hit by a move, if that move caused this Pokémon's HP to drop below half, it switches out."
+195,9,Raises this Pokémon's Defense by two stages when it's hit by a Water move.,Raises this Pokémon's Defense by two stages when it's hit by a Water move.
+196,9,This Pokémon's moves critical hit against poisoned targets.,This Pokémon's moves critical hit against poisoned targets.
+197,9,Transforms this Minior between Core Form and Meteor Form.  Prevents major status ailments and drowsiness while in Meteor Form.,"When this Pokémon enters battle and at the end of each turn, if its HP is 50% or above, it changes into Meteor Form; otherwise, it changes into Core Form.  In Meteor Form, it cannot be given a major status ailment (though existing ones are not cured), cannot become drowsy from []{move:yawn}, and cannot use []{move:rest} (which will simply fail).
+
+This ability cannot be copied, replaced, or nullified.  This ability only takes effect for Minior."
+198,9,This Pokémon's moves have double power against Pokémon that switched in this turn.,This Pokémon's moves have double power against Pokémon that switched in this turn.
+199,9,"Halves damage from Fire moves, doubles damage of Water moves, and prevents burns.","When this Pokémon is hit by a Fire move, the damage is halved.  When this Pokémon uses a Water move, the power is doubled.  This Pokémon cannot be burned, and if it becomes burned, the  burn is immediately ured."
+200,9,This Pokémon's Steel moves have 1.5× power.,This Pokémon's Steel moves have 1.5× power.
+201,9,Raises this Pokémon's Special Attack by one stage every time its HP drops below half.,"Whenever this Pokémon takes damage from a move that causes its HP to drop below 50%, its Special Attack rises by one stage."
+202,9,"During Hail, this Pokémon has double Speed.","During Hail, this Pokémon has double Speed."
+203,9,This Pokémon's moves do not make contact.,A move used by this Pokémon will not make contact.
+204,9,Sound-based moves become Water-type.,"When this Pokémon uses a move that is sound-based, that move's type is Water."
+205,9,This Pokémon's healing moves have their priority increased by 3.,This Pokémon's healing moves have their priority increased by 3.
+206,9,This Pokémon's Normal moves are Electric and have their power increased to 1.2×.,"When this Pokémon uses a Normal moves, that move is Electric its power is 1.2×."
+207,9,Doubles this Pokémon's Speed on Electric Terrain.,Doubles this Pokémon's Speed on Electric Terrain.
+208,9,Wishiwashi becomes Schooling Form when its HP is 25% or higher.,"If this Pokémon is a []{pokemon:wishiwashi} and level 20 or above, then when it enters battle and at the start of each turn, it becomes Schooling Form if its HP is 25% or higher and Solo Form otherwise.
+
+This ability cannot be replaced, copied, or nullified."
+209,9,Prevents the first instance of battle damage.,"If this Pokémon is in its Disguised Form and takes damage from a move, it switches to its Busted Form and the damage is prevented.  Other effects are not prevented.
+
+This ability cannot be copied or replaced.  This ability only takes effect for Mimikyu."
+210,9,Transforms this Pokémon into Ash-Greninja after fainting an opponent.  Water Shuriken's power is 20 and always hits three times.,"Transforms this Pokémon into Ash-Greninja after fainting an opponent.  Water Shuriken's power is 20 and always hits three times.
+
+This ability cannot be copied or replaced.  This ability only takes effect for Greninja."
+211,9,Transforms 10% or 50% Zygarde into Complete Forme when its HP is below 50%.,"Transforms 10% or 50% Zygarde into Complete Forme when its HP is below 50%.
+
+This ability cannot be copied or replaced.  This ability only takes effect for Zygarde."
+212,9,This Pokémon can inflict poison on Poison and Steel Pokémon.,This Pokémon's moves and item ignore the usual immunity of Poison and Steel Pokémon when attempting to inflict poison.
+213,9,This Pokémon always  acts as though it were Asleep.,This Pokémon always acts as though it were Asleep.  It cannot be given another status ailment; it's unaffected by []{move:yawn}; it can use []{move:sleep-talk}; and so on.
+214,9,Opposing Pokémon cannot use priority attacks.,"When an opposing Pokémon attempts to use a move that targets this Pokémon or an ally, and that move has priority, it will fail."
+215,9,"When this Pokémon faints from an opponent's move, that opponent takes damage equal to the HP this Pokémon had remaining.","When this Pokémon faints from an opponent's move, that opponent takes damage equal to the HP this Pokémon had remaining."
+216,9,"Whenever another Pokémon uses a dance move, this Pokémon will use the same move immediately afterwards.","Whenever another Pokémon uses a dance move, this Pokémon will use the same move immediately afterwards."
+217,9,Ally Pokémon's moves have their power increased to 1.3×.,Ally Pokémon's moves have their power increased to 1.3×.
+218,9,Damage from contact moves is halved.  Damage from Fire moves is doubled.,Damage from contact moves is halved.  Damage from Fire moves is doubled.
+219,9,Opposing Pokémon cannot use priority attacks.,"When an opposing Pokémon attempts to use a move that targets this Pokémon or an ally, and that move has priority, it will fail."
+220,9,This Pokémon's Special Attack rises by one stage every time any Pokémon faints.,This Pokémon's Special Attack rises by one stage every time any Pokémon faints.
+221,9,"When this Pokémon takes regular damage from a contact move, the attacking Pokémon's Speed lowers by one stage.","When this Pokémon takes regular damage from a contact move, the attacking Pokémon's Speed lowers by one stage."
+222,9,"When an ally faints, this Pokémon gains its Ability.","When an ally faints, this Pokémon gains its Ability."
+223,9,"When an ally faints, this Pokémon gains its Ability.","When an ally faints, this Pokémon gains its Ability."
+224,9,Raises this Pokémon's highest stat by one stage when it faints another Pokémon.,Raises this Pokémon's highest stat by one stage when it faints another Pokémon.
+225,9,Changes this Pokémon's type to match its held Memory.,"Changes this Pokémon's type to match its held Memory.
+
+This ability cannot be copied, replaced, or nullified.  This ability only takes effect for Silvally."
+226,9,"When this Pokémon enters battle, it changes the terrain to Electric Terrain.","When this Pokémon enters battle, it changes the terrain to []{move:electric-terrain}."
+227,9,"When this Pokémon enters battle, it changes the terrain to Psychic Terrain.","When this Pokémon enters battle, it changes the terrain to []{move:psychic-terrain}."
+228,9,"When this Pokémon enters battle, it changes the terrain to Misty Terrain.","When this Pokémon enters battle, it changes the terrain to []{move:misty-terrain}."
+229,9,"When this Pokémon enters battle, it changes the terrain to Grassy Terrain.","When this Pokémon enters battle, it changes the terrain to []{move:grassy-terrain}."
+230,9,Other Pokémon cannot lower this Pokémon's stats.,"This Pokémon's stats cannot be lowered by other Pokémon's moves or abilities.  This effect only applies to normal stat modifications and not more exotic effects such as []{move:topsy-turvy} or []{move:power-swap}.
+
+This Ability is not bypassed by []{ability:mold-breaker}, []{ability:teravolt}, or []{ability:turboblaze}."
+231,9,"When this Pokémon has full HP, regular damage from moves is halved.","When this Pokémon has full HP, regular damage (not fixed damage!) from moves is halved.
+
+This ability cannot be nullified."
+232,9,Reduces super-effective damage to 0.75×.,"Super-effective damage this Pokémon takes is reduced to 0.75×.
+
+This Ability is not bypassed by []{ability:mold-breaker}, []{ability:teravolt}, or []{ability:turboblaze}."

data/v2/csv/conquest_episode_names.csv

@@ -0,0 +1,39 @@
+episode_id,local_language_id,name
+1,9,The Legend of Ransei
+2,9,The Road to Conquest
+3,9,Happily Ever After
+4,9,The Burden of Peace
+5,9,The Way of the Warrior
+6,9,The Joy of Battle
+7,9,Pride and Precociousness
+8,9,Tragic Determination
+9,9,A Shroud of Darkness
+10,9,Not Worth Fighting Over... 1
+11,9,Teaching Them a Lesson
+12,9,The Reluctant Genius
+13,9,The Unparalleled Warrior
+14,9,A Ninja amongst Ninjas
+15,9,Archenemies
+16,9,Time for Battle!
+17,9,Land of Love and Righteousness
+18,9,Love is a Battlefield
+19,9,The Final Gamble
+20,9,Blowing in the Wind
+21,9,Ransei's Legendary Beauty
+22,9,All Grown Up
+23,9,The Rebel
+24,9,That Which He Holds Dear
+25,9,Not Worth Fighting Over... 2
+26,9,The Rose of Ransei
+27,9,The Visionary's Quest
+28,9,Grace and Beauty
+29,9,Pokémari and Me
+30,9,The Dragon's Dream
+31,9,Putting the Books Down
+32,9,A Date with Destiny
+33,9,This One Goes Out to My Fans
+34,9,Simply the Best
+35,9,Not Worth Fighting Over... 3
+36,9,A Fate Born of Beauty
+37,9,The Free Spirit's Path
+38,9,Two Heroes of Ransei

data/v2/csv/conquest_episode_warriors.csv

@@ -0,0 +1,41 @@
+episode_id,warrior_id
+1,1
+1,2
+2,3
+3,5
+4,19
+5,26
+6,14
+7,7
+8,9
+9,18
+10,36
+11,11
+12,20
+13,33
+14,24
+15,12
+16,25
+17,28
+18,29
+19,10
+20,22
+21,17
+22,23
+23,6
+24,16
+25,37
+26,4
+27,21
+28,34
+29,15
+30,13
+31,8
+32,31
+33,27
+34,30
+35,38
+36,32
+37,35
+38,1
+38,2

data/v2/csv/conquest_episodes.csv

@@ -0,0 +1,39 @@
+id,identifier
+1,the-legend-of-ransei
+2,the-road-to-conquest
+3,happily-ever-after
+4,the-burden-of-peace
+5,the-way-of-the-warrior
+6,the-joy-of-battle
+7,pride-and-precociousness
+8,tragic-determination
+9,a-shroud-of-darkness
+10,not-worth-fighting-over-1
+11,teaching-them-a-lesson
+12,the-reluctant-genius
+13,the-unparalleled-warrior
+14,a-ninja-amongst-ninjas
+15,archenemies
+16,time-for-battle
+17,land-of-love-and-righteousness
+18,love-is-a-battlefield
+19,the-final-gamble
+20,blowing-in-the-wind
+21,ranseis-legendary-beauty
+22,all-grown-up
+23,the-rebel
+24,that-which-he-holds-dear
+25,not-worth-fighting-over-2
+26,the-rose-of-ransei
+27,the-visionarys-quest
+28,grace-and-beauty
+29,pokemari-and-me
+30,the-dragons-dream
+31,putting-the-books-down
+32,a-date-with-destiny
+33,this-one-goes-out-to-my-fans
+34,simply-the-best
+35,not-worth-fighting-over-3
+36,a-fate-born-of-beauty
+37,the-free-spirits-path
+38,two-heroes-of-ransei

data/v2/csv/conquest_kingdom_names.csv

@@ -0,0 +1,18 @@
+kingdom_id,local_language_id,name
+1,9,Aurora
+2,9,Ignis
+3,9,Fontaine
+4,9,Violight
+5,9,Greenleaf
+6,9,Nixtorm
+7,9,Pugilis
+8,9,Viperia
+9,9,Terrera
+10,9,Avia
+11,9,Illusio
+12,9,Chrysalia
+13,9,Cragspur
+14,9,Spectra
+15,9,Dragnor
+16,9,Yaksha
+17,9,Valora

data/v2/csv/conquest_kingdoms.csv

@@ -0,0 +1,18 @@
+id,identifier,type_id
+1,aurora,1
+2,ignis,10
+3,fontaine,11
+4,violight,13
+5,greenleaf,12
+6,nixtorm,15
+7,pugilis,2
+8,viperia,4
+9,terrera,5
+10,avia,3
+11,illusio,14
+12,chrysalia,7
+13,cragspur,6
+14,spectra,8
+15,dragnor,16
+16,yaksha,17
+17,valora,9

data/v2/csv/conquest_move_data.csv

@@ -0,0 +1,124 @@
+move_id,power,accuracy,effect_chance,effect_id,range_id,displacement_id
+1,26,100,,60,2,
+2,31,100,,9,2,
+3,10,90,,14,2,
+17,31,100,,60,2,
+22,24,100,,60,7,
+29,39,100,30,44,2,
+33,31,100,,60,2,
+34,45,100,30,37,11,1
+40,12,100,30,39,3,
+41,26,100,20,68,3,
+44,36,100,30,44,2,
+52,26,100,10,41,11,
+53,45,100,10,41,4,
+55,24,100,,60,3,
+56,51,80,,60,4,
+58,45,100,10,42,4,
+59,51,70,10,42,16,
+60,35,100,10,43,4,
+61,38,100,10,33,17,
+67,31,90,,60,2,
+71,20,100,,21,2,
+72,26,100,,21,2,
+75,31,95,,9,4,
+80,41,100,,64,5,
+82,40,75,,1,3,
+83,12,85,,15,14,
+84,24,100,10,37,3,
+85,45,100,10,37,15,
+87,51,70,30,37,12,
+91,41,100,,16,11,
+93,29,100,10,43,12,
+94,44,100,10,30,13,
+95,,60,100,38,3,
+98,31,100,,60,2,
+100,,,,22,1,
+122,14,100,30,37,2,
+126,51,85,10,41,19,
+136,65,90,,26,11,1
+138,48,100,,67,2,
+145,20,100,10,33,3,
+150,,,,69,1,
+154,10,90,,14,2,
+157,41,90,30,44,4,
+158,43,90,10,44,2,
+163,41,100,,9,2,
+172,32,100,10,62,11,1
+181,24,100,10,42,3,
+185,36,,,52,2,
+188,44,100,30,39,18,
+189,17,100,100,36,3,
+196,34,95,100,58,7,
+200,41,100,,64,5,
+209,39,100,30,37,2,
+210,12,95,,3,7,
+231,45,75,30,30,7,4
+232,31,95,10,28,2,
+238,45,80,,9,10,
+242,43,100,20,30,2,
+247,43,100,20,30,11,
+248,45,100,,18,16,
+276,55,100,100,59,2,4
+301,18,90,,3,11,1
+304,44,100,,60,6,
+305,31,100,30,40,2,
+309,48,85,20,28,2,4
+310,20,100,30,44,2,4
+317,31,80,100,58,11,
+337,43,100,,60,2,
+342,29,100,10,66,7,
+344,58,100,10,63,15,1
+348,45,100,,9,2,
+350,10,90,,14,11,
+352,36,100,20,43,3,
+358,36,100,,65,2,
+360,18,100,,6,11,1
+362,35,100,,48,3,
+372,31,100,,7,2,
+395,31,100,30,37,2,4
+396,45,,,52,11,4
+398,43,100,30,39,2,
+400,38,100,,9,7,
+401,44,90,,60,7,4
+404,41,100,,60,10,
+406,44,100,,60,4,
+407,45,75,20,44,13,2
+413,58,100,,25,8,1
+414,44,100,10,30,9,
+418,26,100,,60,2,
+424,39,95,10,61,2,
+425,26,100,,60,2,
+426,39,85,30,36,11,
+427,38,100,,9,3,
+430,41,100,10,30,9,
+435,41,100,30,37,6,
+437,52,90,100,29,6,
+439,58,90,,23,12,
+440,38,100,10,66,10,
+442,43,100,30,44,2,4
+444,45,80,,9,9,
+449,55,100,,60,6,
+450,36,100,,51,2,
+459,58,90,,23,21,
+473,43,100,,60,11,
+474,35,100,,49,15,
+481,38,100,,60,18,
+486,26,100,,5,11,
+492,47,100,,8,2,
+506,31,100,,2,2,
+507,36,100,,17,2,
+510,28,100,,47,4,
+521,41,100,,19,11,3
+523,33,100,100,58,5,
+525,33,90,,20,7,5
+529,41,95,,9,11,1
+533,45,100,,4,2,
+535,43,100,,60,11,1
+539,42,95,40,36,5,
+540,45,100,,60,20,
+541,23,85,,14,7,
+550,57,85,20,37,2,4
+551,55,85,20,41,9,
+552,41,100,50,28,13,2
+556,45,90,30,44,11,

data/v2/csv/conquest_move_displacement_prose.csv

@@ -0,0 +1,6 @@
+move_displacement_id,local_language_id,name,short_effect,effect
+1,9,Advance one tile,User advances one tile.,"The user moves to the tile directly in front of it.  If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
+2,9,Advance two tiles,User jumps ahead two tiles.,"The user jumps ahead two tiles without crossing the tile in-between.  If the user cannot move to that tile or another Pokémon is already occupying that tile, the move cannot be used."
+3,9,Switch back,"User retreats one tile, switching places with any Pokémon already there.","The user moves to the tile behind it, if it can move to that tile.  If another Pokémon is already occupying that tile, the user switches places with it."
+4,9,Knockback,Deals knockback.,"$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to and if no other Pokémon is already occupying that tile."
+5,9,Knockback & switch,"Deals knockback, switching $target with the Pokémon behind it if applicable.","$Target is knocked one tile backward in the direction the user is facing, if that tile is one it can move to.  If another Pokémon is already occupying that tile, the Pokémon switch places."

data/v2/csv/conquest_move_displacements.csv

@@ -0,0 +1,6 @@
+id,identifier,affects_target
+1,advance-1,0
+2,advance-2,0
+3,switch-back,0
+4,knockback,1
+5,knockback-switch,1

data/v2/csv/conquest_move_effect_prose.csv

@@ -0,0 +1,56 @@
+conquest_move_effect_id,local_language_id,short_effect,effect
+1,9,Inflicts exactly 40 HP in damage.,"Inflicts exactly 40 HP in damage, unaffected by stats or types."
+2,9,Has double power if $target has a major status ailment.,Inflicts regular damage.  Has double power if $target has a major status ailment.
+3,9,Doubles in power with each consecutive successful use.,"Inflicts regular damage.  Every time this move succeeds, its power doubles; if it fails or is not used for a turn, it resets."
+4,9,Ignores $target's stat modifiers.,"Inflicts damage, ignoring $target's stat modifiers."
+5,9,Power rises the faster the user is compared to $target.,"Inflicts regular damage.  The greater the user's Speed compared to $target's, the more power this move has."
+6,9,Power rises the slower the user is compared to $target.,"Inflicts regular damage.  The lower the user's Speed compared to $target's, the more power this move has."
+7,9,Has double power if $target has already taken damage this turn.,Inflicts regular damage.  Has double power if $target has already taken damage this turn.
+8,9,Inflicts damage based on $target's Attack stat instead of the user's.,Inflicts regular damage.  Damage is calculated using $target's Attack stat rather than the user's.
+9,9,Has an increased chance for a critical hit.,Inflicts regular damage.  This move's critical hit rate is higher than usual.
+14,9,Hits 2 to 5 times in one turn.,"Inflicts regular damage.  Hits two to five times in one turn, with damage calculated separately each time."
+15,9,Hits 4 to 5 times in one turn.,"Inflicts regular damage.  Hits four to five times in one turn, with damage calculated separately each time."
+16,9,Digs underground and hits at the beginning of the next turn.,"Inflicts regular damage.  The user digs underground, dodging all moves until it attacks.  At the beginning of the next turn, the user hits $target, even if $target has moved, and cannot move again that turn."
+17,9,Lifts $target into the sky and hits at the beginning of the next turn.,"Inflicts regular damage.  The user carries $target into the sky.  No moves can hit either Pokémon in this state.  At the beginning of the next turn, the user slams $target to the ground, inflicting regular damage.  The user cannot move again that turn."
+18,9,Hits $target at the beginning of the turn after next.,"Inflicts regular damage.  Hits $target at the beginning of the user's turn two turns after this one, even if the target has moved.
+
+In the turn in-between, the user can use this move again, but it will miss any target that already has a Future Sight pending."
+19,9,"User moves back one tile, switching places with any Pokémon already there.",Inflicts regular damage.
+20,9,Switches $target with the Pokémon behind it.,Inflicts regular damage.
+21,9,Heals the user by half the damage dealt.,Inflicts regular damage.  The user heals for half as many HP as it dealt in damage.
+22,9,Teleports randomly.,The user teleports randomly to another tile.
+23,9,Cannot be used the turn after hitting.,"Inflicts regular damage.  If the move succeeds, it cannot be used again on the next turn."
+25,9,Lowers the user's range and Defense until its next turn.,Inflicts regular damage.  The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.
+26,9,Damages the user if it misses.,"Inflicts regular damage.  If this move misses, the user takes some damage."
+28,9,Has a $effect_chance% chance to raise the user's Attack.,Inflicts regular damage.  Has a $effect_chance% chance to raise the user's Attack afterward.
+29,9,Lowers the user's Attack.,Inflicts regular damage.  Lowers the user's Attack afterward.
+30,9,Has a $effect_chance% chance to lower $target's Defense.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's Defense afterward.
+33,9,Has a $effect_chance% chance to lower $target's Speed.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's Speed afterward.
+36,9,Has a $effect_chance% chance to lower $target's accuracy.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's accuracy.
+37,9,Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage.  Has a $effect_chance% chance to paralyze $target.
+38,9,Puts $target to sleep.,Puts $target to sleep.
+39,9,Has a $effect_chance% chance to poison $target.,Inflicts regular damage.  Has a $effect_chance% chance to poison $target.
+40,9,Has a $effect_chance% chance to badly poison $target.,Inflicts regular damage.  Has a $effect_chance% chance to badly poison $target.
+41,9,Has a $effect_chance% chance to burn $target.,Inflicts regular damage.  Has a $effect_chance% chance to burn $target.
+42,9,Has a $effect_chance% chance to freeze $target.,Inflicts regular damage.  Has a $effect_chance% chance to freeze $target.
+43,9,Has a $effect_chance% chance to confuse $target.,Inflicts regular damage.  Has a $effect_chance% chance to confuse $target.
+44,9,Has a $effect_chance% chance to make $target flinch.,Inflicts regular damage.  Has a $effect_chance% chance to make $target flinch.
+47,9,Permanently destroys $target's item if it is consumable.,Inflicts regular damage.  Permanently destroys $target's item if the item can be consumed in battle.
+48,9,Has double power against Pokémon with less than half their max HP remaining.,"Inflicts regular damage.  Has double power when calculating damage against a target with less than half its max HP remaining, on a target-by-target basis."
+49,9,Has double power against poisoned Pokémon.,"Inflicts regular damage.  Has double power when calculating damage against a poisoned target, on a target-by-target basis."
+51,9,Uses $target's item if it is consumable.,"Inflicts regular damage.  The user steals $target's item, if the item can be consumed in battle, and uses it on itself, or destroys it if it would have no effect."
+52,9,Never misses.,"Inflicts regular damage.  Always has 100% accuracy.
+
+This move still misses Pokémon under the effects of []{move:dig} or []{move:sky-drop} and can still be dodged by abilities such as []{ability:instinct}."
+58,9,Has a $effect_chance% chance to lower $target's range by one tile.,Inflicts regular damage.  Has a $effect_chance% chance to lower $target's range by one tile.
+59,9,Lowers the user's Attack and Defense.,Inflicts regular damage.  Lowers the user's Attack and Defense afterward.
+60,9,Inflicts regular damage with no additional effect.,Inflicts regular damage.
+61,9,Has a $effect_chance% chance each to burn $target or make it flinch.,"Inflicts regular damage.  Has a $effect_chance% chance to burn $target, and a $effect_chance% chance, separately rolled, to make $target flinch."
+62,9,Has a $effect_chance% chance to burn $target.  Thaws the user out if frozen.,"Inflicts regular damage.  Has a $effect_chance% chance to burn $target.  Can be used if the user is frozen, in which case it thaws out."
+63,9,Lowers the user's range and Defense until its next turn.  Has a $effect_chance% chance to paralyze $target.,Inflicts regular damage.  The user's Defense is lowered and its range is lowered to one tile until the beginning of its next turn.  Has a $effect_chance% chance to paralyze $target.
+64,9,Hits 2 to 3 times in one turn.  User has 0 range on its next turn.,"Inflicts regular damage.  Hits two to three times in one turn, with damage calculated separately for each hit.  The user's range is lowered to 0 on its next turn."
+65,9,Has double power and wakes $target up if it is asleep.,"Inflicts regular damage.  If $target is asleep, this move has double power and wakes $target up."
+66,9,Has a $effect_chance% chance to poison $target and an increased chance for a critical hit.,Inflicts damage.  Has a $effect_chance% chance to poison $target.  This move's critical hit rate is higher than usual.
+67,9,Heals the user by half the damage inflicted.  Only works if $target is asleep.,"Inflicts damage if $target is asleep, and fails otherwise.  Heals the user for half as many HP as it dealt in damage."
+68,9,Hits twice in one turn.  Has a $effect_chance% chance to poison $target with each hit.,Inflicts regular damage.  Hits twice in one turn.  Has a $effect_chance% chance to poison $target with each hit.
+69,9,Does nothing.,Does nothing.

data/v2/csv/conquest_move_effects.csv

@@ -0,0 +1,52 @@
+id
+1
+2
+3
+4
+5
+6
+7
+8
+9
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+25
+26
+28
+29
+30
+33
+36
+37
+38
+39
+40
+41
+42
+43
+44
+47
+48
+49
+51
+52
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69

data/v2/csv/conquest_move_range_prose.csv

@@ -0,0 +1,22 @@
+conquest_move_range_id,local_language_id,name,description
+1,9,User,The user.
+2,9,Single tile,A single tile directly in front of the user.
+3,9,Two-tile column,Two tiles in a column in front of the user.
+4,9,Three-tile column,Three tiles in a column in front of the user.
+5,9,Adjacent diamond,The four tiles adjacent to the user.
+6,9,Adjacent ring,Eight tiles in a ring around the user.
+7,9,Row,Three tiles in a line centered directly in front of the user.
+8,9,Chevron,"Three tiles in the shape of a chevron (^), with the apex two tiles in front of the user."
+9,9,Plus,Five tiles in a plus shape centered two tiles in front of the user.
+10,9,X-shape,Five tiles in an X shape centered directly in front of the user.
+11,9,Two ahead,A single tile two tiles in front of the user.
+12,9,Three ahead,A single tile three tiles in front of the user.
+13,9,Diamond two ahead,Four tiles in a diamond centered two tiles in front of the user.
+14,9,Ring in front,Eight tiles in a ring centered two tiles in front of the user.
+15,9,Row two ahead,Three tiles in a line centered two tiles in front of the user.
+16,9,Two rows two ahead,"Six tiles in two rows of three, one centered two tiles in front of the user and the other three tiles."
+17,9,Column two ahead,A column of two tiles starting two tiles in front of the user.
+18,9,X-shape two ahead,Five tiles in an X shape centered two tiles in front of the user.
+19,9,Dai,"Seven tiles in the shape of the kanji 大 (dai), consisting of five squares in a plus shape in front of the user and one square on either side of the user."
+20,9,T-shape,"Four tiles in the shape of a T, consisting of the tile directly in front of the user and a row of three tiles centered two tiles in front of the user."
+21,9,Two rows,"Six tiles in two rows of three, one centered directly in front of the user and the other two tiles in front of the user."

data/v2/csv/conquest_move_ranges.csv

@@ -0,0 +1,22 @@
+id,identifier,targets
+1,user,1
+2,tile-1-ahead,1
+3,column-2-tiles,2
+4,column-3-tiles,3
+5,diamond-adjacent,4
+6,ring-adjacent,8
+7,row,3
+8,chevron,3
+9,plus,5
+10,x-shape,5
+11,tile-2-ahead,1
+12,tile-3-ahead,1
+13,diamond-2-ahead,4
+14,ring-2-ahead,8
+15,row-2-ahead,3
+16,2-rows-2-ahead,6
+17,column-2-ahead,2
+18,x-shape-2-ahead,5
+19,dai,7
+20,t-shape,4
+21,2-rows,6

data/v2/csv/conquest_pokemon_abilities.csv

@@ -0,0 +1,561 @@
+pokemon_species_id,slot,ability_id
+4,1,66
+4,2,10016
+4,3,10028
+5,1,66
+5,2,10016
+5,3,10028
+6,1,66
+6,2,10028
+6,3,10029
+15,1,10031
+15,2,10001
+15,3,68
+23,1,22
+23,2,61
+23,3,10039
+24,1,22
+24,2,61
+24,3,10039
+25,1,9
+25,2,10035
+25,3,31
+26,1,9
+26,2,10007
+26,3,31
+39,1,10036
+39,2,10041
+39,3,10042
+40,1,10036
+40,2,10041
+40,3,10042
+41,1,10025
+41,2,39
+41,3,10026
+42,1,10040
+42,2,39
+42,3,10026
+52,1,10001
+52,2,10043
+52,3,10044
+53,1,10001
+53,2,7
+53,3,10052
+63,1,10007
+63,2,10022
+63,3,10047
+64,1,10007
+64,2,10022
+64,3,10005
+65,1,10007
+65,2,10022
+65,3,39
+66,1,62
+66,2,10004
+66,3,10027
+67,1,62
+67,2,10004
+67,3,10027
+68,1,62
+68,2,10057
+68,3,10027
+92,1,26
+93,1,26
+94,1,26
+95,1,5
+95,2,10009
+95,3,10039
+111,1,31
+111,2,10027
+111,3,10009
+112,1,31
+112,2,10027
+112,3,10009
+123,1,68
+123,2,10006
+123,3,10031
+129,1,10017
+129,2,10041
+129,3,10059
+130,1,22
+130,2,10039
+130,3,10011
+131,1,75
+131,2,10002
+131,3,11
+133,1,10050
+133,2,10005
+133,3,10035
+134,1,10002
+134,2,10055
+134,3,11
+135,1,10050
+135,2,10031
+135,3,10
+136,1,10015
+136,2,10054
+136,3,18
+143,1,10013
+143,2,17
+143,3,47
+144,1,10010
+147,1,61
+147,2,10007
+147,3,10041
+148,1,61
+148,2,10007
+148,3,10001
+149,1,39
+149,2,10042
+149,3,10029
+150,1,10022
+169,1,10049
+169,2,39
+169,3,10026
+172,1,9
+172,2,10041
+172,3,10033
+174,1,10036
+174,2,10041
+174,3,10042
+179,1,9
+179,2,10040
+179,3,10037
+180,1,9
+180,2,10040
+180,3,10037
+181,1,9
+181,2,10040
+181,3,10042
+194,1,10017
+194,2,10013
+194,3,11
+195,1,10058
+195,2,10013
+195,3,11
+196,1,10001
+196,2,10007
+196,3,10047
+197,1,10058
+197,2,10025
+197,3,10008
+200,1,26
+204,1,5
+204,2,10009
+204,3,10045
+205,1,5
+205,2,10009
+205,3,10045
+208,1,5
+208,2,10009
+208,3,10039
+212,1,68
+212,2,10006
+212,3,10012
+215,1,39
+215,2,10052
+215,3,10025
+246,1,10019
+246,2,62
+246,3,10030
+247,1,61
+247,2,10009
+247,3,10060
+248,1,10039
+248,2,10011
+248,3,10029
+252,1,65
+252,2,10001
+252,3,10007
+253,1,65
+253,2,10001
+253,3,10006
+254,1,65
+254,2,10001
+254,3,10050
+280,1,10007
+280,2,10005
+280,3,10047
+281,1,10007
+281,2,10005
+281,3,10047
+282,1,10007
+282,2,10005
+282,3,10042
+304,1,5
+304,2,10027
+304,3,10056
+305,1,5
+305,2,10027
+305,3,10056
+306,1,5
+306,2,10027
+306,3,10056
+347,1,4
+347,2,10009
+347,3,10007
+348,1,4
+348,2,10009
+348,3,10006
+355,1,26
+356,1,10039
+356,2,10040
+356,3,10048
+358,1,26
+361,1,39
+361,2,10003
+361,3,10030
+362,1,39
+362,2,10039
+362,3,10010
+363,1,10013
+363,2,10003
+363,3,47
+364,1,10013
+364,2,10003
+364,3,47
+365,1,10011
+365,2,10003
+365,3,47
+374,1,29
+374,2,10027
+374,3,10056
+375,1,29
+375,2,10027
+375,3,10060
+376,1,29
+376,2,10027
+376,3,10004
+379,1,29
+383,1,10020
+384,1,10032
+390,1,66
+390,2,10001
+390,3,10015
+391,1,66
+391,2,10053
+391,3,10015
+392,1,66
+392,2,10053
+392,3,10057
+393,1,67
+393,2,10002
+393,3,10012
+394,1,67
+394,2,10002
+394,3,10012
+395,1,67
+395,2,10002
+395,3,10012
+396,1,51
+396,2,10028
+396,3,10035
+397,1,22
+397,2,10028
+397,3,10035
+398,1,22
+398,2,10028
+398,3,10031
+399,1,86
+399,2,10013
+399,3,109
+400,1,86
+400,2,10013
+400,3,109
+403,1,22
+403,2,10033
+403,3,10035
+404,1,22
+404,2,10033
+404,3,10056
+405,1,22
+405,2,10033
+405,3,10050
+410,1,10060
+410,2,10029
+410,3,5
+411,1,10060
+411,2,10029
+411,3,5
+425,1,10008
+425,2,10045
+425,3,10059
+426,1,10008
+426,2,10045
+426,3,10059
+429,1,26
+433,1,26
+442,1,10040
+442,2,10039
+442,3,10048
+443,1,10019
+443,2,10007
+443,3,10025
+444,1,10019
+444,2,10006
+444,3,10035
+445,1,10030
+445,2,10006
+445,3,10011
+446,1,10023
+446,2,10014
+446,3,47
+447,1,39
+447,2,10006
+447,3,10050
+448,1,39
+448,2,10006
+448,3,10050
+451,1,4
+451,2,97
+451,3,10058
+452,1,4
+452,2,97
+452,3,10031
+453,1,10008
+453,2,10025
+453,3,10051
+454,1,10008
+454,2,10025
+454,3,10028
+455,1,26
+461,1,10008
+461,2,10052
+461,3,10049
+464,1,31
+464,2,10027
+464,3,116
+470,1,10056
+470,2,10007
+470,3,10022
+471,1,10003
+471,2,10030
+471,3,10010
+475,1,10006
+475,2,10057
+475,3,154
+477,1,10039
+477,2,10040
+477,3,10048
+478,1,10001
+478,2,10008
+478,3,10010
+483,1,10011
+493,1,10046
+495,1,65
+495,2,10034
+495,3,10007
+496,1,65
+496,2,10034
+496,3,10007
+497,1,65
+497,2,10034
+497,3,10024
+498,1,66
+498,2,10015
+498,3,10035
+499,1,66
+499,2,10015
+499,3,10035
+500,1,66
+500,2,10015
+500,3,10054
+501,1,67
+501,2,10002
+501,3,10006
+502,1,67
+502,2,10002
+502,3,10006
+503,1,67
+503,2,10002
+503,3,10057
+511,1,10025
+511,2,10024
+511,3,10035
+512,1,10025
+512,2,10028
+512,3,10007
+513,1,10025
+513,2,10001
+513,3,10035
+514,1,10025
+514,2,10007
+514,3,10054
+515,1,10025
+515,2,10001
+515,3,10008
+516,1,10025
+516,2,10007
+516,3,10055
+517,1,10013
+517,2,10005
+517,3,10007
+518,1,10037
+518,2,10037
+518,3,10038
+522,1,31
+522,2,78
+522,3,10056
+523,1,31
+523,2,78
+523,3,10050
+524,1,5
+524,2,10027
+524,3,10045
+525,1,5
+525,2,10027
+525,3,10045
+526,1,5
+526,2,10027
+526,3,10045
+529,1,10019
+529,2,10030
+529,3,10006
+530,1,10019
+530,2,10030
+530,3,10056
+531,1,10022
+531,2,131
+531,3,10021
+532,1,10004
+532,2,62
+532,3,10015
+533,1,10004
+533,2,62
+533,3,10015
+534,1,10004
+534,2,62
+534,3,10015
+540,1,10034
+540,2,10030
+540,3,10018
+541,1,10034
+541,2,10030
+541,3,10058
+542,1,10024
+542,2,68
+542,3,10042
+543,1,38
+543,2,10009
+543,3,10018
+544,1,38
+544,2,10009
+544,3,10028
+545,1,38
+545,2,10009
+545,3,10031
+546,1,10025
+546,2,10001
+546,3,10008
+547,1,10025
+547,2,10001
+547,3,10008
+548,1,20
+548,2,10024
+548,3,10022
+549,1,20
+549,2,10024
+549,3,10022
+551,1,22
+551,2,153
+551,3,10035
+552,1,22
+552,2,153
+552,3,10051
+553,1,22
+553,2,153
+553,3,10051
+554,1,10056
+554,2,10015
+554,3,10035
+555,1,10028
+555,2,10015
+555,3,10057
+559,1,61
+559,2,153
+559,3,10051
+560,1,61
+560,2,153
+560,3,10015
+570,1,149
+570,2,10025
+570,3,10051
+571,1,149
+571,2,10012
+571,3,10049
+572,1,10041
+572,2,10005
+572,3,10042
+573,1,10008
+573,2,10005
+573,3,10042
+574,1,10007
+574,2,10005
+574,3,10008
+575,1,10007
+575,2,10005
+575,3,10037
+576,1,10007
+576,2,10005
+576,3,10037
+587,1,9
+587,2,10007
+587,3,10035
+595,1,14
+595,2,10033
+595,3,10026
+596,1,14
+596,2,10033
+596,3,10026
+607,1,49
+607,2,18
+607,3,10016
+608,1,49
+608,2,18
+608,3,10016
+609,1,49
+609,2,18
+609,3,10016
+610,1,104
+610,2,10007
+610,3,10039
+611,1,104
+611,2,10006
+611,3,10039
+612,1,104
+612,2,10012
+612,3,10011
+613,1,10030
+613,2,10003
+613,3,10041
+614,1,10030
+614,2,10011
+614,3,10039
+624,1,10006
+624,2,10058
+624,3,39
+625,1,10006
+625,2,10058
+625,3,39
+627,1,51
+627,2,10012
+627,3,10035
+628,1,51
+628,2,10012
+628,3,10028
+633,1,10028
+633,2,10012
+633,3,10025
+634,1,10028
+634,2,10012
+634,3,10035
+635,1,26
+636,1,49
+636,2,10056
+636,3,10026
+637,1,49
+637,2,10039
+637,3,10026
+639,1,154
+643,1,163
+644,1,164

data/v2/csv/conquest_pokemon_evolution.csv

@@ -0,0 +1,114 @@
+evolved_species_id,required_stat_id,minimum_stat,minimum_link,kingdom_id,warrior_gender_id,item_id,recruiting_ko_required
+5,2,50,,,,,0
+6,2,83,,,,,0
+24,2,59,,,,,0
+25,,,50,,,,0
+26,,,,,,83,0
+39,,,50,,,,0
+40,,,,,,81,0
+42,4,55,,,,,0
+53,4,96,,,,,0
+64,2,83,,,,,0
+65,,,55,,,,1
+67,2,86,,,,,0
+68,,,60,,,,1
+93,2,99,,,,,0
+94,,,60,,,,1
+112,2,108,,,,,0
+130,2,16,,,,,0
+134,,,,,,84,0
+135,,,,,,83,0
+136,,,,,,82,0
+143,,,50,,,,0
+148,2,60,,,,,0
+149,2,132,,,,,0
+169,,,65,,,,0
+180,2,53,,,,,0
+181,2,90,,,,,0
+195,1,94,,,,,0
+196,,,70,11,,,0
+197,,,70,16,,,0
+205,3,73,,,,,0
+208,,,,,,210,1
+212,,,,,,210,1
+247,2,74,,,,,0
+248,2,132,,,,,0
+253,4,58,,,,,0
+254,4,118,,,,,0
+281,2,44,,,,,0
+282,2,75,,,,,0
+305,3,83,,,,,0
+306,3,130,,,,,0
+348,2,116,,,,,0
+356,3,104,,,,,0
+358,,,50,,,,0
+362,1,128,,,,,0
+364,1,138,,,,,0
+365,1,195,,,,,0
+375,3,64,,,,,0
+376,2,111,,,,,0
+391,4,48,,,,,0
+392,4,102,,,,,0
+394,2,51,,,,,0
+395,2,102,,,,,0
+397,4,48,,,,,0
+398,2,92,,,,,0
+400,2,39,,,,,0
+404,2,35,,,,,0
+405,2,95,,,,,0
+411,3,113,,,,,0
+426,1,146,,,,,0
+429,,,,,,108,0
+444,2,44,,,,,0
+445,2,136,,,,,0
+448,,,50,,,,0
+452,3,90,,,,,0
+454,2,81,,,,,0
+461,4,175,,,,303,0
+464,,,,,,298,1
+470,3,94,,5,,,0
+471,2,91,,6,,,0
+475,,,,,2,109,0
+477,,,,,,302,1
+478,,,,,1,109,0
+496,4,54,,,,,0
+497,4,104,,,,,0
+499,2,41,,,,,0
+500,2,115,,,,,0
+502,2,54,,,,,0
+503,2,104,,,,,0
+512,,,,,,85,0
+514,,,,,,82,0
+516,,,,,,84,0
+518,,,,,,81,0
+523,4,81,,,,,0
+525,3,59,,,,,0
+526,,,60,,,,1
+530,2,97,,,,,0
+533,2,81,,,,,0
+534,,,60,,,,1
+541,3,60,,,,,0
+542,,,65,,,,0
+544,3,50,,,,,0
+545,4,57,,,,,0
+547,,,,,,80,0
+549,,,,,,80,0
+552,2,80,,,,,0
+553,2,110,,,,,0
+555,2,110,,,,,0
+560,3,86,,,,,0
+571,2,90,,,,,0
+573,,,,,,107,0
+575,3,70,,,,,0
+576,3,106,,,,,0
+596,4,84,,,,,0
+608,2,84,,,,,0
+609,,,,,,108,0
+611,2,113,,,,,0
+612,2,173,,,,,0
+614,2,73,,,,,0
+625,2,118,,,,,0
+628,2,119,,,,,0
+634,2,72,,,,,0
+635,2,143,,,,,0
+637,2,131,,,,,0

data/v2/csv/conquest_pokemon_moves.csv

@@ -0,0 +1,201 @@
+pokemon_species_id,move_id
+4,52
+5,424
+6,53
+15,41
+23,40
+24,474
+25,85
+26,344
+39,3
+40,304
+41,17
+42,305
+52,154
+53,163
+63,100
+64,60
+65,94
+66,2
+67,358
+68,238
+92,122
+93,506
+94,247
+95,317
+111,523
+112,529
+123,210
+129,150
+130,401
+131,58
+133,98
+134,56
+135,85
+136,424
+143,34
+144,59
+147,82
+148,525
+149,407
+150,540
+169,440
+172,84
+174,1
+179,84
+180,435
+181,87
+194,55
+195,426
+196,60
+197,372
+200,310
+204,450
+205,360
+208,231
+212,404
+215,185
+246,317
+247,157
+248,444
+252,71
+253,348
+254,437
+280,93
+281,473
+282,94
+304,232
+305,442
+306,231
+347,210
+348,404
+355,310
+356,425
+358,473
+361,181
+362,58
+363,181
+364,301
+365,59
+374,442
+375,418
+376,309
+379,430
+383,414
+384,406
+390,52
+391,172
+392,83
+393,145
+394,61
+395,56
+396,98
+397,17
+398,413
+399,29
+400,158
+403,209
+404,435
+405,87
+410,442
+411,157
+425,310
+426,247
+429,247
+433,93
+442,425
+443,82
+444,337
+445,407
+446,33
+447,395
+448,396
+451,398
+452,440
+453,398
+454,188
+455,22
+461,400
+464,439
+470,348
+471,196
+475,427
+477,247
+478,196
+483,459
+493,449
+495,22
+496,348
+497,437
+498,52
+499,535
+500,126
+501,55
+502,352
+503,401
+511,22
+512,437
+513,481
+514,510
+515,55
+516,362
+517,95
+518,138
+522,209
+523,435
+524,350
+525,157
+526,444
+529,91
+530,529
+531,1
+532,67
+533,358
+534,276
+540,450
+541,75
+542,404
+543,40
+544,342
+545,474
+546,71
+547,75
+548,72
+549,80
+551,189
+552,44
+553,242
+554,172
+555,126
+559,185
+560,136
+570,492
+571,539
+572,3
+573,541
+574,93
+575,60
+576,248
+587,521
+595,486
+596,435
+607,52
+608,481
+609,83
+610,82
+611,337
+612,200
+613,181
+614,556
+624,372
+625,400
+627,17
+628,507
+633,82
+634,242
+635,406
+636,172
+637,552
+639,533
+643,551
+644,550

data/v2/csv/conquest_stat_names.csv

@@ -0,0 +1,7 @@
+conquest_stat_id,local_language_id,name
+1,9,HP
+2,9,Attack
+3,9,Defense
+4,9,Speed
+5,9,Range
+6,9,Energy

data/v2/csv/conquest_stats.csv

@@ -0,0 +1,7 @@
+id,identifier,is_base
+1,hp,1
+2,attack,1
+3,defense,1
+4,speed,1
+5,range,0
+6,energy,0

data/v2/csv/conquest_transformation_pokemon.csv

@@ -0,0 +1,90 @@
+transformation_id,pokemon_species_id
+3,133
+3,134
+3,135
+3,136
+3,196
+3,197
+3,470
+3,471
+6,133
+6,134
+6,135
+6,136
+6,196
+6,197
+6,470
+6,471
+8,635
+8,644
+10,39
+10,40
+12,391
+12,392
+13,643
+15,502
+15,503
+17,404
+17,405
+19,496
+19,497
+21,131
+21,144
+23,533
+23,534
+25,42
+25,169
+27,383
+27,464
+29,627
+29,628
+31,150
+31,475
+33,204
+33,205
+35,525
+35,526
+37,200
+37,429
+39,570
+39,571
+41,306
+41,379
+43,25
+43,26
+45,608
+45,609
+47,397
+47,398
+49,575
+49,576
+51,93
+51,94
+53,215
+53,461
+55,5
+55,6
+57,253
+57,254
+59,64
+59,65
+61,361
+61,478
+63,554
+63,555
+65,636
+65,637
+67,447
+67,448
+69,376
+69,483
+71,394
+71,395
+73,411
+73,639
+75,624
+75,625
+77,611
+77,612
+79,552
+79,553

data/v2/csv/conquest_transformation_warriors.csv

@@ -0,0 +1,8 @@
+transformation_id,present_warrior_id
+43,21
+45,20
+55,12
+59,14
+67,3
+69,19
+69,34

data/v2/csv/conquest_warrior_archetypes.csv

@@ -0,0 +1,31 @@
+id,identifier
+1,armor-veteran
+2,armor-officer
+3,armor-helmet
+4,armor-headlight
+5,armor-sweatband
+6,armor-smarmy
+7,armor-buff
+8,armor-visor
+9,angular
+10,portly
+11,clever
+12,nervous
+13,professor
+14,woman-warrior
+15,princess
+16,messenger
+17,sailor
+18,adventurer
+19,alchemist
+20,merchant-m
+21,merchant-f
+22,monk
+23,ninja-armor
+24,ninja-visor
+25,ninja-scroll
+26,ninja-eyeliner
+27,ninja-ceiling
+28,farmer-m
+29,farmer-f
+30,nobleman

data/v2/csv/conquest_warrior_names.csv

@@ -0,0 +1,202 @@
+warrior_id,local_language_id,name
+1,9,Player ♂
+2,9,Player ♀
+3,9,Nobunaga
+4,9,Oichi
+5,9,Hideyoshi
+6,9,Motochika
+7,9,Ginchiyo
+8,9,Motonari
+9,9,Mitsuhide
+10,9,Yoshihiro
+11,9,Nene
+12,9,Shingen
+13,9,Masamune
+14,9,Kenshin
+15,9,Yoshimoto
+16,9,Ujiyasu
+17,9,Nō
+18,9,Kotarō
+19,9,Ieyasu
+20,9,Hanbei
+21,9,Kanbei
+22,9,Muneshige
+23,9,Gracia
+24,9,Hanzō
+25,9,Kunoichi
+26,9,Yukimura
+27,9,Magoichi
+28,9,Kanetsugu
+29,9,Aya
+30,9,Kai
+31,9,Okuni
+32,9,Ranmaru
+33,9,Tadakatsu
+34,9,Ina
+35,9,Keiji
+36,9,Mitsunari
+37,9,Kiyomasa
+38,9,Masanori
+39,9,Tsunehisa
+40,9,Naoie
+41,9,Harutaka
+42,9,Takanobu
+43,9,Naoshige
+44,9,Ujisato
+45,9,Chacha
+46,9,Gō
+47,9,Hatsu
+48,9,Kazumasu
+49,9,Nagahide
+50,9,Yoshitaka
+51,9,Urakusai
+52,9,Narimasa
+53,9,Tomonori
+54,9,Murashige
+55,9,Masahide
+56,9,Nagayoshi
+57,9,Kitsuno
+58,9,Gotoku
+59,9,Hidenaga
+60,9,Koroku
+61,9,Takatora
+62,9,Yoshitsugu
+63,9,Yukinaga
+64,9,Rikyū
+65,9,Hideyori
+66,9,Asahi
+67,9,Kazutoyo
+68,9,Nagayasu
+69,9,Harunaga
+70,9,Hideaki
+71,9,Naka
+72,9,Tatsuko
+73,9,Maa
+74,9,Chiyo
+75,9,Hatsume
+76,9,Nobuchika
+77,9,Chikayasu
+78,9,Morichika
+79,9,Chikamasa
+80,9,Norishige
+81,9,Takayori
+82,9,Tadasumi
+83,9,Dōsetsu
+84,9,Shōun
+85,9,Sōrin
+86,9,Sekisō
+87,9,Akizane
+88,9,Takatane
+89,9,Kiyo
+90,9,Motoharu
+91,9,Takakage
+92,9,Terumoto
+93,9,Takeyoshi
+94,9,Ekei
+95,9,Takamoto
+96,9,Sadatoshi
+97,9,Hidemitsu
+98,9,Toshimitsu
+99,9,Shigemoto
+100,9,Mitsutada
+101,9,Yukimasa
+102,9,Tadaoki
+103,9,Fujitaka
+104,9,Hiroko
+105,9,Tadamoto
+106,9,Tadatsune
+107,9,Takahisa
+108,9,Hisaaki
+109,9,Masatoshi
+110,9,Kanemori
+111,9,Tokitaka
+112,9,Sandayū
+113,9,Morikiyo
+114,9,Kashinkoji
+115,9,Yasunaga
+116,9,Seikurō
+117,9,Katsuyori
+118,9,Haruyuki
+119,9,Masakage
+120,9,Masatoyo
+121,9,Nobufusa
+122,9,Masayuki
+123,9,Yukitaka
+124,9,Ume
+125,9,Chiyome
+126,9,Kei
+127,9,Kagetsuna
+128,9,Shigezane
+129,9,Tsunamoto
+130,9,Tsunenaga
+131,9,Munetoki
+132,9,Munezane
+133,9,Yoshi
+134,9,Iroha
+135,9,Kagekatsu
+136,9,Yoshikiyo
+137,9,Tomonobu
+138,9,Kageie
+139,9,Takahiro
+140,9,Sadamitsu
+141,9,Yatarō
+142,9,Saneyori
+143,9,Hana
+144,9,Sen
+145,9,Ujichika
+146,9,Ujizane
+147,9,Sessai
+148,9,Masatsuna
+149,9,Yasutomo
+150,9,Ujihiro
+151,9,Motozane
+152,9,Sena
+153,9,Sōun
+154,9,Tsunashige
+155,9,Gen'an
+156,9,Ujimasa
+157,9,Ujiteru
+158,9,Ujikuni
+159,9,Ujinao
+160,9,Shizuka
+161,9,Madoka
+162,9,Dōsan
+163,9,Yoshitatsu
+164,9,Ittetsu
+165,9,Bokuzen
+166,9,Morinari
+167,9,Omi
+168,9,Asa
+169,9,Shimoyama
+170,9,Genba
+171,9,Danzō
+172,9,Yazaemon
+173,9,Isuke
+174,9,Tadatsugu
+175,9,Naomasa
+176,9,Yasumasa
+177,9,Masanobu
+178,9,Hidetada
+179,9,Kazumasa
+180,9,Chōan
+181,9,Tenkai
+182,9,Munenori
+183,9,Kame
+184,9,Toku
+185,9,Saizō
+186,9,Sasuke
+187,9,Katsu
+188,9,Jūzō
+189,9,Tsuru
+190,9,Ise
+191,9,Jinpachi
+192,9,Kamanosuke
+193,9,Seikai
+194,9,Isa
+195,9,Yoshiteru
+196,9,Yoshiaki
+197,9,Hisahide
+198,9,Jūbei
+199,9,Nobutsuna
+200,9,Bokuden
+201,9,Otsū

data/v2/csv/conquest_warrior_rank_stat_map.csv

@@ -0,0 +1,969 @@
+warrior_rank_id,warrior_stat_id,base_stat
+1,1,65
+1,2,60
+1,3,65
+1,4,4
+2,1,75
+2,2,70
+2,3,80
+2,4,6
+3,1,80
+3,2,85
+3,3,100
+3,4,8
+4,1,65
+4,2,60
+4,3,65
+4,4,4
+5,1,75
+5,2,70
+5,3,80
+5,4,6
+6,1,80
+6,2,85
+6,3,100
+6,4,8
+7,1,89
+7,2,94
+7,3,92
+7,4,5
+8,1,96
+8,2,100
+8,3,100
+8,4,8
+9,1,48
+9,2,73
+9,3,90
+9,4,4
+10,1,54
+10,2,83
+10,3,98
+10,4,5
+11,1,66
+11,2,65
+11,3,78
+11,4,6
+12,1,76
+12,2,88
+12,3,88
+12,4,7
+13,1,80
+13,2,98
+13,3,98
+13,4,8
+14,1,82
+14,2,81
+14,3,81
+14,4,6
+15,1,90
+15,2,92
+15,3,91
+15,4,7
+16,1,74
+16,2,68
+16,3,72
+16,4,5
+17,1,84
+17,2,78
+17,3,82
+17,4,6
+18,1,69
+18,2,90
+18,3,86
+18,4,7
+19,1,79
+19,2,100
+19,3,96
+19,4,8
+20,1,77
+20,2,82
+20,3,82
+20,4,5
+21,1,88
+21,2,92
+21,3,92
+21,4,6
+22,1,90
+22,2,63
+22,3,62
+22,4,6
+23,1,98
+23,2,73
+23,3,72
+23,4,7
+24,1,65
+24,2,78
+24,3,75
+24,4,5
+25,1,75
+25,2,84
+25,3,85
+25,4,6
+26,1,82
+26,2,96
+26,3,86
+26,4,7
+27,1,92
+27,2,100
+27,3,96
+27,4,8
+28,1,86
+28,2,82
+28,3,80
+28,4,7
+29,1,96
+29,2,92
+29,3,90
+29,4,8
+30,1,90
+30,2,66
+30,3,81
+30,4,7
+31,1,99
+31,2,76
+31,3,91
+31,4,8
+32,1,64
+32,2,72
+32,3,79
+32,4,5
+33,1,75
+33,2,82
+33,3,88
+33,4,6
+34,1,80
+34,2,78
+34,3,84
+34,4,7
+35,1,90
+35,2,94
+35,3,94
+35,4,8
+36,1,48
+36,2,74
+36,3,90
+36,4,5
+37,1,54
+37,2,84
+37,3,97
+37,4,6
+38,1,82
+38,2,78
+38,3,52
+38,4,5
+39,1,92
+39,2,89
+39,3,62
+39,4,6
+40,1,80
+40,2,84
+40,3,87
+40,4,8
+41,1,88
+41,2,94
+41,3,97
+41,4,8
+42,1,36
+42,2,90
+42,3,70
+42,4,5
+43,1,42
+43,2,99
+43,3,80
+43,4,6
+44,1,60
+44,2,90
+44,3,62
+44,4,5
+45,1,70
+45,2,98
+45,3,70
+45,4,6
+46,1,84
+46,2,68
+46,3,73
+46,4,6
+47,1,94
+47,2,78
+47,3,83
+47,4,7
+48,1,42
+48,2,63
+48,3,78
+48,4,5
+49,1,52
+49,2,73
+49,3,87
+49,4,5
+50,1,87
+50,2,77
+50,3,62
+50,4,5
+51,1,94
+51,2,88
+51,3,72
+51,4,6
+52,1,60
+52,2,63
+52,3,70
+52,4,5
+53,1,70
+53,2,73
+53,3,80
+53,4,5
+54,1,87
+54,2,78
+54,3,80
+54,4,6
+55,1,95
+55,2,84
+55,3,90
+55,4,7
+56,1,89
+56,2,79
+56,3,74
+56,4,6
+57,1,95
+57,2,88
+57,3,84
+57,4,7
+58,1,65
+58,2,88
+58,3,79
+58,4,7
+59,1,75
+59,2,97
+59,3,89
+59,4,7
+60,1,39
+60,2,71
+60,3,75
+60,4,5
+61,1,49
+61,2,81
+61,3,86
+61,4,5
+62,1,73
+62,2,62
+62,3,70
+62,4,5
+63,1,83
+63,2,72
+63,3,80
+63,4,6
+64,1,65
+64,2,63
+64,3,79
+64,4,3
+65,1,75
+65,2,73
+65,3,88
+65,4,4
+66,1,69
+66,2,72
+66,3,66
+66,4,4
+67,1,79
+67,2,82
+67,3,76
+67,4,5
+68,1,92
+68,2,68
+68,3,81
+68,4,6
+69,1,100
+69,2,77
+69,3,89
+69,4,6
+70,1,78
+70,2,56
+70,3,68
+70,4,5
+71,1,88
+71,2,63
+71,3,79
+71,4,6
+72,1,92
+72,2,40
+72,3,73
+72,4,6
+73,1,100
+73,2,50
+73,3,86
+73,4,7
+74,1,46
+74,2,85
+74,3,72
+74,4,5
+75,1,55
+75,2,96
+75,3,84
+75,4,5
+76,1,82
+76,2,64
+76,3,67
+76,4,5
+77,1,92
+77,2,74
+77,3,77
+77,4,6
+78,1,88
+78,2,37
+78,3,63
+78,4,5
+79,1,97
+79,2,50
+79,3,73
+79,4,6
+80,1,52
+80,2,95
+80,3,90
+80,4,7
+81,1,70
+81,2,95
+81,3,79
+81,4,6
+82,1,82
+82,2,70
+82,3,66
+82,4,6
+83,1,88
+83,2,59
+83,3,82
+83,4,7
+84,1,84
+84,2,84
+84,3,81
+84,4,7
+85,1,73
+85,2,81
+85,3,82
+85,4,7
+86,1,34
+86,2,69
+86,3,78
+86,4,2
+87,1,33
+87,2,55
+87,3,75
+87,4,4
+88,1,32
+88,2,55
+88,3,74
+88,4,4
+89,1,79
+89,2,80
+89,3,65
+89,4,6
+90,1,75
+90,2,73
+90,3,68
+90,4,5
+91,1,74
+91,2,55
+91,3,61
+91,4,6
+92,1,7
+92,2,5
+92,3,71
+92,4,2
+93,1,79
+93,2,33
+93,3,66
+93,4,5
+94,1,96
+94,2,21
+94,3,83
+94,4,6
+95,1,70
+95,2,42
+95,3,73
+95,4,6
+96,1,26
+96,2,79
+96,3,67
+96,4,5
+97,1,79
+97,2,31
+97,3,75
+97,4,5
+98,1,54
+98,2,72
+98,3,79
+98,4,2
+99,1,48
+99,2,61
+99,3,72
+99,4,2
+100,1,68
+100,2,78
+100,3,77
+100,4,5
+101,1,75
+101,2,74
+101,3,69
+101,4,4
+102,1,70
+102,2,87
+102,3,72
+102,4,6
+103,1,72
+103,2,86
+103,3,64
+103,4,6
+104,1,31
+104,2,72
+104,3,70
+104,4,6
+105,1,68
+105,2,66
+105,3,75
+105,4,5
+106,1,20
+106,2,26
+106,3,68
+106,4,3
+107,1,34
+107,2,47
+107,3,70
+107,4,3
+108,1,48
+108,2,51
+108,3,62
+108,4,5
+109,1,68
+109,2,61
+109,3,63
+109,4,5
+110,1,14
+110,2,42
+110,3,57
+110,4,2
+111,1,23
+111,2,23
+111,3,23
+111,4,3
+112,1,62
+112,2,54
+112,3,60
+112,4,4
+113,1,50
+113,2,55
+113,3,50
+113,4,2
+114,1,57
+114,2,73
+114,3,50
+114,4,3
+115,1,30
+115,2,67
+115,3,67
+115,4,4
+116,1,62
+116,2,55
+116,3,73
+116,4,3
+117,1,79
+117,2,66
+117,3,70
+117,4,5
+118,1,73
+118,2,78
+118,3,72
+118,4,6
+119,1,77
+119,2,35
+119,3,83
+119,4,5
+120,1,87
+120,2,21
+120,3,63
+120,4,4
+121,1,78
+121,2,45
+121,3,52
+121,4,4
+122,1,49
+122,2,80
+122,3,62
+122,4,5
+123,1,16
+123,2,76
+123,3,28
+123,4,3
+124,1,85
+124,2,86
+124,3,76
+124,4,7
+125,1,90
+125,2,70
+125,3,66
+125,4,7
+126,1,69
+126,2,78
+126,3,83
+126,4,6
+127,1,38
+127,2,88
+127,3,80
+127,4,6
+128,1,58
+128,2,40
+128,3,61
+128,4,4
+129,1,56
+129,2,43
+129,3,45
+129,4,5
+130,1,15
+130,2,13
+130,3,78
+130,4,3
+131,1,92
+131,2,71
+131,3,80
+131,4,7
+132,1,69
+132,2,90
+132,3,84
+132,4,7
+133,1,41
+133,2,26
+133,3,82
+133,4,5
+134,1,80
+134,2,66
+134,3,62
+134,4,5
+135,1,6
+135,2,80
+135,3,68
+135,4,2
+136,1,71
+136,2,72
+136,3,82
+136,4,6
+137,1,48
+137,2,80
+137,3,68
+137,4,5
+138,1,78
+138,2,44
+138,3,72
+138,4,5
+139,1,68
+139,2,68
+139,3,68
+139,4,5
+140,1,60
+140,2,36
+140,3,64
+140,4,3
+141,1,65
+141,2,40
+141,3,58
+141,4,3
+142,1,52
+142,2,55
+142,3,55
+142,4,3
+143,1,76
+143,2,72
+143,3,78
+143,4,6
+144,1,70
+144,2,85
+144,3,80
+144,4,6
+145,1,38
+145,2,63
+145,3,66
+145,4,5
+146,1,78
+146,2,56
+146,3,60
+146,4,5
+147,1,73
+147,2,56
+147,3,70
+147,4,5
+148,1,66
+148,2,87
+148,3,85
+148,4,7
+149,1,71
+149,2,69
+149,3,60
+149,4,5
+150,1,70
+150,2,48
+150,3,58
+150,4,4
+151,1,30
+151,2,55
+151,3,57
+151,4,3
+152,1,56
+152,2,65
+152,3,61
+152,4,4
+153,1,87
+153,2,89
+153,3,34
+153,4,3
+154,1,68
+154,2,47
+154,3,61
+154,4,3
+155,1,42
+155,2,69
+155,3,53
+155,4,3
+156,1,80
+156,2,62
+156,3,66
+156,4,5
+157,1,60
+157,2,40
+157,3,43
+157,4,3
+158,1,82
+158,2,56
+158,3,79
+158,4,6
+159,1,41
+159,2,92
+159,3,69
+159,4,5
+160,1,88
+160,2,66
+160,3,70
+160,4,6
+161,1,70
+161,2,76
+161,3,70
+161,4,5
+162,1,80
+162,2,50
+162,3,70
+162,4,5
+163,1,74
+163,2,93
+163,3,74
+163,4,7
+164,1,58
+164,2,94
+164,3,70
+164,4,6
+165,1,32
+165,2,50
+165,3,50
+165,4,3
+166,1,60
+166,2,67
+166,3,68
+166,4,4
+167,1,65
+167,2,48
+167,3,69
+167,4,5
+168,1,70
+168,2,90
+168,3,72
+168,4,6
+169,1,85
+169,2,53
+169,3,66
+169,4,5
+170,1,66
+170,2,69
+170,3,60
+170,4,4
+171,1,48
+171,2,44
+171,3,56
+171,4,3
+172,1,76
+172,2,53
+172,3,60
+172,4,5
+173,1,71
+173,2,56
+173,3,63
+173,4,5
+174,1,38
+174,2,76
+174,3,50
+174,4,4
+175,1,58
+175,2,59
+175,3,50
+175,4,4
+176,1,82
+176,2,71
+176,3,64
+176,4,6
+177,1,81
+177,2,65
+177,3,73
+177,4,6
+178,1,74
+178,2,76
+178,3,68
+178,4,5
+179,1,90
+179,2,12
+179,3,59
+179,4,5
+180,1,79
+180,2,44
+180,3,61
+180,4,5
+181,1,55
+181,2,92
+181,3,74
+181,4,5
+182,1,92
+182,2,2
+182,3,55
+182,4,4
+183,1,37
+183,2,77
+183,3,61
+183,4,4
+184,1,70
+184,2,57
+184,3,50
+184,4,5
+185,1,27
+185,2,61
+185,3,48
+185,4,4
+186,1,73
+186,2,89
+186,3,71
+186,4,7
+187,1,6
+187,2,8
+187,3,62
+187,4,1
+188,1,50
+188,2,92
+188,3,77
+188,4,6
+189,1,44
+189,2,52
+189,3,62
+189,4,5
+190,1,71
+190,2,58
+190,3,59
+190,4,6
+191,1,18
+191,2,60
+191,3,55
+191,4,3
+192,1,50
+192,2,58
+192,3,63
+192,4,4
+193,1,48
+193,2,74
+193,3,50
+193,4,2
+194,1,69
+194,2,93
+194,3,85
+194,4,7
+195,1,90
+195,2,79
+195,3,76
+195,4,7
+196,1,2
+196,2,83
+196,3,80
+196,4,5
+197,1,63
+197,2,78
+197,3,79
+197,4,7
+198,1,74
+198,2,70
+198,3,78
+198,4,7
+199,1,77
+199,2,62
+199,3,73
+199,4,6
+200,1,42
+200,2,35
+200,3,79
+200,4,4
+201,1,62
+201,2,41
+201,3,62
+201,4,4
+202,1,58
+202,2,50
+202,3,62
+202,4,3
+203,1,73
+203,2,93
+203,3,82
+203,4,8
+204,1,87
+204,2,75
+204,3,63
+204,4,5
+205,1,70
+205,2,72
+205,3,70
+205,4,5
+206,1,62
+206,2,52
+206,3,68
+206,4,6
+207,1,46
+207,2,70
+207,3,66
+207,4,4
+208,1,20
+208,2,60
+208,3,62
+208,4,5
+209,1,57
+209,2,68
+209,3,50
+209,4,3
+210,1,79
+210,2,81
+210,3,43
+210,4,3
+211,1,79
+211,2,75
+211,3,48
+211,4,3
+212,1,79
+212,2,89
+212,3,48
+212,4,3
+213,1,80
+213,2,77
+213,3,57
+213,4,3
+214,1,72
+214,2,68
+214,3,63
+214,4,3
+215,1,72
+215,2,74
+215,3,71
+215,4,6
+216,1,87
+216,2,72
+216,3,68
+216,4,6
+217,1,83
+217,2,51
+217,3,70
+217,4,6
+218,1,6
+218,2,95
+218,3,53
+218,4,3
+219,1,18
+219,2,73
+219,3,75
+219,4,5
+220,1,51
+220,2,78
+220,3,72
+220,4,5
+221,1,2
+221,2,62
+221,3,71
+221,4,2
+222,1,1
+222,2,91
+222,3,72
+222,4,2
+223,1,90
+223,2,80
+223,3,66
+223,4,3
+224,1,62
+224,2,73
+224,3,55
+224,4,4
+225,1,44
+225,2,68
+225,3,50
+225,4,4
+226,1,80
+226,2,76
+226,3,68
+226,4,4
+227,1,81
+227,2,72
+227,3,70
+227,4,4
+228,1,53
+228,2,48
+228,3,72
+228,4,4
+229,1,81
+229,2,80
+229,3,62
+229,4,4
+230,1,75
+230,2,43
+230,3,72
+230,4,4
+231,1,66
+231,2,52
+231,3,61
+231,4,4
+232,1,76
+232,2,48
+232,3,80
+232,4,4
+233,1,84
+233,2,57
+233,3,79
+233,4,4
+234,1,82
+234,2,53
+234,3,65
+234,4,4
+235,1,80
+235,2,43
+235,3,65
+235,4,4
+236,1,92
+236,2,45
+236,3,92
+236,4,6
+237,1,14
+237,2,86
+237,3,80
+237,4,3
+238,1,62
+238,2,92
+238,3,65
+238,4,6
+239,1,91
+239,2,32
+239,3,50
+239,4,5
+240,1,95
+240,2,42
+240,3,70
+240,4,5
+241,1,95
+241,2,30
+241,3,50
+241,4,4
+242,1,67
+242,2,51
+242,3,50
+242,4,3

data/v2/csv/conquest_warrior_ranks.csv

@@ -0,0 +1,243 @@
+id,warrior_id,rank,skill_id
+1,1,1,3
+2,1,2,24
+3,1,3,25
+4,2,1,3
+5,2,2,24
+6,2,3,25
+7,3,1,26
+8,3,2,27
+9,4,1,6
+10,4,2,28
+11,5,1,15
+12,5,2,29
+13,5,3,30
+14,6,1,4
+15,6,2,31
+16,7,1,5
+17,7,2,32
+18,8,1,8
+19,8,2,33
+20,9,1,10
+21,9,2,34
+22,10,1,7
+23,10,2,35
+24,11,1,4
+25,11,2,36
+26,12,1,4
+27,12,2,37
+28,13,1,5
+29,13,2,38
+30,14,1,5
+31,14,2,39
+32,15,1,17
+33,15,2,40
+34,16,1,8
+35,16,2,41
+36,17,1,13
+37,17,2,42
+38,18,1,15
+39,18,2,43
+40,19,1,8
+41,19,2,44
+42,20,1,13
+43,20,2,45
+44,21,1,14
+45,21,2,46
+46,22,1,11
+47,22,2,47
+48,23,1,13
+49,23,2,48
+50,24,1,11
+51,24,2,49
+52,25,1,18
+53,25,2,50
+54,26,1,7
+55,26,2,51
+56,27,1,10
+57,27,2,52
+58,28,1,4
+59,28,2,53
+60,29,1,6
+61,29,2,54
+62,30,1,15
+63,30,2,55
+64,31,1,18
+65,31,2,56
+66,32,1,16
+67,32,2,57
+68,33,1,14
+69,33,2,58
+70,34,1,10
+71,34,2,59
+72,35,1,7
+73,35,2,60
+74,36,1,11
+75,36,2,61
+76,37,1,16
+77,37,2,62
+78,38,1,14
+79,38,2,63
+80,39,1,19
+81,40,1,15
+82,41,1,7
+83,42,1,21
+84,43,1,8
+85,44,1,20
+86,45,1,19
+87,46,1,2
+88,47,1,20
+89,48,1,11
+90,49,1,16
+91,50,1,4
+92,51,1,9
+93,52,1,5
+94,53,1,14
+95,54,1,3
+96,55,1,21
+97,56,1,1
+98,57,1,6
+99,58,1,10
+100,59,1,18
+101,60,1,7
+102,61,1,13
+103,62,1,16
+104,63,1,17
+105,64,1,20
+106,65,1,19
+107,66,1,19
+108,67,1,17
+109,68,1,1
+110,69,1,10
+111,70,1,2
+112,71,1,22
+113,72,1,9
+114,73,1,13
+115,74,1,6
+116,75,1,3
+117,76,1,10
+118,77,1,8
+119,78,1,9
+120,79,1,21
+121,80,1,5
+122,81,1,2
+123,82,1,17
+124,83,1,11
+125,84,1,4
+126,85,1,4
+127,86,1,17
+128,87,1,2
+129,88,1,3
+130,89,1,22
+131,90,1,7
+132,91,1,1
+133,92,1,2
+134,93,1,9
+135,94,1,18
+136,95,1,8
+137,96,1,9
+138,97,1,21
+139,98,1,14
+140,99,1,16
+141,100,1,19
+142,101,1,22
+143,102,1,7
+144,103,1,2
+145,104,1,20
+146,105,1,2
+147,106,1,3
+148,107,1,14
+149,108,1,12
+150,109,1,5
+151,110,1,8
+152,111,1,23
+153,112,1,5
+154,113,1,5
+155,114,1,9
+156,115,1,10
+157,116,1,12
+158,117,1,7
+159,118,1,15
+160,119,1,17
+161,120,1,8
+162,121,1,17
+163,122,1,18
+164,123,1,14
+165,124,1,12
+166,125,1,10
+167,126,1,1
+168,127,1,2
+169,128,1,5
+170,129,1,1
+171,130,1,12
+172,131,1,17
+173,132,1,9
+174,133,1,20
+175,134,1,13
+176,135,1,11
+177,136,1,4
+178,137,1,21
+179,138,1,7
+180,139,1,23
+181,140,1,19
+182,141,1,14
+183,142,1,20
+184,143,1,22
+185,144,1,8
+186,145,1,22
+187,146,1,13
+188,147,1,15
+189,148,1,4
+190,149,1,7
+191,150,1,23
+192,151,1,3
+193,152,1,9
+194,153,1,15
+195,154,1,11
+196,155,1,22
+197,156,1,1
+198,157,1,21
+199,158,1,8
+200,159,1,23
+201,160,1,4
+202,161,1,16
+203,162,1,15
+204,163,1,23
+205,164,1,4
+206,165,1,13
+207,166,1,5
+208,167,1,19
+209,168,1,6
+210,169,1,21
+211,170,1,3
+212,171,1,10
+213,172,1,9
+214,173,1,3
+215,174,1,16
+216,175,1,18
+217,176,1,11
+218,177,1,19
+219,178,1,19
+220,179,1,23
+221,180,1,13
+222,181,1,20
+223,182,1,14
+224,183,1,10
+225,184,1,13
+226,185,1,20
+227,186,1,5
+228,187,1,15
+229,188,1,16
+230,189,1,20
+231,190,1,9
+232,191,1,3
+233,192,1,12
+234,193,1,12
+235,194,1,1
+236,195,1,18
+237,196,1,23
+238,197,1,15
+239,198,1,14
+240,199,1,7
+241,200,1,4
+242,201,1,6

data/v2/csv/conquest_warrior_skill_names.csv

@@ -0,0 +1,64 @@
+skill_id,local_language_id,name
+1,9,Adrenaline
+2,9,Fortify
+3,9,Top Speed
+4,9,Rally
+5,9,Bustle
+6,9,Sweet Song
+7,9,Mighty Blow
+8,9,Brotherhood
+9,9,Eagle Eye
+10,9,Crack Shot
+11,9,Marksman
+12,9,High Jump
+13,9,Added Bonus
+14,9,Impact
+15,9,Quick Strike
+16,9,Empathy
+17,9,Deep Breath
+18,9,Convalesce
+19,9,Salve
+20,9,Detox
+21,9,Shout
+22,9,Temperate
+23,9,Greed
+24,9,Courage
+25,9,Motivate
+26,9,Desire
+27,9,Ambition
+28,9,Soft Light
+29,9,Grand Dream
+30,9,Great Uniter
+31,9,Rebellion
+32,9,Thunderclap
+33,9,Strategist
+34,9,Cold Eyes
+35,9,Chesto!
+36,9,Nene Ninpō
+37,9,Fūrin Kazan
+38,9,One-Eyed Dragon
+39,9,Inspiration
+40,9,Grace
+41,9,Father Figure
+42,9,Viper's Bite
+43,9,Mayhem
+44,9,Resolution
+45,9,Lazybones
+46,9,Extinguish
+47,9,Typhoon
+48,9,Bewilder
+49,9,Ninjutsu
+50,9,Trickster
+51,9,Willpower
+52,9,Cupid
+53,9,Love & Honor
+54,9,Compassion
+55,9,Warrior Woman
+56,9,Kabuki Dance
+57,9,Faith
+58,9,Unrivaled
+59,9,Elegance
+60,9,Carefree
+61,9,Cunning
+62,9,Belief
+63,9,Sacrifice

data/v2/csv/conquest_warrior_skills.csv

@@ -0,0 +1,64 @@
+id,identifier
+1,adrenaline
+2,fortify
+3,top-speed
+4,rally
+5,bustle
+6,sweet-song
+7,mighty-blow
+8,brotherhood
+9,eagle-eye
+10,crack-shot
+11,marksman
+12,high-jump
+13,added-bonus
+14,impact
+15,quick-strike
+16,empathy
+17,deep-breath
+18,convalesce
+19,salve
+20,detox
+21,shout
+22,temperate
+23,greed
+24,courage
+25,motivate
+26,desire
+27,ambition
+28,soft-light
+29,grand-dream
+30,great-uniter
+31,rebellion
+32,thunderclap
+33,strategist
+34,cold-eyes
+35,chesto
+36,nene-ninpo
+37,furin-kazan
+38,one-eyed-dragon
+39,inspiration
+40,grace
+41,father-figure
+42,vipers-bite
+43,mayhem
+44,resolution
+45,lazybones
+46,extinguish
+47,typhoon
+48,bewilder
+49,ninjutsu
+50,trickster
+51,willpower
+52,cupid
+53,love-and-honor
+54,compassion
+55,warrior-woman
+56,kabuki-dance
+57,faith
+58,unrivaled
+59,elegance
+60,carefree
+61,cunning
+62,belief
+63,sacrifice

data/v2/csv/conquest_warrior_specialties.csv

@@ -0,0 +1,298 @@
+warrior_id,type_id,slot
+1,1,1
+2,1,1
+3,13,2
+3,16,1
+4,1,1
+4,16,2
+5,2,2
+5,10,1
+6,11,1
+7,13,1
+8,12,1
+9,3,2
+9,15,1
+10,2,1
+11,3,2
+11,4,1
+12,5,1
+12,6,2
+13,3,1
+14,2,2
+14,14,1
+15,7,1
+15,9,2
+16,6,1
+17,8,1
+17,16,2
+18,17,1
+19,6,2
+19,9,1
+20,10,2
+20,13,1
+21,8,1
+21,10,2
+22,1,2
+22,3,1
+23,14,1
+23,15,2
+24,4,2
+24,8,1
+25,15,2
+25,17,1
+26,3,2
+26,10,1
+27,3,2
+27,12,1
+28,14,1
+29,8,2
+29,15,1
+30,6,2
+30,10,1
+31,7,1
+31,10,2
+32,2,1
+32,9,2
+33,9,1
+33,16,2
+34,9,2
+34,11,1
+35,2,2
+35,6,1
+36,9,1
+36,17,2
+37,5,2
+37,16,1
+38,5,1
+38,17,2
+39,1,1
+40,17,1
+41,1,2
+41,5,1
+42,1,2
+42,2,1
+43,1,1
+44,1,2
+44,12,1
+45,1,1
+46,1,2
+46,11,1
+47,1,1
+48,11,1
+48,16,2
+49,16,1
+50,11,1
+50,16,2
+51,12,1
+51,16,2
+52,16,1
+53,9,1
+53,16,2
+54,12,1
+54,16,2
+55,16,1
+56,2,1
+56,16,2
+57,16,1
+58,16,1
+59,10,1
+60,2,1
+60,10,2
+61,3,1
+61,10,2
+62,10,2
+62,14,1
+63,1,1
+63,10,2
+64,10,2
+64,12,1
+65,10,1
+66,5,1
+66,10,2
+67,10,1
+68,10,1
+69,10,1
+70,7,1
+70,10,2
+71,5,1
+71,10,2
+72,10,1
+73,8,1
+73,10,2
+74,1,1
+75,9,1
+75,10,2
+76,11,1
+77,11,1
+78,11,1
+79,11,1
+80,11,2
+80,13,1
+81,11,2
+81,13,1
+82,11,2
+82,13,1
+83,13,1
+84,13,1
+85,13,2
+85,17,1
+86,13,1
+87,13,1
+88,13,1
+89,13,1
+90,12,2
+90,16,1
+91,12,1
+92,12,1
+93,11,1
+93,12,2
+94,12,1
+95,12,1
+96,12,1
+97,15,1
+98,15,1
+99,15,1
+100,15,1
+101,15,1
+102,14,1
+102,15,2
+103,14,1
+103,15,2
+104,15,1
+105,2,1
+106,2,1
+107,2,1
+108,2,1
+109,2,1
+110,2,1
+111,2,2
+111,10,1
+112,4,1
+113,4,1
+114,4,1
+115,4,1
+116,4,1
+117,5,2
+117,6,1
+118,3,1
+118,5,2
+119,5,2
+119,10,1
+120,5,1
+121,5,1
+122,5,2
+122,10,1
+123,5,2
+123,10,1
+124,5,1
+125,5,2
+125,17,1
+126,5,2
+126,10,1
+127,3,2
+127,16,1
+128,3,2
+128,7,1
+129,3,2
+129,15,1
+130,3,1
+131,3,2
+131,16,1
+132,3,1
+133,3,1
+134,3,1
+135,14,1
+136,14,2
+136,15,1
+137,14,1
+138,6,1
+138,14,2
+139,14,2
+139,17,1
+140,14,1
+141,12,1
+141,14,2
+142,14,1
+143,14,1
+144,14,1
+145,7,1
+146,7,1
+147,7,2
+147,15,1
+148,7,1
+149,7,1
+150,7,1
+151,7,1
+152,7,1
+153,6,1
+154,2,1
+154,6,2
+155,6,1
+156,6,1
+157,6,1
+158,6,1
+159,6,1
+160,6,1
+161,6,1
+162,4,1
+162,8,2
+163,4,1
+163,8,2
+164,8,2
+164,9,1
+165,8,1
+166,8,1
+167,4,1
+167,8,2
+168,4,1
+168,8,2
+169,17,1
+170,3,1
+170,17,2
+171,3,1
+171,17,2
+172,4,1
+172,17,2
+173,17,1
+174,9,1
+175,9,2
+175,10,1
+176,9,2
+176,16,1
+177,8,1
+177,10,2
+178,9,1
+179,9,1
+180,1,1
+180,9,2
+181,8,1
+181,9,2
+182,7,1
+182,9,2
+183,7,1
+183,9,2
+184,9,1
+185,8,1
+185,10,2
+186,3,1
+186,10,2
+187,9,1
+188,10,1
+189,8,1
+190,14,1
+191,8,1
+191,10,2
+192,7,1
+192,10,2
+193,2,1
+193,10,2
+194,2,1
+195,9,1
+196,12,1
+196,16,2
+197,17,1
+198,9,2
+198,14,1
+199,9,1
+200,9,1
+201,3,1

data/v2/csv/conquest_warrior_stat_names.csv

@@ -0,0 +1,5 @@
+warrior_stat_id,local_language_id,name
+1,9,Power
+2,9,Wisdom
+3,9,Charisma
+4,9,Capacity

data/v2/csv/conquest_warrior_stats.csv

@@ -0,0 +1,5 @@
+id,identifier
+1,power
+2,wisdom
+3,charisma
+4,capacity

data/v2/csv/conquest_warrior_transformation.csv

@@ -0,0 +1,42 @@
+transformed_warrior_rank_id,is_automatic,required_link,completed_episode_id,current_episode_id,distant_warrior_id,female_warlord_count,pokemon_count,collection_type_id,warrior_count
+2,1,,,,,,,,
+3,0,80,,38,,,,,
+5,1,,,,,,,,
+6,0,80,,38,,,,,
+8,0,80,,2,,,,,
+10,0,55,,,,,,,
+12,0,60,,,,,,,
+13,0,70,,,,,,,
+15,0,65,,,,,,,
+17,0,60,,,22,,,,
+19,0,60,,,,,100,,
+21,0,70,8,,,,,,
+23,0,60,,,,,,,
+25,0,60,,,,,,4,
+27,0,75,6,,,,,,
+29,0,60,,30,,,,,
+31,0,75,15,,,,,,
+33,0,55,,,,,,,
+35,0,60,,,,,,,
+37,0,60,,,,,,8,
+39,0,60,,,,,,,
+41,0,70,,,,,,,50
+43,0,60,,,,,,,
+45,0,60,,,,,,,
+47,0,60,,,7,,,,
+49,0,60,,,,,,,
+51,0,60,,,,,,,
+53,0,60,,,,,,,
+55,0,65,,,,,,,
+57,0,60,,,,3,,,
+59,0,60,,,,,,,
+61,0,55,,,,,,,
+63,0,55,,,,,,,
+65,0,65,,,,,,,
+67,0,60,,,,,,,
+69,0,80,,,,,,,
+71,0,65,,,,,,,
+73,0,70,,,,,,,
+75,0,60,,,,,,,
+77,0,60,,,,,,,
+79,0,60,,,,,,,

data/v2/csv/conquest_warriors.csv

@@ -0,0 +1,202 @@
+id,identifier,gender_id,archetype_id
+1,player-m,2,
+2,player-f,1,
+3,nobunaga,2,
+4,oichi,1,
+5,hideyoshi,2,
+6,motochika,2,
+7,ginchiyo,1,
+8,motonari,2,
+9,mitsuhide,2,
+10,yoshihiro,2,
+11,nene,1,
+12,shingen,2,
+13,masamune,2,
+14,kenshin,2,
+15,yoshimoto,2,
+16,ujiyasu,2,
+17,no,1,
+18,kotaro,2,
+19,ieyasu,2,
+20,hanbei,2,
+21,kanbei,2,
+22,muneshige,2,
+23,gracia,1,
+24,hanzo,2,
+25,kunoichi,1,
+26,yukimura,2,
+27,magoichi,2,
+28,kanetsugu,2,
+29,aya,1,
+30,kai,1,
+31,okuni,1,
+32,ranmaru,2,
+33,tadakatsu,2,
+34,ina,1,
+35,keiji,2,
+36,mitsunari,2,
+37,kiyomasa,2,
+38,masanori,2,
+39,tsunehisa,2,13
+40,naoie,2,9
+41,harutaka,2,4
+42,takanobu,2,3
+43,naoshige,2,2
+44,ujisato,2,19
+45,chacha,1,15
+46,go,1,14
+47,hatsu,1,15
+48,kazumasu,2,23
+49,nagahide,2,2
+50,yoshitaka,2,17
+51,urakusai,2,19
+52,narimasa,2,3
+53,tomonori,2,30
+54,murashige,2,19
+55,masahide,2,9
+56,nagayoshi,2,6
+57,kitsuno,1,14
+58,gotoku,1,14
+59,hidenaga,2,5
+60,koroku,2,18
+61,takatora,2,11
+62,yoshitsugu,2,9
+63,yukinaga,2,20
+64,rikyu,2,19
+65,hideyori,2,6
+66,asahi,1,15
+67,kazutoyo,2,11
+68,nagayasu,2,7
+69,harunaga,2,10
+70,hideaki,2,12
+71,naka,1,29
+72,tatsuko,1,14
+73,maa,1,15
+74,chiyo,1,14
+75,hatsume,1,27
+76,nobuchika,2,11
+77,chikayasu,2,4
+78,morichika,2,6
+79,chikamasa,2,7
+80,norishige,2,4
+81,takayori,2,11
+82,tadasumi,2,12
+83,dosetsu,2,1
+84,shoun,2,3
+85,sorin,2,9
+86,sekiso,2,22
+87,akizane,2,19
+88,takatane,2,12
+89,kiyo,1,15
+90,motoharu,2,5
+91,takakage,2,8
+92,terumoto,2,5
+93,takeyoshi,2,17
+94,ekei,2,22
+95,takamoto,2,12
+96,sadatoshi,2,10
+97,hidemitsu,2,5
+98,toshimitsu,2,2
+99,shigemoto,2,4
+100,mitsutada,2,7
+101,yukimasa,2,10
+102,tadaoki,2,6
+103,fujitaka,2,30
+104,hiroko,1,15
+105,tadamoto,2,2
+106,tadatsune,2,7
+107,takahisa,2,1
+108,hisaaki,2,8
+109,masatoshi,2,7
+110,kanemori,2,8
+111,tokitaka,2,13
+112,sandayu,2,23
+113,morikiyo,2,23
+114,kashinkoji,2,13
+115,yasunaga,2,24
+116,seikuro,2,25
+117,katsuyori,2,5
+118,haruyuki,2,9
+119,masakage,2,3
+120,masatoyo,2,1
+121,nobufusa,2,4
+122,masayuki,2,2
+123,yukitaka,2,1
+124,ume,1,15
+125,chiyome,1,26
+126,kei,1,14
+127,kagetsuna,2,9
+128,shigezane,2,3
+129,tsunamoto,2,1
+130,tsunenaga,2,17
+131,munetoki,2,7
+132,munezane,2,8
+133,yoshi,1,26
+134,iroha,1,14
+135,kagekatsu,2,3
+136,yoshikiyo,2,2
+137,tomonobu,2,5
+138,kageie,2,3
+139,takahiro,2,6
+140,sadamitsu,2,13
+141,yataro,2,7
+142,saneyori,2,13
+143,hana,1,14
+144,sen,1,15
+145,ujichika,2,30
+146,ujizane,2,30
+147,sessai,2,22
+148,masatsuna,2,4
+149,yasutomo,2,5
+150,ujihiro,2,10
+151,motozane,2,10
+152,sena,1,26
+153,soun,2,1
+154,tsunashige,2,2
+155,genan,2,22
+156,ujimasa,2,4
+157,ujiteru,2,6
+158,ujikuni,2,5
+159,ujinao,2,8
+160,shizuka,1,14
+161,madoka,1,14
+162,dosan,2,20
+163,yoshitatsu,2,3
+164,ittetsu,2,5
+165,bokuzen,2,8
+166,morinari,2,12
+167,omi,1,15
+168,asa,1,15
+169,shimoyama,2,25
+170,genba,2,24
+171,danzo,2,25
+172,yazaemon,2,24
+173,isuke,2,24
+174,tadatsugu,2,1
+175,naomasa,2,3
+176,yasumasa,2,3
+177,masanobu,2,9
+178,hidetada,2,6
+179,kazumasa,2,9
+180,choan,2,20
+181,tenkai,2,22
+182,munenori,2,4
+183,kame,1,27
+184,toku,1,15
+185,saizo,2,23
+186,sasuke,2,25
+187,katsu,1,27
+188,juzo,2,24
+189,tsuru,1,14
+190,ise,1,27
+191,jinpachi,2,17
+192,kamanosuke,2,18
+193,seikai,2,18
+194,isa,2,18
+195,yoshiteru,2,30
+196,yoshiaki,2,30
+197,hisahide,2,2
+198,jubei,2,4
+199,nobutsuna,2,2
+200,bokuden,2,2
+201,otsu,1,27

data/v2/csv/evolution_chains.csv

@@ -364,3 +364,53 @@ id,baby_trigger_item_id
 371,
 372,
 373,
+374,
+375,
+376,
+377,
+378,
+379,
+380,
+381,
+382,
+383,
+384,
+385,
+386,
+387,
+388,
+389,
+390,
+391,
+392,
+393,
+394,
+395,
+396,
+397,
+398,
+399,
+400,
+401,
+402,
+403,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+415,
+416,
+417,
+418,
+419,
+420,
+421,
+422,
+423,

data/v2/csv/generations.csv

@@ -5,3 +5,4 @@ id,main_region_id,identifier
 4,4,generation-iv
 5,5,generation-v
 6,6,generation-vi
+7,7,sun-moon

data/v2/csv/item_categories.csv

@@ -42,4 +42,5 @@ id,pocket_id,identifier
 42,1,jewels
 43,7,miracle-shooter
 44,1,mega-stones
-10001,8,xy-unknown
+45,1,memories
+46,8,z-crystals

data/v2/csv/item_category_prose.csv

@@ -42,4 +42,5 @@ item_category_id,local_language_id,name
 42,9,Jewels
 43,9,Miracle Shooter
 44,9,Mega Stones
-10001,9,X/Y unknown
+45,9,Memories
+46,9,Z-Crystals

data/v2/csv/item_fling_effects.csv

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

data/v2/csv/item_pocket_names.csv

@@ -1,9 +1,17 @@
 item_pocket_id,local_language_id,name
+1,5,Objets
 1,9,Items
+2,5,Médicaments
 2,9,Medicine
+3,5,Balls
 3,9,Poké Balls
+4,5,CT & CS
 4,9,TMs and HMs
+5,5,Baies
 5,9,Berries
+6,5,Lettres
 6,9,Mail
+7,5,Objets de combat
 7,9,Battle Items
+8,5,Object rares
 8,9,Key Items

data/v2/csv/item_prose.csv

@@ -1239,3 +1239,196 @@ This item can only be obtained or used via the Wonder Launcher."
 678,9,Wakes up the Crustle blocking the way in Seaside Cave.,
 679,9,Returned to Curtis or Yancy as part of a sidequest.,
 681,9,"Switches Tornadus, Thundurus, and Landorus between Incarnate and Therian Forme.",
+682,9,"Held: When the holder is hit by a super effective move, its Attack and Special Attack raise by two stages.","Held: When the holder is hit by a super effective move, its Attack and Special Attack raise by two stages."
+683,9,Raises the holder's Special Defense to 1.5×.  Prevents the holder from selecting a status move.,Raises the holder's Special Defense to 1.5×.  Prevents the holder from selecting a status move.
+684,9,Held: Fairy-Type moves from holder do 20% more damage. Changes Arceus's and Judgment's type to Fairy.,Held: Fairy-Type moves from holder do 20% more damage. Changes Arceus's and Judgment's type to Fairy.
+685,9,Switches a Pokémon between its two possible (non-Hidden) Abilities.,Switches a Pokémon between its two possible (non-Hidden) Abilities.
+686,9,Traded on a Swirlix: Holder evolves into Slurpuff.,Traded on a Swirlix: Holder evolves into Slurpuff.
+687,9,Traded on a Spritzee: Holder evolves into Aromatisse.,Traded on a Spritzee: Holder evolves into Aromatisse.
+688,9,"Held: If the holder is hit by a damaging Water move, raises its Special Defense by one stage.","Held: If the holder is hit by a damaging Water move, it consumes this item and raises its Special Defense by one stage."
+689,9,"Held: If the holder is hit by a damaging Ice move, raises its Attack by one stage.","Held: If the holder is hit by a damaging Ice move, raises its Attack by one stage."
+690,9,Held: Prevents damage from powder moves and the damage from Hail and Sandstorm.,Held: Prevents damage from powder moves and the damage from Hail and Sandstorm.
+691,9,Increases the total number of Berries by 2.,Increases the total number of Berries by 2.
+692,9,Increases the chance of Berry mutation.,Increases the chance of Berry mutation.
+693,9,Causes soil to dry out in 4 hours.,Causes soil to dry out in 4 hours.
+694,9,"Increases the total number of Berries by 2, increases the chance of Berry mutation, and causes soil to dry out in 4 hours.","Increases the total number of Berries by 2, increases the chance of Berry mutation, and causes soil to dry out in 4 hours."
+695,9,Held: Allows Gengar to Mega Evolve into Mega Gengar.,Held: Allows Gengar to Mega Evolve into Mega Gengar.
+696,9,Held: Allows Gardevoir to Mega Evolve into Mega Gardevoir.,Held: Allows Gardevoir to Mega Evolve into Mega Gardevoir.
+697,9,Held: Allows Ampharos to Mega Evolve into Mega Ampharos.,Held: Allows Ampharos to Mega Evolve into Mega Ampharos.
+698,9,Held: Allows Venusaur to Mega Evolve into Mega Venusaur.,Held: Allows Venusaur to Mega Evolve into Mega Venusaur.
+699,9,Held: Allows Charizard to Mega Evolve into Mega Charizard X.,Held: Allows Charizard to Mega Evolve into Mega Charizard X.
+700,9,Held: Allows Blastoise to Mega Evolve into Mega Blastoise.,Held: Allows Blastoise to Mega Evolve into Mega Blastoise.
+701,9,Held: Allows Mewtwo to Mega Evolve into Mega Mewtwo X.,Held: Allows Mewtwo to Mega Evolve into Mega Mewtwo X.
+702,9,Held: Allows Mewtwo to Mega Evolve into Mega Mewtwo Y.,Held: Allows Mewtwo to Mega Evolve into Mega Mewtwo Y.
+703,9,Held: Allows Blaziken to Mega Evolve into Mega Blaziken.,Held: Allows Blaziken to Mega Evolve into Mega Blaziken.
+704,9,Held: Allows Medicham to Mega Evolve into Mega Medicham.,Held: Allows Medicham to Mega Evolve into Mega Medicham.
+705,9,Held: Allows Houndoom to Mega Evolve into Mega Houndoom.,Held: Allows Houndoom to Mega Evolve into Mega Houndoom.
+706,9,Held: Allows Aggron to Mega Evolve into Mega Aggron.,Held: Allows Aggron to Mega Evolve into Mega Aggron.
+707,9,Held: Allows Banette to Mega Evolve into Mega Banette.,Held: Allows Banette to Mega Evolve into Mega Banette.
+708,9,Held: Allows Tyranitar to Mega Evolve into Mega Tyranitar.,Held: Allows Tyranitar to Mega Evolve into Mega Tyranitar.
+709,9,Held: Allows Scizor to Mega Evolve into Mega Scizor.,Held: Allows Scizor to Mega Evolve into Mega Scizor.
+710,9,Held: Allows Pinsir to Mega Evolve into Mega Pinsir.,Held: Allows Pinsir to Mega Evolve into Mega Pinsir.
+711,9,Held: Allows Aerodactyl to Mega Evolve into Mega Aerodactyl.,Held: Allows Aerodactyl to Mega Evolve into Mega Aerodactyl.
+712,9,Held: Allows Lucario to Mega Evolve into Mega Lucario.,Held: Allows Lucario to Mega Evolve into Mega Lucario.
+713,9,Held: Allows Abomasnow to Mega Evolve into Mega Abomasnow.,Held: Allows Abomasnow to Mega Evolve into Mega Abomasnow.
+714,9,Held: Allows Kangaskhan to Mega Evolve into Mega Kangaskhan.,Held: Allows Kangaskhan to Mega Evolve into Mega Kangaskhan.
+715,9,Held: Allows Gyarados to Mega Evolve into Mega Gyarados.,Held: Allows Gyarados to Mega Evolve into Mega Gyarados.
+716,9,Held: Allows Absol to Mega Evolve into Mega Absol.,Held: Allows Absol to Mega Evolve into Mega Absol.
+717,9,Held: Allows Charizard to Mega Evolve into Mega Charizard Y.,Held: Allows Charizard to Mega Evolve into Mega Charizard Y.
+718,9,Held: Allows Alakazam to Mega Evolve into Mega Alakazam.,Held: Allows Alakazam to Mega Evolve into Mega Alakazam.
+719,9,Held: Allows Heracross to Mega Evolve into Mega Heracross.,Held: Allows Heracross to Mega Evolve into Mega Heracross.
+720,9,Held: Allows Mawile to Mega Evolve into Mega Mawile.,Held: Allows Mawile to Mega Evolve into Mega Mawile.
+721,9,Held: Allows Manectric to Mega Evolve into Mega Manectric.,Held: Allows Manectric to Mega Evolve into Mega Manectric.
+722,9,Held: Allows Garchomp to Mega Evolve into Mega Garchomp.,Held: Allows Garchomp to Mega Evolve into Mega Garchomp.
+723,9,Held: Consumed when struck by a super-effective Fairy-type attack to halve the damage.,Held: Consumed when struck by a super-effective Fairy-type attack to halve the damage.
+724,9,"Held: When the holder is hit by a physical move, increases its Defense by one stage.","Held: When the holder is hit by a physical move, increases its Defense by one stage."
+725,9,"Held: When the holder is hit by a special move, increases its Special Defense by one stage.","Held: When the holder is hit by a special move, increases its Special Defense by one stage."
+726,9,Can be used at a boutique for a 50% discount.  Consumed once used.,Can be used at a boutique for a 50% discount.  Consumed once used.
+727,9,Vendor trash.,Vendor trash.
+728,9,Cures all major status ailments and confusion.,Cures all major status ailments and confusion.
+729,9,Can be revived into a Tyrunt.,Can be revived into a Tyrunt.
+730,9,Can be revived into an Amaura.,Can be revived into an Amaura.
+731,9,"Held: When the holder uses a damaging Fairy move, the move has 1.5× power and this item is consumed.","Held: When the holder uses a damaging Fairy move, the move has 1.5× power and this item is consumed."
+732,9,Contains basic gameplay information.,Contains basic gameplay information.
+733,9,Unlocks the elevator in Lysandre Labs.,Unlocks the elevator in Lysandre Labs.
+734,9,Displays cutscene conversations as the plot advances.,Displays cutscene conversations as the plot advances.
+735,9,"Does nothing, but signifies becoming Champion.","Does nothing, but signifies becoming Champion."
+736,9,"Trade for a Sun Stone in X and Y, or Pidgeotite in Omega Ruby and Alpha Sapphire.","Trade for a Sun Stone in X and Y, or Pidgeotite in Omega Ruby and Alpha Sapphire."
+737,9,Allows the player to change their eye color.,Allows the player to change their eye color.
+738,9,Advances the Looker postgame plot.,Advances the Looker postgame plot.
+739,9,Allows the player's Pokémon to Mega Evolve.,Allows the player's Pokémon to Mega Evolve.
+740,9,Permits entry to the Kalos Power Plant.,Permits entry to the Kalos Power Plant.
+741,9,Traded to the player's mom for the Town Map and a Potion.,Traded to the player's mom for the Town Map and a Potion.
+742,9,Allows the player to move quickly and off the grid.,Allows the player to move quickly and off the grid.
+743,9,Waters Berry plants.,Waters Berry plants.
+744,9,Permits access to Kiloude City.,Permits access to Kiloude City.
+745,9,Teaches a Pokémon TM96.,Teaches a Pokémon TM96.
+746,9,Teaches a Pokémon TM97.,Teaches a Pokémon TM97.
+747,9,Teaches a Pokémon TM98.,Teaches a Pokémon TM98.
+748,9,Teaches a Pokémon TM99.,Teaches a Pokémon TM99.
+749,9,Teaches a Pokémon TM100.,Teaches a Pokémon TM100.
+760,9,Held: Allows Latias to Mega Evolve into Mega Latias.,Held: Allows Latias to Mega Evolve into Mega Latias.
+761,9,Held: Allows Latios to Mega Evolve into Mega Latios.,Held: Allows Latios to Mega Evolve into Mega Latios.
+762,9,Unknown.,Unknown.
+763,9,Allows the player to change their lipstick color.,Allows the player to change their lipstick color.
+764,9,"Unobtainable, but allows the player to change clothes anywhere.","Unobtainable, but allows the player to change clothes anywhere."
+765,9,Cures any major status ailment and confusion.,Cures any major status ailment and confusion.
+768,9,Unused Key Stone.,"Unused.  This appears as the girlplayer's Mega Bracelet in Pokémon Contests, but it cannot actually be obtained."
+769,9,Unused NPC Key Stone.,"Unused.  This is Korrina's Key Stone in X and Y, but it cannot be obtained by the player."
+770,9,Allows Captain Stern to set out on his expedition.,Allows Captain Stern to set out on his expedition.
+772,9,Creates and stores Pokéblocks.,Creates and stores Pokéblocks.
+773,9,Unlocks the door to Room 1 in Sea Mauville.,Unlocks the door to Room 1 in Sea Mauville.
+774,9,Unlocks the door to Room 2 in Sea Mauville.,Unlocks the door to Room 2 in Sea Mauville.
+775,9,Unlocks the door to Room 4 in Sea Mauville.,Unlocks the door to Room 4 in Sea Mauville.
+776,9,Unlocks the door to Room 6 in Sea Mauville.,Unlocks the door to Room 6 in Sea Mauville.
+779,9,Worn by the player while underwater.,Worn by the player while underwater via Dive in Omega Ruby and Alpha Sapphire.
+780,9,Worn during Pokémon Contests.,Worn during Pokémon Contests.
+782,9,Allows the player to ride Groudon in the Cave of Origin.,Allows the player to ride Groudon in the Cave of Origin.
+783,9,Allows the player to ride Kyogre in the Cave of Origin.,Allows the player to ride Kyogre in the Cave of Origin.
+784,9,Allows the player and their mother to see the star show in the Mossdeep Space Center.,Allows the player and their mother to see the star show in the Mossdeep Space Center.
+785,9,Allows the player's Pokémon to Mega Evolve.,Allows the player's Pokémon to Mega Evolve.
+786,9,Unused NPC Key Stone.,"Unused.  This is Wally's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+787,9,Unused NPC Key Stone.,"Unused.  This is Maxie's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+788,9,Unused NPC Key Stone.,"Unused.  This is Archie's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+789,9,Unused NPC Key Stone.,"Unused.  This is Steven's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+790,9,Unused NPC Key Stone.,"Unused.  This is Lisia's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+791,9,Unused NPC Key Stone.,"Unused.  This is Zinnia's Key Stone in Omega Ruby and Alpha Sapphire, but it cannot be obtained by the player."
+793,9,Held: Allows Swampert to Mega Evolve into Mega Swampert.,Held: Allows Swampert to Mega Evolve into Mega Swampert.
+794,9,Held: Allows Sceptile to Mega Evolve into Mega Sceptile.,Held: Allows Sceptile to Mega Evolve into Mega Sceptile.
+795,9,Held: Allows Sableye to Mega Evolve into Mega Sableye.,Held: Allows Sableye to Mega Evolve into Mega Sableye.
+796,9,Held: Allows Altaria to Mega Evolve into Mega Altaria.,Held: Allows Altaria to Mega Evolve into Mega Altaria.
+797,9,Held: Allows Gallade to Mega Evolve into Mega Gallade.,Held: Allows Gallade to Mega Evolve into Mega Gallade.
+798,9,Held: Allows Audino to Mega Evolve into Mega Audino.,Held: Allows Audino to Mega Evolve into Mega Audino.
+799,9,Held: Allows Metagross to Mega Evolve into Mega Metagross.,Held: Allows Metagross to Mega Evolve into Mega Metagross.
+800,9,Held: Allows Sharpedo to Mega Evolve into Mega Sharpedo.,Held: Allows Sharpedo to Mega Evolve into Mega Sharpedo.
+801,9,Held: Allows Slowbro to Mega Evolve into Mega Slowbro.,Held: Allows Slowbro to Mega Evolve into Mega Slowbro.
+802,9,Held: Allows Steelix to Mega Evolve into Mega Steelix.,Held: Allows Steelix to Mega Evolve into Mega Steelix.
+803,9,Held: Allows Pidgeot to Mega Evolve into Mega Pidgeot.,Held: Allows Pidgeot to Mega Evolve into Mega Pidgeot.
+804,9,Held: Allows Glalie to Mega Evolve into Mega Glalie.,Held: Allows Glalie to Mega Evolve into Mega Glalie.
+805,9,Held: Allows Diancie to Mega Evolve into Mega Diancie.,Held: Allows Diancie to Mega Evolve into Mega Diancie.
+806,9,Transforms Hoopa into its Unbound form for up to three days.,Transforms Hoopa into its Unbound form for up to three days.
+807,9,Unused Key Stone.,"Unused.  This appears as the boy player's Mega Bracelet in Pokémon Contests, but it cannot actually be obtained."
+808,9,Held: Allows Camerupt to Mega Evolve into Mega Camerupt.,Held: Allows Camerupt to Mega Evolve into Mega Camerupt.
+809,9,Held: Allows Lopunny to Mega Evolve into Mega Lopunny.,Held: Allows Lopunny to Mega Evolve into Mega Lopunny.
+810,9,Held: Allows Salamence to Mega Evolve into Mega Salamence.,Held: Allows Salamence to Mega Evolve into Mega Salamence.
+811,9,Held: Allows Beedrill to Mega Evolve into Mega Beedrill.,Held: Allows Beedrill to Mega Evolve into Mega Beedrill.
+814,9,Allows the player's Pokémon to Mega Evolve.,Allows the player's Pokémon to Mega Evolve.
+815,9,"Causes the Meteorite to transform to its final form, allowing Rayquaza to Mega Evolve.","Causes the Meteorite to transform to its final form, allowing Rayquaza to Mega Evolve."
+816,9,Summons Latias or Latios for a ride.,Summons Latias or Latios for a ride.
+817,9,Held: Allows a Pokémon to use the Z-move equivalents of its Normal moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Normal moves.
+818,9,Held: Allows a Pokémon to use the Z-move equivalents of its Fire moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Fire moves.
+819,9,Held: Allows a Pokémon to use the Z-move equivalents of its Water moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Water moves.
+820,9,Held: Allows a Pokémon to use the Z-move equivalents of its Electric moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Electric moves.
+821,9,Held: Allows a Pokémon to use the Z-move equivalents of its Grass moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Grass moves.
+822,9,Held: Allows a Pokémon to use the Z-move equivalents of its Ice moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Ice moves.
+823,9,Held: Allows a Pokémon to use the Z-move equivalents of its Fighting moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Fighting moves.
+824,9,Held: Allows a Pokémon to use the Z-move equivalents of its Poison moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Poison moves.
+825,9,Held: Allows a Pokémon to use the Z-move equivalents of its Ground moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Ground moves.
+826,9,Held: Allows a Pokémon to use the Z-move equivalents of its Flying moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Flying moves.
+827,9,Held: Allows a Pokémon to use the Z-move equivalents of its Psychic moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Psychic moves.
+828,9,Held: Allows a Pokémon to use the Z-move equivalents of its Bug moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Bug moves.
+829,9,Held: Allows a Pokémon to use the Z-move equivalents of its Rock moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Rock moves.
+830,9,Held: Allows a Pokémon to use the Z-move equivalents of its Ghost moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Ghost moves.
+831,9,Held: Allows a Pokémon to use the Z-move equivalents of its Dragon moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Dragon moves.
+832,9,Held: Allows a Pokémon to use the Z-move equivalents of its Dark moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Dark moves.
+833,9,Held: Allows a Pokémon to use the Z-move equivalents of its Steel moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Steel moves.
+834,9,Held: Allows a Pokémon to use the Z-move equivalents of its Fairy moves.,Held: Allows a Pokémon to use the Z-move equivalents of its Fairy moves.
+835,9,Held: Allows Pikachu to upgrade Volt Tackle into Catastropika.,Held: Allows []{pokemon:pikachu} to upgrade []{move:volt-tackle} into []{move:catastropika}.
+836,9,Trade to Mr. Hyper to maximize one of a Pokémon's genes.,Trade to Mr. Hyper to set one of a Pokémon's genes to 31.
+837,9,Trade to Mr. Hyper to maximize all of a Pokémon's genes.,Trade to Mr. Hyper to set all of a Pokémon's genes to 31.
+838,9,Allows the player's Pokémon to use Z-moves.,Allows the player's Pokémon to use Z-moves.
+839,9,Held: Allows Decidueye to upgrade Spirit Shackle into Sinister Arrow Raid.,Held: Allows []{pokemon:decidueye} to upgrade []{move:spirit-shackle} into []{move:sinister-arrow-raid}.
+840,9,Held: Allows Incineroar to upgrade Darkest Lariat into Malicious Moonsault.,Held: Allows []{pokemon:incineroar} to upgrade []{move:darkest-lariat} into []{move:malicious-moonsault}.
+841,9,Held: Allows Primarina to upgrade Sparkling Aria into Oceanic Operetta.,Held: Allows []{pokemon:primarina} to upgrade []{move:sparkling-aria} into []{move:oceanic-operetta}.
+842,9,Held: Allows the Tapus to upgrade Nature's Madness into Guardian of Alola.,"Held: Allows []{pokemon:tapu-koko}, []{pokemon:tapu-lele}, []{pokemon:tapu-bulu}, and []{pokemon:tapu-fini} to upgrade []{move:natures-madness} into []{move:guardian-of-alola}."
+843,9,Held: Allows Marshadow to upgrade Spectral Thief into Soul-Stealing 7 Star Strike.,Held: Allows []{pokemon:marshadow} to upgrade []{move:spectral-thief} into []{move:soul-stealing-7-star-strike}.
+844,9,Held: Allows Alola Raichu to upgrade Thunderbolt into Stoked Sparksurfer.,Held: Allows Alola []{pokemon:raichu} to upgrade []{move:thunderbolt} into []{move:stoked-sparksurfer}.
+845,9,Held: Allows Snorlax to upgrade Giga Impact into Pulverizing Pancake.,Held: Allows []{pokemon:snorlax} to upgrade []{move:giga-impact} into []{move:pulverizing-pancake}.
+846,9,Held: Allows Eevee to upgrade Last Resort into Extreme Evoboost.,Held: Allows []{pokemon:eevee} to upgrade []{move:last-resort} into []{move:extreme-evoboost}.
+847,9,Held: Allows Mew to upgrade Psychic into Genesis Supernova.,Held: Allows []{pokemon:mew} to upgrade []{move:psychic} into []{move:genesis-supernova}.
+877,9,"Held: Allows cap-wearing Pikachu to upgrade Thunderbolt into 10,000,000 Volt Thunderbolt.",Held: Allows cap-wearing []{pokemon:pikachu} to upgrade []{move:thunderbolt} into []{move:10-000-000-volt-thunderbolt}.
+878,9,Holds ingredients during Mallow's trial.,Holds ingredients during Mallow's trial.
+879,9,Allows the player to fish for Pokémon.,Allows the player to fish for Pokémon.
+880,9,Lost by Professor Kukui.,Lost by Professor Kukui.
+881,9,Hosts a mission in Festival Plaza.,Hosts a mission in Festival Plaza.
+882,9,Required to obtain a Z-Ring.,Required to obtain a Z-Ring.
+883,9,Makes wild Pokémon more likely to summon allies.  Held: increases the holder's Speed by one stage when affected by Intimidate.,Makes wild Pokémon more likely to summon allies.  Held: increases the holder's Speed by one stage when affected by Intimidate.
+884,9,Contains collected Zygarde cells/cores.  Can teach Zygarde moves.,Contains collected Zygarde cells/cores.  Can teach Zygarde moves.
+885,9,Evolves an Alola Sandshrew into Alola Sandslash or an Alola Vulpix into Alola Ninetales.,"Used on a party Pokémon
+:   Evolves an Alola []{pokemon:sandshrew} into Alola []{pokemon:sandslash} or an Alola []{pokemon:vulpix} into Alola []{pokemon:ninetales}."
+886,9,Allows the player to summon a Ride Pokémon.,"Allows the player to summon a Ride Pokémon.  Unused, as this can be done simply by pressing Y."
+887,9,Tries to catch a wild Pokémon.  Success rate is 5× for Ultra Beasts and 0.1× for all other Pokémon.,"Used in battle
+:   Attempts to [catch]{mechanic:catch} a wild Pokémon.  If the wild Pokémon is an Ultra Beast, this ball has a catch rate of 5×.  Otherwise, it has a catch rate of 0.1×.
+
+    If used in a trainer battle, nothing happens and the ball is lost."
+888,9,Cures major status ailments and confusion.,Cures major status ailments and confusion.
+889,9,Changes Oricorio to Baile Style.,Changes Oricorio to Baile Style.  Single-use and cannot be used in battle.
+890,9,Changes Oricorio to Pom-Pom Style.,Changes Oricorio to Pom-Pom Style.  Single-use and cannot be used in battle.
+891,9,Changes Oricorio to Pa’u Style.,Changes Oricorio to Pa’u Style.  Single-use and cannot be used in battle.
+892,9,Changes Oricorio to Sensu Style.,Changes Oricorio to Sensu Style.  Single-use and cannot be used in battle.
+893,9,Evolves Nebby into Solgaleo when used at the Altar of the Sunne.,Evolves Nebby into Solgaleo when used at the Altar of the Sunne.
+894,9,Evolves Nebby into Lunala when used at the Altar of the Moone.,Evolves Nebby into Lunala when used at the Altar of the Moone.
+895,9,Unlocks Looker's motel room on Route 8.,Unlocks Looker's motel room on Route 8.
+896,9,Held: Extends the holder's Terrain effects to 8 turns.,"Held: When the holder changes the Terrain (whether by move or ability), it will last  8 turns instead of 5."
+897,9,Held: Prevents side effects of contact moves used on the holder.,Held: Prevents side effects of contact moves used on the holder.
+898,9,Held: Consumed on Electric Terrain and raises the holder's Defense by one stage.,"Held: If the holder enters battle during Electric Terrain, or if Electric Terrain is activated while the holder is in battle, this item is consumed and the holder's Defense raises by one stage."
+899,9,Held: Consumed on Psychic Terrain and raises the holder's Special Defense by one stage.,"Held: If the holder enters battle during Psychic Terrain, or if Psychic Terrain is activated while the holder is in battle, this item is consumed and the holder's Special Defense raises by one stage."
+900,9,Held: Consumed on Misty Terrain and raises the holder's Special Defense by one stage.,"Held: If the holder enters battle during Misty Terrain, or if Misty Terrain is activated while the holder is in battle, this item is consumed and the holder's Special Defense raises by one stage."
+901,9,Held: Consumed on Grassy Terrain and raises the holder's Defense by one stage.,"Held: If the holder enters battle during Grassy Terrain, or if Grassy Terrain is activated while the holder is in battle, this item is consumed and the holder's Defense raises by one stage."
+902,9,Held: Changes Silvally to its Fighting form.  Changes Multi-Attack's type to Fighting.,Held: Changes Silvally to its Fighting form.  Changes Multi-Attack's type to Fighting.
+903,9,Held: Changes Silvally to its Flying form.  Changes Multi-Attack's type to Flying.,Held: Changes Silvally to its Flying form.  Changes Multi-Attack's type to Flying.
+904,9,Held: Changes Silvally to its Poison form.  Changes Multi-Attack's type to Poison.,Held: Changes Silvally to its Poison form.  Changes Multi-Attack's type to Poison.
+905,9,Held: Changes Silvally to its Ground form.  Changes Multi-Attack's type to Ground.,Held: Changes Silvally to its Ground form.  Changes Multi-Attack's type to Ground.
+906,9,Held: Changes Silvally to its Rock form.  Changes Multi-Attack's type to Rock.,Held: Changes Silvally to its Rock form.  Changes Multi-Attack's type to Rock.
+907,9,Held: Changes Silvally to its Bug form.  Changes Multi-Attack's type to Bug.,Held: Changes Silvally to its Bug form.  Changes Multi-Attack's type to Bug.
+908,9,Held: Changes Silvally to its Ghost form.  Changes Multi-Attack's type to Ghost.,Held: Changes Silvally to its Ghost form.  Changes Multi-Attack's type to Ghost.
+909,9,Held: Changes Silvally to its Steel form.  Changes Multi-Attack's type to Steel.,Held: Changes Silvally to its Steel form.  Changes Multi-Attack's type to Steel.
+910,9,Held: Changes Silvally to its Fire form.  Changes Multi-Attack's type to Fire.,Held: Changes Silvally to its Fire form.  Changes Multi-Attack's type to Fire.
+911,9,Held: Changes Silvally to its Water form.  Changes Multi-Attack's type to Water.,Held: Changes Silvally to its Water form.  Changes Multi-Attack's type to Water.
+912,9,Held: Changes Silvally to its Grass form.  Changes Multi-Attack's type to Grass.,Held: Changes Silvally to its Grass form.  Changes Multi-Attack's type to Grass.
+913,9,Held: Changes Silvally to its Electric form.  Changes Multi-Attack's type to Electric.,Held: Changes Silvally to its Electric form.  Changes Multi-Attack's type to Electric.
+914,9,Held: Changes Silvally to its Psychic form.  Changes Multi-Attack's type to Psychic.,Held: Changes Silvally to its Psychic form.  Changes Multi-Attack's type to Psychic.
+915,9,Held: Changes Silvally to its Ice form.  Changes Multi-Attack's type to Ice.,Held: Changes Silvally to its Ice form.  Changes Multi-Attack's type to Ice.
+916,9,Held: Changes Silvally to its Dragon form.  Changes Multi-Attack's type to Dragon.,Held: Changes Silvally to its Dragon form.  Changes Multi-Attack's type to Dragon.
+917,9,Held: Changes Silvally to its Dark form.  Changes Multi-Attack's type to Dark.,Held: Changes Silvally to its Dark form.  Changes Multi-Attack's type to Dark.
+918,9,Held: Changes Silvally to its Fairy form.  Changes Multi-Attack's type to Fairy.,Held: Changes Silvally to its Fairy form.  Changes Multi-Attack's type to Fairy.

data/v2/csv/items.csv

@@ -1,6 +1,6 @@
 id,identifier,category_id,cost,fling_power,fling_effect_id
 1,master-ball,34,0,,
-2,ultra-ball,34,1200,,
+2,ultra-ball,34,800,,
 3,great-ball,34,600,,
 4,poke-ball,34,200,,
 5,safari-ball,34,0,,
@@ -10,108 +10,108 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 9,repeat-ball,33,1000,,
 10,timer-ball,33,1000,,
 11,luxury-ball,33,1000,,
-12,premier-ball,33,200,,
+12,premier-ball,33,20,,
 13,dusk-ball,33,1000,,
 14,heal-ball,33,300,,
 15,quick-ball,33,1000,,
-16,cherish-ball,33,200,,
-17,potion,27,300,30,
-18,antidote,30,100,30,
-19,burn-heal,30,250,30,
-20,ice-heal,30,250,30,
-21,awakening,30,250,30,
-22,paralyze-heal,30,200,30,
+16,cherish-ball,33,0,,
+17,potion,27,200,30,
+18,antidote,30,200,30,
+19,burn-heal,30,300,30,
+20,ice-heal,30,100,30,
+21,awakening,30,100,30,
+22,paralyze-heal,30,300,30,
 23,full-restore,27,3000,30,
 24,max-potion,27,2500,30,
-25,hyper-potion,27,1200,30,
+25,hyper-potion,27,1500,30,
 26,super-potion,27,700,30,
-27,full-heal,30,600,30,
-28,revive,29,1500,30,
+27,full-heal,30,400,30,
+28,revive,29,2000,30,
 29,max-revive,29,4000,30,
 30,fresh-water,27,200,30,
 31,soda-pop,27,300,30,
-32,lemonade,27,350,30,
-33,moomoo-milk,27,500,30,
+32,lemonade,27,400,30,
+33,moomoo-milk,27,600,30,
 34,energy-powder,27,500,30,
-35,energy-root,27,800,30,
-36,heal-powder,30,450,30,
+35,energy-root,27,1200,30,
+36,heal-powder,30,300,30,
 37,revival-herb,29,2800,30,
 38,ether,28,1200,30,
 39,max-ether,28,2000,30,
 40,elixir,28,3000,30,
 41,max-elixir,28,4500,30,
-42,lava-cookie,30,200,30,
-43,berry-juice,27,100,30,
-44,sacred-ash,29,200,30,
-45,hp-up,26,9800,30,
-46,protein,26,9800,30,
-47,iron,26,9800,30,
-48,carbos,26,9800,30,
-49,calcium,26,9800,30,
-50,rare-candy,26,4800,30,
-51,pp-up,26,9800,30,
-52,zinc,26,9800,30,
-53,pp-max,26,9800,30,
-54,old-gateau,30,200,30,
-55,guard-spec,1,700,30,
-56,dire-hit,1,650,30,
-57,x-attack,1,500,30,
-58,x-defense,1,550,30,
-59,x-speed,1,350,30,
-60,x-accuracy,1,950,30,
-61,x-sp-atk,1,350,30,
-62,x-sp-def,1,350,30,
-63,poke-doll,11,1000,30,
-64,fluffy-tail,11,1000,30,
-65,blue-flute,38,100,30,
-66,yellow-flute,38,200,30,
-67,red-flute,38,300,30,
-68,black-flute,11,400,30,
-69,white-flute,11,500,30,
+42,lava-cookie,30,350,30,
+43,berry-juice,27,200,30,
+44,sacred-ash,29,50000,30,
+45,hp-up,26,10000,30,
+46,protein,26,10000,30,
+47,iron,26,10000,30,
+48,carbos,26,10000,30,
+49,calcium,26,10000,30,
+50,rare-candy,26,10000,30,
+51,pp-up,26,10000,30,
+52,zinc,26,10000,30,
+53,pp-max,26,10000,30,
+54,old-gateau,30,350,30,
+55,guard-spec,1,1500,30,
+56,dire-hit,1,1000,30,
+57,x-attack,1,1000,30,
+58,x-defense,1,2000,30,
+59,x-speed,1,1000,30,
+60,x-accuracy,1,1000,30,
+61,x-sp-atk,1,1000,30,
+62,x-sp-def,1,2000,30,
+63,poke-doll,11,100,30,
+64,fluffy-tail,11,100,30,
+65,blue-flute,38,20,30,
+66,yellow-flute,38,20,30,
+67,red-flute,38,20,30,
+68,black-flute,11,20,30,
+69,white-flute,11,20,30,
 70,shoal-salt,9,20,30,
 71,shoal-shell,9,20,30,
-72,red-shard,9,200,30,
-73,blue-shard,9,200,30,
-74,yellow-shard,9,200,30,
-75,green-shard,9,200,30,
-76,super-repel,11,500,30,
-77,max-repel,11,700,30,
-78,escape-rope,11,550,30,
-79,repel,11,350,30,
-80,sun-stone,10,2100,30,
-81,moon-stone,10,2100,30,
-82,fire-stone,10,2100,30,
-83,thunder-stone,10,2100,30,
-84,water-stone,10,2100,30,
-85,leaf-stone,10,2100,30,
+72,red-shard,9,1000,30,
+73,blue-shard,9,1000,30,
+74,yellow-shard,9,1000,30,
+75,green-shard,9,1000,30,
+76,super-repel,11,700,30,
+77,max-repel,11,900,30,
+78,escape-rope,11,1000,30,
+79,repel,11,400,30,
+80,sun-stone,10,3000,30,
+81,moon-stone,10,3000,30,
+82,fire-stone,10,3000,30,
+83,thunder-stone,10,3000,30,
+84,water-stone,10,3000,30,
+85,leaf-stone,10,3000,30,
 86,tiny-mushroom,24,500,30,
 87,big-mushroom,24,5000,30,
-88,pearl,24,1400,30,
-89,big-pearl,24,7500,30,
-90,stardust,24,2000,30,
-91,star-piece,24,9800,30,
+88,pearl,24,2000,30,
+89,big-pearl,24,8000,30,
+90,stardust,24,3000,30,
+91,star-piece,24,12000,30,
 92,nugget,24,10000,30,
 93,heart-scale,9,100,30,
-94,honey,35,100,30,
+94,honey,35,300,30,
 95,growth-mulch,32,200,30,
 96,damp-mulch,32,200,30,
 97,stable-mulch,32,200,30,
 98,gooey-mulch,32,200,30,
-99,root-fossil,35,1000,100,
-100,claw-fossil,35,1000,100,
-101,helix-fossil,35,1000,100,
-102,dome-fossil,35,1000,100,
-103,old-amber,35,1000,100,
-104,armor-fossil,35,1000,100,
-105,skull-fossil,35,1000,100,
-106,rare-bone,24,10000,100,
-107,shiny-stone,10,2100,80,
-108,dusk-stone,10,2100,80,
-109,dawn-stone,10,2100,80,
-110,oval-stone,10,2100,80,
+99,root-fossil,35,7000,100,
+100,claw-fossil,35,7000,100,
+101,helix-fossil,35,7000,100,
+102,dome-fossil,35,7000,100,
+103,old-amber,35,10000,100,
+104,armor-fossil,35,7000,100,
+105,skull-fossil,35,7000,100,
+106,rare-bone,24,5000,100,
+107,shiny-stone,10,3000,80,
+108,dusk-stone,10,3000,80,
+109,dawn-stone,10,3000,80,
+110,oval-stone,10,2000,80,
 111,odd-keystone,35,2100,80,
-112,adamant-orb,18,10000,60,
-113,lustrous-orb,18,10000,60,
+112,adamant-orb,18,0,60,
+113,lustrous-orb,18,0,60,
 114,grass-mail,25,50,,
 115,flame-mail,25,50,,
 116,bubble-mail,25,50,,
@@ -188,91 +188,91 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 187,custap-berry,5,20,10,
 188,jaboca-berry,4,20,10,
 189,rowap-berry,4,20,10,
-190,bright-powder,12,10,10,
-191,white-herb,12,100,10,4
+190,bright-powder,12,4000,10,
+191,white-herb,12,4000,10,4
 192,macho-brace,14,3000,60,
-193,exp-share,16,3000,30,
-194,quick-claw,12,100,80,
-195,soothe-bell,16,100,10,
-196,mental-herb,12,100,10,4
-197,choice-band,13,100,10,
-198,kings-rock,12,100,30,7
-199,silver-powder,19,100,10,
-200,amulet-coin,16,100,30,
-201,cleanse-tag,16,200,30,
-202,soul-dew,18,200,30,
-203,deep-sea-tooth,18,200,90,
-204,deep-sea-scale,18,200,30,
-205,smoke-ball,12,200,30,
-206,everstone,16,200,30,
-207,focus-band,12,200,10,
-208,lucky-egg,16,200,30,
-209,scope-lens,12,200,30,
-210,metal-coat,19,100,30,
-211,leftovers,12,200,10,
-212,dragon-scale,10,2100,30,
-213,light-ball,18,100,30,5
-214,soft-sand,19,100,10,
-215,hard-stone,19,100,100,
-216,miracle-seed,19,100,30,
-217,black-glasses,19,100,30,
-218,black-belt,19,100,30,
-219,magnet,19,100,30,
-220,mystic-water,19,100,30,
-221,sharp-beak,19,100,50,
-222,poison-barb,19,100,70,6
-223,never-melt-ice,19,100,30,
-224,spell-tag,19,100,30,
-225,twisted-spoon,19,100,30,
-226,charcoal,19,9800,30,
-227,dragon-fang,19,100,70,
-228,silk-scarf,19,100,10,
-229,up-grade,10,2100,30,
-230,shell-bell,12,200,30,
-231,sea-incense,19,9600,10,
-232,lax-incense,12,9600,10,
-233,lucky-punch,18,10,40,
-234,metal-powder,18,10,10,
-235,thick-club,18,500,90,
-236,stick,18,200,60,
+193,exp-share,16,0,,
+194,quick-claw,12,4000,80,
+195,soothe-bell,16,4000,10,
+196,mental-herb,12,4000,10,4
+197,choice-band,13,4000,10,
+198,kings-rock,12,5000,30,7
+199,silver-powder,19,1000,10,
+200,amulet-coin,16,10000,30,
+201,cleanse-tag,16,5000,30,
+202,soul-dew,18,0,30,
+203,deep-sea-tooth,18,2000,90,
+204,deep-sea-scale,18,2000,30,
+205,smoke-ball,12,4000,30,
+206,everstone,16,3000,30,
+207,focus-band,12,4000,10,
+208,lucky-egg,16,10000,30,
+209,scope-lens,12,4000,30,
+210,metal-coat,19,2000,30,
+211,leftovers,12,4000,10,
+212,dragon-scale,10,2000,30,
+213,light-ball,18,1000,30,5
+214,soft-sand,19,1000,10,
+215,hard-stone,19,1000,100,
+216,miracle-seed,19,1000,30,
+217,black-glasses,19,1000,30,
+218,black-belt,19,1000,30,
+219,magnet,19,1000,30,
+220,mystic-water,19,1000,30,
+221,sharp-beak,19,1000,50,
+222,poison-barb,19,1000,70,6
+223,never-melt-ice,19,1000,30,
+224,spell-tag,19,1000,30,
+225,twisted-spoon,19,1000,30,
+226,charcoal,19,1000,30,
+227,dragon-fang,19,1000,70,
+228,silk-scarf,19,1000,10,
+229,up-grade,10,2000,30,
+230,shell-bell,12,4000,30,
+231,sea-incense,19,2000,10,
+232,lax-incense,12,5000,10,
+233,lucky-punch,18,1000,40,
+234,metal-powder,18,1000,10,
+235,thick-club,18,1000,90,
+236,stick,18,1000,60,
 237,red-scarf,36,100,10,
 238,blue-scarf,36,100,10,
 239,pink-scarf,36,100,10,
 240,green-scarf,36,100,10,
 241,yellow-scarf,36,100,10,
-242,wide-lens,12,200,10,
-243,muscle-band,12,200,10,
-244,wise-glasses,12,200,10,
-245,expert-belt,12,200,10,
-246,light-clay,12,200,30,
-247,life-orb,12,200,30,
-248,power-herb,12,100,10,
-249,toxic-orb,15,100,30,1
-250,flame-orb,15,100,30,2
-251,quick-powder,18,10,10,
-252,focus-sash,12,200,10,
-253,zoom-lens,12,200,10,
-254,metronome,12,200,30,
-255,iron-ball,15,200,130,
-256,lagging-tail,15,200,10,
-257,destiny-knot,12,200,10,
-258,black-sludge,12,200,30,
-259,icy-rock,12,200,40,
-260,smooth-rock,12,200,10,
-261,heat-rock,12,200,60,
-262,damp-rock,12,200,60,
-263,grip-claw,12,200,90,
-264,choice-scarf,13,200,10,
-265,sticky-barb,15,200,80,
+242,wide-lens,12,4000,10,
+243,muscle-band,12,4000,10,
+244,wise-glasses,12,4000,10,
+245,expert-belt,12,4000,10,
+246,light-clay,12,4000,30,
+247,life-orb,12,4000,30,
+248,power-herb,12,4000,10,
+249,toxic-orb,15,4000,30,1
+250,flame-orb,15,4000,30,2
+251,quick-powder,18,1000,10,
+252,focus-sash,12,4000,10,
+253,zoom-lens,12,4000,10,
+254,metronome,12,4000,30,
+255,iron-ball,15,4000,130,
+256,lagging-tail,15,4000,10,
+257,destiny-knot,12,4000,10,
+258,black-sludge,12,4000,30,
+259,icy-rock,12,4000,40,
+260,smooth-rock,12,4000,10,
+261,heat-rock,12,4000,60,
+262,damp-rock,12,4000,60,
+263,grip-claw,12,4000,90,
+264,choice-scarf,13,4000,10,
+265,sticky-barb,15,4000,80,
 266,power-bracer,14,3000,70,
 267,power-belt,14,3000,70,
 268,power-lens,14,3000,70,
 269,power-band,14,3000,70,
 270,power-anklet,14,3000,70,
 271,power-weight,14,3000,70,
-272,shed-shell,12,100,10,
-273,big-root,12,200,10,
-274,choice-specs,13,200,10,
+272,shed-shell,12,4000,10,
+273,big-root,12,4000,10,
+274,choice-specs,13,4000,10,
 275,flame-plate,17,1000,90,
 276,splash-plate,17,1000,90,
 277,zap-plate,17,1000,90,
@@ -289,112 +289,112 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 288,draco-plate,17,1000,90,
 289,dread-plate,17,1000,90,
 290,iron-plate,17,1000,90,
-291,odd-incense,19,9600,10,
-292,rock-incense,19,9600,10,
-293,full-incense,15,9600,10,
-294,wave-incense,19,9600,10,
-295,rose-incense,19,9600,10,
-296,luck-incense,16,9600,10,
-297,pure-incense,16,9600,10,
-298,protector,10,2100,80,
-299,electirizer,10,2100,80,
-300,magmarizer,10,2100,80,
-301,dubious-disc,10,2100,50,
-302,reaper-cloth,10,2100,10,
-303,razor-claw,12,2100,80,
-304,razor-fang,12,2100,30,7
-305,tm01,37,3000,,
-306,tm02,37,3000,,
-307,tm03,37,3000,,
-308,tm04,37,1500,,
-309,tm05,37,1000,,
-310,tm06,37,3000,,
-311,tm07,37,2000,,
-312,tm08,37,1500,,
-313,tm09,37,2000,,
-314,tm10,37,2000,,
-315,tm11,37,2000,,
-316,tm12,37,1500,,
-317,tm13,37,3000,,
-318,tm14,37,5500,,
-319,tm15,37,7500,,
-320,tm16,37,2000,,
-321,tm17,37,2000,,
-322,tm18,37,2000,,
-323,tm19,37,3000,,
-324,tm20,37,2000,,
-325,tm21,37,1000,,
-326,tm22,37,3000,,
-327,tm23,37,3000,,
-328,tm24,37,3000,,
-329,tm25,37,5500,,
-330,tm26,37,3000,,
-331,tm27,37,1000,,
-332,tm28,37,2000,,
-333,tm29,37,3000,,
-334,tm30,37,3000,,
-335,tm31,37,3000,,
-336,tm32,37,1000,,
-337,tm33,37,2000,,
-338,tm34,37,3000,,
-339,tm35,37,3000,,
-340,tm36,37,3000,,
-341,tm37,37,2000,,
-342,tm38,37,5500,,
-343,tm39,37,2000,,
-344,tm40,37,3000,,
-345,tm41,37,1500,,
-346,tm42,37,3000,,
-347,tm43,37,2000,,
-348,tm44,37,3000,,
-349,tm45,37,3000,,
-350,tm46,37,2000,,
-351,tm47,37,3000,,
-352,tm48,37,3000,,
-353,tm49,37,1500,,
-354,tm50,37,5500,,
-355,tm51,37,2000,,
-356,tm52,37,5500,,
-357,tm53,37,3000,,
-358,tm54,37,2000,,
-359,tm55,37,3000,,
-360,tm56,37,2000,,
-361,tm57,37,3000,,
-362,tm58,37,2000,,
-363,tm59,37,3000,,
-364,tm60,37,3000,,
-365,tm61,37,2000,,
-366,tm62,37,3000,,
-367,tm63,37,2000,,
-368,tm64,37,7500,,
-369,tm65,37,3000,,
-370,tm66,37,3000,,
-371,tm67,37,1000,,
-372,tm68,37,7500,,
-373,tm69,37,1500,,
-374,tm70,37,1000,,
-375,tm71,37,3000,,
-376,tm72,37,3000,,
-377,tm73,37,2000,,
-378,tm74,37,3000,,
-379,tm75,37,1500,,
-380,tm76,37,2000,,
-381,tm77,37,1500,,
-382,tm78,37,1500,,
-383,tm79,37,3000,,
-384,tm80,37,3000,,
-385,tm81,37,3000,,
-386,tm82,37,1000,,
-387,tm83,37,2000,,
-388,tm84,37,3000,,
-389,tm85,37,3000,,
-390,tm86,37,3000,,
-391,tm87,37,1500,,
-392,tm88,37,3000,,
-393,tm89,37,3000,,
-394,tm90,37,2000,,
-395,tm91,37,3000,,
-396,tm92,37,5500,,
+291,odd-incense,19,2000,10,
+292,rock-incense,19,2000,10,
+293,full-incense,15,5000,10,
+294,wave-incense,19,2000,10,
+295,rose-incense,19,2000,10,
+296,luck-incense,16,11000,10,
+297,pure-incense,16,6000,10,
+298,protector,10,2000,80,
+299,electirizer,10,2000,80,
+300,magmarizer,10,2000,80,
+301,dubious-disc,10,2000,50,
+302,reaper-cloth,10,2000,10,
+303,razor-claw,12,5000,80,
+304,razor-fang,12,5000,30,7
+305,tm01,37,10000,,
+306,tm02,37,10000,,
+307,tm03,37,10000,,
+308,tm04,37,10000,,
+309,tm05,37,10000,,
+310,tm06,37,10000,,
+311,tm07,37,50000,,
+312,tm08,37,10000,,
+313,tm09,37,10000,,
+314,tm10,37,10000,,
+315,tm11,37,50000,,
+316,tm12,37,10000,,
+317,tm13,37,10000,,
+318,tm14,37,30000,,
+319,tm15,37,50000,,
+320,tm16,37,10000,,
+321,tm17,37,10000,,
+322,tm18,37,50000,,
+323,tm19,37,10000,,
+324,tm20,37,10000,,
+325,tm21,37,10000,,
+326,tm22,37,10000,,
+327,tm23,37,10000,,
+328,tm24,37,10000,,
+329,tm25,37,30000,,
+330,tm26,37,10000,,
+331,tm27,37,10000,,
+332,tm28,37,30000,,
+333,tm29,37,10000,,
+334,tm30,37,10000,,
+335,tm31,37,10000,,
+336,tm32,37,10000,,
+337,tm33,37,10000,,
+338,tm34,37,10000,,
+339,tm35,37,10000,,
+340,tm36,37,10000,,
+341,tm37,37,50000,,
+342,tm38,37,30000,,
+343,tm39,37,10000,,
+344,tm40,37,10000,,
+345,tm41,37,10000,,
+346,tm42,37,10000,,
+347,tm43,37,10000,,
+348,tm44,37,10000,,
+349,tm45,37,10000,,
+350,tm46,37,10000,,
+351,tm47,37,10000,,
+352,tm48,37,10000,,
+353,tm49,37,10000,,
+354,tm50,37,80000,,
+355,tm51,37,10000,,
+356,tm52,37,30000,,
+357,tm53,37,10000,,
+358,tm54,37,10000,,
+359,tm55,37,10000,,
+360,tm56,37,10000,,
+361,tm57,37,10000,,
+362,tm58,37,10000,,
+363,tm59,37,30000,,
+364,tm60,37,10000,,
+365,tm61,37,10000,,
+366,tm62,37,10000,,
+367,tm63,37,10000,,
+368,tm64,37,10000,,
+369,tm65,37,10000,,
+370,tm66,37,10000,,
+371,tm67,37,10000,,
+372,tm68,37,50000,,
+373,tm69,37,10000,,
+374,tm70,37,30000,,
+375,tm71,37,30000,,
+376,tm72,37,10000,,
+377,tm73,37,5000,,
+378,tm74,37,10000,,
+379,tm75,37,10000,,
+380,tm76,37,10000,,
+381,tm77,37,10000,,
+382,tm78,37,10000,,
+383,tm79,37,10000,,
+384,tm80,37,10000,,
+385,tm81,37,10000,,
+386,tm82,37,10000,,
+387,tm83,37,10000,,
+388,tm84,37,10000,,
+389,tm85,37,10000,,
+390,tm86,37,10000,,
+391,tm87,37,10000,,
+392,tm88,37,10000,,
+393,tm89,37,10000,,
+394,tm90,37,10000,,
+395,tm91,37,10000,,
+396,tm92,37,10000,,
 397,hm01,37,0,,
 398,hm02,37,0,,
 399,hm03,37,0,,
@@ -440,31 +440,31 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 439,coupon-3,22,0,,
 440,storage-key,22,0,,
 441,secret-potion,22,0,,
-442,griseous-orb,18,10000,,
+442,griseous-orb,18,0,60,
 443,vs-recorder,21,0,,
 444,gracidea,20,0,,
 445,secret-key,20,0,,
 446,apricorn-box,21,0,,
 447,berry-pots,21,0,,
 448,squirt-bottle,22,0,,
-449,lure-ball,39,300,,
-450,level-ball,39,300,,
-451,moon-ball,39,300,,
-452,heavy-ball,39,300,,
-453,fast-ball,39,300,,
-454,friend-ball,39,300,,
-455,love-ball,39,300,,
+449,lure-ball,39,0,,
+450,level-ball,39,0,,
+451,moon-ball,39,0,,
+452,heavy-ball,39,0,,
+453,fast-ball,39,0,,
+454,friend-ball,39,0,,
+455,love-ball,39,0,,
 456,park-ball,34,0,,
-457,sport-ball,34,0,,
-458,red-apricorn,40,0,,
-459,blue-apricorn,40,0,,
-460,yellow-apricorn,40,0,,
-461,green-apricorn,40,0,,
-462,pink-apricorn,40,0,,
-463,white-apricorn,40,0,,
-464,black-apricorn,40,0,,
+457,sport-ball,34,300,,
+458,red-apricorn,40,20,,
+459,blue-apricorn,40,20,,
+460,yellow-apricorn,40,20,,
+461,green-apricorn,40,20,,
+462,pink-apricorn,40,20,,
+463,white-apricorn,40,20,,
+464,black-apricorn,40,20,,
 465,dowsing-machine,21,0,,
-466,rage-candy-bar,21,0,,
+466,rage-candy-bar,21,350,30,
 467,red-orb,22,0,,
 468,blue-orb,22,0,,
 469,jade-orb,22,0,,
@@ -561,11 +561,11 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 560,sapphire,22,0,,
 561,magma-emblem,22,0,,
 562,old-sea-map,20,0,,
-563,douse-drive,18,1000,70,
-564,shock-drive,18,1000,70,
-565,burn-drive,18,1000,70,
-566,chill-drive,18,1000,70,
-567,sweet-heart,27,100,30,
+563,douse-drive,18,0,70,
+564,shock-drive,18,0,70,
+565,burn-drive,18,0,70,
+566,chill-drive,18,0,70,
+567,sweet-heart,27,3000,30,
 568,greet-mail,25,50,,
 569,favored-mail,25,50,,
 570,rsvp-mail,25,50,,
@@ -578,17 +578,17 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 577,bridge-mail-t,25,50,,
 578,bridge-mail-v,25,50,,
 579,bridge-mail-m,25,50,,
-580,prism-scale,10,500,30,
-581,eviolite,12,200,40,
-582,float-stone,12,200,30,
-583,rocky-helmet,12,200,60,
-584,air-balloon,12,200,10,
-585,red-card,12,200,10,
-586,ring-target,12,200,10,
-587,binding-band,12,200,30,
-588,absorb-bulb,12,200,30,
-589,cell-battery,12,200,30,
-590,eject-button,12,200,30,
+580,prism-scale,10,2000,30,
+581,eviolite,12,4000,40,
+582,float-stone,12,4000,30,
+583,rocky-helmet,12,4000,60,
+584,air-balloon,12,4000,10,
+585,red-card,12,4000,10,
+586,ring-target,12,4000,10,
+587,binding-band,12,4000,30,
+588,absorb-bulb,12,4000,30,
+589,cell-battery,12,4000,30,
+590,eject-button,12,4000,30,
 591,fire-gem,42,200,,
 592,water-gem,42,200,,
 593,electric-gem,42,200,,
@@ -604,33 +604,33 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 603,ghost-gem,42,200,,
 604,dark-gem,42,200,,
 605,steel-gem,42,200,,
-606,health-wing,26,3000,20,
-607,muscle-wing,26,3000,20,
-608,resist-wing,26,3000,20,
-609,genius-wing,26,3000,20,
-610,clever-wing,26,3000,20,
-611,swift-wing,26,3000,20,
-612,pretty-wing,24,200,20,
-613,cover-fossil,35,1000,100,
-614,plume-fossil,35,1000,100,
+606,health-wing,26,300,20,
+607,muscle-wing,26,300,20,
+608,resist-wing,26,300,20,
+609,genius-wing,26,300,20,
+610,clever-wing,26,300,20,
+611,swift-wing,26,300,20,
+612,pretty-wing,24,1000,20,
+613,cover-fossil,35,7000,100,
+614,plume-fossil,35,7000,100,
 615,liberty-pass,20,0,,
 616,pass-orb,12,200,30,
 617,dream-ball,33,0,,
-618,poke-toy,11,1000,30,
+618,poke-toy,11,100,30,
 619,prop-case,21,0,,
 620,dragon-skull,22,0,,
-621,balm-mushroom,24,0,30,
-622,big-nugget,24,0,30,
-623,pearl-string,24,0,30,
-624,comet-shard,24,0,30,
+621,balm-mushroom,24,15000,30,
+622,big-nugget,24,40000,30,
+623,pearl-string,24,30000,30,
+624,comet-shard,24,60000,30,
 625,relic-copper,24,0,30,
 626,relic-silver,24,0,30,
-627,relic-gold,24,0,30,
+627,relic-gold,24,60000,30,
 628,relic-vase,24,0,30,
 629,relic-band,24,0,30,
 630,relic-statue,24,0,30,
 631,relic-crown,24,0,30,
-632,casteliacone,30,100,30,
+632,casteliacone,30,350,30,
 633,dire-hit-2,43,0,,
 634,x-speed-2,43,0,,
 635,x-sp-atk-2,43,0,,
@@ -657,8 +657,8 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 656,dire-hit-3,43,0,,
 657,light-stone,22,0,,
 658,dark-stone,22,0,,
-659,tm93,37,10000,,
-660,tm94,37,10000,,
+659,tm93,37,50000,,
+660,tm94,37,30000,,
 661,tm95,37,10000,,
 662,xtransceiver,21,0,,
 663,god-stone,23,0,,
@@ -666,7 +666,7 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 665,gram-2,22,0,,
 666,gram-3,22,0,,
 668,dragon-gem,42,200,,
-669,normal-gem,42,200,,
+669,normal-gem,42,4000,,
 670,medal-box,21,0,,
 671,dna-splicers,21,0,,
 673,permit,21,0,,
@@ -677,56 +677,56 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 678,colress-machine,22,0,,
 679,dropped-item,22,0,,
 681,reveal-glass,21,0,,
-682,weakness-policy,12,0,,
-683,assault-vest,12,0,,
-684,pixie-plate,17,0,,
-685,ability-capsule,26,0,,
-686,whipped-dream,10,0,,
-687,sachet,10,0,,
-688,luminous-moss,12,0,,
-689,snowball,12,0,,
-690,safety-goggles,12,0,,
-691,rich-mulch,32,0,,
-692,surprise-mulch,32,0,,
-693,boost-mulch,32,0,,
-694,amaze-mulch,32,0,,
-695,gengarite,44,0,,
-696,gardevoirite,44,0,,
-697,ampharosite,44,0,,
-698,venusaurite,44,0,,
-699,charizardite-x,44,0,,
-700,blastoisinite,44,0,,
-701,mewtwonite-x,44,0,,
-702,mewtwonite-y,44,0,,
-703,blazikenite,44,0,,
-704,medichamite,44,0,,
-705,houndoominite,44,0,,
-706,aggronite,44,0,,
-707,banettite,44,0,,
-708,tyranitarite,44,0,,
-709,scizorite,44,0,,
-710,pinsirite,44,0,,
-711,aerodactylite,44,0,,
-712,lucarionite,44,0,,
-713,abomasite,44,0,,
-714,kangaskhanite,44,0,,
-715,gyaradosite,44,0,,
-716,absolite,44,0,,
-717,charizardite-y,44,0,,
-718,alakazite,44,0,,
-719,heracronite,44,0,,
-720,mawilite,44,0,,
-721,manectite,44,0,,
-722,garchompite,44,0,,
-723,roseli-berry,7,0,,
-724,kee-berry,4,0,,
-725,maranga-berry,4,0,,
-726,discount-coupon,10001,0,,
-727,strange-souvenir,10001,0,,
-728,lumiose-galette,30,0,,
-729,jaw-fossil,35,0,,
-730,sail-fossil,35,0,,
-731,fairy-gem,42,0,,
+682,weakness-policy,12,1000,80,
+683,assault-vest,12,1000,80,
+684,pixie-plate,17,1000,90,
+685,ability-capsule,26,10000,,
+686,whipped-dream,10,2000,80,
+687,sachet,10,2000,80,
+688,luminous-moss,12,4000,30,
+689,snowball,12,4000,30,
+690,safety-goggles,12,4000,80,
+691,rich-mulch,32,200,30,
+692,surprise-mulch,32,200,30,
+693,boost-mulch,32,200,30,
+694,amaze-mulch,32,200,30,
+695,gengarite,44,0,80,
+696,gardevoirite,44,0,80,
+697,ampharosite,44,0,80,
+698,venusaurite,44,0,80,
+699,charizardite-x,44,0,80,
+700,blastoisinite,44,0,80,
+701,mewtwonite-x,44,0,80,
+702,mewtwonite-y,44,0,80,
+703,blazikenite,44,0,80,
+704,medichamite,44,0,80,
+705,houndoominite,44,0,80,
+706,aggronite,44,0,80,
+707,banettite,44,0,80,
+708,tyranitarite,44,0,80,
+709,scizorite,44,0,80,
+710,pinsirite,44,0,80,
+711,aerodactylite,44,0,80,
+712,lucarionite,44,0,80,
+713,abomasite,44,0,80,
+714,kangaskhanite,44,0,80,
+715,gyaradosite,44,0,80,
+716,absolite,44,0,80,
+717,charizardite-y,44,0,80,
+718,alakazite,44,0,80,
+719,heracronite,44,0,80,
+720,mawilite,44,0,80,
+721,manectite,44,0,80,
+722,garchompite,44,0,80,
+723,roseli-berry,7,20,10,
+724,kee-berry,4,20,10,
+725,maranga-berry,4,20,10,
+726,discount-coupon,24,20,10,
+727,strange-souvenir,24,3000,30,
+728,lumiose-galette,30,350,30,
+729,jaw-fossil,35,7000,100,
+730,sail-fossil,35,7000,100,
+731,fairy-gem,42,200,,
 732,adventure-rules,21,0,,
 733,elevator-key,22,0,,
 734,holo-caster,21,0,,
@@ -740,8 +740,129 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 742,roller-skates,21,0,,
 743,sprinklotad,21,0,,
 744,tmv-pass,21,0,,
-745,tm96,37,0,,
-746,tm97,37,0,,
-747,tm98,37,0,,
-748,tm99,37,0,,
-749,tm100,37,0,,
+745,tm96,37,10000,,
+746,tm97,37,10000,,
+747,tm98,37,30000,,
+748,tm99,37,10000,,
+749,tm100,37,5000,,
+760,latiasite,44,0,80,
+761,latiosite,44,0,80,
+762,common-stone,23,0,,
+763,makeup-bag,21,0,,
+764,travel-trunk,23,0,,
+765,shalour-sable,30,350,30,
+768,mega-charm,23,0,,
+769,mega-glove,23,0,,
+770,devon-parts,22,0,,
+772,pokeblock-kit,21,0,,
+773,key-to-room-1,22,0,,
+774,key-to-room-2,22,0,,
+775,key-to-room-4,22,0,,
+776,key-to-room-6,22,0,,
+779,devon-scuba-gear,22,0,,
+780,contest-costume--jacket,21,0,,
+782,magma-suit,22,0,,
+783,aqua-suit,22,0,,
+784,pair-of-tickets,22,0,,
+785,mega-bracelet,21,0,,
+786,mega-pendant,23,0,,
+787,mega-glasses,23,0,,
+788,mega-anchor,23,0,,
+789,mega-stickpin,23,0,,
+790,mega-tiara,23,0,,
+791,mega-anklet,23,0,,
+793,swampertite,44,0,80,
+794,sceptilite,44,0,80,
+795,sablenite,44,0,80,
+796,altarianite,44,0,80,
+797,galladite,44,0,80,
+798,audinite,44,0,80,
+799,metagrossite,44,0,80,
+800,sharpedonite,44,0,80,
+801,slowbronite,44,0,80,
+802,steelixite,44,0,80,
+803,pidgeotite,44,0,80,
+804,glalitite,44,0,80,
+805,diancite,44,0,80,
+806,prison-bottle,21,0,,
+807,mega-cuff,23,0,,
+808,cameruptite,44,0,80,
+809,lopunnite,44,0,80,
+810,salamencite,44,0,80,
+811,beedrillite,44,0,80,
+814,key-stone,21,0,,
+815,meteorite-shard,22,0,,
+816,eon-flute,21,0,,
+817,normalium-z--held,46,0,,
+818,firium-z--held,46,0,,
+819,waterium-z--held,46,0,,
+820,electrium-z--held,46,0,,
+821,grassium-z--held,46,0,,
+822,icium-z--held,46,0,,
+823,fightinium-z--held,46,0,,
+824,poisonium-z--held,46,0,,
+825,groundium-z--held,46,0,,
+826,flyinium-z--held,46,0,,
+827,psychium-z--held,46,0,,
+828,buginium-z--held,46,0,,
+829,rockium-z--held,46,0,,
+830,ghostium-z--held,46,0,,
+831,dragonium-z--held,46,0,,
+832,darkinium-z--held,46,0,,
+833,steelium-z--held,46,0,,
+834,fairium-z--held,46,0,,
+835,pikanium-z--held,46,0,,
+836,bottle-cap,24,5000,30,
+837,gold-bottle-cap,24,10000,30,
+838,z-ring,21,0,,
+839,decidium-z--held,46,0,,
+840,incinium-z--held,46,0,,
+841,primarium-z--held,46,0,,
+842,tapunium-z--held,46,0,,
+843,marshadium-z--held,46,0,,
+844,aloraichium-z--held,46,0,,
+845,snorlium-z--held,46,0,,
+846,eevium-z--held,46,0,,
+847,mewnium-z--held,46,0,,
+877,pikashunium-z--held,46,0,,
+878,forage-bag,21,0,,
+879,fishing-rod,21,0,,
+880,professors-mask,22,0,,
+881,festival-ticket,21,10,,
+882,sparkling-stone,22,0,,
+883,adrenaline-orb,12,300,30,
+884,zygarde-cube,21,0,,
+885,ice-stone,10,3000,30,
+886,ride-pager,23,0,,
+887,beast-ball,33,0,,
+888,big-malasada,30,350,30,
+889,red-nectar,18,300,10,
+890,yellow-nectar,18,300,10,
+891,pink-nectar,18,300,10,
+892,purple-nectar,18,300,10,
+893,sun-flute,22,0,,
+894,moon-flute,22,0,,
+895,enigmatic-card,22,0,,
+896,terrain-extender,12,4000,60,
+897,protective-pads,12,4000,30,
+898,electric-seed,12,4000,10,
+899,psychic-seed,12,4000,10,
+900,misty-seed,12,4000,10,
+901,grassy-seed,12,4000,10,
+902,fighting-memory,45,1000,50,
+903,flying-memory,45,1000,50,
+904,poison-memory,45,1000,50,
+905,ground-memory,45,1000,50,
+906,rock-memory,45,1000,50,
+907,bug-memory,45,1000,50,
+908,ghost-memory,45,1000,50,
+909,steel-memory,45,1000,50,
+910,fire-memory,45,1000,50,
+911,water-memory,45,1000,50,
+912,grass-memory,45,1000,50,
+913,electric-memory,45,1000,50,
+914,psychic-memory,45,1000,50,
+915,ice-memory,45,1000,50,
+916,dragon-memory,45,1000,50,
+917,dark-memory,45,1000,50,
+918,fairy-memory,45,1000,50,

data/v2/csv/languages.csv

@@ -1,12 +1,13 @@
 id,iso639,iso3166,identifier,official,order
-1,ja,jp,ja,1,1
+1,ja,jp,ja-Hrkt,1,1
 2,ja,jp,roomaji,1,3
 3,ko,kr,ko,1,4
-4,zh,cn,zh,1,5
-5,fr,fr,fr,1,7
-6,de,de,de,1,8
-7,es,es,es,1,9
-8,it,it,it,1,10
-9,en,us,en,1,6
-10,cs,cz,cs,0,11
-11,ja,jp,ja-kanji,1,2
+4,zh,cn,zh-Hant,1,5
+5,fr,fr,fr,1,8
+6,de,de,de,1,9
+7,es,es,es,1,10
+8,it,it,it,1,11
+9,en,us,en,1,7
+10,cs,cz,cs,0,12
+11,ja,jp,ja,1,2
+12,zh,cn,zh-Hans,1,6

data/v2/csv/location_area_encounter_rates.csv

@@ -1445,22 +1445,48 @@ location_area_id,encounter_method_id,version_id,rate
 257,4,16,75
 257,5,15,15
 257,5,16,15
+258,1,10,7
+258,1,11,7
 258,1,15,5
 258,1,16,5
+259,1,10,7
+259,1,11,7
 259,1,15,5
 259,1,16,5
+260,1,10,7
+260,1,11,7
 260,1,15,5
 260,1,16,5
+261,1,10,7
+261,1,11,7
 261,1,15,10
 261,1,16,10
+261,2,10,20
+261,2,11,20
+261,3,10,20
+261,3,11,20
+261,4,10,20
+261,4,11,20
+261,5,10,2
+261,5,11,2
+262,1,10,7
+262,1,11,7
 262,1,15,10
 262,1,16,10
+262,2,10,20
+262,2,11,20
 262,2,15,25
 262,2,16,25
+262,3,10,20
+262,3,11,20
 262,3,15,50
 262,3,16,50
+262,4,10,20
+262,4,11,20
 262,4,15,75
 262,4,16,75
+262,5,10,2
+262,5,11,2
 262,5,15,5
 262,5,16,5
 263,1,15,5
@@ -1551,82 +1577,164 @@ location_area_id,encounter_method_id,version_id,rate
 275,4,16,100
 275,5,15,15
 275,5,16,15
+276,1,10,21
+276,1,11,21
+276,2,10,60
+276,2,11,60
 276,2,15,25
 276,2,16,25
+276,3,10,60
+276,3,11,60
 276,3,15,50
 276,3,16,50
+276,4,10,60
+276,4,11,60
 276,4,15,75
 276,4,16,75
+276,5,10,2
+276,5,11,2
 276,5,15,15
 276,5,16,15
+277,2,10,20
+277,2,11,20
 277,2,15,25
 277,2,16,25
+277,3,10,20
+277,3,11,20
 277,3,15,50
 277,3,16,50
+277,4,10,20
+277,4,11,20
 277,4,15,75
 277,4,16,75
+277,5,10,2
+277,5,11,2
 277,5,15,10
 277,5,16,10
 277,6,15,30
 277,6,16,30
+278,2,10,20
+278,2,11,20
 278,2,15,25
 278,2,16,25
+278,3,10,20
+278,3,11,20
 278,3,15,50
 278,3,16,50
+278,4,10,20
+278,4,11,20
 278,4,15,75
 278,4,16,75
+278,5,10,2
+278,5,11,2
 278,5,15,10
 278,5,16,10
+279,2,10,10
+279,2,11,10
 279,2,15,25
 279,2,16,25
+279,3,10,10
+279,3,11,10
 279,3,15,50
 279,3,16,50
+279,4,10,10
+279,4,11,10
 279,4,15,75
 279,4,16,75
+279,5,10,1
+279,5,11,1
 279,5,15,15
 279,5,16,15
+280,2,10,10
+280,2,11,10
 280,2,15,25
 280,2,16,25
+280,3,10,10
+280,3,11,10
 280,3,15,50
 280,3,16,50
+280,4,10,10
+280,4,11,10
 280,4,15,75
 280,4,16,75
+280,5,10,1
+280,5,11,1
 280,5,15,15
 280,5,16,15
+281,2,10,10
+281,2,11,10
 281,2,15,25
 281,2,16,25
+281,3,10,10
+281,3,11,10
 281,3,15,50
 281,3,16,50
+281,4,10,10
+281,4,11,10
 281,4,15,75
 281,4,16,75
+281,5,10,1
+281,5,11,1
 281,5,15,10
 281,5,16,10
+282,2,10,10
+282,2,11,10
 282,2,15,25
 282,2,16,25
+282,3,10,10
+282,3,11,10
 282,3,15,50
 282,3,16,50
+282,4,10,10
+282,4,11,10
 282,4,15,75
 282,4,16,75
+282,5,10,1
+282,5,11,1
 282,5,15,15
 282,5,16,15
 282,6,15,40
 282,6,16,40
+283,2,10,10
+283,2,11,10
+283,3,10,10
+283,3,11,10
+283,4,10,10
+283,4,11,10
+283,5,10,1
+283,5,11,1
 283,5,15,15
 283,5,16,15
+284,2,10,10
+284,2,11,10
 284,2,15,25
 284,2,16,25
+284,3,10,10
+284,3,11,10
 284,3,15,50
 284,3,16,50
+284,4,10,10
+284,4,11,10
 284,4,15,75
 284,4,16,75
+284,5,10,1
+284,5,11,1
 284,5,15,15
 284,5,16,15
+285,2,10,10
+285,2,11,10
 285,2,15,25
 285,2,16,25
+285,3,10,10
+285,3,11,10
 285,3,15,50
 285,3,16,50
+285,4,10,10
+285,4,11,10
 285,4,15,75
 285,4,16,75
+285,5,10,1
+285,5,11,1
 285,5,15,15
 285,5,16,15
 286,1,15,25
@@ -1661,50 +1769,92 @@ location_area_id,encounter_method_id,version_id,rate
 289,4,16,75
 289,5,15,10
 289,5,16,10
+290,1,10,7
+290,1,11,7
 290,1,15,15
 290,1,16,15
 291,1,15,15
 291,1,16,15
+292,1,10,7
+292,1,11,7
 292,1,15,15
 292,1,16,15
+293,1,10,7
+293,1,11,7
 293,1,15,15
 293,1,16,15
+293,6,10,50
+293,6,11,50
 293,6,15,20
 293,6,16,20
 294,1,15,10
 294,1,16,10
+295,1,10,21
+295,1,11,21
 295,1,15,20
 295,1,16,20
+296,1,10,21
+296,1,11,21
 296,1,15,20
 296,1,16,20
+297,1,10,21
+297,1,11,21
 297,1,15,20
 297,1,16,20
+298,1,10,21
+298,1,11,21
 298,1,15,20
 298,1,16,20
+298,2,10,20
+298,2,11,20
 298,2,15,25
 298,2,16,25
+298,3,10,20
+298,3,11,20
 298,3,15,50
 298,3,16,50
+298,4,10,20
+298,4,11,20
 298,4,15,75
 298,4,16,75
+298,5,10,2
+298,5,11,2
 298,5,15,15
 298,5,16,15
+299,1,10,21
+299,1,11,21
 299,1,15,20
 299,1,16,20
+300,1,10,21
+300,1,11,21
 300,1,15,20
 300,1,16,20
+300,2,10,20
+300,2,11,20
 300,2,15,25
 300,2,16,25
+300,3,10,20
+300,3,11,20
 300,3,15,50
 300,3,16,50
+300,4,10,20
+300,4,11,20
 300,4,15,75
 300,4,16,75
+300,5,10,2
+300,5,11,2
 300,5,15,15
 300,5,16,15
+301,1,10,21
+301,1,11,21
 301,1,15,20
 301,1,16,20
+302,1,10,21
+302,1,11,21
 302,1,15,20
 302,1,16,20
+303,1,10,21
+303,1,11,21
 303,1,15,20
 303,1,16,20
 303,2,15,25
@@ -1715,76 +1865,156 @@ location_area_id,encounter_method_id,version_id,rate
 303,4,16,75
 303,5,15,15
 303,5,16,15
+304,1,10,21
+304,1,11,21
 304,1,15,20
 304,1,16,20
+304,2,10,20
+304,2,11,20
 304,2,15,25
 304,2,16,25
+304,3,10,20
+304,3,11,20
 304,3,15,50
 304,3,16,50
+304,4,10,20
+304,4,11,20
 304,4,15,75
 304,4,16,75
+304,5,10,2
+304,5,11,2
 304,5,15,15
 304,5,16,15
+305,1,10,21
+305,1,11,21
 305,1,15,20
 305,1,16,20
+305,2,10,20
+305,2,11,20
+305,3,10,20
+305,3,11,20
+305,4,10,20
+305,4,11,20
+305,5,10,2
+305,5,11,2
+306,1,10,21
+306,1,11,21
 306,1,15,20
 306,1,16,20
+306,2,10,20
+306,2,11,20
 306,2,15,25
 306,2,16,25
+306,3,10,20
+306,3,11,20
 306,3,15,50
 306,3,16,50
+306,4,10,20
+306,4,11,20
 306,4,15,75
 306,4,16,75
+306,5,10,2
+306,5,11,2
 306,5,15,15
 306,5,16,15
+307,1,10,21
+307,1,11,21
 307,1,15,20
 307,1,16,20
+308,1,10,21
+308,1,11,21
 308,1,15,20
 308,1,16,20
+309,1,10,21
+309,1,11,21
 309,1,15,20
 309,1,16,20
+310,1,10,21
+310,1,11,21
 310,1,15,20
 310,1,16,20
+311,1,10,21
+311,1,11,21
 311,1,15,20
 311,1,16,20
+312,1,10,14
+312,1,11,14
 312,1,15,20
 312,1,16,20
+312,2,10,20
+312,2,11,20
 312,2,15,25
 312,2,16,25
+312,3,10,20
+312,3,11,20
 312,3,15,50
 312,3,16,50
+312,4,10,20
+312,4,11,20
 312,4,15,75
 312,4,16,75
+312,5,10,2
+312,5,11,2
 312,5,15,10
 312,5,16,10
+313,1,10,21
+313,1,11,21
 313,1,15,20
 313,1,16,20
+313,2,10,20
+313,2,11,20
 313,2,15,25
 313,2,16,25
+313,3,10,20
+313,3,11,20
 313,3,15,50
 313,3,16,50
+313,4,10,20
+313,4,11,20
 313,4,15,75
 313,4,16,75
+313,5,10,2
+313,5,11,2
 313,5,15,10
 313,5,16,10
+314,1,10,21
+314,1,11,21
 314,1,15,20
 314,1,16,20
+314,2,10,20
+314,2,11,20
 314,2,15,25
 314,2,16,25
+314,3,10,20
+314,3,11,20
 314,3,15,50
 314,3,16,50
+314,4,10,20
+314,4,11,20
 314,4,15,75
 314,4,16,75
+314,5,10,2
+314,5,11,2
 314,5,15,10
 314,5,16,10
+315,1,10,21
+315,1,11,21
 315,1,15,20
 315,1,16,20
+315,2,10,20
+315,2,11,20
 315,2,15,25
 315,2,16,25
+315,3,10,20
+315,3,11,20
 315,3,15,50
 315,3,16,50
+315,4,10,20
+315,4,11,20
 315,4,15,75
 315,4,16,75
+315,5,10,2
+315,5,11,2
 315,5,15,10
 315,5,16,10
 316,1,15,15
@@ -1797,6 +2027,8 @@ location_area_id,encounter_method_id,version_id,rate
 316,4,16,75
 316,5,15,10
 316,5,16,10
+317,1,10,5
+317,1,11,5
 317,1,15,10
 317,1,16,10
 318,1,15,10
@@ -1807,20 +2039,36 @@ location_area_id,encounter_method_id,version_id,rate
 319,6,16,40
 320,1,15,20
 320,1,16,20
+321,1,10,14
+321,1,11,14
 321,1,15,15
 321,1,16,15
+323,1,10,7
+323,1,11,7
 323,1,15,10
 323,1,16,10
+323,2,10,20
+323,2,11,20
 323,2,15,25
 323,2,16,25
+323,3,10,20
+323,3,11,20
 323,3,15,50
 323,3,16,50
+323,4,10,20
+323,4,11,20
 323,4,15,75
 323,4,16,75
+323,5,10,2
+323,5,11,2
 323,5,15,10
 323,5,16,10
+323,6,10,50
+323,6,11,50
 323,6,15,5
 323,6,16,5
+324,1,10,7
+324,1,11,7
 324,1,15,10
 324,1,16,10
 324,2,15,25
@@ -1831,18 +2079,112 @@ location_area_id,encounter_method_id,version_id,rate
 324,4,16,75
 324,5,15,10
 324,5,16,10
+324,6,10,50
+324,6,11,50
+325,1,10,7
+325,1,11,7
 325,1,15,10
 325,1,16,10
+325,2,10,20
+325,2,11,20
 325,2,15,25
 325,2,16,25
+325,3,10,20
+325,3,11,20
 325,3,15,50
 325,3,16,50
+325,4,10,20
+325,4,11,20
 325,4,15,75
 325,4,16,75
+325,5,10,2
+325,5,11,2
 325,5,15,10
 325,5,16,10
+325,6,10,50
+325,6,11,50
 325,6,15,5
 325,6,16,5
+326,1,10,5
+326,1,11,5
+327,1,10,7
+327,1,11,7
+329,1,10,21
+329,1,11,21
+329,2,10,20
+329,2,11,20
+329,3,10,20
+329,3,11,20
+329,4,10,20
+329,4,11,20
+329,5,10,2
+329,5,11,2
+330,1,10,7
+330,1,11,7
+331,1,10,7
+331,1,11,7
+332,1,10,7
+332,1,11,7
+333,1,10,7
+333,1,11,7
+336,1,10,2
+336,1,11,2
+337,1,10,4
+337,1,11,4
+338,1,10,6
+338,1,11,6
+339,1,10,8
+339,1,11,8
+340,1,10,10
+340,1,11,10
+341,1,10,7
+341,1,11,7
+342,1,10,7
+342,1,11,7
+343,1,10,7
+343,1,11,7
+344,1,10,5
+344,1,11,5
+345,1,10,21
+345,1,11,21
+345,2,10,20
+345,2,11,20
+345,3,10,20
+345,3,11,20
+345,4,10,20
+345,4,11,20
+345,5,10,2
+345,5,11,2
+346,1,10,21
+346,1,11,21
+346,2,10,20
+346,2,11,20
+346,3,10,20
+346,3,11,20
+346,4,10,20
+346,4,11,20
+346,5,10,2
+346,5,11,2
+347,1,10,21
+347,1,11,21
+347,2,10,20
+347,2,11,20
+347,3,10,20
+347,3,11,20
+347,4,10,20
+347,4,11,20
+347,5,10,2
+347,5,11,2
+348,1,10,21
+348,1,11,21
+348,2,10,20
+348,2,11,20
+348,3,10,20
+348,3,11,20
+348,4,10,20
+348,4,11,20
+348,5,10,2
+348,5,11,2
 350,2,7,10
 350,2,8,10
 350,2,9,10
@@ -2648,14 +2990,6 @@ location_area_id,encounter_method_id,version_id,rate
 455,1,11,7
 456,1,10,7
 456,1,11,7
-457,1,10,14
-457,1,11,14
-458,1,10,7
-458,1,11,7
-459,1,10,5
-459,1,11,5
-460,1,10,7
-460,1,11,7
 461,2,10,10
 461,2,11,10
 461,3,10,10
@@ -2664,127 +2998,6 @@ location_area_id,encounter_method_id,version_id,rate
 461,4,11,10
 461,5,10,1
 461,5,11,1
-462,1,10,5
-462,1,11,5
-463,1,10,7
-464,1,10,7
-465,1,10,7
-466,1,10,7
-466,1,11,7
-467,1,10,5
-467,1,11,5
-468,1,10,21
-468,1,11,21
-468,2,10,20
-468,2,11,20
-468,3,10,20
-468,3,11,20
-468,4,10,20
-468,4,11,20
-468,5,10,2
-468,5,11,2
-469,1,10,21
-469,1,11,21
-469,2,10,20
-469,2,11,20
-469,3,10,20
-469,3,11,20
-469,4,10,20
-469,4,11,20
-469,5,10,2
-469,5,11,2
-470,1,10,21
-470,1,11,21
-470,2,10,20
-470,2,11,20
-470,3,10,20
-470,3,11,20
-470,4,10,20
-470,4,11,20
-470,5,10,2
-470,5,11,2
-471,1,10,21
-471,1,11,21
-471,2,10,20
-471,2,11,20
-471,3,10,20
-471,3,11,20
-471,4,10,20
-471,4,11,20
-471,5,10,2
-471,5,11,2
-472,1,10,7
-472,1,11,7
-472,2,10,20
-472,2,11,20
-472,3,10,20
-472,3,11,20
-472,4,10,20
-472,4,11,20
-472,5,10,2
-472,5,11,2
-472,6,10,50
-472,6,11,50
-473,1,10,7
-473,1,11,7
-473,6,10,50
-473,6,11,50
-474,1,10,7
-474,1,11,7
-474,2,10,20
-474,2,11,20
-474,3,10,20
-474,3,11,20
-474,4,10,20
-474,4,11,20
-474,5,10,2
-474,5,11,2
-474,6,10,50
-474,6,11,50
-475,1,10,7
-475,1,11,7
-476,1,10,7
-476,1,11,7
-476,6,10,50
-476,6,11,50
-477,1,10,7
-477,1,11,7
-478,1,10,7
-478,1,11,7
-479,1,10,7
-479,1,11,7
-480,1,10,7
-480,1,11,7
-480,2,10,20
-480,2,11,20
-480,3,10,20
-480,3,11,20
-480,4,10,20
-480,4,11,20
-480,5,10,2
-480,5,11,2
-481,1,10,7
-481,1,11,7
-481,2,10,20
-481,2,11,20
-481,3,10,20
-481,3,11,20
-481,4,10,20
-481,4,11,20
-481,5,10,2
-481,5,11,2
-482,1,10,2
-482,1,11,2
-483,1,10,4
-483,1,11,4
-484,1,10,6
-484,1,11,6
-485,1,10,8
-485,1,11,8
-486,1,10,10
-486,1,11,10
-487,1,10,7
-487,1,11,7
 488,1,10,21
 488,1,11,21
 488,6,10,50
@@ -3007,212 +3220,6 @@ location_area_id,encounter_method_id,version_id,rate
 528,4,11,20
 528,5,10,2
 528,5,11,2
-529,1,10,21
-529,1,11,21
-530,1,10,21
-530,1,11,21
-531,1,10,21
-531,1,11,21
-532,1,10,21
-532,1,11,21
-532,2,10,20
-532,2,11,20
-532,3,10,20
-532,3,11,20
-532,4,10,20
-532,4,11,20
-532,5,10,2
-532,5,11,2
-533,1,10,21
-533,1,11,21
-534,1,10,21
-534,1,11,21
-534,2,10,20
-534,2,11,20
-534,3,10,20
-534,3,11,20
-534,4,10,20
-534,4,11,20
-534,5,10,2
-534,5,11,2
-535,1,10,21
-535,1,11,21
-536,1,10,21
-536,1,11,21
-537,1,10,21
-537,1,11,21
-538,1,10,21
-538,1,11,21
-538,2,10,20
-538,2,11,20
-538,3,10,20
-538,3,11,20
-538,4,10,20
-538,4,11,20
-538,5,10,2
-538,5,11,2
-539,1,10,21
-539,1,11,21
-539,2,10,20
-539,2,11,20
-539,3,10,20
-539,3,11,20
-539,4,10,20
-539,4,11,20
-539,5,10,2
-539,5,11,2
-540,1,10,21
-540,1,11,21
-540,2,10,60
-540,2,11,60
-540,3,10,60
-540,3,11,60
-540,4,10,60
-540,4,11,60
-540,5,10,2
-540,5,11,2
-541,1,10,21
-541,1,11,21
-541,2,10,20
-541,2,11,20
-541,3,10,20
-541,3,11,20
-541,4,10,20
-541,4,11,20
-541,5,10,2
-541,5,11,2
-542,1,10,21
-542,1,11,21
-543,1,10,21
-543,1,11,21
-544,1,10,21
-544,1,11,21
-545,1,10,21
-545,1,11,21
-546,1,10,21
-546,1,11,21
-547,2,10,20
-547,2,11,20
-547,3,10,20
-547,3,11,20
-547,4,10,20
-547,4,11,20
-547,5,10,2
-547,5,11,2
-548,2,10,20
-548,2,11,20
-548,3,10,20
-548,3,11,20
-548,4,10,20
-548,4,11,20
-548,5,10,2
-548,5,11,2
-549,1,10,14
-549,1,11,14
-549,2,10,20
-549,2,11,20
-549,3,10,20
-549,3,11,20
-549,4,10,20
-549,4,11,20
-549,5,10,2
-549,5,11,2
-550,1,10,21
-550,1,11,21
-550,2,10,20
-550,2,11,20
-550,3,10,20
-550,3,11,20
-550,4,10,20
-550,4,11,20
-550,5,10,2
-550,5,11,2
-551,1,10,21
-551,1,11,21
-551,2,10,20
-551,2,11,20
-551,3,10,20
-551,3,11,20
-551,4,10,20
-551,4,11,20
-551,5,10,2
-551,5,11,2
-552,1,10,21
-552,1,11,21
-552,2,10,20
-552,2,11,20
-552,3,10,20
-552,3,11,20
-552,4,10,20
-552,4,11,20
-552,5,10,2
-552,5,11,2
-553,1,10,21
-553,1,11,21
-553,2,10,20
-553,2,11,20
-553,3,10,20
-553,3,11,20
-553,4,10,20
-553,4,11,20
-553,5,10,2
-553,5,11,2
-554,2,10,10
-554,2,11,10
-554,3,10,10
-554,3,11,10
-554,4,10,10
-554,4,11,10
-554,5,10,1
-554,5,11,1
-555,2,10,10
-555,2,11,10
-555,3,10,10
-555,3,11,10
-555,4,10,10
-555,4,11,10
-555,5,10,1
-555,5,11,1
-556,2,10,10
-556,2,11,10
-556,3,10,10
-556,3,11,10
-556,4,10,10
-556,4,11,10
-556,5,10,1
-556,5,11,1
-557,2,10,10
-557,2,11,10
-557,3,10,10
-557,3,11,10
-557,4,10,10
-557,4,11,10
-557,5,10,1
-557,5,11,1
-558,2,10,10
-558,2,11,10
-558,3,10,10
-558,3,11,10
-558,4,10,10
-558,4,11,10
-558,5,10,1
-558,5,11,1
-559,2,10,10
-559,2,11,10
-559,3,10,10
-559,3,11,10
-559,4,10,10
-559,4,11,10
-559,5,10,1
-559,5,11,1
-560,2,10,10
-560,2,11,10
-560,3,10,10
-560,3,11,10
-560,4,10,10
-560,4,11,10
-560,5,10,1
-560,5,11,1
 561,2,10,10
 561,2,11,10
 561,3,10,10
@@ -3255,9 +3262,6 @@ location_area_id,encounter_method_id,version_id,rate
 571,1,11,7
 572,1,10,5
 572,1,11,7
-573,1,11,7
-574,1,11,7
-575,1,11,7
 576,4,17,50
 576,4,18,50
 576,4,21,50

data/v2/csv/location_area_prose.csv

@@ -411,37 +411,7 @@ location_area_id,local_language_id,name
 454,9,
 455,9,
 456,9,
-457,9,
-458,9,1F
-459,9,B1F
-460,9,B2F
 461,9,
-462,9,
-463,9,1F
-464,9,2F
-465,9,3F
-466,9,
-467,9,B1F
-468,9,center
-469,9,"Area 1, east"
-470,9,"Area 2, north"
-471,9,"Area 3, west"
-472,9,1F
-473,9,2F
-474,9,B1F
-475,9,1F
-476,9,B1F
-477,9,1F
-478,9,B1F
-479,9,B2F
-480,9,B3F
-481,9,B4F
-482,9,3F
-483,9,4F
-484,9,5F
-485,9,6F
-486,9,7F
-487,9,
 488,9,
 489,9,cave
 490,9,inside
@@ -483,38 +453,6 @@ location_area_id,local_language_id,name
 526,9,
 527,9,
 528,9,
-529,9,
-530,9,
-531,9,
-532,9,
-533,9,
-534,9,
-535,9,
-536,9,
-537,9,
-538,9,
-539,9,
-540,9,
-541,9,
-542,9,
-543,9,
-544,9,
-545,9,
-546,9,
-547,9,
-548,9,
-549,9,
-550,9,
-551,9,
-552,9,
-553,9,
-554,9,
-555,9,
-556,9,
-557,9,
-558,9,
-559,9,
-560,9,
 561,9,
 562,9,
 563,9,
@@ -527,9 +465,6 @@ location_area_id,local_language_id,name
 570,9,g
 571,9,h
 572,9,i
-573,9,1F
-574,9,2F
-575,9,3F
 576,9,
 577,9,
 578,9,

data/v2/csv/location_areas.csv

@@ -411,37 +411,7 @@ id,location_id,game_index,identifier
 454,495,4,
 455,496,5,
 456,497,6,
-457,155,7,
-458,80,8,1f
-459,80,9,b1f
-460,80,10,b2f
 461,498,11,
-462,73,12,
-463,499,13,1f
-464,499,14,2f
-465,499,15,3f
-466,161,16,
-467,161,19,b1f
-468,162,20,center
-469,162,21,area-1-east
-470,162,22,area-2-north
-471,162,23,area-3-west
-472,147,24,1f
-473,147,25,2f
-474,147,26,b1f
-475,87,27,1f
-476,87,28,b1f
-477,136,29,1f
-478,136,30,b1f
-479,136,31,b2f
-480,136,32,b3f
-481,136,33,b4f
-482,160,34,3f
-483,160,35,4f
-484,160,36,5f
-485,160,37,6f
-486,160,38,7f
-487,158,39,
 488,500,40,
 489,500,41,cave
 490,500,42,inside
@@ -483,38 +453,6 @@ id,location_id,game_index,identifier
 526,519,84,
 527,520,85,
 528,521,86,
-529,88,87,
-530,99,88,
-531,109,89,
-532,120,90,
-533,130,91,
-534,131,92,
-535,132,93,
-536,133,94,
-537,134,95,
-538,89,96,
-539,90,97,
-540,91,98,
-541,92,99,
-542,93,100,
-543,94,101,
-544,95,102,
-545,96,103,
-546,97,104,
-547,522,105,
-548,523,106,
-549,524,107,
-550,102,109,
-551,157,110,
-552,103,111,
-553,104,112,
-554,86,113,
-555,154,114,
-556,68,115,
-557,151,116,
-558,67,117,
-559,76,118,
-560,71,119,
 561,526,120,
 562,527,121,
 563,528,122,
@@ -527,9 +465,6 @@ id,location_id,game_index,identifier
 570,529,129,g
 571,529,130,h
 572,529,131,i
-573,530,13,1f
-574,530,14,2f
-575,530,15,3f
 576,348,0,
 577,352,1,
 578,354,2,

data/v2/csv/location_names.csv

@@ -203,7 +203,7 @@ location_id,local_language_id,name
 102,9,Route 22
 103,5,Route 24
 103,9,Route 24
-104,5,Rotue 25
+104,5,Route 25
 104,9,Route 25
 105,5,Route 26
 105,9,Route 26
@@ -1058,8 +1058,6 @@ location_id,local_language_id,name
 497,9,Viapos Chamber
 498,5,L'Océane
 498,9,S.S. Anne
-499,5,Route Victoire
-499,9,Victory Road
 500,5,Mont Braise
 500,9,Mt. Ember
 501,5,Bois Baies
@@ -1104,12 +1102,6 @@ location_id,local_language_id,name
 520,9,Sevault Canyon
 521,5,Ruines Tanoby
 521,9,Tanoby Ruins
-522,5,Route 19
-522,9,Route 19
-523,5,Route 20
-523,9,Route 20
-524,5,Route 21
-524,9,Route 21
 526,5,Ile 1
 526,9,One Island
 527,5,Ile 4
@@ -1118,8 +1110,6 @@ location_id,local_language_id,name
 528,9,Five Island
 529,5,Grotte Métamo
 529,9,Altering Cave
-530,5,Route Victoire
-530,9,Victory Road
 531,1,ヒオウギシティ
 531,5,Pavonnay
 531,9,Aspertia City

data/v2/csv/locations.csv

@@ -486,7 +486,6 @@ id,region_id,identifier
 496,1,rixy-chamber
 497,1,viapos-chamber
 498,1,ss-anne
-499,1,kanto-victory-road-3
 500,1,mt-ember
 501,1,berry-forest
 502,1,icefall-cave
@@ -509,14 +508,10 @@ id,region_id,identifier
 519,1,canyon-entrance
 520,1,sevault-canyon
 521,1,tanoby-ruins
-522,1,kanto-route-19
-523,1,kanto-route-20
-524,1,kanto-route-21
 526,1,one-island
 527,1,four-island
 528,1,five-island
 529,1,kanto-altering-cave
-530,1,kanto-victory-road-4
 531,5,aspertia-city
 532,5,virbank-city
 533,5,humilau-city

data/v2/csv/machines.csv

@@ -15,6 +15,7 @@ machine_number,version_group_id,item_id,move_id
 1,14,305,468
 1,15,305,468
 1,16,305,468
+1,17,305,526
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -31,6 +32,7 @@ machine_number,version_group_id,item_id,move_id
 2,14,306,337
 2,15,306,337
 2,16,306,337
+2,17,306,337
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -47,6 +49,7 @@ machine_number,version_group_id,item_id,move_id
 3,14,307,473
 3,15,307,473
 3,16,307,473
+3,17,307,473
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -63,6 +66,7 @@ machine_number,version_group_id,item_id,move_id
 4,14,308,347
 4,15,308,347
 4,16,308,347
+4,17,308,347
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -79,6 +83,7 @@ machine_number,version_group_id,item_id,move_id
 5,14,309,46
 5,15,309,46
 5,16,309,46
+5,17,309,46
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -95,6 +100,7 @@ machine_number,version_group_id,item_id,move_id
 6,14,310,92
 6,15,310,92
 6,16,310,92
+6,17,310,92
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -111,6 +117,7 @@ machine_number,version_group_id,item_id,move_id
 7,14,311,258
 7,15,311,258
 7,16,311,258
+7,17,311,258
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -127,6 +134,7 @@ machine_number,version_group_id,item_id,move_id
 8,14,312,339
 8,15,312,339
 8,16,312,339
+8,17,312,339
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -143,6 +151,7 @@ machine_number,version_group_id,item_id,move_id
 9,14,313,474
 9,15,313,474
 9,16,313,474
+9,17,313,474
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -159,6 +168,7 @@ machine_number,version_group_id,item_id,move_id
 10,14,314,237
 10,15,314,237
 10,16,314,237
+10,17,314,237
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -175,6 +185,7 @@ machine_number,version_group_id,item_id,move_id
 11,14,315,241
 11,15,315,241
 11,16,315,241
+11,17,315,241
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -191,6 +202,7 @@ machine_number,version_group_id,item_id,move_id
 12,14,316,269
 12,15,316,269
 12,16,316,269
+12,17,316,269
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -207,6 +219,7 @@ machine_number,version_group_id,item_id,move_id
 13,14,317,58
 13,15,317,58
 13,16,317,58
+13,17,317,58
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -223,6 +236,7 @@ machine_number,version_group_id,item_id,move_id
 14,14,318,59
 14,15,318,59
 14,16,318,59
+14,17,318,59
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -239,6 +253,7 @@ machine_number,version_group_id,item_id,move_id
 15,14,319,63
 15,15,319,63
 15,16,319,63
+15,17,319,63
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -255,6 +270,7 @@ machine_number,version_group_id,item_id,move_id
 16,14,320,113
 16,15,320,113
 16,16,320,113
+16,17,320,113
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -271,6 +287,7 @@ machine_number,version_group_id,item_id,move_id
 17,14,321,182
 17,15,321,182
 17,16,321,182
+17,17,321,182
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -287,6 +304,7 @@ machine_number,version_group_id,item_id,move_id
 18,14,322,240
 18,15,322,240
 18,16,322,240
+18,17,322,240
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -303,6 +321,7 @@ machine_number,version_group_id,item_id,move_id
 19,14,323,477
 19,15,323,355
 19,16,323,355
+19,17,323,355
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -319,6 +338,7 @@ machine_number,version_group_id,item_id,move_id
 20,14,324,219
 20,15,324,219
 20,16,324,219
+20,17,324,219
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -335,6 +355,7 @@ machine_number,version_group_id,item_id,move_id
 21,14,325,218
 21,15,325,218
 21,16,325,218
+21,17,325,218
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -351,6 +372,7 @@ machine_number,version_group_id,item_id,move_id
 22,14,326,76
 22,15,326,76
 22,16,326,76
+22,17,326,76
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -367,6 +389,7 @@ machine_number,version_group_id,item_id,move_id
 23,14,327,479
 23,15,327,479
 23,16,327,479
+23,17,327,479
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -383,6 +406,7 @@ machine_number,version_group_id,item_id,move_id
 24,14,328,85
 24,15,328,85
 24,16,328,85
+24,17,328,85
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -399,6 +423,7 @@ machine_number,version_group_id,item_id,move_id
 25,14,329,87
 25,15,329,87
 25,16,329,87
+25,17,329,87
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -415,6 +440,7 @@ machine_number,version_group_id,item_id,move_id
 26,14,330,89
 26,15,330,89
 26,16,330,89
+26,17,330,89
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -431,6 +457,7 @@ machine_number,version_group_id,item_id,move_id
 27,14,331,216
 27,15,331,216
 27,16,331,216
+27,17,331,216
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -447,6 +474,7 @@ machine_number,version_group_id,item_id,move_id
 28,14,332,91
 28,15,332,91
 28,16,332,91
+28,17,332,141
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -463,6 +491,7 @@ machine_number,version_group_id,item_id,move_id
 29,14,333,94
 29,15,333,94
 29,16,333,94
+29,17,333,94
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -479,6 +508,7 @@ machine_number,version_group_id,item_id,move_id
 30,14,334,247
 30,15,334,247
 30,16,334,247
+30,17,334,247
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -495,6 +525,7 @@ machine_number,version_group_id,item_id,move_id
 31,14,335,280
 31,15,335,280
 31,16,335,280
+31,17,335,280
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -511,6 +542,7 @@ machine_number,version_group_id,item_id,move_id
 32,14,336,104
 32,15,336,104
 32,16,336,104
+32,17,336,104
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -527,6 +559,7 @@ machine_number,version_group_id,item_id,move_id
 33,14,337,115
 33,15,337,115
 33,16,337,115
+33,17,337,115
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -543,6 +576,7 @@ machine_number,version_group_id,item_id,move_id
 34,14,338,482
 34,15,338,482
 34,16,338,482
+34,17,338,482
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -559,6 +593,7 @@ machine_number,version_group_id,item_id,move_id
 35,14,339,53
 35,15,339,53
 35,16,339,53
+35,17,339,53
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -575,6 +610,7 @@ machine_number,version_group_id,item_id,move_id
 36,14,340,188
 36,15,340,188
 36,16,340,188
+36,17,340,188
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -591,6 +627,7 @@ machine_number,version_group_id,item_id,move_id
 37,14,341,201
 37,15,341,201
 37,16,341,201
+37,17,341,201
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -607,6 +644,7 @@ machine_number,version_group_id,item_id,move_id
 38,14,342,126
 38,15,342,126
 38,16,342,126
+38,17,342,126
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -623,6 +661,7 @@ machine_number,version_group_id,item_id,move_id
 39,14,343,317
 39,15,343,317
 39,16,343,317
+39,17,343,317
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -639,6 +678,7 @@ machine_number,version_group_id,item_id,move_id
 40,14,344,332
 40,15,344,332
 40,16,344,332
+40,17,344,332
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -655,6 +695,7 @@ machine_number,version_group_id,item_id,move_id
 41,14,345,259
 41,15,345,259
 41,16,345,259
+41,17,345,259
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -671,6 +712,7 @@ machine_number,version_group_id,item_id,move_id
 42,14,346,263
 42,15,346,263
 42,16,346,263
+42,17,346,263
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -687,6 +729,7 @@ machine_number,version_group_id,item_id,move_id
 43,14,347,488
 43,15,347,488
 43,16,347,488
+43,17,347,488
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -703,6 +746,7 @@ machine_number,version_group_id,item_id,move_id
 44,14,348,156
 44,15,348,156
 44,16,348,156
+44,17,348,156
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -719,6 +763,7 @@ machine_number,version_group_id,item_id,move_id
 45,14,349,213
 45,15,349,213
 45,16,349,213
+45,17,349,213
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -735,6 +780,7 @@ machine_number,version_group_id,item_id,move_id
 46,14,350,168
 46,15,350,168
 46,16,350,168
+46,17,350,168
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -751,6 +797,7 @@ machine_number,version_group_id,item_id,move_id
 47,14,351,490
 47,15,351,490
 47,16,351,490
+47,17,351,490
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -767,6 +814,7 @@ machine_number,version_group_id,item_id,move_id
 48,14,352,496
 48,15,352,496
 48,16,352,496
+48,17,352,496
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -783,6 +831,7 @@ machine_number,version_group_id,item_id,move_id
 49,14,353,497
 49,15,353,497
 49,16,353,497
+49,17,353,497
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -799,6 +848,7 @@ machine_number,version_group_id,item_id,move_id
 50,14,354,315
 50,15,354,315
 50,16,354,315
+50,17,354,315
 51,8,355,355
 51,9,355,355
 51,10,355,355
@@ -806,6 +856,7 @@ machine_number,version_group_id,item_id,move_id
 51,14,355,502
 51,15,355,211
 51,16,355,211
+51,17,355,211
 52,8,356,411
 52,9,356,411
 52,10,356,411
@@ -813,6 +864,7 @@ machine_number,version_group_id,item_id,move_id
 52,14,356,411
 52,15,356,411
 52,16,356,411
+52,17,356,411
 53,8,357,412
 53,9,357,412
 53,10,357,412
@@ -820,6 +872,7 @@ machine_number,version_group_id,item_id,move_id
 53,14,357,412
 53,15,357,412
 53,16,357,412
+53,17,357,412
 54,8,358,206
 54,9,358,206
 54,10,358,206
@@ -827,6 +880,7 @@ machine_number,version_group_id,item_id,move_id
 54,14,358,206
 54,15,358,206
 54,16,358,206
+54,17,358,206
 55,8,359,362
 55,9,359,362
 55,10,359,362
@@ -834,6 +888,7 @@ machine_number,version_group_id,item_id,move_id
 55,14,359,503
 55,15,359,503
 55,16,359,503
+55,17,359,503
 56,8,360,374
 56,9,360,374
 56,10,360,374
@@ -841,6 +896,7 @@ machine_number,version_group_id,item_id,move_id
 56,14,360,374
 56,15,360,374
 56,16,360,374
+56,17,360,374
 57,8,361,451
 57,9,361,451
 57,10,361,451
@@ -848,6 +904,7 @@ machine_number,version_group_id,item_id,move_id
 57,14,361,451
 57,15,361,451
 57,16,361,451
+57,17,361,451
 58,8,362,203
 58,9,362,203
 58,10,362,203
@@ -855,6 +912,7 @@ machine_number,version_group_id,item_id,move_id
 58,14,362,507
 58,15,362,507
 58,16,362,507
+58,17,362,507
 59,8,363,406
 59,9,363,406
 59,10,363,406
@@ -862,6 +920,7 @@ machine_number,version_group_id,item_id,move_id
 59,14,363,510
 59,15,363,510
 59,16,363,510
+59,17,363,693
 60,8,364,409
 60,9,364,409
 60,10,364,409
@@ -869,6 +928,7 @@ machine_number,version_group_id,item_id,move_id
 60,14,364,511
 60,15,364,511
 60,16,364,511
+60,17,364,511
 61,8,365,261
 61,9,365,261
 61,10,365,261
@@ -876,6 +936,7 @@ machine_number,version_group_id,item_id,move_id
 61,14,365,261
 61,15,365,261
 61,16,365,261
+61,17,365,261
 62,8,366,318
 62,9,366,318
 62,10,366,318
@@ -883,6 +944,7 @@ machine_number,version_group_id,item_id,move_id
 62,14,366,512
 62,15,366,512
 62,16,366,512
+62,17,366,512
 63,8,367,373
 63,9,367,373
 63,10,367,373
@@ -890,6 +952,7 @@ machine_number,version_group_id,item_id,move_id
 63,14,367,373
 63,15,367,373
 63,16,367,373
+63,17,367,373
 64,8,368,153
 64,9,368,153
 64,10,368,153
@@ -897,6 +960,7 @@ machine_number,version_group_id,item_id,move_id
 64,14,368,153
 64,15,368,153
 64,16,368,153
+64,17,368,153
 65,8,369,421
 65,9,369,421
 65,10,369,421
@@ -904,6 +968,7 @@ machine_number,version_group_id,item_id,move_id
 65,14,369,421
 65,15,369,421
 65,16,369,421
+65,17,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
@@ -911,6 +976,7 @@ machine_number,version_group_id,item_id,move_id
 66,14,370,371
 66,15,370,371
 66,16,370,371
+66,17,370,371
 67,8,371,278
 67,9,371,278
 67,10,371,278
@@ -918,6 +984,7 @@ machine_number,version_group_id,item_id,move_id
 67,14,371,514
 67,15,371,514
 67,16,371,514
+67,17,371,684
 68,8,372,416
 68,9,372,416
 68,10,372,416
@@ -925,6 +992,7 @@ machine_number,version_group_id,item_id,move_id
 68,14,372,416
 68,15,372,416
 68,16,372,416
+68,17,372,416
 69,8,373,397
 69,9,373,397
 69,10,373,397
@@ -932,6 +1000,7 @@ machine_number,version_group_id,item_id,move_id
 69,14,373,397
 69,15,373,397
 69,16,373,397
+69,17,373,397
 70,8,374,148
 70,9,374,148
 70,10,374,148
@@ -939,6 +1008,7 @@ machine_number,version_group_id,item_id,move_id
 70,14,374,148
 70,15,374,148
 70,16,374,148
+70,17,374,694
 71,8,375,444
 71,9,375,444
 71,10,375,444
@@ -946,6 +1016,7 @@ machine_number,version_group_id,item_id,move_id
 71,14,375,444
 71,15,375,444
 71,16,375,444
+71,17,375,444
 72,8,376,419
 72,9,376,419
 72,10,376,419
@@ -953,6 +1024,7 @@ machine_number,version_group_id,item_id,move_id
 72,14,376,521
 72,15,376,521
 72,16,376,521
+72,17,376,521
 73,8,377,86
 73,9,377,86
 73,10,377,86
@@ -960,6 +1032,7 @@ machine_number,version_group_id,item_id,move_id
 73,14,377,86
 73,15,377,86
 73,16,377,86
+73,17,377,86
 74,8,378,360
 74,9,378,360
 74,10,378,360
@@ -967,6 +1040,7 @@ machine_number,version_group_id,item_id,move_id
 74,14,378,360
 74,15,378,360
 74,16,378,360
+74,17,378,360
 75,8,379,14
 75,9,379,14
 75,10,379,14
@@ -974,6 +1048,7 @@ machine_number,version_group_id,item_id,move_id
 75,14,379,14
 75,15,379,14
 75,16,379,14
+75,17,379,14
 76,8,380,446
 76,9,380,446
 76,10,380,446
@@ -981,6 +1056,7 @@ machine_number,version_group_id,item_id,move_id
 76,14,380,522
 76,15,380,522
 76,16,380,522
+76,17,380,19
 77,8,381,244
 77,9,381,244
 77,10,381,244
@@ -988,6 +1064,7 @@ machine_number,version_group_id,item_id,move_id
 77,14,381,244
 77,15,381,244
 77,16,381,244
+77,17,381,244
 78,8,382,445
 78,9,382,445
 78,10,382,445
@@ -995,6 +1072,7 @@ machine_number,version_group_id,item_id,move_id
 78,14,382,523
 78,15,382,523
 78,16,382,523
+78,17,382,523
 79,8,383,399
 79,9,383,399
 79,10,383,399
@@ -1002,6 +1080,7 @@ machine_number,version_group_id,item_id,move_id
 79,14,383,524
 79,15,383,524
 79,16,383,524
+79,17,383,524
 80,8,384,157
 80,9,384,157
 80,10,384,157
@@ -1009,6 +1088,7 @@ machine_number,version_group_id,item_id,move_id
 80,14,384,157
 80,15,384,157
 80,16,384,157
+80,17,384,157
 81,8,385,404
 81,9,385,404
 81,10,385,404
@@ -1016,6 +1096,7 @@ machine_number,version_group_id,item_id,move_id
 81,14,385,404
 81,15,385,404
 81,16,385,404
+81,17,385,404
 82,8,386,214
 82,9,386,214
 82,10,386,214
@@ -1023,6 +1104,7 @@ machine_number,version_group_id,item_id,move_id
 82,14,386,525
 82,15,386,525
 82,16,386,525
+82,17,386,525
 83,8,387,363
 83,9,387,363
 83,10,387,363
@@ -1030,6 +1112,7 @@ machine_number,version_group_id,item_id,move_id
 83,14,387,526
 83,15,387,611
 83,16,387,611
+83,17,387,611
 84,8,388,398
 84,9,388,398
 84,10,388,398
@@ -1037,6 +1120,7 @@ machine_number,version_group_id,item_id,move_id
 84,14,388,398
 84,15,388,398
 84,16,388,398
+84,17,388,398
 85,8,389,138
 85,9,389,138
 85,10,389,138
@@ -1044,6 +1128,7 @@ machine_number,version_group_id,item_id,move_id
 85,14,389,138
 85,15,389,138
 85,16,389,138
+85,17,389,138
 86,8,390,447
 86,9,390,447
 86,10,390,447
@@ -1051,6 +1136,7 @@ machine_number,version_group_id,item_id,move_id
 86,14,390,447
 86,15,390,447
 86,16,390,447
+86,17,390,447
 87,8,391,207
 87,9,391,207
 87,10,391,207
@@ -1058,6 +1144,7 @@ machine_number,version_group_id,item_id,move_id
 87,14,391,207
 87,15,391,207
 87,16,391,207
+87,17,391,207
 88,8,392,365
 88,9,392,365
 88,10,392,365
@@ -1065,6 +1152,7 @@ machine_number,version_group_id,item_id,move_id
 88,14,392,365
 88,15,392,214
 88,16,392,214
+88,17,392,214
 89,8,393,369
 89,9,393,369
 89,10,393,369
@@ -1072,6 +1160,7 @@ machine_number,version_group_id,item_id,move_id
 89,14,393,369
 89,15,393,369
 89,16,393,369
+89,17,393,369
 90,8,394,164
 90,9,394,164
 90,10,394,164
@@ -1079,6 +1168,7 @@ machine_number,version_group_id,item_id,move_id
 90,14,394,164
 90,15,394,164
 90,16,394,164
+90,17,394,164
 91,8,395,430
 91,9,395,430
 91,10,395,430
@@ -1086,6 +1176,7 @@ machine_number,version_group_id,item_id,move_id
 91,14,395,430
 91,15,395,430
 91,16,395,430
+91,17,395,430
 92,8,396,433
 92,9,396,433
 92,10,396,433
@@ -1093,28 +1184,37 @@ machine_number,version_group_id,item_id,move_id
 92,14,396,433
 92,15,396,433
 92,16,396,433
+92,17,396,433
 93,11,659,528
 93,14,659,528
 93,15,659,528
 93,16,397,528
+93,17,659,528
 94,11,660,249
 94,14,660,249
 94,15,660,249
 94,16,398,290
+94,17,660,57
 95,11,661,555
 95,14,661,555
 95,15,661,555
 95,16,399,555
+95,17,661,555
 96,15,745,267
 96,16,400,267
+96,17,745,267
 97,15,746,399
 97,16,401,399
+97,17,746,399
 98,15,747,612
 98,16,402,612
+98,17,747,127
 99,15,748,605
 99,16,403,605
+99,17,748,605
 100,15,749,590
 100,16,404,590
+100,17,749,590
 101,1,397,15
 101,2,397,15
 101,3,397,15
@@ -1130,7 +1230,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
+101,16,397,15
 102,1,398,19
 102,2,398,19
 102,3,398,19
@@ -1146,7 +1246,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
+102,16,398,19
 103,1,399,57
 103,2,399,57
 103,3,399,57
@@ -1162,7 +1262,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
+103,16,399,57
 104,1,400,70
 104,2,400,70
 104,3,400,70
@@ -1178,7 +1278,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
+104,16,400,70
 105,1,401,148
 105,2,401,148
 105,3,401,148
@@ -1194,7 +1294,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
+105,16,401,127
 106,3,402,250
 106,4,402,250
 106,5,402,249
@@ -1207,7 +1307,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
+106,16,402,249
 107,3,403,127
 107,4,403,127
 107,5,403,127
@@ -1218,7 +1318,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
+107,16,403,291
 108,5,404,291
 108,6,404,291
 108,7,404,291

data/v2/csv/move_changelog.csv

@@ -1,83 +1,177 @@
-move_id,changed_in_version_group_id,type_id,power,pp,accuracy,effect_id,effect_chance
-2,3,1,,,,,
-13,5,,,,75,,
-16,3,1,,,,1,
-17,3,,35,,,,
-18,3,,,,85,,
-19,8,,70,,,,
-20,11,,,,75,,
-22,8,,,10,,,
-26,8,,70,,,,
-26,11,,85,25,,,
-28,3,1,,,,,
-33,11,,35,,95,,
-35,11,,,,85,,
-37,11,,90,20,,,
-38,3,,100,,,49,
-40,3,,,,,,20
-44,3,1,,,,,10
-50,8,,,,55,,
-50,11,,,,80,,
-59,3,,,,90,,
-67,5,,50,,90,32,30
-71,8,,,20,,,
-72,8,,,10,,,
-74,11,,,,,14,
-80,8,,70,,,,
-80,11,,90,20,,,
-83,11,,15,,70,,
-87,3,,,,,,10
-88,3,,,,65,,
-91,3,,100,,,,
-91,8,,60,,,,
-92,11,,,,85,,
-94,3,,,,,,30
-95,8,,,,60,,
-95,9,,,,70,,
-105,8,,,20,,,
-120,3,,130,,,,
-126,3,,,,,,30
-128,11,,,10,75,,
-136,8,,85,,,,
-136,11,,100,20,,,
-137,11,,,,75,,
-139,11,,,,55,,
-143,3,,,,,,10
-146,3,,,,,1,0
-148,8,,,,70,,
-152,11,,,,85,,
-153,3,,170,,,,
-157,3,,,,,1,0
-161,3,,,,,1,0
-170,11,,,40,,,
-174,11,10001,,,,,
-178,11,,,,85,,
-184,11,,,,90,,
-192,8,,100,,,,
-198,11,,,,80,,
-200,8,,90,,,,
-200,11,,,15,,,
-202,8,,,5,,,
-202,11,,60,,,,
-210,11,,10,,,,
-248,11,,80,15,90,,
-249,8,,20,,,,
-250,11,,15,,70,,
-251,11,,10,,,,
-253,11,,50,,,,
-254,8,,,10,,,
-291,8,,60,,,,
-294,11,,,,,54,
-328,11,,15,,70,,
-331,11,,10,,,,
-333,11,,10,,,,
-343,11,,40,,,,
-348,8,,70,,,,
-350,11,,,,80,,
-353,11,,120,,85,,
-364,11,,50,,,,
-382,11,,0,,,,
-386,11,,60,,,,
-387,11,,130,,,,
-409,11,,60,5,,,
-463,11,,,,70,,
+move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id,effect_id,effect_chance
+2,3,1,,,,,,,
+13,5,,,,75,,,,
+14,15,,,30,,,,,
+16,3,1,,,,,,1,
+17,3,,35,,,,,,
+18,3,,,,85,,,,
+18,15,,,,100,,,,
+19,8,,70,,,,,,
+20,11,,,,75,,,,
+22,8,,,10,,,,,
+22,15,,35,15,,,,,
+26,8,,70,,,,,,
+26,11,,85,25,,,,,
+28,3,1,,,,,,,
+33,11,,35,,95,,,,
+33,17,,50,,,,,,
+35,11,,,,85,,,,
+37,11,,90,20,,,,,
+38,3,,100,,,,,49,
+40,3,,,,,,,,20
+42,15,,14,,85,,,,
+44,3,1,,,,,,,10
+46,15,,,,100,,,,
+50,8,,,,55,,,,
+50,11,,,,80,,,,
+53,15,,95,,,,,,
+56,15,,120,,,,,,
+57,15,,95,,,,,,
+58,15,,95,,,,,,
+59,3,,,,90,,,,
+59,15,,120,,,,,,
+66,15,,,25,,,,,
+67,5,,50,,90,,,32,30
+71,8,,,20,,,,,
+72,8,,,10,,,,,
+74,11,,,,,,,14,
+74,15,,,40,,,,,
+80,8,,70,,,,,,
+80,11,,90,20,,,,,
+81,17,,,,,,,21,
+83,11,,15,,70,,,,
+85,15,,95,,,,,,
+86,17,,,,100,,,,
+87,3,,,,,,,,10
+87,15,,120,,,,,,
+88,3,,,,65,,,,
+91,3,,100,,,,,,
+91,8,,60,,,,,,
+92,11,,,,85,,,,
+94,3,,,,,,,,30
+95,8,,,,60,,,,
+95,9,,,,70,,,,
+105,8,,,20,,,,,
+107,15,,,20,,,,,
+112,15,,,30,,,,,
+120,3,,130,,,,,,
+122,15,,20,,,,,,
+123,15,,20,,,,,,
+126,3,,,,,,,,30
+126,15,,120,,,,,,
+128,11,,,10,75,,,,
+130,15,,100,15,,,,,
+136,8,,85,,,,,,
+136,11,,100,20,,,,,
+137,11,,,,75,,,,
+137,15,,,,90,,,,
+139,11,,,,55,,,,
+139,15,,,,80,,,,
+141,17,,20,15,,,,,
+143,3,,,,,,,,10
+145,15,,20,,,,,,
+146,3,,,,,,,1,0
+148,8,,,,70,,,,
+149,15,,,,80,,,,
+151,15,,,40,,,,,
+152,11,,,,85,,,,
+152,15,,90,,,,,,
+153,3,,170,,,,,,
+157,3,,,,,,,1,0
+161,3,,,,,,,1,0
+165,15,,,,,,10,,
+168,15,,40,10,,,,,
+170,11,,,40,,,,,
+173,15,,40,,,,,,
+174,11,10001,,,,,,,
+178,11,,,,85,,,,
+178,15,,,,,,10,,
+184,11,,,,90,,,,
+186,15,1,,,,,,,
+192,8,,100,,,,,,
+195,15,,,,,,12,,
+198,11,,,,80,,,,
+200,8,,90,,,,,,
+200,11,,,15,,,,,
+202,8,,,5,,,,,
+202,11,,60,,,,,,
+204,15,1,,,,,,,
+207,17,,,,90,,,,
+210,11,,10,,,,,,
+210,15,,20,,,,,,
+215,15,,,,,,4,,
+236,15,1,,,,,,,
+237,15,,1,,,,,,
+248,11,,80,15,90,,,,
+248,15,,100,,,,,,
+249,8,,20,,,,,,
+250,11,,15,,70,,,,
+251,11,,10,,,,,,
+253,11,,50,,,,,,
+254,8,,,10,,,,,
+257,15,,100,,,,,,
+261,15,,,,75,,,,
+265,15,,60,,,,,,
+266,15,,,,,3,,,
+267,15,,,,,,1,,
+282,15,,20,,,,,,
+291,8,,60,,,,,,
+294,11,,,,,,,54,
+305,15,,,,,,,,30
+309,15,,100,,85,,,,
+312,15,,,,,,4,,
+314,15,,55,,,,,,
+315,15,,140,,,,,,
+317,15,,50,10,80,,,,
+326,15,,,30,,,,,
+328,11,,15,,70,,,,
+330,15,,95,,,,,,
+331,11,,10,,,,,,
+333,11,,10,,,,,,
+343,11,,40,,,,,,
+343,15,,,40,,,,,
+348,8,,70,,,,,,
+350,11,,,,80,,,,
+353,11,,120,,85,,,,
+358,15,,60,,,,,,
+364,11,,50,,,,,,
+366,15,,,30,,,,,
+372,15,,50,,,,,,
+375,15,,,,90,,,,
+382,11,,0,,,,,,
+386,11,,60,,,,,,
+387,11,,130,,,,,,
+389,17,,80,,,,,,
+396,15,,90,,,,,,
+403,15,,,20,,,,,
+406,15,,90,,,,,,
+408,15,,70,,,,,,
+409,11,,60,5,,,,,
+412,15,,80,,,,,,
+434,15,,140,,,,,,
+437,15,,140,,,,,,
+441,15,,,,70,,,,
+448,15,,60,,,,,,
+463,11,,,,70,,,,
+463,15,,120,,,,,,
+464,17,,,,80,,,,
+472,15,,,,,-7,,,
+476,15,,,,,3,,,
+478,15,,,,,-7,,,
+480,15,,40,,,,,,
+485,15,,70,15,,,,,
+490,15,,60,,,,,,
+506,15,,50,,,,,,
+510,15,,30,,,,,,
+518,15,,50,,,,,,
+519,15,,50,,,,,,
+520,15,,50,,,,,,
+522,15,,30,,,,,,
+524,15,,40,,,,,,
+533,15,,,20,,,,,
+542,15,,120,,,,,,
+546,15,,85,,,,,,
+560,17,,80,,,,,,
+565,17,,30,,,,,,
+570,17,,50,,,,,,
+595,17,,65,,,,,,

data/v2/csv/move_damage_class_prose.csv

@@ -2,12 +2,15 @@ move_damage_class_id,local_language_id,name,description
 1,1,へんか,ダメージない
 1,5,statut,Aucun dégât
 1,6,status,Kein Schaden
+1,7,estado,Sin Daño
 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,7,físico,"Daño Físico, controlado por el Ataque y Defensa"
 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,7,especial,"Daño Especial, controlado por el Ataque Esecieal y Defensa Especial"
 3,9,special,"Special damage, controlled by Special Attack and Special Defense"

data/v2/csv/move_effect_prose.csv

@@ -97,6 +97,7 @@ This move cannot be copied by []{move:mirror-move}, nor forced by []{move:encore
 59,9,Lowers the target's Attack by two stages.,Lowers the target's [Attack]{mechanic:attack} by two [stages]{mechanic:stage}.
 60,9,Lowers the target's Defense by two stages.,Lowers the target's [Defense]{mechanic:defense} by two [stages]{mechanic:stage}.
 61,9,Lowers the target's Speed by two stages.,Lowers the target's [Speed]{mechanic:speed} by two [stages]{mechanic:stage}.
+62,9,Lowers the target's Special Attack by two stages.,Lowers the target's Special Attack by two stages.
 63,9,Lowers the target's Special Defense by two stages.,Lowers the target's [Special Defense]{mechanic:special-defense} by two [stages]{mechanic:stage}.
 66,9,Reduces damage from physical attacks by half.,"Erects a barrier around the user's side of the field that reduces damage from [physical]{mechanic:physical} attacks by half for five turns.  In double battles, the reduction is 1/3.  [Critical hit]{mechanic:critical-hit}s are not affected by the barrier.
 
@@ -111,6 +112,7 @@ If the user is holding []{item:light-clay}, the barrier lasts for eight turns.
 72,9,Has a $effect_chance% chance to lower the target's Special Attack by one stage.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to lower the target's [Special Attack]{mechanic:special-attack} by one [stage]{mechanic:stage}.
 73,9,Has a $effect_chance% chance to lower the target's Special Defense by one stage.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to lower the target's [Special Defense]{mechanic:special-defense} by one [stage]{mechanic:stage}.
 74,9,Has a $effect_chance% chance to lower the target's accuracy by one stage.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to lower the target's [accuracy]{mechanic:accuracy} by one [stage]{mechanic:stage}.
+75,9,XXX new effect for mystical-fire,XXX new effect for mystical-fire
 76,9,User charges for one turn before attacking.  Has a $effect_chance% chance to make the target flinch.,"Inflicts [regular damage]{mechanic:regular-damage}.  User charges for one turn before attacking.  [Critical hit chance]{mechanic:critical-hit-chance} is one level higher than normal.  Has a $effect_chance% chance to make the target [flinch]{mechanic:flinch}.
 
 This move cannot be selected by []{move:sleep-talk}."
@@ -992,72 +994,125 @@ If the user is a []{pokemon:meloetta}, it will toggle between Aria and Pirouette
 331,9,Lowers the target's Speed by one stage.,Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the target's [Speed]{mechanic:speed} by one [stage]{mechanic:stage}.
 332,9,Requires a turn to charge before attacking.  Has a $effect_chance% chance to paralyze the target.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to [paralyze]{mechanic:paralysis} the target.  User charges for one turn before attacking.
 333,9,Requires a turn to charge before attacking.  Has a $effect_chance% chance to [burn]{mechanic:burn} the target.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to [burn]{mechanic:burn} the target.  User charges for one turn before attacking.
-335,9,"Lowers the user's Defense, Special Defense, and Speed by one stage each.","Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the user's [Defense]{mechanic:defense}, [Special Defense]{mechanic:special-defense}, and [Speed]{mechanic:speed} by one [stage]{mechanic:stage} each."
-336,9,"With [Fusion Bolt]{move:fusion-bolt}, inflicts double damage.","Inflicts [regular damage]{mechanic:regular-damage}.  If a friendly Pokémon used []{move:fusion-bolt} earlier this turn, this move has double power."
-337,9,"With [Fusion Flare]{move:fusion-flare}, inflicts double damage.","Inflicts [regular damage]{mechanic:regular-damage}.  If a friendly Pokémon used []{move:fusion-flare} earlier this turn, this move has double power."
-338,9,Has a $effect_chance% chance to confuse the target.,"Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to [confuse]{mechanic:confuse} the target.
+334,9,Has a $effect_chance% chance to confuse the target.,"Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to [confuse]{mechanic:confuse} the target.
 
 This move can hit Pokémon under the effect of []{move:bounce}, []{move:fly}, or []{move:sky-drop}.
 
 During []{move:rain-dance}, this move has 100% accuracy.  During []{move:sunny-day}, this move has 50% accuracy."
-339,9,Deals both []{type:fighting} and []{type:flying}-type damage.,"Inflicts regular damage.  For the purposes of type effectiveness, this move is both []{type:fighting}- and []{type:flying}-type: its final effectiveness is determined by multiplying the effectiveness of each type against each of the target's types.
+335,9,"Lowers the user's Defense, Special Defense, and Speed by one stage each.","Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the user's [Defense]{mechanic:defense}, [Special Defense]{mechanic:special-defense}, and [Speed]{mechanic:speed} by one [stage]{mechanic:stage} each."
+336,9,"With [Fusion Bolt]{move:fusion-bolt}, inflicts double damage.","Inflicts [regular damage]{mechanic:regular-damage}.  If a friendly Pokémon used []{move:fusion-bolt} earlier this turn, this move has double power."
+337,9,"With [Fusion Flare]{move:fusion-flare}, inflicts double damage.","Inflicts [regular damage]{mechanic:regular-damage}.  If a friendly Pokémon used []{move:fusion-flare} earlier this turn, this move has double power."
+338,9,Deals both []{type:fighting} and []{type:flying}-type damage.,"Inflicts regular damage.  For the purposes of type effectiveness, this move is both []{type:fighting}- and []{type:flying}-type: its final effectiveness is determined by multiplying the effectiveness of each type against each of the target's types.
 
 For all other purposes, this move is pure Fighting-type.  If this move's type is changed, its Fighting typing is overwritten, and its secondary type remains Flying.
 
 If the target has used []{move:minimize} since entering battle, this move has double power and will never miss."
-340,9,Protects all friendly Pokémon from damaging moves.  Only works on the first turn after the user is sent out.,Protects all friendly Pokémon from damaging moves.  Only works on the first turn after the user is sent out.
-341,9,Can only be used after the user has eaten a berry.,"Inflicts regular damage.  Can only be used if the user has eaten a berry since the beginning of the battle.
+339,9,Can only be used after the user has eaten a berry.,"Inflicts regular damage.  Can only be used if the user has eaten a berry since the beginning of the battle.
 
 After the user eats a berry, it may use this move any number of times until the end of the battle, even if it switches out.  Eating a held berry, eating a berry via []{move:bug-bite} or []{move:pluck}, or being the target of a [Flung]{move:fling} berry will enable this move.  Feeding a Pokémon a berry from the bag or using []{move:natural-gift} will not.
 
 If the trainer chooses this move when it cannot be used, the choice is rejected outright and the trainer must choose another move."
-342,9,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle.,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle.
-343,9,"Covers the opposing field, lowering opponents' Speed by one stage upon switching in.","Shoots a web over the opponents' side of the field, which lowers the Speed of any opposing Pokémon that enters the field by one stage.
+340,9,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle.,Raises the Attack and Special Attack of all []{type:grass} Pokémon in battle.
+341,9,"Covers the opposing field, lowering opponents' Speed by one stage upon switching in.","Shoots a web over the opponents' side of the field, which lowers the Speed of any opposing Pokémon that enters the field by one stage.
 
 Pokémon in the air, such as []{type:flying}-types and those with []{ability:levitate}, are unaffected.  []{move:rapid-spin} removes Sticky Web from the user's side of the field; []{move:defog} removes it from both sides."
-344,9,Raises the user's Attack by two stages if it KOs the target.,Inflicts regular damage.  Raises the user's Attack by two stages if it KOs the target.
-345,9,Adds []{type:ghost} to the target's types.,Adds []{type:ghost} to the target's types.
-346,9,Lowers the target's Attack and Special Attack by one stage.,Lowers the target's Attack and Special Attack by one stage.
-347,9,Changes all []{type:normal} moves to []{type:electric} moves for the rest of the turn.,Changes all Pokémon's []{type:normal} moves to []{type:electric} moves for the rest of the turn.
-348,9,Heals the user for half the total damage dealt to all targets.,Heals the user for half the total damage dealt to all targets.
-349,9,Adds []{type:grass} to the target's types.,Adds []{type:grass} to the target's types.
-350,9,Super-effective against []{type:water}.,"Deals regular damage.  This move is super-effective against the []{type:water} type.
-
-The target's other type will affect damage as usual.  If this move's type is changed, it remains super-effective against Water regardless of its type."
-351,9,Lowers all targets' Attack and Special Attack by one stage.  Makes the user switch out.,Lowers all targets' Attack and Special Attack by one stage.  Makes the user switch out.
-352,9,Inverts the target's stat modifiers.,Inverts the target's stat modifiers.
-353,9,Drains 75% of the damage inflicted to heal the user.,Deals regular damage.  Drains 75% of the damage inflicted to heal the user.
-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.
+342,9,Raises the user's Attack by two stages if it KOs the target.,Inflicts regular damage.  Raises the user's Attack by two stages if it KOs the target.
+343,9,Adds []{type:ghost} to the target's types.,Adds []{type:ghost} to the target's types.
+344,9,Lowers the target's Attack and Special Attack by one stage.,Lowers the target's Attack and Special Attack by one stage.
+345,9,Changes all []{type:normal} moves to []{type:electric} moves for the rest of the turn.,Changes all Pokémon's []{type:normal} moves to []{type:electric} moves for the rest of the turn.
+346,9,Heals the user for half the total damage dealt to all targets.,Heals the user for half the total damage dealt to all targets.
+347,9,Lowers all targets' Attack and Special Attack by one stage.  Makes the user switch out.,Lowers all targets' Attack and Special Attack by one stage.  Makes the user switch out.
+348,9,Inverts the target's stat modifiers.,Inverts the target's stat modifiers.
+349,9,Drains 75% of the damage inflicted to heal the user.,Deals regular damage.  Drains 75% of the damage inflicted to heal the user.
+350,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.
-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.
+351,9,Raises the Defense of all []{type:grass} Pokémon in battle.,Raises the Defense of all []{type:grass} Pokémon in battle.
+352,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}."
-357,9,"For five turns, protects all Pokémon on the ground from major status ailments and confusion, and halves the power of incoming []{type:dragon} moves.","For five turns, protects all Pokémon on the ground from major status ailments and confusion and weakens []{type:dragon} moves used against them to 0.5× their power.
+353,9,"For five turns, protects all Pokémon on the ground from major status ailments and confusion, and halves the power of incoming []{type:dragon} moves.","For five turns, protects all Pokémon on the ground from major status ailments and confusion and weakens []{type:dragon} moves used against them to 0.5× their power.
 
 Changes []{move:nature-power} to []{move:moonblast}."
-358,9,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn.,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn.
-359,9,Prevents all Pokémon from fleeing or switching out during the next turn.,Prevents all Pokémon from fleeing or switching out during the next turn.
-360,9,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact.  Switches Aegislash to Shield Forme.,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact.  Switches Aegislash to Shield Forme.
-361,9,Lowers the target's Special Attack by one stage.,Lowers the target's Special Attack by one stage.
+354,9,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn.,Changes the target's move's type to []{type:electric} if it hasn't moved yet this turn.
+355,9,Prevents all Pokémon from fleeing or switching out during the next turn.,Prevents all Pokémon from fleeing or switching out during the next turn.
+356,9,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact.  Switches Aegislash to Shield Forme.,Blocks damaging attacks and lowers attacking Pokémon's Attack by two stages on contact.  Switches Aegislash to Shield Forme.
+357,9,Lowers the target's Attack by one stage.,Lowers the target's [Attack]{mechanic:attack} by one [stage]{mechanic:stage}.
+358,9,Lowers the target's Special Attack by one stage.,Lowers the target's Special Attack by one stage.
+359,9,Has a $effect_chance% chance to raise the user's Defense by two stages for each target hit.,Inflicts regular damage.  Has a $effect_chance% chance to raise the user's Defense by two stages for each target hit.
+360,9,Ignores and destroys protection effects.,Inflicts [regular damage]{mechanic:regular-damage}.  Bypasses and removes any protection effect on the target.
+361,9,Hits 2–5 times.,Inflicts regular damage.  Hits 2–5 times.
 362,9,Blocks damaging attacks and damages attacking Pokémon for 1/8 their max HP.,Blocks damaging attacks and damages attacking Pokémon for 1/8 their max HP.
 363,9,Raises a selected ally's Special Defense by one stage.,Raises a selected ally's Special Defense by one stage.
 364,9,"Lowers the target's Attack, Special Attack, and Speed by one stage if it is poisoned.","Lowers the target's Attack, Special Attack, and Speed by one stage if it is poisoned."
-365,9,"Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move.","Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move."
+365,9,Lowers the target's Attack by one stage.,Lowers the target's Attack by one stage.
 366,9,"Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by two stages.","Takes one turn to charge, then raises the user's Special Attack, Special Defense, and Speed by two stages."
 367,9,Raises the Defense and Special Defense of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage.,Raises the Defense and Special Defense of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage.
-368,9,"For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.","For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.
-
-Changes []{move:nature-power} to []{move:thunderbolt}."
-369,9,Lowers the target's Special Attack by two stages.,Lowers the target's Special Attack by two stages.
-370,9,Doubles prize money.,"Doubles prize money.
+368,9,Doubles prize money.,"Doubles prize money.
 
 Stacks with a held item.  Only works once per battle."
+369,9,"For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.","For five turns, prevents all Pokémon on the ground from sleeping and strengthens their []{type:electric} moves to 1.5× their power.
+
+Changes []{move:nature-power} to []{move:thunderbolt}."
+370,9,Does nothing.,Does nothing.
+371,9,Does nothing.,Does nothing.
+372,9,Has a $effect_chance% chance to paralyze the target.,Inflicts [regular damage]{mechanic:regular-damage}.  Has a $effect_chance% chance to [paralyze]{mechanic:paralysis} the target.
+373,9,"Grounds the target, and hits even Flying-type or levitating Pokémon.",Inflicts regular damage.  Grounds the target until it leaves battle.  Ignores levitation effects and the immunity of []{type:flying}-type Pokémon.
+374,9,Prevents the target from leaving battle.,Inflicts regular damage.  Traps the target.  
+375,9,Raises the user's Attack by one stage after inflicting damage.,Inflicts regular damage.  Raises the user's Attack by one stage.
+376,9,Adds []{type:grass} to the target's types.,Adds []{type:grass} to the target's types.
+377,9,Protects all friendly Pokémon from damaging moves.  Only works on the first turn after the user is sent out.,Protects all friendly Pokémon from damaging moves.  Only works on the first turn after the user is sent out.
+378,9,"Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move.","Explodes if the target uses a []{type:fire} move this turn, damaging it for 1/4 its max HP and preventing the move."
+379,9,Inflicts regular damage.,Inflicts [regular damage]{mechanic:regular-damage}.
+380,9,Super-effective against []{type:water}.,"Inflicts [regular damage]{mechanic:regular-damage}.  This move is super-effective against the []{type:water} type.
+
+The target's other type will affect damage as usual.  If this move's type is changed, it remains super-effective against Water regardless of its type."
+381,9,Never misses.,Inflicts [regular damage]{mechanic:regular-damage}.  Ignores [accuracy]{mechanic:accuracy} and [evasion]{mechanic:evasion}.
+382,9,"Heals the user for ½ its max HP, or ⅔ during a sandstorm.","Heals the user for ½ its max HP.  During a []{move:sandstorm}, the healing is increased to ⅔."
+383,9,Can only be used as the first move after the user enters battle.,Inflicts regular damage. Can only be used on the user's first turn after entering the field.
+384,9,Grants the user protection for the rest of the turn and poisons any Pokémon that tries to use a contact move on it.,"Grants the user protection for the rest of the turn.  If a Pokémon attempts to use a move that makes contact with the user, that Pokémon will be poisoned.  This move's chance of success halves every time it's used consecutively with any other protection move."
+385,9,Traps the target.,Inflicts regular damage.  Traps the target.
+386,9,Cures the target of burns.,"Inflicts regular damage.  If the target has a burn and takes damage from this move, its burn is healed."
+387,9,"Heals the target for ½ its max HP, or ⅔ on Grassy Terrain.","Heals the target for ½ its max HP.  If []{move:grassy-terrain} is in effect, heals for ⅔ instead."
+388,9,Heals the user by the target's current Attack stat and lowers the target's Attack by one stage.,"Lowers the target's Attack by one stage.  Heals the user by the target's current Attack, including modifiers, but not including this move's Attack-lowering effect.
+
+If the target's Attack is already at -6, this move will fail.  In any other situation that would prevent a stat modification, the healing will still succeed."
+389,9,Forces the target's opponents to aim at the target for the rest of the turn.,"For the duration of the turn, if the target is also a valid target for a move used by one of its opponents, that move will target it instead."
+390,9,Poisons the target and lowers its Speed by one stage.,Poisons the target and lowers its Speed by one stage.
+391,9,Guarantees a critical hit with the user's next move.,The user's next move will result in a [critical hit]{mechanic:critical-hit}.
+392,9,Raises the Attack and Special Attack of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage.,Raises the Attack and Special Attack of all friendly Pokémon with []{ability:plus} or []{ability:minus} by one stage.
+393,9,Prevents the target from using sound-based moves for two turns.,"Inflicts [regular damage]{mechanic:regular-damage}.  Silences the target for two turns, preventing it from using any sound-based moves."
+394,9,"Damages opponents, but heals allies for 50% of their max HP.","If the target is an opponent, inflicts [regular damage]{mechanic:regular-damage}.  If the target is an ally, heals the target for 50% of its max HP."
+395,9,Protects Pokémon on the ground from priority moves and increases the power of their  Psychic moves by 50%.,"Changes the terrain to Psychic Terrain for 5 turns.  Overrides []{move:electric-terrain}, []{move:grassy-terrain}, and []{move:misty-terrain}.
+
+All Pokémon on the ground are immune to moves with priority greater than 0.  (Moves that target the field rather than individual Pokémon, such as []{move:spikes}, are not affected.)  Additionally, when a Pokémon on the ground uses a []{type:psychic}-type move, that move's power is increased to 1.5×.
+
+If a Pokémon is holding a Terrain Extender when creating Psychic Terrain (by any means), the effect lasts for 8 turns instead of 5."
+396,9,Lowers the target's Attack by one stage after inflicting damage.,Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the target's [Attack]{mechanic:attack} by one [stage]{mechanic:stage}.
+397,9,Lowers the target's Defense by one stage after inflicting damage.,Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the target's [Defense]{mechanic:defense} by one [stage]{mechanic:stage}.
+398,9,Removes the user's []{type:fire} type after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}.  Removes the user's []{type:fire} type after damage calculation.  If the user is not []{type:fire}-type, this move will fail."
+399,9,Exchanges the user's Speed with the target's.,Exchanges the original [Speed]{mechanic:speed} stats of the user and target.
+400,9,Cures the target of a major status ailment and heals the user for 50% of its max HP.,"Cures the target of its major status ailment and heals the user for 50% of its max HP.  If the target has no major status ailment, this move will fail."
+401,9,Has the same type as the user.,"Inflicts [regular damage]{mechanic:regular-damage}.  This move's type matches the user's first type, if any; otherwise, it's typeless."
+402,9,Nullifies the target's ability if it moves earlier.,"Inflicts [regular damage]{mechanic:regular-damage}.  If the target has already moved this turn, its ability is nullified."
+403,9,Forces the target to repeat its last used move.,"The target immediately uses its most recently-used move.  This is independent of the target's normal action for the turn (i.e., it may end up moving twice), but otherwise functions as usual, including deduction of PP.  This effect works for disabled moves and ignores []{move:torment}."
+404,9,Inflicts a burn on any Pokémon that makes contact before the attack.,"Begins charging at the start of the turn, then attacks as normal.  Any Pokémon that makes contact with the user while charging is [burned]{mechanic:burns}.  The charging is not affected by accuracy, sleep, paralysis, or any other effect that would interfere with a move."
+405,9,Lowers the user's Defense by one stage after inflicting damage.,Inflicts [regular damage]{mechanic:regular-damage}.  Lowers the user's [Defense]{mechanic:defense} by one [stage]{mechanic:stage}.
+406,9,Inflicts regular damage with no additional effect.,Inflicts [regular damage]{mechanic:regular-damage}.
+407,9,"Reduces damage five turns, but must be used during hail.","Places the Aurora Veil effect on the user's side of the field for the next 5 turns.  If the weather is not []{move:hail}, or the weather is disabled by the effects of []{ability:cloud-nine} or []{ability:air-lock}, this move will fail.
+
+Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is reduced by ½.  (If there are multiple Pokémon on the affected field, the reduction is ⅓.)"
+408,9,Only inflicts damage if the user was hit by a physical move this turn.,"Inflicts [regular damage]{mechanic:regular-damage}.  If the user was not yet hit by an opponent's physical move this turn, this move will fail."
+409,9,Has double power if the user's last move failed.,"Inflicts [regular damage]{mechanic:regular-damage}.  Power is doubled if the user's last move failed for any reason (i.e., produced the message ""But it failed!"") or was ineffective due to types."
+410,9,"Steals the target's stat increases, then inflicts damage.","Steals the target's stat increases, then inflicts [regular damage]{mechanic:regular-damage}.  Will not steal stat increases that would put any of the user's stats at more than +6; any excess is left on the target.  Stolen increases are affected by abilities as normal."
+411,9,Cannot be disrupted by abilities.,"Inflicts [regular damage]{mechanic:regular-damage}.  Other Pokémon's abilities cannot activate in response to this move.  In particular, it hits through []{ability:disguise}"
+412,9,Lowers the target's Attack and Special Attack by one stage.,Lowers the target's [Attack]{mechanic:attack} and [Special Attack]{mechanic:special-attack} by one stage each.
+413,9,Damages the target for 75% of its remaining HP.,Inflicts direct damage equal to ¾ of the target's remaining HP.
+414,9,Raises all of the user's stats by two stages.,"Raises the user's [Attack]{mechanic:attack}, [Defense]{mechanic:defense}, [Special Attack]{mechanic:special-attack}, [Special Defense]{mechanic:special-defense}, and [Speed]{mechanic:speed} by two [stages]{mechanic:stage} each."
+415,9,Changes the terrain to Psychic Terrain after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) changes the terrain to []{move:psychic-terrain}."
 10001,9,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic:regular-damage}.  User's [critical hit]{mechanic:critical-hit} rate is one level higher when using this move while in [hyper mode]{mechanic:hyper-mode}.
 10002,9,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic:regular-damage}.  User takes 1/2 of its current [HP]{mechanic:hp} in recoil.
 10003,9,Halves HP of all Pokémon on the field.  Must recharge,"Halves [HP]{mechanic:hp} of all Pokémon on the field.  User loses its next turn to ""recharge"", and cannot attack or [switch]{mechanic:switch} out during that turn."
 10004,9,Lowers the target's evasion by two stages.,Lowers the target's [evasion]{mechanic:evasion} by two [stages]{mechanic:stage}.
 10005,9,"Removes [Light Screen]{move:light-screen}, [Reflect]{move:reflect}, and [Safeguard]{move:safeguard}.","Removes the effects of []{move:light-screen}, []{move:reflect}, and []{move:safeguard}."
 10006,9,Changes the weather to Shadow Sky for five turns.,Changes the weather to Shadow Sky for five turns.  Pokémon other than []{type:shadow} Pokémon take 1/16 their max [HP]{mechanic:hp} at the end of every turn.  This move is typeless for the purposes of []{move:weather-ball}.
-10007,9,Unknown.,"This move has a unique effect, but it is unreleased, so the specific effect is unknown."

data/v2/csv/move_effects.csv

@@ -53,6 +53,7 @@ id
 59
 60
 61
+62
 63
 66
 67
@@ -63,6 +64,7 @@ id
 72
 73
 74
+75
 76
 77
 78
@@ -312,6 +314,7 @@ id
 331
 332
 333
+334
 335
 336
 337
@@ -348,10 +351,54 @@ id
 368
 369
 370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
 10001
 10002
 10003
 10004
 10005
 10006
-10007

data/v2/csv/move_flag_map.csv

@@ -43,6 +43,7 @@ move_id,move_flag_id
 13,4
 13,7
 14,6
+14,21
 15,1
 15,4
 15,7
@@ -244,6 +245,7 @@ move_id,move_flag_id
 80,1
 80,4
 80,7
+80,21
 81,4
 81,5
 81,7
@@ -738,8 +740,10 @@ move_id,move_flag_id
 297,4
 297,5
 297,7
+297,21
 298,4
 298,7
+298,21
 299,1
 299,4
 299,7
@@ -878,6 +882,7 @@ move_id,move_flag_id
 348,4
 348,7
 349,6
+349,21
 350,4
 350,7
 351,4
@@ -1174,6 +1179,7 @@ move_id,move_flag_id
 460,7
 461,6
 461,13
+461,21
 462,1
 462,4
 462,7
@@ -1216,6 +1222,7 @@ move_id,move_flag_id
 482,4
 482,7
 483,6
+483,21
 484,1
 484,4
 484,7
@@ -1394,6 +1401,7 @@ move_id,move_flag_id
 551,7
 552,4
 552,7
+552,21
 553,2
 553,4
 553,7
@@ -1554,6 +1562,154 @@ move_id,move_flag_id
 616,20
 617,4
 617,7
+618,4
+618,7
+619,4
+619,7
+619,20
+620,1
+620,4
+620,7
+620,12
+621,7
+621,14
+658,1
+659,6
+659,13
+660,1
+660,4
+660,7
+662,4
+662,7
+663,1
+663,4
+663,7
+664,4
+664,7
+664,9
+664,14
+665,1
+665,4
+665,7
+665,8
+666,4
+666,5
+666,13
+667,1
+667,4
+667,7
+668,4
+668,5
+668,7
+668,13
+669,1
+669,2
+669,4
+669,7
+670,4
+670,7
+671,4
+671,5
+672,4
+672,5
+672,7
+673,6
+674,6
+674,14
+675,1
+675,4
+675,7
+676,4
+676,7
+677,1
+677,4
+677,7
+678,20
+679,1
+679,4
+679,7
+680,1
+680,4
+680,7
+681,1
+681,4
+681,7
+682,4
+682,7
+682,11
+683,4
+683,7
+683,14
+684,1
+684,4
+684,7
+685,4
+685,5
+685,13
+686,4
+686,7
+686,21
+687,4
+687,7
+688,1
+688,4
+688,7
+689,4
+689,14
+690,4
+691,4
+691,7
+691,9
+691,14
+692,1
+692,4
+692,7
+693,1
+693,4
+693,7
+694,6
+696,1
+699,1
+701,1
+704,4
+705,4
+705,7
+706,1
+706,4
+706,7
+707,1
+707,4
+707,7
+708,4
+708,7
+709,1
+709,4
+709,7
+710,1
+710,4
+710,7
+711,3
+711,4
+711,7
+712,1
+712,4
+712,7
+712,14
+713,1
+713,4
+713,7
+714,4
+714,7
+715,5
+715,7
+716,1
+716,4
+716,7
+717,4
+717,7
+718,1
+718,4
+718,7
 10001,1
 10001,4
 10002,4

data/v2/csv/move_flag_prose.csv

@@ -39,3 +39,4 @@ move_flag_id,local_language_id,name,description
 19,9,Mental effects,This move is blocked by []{ability:aroma-veil} and cured by []{item:mental-herb}.
 20,6,Nicht Nutzbar in Himmelskämpfen,Diese Fähigkeit ist in Himmelskämpfen nicht nutzbar.
 20,9,Unusable during Sky Battles,This move is unusable during Sky Battles.
+21,9,Dance,This move triggers []{ability:dancer}.

data/v2/csv/move_flags.csv

@@ -19,3 +19,4 @@ id,identifier
 18,ballistics
 19,mental
 20,non-sky-battle
+21,dance

data/v2/csv/move_meta.csv

@@ -616,3 +616,105 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 615,0,0,,,,,0,0,0,0,0,0
 616,0,0,,,,,0,0,0,0,0,0
 617,0,0,,,,,-50,0,0,0,0,0
+618,0,0,,,,,0,0,0,0,0,0
+619,0,0,,,,,0,0,0,0,0,0
+620,7,0,,,,,0,0,0,0,0,0
+621,7,0,,,,,0,0,0,0,0,0
+622,0,0,,,,,0,0,0,0,0,0
+623,0,0,,,,,0,0,0,0,0,0
+624,0,0,,,,,0,0,0,0,0,0
+625,0,0,,,,,0,0,0,0,0,0
+626,0,0,,,,,0,0,0,0,0,0
+627,0,0,,,,,0,0,0,0,0,0
+628,0,0,,,,,0,0,0,0,0,0
+629,0,0,,,,,0,0,0,0,0,0
+630,0,0,,,,,0,0,0,0,0,0
+631,0,0,,,,,0,0,0,0,0,0
+632,0,0,,,,,0,0,0,0,0,0
+633,0,0,,,,,0,0,0,0,0,0
+634,0,0,,,,,0,0,0,0,0,0
+635,0,0,,,,,0,0,0,0,0,0
+636,0,0,,,,,0,0,0,0,0,0
+637,0,0,,,,,0,0,0,0,0,0
+638,0,0,,,,,0,0,0,0,0,0
+639,0,0,,,,,0,0,0,0,0,0
+640,0,0,,,,,0,0,0,0,0,0
+641,0,0,,,,,0,0,0,0,0,0
+642,0,0,,,,,0,0,0,0,0,0
+643,0,0,,,,,0,0,0,0,0,0
+644,0,0,,,,,0,0,0,0,0,0
+645,0,0,,,,,0,0,0,0,0,0
+646,0,0,,,,,0,0,0,0,0,0
+647,0,0,,,,,0,0,0,0,0,0
+648,0,0,,,,,0,0,0,0,0,0
+649,0,0,,,,,0,0,0,0,0,0
+650,0,0,,,,,0,0,0,0,0,0
+651,0,0,,,,,0,0,0,0,0,0
+652,0,0,,,,,0,0,0,0,0,0
+653,0,0,,,,,0,0,0,0,0,0
+654,0,0,,,,,0,0,0,0,0,0
+655,0,0,,,,,0,0,0,0,0,0
+656,0,0,,,,,0,0,0,0,0,0
+657,0,0,,,,,0,0,0,0,0,0
+658,0,0,,,,,0,0,0,0,0,0
+659,3,0,,,,,0,50,0,0,0,0
+660,0,0,,,,,0,0,0,0,0,0
+661,13,0,,,,,0,0,0,0,0,0
+662,0,0,,,,,0,0,0,0,0,0
+663,0,0,,,,,0,0,0,0,0,0
+664,0,0,,,,,0,0,0,0,0,0
+665,7,0,,,,,0,0,0,0,0,0
+666,3,0,,,,,0,50,0,0,0,0
+667,0,0,,,,,0,0,0,0,0,0
+668,13,0,,,,,0,0,0,0,0,0
+669,0,0,,,,,0,0,0,0,0,0
+670,0,0,,,,,0,0,0,0,0,0
+671,13,0,,,,,0,0,0,0,0,0
+672,5,5,,,,,0,0,0,100,0,0
+673,13,0,,,,,0,0,0,0,0,0
+674,2,0,,,,,0,0,0,0,0,0
+675,4,24,,,2,2,0,0,0,100,0,0
+676,0,0,,,,,0,0,0,0,0,0
+677,0,0,,,,,0,0,0,0,0,0
+678,10,0,,,,,0,0,0,0,0,0
+679,6,0,,,,,0,0,0,0,0,0
+680,6,0,,,,,0,0,0,0,0,0
+681,0,0,,,,,0,0,0,0,0,0
+682,0,0,,,,,0,0,0,0,0,0
+683,13,0,,,,,0,0,0,0,0,0
+684,0,0,,,,,0,0,0,0,0,0
+685,13,0,,,,,0,50,0,0,0,0
+686,0,0,,,,,0,0,0,0,0,0
+687,0,0,,,,,0,0,0,0,0,0
+688,6,0,,,,,0,0,0,0,0,0
+689,13,0,,,,,0,0,0,0,0,0
+690,0,0,,,,,0,0,0,0,0,0
+691,7,0,,,,,0,0,0,0,0,0
+692,0,0,,,,,0,0,0,0,0,0
+693,0,0,,,,,0,0,0,0,0,0
+694,11,0,,,,,0,0,0,0,0,0
+695,0,0,,,,,0,0,0,0,0,0
+696,0,0,,,,,0,0,0,0,0,0
+697,0,0,,,,,0,0,0,0,0,0
+698,0,0,,,,,0,0,0,0,0,0
+699,0,0,,,,,0,0,0,0,0,0
+700,4,1,,,,,0,0,0,100,0,0
+701,0,0,,,,,0,0,0,0,0,0
+702,2,0,,,,,0,0,0,0,0,0
+703,0,0,,,,,0,0,0,0,0,0
+704,0,0,,,,,0,0,0,0,0,0
+705,7,0,,,,,0,0,0,0,0,0
+706,0,0,,,,,0,0,0,0,0,0
+707,0,0,,,,,0,0,0,0,0,0
+708,6,0,,,,,0,0,0,0,0,0
+709,0,0,,,,,0,0,0,0,0,0
+710,6,0,,,,,0,0,0,0,0,0
+711,0,0,,,,,0,0,0,0,0,0
+712,0,0,,,,,0,0,0,0,0,0
+713,0,0,,,,,0,0,0,0,0,0
+714,0,0,,,,,0,0,0,0,0,0
+715,2,0,,,,,0,0,0,0,0,0
+716,0,0,,,,,0,0,0,0,30,0
+717,0,0,,,,,0,0,0,0,0,0
+718,0,0,,,,,0,0,0,0,0,0
+719,0,0,,,,,0,0,2,0,0,0

data/v2/csv/move_meta_ailment_names.csv

@@ -39,3 +39,4 @@ move_meta_ailment_id,local_language_id,name
 20,9,Perish Song
 21,5,Racines
 21,9,Ingrain
+24,9,Silence

data/v2/csv/move_meta_ailments.csv

@@ -19,3 +19,4 @@ id,identifier
 19,embargo
 20,perish-song
 21,ingrain
+24,silence

data/v2/csv/moves.csv

@@ -31,7 +31,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 30,horn-attack,1,1,65,25,100,0,10,2,1,,1,1,5
 31,fury-attack,1,1,15,20,85,0,10,2,30,,1,10,7
 32,horn-drill,1,1,,5,30,0,10,2,39,,1,14,9
-33,tackle,1,1,50,35,100,0,10,2,1,,5,1,5
+33,tackle,1,1,40,35,100,0,10,2,1,,5,1,5
 34,body-slam,1,1,85,15,100,0,10,2,7,30,5,4,5
 35,wrap,1,1,15,20,90,0,10,2,43,100,5,24,21
 36,take-down,1,1,90,20,85,0,10,2,49,,5,3,5
@@ -79,12 +79,12 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 78,stun-spore,1,12,,30,75,0,10,1,68,,4,14,19
 79,sleep-powder,1,12,,15,75,0,10,1,2,,4,5,19
 80,petal-dance,1,12,120,10,100,0,8,3,28,,2,6,21
-81,string-shot,1,7,,40,95,0,11,1,21,,4,9,19
+81,string-shot,1,7,,40,95,0,11,1,61,,4,9,19
 82,dragon-rage,1,16,,10,100,0,10,3,42,,1,26,5
 83,fire-spin,1,10,35,15,85,0,10,3,43,100,2,24,21
 84,thunder-shock,1,13,40,30,100,0,10,3,7,10,1,1,5
 85,thunderbolt,1,13,90,15,100,0,10,3,7,10,1,1,17
-86,thunder-wave,1,13,,20,100,0,10,1,68,,1,14,19
+86,thunder-wave,1,13,,20,90,0,10,1,68,,1,14,19
 87,thunder,1,13,110,10,70,0,10,3,153,30,1,8,17
 88,rock-throw,1,6,50,15,90,0,10,2,1,,5,12,5
 89,earthquake,1,5,100,10,100,0,9,2,148,,5,5,18
@@ -139,7 +139,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 138,dream-eater,1,14,100,15,100,0,10,3,9,,4,8,20
 139,poison-gas,1,4,,40,90,0,11,1,67,,4,33,5
 140,barrage,1,1,15,20,85,0,10,2,30,,5,12,7
-141,leech-life,1,7,20,15,100,0,10,2,4,,4,9,20
+141,leech-life,1,7,80,10,100,0,10,2,4,,4,9,20
 142,lovely-kiss,1,1,,10,75,0,10,1,2,,2,5,19
 143,sky-attack,1,3,140,5,90,0,10,2,76,30,1,2,6
 144,transform,1,1,,10,,0,10,1,58,,4,17,23
@@ -163,7 +163,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 162,super-fang,1,1,,10,90,0,10,2,41,,5,14,5
 163,slash,1,1,70,20,100,0,10,2,44,,1,2,5
 164,substitute,1,1,,10,,0,7,1,80,,4,16,23
-165,struggle,1,1,50,,,0,8,2,255,,1,1,5
+165,struggle,1,1,50,1,,0,8,2,255,,1,1,5
 166,sketch,2,1,,1,,0,10,1,96,,4,19,23
 167,triple-kick,2,2,10,10,90,0,10,2,105,,1,1,7
 168,thief,2,17,60,25,100,0,10,2,106,,5,20,12
@@ -205,7 +205,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 204,charm,2,18,,20,100,0,10,1,59,,3,23,19
 205,rollout,2,6,30,20,90,0,10,2,118,,5,24,7
 206,false-swipe,2,1,40,40,100,0,10,2,102,,1,5,16
-207,swagger,2,1,,15,90,0,10,1,119,,3,27,19
+207,swagger,2,1,,15,85,0,10,1,119,,3,27,19
 208,milk-drink,2,1,,10,,0,7,1,33,,3,12,8
 209,spark,2,13,65,20,100,0,10,2,7,30,1,4,5
 210,fury-cutter,2,7,40,20,95,0,10,2,120,,1,17,7
@@ -387,7 +387,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 386,punishment,4,17,,5,100,0,10,2,246,,4,,23
 387,last-resort,4,1,140,5,100,0,10,2,247,,3,,21
 388,worry-seed,4,12,,10,100,0,10,1,248,,2,,19
-389,sucker-punch,4,17,80,5,100,1,10,2,249,,4,,1
+389,sucker-punch,4,17,70,5,100,1,10,2,249,,4,,1
 390,toxic-spikes,4,4,,20,,0,6,1,250,,4,,13
 391,heart-swap,4,14,,10,,0,10,1,251,,1,,16
 392,aqua-ring,4,11,,20,,0,7,1,252,,2,,8
@@ -462,7 +462,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 461,lunar-dance,4,14,,10,,0,7,1,271,,2,,8
 462,crush-grip,4,1,,5,100,0,10,2,238,,5,,15
 463,magma-storm,4,10,100,5,75,0,10,3,43,100,5,,7
-464,dark-void,4,17,,10,80,0,11,1,2,,4,,19
+464,dark-void,4,17,,10,50,0,11,1,2,,4,,19
 465,seed-flare,4,12,120,5,85,0,10,3,272,40,1,,22
 466,ominous-wind,4,8,60,5,100,0,10,3,141,10,4,,11
 467,shadow-force,4,8,120,5,100,0,10,2,273,,4,,22
@@ -500,7 +500,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 499,clear-smog,5,4,50,15,,0,10,3,305,,,,
 500,stored-power,5,14,20,10,100,0,10,3,306,,,,
 501,quick-guard,5,2,,15,,3,4,1,307,,,,
-502,ally-switch,5,14,,15,,1,7,1,308,,,,
+502,ally-switch,5,14,,15,,2,7,1,308,,,,
 503,scald,5,11,80,15,100,0,10,3,5,30,,,
 504,shell-smash,5,1,,15,,0,7,1,309,,,,
 505,heal-pulse,5,14,,10,,0,10,1,310,,,,
@@ -540,7 +540,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 539,night-daze,5,17,85,10,95,0,10,3,74,40,,,
 540,psystrike,5,14,100,10,100,0,10,3,283,,,,
 541,tail-slap,5,1,25,10,85,0,10,2,30,,,,
-542,hurricane,5,3,110,10,70,0,10,3,338,30,,,
+542,hurricane,5,3,110,10,70,0,10,3,334,30,,,
 543,head-charge,5,1,120,15,100,0,10,2,49,,,,
 544,gear-grind,5,9,50,15,85,0,10,2,45,,,,
 545,searing-shot,5,10,100,5,100,0,9,3,5,30,,,
@@ -558,68 +558,166 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 557,v-create,5,10,180,5,95,0,10,2,335,100,,,
 558,fusion-flare,5,10,100,5,100,0,10,3,336,,,,
 559,fusion-bolt,5,13,100,5,100,0,10,2,337,,,,
-560,flying-press,6,2,80,10,95,0,10,2,339,,,,
-561,mat-block,6,2,,10,,0,4,1,340,,,,
-562,belch,6,4,120,10,90,0,10,3,341,,,,
-563,rototiller,6,5,,10,,0,14,1,342,100,,,
-564,sticky-web,6,7,,20,,0,6,1,343,,,,
-565,fell-stinger,6,7,30,25,100,0,10,2,344,,,,
+560,flying-press,6,2,100,10,95,0,10,2,338,,,,
+561,mat-block,6,2,,10,,0,4,1,377,,,,
+562,belch,6,4,120,10,90,0,10,3,339,,,,
+563,rototiller,6,5,,10,,0,14,1,340,100,,,
+564,sticky-web,6,7,,20,,0,6,1,341,,,,
+565,fell-stinger,6,7,50,25,100,0,10,2,342,,,,
 566,phantom-force,6,8,90,10,100,0,10,2,273,,,,
-567,trick-or-treat,6,8,,20,100,0,10,1,345,,,,
-568,noble-roar,6,1,,30,100,0,10,1,346,100,,,
-569,ion-deluge,6,13,,25,,1,12,1,347,,,,
-570,parabolic-charge,6,13,50,20,100,0,9,3,348,,,,
-571,forests-curse,6,12,,20,100,0,10,1,349,,,,
-572,petal-blizzard,6,12,90,15,100,0,9,2,1,,,,
-573,freeze-dry,6,15,70,20,100,0,10,3,350,10,,,
-574,disarming-voice,6,18,40,15,,0,11,3,18,,,,
-575,parting-shot,6,17,,20,100,0,10,1,351,100,,,
-576,topsy-turvy,6,17,,20,,0,10,1,352,,,,
-577,draining-kiss,6,18,50,10,100,0,10,3,353,,,,
-578,crafty-shield,6,18,,10,,3,4,1,354,,,,
-579,flower-shield,6,18,,10,,0,14,1,355,100,,,
-580,grassy-terrain,6,12,,10,,0,12,1,356,,,,
-581,misty-terrain,6,18,,10,,0,12,1,357,,,,
-582,electrify,6,13,,20,,0,10,1,358,,,,
+567,trick-or-treat,6,8,,20,100,0,10,1,343,,,,
+568,noble-roar,6,1,,30,100,0,10,1,344,100,,,
+569,ion-deluge,6,13,,25,,1,12,1,345,,,,
+570,parabolic-charge,6,13,65,20,100,0,9,3,346,,,,
+571,forests-curse,6,12,,20,100,0,10,1,376,,,,
+572,petal-blizzard,6,12,90,15,100,0,9,2,379,,,,
+573,freeze-dry,6,15,70,20,100,0,10,3,380,10,,,
+574,disarming-voice,6,18,40,15,,0,11,3,381,,,,
+575,parting-shot,6,17,,20,100,0,10,1,347,100,,,
+576,topsy-turvy,6,17,,20,,0,10,1,348,,,,
+577,draining-kiss,6,18,50,10,100,0,10,3,349,,,,
+578,crafty-shield,6,18,,10,,3,4,1,350,,,,
+579,flower-shield,6,18,,10,,0,14,1,351,100,,,
+580,grassy-terrain,6,12,,10,,0,12,1,352,,,,
+581,misty-terrain,6,18,,10,,0,12,1,353,,,,
+582,electrify,6,13,,20,,0,10,1,354,,,,
 583,play-rough,6,18,90,10,90,0,10,2,69,10,,,
 584,fairy-wind,6,18,40,30,100,0,10,3,1,,,,
 585,moonblast,6,18,95,15,100,0,10,3,72,30,,,
-586,boomburst,6,1,140,10,100,0,9,3,1,,,,
-587,fairy-lock,6,18,,10,,0,12,1,359,,,,
-588,kings-shield,6,9,,10,,4,7,1,360,,,,
-589,play-nice,6,1,,20,,0,10,1,19,100,,,
-590,confide,6,1,,20,,0,10,1,361,100,,,
-591,diamond-storm,6,6,100,5,95,0,11,2,139,50,,,
+586,boomburst,6,1,140,10,100,0,9,3,379,,,,
+587,fairy-lock,6,18,,10,,0,12,1,355,,,,
+588,kings-shield,6,9,,10,,4,7,1,356,,,,
+589,play-nice,6,1,,20,,0,10,1,357,100,,,
+590,confide,6,1,,20,,0,10,1,358,100,,,
+591,diamond-storm,6,6,100,5,95,0,11,2,359,50,,,
 592,steam-eruption,6,11,110,5,95,0,10,3,5,30,,,
-593,hyperspace-hole,6,14,80,5,,0,10,3,10007,,,,
-594,water-shuriken,6,11,15,20,100,1,10,2,30,,,,
-595,mystical-fire,6,10,65,10,100,0,10,3,72,100,,,
+593,hyperspace-hole,6,14,80,5,,0,10,3,360,,,,
+594,water-shuriken,6,11,15,20,100,1,10,3,361,,,,
+595,mystical-fire,6,10,75,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,369,,,,
+598,eerie-impulse,6,13,,15,100,0,10,1,62,,,,
 599,venom-drench,6,4,,20,100,0,11,1,364,100,,,
-600,powder,6,7,,20,100,1,10,1,365,,,,
+600,powder,6,7,,20,100,1,10,1,378,,,,
 601,geomancy,6,18,,10,,0,7,1,366,,,,
 602,magnetic-flux,6,13,,20,,0,13,1,367,,,,
-603,happy-hour,6,1,,30,,0,4,1,370,,,,
-604,electric-terrain,6,13,,10,,0,12,1,368,,,,
+603,happy-hour,6,1,,30,,0,4,1,368,,,,
+604,electric-terrain,6,13,,10,,0,12,1,369,,,,
 605,dazzling-gleam,6,18,80,10,100,0,11,3,1,,,,
-606,celebrate,6,1,,40,,0,7,1,10007,,,,
-607,hold-hands,6,1,,40,,0,3,1,10007,,,,
-608,baby-doll-eyes,6,18,,30,100,1,10,1,19,,,,
-609,nuzzle,6,13,20,20,100,0,10,2,7,100,,,
+606,celebrate,6,1,,40,,0,7,1,370,,,,
+607,hold-hands,6,1,,40,,0,3,1,371,,,,
+608,baby-doll-eyes,6,18,,30,100,1,10,1,365,,,,
+609,nuzzle,6,13,20,20,100,0,10,2,372,100,,,
 610,hold-back,6,1,40,40,100,0,10,2,102,,,,
 611,infestation,6,7,20,20,100,0,10,3,43,100,,,
-612,power-up-punch,6,2,40,20,100,0,10,2,140,100,,,
-613,oblivion-wing,6,3,80,10,100,0,10,3,353,,,,
-614,thousand-arrows,6,5,90,10,100,0,11,2,10007,100,,,
-615,thousand-waves,6,5,90,10,100,0,11,2,10007,,,,
+612,power-up-punch,6,2,40,20,100,0,10,2,375,100,,,
+613,oblivion-wing,6,3,80,10,100,0,10,3,349,,,,
+614,thousand-arrows,6,5,90,10,100,0,11,2,373,100,,,
+615,thousand-waves,6,5,90,10,100,0,11,2,374,,,,
 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,,,,
+620,dragon-ascent,6,3,120,5,100,0,10,2,230,100,,,
+621,hyperspace-fury,6,17,100,5,,0,10,2,360,100,,,
+622,breakneck-blitz--physical,7,1,,1,,0,10,2,1,,,,
+623,breakneck-blitz--special,7,1,,1,,0,10,3,1,,,,
+624,all-out-pummeling--physical,7,2,,1,,0,10,2,1,,,,
+625,all-out-pummeling--special,7,2,,1,,0,10,3,1,,,,
+626,supersonic-skystrike--physical,7,3,,1,,0,10,2,1,,,,
+627,supersonic-skystrike--special,7,3,,1,,0,10,3,1,,,,
+628,acid-downpour--physical,7,4,,1,,0,10,2,1,,,,
+629,acid-downpour--special,7,4,,1,,0,10,3,1,,,,
+630,tectonic-rage--physical,7,5,,1,,0,10,2,1,,,,
+631,tectonic-rage--special,7,5,,1,,0,10,3,1,,,,
+632,continental-crush--physical,7,6,,1,,0,10,2,1,,,,
+633,continental-crush--special,7,6,,1,,0,10,3,1,,,,
+634,savage-spin-out--physical,7,7,,1,,0,10,2,1,,,,
+635,savage-spin-out--special,7,7,,1,,0,10,3,1,,,,
+636,never-ending-nightmare--physical,7,8,,1,,0,10,2,1,,,,
+637,never-ending-nightmare--special,7,8,,1,,0,10,3,1,,,,
+638,corkscrew-crash--physical,7,9,,1,,0,10,2,1,,,,
+639,corkscrew-crash--special,7,9,,1,,0,10,3,1,,,,
+640,inferno-overdrive--physical,7,10,,1,,0,10,2,1,,,,
+641,inferno-overdrive--special,7,10,,1,,0,10,3,1,,,,
+642,hydro-vortex--physical,7,11,,1,,0,10,2,1,,,,
+643,hydro-vortex--special,7,11,,1,,0,10,3,1,,,,
+644,bloom-doom--physical,7,12,,1,,0,10,2,1,,,,
+645,bloom-doom--special,7,12,,1,,0,10,3,1,,,,
+646,gigavolt-havoc--physical,7,13,,1,,0,10,2,1,,,,
+647,gigavolt-havoc--special,7,13,,1,,0,10,3,1,,,,
+648,shattered-psyche--physical,7,14,,1,,0,10,2,1,,,,
+649,shattered-psyche--special,7,14,,1,,0,10,3,1,,,,
+650,subzero-slammer--physical,7,15,,1,,0,10,2,1,,,,
+651,subzero-slammer--special,7,15,,1,,0,10,3,1,,,,
+652,devastating-drake--physical,7,16,,1,,0,10,2,1,,,,
+653,devastating-drake--special,7,16,,1,,0,10,3,1,,,,
+654,black-hole-eclipse--physical,7,17,,1,,0,10,2,1,,,,
+655,black-hole-eclipse--special,7,17,,1,,0,10,3,1,,,,
+656,twinkle-tackle--physical,7,18,,1,,0,10,2,1,,,,
+657,twinkle-tackle--special,7,18,,1,,0,10,3,1,,,,
+658,catastropika,7,13,210,1,,0,10,2,1,,,,
+659,shore-up,7,5,,10,,0,7,1,382,,,,
+660,first-impression,7,7,90,10,100,2,10,2,383,,,,
+661,baneful-bunker,7,4,,10,,4,7,1,384,,,,
+662,spirit-shackle,7,8,80,10,100,0,10,2,385,,,,
+663,darkest-lariat,7,17,85,10,100,0,10,2,304,,,,
+664,sparkling-aria,7,11,90,10,100,0,9,3,386,,,,
+665,ice-hammer,7,15,100,10,90,0,10,2,219,100,,,
+666,floral-healing,7,18,,10,,0,10,1,387,,,,
+667,high-horsepower,7,5,95,10,95,0,10,2,1,,,,
+668,strength-sap,7,12,,10,100,0,10,1,388,100,,,
+669,solar-blade,7,12,125,10,100,0,10,2,152,,,,
+670,leafage,7,12,40,40,100,0,10,2,1,,,,
+671,spotlight,7,1,,15,,3,10,1,389,,,,
+672,toxic-thread,7,4,,20,100,0,10,1,390,100,,,
+673,laser-focus,7,1,,30,,0,7,1,391,,,,
+674,gear-up,7,9,,20,,0,13,1,392,,,,
+675,throat-chop,7,17,80,15,100,0,10,2,393,100,,,
+676,pollen-puff,7,7,90,15,100,0,10,3,394,,,,
+677,anchor-shot,7,9,80,20,100,0,10,2,385,,,,
+678,psychic-terrain,7,14,,10,,0,12,1,395,,,,
+679,lunge,7,7,80,15,100,0,10,2,396,100,,,
+680,fire-lash,7,10,80,15,100,0,10,2,397,100,,,
+681,power-trip,7,17,20,10,100,0,10,2,306,,,,
+682,burn-up,7,10,130,5,100,0,10,3,398,,,,
+683,speed-swap,7,14,,10,,0,10,1,399,,,,
+684,smart-strike,7,9,70,10,,0,10,2,18,,,,
+685,purify,7,4,,20,,0,10,1,400,,,,
+686,revelation-dance,7,1,90,15,100,0,10,3,401,,,,
+687,core-enforcer,7,16,100,10,100,0,11,3,402,,,,
+688,trop-kick,7,12,70,15,100,0,10,2,396,100,,,
+689,instruct,7,14,,15,,0,10,1,403,,,,
+690,beak-blast,7,3,100,15,100,-3,10,2,404,,,,
+691,clanging-scales,7,16,110,5,100,0,11,3,405,100,,,
+692,dragon-hammer,7,16,90,15,100,0,10,2,1,,,,
+693,brutal-swing,7,17,60,20,100,0,9,2,406,,,,
+694,aurora-veil,7,15,,20,,0,4,1,407,,,,
+695,sinister-arrow-raid,7,8,180,1,,0,10,2,1,,,,
+696,malicious-moonsault,7,17,180,1,,0,10,2,1,,,,
+697,oceanic-operetta,7,11,195,1,,0,10,3,1,,,,
+698,guardian-of-alola,7,18,,1,,0,10,3,413,,,,
+699,soul-stealing-7-star-strike,7,8,195,1,,0,10,2,1,,,,
+700,stoked-sparksurfer,7,13,175,1,,0,10,3,7,100,,,
+701,pulverizing-pancake,7,1,210,1,,0,10,2,1,,,,
+702,extreme-evoboost,7,1,,1,,0,7,1,414,100,,,
+703,genesis-supernova,7,14,185,1,,0,10,3,415,,,,
+704,shell-trap,7,10,150,5,100,-3,11,3,408,,,,
+705,fleur-cannon,7,18,130,5,90,0,10,3,205,100,,,
+706,psychic-fangs,7,14,85,10,100,0,10,2,187,,,,
+707,stomping-tantrum,7,5,75,10,100,0,10,2,409,,,,
+708,shadow-bone,7,8,85,10,100,0,10,2,70,20,,,
+709,accelerock,7,6,40,20,100,1,10,2,104,,,,
+710,liquidation,7,11,85,10,100,0,10,2,70,20,,,
+711,prismatic-laser,7,14,160,10,100,0,10,3,81,,,,
+712,spectral-thief,7,8,90,10,100,0,10,2,410,,,,
+713,sunsteel-strike,7,9,100,5,100,0,10,2,411,,,,
+714,moongeist-beam,7,8,100,5,100,0,10,3,411,,,,
+715,tearful-look,7,1,,20,,0,10,1,412,100,,,
+716,zing-zap,7,13,80,10,100,0,10,2,32,30,,,
+717,natures-madness,7,18,,10,90,0,10,3,41,,,,
+718,multi-attack,7,1,90,10,100,0,10,2,269,,,,
+719,10-000-000-volt-thunderbolt,7,13,195,1,,0,10,3,1,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokemon_abilities.csv

@@ -241,7 +241,7 @@ pokemon_id,ability_id,is_hidden,slot
 91,142,1,3
 92,26,0,1
 93,26,0,1
-94,26,0,1
+94,130,0,1
 95,69,0,1
 95,5,0,2
 95,133,1,3
@@ -636,11 +636,11 @@ pokemon_id,ability_id,is_hidden,slot
 242,32,0,2
 242,131,1,3
 243,46,0,1
-243,10,1,3
+243,39,1,3
 244,46,0,1
-244,18,1,3
+244,39,1,3
 245,46,0,1
-245,11,1,3
+245,39,1,3
 246,62,0,1
 246,8,1,3
 247,61,0,1
@@ -712,8 +712,10 @@ pokemon_id,ability_id,is_hidden,slot
 277,62,0,1
 277,113,1,3
 278,51,0,1
+278,93,0,2
 278,44,1,3
 279,51,0,1
+279,2,0,2
 279,44,1,3
 280,28,0,1
 280,36,0,2
@@ -827,6 +829,7 @@ pokemon_id,ability_id,is_hidden,slot
 323,116,0,2
 323,83,1,3
 324,73,0,1
+324,70,0,2
 324,75,1,3
 325,47,0,1
 325,20,0,2
@@ -1275,10 +1278,13 @@ pokemon_id,ability_id,is_hidden,slot
 523,78,0,2
 523,157,1,3
 524,5,0,1
+524,133,0,2
 524,159,1,3
 525,5,0,1
+525,133,0,2
 525,159,1,3
 526,5,0,1
+526,45,0,2
 526,159,1,3
 527,109,0,1
 527,103,0,2
@@ -1432,10 +1438,13 @@ pokemon_id,ability_id,is_hidden,slot
 581,145,0,2
 581,93,1,3
 582,115,0,1
+582,81,0,2
 582,133,1,3
 583,115,0,1
+583,81,0,2
 583,133,1,3
 584,115,0,1
+584,117,0,2
 584,133,1,3
 585,34,0,1
 585,157,0,2
@@ -1510,8 +1519,10 @@ pokemon_id,ability_id,is_hidden,slot
 612,104,0,2
 612,127,1,3
 613,81,0,1
+613,202,0,2
 613,155,1,3
 614,81,0,1
+614,202,0,2
 614,33,1,3
 615,26,0,1
 616,93,0,1
@@ -1750,6 +1761,170 @@ pokemon_id,ability_id,is_hidden,slot
 719,29,0,1
 720,170,0,1
 721,11,0,1
+722,65,0,1
+722,203,1,3
+723,65,0,1
+723,203,1,3
+724,65,0,1
+724,203,1,3
+725,66,0,1
+725,22,1,3
+726,66,0,1
+726,22,1,3
+727,66,0,1
+727,22,1,3
+728,67,0,1
+728,204,1,3
+729,67,0,1
+729,204,1,3
+730,67,0,1
+730,204,1,3
+731,51,0,1
+731,92,0,2
+731,53,1,3
+732,51,0,1
+732,92,0,2
+732,53,1,3
+733,51,0,1
+733,92,0,2
+733,125,1,3
+734,198,0,1
+734,173,0,2
+734,91,1,3
+735,198,0,1
+735,173,0,2
+735,91,1,3
+736,68,0,1
+737,217,0,1
+738,26,0,1
+739,52,0,1
+739,89,0,2
+739,83,1,3
+740,52,0,1
+740,89,0,2
+740,83,1,3
+741,216,0,1
+742,118,0,1
+742,19,0,2
+742,175,1,3
+743,118,0,1
+743,19,0,2
+743,175,1,3
+744,51,0,1
+744,72,0,2
+744,80,1,3
+745,51,0,1
+745,146,0,2
+745,80,1,3
+746,208,0,1
+747,196,0,1
+747,7,0,2
+747,144,1,3
+748,196,0,1
+748,7,0,2
+748,144,1,3
+749,20,0,1
+749,192,0,2
+749,39,1,3
+750,20,0,1
+750,192,0,2
+750,39,1,3
+751,199,0,1
+751,11,1,3
+752,199,0,1
+752,11,1,3
+753,102,0,1
+753,126,1,3
+754,102,0,1
+754,126,1,3
+755,35,0,1
+755,27,0,2
+755,44,1,3
+756,35,0,1
+756,27,0,2
+756,44,1,3
+757,212,0,1
+757,12,1,3
+758,212,0,1
+758,12,1,3
+759,218,0,1
+759,103,0,2
+759,56,1,3
+760,218,0,1
+760,103,0,2
+760,127,1,3
+761,102,0,1
+761,12,0,2
+761,175,1,3
+762,102,0,1
+762,12,0,2
+762,175,1,3
+763,102,0,1
+763,214,0,2
+763,175,1,3
+764,166,0,1
+764,205,0,2
+764,30,1,3
+765,39,0,1
+765,140,0,2
+765,180,1,3
+766,222,0,1
+766,128,1,3
+767,193,0,1
+768,194,0,1
+769,195,0,1
+769,8,1,3
+770,195,0,1
+770,8,1,3
+771,215,0,1
+771,109,1,3
+772,4,0,1
+773,225,0,1
+774,197,0,1
+775,213,0,1
+776,75,0,1
+777,160,0,1
+777,31,0,2
+777,5,1,3
+778,209,0,1
+779,219,0,1
+779,173,0,2
+779,147,1,3
+780,201,0,1
+780,157,0,2
+780,13,1,3
+781,200,0,1
+782,171,0,1
+782,43,0,2
+782,142,1,3
+783,171,0,1
+783,43,0,2
+783,142,1,3
+784,171,0,1
+784,43,0,2
+784,142,1,3
+785,226,0,1
+785,140,1,3
+786,227,0,1
+786,140,1,3
+787,229,0,1
+787,140,1,3
+788,228,0,1
+788,140,1,3
+789,109,0,1
+790,5,0,1
+791,230,0,1
+792,231,0,1
+793,224,0,1
+794,224,0,1
+795,224,0,1
+796,224,0,1
+797,224,0,1
+798,224,0,1
+799,224,0,1
+800,232,0,1
+801,220,0,1
+802,101,0,1
 10001,46,0,1
 10002,46,0,1
 10003,46,0,1
@@ -1866,3 +2041,105 @@ pokemon_id,ability_id,is_hidden,slot
 10088,113,0,1
 10089,184,0,1
 10090,91,0,1
+10091,82,0,1
+10091,55,0,2
+10091,47,1,3
+10092,82,0,1
+10092,55,0,2
+10092,47,1,3
+10093,82,0,1
+10093,55,0,2
+10093,47,1,3
+10094,9,0,1
+10094,31,1,3
+10095,9,0,1
+10095,31,1,3
+10096,9,0,1
+10096,31,1,3
+10097,9,0,1
+10097,31,1,3
+10098,9,0,1
+10098,31,1,3
+10099,9,0,1
+10099,31,1,3
+10100,207,0,1
+10101,81,0,1
+10101,202,1,3
+10102,81,0,1
+10102,202,1,3
+10103,81,0,1
+10103,117,1,3
+10104,81,0,1
+10104,117,1,3
+10105,8,0,1
+10105,221,0,2
+10105,159,1,3
+10106,8,0,1
+10106,221,0,2
+10106,159,1,3
+10107,53,0,1
+10107,101,0,2
+10107,155,1,3
+10108,169,0,1
+10108,101,0,2
+10108,155,1,3
+10109,42,0,1
+10109,5,0,2
+10109,206,1,3
+10110,42,0,1
+10110,5,0,2
+10110,206,1,3
+10111,42,0,1
+10111,5,0,2
+10111,206,1,3
+10112,143,0,1
+10112,82,0,2
+10112,223,1,3
+10113,143,0,1
+10113,82,0,2
+10113,223,1,3
+10114,119,0,1
+10114,139,1,3
+10115,130,0,1
+10115,31,0,2
+10115,69,1,3
+10116,210,0,1
+10117,210,0,1
+10118,211,0,1
+10119,211,0,1
+10120,211,0,1
+10121,198,0,1
+10121,173,0,2
+10121,91,1,3
+10122,26,0,1
+10123,216,0,1
+10124,216,0,1
+10125,216,0,1
+10126,51,0,1
+10126,72,0,2
+10126,99,1,3
+10127,208,0,1
+10128,102,0,1
+10128,126,1,3
+10129,212,0,1
+10129,12,1,3
+10130,197,0,1
+10131,197,0,1
+10132,197,0,1
+10133,197,0,1
+10134,197,0,1
+10135,197,0,1
+10136,197,0,1
+10137,197,0,1
+10138,197,0,1
+10139,197,0,1
+10140,197,0,1
+10141,197,0,1
+10142,197,0,1
+10143,209,0,1
+10144,209,0,1
+10145,209,0,1
+10146,171,0,1
+10146,43,0,2
+10146,142,1,3
+10147,220,0,1

data/v2/csv/pokemon_egg_groups.csv

@@ -911,3 +911,98 @@ species_id,egg_group_id
 719,15
 720,15
 721,15
+722,4
+723,4
+724,4
+725,5
+726,5
+727,5
+728,2
+728,5
+729,2
+729,5
+730,2
+730,5
+731,4
+732,4
+733,4
+734,5
+735,5
+736,3
+737,3
+738,3
+739,9
+740,9
+741,4
+742,3
+742,6
+743,3
+743,6
+744,5
+745,5
+746,12
+747,2
+748,2
+749,5
+750,5
+751,2
+751,3
+752,2
+752,3
+753,7
+754,7
+755,7
+756,7
+757,1
+757,14
+758,1
+758,14
+759,5
+760,5
+761,7
+762,7
+763,7
+764,7
+765,5
+766,5
+767,3
+767,9
+768,3
+768,9
+769,11
+770,11
+771,2
+772,15
+773,15
+774,10
+775,5
+776,1
+776,14
+777,5
+777,6
+778,11
+779,12
+780,1
+780,14
+781,10
+782,14
+783,14
+784,14
+785,15
+786,15
+787,15
+788,15
+789,15
+790,15
+791,15
+792,15
+793,15
+794,15
+795,15
+796,15
+797,15
+798,15
+799,15
+800,15
+801,15
+802,15

data/v2/csv/pokemon_evolution.csv

@@ -363,3 +363,42 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 363,470,1,,,,650,,,,,,,,,,,,0,0
 364,471,1,,,,640,,,,,,,,,,,,0,0
 365,476,1,,,,629,,,,,,,,,,,,0,0
+366,462,1,,,,,,,,,,,,,,,,0,0
+367,105,1,,28,,,,night,,,,,,,,,,0,0
+368,470,1,,,,,,,,,,,,,,,,0,0
+369,471,1,,,,,,,,,,,,,,,,0,0
+370,476,1,,,,,,,,,,,,,,,,0,0
+371,350,1,,,,,,,,,,170,,,,,,0,0
+372,678,1,,25,2,,,,,,,,,,,,,0,0
+373,723,1,,17,,,,,,,,,,,,,,0,0
+374,724,1,,34,,,,,,,,,,,,,,0,0
+375,726,1,,17,,,,,,,,,,,,,,0,0
+376,727,1,,34,,,,,,,,,,,,,,0,0
+377,729,1,,17,,,,,,,,,,,,,,0,0
+378,730,1,,34,,,,,,,,,,,,,,0,0
+379,732,1,,14,,,,,,,,,,,,,,0,0
+380,733,1,,28,,,,,,,,,,,,,,0,0
+381,735,1,,20,,,,day,,,,,,,,,,0,0
+382,737,1,,20,,,,,,,,,,,,,,0,0
+383,738,1,,,,,,,,,,,,,,,,0,0
+384,740,1,,,,,,,,,,,,,,,,0,0
+385,743,1,,25,,,,,,,,,,,,,,0,0
+386,745,1,,25,,,,day,,,,,,,,,,0,0
+387,745,1,,25,,,,night,,,,,,,,,,0,0
+388,748,1,,38,,,,,,,,,,,,,,0,0
+389,750,1,,30,,,,,,,,,,,,,,0,0
+390,752,1,,22,,,,,,,,,,,,,,0,0
+391,754,1,,34,,,,day,,,,,,,,,,0,0
+392,756,1,,24,,,,,,,,,,,,,,0,0
+393,758,1,,33,1,,,,,,,,,,,,,0,0
+394,760,1,,27,,,,,,,,,,,,,,0,0
+395,762,1,,18,,,,,,,,,,,,,,0,0
+396,763,1,,,,,,,23,,,,,,,,,0,0
+397,768,1,,30,,,,,,,,,,,,,,0,0
+398,770,1,,42,,,,,,,,,,,,,,0,0
+399,773,1,,,,,,,,,220,,,,,,,0,0
+400,783,1,,35,,,,,,,,,,,,,,0,0
+401,784,1,,45,,,,,,,,,,,,,,0,0
+402,790,1,,43,,,,,,,,,,,,,,0,0
+403,791,1,,53,,,,,,,,,,,,,,0,0
+404,792,1,,53,,,,,,,,,,,,,,0,0

data/v2/csv/pokemon_move_method_prose.csv

@@ -1,11 +1,15 @@
 pokemon_move_method_id,local_language_id,name,description
 1,6,Level up,"Wird gelernt, wenn ein Pokémon ein bestimmtes Level erreicht."
+1,7,Nivel,Se aprende cuando un pokemon alcanza un cierto nivel.
 1,9,Level up,Learned when a Pokémon reaches a certain level.
 2,6,Ei,"Erscheint bei einem frisch geschlüpften Pokémon, wenn der Vater die selbe Fähigkeit hatte."
+2,7,Huevo,"Aparece en un Pokémon recién nacido, si el padre tuvo el mismo movimiento."
 2,9,Egg,"Appears on a newly-hatched Pokémon, if the father had the same move."
 3,6,Tutor,Kann jederzeit von einem NPC erlernt werden.
+3,7,Tutor, Puede ser enseñado en cualquier momento por un NPC.
 3,9,Tutor,Can be taught at any time by an NPC.
 4,6,Maschine,Kann jederzeit durch das benutzen eines TM oder VM erlernt werden.
+4,7,Máquina,Se puede enseñar en cualquier momento usando una MT o MO.
 4,9,Machine,Can be taught at any time by using a TM or HM.
 5,6,Stadium: Surfendes Pikachu,"Wird gelernt, wenn ein Pikachu dabei hilft den Premium-Cup in der Kategorie Meisterball ohne unterbrechung zu besiegen.  Es muss in jedem Kampf teilnehmen."
 5,9,Stadium: Surfing Pikachu,"Learned when a non-rental Pikachu helps beat Prime Cup Master Ball R-2.  It must participate in every battle, and you must win with no continues."
@@ -15,4 +19,4 @@ pokemon_move_method_id,local_language_id,name,description
 8,9,XD: Shadow,Appears on a Snatched Shadow Pokémon.
 9,9,XD: Purification,Appears on a Shadow Pokémon as it becomes increasingly purified.
 10,6,Rotom Formen,"Erscheint, wenn Rotom seine Form wechselt.  Verschwindet wenn Rotom eine andere Form an nimmt. Diese Fähigkeit kann nur durch wechseln der Form erlernt werden."
-10,9,Rotom Form,Appears when Rotom changes to this form.  Disappears if Rotom becomes another form and this move can only be learned by form change.
+10,9,Form Change,Appears when Rotom or Cosplay Pikachu changes form.  Disappears if the Pokémon becomes another form and this move can only be learned by form change.

data/v2/csv/pokemon_shape_prose.csv

@@ -1,15 +1,29 @@
-pokemon_shape_id,local_language_id,name,awesome_name
-1,9,Ball,Pomaceous
-2,9,Squiggle,Caudal
-3,9,Fish,Ichthyic
-4,9,Arms,Brachial
-5,9,Blob,Alvine
-6,9,Upright,Sciurine
-7,9,Legs,Crural
-8,9,Quadruped,Mensal
-9,9,Wings,Alar
-10,9,Tentacles,Cilial
-11,9,Heads,Polycephalic
-12,9,Humanoid,Anthropomorphic
-13,9,Bug wings,Lepidopterous
-14,9,Armor,Chitinous
+pokemon_shape_id,local_language_id,name,awesome_name,description
+1,5,Balle,Pomacé,Pokémon constitués uniquement d'une tête
+1,9,Ball,Pomaceous,Pokémon consisting of only a head
+2,5,Sinueux,Caudal,Pokémon avec un corps serpentin
+2,9,Squiggle,Caudal,Pokémon with serpentine bodies
+3,5,Poisson,Ichtyque,Pokémon disposant de nageoires
+3,9,Fish,Ichthyic,Pokémon with fins
+4,5,Bras,Brachial,Pokémon constitués d'une tête et de bras
+4,9,Arms,Brachial,Pokémon consisting of a head and arms
+5,5,Goutte,Alvin,Pokémon constitués d'une tête et d'un corps
+5,9,Blob,Alvine,Pokémon consisting of a head and a base
+6,5,Droit,Sciurine,Pokémon bipèdes disposant d'une queue
+6,9,Upright,Sciurine,"Pokémon with a bipedal, tailed form"
+7,5,Jambes,Crural,Pokémon constitués d'une tête et de jambes
+7,9,Legs,Crural,Pokémon consisting of a head and legs
+8,5,Quadrupède,Mensal,Pokémon quadrupèdes
+8,9,Quadruped,Mensal,Pokémon with a quadruped body
+9,5,Ailes,Alaire,Pokémon avec une seule paire d'aile
+9,9,Wings,Alar,Pokémon with a single pair of wings
+10,5,Tentacules,Ciliaire,Pokémon avec des tentacules ou possédant de multiples pattes
+10,9,Tentacles,Cilial,Pokémon with tentacles or a multiped body
+11,5,Têtes,Polycéphale,Pokémon avec un corps multiple
+11,9,Heads,Polycephalic,Pokémon consisting of multiple bodies
+12,5,Humanoïde,Anthropomorphique,Pokémon bipèdes sans queue
+12,9,Humanoid,Anthropomorphic,"Pokémon with a bipedal, tailless form"
+13,5,Ailes d'insecte,Lépidoptère,Pokémon avec deux paires d'ailes
+13,9,Bug wings,Lepidopterous,Pokémon with two or more pairs of wings
+14,5,Armure,Chitineux,Pokémon avec un corps insectoïde
+14,9,Armor,Chitinous,Pokémon with an insectoid body

data/v2/csv/pokemon_species.csv

@@ -8,15 +8,15 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 7,squirtle,1,,3,2,6,9,1,45,70,0,20,0,4,0,7,
 8,wartortle,1,7,3,2,6,9,1,45,70,0,20,0,4,0,8,
 9,blastoise,1,8,3,2,6,9,1,45,70,0,20,0,4,1,9,
-10,caterpie,1,,4,5,2,2,4,255,70,0,15,0,2,0,10,
+10,caterpie,1,,4,5,14,2,4,255,70,0,15,0,2,0,10,
 11,metapod,1,10,4,5,2,2,4,120,70,0,15,0,2,0,11,
 12,butterfree,1,11,4,9,13,2,4,45,70,0,15,1,2,0,12,
-13,weedle,1,,5,3,2,2,4,255,70,0,15,0,2,0,13,
+13,weedle,1,,5,3,14,2,4,255,70,0,15,0,2,0,13,
 14,kakuna,1,13,5,10,2,2,4,120,70,0,15,0,2,0,14,
-15,beedrill,1,14,5,10,13,2,4,45,70,0,15,0,2,0,15,177
+15,beedrill,1,14,5,10,13,2,4,45,70,0,15,0,2,1,15,177
 16,pidgey,1,,6,3,9,2,4,255,70,0,15,0,4,0,16,
 17,pidgeotto,1,16,6,3,9,2,4,120,70,0,15,0,4,0,17,
-18,pidgeot,1,17,6,3,9,2,4,45,70,0,15,0,4,0,18,
+18,pidgeot,1,17,6,3,9,2,4,45,70,0,15,0,4,1,18,
 19,rattata,1,,7,7,8,3,4,255,70,0,15,1,2,0,19,
 20,raticate,1,19,7,3,8,3,4,127,70,0,15,1,2,0,20,
 21,spearow,1,,8,3,9,6,4,255,70,0,15,0,2,0,21,
@@ -78,7 +78,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 77,ponyta,1,,32,10,8,3,4,190,70,0,20,0,2,0,83,
 78,rapidash,1,77,32,10,8,3,4,60,70,0,20,0,2,0,84,
 79,slowpoke,1,,33,6,8,9,4,190,70,0,20,0,2,0,85,
-80,slowbro,1,79,33,6,6,9,4,75,70,0,20,0,2,0,86,
+80,slowbro,1,79,33,6,6,9,4,75,70,0,20,0,2,1,86,
 81,magnemite,1,,34,4,4,6,-1,190,70,0,20,0,2,0,88,
 82,magneton,1,81,34,4,11,6,-1,60,70,0,20,0,2,0,89,
 83,farfetchd,1,,35,3,9,3,4,45,70,0,20,0,2,0,91,
@@ -206,7 +206,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 205,forretress,2,204,102,7,1,2,4,75,70,0,20,0,2,0,236,57
 206,dunsparce,2,,103,10,2,1,4,190,70,0,20,0,2,0,237,
 207,gligar,2,,104,7,9,4,4,60,70,0,20,1,4,0,238,
-208,steelix,2,95,41,4,2,1,4,25,70,0,25,1,2,0,104,176
+208,steelix,2,95,41,4,2,1,4,25,70,0,25,1,2,1,104,176
 209,snubbull,2,,105,6,12,8,6,190,70,0,20,0,3,0,240,
 210,granbull,2,209,105,7,6,8,6,75,70,0,20,0,3,0,241,
 211,qwilfish,2,,106,4,3,7,4,45,70,0,20,0,2,0,242,
@@ -252,18 +252,18 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 251,celebi,2,,129,5,12,2,-1,45,100,0,120,0,4,0,276,
 252,treecko,3,,130,5,6,2,1,45,70,0,20,0,4,0,277,130
 253,grovyle,3,252,130,5,6,2,1,45,70,0,20,0,4,0,278,131
-254,sceptile,3,253,130,5,6,2,1,45,70,0,20,0,4,0,279,132
+254,sceptile,3,253,130,5,6,2,1,45,70,0,20,0,4,1,279,132
 255,torchic,3,,131,8,7,3,1,45,70,0,20,1,4,0,280,
 256,combusken,3,255,131,8,6,3,1,45,70,0,20,1,4,0,281,
 257,blaziken,3,256,131,8,6,3,1,45,70,0,20,1,4,1,282,
 258,mudkip,3,,132,2,8,9,1,45,70,0,20,0,4,0,283,
 259,marshtomp,3,258,132,2,6,9,1,45,70,0,20,0,4,0,284,
-260,swampert,3,259,132,2,6,9,1,45,70,0,20,0,4,0,285,
+260,swampert,3,259,132,2,6,9,1,45,70,0,20,0,4,1,285,
 261,poochyena,3,,133,4,8,3,4,255,70,0,15,0,2,0,286,
 262,mightyena,3,261,133,4,8,3,4,127,70,0,15,0,2,0,287,
 263,zigzagoon,3,,134,3,8,3,4,255,70,0,15,0,2,0,288,
 264,linoone,3,263,134,9,8,3,4,90,70,0,15,0,2,0,289,
-265,wurmple,3,,135,8,2,2,4,255,70,0,15,0,2,0,290,
+265,wurmple,3,,135,8,14,2,4,255,70,0,15,0,2,0,290,
 266,silcoon,3,265,135,9,1,2,4,120,70,0,15,0,2,0,291,
 267,beautifly,3,266,135,10,13,2,4,45,70,0,15,1,2,0,292,
 268,cascoon,3,265,135,7,1,2,4,120,70,0,15,0,2,0,293,
@@ -300,7 +300,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 299,nosepass,3,,147,4,12,1,4,255,70,0,20,0,2,0,324,
 300,skitty,3,,148,6,8,2,6,255,70,0,15,0,3,0,326,
 301,delcatty,3,300,148,7,8,2,6,60,70,0,15,0,3,0,327,
-302,sableye,3,,149,7,12,1,4,45,35,0,25,0,4,0,328,
+302,sableye,3,,149,7,12,1,4,45,35,0,25,0,4,1,328,
 303,mawile,3,,150,1,12,1,4,45,70,0,20,0,3,1,329,
 304,aron,3,,151,4,8,4,4,180,35,0,35,0,1,0,330,149
 305,lairon,3,304,151,4,8,4,4,90,35,0,35,0,1,0,331,150
@@ -317,11 +317,11 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 316,gulpin,3,,159,5,4,3,4,225,70,0,20,1,6,0,344,
 317,swalot,3,316,159,7,4,3,4,75,70,0,20,1,6,0,345,
 318,carvanha,3,,160,8,3,7,4,225,35,0,20,0,1,0,346,
-319,sharpedo,3,318,160,2,3,7,4,60,35,0,20,0,1,0,347,
+319,sharpedo,3,318,160,2,3,7,4,60,35,0,20,0,1,1,347,
 320,wailmer,3,,161,2,3,7,4,125,70,0,40,0,6,0,348,
 321,wailord,3,320,161,2,3,7,4,60,70,0,40,0,6,0,349,
 322,numel,3,,162,10,8,4,4,255,70,0,20,1,2,0,350,
-323,camerupt,3,322,162,8,8,4,4,150,70,0,20,1,2,0,351,
+323,camerupt,3,322,162,8,8,4,4,150,70,0,20,1,2,1,351,
 324,torkoal,3,,163,3,8,4,4,90,70,0,20,0,2,0,352,
 325,spoink,3,,164,1,4,4,4,255,70,0,20,0,3,0,353,
 326,grumpig,3,325,164,7,6,4,4,60,70,0,20,0,3,0,354,
@@ -332,7 +332,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 331,cacnea,3,,167,5,12,6,4,190,35,0,20,0,4,0,359,
 332,cacturne,3,331,167,5,12,6,4,60,35,0,20,1,4,0,360,
 333,swablu,3,,168,2,9,2,4,255,70,0,20,0,5,0,361,
-334,altaria,3,333,168,2,9,2,4,45,70,0,20,0,5,0,362,
+334,altaria,3,333,168,2,9,2,4,45,70,0,20,0,5,1,362,
 335,zangoose,3,,169,9,6,3,4,90,70,0,20,0,5,0,363,
 336,seviper,3,,170,1,2,3,4,90,70,0,20,0,6,0,364,
 337,lunatone,3,,171,10,1,1,-1,45,70,0,25,0,3,0,365,
@@ -349,7 +349,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 348,armaldo,3,347,177,4,6,9,1,45,70,0,30,0,5,0,376,172
 349,feebas,3,,178,3,3,9,4,255,70,0,20,0,5,0,377,
 350,milotic,3,349,178,6,2,9,4,60,70,0,20,1,5,0,378,
-351,castform,3,,179,9,1,3,4,45,70,0,25,0,2,1,379,
+351,castform,3,,179,4,1,3,4,45,70,0,25,0,2,1,379,
 352,kecleon,3,,180,5,6,2,4,200,70,0,20,0,4,0,380,
 353,shuppet,3,,181,1,1,8,4,225,35,0,25,0,3,0,381,
 354,banette,3,353,181,1,6,8,4,45,35,0,25,0,3,1,382,
@@ -360,7 +360,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 359,absol,3,,185,9,8,4,4,30,35,0,25,0,4,1,389,
 360,wynaut,3,,100,2,6,1,4,125,70,1,20,0,2,0,232,
 361,snorunt,3,,186,4,12,1,4,190,70,0,20,0,2,0,390,93
-362,glalie,3,361,186,4,1,1,4,75,70,0,20,0,2,0,391,94
+362,glalie,3,361,186,4,1,1,4,75,70,0,20,0,2,1,391,94
 363,spheal,3,,187,2,3,7,4,255,70,0,20,0,4,0,393,60
 364,sealeo,3,363,187,2,3,7,4,120,70,0,20,0,4,0,394,61
 365,walrein,3,364,187,2,8,7,4,45,70,0,20,0,4,0,395,62
@@ -371,18 +371,18 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 370,luvdisc,3,,190,6,3,7,6,225,70,0,20,0,3,0,400,
 371,bagon,3,,191,2,12,6,4,45,35,0,40,0,1,0,401,
 372,shelgon,3,371,191,9,8,6,4,45,35,0,40,0,1,0,402,
-373,salamence,3,372,191,2,8,6,4,45,35,0,40,0,1,0,403,
+373,salamence,3,372,191,2,8,6,4,45,35,0,40,0,1,1,403,
 374,beldum,3,,192,2,5,6,-1,3,35,0,40,0,1,0,404,82
 375,metang,3,374,192,2,4,6,-1,3,35,0,40,0,1,0,405,83
-376,metagross,3,375,192,2,11,6,-1,3,35,0,40,0,1,0,406,84
+376,metagross,3,375,192,2,11,6,-1,3,35,0,40,0,1,1,406,84
 377,regirock,3,,193,3,12,1,-1,3,35,0,80,0,1,0,407,
 378,regice,3,,194,2,12,1,-1,3,35,0,80,0,1,0,408,
 379,registeel,3,,195,4,12,1,-1,3,35,0,80,0,1,0,409,193
-380,latias,3,,196,8,9,9,8,3,90,0,120,0,1,0,410,
-381,latios,3,,197,2,9,9,0,3,90,0,120,0,1,0,411,
-382,kyogre,3,,198,2,3,7,-1,5,0,0,120,0,1,0,412,
-383,groudon,3,,199,8,6,6,-1,5,0,0,120,0,1,0,413,194
-384,rayquaza,3,,200,5,2,5,-1,3,0,0,120,0,1,0,414,200
+380,latias,3,,196,8,9,9,8,3,90,0,120,0,1,1,410,
+381,latios,3,,197,2,9,9,0,3,90,0,120,0,1,1,411,
+382,kyogre,3,,198,2,3,7,-1,3,0,0,120,0,1,1,412,
+383,groudon,3,,199,8,6,6,-1,3,0,0,120,0,1,1,413,194
+384,rayquaza,3,,200,5,2,5,-1,45,0,0,120,0,1,1,414,200
 385,jirachi,3,,201,10,12,4,-1,3,100,0,120,0,1,0,415,
 386,deoxys,3,,202,8,12,5,-1,3,0,0,120,0,1,1,416,
 387,turtwig,4,,203,5,8,,1,45,70,0,20,0,4,0,417,
@@ -410,23 +410,23 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 409,rampardos,4,408,211,2,6,,1,45,70,0,30,0,5,0,437,
 410,shieldon,4,,212,4,8,,1,45,70,0,30,0,5,0,438,163
 411,bastiodon,4,410,212,4,8,,1,45,70,0,30,0,5,0,439,164
-412,burmy,4,,213,4,2,,4,120,70,0,15,0,2,1,440,
-413,wormadam,4,412,213,4,2,,8,45,70,0,15,0,2,0,441,
+412,burmy,4,,213,5,5,,4,120,70,0,15,0,2,1,440,
+413,wormadam,4,412,213,5,5,,8,45,70,0,15,0,2,0,441,
 414,mothim,4,412,213,10,13,,0,45,70,0,15,0,2,0,442,
 415,combee,4,,214,10,11,,1,120,70,0,15,1,4,0,443,
-416,vespiquen,4,415,214,10,9,,8,45,70,0,15,0,4,0,444,
+416,vespiquen,4,415,214,10,13,,8,45,70,0,15,0,4,0,444,
 417,pachirisu,4,,215,9,8,,4,200,100,0,10,1,2,0,445,
 418,buizel,4,,216,3,8,,4,190,70,0,20,1,2,0,446,
 419,floatzel,4,418,216,3,8,,4,75,70,0,20,1,2,0,447,
 420,cherubi,4,,217,6,11,,4,190,70,0,20,0,2,0,448,
-421,cherrim,4,420,217,6,7,,4,75,70,0,20,0,2,1,449,
-422,shellos,4,,218,7,14,,4,190,70,0,20,0,2,0,450,
-423,gastrodon,4,422,218,7,14,,4,75,70,0,20,0,2,0,451,
+421,cherrim,4,420,217,7,7,,4,75,70,0,20,0,2,1,449,
+422,shellos,4,,218,7,2,,4,190,70,0,20,0,2,0,450,
+423,gastrodon,4,422,218,7,2,,4,75,70,0,20,0,2,0,451,
 424,ambipom,4,190,93,7,6,,4,45,100,0,20,1,3,0,220,
 425,drifloon,4,,219,7,4,,4,125,70,0,30,0,6,0,452,167
 426,drifblim,4,425,219,7,4,,4,60,70,0,30,0,6,0,453,168
 427,buneary,4,,220,3,6,,4,190,0,0,20,0,2,0,454,
-428,lopunny,4,427,220,3,6,,4,60,140,0,20,0,2,0,455,
+428,lopunny,4,427,220,3,6,,4,60,140,0,20,0,2,1,455,
 429,mismagius,4,200,98,7,1,,4,45,35,0,25,0,3,0,230,184
 430,honchkrow,4,198,97,1,9,,4,30,35,0,20,0,4,0,228,
 431,glameow,4,,221,4,8,,6,190,70,0,20,0,3,0,456,
@@ -473,7 +473,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 472,gliscor,4,207,104,7,9,,4,30,70,0,20,0,4,0,239,
 473,mamoswine,4,221,112,3,8,,4,50,70,0,20,1,1,0,253,
 474,porygon-z,4,233,68,8,4,,-1,30,70,0,20,0,2,0,168,
-475,gallade,4,281,140,9,12,,0,45,35,0,20,0,1,0,308,12
+475,gallade,4,281,140,9,12,,0,45,35,0,20,0,1,1,308,12
 476,probopass,4,299,147,4,11,,4,60,70,0,20,0,2,0,325,
 477,dusknoir,4,356,182,1,4,,4,45,35,0,25,0,3,0,385,71
 478,froslass,4,361,186,9,4,,8,75,70,0,20,0,2,0,392,95
@@ -481,17 +481,17 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 480,uxie,4,,241,10,6,,-1,3,140,0,80,0,1,0,481,
 481,mesprit,4,,242,6,6,,-1,3,140,0,80,0,1,0,482,
 482,azelf,4,,243,2,6,,-1,3,140,0,80,0,1,0,483,
-483,dialga,4,,244,9,8,,-1,30,0,0,120,0,1,0,484,195
-484,palkia,4,,245,7,6,,-1,30,0,0,120,0,1,0,485,
+483,dialga,4,,244,9,8,,-1,3,0,0,120,0,1,0,484,195
+484,palkia,4,,245,7,6,,-1,3,0,0,120,0,1,0,485,
 485,heatran,4,,246,3,8,,4,3,100,0,10,0,1,0,486,
 486,regigigas,4,,247,9,12,,-1,3,0,0,120,0,1,0,487,
 487,giratina,4,,248,1,10,,-1,3,0,0,120,0,1,1,488,
-488,cresselia,4,,249,10,14,,8,3,100,0,120,0,1,0,489,
+488,cresselia,4,,249,10,2,,8,3,100,0,120,0,1,0,489,
 489,phione,4,,250,2,4,,-1,30,70,0,40,0,1,0,490,
 490,manaphy,4,,250,2,12,,-1,3,70,0,10,0,1,0,491,
 491,darkrai,4,,252,1,12,,-1,3,0,0,120,0,1,0,492,
 492,shaymin,4,,253,5,8,,-1,45,100,0,120,0,4,1,493,
-493,arceus,4,,254,4,8,,-1,3,0,0,120,0,1,1,494,199
+493,arceus,4,,254,9,8,,-1,3,0,0,120,0,1,1,494,199
 494,victini,5,,255,10,12,,-1,3,100,0,120,0,1,0,495,
 495,snivy,5,,256,5,6,,1,45,70,0,20,0,4,0,496,118
 496,servine,5,495,256,5,6,,1,45,70,0,20,0,4,0,497,119
@@ -529,7 +529,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 528,swoobat,5,527,269,2,9,,4,45,70,0,15,0,2,0,529,
 529,drilbur,5,,270,4,6,,4,120,70,0,20,0,2,0,530,152
 530,excadrill,5,529,270,4,12,,4,60,70,0,20,0,2,0,531,153
-531,audino,5,,271,6,6,,4,255,70,0,20,0,3,0,532,185
+531,audino,5,,271,6,6,,4,255,70,0,20,0,3,1,532,185
 532,timburr,5,,272,4,12,,2,180,70,0,20,0,4,0,533,101
 533,gurdurr,5,532,272,4,12,,2,90,70,0,20,0,4,0,534,102
 534,conkeldurr,5,533,272,3,12,,2,45,70,0,20,0,4,0,535,103
@@ -583,7 +583,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 582,vanillite,5,,296,9,5,,4,255,70,0,20,0,1,0,583,
 583,vanillish,5,582,296,9,5,,4,120,70,0,20,0,1,0,584,
 584,vanilluxe,5,583,296,9,11,,4,45,70,0,20,0,1,0,585,
-585,deerling,5,,297,10,8,,4,190,70,0,20,0,2,1,586,
+585,deerling,5,,297,6,8,,4,190,70,0,20,0,2,1,586,
 586,sawsbuck,5,585,297,3,8,,4,75,70,0,20,0,2,1,587,
 587,emolga,5,,298,9,8,,4,200,70,0,20,0,2,0,588,180
 588,karrablast,5,,299,2,12,,4,200,70,0,15,0,2,0,589,
@@ -641,8 +641,8 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 640,virizion,5,,327,5,8,,-1,3,35,0,80,0,1,0,641,
 641,tornadus,5,,328,5,4,,0,3,90,0,120,0,1,1,642,
 642,thundurus,5,,329,2,4,,0,3,90,0,120,0,1,1,643,
-643,reshiram,5,,330,9,9,,-1,45,0,0,120,0,1,0,644,197
-644,zekrom,5,,331,1,6,,-1,45,0,0,120,0,1,0,645,198
+643,reshiram,5,,330,9,9,,-1,3,0,0,120,0,1,0,644,197
+644,zekrom,5,,331,1,6,,-1,3,0,0,120,0,1,0,645,198
 645,landorus,5,,332,3,4,,0,3,90,0,120,0,1,1,646,
 646,kyurem,5,,333,4,6,,-1,3,0,0,120,0,1,1,647,
 647,keldeo,5,,334,10,8,,-1,3,35,0,80,0,1,1,648,
@@ -664,7 +664,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 663,talonflame,6,662,341,8,9,,4,45,70,0,15,0,4,0,664,
 664,scatterbug,6,,342,1,14,,4,255,70,0,15,0,2,0,665,
 665,spewpa,6,664,342,1,5,,4,120,70,0,15,0,2,0,666,
-666,vivillon,6,665,342,1,13,,4,45,70,0,15,0,2,0,667,
+666,vivillon,6,665,342,9,13,,4,45,70,0,15,0,2,0,667,
 667,litleo,6,,343,3,8,,7,220,70,0,20,0,4,0,668,
 668,pyroar,6,667,343,3,8,,7,65,70,0,20,1,4,0,669,
 669,flabebe,6,,344,9,4,,8,225,70,0,20,0,2,0,670,
@@ -676,7 +676,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 675,pangoro,6,674,346,9,12,,4,65,70,0,25,0,2,0,676,
 676,furfrou,6,,347,9,8,,4,160,70,0,20,0,2,1,677,
 677,espurr,6,,348,4,6,,4,190,70,0,20,0,2,0,678,
-678,meowstic,6,677,348,9,6,,4,75,70,0,20,1,2,0,679,
+678,meowstic,6,677,348,2,6,,4,75,70,0,20,1,2,0,679,
 679,honedge,6,,349,3,5,,4,180,70,0,20,0,2,0,680,
 680,doublade,6,679,349,3,11,,4,90,70,0,20,0,2,0,681,
 681,aegislash,6,680,349,3,5,,4,45,70,0,20,0,2,1,682,
@@ -717,6 +717,87 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 716,xerneas,6,,368,2,8,,-1,45,0,0,120,0,1,1,716,
 717,yveltal,6,,369,8,9,,-1,45,0,0,120,0,1,0,717,
 718,zygarde,6,,370,5,2,,-1,3,0,0,120,0,1,0,718,
-719,diancie,6,,371,6,4,,-1,3,70,0,25,0,1,0,719,
-720,hoopa,6,,372,7,1,,-1,3,100,0,120,0,1,0,720,
-721,volcanion,6,,373,3,1,,-1,3,100,0,120,0,1,0,721,
+719,diancie,6,,371,6,4,,-1,3,70,0,25,0,1,1,719,
+720,hoopa,6,,372,7,4,,-1,3,100,0,120,0,1,0,720,
+721,volcanion,6,,373,3,8,,-1,3,100,0,120,0,1,0,721,
+722,rowlet,7,,374,3,9,,1,45,70,0,15,0,4,0,722,
+723,dartrix,7,722,374,3,9,,1,45,70,0,15,0,4,0,723,
+724,decidueye,7,723,374,3,9,,1,45,70,0,15,0,4,0,724,
+725,litten,7,,375,8,8,,1,45,70,0,15,0,4,0,725,
+726,torracat,7,725,375,8,8,,1,45,70,0,15,0,4,0,726,
+727,incineroar,7,726,375,8,6,,1,45,70,0,15,0,4,0,727,
+728,popplio,7,,376,2,3,,1,45,70,0,15,0,4,0,728,
+729,brionne,7,728,376,2,3,,1,45,70,0,15,0,4,0,729,
+730,primarina,7,729,376,2,3,,1,45,70,0,15,0,4,0,730,
+731,pikipek,7,,377,1,9,,4,255,70,0,15,0,2,0,731,
+732,trumbeak,7,731,377,1,9,,4,120,70,0,15,0,2,0,732,
+733,toucannon,7,732,377,1,9,,4,45,70,0,15,0,2,0,733,
+734,yungoos,7,,378,3,8,,4,255,70,0,15,0,2,0,734,
+735,gumshoos,7,734,378,3,8,,4,127,70,0,15,0,2,0,735,
+736,grubbin,7,,379,4,14,,4,255,70,0,15,0,2,0,736,
+737,charjabug,7,736,379,5,2,,4,120,70,0,15,0,2,0,737,
+738,vikavolt,7,737,379,2,14,,4,45,70,0,15,0,2,0,738,
+739,crabrawler,7,,380,7,14,,4,225,70,0,20,0,2,0,739,
+740,crabominable,7,739,380,9,14,,4,60,70,0,20,0,2,0,740,
+741,oricorio,7,,381,8,9,,6,45,70,0,20,0,2,0,741,
+742,cutiefly,7,,382,10,14,,4,190,70,0,20,0,2,0,742,
+743,ribombee,7,742,382,10,13,,4,75,70,0,20,0,2,0,743,
+744,rockruff,7,,383,3,8,,4,190,70,0,15,0,2,0,744,
+745,lycanroc,7,744,383,3,8,,4,90,70,0,15,0,2,0,745,
+746,wishiwashi,7,,384,2,3,,4,60,70,0,15,0,3,0,746,
+747,mareanie,7,,385,2,5,,4,190,70,0,20,0,2,0,747,
+748,toxapex,7,747,385,2,10,,4,75,70,0,20,0,2,0,748,
+749,mudbray,7,,386,3,8,,4,190,70,0,20,0,2,0,749,
+750,mudsdale,7,749,386,3,8,,4,60,70,0,20,0,2,0,750,
+751,dewpider,7,,387,5,7,,4,200,70,0,15,0,2,0,751,
+752,araquanid,7,751,387,5,14,,4,100,70,0,15,0,2,0,752,
+753,fomantis,7,,388,6,6,,4,190,70,0,20,0,2,0,753,
+754,lurantis,7,753,388,6,12,,4,75,70,0,20,0,2,0,754,
+755,morelull,7,,389,7,5,,4,190,70,0,20,0,2,0,755,
+756,shiinotic,7,755,389,7,12,,4,75,70,0,20,0,2,0,756,
+757,salandit,7,,390,1,8,,1,120,70,0,20,0,2,0,757,
+758,salazzle,7,757,390,1,8,,8,45,70,0,20,0,2,0,758,
+759,stufful,7,,391,6,8,,4,140,70,0,15,0,2,0,759,
+760,bewear,7,759,391,6,6,,4,70,70,0,15,0,2,0,760,
+761,bounsweet,7,,392,7,7,,8,235,70,0,20,0,4,0,761,
+762,steenee,7,761,392,7,12,,8,120,70,0,20,0,4,0,762,
+763,tsareena,7,762,392,7,12,,8,45,70,0,20,0,4,0,763,
+764,comfey,7,,393,5,1,,6,60,70,0,20,0,3,0,764,
+765,oranguru,7,,394,9,12,,4,45,70,0,20,0,1,0,765,
+766,passimian,7,,395,9,6,,4,45,70,0,20,0,1,0,766,
+767,wimpod,7,,396,4,10,,4,90,70,0,20,0,2,0,767,
+768,golisopod,7,767,396,4,12,,4,45,70,0,20,0,2,0,768,
+769,sandygast,7,,397,3,2,,4,140,70,0,15,0,2,0,769,
+770,palossand,7,769,397,3,2,,4,60,70,0,15,0,2,0,770,
+771,pyukumuku,7,,398,1,2,,4,60,70,0,15,0,3,0,771,
+772,type-null,7,,399,4,8,,-1,3,0,0,120,0,1,0,772,
+773,silvally,7,772,399,4,8,,-1,3,0,0,120,0,1,0,773,
+774,minior,7,,400,3,1,,-1,30,70,0,25,0,4,0,774,
+775,komala,7,,401,2,12,,4,45,70,0,20,0,1,0,775,
+776,turtonator,7,,402,8,6,,4,70,70,0,20,0,2,0,776,
+777,togedemaru,7,,403,4,6,,4,180,70,0,10,0,2,0,777,
+778,mimikyu,7,,404,10,2,,4,45,70,0,20,0,2,0,778,
+779,bruxish,7,,405,6,3,,4,80,70,0,15,0,2,0,779,
+780,drampa,7,,406,9,2,,4,70,70,0,20,0,2,0,780,
+781,dhelmise,7,,407,5,5,,-1,25,70,0,25,0,2,0,781,
+782,jangmo-o,7,,408,4,8,,4,45,70,0,40,0,1,0,782,
+783,hakamo-o,7,782,408,4,6,,4,45,70,0,40,0,1,0,783,
+784,kommo-o,7,783,408,4,6,,4,45,70,0,40,0,1,0,784,
+785,tapu-koko,7,,409,10,4,,-1,3,70,0,15,0,1,0,785,
+786,tapu-lele,7,,410,6,4,,-1,3,70,0,15,0,1,0,786,
+787,tapu-bulu,7,,411,8,4,,-1,3,70,0,15,0,1,0,787,
+788,tapu-fini,7,,412,7,4,,-1,3,70,0,15,0,1,0,788,
+789,cosmog,7,,413,2,1,,-1,45,0,0,120,0,1,0,789,
+790,cosmoem,7,789,413,2,1,,-1,45,0,0,120,0,1,0,790,
+791,solgaleo,7,790,413,9,8,,-1,45,0,0,120,0,1,0,791,
+792,lunala,7,790,413,7,9,,-1,45,0,0,120,0,1,0,792,
+793,nihilego,7,,414,9,10,,-1,45,0,0,120,0,1,0,793,
+794,buzzwole,7,,415,8,10,,-1,25,0,0,120,0,1,0,794,
+795,pheromosa,7,,416,9,12,,-1,255,0,0,120,0,1,0,795,
+796,xurkitree,7,,417,1,6,,-1,30,0,0,120,0,1,0,796,
+797,celesteela,7,,418,5,12,,-1,25,0,0,120,0,1,0,797,
+798,kartana,7,,419,9,12,,-1,255,0,0,120,0,1,0,798,
+799,guzzlord,7,,420,1,6,,-1,15,0,0,120,0,1,0,799,
+800,necrozma,7,,421,1,4,,-1,3,0,0,120,0,1,0,800,
+801,magearna,7,,422,4,12,,-1,3,0,0,120,0,1,0,801,
+802,marshadow,7,,423,4,12,,-1,3,0,0,120,0,1,0,802,

data/v2/csv/pokemon_types.csv

@@ -1070,6 +1070,139 @@ pokemon_id,type_id,slot
 720,8,2
 721,10,1
 721,11,2
+722,12,1
+722,3,2
+723,12,1
+723,3,2
+724,12,1
+724,8,2
+725,10,1
+726,10,1
+727,10,1
+727,17,2
+728,11,1
+729,11,1
+730,11,1
+730,18,2
+731,1,1
+731,3,2
+732,1,1
+732,3,2
+733,1,1
+733,3,2
+734,1,1
+735,1,1
+736,7,1
+737,7,1
+737,13,2
+738,7,1
+738,13,2
+739,2,1
+740,2,1
+740,15,2
+741,10,1
+741,3,2
+742,7,1
+742,18,2
+743,7,1
+743,18,2
+744,6,1
+745,6,1
+746,11,1
+747,4,1
+747,11,2
+748,4,1
+748,11,2
+749,5,1
+750,5,1
+751,11,1
+751,7,2
+752,11,1
+752,7,2
+753,12,1
+754,12,1
+755,12,1
+755,18,2
+756,12,1
+756,18,2
+757,4,1
+757,10,2
+758,4,1
+758,10,2
+759,1,1
+759,2,2
+760,1,1
+760,2,2
+761,12,1
+762,12,1
+763,12,1
+764,18,1
+765,1,1
+765,14,2
+766,2,1
+767,7,1
+767,11,2
+768,7,1
+768,11,2
+769,8,1
+769,5,2
+770,8,1
+770,5,2
+771,11,1
+772,1,1
+773,1,1
+774,6,1
+774,3,2
+775,1,1
+776,10,1
+776,16,2
+777,13,1
+777,9,2
+778,8,1
+778,18,2
+779,11,1
+779,14,2
+780,1,1
+780,16,2
+781,8,1
+781,12,2
+782,16,1
+783,16,1
+783,2,2
+784,16,1
+784,2,2
+785,13,1
+785,18,2
+786,14,1
+786,18,2
+787,12,1
+787,18,2
+788,11,1
+788,18,2
+789,14,1
+790,14,1
+791,14,1
+791,9,2
+792,14,1
+792,8,2
+793,6,1
+793,4,2
+794,7,1
+794,2,2
+795,7,1
+795,2,2
+796,13,1
+797,9,1
+797,3,2
+798,12,1
+798,9,2
+799,17,1
+799,16,2
+800,14,1
+801,9,1
+801,18,2
+802,2,1
+802,8,2
 10001,14,1
 10002,14,1
 10003,14,1
@@ -1224,3 +1357,104 @@ pokemon_id,type_id,slot
 10089,3,2
 10090,7,1
 10090,4,2
+10091,17,1
+10091,1,2
+10092,17,1
+10092,1,2
+10093,17,1
+10093,1,2
+10094,13,1
+10095,13,1
+10096,13,1
+10097,13,1
+10098,13,1
+10099,13,1
+10100,13,1
+10100,14,2
+10101,15,1
+10101,9,2
+10102,15,1
+10102,9,2
+10103,15,1
+10104,15,1
+10104,18,2
+10105,5,1
+10105,9,2
+10106,5,1
+10106,9,2
+10107,17,1
+10108,17,1
+10109,6,1
+10109,13,2
+10110,6,1
+10110,13,2
+10111,6,1
+10111,13,2
+10112,4,1
+10112,17,2
+10113,4,1
+10113,17,2
+10114,12,1
+10114,16,2
+10115,10,1
+10115,8,2
+10116,11,1
+10116,17,2
+10117,11,1
+10117,17,2
+10118,16,1
+10118,5,2
+10119,16,1
+10119,5,2
+10120,16,1
+10120,5,2
+10121,1,1
+10122,7,1
+10122,13,2
+10123,13,1
+10123,3,2
+10124,14,1
+10124,3,2
+10125,8,1
+10125,3,2
+10126,6,1
+10127,11,1
+10128,12,1
+10129,4,1
+10129,10,2
+10130,6,1
+10130,3,2
+10131,6,1
+10131,3,2
+10132,6,1
+10132,3,2
+10133,6,1
+10133,3,2
+10134,6,1
+10134,3,2
+10135,6,1
+10135,3,2
+10136,6,1
+10136,3,2
+10137,6,1
+10137,3,2
+10138,6,1
+10138,3,2
+10139,6,1
+10139,3,2
+10140,6,1
+10140,3,2
+10141,6,1
+10141,3,2
+10142,6,1
+10142,3,2
+10143,8,1
+10143,18,2
+10144,8,1
+10144,18,2
+10145,8,1
+10145,18,2
+10146,16,1
+10146,2,2
+10147,9,1
+10147,18,2

data/v2/csv/region_names.csv

@@ -29,3 +29,4 @@ region_id,local_language_id,name
 6,6,Kalos
 6,8,Kalos
 6,9,Kalos
+7,9,Alola

data/v2/csv/regions.csv

@@ -5,3 +5,4 @@ id,identifier
 4,sinnoh
 5,unova
 6,kalos
+7,alola

data/v2/csv/version_group_pokemon_move_methods.csv

@@ -70,3 +70,9 @@ version_group_id,pokemon_move_method_id
 16,4
 16,6
 16,10
+17,1
+17,2
+17,3
+17,4
+17,6
+17,10

data/v2/csv/version_group_regions.csv

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

data/v2/csv/version_groups.csv

@@ -15,3 +15,4 @@ id,identifier,generation_id,order
 14,black-2-white-2,5,14
 15,x-y,6,15
 16,omega-ruby-alpha-sapphire,6,16
+17,sun-moon,7,17

data/v2/csv/version_names.csv

@@ -129,3 +129,5 @@ version_id,local_language_id,name
 26,6,Alpha Saphir
 26,8,Zaffiro Alpha
 26,9,Alpha Sapphire
+27,9,Sun
+28,9,Moon

data/v2/csv/versions.csv

@@ -25,3 +25,5 @@ id,version_group_id,identifier
 24,15,y
 25,16,omega-ruby
 26,16,alpha-sapphire
+27,17,sun
+28,17,moon