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

@@ -14,6 +14,9 @@ pip-selfcheck.json
 !/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

@@ -1,23 +1,13 @@
-FROM python:2.7-slim
+ARG PYTHON_VERSION=${PYTHON_VERSION:-"3.7-slim"}
+FROM python:${PYTHON_VERSION}
 
-RUN echo "Upgrading distro..." && \
-    apt-get update > /dev/null && \
-    apt-get upgrade -y > /dev/null && \
-    echo "Installing dependencies..." && \
-    apt-get install -y git python-distribute > /dev/null && \
-    pip install --no-cache-dir virtualenv psycopg2 pymysql > /dev/null && \
-    echo "Optimizing space..." && \
-    apt-get remove --purge -y software-properties-common > /dev/null && \
-    apt-get autoremove -y > /dev/null && \
-    apt-get clean > /dev/null && \
-    apt-get autoclean > /dev/null && \
-    echo -n > /var/lib/apt/extended_states && \
-    rm -rf /var/lib/apt/lists/* && \
-    rm -rf /usr/share/man/?? && \
-    rm -rf /usr/share/man/??_*
+ADD ./ /app/
 
-COPY ./docker-entrypoint.sh /docker-entrypoint
-RUN chmod +x /docker-entrypoint
+WORKDIR /app
 
-ENTRYPOINT ["/docker-entrypoint"]
+RUN echo "Setting up project..." && \
+    pip install -e . && \
+    echo "DONE"
+
+ENTRYPOINT ["pokedex"]
 CMD ["status"]

README.md

@@ -1,35 +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/).
+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 a single person ([eevee](https://eev.ee/)), who is also preoccupied with a lot of other things.  It needs a lot of TLC to modernize it and fix a lot of rough edges, but updating it for newly-released games is even more urgent, and that's not happening very quickly either.
+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.
 
-I started on an experiment with switching to YAML for data storage some time ago, for a variety of reasons.  Then new games came out and interrupted me.  I knew that if I didn't commit to the YAML thing then it would never get finished and I'd just grow to resent this project, so for Sun and Moon, I'm dumping to YAML _first_ and then loading that into the old database.  I'm also writing all the extraction code from scratch, since historically our process for new games has involved dozens of little ad-hoc programs we keep losing and a lot of manual effort.
+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.
 
-That means the YAML project is finally starting to show some promise, but it's taking me forever to actually get Sun and Moon data on the site.
+### Status of the YAML migration
 
-On the other hand, if I can get this going, the results could be _fantastic_:
+**Update from 2017-06-18**
 
-- The data will include everything from older games, so you don't have to guess!  Also, the site will handle older games correctly, probably!
-- Many more filtering and searching tools on veekun, since I 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!
+@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!
 
-So please be patient.  :)
+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?
+## 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.  :)
+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.
 
-## Copyright and whatnot
+### About editing CSV files
 
-The software is licensed under the MIT license.  See the `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.
+Fixing CSV data inconsistency or errors and putting that into a Pull Request it's also appreciated.
 
-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.
+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

docker-compose.yml

@@ -1,6 +0,0 @@
-version: '3'
-services:
-  pokedex:
-    build: ./
-    volumes:
-      - ./:/project

docker-entrypoint.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-POKEDEX_DIR=${POKEDEX_DIR:-"/project"}
-
-cd ${POKEDEX_DIR}
-
-if [ ! -f "${POKEDEX_DIR}/bin/python" ] || [ ! -f "${POKEDEX_DIR}/bin/pokedex" ] ; then
-    echo "Building the bin/pokedex executable ..."
-    virtualenv $POKEDEX_DIR --python=python2
-    bin/python setup.py develop
-fi
-
-case "$1" in
-   "") bin/pokedex help
-   ;;
-   "exec") exec ${@:2}
-   ;;
-   *) bin/pokedex $@
-   ;;
-esac

docker-pokedex

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-docker-compose run --rm pokedex "$@"

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

pokedex/data/csv/abilities.csv

@@ -231,6 +231,41 @@ id,identifier,generation_id,is_main_series
 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/ability_names.csv

@@ -92,7 +92,7 @@ ability_id,local_language_id,name
 10,1,ちくでん
 10,3,축전
 10,4,蓄電
-10,5,Absorb Volt
+10,5,Absorbe-Volt
 10,6,Voltabsorber
 10,7,Absorbe Elec
 10,8,Assorbivolt
@@ -102,7 +102,7 @@ ability_id,local_language_id,name
 11,1,ちょすい
 11,3,저수
 11,4,儲水
-11,5,Absorb Eau
+11,5,Absorbe-Eau
 11,6,H2O-Absorber
 11,7,Absorbe Agua
 11,8,Assorbacqua
@@ -152,7 +152,7 @@ ability_id,local_language_id,name
 16,1,へんしょく
 16,3,변색
 16,4,變色
-16,5,Déguisement
+16,5,Homochromie
 16,6,Farbwechsel
 16,7,Cambio Color
 16,8,Cambiacolore
@@ -353,7 +353,7 @@ ability_id,local_language_id,name
 36,3,트레이스
 36,4,複製
 36,5,Calque
-36,6,Fährte
+36,6,Erfassen
 36,7,Rastro
 36,8,Traccia
 36,9,Trace
@@ -572,7 +572,7 @@ ability_id,local_language_id,name
 58,1,マイナス
 58,3,마이너스
 58,4,負電
-58,5,Minus
+58,5,Moins
 58,6,Minus
 58,7,Menos
 58,8,Meno
@@ -592,8 +592,8 @@ ability_id,local_language_id,name
 60,1,ねんちゃく
 60,3,점착
 60,4,黏著
-60,5,Glue
-60,6,Wertehalter
+60,5,Glu
+60,6,Klebekörper
 60,7,Viscosidad
 60,8,Antifurto
 60,9,Sticky Hold
@@ -1054,7 +1054,7 @@ ability_id,local_language_id,name
 106,4,引爆
 106,5,Boom Final
 106,6,Finalschlag
-106,7,Resquicio
+106,7,Detonación
 106,8,Scoppio
 106,9,Aftermath
 106,11,ゆうばく
@@ -1312,7 +1312,7 @@ ability_id,local_language_id,name
 132,1,フレンドガード
 132,3,프렌드가드
 132,4,友情防守
-132,5,Garde Amie
+132,5,Garde-Ami
 132,6,Freundeshut
 132,7,Compiescolta
 132,8,Amicoscudo
@@ -1354,7 +1354,7 @@ ability_id,local_language_id,name
 136,4,多重鱗片
 136,5,Multiécaille
 136,6,Multischuppe
-136,7,Compensación
+136,7,Multiescamas
 136,8,Multisquame
 136,9,Multiscale
 136,11,マルチスケイル
@@ -1413,7 +1413,7 @@ ability_id,local_language_id,name
 142,3,방진
 142,4,防塵
 142,5,Envelocape
-142,6,Wetterfest
+142,6,Partikelschutz
 142,7,Funda
 142,8,Copricapo
 142,9,Overcoat
@@ -1622,7 +1622,7 @@ ability_id,local_language_id,name
 163,1,ターボブレイズ
 163,3,터보블레이즈
 163,4,渦輪火焰
-163,5,TurboBrasier
+163,5,Turbo Brasier
 163,6,Turbobrand
 163,7,Turbollama
 163,8,Piroturbina
@@ -2319,6 +2319,356 @@ ability_id,local_language_id,name
 232,9,Prism Armor
 232,11,プリズムアーマー
 232,12,棱镜装甲
+233,1,ブレインフォース
+233,3,브레인포스
+233,4,腦核之力
+233,5,Cérébro-Force
+233,6,Zerebralmacht
+233,7,Fuerza Cerebral
+233,8,Cerebroforza
+233,9,Neuroforce
+233,11,ブレインフォース
+233,12,脑核之力
+234,1,ふとうのけん
+234,3,불요의검
+234,4,不撓之劍
+234,5,Lame Indomptable
+234,6,Kühnes Schwert
+234,7,Espada Indómita
+234,8,Spada Indomita
+234,9,Intrepid Sword
+234,11,ふとうのけん
+234,12,不挠之剑
+235,1,ふくつのたて
+235,3,불굴의방패
+235,4,不屈之盾
+235,5,Égide Inflexible
+235,6,Wackerer Schild
+235,7,Escudo Recio
+235,8,Scudo Saldo
+235,9,Dauntless Shield
+235,11,ふくつのたて
+235,12,不屈之盾
+236,1,リベロ
+236,3,리베로
+236,4,自由者
+236,5,Libéro
+236,6,Libero
+236,7,Líbero
+236,8,Libero
+236,9,Libero
+236,11,リベロ
+236,12,自由者
+237,1,たまひろい
+237,3,볼줍기
+237,4,撿球
+237,5,Ramasse Ball
+237,6,Apport
+237,7,Recogebolas
+237,8,Raccattapalle
+237,9,Ball Fetch
+237,11,たまひろい
+237,12,捡球
+238,1,わたげ
+238,3,솜털
+238,4,棉絮
+238,5,Effilochage
+238,6,Wollflaum
+238,7,Pelusa
+238,8,Lanugine
+238,9,Cotton Down
+238,11,わたげ
+238,12,棉絮
+239,1,スクリューおびれ
+239,3,스크루지느러미
+239,4,螺旋尾鰭
+239,5,Propulseur
+239,6,Schraubflosse
+239,7,Hélice Caudal
+239,8,Elicopinna
+239,9,Propeller Tail
+239,11,スクリューおびれ
+239,12,螺旋尾鳍
+240,1,ミラーアーマー
+240,3,미러아머
+240,4,鏡甲
+240,5,Armure Miroir
+240,6,Spiegelrüstung
+240,7,Coraza Reflejo
+240,8,Blindospecchio
+240,9,Mirror Armor
+240,11,ミラーアーマー
+240,12,镜甲
+241,1,うのミサイル
+241,3,그대로꿀꺽미사일
+241,4,一口飛彈
+241,5,Dégobage
+241,6,Würggeschoss
+241,7,Tragamisil
+241,8,Inghiottimissile
+241,9,Gulp Missile
+241,11,うのミサイル
+241,12,一口导弹
+242,1,すじがねいり
+242,3,굳건한신념
+242,4,堅毅
+242,5,Nerfs d’Acier
+242,6,Stahlrückgrat
+242,7,Acérrimo
+242,8,Volontà di Ferro
+242,9,Stalwart
+242,11,すじがねいり
+242,12,坚毅
+243,1,じょうききかん
+243,3,증기기관
+243,4,蒸汽機
+243,5,Turbine
+243,6,Dampfantrieb
+243,7,Combustible
+243,8,Vapormacchina
+243,9,Steam Engine
+243,11,じょうききかん
+243,12,蒸汽机
+244,1,パンクロック
+244,3,펑크록
+244,4,龐克搖滾
+244,5,Punk Rock
+244,6,Punk Rock
+244,7,Punk Rock
+244,8,Punk Rock
+244,9,Punk Rock
+244,11,パンクロック
+244,12,庞克摇滚
+245,1,すなはき
+245,3,모래뿜기
+245,4,吐沙
+245,5,Expul’Sable
+245,6,Sandspeier
+245,7,Expulsarena
+245,8,Sputasabbia
+245,9,Sand Spit
+245,11,すなはき
+245,12,吐沙
+246,1,こおりのりんぷん
+246,3,얼음인분
+246,4,冰鱗粉
+246,5,Écailles Glacées
+246,6,Eisflügelstaub
+246,7,Escama de Hielo
+246,8,Geloscaglie
+246,9,Ice Scales
+246,11,こおりのりんぷん
+246,12,冰鳞粉
+247,1,じゅくせい
+247,3,숙성
+247,4,熟成
+247,5,Mûrissement
+247,6,Heranreifen
+247,7,Maduración
+247,8,Maturazione
+247,9,Ripen
+247,11,じゅくせい
+247,12,熟成
+248,1,アイスフェイス
+248,3,아이스페이스
+248,4,結凍頭
+248,5,Tête de Gel
+248,6,Tiefkühlkopf
+248,7,Cara de Hielo
+248,8,Gelofaccia
+248,9,Ice Face
+248,11,アイスフェイス
+248,12,结冻头
+249,1,パワースポット
+249,3,파워스폿
+249,4,能量點
+249,5,Cercle d’Énergie
+249,6,Kraftquelle
+249,7,Fuente Energía
+249,8,Fonte Energetica
+249,9,Power Spot
+249,11,パワースポット
+249,12,能量点
+250,1,ぎたい
+250,3,의태
+250,4,擬態
+250,5,Mimétisme
+250,6,Mimese
+250,7,Mimetismo
+250,8,Mimetismo
+250,9,Mimicry
+250,11,ぎたい
+250,12,拟态
+251,1,バリアフリー
+251,3,배리어프리
+251,4,除障
+251,5,Brise-Barrière
+251,6,Hemmungslos
+251,7,Antibarrera
+251,8,Annullabarriere
+251,9,Screen Cleaner
+251,11,バリアフリー
+251,12,除障
+252,1,はがねのせいしん
+252,3,강철정신
+252,4,鋼之意志
+252,5,Boost Acier
+252,6,Stählerner Wille
+252,7,Alma Acerada
+252,8,Spiritoferreo
+252,9,Steely Spirit
+252,11,はがねのせいしん
+252,12,钢之意志
+253,1,ほろびのボディ
+253,3,멸망의바디
+253,4,滅亡之軀
+253,5,Corps Condamné
+253,6,Unheilskörper
+253,7,Cuerpo Mortal
+253,8,Ultimotocco
+253,9,Perish Body
+253,11,ほろびのボディ
+253,12,灭亡之躯
+254,1,さまようたましい
+254,3,떠도는영혼
+254,4,遊魂
+254,5,Âme Vagabonde
+254,6,Rastlose Seele
+254,7,Alma Errante
+254,8,Anima Errante
+254,9,Wandering Spirit
+254,11,さまようたましい
+254,12,游魂
+255,1,ごりむちゅう
+255,3,무아지경
+255,4,一猩一意
+255,5,Entêtement
+255,6,Affenfokus
+255,7,Monotema
+255,8,Vigorilla
+255,9,Gorilla Tactics
+255,11,ごりむちゅう
+255,12,一猩一意
+256,1,かがくへんかガス
+256,3,화학변화가스
+256,4,化學變化氣體
+256,5,Gaz Inhibiteur
+256,6,Reaktionsgas
+256,7,Gas Reactivo
+256,8,Gas Reagente
+256,9,Neutralizing Gas
+256,11,かがくへんかガス
+256,12,化学变化气体
+257,1,パステルベール
+257,3,파스텔베일
+257,4,粉彩護幕
+257,5,Voile Pastel
+257,6,Pastellhülle
+257,7,Velo Pastel
+257,8,Pastelvelo
+257,9,Pastel Veil
+257,11,パステルベール
+257,12,粉彩护幕
+258,1,はらぺこスイッチ
+258,3,꼬르륵스위치
+258,4,飽了又餓
+258,5,Déclic Fringale
+258,6,Heißhunger
+258,7,Mutapetito
+258,8,Pancialterna
+258,9,Hunger Switch
+258,11,はらぺこスイッチ
+258,12,饱了又饿
+259,1,クイックドロウ
+259,3,퀵드로
+259,4,速擊
+259,5,Tir Vif
+259,6,Schnellschuss
+259,7,Mano Rápida
+259,8,Colpolesto
+259,9,Quick Draw
+259,11,クイックドロウ
+259,12,速击
+260,1,ふかしのこぶし
+260,3,보이지않는주먹
+260,4,無形拳
+260,5,Poing Invisible
+260,6,Verborgene Faust
+260,7,Puño Invisible
+260,8,Pugni Invisibili
+260,9,Unseen Fist
+260,11,ふかしのこぶし
+260,12,无形拳
+261,1,きみょうなくすり
+261,3,기묘한약
+261,4,怪藥
+261,5,Breuvage Suspect
+261,6,Kuriose Arznei
+261,7,Medicina Extraña
+261,8,Stranofarmaco
+261,9,Curious Medicine
+261,11,きみょうなくすり
+261,12,怪药
+262,1,トランジスタ
+262,3,트랜지스터
+262,4,電晶體
+262,5,Transistor
+262,6,Transistor
+262,7,Transistor
+262,8,Transistor
+262,9,Transistor
+262,11,トランジスタ
+262,12,电晶体
+263,1,りゅうのあぎと
+263,3,용의턱
+263,4,龍顎
+263,5,Dent de Dragon
+263,6,Drachenkiefer
+263,7,Mandíbula Dragón
+263,8,Dragomascelle
+263,9,Dragon’s Maw
+263,11,りゅうのあぎと
+263,12,龙颚
+264,1,しろのいななき
+264,3,백의울음
+264,4,蒼白嘶鳴
+264,5,Blanche Ruade
+264,6,Helles Wiehern
+264,7,Relincho Blanco
+264,8,Nitrito Bianco
+264,9,Chilling Neigh
+264,11,しろのいななき
+264,12,苍白嘶鸣
+265,1,くろのいななき
+265,3,흑의울음
+265,4,漆黑嘶鳴
+265,5,Sombre Ruade
+265,6,Dunkles Wiehern
+265,7,Relincho Negro
+265,8,Nitrito Nero
+265,9,Grim Neigh
+265,11,くろのいななき
+265,12,漆黑嘶鸣
+266,1,じんばいったい
+266,3,혼연일체
+266,4,人馬一體
+266,5,Osmose Équine
+266,6,Reitgespann
+266,7,Unidad Ecuestre
+266,8,Sintonia Equina
+266,9,As One
+266,11,じんばいったい
+266,12,人马一体
+267,1,じんばいったい
+267,3,혼연일체
+267,4,人馬一體
+267,5,Osmose Équine
+267,6,Reitgespann
+267,7,Unidad Ecuestre
+267,8,Sintonia Equina
+267,9,As One
+267,11,じんばいったい
+267,12,人马一体
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

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

@@ -414,3 +414,56 @@ id,baby_trigger_item_id
 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,4 +5,5 @@ id,main_region_id,identifier
 4,4,generation-iv
 5,5,generation-v
 6,6,generation-vi
-7,7,sun-moon
+7,7,generation-vii
+8,8,generation-viii

pokedex/data/csv/item_categories.csv

@@ -44,3 +44,8 @@ id,pocket_id,identifier
 44,1,mega-stones
 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

@@ -44,3 +44,8 @@ item_category_id,local_language_id,name
 44,9,Mega Stones
 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_pocket_names.csv

@@ -1,17 +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

@@ -1432,3 +1432,90 @@ This item can only be obtained or used via the Wonder Launcher."
 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

@@ -11,3 +11,4 @@ id,iso639,iso3166,identifier,official,order
 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/machines.csv

@@ -1,4 +1,5 @@
 machine_number,version_group_id,item_id,move_id
+0,20,1288,5
 1,1,305,5
 1,2,305,5
 1,3,305,223
@@ -16,6 +17,9 @@ machine_number,version_group_id,item_id,move_id
 1,15,305,468
 1,16,305,468
 1,17,305,526
+1,18,305,526
+1,19,305,29
+1,20,305,25
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -33,6 +37,9 @@ machine_number,version_group_id,item_id,move_id
 2,15,306,337
 2,16,306,337
 2,17,306,337
+2,18,306,337
+2,19,306,269
+2,20,306,6
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -50,6 +57,9 @@ machine_number,version_group_id,item_id,move_id
 3,15,307,473
 3,16,307,473
 3,17,307,473
+3,18,307,473
+3,19,307,270
+3,20,307,7
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -67,6 +77,9 @@ machine_number,version_group_id,item_id,move_id
 4,15,308,347
 4,16,308,347
 4,17,308,347
+4,18,308,347
+4,19,308,100
+4,20,308,8
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -84,6 +97,9 @@ machine_number,version_group_id,item_id,move_id
 5,15,309,46
 5,16,309,46
 5,17,309,46
+5,18,309,46
+5,19,309,156
+5,20,309,9
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -101,6 +117,9 @@ machine_number,version_group_id,item_id,move_id
 6,15,310,92
 6,16,310,92
 6,17,310,92
+6,18,310,92
+6,19,310,113
+6,20,310,19
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -118,6 +137,9 @@ machine_number,version_group_id,item_id,move_id
 7,15,311,258
 7,16,311,258
 7,17,311,258
+7,18,311,258
+7,19,311,182
+7,20,311,42
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -135,6 +157,9 @@ machine_number,version_group_id,item_id,move_id
 8,15,312,339
 8,16,312,339
 8,17,312,339
+8,18,312,339
+8,19,312,164
+8,20,312,63
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -152,6 +177,9 @@ machine_number,version_group_id,item_id,move_id
 9,15,313,474
 9,16,313,474
 9,17,313,474
+9,18,313,474
+9,19,313,115
+9,20,313,416
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -169,6 +197,9 @@ machine_number,version_group_id,item_id,move_id
 10,15,314,237
 10,16,314,237
 10,17,314,237
+10,18,314,237
+10,19,314,91
+10,20,314,345
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -186,6 +217,9 @@ machine_number,version_group_id,item_id,move_id
 11,15,315,241
 11,16,315,241
 11,17,315,241
+11,18,315,241
+11,19,315,261
+11,20,315,76
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -203,6 +237,9 @@ machine_number,version_group_id,item_id,move_id
 12,15,316,269
 12,16,316,269
 12,17,316,269
+12,18,316,269
+12,19,316,263
+12,20,316,669
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -220,6 +257,9 @@ machine_number,version_group_id,item_id,move_id
 13,15,317,58
 13,16,317,58
 13,17,317,58
+13,18,317,58
+13,19,317,280
+13,20,317,83
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -237,6 +277,9 @@ machine_number,version_group_id,item_id,move_id
 14,15,318,59
 14,16,318,59
 14,17,318,59
+14,18,318,59
+14,19,318,19
+14,20,318,86
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -254,6 +297,9 @@ machine_number,version_group_id,item_id,move_id
 15,15,319,63
 15,16,319,63
 15,17,319,63
+15,18,319,63
+15,19,319,69
+15,20,319,91
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -271,6 +317,9 @@ machine_number,version_group_id,item_id,move_id
 16,15,320,113
 16,16,320,113
 16,17,320,113
+16,18,320,113
+16,19,320,86
+16,20,320,103
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -288,6 +337,9 @@ machine_number,version_group_id,item_id,move_id
 17,15,321,182
 17,16,321,182
 17,17,321,182
+17,18,321,182
+17,19,321,525
+17,20,321,113
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -305,6 +357,9 @@ machine_number,version_group_id,item_id,move_id
 18,15,322,240
 18,16,322,240
 18,17,322,240
+18,18,322,240
+18,19,322,369
+18,20,322,115
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -322,6 +377,9 @@ machine_number,version_group_id,item_id,move_id
 19,15,323,355
 19,16,323,355
 19,17,323,355
+19,18,323,355
+19,19,323,231
+19,20,323,219
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -339,6 +397,9 @@ machine_number,version_group_id,item_id,move_id
 20,15,324,219
 20,16,324,219
 20,17,324,219
+20,18,324,219
+20,19,324,399
+20,20,324,120
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -356,6 +417,9 @@ machine_number,version_group_id,item_id,move_id
 21,15,325,218
 21,16,325,218
 21,17,325,218
+21,18,325,218
+21,19,325,492
+21,20,325,156
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -373,6 +437,9 @@ machine_number,version_group_id,item_id,move_id
 22,15,326,76
 22,16,326,76
 22,17,326,76
+22,18,326,76
+22,19,326,157
+22,20,326,157
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -390,6 +457,9 @@ machine_number,version_group_id,item_id,move_id
 23,15,327,479
 23,16,327,479
 23,17,327,479
+23,18,327,479
+23,19,327,9
+23,20,327,168
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -407,6 +477,9 @@ machine_number,version_group_id,item_id,move_id
 24,15,328,85
 24,16,328,85
 24,17,328,85
+24,18,328,85
+24,19,328,404
+24,20,328,173
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -424,6 +497,9 @@ machine_number,version_group_id,item_id,move_id
 25,15,329,87
 25,16,329,87
 25,17,329,87
+25,18,329,87
+25,19,329,127
+25,20,329,182
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -441,6 +517,9 @@ machine_number,version_group_id,item_id,move_id
 26,15,330,89
 26,16,330,89
 26,17,330,89
+26,18,330,89
+26,19,330,398
+26,20,330,184
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -458,6 +537,9 @@ machine_number,version_group_id,item_id,move_id
 27,15,331,216
 27,16,331,216
 27,17,331,216
+27,18,331,216
+27,19,331,92
+27,20,331,196
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -475,6 +557,9 @@ machine_number,version_group_id,item_id,move_id
 28,15,332,91
 28,16,332,91
 28,17,332,141
+28,18,332,141
+28,19,332,161
+28,20,332,202
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -492,6 +577,9 @@ machine_number,version_group_id,item_id,move_id
 29,15,333,94
 29,16,333,94
 29,17,333,94
+29,18,333,94
+29,19,333,503
+29,20,333,204
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -509,6 +597,9 @@ machine_number,version_group_id,item_id,move_id
 30,15,334,247
 30,16,334,247
 30,17,334,247
+30,18,334,247
+30,19,334,339
+30,20,334,211
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -526,6 +617,9 @@ machine_number,version_group_id,item_id,move_id
 31,15,335,280
 31,16,335,280
 31,17,335,280
+31,18,335,280
+31,19,335,7
+31,20,335,213
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -543,6 +637,9 @@ machine_number,version_group_id,item_id,move_id
 32,15,336,104
 32,16,336,104
 32,17,336,104
+32,18,336,104
+32,19,336,605
+32,20,336,201
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -560,6 +657,9 @@ machine_number,version_group_id,item_id,move_id
 33,15,337,115
 33,16,337,115
 33,17,337,115
+33,18,337,115
+33,19,337,347
+33,20,337,240
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -577,6 +677,9 @@ machine_number,version_group_id,item_id,move_id
 34,15,338,482
 34,16,338,482
 34,17,338,482
+34,18,338,482
+34,19,338,406
+34,20,338,241
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -594,6 +697,9 @@ machine_number,version_group_id,item_id,move_id
 35,15,339,53
 35,16,339,53
 35,17,339,53
+35,18,339,53
+35,19,339,8
+35,20,339,258
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -611,6 +717,9 @@ machine_number,version_group_id,item_id,move_id
 36,15,340,188
 36,16,340,188
 36,17,340,188
+36,18,340,188
+36,19,340,85
+36,20,340,250
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -628,6 +737,9 @@ machine_number,version_group_id,item_id,move_id
 37,15,341,201
 37,16,341,201
 37,17,341,201
+37,18,341,201
+37,19,341,53
+37,20,341,251
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -645,6 +757,9 @@ machine_number,version_group_id,item_id,move_id
 38,15,342,126
 38,16,342,126
 38,17,342,126
+38,18,342,126
+38,19,342,87
+38,20,342,261
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -662,6 +777,9 @@ machine_number,version_group_id,item_id,move_id
 39,15,343,317
 39,16,343,317
 39,17,343,317
+39,18,343,317
+39,19,343,200
+39,20,343,263
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -679,6 +797,9 @@ machine_number,version_group_id,item_id,move_id
 40,15,344,332
 40,16,344,332
 40,17,344,332
+40,18,344,332
+40,19,344,94
+40,20,344,129
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -696,6 +817,9 @@ machine_number,version_group_id,item_id,move_id
 41,15,345,259
 41,16,345,259
 41,17,345,259
+41,18,345,259
+41,19,345,89
+41,20,345,270
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -713,6 +837,9 @@ machine_number,version_group_id,item_id,move_id
 42,15,346,263
 42,16,346,263
 42,17,346,263
+42,18,346,263
+42,19,346,120
+42,20,346,279
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -730,6 +857,9 @@ machine_number,version_group_id,item_id,move_id
 43,15,347,488
 43,16,347,488
 43,17,347,488
+43,18,347,488
+43,19,347,247
+43,20,347,280
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -747,6 +877,9 @@ machine_number,version_group_id,item_id,move_id
 44,15,348,156
 44,16,348,156
 44,17,348,156
+44,18,348,156
+44,19,348,583
+44,20,348,286
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -764,6 +897,9 @@ machine_number,version_group_id,item_id,move_id
 45,15,349,213
 45,16,349,213
 45,17,349,213
+45,18,349,213
+45,19,349,76
+45,20,349,291
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -781,6 +917,9 @@ machine_number,version_group_id,item_id,move_id
 46,15,350,168
 46,16,350,168
 46,17,350,168
+46,18,350,168
+46,19,350,126
+46,20,350,311
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -798,6 +937,9 @@ machine_number,version_group_id,item_id,move_id
 47,15,351,490
 47,16,351,490
 47,17,351,490
+47,18,351,490
+47,19,351,57
+47,20,351,313
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -815,6 +957,9 @@ machine_number,version_group_id,item_id,move_id
 48,15,352,496
 48,16,352,496
 48,17,352,496
+48,18,352,496
+48,19,352,63
+48,20,352,317
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -832,6 +977,9 @@ machine_number,version_group_id,item_id,move_id
 49,15,353,497
 49,16,353,497
 49,17,353,497
+49,18,353,497
+49,19,353,276
+49,20,353,328
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -849,6 +997,9 @@ machine_number,version_group_id,item_id,move_id
 50,15,354,315
 50,16,354,315
 50,17,354,315
+50,18,354,315
+50,19,354,355
+50,20,354,331
 51,8,355,355
 51,9,355,355
 51,10,355,355
@@ -857,6 +1008,9 @@ machine_number,version_group_id,item_id,move_id
 51,15,355,211
 51,16,355,211
 51,17,355,211
+51,18,355,211
+51,19,355,59
+51,20,355,333
 52,8,356,411
 52,9,356,411
 52,10,356,411
@@ -865,6 +1019,9 @@ machine_number,version_group_id,item_id,move_id
 52,15,356,411
 52,16,356,411
 52,17,356,411
+52,18,356,411
+52,19,356,188
+52,20,356,340
 53,8,357,412
 53,9,357,412
 53,10,357,412
@@ -873,6 +1030,9 @@ machine_number,version_group_id,item_id,move_id
 53,15,357,412
 53,16,357,412
 53,17,357,412
+53,18,357,412
+53,19,357,72
+53,20,357,341
 54,8,358,206
 54,9,358,206
 54,10,358,206
@@ -881,6 +1041,9 @@ machine_number,version_group_id,item_id,move_id
 54,15,358,206
 54,16,358,206
 54,17,358,206
+54,18,358,206
+54,19,358,430
+54,20,358,350
 55,8,359,362
 55,9,359,362
 55,10,359,362
@@ -889,6 +1052,9 @@ machine_number,version_group_id,item_id,move_id
 55,15,359,503
 55,16,359,503
 55,17,359,503
+55,18,359,503
+55,19,359,58
+55,20,359,362
 56,8,360,374
 56,9,360,374
 56,10,360,374
@@ -897,6 +1063,9 @@ machine_number,version_group_id,item_id,move_id
 56,15,360,374
 56,16,360,374
 56,17,360,374
+56,18,360,374
+56,19,360,446
+56,20,360,369
 57,8,361,451
 57,9,361,451
 57,10,361,451
@@ -905,6 +1074,9 @@ machine_number,version_group_id,item_id,move_id
 57,15,361,451
 57,16,361,451
 57,17,361,451
+57,18,361,451
+57,19,361,6
+57,20,361,371
 58,8,362,203
 58,9,362,203
 58,10,362,203
@@ -913,6 +1085,9 @@ machine_number,version_group_id,item_id,move_id
 58,15,362,507
 58,16,362,507
 58,17,362,507
+58,18,362,507
+58,19,362,529
+58,20,362,372
 59,8,363,406
 59,9,363,406
 59,10,363,406
@@ -921,6 +1096,9 @@ machine_number,version_group_id,item_id,move_id
 59,15,363,510
 59,16,363,510
 59,17,363,693
+59,18,363,693
+59,19,363,138
+59,20,363,374
 60,8,364,409
 60,9,364,409
 60,10,364,409
@@ -929,6 +1107,9 @@ machine_number,version_group_id,item_id,move_id
 60,15,364,511
 60,16,364,511
 60,17,364,511
+60,18,364,511
+60,19,364,224
+60,20,364,384
 61,8,365,261
 61,9,365,261
 61,10,365,261
@@ -937,6 +1118,8 @@ machine_number,version_group_id,item_id,move_id
 61,15,365,261
 61,16,365,261
 61,17,365,261
+61,18,365,261
+61,20,365,385
 62,8,366,318
 62,9,366,318
 62,10,366,318
@@ -945,6 +1128,8 @@ machine_number,version_group_id,item_id,move_id
 62,15,366,512
 62,16,366,512
 62,17,366,512
+62,18,366,512
+62,20,366,683
 63,8,367,373
 63,9,367,373
 63,10,367,373
@@ -953,6 +1138,8 @@ machine_number,version_group_id,item_id,move_id
 63,15,367,373
 63,16,367,373
 63,17,367,373
+63,18,367,373
+63,20,367,409
 64,8,368,153
 64,9,368,153
 64,10,368,153
@@ -961,6 +1148,8 @@ machine_number,version_group_id,item_id,move_id
 64,15,368,153
 64,16,368,153
 64,17,368,153
+64,18,368,153
+64,20,368,419
 65,8,369,421
 65,9,369,421
 65,10,369,421
@@ -969,6 +1158,8 @@ machine_number,version_group_id,item_id,move_id
 65,15,369,421
 65,16,369,421
 65,17,369,421
+65,18,369,421
+65,20,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
@@ -977,6 +1168,8 @@ machine_number,version_group_id,item_id,move_id
 66,15,370,371
 66,16,370,371
 66,17,370,371
+66,18,370,371
+66,20,370,422
 67,8,371,278
 67,9,371,278
 67,10,371,278
@@ -985,6 +1178,8 @@ machine_number,version_group_id,item_id,move_id
 67,15,371,514
 67,16,371,514
 67,17,371,684
+67,18,371,684
+67,20,371,423
 68,8,372,416
 68,9,372,416
 68,10,372,416
@@ -993,6 +1188,8 @@ machine_number,version_group_id,item_id,move_id
 68,15,372,416
 68,16,372,416
 68,17,372,416
+68,18,372,416
+68,20,372,424
 69,8,373,397
 69,9,373,397
 69,10,373,397
@@ -1001,6 +1198,8 @@ machine_number,version_group_id,item_id,move_id
 69,15,373,397
 69,16,373,397
 69,17,373,397
+69,18,373,397
+69,20,373,427
 70,8,374,148
 70,9,374,148
 70,10,374,148
@@ -1009,6 +1208,8 @@ machine_number,version_group_id,item_id,move_id
 70,15,374,148
 70,16,374,148
 70,17,374,694
+70,18,374,694
+70,20,374,433
 71,8,375,444
 71,9,375,444
 71,10,375,444
@@ -1017,6 +1218,8 @@ machine_number,version_group_id,item_id,move_id
 71,15,375,444
 71,16,375,444
 71,17,375,444
+71,18,375,444
+71,20,375,472
 72,8,376,419
 72,9,376,419
 72,10,376,419
@@ -1025,6 +1228,8 @@ machine_number,version_group_id,item_id,move_id
 72,15,376,521
 72,16,376,521
 72,17,376,521
+72,18,376,521
+72,20,376,478
 73,8,377,86
 73,9,377,86
 73,10,377,86
@@ -1033,6 +1238,8 @@ machine_number,version_group_id,item_id,move_id
 73,15,377,86
 73,16,377,86
 73,17,377,86
+73,18,377,86
+73,20,377,440
 74,8,378,360
 74,9,378,360
 74,10,378,360
@@ -1041,6 +1248,8 @@ machine_number,version_group_id,item_id,move_id
 74,15,378,360
 74,16,378,360
 74,17,378,360
+74,18,378,360
+74,20,378,474
 75,8,379,14
 75,9,379,14
 75,10,379,14
@@ -1049,6 +1258,8 @@ machine_number,version_group_id,item_id,move_id
 75,15,379,14
 75,16,379,14
 75,17,379,14
+75,18,379,14
+75,20,379,490
 76,8,380,446
 76,9,380,446
 76,10,380,446
@@ -1057,6 +1268,8 @@ machine_number,version_group_id,item_id,move_id
 76,15,380,522
 76,16,380,522
 76,17,380,19
+76,18,380,19
+76,20,380,496
 77,8,381,244
 77,9,381,244
 77,10,381,244
@@ -1065,6 +1278,8 @@ machine_number,version_group_id,item_id,move_id
 77,15,381,244
 77,16,381,244
 77,17,381,244
+77,18,381,244
+77,20,381,506
 78,8,382,445
 78,9,382,445
 78,10,382,445
@@ -1073,6 +1288,8 @@ machine_number,version_group_id,item_id,move_id
 78,15,382,523
 78,16,382,523
 78,17,382,523
+78,18,382,523
+78,20,382,512
 79,8,383,399
 79,9,383,399
 79,10,383,399
@@ -1081,6 +1298,8 @@ machine_number,version_group_id,item_id,move_id
 79,15,383,524
 79,16,383,524
 79,17,383,524
+79,18,383,524
+79,20,383,514
 80,8,384,157
 80,9,384,157
 80,10,384,157
@@ -1089,6 +1308,8 @@ machine_number,version_group_id,item_id,move_id
 80,15,384,157
 80,16,384,157
 80,17,384,157
+80,18,384,157
+80,20,384,521
 81,8,385,404
 81,9,385,404
 81,10,385,404
@@ -1097,6 +1318,8 @@ machine_number,version_group_id,item_id,move_id
 81,15,385,404
 81,16,385,404
 81,17,385,404
+81,18,385,404
+81,20,385,523
 82,8,386,214
 82,9,386,214
 82,10,386,214
@@ -1105,6 +1328,8 @@ machine_number,version_group_id,item_id,move_id
 82,15,386,525
 82,16,386,525
 82,17,386,525
+82,18,386,525
+82,20,386,527
 83,8,387,363
 83,9,387,363
 83,10,387,363
@@ -1113,6 +1338,8 @@ machine_number,version_group_id,item_id,move_id
 83,15,387,611
 83,16,387,611
 83,17,387,611
+83,18,387,611
+83,20,387,534
 84,8,388,398
 84,9,388,398
 84,10,388,398
@@ -1121,6 +1348,8 @@ machine_number,version_group_id,item_id,move_id
 84,15,388,398
 84,16,388,398
 84,17,388,398
+84,18,388,398
+84,20,388,541
 85,8,389,138
 85,9,389,138
 85,10,389,138
@@ -1129,6 +1358,8 @@ machine_number,version_group_id,item_id,move_id
 85,15,389,138
 85,16,389,138
 85,17,389,138
+85,18,389,138
+85,20,389,555
 86,8,390,447
 86,9,390,447
 86,10,390,447
@@ -1137,6 +1368,8 @@ machine_number,version_group_id,item_id,move_id
 86,15,390,447
 86,16,390,447
 86,17,390,447
+86,18,390,447
+86,20,390,566
 87,8,391,207
 87,9,391,207
 87,10,391,207
@@ -1145,6 +1378,8 @@ machine_number,version_group_id,item_id,move_id
 87,15,391,207
 87,16,391,207
 87,17,391,207
+87,18,391,207
+87,20,391,577
 88,8,392,365
 88,9,392,365
 88,10,392,365
@@ -1153,6 +1388,8 @@ machine_number,version_group_id,item_id,move_id
 88,15,392,214
 88,16,392,214
 88,17,392,214
+88,18,392,214
+88,20,392,580
 89,8,393,369
 89,9,393,369
 89,10,393,369
@@ -1161,6 +1398,8 @@ machine_number,version_group_id,item_id,move_id
 89,15,393,369
 89,16,393,369
 89,17,393,369
+89,18,393,369
+89,20,393,581
 90,8,394,164
 90,9,394,164
 90,10,394,164
@@ -1169,6 +1408,8 @@ machine_number,version_group_id,item_id,move_id
 90,15,394,164
 90,16,394,164
 90,17,394,164
+90,18,394,164
+90,20,394,604
 91,8,395,430
 91,9,395,430
 91,10,395,430
@@ -1177,6 +1418,8 @@ machine_number,version_group_id,item_id,move_id
 91,15,395,430
 91,16,395,430
 91,17,395,430
+91,18,395,430
+91,20,395,678
 92,8,396,433
 92,9,396,433
 92,10,396,433
@@ -1185,36 +1428,54 @@ machine_number,version_group_id,item_id,move_id
 92,15,396,433
 92,16,396,433
 92,17,396,433
+92,18,396,433
+92,20,396,595
 93,11,659,528
 93,14,659,528
 93,15,659,528
-93,16,397,528
+93,16,659,528
 93,17,659,528
+93,18,659,528
+93,20,659,598
 94,11,660,249
 94,14,660,249
 94,15,660,249
-94,16,398,290
+94,16,660,290
 94,17,660,57
+94,18,660,57
+94,20,660,206
 95,11,661,555
 95,14,661,555
 95,15,661,555
-95,16,399,555
+95,16,661,555
 95,17,661,555
+95,18,661,555
+95,20,661,403
 96,15,745,267
-96,16,400,267
+96,16,745,267
 96,17,745,267
+96,18,745,267
+96,20,745,684
 97,15,746,399
-97,16,401,399
+97,16,746,399
 97,17,746,399
+97,18,746,399
+97,20,746,693
 98,15,747,612
-98,16,402,612
+98,16,747,612
 98,17,747,127
+98,18,747,127
+98,20,747,707
 99,15,748,605
-99,16,403,605
+99,16,748,605
 99,17,748,605
+99,18,748,605
+99,20,748,784
 100,15,749,590
-100,16,404,590
+100,16,749,590
 100,17,749,590
+100,18,749,590
+100,20,1188,14
 101,1,397,15
 101,2,397,15
 101,3,397,15
@@ -1231,6 +1492,7 @@ machine_number,version_group_id,item_id,move_id
 101,14,397,15
 101,15,397,15
 101,16,397,15
+101,20,1189,34
 102,1,398,19
 102,2,398,19
 102,3,398,19
@@ -1247,6 +1509,7 @@ machine_number,version_group_id,item_id,move_id
 102,14,398,19
 102,15,398,19
 102,16,398,19
+102,20,1190,53
 103,1,399,57
 103,2,399,57
 103,3,399,57
@@ -1263,6 +1526,7 @@ machine_number,version_group_id,item_id,move_id
 103,14,399,57
 103,15,399,57
 103,16,399,57
+103,20,1191,56
 104,1,400,70
 104,2,400,70
 104,3,400,70
@@ -1279,6 +1543,7 @@ machine_number,version_group_id,item_id,move_id
 104,14,400,70
 104,15,400,70
 104,16,400,70
+104,20,1192,57
 105,1,401,148
 105,2,401,148
 105,3,401,148
@@ -1295,6 +1560,7 @@ machine_number,version_group_id,item_id,move_id
 105,14,401,127
 105,15,401,127
 105,16,401,127
+105,20,1193,58
 106,3,402,250
 106,4,402,250
 106,5,402,249
@@ -1308,6 +1574,7 @@ machine_number,version_group_id,item_id,move_id
 106,13,402,249
 106,14,402,291
 106,16,402,249
+106,20,1194,59
 107,3,403,127
 107,4,403,127
 107,5,403,127
@@ -1319,6 +1586,7 @@ machine_number,version_group_id,item_id,move_id
 107,12,403,127
 107,13,403,127
 107,16,403,291
+107,20,1195,67
 108,5,404,291
 108,6,404,291
 108,7,404,291
@@ -1327,3 +1595,95 @@ machine_number,version_group_id,item_id,move_id
 108,10,404,431
 108,12,404,291
 108,13,404,291
+108,20,1196,85
+109,20,1197,87
+110,20,1198,89
+111,20,1199,94
+112,20,1200,97
+113,20,1201,116
+114,20,1202,118
+115,20,1203,126
+116,20,1204,127
+117,20,1205,133
+118,20,1206,141
+119,20,1207,161
+120,20,1208,164
+121,20,1209,179
+122,20,1210,188
+123,20,1211,191
+124,20,1212,200
+125,20,1213,473
+126,20,1214,203
+127,20,1215,214
+128,20,1216,224
+129,20,1217,226
+130,20,1218,227
+131,20,1219,231
+132,20,1220,242
+133,20,1221,247
+134,20,1222,248
+135,20,1223,253
+136,20,1224,257
+137,20,1225,269
+138,20,1226,271
+139,20,1227,276
+140,20,1228,285
+141,20,1229,299
+142,20,1230,304
+143,20,1231,315
+144,20,1232,322
+145,20,1233,330
+146,20,1234,334
+147,20,1235,337
+148,20,1236,339
+149,20,1237,347
+150,20,1238,348
+151,20,1239,349
+152,20,1240,360
+153,20,1241,370
+154,20,1242,390
+155,20,1243,394
+156,20,1244,396
+157,20,1245,398
+158,20,1246,399
+159,20,1247,402
+160,20,1248,404
+161,20,1249,405
+162,20,1250,406
+163,20,1251,408
+164,20,1252,411
+165,20,1253,412
+166,20,1254,413
+167,20,1255,414
+168,20,1256,417
+169,20,1257,428
+170,20,1258,430
+171,20,1259,437
+172,20,1260,438
+173,20,1261,441
+174,20,1262,442
+175,20,1263,444
+176,20,1264,446
+177,20,1265,447
+178,20,1266,482
+179,20,1267,484
+180,20,1268,486
+181,20,1269,492
+182,20,1270,500
+183,20,1271,502
+184,20,1272,503
+185,20,1273,526
+186,20,1274,528
+187,20,1275,529
+188,20,1276,535
+189,20,1277,542
+190,20,1278,583
+191,20,1279,599
+192,20,1280,605
+193,20,1281,663
+194,20,1282,667
+195,20,1283,675
+196,20,1284,676
+197,20,1285,706
+198,20,1286,710
+199,20,1287,776

pokedex/data/csv/move_changelog.csv

@@ -33,9 +33,15 @@ 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,
@@ -51,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,,,,,
@@ -69,6 +76,8 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 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,,,,
@@ -100,6 +109,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 210,11,,10,,,,,,
 210,15,,20,,,,,,
 215,15,,,,,,4,,
+229,20,,20,,,,,,
 236,15,1,,,,,,,
 237,15,,1,,,,,,
 248,11,,80,15,90,,,,
@@ -128,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,,,,,,
@@ -175,3 +186,13 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 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

@@ -6,7 +6,7 @@ move_damage_class_id,local_language_id,name,description
 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,とくしゅ,とくしゅのダメージ。とくこうととくぼうを行使する

pokedex/data/csv/move_effect_prose.csv

@@ -1110,6 +1110,32 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
 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."

pokedex/data/csv/move_effects.csv

@@ -396,6 +396,32 @@ id
 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

pokedex/data/csv/move_flag_map.csv

@@ -165,6 +165,7 @@ move_id,move_flag_id
 50,5
 50,7
 50,14
+50,19
 51,4
 51,7
 52,4
@@ -422,6 +423,7 @@ move_id,move_flag_id
 158,1
 158,4
 158,7
+158,16
 159,6
 160,6
 161,4
@@ -505,6 +507,7 @@ move_id,move_flag_id
 191,20
 192,4
 192,7
+192,18
 193,4
 193,5
 193,7
@@ -640,7 +643,6 @@ move_id,move_flag_id
 249,7
 250,4
 250,7
-250,19
 251,4
 251,7
 252,1
@@ -737,6 +739,7 @@ move_id,move_flag_id
 295,7
 296,4
 296,7
+296,18
 297,4
 297,5
 297,7
@@ -849,6 +852,7 @@ move_id,move_flag_id
 335,5
 335,7
 336,6
+336,9
 337,1
 337,4
 337,7
@@ -885,6 +889,7 @@ move_id,move_flag_id
 349,21
 350,4
 350,7
+350,18
 351,4
 351,7
 352,4
@@ -950,6 +955,7 @@ move_id,move_flag_id
 377,4
 377,5
 377,7
+377,19
 378,1
 378,4
 378,7
@@ -1122,6 +1128,7 @@ move_id,move_flag_id
 439,3
 439,4
 439,7
+439,18
 440,1
 440,4
 440,7
@@ -1384,6 +1391,7 @@ move_id,move_flag_id
 544,7
 545,4
 545,7
+545,18
 546,4
 546,7
 547,4
@@ -1564,6 +1572,7 @@ move_id,move_flag_id
 617,7
 618,4
 618,7
+618,17
 619,4
 619,7
 619,20
@@ -1621,6 +1630,7 @@ move_id,move_flag_id
 675,7
 676,4
 676,7
+676,18
 677,1
 677,4
 677,7
@@ -1657,6 +1667,7 @@ move_id,move_flag_id
 689,4
 689,14
 690,4
+690,18
 691,4
 691,7
 691,9
@@ -1677,6 +1688,7 @@ move_id,move_flag_id
 706,1
 706,4
 706,7
+706,16
 707,1
 707,4
 707,7
@@ -1710,6 +1722,218 @@ move_id,move_flag_id
 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_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
@@ -618,8 +618,8 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 617,0,0,,,,,-50,0,0,0,0,0
 618,0,0,,,,,0,0,0,0,0,0
 619,0,0,,,,,0,0,0,0,0,0
-620,7,0,,,,,0,0,0,0,0,0
-621,7,0,,,,,0,0,0,0,0,0
+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
@@ -663,22 +663,22 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 662,0,0,,,,,0,0,0,0,0,0
 663,0,0,,,,,0,0,0,0,0,0
 664,0,0,,,,,0,0,0,0,0,0
-665,7,0,,,,,0,0,0,0,0,0
+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,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,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,0
-680,6,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
@@ -686,10 +686,10 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 685,13,0,,,,,0,50,0,0,0,0
 686,0,0,,,,,0,0,0,0,0,0
 687,0,0,,,,,0,0,0,0,0,0
-688,6,0,,,,,0,0,0,0,0,0
+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,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
@@ -700,21 +700,128 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 699,0,0,,,,,0,0,0,0,0,0
 700,4,1,,,,,0,0,0,100,0,0
 701,0,0,,,,,0,0,0,0,0,0
-702,2,0,,,,,0,0,0,0,0,0
+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,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,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,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,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,41 +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

@@ -20,3 +20,4 @@ id,identifier
 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

@@ -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
@@ -146,7 +146,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 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
@@ -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
@@ -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
@@ -716,8 +716,115 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 715,tearful-look,7,1,,20,,0,10,1,412,100,,,
 716,zing-zap,7,13,80,10,100,0,10,2,32,30,,,
 717,natures-madness,7,18,,10,90,0,10,3,41,,,,
-718,multi-attack,7,1,90,10,100,0,10,2,269,,,,
+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

@@ -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
@@ -1925,6 +1929,219 @@ pokemon_id,ability_id,is_hidden,slot
 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
@@ -2143,3 +2360,91 @@ pokemon_id,ability_id,is_hidden,slot
 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,9 +910,13 @@ 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
@@ -1006,3 +1018,138 @@ species_id,egg_group_id
 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
@@ -369,7 +369,6 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 369,471,1,,,,,,,,,,,,,,,,0,0
 370,476,1,,,,,,,,,,,,,,,,0,0
 371,350,1,,,,,,,,,,170,,,,,,0,0
-372,678,1,,25,2,,,,,,,,,,,,,0,0
 373,723,1,,17,,,,,,,,,,,,,,0,0
 374,724,1,,34,,,,,,,,,,,,,,0,0
 375,726,1,,17,,,,,,,,,,,,,,0,0
@@ -381,7 +380,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 381,735,1,,20,,,,day,,,,,,,,,,0,0
 382,737,1,,20,,,,,,,,,,,,,,0,0
 383,738,1,,,,,,,,,,,,,,,,0,0
-384,740,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
@@ -396,9 +395,66 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 396,763,1,,,,,,,23,,,,,,,,,0,0
 397,768,1,,30,,,,,,,,,,,,,,0,0
 398,770,1,,42,,,,,,,,,,,,,,0,0
-399,773,1,,,,,,,,,220,,,,,,,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

@@ -20,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_stats.csv

@@ -1191,7 +1191,7 @@ pokemon_id,stat_id,base_stat,effort
 199,2,75,0
 199,3,80,0
 199,4,100,0
-199,5,110,3
+199,5,110,2
 199,6,30,0
 200,1,60,0
 200,2,60,0
@@ -4081,9 +4081,9 @@ pokemon_id,stat_id,base_stat,effort
 680,6,35,0
 681,1,60,0
 681,2,50,0
-681,3,150,2
+681,3,140,2
 681,4,50,0
-681,5,150,1
+681,5,140,1
 681,6,60,0
 682,1,78,1
 682,2,52,0
@@ -4811,6 +4811,582 @@ pokemon_id,stat_id,base_stat,effort
 802,4,90,0
 802,5,90,0
 802,6,125,1
+803,1,67,0
+803,2,73,0
+803,3,67,0
+803,4,73,0
+803,5,67,0
+803,6,73,1
+804,1,73,0
+804,2,73,0
+804,3,73,0
+804,4,127,3
+804,5,73,0
+804,6,121,0
+805,1,61,0
+805,2,131,0
+805,3,211,3
+805,4,53,0
+805,5,101,0
+805,6,13,0
+806,1,53,0
+806,2,127,0
+806,3,53,0
+806,4,151,3
+806,5,79,0
+806,6,107,0
+807,1,88,0
+807,2,112,0
+807,3,75,0
+807,4,102,0
+807,5,80,0
+807,6,143,3
+808,1,46,0
+808,2,65,1
+808,3,65,0
+808,4,55,0
+808,5,35,0
+808,6,34,0
+809,1,135,0
+809,2,143,3
+809,3,143,0
+809,4,80,0
+809,5,65,0
+809,6,34,0
+810,1,50,0
+810,2,65,1
+810,3,50,0
+810,4,40,0
+810,5,40,0
+810,6,65,0
+811,1,70,0
+811,2,85,2
+811,3,70,0
+811,4,55,0
+811,5,60,0
+811,6,80,0
+812,1,100,0
+812,2,125,3
+812,3,90,0
+812,4,60,0
+812,5,70,0
+812,6,85,0
+813,1,50,0
+813,2,71,0
+813,3,40,0
+813,4,40,0
+813,5,40,0
+813,6,69,1
+814,1,65,0
+814,2,86,0
+814,3,60,0
+814,4,55,0
+814,5,60,0
+814,6,94,2
+815,1,80,0
+815,2,116,0
+815,3,75,0
+815,4,65,0
+815,5,75,0
+815,6,119,3
+816,1,50,0
+816,2,40,0
+816,3,40,0
+816,4,70,0
+816,5,40,1
+816,6,70,1
+817,1,65,0
+817,2,60,0
+817,3,55,0
+817,4,95,2
+817,5,55,0
+817,6,90,0
+818,1,70,0
+818,2,85,0
+818,3,65,0
+818,4,125,0
+818,5,65,0
+818,6,120,3
+819,1,70,1
+819,2,55,0
+819,3,55,0
+819,4,35,0
+819,5,35,0
+819,6,25,0
+820,1,120,2
+820,2,95,0
+820,3,95,0
+820,4,55,0
+820,5,75,0
+820,6,20,0
+821,1,38,0
+821,2,47,0
+821,3,35,0
+821,4,33,0
+821,5,35,0
+821,6,57,1
+822,1,68,0
+822,2,67,0
+822,3,55,0
+822,4,43,0
+822,5,55,0
+822,6,77,2
+823,1,98,0
+823,2,87,0
+823,3,105,3
+823,4,53,0
+823,5,85,0
+823,6,67,0
+824,1,25,0
+824,2,20,0
+824,3,20,0
+824,4,25,0
+824,5,45,1
+824,6,45,0
+825,1,50,0
+825,2,35,0
+825,3,80,0
+825,4,50,0
+825,5,90,2
+825,6,30,0
+826,1,60,0
+826,2,45,0
+826,3,110,0
+826,4,80,0
+826,5,120,3
+826,6,90,0
+827,1,40,0
+827,2,28,0
+827,3,28,0
+827,4,47,0
+827,5,52,1
+827,6,50,0
+828,1,70,0
+828,2,58,0
+828,3,58,0
+828,4,87,0
+828,5,92,2
+828,6,90,0
+829,1,40,0
+829,2,40,0
+829,3,60,0
+829,4,40,0
+829,5,60,1
+829,6,10,0
+830,1,60,0
+830,2,50,0
+830,3,90,0
+830,4,80,0
+830,5,120,2
+830,6,60,0
+831,1,42,0
+831,2,40,0
+831,3,55,1
+831,4,40,0
+831,5,45,0
+831,6,48,0
+832,1,72,0
+832,2,80,0
+832,3,100,2
+832,4,60,0
+832,5,90,0
+832,6,88,0
+833,1,50,0
+833,2,64,1
+833,3,50,0
+833,4,38,0
+833,5,38,0
+833,6,44,0
+834,1,90,0
+834,2,115,2
+834,3,90,0
+834,4,48,0
+834,5,68,0
+834,6,74,0
+835,1,59,1
+835,2,45,0
+835,3,50,0
+835,4,40,0
+835,5,50,0
+835,6,26,0
+836,1,69,0
+836,2,90,0
+836,3,60,0
+836,4,90,0
+836,5,60,0
+836,6,121,2
+837,1,30,0
+837,2,40,0
+837,3,50,1
+837,4,40,0
+837,5,50,0
+837,6,30,0
+838,1,80,0
+838,2,60,0
+838,3,90,2
+838,4,60,0
+838,5,70,0
+838,6,50,0
+839,1,110,0
+839,2,80,0
+839,3,120,3
+839,4,80,0
+839,5,90,0
+839,6,30,0
+840,1,40,0
+840,2,40,0
+840,3,80,1
+840,4,40,0
+840,5,40,0
+840,6,20,0
+841,1,70,0
+841,2,110,2
+841,3,80,0
+841,4,95,0
+841,5,60,0
+841,6,70,0
+842,1,110,2
+842,2,85,0
+842,3,80,0
+842,4,100,0
+842,5,80,0
+842,6,30,0
+843,1,52,0
+843,2,57,0
+843,3,75,1
+843,4,35,0
+843,5,50,0
+843,6,46,0
+844,1,72,0
+844,2,107,0
+844,3,125,2
+844,4,65,0
+844,5,70,0
+844,6,71,0
+845,1,70,0
+845,2,85,0
+845,3,55,0
+845,4,85,0
+845,5,95,2
+845,6,85,0
+846,1,41,0
+846,2,63,0
+846,3,40,0
+846,4,40,0
+846,5,30,0
+846,6,66,1
+847,1,61,0
+847,2,123,0
+847,3,60,0
+847,4,60,0
+847,5,50,0
+847,6,136,2
+848,1,40,0
+848,2,38,0
+848,3,35,0
+848,4,54,1
+848,5,35,0
+848,6,40,0
+849,1,75,0
+849,2,98,0
+849,3,70,0
+849,4,114,2
+849,5,70,0
+849,6,75,0
+850,1,50,0
+850,2,65,1
+850,3,45,0
+850,4,50,0
+850,5,50,0
+850,6,45,0
+851,1,100,0
+851,2,115,2
+851,3,65,0
+851,4,90,0
+851,5,90,0
+851,6,65,0
+852,1,50,0
+852,2,68,1
+852,3,60,0
+852,4,50,0
+852,5,50,0
+852,6,32,0
+853,1,80,0
+853,2,118,2
+853,3,90,0
+853,4,70,0
+853,5,80,0
+853,6,42,0
+854,1,40,0
+854,2,45,0
+854,3,45,0
+854,4,74,1
+854,5,54,0
+854,6,50,0
+855,1,60,0
+855,2,65,0
+855,3,65,0
+855,4,134,2
+855,5,114,0
+855,6,70,0
+856,1,42,0
+856,2,30,0
+856,3,45,0
+856,4,56,1
+856,5,53,0
+856,6,39,0
+857,1,57,0
+857,2,40,0
+857,3,65,0
+857,4,86,2
+857,5,73,0
+857,6,49,0
+858,1,57,0
+858,2,90,0
+858,3,95,0
+858,4,136,3
+858,5,103,0
+858,6,29,0
+859,1,45,0
+859,2,45,0
+859,3,30,0
+859,4,55,1
+859,5,40,0
+859,6,50,0
+860,1,65,0
+860,2,60,0
+860,3,45,0
+860,4,75,2
+860,5,55,0
+860,6,70,0
+861,1,95,0
+861,2,120,3
+861,3,65,0
+861,4,95,0
+861,5,75,0
+861,6,60,0
+862,1,93,0
+862,2,90,0
+862,3,101,3
+862,4,60,0
+862,5,81,0
+862,6,95,0
+863,1,70,0
+863,2,110,2
+863,3,100,0
+863,4,50,0
+863,5,60,0
+863,6,50,0
+864,1,60,0
+864,2,95,0
+864,3,50,0
+864,4,145,2
+864,5,130,0
+864,6,30,0
+865,1,62,0
+865,2,135,2
+865,3,95,0
+865,4,68,0
+865,5,82,0
+865,6,65,0
+866,1,80,0
+866,2,85,0
+866,3,75,0
+866,4,110,3
+866,5,100,0
+866,6,70,0
+867,1,58,0
+867,2,95,0
+867,3,145,2
+867,4,50,0
+867,5,105,0
+867,6,30,0
+868,1,45,0
+868,2,40,0
+868,3,40,0
+868,4,50,0
+868,5,61,1
+868,6,34,0
+869,1,65,0
+869,2,60,0
+869,3,75,0
+869,4,110,0
+869,5,121,2
+869,6,64,0
+870,1,65,0
+870,2,100,2
+870,3,100,0
+870,4,70,0
+870,5,60,1
+870,6,75,0
+871,1,48,0
+871,2,101,2
+871,3,95,0
+871,4,91,0
+871,5,85,0
+871,6,15,0
+872,1,30,0
+872,2,25,0
+872,3,35,0
+872,4,45,1
+872,5,30,0
+872,6,20,0
+873,1,70,0
+873,2,65,0
+873,3,60,0
+873,4,125,2
+873,5,90,0
+873,6,65,0
+874,1,100,0
+874,2,125,0
+874,3,135,2
+874,4,20,0
+874,5,20,0
+874,6,70,0
+875,1,75,0
+875,2,80,0
+875,3,110,2
+875,4,65,0
+875,5,90,0
+875,6,50,0
+876,1,60,0
+876,2,65,0
+876,3,55,0
+876,4,105,2
+876,5,95,0
+876,6,95,0
+877,1,58,0
+877,2,95,0
+877,3,58,0
+877,4,70,0
+877,5,58,0
+877,6,97,2
+878,1,72,0
+878,2,80,1
+878,3,49,0
+878,4,40,0
+878,5,49,0
+878,6,40,0
+879,1,122,0
+879,2,130,2
+879,3,69,0
+879,4,80,0
+879,5,69,0
+879,6,30,0
+880,1,90,0
+880,2,100,2
+880,3,90,0
+880,4,80,0
+880,5,70,0
+880,6,75,0
+881,1,90,0
+881,2,100,2
+881,3,90,0
+881,4,90,0
+881,5,80,0
+881,6,55,0
+882,1,90,0
+882,2,90,0
+882,3,100,2
+882,4,70,0
+882,5,80,0
+882,6,75,0
+883,1,90,0
+883,2,90,0
+883,3,100,2
+883,4,80,0
+883,5,90,0
+883,6,55,0
+884,1,70,0
+884,2,95,0
+884,3,115,0
+884,4,120,2
+884,5,50,0
+884,6,85,0
+885,1,28,0
+885,2,60,0
+885,3,30,0
+885,4,40,0
+885,5,30,0
+885,6,82,1
+886,1,68,0
+886,2,80,0
+886,3,50,0
+886,4,60,0
+886,5,50,0
+886,6,102,2
+887,1,88,0
+887,2,120,0
+887,3,75,0
+887,4,100,0
+887,5,75,0
+887,6,142,3
+888,1,92,0
+888,2,130,0
+888,3,115,0
+888,4,80,0
+888,5,115,0
+888,6,138,3
+889,1,92,0
+889,2,130,0
+889,3,115,0
+889,4,80,0
+889,5,115,0
+889,6,138,3
+890,1,140,3
+890,2,85,0
+890,3,95,0
+890,4,145,0
+890,5,95,0
+890,6,130,0
+891,1,60,0
+891,2,90,1
+891,3,60,0
+891,4,53,0
+891,5,50,0
+891,6,72,0
+892,1,100,0
+892,2,130,3
+892,3,100,0
+892,4,63,0
+892,5,60,0
+892,6,97,0
+893,1,105,0
+893,2,120,3
+893,3,105,0
+893,4,70,0
+893,5,95,0
+893,6,105,0
+894,1,80,0
+894,2,100,0
+894,3,50,0
+894,4,100,0
+894,5,50,0
+894,6,200,3
+895,1,200,3
+895,2,100,0
+895,3,50,0
+895,4,100,0
+895,5,50,0
+895,6,80,0
+896,1,100,0
+896,2,145,3
+896,3,130,0
+896,4,65,0
+896,5,110,0
+896,6,30,0
+897,1,100,0
+897,2,65,0
+897,3,60,0
+897,4,145,3
+897,5,80,0
+897,6,130,0
+898,1,100,3
+898,2,80,0
+898,3,80,0
+898,4,80,0
+898,5,80,0
+898,6,80,0
 10001,1,50,0
 10001,2,180,2
 10001,3,20,0
@@ -4962,9 +5538,9 @@ pokemon_id,stat_id,base_stat,effort
 10025,5,81,0
 10025,6,104,2
 10026,1,60,0
-10026,2,150,2
+10026,2,140,2
 10026,3,50,0
-10026,4,150,1
+10026,4,140,1
 10026,5,50,0
 10026,6,60,0
 10027,1,44,0
@@ -5693,3 +6269,285 @@ pokemon_id,stat_id,base_stat,effort
 10147,4,130,3
 10147,5,115,0
 10147,6,65,0
+10148,1,35,0
+10148,2,55,0
+10148,3,40,0
+10148,4,50,0
+10148,5,50,0
+10148,6,90,2
+10149,1,60,0
+10149,2,80,0
+10149,3,110,2
+10149,4,50,0
+10149,5,80,0
+10149,6,45,0
+10150,1,60,0
+10150,2,55,0
+10150,3,60,0
+10150,4,95,0
+10150,5,70,0
+10150,6,124,2
+10151,1,45,0
+10151,2,65,1
+10151,3,40,0
+10151,4,30,0
+10151,5,40,0
+10151,6,60,0
+10152,1,75,0
+10152,2,117,2
+10152,3,65,0
+10152,4,55,0
+10152,5,65,0
+10152,6,110,0
+10153,1,68,0
+10153,2,70,0
+10153,3,92,0
+10153,4,50,0
+10153,5,132,2
+10153,6,42,0
+10154,1,65,0
+10154,2,98,2
+10154,3,63,0
+10154,4,40,0
+10154,5,73,0
+10154,6,96,0
+10155,1,97,0
+10155,2,157,3
+10155,3,127,0
+10155,4,113,0
+10155,5,109,0
+10155,6,77,0
+10156,1,97,0
+10156,2,113,0
+10156,3,109,0
+10156,4,157,3
+10156,5,127,0
+10156,6,77,0
+10157,1,97,0
+10157,2,167,1
+10157,3,97,0
+10157,4,167,1
+10157,5,97,0
+10157,6,129,1
+10158,1,45,0
+10158,2,80,0
+10158,3,50,0
+10158,4,75,0
+10158,5,60,0
+10158,6,120,2
+10159,1,65,0
+10159,2,75,0
+10159,3,70,0
+10159,4,65,0
+10159,5,85,1
+10159,6,75,0
+10160,1,35,0
+10160,2,55,0
+10160,3,40,0
+10160,4,50,0
+10160,5,50,0
+10160,6,90,2
+10161,1,50,0
+10161,2,65,1
+10161,3,55,0
+10161,4,40,0
+10161,5,40,0
+10161,6,40,0
+10162,1,50,0
+10162,2,85,0
+10162,3,55,0
+10162,4,65,0
+10162,5,65,0
+10162,6,90,1
+10163,1,65,0
+10163,2,100,0
+10163,3,70,0
+10163,4,80,0
+10163,5,80,0
+10163,6,105,2
+10164,1,90,1
+10164,2,65,0
+10164,3,65,0
+10164,4,40,0
+10164,5,40,0
+10164,6,15,0
+10165,1,95,0
+10165,2,100,2
+10165,3,95,0
+10165,4,100,0
+10165,5,70,0
+10165,6,30,0
+10166,1,52,0
+10166,2,95,1
+10166,3,55,0
+10166,4,58,0
+10166,5,62,0
+10166,6,55,0
+10167,1,65,0
+10167,2,90,0
+10167,3,120,2
+10167,4,85,0
+10167,5,70,0
+10167,6,60,0
+10168,1,50,0
+10168,2,65,0
+10168,3,65,0
+10168,4,90,0
+10168,5,90,0
+10168,6,100,2
+10169,1,90,0
+10169,2,85,0
+10169,3,85,0
+10169,4,125,3
+10169,5,100,0
+10169,6,95,0
+10170,1,90,0
+10170,2,125,3
+10170,3,90,0
+10170,4,85,0
+10170,5,90,0
+10170,6,100,0
+10171,1,90,0
+10171,2,85,0
+10171,3,90,0
+10171,4,100,0
+10171,5,125,3
+10171,6,90,0
+10172,1,95,0
+10172,2,65,0
+10172,3,80,0
+10172,4,110,0
+10172,5,110,2
+10172,6,30,0
+10173,1,60,0
+10173,2,55,0
+10173,3,100,0
+10173,4,65,0
+10173,5,100,1
+10173,6,30,0
+10174,1,38,0
+10174,2,30,0
+10174,3,41,0
+10174,4,30,0
+10174,5,41,0
+10174,6,60,1
+10175,1,78,0
+10175,2,70,0
+10175,3,61,0
+10175,4,50,0
+10175,5,61,0
+10175,6,100,2
+10176,1,70,0
+10176,2,90,1
+10176,3,45,0
+10176,4,15,0
+10176,5,45,0
+10176,6,50,0
+10177,1,105,0
+10177,2,140,2
+10177,3,55,0
+10177,4,30,0
+10177,5,55,0
+10177,6,95,0
+10178,1,105,0
+10178,2,160,0
+10178,3,55,0
+10178,4,30,2
+10178,5,55,0
+10178,6,135,0
+10179,1,38,0
+10179,2,55,0
+10179,3,85,1
+10179,4,30,0
+10179,5,65,0
+10179,6,30,0
+10180,1,109,2
+10180,2,81,0
+10180,3,99,0
+10180,4,66,0
+10180,5,84,0
+10180,6,32,0
+10181,1,54,3
+10181,2,100,0
+10181,3,71,0
+10181,4,61,0
+10181,5,85,0
+10181,6,115,0
+10182,1,70,0
+10182,2,85,0
+10182,3,55,0
+10182,4,85,0
+10182,5,95,2
+10182,6,85,0
+10183,1,70,0
+10183,2,85,0
+10183,3,55,0
+10183,4,85,0
+10183,5,95,2
+10183,6,85,0
+10184,1,75,0
+10184,2,98,0
+10184,3,70,0
+10184,4,114,2
+10184,5,70,0
+10184,6,75,0
+10185,1,75,0
+10185,2,80,0
+10185,3,70,2
+10185,4,65,0
+10185,5,50,0
+10185,6,130,0
+10186,1,70,0
+10186,2,55,0
+10186,3,65,0
+10186,4,95,0
+10186,5,105,2
+10186,6,85,0
+10187,1,58,0
+10187,2,95,0
+10187,3,58,0
+10187,4,70,0
+10187,5,58,0
+10187,6,97,2
+10188,1,92,0
+10188,2,170,0
+10188,3,115,0
+10188,4,80,0
+10188,5,115,0
+10188,6,148,3
+10189,1,92,0
+10189,2,130,0
+10189,3,145,0
+10189,4,80,0
+10189,5,145,0
+10189,6,128,3
+10190,1,255,3
+10190,2,115,0
+10190,3,250,0
+10190,4,125,0
+10190,5,250,0
+10190,6,130,0
+10191,1,100,0
+10191,2,130,3
+10191,3,100,0
+10191,4,63,0
+10191,5,60,0
+10191,6,97,0
+10192,1,105,0
+10192,2,120,3
+10192,3,105,0
+10192,4,70,0
+10192,5,95,0
+10192,6,105,0
+10193,1,100,0
+10193,2,165,3
+10193,3,150,0
+10193,4,85,0
+10193,5,130,0
+10193,6,50,0
+10194,1,100,0
+10194,2,85,0
+10194,3,80,0
+10194,4,165,3
+10194,5,100,0
+10194,6,150,0

pokedex/data/csv/pokemon_types.csv

@@ -1203,6 +1203,142 @@ pokemon_id,type_id,slot
 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
@@ -1458,3 +1594,83 @@ pokemon_id,type_id,slot
 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,32 +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

@@ -6,3 +6,4 @@ id,identifier
 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

@@ -76,3 +76,19 @@ version_group_id,pokemon_move_method_id
 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

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

pokedex/data/csv/version_groups.csv

@@ -16,3 +16,6 @@ id,identifier,generation_id,order
 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,133 +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

@@ -27,3 +27,9 @@ id,version_group_id,identifier
 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/load.py

@@ -11,11 +11,15 @@ import sqlalchemy.sql.util
 import sqlalchemy.types
 
 import pokedex
+import pokedex.db.tables as t
 from pokedex.db import metadata, translations
 from pokedex.defaults import get_default_csv_dir
 from pokedex.db.dependencies import find_dependent_tables
 from pokedex.db.oracle import rewrite_long_table_names
 
+from sqlalchemy import and_
+from sqlalchemy.sql import exists
+
 
 def _get_table_names(metadata, patterns):
     """Returns a list of table names from the given metadata.  If `patterns`
@@ -156,8 +160,21 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
 
     # SQLite speed tweaks
     if not safe and engine.dialect.name == 'sqlite':
-        session.execute("PRAGMA synchronous=OFF")
-        session.execute("PRAGMA journal_mode=OFF")
+        # We have to explicity call close here because session.execute
+        # returns a ResultProxy object that hangs onto the database cursor
+        # in case you wanted to see the results of your statement, and
+        # these PRAGMA commands helpfully return the string 'OFF'.
+        #
+        # This would not normally be a problem, except that when
+        # journal_mode=OFF, SQLite sometimes doesn't like it when you
+        # have multiple database cursors open.
+        #
+        # This would still not normally be a problem because CPython
+        # will free the ResultProxy immediately because it isn't referenced,
+        # closing the database cursor, but this isn't true in PyPy,
+        # which doesn't use reference counting.
+        session.execute("PRAGMA synchronous=OFF").close()
+        session.execute("PRAGMA journal_mode=OFF").close()
 
     # Drop all tables if requested
     if drop_tables:
@@ -180,7 +197,29 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
 
     print_start('Creating tables')
     for n, table in enumerate(table_objs):
-        table.create()
+        try:
+            table.create(bind=engine)
+
+        # Exceptions for handling the error thrown when trying to load
+        # the database with a table that already exists.
+        except (
+            sqlalchemy.exc.OperationalError,  # Exception used for SQLite
+            sqlalchemy.exc.ProgrammingError,  # Exception used for PostgreSQL
+            sqlalchemy.exc.InternalError      # Exception used for MySQL
+            ) as error:
+
+            if "already exists" in str(error.orig):
+                print("\n\nERROR:  The table '{}' already exists in the database. "
+                    "Did you mean to use 'pokedex load -D'".format(table))
+                sys.exit(1)
+
+            # If it happens to be some other error but raised by the same
+            # exception, then an unexpected error message is sent with
+            # the error included
+            else:
+                print("\n\n UNEXPECTED ERROR: ", error)
+                sys.exit(1)
+
         print_status('%s/%s' % (n, len(table_objs)))
     print_done()
 
@@ -197,7 +236,10 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
 
         try:
             csvpath = "%s/%s.csv" % (directory, table_name)
-            csvfile = open(csvpath, 'r')
+            if six.PY2:
+                csvfile = open(csvpath, 'r')
+            else:
+                csvfile = open(csvpath, 'r', encoding="utf8")
         except IOError:
             # File doesn't exist; don't load anything!
             print_done('missing?')
@@ -332,6 +374,23 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         session.commit()
         print_done()
 
+    VGPMM = t.VersionGroupPokemonMoveMethod
+    if VGPMM.__tablename__ in table_names or t.PokemonMove.__tablename__ in table_names:
+        print_start('Regenerating %s' % VGPMM.__tablename__)
+
+        session.query(VGPMM).delete()
+
+        q = session.query(t.VersionGroup.id, t.PokemonMoveMethod.id)
+        q = q.filter(exists().where(and_(
+                t.PokemonMove.pokemon_move_method_id == t.PokemonMoveMethod.id,
+                t.PokemonMove.version_group_id == t.VersionGroup.id)))
+        for version_group_id, pokemon_move_method_id in q:
+            session.add(VGPMM(
+                    version_group_id=version_group_id,
+                    pokemon_move_method_id=pokemon_move_method_id,
+            ))
+        session.commit()
+        print_done()
 
     print_start('Translations')
     transl = translations.Translations(csv_directory=directory)
@@ -403,10 +462,12 @@ def dump(session, tables=[], directory=None, verbose=False, langs=None):
 
         # CSV module only works with bytes on 2 and only works with text on 3!
         if six.PY3:
-            writer = csv.writer(open(filename, 'w', newline=''), lineterminator='\n')
+            csvfile = open(filename, 'w', newline='', encoding="utf8")
+            writer = csv.writer(csvfile, lineterminator='\n')
             columns = [col.name for col in table.columns]
         else:
-            writer = csv.writer(open(filename, 'wb'), lineterminator='\n')
+            csvfile = open(filename, 'wb')
+            writer = csv.writer(csvfile, lineterminator='\n')
             columns = [col.name.encode('utf8') for col in table.columns]
 
         # For name tables, always dump rows for official languages, as well as
@@ -453,4 +514,5 @@ def dump(session, tables=[], directory=None, verbose=False, langs=None):
 
                 writer.writerow(csvs)
 
+        csvfile.close()
         print_done()

pokedex/db/markdown.py

@@ -11,17 +11,14 @@ which case it is replaced by the name of the thing linked to.
 """
 from __future__ import absolute_import
 
+import sys
 import re
 
 import markdown
 import six
 from sqlalchemy.orm.session import object_session
-try:
-    # Markdown 2.1+
-    from markdown.util import etree, AtomicString
-except ImportError:
-    # Old Markdown
-    from markdown import etree, AtomicString
+from markdown.util import etree, AtomicString
+
 
 @six.python_2_unicode_compatible
 class MarkdownString(object):
@@ -66,8 +63,7 @@ class MarkdownString(object):
             extension = self.session.markdown_extension
 
         md = markdown.Markdown(
-            extensions=['extra', extension],
-            safe_mode='escape',
+            extensions=['markdown.extensions.extra', EscapeHtml(), extension],
             output_format='xhtml1',
         )
 
@@ -164,7 +160,10 @@ class PokedexLinkPattern(markdown.inlinepatterns.Pattern):
 
     Handles matches using factory
     """
-    regex = u'(?x) \\[ ([^]]*) \\] \\{ ([-a-z0-9]+) : ([-a-z0-9 ]+) \\}'
+    if sys.version_info >= (3, 6):
+        regex = u'(?x: \\[ ([^]]*) \\] \\{ ([-a-z0-9]+) : ([-a-z0-9 ]+) \\} )'
+    else:
+        regex = u'(?x) \\[ ([^]]*) \\] \\{ ([-a-z0-9]+) : ([-a-z0-9 ]+) \\}'
 
     def __init__(self, factory, session, string_language=None, game_language=None):
         markdown.inlinepatterns.Pattern.__init__(self, self.regex)
@@ -228,6 +227,17 @@ class PokedexLinkPattern(markdown.inlinepatterns.Pattern):
             el.text = AtomicString(label or name)
         return el
 
+class EscapeHtml(markdown.Extension):
+    u"""Markdown extension which escapes raw html elements.
+
+    This is the recommended replacement for safe_mode='escape',
+    which was deprecated in Markdown 2.5.
+    See https://python-markdown.github.io/change_log/release-2.5/
+    """
+    def extendMarkdown(self, md, md_globals):
+        del md.preprocessors['html_block']
+        del md.inlinePatterns['html']
+
 class PokedexLinkExtension(markdown.Extension):
     u"""Markdown extension that translates the syntax used in effect text:
 

pokedex/db/multilang.py

@@ -207,11 +207,13 @@ def create_translation_table(_table_name, foreign_class, relation_name,
     return Translations
 
 class MultilangQuery(Query):
-    def __iter__(self):
+    def _execute_and_instances(self, *args, **kwargs):
+        # Set _default_language_id param if it hasn't been set by the time the query is executed.
+        # XXX This is really hacky and we should figure out a cleaner method.
         if '_default_language_id' not in self._params or self._params['_default_language_id'] == 'dummy':
             self._params = self._params.copy()
             self._params['_default_language_id'] = self.session.default_language_id
-        return super(MultilangQuery, self).__iter__()
+        return super(MultilangQuery, self)._execute_and_instances(*args, **kwargs)
 
 class MultilangSession(Session):
     """A tiny Session subclass that adds support for a default language.

pokedex/db/tables.py

@@ -90,10 +90,10 @@ class Language(TableBase):
     id = Column(Integer, primary_key=True, nullable=False,
         doc=u"A numeric ID")
     iso639 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
+        doc=u"The two-letter code of the language. Note that it is not unique.",
         info=dict(format='identifier'))
     iso3166 = Column(Unicode(79), nullable=False,
-        doc=u"The two-letter code of the language. Note that it is not unique.",
+        doc=u"The two-letter code of the country where this language is spoken. Note that it is not unique.",
         info=dict(format='identifier'))
     identifier = Column(Unicode(79), nullable=False,
         doc=u"An identifier",
@@ -850,7 +850,17 @@ create_translation_table('encounter_method_prose', EncounterMethod, 'prose',
 )
 
 class EncounterSlot(TableBase):
-    u"""An abstract "slot" within a method, associated with both some set of conditions and a rarity."""
+    u"""An abstract "slot" within a method, associated with both some set of conditions and a rarity.
+
+    "slot" has a very specific meaning:
+    If during gameplay you know sufficient details about the current game state,
+    you can predict which slot (and therefore which pokemon) will spawn.
+
+    There are currently two reasons that "slot" might be empty:
+    1) The slot corresponds to a gift pokemon.
+    2) Red/Blue's Super Rod slots, which don't correspond to in-game slots.
+       See https://github.com/veekun/pokedex/issues/166#issuecomment-220101455
+    """
 
     __tablename__ = 'encounter_slots'
     id = Column(Integer, primary_key=True, nullable=False,
@@ -1103,7 +1113,7 @@ class Location(TableBase):
         doc=u"A numeric ID")
     region_id = Column(Integer, ForeignKey('regions.id'),
         doc=u"ID of the region this location is in")
-    identifier = Column(Unicode(79), nullable=False,
+    identifier = Column(Unicode(79), nullable=False, unique=True,
         doc=u"An identifier",
         info=dict(format='identifier'))
 
@@ -1112,6 +1122,11 @@ create_translation_table('location_names', Location, 'names',
     name = Column(Unicode(79), nullable=False, index=True,
         doc=u"The name",
         info=dict(format='plaintext', official=True)),
+    subtitle = Column(Unicode(79), nullable=True, index=False,
+        doc=u"""A subtitle for the location, if any.
+            This may be an alternate name for the locaton, as in the Kalos routes,
+            or the name of a subarea of the location, as in Alola.""",
+        info=dict(format='plaintext', official=True)),
 )
 
 class LocationArea(TableBase):
@@ -1128,6 +1143,11 @@ class LocationArea(TableBase):
         doc=u"An identifier",
         info=dict(format='identifier'))
 
+    __table_args__ = (
+        UniqueConstraint(location_id, identifier),
+        {},
+    )
+
 create_translation_table('location_area_prose', LocationArea, 'prose',
     relation_lazy='joined',
     name = Column(Unicode(79), nullable=True, index=True,
@@ -1751,6 +1771,13 @@ class PokemonDexNumber(TableBase):
     pokedex_number = Column(Integer, nullable=False,
         doc=u"Number of the Pokémon in that the Pokédex")
 
+    __table_args__ = (
+        UniqueConstraint(pokedex_id, pokedex_number),
+        UniqueConstraint(pokedex_id, species_id),
+        {},
+    )
+
+
 class PokemonEggGroup(TableBase):
     u"""Maps an Egg group to a species; each species belongs to one or two egg groups."""
     __tablename__ = 'pokemon_egg_groups'
@@ -1782,7 +1809,7 @@ class PokemonEvolution(TableBase):
         doc=u"The ID of the location the evolution must be triggered at.")
     held_item_id = Column(Integer, ForeignKey('items.id'), nullable=True,
         doc=u"The ID of the item the Pokémon must hold.")
-    time_of_day = Column(Enum('day', 'night', name='pokemon_evolution_time_of_day'), nullable=True,
+    time_of_day = Column(Enum('day', 'night', 'dusk', name='pokemon_evolution_time_of_day'), nullable=True,
         doc=u"The required time of day.")
     known_move_id = Column(Integer, ForeignKey('moves.id'), nullable=True,
         doc=u"The ID of the move the Pokémon must know.")
@@ -2008,7 +2035,7 @@ class PokemonSpecies(TableBase):
         doc=u"ID of the species' evolution chain (a.k.a. family)")
     color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
         doc=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games.")
-    shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False,
+    shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=True,
         doc=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games.")
     habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
         doc=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games.")
@@ -2028,6 +2055,10 @@ class PokemonSpecies(TableBase):
         doc=u"ID of the growth rate for this family")
     forms_switchable = Column(Boolean, nullable=False,
         doc=u"True iff a particular individual of this species can switch between its different forms.")
+    is_legendary = Column(Boolean, nullable=False,
+        doc=u'True iff the Pokémon is a legendary Pokémon.')
+    is_mythical = Column(Boolean, nullable=False,
+        doc=u'True iff the Pokémon is a mythical Pokémon.')
     order = Column(Integer, nullable=False, index=True,
         doc=u'The order in which species should be sorted.  Based on National Dex order, except families are grouped together and sorted by stage.')
     conquest_order = Column(Integer, nullable=True, index=True,
@@ -2795,7 +2826,7 @@ PokemonSpecies.flavor_text = relationship(PokemonSpeciesFlavorText,
     backref='species')
 PokemonSpecies.growth_rate = relationship(GrowthRate,
     innerjoin=True,
-    backref='evolution_chains')
+    backref='species')
 PokemonSpecies.habitat = relationship(PokemonHabitat,
     backref='species')
 PokemonSpecies.color = relationship(PokemonColor,
@@ -2833,7 +2864,7 @@ PokemonSpecies.generation = relationship(Generation,
     innerjoin=True,
     backref='species')
 PokemonSpecies.shape = relationship(PokemonShape,
-    innerjoin=True,
+    innerjoin=False,
     backref='species')
 PokemonSpecies.pal_park = relationship(PalPark,
     uselist=False,

pokedex/db/translations.py

@@ -262,11 +262,15 @@ class Translations(object):
     def reader_for_class(self, cls, reader_class=csv.reader):
         tablename = cls.__table__.name
         csvpath = os.path.join(self.csv_directory, tablename + '.csv')
-        return reader_class(open(csvpath, 'r'), lineterminator='\n')
+        if six.PY2:
+            read = open(csvpath, 'r')
+        else:
+            read = open(csvpath, 'r', encoding='utf-8')
+        return reader_class(read, lineterminator='\n')
 
     def writer_for_lang(self, lang):
         csvpath = os.path.join(self.translation_directory, '%s.csv' % lang)
-        return csv.writer(io.open(csvpath, 'w', newline=''), lineterminator='\n')
+        return csv.writer(io.open(csvpath, 'w', newline='', encoding="utf8"), lineterminator='\n')
 
     def yield_source_messages(self, language_id=None):
         """Yield all messages from source CSV files
@@ -307,7 +311,10 @@ class Translations(object):
         """
         path = os.path.join(self.csv_directory, 'translations', '%s.csv' % lang)
         try:
-            file = open(path, 'r')
+            if six.PY2:
+                file = open(path, 'r')
+            else:
+                file = open(path, 'r', encoding="utf8")
         except IOError:
             return ()
         return yield_translation_csv_messages(file)
@@ -370,7 +377,10 @@ def group_by_object(stream):
     Yields ((class name, object ID), (list of messages)) pairs.
     """
     stream = iter(stream)
-    current = next(stream)
+    try:
+        current = next(stream)
+    except StopIteration:
+        return
     current_key = current.cls, current.id
     group = [current]
     for message in stream: