Giratina-origin did exist in gen7 (#348)

Rip some foreign names and text (characteristics/types/colors/natures), taken from the switch version of Pokemon HOME.

Helps with #159 and #256

.dockerignore

@@ -0,0 +1,5 @@
+.git
+.idea
+*.sqlite
+*.log
+site-packages

.github/workflows/build.yml

@@ -0,0 +1,38 @@
+# For more information see: https://docs.github.com/en/actions/guides/building-and-testing-python
+
+name: Build and test
+
+on:
+  push:
+    branches: '**'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [2.7, 3.5, 3.7, 3.9, pypy3]
+      # don't cancel every other job if one fails
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install pytest wheel
+        pip install -e .
+    - name: Set up pokedex
+      run: pokedex setup -v
+    - name: Test with pytest
+      run: pytest
+    - name: Dump database and check for differences
+      run: |
+        pokedex dump
+        git --no-pager diff --exit-code pokedex/data/csv/

.gitignore

@@ -6,4 +6,17 @@
 *.egg-info
 
 pokedex.sqlite
+pokedex.sqlite-journal
 whoosh-index
+pip-selfcheck.json
+
+/bin
+!/bin/edit-csv-as-yaml
+!/bin/poupdate
+!/bin/reset-postgresql-sequences
+!/bin/docker-pokedex
+/local
+/lib
+/include
+
+.idea

.travis.yml

@@ -1,12 +1,17 @@
+os: linux
 language: python
 python:
     - "2.7"
     - "3.4"
     - "3.5"
+    - "3.6"
+    - "3.7"
     - "pypy"
     - "pypy3"
 
 install: pip install -e .
 before_script: pokedex setup -v
-script: py.test
-sudo: false
+script:
+    - py.test
+    - pokedex dump
+    - git --no-pager diff --exit-code pokedex/data/csv/

Dockerfile

@@ -0,0 +1,13 @@
+ARG PYTHON_VERSION=${PYTHON_VERSION:-"3.7-slim"}
+FROM python:${PYTHON_VERSION}
+
+ADD ./ /app/
+
+WORKDIR /app
+
+RUN echo "Setting up project..." && \
+    pip install -e . && \
+    echo "DONE"
+
+ENTRYPOINT ["pokedex"]
+CMD ["status"]

README

@@ -1,17 +0,0 @@
-This software is copyrighted and licensed under the MIT license.  See the file
-entitled LICENSE for full copyright and license text.
-
-This software comes bundled with data, sprites, and sounds extracted from the
-Pokémon series of video games.  Some terminology from the Pokémon franchise is
-also necessarily used within the software itself.  This is all the intellectual
-property of Nintendo, Creatures, inc., and GAME FREAK, inc. and is protected by
-various copyrights and trademarks.  The author believes that the use of this
-intellectual property for a fan reference is covered by fair use and that the
-software is significantly impaired without said property included.  Any use of
-this copyrighted property is at your own legal risk.
-
-A complete revision history of this software is available from
-https://github.com/veekun/pokedex.
-
-Contributors:
-Alex Munroe (Eevee): git@veekun.com

README.md

@@ -0,0 +1,101 @@
+# pokedex
+
+This is a Python library slash pile of data containing a whole lot of data scraped from Pokémon games.
+It's the primary guts of [veekun](https://veekun.com/).
+
+## Current status
+
+The project is not _dead_, but it is _languishing_.
+It's currently being maintained by only its creator ([eevee](https://eev.ee/)) and a couple of other contributors,
+who are also occupied with a lot of other things.
+
+The project needs to be modernized and to have a lot of rough edges fixed that would also make it easier
+to maintain for the games and generations to come.
+
+### Status of the YAML migration
+
+**Update from 2017-06-18**
+
+@eevee started on an experiment with switching to YAML for data storage some time ago, for a variety of reasons.
+It's finally starting to show some promise — all of gen 7 was dumped to a YAML format, then loaded into the database
+from there — but it'll take a lot more work to get this usable. The intended _upsides_ are:
+
+- The data will include everything from older games, so you don't have to guess! 
+Also, the veekun site will handle older games correctly, probably!
+- Many more filtering and searching tools on veekun, since we won't have to fight SQL to write them!
+- More interesting data we've never had before, like trainer teams and overworld items!
+And models? Maps, even? Who knows, but working on this stuff should be easier with all this existing code in place!
+- A project that's actually documented and not confusing as hell to use!
+- A useful command line interface that doesn't require weird setup steps!
+
+If you're interested in this work, hearing about that would be some great motivation! 
+In the meantime, veekun will look a bit stagnant. 
+We can't dedicate huge amounts of time to it, either, so this may take a while, if it ever gets done at all.
+Sorry.
+
+
+## How can I help?
+
+I don't know! Not many people have the right combination of skills and interests to work on this. 
+I guess you could pledge to my [Patreon](https://www.patreon.com/eevee) as some gentle encouragement. :)
+
+If you are a developer, you can of course also contribute to the development of this project via Pull Requests.
+
+### About editing CSV files
+
+Fixing CSV data inconsistency or errors and putting that into a Pull Request it's also appreciated.
+
+Even though, whilst for every new game that we integrate here the initial big dump of data comes directly from
+the disassembled game files and scripts that parse their data, there is still some data that needs to be fixed or
+introduced manually.
+
+Pull Requests with manually-written modifications to the CSV files introducing data of new games without a trustful
+data source will be discarded.
+
+As mentioned, for new games we always try to automate this process with scripts that parse the disassembled game's data
+data into CSV, excepting whenever we have to fix some data inconsistency or error.
+
+Raw data can also sometimes come from external data miners, which have disassembled the game content and dumped all the
+information into human-readable text files.
+
+## Using the pokedex CLI
+
+A guide is available under the project's [Wiki](https://github.com/veekun/pokedex/wiki).
+
+### Docker support
+
+If you want to use the CLI but you don't want to install all python requirements yourself locally in your
+computer, you can use [Docker](https://www.docker.com/) and the provided Dockerfile will do everything for you.
+
+You only need to clone this project, and under the project directory, use the docker helper script to run
+any pokedex CLI command:
+
+**Examples**:
+
+Generating the SQLite database from the CSV files:
+```bash
+bin/docker-pokedex setup -v
+```
+
+Dumping the SQLite database back into the CSV files:
+```bash
+bin/docker-pokedex dump -l all
+```
+
+You also have a special command to re-build the docker image (e.g. after editing files):
+```bash
+bin/docker-pokedex rebuild
+```
+
+## License and Copyright
+
+The software is licensed under the MIT license. See the [`LICENSE`](LICENSE) file for full copyright and license text. 
+The short version is that you can do what you like with the code, as long as you say where you got it.
+
+This repository includes data extracted from the Pokémon series of video games.
+All of it is the intellectual property of Nintendo, Creatures, inc., and GAME FREAK, inc. and is protected by various 
+copyrights and trademarks. The author believes that the use of this intellectual property for a fan reference is 
+covered by fair use — the use is inherently educational, and the software would be severely impaired without the 
+copyrighted material.
+
+That said, any use of this library and its included data is **at your own legal risk**.

bin/docker-pokedex

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+curr_dir="$(pwd)"
+log_file="${curr_dir}/bin/docker-pokedex.log"
+
+if [[ "${1}" = "rebuild" ]] || [[ ! -f "${log_file}" ]]; then
+    docker build --rm -t veekun/pokedex ${curr_dir}
+    echo "$(date)" >> "${log_file}"
+
+    if [[ "${1}" = "rebuild" ]]; then
+        echo "Docker container rebuilt"
+        exit
+    fi;
+fi
+
+docker run -it --rm \
+    -e TERM=xterm-256color \
+    --name "pokedex-$(date +%Y%m%d-%H%M%S)" \
+    --mount type=bind,source="${curr_dir}/pokedex/data",target=/app/pokedex/data \
+    veekun/pokedex "${@}"

conftest.py

@@ -21,6 +21,9 @@ def pytest_runtest_setup(item):
     if 'slow' in item.keywords and not item.config.getvalue('all'):
         pytest.skip("skipping slow tests")
 
+def pytest_configure(config):
+    config.addinivalue_line("markers", "slow: marks tests as slow (require --all to run)")
+
 @pytest.fixture(scope="module")
 def session(request):
     import pokedex.db

doc/installing.rst

@@ -8,7 +8,7 @@ Run the following from an empty directory::
 
     $ sudo apt-get install git python python-pip python-sqlalchemy
     $ git clone git://github.com/veekun/pokedex.git
-    $ pip install -E env -e pokedex
+    $ pip install -e pokedex
     $ source env/bin/activate
     (env)$ pokedex setup -v
     (env)$ pokedex lookup eevee
@@ -66,7 +66,7 @@ Getting and installing pokedex
 Run the following from an empty directory::
 
     $ git clone git://github.com/veekun/pokedex.git
-    $ pip install -E env -e pokedex
+    $ pip install -e pokedex
 
 This will give you two directories: pokedex (containing the source code and
 data), and env (a virtualenv_).

item-questions

@@ -1,18 +0,0 @@
-QUESTIONS ABOUT ITEMS
-- I think: key items are uncountable.  everything else is countable.  an item can be held iff it is countable.
-- how long do
-- check bp for ultimate held item ref or something
-- I need a better way to represent NPC interactions in different games
-- how much does growth mulch accelerate soil drying?  how much does damp mulch slow it?
-- does lum berry cure confusion?
-- how does sweet heart work?  it seems a guy in mistralton will trade some for heart scales?
-- kind of guessing about the * urge items
-
-CHANGES SINCE R/S
-- 4 shoal salt + 4 shoal shells, traded to a guy in Shoal Cave, make a Shell Bell
-- white flute increased encounter rate by 50%, not 100%
-- shards can be traded for the respective stones
-
-
-
-UP TO 67

package.json

@@ -0,0 +1,3 @@
+{
+  "private": true
+}

pokedex/compatibility.py

@@ -3,6 +3,7 @@
 Currently these are functions missing from Python 2.5.
 """
 from __future__ import print_function
+import six
 
 try:
     from itertools import permutations
@@ -67,7 +68,7 @@ except ImportError:
 
         # Parse and validate the field names.  Validation serves two purposes,
         # generating informative error messages and preventing template injection attacks.
-        if isinstance(field_names, basestring):
+        if isinstance(field_names, six.string_types):
             field_names = field_names.replace(',', ' ').split() # names separated by whitespace and/or commas
         field_names = tuple(map(str, field_names))
         if rename:

pokedex/data/csv/abilities.csv

@@ -190,6 +190,82 @@ 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
+233,neuroforce,7,1
+234,intrepid-sword,8,1
+235,dauntless-shield,8,1
+236,libero,8,1
+237,ball-fetch,8,1
+238,cotton-down,8,1
+239,propeller-tail,8,1
+240,mirror-armor,8,1
+241,gulp-missile,8,1
+242,stalwart,8,1
+243,steam-engine,8,1
+244,punk-rock,8,1
+245,sand-spit,8,1
+246,ice-scales,8,1
+247,ripen,8,1
+248,ice-face,8,1
+249,power-spot,8,1
+250,mimicry,8,1
+251,screen-cleaner,8,1
+252,steely-spirit,8,1
+253,perish-body,8,1
+254,wandering-spirit,8,1
+255,gorilla-tactics,8,1
+256,neutralizing-gas,8,1
+257,pastel-veil,8,1
+258,hunger-switch,8,1
+259,quick-draw,8,1
+260,unseen-fist,8,1
+261,curious-medicine,8,1
+262,transistor,8,1
+263,dragons-maw,8,1
+264,chilling-neigh,8,1
+265,grim-neigh,8,1
+266,as-one-glastrier,8,1
+267,as-one-spectrier,8,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

pokedex/data/csv/ability_changelog_prose.csv

@@ -1,53 +1,105 @@
 ability_changelog_id,local_language_id,effect
+1,6,Hat im Kampf keinen Effekt.
 1,9,Has no effect in battle.
+2,6,Verhindert keine regulären K.O. bei vollen []{mechanic:hp}.
 2,9,Does not prevent regular KOs from full [HP]{mechanic:hp}.
+3,6,Hat außerhalb vom Kampf keinen Effekt.
 3,9,Has no overworld effect.
+4,6,"[]{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}, werden nicht absorbiert."
 4,9,"Does not absorb non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}."
+5,6,Löst bei Attacken die mehrmals Treffen bei jedem Treffer aus.
 5,9,Triggers on every hit of multiple-hit moves.
+6,6,[]{move:will-o-wisp} triggert die Fähigkeit nicht bei Pokémon die immun gegen []{mechanic:burn} sind.
 6,9,[]{move:will-o-wisp} does not trigger this ability for Pokémon immune to [burns]{mechanic:burn}.
+7,6,Hat außerhalb vom Kampf keinen Effekt.
 7,9,Has no overworld effect.
+8,6,Hat außerhalb vom Kampf keinen Effekt.
 8,9,Has no overworld effect.
+9,6,"Hat keinen Effekt, wenn die Fähigkeit nach Kampfbeginn erlangt wurde."
 9,9,Does not take effect if acquired after entering battle.
+10,6,Betrifft andere Pokémon mit dieser Fähigkeit.
 10,9,Affects other Pokémon with this ability.
+11,6,Verursacht nur 1/16 der maximalen []{mechanic:hp} des Angreifers Schaden.
 11,9,Inflicts only 1/16 of the attacker's maximum [HP]{mechanic:hp} in damage.
+12,6,"[]{move:fire-fang} und Attacken die [typenlosen Schaden]{mechanic:typeless-damage} verursachen, ignorieren diese Fähigkeit unabhängig von ihrem Typ."
 12,9,[]{move:fire-fang} and moves that inflict [typeless damage]{mechanic:typeless-damage} ignore this ability regardless of type.
+13,6,Hat außerhalb vom Kampf keinen Effekt.
 13,9,Has no overworld effect.
+14,6,Kann das Wesen von Pokémon mit denen in der Spielwelt interagiert wird nicht verändern.
 14,9,Cannot influence the natures of Pokémon encountered by interacting with them on the overworld.
+15,6,Gibt schwere []{mechanic:poison} als normale []{mechanic:poison} zurück.
 15,9,Passes back bad [poison]{mechanic:poison} as regular poison.
+16,6,Hat außerhalb vom Kampf keinen Effekt.
 16,9,Has no overworld effect.
+17,6,"Betrifft keine []{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}. Erhöht die Anzahl an Trainer-Anrufen wenn irgendein Pokémon im Team diese Fähigkeit hat."
 17,9,"Does not affect non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}.  Increases the frequency of Match Call calls on the overworld if any party Pokémon has this ability."
+18,6,"Leitet []{type:electric}-Attacken um, ohne ihre Effekte zu deaktivieren oder einen []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um."
 18,9,Redirects []{type:electric} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+19,6,Hat außerhalb vom Kampf keinen Effekt.
 19,9,Has no overworld effect.
+20,6,Hat außerhalb vom Kampf keinen Effekt.
 20,9,Has no overworld effect.
+21,6,"Hindert []{move:heal-bell} daran, das Pokémon zu heilen, auch außerhalb vom Kampf."
 21,9,"Prevents []{move:heal-bell} from curing the Pokémon, whether or not it is in battle."
+22,6,Hat außerhalb vom Kampf keinen Effekt.
 22,9,Has no overworld effect.
+23,6,Betrifft keine Attacken von Teammitgliedern die alle anderen Pokémon als Ziel haben. Diese Fähigkeit wird im Kampf nicht angekündigt.
 23,9,Does not affect friendly Pokémon's moves that target all other Pokémon.  This ability's presence is not announced upon entering battle.
+24,6,Hat außerhalb vom Kampf keinen Effekt.
 24,9,Has no overworld effect.
+25,6,Hat außerhalb vom Kampf keinen Effekt.
 25,9,Has no overworld effect.
+26,6,Hat außerhalb vom Kampf keinen Effekt.
 26,9,Has no overworld effect.
+27,6,"Verdoppelt den Radius in dem []{move:cut} Gras entfernt, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 27,9,Doubles []{move:cut}'s grass-cutting radius on the overworld if any party Pokémon has this ability.
+28,6,Hat im Kampf keinen Effekt.
 28,9,Has no effect in battle.
+29,6,Hat außerhalb vom Kampf keinen Effekt.
 29,9,Has no overworld effect.
+30,6,Hat außerhalb vom Kampf keinen Effekt.
 30,9,Has no overworld effect.
+31,6,Hat außerhalb vom Kampf keinen Effekt.
 31,9,Has no overworld effect.
+32,6,Hat keinen Effekt während das Pokémon [schläft]{mechanic:sleep}.
 32,9,Does not take effect during [sleep]{mechanic:sleep}.
+33,6,Hat außerhalb vom Kampf keinen Effekt.
 33,9,Has no overworld effect.
+34,6,"Erhöht die Anzahl an Rufen die man außerhalb vom Kampf hört, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 34,9,Increases the frequency of cries heard on the overworld if any party Pokémon has this ability.
+35,6,Hat außerhalb vom Kampf keinen Effekt.
 35,9,Has no overworld effect.
+36,6,Hat außerhalb vom Kampf keinen Effekt.
 36,9,Has no overworld effect.
+37,6,Hat außerhalb vom Kampf keinen Effekt.
 37,9,Has no overworld effect.
+38,6,[]{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf.
 38,9,[Poison]{mechanic:poison} still damages the Pokémon outside of battle.
+39,6,"[]{mechanic:paralysis} hindert das Pokémon nicht daran sich zu bewegen, aber der []{mechanic:speed} Malus bleibt. []{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf."
 39,9,"[Paralysis]{mechanic:paralysis} cannot prevent the Pokémon from moving, though the [Speed]{mechanic:speed} cut is unaffected.  [Poison]{mechanic:poison} still damages the Pokémon outside of battle."
+40,6,Wegen eines Glitches haben Attacken die von dieser Fähigkeit beeinflusst sind eine (100 - Genauigkeit)% Chance durch den []{move:detect} oder []{move:protect} zu treffen.
 40,9,"Due to a glitch, moves affected by this ability have a (100 - accuracy)% chance to hit through []{move:detect} or []{move:protect}."
+41,6,[]{move:rest} funktioniert normal bei [starkem Sonnenlicht]{mechanic:strong-sunlight}.
 41,9,[]{move:rest} works as usual during [strong sunlight]{mechanic:strong-sunlight}.
+42,6,[]{move:fling} kann normal benutzt werden.
 42,9,[]{move:fling} can be used as usual.
+43,6,Leitet []{type:water}-Attacken um ohne den []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um.
 43,9,Redirects []{type:water} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+44,6,Kann []{ability:flower-gift} und []{ability:wonder-guard} kopieren.
 44,9,Can copy []{ability:flower-gift} and []{ability:wonder-guard}.
+45,6,Kann []{ability:forecast} und []{ability:trace} kopieren.
 45,9,Can copy []{ability:forecast} and []{ability:trace}.
+46,6,Funktioniert nur wenn es mit []{ability:minus} kombiniert wird.
 46,9,Powers up only when paired with []{ability:minus}.
+47,6,Funktioniert nur wenn es mit []{ability:plus} kombiniert wird.
 47,9,Powers up only when paired with []{ability:plus}.
+48,6,"Die Chance, dass der Effekt eintritt, beträgt 30%."
 48,9,Chance of taking effect is 30%.
+49,6,[]{move:triple-kick} wird nicht beeinflusst.
 49,9,[]{move:triple-kick} is unaffected.
+50,6,[]{move:struggle} wird nicht beeinflusst. []{move:helping-hand} und []{move:defense-curl} werden nicht beachtet.
 50,9,[]{move:struggle} is unaffected.  []{move:helping-hand} and []{move:defense-curl} are not taken into account.
+51,6,Hat außerhalb vom Kampf keinen Effekt.
 51,9,Has no overworld effect.
+52,6,"Die Chance, dass der Effekt eintritt, beträgt 33%."
 52,9,Chance of taking effect is 33%.

pokedex/data/csv/berry_firmness_names.csv

@@ -1,11 +1,16 @@
 berry_firmness_id,local_language_id,name
 1,5,Très tendre
+1,7,Muy blanda
 1,9,Very Soft
 2,5,Tendre
+2,7,Blanda
 2,9,Soft
 3,5,Ferme
+3,7,Dura
 3,9,Hard
 4,5,Très ferme
+4,7,Muy dura
 4,9,Very Hard
 5,5,Super ferme
+5,7,Superdura
 5,9,Super Hard

pokedex/data/csv/characteristic_text.csv

@@ -1,61 +1,301 @@
 characteristic_id,local_language_id,message
-1,5,Adore manger
+1,1,たべるのが　だいすき
+1,3,먹는 것을 제일 좋아함
+1,4,非常喜歡吃東西
+1,5,Il adore manger
+1,6,Liebt es zu essen
+1,7,Le encanta comer
+1,8,Adora mangiare
 1,9,Loves to eat
-2,5,Est fier de sa puissance
+1,11,食べるのが　大好き
+1,12,非常喜欢吃东西
+2,1,ちからが　じまん
+2,3,힘자랑이 특기임
+2,4,以力氣大為傲
+2,5,Il est fier de sa puissance
+2,6,Ist stolz auf seine Stärke
+2,7,Se enorgullece de su fuerza
+2,8,La forza è il suo vanto
 2,9,Proud of its power
-3,5,Corps robuste
+2,11,力が　自慢
+2,12,以力气大为傲
+3,1,からだが　じょうぶ
+3,3,몸이 튼튼함
+3,4,身體強壯
+3,5,Il a un corps robuste
+3,6,Hat einen robusten Körper
+3,7,Se caracteriza por su cuerpo resistente
+3,8,Ha un corpo robusto
 3,9,Sturdy body
-4,5,Extrêmement curieux
+3,11,体が　丈夫
+3,12,身体强壮
+4,1,こうきしんが　つよい
+4,3,호기심이 강함
+4,4,好奇心強
+4,5,Il est extrêmement curieux
+4,6,Ist sehr neugierig
+4,7,Siente mucha curiosidad por todo
+4,8,È un grande ficcanaso
 4,9,Highly curious
-5,5,Très volontaire
+4,11,好奇心が　強い
+4,12,好奇心强
+5,1,きが　つよい
+5,3,기가 센 성격임
+5,4,性格強勢
+5,5,Il est très volontaire
+5,6,Besitzt einen starken Willen
+5,7,Se distingue por su gran fuerza de voluntad
+5,8,Sa il fatto suo
 5,9,Strong willed
-6,5,Aime courir
+5,11,気が　強い
+5,12,性格强势
+6,1,かけっこが　すき
+6,3,달리기를 좋아함
+6,4,喜歡比誰跑得快
+6,5,Il aime la vitesse
+6,6,Ist gerne schnell unterwegs
+6,7,Le gusta ir muy rápido
+6,8,Adora andare veloce
 6,9,Likes to run
-7,5,S'assoupit souvent
+6,11,駆けっこが　好き
+6,12,喜欢比谁跑得快
+7,1,ひるねを　よくする
+7,3,낮잠을 잘 잠
+7,4,經常睡午覺
+7,5,Il s’assoupit souvent
+7,6,Nickt oft ein
+7,7,A menudo se duerme
+7,8,Si addormenta spesso
 7,9,Takes plenty of siestas
-8,5,Aime se démener
+7,11,昼寝を　よくする
+7,12,经常睡午觉
+8,1,あばれることが　すき
+8,3,난동부리기를 좋아함
+8,4,喜歡胡鬧
+8,5,Il aime se démener
+8,6,Prügelt sich gern
+8,7,Le gusta revolverse
+8,8,Adora dimenarsi
 8,9,Likes to thrash about
-9,5,Sait encaisser les coups
+8,11,暴れることが　好き
+8,12,喜欢胡闹
+9,1,うたれ　づよい
+9,3,맷집이 강함
+9,4,抗打能力強
+9,5,Il sait encaisser les coups
+9,6,Kann Treffer gut verkraften
+9,7,Encaja bien los ataques
+9,8,È forte in attacco
 9,9,Capable of taking hits
-10,5,Coquin
+9,11,打たれ強い
+9,12,抗打能力强
+10,1,イタズラが　すき
+10,3,장난을 좋아함
+10,4,喜歡惡作劇
+10,5,Il est coquin
+10,6,Ist hinterhältig
+10,7,Le gusta hacer travesuras
+10,8,È alquanto vivace
 10,9,Mischievous
-11,5,Un peu vaniteux
+10,11,イタズラが　好き
+10,12,喜欢恶作剧
+11,1,ちょっぴり　みえっぱり
+11,3,조금 겉치레를 좋아함
+11,4,有一點點愛慕虛榮
+11,5,Il est un peu vaniteux
+11,6,Ist etwas eitel
+11,7,Es un poco petulante
+11,8,È abbastanza superficiale
 11,9,Somewhat vain
-12,5,Attentif aux sons
+11,11,ちょっぴり　みえっぱり
+11,12,有一点点爱慕虚荣
+12,1,ものおとに　びんかん
+12,3,주위 소리에 민감함
+12,4,對聲音敏感
+12,5,Il est attentif aux sons
+12,6,Achtet auf Geräusche
+12,7,Siempre tiene el oído alerta
+12,8,Fa attenzione ai suoni
 12,9,Alert to sounds
-13,5,Dort beaucoup
+12,11,物音に　敏感
+12,12,对声音敏感
+13,1,いねむりが　おおい
+13,3,말뚝잠이 많음
+13,4,常常打瞌睡
+13,5,Il dort beaucoup
+13,6,Schläft gern
+13,7,Duerme mucho
+13,8,Dorme a lungo
 13,9,Nods off a lot
-14,5,Un peu coléreux
+13,11,居眠りが　多い
+13,12,常常打瞌睡
+14,1,ちょっと　おこりっぽい
+14,3,약간 화를 잘 내는 성미임
+14,4,有點容易生氣
+14,5,Il est un peu coléreux
+14,6,Besitzt Temperament
+14,7,A veces se enfada
+14,8,Si arrabbia facilmente
 14,9,A little quick tempered
-15,5,Très obstiné
+14,11,ちょっと　怒りっぽい
+14,12,有点容易生气
+15,1,ねばり　づよい
+15,3,끈질김
+15,4,頑強不屈
+15,5,Il est très obstiné
+15,6,Ist äußerst zäh
+15,7,Es muy persistente
+15,8,È molto ostinato
 15,9,Highly persistent
-16,5,Très astucieux
+15,11,粘り強い
+15,12,顽强不屈
+16,1,ぬけめが　ない
+16,3,빈틈이 없음
+16,4,做事萬無一失
+16,5,Il est très astucieux
+16,6,Ist äußerst gerissen
+16,7,Es muy sagaz
+16,8,È estremamente sagace
 16,9,Thoroughly cunning
-17,5,Esprit rebelle
+16,11,抜け目が　ない
+16,12,做事万无一失
+17,1,まけんきが　つよい
+17,3,오기가 센 성격임
+17,4,爭強好勝
+17,5,Il a l’esprit rebelle
+17,6,Ist sehr aufsässig
+17,7,Es muy insolente
+17,8,È molto insolente
 17,9,Strongly defiant
-18,5,Bête et impulsif
+17,11,負けん気が　強い
+17,12,争强好胜
+18,1,おっちょこちょい
+18,3,촐랑대는 성격임
+18,4,冒冒失失
+18,5,Il est bête et impulsif
+18,6,Ist ungestüm und einfältig
+18,7,Es de carácter simple e impetuoso
+18,8,È irruente e semplice
 18,9,Impetuous and silly
-19,5,Éparpille des choses
+18,11,おっちょこちょい
+18,12,冒冒失失
+19,1,ものを　よく　ちらかす
+19,3,물건을 잘 어지름
+19,4,經常亂扔東西
+19,5,Il éparpille souvent les choses
+19,6,Macht oft Unordnung
+19,7,Suele desordenar cosas
+19,8,Lascia cose in giro
 19,9,Scatters things often
-20,5,Aime combattre
+19,11,ものを　よく　散らかす
+19,12,经常乱扔东西
+20,1,ケンカを　するのが　すき
+20,3,싸움을 좋아함
+20,4,喜歡打架
+20,5,Il aime combattre
+20,6,Liebt Kämpfe
+20,7,Le gusta luchar
+20,8,Adora lottare
 20,9,Likes to fight
-21,5,Bonne endurance
+20,11,ケンカを　するのが　好き
+20,12,喜欢打架
+21,1,しんぼう　づよい
+21,3,인내심이 강함
+21,4,能吃苦耐勞
+21,5,Il a une bonne endurance
+21,6,Hat eine gute Ausdauer
+21,7,Se caracteriza por ser muy resistente
+21,8,È molto paziente
 21,9,Good endurance
-22,5,Souvent dans la lune
+21,11,辛抱強い
+21,12,能吃苦耐劳
+22,1,かんがえごとが　おおい
+22,3,걱정거리가 많음
+22,4,經常思考
+22,5,Il est souvent dans la lune
+22,6,Ist oft in Gedanken
+22,7,A menudo está en Babia
+22,8,Si perde nel suo mondo
 22,9,Often lost in thought
-23,5,A horreur de perdre
+22,11,考え事が　多い
+22,12,经常思考
+23,1,まけずぎらい
+23,3,지기 싫어함
+23,4,不服輸
+23,5,Il a horreur de perdre
+23,6,Hasst Niederlagen
+23,7,Odia perder
+23,8,Non sopporta perdere
 23,9,Hates to lose
-24,5,Aime faire le pitre
+23,11,負けず嫌い
+23,12,不服输
+24,1,すこし　おちょうしもの
+24,3,약간 우쭐쟁이임
+24,4,有點容易得意忘形
+24,5,Il aime faire le pitre
+24,6,Ist ein bisschen albern
+24,7,Le encanta hacer payasadas
+24,8,È una specie di buffone
 24,9,Somewhat of a clown
-25,5,Aime se détendre
+24,11,すこし　お調子者
+24,12,有点容易得意忘形
+25,1,のんびりするのが　すき
+25,3,유유자적함을 좋아함
+25,4,喜歡悠然自在
+25,5,Il aime se détendre
+25,6,"Mag es, sich zu entspannen"
+25,7,Le gusta relajarse
+25,8,Adora rilassarsi
 25,9,Likes to relax
-26,5,S'emporte facilement
+25,11,のんびりするのが　好き
+25,12,喜欢悠然自在
+26,1,ちのけが　おおい
+26,3,혈기가 왕성함
+26,4,血氣方剛
+26,5,Il s’emporte facilement
+26,6,Ist impulsiv
+26,7,Tiene mal genio
+26,8,È facilmente irritabile
 26,9,Quick tempered
-27,5,Persévérant
+26,11,血の気が　多い
+26,12,血气方刚
+27,1,がまん　づよい
+27,3,잘 참음
+27,4,善於忍耐
+27,5,Il est persévérant
+27,6,Ist beharrlich
+27,7,Es muy perseverante
+27,8,È molto tenace
 27,9,Good perseverance
-28,5,Très particulier
+27,11,我慢強い
+27,12,善于忍耐
+28,1,とても　きちょうめん
+28,3,매우 꼼꼼함
+28,4,一絲不苟
+28,5,Il est très particulier
+28,6,Ist sehr pedantisch
+28,7,Es muy tiquismiquis
+28,8,È molto esigente
 28,9,Very finicky
-29,5,Assez entêté
+28,11,とても　きちょうめん
+28,12,一丝不苟
+29,1,ちょっぴり　ごうじょう
+29,3,조금 고집통이임
+29,4,有一點點固執
+29,5,Il est assez entêté
+29,6,Ist dickköpfig
+29,7,Es un poco cabezota
+29,8,È un po’ testardo
 29,9,Somewhat stubborn
-30,5,Fuit rapidement
+29,11,ちょっぴり　強情
+29,12,有一点点固执
+30,1,にげるのが　はやい
+30,3,도망에는 선수임
+30,4,逃得快
+30,5,Il fuit rapidement
+30,6,Flüchtet schnell
+30,7,Huye rápido
+30,8,Sa fuggire velocemente
 30,9,Quick to flee
+30,11,逃げるのが　はやい
+30,12,逃得快

pokedex/data/csv/conquest_episode_names.csv

@@ -1,39 +1,77 @@
 episode_id,local_language_id,name
+1,7,La Leyenda de Ransei
 1,9,The Legend of Ransei
+2,7,El Camino hacia la Conquista
 2,9,The Road to Conquest
+3,7,Felices por Siempre
 3,9,Happily Ever After
+4,7,El Peso de la Paz
 4,9,The Burden of Peace
+5,7,El Camino del Guerrero
 5,9,The Way of the Warrior
+6,7,La Alegría de la Batalla
 6,9,The Joy of Battle
+7,7,Orgullo y Precocidad
 7,9,Pride and Precociousness
+8,7,Determinación Trágica
 8,9,Tragic Determination
+9,7,Un Manto de Oscuridad
 9,9,A Shroud of Darkness
+10,7,No Vale la Pena Pelear por... 1
 10,9,Not Worth Fighting Over... 1
+11,7,Enseñándoles una Lección
 11,9,Teaching Them a Lesson
+12,7,El Genio Renuente
 12,9,The Reluctant Genius
+13,7,El Guerrero Incomparable
 13,9,The Unparalleled Warrior
+14,7,Un Ninja entre Ninjas
 14,9,A Ninja amongst Ninjas
+15,7,Archienemigos
 15,9,Archenemies
+16,7,¡Tiempo para la Batalla!
 16,9,Time for Battle!
+17,7,Tierra de Amor y Honradez
 17,9,Land of Love and Righteousness
+18,7,El Amor es un Campo de Batalla
 18,9,Love is a Battlefield
+19,7,La Apuesta Final
 19,9,The Final Gamble
+20,7,Soplando en el Viento
 20,9,Blowing in the Wind
+21,7,Belleza Legendaria de Ransei
 21,9,Ransei's Legendary Beauty
+22,7,Todo Crece
 22,9,All Grown Up
+23,7,El Rebelde
 23,9,The Rebel
+24,7,Eso que el Querido Sostiene
 24,9,That Which He Holds Dear
+25,7,No Vale la Pena Pelear por... 2
 25,9,Not Worth Fighting Over... 2
+26,7,La Rosa de Ransei
 26,9,The Rose of Ransei
+27,7,La Misión del Visionario
 27,9,The Visionary's Quest
+28,7,Gracia y Belleza
 28,9,Grace and Beauty
+29,7,Pokémari y Yo
 29,9,Pokémari and Me
+30,7,El Sueño del Dragón
 30,9,The Dragon's Dream
+31,7,Dejando Abajo los Libros
 31,9,Putting the Books Down
+32,7,Una Cita con el Destino
 32,9,A Date with Destiny
+33,7,Esta va para mis Fans
 33,9,This One Goes Out to My Fans
+34,7,Simplemente lo Mejor
 34,9,Simply the Best
+35,7,No Vale la Pena Pelear por... 3
 35,9,Not Worth Fighting Over... 3
+36,7,Belleza Destino de Nacimiento
 36,9,A Fate Born of Beauty
+37,7,El Sendero del Espíritu Libre
 37,9,The Free Spirit's Path
+38,7,Dos Héroes de Ransei
 38,9,Two Heroes of Ransei

pokedex/data/csv/conquest_stat_names.csv

@@ -1,7 +1,13 @@
 conquest_stat_id,local_language_id,name
+1,7,PS
 1,9,HP
+2,7,Ataque
 2,9,Attack
+3,7,Defensa
 3,9,Defense
+4,7,Velocidad
 4,9,Speed
+5,7,Rango
 5,9,Range
+6,7,Energía
 6,9,Energy

pokedex/data/csv/contest_combos.csv

@@ -1,6 +1,6 @@
 first_move_id,second_move_id
 1,3
-1,29
+1,21
 1,185
 7,8
 7,9
@@ -37,7 +37,6 @@ first_move_id,second_move_id
 74,22
 74,71
 74,72
-74,73
 74,75
 74,76
 74,80
@@ -45,6 +44,7 @@ first_move_id,second_move_id
 74,331
 74,338
 74,345
+81,169
 82,225
 82,337
 82,349
@@ -77,8 +77,8 @@ first_move_id,second_move_id
 111,205
 116,2
 116,5
-116,21
 116,25
+116,29
 116,36
 116,38
 116,167
@@ -108,8 +108,6 @@ first_move_id,second_move_id
 170,66
 170,136
 170,223
-170,276
-170,329
 174,180
 174,194
 174,212
@@ -132,10 +130,8 @@ first_move_id,second_move_id
 199,276
 201,28
 201,189
-201,300
 201,311
 201,328
-201,341
 203,175
 203,179
 203,194
@@ -155,17 +151,18 @@ first_move_id,second_move_id
 230,77
 230,78
 230,79
-240,3
 240,55
 240,56
 240,57
 240,61
 240,87
+240,110
 240,127
 240,128
 240,145
 240,152
 240,190
+240,250
 240,291
 240,308
 240,311
@@ -174,7 +171,6 @@ first_move_id,second_move_id
 240,346
 240,352
 241,7
-241,27
 241,52
 241,53
 241,76
@@ -186,6 +182,7 @@ first_move_id,second_move_id
 241,235
 241,236
 241,257
+241,261
 241,284
 241,299
 241,307
@@ -198,22 +195,14 @@ first_move_id,second_move_id
 252,292
 254,255
 254,256
-258,58
 258,59
-258,62
-258,114
 258,181
-258,196
-258,301
 258,311
-258,329
-258,333
 268,9
 268,84
 268,85
 268,86
 268,87
-268,192
 268,209
 268,344
 268,351

pokedex/data/csv/egg_group_prose.csv

@@ -1,89 +1,104 @@
 egg_group_id,local_language_id,name
 1,1,かいじゅう
+1,3,괴수
 1,5,Monstrueux
 1,6,Monster
 1,7,Monstruo
 1,8,Mostro
 1,9,Monster
 2,1,すいちゅう１
+2,3,수중 1
 2,5,Aquatique 1
 2,6,Wasser 1
 2,7,Agua 1
 2,8,Acqua 1
 2,9,Water 1
 3,1,むし
+3,3,벌레
 3,5,Insectoïde
 3,6,Käfer
 3,7,Bicho
 3,8,Coleottero
 3,9,Bug
 4,1,ひこう
+4,3,비행
 4,5,Aérien
 4,6,Flug
 4,7,Volador
 4,8,Volante
 4,9,Flying
 5,1,りくじょう
+5,3,육상
 5,5,Terrestre
 5,6,Feld
 5,7,Campo
 5,8,Campo
 5,9,Field
 6,1,ようせい
+6,3,요정
 6,5,Féerique
 6,6,Fee
 6,7,Hada
 6,8,Magico
 6,9,Fairy
 7,1,しょくぶつ
+7,3,식물
 7,5,Végétal
 7,6,Pflanze
 7,7,Planta
 7,8,Erba
 7,9,Grass
 8,1,ひとがた
+8,3,인간형
 8,5,Humanoïde
 8,6,Humanotyp
 8,7,Humanoide
 8,8,Umanoide
 8,9,Human-Like
 9,1,すいちゅう３
+9,3,수중 3
 9,5,Aquatique 3
 9,6,Wasser 3
 9,7,Agua 3
 9,8,Acqua 3
 9,9,Water 3
 10,1,こうぶつ
+10,3,광물
 10,5,Minéral
 10,6,Mineral
 10,7,Mineral
 10,8,Minerale
 10,9,Mineral
 11,1,ふていけい
+11,3,부정형
 11,5,Amorphe
 11,6,Amorph
 11,7,Amorfo
 11,8,Amorfo
 11,9,Amorphous
 12,1,すいちゅう２
+12,3,수중 2
 12,5,Aquatique 2
 12,6,Wasser 2
 12,7,Agua 2
 12,8,Acqua 2
 12,9,Water 2
 13,1,メタモン
+13,3,메타몽
 13,5,Métamorph
 13,6,Ditto
 13,7,Ditto
 13,8,Ditto
 13,9,Ditto
 14,1,ドラゴン
+14,3,드래곤
 14,5,Draconique
 14,6,Drache
 14,7,Dragón
 14,8,Drago
 14,9,Dragon
 15,1,タマゴみはっけん
+15,3,알미발견
 15,5,Inconnu
 15,6,Unbekannt
 15,7,Desconocido

pokedex/data/csv/encounter_method_prose.csv

@@ -33,3 +33,5 @@ encounter_method_id,local_language_id,name
 16,9,Walking in red flowers
 17,6,Auf unwegsamen Gelände laufen
 17,9,Walking on rough terrain
+18,9,Receive as a gift
+19,9,Receive egg as a gift

pokedex/data/csv/encounter_methods.csv

@@ -16,3 +16,5 @@ id,identifier,order
 15,purple-flowers,7
 16,red-flowers,8
 17,rough-terrain,9
+18,gift,18
+19,gift-egg,19

pokedex/data/csv/encounter_slots.csv

@@ -488,3 +488,74 @@ id,version_group_id,encounter_method_id,slot,rarity
 487,15,4,0,60
 488,15,4,1,35
 489,15,4,2,5
+490,1,18,,100
+491,2,18,,100
+492,3,18,,100
+493,4,18,,100
+494,5,18,,100
+495,6,18,,100
+496,7,18,,100
+497,8,18,,100
+498,9,18,,100
+499,10,18,,100
+500,11,18,,100
+501,14,18,,100
+502,15,18,,100
+503,16,18,,100
+504,3,19,,100
+505,4,19,,100
+506,5,19,,100
+507,6,19,,100
+508,7,19,,100
+509,8,19,,100
+510,9,19,,100
+511,10,19,,100
+512,11,19,,100
+513,14,19,,100
+514,16,19,,100
+515,3,1,1,30
+516,3,1,2,30
+517,3,1,3,20
+518,3,1,4,10
+519,3,1,5,5
+520,3,1,6,4
+521,3,1,7,1
+522,3,2,1,70
+523,3,2,2,15
+524,3,2,3,15
+525,3,3,1,35
+526,3,3,2,35
+527,3,3,3,20
+528,3,3,4,10
+529,3,4,1,40
+530,3,4,2,30
+531,3,4,3,20
+532,3,4,4,10
+533,3,5,1,60
+534,3,5,2,30
+535,3,5,3,10
+536,3,6,1,90
+537,3,6,2,10
+538,4,1,1,30
+539,4,1,2,30
+540,4,1,3,20
+541,4,1,4,10
+542,4,1,5,5
+543,4,1,6,4
+544,4,1,7,1
+545,4,2,1,70
+546,4,2,2,15
+547,4,2,3,15
+548,4,3,1,35
+549,4,3,2,35
+550,4,3,3,20
+551,4,3,4,10
+552,4,4,1,40
+553,4,4,2,30
+554,4,4,3,20
+555,4,4,4,10
+556,4,5,1,60
+557,4,5,2,30
+558,4,5,3,10
+559,4,6,1,90
+560,4,6,2,10

pokedex/data/csv/evolution_chains.csv

@@ -364,3 +364,106 @@ 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,
+424,
+425,
+426,
+427,
+428,
+429,
+430,
+431,
+432,
+433,
+434,
+435,
+436,
+437,
+438,
+439,
+440,
+441,
+442,
+443,
+444,
+445,
+446,
+447,
+448,
+449,
+450,
+451,
+452,
+453,
+454,
+455,
+456,
+457,
+458,
+459,
+460,
+461,
+462,
+463,
+464,
+465,
+466,
+467,
+468,
+469,
+470,
+471,
+472,
+473,
+474,
+475,
+476,

pokedex/data/csv/evolution_trigger_prose.csv

@@ -11,3 +11,8 @@ evolution_trigger_id,local_language_id,name
 4,5,Place dans l'équipe et une Poké Ball
 4,6,Platz im Team und ein Pokéball
 4,9,Shed
+5,9,Spin
+6,9,Train in the Tower of Darkness
+7,9,Train in the Tower of Waters
+8,9,Land three critical hits in a battle
+9,9,Go somewhere after taking damage

pokedex/data/csv/evolution_triggers.csv

@@ -3,3 +3,8 @@ id,identifier
 2,trade
 3,use-item
 4,shed
+5,spin
+6,tower-of-darkness
+7,tower-of-waters
+8,three-critical-hits
+9,take-damage

pokedex/data/csv/generation_names.csv

@@ -1,19 +1,51 @@
 generation_id,local_language_id,name
+1,1,だいいちせだい
+1,3,1세대
 1,5,Génération I
 1,6,Generation I
+1,7,Generación I
 1,9,Generation I
+1,11,第一世代
+2,1,だいにせだい
+2,3,2세대
 2,5,Génération II
 2,6,Generation II
+2,7,Generación II
 2,9,Generation II
+2,11,第二世代
+3,1,だいさんせだい
+3,3,3세대
 3,5,Génération III
 3,6,Generation III
+3,7,Generación III
 3,9,Generation III
+3,11,第三世代
+4,1,だいよんせだい
+4,3,4세대
 4,5,Génération IV
 4,6,Generation IV
+4,7,Generación IV
 4,9,Generation IV
+4,11,第四世代
+5,1,だいごせだい
+5,3,5세대
 5,5,Génération V
 5,6,Generation V
+5,7,Generación V
 5,9,Generation V
+5,11,第五世代
+6,1,だいろくせだい
+6,3,6세대
 6,5,Génération VI
 6,6,Generation VI
+6,7,Generación VI
 6,9,Generation VI
+6,11,第六世代
+7,1,だいななせだい
+7,3,7세대
+7,5,Génération VII
+7,6,Generation VII
+7,7,Generación VII
+7,9,Generation VII
+7,11,第七世代
+8,9,Generation VIII

pokedex/data/csv/generations.csv

@@ -5,3 +5,5 @@ id,main_region_id,identifier
 4,4,generation-iv
 5,5,generation-v
 6,6,generation-vi
+7,7,generation-vii
+8,8,generation-viii

pokedex/data/csv/item_categories.csv

@@ -42,4 +42,10 @@ 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
+47,1,species-candies
+48,5,catching-bonus
+49,1,dynamax-crystals
+50,2,nature-mints
+51,1,curry-ingredients

pokedex/data/csv/item_category_prose.csv

@@ -42,4 +42,10 @@ 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
+47,9,Species candies
+48,9,Catching bonus
+49,9,Dynamax crystals
+50,9,Nature mints
+51,9,Curry ingredients

pokedex/data/csv/item_fling_effects.csv

@@ -1,8 +1,8 @@
-id
-1
-2
-3
-4
-5
-6
-7
+id,identifier
+1,badly-poison
+2,burn
+3,berry-effect
+4,herb-effect
+5,paralyze
+6,poison
+7,flinch

pokedex/data/csv/item_pocket_names.csv

@@ -1,9 +1,25 @@
 item_pocket_id,local_language_id,name
+1,5,Objets
+1,7,Objetos
 1,9,Items
+2,5,Médicaments
+2,7,Medicinas
 2,9,Medicine
+3,5,Balls
+3,7,Bolas
 3,9,Poké Balls
+4,5,CT & CS
+4,7,MT y MO
 4,9,TMs and HMs
+5,5,Baies
+5,7,Bayas
 5,9,Berries
+6,5,Lettres
+6,7,Correo
 6,9,Mail
+7,5,Objets de combat
+7,7,Objetos de combate
 7,9,Battle Items
+8,5,Object rares
+8,7,Objetos clave
 8,9,Key Items

pokedex/data/csv/item_prose.csv

@@ -1239,3 +1239,283 @@ 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.
+919,9,XXX new effect for bike--green,XXX new effect for bike--green
+920,9,XXX new effect for storage-key--galactic-warehouse,XXX new effect for storage-key--galactic-warehouse
+921,9,XXX new effect for basement-key--goldenrod,XXX new effect for basement-key--goldenrod
+922,9,XXX new effect for xtranceiver--red,XXX new effect for xtranceiver--red
+923,9,XXX new effect for xtranceiver--yellow,XXX new effect for xtranceiver--yellow
+924,9,XXX new effect for dna-splicers--merge,XXX new effect for dna-splicers--merge
+925,9,XXX new effect for dna-splicers--split,XXX new effect for dna-splicers--split
+926,9,XXX new effect for dropped-item--red,XXX new effect for dropped-item--red
+927,9,XXX new effect for dropped-item--yellow,XXX new effect for dropped-item--yellow
+928,9,XXX new effect for holo-caster--green,XXX new effect for holo-caster--green
+929,9,XXX new effect for bike--yellow,XXX new effect for bike--yellow
+930,9,XXX new effect for holo-caster--red,XXX new effect for holo-caster--red
+931,9,XXX new effect for basement-key--new-mauville,XXX new effect for basement-key--new-mauville
+932,9,XXX new effect for storage-key--sea-mauville,XXX new effect for storage-key--sea-mauville
+933,9,XXX new effect for ss-ticket--hoenn,XXX new effect for ss-ticket--hoenn
+934,9,XXX new effect for contest-costume--dress,XXX new effect for contest-costume--dress
+935,9,XXX new effect for meteorite--2,XXX new effect for meteorite--2
+936,9,XXX new effect for meteorite--3,XXX new effect for meteorite--3
+937,9,XXX new effect for meteorite--4,XXX new effect for meteorite--4
+938,9,XXX new effect for normalium-z--bag,XXX new effect for normalium-z--bag
+939,9,XXX new effect for firium-z--bag,XXX new effect for firium-z--bag
+940,9,XXX new effect for waterium-z--bag,XXX new effect for waterium-z--bag
+941,9,XXX new effect for electrium-z--bag,XXX new effect for electrium-z--bag
+942,9,XXX new effect for grassium-z--bag,XXX new effect for grassium-z--bag
+943,9,XXX new effect for icium-z--bag,XXX new effect for icium-z--bag
+944,9,XXX new effect for fightinium-z--bag,XXX new effect for fightinium-z--bag
+945,9,XXX new effect for poisonium-z--bag,XXX new effect for poisonium-z--bag
+946,9,XXX new effect for groundium-z--bag,XXX new effect for groundium-z--bag
+947,9,XXX new effect for flyinium-z--bag,XXX new effect for flyinium-z--bag
+948,9,XXX new effect for psychium-z--bag,XXX new effect for psychium-z--bag
+949,9,XXX new effect for buginium-z--bag,XXX new effect for buginium-z--bag
+950,9,XXX new effect for rockium-z--bag,XXX new effect for rockium-z--bag
+951,9,XXX new effect for ghostium-z--bag,XXX new effect for ghostium-z--bag
+952,9,XXX new effect for dragonium-z--bag,XXX new effect for dragonium-z--bag
+953,9,XXX new effect for darkinium-z--bag,XXX new effect for darkinium-z--bag
+954,9,XXX new effect for steelium-z--bag,XXX new effect for steelium-z--bag
+955,9,XXX new effect for fairium-z--bag,XXX new effect for fairium-z--bag
+956,9,XXX new effect for pikanium-z--bag,XXX new effect for pikanium-z--bag
+957,9,XXX new effect for decidium-z--bag,XXX new effect for decidium-z--bag
+958,9,XXX new effect for incinium-z--bag,XXX new effect for incinium-z--bag
+959,9,XXX new effect for primarium-z--bag,XXX new effect for primarium-z--bag
+960,9,XXX new effect for tapunium-z--bag,XXX new effect for tapunium-z--bag
+961,9,XXX new effect for marshadium-z--bag,XXX new effect for marshadium-z--bag
+962,9,XXX new effect for aloraichium-z--bag,XXX new effect for aloraichium-z--bag
+963,9,XXX new effect for snorlium-z--bag,XXX new effect for snorlium-z--bag
+964,9,XXX new effect for eevium-z--bag,XXX new effect for eevium-z--bag
+965,9,XXX new effect for mewnium-z--bag,XXX new effect for mewnium-z--bag
+966,9,XXX new effect for pikashunium-z--bag,XXX new effect for pikashunium-z--bag
+967,9,XXX new effect for solganium-z--held,XXX new effect for solganium-z--held
+968,9,XXX new effect for lunalium-z--held,XXX new effect for lunalium-z--held
+969,9,XXX new effect for ultranecrozium-z--held,XXX new effect for ultranecrozium-z--held
+970,9,XXX new effect for mimikium-z--held,XXX new effect for mimikium-z--held
+971,9,XXX new effect for lycanium-z--held,XXX new effect for lycanium-z--held
+972,9,XXX new effect for kommonium-z--held,XXX new effect for kommonium-z--held
+973,9,XXX new effect for solganium-z--bag,XXX new effect for solganium-z--bag
+974,9,XXX new effect for lunalium-z--bag,XXX new effect for lunalium-z--bag
+975,9,XXX new effect for ultranecrozium-z--bag,XXX new effect for ultranecrozium-z--bag
+976,9,XXX new effect for mimikium-z--bag,XXX new effect for mimikium-z--bag
+977,9,XXX new effect for lycanium-z--bag,XXX new effect for lycanium-z--bag
+978,9,XXX new effect for kommonium-z--bag,XXX new effect for kommonium-z--bag
+979,9,XXX new effect for z-power-ring,XXX new effect for z-power-ring
+980,9,XXX new effect for pink-petal,XXX new effect for pink-petal
+981,9,XXX new effect for orange-petal,XXX new effect for orange-petal
+982,9,XXX new effect for blue-petal,XXX new effect for blue-petal
+983,9,XXX new effect for red-petal,XXX new effect for red-petal
+984,9,XXX new effect for green-petal,XXX new effect for green-petal
+985,9,XXX new effect for yellow-petal,XXX new effect for yellow-petal
+986,9,XXX new effect for purple-petal,XXX new effect for purple-petal
+987,9,XXX new effect for rainbow-flower,XXX new effect for rainbow-flower
+988,9,XXX new effect for surge-badge,XXX new effect for surge-badge
+989,9,XXX new effect for n-solarizer--merge,XXX new effect for n-solarizer--merge
+990,9,XXX new effect for n-lunarizer--merge,XXX new effect for n-lunarizer--merge
+991,9,XXX new effect for n-solarizer--split,XXX new effect for n-solarizer--split
+992,9,XXX new effect for n-lunarizer--split,XXX new effect for n-lunarizer--split
+993,9,XXX new effect for ilimas-normalium-z,XXX new effect for ilimas-normalium-z
+994,9,XXX new effect for left-poke-ball,XXX new effect for left-poke-ball
+995,9,XXX new effect for roto-hatch,XXX new effect for roto-hatch
+996,9,XXX new effect for roto-bargain,XXX new effect for roto-bargain
+997,9,XXX new effect for roto-prize-money,XXX new effect for roto-prize-money
+998,9,XXX new effect for roto-exp-points,XXX new effect for roto-exp-points
+999,9,XXX new effect for roto-friendship,XXX new effect for roto-friendship
+1000,9,XXX new effect for roto-encounter,XXX new effect for roto-encounter
+1001,9,XXX new effect for roto-stealth,XXX new effect for roto-stealth
+1002,9,XXX new effect for roto-hp-restore,XXX new effect for roto-hp-restore
+1003,9,XXX new effect for roto-pp-restore,XXX new effect for roto-pp-restore
+1004,9,XXX new effect for roto-boost,XXX new effect for roto-boost
+1005,9,XXX new effect for roto-catch,XXX new effect for roto-catch

pokedex/data/csv/language_names.csv

@@ -1,41 +1,60 @@
 language_id,local_language_id,name
 1,1,日本語
+1,3,일본어
 1,5,Japonais
 1,6,Japanisch
+1,7,Japonés
 1,9,Japanese
 2,1,正式ローマジ
+2,3,정식 로마자
 2,5,Romaji
 2,6,Rōmaji
 2,9,Official roomaji
 3,1,韓国語
+3,3,한국어
 3,5,Coréen
 3,6,Koreanisch
+3,7,Coreano
 3,9,Korean
 4,1,中国語
+4,3,중국어
 4,5,Chinois
 4,6,Chinesisch
+4,7,Chino
 4,9,Chinese
 5,1,フランス語
+5,3,프랑스어
 5,5,Français
 5,6,Französisch
+5,7,Francés
 5,9,French
 6,1,ドイツ語
+6,3,도이치어
 6,5,Allemand
 6,6,Deutsch
+6,7,Alemán
 6,9,German
 7,1,西語
+7,3,스페인어
 7,5,Espagnol
 7,6,Spanisch
+7,7,Español
 7,9,Spanish
 8,1,伊語
+8,3,이탈리아어
 8,5,Italien
 8,6,Italienisch
+8,7,Italiano
 8,9,Italian
 9,1,英語
+9,3,영어
 9,5,Anglais
 9,6,Englisch
+9,7,Inglés
 9,9,English
 10,1,チェコ語
+10,3,체코어
 10,5,Tchèque
 10,6,Tschechisch
+10,7,Checo
 10,9,Czech

pokedex/data/csv/languages.csv

@@ -1,12 +1,14 @@
 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
+13,pt-BR,br,pt-BR,0,13

pokedex/data/csv/location_area_prose.csv

@@ -9,18 +9,18 @@ location_area_id,local_language_id,name
 8,9,
 9,9,
 10,9,
-11,9,Route 207
+11,9,1F Route 207
 12,9,2F
 13,9,3F
-14,9,snowfall
-15,9,blizzard
+14,9,exterior snowfall
+15,9,exterior blizzard
 16,9,4F
-17,9,5F
-18,9,6F
-19,9,7F
-20,9,cave
-21,9,Route 216
-22,9,Route 211
+17,9,4F small room
+18,9,5F
+19,9,6F
+20,9,1F from exterior
+21,9,1F Route 216
+22,9,1F Route 211
 23,9,B1F
 24,9,Area 1
 25,9,Area 2
@@ -618,3 +618,35 @@ location_area_id,local_language_id,name
 756,9,Unknown Area 345
 757,9,Unknown Area 347
 758,9,Unknown Area 348
+761,9,Pokemon Center
+762,9,Fighting Dojo
+763,9,Celadon Mansion rooftop
+764,9,Silph Co. 7F
+765,9,North Gate
+766,9,Bill's house
+767,9,Mania's house
+768,9,Weather Institute
+769,9,Steven's house
+770,9,
+771,9,
+772,9,
+773,9,Kirk's house
+774,9,
+775,9,Game Freak HQ 1F
+776,9,Weather Institute
+777,9,
+778,9,
+779,9,
+780,9,
+781,9,Contest Hall
+782,9,Contest Hall
+783,9,Contest Hall
+784,9,Contest Hall
+785,9,
+786,9,
+787,9,
+788,9,West Gate
+789,9,West Gate
+790,9,Poke Mart
+791,9,Pokemon Center
+792,9,West Gate

pokedex/data/csv/location_areas.csv

@@ -9,18 +9,18 @@ id,location_id,game_index,identifier
 8,7,8,
 9,8,9,
 10,9,10,
-11,10,11,route-207
+11,10,11,1f-route-207
 12,10,12,2f
 13,10,13,3f
-14,10,14,snowfall
-15,10,15,blizzard
+14,10,14,exterior-snowfall
+15,10,15,exterior-blizzard
 16,10,16,4f
-17,10,17,5f
-18,10,18,6f
-19,10,19,7f
-20,10,20,cave
-21,10,21,route-216
-22,10,22,route-211
+17,10,17,4f-small-room
+18,10,18,5f
+19,10,19,6f
+20,10,20,1f-from-exterior
+21,10,21,1f-route-216
+22,10,22,1f-route-211
 23,10,23,b1f
 24,11,24,area-1
 25,11,25,area-2
@@ -650,3 +650,35 @@ id,location_id,game_index,identifier
 758,676,0,unknown-area-348
 759,677,0,
 760,661,0,
+761,120,0,pokemon-center
+762,234,0,fighting-dojo
+763,67,0,celadon-mansion
+764,234,0,silph-co-7f
+765,229,0,north-gate
+766,229,0,bills-house
+767,70,0,manias-house
+768,467,0,weather-institute
+769,432,0,stevens-house
+770,567,0,
+771,169,0,
+772,170,0,
+773,70,0,kirks-house
+774,346,0,
+775,350,0,game-freak-hq-1f
+776,361,0,weather-institute
+777,536,0,
+778,590,0,
+779,599,0,
+780,625,0,
+781,430,0,contest-hall
+782,571,0,contest-hall
+783,570,0,contest-hall
+784,431,0,contest-hall
+785,578,0,
+786,695,0,
+787,569,0,
+788,2,0,west-gate
+789,169,0,west-gate
+790,153,0,poke-mart
+791,153,0,pokemon-center
+792,349,0,west-gate

pokedex/data/csv/location_game_indices.csv

@@ -246,10 +246,12 @@ location_id,generation_id,game_index
 263,4,2011
 264,4,2012
 264,6,2
+264,7,2
 265,4,3000
 266,4,3001
 267,4,3002
 267,6,4
+267,7,4
 268,4,3003
 269,4,3004
 270,4,3005
@@ -441,6 +443,62 @@ location_id,generation_id,game_index
 426,5,114
 427,5,115
 428,5,116
+429,6,184
+430,6,186
+431,6,194
+432,6,196
+433,6,198
+434,6,200
+435,6,272
+436,6,274
+437,6,280
+438,6,282
+439,6,286
+440,6,288
+441,6,290
+442,6,294
+443,6,296
+444,6,298
+445,6,300
+446,6,302
+448,6,316
+449,6,204
+450,6,206
+451,6,208
+452,6,210
+453,6,212
+454,6,214
+455,6,216
+456,6,218
+457,6,220
+458,6,222
+459,6,224
+460,6,226
+461,6,228
+462,6,230
+463,6,232
+464,6,234
+465,6,236
+466,6,238
+467,6,240
+468,6,242
+469,6,244
+470,6,246
+471,6,248
+472,6,250
+473,6,252
+474,6,254
+475,6,256
+476,6,258
+477,6,260
+478,6,262
+479,6,264
+480,6,266
+481,6,268
+482,6,270
+483,6,324
+484,6,174
+485,6,182
 531,5,117
 532,5,118
 533,5,119
@@ -477,6 +535,24 @@ location_id,generation_id,game_index
 564,5,151
 565,5,152
 566,5,153
+567,6,170
+568,6,172
+569,6,176
+570,6,178
+571,6,180
+572,6,188
+573,6,190
+574,6,192
+576,6,284
+577,6,330
+578,6,320
+579,6,310
+580,6,312
+581,6,306
+582,6,278
+583,6,308
+584,6,276
+585,6,354
 587,6,6
 588,6,8
 589,6,9
@@ -581,3 +657,112 @@ location_id,generation_id,game_index
 688,6,164
 689,6,166
 690,6,168
+691,6,202
+692,6,292
+693,6,304
+694,6,314
+695,6,318
+696,6,322
+697,6,326
+698,6,328
+699,6,332
+700,6,334
+701,6,336
+702,6,338
+703,6,340
+704,6,342
+705,6,344
+706,6,346
+707,6,348
+708,6,350
+709,6,352
+710,7,6
+711,7,8
+712,7,10
+713,7,12
+714,7,14
+715,7,16
+716,7,18
+717,7,20
+718,7,22
+719,7,24
+720,7,26
+721,7,28
+722,7,30
+723,7,34
+724,7,36
+725,7,38
+726,7,40
+727,7,42
+728,7,44
+729,7,46
+730,7,48
+731,7,50
+732,7,52
+733,7,54
+734,7,56
+735,7,58
+736,7,60
+737,7,62
+737,7,102
+738,7,64
+739,7,66
+740,7,68
+741,7,70
+742,7,72
+743,7,74
+744,7,76
+745,7,78
+746,7,82
+747,7,84
+748,7,86
+749,7,88
+750,7,90
+751,7,92
+752,7,94
+753,7,100
+754,7,104
+755,7,106
+756,7,108
+757,7,110
+758,7,112
+759,7,114
+760,7,116
+761,7,118
+762,7,120
+763,7,122
+764,7,124
+765,7,126
+766,7,128
+767,7,130
+768,7,132
+769,7,134
+770,7,136
+771,7,138
+772,7,140
+773,7,142
+774,7,144
+775,7,146
+776,7,148
+777,7,150
+778,7,152
+779,7,154
+780,7,156
+781,7,158
+782,7,160
+783,7,162
+784,7,164
+785,7,166
+786,7,168
+787,7,170
+788,7,172
+789,7,174
+790,7,176
+791,7,178
+792,7,180
+793,7,182
+794,7,184
+795,7,186
+796,7,188
+797,7,190
+798,7,192

pokedex/data/csv/locations.csv

@@ -519,11 +519,11 @@ id,region_id,identifier
 535,5,join-avenue
 536,5,floccesy-town
 537,5,lentimas-town
-538,5,route-19
-539,5,route-20
-540,5,route-21
-541,5,route-22
-542,5,route-23
+538,5,unova-route-19
+539,5,unova-route-20
+540,5,unova-route-21
+541,5,unova-route-22
+542,5,unova-route-23
 543,5,castelia-sewers
 544,5,floccesy-ranch
 545,5,virbank-complex
@@ -638,8 +638,8 @@ id,region_id,identifier
 654,6,dernière-way
 655,6,kalos-route-22
 656,6,detourner-way
-657,6,victory-road
-658,6,pokemon-league
+657,6,kalos-victory-road
+658,6,kalos-pokemon-league
 659,6,kiloude-city
 660,6,battle-maison
 661,6,azure-bay
@@ -672,3 +672,111 @@ id,region_id,identifier
 688,6,kiloude-station
 689,6,ambrette-aquarium
 690,6,unknown-dungeon
+691,3,hoenn-pokemon-league
+692,3,team-aqua-hideout
+693,3,sea-mauville
+694,3,team-magma-hideout
+695,3,battle-resort
+696,3,ss-tidal
+697,3,mirage-forest
+698,3,mirage-cave
+699,3,mirage-mountain
+700,3,trackless-forest
+701,3,pathless-plain
+702,3,nameless-cavern
+703,3,fabled-cave
+704,3,gnarled-den
+705,3,crescent-isle
+706,3,secret-islet
+707,3,soaring-in-the-sky
+708,3,secret-shore
+709,3,secret-meadow
+710,7,alola-route-1--hauoli-outskirts
+711,7,alola-route-1
+712,7,alola-route-3
+713,7,alola-route-2
+714,7,kalae-bay
+715,7,melemele-sea
+716,7,hauoli-city--beachfront
+717,7,hauoli-city--shopping-district
+718,7,hauoli-city--marina
+719,7,iki-town
+720,7,mahalo-trail
+721,7,mahalo-trail--plank-bridge
+722,7,ruins-of-conflict
+723,7,ten-carat-hill
+724,7,ten-carat-hill--farthest-hollow
+725,7,hauoli-cemetery
+726,7,melemele-meadow
+727,7,seaward-cave
+728,7,berry-fields
+729,7,verdant-cavern--trial-site
+730,7,verdant-cavern--totems-den
+731,7,alola-route-4
+732,7,alola-route-5
+733,7,alola-route-6
+734,7,alola-route-7
+735,7,alola-route-8
+736,7,alola-route-9
+737,7,hano-grand-resort
+738,7,hano-beach
+739,7,akala-meadow
+740,7,paniola-town
+741,7,heahea-city
+742,7,konikoni-city
+743,7,royal-avenue
+744,7,memorial-hill
+745,7,paniola-ranch
+746,7,wela-volcano-park
+747,7,wela-volcano-park--totems-den
+748,7,brooklet-hill
+749,7,brooklet-hill--totems-den
+750,7,lush-jungle
+751,7,ruins-of-life
+752,7,akala-outskirts
+753,7,digletts-tunnel
+754,7,battle-royal-dome
+755,7,alola-route-10
+756,7,alola-route-11
+757,7,secluded-shore
+758,7,alola-route-13
+759,7,tapu-village
+760,7,alola-route-15
+761,7,alola-route-16
+762,7,alola-route-17
+763,7,alola-route-12
+764,7,haina-desert
+765,7,alola-route-14
+766,7,ulaula-meadow
+767,7,po-town
+768,7,malie-city
+769,7,malie-garden
+770,7,mount-hokulani
+771,7,blush-mountain
+772,7,ruins-of-abundance
+773,7,lake-of-the-sunne
+774,7,lake-of-the-moone
+775,7,mount-lanakila
+776,7,shady-house
+777,7,thrifty-megamart--abandoned-site
+778,7,hokulani-observatory
+779,7,alola-pokemon-league
+780,7,poni-meadow
+781,7,poni-wilds
+782,7,ancient-poni-path
+783,7,poni-breaker-coast
+784,7,poni-grove
+785,7,poni-plains
+786,7,poni-coast
+787,7,poni-gauntlet
+788,7,seafolk-village
+789,7,vast-poni-canyon
+790,7,altar-of-the-sunne
+791,7,altar-of-the-moone
+792,7,ruins-of-hope
+793,7,resolution-cave
+794,7,exeggutor-island
+795,7,battle-tree
+796,7,aether-paradise
+797,7,ultra-space
+798,7,malie-city--outer-cape

pokedex/data/csv/move_changelog.csv

@@ -14,6 +14,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 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,
@@ -32,13 +33,21 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 66,15,,,25,,,,,
 67,5,,50,,90,,,32,30
 71,8,,,20,,,,,
+71,19,,20,25,,,,,
+71,20,,40,15,,,,,
 72,8,,,10,,,,,
+72,19,,40,15,,,,,
+72,20,,75,10,,,,,
 74,11,,,,,,,14,
 74,15,,,40,,,,,
+76,19,,120,,,,,,
+76,20,,200,,,,,,
 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,,,,
@@ -48,6 +57,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 94,3,,,,,,,,30
 95,8,,,,60,,,,
 95,9,,,,70,,,,
+100,19,,,,,0,,,
 105,8,,,20,,,,,
 107,15,,,20,,,,,
 112,15,,,30,,,,,
@@ -64,7 +74,10 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 137,15,,,,90,,,,
 139,11,,,,55,,,,
 139,15,,,,80,,,,
+141,17,,20,15,,,,,
 143,3,,,,,,,,10
+143,19,,140,,,,,,
+143,20,,200,,,,,,
 145,15,,20,,,,,,
 146,3,,,,,,,1,0
 148,8,,,,70,,,,
@@ -92,9 +105,11 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 202,8,,,5,,,,,
 202,11,,60,,,,,,
 204,15,1,,,,,,,
+207,17,,,,90,,,,
 210,11,,10,,,,,,
 210,15,,20,,,,,,
 215,15,,,,,,4,,
+229,20,,20,,,,,,
 236,15,1,,,,,,,
 237,15,,1,,,,,,
 248,11,,80,15,90,,,,
@@ -123,6 +138,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 330,15,,95,,,,,,
 331,11,,10,,,,,,
 333,11,,10,,,,,,
+336,20,,,,,,7,,
 343,11,,40,,,,,,
 343,15,,,40,,,,,
 348,8,,70,,,,,,
@@ -136,6 +152,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 382,11,,0,,,,,,
 386,11,,60,,,,,,
 387,11,,130,,,,,,
+389,17,,80,,,,,,
 396,15,,90,,,,,,
 403,15,,,20,,,,,
 406,15,,90,,,,,,
@@ -148,6 +165,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 448,15,,60,,,,,,
 463,11,,,,70,,,,
 463,15,,120,,,,,,
+464,17,,,,80,,,,
 472,15,,,,,-7,,,
 476,15,,,,,3,,,
 478,15,,,,,-7,,,
@@ -164,3 +182,17 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 533,15,,,20,,,,,
 542,15,,120,,,,,,
 546,15,,85,,,,,,
+560,17,,80,,,,,,
+565,17,,30,,,,,,
+570,17,,50,,,,,,
+595,17,,65,,,,,,
+718,20,,90,,,,,,
+729,20,,50,15,,,,,
+733,20,,90,15,,,,,
+734,20,,90,15,,,,,
+735,20,,90,15,,,,,
+736,20,,90,,100,,,,
+737,20,,90,,100,,,,
+738,20,,90,15,100,,,,
+739,20,,90,15,100,,,,
+740,20,,90,15,100,,,,

pokedex/data/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,6,physisch,"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"

pokedex/data/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,151 @@ 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}."
+416,9,XXX new effect for light-that-burns-the-sky,XXX new effect for light-that-burns-the-sky
+417,9,XXX new effect for lets-snuggle-forever,XXX new effect for lets-snuggle-forever
+418,9,XXX new effect for splintered-stormshards,XXX new effect for splintered-stormshards
+419,9,XXX new effect for clangorous-soulblaze,XXX new effect for clangorous-soulblaze
+420,9,XXX new effect for mind-blown,XXX new effect for mind-blown
+421,9,XXX new effect for dynamax-cannon,XXX new effect for dynamax-cannon
+422,9,XXX new effect for snipe-shot,XXX new effect for snipe-shot
+423,9,XXX new effect for jaw-lock,XXX new effect for jaw-lock
+424,9,XXX new effect for stuff-cheeks,XXX new effect for stuff-cheeks
+425,9,XXX new effect for no-retreat,XXX new effect for no-retreat
+426,9,XXX new effect for tar-shot,XXX new effect for tar-shot
+427,9,XXX new effect for magic-powder,XXX new effect for magic-powder
+428,9,XXX new effect for dragon-darts,XXX new effect for dragon-darts
+429,9,XXX new effect for teatime,XXX new effect for teatime
+430,9,XXX new effect for octolock,XXX new effect for octolock
+431,9,XXX new effect for bolt-beak,XXX new effect for bolt-beak
+432,9,XXX new effect for court-change,XXX new effect for court-change
+433,9,XXX new effect for clangorous-soul,XXX new effect for clangorous-soul
+434,9,XXX new effect for body-press,XXX new effect for body-press
+435,9,XXX new effect for decorate,XXX new effect for decorate
+436,9,XXX new effect for behemoth-blade,XXX new effect for behemoth-blade
+437,9,XXX new effect for aura-wheel,XXX new effect for aura-wheel
+439,9,XXX new effect for overdrive,XXX new effect for overdrive
+440,9,XXX new effect for apple-acid,XXX new effect for apple-acid
+441,9,XXX new effect for life-dew,XXX new effect for life-dew
+442,9,XXX new effect for obstruct,XXX new effect for obstruct
 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."

pokedex/data/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,80 @@ 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
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+439
+440
+441
+442
 10001
 10002
 10003
 10004
 10005
 10006
-10007

pokedex/data/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
@@ -164,6 +165,7 @@ move_id,move_flag_id
 50,5
 50,7
 50,14
+50,19
 51,4
 51,7
 52,4
@@ -244,6 +246,7 @@ move_id,move_flag_id
 80,1
 80,4
 80,7
+80,21
 81,4
 81,5
 81,7
@@ -420,6 +423,7 @@ move_id,move_flag_id
 158,1
 158,4
 158,7
+158,16
 159,6
 160,6
 161,4
@@ -503,6 +507,7 @@ move_id,move_flag_id
 191,20
 192,4
 192,7
+192,18
 193,4
 193,5
 193,7
@@ -638,7 +643,6 @@ move_id,move_flag_id
 249,7
 250,4
 250,7
-250,19
 251,4
 251,7
 252,1
@@ -735,11 +739,14 @@ move_id,move_flag_id
 295,7
 296,4
 296,7
+296,18
 297,4
 297,5
 297,7
+297,21
 298,4
 298,7
+298,21
 299,1
 299,4
 299,7
@@ -845,6 +852,7 @@ move_id,move_flag_id
 335,5
 335,7
 336,6
+336,9
 337,1
 337,4
 337,7
@@ -878,8 +886,10 @@ move_id,move_flag_id
 348,4
 348,7
 349,6
+349,21
 350,4
 350,7
+350,18
 351,4
 351,7
 352,4
@@ -945,6 +955,7 @@ move_id,move_flag_id
 377,4
 377,5
 377,7
+377,19
 378,1
 378,4
 378,7
@@ -1117,6 +1128,7 @@ move_id,move_flag_id
 439,3
 439,4
 439,7
+439,18
 440,1
 440,4
 440,7
@@ -1174,6 +1186,7 @@ move_id,move_flag_id
 460,7
 461,6
 461,13
+461,21
 462,1
 462,4
 462,7
@@ -1216,6 +1229,7 @@ move_id,move_flag_id
 482,4
 482,7
 483,6
+483,21
 484,1
 484,4
 484,7
@@ -1377,6 +1391,7 @@ move_id,move_flag_id
 544,7
 545,4
 545,7
+545,18
 546,4
 546,7
 547,4
@@ -1394,6 +1409,7 @@ move_id,move_flag_id
 551,7
 552,4
 552,7
+552,21
 553,2
 553,4
 553,7
@@ -1554,6 +1570,370 @@ move_id,move_flag_id
 616,20
 617,4
 617,7
+618,4
+618,7
+618,17
+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
+676,18
+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
+690,18
+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
+706,16
+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
+720,4
+720,7
+721,1
+721,4
+721,7
+721,8
+722,4
+722,7
+724,1
+726,1
+728,9
+728,14
+729,1
+729,4
+729,7
+730,4
+730,7
+731,1
+731,4
+731,7
+731,10
+732,4
+732,7
+733,4
+733,7
+733,13
+734,4
+734,7
+735,1
+735,4
+735,7
+735,11
+736,4
+736,7
+737,4
+737,7
+738,4
+738,5
+738,7
+739,4
+739,7
+740,4
+740,7
+741,1
+741,4
+741,7
+742,1
+742,4
+742,7
+742,8
+744,4
+745,4
+745,7
+746,1
+746,4
+746,7
+746,16
+747,6
+748,6
+749,4
+749,5
+749,7
+750,4
+750,5
+750,7
+750,15
+751,4
+751,7
+752,14
+753,4
+753,7
+754,1
+754,4
+754,7
+755,1
+755,4
+755,7
+755,16
+756,7
+775,6
+775,9
+775,21
+776,1
+776,4
+776,7
+778,4
+778,7
+779,1
+779,4
+779,7
+780,4
+780,7
+780,11
+780,18
+781,1
+781,4
+781,7
+782,1
+782,4
+782,7
+783,4
+783,7
+784,1
+784,4
+784,7
+785,1
+785,4
+785,7
+786,4
+786,7
+786,9
+786,14
+787,4
+787,7
+788,4
+788,7
+789,1
+789,4
+789,7
+790,4
+790,7
+791,6
+791,13
+791,14
+793,1
+793,4
+793,7
+794,3
+794,4
+794,7
+795,3
+795,4
+795,7
+796,4
+796,7
+797,4
+797,7
+798,1
+798,4
+798,7
+799,4
+799,7
+800,2
+800,4
+800,7
+801,4
+801,7
+802,4
+802,7
+803,1
+803,4
+803,7
+804,4
+804,7
+805,4
+805,7
+805,17
+806,1
+806,4
+806,7
+807,4
+807,7
+808,1
+808,4
+808,7
+809,4
+809,7
+810,4
+810,5
+810,7
+811,14
+812,1
+812,4
+812,7
+813,1
+813,4
+813,7
+814,1
+814,4
+814,7
+815,4
+815,7
+815,11
+816,13
+816,14
+817,1
+817,4
+817,7
+817,8
+818,1
+818,4
+818,7
+818,8
+819,4
+819,7
+820,4
+820,7
+821,4
+821,7
+822,4
+822,7
+823,1
+823,4
+823,7
+824,4
+824,7
+825,4
+825,7
+826,4
+826,7
+826,9
+826,14
 10001,1
 10001,4
 10002,4

pokedex/data/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}.

pokedex/data/csv/move_flags.csv

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

pokedex/data/csv/move_meta.csv

@@ -227,7 +227,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 226,13,0,,,,,0,0,0,0,0,0
 227,13,0,,,,,0,0,0,0,0,0
 228,0,0,,,,,0,0,0,0,0,0
-229,0,0,,,,,0,0,0,0,0,0
+229,7,0,,,,,0,0,0,0,0,100
 230,2,0,,,,,0,0,0,0,0,0
 231,6,0,,,,,0,0,0,0,0,30
 232,7,0,,,,,0,0,0,0,0,10
@@ -391,7 +391,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 390,11,0,,,,,0,0,0,0,0,0
 391,13,0,,,,,0,0,0,0,0,0
 392,13,0,,,,,0,0,0,0,0,0
-393,13,0,,,5,5,0,0,0,0,0,0
+393,13,0,,,,,0,0,0,0,0,0
 394,4,4,,,,,-33,0,0,10,0,0
 395,4,1,,,,,0,0,0,30,0,0
 396,0,0,,,,,0,0,0,0,0,0
@@ -616,3 +616,212 @@ 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,100
+621,7,0,,,,,0,0,0,0,0,100
+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,100
+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,100
+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,100
+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,100
+680,6,0,,,,,0,0,0,0,0,100
+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,100
+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,100
+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,100
+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,100
+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,20
+709,0,0,,,,,0,0,0,0,0,0
+710,6,0,,,,,0,0,0,0,0,20
+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,100
+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
+720,0,0,,,,,0,0,0,0,0,0
+721,0,0,,,,,0,0,0,0,0,0
+722,0,0,,,,,0,0,0,0,0,0
+723,0,0,,,,,0,0,0,0,0,0
+724,0,0,,,,,0,0,0,0,0,0
+725,0,0,,,,,0,0,0,0,0,0
+726,0,0,,,,,0,0,0,0,0,0
+727,0,0,,,,,0,0,0,0,0,0
+728,7,0,,,,,0,0,0,0,0,100
+729,7,0,,,,,0,0,0,0,0,100
+730,4,1,,,,,0,0,0,30,0,0
+731,0,0,,,,,0,0,0,0,30,0
+732,0,0,,,,,0,0,0,0,0,0
+733,8,0,,,,,100,0,0,0,0,0
+734,4,1,,,,,0,0,0,100,0,0
+735,4,4,,,,,0,0,0,100,0,0
+736,0,0,,,,,0,0,0,0,0,0
+737,0,0,,,,,0,0,0,0,0,0
+738,4,18,,,,,0,0,0,100,0,0
+739,0,0,,,,,0,0,0,0,0,0
+740,0,0,,,,,0,0,0,0,0,0
+741,0,0,,,,,0,0,0,0,0,0
+742,0,0,2,2,,,0,0,0,0,30,0
+743,13,0,,,,,0,0,0,0,0,0
+744,0,0,,,,,0,0,0,0,0,0
+745,0,0,,,,,0,0,1,0,0,0
+746,0,0,,,,,0,0,0,0,0,0
+747,2,0,,,,,0,0,0,0,0,100
+748,2,0,,,,,0,0,0,0,0,100
+749,5,42,,,,,0,0,0,100,0,100
+750,13,0,,,,,0,0,0,0,0,0
+751,0,0,2,2,,,0,0,0,0,0,0
+752,13,0,,,,,0,0,0,0,0,0
+753,13,0,,,,,0,0,0,0,0,0
+754,0,0,,,,,0,0,0,0,0,0
+755,0,0,,,,,0,0,0,0,0,0
+756,13,0,,,,,0,0,0,0,0,0
+757,0,0,,,,,0,0,0,0,0,0
+758,0,0,,,,,0,0,0,0,0,0
+759,0,0,,,,,0,0,0,0,0,0
+760,0,0,,,,,0,0,0,0,0,0
+761,0,0,,,,,0,0,0,0,0,0
+762,0,0,,,,,0,0,0,0,0,0
+763,0,0,,,,,0,0,0,0,0,0
+764,0,0,,,,,0,0,0,0,0,0
+765,0,0,,,,,0,0,0,0,0,0
+766,0,0,,,,,0,0,0,0,0,0
+767,0,0,,,,,0,0,0,0,0,0
+768,0,0,,,,,0,0,0,0,0,0
+769,0,0,,,,,0,0,0,0,0,0
+770,0,0,,,,,0,0,0,0,0,0
+771,0,0,,,,,0,0,0,0,0,0
+772,0,0,,,,,0,0,0,0,0,0
+773,0,0,,,,,0,0,0,0,0,0
+774,0,0,,,,,0,0,0,0,0,0
+775,2,0,,,,,0,-33,0,0,0,100
+776,0,0,,,,,0,0,0,0,0,0
+777,2,0,,,,,0,0,0,0,0,100
+778,6,0,,,,,0,0,0,0,0,100
+779,4,8,,,5,6,0,0,0,100,0,0
+780,4,4,,,,,0,0,0,10,0,0
+781,0,0,,,,,0,0,0,0,0,0
+782,0,0,,,,,0,0,0,0,0,0
+783,7,0,,,,,0,0,0,0,0,100
+784,6,0,,,,,0,0,0,0,0,100
+785,0,0,,,,,0,0,0,0,0,0
+786,0,0,,,,,0,0,0,0,0,0
+787,6,0,,,,,0,0,0,0,0,100
+788,6,0,,,,,0,0,0,0,0,100
+789,6,0,,,,,0,0,0,0,0,100
+790,4,6,,,2,5,0,0,0,20,0,0
+791,3,0,,,,,0,25,0,0,0,0
+792,13,0,,,,,0,0,0,0,0,0
+793,0,0,,,,,0,0,0,0,0,0
+794,0,0,,,,,0,0,0,0,0,0
+795,0,0,,,,,0,0,0,0,0,0
+796,0,0,,,,,0,0,0,0,0,0
+797,0,0,,,,,0,0,0,0,0,0
+798,0,0,,,,,0,0,0,0,0,0
+799,0,0,2,5,,,0,0,0,0,0,0
+800,0,0,,,,,0,0,0,100,0,0
+801,4,5,,,,,0,0,0,20,0,0
+802,0,0,,,,,0,0,0,0,0,0
+803,0,0,,,,,0,0,0,0,0,0
+804,0,0,,,,,0,0,0,0,0,0
+805,0,0,,,,,0,0,0,0,0,0
+806,6,0,,,,,0,0,0,0,0,100
+807,4,4,,,,,0,0,0,100,0,0
+808,0,0,,,,,0,0,0,0,0,0
+809,0,0,,,,,0,0,0,0,0,0
+810,13,0,,,,,0,0,0,0,0,0
+811,2,0,,,,,0,0,0,0,0,100
+812,0,0,,,,,0,0,0,0,0,0
+813,0,0,3,3,,,0,0,0,0,0,0
+814,0,0,2,2,,,0,0,0,0,0,0
+815,4,4,,,,,0,0,0,30,0,0
+816,13,0,,,,,0,25,0,0,0,0
+817,0,0,,,,,0,0,6,0,0,0
+818,0,0,3,3,,,0,0,6,0,0,0
+819,4,8,,,5,6,0,0,0,100,0,0
+820,0,0,,,,,0,0,0,0,0,0
+821,4,3,,,,,0,0,0,10,0,0
+822,0,0,,,,,0,0,0,0,20,0
+823,6,0,,,,,0,0,0,0,0,100
+824,0,0,,,,,0,0,0,0,0,0
+825,0,0,,,,,0,0,0,0,0,0
+826,0,0,,,,,0,0,0,0,0,0

pokedex/data/csv/move_meta_ailment_names.csv

@@ -2,40 +2,61 @@ move_meta_ailment_id,local_language_id,name
 -1,5,????
 -1,9,????
 0,5,Aucun
+0,7,ninguno
 0,9,none
 1,5,Paralysie
+1,7,Parálisis
 1,9,Paralysis
 2,5,Sommeil
+2,7,Dormir
 2,9,Sleep
 3,5,Gel
+3,7,Congelar
 3,9,Freeze
 4,5,Brûlure
+4,7,Quemar
 4,9,Burn
 5,5,Empoisonnement
+5,7,Envenenar
 5,9,Poison
 6,5,Confusion
+6,7,Confundir
 6,9,Confusion
 7,5,Attraction
+7,7,Enamorar
 7,9,Infatuation
 8,5,Piège
+8,7,Atrapado
 8,9,Trap
 9,5,Cauchemar
+9,7,Maldito
 9,9,Nightmare
 12,5,Tourmente
+12,7,Tormento
 12,9,Torment
 13,5,Entrave
+13,7,Anulación
 13,9,Disable
 14,5,Bâillement
+14,7,Bostezo
 14,9,Yawn
 15,5,Anti-Soin
+15,7,Anticura
 15,9,Heal Block
 17,5,Aucune immunité aux types
 17,9,No type immunity
 18,5,Vampigraine
+18,7,Drenadoras
 18,9,Leech Seed
 19,5,Embargo
+19,7,Embargo
 19,9,Embargo
 20,5,Requiem
+20,7,Canto mortal
 20,9,Perish Song
 21,5,Racines
+21,7,Arraigo
 21,9,Ingrain
+24,7,Silenciado
+24,9,Silence
+42,9,Tar shot

pokedex/data/csv/move_meta_ailments.csv

@@ -19,3 +19,5 @@ id,identifier
 19,embargo
 20,perish-song
 21,ingrain
+24,silence
+42,tar-shot

pokedex/data/csv/move_meta_stat_changes.csv

@@ -36,11 +36,11 @@ move_id,stat_id,change
 204,2,-2
 207,2,2
 211,3,1
+229,6,1
 230,8,-2
 231,3,-1
 232,2,1
 242,3,-1
-246,1,1
 246,2,1
 246,3,1
 246,4,1
@@ -61,7 +61,6 @@ move_id,stat_id,change
 313,5,-2
 315,4,-2
 317,6,-1
-318,1,1
 318,2,1
 318,3,1
 318,4,1
@@ -102,7 +101,6 @@ move_id,stat_id,change
 455,3,1
 455,5,1
 465,5,-2
-466,1,1
 466,2,1
 466,3,1
 466,4,1
@@ -148,7 +146,7 @@ move_id,stat_id,change
 585,4,-1
 589,2,-1
 590,4,-1
-591,3,1
+591,3,2
 595,4,-1
 597,5,1
 598,4,-2
@@ -162,3 +160,55 @@ move_id,stat_id,change
 602,5,1
 608,2,-1
 612,2,1
+620,3,-1
+620,5,-1
+621,3,-1
+665,6,-1
+668,2,-1
+672,6,-1
+674,2,1
+674,4,1
+679,2,-1
+680,3,-1
+688,2,-1
+691,3,-1
+702,2,2
+702,3,2
+702,4,2
+702,5,2
+702,6,2
+705,4,-2
+708,3,-1
+710,3,-1
+715,2,-1
+715,4,-1
+728,2,1
+728,3,1
+728,4,1
+728,5,1
+728,6,1
+729,8,1
+747,3,2
+748,2,1
+748,3,1
+748,4,1
+748,5,1
+748,6,1
+749,6,-1
+775,2,1
+775,3,1
+775,4,1
+775,5,1
+775,6,1
+777,2,2
+777,4,2
+778,6,-1
+783,6,1
+784,2,-1
+787,5,-1
+788,3,-1
+789,4,-1
+806,4,-1
+811,2,1
+811,3,1
+823,3,-1

pokedex/data/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
@@ -98,7 +98,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 97,agility,1,14,,30,,0,7,1,53,,1,30,1
 98,quick-attack,1,1,40,30,100,1,10,2,104,,1,30,1
 99,rage,1,1,20,20,100,0,10,2,82,,1,17,11
-100,teleport,1,14,,20,,0,7,1,154,,1,15,1
+100,teleport,1,14,,20,,-6,7,1,154,,1,15,1
 101,night-shade,1,8,,15,100,0,10,3,88,,4,23,5
 102,mimic,1,1,,10,,0,10,1,83,,3,19,12
 103,screech,1,1,,40,85,0,10,1,60,,4,5,10
@@ -106,7 +106,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 105,recover,1,1,,10,,0,7,1,33,,4,23,8
 106,harden,1,1,,30,,0,7,1,12,,5,16,13
 107,minimize,1,1,,10,,0,7,1,109,,3,16,13
-108,smokescreen,1,1,,20,100,0,10,1,24,,4,21,10
+108,smokescreen,1,1,,20,100,0,10,1,24,,4,22,10
 109,confuse-ray,1,8,,10,100,0,10,1,50,,4,21,10
 110,withdraw,1,11,,40,,0,7,1,12,,3,15,13
 111,defense-curl,1,1,,40,,0,7,1,157,,3,16,13
@@ -139,14 +139,14 @@ 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
 145,bubble,1,11,40,30,100,0,11,3,71,10,3,8,2
 146,dizzy-punch,1,1,70,10,100,0,10,2,77,20,1,4,16
 147,spore,1,12,,15,100,0,10,1,2,,2,5,10
-148,flash,1,1,,20,100,0,10,1,24,,2,21,10
+148,flash,1,1,,20,100,0,10,1,24,,2,22,10
 149,psywave,1,14,,15,100,0,10,3,89,,4,14,5
 150,splash,1,1,,40,,0,7,1,86,,3,28,16
 151,acid-armor,1,4,,20,,0,7,1,52,,5,32,11
@@ -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
@@ -178,7 +178,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 177,aeroblast,2,3,100,5,95,0,10,3,44,,1,2,22
 178,cotton-spore,2,12,,40,100,0,11,1,61,,2,10,1
 179,reversal,2,2,,15,100,0,10,2,100,,1,28,15
-180,spite,2,8,,10,100,0,10,1,101,,5,28,19
+180,spite,2,8,,10,100,0,10,1,101,,5,26,19
 181,powder-snow,2,15,40,25,100,0,11,3,6,10,2,1,5
 182,protect,2,1,,10,,4,7,1,112,,3,15,16
 183,mach-punch,2,2,40,30,100,1,10,2,104,,1,30,1
@@ -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
@@ -227,7 +227,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 226,baton-pass,2,1,,40,,0,7,1,128,,3,18,16
 227,encore,2,1,,5,100,0,10,1,91,,3,18,20
 228,pursuit,2,17,40,20,100,0,10,2,129,,4,14,20
-229,rapid-spin,2,1,20,40,100,0,10,2,130,,1,16,17
+229,rapid-spin,2,1,50,40,100,0,10,2,130,100,1,16,17
 230,sweet-scent,2,1,,20,100,0,11,1,25,,3,5,19
 231,iron-tail,2,9,100,15,75,0,10,2,70,30,1,4,18
 232,metal-claw,2,9,50,35,95,0,10,2,140,10,1,1,18
@@ -245,7 +245,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 244,psych-up,2,1,,10,,0,10,1,144,,4,12,11
 245,extreme-speed,2,1,80,5,100,2,10,2,104,,1,30,1
 246,ancient-power,2,6,60,5,100,0,10,3,141,10,5,32,18
-247,shadow-ball,2,8,80,15,100,0,10,3,73,20,4,21,17
+247,shadow-ball,2,8,80,15,100,0,10,3,73,20,4,22,17
 248,future-sight,2,14,120,10,100,0,10,3,149,,4,24,17
 249,rock-smash,2,2,40,15,100,0,10,2,70,50,5,29,18
 250,whirlpool,2,11,35,15,85,0,10,3,262,100,2,24,21
@@ -334,7 +334,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 333,icicle-spear,3,15,25,30,100,0,10,2,30,,2,23,7
 334,iron-defense,3,9,,15,,0,7,1,52,,5,15,13
 335,block,3,1,,5,,0,10,1,107,,3,18,13
-336,howl,3,1,,40,,0,7,1,11,,1,32,11
+336,howl,3,1,,40,,0,13,1,11,,1,32,11
 337,dragon-claw,3,16,80,15,100,0,10,2,1,,1,23,17
 338,frenzy-plant,3,12,150,5,90,0,10,3,81,,1,6,22
 339,bulk-up,3,2,,20,,0,7,1,209,,2,32,11
@@ -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,273 @@ 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,120,10,100,0,10,2,269,,,,
+719,10-000-000-volt-thunderbolt,7,13,195,1,,0,10,3,1,,,,
+720,mind-blown,7,10,150,5,100,0,9,3,420,,,,
+721,plasma-fists,7,13,100,15,100,0,10,2,1,,,,
+722,photon-geyser,7,14,100,5,100,0,10,3,1,,,,
+723,light-that-burns-the-sky,7,14,200,1,,0,10,3,416,,,,
+724,searing-sunraze-smash,7,9,200,1,,0,10,2,411,,,,
+725,menacing-moonraze-maelstrom,7,8,200,1,,0,10,3,411,,,,
+726,lets-snuggle-forever,7,18,190,1,,0,10,2,417,,,,
+727,splintered-stormshards,7,6,190,1,,0,10,2,418,,,,
+728,clangorous-soulblaze,7,16,185,1,,0,11,3,419,100,,,
+729,zippy-zap,7,13,80,10,100,2,10,2,1,100,,,
+730,splishy-splash,7,11,90,15,100,0,11,3,1,30,,,
+731,floaty-fall,7,3,90,15,95,0,10,2,1,30,,,
+732,pika-papow,7,13,,20,,0,10,3,1,,,,
+733,bouncy-bubble,7,11,60,20,100,0,10,3,1,,,,
+734,buzzy-buzz,7,13,60,20,100,0,10,3,1,100,,,
+735,sizzly-slide,7,10,60,20,100,0,10,2,1,100,,,
+736,glitzy-glow,7,14,80,15,95,0,10,3,1,,,,
+737,baddy-bad,7,17,80,15,95,0,10,3,1,,,,
+738,sappy-seed,7,12,100,10,90,0,10,2,1,100,,,
+739,freezy-frost,7,15,100,10,90,0,10,3,1,,,,
+740,sparkly-swirl,7,18,120,5,85,0,10,3,1,,,,
+741,veevee-volley,7,1,,20,,0,10,2,1,,,,
+742,double-iron-bash,7,9,60,5,100,0,10,2,45,30,,,
+743,max-guard,8,1,,10,,4,7,1,112,,,,
+744,dynamax-cannon,8,16,100,5,100,0,10,3,421,,,,
+745,snipe-shot,8,11,80,15,100,0,10,3,422,,,,
+746,jaw-lock,8,17,80,10,100,0,10,2,423,,,,
+747,stuff-cheeks,8,1,,10,,0,7,1,424,100,,,
+748,no-retreat,8,2,,5,,0,7,1,425,100,,,
+749,tar-shot,8,6,,15,100,0,10,1,426,100,,,
+750,magic-powder,8,14,,20,100,0,10,1,427,,,,
+751,dragon-darts,8,16,50,10,100,0,10,2,428,,,,
+752,teatime,8,1,,10,,0,14,1,429,,,,
+753,octolock,8,2,,15,100,0,10,1,430,,,,
+754,bolt-beak,8,13,85,10,100,0,10,2,431,,,,
+755,fishious-rend,8,11,85,10,100,0,10,2,431,,,,
+756,court-change,8,1,,10,100,0,12,1,432,,,,
+757,max-flare,8,10,100,10,,0,2,2,1,,,,
+758,max-flutterby,8,7,10,10,,0,2,2,1,,,,
+759,max-lightning,8,13,10,10,,0,2,2,1,,,,
+760,max-strike,8,1,10,10,,0,2,2,1,,,,
+761,max-knuckle,8,2,10,10,,0,2,2,1,,,,
+762,max-phantasm,8,8,10,10,,0,2,2,1,,,,
+763,max-hailstorm,8,15,10,10,,0,2,2,1,,,,
+764,max-ooze,8,4,10,10,,0,2,2,1,,,,
+765,max-geyser,8,11,10,10,,0,2,2,1,,,,
+766,max-airstream,8,3,10,10,,0,2,2,1,,,,
+767,max-starfall,8,18,10,10,,0,2,2,1,,,,
+768,max-wyrmwind,8,16,10,10,,0,2,2,1,,,,
+769,max-mindstorm,8,14,10,10,,0,2,2,1,,,,
+770,max-rockfall,8,6,10,10,,0,2,2,1,,,,
+771,max-quake,8,5,10,10,,0,2,2,1,,,,
+772,max-darkness,8,17,10,10,,0,2,2,1,,,,
+773,max-overgrowth,8,12,10,10,,0,2,2,1,,,,
+774,max-steelspike,8,9,10,10,,0,2,2,1,,,,
+775,clangorous-soul,8,16,,5,100,0,7,1,433,100,,,
+776,body-press,8,2,80,10,100,0,10,2,434,,,,
+777,decorate,8,18,,15,,0,10,1,435,100,,,
+778,drum-beating,8,12,80,10,100,0,10,2,71,100,,,
+779,snap-trap,8,12,35,15,100,0,10,2,43,100,,,
+780,pyro-ball,8,10,120,5,90,0,10,2,5,10,,,
+781,behemoth-blade,8,9,100,5,100,0,10,2,436,,,,
+782,behemoth-bash,8,9,100,5,100,0,10,2,436,,,,
+783,aura-wheel,8,13,110,10,100,0,10,2,437,100,,,
+784,breaking-swipe,8,16,60,15,100,0,11,2,396,100,,,
+785,branch-poke,8,12,40,40,100,0,10,2,1,,,,
+786,overdrive,8,13,80,10,100,0,11,3,439,,,,
+787,apple-acid,8,12,80,10,100,0,10,3,440,100,,,
+788,grav-apple,8,12,80,10,100,0,10,2,397,100,,,
+789,spirit-break,8,18,75,15,100,0,10,2,72,100,,,
+790,strange-steam,8,18,90,10,95,0,10,3,77,20,,,
+791,life-dew,8,11,,10,,0,13,1,441,,,,
+792,obstruct,8,17,,10,100,4,7,1,442,,,,
+793,false-surrender,8,17,80,10,,0,10,2,18,,,,
+794,meteor-assault,8,2,150,5,100,0,10,2,81,,,,
+795,eternabeam,8,16,160,5,90,0,10,3,81,,,,
+796,steel-beam,8,9,140,5,95,0,10,3,420,,,,
+797,expanding-force,8,14,80,10,100,0,10,3,1,,,,
+798,steel-roller,8,9,130,5,100,0,10,2,1,,,,
+799,scale-shot,8,16,25,20,90,0,10,2,1,,,,
+800,meteor-beam,8,6,120,10,90,0,10,3,1,100,,,
+801,shell-side-arm,8,4,90,10,100,0,10,3,1,20,,,
+802,misty-explosion,8,18,100,5,100,0,9,3,1,,,,
+803,grassy-glide,8,12,70,20,100,0,10,2,1,,,,
+804,rising-voltage,8,13,70,20,100,0,10,3,1,,,,
+805,terrain-pulse,8,1,50,10,100,0,10,3,1,,,,
+806,skitter-smack,8,7,70,10,90,0,10,2,1,100,,,
+807,burning-jealousy,8,10,70,5,100,0,11,3,1,100,,,
+808,lash-out,8,17,75,5,100,0,10,2,1,,,,
+809,poltergeist,8,8,110,5,90,0,10,2,1,,,,
+810,corrosive-gas,8,4,,40,100,0,9,1,1,,,,
+811,coaching,8,2,,10,,0,13,1,1,100,,,
+812,flip-turn,8,11,60,20,100,0,10,2,1,,,,
+813,triple-axel,8,15,20,10,90,0,10,2,1,,,,
+814,dual-wingbeat,8,3,40,10,90,0,10,2,1,,,,
+815,scorching-sands,8,5,70,10,100,0,10,3,1,30,,,
+816,jungle-healing,8,12,,10,,0,13,1,1,,,,
+817,wicked-blow,8,17,80,5,100,0,10,2,1,,,,
+818,surging-strikes,8,11,25,5,100,0,10,2,1,,,,
+819,thunder-cage,8,13,80,15,90,0,10,3,1,100,,,
+820,dragon-energy,8,16,150,5,100,0,11,3,1,,,,
+821,freezing-glare,8,14,90,10,100,0,10,3,1,10,,,
+822,fiery-wrath,8,17,90,10,100,0,11,3,1,20,,,
+823,thunderous-kick,8,2,90,10,100,0,10,2,1,100,,,
+824,glacial-lance,8,15,130,5,100,0,11,2,1,,,,
+825,astral-barrage,8,8,120,5,100,0,11,3,1,,,,
+826,eerie-spell,8,14,80,5,100,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,,,,

pokedex/data/csv/nature_names.csv

@@ -1,176 +1,251 @@
 nature_id,local_language_id,name
 1,1,がんばりや
 1,3,노력
+1,4,勤奮
 1,5,Hardi
 1,6,Robust
 1,7,Fuerte
 1,8,Ardita
 1,9,Hardy
+1,11,がんばりや
+1,12,勤奋
 2,1,ずぶとい
 2,3,대담
+2,4,大膽
 2,5,Assuré
 2,6,Kühn
-2,7,Osado
+2,7,Osada
 2,8,Sicura
 2,9,Bold
+2,11,ずぶとい
+2,12,大胆
 3,1,ひかえめ
 3,3,조심
+3,4,內斂
 3,5,Modeste
 3,6,Mäßig
-3,7,Modesto
+3,7,Modesta
 3,8,Modesta
 3,9,Modest
+3,11,ひかえめ
+3,12,内敛
 4,1,おだやか
 4,3,차분
+4,4,溫和
 4,5,Calme
 4,6,Still
-4,7,Sereno
+4,7,Serena
 4,8,Calma
 4,9,Calm
+4,11,おだやか
+4,12,温和
 5,1,おくびょう
 5,3,겁쟁이
+5,4,膽小
 5,5,Timide
 5,6,Scheu
-5,7,Miedoso
+5,7,Miedosa
 5,8,Timida
 5,9,Timid
+5,11,おくびょう
+5,12,胆小
 6,1,さみしがり
 6,3,외로움
+6,4,怕寂寞
 6,5,Solo
 6,6,Solo
-6,7,Huraño
+6,7,Huraña
 6,8,Schiva
 6,9,Lonely
+6,11,さみしがり
+6,12,怕寂寞
 7,1,すなお
 7,3,온순
+7,4,坦率
 7,5,Docile
 7,6,Sanft
 7,7,Dócil
 7,8,Docile
 7,9,Docile
+7,11,すなお
+7,12,坦率
 8,1,おっとり
 8,3,의젓
+8,4,慢吞吞
 8,5,Doux
 8,6,Mild
 8,7,Afable
 8,8,Mite
 8,9,Mild
+8,11,おっとり
+8,12,慢吞吞
 9,1,おとなしい
 9,3,얌전
+9,4,溫順
 9,5,Gentil
 9,6,Zart
 9,7,Amable
 9,8,Gentile
 9,9,Gentle
+9,11,おとなしい
+9,12,温顺
 10,1,せっかち
 10,3,성급
+10,4,急躁
 10,5,Pressé
 10,6,Hastig
-10,7,Activo
+10,7,Activa
 10,8,Lesta
 10,9,Hasty
+10,11,せっかち
+10,12,急躁
 11,1,いじっぱり
 11,3,고집
+11,4,固執
 11,5,Rigide
 11,6,Hart
 11,7,Firme
 11,8,Decisa
 11,9,Adamant
+11,11,いじっぱり
+11,12,固执
 12,1,わんぱく
 12,3,장난꾸러기
+12,4,淘氣
 12,5,Malin
 12,6,Pfiffig
-12,7,Agitado
+12,7,Agitada
 12,8,Scaltra
 12,9,Impish
+12,11,わんぱく
+12,12,淘气
 13,1,てれや
 13,3,수줍음
+13,4,害羞
 13,5,Pudique
 13,6,Zaghaft
-13,7,Tímido
+13,7,Tímida
 13,8,Ritrosa
 13,9,Bashful
+13,11,てれや
+13,12,害羞
 14,1,しんちょう
 14,3,신중
+14,4,慎重
 14,5,Prudent
 14,6,Sacht
-14,7,Cauto
+14,7,Cauta
 14,8,Cauta
 14,9,Careful
+14,11,しんちょう
+14,12,慎重
 15,1,うっかりや
 15,3,덜렁
+15,4,馬虎
 15,5,Foufou
 15,6,Hitzig
-15,7,Alocado
+15,7,Alocada
 15,8,Ardente
 15,9,Rash
+15,11,うっかりや
+15,12,马虎
 16,1,ようき
 16,3,명랑
+16,4,爽朗
 16,5,Jovial
 16,6,Froh
 16,7,Alegre
 16,8,Allegra
 16,9,Jolly
+16,11,ようき
+16,12,爽朗
 17,1,やんちゃ
 17,3,개구쟁이
+17,4,頑皮
 17,5,Mauvais
 17,6,Frech
-17,7,Pícaro
+17,7,Pícara
 17,8,Birbona
 17,9,Naughty
+17,11,やんちゃ
+17,12,顽皮
 18,1,のうてんき
 18,3,촐랑
+18,4,樂天
 18,5,Lâche
 18,6,Lasch
-18,7,Flojo
+18,7,Floja
 18,8,Fiacca
 18,9,Lax
+18,11,のうてんき
+18,12,乐天
 19,1,きまぐれ
 19,3,변덕
+19,4,浮躁
 19,5,Bizarre
 19,6,Kauzig
-19,7,Raro
+19,7,Rara
 19,8,Furba
 19,9,Quirky
+19,11,きまぐれ
+19,12,浮躁
 20,1,むじゃき
 20,3,천진난만
+20,4,天真
 20,5,Naïf
 20,6,Naiv
-20,7,Ingenuo
+20,7,Ingenua
 20,8,Ingenua
 20,9,Naive
+20,11,むじゃき
+20,12,天真
 21,1,ゆうかん
 21,3,용감
+21,4,勇敢
 21,5,Brave
 21,6,Mutig
 21,7,Audaz
 21,8,Audace
 21,9,Brave
+21,11,ゆうかん
+21,12,勇敢
 22,1,のんき
 22,3,무사태평
+22,4,悠閒
 22,5,Relax
 22,6,Locker
-22,7,Plácido
+22,7,Plácida
 22,8,Placida
 22,9,Relaxed
+22,11,のんき
+22,12,悠闲
 23,1,れいせい
 23,3,냉정
+23,4,冷靜
 23,5,Discret
 23,6,Ruhig
-23,7,Manso
+23,7,Mansa
 23,8,Quieta
 23,9,Quiet
+23,11,れいせい
+23,12,冷静
 24,1,なまいき
 24,3,건방
+24,4,自大
 24,5,Malpoli
 24,6,Forsch
-24,7,Grosero
+24,7,Grosera
 24,8,Vivace
 24,9,Sassy
+24,11,なまいき
+24,12,自大
 25,1,まじめ
 25,3,성실
+25,4,認真
 25,5,Sérieux
 25,6,Ernst
-25,7,Serio
+25,7,Seria
 25,8,Seria
 25,9,Serious
+25,11,まじめ
+25,12,认真

pokedex/data/csv/pal_park_area_names.csv

@@ -1,11 +1,16 @@
 pal_park_area_id,local_language_id,name
 1,5,Forêt
+1,7,Bosque
 1,9,Forest
 2,5,Plaine
+2,7,Campo
 2,9,Field
 3,5,Montagne
+3,7,Montaña
 3,9,Mountain
 4,5,Étang
+4,7,Estanque
 4,9,Pond
 5,5,Mer
+5,7,Mar
 5,9,Sea

pokedex/data/csv/pokeathlon_stat_names.csv

@@ -1,11 +1,16 @@
 pokeathlon_stat_id,local_language_id,name
 1,5,Vitesse
+1,7,Velocidad
 1,9,Speed
 2,5,Force
+2,7,Fuerza
 2,9,Power
 3,5,Habileté
+3,7,Habilidad
 3,9,Skill
 4,5,Endurance
+4,7,Firmeza
 4,9,Stamina
 5,5,Saut
+5,7,Salto
 5,9,Jump

pokedex/data/csv/pokedex_prose.csv

@@ -1,9 +1,11 @@
 pokedex_id,local_language_id,name,description
 1,5,National,Pokédex National complet
 1,6,National,Komplette Nationale Dex
+1,7,Nacional,Pokédex Nacional completa
 1,9,National,Entire National dex
 2,5,Kanto,Pokédex régional de Kanto dans Rouge/Bleu/Jaune
 2,6,Kanto,Rot/Blau/Gelb Kanto Dex
+2,7,Kanto,Pokédex regional de Rojo/Azul/Amarillo
 2,9,Kanto,Red/Blue/Yellow Kanto dex
 3,5,Johto initial,"Pokédex régional de Johto dans Or/Argent/Cristal, appellé ""Nouveau"" Pokédex dans le jeu"
 3,6,Original Johto,"Gold/Silber/Kristall Johto Dex — Auch der ""Neue"" Pokédex im Spiel genannt"
@@ -41,3 +43,17 @@ pokedex_id,local_language_id,name,description
 15,5,Hoenn amélioré,"Pokédex régional d'Hoenn dans Rubis Oméga/Saphir Alpha, mis à jour pour les nouvelles évolutions"
 15,6,Neue Hoenn,Omega Rubin/Alpha Saphir Hoenn Dex — Dex aus Rubin/Saphir/Smaragd um Neue Entwicklungen erweitert
 15,9,New Hoenn,"Omega Ruby/Alpha Sapphire Hoenn Dex—Ruby/Sapphire/Emerald's, updated to add new evolutions"
+16,9,Original Alola,Sun/Moon Alola dex
+17,9,Original Melemele,Sun/Moon Melemele dex
+18,9,Original Akala,Sun/Moon Akala dex
+19,9,Original Ula'ula,Sun/Moon Ula'ula dex
+20,9,Original Poni,Sun/Moon Poni dex
+21,9,Updated Alola,Ultra Sun/Ultra Moon Alola dex
+22,9,Updated Melemele,Ultra Sun/Ultra Moon Melemele dex
+23,9,Updated Akala,Ultra Sun/Ultra Moon Akala dex
+24,9,Updated Ula'ula,Ultra Sun/Ultra Moon Ula'ula dex
+25,9,Updated Poni,Ultra Sun/Ultra Moon Poni dex
+26,9,Let’s Go Kanto,Let’s Go: Pikachu/Let’s Go: Eevee Kanto dex
+27,9,Galar,
+28,9,Isle of Armor,
+29,9,Crown Tundra,

pokedex/data/csv/pokedex_version_groups.csv

@@ -15,3 +15,17 @@ pokedex_id,version_group_id
 13,15
 14,15
 15,16
+16,17
+17,17
+18,17
+19,17
+20,17
+21,18
+22,18
+23,18
+24,18
+25,18
+26,19
+27,20
+28,20
+29,20

pokedex/data/csv/pokedexes.csv

@@ -13,3 +13,17 @@ id,region_id,identifier,is_main_series
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
 15,3,updated-hoenn,1
+16,7,original-alola,1
+17,7,original-melemele,1
+18,7,original-akala,1
+19,7,original-ulaula,1
+20,7,original-poni,1
+21,7,updated-alola,1
+22,7,updated-melemele,1
+23,7,updated-akala,1
+24,7,updated-ulaula,1
+25,7,updated-poni,1
+26,1,letsgo-kanto,1
+27,8,galar,1
+28,8,isle-of-armor,1
+29,8,crown-tundra,1

pokedex/data/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
@@ -283,7 +283,11 @@ pokemon_id,ability_id,is_hidden,slot
 108,12,0,2
 108,13,1,3
 109,26,0,1
+109,256,0,2
+109,1,1,3
 110,26,0,1
+110,256,0,2
+110,1,1,3
 111,31,0,1
 111,69,0,2
 111,120,1,3
@@ -636,11 +640,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 +716,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 +833,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 +1282,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 +1442,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 +1523,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 +1765,383 @@ 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
+803,224,0,1
+804,224,0,1
+805,224,0,1
+806,224,0,1
+807,10,0,1
+808,42,0,1
+809,89,0,1
+810,65,0,1
+810,229,1,3
+811,65,0,1
+811,229,1,3
+812,65,0,1
+812,229,1,3
+813,66,0,1
+813,236,1,3
+814,66,0,1
+814,236,1,3
+815,66,0,1
+815,236,1,3
+816,67,0,1
+816,97,1,3
+817,67,0,1
+817,97,1,3
+818,67,0,1
+818,97,1,3
+819,167,0,1
+819,82,1,3
+820,167,0,1
+820,82,1,3
+821,51,0,1
+821,127,0,2
+821,145,1,3
+822,51,0,1
+822,127,0,2
+822,145,1,3
+823,46,0,1
+823,127,0,2
+823,240,1,3
+824,68,0,1
+824,14,0,2
+824,140,1,3
+825,68,0,1
+825,14,0,2
+825,140,1,3
+826,68,0,1
+826,119,0,2
+826,140,1,3
+827,50,0,1
+827,84,0,2
+827,198,1,3
+828,50,0,1
+828,84,0,2
+828,198,1,3
+829,238,0,1
+829,144,0,2
+829,27,1,3
+830,238,0,1
+830,144,0,2
+830,27,1,3
+831,218,0,1
+831,50,0,2
+831,171,1,3
+832,218,0,1
+832,80,0,2
+832,171,1,3
+833,173,0,1
+833,75,0,2
+833,33,1,3
+834,173,0,1
+834,75,0,2
+834,33,1,3
+835,237,0,1
+835,155,1,3
+836,173,0,1
+836,172,1,3
+837,243,0,1
+837,85,0,2
+837,18,1,3
+838,243,0,1
+838,49,0,2
+838,18,1,3
+839,243,0,1
+839,49,0,2
+839,18,1,3
+840,247,0,1
+840,82,0,2
+840,171,1,3
+841,247,0,1
+841,82,0,2
+841,55,1,3
+842,247,0,1
+842,82,0,2
+842,47,1,3
+843,245,0,1
+843,61,0,2
+843,8,1,3
+844,245,0,1
+844,61,0,2
+844,8,1,3
+845,241,0,1
+846,33,0,1
+846,239,1,3
+847,33,0,1
+847,239,1,3
+848,155,0,1
+848,9,0,2
+848,103,1,3
+849,244,0,1
+849,57,0,2
+849,101,1,3
+850,18,0,1
+850,73,0,2
+850,49,1,3
+851,18,0,1
+851,73,0,2
+851,49,1,3
+852,7,0,1
+852,101,1,3
+853,7,0,1
+853,101,1,3
+854,133,0,1
+854,130,1,3
+855,133,0,1
+855,130,1,3
+856,131,0,1
+856,107,0,2
+856,156,1,3
+857,131,0,1
+857,107,0,2
+857,156,1,3
+858,131,0,1
+858,107,0,2
+858,156,1,3
+859,158,0,1
+859,119,0,2
+859,124,1,3
+860,158,0,1
+860,119,0,2
+860,124,1,3
+861,158,0,1
+861,119,0,2
+861,124,1,3
+862,120,0,1
+862,62,0,2
+862,128,1,3
+863,4,0,1
+863,181,0,2
+863,252,1,3
+864,133,0,1
+864,253,1,3
+865,80,0,1
+865,113,1,3
+866,77,0,1
+866,251,0,2
+866,115,1,3
+867,254,0,1
+868,175,0,1
+868,165,1,3
+869,175,0,1
+869,165,1,3
+870,4,0,1
+870,128,1,3
+871,31,0,1
+871,226,1,3
+872,19,0,1
+872,246,1,3
+873,19,0,1
+873,246,1,3
+874,249,0,1
+875,248,0,1
+876,39,0,1
+876,28,0,2
+876,227,1,3
+877,258,0,1
+878,125,0,1
+878,134,1,3
+879,125,0,1
+879,134,1,3
+880,10,0,1
+880,55,0,2
+880,146,1,3
+881,10,0,1
+881,9,0,2
+881,202,1,3
+882,11,0,1
+882,173,0,2
+882,146,1,3
+883,11,0,1
+883,115,0,2
+883,202,1,3
+884,135,0,1
+884,134,0,2
+884,242,1,3
+885,29,0,1
+885,151,0,2
+885,130,1,3
+886,29,0,1
+886,151,0,2
+886,130,1,3
+887,29,0,1
+887,151,0,2
+887,130,1,3
+888,234,0,1
+889,235,0,1
+890,46,0,1
+891,39,0,1
+892,260,0,1
+893,102,0,1
+894,262,0,1
+895,263,0,1
+896,264,0,1
+897,265,0,1
+898,127,0,1
 10001,46,0,1
 10002,46,0,1
 10003,46,0,1
@@ -1866,3 +2258,193 @@ 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
+10148,9,0,1
+10148,31,1,3
+10149,130,0,1
+10149,31,0,2
+10149,69,1,3
+10150,118,0,1
+10150,19,0,2
+10150,175,1,3
+10151,20,0,1
+10152,181,0,1
+10153,199,0,1
+10153,11,1,3
+10154,160,0,1
+10154,31,0,2
+10154,5,1,3
+10155,232,0,1
+10156,232,0,1
+10157,233,0,1
+10158,9,0,1
+10158,31,1,3
+10159,50,0,1
+10159,91,0,2
+10159,107,1,3
+10160,9,0,1
+10160,31,1,3
+10161,53,0,1
+10161,181,0,2
+10161,127,1,3
+10162,50,0,1
+10162,257,0,2
+10162,107,1,3
+10163,50,0,1
+10163,257,0,2
+10163,107,1,3
+10164,82,0,1
+10164,20,0,2
+10164,144,1,3
+10165,259,0,1
+10165,20,0,2
+10165,144,1,3
+10166,80,0,1
+10166,113,1,3
+10167,26,0,1
+10167,256,0,2
+10167,228,1,3
+10168,72,0,1
+10168,251,0,2
+10168,115,1,3
+10169,172,0,1
+10170,128,0,1
+10171,201,0,1
+10172,261,0,1
+10172,20,0,2
+10172,144,1,3
+10173,133,0,1
+10173,130,1,3
+10174,53,0,1
+10174,82,0,2
+10174,95,1,3
+10175,53,0,1
+10175,82,0,2
+10175,95,1,3
+10176,55,0,1
+10176,39,1,3
+10177,255,0,1
+10177,161,1,3
+10178,255,0,1
+10178,161,1,3
+10179,254,0,1
+10180,250,0,1
+10181,188,0,1
+10182,241,0,1
+10183,241,0,1
+10184,244,0,1
+10184,58,0,2
+10184,101,1,3
+10185,248,0,1
+10186,20,0,1
+10186,28,0,2
+10186,227,1,3
+10187,258,0,1
+10188,234,0,1
+10189,235,0,1
+10190,46,0,1
+10191,260,0,1
+10192,102,0,1
+10193,266,0,1
+10194,267,0,1

pokedex/data/csv/pokemon_color_names.csv

@@ -1,51 +1,101 @@
 pokemon_color_id,local_language_id,name
-1,1,黒い
+1,1,くろいろ
+1,3,검정
+1,4,黑色
 1,5,Noir
 1,6,Schwarz
+1,7,Negro
 1,8,Nero
 1,9,Black
-2,1,青い
+1,11,黒色
+1,12,黑色
+2,1,あおいろ
+2,3,파랑
+2,4,藍色
 2,5,Bleu
 2,6,Blau
+2,7,Azul
 2,8,Blu
 2,9,Blue
-3,1,茶色
+2,11,青色
+2,12,蓝色
+3,1,ちゃいろ
+3,3,갈색
+3,4,褐色
 3,5,Brun
 3,6,Braun
+3,7,Marrón
 3,8,Marrone
 3,9,Brown
-4,1,灰色
+3,11,茶色
+3,12,褐色
+4,1,はいいろ
+4,3,회색
+4,4,灰色
 4,5,Gris
 4,6,Grau
+4,7,Gris
 4,8,Grigio
 4,9,Gray
-5,1,緑
+4,11,灰色
+4,12,灰色
+5,1,みどりいろ
+5,3,초록
+5,4,綠色
 5,5,Vert
 5,6,Grün
+5,7,Verde
 5,8,Verde
 5,9,Green
-6,1,ピンク
+5,11,緑色
+5,12,绿色
+6,1,ももいろ
+6,3,담홍
+6,4,粉紅色
 6,5,Rose
 6,6,Rosa
+6,7,Rosa
 6,8,Rosa
 6,9,Pink
-7,1,パーパル
+6,11,桃色
+6,12,粉红色
+7,1,むらさきいろ
+7,3,보라
+7,4,紫色
 7,5,Violet
 7,6,Violett
+7,7,Morado
 7,8,Viola
 7,9,Purple
-8,1,赤い
+7,11,紫色
+7,12,紫色
+8,1,あかいろ
+8,3,빨강
+8,4,紅色
 8,5,Rouge
 8,6,Rot
+8,7,Rojo
 8,8,Rosso
 8,9,Red
-9,1,白い
+8,11,赤色
+8,12,红色
+9,1,しろいろ
+9,3,하양
+9,4,白色
 9,5,Blanc
 9,6,Weiß
+9,7,Blanco
 9,8,Bianco
 9,9,White
-10,1,黄色
+9,11,白色
+9,12,白色
+10,1,きいろ
+10,3,노랑
+10,4,黃色
 10,5,Jaune
 10,6,Gelb
+10,7,Amarillo
 10,8,Giallo
 10,9,Yellow
+10,11,黄色
+10,12,黄色

pokedex/data/csv/pokemon_egg_groups.csv

@@ -357,8 +357,11 @@ species_id,egg_group_id
 278,4
 279,2
 279,4
+280,8
 280,11
+281,8
 281,11
+282,8
 282,11
 283,2
 283,3
@@ -422,8 +425,11 @@ species_id,egg_group_id
 327,5
 327,8
 328,3
+328,14
 329,3
+329,14
 330,3
+330,14
 331,7
 331,8
 332,7
@@ -616,6 +622,7 @@ species_id,egg_group_id
 472,3
 473,5
 474,10
+475,8
 475,11
 476,10
 477,11
@@ -886,6 +893,7 @@ species_id,egg_group_id
 698,1
 699,1
 700,5
+701,4
 701,8
 702,5
 702,6
@@ -902,12 +910,246 @@ species_id,egg_group_id
 710,11
 711,11
 712,1
+712,10
 713,1
+713,10
 714,4
+714,14
 715,4
+715,14
 716,15
 717,15
 718,15
 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
+803,15
+804,15
+805,15
+806,15
+807,15
+808,15
+809,15
+810,5
+810,7
+811,5
+811,7
+812,5
+812,7
+813,5
+813,8
+814,5
+814,8
+815,5
+815,8
+816,2
+816,5
+817,2
+817,5
+818,2
+818,5
+819,5
+820,5
+821,4
+822,4
+823,4
+824,3
+825,3
+826,3
+827,5
+828,5
+829,7
+830,7
+831,5
+832,5
+833,1
+833,2
+834,1
+834,2
+835,5
+836,5
+837,10
+838,10
+839,10
+840,7
+840,14
+841,7
+841,14
+842,7
+842,14
+843,5
+843,14
+844,5
+844,14
+845,2
+845,4
+846,12
+847,12
+848,15
+849,8
+850,3
+851,3
+852,2
+852,8
+853,2
+853,8
+854,10
+854,11
+855,10
+855,11
+856,6
+857,6
+858,6
+859,6
+859,8
+860,6
+860,8
+861,6
+861,8
+862,5
+863,5
+864,2
+864,9
+865,4
+865,5
+866,8
+867,10
+867,11
+868,6
+868,11
+869,6
+869,11
+870,6
+870,10
+871,2
+871,11
+872,3
+873,3
+874,10
+875,2
+875,5
+876,6
+877,5
+877,6
+878,5
+878,10
+879,5
+879,10
+880,15
+881,15
+882,15
+883,15
+884,10
+884,14
+885,11
+885,14
+886,11
+886,14
+887,11
+887,14
+888,15
+889,15
+890,15
+891,15
+892,15
+893,15
+894,15
+895,15
+896,15
+897,15
+898,15

pokedex/data/csv/pokemon_evolution.csv

@@ -14,17 +14,17 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 13,20,1,,20,,,,,,,,,,,,,,0,0
 14,22,1,,20,,,,,,,,,,,,,,0,0
 15,24,1,,22,,,,,,,,,,,,,,0,0
-16,25,1,,,,,,,,,220,,,,,,,0,0
+16,25,1,,,,,,,,,160,,,,,,,0,0
 17,26,3,83,,,,,,,,,,,,,,,0,0
 18,28,1,,22,,,,,,,,,,,,,,0,0
 19,30,1,,16,,,,,,,,,,,,,,0,0
 20,31,3,81,,,,,,,,,,,,,,,0,0
 21,33,1,,16,,,,,,,,,,,,,,0,0
 22,34,3,81,,,,,,,,,,,,,,,0,0
-23,35,1,,,,,,,,,220,,,,,,,0,0
+23,35,1,,,,,,,,,160,,,,,,,0,0
 24,36,3,81,,,,,,,,,,,,,,,0,0
 25,38,3,82,,,,,,,,,,,,,,,0,0
-26,39,1,,,,,,,,,220,,,,,,,0,0
+26,39,1,,,,,,,,,160,,,,,,,0,0
 27,40,3,81,,,,,,,,,,,,,,,0,0
 28,42,1,,22,,,,,,,,,,,,,,0,0
 29,44,1,,21,,,,,,,,,,,,,,0,0
@@ -79,7 +79,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 78,136,3,82,,,,,,,,,,,,,,,0,0
 79,139,1,,40,,,,,,,,,,,,,,0,0
 80,141,1,,40,,,,,,,,,,,,,,0,0
-81,143,1,,,,,,,,,220,,,,,,,0,0
+81,143,1,,,,,,,,,160,,,,,,,0,0
 82,148,1,,30,,,,,,,,,,,,,,0,0
 83,149,1,,55,,,,,,,,,,,,,,0,0
 84,153,1,,16,,,,,,,,,,,,,,0,0
@@ -92,14 +92,14 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 91,164,1,,20,,,,,,,,,,,,,,0,0
 92,166,1,,18,,,,,,,,,,,,,,0,0
 93,168,1,,22,,,,,,,,,,,,,,0,0
-94,169,1,,,,,,,,,220,,,,,,,0,0
+94,169,1,,,,,,,,,160,,,,,,,0,0
 95,171,1,,27,,,,,,,,,,,,,,0,0
-96,176,1,,,,,,,,,220,,,,,,,0,0
+96,176,1,,,,,,,,,160,,,,,,,0,0
 97,178,1,,25,,,,,,,,,,,,,,0,0
 98,180,1,,15,,,,,,,,,,,,,,0,0
 99,181,1,,30,,,,,,,,,,,,,,0,0
 100,182,3,80,,,,,,,,,,,,,,,0,0
-101,183,1,,,,,,,,,220,,,,,,,0,0
+101,183,1,,,,,,,,,160,,,,,,,0,0
 102,184,1,,18,,,,,,,,,,,,,,0,0
 103,185,1,,,,,,,102,,,,,,,,,0,0
 104,186,2,,,,,198,,,,,,,,,,,0,0
@@ -107,8 +107,8 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 106,189,1,,27,,,,,,,,,,,,,,0,0
 107,192,3,80,,,,,,,,,,,,,,,0,0
 108,195,1,,20,,,,,,,,,,,,,,0,0
-109,196,1,,,,,,day,,,220,,,,,,,0,0
-110,197,1,,,,,,night,,,220,,,,,,,0,0
+109,196,1,,,,,,day,,,160,,,,,,,0,0
+110,197,1,,,,,,night,,,160,,,,,,,0,0
 111,199,2,,,,,198,,,,,,,,,,,0,0
 112,202,1,,15,,,,,,,,,,,,,,0,0
 113,205,1,,31,,,,,,,,,,,,,,0,0
@@ -125,7 +125,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 124,232,1,,25,,,,,,,,,,,,,,0,0
 125,233,2,,,,,229,,,,,,,,,,,0,0
 126,237,1,,20,,,,,,,,,,0,,,,0,0
-127,242,1,,,,,,,,,220,,,,,,,0,0
+127,242,1,,,,,,,,,160,,,,,,,0,0
 128,247,1,,30,,,,,,,,,,,,,,0,0
 129,248,1,,55,,,,,,,,,,,,,,0,0
 130,253,1,,16,,,,,,,,,,,,,,0,0
@@ -162,7 +162,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 161,306,1,,42,,,,,,,,,,,,,,0,0
 162,308,1,,37,,,,,,,,,,,,,,0,0
 163,310,1,,26,,,,,,,,,,,,,,0,0
-164,315,1,,,,,,day,,,220,,,,,,,0,0
+164,315,1,,,,,,day,,,160,,,,,,,0,0
 165,317,1,,26,,,,,,,,,,,,,,0,0
 166,319,1,,30,,,,,,,,,,,,,,0,0
 167,321,1,,40,,,,,,,,,,,,,,0,0
@@ -213,7 +213,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 212,423,1,,30,,,,,,,,,,,,,,0,0
 213,424,1,,,,,,,458,,,,,,,,,0,0
 214,426,1,,28,,,,,,,,,,,,,,0,0
-215,428,1,,,,,,,,,220,,,,,,,0,0
+215,428,1,,,,,,,,,160,,,,,,,0,0
 216,429,3,108,,,,,,,,,,,,,,,0,0
 217,430,3,108,,,,,,,,,,,,,,,0,0
 218,432,1,,38,,,,,,,,,,,,,,0,0
@@ -221,7 +221,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 220,437,1,,33,,,,,,,,,,,,,,0,0
 221,444,1,,24,,,,,,,,,,,,,,0,0
 222,445,1,,48,,,,,,,,,,,,,,0,0
-223,448,1,,,,,,day,,,220,,,,,,,0,0
+223,448,1,,,,,,day,,,160,,,,,,,0,0
 224,450,1,,34,,,,,,,,,,,,,,0,0
 225,452,1,,40,,,,,,,,,,,,,,0,0
 226,454,1,,37,,,,,,,,,,,,,,0,0
@@ -264,7 +264,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 263,523,1,,27,,,,,,,,,,,,,,0,0
 264,525,1,,25,,,,,,,,,,,,,,0,0
 265,526,2,,,,,,,,,,,,,,,,0,0
-266,528,1,,,,,,,,,220,,,,,,,0,0
+266,528,1,,,,,,,,,160,,,,,,,0,0
 267,530,1,,31,,,,,,,,,,,,,,0,0
 268,533,1,,25,,,,,,,,,,,,,,0,0
 269,534,2,,,,,,,,,,,,,,,,0,0
@@ -363,3 +363,98 @@ 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
+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,,,,775,,,,,,,,,,,,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,,,,,,,,,160,,,,,,,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
+405,804,1,,,,,,,406,,,,,,,,,0,0
+406,462,3,83,,,,,,,,,,,,,,,0,0
+407,470,3,85,,,,,,,,,,,,,,,0,0
+408,471,3,885,,,,,,,,,,,,,,,0,0
+409,700,1,,,,,,,,18,160,,,,,,,0,0
+410,738,3,83,,,,,,,,,,,,,,,0,0
+411,811,1,,16,,,,,,,,,,,,,,0,0
+412,812,1,,35,,,,,,,,,,,,,,0,0
+413,814,1,,16,,,,,,,,,,,,,,0,0
+414,815,1,,35,,,,,,,,,,,,,,0,0
+415,817,1,,16,,,,,,,,,,,,,,0,0
+416,818,1,,35,,,,,,,,,,,,,,0,0
+417,820,1,,24,,,,,,,,,,,,,,0,0
+418,822,1,,18,,,,,,,,,,,,,,0,0
+419,823,1,,38,,,,,,,,,,,,,,0,0
+420,825,1,,10,,,,,,,,,,,,,,0,0
+421,826,1,,30,,,,,,,,,,,,,,0,0
+422,828,1,,18,,,,,,,,,,,,,,0,0
+423,830,1,,20,,,,,,,,,,,,,,0,0
+424,832,1,,24,,,,,,,,,,,,,,0,0
+425,834,1,,22,,,,,,,,,,,,,,0,0
+426,836,1,,25,,,,,,,,,,,,,,0,0
+427,838,1,,18,,,,,,,,,,,,,,0,0
+428,839,1,,34,,,,,,,,,,,,,,0,0
+429,841,3,1175,,,,,,,,,,,,,,,0,0
+430,842,3,1174,,,,,,,,,,,,,,,0,0
+431,844,1,,36,,,,,,,,,,,,,,0,0
+432,847,1,,26,,,,,,,,,,,,,,0,0
+433,849,1,,30,,,,,,,,,,,,,,0,0
+434,851,1,,28,,,,,,,,,,,,,,0,0
+435,853,1,,,,,,,269,,,,,,,,,0,0
+436,855,3,1311,,,,,,,,,,,,,,,0,0
+437,857,1,,32,,,,,,,,,,,,,,0,0
+438,858,1,,42,,,,,,,,,,,,,,0,0
+439,860,1,,32,,,,,,,,,,,,,,0,0
+440,861,1,,42,,,,,,,,,,,,,,0,0
+441,869,5,,,,,,,,,,,,,,,,0,0
+442,873,1,,,,,,night,,,160,,,,,,,0,0
+443,879,1,,34,,,,,,,,,,,,,,0,0
+444,886,1,,50,,,,,,,,,,,,,,0,0
+445,887,1,,60,,,,,,,,,,,,,,0,0
+446,892,6,,,,,,,,,,,,,,,,0,0
+447,892,7,,,,,,,,,,,,,,,,0,0
+448,28,3,885,,,,,,,,,,,,,,,0,0
+449,38,3,885,,,,,,,,,,,,,,,0,0
+450,53,1,,,,,,,,,160,,,,,,,0,0
+451,863,1,,28,,,,,,,,,,,,,,0,0
+452,80,3,1633,,,,,,,,,,,,,,,0,0
+453,199,3,1643,,,,,,,,,,,,,,,0,0
+454,865,8,,,,,,,,,,,,,,,,0,0
+455,866,1,,42,,,,,,,,,,,,,,0,0
+456,864,1,,38,,,,,,,,,,,,,,0,0
+457,862,1,,35,,,,night,,,,,,,,,,0,0
+458,555,3,885,,,,,,,,,,,,,,,0,0
+459,867,9,,,,,,,,,,,,,,,,0,0
+460,745,1,,25,,,,dusk,,,,,,,,,,0,0
+461,20,1,,20,,,,night,,,,,,,,,,0,0

pokedex/data/csv/pokemon_habitat_names.csv

@@ -1,19 +1,28 @@
 pokemon_habitat_id,local_language_id,name
 1,5,grottes
+1,7,caverna
 1,9,cave
 2,5,forêts
+2,7,bosque
 2,9,forest
 3,5,champs
+3,7,pradera
 3,9,grassland
 4,5,montagnes
+4,7,montaña
 4,9,mountain
 5,5,rares
+5,7,raro
 5,9,rare
 6,5,milieux hostiles
+6,7,campo
 6,9,rough terrain
 7,5,mers
+7,7,mar
 7,9,sea
 8,5,urbains
+8,7,ciudad
 8,9,urban
 9,5,marécages
+9,7,agua salada
 9,9,water's edge

pokedex/data/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."
@@ -16,3 +20,4 @@ pokemon_move_method_id,local_language_id,name,description
 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,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.
+11,9,Zygarde Cube,Can be taught using the Zygarde Cube.  Must find the corresponding Zygarde Core first in Sun/Moon.  All moves are available immediately in Ultra Sun/Ultra Moon.

pokedex/data/csv/pokemon_move_methods.csv

@@ -9,3 +9,4 @@ id,identifier
 8,xd-shadow
 9,xd-purification
 10,form-change
+11,zygarde-cube

pokedex/data/csv/pokemon_types.csv

@@ -1070,6 +1070,275 @@ 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
+803,4,1
+804,4,1
+804,16,2
+805,6,1
+805,9,2
+806,10,1
+806,8,2
+807,13,1
+808,9,1
+809,9,1
+810,12,1
+811,12,1
+812,12,1
+813,10,1
+814,10,1
+815,10,1
+816,11,1
+817,11,1
+818,11,1
+819,1,1
+820,1,1
+821,3,1
+822,3,1
+823,3,1
+823,9,2
+824,7,1
+825,7,1
+825,14,2
+826,7,1
+826,14,2
+827,17,1
+828,17,1
+829,12,1
+830,12,1
+831,1,1
+832,1,1
+833,11,1
+834,11,1
+834,6,2
+835,13,1
+836,13,1
+837,6,1
+838,6,1
+838,10,2
+839,6,1
+839,10,2
+840,12,1
+840,16,2
+841,12,1
+841,16,2
+842,12,1
+842,16,2
+843,5,1
+844,5,1
+845,3,1
+845,11,2
+846,11,1
+847,11,1
+848,13,1
+848,4,2
+849,13,1
+849,4,2
+850,10,1
+850,7,2
+851,10,1
+851,7,2
+852,2,1
+853,2,1
+854,8,1
+855,8,1
+856,14,1
+857,14,1
+858,14,1
+858,18,2
+859,17,1
+859,18,2
+860,17,1
+860,18,2
+861,17,1
+861,18,2
+862,17,1
+862,1,2
+863,9,1
+864,8,1
+865,2,1
+866,15,1
+866,14,2
+867,5,1
+867,8,2
+868,18,1
+869,18,1
+870,2,1
+871,13,1
+872,15,1
+872,7,2
+873,15,1
+873,7,2
+874,6,1
+875,15,1
+876,14,1
+876,1,2
+877,13,1
+877,17,2
+878,9,1
+879,9,1
+880,13,1
+880,16,2
+881,13,1
+881,15,2
+882,11,1
+882,16,2
+883,11,1
+883,15,2
+884,9,1
+884,16,2
+885,16,1
+885,8,2
+886,16,1
+886,8,2
+887,16,1
+887,8,2
+888,18,1
+889,2,1
+890,4,1
+890,16,2
+891,2,1
+892,2,1
+892,17,2
+893,17,1
+893,12,2
+894,13,1
+895,16,1
+896,15,1
+897,8,1
+898,14,1
+898,12,2
 10001,14,1
 10002,14,1
 10003,14,1
@@ -1224,3 +1493,184 @@ 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
+10148,13,1
+10149,10,1
+10149,8,2
+10150,7,1
+10150,18,2
+10151,6,1
+10152,6,1
+10153,11,1
+10153,7,2
+10154,13,1
+10154,9,2
+10155,14,1
+10155,9,2
+10156,14,1
+10156,8,2
+10157,14,1
+10157,16,2
+10158,13,1
+10159,1,1
+10160,13,1
+10161,9,1
+10162,14,1
+10163,14,1
+10163,18,2
+10164,14,1
+10165,4,1
+10165,14,2
+10166,2,1
+10167,4,1
+10167,18,2
+10168,15,1
+10168,14,2
+10169,14,1
+10169,3,2
+10170,2,1
+10170,3,2
+10171,17,1
+10171,3,2
+10172,4,1
+10172,14,2
+10173,8,1
+10174,17,1
+10174,1,2
+10175,17,1
+10175,1,2
+10176,15,1
+10177,15,1
+10178,15,1
+10178,10,2
+10179,5,1
+10179,8,2
+10180,5,1
+10180,9,2
+10181,16,1
+10181,5,2
+10182,3,1
+10182,11,2
+10183,3,1
+10183,11,2
+10184,13,1
+10184,4,2
+10185,15,1
+10186,14,1
+10186,1,2
+10187,13,1
+10187,17,2
+10188,18,1
+10188,9,2
+10189,2,1
+10189,9,2
+10190,4,1
+10190,16,2
+10191,2,1
+10191,11,2
+10192,17,1
+10192,12,2
+10193,14,1
+10193,15,2
+10194,14,1
+10194,8,2

pokedex/data/csv/region_names.csv

@@ -1,31 +1,39 @@
 region_id,local_language_id,name
 1,1,カントー地方
+1,3,관동지방
 1,5,Kanto
 1,6,Kanto
 1,8,Kanto
 1,9,Kanto
 2,1,ジョウト地方
+2,3,성도지방
 2,5,Johto
 2,6,Johto
 2,8,Johto
 2,9,Johto
 3,1,ホウエン地方
+3,3,호연지방
 3,5,Hoenn
 3,6,Hoenn
 3,8,Hoenn
 3,9,Hoenn
 4,1,シンオウ地方
+4,3,신오지방
 4,5,Sinnoh
 4,6,Sinnoh
 4,8,Sinnoh
 4,9,Sinnoh
 5,1,イッシュ地方
+5,3,하나지방
 5,5,Unys
 5,6,Einall
 5,8,Unima
 5,9,Unova
 6,1,カロス地方
+6,3,칼로스지방
 6,5,Kalos
 6,6,Kalos
 6,8,Kalos
 6,9,Kalos
+7,9,Alola
+8,9,Galar

pokedex/data/csv/regions.csv

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

pokedex/data/csv/stat_names.csv

@@ -1,47 +1,55 @@
 stat_id,local_language_id,name
 1,1,HP
+1,3,HP
 1,5,PV
 1,6,KP
 1,7,PS
 1,8,PS
 1,9,HP
 2,1,こうげき
+2,3,공격
 2,5,Attaque
 2,6,Angriff
 2,7,Ataque
 2,8,Attacco
 2,9,Attack
 3,1,ぼうぎょ
+3,3,방어
 3,5,Défense
 3,6,Verteidigung
 3,7,Defensa
 3,8,Difesa
 3,9,Defense
 4,1,とくこう
+4,3,특수공격
 4,5,Attaque Spéciale
 4,6,Spezialangriff
 4,7,Ataque Especial
 4,8,Attacco Speciale
 4,9,Special Attack
 5,1,とくぼう
+5,3,특수방어
 5,5,Défense Spéciale
 5,6,Spezialverteidigung
 5,7,Defensa Especial
 5,8,Difesa Speciale
 5,9,Special Defense
 6,1,すばやさ
+6,3,스피드
 6,5,Vitesse
 6,6,Initiative
 6,7,Velocidad
 6,8,Velocità
 6,9,Speed
 7,1,めいちゅう
+7,3,명중률
 7,5,Précision
 7,6,Genauigkeit
 7,7,Precisión
 7,8,precisione
 7,9,accuracy
 8,1,かいひ
+8,3,회피율
 8,5,Esquive
 8,6,Fluchtwert
 8,7,Evasión

pokedex/data/csv/type_names.csv

@@ -1,137 +1,193 @@
 type_id,local_language_id,name
 1,1,ノーマル
 1,3,노말
+1,4,一般
 1,5,Normal
 1,6,Normal
 1,7,Normal
 1,8,Normale
 1,9,Normal
+1,11,ノーマル
+1,12,一般
 2,1,かくとう
 2,3,격투
+2,4,格鬥
 2,5,Combat
 2,6,Kampf
 2,7,Lucha
 2,8,Lotta
 2,9,Fighting
+2,11,かくとう
+2,12,格斗
 3,1,ひこう
 3,3,비행
+3,4,飛行
 3,5,Vol
 3,6,Flug
 3,7,Volador
 3,8,Volante
 3,9,Flying
+3,11,ひこう
+3,12,飞行
 4,1,どく
 4,3,독
+4,4,毒
 4,5,Poison
 4,6,Gift
 4,7,Veneno
 4,8,Veleno
 4,9,Poison
+4,11,どく
+4,12,毒
 5,1,じめん
 5,3,땅
+5,4,地面
 5,5,Sol
 5,6,Boden
 5,7,Tierra
 5,8,Terra
 5,9,Ground
+5,11,じめん
+5,12,地面
 6,1,いわ
 6,3,바위
+6,4,岩石
 6,5,Roche
 6,6,Gestein
 6,7,Roca
 6,8,Roccia
 6,9,Rock
+6,11,いわ
+6,12,岩石
 7,1,むし
 7,3,벌레
+7,4,蟲
 7,5,Insecte
 7,6,Käfer
 7,7,Bicho
 7,8,Coleottero
 7,9,Bug
+7,11,むし
+7,12,虫
 8,1,ゴースト
 8,3,고스트
+8,4,幽靈
 8,5,Spectre
 8,6,Geist
 8,7,Fantasma
 8,8,Spettro
 8,9,Ghost
+8,11,ゴースト
+8,12,幽灵
 9,1,はがね
 9,3,강철
+9,4,鋼
 9,5,Acier
 9,6,Stahl
 9,7,Acero
 9,8,Acciaio
 9,9,Steel
+9,11,はがね
+9,12,钢
 10,1,ほのお
 10,3,불꽃
+10,4,火
 10,5,Feu
 10,6,Feuer
 10,7,Fuego
 10,8,Fuoco
 10,9,Fire
+10,11,ほのお
+10,12,火
 11,1,みず
 11,3,물
+11,4,水
 11,5,Eau
 11,6,Wasser
 11,7,Agua
 11,8,Acqua
 11,9,Water
+11,11,みず
+11,12,水
 12,1,くさ
 12,3,풀
+12,4,草
 12,5,Plante
 12,6,Pflanze
 12,7,Planta
 12,8,Erba
 12,9,Grass
+12,11,くさ
+12,12,草
 13,1,でんき
 13,3,전기
+13,4,電
 13,5,Électrik
 13,6,Elektro
 13,7,Eléctrico
 13,8,Elettro
 13,9,Electric
+13,11,でんき
+13,12,电
 14,1,エスパー
 14,3,에스퍼
+14,4,超能力
 14,5,Psy
 14,6,Psycho
 14,7,Psíquico
 14,8,Psico
 14,9,Psychic
+14,11,エスパー
+14,12,超能力
 15,1,こおり
 15,3,얼음
+15,4,冰
 15,5,Glace
 15,6,Eis
 15,7,Hielo
 15,8,Ghiaccio
 15,9,Ice
+15,11,こおり
+15,12,冰
 16,1,ドラゴン
 16,3,드래곤
+16,4,龍
 16,5,Dragon
 16,6,Drache
 16,7,Dragón
 16,8,Drago
 16,9,Dragon
+16,11,ドラゴン
+16,12,龙
 17,1,あく
 17,3,악
+17,4,惡
 17,5,Ténèbres
 17,6,Unlicht
 17,7,Siniestro
 17,8,Buio
 17,9,Dark
+17,11,あく
+17,12,恶
 18,1,フェアリー
 18,3,페어리
+18,4,妖精
 18,5,Fée
 18,6,Fee
 18,7,Hada
 18,8,Folletto
 18,9,Fairy
+18,11,フェアリー
+18,12,妖精
 10001,1,？？？
+10001,3,???
 10001,5,???
 10001,6,???
 10001,7,???
 10001,8,???
 10001,9,???
 10002,1,ダーク
+10002,3,다크
 10002,5,Obscur
 10002,6,Crypto
 10002,8,Ombra

pokedex/data/csv/version_group_pokemon_move_methods.csv

@@ -70,3 +70,25 @@ 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
+17,11
+18,1
+18,2
+18,3
+18,4
+18,6
+18,10
+18,11
+19,1
+19,3
+19,4
+20,1
+20,2
+20,3
+20,4
+20,10

pokedex/data/csv/version_group_regions.csv

@@ -16,3 +16,7 @@ version_group_id,region_id
 14,5
 15,6
 16,3
+17,7
+18,7
+19,1
+20,8

pokedex/data/csv/version_groups.csv

@@ -15,3 +15,7 @@ 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
+18,ultra-sun-ultra-moon,7,18
+19,lets-go-pikachu-lets-go-eevee,7,19
+20,sword-shield,8,20

pokedex/data/csv/version_names.csv

@@ -1,131 +1,215 @@
 version_id,local_language_id,name
 1,1,赤
+1,3,레드
 1,5,Rouge
 1,6,Rot
+1,7,Rojo
 1,8,Rossa
 1,9,Red
 2,1,緑
+2,3,블루
 2,5,Bleu
 2,6,Blau
+2,7,Azul
 2,8,Blu
 2,9,Blue
 3,1,ピカチュウ
+3,3,피카츄
 3,5,Jaune
 3,6,Gelb
+3,7,Amarillo
 3,8,Gialla
 3,9,Yellow
 4,1,金
+4,3,골드
 4,5,Or
 4,6,Gold
+4,7,Oro
 4,8,Oro
 4,9,Gold
 5,1,銀
+5,3,실버
 5,5,Argent
 5,6,Silber
+5,7,Plata
 5,8,Argento
 5,9,Silver
 6,1,クリスタル
+6,3,크리스탈
 6,5,Cristal
 6,6,Kristall
+6,7,Cristal
 6,8,Cristallo
 6,9,Crystal
 7,1,ルビー
+7,3,루비
 7,5,Rubis
 7,6,Rubin
+7,7,Rubí
 7,8,Rubino
 7,9,Ruby
 8,1,サファイア
+8,3,사파이어
 8,5,Saphir
 8,6,Saphir
+8,7,Zafiro
 8,8,Zaffiro
 8,9,Sapphire
 9,1,エメラルド
+9,3,에메랄드
 9,5,Émeraude
 9,6,Smaragd
+9,7,Esmeralda
 9,8,Smeraldo
 9,9,Emerald
 10,1,ファイアレッド
+10,3,파이어레드
 10,5,Rouge Feu
 10,6,Feuerrot
+10,7,Rojo Fuego
 10,8,Rosso Fuoco
 10,9,FireRed
 11,1,リーフグリーン
+11,3,리프그린
 11,5,Vert Feuille
 11,6,Blattgrün
+11,7,Verde Hoja
 11,8,Verde Foglia
 11,9,LeafGreen
 12,1,ダイヤモンド
+12,3,디아루가
 12,5,Diamant
 12,6,Diamant
+12,7,Diamante
 12,8,Diamante
 12,9,Diamond
 13,1,パール
+13,3,펄기아
 13,5,Perle
 13,6,Perl
+13,7,Perla
 13,8,Perla
 13,9,Pearl
 14,1,プラチナ
+14,3,기라티나
 14,5,Platine
 14,6,Platin
+14,7,Platino
 14,8,Platino
 14,9,Platinum
 15,1,ハートゴールド
+15,3,하트골드
 15,5,Or HeartGold
 15,6,HeartGold
+15,7,Oro HeartGold
 15,8,Oro HeartGold
 15,9,HeartGold
 16,1,ソウルシルバー
+16,3,소울실버
 16,5,Argent SoulSilver
 16,6,SoulSilver
+16,7,Plata SoulSilver
 16,8,Argento SoulSilver
 16,9,SoulSilver
 17,1,ブラック
+17,3,블랙
 17,5,Noir
 17,6,Schwarz
+17,7,Negro
 17,8,Nera
 17,9,Black
 18,1,ホワイト
+18,3,화이트
 18,5,Blanc
 18,6,Weiß
+18,7,Blanco
 18,8,Bianca
 18,9,White
 19,1,コロシアム
+19,3,콜로세움
 19,5,Colosseum
 19,6,Colosseum
+19,7,Colosseum
 19,8,Colosseum
 19,9,Colosseum
 20,1,XD
+20,3,XD
 20,5,XD
 20,6,XD
+20,7,XD
 20,8,XD
 20,9,XD
 21,1,ブラック2
+21,3,블랙 2
 21,5,Noir 2
 21,6,Schwarz 2
+21,7,Negro 2
 21,8,Nera 2
 21,9,Black 2
 22,1,ホワイト2
+22,3,화이트 2
 22,5,Blanc 2
 22,6,Weiß 2
+22,7,Blanco 2
 22,8,Bianca 2
 22,9,White 2
 23,1,X
+23,3,X
 23,5,X
 23,6,X
+23,7,X
 23,8,X
 23,9,X
 24,1,Y
+24,3,Y
 24,5,Y
 24,6,Y
+24,7,Y
 24,8,Y
 24,9,Y
 25,1,オメガルビー
+25,3,오메가루비
 25,5,Rubis Oméga
 25,6,Omega Rubin
+25,7,Rubí Omega
 25,8,Rubino Omega
 25,9,Omega Ruby
 26,1,アルファサファイア
+26,3,알파사파이어
 26,5,Saphir Alpha
 26,6,Alpha Saphir
+26,7,Zafiro Alfa
 26,8,Zaffiro Alpha
 26,9,Alpha Sapphire
+27,1,サン
+27,3,썬
+27,5,Soleil
+27,6,Sonne
+27,7,Sol
+27,8,Sole
+27,9,Sun
+28,1,ムーン
+28,3,문
+28,5,Lune
+28,6,Mond
+28,7,Luna
+28,8,Luna
+28,9,Moon
+29,1,ウルトラサン
+29,3,울트라썬
+29,5,Ultra-Soleil
+29,6,Ultrasonne
+29,7,Ultrasol
+29,8,Ultrasole
+29,9,Ultra Sun
+30,1,ウルトラムーン
+30,3,울트라문
+30,5,Ultra-Lune
+30,6,Ultramond
+30,7,Ultraluna
+30,8,Ultraluna
+30,9,Ultra Moon
+31,9,"Let’s Go, Pikachu!"
+32,9,"Let’s Go, Eevee!"
+33,9,Sword
+34,9,Shield

pokedex/data/csv/versions.csv

@@ -25,3 +25,11 @@ id,version_group_id,identifier
 24,15,y
 25,16,omega-ruby
 26,16,alpha-sapphire
+27,17,sun
+28,17,moon
+29,18,ultra-sun
+30,18,ultra-moon
+31,19,lets-go-pikachu
+32,19,lets-go-eevee
+33,20,sword
+34,20,shield

pokedex/db/__init__.py

@@ -4,7 +4,7 @@ import re
 from sqlalchemy import engine_from_config, orm
 
 from ..defaults import get_default_db_uri
-from .tables import Language, metadata
+from .tables import metadata
 from .multilang import MultilangSession, MultilangScopedSession
 
 ENGLISH_ID = 9
@@ -46,7 +46,7 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
     ### Connect
     engine_args[engine_prefix + 'url'] = uri
     engine = engine_from_config(engine_args, prefix=engine_prefix)
-    conn = engine.connect()
+    engine.connect()
     metadata.bind = engine
 
     all_session_args = dict(autoflush=True, autocommit=False, bind=engine)