Merge branch 'master' into gender-differences

.circleci/config.yml

@@ -39,10 +39,9 @@ jobs:
       - run:
           name: Build database
           command: make build-db
-   
   deploy:
     machine:
-      image: ubuntu-2004:202111-01 # https://circleci.com/docs/2.0/configuration-reference/#available-machine-images with Docker 18.09.3. Newer images don't work
+      image: ubuntu-2204:2023.10.1
     resource_class: large
     steps:
       - checkout

.github/workflows/docker-build.yml

@@ -0,0 +1,42 @@
+name: Build Docker image
+
+on:
+  pull_request:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: pokeapi/pokeapi
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Inspect builder
+        run: |
+          echo "Name:      ${{ steps.buildx.outputs.name }}"
+          echo "Endpoint:  ${{ steps.buildx.outputs.endpoint }}"
+          echo "Status:    ${{ steps.buildx.outputs.status }}"
+          echo "Flags:     ${{ steps.buildx.outputs.flags }}"
+          echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
+      - name: Build
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Resources/docker/app/Dockerfile
+          push: false
+          platforms: local
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.gitignore

@@ -4,10 +4,10 @@
 *build/*
 *.DS_STORE
 db.*
-venv*
+*venv*
 node_modules
 .vscode
 *.env
 Resources/nginx/ssl/*
 !Resources/nginx/ssl/*.sample.*
-.idea*
+.idea*

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "data/v2/sprites"]
 	path = data/v2/sprites
 	url = https://github.com/PokeAPI/sprites.git
+[submodule "data/v2/cries"]
+	path = data/v2/cries
+	url = https://github.com/PokeAPI/cries.git

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) © 2013–2021 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
+Copyright (c) © 2013–2023 Paul Hallett and PokéAPI contributors (https://github.com/PokeAPI/pokeapi#contributing). Pokémon and Pokémon character names are trademarks of Nintendo.
 
 All rights reserved.
 

Makefile

@@ -1,7 +1,6 @@
 veekun_pokedex_repository = ../pokedex
 local_config = --settings=config.local
 docker_config = --settings=config.docker-compose
-HASURA_GRAPHQL_ADMIN_SECRET=pokemon
 
 .PHONY: help
 .SILENT:
@@ -70,6 +69,9 @@ docker-stop:  # (Docker) Stop containers
 docker-down:  # (Docker) Stop and removes containers and networks
 	docker-compose down
 
+docker-test:  # (Docker) Run tests
+	docker-compose exec -T app python manage.py test ${local_config}
+
 docker-prod:
 	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
 
@@ -98,11 +100,11 @@ sync-to-veekun: pull pull-veekun  # Copy data from this repository to ../pokedex
 # read-env-file:  # Exports ./.env into shell environment variables
 # 	export `egrep -v '^#' .env | xargs`
 
-hasura-export:  # Export Hasura configuration
-	hasura md export --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET}
+hasura-export:  # Export Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
+	hasura md export --project graphql
 
-hasura-apply:  # Apply local Hasura configuration
-	hasura md apply --project graphql --admin-secret ${HASURA_GRAPHQL_ADMIN_SECRET}
+hasura-apply:  # Apply local Hasura configuration, be sure to have set HASURA_GRAPHQL_ADMIN_SECRET
+	hasura md apply --project graphql
 
 hasura-get-anon-schema:  # Dumps GraphQL schema
 	gq http://localhost:8080/v1/graphql --introspect > graphql/schema.graphql
@@ -125,17 +127,25 @@ k8s-delete:  # (k8s) Delete pokeapi namespace
 start-graphql-prod:
 	git pull origin master
 	git submodule update --init
-	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+	docker compose stop app
+
+down-graphql-prod:
+	docker container rm $(docker container ls -aq) -f
+	docker system prune --all --volumes --force
+	sync; echo 3 > /proc/sys/vm/drop_caches
 
 update-graphql-data-prod:
 	git pull origin master
 	git submodule update --init
-	docker stop pokeapi_graphql-engine_1
+	docker compose stop graphql-engine
 	sync; echo 3 > /proc/sys/vm/drop_caches
-	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d app
+	docker compose -f docker-compose.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d app
 	make docker-migrate
 	make docker-build-db
-	docker stop pokeapi_app_1
+	docker compose stop app
 	sync; echo 3 > /proc/sys/vm/drop_caches
-	docker exec pokeapi_web_1 sh -c 'rm -rf /tmp/cache/*'
-	docker start pokeapi_graphql-engine_1
+	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
+	docker compose start graphql-engine
+	sleep 120
+	make hasura-apply

README.md

@@ -37,7 +37,7 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
     make setup
     ```
 
-- Run the server using the following command:
+- Run the server on port `8000` using the following command:
 
     ```sh
     make serve
@@ -45,34 +45,34 @@ A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ### Database setup
 
-Start the Django shell by
+To build or rebuild the database by applying any CSV file update, run
 
 ```sh
-python manage.py shell --settings=config.local
+make build-db
 ```
 
-Run the build script with
+Visit [localhost:8000/api/v2/](http://localhost:8000/api/v2/) to see the running API!
 
-```py
-from data.v2.build import build_all
-build_all()
-```
-
-Visit [localhost:80/api/v2/](localhost:80/api/v2/) to see the running API!
-
-Each time the build script is run, it will iterate over each table in the database, wipe it, and rewrite each row using the data found in data/v2/csv.
-
-The option to build individual portions of the database was removed in order to increase performance of the build script.
+Each time the `build-db` script is run, it will iterate over each table in the database, wipe it, and rewrite each row using the data found in data/v2/csv.
 
 If you ever need to wipe the database use this command:
 
 ```sh
-make wipe_db
+make wipe-sqlite-db
 ```
 
+If the database schema has changed, generate any outstanding migrations and apply them
+
+```sh
+make make-migrations
+make migrate
+```
+
+Run `make help` to see all tasks.
+
 ## Docker and Compose   [![docker hub](https://img.shields.io/docker/v/pokeapi/pokeapi?label=tag&sort=semver)](https://hub.docker.com/r/pokeapi/pokeapi)
 
-There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each services and is recommended if you need to simply spin up PokéAPI.
+There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allows you to deploy a production-like environment, with separate containers for each service, and is recommended if you need to simply spin up PokéAPI.
 
 Start everything by
 
@@ -90,13 +90,26 @@ docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; bui
 
 Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemon/bulbasaur/](http://localhost/api/v2/pokemon/bulbasaur/) on port `80`.
 
+To rebuild the database and apply any CSV file updates, run
+
+```sh
+make docker-build-db
+```
+
+If the database schema has changed, generate the migrations and apply those
+
+```sh
+make docker-make-migrations
+make docker-migrate
+```
+
 ## GraphQL &nbsp; <a href="ttps://github.com/hasura/graphql-engine"><img height="29px" src="https://graphql-engine-cdn.hasura.io/img/powered_by_hasura_blue.svg"/></a>
 
 When you start PokéAPI with the above docker-compose setup, an [Hasura Engine](https://github.com/hasura/graphql-engine) server is started as well. It's possible to track all the PokeAPI tables and foreign keys by simply
 
 ```sh
 # hasura cli needs to be installed and available in your $PATH: https://hasura.io/docs/latest/graphql/core/hasura-cli/install-hasura-cli.html
-# hasura cli's version has to be v2.0.8
+# hasura cli's version has to greater than v2.0.8
 make hasura-apply
 ```
 
@@ -104,7 +117,7 @@ When finished browse http://localhost:8080 and you will find the admin console.
 
 A free public GraphiQL console is browsable at the address https://beta.pokeapi.co/graphql/console/. The relative GraphQL endpoint is accessible at https://beta.pokeapi.co/graphql/v1beta
 
-A set of examples are provided in the directory [/graphql/examples](./graphql/examples) of this repository.
+A set of examples is provided in the directory [/graphql/examples](./graphql/examples) of this repository.
 
 ## Kubernetes &nbsp; [![k8s status](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml/badge.svg?branch=master)](https://github.com/PokeAPI/pokeapi/actions/workflows/kustomize.yml)
 
@@ -156,7 +169,7 @@ This k8s setup creates all k8s resources inside the _Namespace_ `pokeapi`, run `
 
 ## Donations
 
-Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 60 million requests a month!
+Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get 330 million requests a month!
 
 Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer)
 
@@ -164,10 +177,13 @@ Thank you to all our backers! [Become a backer](https://opencollective.com/pokea
 
 ## Join Us On Slack!
 
-Have a question or just want to discuss new ideas and improvements? Hit us up on slack. Consider talking with us here before creating new issue.
+> **Warning**
+> Currently no maintainer has enough free time to support the community on Slack. Our Slack is in an unmaintained status.
+
+Have a question or just want to discuss new ideas and improvements? Hit us up on Slack. ~~Consider talking with us here before creating a new issue.~~
 This way we can keep issues here a bit more organized and helpful in the long run. Be excellent to each other :smile:
 
-[Sign up](https://join.slack.com/t/pokeapi/shared_invite/zt-1l4vpwa8k-muQmMrFfv7TIFGrVWzjzcw) easily!
+[Sign up](https://join.slack.com/t/pokeapi/shared_invite/zt-2ampo6her-_tHSI3uOS65WzGypt7Y96w) easily!
 
 Once you've signed up visit [PokéAPI on Slack](https://pokeapi.slack.com)
 
@@ -177,7 +193,7 @@ This project exists thanks to all the people who [contribute](https://github.com
 
 <a href="graphs/contributors"><img src="https://opencollective.com/pokeapi/contributors.svg?width=890" /></a>
 
-All contributions are welcome: bug fixes, data contributions, recommendations.
+All contributions are welcome: bug fixes, data contributions, and recommendations.
 
 Please see the [issues on GitHub](https://github.com/PokeAPI/pokeapi/issues) before you submit a pull request or raise an issue, someone else might have beat you to it.
 

Resources/compose/docker-compose-prod-graphql.yml

@@ -1,9 +1,6 @@
 version: '2.4'
 services:
-  cache:
-    image: redis:7.0.7-alpine
   db:
-    image: postgres:15.1
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
@@ -14,12 +11,10 @@ services:
     restart: "no"
 
   web:
-    image: nginx:1.23.3-alpine
     volumes:
       - graphiql:/public-console:ro
 
   graphql-engine:
-    image: hasura/graphql-engine:v2.16.1
     cpus: 0.7
     memswap_limit: 3g
     mem_limit: 700m

Resources/nginx/nginx.conf

@@ -89,6 +89,7 @@ http {
         }
 
         location /graphql/v1beta {
+            include /ssl/cache.conf*;
             # proxy_cache small;
             # proxy_cache_valid 200 10d;
             # proxy_cache_valid any 0;

Resources/scripts/updater.sh

@@ -115,7 +115,7 @@ configure_git() {
 pr_input_updater_start() {
   cat <<EOF
 {
-  "body": "A [PokeAPI/api-data](${data_repo_url}) refresh has started. In 45 minutes the staging branch of [PokeAPI/api-data](${data_repo_url}/tree/staging) will be pushed with the new generated data. <br><br> The staging branch will be deployed in our [staging environment]($staging_environment_url) and you will be able to review the entire API. <br><br> A Pull Request ([master](${data_repo_url}/tree/master)<-[staging](${data_repo_url}/tree/staging)) will be also created at [PokeAPI/api-data](${data_repo_url}/pulls) and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at [pokeapi.co]($production_environment_url)."
+  "body": "A [PokeAPI/api-data](${data_repo_url}) refresh has started. In ~45 minutes the staging branch of [PokeAPI/api-data](${data_repo_url}/tree/staging) will be pushed with the new generated data. <br><br> The staging branch will be deployed in our [staging environment]($staging_environment_url) and the entire API will be ready to review. <br><br> A Pull Request ([master](${data_repo_url}/tree/master)<-[staging](${data_repo_url}/tree/staging)) will be also created at [PokeAPI/api-data](${data_repo_url}/pulls) and assigned to the PokeAPI Core team to be reviewed. If approved and merged new data will soon be available worldwide at [pokeapi.co]($production_environment_url)."
 }
 EOF
 }
@@ -123,7 +123,7 @@ EOF
 pr_input_updater_end_success() {
   cat <<EOF
 {
-  "body": "The updater script has finished its job and has now opened a Pull Request towards [PokeAPI/api-data](${data_repo_url}/pulls) with the updated data. <br><br> You can see the Pull Request deployed at our [staging environment]($staging_environment_url) when [CircleCI deploy]($deploy_circleci_status_url) will be finished (_check the started time of the last build_)."
+  "body": "The updater script has finished its job and has now opened a Pull Request towards [PokeAPI/api-data](${data_repo_url}/pulls) with the updated data. <br><br> The Pull Request can be seen deployed in our [staging environment]($staging_environment_url) when [CircleCI deploy]($deploy_circleci_status_url) will be finished (_check the start time of the last build_)."
 }
 EOF
 }
@@ -165,6 +165,7 @@ notify_engine_pr() {
 
 # Run the updater script (https://github.com/PokeAPI/api-data/blob/master/updater/cmd.bash) which will generate the new pokeapi data and push it to the api-data repository under a new branch
 run_updater() {
+  engine_repo_pr_number=$(get_invokator_pr_number)
   cd "$data_repo/updater" || cleanexit 'fail' "Failed to cd"
   # Wait to be sure PokeAPI/pokeapi's master branch has been updated on Github with the lastest merged PR content
   sleep 10
@@ -176,7 +177,8 @@ run_updater() {
   fi
 
   # Run the updater
-  docker run --privileged -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e RUN_AS='root' pokeapi-updater
+  docker network create pokeapi
+  docker run --privileged --network pokeapi --network-alias docker -e REPO_POKEAPI_CHECKOUT_OBJECT="$CIRCLE_SHA1" -e COMMIT_EMAIL="$email" -e COMMIT_NAME="$username" -e BRANCH_NAME="$branch_name" -e REPO_POKEAPI="https://github.com/$org/$engine_repo.git" -e REPO_DATA="https://$MACHINE_USER_GITHUB_API_TOKEN@github.com/$org/$data_repo.git" -e COMMIT_MESSAGE="[Updater Bot] Regenerate data from https://github.com/$org/$engine_repo/pull/$engine_repo_pr_number" -e COMMIT_AND_PUSH='true' -e RUN_AS='root' pokeapi-updater
   return_code=$?
   if [ "$return_code" -eq 2 ]; then
     cleanexit 'no-new-data' "Generated data is the same as old data, skipping deploy"

config/docker-compose.py

@@ -24,6 +24,5 @@ CACHES = {
 }
 
 DEBUG = False
-TASTYPIE_FULL_DEBUG = False
 
 ALLOWED_HOSTS = ["*"]

config/docker.py

@@ -24,4 +24,3 @@ CACHES = {
 }
 
 DEBUG = True
-TASTYPIE_FULL_DEBUG = True

config/local.py

@@ -14,4 +14,3 @@ CACHES = {
 }
 
 DEBUG = True
-TASTYPIE_FULL_DEBUG = True

config/settings.py

@@ -86,10 +86,7 @@ SECRET_KEY = os.environ.get(
     "SECRET_KEY", "ubx+22!jbo(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#"
 )
 
-CUSTOM_APPS = (
-    "tastypie",
-    "pokemon_v2",
-)
+CUSTOM_APPS = ("pokemon_v2",)
 
 INSTALLED_APPS = (
     "django.contrib.auth",
@@ -97,6 +94,7 @@ INSTALLED_APPS = (
     "django.contrib.sessions",
     "django.contrib.sites",
     "django.contrib.admin",
+    "django.contrib.messages",
     "django.contrib.humanize",
     "corsheaders",
     "rest_framework",
@@ -106,8 +104,6 @@ INSTALLED_APPS = (
 
 API_LIMIT_PER_PAGE = 1
 
-TASTYPIE_DEFAULT_FORMATS = ["json"]
-
 CORS_ORIGIN_ALLOW_ALL = True
 
 CORS_ALLOW_METHODS = "GET"
@@ -115,9 +111,28 @@ CORS_ALLOW_METHODS = "GET"
 CORS_URLS_REGEX = r"^/api/.*$"
 
 REST_FRAMEWORK = {
-    "DEFAULT_RENDERER_CLASSES": ("drf_ujson.renderers.UJSONRenderer",),
-    "DEFAULT_PARSER_CLASSES": ("drf_ujson.renderers.UJSONRenderer",),
+    "DEFAULT_RENDERER_CLASSES": ("rest_framework.renderers.JSONRenderer",),
+    "DEFAULT_PARSER_CLASSES": ("rest_framework.renderers.JSONRenderer",),
     "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
     "PAGE_SIZE": 20,
     "PAGINATE_BY": 20,
 }
+
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ],
+        },
+    },
+]
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

data/v2/build.py

@@ -31,7 +31,10 @@ DB_VENDOR = connection.vendor
 
 
 MEDIA_DIR = "{prefix}{{file_name}}".format(
-    prefix=os.environ.get("POKEAPI_SPRITES_PREFIX", "/media/sprites/")
+    prefix=os.environ.get(
+        "POKEAPI_SPRITES_PREFIX",
+        "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/",
+    )
 )
 IMAGE_DIR = os.getcwd() + "/data/v2/sprites/sprites/"
 RESOURCE_IMAGES = []
@@ -496,9 +499,7 @@ def _build_items():
 
         item_sprites = "items/{0}"
         sprites = {"default": file_path_or_none(item_sprites.format(file_name))}
-        yield ItemSprites(
-            id=int(info[0]), item_id=int(info[0]), sprites=json.dumps(sprites)
-        )
+        yield ItemSprites(id=int(info[0]), item_id=int(info[0]), sprites=sprites)
 
     build_generic((ItemSprites,), "items.csv", csv_record_to_objects)
 
@@ -1387,6 +1388,7 @@ def _build_pokemons():
         dream_world = "other/dream-world/"
         home = "other/home/"
         official_art = "other/official-artwork/"
+        showdown = "other/showdown/"
         gen_i = "versions/generation-i/"
         gen_ii = "versions/generation-ii/"
         gen_iii = "versions/generation-iii/"
@@ -1437,6 +1439,32 @@ def _build_pokemons():
                         poke_sprites + official_art + "shiny/", info, "png"
                     ),
                 },
+                "showdown": {
+                    "front_default": try_image_names(
+                        poke_sprites + showdown, info, "gif"
+                    ),
+                    "front_shiny": try_image_names(
+                        poke_sprites + showdown + "shiny/", info, "gif"
+                    ),
+                    "front_female": try_image_names(
+                        poke_sprites + showdown + "female/", info, "gif"
+                    ),
+                    "front_shiny_female": try_image_names(
+                        poke_sprites + showdown + "shiny/female/", info, "gif"
+                    ),
+                    "back_default": try_image_names(
+                        poke_sprites + showdown + "back/", info, "gif"
+                    ),
+                    "back_shiny": try_image_names(
+                        poke_sprites + showdown + "back/shiny/", info, "gif"
+                    ),
+                    "back_female": try_image_names(
+                        poke_sprites + showdown + "back/female/", info, "gif"
+                    ),
+                    "back_shiny_female": try_image_names(
+                        poke_sprites + showdown + "back/shiny/female", info, "gif"
+                    ),
+                },
             },
             "versions": {
                 "generation-i": {
@@ -1898,7 +1926,7 @@ def _build_pokemons():
         yield PokemonSprites(
             id=int(info[0]),
             pokemon=Pokemon.objects.get(pk=int(info[0])),
-            sprites=json.dumps(sprites),
+            sprites=sprites,
         )
 
     build_generic((PokemonSprites,), "pokemon.csv", csv_record_to_objects)
@@ -1913,6 +1941,19 @@ def _build_pokemons():
 
     build_generic((PokemonAbility,), "pokemon_abilities.csv", csv_record_to_objects)
 
+    def csv_record_to_objects(info):
+        yield PokemonAbilityPast(
+            pokemon_id=int(info[0]),
+            generation_id=int(info[1]),
+            ability_id=int(info[2]),
+            is_hidden=bool(int(info[3])),
+            slot=int(info[4]),
+        )
+
+    build_generic(
+        (PokemonAbilityPast,), "pokemon_abilities_past.csv", csv_record_to_objects
+    )
+
     def csv_record_to_objects(info):
         yield PokemonDexNumber(
             pokemon_species_id=int(info[0]),
@@ -2008,7 +2049,7 @@ def _build_pokemons():
             ),
         }
         yield PokemonFormSprites(
-            id=int(info[0]), pokemon_form_id=int(info[0]), sprites=json.dumps(sprites)
+            id=int(info[0]), pokemon_form_id=int(info[0]), sprites=sprites
         )
 
     build_generic((PokemonFormSprites,), "pokemon_forms.csv", csv_record_to_objects)

data/v2/cries

@@ -0,0 +1 @@
+Subproject commit 8584048df8f55ee1c436da23b378316e9d416a9b

data/v2/csv/abilities.csv

@@ -297,6 +297,15 @@ id,identifier,generation_id,is_main_series
 296,armor-tail,9,1
 297,earth-eater,9,1
 298,mycelium-might,9,1
+299,minds-eye,9,1
+300,supersweet-syrup,9,1
+301,hospitality,9,1
+302,toxic-chain,9,1
+303,embody-aspect,9,1
+304,tera-shift,9,1
+305,tera-shell,9,1
+306,teraform-zero,9,1
+307,poison-puppeteer,9,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_names.csv

@@ -2886,6 +2886,98 @@ ability_id,local_language_id,name
 298,8,Micoforza
 298,9,Mycelium Might
 298,11,きんしのちから
+299,1,しんがん
+299,3,심안
+299,4,心眼
+299,5,Œil Révélateur 
+299,7,Ojo Mental 
+299,8,Occhio Interiore 
+299,9,Mind’s Eye
+299,11,しんがん
+299,12,心眼
+300,1,かんろなミツ
+300,3,감미로운꿀
+300,4,甘露之蜜
+300,5,Nectar Mielleux
+300,1,かんろなミツ
+300,3,감미로운꿀
+300,4,甘露之蜜
+300,5,Nectar Mielleux
+300,6,Süßer Nektar
+300,7,Néctar Dulce
+300,8,Sciroppo Sublime
+300,9,Supersweet Syrup
+300,12,甘露之蜜
+301,1,おもてなし
+301,3,대접
+301,4,款待
+301,5,Aux Petits Soins
+301,6,Gastlichkeit
+301,7,Hospitalidad
+301,8,Ospitalità
+301,9,Hospitality
+301,11,おもてなし
+301,12,款待
+302,1,どくのくさり
+302,3,독사슬
+302,4,毒鎖鏈
+302,5,Chaîne Toxique
+302,6,Giftkette
+302,7,Cadena Tóxica
+302,8,Catena Tossica
+302,9,Toxic Chain
+302,11,どくのくさり
+302,12,毒锁链
+303,1,おもかげやどし
+303,3,초상투영
+303,4,面影輝映
+303,5,Force Mémorielle
+303,6,Erinnerungskraft
+303,7,Evocarrecuerdos
+303,8,Albergamemorie
+303,9,Embody Aspect
+303,11,おもかげやどし
+303,12,面影辉映
+304,1,テラスチェンジ
+304,3,테라체인지
+304,4,太晶變形
+304,5,Téramorphose
+304,6,Tera-Wandel
+304,7,Teracambio
+304,8,Teramorfosi
+304,9,Tera Shift
+304,11,テラスチェンジ
+304,12,太晶变形
+305,1,テラスシェル
+305,3,테라셸
+305,4,太晶甲殼
+305,5,Téra-Carapace
+305,6,Tera-Panzer
+305,7,Teracaparazón
+305,8,Teraguscio
+305,9,Tera Shell
+305,11,テラスシェル
+305,12,太晶甲壳
+306,1,ゼロフォーミング
+306,3,제로포밍
+306,4,歸零化境
+306,5,Téraformation 0
+306,6,Teraforming Null
+306,7,Teraformación 0
+306,8,Zeroformazione
+306,9,Teraform Zero
+306,11,ゼロフォーミング
+306,12,归零化境
+307,1,どくくぐつ
+307,3,독조종
+307,4,毒傀儡
+307,5,Emprise Toxique
+307,6,Giftpuppenspiel
+307,7,Títere Tóxico
+307,8,Malia Tossica
+307,9,Poison Puppeteer
+307,11,どくくぐつ
+307,12,毒傀儡
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/berry_firmness_names.csv

@@ -1,16 +1,31 @@
 berry_firmness_id,local_language_id,name
+1,1,とてもやわらかい
+1,4,很柔軟
 1,5,Très tendre
 1,7,Muy blanda
 1,9,Very Soft
+1,12,很柔软
+2,1,やわらかい
+2,4,柔軟
 2,5,Tendre
 2,7,Blanda
 2,9,Soft
+2,12,柔软
+3,1,かたい
+3,4,堅硬
 3,5,Ferme
 3,7,Dura
 3,9,Hard
+3,12,坚硬
+4,1,とてもかたい
+4,4,很堅硬
 4,5,Très ferme
 4,7,Muy dura
 4,9,Very Hard
+4,12,很坚硬
+5,1,とてつもなくかたい
+5,4,非常堅硬
 5,5,Super ferme
 5,7,Superdura
 5,9,Super Hard
+5,12,非常坚硬

data/v2/csv/contest_type_names.csv

@@ -1,11 +1,26 @@
 contest_type_id,local_language_id,name,flavor,color
+1,1,かっこよさ,からい,
+1,4,帥氣,辣,紅
 1,5,Sang-froid,Épicé,Rouge
 1,9,Cool,Spicy,Red
+1,12,帅气,辣,红
+2,1,うつくしさ,しぶい,
+2,4,美麗,澀,藍
 2,5,Beauté,Sec,Bleu
 2,9,Beauty,Dry,Blue
+2,12,美丽,涩,蓝
+3,1,かわいさ,あまい,
+3,4,可愛,甜,粉紅
 3,5,Grâce,Sucré,Rose
 3,9,Cute,Sweet,Pink
+3,12,可爱,甜,粉红
+4,1,かしこさ,にがい,
+4,4,聰明,苦,綠
 4,5,Intelligence,Amère,Vert
 4,9,Smart,Bitter,Green
+4,12,聪明,苦,绿
+5,1,たくましさ,すっぱい,
+5,4,強壯,酸,黃
 5,5,Robustesse,Acide,Jaune
 5,9,Tough,Sour,Yellow
+5,12,强壮,酸,黄

data/v2/csv/egg_group_prose.csv

@@ -1,106 +1,136 @@
 egg_group_id,local_language_id,name
 1,1,かいじゅう
 1,3,괴수
+1,4,怪獸
 1,5,Monstrueux
 1,6,Monster
 1,7,Monstruo
 1,8,Mostro
 1,9,Monster
+1,12,怪兽
 2,1,すいちゅう１
 2,3,수중 1
+2,4,水中1
 2,5,Aquatique 1
 2,6,Wasser 1
 2,7,Agua 1
 2,8,Acqua 1
 2,9,Water 1
+2,12,水中1
 3,1,むし
 3,3,벌레
+3,4,蟲
 3,5,Insectoïde
 3,6,Käfer
 3,7,Bicho
 3,8,Coleottero
 3,9,Bug
+3,12,虫
 4,1,ひこう
 4,3,비행
+4,4,飛行
 4,5,Aérien
 4,6,Flug
 4,7,Volador
 4,8,Volante
 4,9,Flying
+4,12,飞行
 5,1,りくじょう
 5,3,육상
+5,4,陸上
 5,5,Terrestre
 5,6,Feld
 5,7,Campo
 5,8,Campo
 5,9,Field
+5,12,陆上
 6,1,ようせい
 6,3,요정
+6,4,妖精
 6,5,Féerique
 6,6,Fee
 6,7,Hada
 6,8,Magico
 6,9,Fairy
+6,12,妖精
 7,1,しょくぶつ
 7,3,식물
+7,4,植物
 7,5,Végétal
 7,6,Pflanze
 7,7,Planta
 7,8,Erba
 7,9,Grass
+7,12,植物
 8,1,ひとがた
 8,3,인간형
+8,4,人型
 8,5,Humanoïde
 8,6,Humanotyp
 8,7,Humanoide
 8,8,Umanoide
 8,9,Human-Like
+8,12,人型
 9,1,すいちゅう３
 9,3,수중 3
+9,4,水中3
 9,5,Aquatique 3
 9,6,Wasser 3
 9,7,Agua 3
 9,8,Acqua 3
 9,9,Water 3
+9,12,水中３
 10,1,こうぶつ
 10,3,광물
+10,4,礦物
 10,5,Minéral
 10,6,Mineral
 10,7,Mineral
 10,8,Minerale
 10,9,Mineral
+10,12,矿物
 11,1,ふていけい
 11,3,부정형
+11,4,不定形
 11,5,Amorphe
 11,6,Amorph
 11,7,Amorfo
 11,8,Amorfo
 11,9,Amorphous
+11,12,不定形
 12,1,すいちゅう２
 12,3,수중 2
+12,4,水中2
 12,5,Aquatique 2
 12,6,Wasser 2
 12,7,Agua 2
 12,8,Acqua 2
 12,9,Water 2
+12,12,水中2
 13,1,メタモン
 13,3,메타몽
+13,4,百變怪
 13,5,Métamorph
 13,6,Ditto
 13,7,Ditto
 13,8,Ditto
 13,9,Ditto
+13,12,百变怪
 14,1,ドラゴン
 14,3,드래곤
+14,4,龍
 14,5,Draconique
 14,6,Drache
 14,7,Dragón
 14,8,Drago
 14,9,Dragon
+14,12,龙
 15,1,タマゴみはっけん
 15,3,알미발견
+15,4,未發現
 15,5,Inconnu
 15,6,Unbekannt
 15,7,Desconocido
 15,8,Non ancora scoperto
 15,9,Undiscovered
+15,12,未发现

data/v2/csv/encounter_condition_value_prose.csv

@@ -1,92 +1,163 @@
 encounter_condition_value_id,local_language_id,name
 1,6,Während eines Schwarms
 1,9,During a swarm
+1,5,Pendant une tempête
 2,6,Außerhalb eines Schwarms
 2,9,Not during a swarm
+2,5,Pas pendant une tempête
 3,6,Am Morgen
 3,9,In the morning
+3,5,Le matin
 4,6,Am Tag
 4,9,During the day
+4,5,La journée
 5,6,In der Nacht
 5,9,At night
+5,5,La nuit
 6,6,Durch Benutzung des Pokéradars
 6,9,Using PokéRadar
+6,5,En utilisant le PokéRadar
 7,6,Ohne Benutzung des Pokéradars
 7,9,Not using PokéRadar
+7,5,Sans utiliser le PokéRadar
 8,6,Kein Spiel in Slot 2
 8,9,No game in slot 2
+8,5,Sans jeu dans le slot 2
 9,6,Rubin in Slot 2
 9,9,Ruby in slot 2
+9,5,Rubis dans le slot 2
 10,6,Saphir in Slot 2
 10,9,Sapphire in slot 2
+10,5,Saphir dans le slot 2
 11,6,Smaragd in Slot 2
 11,9,Emerald in slot 2
+11,5,Émeraude dans le slot 2
 12,6,Feuerrot in slot 2
 12,9,FireRed in slot 2
+12,5,Rouge Feu dans le slot 2
 13,6,Blattgrün in slot 2
 13,9,LeafGreen in slot 2
+13,5,Vert Feuille dans le slot 2
 14,6,Radio aus
 14,9,Radio off
+14,5,Radio éteinte
 15,6,Hoenn-Sound im Radio
 15,9,Hoenn radio
+15,5,En écoutant Radio Hoenn
 16,6,Sinnoh-Sound im Radio
 16,9,Sinnoh radio
+16,5,En écoutant Radio Sinnoh
 17,6,Im Frühling
 17,9,During Spring
+17,5,Au printemps
 18,6,Im Sommer
 18,9,During Summer
+18,5,En été
 19,6,Im Herbst
 19,9,During Autumn
+19,5,En automne
 20,6,Im Winter
 20,9,During Winter
+20,5,En hiver
 21,9,Bulbasaur as starter
+21,5,Bulbizarre en starter
 22,9,Squirtle as starter
+22,5,Carapuce en starter
 23,9,Charmander as starter
+23,5,Salamèche en starter
 24,9,Chespin as starter
+24,5,Marisson en starter
 25,9,Fennekin as starter
+25,5,Feunnec en starter
 26,9,Froakie as starter
+26,5,Grenousse en starter
 27,9,Chose ‘Blue’ on the TV news report
+27,5,Choisi « bleu » à la télé
 28,9,Chose ‘Red’ on the TV news report
+28,5,Choisi « rouge » à la télé
 29,9,Awakened the legendary beasts at Burned Tower
+29,5,En ayant réveillé les légendaires à la Tour Cendrée
 30,9,Visited Lake Verity after defeating Team Galactic at Mt. Coronet
+30,5,En ayant visité le Lac Vérité après avoir vaincu la Team Galaxie au Mont Couronné
 31,9,Talked to Professor Oak at Eterna City
+31,5,Après avoir parlé au Prof. Chen à Vestigion
 32,9,Visited the Pokémon Fan Club with Copycat’s doll
+32,5,Après avoir visité le Fan Club Pokémon avec la poupée de Copieuse
 33,9,Met Tornadus or Thundurus in a cutscene
+33,5,Après avoir rencontré Boréas ou Fulguris lors d’une cinématique
 34,9,Beat the Elite 4 for the second time
+34,5,Après deux victoires sur le Conseil 4
 35,9,Enter the Hall of Fame
+35,5,Après l’entrée au Panthéon
 36,9,None
+36,5,Aucune
 37,9,Acquired National Pokédex
+37,5,En ayant le Pokédex National
 38,9,None
+38,5,Aucune
 39,9,Beat the Pokémon league after knocking out Snorlax at Route 11
+39,5,"Après avoir mis Ronflex KO sur la route 11, puis avoir battu la Ligue"
 40,9,Playing on the Virtual Console Release
+40,5,En jouant sur la version Virtual Console
 41,9,Cure the nightmares of Eldritch’s Son
+41,5,Après avoir soigné les cauchemars du fils d’Edern
 42,9,Talk to Cynthia’s grandmother
+42,5,Après avoir parlé à la grand-mère de Cynthia
 43,9,No item requirement
+43,5,Sans objet particulier
 44,9,Have Adamant Orb in bag
+44,5,En ayant un Orbe Adamant dans le sac
 45,9,Have Lustrous Orb in bag
+45,5,En ayant un Orbe Perlé dans le sac
 46,9,Have Helix Fossil in bag
+46,5,En ayant un Nautile dans le sac
 47,9,Have Dome Fossil in bag
+47,5,En ayant un Fossile Dôme dans le sac
 48,9,Have Old Amber in bag
+48,5,En ayant un Vieil Ambre dans le sac
 49,9,Have Root Fossil in bag
+49,5,En ayant un Fossile Racine dans le sac
 50,9,Have Claw Fossil in bag
+50,5,En ayant un Fossile Griffe dans le sac
 51,9,Defeat Jupiter
+51,5,Après avoir vaincu Jupiter
 52,9,Defeat Team Galactic at Iron Island
+52,5,Après avoir vaincu la Team Galaxie sur l’Île de Fer
 53,9,Input correct password
+53,5,Après avoir saisi le bon mot de passe
 54,9,Obtained Zephyr badge
+54,5,En ayant obtenu le badge Zéphir
 55,9,Defeat Red
+55,5,Après avoir vaincu Red
 56,9,Received a Kanto Starter
+56,5,Après avoir recu un starter de Kanto
 57,9,Received TM59 From Claire
+57,5,Après avoir reçu la CT59 de Claire
 58,9,"Have Regirock, Regice and Registeel in the party"
+58,5,"En ayant Regirock, Regice et Registeel dans l’équipe"
 59,9,Sunday
+59,5,Le dimanche
 60,9,Monday
+60,5,Le lundi
 61,9,Tuesday
+61,5,Le mardi
 62,9,Wednesday
+62,5,Le mercredi
 63,9,Thursday
+63,5,Le jeudi
 64,9,Friday
+64,5,Le vendredi
 65,9,Saturday
+65,5,Le samedi
 66,9,The first Pokémon in the player’s party has a high friendship stat
+66,5,Si le premier Pokémon de l’équipe a une stat d’amitié élevée
 67,9,Beat Mars for the first time
+67,5,Après deux victoires face à Mars
 68,9,Have Odd Keystone in bag
+68,5,En ayant une Clé de Voûte dans le sac
 69,9,Has talked to at least 32 people in the underground
+69,5,Après avoir parlé à 32 personnes dans les souterrains
 70,9,Returned Machine Part to Power Plant
+70,5,Après avoir rapporté la pièce de machine à la centrale
 10,9,Have an Event Arceus in the party
+10,5,En ayant un Arceus événementiel dans l’équipe

data/v2/csv/encounter_method_prose.csv

@@ -1,49 +1,80 @@
 encounter_method_id,local_language_id,name
 1,6,Im hohen Gras oder in einer Höhle laufen
 1,9,Walking in tall grass or a cave
+1,5,En marchant dans les herbes hautes ou une grotte
 2,6,Mit einer normalen Angel angeln
 2,9,Fishing with an Old Rod
+2,5,En pêchant avec une Canne
 3,6,Mit einer Profiangel angeln
 3,9,Fishing with a Good Rod
+3,5,En pêchant avec une Super Canne
 4,6,Mit einer Superangel angeln
 4,9,Fishing with a Super Rod
+4,5,En pêchant avec une Méga Canne
 5,6,Surfen
 5,9,Surfing
+5,5,En surfant
 6,6,Steine zertrümmern
 6,9,Smashing rocks
+6,5,En brisant des rochers
 7,6,Bäumen Kopfnüsse geben
 7,9,Headbutting trees
+7,5,En utilisant Coup d’Boule sur un arbre
 8,6,Im dunklen Gras laufen
 8,9,Walking in dark grass
+8,5,En marchant dans les herbes sombres
 9,6,Im raschelndem Gras laufen
 9,9,Walking in rustling grass
+9,5,En marchant dans les herbes mouvantes
 10,6,In Staubwolken laufen
 10,9,Walking in dust clouds
+10,5,En marchant dans un nuage de poussière
 11,6,Im Schatten einer Brücke laufen
 11,9,Walking in bridge shadows
+11,5,En marchant à l’ombre d’un pont
 12,6,An dunklen stellen angeln
 12,9,Fishing in dark spots
+12,5,En pêchant dans les endroits sombres
 13,6,An dunklen stellen surfen
 13,9,Surfing in dark spots
+13,5,En surfant sur les endroits sombres
 14,6,In gelben Blumenfeldern laufen
 14,9,Walking in yellow flowers
+14,5,En marchant dans les fleurs jaunes
 15,6,In violetten Blumenfeldern laufen
 15,9,Walking in purple flowers
+15,5,En marchant dans les fleurs violettes
 16,6,In roten Blumenfeldern laufen
 16,9,Walking in red flowers
+16,5,En marchant dans les fleurs rouges
 17,6,Auf unwegsamen Gelände laufen
 17,9,Walking on rough terrain
+17,5,En marchant sur un terrain accidenté
 18,9,Receive as a gift
+18,5,Reçu en cadeau
 19,9,Receive egg as a gift
+19,5,Œuf reçu en cadeau
 20,9,"Static encounter, only one chance"
+20,5,"Rencontre statique, chance unique"
 21,9,Playing Pokéflute
+21,5,En jouant de la Pokéflûte
 22,9,Headbutting a low encounter rate tree
+22,5,En utilisant Coup d’Boule sur un arbre à taux bas
 23,9,Headbutting a normal encounter rate tree
+22,5,En utilisant Coup d’Boule sur un arbre à taux normal
 24,9,Headbutting a high encounter rate tree
+22,5,En utilisant Coup d’Boule sur un arbre à taux élevé
 25,9,Using the Squirt Bottle on a Sudowoodo
+25,5,En utilisant la Carapuce à O sur Simularbre
 26,9,Using the Wailmer Pail on a Sudowoodo
+26,5,En utilisant le Seau Wailmer / Wailmerrosoir sur Simularbre
 27,9,Diving on seaweed
+27,5,En plongeant dans les algues
 28,9,On any overworld patch of grass
+28,5,Dans les herbes
 29,9,On any overworld water tile
+29,5,Sur l’eau
 30,9,Using Devon Scope
+30,5,En utilisant le Devon Scope
 31,9,Fishing in a Feebas Tile
+31,5,En pêchant sur une tuile à Barpau

data/v2/csv/encounter_methods.csv

@@ -30,3 +30,9 @@ id,identifier,order
 29,roaming-water,29
 30,devon-scope,30
 31,feebas-tile-fishing,31
+32,island-scan,32
+33,sos-encounter,33
+34,bubbling-spots,34
+35,berry-piles,35
+36,npc-trade,36
+37,sos-from-bubbling-spot,37

data/v2/csv/encounter_slots.csv

@@ -711,3 +711,430 @@ id,version_group_id,encounter_method_id,slot,rarity
 710,6,30,1,100
 711,5,31,1,50
 712,6,31,1,50
+713,17,18,1,100
+714,17,32,1,100
+715,17,1,1,50
+716,17,1,2,30
+717,17,1,3,30
+718,17,1,4,15
+719,17,1,5,5
+720,18,34,1,40
+721,18,34,2,35
+722,18,34,3,25
+723,18,32,1,100
+724,18,33,1,15
+725,18,33,2,15
+726,18,33,3,15
+727,18,37,1,15
+728,18,37,2,15
+729,18,4,1,55
+730,18,4,2,40
+731,18,4,3,5
+732,18,1,1,50
+733,18,1,2,30
+734,18,1,3,20
+735,18,1,4,20
+736,18,1,5,20
+737,18,1,6,15
+738,18,1,7,15
+739,17,1,1,30
+740,17,1,4,20
+741,17,1,5,20
+742,17,1,6,20
+743,18,1,1,20
+744,18,1,2,20
+745,18,1,7,10
+746,18,1,8,10
+747,18,1,9,5
+748,17,5,1,40
+749,17,5,2,40
+750,17,5,3,20
+751,17,1,2,50
+752,17,1,4,30
+753,17,1,5,30
+754,17,1,7,20
+755,17,33,1,15
+756,17,33,2,15
+757,17,33,3,15
+758,17,33,4,15
+759,17,33,5,15
+760,17,1,3,20
+761,17,1,5,10
+762,17,1,6,10
+763,17,1,7,10
+764,17,1,8,10
+765,17,1,9,5
+766,18,1,1,30
+767,18,1,6,10
+768,18,20,1,100
+769,18,20,2,100
+770,18,1,3,10
+771,18,1,4,10
+772,17,1,5,15
+773,18,18,1,100
+774,18,18,2,100
+775,18,18,3,100
+776,18,1,1,35
+777,18,1,2,35
+778,18,1,3,35
+779,18,1,4,30
+780,17,35,1,100
+781,17,34,1,80
+782,17,34,2,20
+783,18,35,1,100
+784,18,34,1,50
+785,18,34,2,30
+786,18,34,3,20
+787,18,1,3,30
+788,17,1,1,20
+789,17,1,2,20
+790,17,1,9,10
+791,17,1,1,40
+792,17,1,4,10
+793,17,4,1,79
+794,17,4,2,20
+795,17,4,3,1
+796,17,34,1,50
+797,17,34,2,30
+798,17,34,3,20
+799,17,37,1,15
+800,18,5,1,30
+801,18,5,2,30
+802,18,5,3,20
+803,18,5,4,20
+804,18,1,5,10
+805,18,34,1,35
+806,18,34,4,10
+807,18,33,4,15
+808,18,37,3,15
+809,18,4,1,50
+810,18,4,4,5
+811,18,5,1,40
+812,18,5,2,40
+813,17,18,2,100
+814,17,18,3,100
+815,17,18,4,100
+816,17,1,1,100
+817,17,33,1,10
+818,17,33,2,10
+819,17,33,3,100
+820,18,33,1,10
+821,18,33,2,10
+822,18,33,3,100
+823,18,1,7,5
+824,17,33,3,1
+825,18,33,3,1
+826,18,1,1,40
+827,18,1,6,20
+828,18,33,5,15
+829,17,36,1,100
+830,18,36,1,100
+831,17,34,1,70
+832,17,34,2,70
+833,17,34,3,30
+834,18,34,3,30
+835,18,34,4,15
+836,18,34,5,5
+837,18,34,6,5
+838,18,1,9,10
+839,18,1,10,10
+840,18,1,11,10
+841,18,34,1,70
+842,17,1,1,49
+843,17,1,6,1
+844,18,1,3,29
+845,18,1,5,1
+846,17,1,2,25
+847,18,1,2,25
+848,18,1,10,5
+849,17,34,1,100
+850,17,1,6,9
+851,17,1,7,1
+852,18,34,1,100
+853,18,1,6,9
+854,18,1,7,1
+855,17,5,1,30
+856,17,5,2,30
+857,17,5,4,20
+858,18,34,2,45
+859,18,34,3,35
+860,18,34,4,20
+861,18,18,4,100
+862,18,18,5,100
+863,18,18,6,100
+864,18,18,7,100
+865,18,18,8,100
+866,18,18,9,100
+867,18,18,10,100
+868,17,34,1,60
+869,17,20,1,100
+870,17,1,6,5
+871,18,34,4,5
+872,18,33,6,15
+873,18,4,2,30
+874,18,4,3,15
+875,18,1,4,15
+876,18,1,5,15
+877,17,4,1,70
+878,17,4,2,15
+879,17,4,3,10
+880,17,4,4,5
+881,18,4,2,20
+882,18,4,4,15
+883,18,4,1,49
+884,18,4,3,10
+885,18,4,4,1
+886,18,5,2,25
+887,18,5,5,5
+888,18,33,7,15
+889,17,34,2,45
+890,17,34,3,5
+891,17,37,2,15
+892,17,4,2,29
+893,17,5,3,40
+894,18,34,2,25
+895,18,4,1,44
+896,18,4,3,25
+897,18,5,3,40
+898,18,1,7,20
+899,17,1,1,70
+900,17,1,3,100
+901,18,1,1,60
+902,17,33,1,11
+903,18,33,1,11
+904,17,34,3,10
+905,17,37,1,10
+906,17,37,2,10
+907,17,37,3,1
+908,18,34,2,20
+909,18,34,3,10
+910,18,37,1,11
+911,18,37,2,10
+912,18,37,3,1
+913,18,37,4,15
+914,18,37,5,15
+915,18,37,6,15
+916,18,1,1,70
+917,17,1,1,80
+918,18,5,3,30
+919,18,5,4,10
+920,18,1,2,40
+921,18,1,3,40
+922,18,34,2,15
+923,18,34,3,15
+924,18,34,5,15
+925,18,4,1,25
+926,18,4,2,25
+927,18,4,5,5
+928,18,4,6,5
+929,18,5,2,20
+930,17,1,1,25
+931,17,1,8,5
+932,18,1,1,25
+933,18,4,1,35
+934,18,4,2,35
+935,18,1,1,39
+936,18,1,4,1
+937,17,1,7,5
+938,18,33,8,15
+939,18,33,9,15
+940,18,1,1,21
+941,18,1,11,4
+942,18,1,12,1
+943,17,33,6,15
+944,17,33,7,15
+945,17,33,8,15
+946,17,33,9,15
+947,17,33,4,1
+948,17,4,1,60
+949,17,4,2,40
+950,17,1,9,100
+951,18,33,4,1
+952,18,4,1,40
+953,17,1,5,9
+954,17,1,7,100
+955,17,34,1,40
+956,17,34,4,20
+957,17,4,1,78
+958,17,4,4,1
+959,18,34,6,15
+960,18,34,7,15
+961,18,34,8,5
+962,17,1,4,100
+963,18,33,2,11
+964,17,1,2,40
+965,17,1,3,5
+966,17,1,4,5
+967,18,1,4,5
+968,18,1,5,5
+969,17,34,2,50
+970,17,4,1,99
+971,17,4,2,1
+972,18,34,1,60
+973,18,34,2,40
+974,18,4,1,90
+975,18,4,2,10
+976,17,18,1,7
+977,17,18,2,7
+978,17,18,3,7
+979,17,18,4,4
+980,17,18,5,4
+981,17,18,6,4
+982,17,18,7,4
+983,17,18,8,4
+984,17,18,9,4
+985,17,18,10,4
+986,17,18,11,4
+987,17,18,12,4
+988,17,18,13,4
+989,17,18,14,4
+990,17,18,15,4
+991,17,18,16,4
+992,17,18,17,4
+993,17,18,18,2
+994,17,18,19,2
+995,17,18,20,2
+996,17,18,21,2
+997,17,18,22,2
+998,17,18,23,2
+999,17,18,24,2
+1000,17,18,25,2
+1001,17,18,18,4
+1002,18,18,1,7
+1003,18,18,2,7
+1004,18,18,3,7
+1005,18,18,4,4
+1006,18,18,5,4
+1007,18,18,6,4
+1008,18,18,7,4
+1009,18,18,8,4
+1010,18,18,9,4
+1011,18,18,10,4
+1012,18,18,11,4
+1013,18,18,12,4
+1014,18,18,13,4
+1015,18,18,14,4
+1016,18,18,15,4
+1017,18,18,16,4
+1018,18,18,17,4
+1019,18,18,18,2
+1020,18,18,19,2
+1021,18,18,20,2
+1022,18,18,21,2
+1023,18,18,22,2
+1024,18,18,23,2
+1025,18,18,24,2
+1026,18,18,25,2
+1027,18,18,18,4
+1028,17,18,1,8
+1029,17,18,2,8
+1030,17,18,3,5
+1031,17,18,4,5
+1032,17,18,5,5
+1033,17,18,6,5
+1034,17,18,7,5
+1035,17,18,8,5
+1036,17,18,9,5
+1037,17,18,10,5
+1038,17,18,11,5
+1039,17,18,12,5
+1040,17,18,13,5
+1041,17,18,14,5
+1042,17,18,15,5
+1043,17,18,16,3
+1044,17,18,17,3
+1045,17,18,18,3
+1046,17,18,19,3
+1047,17,18,20,3
+1048,17,18,21,3
+1049,18,18,1,8
+1050,18,18,2,5
+1051,18,18,3,5
+1052,18,18,4,5
+1053,18,18,5,5
+1054,18,18,6,5
+1055,18,18,7,5
+1056,18,18,8,5
+1057,18,18,9,5
+1058,18,18,10,5
+1059,18,18,11,5
+1060,18,18,12,5
+1061,18,18,13,5
+1062,18,18,14,5
+1063,18,18,15,5
+1064,18,18,16,3
+1065,18,18,17,3
+1066,18,18,18,3
+1067,18,18,19,3
+1068,18,18,20,3
+1069,18,18,21,3
+1070,17,18,3,8
+1071,17,18,4,8
+1072,17,18,5,8
+1073,17,18,6,6
+1074,17,18,7,6
+1075,17,18,8,6
+1076,17,18,9,6
+1077,17,18,10,6
+1078,17,18,11,6
+1079,17,18,12,6
+1080,17,18,13,6
+1081,17,18,14,3
+1082,17,18,15,3
+1083,18,18,2,8
+1084,18,18,3,8
+1085,18,18,4,8
+1086,18,18,5,8
+1087,18,18,6,8
+1088,18,18,15,3
+1089,17,34,2,40
+1090,18,34,4,40
+1091,18,34,5,30
+1092,18,34,6,20
+1093,18,34,7,10
+1094,17,37,3,15
+1095,17,37,4,15
+1096,17,4,1,59
+1097,18,4,1,59
+1098,18,4,3,1
+1099,18,1,8,100
+1100,17,34,3,70
+1101,17,34,4,30
+1102,17,34,5,30
+1103,18,34,2,70
+1104,18,34,3,50
+1105,18,34,4,30
+1106,17,34,1,90
+1107,17,34,2,10
+1108,17,34,3,50
+1109,17,34,4,40
+1110,17,34,5,10
+1111,17,5,2,25
+1112,17,5,5,5
+1113,18,1,3,15
+1114,17,5,1,80
+1115,17,5,2,20
+1116,18,5,1,55
+1117,18,5,3,10
+1118,18,5,4,5
+1119,17,1,6,100
+1120,17,1,3,15
+1121,18,20,3,100
+1122,18,20,4,100
+1123,18,20,5,100
+1124,18,20,6,100
+1125,18,20,7,15
+1126,18,20,8,15
+1127,18,20,9,15
+1128,18,20,10,15
+1129,18,20,11,15
+1130,18,20,7,100
+1131,18,20,8,100
+1132,18,20,12,15
+1133,18,20,13,15
+1134,18,4,1,45
+1135,18,5,1,80
+1136,18,1,8,5
+1137,17,1,3,24
+1138,17,1,5,1
+1139,18,1,3,24

data/v2/csv/evolution_chains.csv

@@ -529,3 +529,14 @@ id,baby_trigger_item_id
 536,
 537,
 538,
+539,
+540,
+541,
+542,
+543,
+544,
+545,
+546,
+547,
+548,
+549,

data/v2/csv/generation_names.csv

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

data/v2/csv/growth_rate_prose.csv

@@ -13,7 +13,7 @@ growth_rate_id,local_language_id,name
 4,9,medium slow
 5,5,erratique
 5,6,"langsam, dann sehr schnell"
-5,9,slow then very fast
+5,9,erratic
 6,5,fluctuante
 6,6,"schnell, dann sehr langsam"
-6,9,fast then very slow
+6,9,fluctuating

data/v2/csv/item_names.csv

@@ -17642,3 +17642,183 @@ item_id,local_language_id,name
 2099,4,黄色盘子
 2099,9,Yellow Dish
 2099,11,イエロープレート
+2100,1,ロトりぼう
+2100,9,Roto Stick
+2100,11,ロトりぼう
+2101,1,おしゃれカードみどり
+2101,9,Teal Style Card
+2101,11,おしゃれカードみどり
+2102,1,みどりのめん
+2102,9,Teal Mask
+2102,11,みどりのめん
+2103,1,きらめくおまもり
+2103,9,Glimmering Charm
+2103,11,きらめくおまもり
+2104,1,けっしょうのかけら
+2104,9,Crystal Cluster
+2104,11,けっしょうのかけら
+2105,1,ようせいのハネ
+2105,9,Fairy Feather
+2105,11,ようせいのハネ
+2106,1,いどのめん
+2106,9,Wellspring Mask
+2106,11,いどのめん
+2107,1,かまどのめん
+2107,9,Hearthflame Mask
+2107,11,かまどのめん
+2108,1,いしずえのめん
+2108,9,Cornerstone Mask
+2108,11,いしずえのめん
+2109,1,みついりりんご
+2109,9,Syrupy Apple
+2109,11,みついりりんご
+2110,1,ボンサクのちゃわん
+2110,9,Unremarlable Teacup
+2110,11,ボンサクのちゃわん
+2111,1,ケッサクのちゃわん
+2111,9,Masterpiece Teacup
+2111,11,ボンサクのちゃわん
+2112,1,たいりょくのもち
+2112,9,Health Mochi
+2112,11,たいりょくのもち
+2113,1,きんりょくのもち
+2113,9,Muscle Mochi
+2113,11,きんりょくのもち
+2114,1,ていこうのもち
+2114,9,Resist Mochi
+2114,11,ていこうのもち
+2115,1,ちりょくのもち
+2115,9,Genius Mochi
+2115,11,ちりょくのもち
+2116,1,せいしんのもち
+2116,9,Clever Mochi
+2116,11,せいしんのもち
+2117,1,しゅんぱつのもち
+2117,9,Swift Mochi
+2117,11,しゅんぱつのもち
+2118,1,まっさらもち
+2118,9,Fresh Start Mochi
+2118,11,まっさらもち
+2119,1,アーボのきば
+2119,9,Ekans Fang
+2119,11,アーボのきば
+2120,1,サンドのツメ
+2120,9,Sandshrew Claw
+2120,11,サンドのツメ
+2121,1,ピィのけ
+2121,9,Cleffa Fur
+2121,11,ピィのけ
+2122,1,ロコンのけ
+2122,9,Vulpix Fur
+2122,11,ロコンのけ
+2123,1,ニョロモのめんえき
+2123,9,Poliwag Slime
+2123,11,ニョロモのめんえき
+2124,1,マダツボミのツル
+2124,9,Bellsprout Vine
+2124,11,マダツボミのツル
+2125,1,イシツブテのかけら
+2125,9,Geodude Fragment
+2125,11,イシツブテのかけら
+2126,1,ドガースのガス
+2126,9,Koffing Gas
+2126,11,ドガースのガス
+2127,1,ゴンベのキバ
+2127,9,Munchlax Fang
+2127,11,ゴンベのキバ
+2128,1,オタチのけ
+2128,9,Sentret Fur
+2128,11,オタチのけ
+2129,1,ホーホーのはね
+2129,9,Hoothoot Feather
+2129,11,ホーホーのはね
+2130,1,イトマルのいと
+2130,9,Spinarak Thread
+2130,11,イトマルのいと
+2131,1,エイパムのけ
+2131,9,Aipom Hair
+2131,11,エイパムのけ
+2132,1,ヤンヤンマのトゲ
+2132,9,Yanma Spike
+2132,11,ヤンヤンマのトゲ
+2133,1,グライガーのキバ
+2133,9,Gligar Fang
+2133,11,グライガーのキバ
+2134,1,マグマッグのようがん
+2134,9,Slugma Lava
+2134,11,マグマッグのようがん
+2135,1,ウリムーのけ
+2135,9,Swinub Hair
+2135,11,ウリムーのけ
+2136,1,ポチエナのキバ
+2136,9,Poochyena Fang
+2136,11,ポチエナのキバ
+2137,1,ハスボーのはっぱ
+2137,9,Lotad Leaf
+2137,11,ハスボーのはっぱ
+2138,1,タネボーのえだ
+2138,9,Seedot Stem
+2138,11,タネボーのえだ
+2139,1,ノズパスのかけら
+2139,9,Nosepass Fragment
+2139,11,ノズパスのかけら
+2140,1,バルビートのしる
+2140,9,Volbeat Fluid
+2140,11,バルビートのしる
+2141,1,イルミーゼのしる
+2141,9,Illumise Fluid
+2141,11,イルミーゼのしる
+2142,1,ヘイガニのから
+2142,9,Corphish Shell
+2142,11,ヘイガニのから
+2143,1,ヒンバスのうろこ
+2143,9,Feebas Scales
+2143,11,ヒンバスのうろこ
+2144,1,ヨマワルのかけら
+2144,9,Duskull Fragment
+2144,11,ヨマワルのかけら
+2145,1,リーシャンのかけら
+2145,9,Chingling Fragment
+2145,11,リーシャンのかけら
+2146,1,ドッコラーのあせ
+2146,9,Timburr Sweat
+2146,11,ドッコラーのあせ
+2147,1,クルミルのはっぱ
+2147,9,Sewaddle Leaf
+2147,11,クルミルのはっぱ
+2148,1,コアルヒーのはね
+2148,9,Ducklett Feather
+2148,11,コアルヒーのはね
+2149,1,ヒトモシのすす
+2149,9,Litwick Soot
+2149,11,ヒトモシのすす
+2150,1,コジョフーのツメ
+2150,9,Mienfoo Claw
+2150,11,コジョフーのツメ
+2151,1,バルチャイのはね
+2151,9,Vullaby Feather
+2151,11,バルチャイのはね
+2152,1,メレシーのほうせき
+2152,9,Carbink Jewel
+2152,11,メレシーのほうせき
+2153,1,ボクレーのえだ
+2153,9,Phantump Twig
+2153,11,ボクレーのえだ
+2154,1,アゴジムシのいと
+2154,9,Grubbin Thread
+2154,11,アゴジムシのいと
+2155,1,アブリーのこな
+2155,9,Cutiefly Powder
+2155,11,アブリーのこな
+2156,1,ジャラコのウロコ
+2156,9,Jangmo-o Scales
+2156,11,ジャラコのウロコ
+2157,1,ウッウのうもう
+2157,9,Cramorant Down
+2157,11,ウッウのうもう
+2158,1,モルペコのたね
+2158,9,Morpeko Snack
+2158,11,モルペコのたね
+2159,1,チャデスのこな
+2159,9,Poltchageist Powder
+2159,11,チャデスのこな

data/v2/csv/item_pocket_names.csv

@@ -1,25 +1,41 @@
 item_pocket_id,local_language_id,name
+1,4,道具
 1,5,Objets
 1,7,Objetos
 1,9,Items
+1,12,道具
+2,4,回復道具
 2,5,Médicaments
 2,7,Medicinas
 2,9,Medicine
+2,12,回复道具
+3,4,精靈球
 3,5,Balls
 3,7,Bolas
 3,9,Poké Balls
+3,12,精灵球
+4,4,招式及秘傳學習器
 4,5,CT & CS
 4,7,MT y MO
 4,9,TMs and HMs
+4,12,招式及秘传学习器
+5,4,樹果
 5,5,Baies
 5,7,Bayas
 5,9,Berries
+5,12,树果
+6,4,郵件
 6,5,Lettres
 6,7,Correo
 6,9,Mail
+6,12,邮件
+7,4,戰鬥道具
 7,5,Objets de combat
 7,7,Objetos de combate
 7,9,Battle Items
+7,12,战斗道具
+8,4,重要物品
 8,5,Object rares
 8,7,Objetos clave
 8,9,Key Items
+8,12,重要物品

data/v2/csv/items.csv

@@ -2047,5 +2047,65 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 2097,red-dish,55,0,,
 2098,white-dish,55,0,,
 2099,yellow-dish,55,0,,
+2100,roto-stick,21,0,,
+2101,teal-style-card,21,0,,
+2102,teak-mask,20,0,,
+2103,glimmering-charm,21,0,,
+2104,cyrstal-cluster,20,0,,
+2105,fairy-feather,12,750,,
+2106,wellspring-mask,12,0,,
+2107,hearthflame-mask,12,0,,
+2108,cornerstone-mask,12,0,,
+2109,syrupy-apple,10,500,,
+2110,unremarkable-teacup,10,400,,
+2111,masterpiece-teacup,10,9500,,
+2112,health-mochi,26,125,,
+2113,muscle-mochi,26,125,,
+2114,resist-mochi,26,125,,
+2115,genius-mochi,26,125,,
+2116,clever-mochi,26,125,,
+2117,swift-mochi,26,125,,
+2118,fresh-start-mochi,26,75,,
+2119,ekans-fang,54,15,,
+2120,sandshrew-claw,54,10,,
+2121,cleffa-fur,54,25,,
+2122,vulpix-fur,54,35,,
+2123,poliwag-slime,54,35,,
+2124,bellsprout-vine,54,25,,
+2125,geodude-fragment,54,30,,
+2126,koffing-gas,54,25,,
+2127,munchlax-fang,54,40,,
+2128,sentret-fur,54,10,,
+2129,hoothoot-feather,54,15,,
+2130,spinarak-thread,54,10,,
+2131,aipom-hair,54,30,,
+2132,yanma-spike,54,35,,
+2133,gligar-fang,54,40,,
+2134,slugma-lava,54,20,,
+2135,swinub-hair,54,35,,
+2136,poochyena-fang,54,15,,
+2137,lotad-leaf,54,20,,
+2138,seedot-stem,54,20,,
+2139,nosepass-fragment,54,40,,
+2140,volbeat-fluid,54,10,,
+2141,illumise-fluid,54,10,,
+2142,corphish-shell,54,10,,
+2143,feebas-scales,54,35,,
+2144,duskull-fragment,54,40,,
+2145,chingling-fragment,54,20,,
+2146,timburr-sweat,54,30,,
+2147,sewaddle-leaf,54,20,,
+2148,ducklett-feather,54,15,,
+2149,litwick-soot,54,30,,
+2150,mienfoo-claw,54,40,,
+2151,vullaby-feather,54,35,,
+2152,carbink-jewel,54,50,,
+2153,phantump-twig,54,20,,
+2154,grubbin-thread,54,25,,
+2155,cutiefly-powder,54,25,,
+2156,jangmo-o-scales,54,50,,
+2157,cramorant-down,54,30,,
+2158,morpeko-snack,54,15,,
+2159,poltchageist-powder,54,30,,
 10001,black-augurite,10,0,,
 10002,peat-block,10,0,,

data/v2/csv/location_areas.csv

@@ -731,3 +731,325 @@ id,location_id,game_index,identifier
 840,188,0,
 841,237,0,
 842,247,0,
+843,868,0,
+844,869,0,
+845,870,0,main
+846,870,0,garbage
+847,871,0,
+848,872,0,
+849,873,0,
+850,874,0,
+851,875,0,main
+852,875,0,steamdrift-way
+853,876,0,main
+854,876,0,circhester-bay
+855,876,0,outer-spikemouth
+856,877,0,main
+857,877,0,near-station
+858,878,0,
+859,879,0,
+860,880,0,
+861,881,0,
+862,882,0,
+863,883,0,
+864,884,0,main
+865,884,0,ocean
+866,884,0,river
+867,884,0,beach
+868,885,0,
+869,886,0,
+870,887,0,
+871,888,0,
+872,889,0,
+873,890,0,
+874,891,0,
+875,892,0,
+876,893,0,main
+877,893,0,beach
+878,894,0,
+879,895,0,
+880,896,0,
+881,897,0,
+882,898,0,
+883,899,0,
+884,900,0,
+885,1041,0,main
+886,1041,0,2
+887,1041,0,3
+888,901,0,
+889,902,0,
+890,903,0,
+891,904,0,
+892,905,0,
+893,906,0,
+894,907,0,
+895,908,0,
+896,909,0,
+897,910,0,
+898,911,0,
+899,912,0,
+900,913,0,
+901,914,0,
+902,915,0,main
+903,915,0,beach
+904,916,0,
+905,917,0,
+906,918,0,
+907,919,0,
+908,920,0,
+909,921,0,
+910,922,0,
+911,923,0,
+912,924,0,
+913,925,0,
+914,926,0,
+915,927,0,
+916,928,0,main
+917,928,0,2
+918,929,0,
+919,930,0,
+920,931,0,
+921,932,0,
+922,933,0,main
+923,933,0,2
+924,934,0,
+925,935,0,
+926,936,0,
+927,937,0,main
+928,937,0,2
+929,938,0,main
+930,938,0,2
+931,938,0,3
+932,939,0,
+933,940,0,
+934,941,0,
+935,942,0,
+936,943,0,main
+937,943,0,beach
+938,944,0,
+939,945,0,
+940,946,0,
+941,947,0,
+942,948,0,
+943,949,0,
+944,950,0,
+945,951,0,
+946,952,0,
+947,953,0,
+948,954,0,
+949,955,0,
+950,956,0,
+951,957,0,
+952,958,0,
+953,959,0,
+954,960,0,
+955,961,0,
+956,962,0,
+957,963,0,
+958,964,0,
+959,965,0,
+960,966,0,
+961,967,0,
+962,968,0,
+963,969,0,
+964,970,0,
+965,971,0,
+966,972,0,
+967,973,0,
+968,974,0,
+969,975,0,
+970,976,0,
+971,977,0,
+972,978,0,
+973,979,0,
+974,980,0,
+975,981,0,
+976,982,0,
+977,983,0,
+978,984,0,
+979,985,0,
+980,986,0,
+981,987,0,
+982,988,0,
+983,989,0,
+984,990,0,
+985,991,0,
+986,992,0,
+987,993,0,
+988,994,0,
+989,995,0,
+990,996,0,
+991,997,0,
+992,998,0,
+993,999,0,
+994,1000,0,
+995,1001,0,
+996,1002,0,
+997,1003,0,
+998,1004,0,
+999,1005,0,
+1000,1006,0,
+1001,1007,0,
+1002,1008,0,
+1003,1009,0,
+1004,1010,0,
+1005,1011,0,
+1006,1012,0,
+1007,1013,0,
+1008,1014,0,
+1009,1015,0,
+1010,1016,0,
+1011,1017,0,
+1012,1018,0,
+1013,1019,0,
+1014,1020,0,
+1015,1021,0,
+1016,1022,0,
+1017,1023,0,
+1018,1024,0,
+1019,1025,0,
+1020,1026,0,
+1021,1027,0,
+1022,1028,0,
+1023,1029,0,
+1024,1030,0,
+1025,1031,0,
+1026,1032,0,
+1027,1033,0,
+1028,1034,0,
+1029,1035,0,
+1030,1036,0,
+1031,1037,0,
+1032,1038,0,
+1033,1039,0,
+1034,1040,0,
+1035,711,0,east
+1036,711,0,hauoli-outskirts
+1037,711,0,south
+1038,711,0,trainers-school
+1039,711,0,west
+1040,713,0,main
+1041,713,0,north
+1042,713,0,south
+1043,712,0,main
+1044,712,0,north
+1045,712,0,south
+1046,731,0,
+1047,732,0,
+1048,733,0,north
+1049,733,0,south
+1050,734,0,
+1051,735,0,main
+1052,735,0,fossil-restoration-center
+1053,736,0,main
+1054,736,0,police-station
+1055,755,0,
+1056,756,0,
+1057,763,0,
+1058,758,0,
+1059,765,0,
+1060,760,0,main
+1061,760,0,aether-house
+1062,761,0,main
+1063,761,0,east
+1064,761,0,west
+1065,762,0,northeast
+1066,762,0,west
+1067,796,0,2f
+1068,752,0,
+1069,791,0,
+1070,790,0,
+1071,782,0,
+1072,728,0,
+1073,771,0,
+1074,748,0,main
+1075,748,0,north
+1076,748,0,south
+1077,748,0,totems-den
+1078,753,0,
+1079,1046,0,
+1080,794,0,
+1081,764,0,
+1082,738,0,
+1083,725,0,
+1084,1042,0,main
+1085,1042,0,shopping-district
+1086,1042,0,beachfront
+1087,1047,0,
+1088,741,0,surf-association
+1089,719,0,
+1090,714,0,
+1091,742,0,
+1092,774,0,
+1093,773,0,
+1094,750,0,east-cave
+1095,750,0,north
+1096,750,0,south
+1097,750,0,west
+1098,720,0,
+1099,1045,0,main
+1100,1045,0,outer-cape
+1101,769,0,
+1102,726,0,
+1103,715,0,
+1104,744,0,
+1105,770,0,main
+1106,770,0,east
+1107,770,0,west
+1108,775,0,base
+1109,775,0,cave
+1110,775,0,outside
+1111,745,0,
+1112,740,0,
+1113,783,0,
+1114,786,0,
+1115,787,0,
+1116,784,0,
+1117,780,0,
+1118,785,0,center
+1119,785,0,east
+1120,785,0,north
+1121,785,0,west
+1122,781,0,
+1123,793,0,
+1124,743,0,
+1125,772,0,
+1126,722,0,
+1127,792,0,
+1128,751,0,
+1129,1048,0,
+1130,788,0,main
+1131,788,0,huntail-boat
+1132,727,0,
+1133,757,0,
+1134,759,0,
+1135,723,0,farthest-hollow
+1136,723,0,inside
+1137,1044,0,abandoned-site
+1138,1049,0,
+1139,766,0,
+1140,797,0,ultra-crater
+1141,797,0,ultra-deep-sea
+1142,797,0,ultra-desert
+1143,797,0,ultra-forest
+1144,797,0,ultra-jungle
+1145,797,0,ultra-plant
+1146,797,0,ultra-ruin
+1147,1051,0,cave
+1148,1051,0,cliff
+1149,1051,0,crag
+1150,1051,0,waterfall
+1151,789,0,inside
+1152,789,0,northwest
+1153,789,0,outside
+1154,1043,0,trial-site
+1155,1043,0,totems-den
+1156,746,0,
+1157,746,0,totems-den
+1158,1052,0,poni-island-reached
+1159,1052,0,ulaula-island-reached
+1160,1052,0,elite-four-defeated
+1161,1053,0,
+1162,1050,0,
+1163,750,0,all-areas
+1164,762,0,all-areas

data/v2/csv/location_names.csv

@@ -3577,18 +3577,29 @@ location_id,local_language_id,name,subtitle
 798,11,マリエシティ,はずれの岬
 798,12,马利埃静市,市郊海角
 799,9,Roaming Kanto,
+799,5,Sillonnant Kanto,
 800,9,Roaming Johto,
+800,5,Sillonnant Johto,
 801,9,Roaming Hoenn,
+801,5,Sillonnant Hoenn,
 802,9,Roaming Sinnoh,
+802,5,Sillonnant Sinnoh,
 803,9,Terra Cave,
+803,5,Grotte Terra,
 804,9,Marine Cave,
+804,5,Grotte Marine,
 805,9,Two Island,
 806,9,Three Island,
 807,9,Three Isle Path,
 808,9,Six Island,
 809,9,Seven Island,
 810,9,Birth Island,
+810,5,Île Aurore,
 811,9,Navel Rock,
+811,5,Roc Nombri,
 812,9,Faraway Island,
+812,5,Île lointaine,
 813,9,Hoenn Battle Frontier,
+813,5,Zone de Combat,
 814,9,Johto Safari Zone,
+814,5,Parc Safari,

data/v2/csv/locations.csv

@@ -849,3 +849,189 @@ id,region_id,identifier
 865,10,caph-squads-base
 866,10,area-zero
 867,10,zero-lab
+868,8,galar-route-1
+869,8,galar-route-2
+870,8,galar-route-3
+871,8,galar-route-4
+872,8,galar-route-5
+873,8,galar-route-6
+874,8,galar-route-7
+875,8,galar-route-8
+876,8,galar-route-9
+877,8,galar-route-10
+878,8,axews-eye
+879,8,ballimere-lake
+880,8,ballonlea
+881,8,battle-tower
+882,8,brawlers-cave
+883,8,bridge-field
+884,8,challenge-beach
+885,8,challenge-road
+886,8,circhester
+887,8,courageous-cavern
+888,8,crown-shrine
+889,8,dappled-grove
+890,8,dusty-bowl
+891,8,dyna-tree-hill
+892,8,east-lake-axewell
+893,8,fields-of-honor
+894,8,forest-of-focus
+895,8,freezington
+896,8,frigid-sea
+897,8,frostpoint-field
+898,8,galar-mine
+899,8,galar-mine-no-2
+900,8,giants-bed
+901,8,giants-foot
+902,8,giants-mirror
+903,8,giants-seat
+904,8,glimwood-tangle
+905,8,hammerlocke
+906,8,hammerlocke-hills
+907,8,honeycalm-island
+908,8,honeycalm-sea
+909,8,hulbury
+910,8,galar-iceberg-ruins
+911,8,insular-sea
+912,8,galar-iron-ruins
+913,8,lake-of-outrage
+914,8,lakeside-cave
+915,8,loop-lagoon
+916,8,master-dojo
+917,8,max-lair
+918,8,motostoke
+919,8,motostoke-outskirts
+920,8,motostoke-riverbank
+921,8,north-lake-miloch
+922,8,old-cemetary
+923,8,path-to-the-peak
+924,8,postwick
+925,8,potbottom-desert
+926,8,roaring-sea-caves
+927,8,galar-rock-peak-ruins
+928,8,rolling-fields
+929,8,slippery-slope
+930,8,slumbering-weald
+931,8,snowslide-slope
+932,8,soothing-wetlands
+933,8,south-lake-miloch
+934,8,spikemuth
+935,8,spike-decision-ruins
+936,8,steamdrift-way
+937,8,stepping-stone-sea
+938,8,stony-wilderness
+939,8,stow-on-side
+940,8,three-point-pass
+941,8,tower-of-darkness
+942,8,tower-of-waters
+943,8,training-lowlands
+944,8,tunnel-to-the-top
+945,8,turffield
+946,8,warm-up-tunnel
+947,8,watchtower-ruins
+948,8,wedgehurst
+949,8,west-lake-axewell
+950,8,workout-sea
+951,8,wyndon
+952,9,aipom-hill
+953,9,ancient-quarry
+954,9,arenas-approach
+955,9,aspiration-hill
+956,9,avalanche-slopes
+957,9,avaluggs-legacy
+958,9,bathers-lagoon
+959,9,bolderoll-ravine
+960,9,bolderoll-slope
+961,9,bonechill-wastes
+962,9,brava-arena
+963,9,castaway-shore
+964,9,celestica-ruins
+965,9,celestica-trail
+966,9,clamberclaw-cliffs
+967,9,cloudcap-pass
+968,9,cloudpool-ridge
+969,9,coastlands-camp
+970,9,cottonsedge-prairie
+971,9,crossing-slope
+972,9,deadwood-haunt
+973,9,deertrack-heights
+974,9,deertrack-path
+975,9,diamond-heath
+976,9,diamond-settlement
+977,9,droning-meadow
+978,9,fabled-spring
+979,9,firespit-island
+980,9,floaro-gardens
+981,9,gapejaw-bog
+982,9,ginkgo-landing
+983,9,glacier-terrace
+984,9,golden-lowlands
+985,9,grandtree-arena
+986,9,grueling-grove
+987,9,hearts-crag
+988,9,heavenward-lookout
+989,9,heights-camp
+990,9,hideaway-bay
+991,9,holm-of-trials
+992,9,horseshoe-plains
+993,9,ice-column-chamber
+994,9,icebound-falls
+995,9,icepeak-arena
+996,9,icepeak-cavern
+997,9,islespy-shore
+998,9,jubilife-village
+999,9,hisui-lake-acuity
+1000,9,hisui-lake-valor
+1001,9,hisui-lake-verity
+1002,9,lonely-spring
+1003,9,lunkers-lair
+1004,9,molten-arena
+1005,9,moonview-arena
+1006,9,natures-pantry
+1007,9,obsidian-falls
+1008,9,oreburrow-tunnel
+1009,9,pearl-settlement
+1010,9,primeval-grotto
+1011,9,ramanas-island
+1012,9,sacred-plaza
+1013,9,sands-reach
+1014,9,sandgem-flats
+1015,9,scarlet-bog
+1016,9,seagrass-haven
+1017,9,seaside-hollow
+1018,9,shrouded-ruins
+1019,9,sludge-mound
+1020,9,snowfall-hot-spring
+1021,9,hisui-snowpoint-temple
+1022,9,hisui-solaceon-ruins
+1023,9,sonorous-path
+1024,9,space-time-distortion
+1025,9,hisui-spring-path
+1026,9,stonetooth-rows
+1027,9,temple-of-sinnoh
+1028,9,the-heartwood
+1029,9,tidewater-dam
+1030,9,tombolo-walk
+1031,9,tranquility-cove
+1032,9,hisui-turnback-cave
+1033,9,ursas-ring
+1034,9,veilstone-cape
+1035,9,hisui-wayward-cave
+1036,9,wayward-wood
+1037,9,whiteout-valley
+1038,9,windbreak-stand
+1039,9,windswept-run
+1040,9,worn-bridge
+1041,8,giants-cap
+1042,7,hauoli-city
+1043,7,verdant-cavern
+1044,7,thrifty-megamart
+1045,7,malie-city
+1046,7,dividing-peak-tunnel
+1047,7,heahea-beach
+1048,7,sandy-cave
+1049,7,ulaula-beach
+1050,7,ultra-megalopolis
+1051,7,ultra-space-wilds
+1052,7,poke-pelago
+1053,7,team-rockets-castle

data/v2/csv/move_damage_class_prose.csv

@@ -1,16 +1,22 @@
 move_damage_class_id,local_language_id,name,description
 1,1,へんか,ダメージない
+1,4,變化,沒有傷害
 1,5,statut,Aucun dégât
 1,6,status,Kein Schaden
 1,7,estado,Sin Daño
 1,9,status,No damage
+1,12,变化,没有伤害
 2,1,ぶつり,ぶつりのダメージ。こうげきとぼうぎょを行使する
+2,4,物理,物理傷害，受攻擊和防禦影響
 2,5,physique,"Dégâts physique, influencés par l'Attaque et la Défense"
 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"
+2,12,物理,物理伤害，受攻击和防御影响
 3,1,とくしゅ,とくしゅのダメージ。とくこうととくぼうを行使する
+3,4,特殊,特殊傷害，受特攻和特防影響
 3,5,spéciale,"Dégâts spéciaux, influencés par l'Attaque Spéciale et la Défense Spéciale"
 3,6,spezial,"Spezieller Schaden, beeinflusst von Spezialangriff und Spezialverteidigung"
 3,7,especial,"Daño Especial, controlado por el Ataque Esecieal y Defensa Especial"
 3,9,special,"Special damage, controlled by Special Attack and Special Defense"
+3,12,特殊,特殊伤害，受特攻和特防影响

data/v2/csv/move_meta_stat_changes.csv

@@ -48,7 +48,11 @@ move_id,stat_id,change
 246,6,1
 247,5,-1
 249,3,-1
+254,3,1
+254,5,1
 260,4,1
+262,2,-2
+262,4,-2
 268,5,1
 276,2,-1
 276,3,-1
@@ -94,6 +98,7 @@ move_id,stat_id,change
 426,7,-1
 429,7,-1
 430,5,-1
+432,8,-1
 434,4,-2
 437,4,-2
 445,4,-2
@@ -118,6 +123,11 @@ move_id,stat_id,change
 489,7,1
 490,6,-1
 491,5,-2
+504,3,-1
+504,5,-1
+504,2,2
+504,4,2
+504,6,2
 508,2,1
 508,6,2
 522,4,-1

data/v2/csv/move_names.csv

@@ -8261,300 +8261,546 @@ move_id,local_language_id,name
 826,12,诡异咒语
 827,1,フェイタルクロー
 827,4,克命爪
+827,8,Artigli Fatali
 827,9,Dire Claw
 827,11,フェイタルクロー
 828,1,バリアーラッシュ
 828,4,屏障猛攻
+828,8,Barrierassalto
 828,9,Psyshield Bash
 828,11,バリアーラッシュ
 829,1,パワーシフト
 829,4,力量转换
+829,8,Scambioforza
 829,9,Power Shift
 829,11,パワーシフト
 830,1,がんせきアックス
 830,4,岩斧
+830,8,Rocciascure
 830,9,Stone Axe
 830,11,がんせきアックス
 831,1,はるのあらし
 831,4,阳春风暴
+831,8,Tempesta Zefirea
 831,9,Springtide Storm
 831,11,はるのあらし
 832,1,しんぴのちから
 832,4,神秘之力
+832,8,Forza Mistica
 832,9,Mystical Power
 832,11,しんぴのちから
 833,1,だいふんげき
 833,4,大愤慨
+833,8,Ira Furente
 833,9,Raging Fury
 833,11,だいふんげき
 834,1,ウェーブタックル
 834,4,波动冲
+834,8,Ondaschianto
 834,9,Wave Crash
 834,11,ウェーブタックル
 835,1,クロロブラスト
 835,4,叶绿爆震
+835,8,Clorofillaser
 835,9,Chloroblast
 835,11,クロロブラスト
 836,1,ひょうざんおろし
 836,4,冰山风
+836,8,Soffio d’Iceberg
 836,9,Mountain Gale
 836,11,ひょうざんおろし
 837,1,しょうりのまい
 837,4,胜利之舞
+837,8,Danzavittoria
 837,9,Victory Dance
 837,11,しょうりのまい
 838,1,ぶちかまし
 838,4,突飞猛扑
+838,8,Scontro Frontale
 838,9,Headlong Rush
 838,11,ぶちかまし
 839,1,どくばりセンボン
 839,4,毒千针
+839,8,Mille Fielespine
 839,9,Barb Barrage
 839,11,どくばりセンボン
 840,1,オーラウイング
 840,4,气场之翼
+840,8,Ali d'Aura
 840,9,Esper Wing
 840,11,オーラウイング
 841,1,うらみつらみ
 841,4,冤冤相报
+841,8,Livore
 841,9,Bitter Malice
 841,11,うらみつらみ
 842,1,たてこもる
 842,4,闭关
+842,8,Barricata
 842,9,Shelter
 842,11,たてこもる
 843,1,３ぼんのや
 843,4,三连箭
+843,8,Triplodardo
 843,9,Triple Arrows
 843,11,３ぼんのや
 844,1,ひゃっきやこう
 844,4,群魔乱舞
+844,8,Corteo Spettrale
 844,9,Infernal Parade
 844,11,ひゃっきやこう
 845,1,ひけん・ちえなみ
 845,4,秘剑・千重涛
+845,8,Lama Milleflutti
 845,9,Ceaseless Edge
 845,11,ひけん・ちえなみ
 846,1,こがらしあらし
 846,4,枯叶风暴
+846,8,Tempesta Boreale
 846,9,Bleakwind Storm
 846,11,こがらしあらし
 847,1,かみなりあらし
 847,4,鸣雷风暴
+847,8,Tempesta Tonante
 847,9,Wildbolt Storm
 847,11,かみなりあらし
 848,1,ねっさのあらし
 848,4,热沙风暴
+848,8,Tempesta Ardente
 848,9,Sandsear Storm
 848,11,ねっさのあらし
 849,1,みかづきのいのり
 849,4,新月祈祷
+849,8,Invocaluna
 849,9,Lunar Blessing
 849,11,みかづきのいのり
 850,1,ブレイブチャージ
 850,4,勇气填充
+850,8,Baldimpulso
 850,9,Take Heart
 850,11,ブレイブチャージ
 851,1,テラバースト
 851,4,太晶爆发
+851,8,Terascoppio
 851,9,Tera Blast
 851,11,テラバースト
 852,1,スレッドトラップ
 852,4,线阱
+852,8,Telatrappola
 852,9,Silk Trap
 852,11,スレッドトラップ
 853,1,かかとおとし
 853,4,下压踢
+853,8,Calcio ad Ascia
 853,9,Axe Kick
 853,11,かかとおとし
 854,1,おはかまいり
 854,4,扫墓
+854,8,Omaggio ai KO
 854,9,Last Respects
 854,11,おはかまいり
 855,1,ルミナコリジョン
 855,4,琉光冲激
+855,8,Fotocollisione
 855,9,Lumina Crash
 855,11,ルミナコリジョン
 856,1,いっちょうあがり
 856,4,上菜
+856,8,Alta Cucina
 856,9,Order Up
 856,11,いっちょうあがり
 857,1,ジェットパンチ
 857,4,喷射拳
+857,8,Pugnojet
 857,9,Jet Punch
 857,11,ジェットパンチ
 858,1,ハバネロエキス
 858,4,辣椒精华
+858,8,Essenza Piccante
 858,9,Spicy Extract
 858,11,ハバネロエキス
 859,1,ホイールスピン
 859,4,疾速转轮
+859,8,Slittaruote
 859,9,Spin Out
 859,11,ホイールスピン
 860,1,ネズミざん
 860,4,鼠数儿
+860,8,Infestazione
 860,9,Population Bomb
 860,11,ネズミざん
 861,1,アイススピナー
 861,4,冰旋
+861,8,Vortighiaccio
 861,9,Ice Spinner
 861,11,アイススピナー
 862,1,きょけんとつげき
 862,4,巨剑突击
+862,8,Spadoncarica
 862,9,Glaive Rush
 862,11,きょけんとつげき
 863,1,さいきのいのり
 863,4,复生祈祷
+863,8,Preghiera Vitale
 863,9,Revival Blessing
 863,11,さいきのいのり
 864,1,しおづけ
 864,4,盐腌
+864,8,Sotto Sale
 864,9,Salt Cure
 864,11,しおづけ
 865,1,トリプルダイブ
 865,4,三连钻
+865,8,Triplo Tuffo
 865,9,Triple Dive
 865,11,トリプルダイブ
 866,1,キラースピン
 866,4,晶光转转
+866,8,Glitturbine
 866,9,Mortal Spin
 866,11,キラースピン
 867,1,うつしえ
 867,4,描绘
+867,8,Ricalco
 867,9,Doodle
 867,11,うつしえ
 868,1,みをけずる
 868,4,甩肉
+868,8,Alleggerimento
 868,9,Fillet Away
 868,11,みをけずる
 869,1,ドゲザン
 869,4,仆刀
+869,8,Genufendente
 869,9,Kowtow Cleave
 869,11,ドゲザン
 870,1,トリックフラワー
 870,4,千变万花
+870,8,Prestigiafiore
 870,9,Flower Trick
 870,11,トリックフラワー
 871,1,フレアソング
 871,4,闪焰高歌
+871,8,Canzone Ardente
 871,9,Torch Song
 871,11,フレアソング
 872,1,アクアステップ
 872,4,流水旋舞
+872,8,Idroballetto
 872,9,Aqua Step
 872,11,アクアステップ
 873,1,レイジングブル
 873,4,怒牛
+873,8,Scatenatoro
 873,9,Raging Bull
 873,11,レイジングブル
 874,1,ゴールドラッシュ
 874,4,淘金潮
+874,8,Corsa all'Oro
 874,9,Make It Rain
 874,11,ゴールドラッシュ
-875,1,はたく
-875,4,拍击
-875,9,Pound
-875,11,はたく
-876,1,はたく
-876,4,拍击
-876,9,Pound
-876,11,はたく
+875,1,サイコブレイド 
+875,3,사이코블레이드
+875,4,精神劍
+875,5,Lame Psychique
+875,6,Psychoschneide
+875,7,Psicohojas
+875,8,Psicolama
+875,9,Psyblade
+875,11,サイコブレイド 
+875,12,精神剑
+876,1,ハイドロスチーム
+876,3,하이드로스팀
+876,4,水蒸氣
+876,5,Hydrovapeur
+876,6,Hydrodampf
+876,7,Hidrovapor
+876,8,Idrovapore
+876,9,Hydro Steam
+876,11,ハイドロスチーム
+876,12,水蒸气
 877,1,カタストロフィ
 877,4,大灾难
+877,8,Catastrofe
 877,9,Ruination
 877,11,カタストロフィ
 878,1,アクセルブレイク
 878,4,全开猛撞
+878,8,Turboschianto
 878,9,Collision Course
 878,11,アクセルブレイク
 879,1,イナズマドライブ
 879,4,闪电猛冲
+879,8,Fulmiscatto
 879,9,Electro Drift
 879,11,イナズマドライブ
 880,1,しっぽきり
 880,4,断尾
+880,8,Tagliacoda
 880,9,Shed Tail
 880,11,しっぽきり
 881,1,さむいギャグ
 881,4,冷笑话
+881,8,Freddura
 881,9,Chilly Reception
 881,11,さむいギャグ
 882,1,おかたづけ
 882,4,大扫除
+882,8,Pulizie
 882,9,Tidy Up
 882,11,おかたづけ
 883,1,ゆきげしき
 883,4,雪景
+883,8,Vista Innevata
 883,9,Snowscape
 883,11,ゆきげしき
 884,1,とびつく
 884,4,虫扑
+884,8,Balzo
 884,9,Pounce
 884,11,とびつく
 885,1,くさわけ
 885,4,起草
+885,8,Apripista
 885,9,Trailblaze
 885,11,くさわけ
 886,1,ひやみず
 886,4,泼冷水
+886,8,Doccia Fredda
 886,9,Chilling Water
 886,11,ひやみず
 887,1,ハイパードリル
 887,4,强力钻
+887,8,Ipertrapano
 887,9,Hyper Drill
 887,11,ハイパードリル
 888,1,ツインビーム
 888,4,双光束
+888,8,Doppioraggio
 888,9,Twin Beam
 888,11,ツインビーム
 889,1,ふんどのこぶし
 889,4,愤怒之拳
+889,8,Pugno Furibondo
 889,9,Rage Fist
 889,11,ふんどのこぶし
 890,1,アーマーキャノン
 890,4,铠农炮
+890,8,Corazza Cannone
 890,9,Armor Cannon
 890,11,アーマーキャノン
 891,1,むねんのつるぎ
 891,4,悔念剑
+891,8,Lama del Rimorso
 891,9,Bitter Blade
 891,11,むねんのつるぎ
 892,1,でんこうそうげき
 892,4,电光双击
+892,8,Doppiolampo
 892,9,Double Shock
 892,11,でんこうそうげき
 893,1,デカハンマー
 893,4,巨力锤
+893,8,Granmartello
 893,9,Gigaton Hammer
 893,11,デカハンマー
 894,1,ほうふく
 894,4,复仇
+894,8,Ritorsione
 894,9,Comeuppance
 894,11,ほうふく
 895,1,アクアカッター
 895,4,水波刀
+895,8,Idrotaglio
 895,9,Aqua Cutter
 895,11,アクアカッター
 896,1,バーンアクセル
 896,4,灼热暴冲
+896,8,Turboustione
 896,9,Blazing Torque
 896,11,バーンアクセル
 897,1,ダークアクセル
 897,4,黑暗暴冲
+897,8,Turbotenebra
 897,9,Wicked Torque
 897,11,ダークアクセル
 898,1,ポイズンアクセル
 898,4,剧毒暴冲
+898,8,Turbotossina
 898,9,Noxious Torque
 898,11,ポイズンアクセル
 899,1,ファイトアクセル
 899,4,格斗暴冲
+899,8,Turborissa
 899,9,Combat Torque
 899,11,ファイトアクセル
 900,1,マジカルアクセル
 900,4,魔法暴冲
+900,8,Turboincanto
 900,9,Magical Torque
 900,11,マジカルアクセル
+901,1,ブラッドムーン
+901,9,Blood Moon
+901,11,ブラッドムーン
+902,1,シャカシャカほう
+902,9,Matcha Gotcha
+902,11,シャカシャカほう
+903,1,みずあめボム
+903,9,Syrup Bomb
+903,11,みずあめボム
+904,1,ツタこんぼう
+904,9,Ivy Cudgel
+904,11,ツタこんぼう
+905,1,エレクトロビーム
+905,3,일렉트로빔
+905,4,電光束
+905,5,Fulgurayon
+905,6,Stromstrahl
+905,7,Electrorrayo
+905,8,Elettroraggio
+905,9,Electro Shot
+905,11,エレクトロビーム
+905,12,电光束
+906,1,テラクラスター
+906,3,테라클러스터
+906,4,晶光星群
+906,5,Pluie Térastrale
+906,6,Tera-Sternhagel
+906,7,Teraclúster
+906,8,Teracluster
+906,9,Tera Starstorm
+906,11,テラクラスター
+906,12,晶光星群
+907,1,きまぐレーザー
+907,3,변덕레이저
+907,4,隨機光
+907,5,Laser Hasard
+907,6,Launenlaser
+907,7,Láser Veleidoso
+907,8,Irregolaser
+907,9,Fickle Beam
+907,11,きまぐレーザー
+907,12,随机光
+908,1,かえんのまもり
+908,3,화염의수호
+908,4,火焰守護
+908,5,Rempart Brûlant
+908,6,Flammenschild
+908,7,Llama Protectora
+908,8,Egida Ignea
+908,9,Burning Bulwark
+908,11,かえんのまもり
+908,12,火焰守护
+909,1,じんらい
+909,3,질풍신뢰
+909,4,迅雷
+909,5,Vif Éclair
+909,6,Sturmblitz
+909,7,Relámpago Súbito
+909,8,Saetta
+909,9,Thunderclap
+909,11,じんらい
+909,12,迅雷
+910,1,パワフルエッジ
+910,3,파워풀에지
+910,4,強刃攻擊
+910,5,Lame Puissante
+910,6,Wuchtklinge
+910,7,Filo Potente
+910,8,Taglio Poderoso
+910,9,Mighty Cleave
+910,11,パワフルエッジ
+910,12,强刃攻击
+911,1,タキオンカッター
+911,3,타키온커터
+911,4,迅子利刃
+911,5,Lame Tachyonique
+911,6,Tachyon-Schnitt
+911,7,Tajo Taquión
+911,8,Tachiontaglio
+911,9,Tachyon Cutter
+911,11,タキオンカッター
+911,12,迅子利刃
+912,1,ハードプレス
+912,3,하드프레스
+912,4,硬壓
+912,5,Pression Extrême
+912,6,Stahlpresse
+912,7,Prensa Metálica
+912,8,Pressa d’Acciaio
+912,9,Hard Press
+912,11,ハードプレス
+912,12,硬压
+913,1,ドラゴンエール
+913,3,드래곤옐
+913,4,龍聲鼓舞
+913,5,Cri Draconique
+913,6,Drachenschrei
+913,7,Bramido Dragón
+913,8,Grido del Drago
+913,9,Dragon Cheer
+913,11,ドラゴンエール
+913,12,龙声鼓舞
+914,1,みわくのボイス
+914,3,매혹의보이스
+914,4,魅誘之聲
+914,5,Voix Envoûtante
+914,6,Lockstimme
+914,7,Canto Encantador
+914,8,Ammaliavoce
+914,9,Alluring Voice
+914,11,みわくのボイス
+914,12,魅诱之声
+915,1,やけっぱち
+915,3,열불내기
+915,4,豁出去
+915,5,Indignition
+915,6,Frustflamme
+915,7,Cólera Ardiente
+915,8,Rabbia Bruciante
+915,9,Temper Flare
+915,11,やけっぱち
+915,12,豁出去
+916,1,サンダーダイブ
+916,3,썬더다이브
+916,4,閃電強襲
+916,5,Volt Assaut
+916,6,Donnerstoß
+916,7,Plancha Voltaica
+916,8,Elettrotuffo
+916,9,Supercell Slam
+916,11,サンダーダイブ
+916,12,闪电强袭
+917,1,サイコノイズ
+917,3,사이코노이즈
+917,4,精神噪音
+917,5,Dissonance Psy
+917,6,Psycholärm
+917,7,Psicorruido
+917,8,Psicorumore
+917,9,Psychic Noise
+917,11,サイコノイズ
+917,12,精神噪音
+918,1,はやてがえし
+918,3,기선제압
+918,4,快手還擊
+918,5,Prio-Parade
+918,6,Schnellkonter
+918,7,Palma Rauda
+918,8,Colpo di Mano
+918,9,Upper Hand
+918,11,はやてがえし
+918,12,快手还击
+919,1,じゃどくのくさり
+919,3,악독사슬
+919,4,邪毒鎖鏈
+919,5,Chaîne Malsaine
+919,6,Giftkettung
+919,7,Cadena Virulenta
+919,8,Intossicatena
+919,9,Malignant Chain
+919,11,じゃどくのくさり
+919,12,邪毒锁链
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag

data/v2/csv/moves.csv

@@ -103,7 +103,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 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
 104,double-team,1,1,,15,,0,7,1,17,,1,16,1
-105,recover,1,1,,10,,0,7,1,33,,4,23,8
+105,recover,1,1,,5,,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,22,10
@@ -133,7 +133,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 132,constrict,1,1,10,35,100,0,10,2,71,10,5,9,21
 133,amnesia,1,14,,20,,0,7,1,55,,3,32,11
 134,kinesis,1,14,,15,80,0,10,1,24,,4,24,11
-135,soft-boiled,1,1,,10,,0,7,1,33,,2,1,8
+135,soft-boiled,1,1,,5,,0,7,1,33,,2,1,8
 136,high-jump-kick,1,2,130,10,90,0,10,2,46,,1,3,5
 137,glare,1,1,,30,100,0,10,1,68,,5,5,19
 138,dream-eater,1,14,100,15,100,0,10,3,9,,4,8,20
@@ -154,7 +154,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 153,explosion,1,1,250,5,100,0,9,2,8,,2,7,9
 154,fury-swipes,1,1,18,15,80,0,10,2,30,,5,10,7
 155,bonemerang,1,5,50,10,90,0,10,2,45,,5,1,7
-156,rest,1,14,,10,,0,7,1,38,,3,16,8
+156,rest,1,14,,5,,0,7,1,38,,3,16,8
 157,rock-slide,1,6,75,10,90,0,11,2,32,30,5,5,5
 158,hyper-fang,1,1,80,15,90,0,10,2,32,10,1,4,18
 159,sharpen,1,1,,30,,0,7,1,11,,3,32,11
@@ -206,7 +206,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 205,rollout,2,6,30,20,90,0,10,2,118,,5,24,7
 206,false-swipe,2,1,40,40,100,0,10,2,102,,1,5,16
 207,swagger,2,1,,15,85,0,10,1,119,,3,27,19
-208,milk-drink,2,1,,10,,0,7,1,33,,3,12,8
+208,milk-drink,2,1,,5,,0,7,1,33,,3,12,8
 209,spark,2,13,65,20,100,0,10,2,7,30,1,4,5
 210,fury-cutter,2,7,40,20,95,0,10,2,120,,1,17,7
 211,steel-wing,2,9,70,25,90,0,10,2,139,10,1,12,5
@@ -293,15 +293,15 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 292,arm-thrust,3,2,15,20,100,0,10,2,30,,5,10,7
 293,camouflage,3,1,,20,,0,7,1,214,,4,2,13
 294,tail-glow,3,7,,20,,0,7,1,322,,2,32,11
-295,luster-purge,3,14,70,5,100,0,10,3,73,50,4,9,22
-296,mist-ball,3,14,70,5,100,0,10,3,72,50,4,4,22
+295,luster-purge,3,14,95,5,100,0,10,3,73,50,4,9,22
+296,mist-ball,3,14,95,5,100,0,10,3,72,50,4,4,22
 297,feather-dance,3,3,,15,100,0,10,1,59,,2,28,19
 298,teeter-dance,3,1,,20,100,0,9,1,200,,3,6,14
 299,blaze-kick,3,10,85,10,90,0,10,2,201,10,2,1,17
 300,mud-sport,3,5,,15,,0,12,1,202,,3,1,13
 301,ice-ball,3,15,30,20,90,0,10,2,118,,2,24,7
 302,needle-arm,3,12,60,15,100,0,10,2,32,30,4,4,5
-303,slack-off,3,1,,10,,0,7,1,33,,3,26,8
+303,slack-off,3,1,,5,,0,7,1,33,,3,26,8
 304,hyper-voice,3,1,90,10,100,0,11,3,1,,1,5,5
 305,poison-fang,3,4,50,15,100,0,10,2,203,50,4,33,4
 306,crush-claw,3,1,75,10,95,0,10,2,70,50,1,4,5
@@ -353,7 +353,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 352,water-pulse,3,11,60,20,100,0,10,3,77,20,2,21,17
 353,doom-desire,3,9,140,5,100,0,10,3,149,,1,24,17
 354,psycho-boost,3,14,140,5,90,0,10,3,205,100,4,3,22
-355,roost,4,3,,10,,0,7,1,215,,1,,8
+355,roost,4,3,,5,,0,7,1,215,,1,,8
 356,gravity,4,14,,5,,0,12,1,216,,2,,13
 357,miracle-eye,4,14,,40,,0,10,1,217,,3,,20
 358,wake-up-slap,4,2,70,10,100,0,10,2,218,,4,,16
@@ -657,7 +657,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 656,twinkle-tackle--physical,7,18,,1,,0,10,2,1,,,,
 657,twinkle-tackle--special,7,18,,1,,0,10,3,1,,,,
 658,catastropika,7,13,210,1,,0,10,2,1,,,,
-659,shore-up,7,5,,10,,0,7,1,382,,,,
+659,shore-up,7,5,,5,,0,7,1,382,,,,
 660,first-impression,7,7,90,10,100,2,10,2,383,,,,
 661,baneful-bunker,7,4,,10,,4,7,1,384,,,,
 662,spirit-shackle,7,8,80,10,100,0,10,2,385,,,,
@@ -801,7 +801,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 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,,,,
+803,grassy-glide,8,12,55,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,,,
@@ -815,14 +815,14 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 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,,,,
+817,wicked-blow,8,17,75,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,,,,
+824,glacial-lance,8,15,120,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,,,,
 827,dire-claw,8,4,80,15,100,0,10,2,,,,,
@@ -873,8 +873,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 872,aqua-step,9,11,80,10,100,0,10,2,,,,,
 873,raging-bull,9,1,90,10,100,0,10,2,,,,,
 874,make-it-rain,9,9,120,5,100,0,11,3,,,,,
-875,pound,9,1,40,35,100,0,10,2,,,,,
-876,pound,9,1,40,35,100,0,10,2,,,,,
+875,psyblade,9,14,80,15,100,0,10,2,,,,,
+876,hydro-steam,9,11,80,15,100,0,10,3,,,,,
 877,ruination,9,17,1,10,90,0,10,3,,,,,
 878,collision-course,9,2,100,5,100,0,10,2,,,,,
 879,electro-drift,9,13,100,5,100,0,10,3,,,,,
@@ -899,8 +899,25 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 898,noxious-torque,9,4,100,10,100,0,10,2,,,,,
 899,combat-torque,9,2,100,10,100,0,10,2,,,,,
 900,magical-torque,9,18,100,10,100,0,10,2,,,,,
-901,hydro-steam,9,11,80,15,100,0,10,3,,,,,
-902,psyblade,9,14,80,15,100,0,10,2,,,,,
+901,blood-moon,9,1,140,5,100,0,10,3,,,,,
+902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
+903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
+904,ivy-cudgel,9,12,100,10,100,0,10,2,,,,,
+905,electro-shot,9,13,130,10,100,0,10,3,,,,,
+906,tera-starstorm,9,1,120,5,100,0,11,3,,,,,
+907,fickle-beam,9,16,80,5,100,0,10,3,,,,,
+908,burning-bulwark,9,10,0,10,0,4,7,1,,,,,
+909,thunderclap,9,13,70,5,100,1,10,3,,,,,
+910,mighty-cleave,9,6,95,5,100,0,10,2,,,,,
+911,tachyon-cutter,9,9,50,10,0,0,10,3,,,,,
+912,hard-press,9,9,0,10,100,0,10,2,,,,,
+913,dragon-cheer,9,16,0,15,0,0,15,1,,,,,
+914,alluring-voice,9,18,80,10,100,0,10,3,,,,,
+915,temper-flare,9,10,75,10,100,0,10,2,,,,,
+916,supercell-slam,9,13,100,15,95,0,10,2,,,,,
+917,psychic-noise,9,14,75,10,100,0,10,3,,,,,
+918,upper-hand,9,2,65,15,100,3,10,2,,,,,
+919,malignant-chain,9,4,100,5,100,0,10,3,,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokeathlon_stat_names.csv

@@ -1,16 +1,31 @@
 pokeathlon_stat_id,local_language_id,name
+1,1,スピード
+1,4,速度
 1,5,Vitesse
 1,7,Velocidad
 1,9,Speed
+1,12,速度
+2,1,パワー
+2,4,力量
 2,5,Force
 2,7,Fuerza
 2,9,Power
+2,12,力量
+3,1,テクニック
+3,4,技巧
 3,5,Habileté
 3,7,Habilidad
 3,9,Skill
+3,12,技巧
+4,1,スタミナ
+4,4,耐力
 4,5,Endurance
 4,7,Firmeza
 4,9,Stamina
+4,12,耐力
+5,1,ジャンプ
+5,4,跳躍
 5,5,Saut
 5,7,Salto
 5,9,Jump
+5,12,跳跃

data/v2/csv/pokedex_version_groups.csv

@@ -7,6 +7,7 @@ pokedex_id,version_group_id
 4,5
 4,6
 5,8
+5,23
 6,9
 7,10
 8,11
@@ -28,6 +29,8 @@ pokedex_id,version_group_id
 26,19
 27,20
 28,20
+28,21
+29,22
 29,20
 30,24
 31,25

data/v2/csv/pokedexes.csv

@@ -29,5 +29,5 @@ id,region_id,identifier,is_main_series
 29,8,crown-tundra,1
 30,9,hisui,1
 31,10,paldea,1
-32,10,teal-mask,1
-33,10,indigo-disk,1
+32,10,kitakami,1
+33,10,blueberry,1

data/v2/csv/pokemon.csv

@@ -1009,6 +1009,21 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 1008,miraidon,1008,35,2400,,999,1
 1009,walking-wake,1009,35,2800,,1093,1
 1010,iron-leaves,1010,15,1250,,1094,1
+1011,dipplin,1011,4,97,,1095,1
+1012,poltchageist,1012,1,11,,1096,1
+1013,sinistcha,1013,2,22,,1097,1
+1014,okidogi,1014,18,922,,1098,1
+1015,munkidori,1015,10,122,,1099,1
+1016,fezandipiti,1016,14,301,,1100,1
+1017,ogerpon,1017,12,398,,1101,1
+1018,archaludon,1018,20,600,,1102,1
+1019,hydrapple,1019,18,930,,1103,1
+1020,gouging-fire,1020,35,5900,,1104,1
+1021,raging-bolt,1021,52,4800,,1105,1
+1022,iron-boulder,1022,15,1625,,1106,1
+1023,iron-crown,1023,16,1560,,1107,1
+1024,terapagos,1024,2,65,,1108,1
+1025,pecharunt,1025,3,3,,1109,1
 10001,deoxys-attack,386,17,608,270,515,0
 10002,deoxys-defense,386,17,608,270,516,0
 10003,deoxys-speed,386,17,608,270,517,0
@@ -1280,3 +1295,9 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10269,miraidon-drive-mode,1008,28,2400,,,0
 10270,miraidon-aquatic-mode,1008,28,2400,,,0
 10271,miraidon-glide-mode,1008,28,2400,,,0
+10272,ursaluna-bloodmoon,901,24,2900,,,0
+10273,ogerpon-wellspring-mask,1017,12,398,,,0
+10274,ogerpon-hearthflame-mask,1017,12,398,,,0
+10275,ogerpon-cornerstone-mask,1017,12,398,,,0
+10276,terapagos-terastal,1024,3,160,,,0
+10277,terapagos-stellar,1024,17,770,,,0

data/v2/csv/pokemon_abilities.csv

@@ -709,7 +709,7 @@ pokemon_id,ability_id,is_hidden,slot
 274,48,0,2
 274,124,1,3
 275,34,0,1
-275,48,0,2
+275,274,0,2
 275,124,1,3
 276,62,0,1
 276,113,1,3
@@ -977,11 +977,11 @@ pokemon_id,ability_id,is_hidden,slot
 392,66,0,1
 392,89,1,3
 393,67,0,1
-393,128,1,3
+393,172,1,3
 394,67,0,1
-394,128,1,3
+394,172,1,3
 395,67,0,1
-395,128,1,3
+395,172,1,3
 396,51,0,1
 396,120,1,3
 397,22,0,1
@@ -2148,14 +2148,15 @@ pokemon_id,ability_id,is_hidden,slot
 899,157,1,3
 900,68,0,1
 900,125,0,2
-900,80,1,3
+900,292,1,3
 901,62,0,1
 901,171,0,2
 901,127,1,3
-902,155,0,1
+902,33,0,1
 902,91,0,2
 902,104,1,3
 903,46,0,1
+903,84,0,2
 903,143,1,3
 904,38,0,1
 904,33,0,2
@@ -2411,6 +2412,32 @@ pokemon_id,ability_id,is_hidden,slot
 1009,281,1,3
 1010,282,0,1
 1010,282,1,3
+1011,300,0,1
+1011,82,0,2
+1011,60,1,3
+1012,301,0,1
+1012,85,1,3
+1013,301,0,1
+1013,85,1,3
+1014,302,0,1
+1014,275,1,3
+1015,302,0,1
+1015,119,1,3
+1016,302,0,1
+1016,101,1,3
+1017,128,0,1
+1018,192,0,1
+1018,5,0,2
+1018,242,1,3
+1019,300,0,1
+1019,144,0,2
+1019,60,1,3
+1020,281,0,1
+1021,281,0,1
+1022,282,0,1
+1023,282,0,1
+1024,304,0,1
+1025,307,0,1
 10001,46,0,1
 10002,46,0,1
 10003,46,0,1
@@ -2803,10 +2830,10 @@ pokemon_id,ability_id,is_hidden,slot
 10228,101,1,3
 10229,22,0,1
 10229,18,0,2
-10229,154,1,3
+10229,69,1,3
 10230,22,0,1
 10230,18,0,2
-10230,154,1,3
+10230,69,1,3
 10231,43,0,1
 10231,9,0,2
 10231,106,1,3
@@ -2814,15 +2841,15 @@ pokemon_id,ability_id,is_hidden,slot
 10232,9,0,2
 10232,106,1,3
 10233,66,0,1
-10233,18,1,3
+10233,119,1,3
 10234,38,0,1
 10234,33,0,2
 10234,22,1,3
 10235,39,0,1
 10235,51,0,2
-10235,143,1,3
+10235,124,1,3
 10236,67,0,1
-10236,75,1,3
+10236,292,1,3
 10237,34,0,1
 10237,55,0,2
 10237,102,1,3
@@ -2830,18 +2857,18 @@ pokemon_id,ability_id,is_hidden,slot
 10239,149,0,1
 10240,51,0,1
 10240,125,0,2
-10240,128,1,3
+10240,110,1,3
 10241,157,0,1
-10241,142,0,2
+10241,75,0,2
 10241,183,1,3
 10242,157,0,1
-10242,142,0,2
+10242,75,0,2
 10242,183,1,3
 10243,173,0,1
 10243,115,0,2
 10243,5,1,3
 10244,65,0,1
-10244,203,1,3
+10244,113,1,3
 10245,46,0,1
 10245,140,1,3
 10246,46,0,1
@@ -2849,7 +2876,7 @@ pokemon_id,ability_id,is_hidden,slot
 10247,155,0,1
 10247,91,0,2
 10247,104,1,3
-10248,155,0,1
+10248,33,0,1
 10248,91,0,2
 10248,104,1,3
 10249,142,0,1
@@ -2907,3 +2934,9 @@ pokemon_id,ability_id,is_hidden,slot
 10270,289,1,3
 10271,289,0,1
 10271,289,1,3
+10272,299,0,1
+10273,11,0,1
+10274,104,0,1
+10275,5,0,1
+10276,305,0,1
+10277,306,0,1

data/v2/csv/pokemon_abilities_past.csv

@@ -0,0 +1,18 @@
+pokemon_id,generation_id,ability_id,is_hidden,slot
+94,6,26,0,1
+145,5,31,1,3
+243,6,10,1,3
+244,6,18,1,3
+245,6,11,1,3
+275,8,48,0,2
+393,8,128,1,3
+394,8,128,1,3
+395,8,128,1,3
+475,8,80,0,2
+543,5,95,1,3
+544,5,95,1,3
+545,5,95,1,3
+607,5,23,1,3
+608,5,23,1,3
+609,5,23,1,3
+10016,5,69,0,1

data/v2/csv/pokemon_evolution.csv

@@ -14,7 +14,7 @@ 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,,,,,,,,,160,,,,,,,0,0
+16,25,1,,,,,,,,,220,,,,,,,0,0
 17,26,3,83,,,,,,,,,,,,,,,0,0
 18,28,1,,22,,,,,,,,,,,,,,0,0
 19,30,1,,16,,,,,,,,,,,,,,0,0
@@ -365,8 +365,6 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 365,476,1,,,,629,,,,,,,,,,,,0,0
 366,462,1,,,,,,,,,,,,,,,,0,0
 367,105,1,,28,,,,night,,,,,,,,,,0,0
-368,470,1,,,,,,,,,,,,,,,,0,0
-369,471,1,,,,,,,,,,,,,,,,0,0
 370,476,1,,,,,,,,,,,,,,,,0,0
 371,350,1,,,,,,,,,,170,,,,,,0,0
 373,723,1,,17,,,,,,,,,,,,,,0,0

data/v2/csv/pokemon_form_names.csv

@@ -507,6 +507,42 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 1008,1,コンプリートモード,
 1008,9,Ultimate Mode,
 1008,11,コンプリートモード,
+1012,1,マガイモノのすがた,
+1012,3,가짜배기의 모습,
+1012,4,冒牌貨的樣子,
+1012,5,Forme Imitation,
+1012,6,Imitationsform,
+1012,7,Forma Fraudulenta,
+1012,8,Forma Taroccata,
+1012,9,Counterfeit Form,
+1012,11,マガイモノのすがた,
+1012,12,高檔貨的樣子,
+1013,1,ボンサクのすがた,
+1013,3,범작의 모습,
+1013,4,凡作的樣子,
+1013,5,Forme Médiocre,
+1013,6,Simple Form,
+1013,7,Forma Mediocre,
+1013,8,Forma Dozzinale,
+1013,9,Unremarkable Form,
+1013,11,ボンサクのすがた,
+1013,12,凡作的样子,
+1017,1,みどりのめん,
+1017,3,벽록의가면,
+1017,4,碧草面具,
+1017,5,Masque Turquoise,
+1017,6,Türkisgrüne Maske,
+1017,7,Máscara Turquesa,
+1017,8,Maschera Turchese,
+1017,9,Teal Mask,
+1017,11,みどりのめん,
+1017,12,碧草面具,
+1024,1,ノーマルフォルム,
+1024,5,Forme Normale,
+1024,7,Forma normal,
+1024,8,Forma Normale,
+1024,9,Normal Form,
+1024,11,ノーマルフォルム,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -3528,3 +3564,75 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10440,1,グライドモード,
 10440,9,Glide Mode,
 10440,11,グライドモード,
+10441,1,アカツキ,
+10441,3,붉은 달,
+10441,4,赫月,
+10441,5,Lune Vermeille,
+10441,6,Blutmond,
+10441,7,Luna Carmesí,
+10441,8,Luna Cremisi,
+10441,9,Bloodmoon,
+10441,11,アカツキ,
+10441,12,赫月,
+10442,1,いどのめん,
+10442,3,우물의가면,
+10442,4,水井面具,
+10442,5,Masque du Puits,
+10442,6,Brunnenmaske,
+10442,7,Máscara Fuente,
+10442,8,Maschera Pozzo,
+10442,9,Wellspring Mask,
+10442,11,いどのめん,
+10442,12,水井面具,
+10443,1,かまどのめん,
+10443,3,화덕의가면,
+10443,4,火灶面具,
+10443,5,Masque du Fourneau,
+10443,6,Ofenmaske,
+10443,7,Máscara Horno,
+10443,8,Maschera Focolare,
+10443,9,Hearthflame Mask,
+10443,11,かまどのめん,
+10443,12,火灶面具,
+10444,1,いしずえのめん,
+10444,3,주춧돌의가면,
+10444,4,礎石面具,
+10444,5,Masque de la Pierre,
+10444,6,Fundamentmaske,
+10444,7,Máscara Cimiento,
+10444,8,Maschera Fondamenta,
+10444,9,Cornerstone Mask,
+10444,11,いしずえのめん,
+10444,12,礎石面具,
+10445,1,テラスタルフォルム,
+10445,5,Forme Téracristal,
+10445,6,Terakristall-Form,
+10445,7,Forma teracristal,
+10445,8,Forma Teracristal,
+10445,9,Terastal Form,
+10445,11,テラスタルフォルム,
+10446,1,ステラフォルム,
+10446,6,Stellarform,
+10446,7,Forma astral,
+10446,9,Stellar Form,
+10446,11,ステラフォルム,
+10447,1,タカイモノのすがた,
+10447,3,알짜배기의 모습,
+10447,4,高檔貨的樣子,
+10447,5,Forme Onéreuse,
+10447,6,Kostbarkeitsform,
+10447,7,Forma Opulenta,
+10447,8,Forma Pregiata,
+10447,9,Artisan Form,
+10447,11,タカイモノのすがた,
+10447,12,高档货的样子,
+10448,1,ケッサクのすがた,
+10448,3,걸작의 모습,
+10448,4,傑作的樣子,
+10448,5,Forme Exceptionnelle,
+10448,6,Edle Form,
+10448,7,Forma Exquisita,
+10448,8,Forma Eccezionale,
+10448,9,Masterpiece Form,
+10448,11,ケッサクのすがた,
+10448,12,杰作的样子,

data/v2/csv/pokemon_forms.csv

@@ -1007,8 +1007,23 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 1006,iron-valiant,,1006,25,1,0,0,1,1352
 1007,koraidon-apex-build,apex-build,1007,25,1,0,0,1,1357
 1008,miraidon-ultimate-mode,ultimate-mode,1008,25,1,0,0,1,1358
-1009,walking-wake,walking-wake,1009,25,1,0,0,1,1370
-1010,iron-leaves,iron-leaves,1010,25,1,0,0,1,1371
+1009,walking-wake,,1009,25,1,0,0,1,1370
+1010,iron-leaves,,1010,25,1,0,0,1,1371
+1011,dipplin,,1011,26,1,0,0,1,1373
+1012,poltchageist-counterfeit,counterfeit,1012,26,1,0,0,1,1374
+1013,sinistcha-unremarkable,unremarkable,1013,26,1,0,0,1,1376
+1014,okidogi,,1014,26,1,0,0,1,1378
+1015,munkidori,,1015,26,1,0,0,1,1379
+1016,fezandipiti,,1016,26,1,0,0,1,1380
+1017,ogerpon,,1017,26,1,0,0,1,1381
+1018,archaludon,,1018,27,1,0,0,1,1385
+1019,hydrapple,,1019,27,1,0,0,1,1386
+1020,gouging-fire,,1020,27,1,0,0,1,1387
+1021,raging-bolt,,1021,27,1,0,0,1,1388
+1022,iron-boulder,,1022,27,1,0,0,1,1389
+1023,iron-crown,,1023,27,1,0,0,1,1390
+1024,terapagos,,1024,27,1,0,0,1,1391
+1025,pecharunt,,1025,27,1,0,0,1,1394
 10001,unown-b,b,201,3,0,0,0,2,299
 10002,unown-c,c,201,3,0,0,0,3,300
 10003,unown-d,d,201,3,0,0,0,4,301
@@ -1406,27 +1421,27 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10395,urshifu-single-strike-gmax,gmax,10226,20,1,1,0,1,1281
 10396,urshifu-rapid-strike-gmax,gmax,10227,20,1,1,0,1,1282
 10397,toxtricity-low-key-gmax,gmax,10228,20,1,1,0,1,1283
-10398,growlithe-hisui,hisui,10229,24,1,0,0,1,1284
-10399,arcanine-hisui,hisui,10230,24,1,0,0,1,1285
-10400,voltorb-hisui,hisui,10231,24,1,0,0,1,1286
-10401,electrode-hisui,hisui,10232,24,1,0,0,1,1287
-10402,typhlosion-hisui,hisui,10233,24,1,0,0,1,1288
-10403,qwilfish-hisui,hisui,10234,24,1,0,0,1,1289
-10404,sneasel-hisui,hisui,10235,24,1,0,0,1,1290
-10405,samurott-hisui,hisui,10236,24,1,0,0,1,1291
-10406,lilligant-hisui,hisui,10237,24,1,0,0,1,1292
-10407,zorua-hisui,hisui,10238,24,1,0,0,1,1293
-10408,zoroark-hisui,hisui,10239,24,1,0,0,1,1294
-10409,braviary-hisui,hisui,10240,24,1,0,0,1,1295
-10410,sliggoo-hisui,hisui,10241,24,1,0,0,1,1296
-10411,goodra-hisui,hisui,10242,24,1,0,0,1,1297
-10412,avalugg-hisui,hisui,10243,24,1,0,0,1,1298
-10413,decidueye-hisui,hisui,10244,24,1,0,0,1,1299
-10414,dialga-origin,origin,10245,24,1,0,0,1,1300
-10415,palkia-origin,origin,10246,24,1,0,0,1,1301
-10416,basculin-white-striped,white-striped,10247,24,1,0,0,1,1302
-10417,basculegion-female,female,10248,24,1,0,0,1,1303
-10418,enamorus-therian,therian,10249,24,1,0,0,1,1304
+10398,growlithe-hisui,hisui,10229,24,1,0,0,2,1284
+10399,arcanine-hisui,hisui,10230,24,1,0,0,2,1285
+10400,voltorb-hisui,hisui,10231,24,1,0,0,2,1286
+10401,electrode-hisui,hisui,10232,24,1,0,0,2,1287
+10402,typhlosion-hisui,hisui,10233,24,1,0,0,2,1288
+10403,qwilfish-hisui,hisui,10234,24,1,0,0,2,1289
+10404,sneasel-hisui,hisui,10235,24,1,0,0,2,1290
+10405,samurott-hisui,hisui,10236,24,1,0,0,2,1291
+10406,lilligant-hisui,hisui,10237,24,1,0,0,2,1292
+10407,zorua-hisui,hisui,10238,24,1,0,0,2,1293
+10408,zoroark-hisui,hisui,10239,24,1,0,0,2,1294
+10409,braviary-hisui,hisui,10240,24,1,0,0,2,1295
+10410,sliggoo-hisui,hisui,10241,24,1,0,0,2,1296
+10411,goodra-hisui,hisui,10242,24,1,0,0,2,1297
+10412,avalugg-hisui,hisui,10243,24,1,0,0,2,1298
+10413,decidueye-hisui,hisui,10244,24,1,0,0,2,1299
+10414,dialga-origin,origin,10245,24,1,0,0,2,1300
+10415,palkia-origin,origin,10246,24,1,0,0,2,1301
+10416,basculin-white-striped,white-striped,10247,24,1,0,0,3,1302
+10417,basculegion-female,female,10248,24,1,0,0,2,1303
+10418,enamorus-therian,therian,10249,24,1,0,0,2,1304
 10419,tauros-paldea-combat-breed,paldea-combat-breed,10250,25,0,0,0,2,1305
 10420,tauros-paldea-blaze-breed,paldea-blaze-breed,10251,25,0,0,0,3,1306
 10421,tauros-paldea-aqua-breed,paldea-aqua-breed,10252,25,0,0,0,4,1307
@@ -1449,3 +1464,11 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10438,miraidon-drive-mode,drive-mode,10269,25,0,0,0,3,1324
 10439,miraidon-aquatic-mode,aquatic-mode,10270,25,0,0,0,4,1325
 10440,miraidon-glide-mode,glide-mode,10271,25,0,0,0,5,1326
+10441,ursaluna-bloodmoon,bloodmoon,10272,26,0,0,0,2,1372
+10442,ogerpon-wellspring-mask,wellspring-mask,10273,26,0,0,0,2,1382
+10443,ogerpon-hearthflame-mask,hearthflame-mask,10274,26,0,0,0,3,1383
+10444,ogerpon-cornerstone-mask,cornerstone-mask,10275,26,0,0,0,4,1384
+10445,terapagos-terastal,terastal,10276,27,0,1,0,2,1392
+10446,terapagos-stellar,stellar,10277,27,0,1,0,3,1393
+10447,poltchageist-artisan,artisan,1012,26,0,0,0,2,1375
+10448,sinistcha-masterpiece,masterpiece,1013,26,0,0,0,2,1377

data/v2/csv/pokemon_move_method_prose.csv

@@ -1,13 +1,17 @@
 pokemon_move_method_id,local_language_id,name,description
+1,5,Montée de niveau,"Appris lorsqu’un Pokémon atteint un certain niveau."
 1,6,Level up,"Wird gelernt, wenn ein Pokémon ein bestimmtes Level erreicht."
 1,7,Nivel,Se aprende cuando un pokemon alcanza un cierto nivel.
 1,9,Level up,Learned when a Pokémon reaches a certain level.
+2,5,Œuf,"Apparaît à l’éclosion d’un œuf de Pokémon, si le père connaît ce mouvement."
 2,6,Ei,"Erscheint bei einem frisch geschlüpften Pokémon, wenn der Vater die selbe Fähigkeit hatte."
 2,7,Huevo,"Aparece en un Pokémon recién nacido, si el padre tuvo el mismo movimiento."
 2,9,Egg,"Appears on a newly-hatched Pokémon, if the father had the same move."
+3,5,Enseigné,"Enseigné par un PNJ"
 3,6,Tutor,Kann jederzeit von einem NPC erlernt werden.
 3,7,Tutor, Puede ser enseñado en cualquier momento por un NPC.
 3,9,Tutor,Can be taught at any time by an NPC.
+4,5,Capsule,"Peut être appris n’importe quand par une CT ou une CS."
 4,6,Maschine,Kann jederzeit durch das benutzen eines TM oder VM erlernt werden.
 4,7,Máquina,Se puede enseñar en cualquier momento usando una MT o MO.
 4,9,Machine,Can be taught at any time by using a TM or HM.

data/v2/csv/pokemon_species.csv

@@ -1009,3 +1009,18 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 1008,miraidon,9,,536,2,,,-1,3,0,0,50,0,1,0,1,0,999,
 1009,walking-wake,9,,537,2,,,-1,5,0,0,50,0,1,0,0,0,1011,
 1010,iron-leaves,9,,538,5,,,-1,5,0,0,50,0,1,0,0,0,1012,
+1011,dipplin,9,840,442,5,,,-1,45,0,0,20,0,1,0,0,0,1013,
+1012,poltchageist,9,,539,5,,,-1,120,0,0,50,0,1,0,0,0,1014,
+1013,sinistcha,9,1012,539,5,,,-1,60,0,0,50,0,1,0,0,0,1015,
+1014,okidogi,9,,540,1,,,-1,3,0,0,50,0,1,0,1,0,1016,
+1015,munkidori,9,,541,1,,,-1,3,0,0,50,0,1,0,1,0,1017,
+1016,fezandipiti,9,,542,1,,,-1,3,0,0,50,0,1,0,1,0,1018,
+1017,ogerpon,9,,543,5,,,-1,5,0,0,50,0,1,0,1,0,1019,
+1018,archaludon,9,884,465,9,,,4,10,50,0,30,0,2,0,0,0,1020,
+1019,hydrapple,9,1011,442,5,,,4,10,50,0,20,0,5,0,0,0,1021,
+1020,gouging-fire,9,,544,3,,,-1,10,0,0,50,0,1,0,0,0,1022,
+1021,raging-bolt,9,,545,10,,,-1,10,0,0,50,0,1,0,0,0,1023,
+1022,iron-boulder,9,,547,4,,,-1,10,0,0,50,0,1,0,0,0,1024,
+1023,iron-crown,9,,546,2,,,-1,10,0,0,50,0,1,0,0,0,1025,
+1024,terapagos,9,,548,2,,,-1,255,50,0,5,0,1,0,1,0,1026,
+1025,pecharunt,9,,549,7,,,-1,3,0,0,20,0,1,0,0,1,1027,

data/v2/csv/pokemon_species_flavor_text.csv

@@ -183366,3 +183366,209 @@ nickname ”sea fiend.” It slurps up poison to nourish itself."
 905,39,9,"When it flies to this land from across the sea, the bitter winter
 comes to an end. According to legend, this Pokémon's love
 gives rise to the budding of fresh life across Hisui."
+906,40,9,"Its fluffy fur is similar in composition to plants. This Pokémon frequently washes its face to keep it from drying out."
+906,41,9,"The sweet scent its body gives off mesmerizes those around it. The scent grows stronger when this Pokémon is in the sun."
+907,40,9,"Floragato deftly wields the vine hidden beneath its long fur, slamming the hard flower bud against its opponents."
+907,41,9,"The hardness of Floragato’s fur depends on the Pokémon’s mood. When Floragato is prepared to battle, its fur becomes pointed and needle sharp."
+908,40,9,"This Pokémon uses the reflective fur lining its cape to camouflage the stem of its flower, creating the illusion that the flower is floating."
+908,41,9,"With skillful misdirection, it rigs foes with pollen-packed flower bombs. Meowscarada sets off the bombs before its foes realize what’s going on."
+909,40,9,"It lies on warm rocks and uses the heat absorbed by its square-shaped scales to create fire energy."
+909,41,9,"Its flame sac is small, so energy is always leaking out. This energy is released from the dent atop Fuecoco’s head and flickers to and fro."
+910,40,9,"The combination of Crocalor’s fire energy and overflowing vitality has caused an egg-shaped fireball to appear on the Pokémon’s head."
+910,41,9,"The valve in Crocalor’s flame sac is closely connected to its vocal cords. This Pokémon utters a guttural cry as it spews flames every which way."
+911,40,9,"The fiery bird changes shape when Skeledirge sings. Rumor has it that the bird was born when the fireball on Skeledirge’s head gained a soul."
+911,41,9,"Skeledirge’s gentle singing soothes the souls of all that hear it. It burns its enemies to a crisp with flames of over 5,400 degrees Fahrenheit."
+912,40,9,This Pokémon migrated to Paldea from distant lands long ago. The gel secreted by its feathers repels water and grime."
+912,41,9,"Its strong legs let it easily swim around in even fast-flowing rivers. It likes to keep things tidy and is prone to overthinking things."
+913,40,9,"These Pokémon constantly run through shallow waters to train their legs, then compete with each other to see which of them kicks most gracefully."
+913,41,9,"The hardworking Quaxwell observes people and Pokémon from various regions and incorporates their movements into its own dance routines."
+914,40,9,"A single kick from a Quaquaval can send a truck rolling. This Pokémon uses its powerful legs to perform striking dances from far-off lands."
+914,41,9,"Dancing in ways that evoke far-away places, this Pokémon mesmerizes all that see it. Flourishes of its decorative water feathers slice into its foes."
+915,40,9,"It searches for food all day. It possesses a keen sense of smell but doesn’t use it for anything other than foraging."
+915,41,9,"This Pokémon spurns all but the finest of foods. Its body gives off an herblike scent that bug Pokémon detest."
+916,40,9,"Oinkologne is proud of its fine, glossy skin. It emits a concentrated scent from the tip of its tail."
+916,41,9,"It entrances female Pokémon with the sweet, alluring scent that wafts from all over its body."
+917,40,9,"The ball of threads wrapped around its body is elastic enough to deflect the scythes of Scyther, this Pokémon’s natural enemy."
+917,41,9,"The thread it secretes from its rear is as strong as wire. The secret behind the thread’s strength is the topic of ongoing research."
+918,40,9,"It clings to branches and ceilings using its threads and moves without a sound. It takes out its prey before the prey even notices it."
+918,41,9,"Spidops covers its territory in tough, sticky threads to set up traps for intruders."
+919,40,9,"It has its third set of legs folded up. When it’s in a tough spot, this Pokémon jumps over 30 feet using the strength of its legs."
+919,41,9,"It’s highly skilled at a fighting style in which it uses its jumping capabilities to dodge incoming attacks while also dealing damage to opponents."
+920,40,9,"When it decides to fight all out, it stands on its previously folded legs to enter Showdown Mode. It neutralizes its enemies in short order."
+920,41,9,"It uses its normally folded third set of legs when in Showdown Mode. This places a huge burden on its body, so it can’t stay in this mode for long."
+921,40,9,"It has underdeveloped electric sacs on its cheeks. These sacs can produce electricity only if Pawmi rubs them furiously with the pads on its forepaws."
+921,41,9,"The pads of its paws are electricity-discharging organs. Pawmi fires electricity from its forepaws while standing unsteadily on its hind legs."
+922,40,9,"When its group is attacked, Pawmo is the first to leap into battle, defeating enemies with a fighting technique that utilizes electric shocks."
+922,41,9,"Pawmo uses a unique fighting technique in which it uses its forepaws to strike foes and zap them with electricity from its paw pads simultaneously."
+923,40,9,"This Pokémon normally is slow to react, but once it enters battle, it will strike down its enemies with lightning-fast movements."
+923,41,9,"Pawmot’s fluffy fur acts as a battery. It can store the same amount of electricity as an electric car."
+924,40,9,"Exhibiting great teamwork, they use their incisors to cut pieces out of any material that might be useful for a nest, then make off with them."
+924,41,9,"The pair sticks together no matter what. They split any food they find exactly in half and then eat it together."
+925,40,9,"The two little ones just appeared one day. The group might be a family of related Pokémon, but nobody knows for sure."
+925,41,9,"The larger pair protects the little ones during battles. When facing strong opponents, the whole group will join the fight."
+926,40,9,"This Pokémon is smooth and moist to the touch. Yeast in Fidough’s breath induces fermentation in the Pokémon’s vicinity."
+926,41,9,"The yeast in Fidough’s breath is useful for cooking, so this Pokémon has been protected by people since long ago."
+927,40,9,"The pleasant aroma that emanates from this Pokémon’s body helps wheat grow, so Dachsbun has been treasured by farming villages."
+927,41,9,"The surface of this Pokémon’s skin hardens when exposed to intense heat, and its body has an appetizing aroma."
+928,40,9,"It protects itself from enemies by emitting oil from the fruit on its head. This oil is bitter and astringent enough to make someone flinch."
+928,41,9,"This Pokémon converts nutrients into oil, which it stores in the fruit on its head. It can easily go a whole week without eating or drinking."
+929,40,9,"Dolliv shares its tasty, fresh-scented oil with others. This species has coexisted with humans since times long gone."
+929,41,9,"It basks in the sun to its heart’s content until the fruits on its head ripen. After that, Dolliv departs from human settlements and goes on a journey."
+930,40,9,"This calm Pokémon is very compassionate. It will share its delicious, nutrient-rich oil with weakened Pokémon."
+930,41,9,"This Pokémon drives back enemies by launching its rich, aromatic oil at them with enough force to smash a boulder."
+931,40,9,"These Pokémon prefer to live in cities. They form flocks based on the color of their feathers, and they fight over territory."
+931,41,9,"Green-feathered flocks hold the most sway. When they’re out searching for food in the mornings and evenings, it gets very noisy."
+932,40,9,"It was born in a layer of rock salt deep under the earth. This species was particularly treasured in the old days, as they would share precious salt."
+932,41,9,"The ground scrapes its body as it travels, causing it to leave salt behind. Salt is constantly being created and replenished inside Nacli’s body."
+933,40,9,"This Pokémon dry cures its prey by spraying salt over them. The curing process steals away the water in the prey’s body."
+933,41,9,"It compresses rock salt inside its body and shoots out hardened salt pellets with enough force to perforate an iron sheet."
+934,40,9,"Garganacl will rub its fingertips together and sprinkle injured Pokémon with salt. Even severe wounds will promptly heal afterward."
+934,41,9,"Many Pokémon gather around Garganacl, hoping to lick at its mineral-rich salt."
+935,40,9,"Burnt charcoal came to life and became a Pokémon. Possessing a fiery fighting spirit, Charcadet will battle even tough opponents."
+935,41,9,"Its firepower increases when it fights, reaching over 1,800 degrees Fahrenheit. It likes berries that are rich in fat."
+936,40,9,"Armarouge evolved through the use of a set of armor that belonged to a distinguished warrior. This Pokémon is incredibly loyal."
+936,41,9,"This Pokémon clads itself in armor that has been fortified by psychic and fire energy, and it shoots blazing fireballs."
+937,40,9,"The fiery blades on its arms burn fiercely with the lingering resentment of a sword wielder who fell before accomplishing their goal."
+937,41,9,"An old set of armor steeped in grudges caused this Pokémon’s evolution. Ceruledge cuts its enemies to pieces without mercy."
+938,40,9,"Tadbulb shakes its tail to generate electricity. If it senses danger, it will make its head blink on and off to alert its allies."
+938,41,9,"It floats using the electricity stored in its body. When thunderclouds are around, Tadbulb will float higher off the ground."
+939,40,9,"When this Pokémon expands and contracts its wobbly body, the belly-button dynamo in its stomach produces a huge amount of electricity."
+939,41,9,"What appear to be eyeballs are actually organs for discharging the electricity generated by Bellibolt’s belly-button dynamo."
+940,40,9,"When its wings catch the wind, the bones within produce electricity. This Pokémon dives into the ocean, catching prey by electrocuting them."
+940,41,9,"These Pokémon make their nests on coastal cliffs. The nests have a strange, crackling texture, and they’re a popular delicacy."
+941,40,9,"Kilowattrel inflates its throat sac to amplify its electricity. By riding the wind, this Pokémon can fly over 430 miles in a day."
+941,41,9,"It uses its throat sac to store electricity generated by its wings. There’s hardly any oil in its feathers, so it is a poor swimmer."
+942,40,9,"It always scowls in an attempt to make opponents take it seriously, but even crying children will burst into laughter when they see Maschiff’s face."
+942,41,9,"Its well-developed jaw and fangs are strong enough to crunch through boulders, and its thick fat makes for an excellent defense."
+943,40,9,"This Pokémon can store energy in its large dewlap. Mabosstiff unleashes this energy all at once to blow away enemies."
+943,41,9,"Mabosstiff loves playing with children. Though usually gentle, it takes on an intimidating look when protecting its family."
+944,40,9,"Though usually a mellow Pokémon, it will sink its sharp, poison-soaked front teeth into any that anger it, causing paralysis in the object of its ire."
+944,41,9,"To keep enemies away from its territory, it paints markings around its nest using a poisonous liquid that has an acrid odor."
+945,40,9,"The color of the poisonous saliva depends on what the Pokémon eats. Grafaiai covers its fingers in its saliva and draws patterns on trees in forests."
+945,41,9,"Each Grafaiai paints its own individual pattern, and it will paint that same pattern over and over again throughout its life."
+946,40,9,"A soul unable to move on to the afterlife was blown around by the wind until it got tangled up with dried grass and became a Pokémon."
+946,41,9,"Not even Bramblin knows where it is headed as it tumbles across the wilderness, blown by the wind. It loathes getting wet."
+947,40,9,"It will open the branches of its head to envelop its prey. Once it absorbs all the life energy it needs, it expels the prey and discards it."
+947,41,9,"Brambleghast wanders around arid regions. On rare occasions, mass outbreaks of these Pokémon will bury an entire town."
+948,40,9,"Toedscool lives in muggy forests. The flaps that fall from its body are chewy and very delicious."
+948,41,9,"Though it looks like Tentacool, Toedscool is a completely different species. Its legs may be thin, but it can run at a speed of 30 mph."
+949,40,9,"These Pokémon gather into groups and form colonies deep within forests. They absolutely hate it when strangers approach."
+949,41,9,"It coils its 10 tentacles around prey and sucks out their nutrients, causing the prey pain. The folds along the rim of its head are a popular delicacy."
+950,40,9,"Klawf hangs upside-down from cliffs, waiting for prey. But Klawf can’t remain in this position for long because its blood rushes to its head."
+950,41,9,"This Pokémon lives on sheer cliffs. It sidesteps opponents’ attacks, then lunges for their weak spots with its claws."
+951,40,9,"The more sunlight this Pokémon bathes in, the more spicy chemicals are produced by its body, and thus the spicier its moves become."
+951,41,9,"Traditional Paldean dishes can be extremely spicy because they include the shed front teeth of Capsakid among their ingredients."
+952,40,9,"The red head converts spicy chemicals into fire energy and blasts the surrounding area with a super spicy stream of flame."
+952,41,9,"The green head has turned vicious due to the spicy chemicals stimulating its brain. Once it goes on a rampage, there is no stopping it."
+953,40,9,"This Pokémon creates a mud ball by mixing sand and dirt with psychic energy. It treasures its mud ball more than its own life."
+953,41,9,"It rolls its mud ball around while the energy it needs for evolution matures. Eventually the time comes for it to evolve."
+954,40,9,"The body that supports the ball barely moves. Therefore, it is thought that the true body of this Pokémon is actually inside the ball."
+954,41,9,"An infant sleeps inside the ball. Rabsca rolls the ball soothingly with its legs to ensure the infant sleeps comfortably."
+955,40,9,"Flittle’s toes levitate about half an inch above the ground because of the psychic power emitted from the frills on the Pokémon’s belly."
+955,41,9,"It spends its time running around wastelands. If anyone steals its beloved berries, it will chase them down and exact its revenge."
+956,40,9,"It immobilizes opponents by bathing them in psychic power from its large eyes. Despite its appearance, it has a vicious temperament."
+956,41,9,"It emits psychic power from the gaps between its multicolored frills and sprints at speeds greater than 120 mph."
+957,40,9,"It swings its handmade hammer around to protect itself, but the hammer is often stolen by Pokémon that eat metal."
+957,41,9,"This Pokémon pounds iron scraps together to make a hammer. It will remake the hammer again and again until it’s satisfied with the result."
+958,40,9,"This Pokémon will attack groups of Pawniard and Bisharp, gathering metal from them in order to create a large and sturdy hammer."
+958,41,9,"These Pokémon make their homes in piles of scrap metal. They test the strength of each other’s hammers by smashing them together."
+959,40,9,"This intelligent Pokémon has a very daring disposition. It knocks rocks into the sky with its hammer, aiming for flying Corviknight."
+959,41,9,"The hammer tops 220 pounds, yet it gets swung around easily by Tinkaton as it steals whatever it pleases and carries its plunder back home."
+960,40,9,"This Pokémon can pick up the scent of a Veluza just over 65 feet away and will hide itself in the sand."
+960,41,9,"Though it looks like Diglett, Wiglett is an entirely different species. The resemblance seems to be a coincidental result of environmental adaptation."
+961,40,9,"It has a vicious temperament, contrary to what its appearance may suggest. It wraps its long bodies around prey, then drags the prey into its den."
+961,41,9,"A variety of fish Pokémon, Wugtrio was once considered to be a regional form of Dugtrio."
+962,40,9,"It gathers things up in an apron made from shed feathers added to the Pokémon’s chest feathers, then drops those things from high places for fun."
+962,41,9,"Bombirdier uses the apron on its chest to bundle up food, which it carries back to its nest. It enjoys dropping things that make loud noises."
+963,40,9,"It likes playing with others of its kind using the water ring on its tail. It uses ultrasonic waves to sense the emotions of other living creatures."
+963,41,9,"Its water ring is made from seawater mixed with a sticky fluid that Finizen secretes from its blowhole."
+964,40,9,"This Pokémon changes its appearance if it hears its allies calling for help. Palafin will never show anybody its moment of transformation."
+964,41,9,"Its physical capabilities are no different than a Finizen’s, but when its allies are in danger, it transforms and powers itself up."
+965,40,9,"It is said that this Pokémon was born when an unknown poison Pokémon entered and inspirited an engine left at a scrap-processing factory."
+965,41,9,"The steel section is Varoom’s actual body. This Pokémon clings to rocks and converts the minerals within into energy to fuel its activities."
+966,40,9,"It creates a gas out of poison and minerals from rocks. It then detonates the gas in its cylinders—now numbering eight—to generate energy."
+966,41,9,"Revavroom viciously threatens others with the sound of its exhaust. It sticks its tongue out from its cylindrical mouth and sprays toxic fluids."
+967,40,9,"Apparently Cyclizar has been allowing people to ride on its back since ancient times. Depictions of this have been found in 10,000-year-old murals."
+967,41,9,"It can sprint at over 70 mph while carrying a human. The rider’s body heat warms Cyclizar’s back and lifts the Pokémon’s spirit."
+968,40,9,"When attacked, this Pokémon will wield the tendrils on its body like fists and pelt the opponent with a storm of punches."
+968,41,9,"This Pokémon lives in arid deserts. It maintains its metal body by consuming iron from the soil."
+969,40,9,"It absorbs nutrients from cave walls. The petals it wears are made of crystallized poison."
+969,41,9,"Glimmet’s toxic mineral crystals look just like flower petals. This Pokémon scatters poisonous powder like pollen to protect itself."
+970,40,9,"When this Pokémon detects danger, it will open up its crystalline petals and fire beams from its conical body."
+970,41,9,"Glimmora’s petals are made of crystallized poison energy. It has recently become evident that these petals resemble Tera Jewels."
+971,40,9,"It is said that a dog Pokémon that died in the wild without ever interacting with a human was reborn as this Pokémon."
+971,41,9,"This friendly Pokémon doesn’t like being alone. Pay it even the slightest bit of attention, and it will follow you forever."
+972,40,9,"Houndstone spends most of its time sleeping in graveyards. Among all the dog Pokémon, this one is most loyal to its master."
+972,41,9,"A lovingly mourned Pokémon was reborn as Houndstone. It doesn’t like anyone touching the protuberance atop its head."
+973,40,9,"This Pokémon apparently ties the base of its neck into a knot so that energy stored in its belly does not escape from its beak."
+973,41,9,"Thanks to a behavior of theirs known as “synchronizing,” an entire flock of these Pokémon can attack simultaneously in perfect harmony."
+974,40,9,"This species left the ocean and began living on land a very long time ago. It seems to be closely related to Wailmer."
+974,41,9,"It lives in frigid regions in pods of five or so individuals. It loves the minerals found in snow and ice."
+975,40,9,"This Pokémon wanders around snowy, icy areas. It protects its body with powerful muscles and a thick layer of fat under its skin."
+975,41,9,"Ice energy builds up in the horn on its upper jaw, causing the horn to reach cryogenic temperatures that freeze its surroundings."
+976,40,9,"When Veluza discards unnecessary flesh, its mind becomes honed and its psychic power increases. The spare flesh has a mild but delicious flavor."
+976,41,9,"Veluza has excellent regenerative capabilities. It sheds spare flesh from its body to boost its agility, then charges at its prey."
+977,40,9,"This Pokémon is a glutton, but it’s bad at getting food. It teams up with a Tatsugiri to catch prey."
+977,41,9,"It treats Tatsugiri like its boss and follows it loyally. Though powerful, Dondozo is apparently not very smart."
+978,40,9,"This is a small dragon Pokémon. It lives inside the mouth of Dondozo to protect itself from enemies on the outside."
+978,41,9,"Tatsugiri is an extremely cunning Pokémon. It feigns weakness to lure in prey, then orders its partner to attack."
+979,40,9,"When its anger rose beyond a critical point, this Pokémon gained power that is unfettered by the limits of its physical body."
+979,41,9,"It imbues its fists with the power of the rage that it kept hidden in its heart. Opponents struck by these imbued fists will be shattered to their core."
+980,40,9,"When attacked, this Pokémon will retaliate by sticking thick spines out from its body. It’s a risky move that puts everything on the line."
+980,41,9,"It lives at the bottom of ponds and swamps. It will carry Wooper on its back and ferry them across water from one shore to the other."
+981,40,9,"Now that the brain waves from the head and tail are synced up, the psychic power of this Pokémon is 10 times stronger than Girafarig’s."
+981,41,9,"The hardened head from the tail protects the head of the main body as Farigiraf whips its long neck around to headbutt enemies."
+982,40,9,"This Pokémon uses its hard tail to make its nest by boring holes into bedrock deep underground. The nest can reach lengths of over six miles."
+982,41,9,"It drives enemies out of its nest by sucking in enough air to fill its long, narrow lungs, then releasing the air in an intense blast."
+983,40,9,"Only a Bisharp that stands above all others in its vast army can evolve into Kingambit."
+983,41,9,"Though it commands a massive army in battle, it’s not skilled at devising complex strategies. It just uses brute strength to keep pushing."
+984,40,9,"Sightings of this Pokémon have occurred in recent years. The name Great Tusk was taken from a creature listed in a certain book."
+984,41,9,"This creature resembles a mysterious Pokémon that, according to a paranormal magazine, has lived since ancient times."
+985,40,9,"There has been only one reported sighting of this Pokémon. It resembles a mysterious creature depicted in an old expedition journal."
+985,41,9,"It resembles a mysterious Pokémon described in a paranormal magazine as a Jigglypuff from one billion years ago."
+986,40,9,"It is possible that the creature listed as Brute Bonnet in a certain book could actually be this Pokémon."
+986,41,9,"It bears a slight resemblance to a Pokémon described in a dubious magazine as a cross between a dinosaur and a mushroom."
+987,40,9,"This Pokémon has characteristics similar to those of Flutter Mane, a creature mentioned in a certain book."
+987,41,9,"It has similar features to a ghostly pterosaur that was covered in a paranormal magazine, but the two have little else in common."
+988,40,9,"This mysterious Pokémon has some similarities to a creature that an old book introduced as Slither Wing."
+988,41,9,"This Pokémon somewhat resembles an ancient form of Volcarona that was introduced in a dubious magazine."
+989,40,9,"No records exist of this Pokémon being caught. Data is lacking, but the Pokémon’s traits match up with a creature shown in an expedition journal."
+989,41,9,"It slightly resembles a Magneton that lived for 10,000 years and was featured in an article in a paranormal magazine."
+990,40,9,"This Pokémon closely resembles a scientific weapon that a paranormal magazine claimed was sent to this planet by aliens."
+990,41,9,"Sightings of this Pokémon have occurred in recent years. It resembles a mysterious object described in an old expedition journal."
+991,40,9,"Its shape is similar to a robot featured in a paranormal magazine article. The robot was said to have been created by an ancient civilization."
+991,41,9,"It resembles a mysterious object mentioned in an old book. There are only two reported sightings of this Pokémon."
+992,40,9,"It is very similar to a cyborg covered exclusively by a paranormal magazine. The cyborg was said to be the modified form of a certain athlete."
+992,41,9,"This Pokémon shares many similarities with Iron Hands, an object mentioned in a certain expedition journal."
+993,40,9,"It resembles a certain Pokémon introduced in a paranormal magazine, described as the offspring of a Hydreigon that fell in love with a robot."
+993,41,9,"It’s possible that Iron Jugulis, an object described in an old book, may actually be this Pokémon."
+994,40,9,"This Pokémon resembles an unknown object described in a paranormal magazine as a UFO sent to observe humanity."
+994,41,9,"No records exist of this species being caught. Data is lacking, but the Pokémon’s traits match up with an object described in an old book."
+995,40,9,"It has some similarities to a Pokémon introduced in a dubious magazine as a Tyranitar from one billion years into the future."
+995,41,9,"Some of its notable features match those of an object named within a certain expedition journal as Iron Thorns."
+996,40,9,"Frigibax absorbs heat through its dorsal fin and converts the heat into ice energy. The higher the temperature, the more energy Frigibax stores."
+996,41,9,"This Pokémon lives in forests and craggy areas. Using the power of its dorsal fin, it cools the inside of its nest like a refrigerator."
+997,40,9,"Arctibax freezes the air around it, protecting its face with an ice mask and turning its dorsal fin into a blade of ice."
+997,41,9,"It attacks with the blade of its frozen dorsal fin by doing a front flip in the air. Arctibax’s strong back and legs allow it to pull off this technique."
+998,40,9,"This Pokémon blasts cryogenic air out from its mouth. This air can instantly freeze even liquid-hot lava."
+998,41,9,"It launches itself into battle by flipping upside down and spewing frigid air from its mouth. It finishes opponents off with its dorsal blade."
+999,40,9,"This Pokémon was born inside a treasure chest about 1,500 years ago. It sucks the life-force out of scoundrels who try to steal the treasure."
+999,41,9,"It lives inside an old treasure chest. Sometimes it gets left in shop corners since no one realizes it’s actually a Pokémon."
+1000,40,9,"Its body seems to be made up of 1,000 coins. This Pokémon gets along well with others and is quick to make friends with anybody."
+1000,41,9,"It has a sturdy body made up of stacked coins. Gholdengo overwhelms its enemies by firing coin after coin at them in quick succession."
+1001,40,9,"The grudge of a person punished for writing the king’s evil deeds upon wooden tablets has clad itself in dead leaves to become a Pokémon."
+1001,41,9,"It drains the life-force from vegetation, causing nearby forests to instantly wither and fields to turn barren."
+1002,40,9,"This Pokémon can control 100 tons of fallen snow. It plays around innocently by leaping in and out of avalanches it has caused."
+1002,41,9,"The hatred of those who perished by the sword long ago has clad itself in snow and become a Pokémon."
+1003,40,9,"The fear poured into an ancient ritual vessel has clad itself in rocks and dirt to become a Pokémon."
+1003,41,9,"It slowly brings its exceedingly heavy head down upon the ground, splitting the earth open with huge fissures that run over 160 feet deep."
+1004,40,9,"It controls flames burning at over 5,400 degrees Fahrenheit. It casually swims through the sea of lava it creates by melting rock and sand."
+1004,41,9,"The envy accumulated within curved beads that sparked multiple conflicts has clad itself in fire and become a Pokémon."
+1005,40,9,"It is possible that this is the creature listed as Roaring Moon in an expedition journal that still holds many mysteries."
+1005,41,9,"According to an article in a dubious magazine, this Pokémon has some connection to a phenomenon that occurs in a certain region."
+1006,40,9,"It has some similarities to a mad scientist’s invention covered in a paranormal magazine."
+1006,41,9,"It’s possible that this is the object listed as Iron Valiant in a certain expedition journal."
+1007,40,9,"This seems to be the Winged King mentioned in an old expedition journal. It was said to have split the land with its bare fists."
+1007,41,9,"This Pokémon resembles Cyclizar, but it is far burlier and more ferocious. Nothing is known about its ecology or other features."
+1008,40,9,"Much remains unknown about this creature. It resembles Cyclizar, but it is far more ruthless and powerful."
+1008,41,9,"This seems to be the Iron Serpent mentioned in an old book. The Iron Serpent is said to have turned the land to ash with its lightning."

data/v2/csv/pokemon_stats.csv

@@ -2923,9 +2923,9 @@ pokemon_id,stat_id,base_stat,effort
 487,6,90,0
 488,1,120,0
 488,2,70,0
-488,3,120,0
+488,3,110,0
 488,4,75,0
-488,5,130,3
+488,5,120,3
 488,6,85,0
 489,1,80,1
 489,2,80,0
@@ -5322,13 +5322,13 @@ pokemon_id,stat_id,base_stat,effort
 887,5,75,0
 887,6,142,3
 888,1,92,0
-888,2,130,0
+888,2,120,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,2,120,0
 889,3,115,0
 889,4,80,0
 889,5,115,0
@@ -6059,6 +6059,96 @@ pokemon_id,stat_id,base_stat,effort
 1010,4,70,0
 1010,5,108,0
 1010,6,104,0
+1011,1,80,0
+1011,2,80,0
+1011,3,110,2
+1011,4,95,0
+1011,5,80,0
+1011,6,40,0
+1012,1,40,0
+1012,2,45,0
+1012,3,45,0
+1012,4,74,1
+1012,5,54,0
+1012,6,50,0
+1013,1,71,0
+1013,2,60,0
+1013,3,106,0
+1013,4,121,2
+1013,5,80,0
+1013,6,70,0
+1014,1,88,0
+1014,2,128,3
+1014,3,115,0
+1014,4,58,0
+1014,5,86,0
+1014,6,80,0
+1015,1,88,0
+1015,2,75,0
+1015,3,66,0
+1015,4,130,3
+1015,5,90,0
+1015,6,106,0
+1016,1,88,0
+1016,2,91,0
+1016,3,82,0
+1016,4,70,0
+1016,5,125,3
+1016,6,99,0
+1017,1,80,0
+1017,2,120,3
+1017,3,84,0
+1017,4,60,0
+1017,5,96,0
+1017,6,110,0
+1018,1,90,0
+1018,2,105,0
+1018,3,130,3
+1018,4,125,0
+1018,5,65,0
+1018,6,85,0
+1019,1,106,0
+1019,2,80,0
+1019,3,110,0
+1019,4,120,3
+1019,5,80,0
+1019,6,44,0
+1020,1,105,0
+1020,2,115,0
+1020,3,121,3
+1020,4,65,0
+1020,5,93,0
+1020,6,91,0
+1021,1,125,0
+1021,2,73,0
+1021,3,91,0
+1021,4,137,3
+1021,5,89,0
+1021,6,75,0
+1022,1,90,0
+1022,2,120,0
+1022,3,80,0
+1022,4,68,0
+1022,5,108,0
+1022,6,124,3
+1023,1,90,0
+1023,2,72,0
+1023,3,100,0
+1023,4,122,3
+1023,5,108,0
+1023,6,98,0
+1024,1,90,0
+1024,2,65,0
+1024,3,85,1
+1024,4,65,0
+1024,5,85,0
+1024,6,60,0
+1025,1,88,0
+1025,2,88,0
+1025,3,160,3
+1025,4,88,0
+1025,5,88,0
+1025,6,88,0
 10001,1,50,0
 10001,2,180,2
 10001,3,20,0
@@ -7182,16 +7272,16 @@ pokemon_id,stat_id,base_stat,effort
 10187,5,58,0
 10187,6,97,2
 10188,1,92,0
-10188,2,170,0
+10188,2,150,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,2,120,0
+10189,3,140,0
 10189,4,80,0
-10189,5,145,0
+10189,5,140,0
 10189,6,128,3
 10190,1,255,3
 10190,2,115,0
@@ -7685,3 +7775,39 @@ pokemon_id,stat_id,base_stat,effort
 10271,4,135,3
 10271,5,115,0
 10271,6,135,0
+10272,1,113,0
+10272,2,70,3
+10272,3,120,0
+10272,4,135,0
+10272,5,65,0
+10272,6,52,0
+10273,1,80,0
+10273,2,120,3
+10273,3,84,0
+10273,4,60,0
+10273,5,96,0
+10273,6,110,0
+10274,1,80,0
+10274,2,120,3
+10274,3,84,0
+10274,4,60,0
+10274,5,96,0
+10274,6,110,0
+10275,1,80,0
+10275,2,120,3
+10275,3,84,0
+10275,4,60,0
+10275,5,96,0
+10275,6,110,0
+10276,1,95,0
+10276,2,95,0
+10276,3,110,2
+10276,4,105,0
+10276,5,110,2
+10276,6,85,0
+10277,1,95,3
+10277,2,95,0
+10277,3,110,0
+10277,4,105,0
+10277,5,110,0
+10277,6,85,0

data/v2/csv/pokemon_types.csv

@@ -1522,6 +1522,34 @@ pokemon_id,type_id,slot
 1009,16,2
 1010,12,1
 1010,14,2
+1011,12,1
+1011,16,2
+1012,12,1
+1012,8,2
+1013,12,1
+1013,8,2
+1014,4,1
+1014,2,2
+1015,4,1
+1015,14,2
+1016,4,1
+1016,18,2
+1017,12,1
+1018,9,1
+1018,16,2
+1019,12,1
+1019,16,2
+1020,10,1
+1020,16,2
+1021,13,1
+1021,16,2
+1022,6,1
+1022,14,2
+1023,9,1
+1023,14,2
+1024,1,1
+1025,4,1
+1025,8,2
 10001,14,1
 10002,14,1
 10003,14,1
@@ -1989,3 +2017,13 @@ pokemon_id,type_id,slot
 10270,16,2
 10271,13,1
 10271,16,2
+10272,5,1
+10272,1,2
+10273,12,1
+10273,11,2
+10274,12,1
+10274,10,2
+10275,12,1
+10275,6,2
+10276,1,1
+10277,1,1

data/v2/csv/region_names.csv

@@ -1,41 +1,81 @@
 region_id,local_language_id,name
-1,1,カントー地方
-1,3,관동지방
+1,1,カントー
+1,3,관동
+1,4,關都
 1,5,Kanto
 1,6,Kanto
 1,8,Kanto
 1,9,Kanto
-2,1,ジョウト地方
-2,3,성도지방
+1,12,关都
+2,1,ジョウト
+2,3,성도
+2,4,城都
 2,5,Johto
 2,6,Johto
 2,8,Johto
 2,9,Johto
-3,1,ホウエン地方
-3,3,호연지방
+2,12,城都
+3,1,ホウエン
+3,3,호연
+3,4,豐緣
 3,5,Hoenn
 3,6,Hoenn
 3,8,Hoenn
 3,9,Hoenn
-4,1,シンオウ地方
-4,3,신오지방
+3,12,丰缘
+4,1,シンオウ
+4,3,신오
+4,4,神奧
 4,5,Sinnoh
 4,6,Sinnoh
 4,8,Sinnoh
 4,9,Sinnoh
-5,1,イッシュ地方
-5,3,하나지방
+4,12,神奥
+5,1,イッシュ
+5,3,하나
+5,4,合眾
 5,5,Unys
 5,6,Einall
 5,8,Unima
 5,9,Unova
-6,1,カロス地方
-6,3,칼로스지방
+5,12,合众
+6,1,カロス
+6,3,칼로스
+6,4,卡洛斯
 6,5,Kalos
 6,6,Kalos
 6,8,Kalos
 6,9,Kalos
+6,12,卡洛斯
+7,1,アローラ
+7,3,알로라
+7,4,阿羅拉
+7,5,Alola
+7,6,Alola
+7,8,Alola
 7,9,Alola
+7,12,阿罗拉
+8,1,ガラル
+8,3,가라르
+8,4,伽勒爾
+8,5,Galar
+8,6,Galar
+8,8,Galar
 8,9,Galar
+8,12,伽勒尔
+9,1,ヒスイ
+9,3,히스이
+9,4,洗翠
+9,5,Hisui
+9,6,Hisui
 9,8,Hisui
 9,9,Hisui
+9,12,洗翠
+10,1,パルデア
+10,3,팔데아
+10,4,帕底亞
+10,5,Paldea
+10,6,Paldea
+10,8,Paldea
+10,9,Paldea
+10,12,帕底亚

data/v2/csv/stat_names.csv

@@ -55,15 +55,19 @@ stat_id,local_language_id,name
 6,12,速度
 7,1,めいちゅう
 7,3,명중률
+7,4,命中
 7,5,Précision
 7,6,Genauigkeit
 7,7,Precisión
 7,8,precisione
 7,9,accuracy
+7,12,命中
 8,1,かいひ
 8,3,회피율
+8,4,閃避
 8,5,Esquive
 8,6,Fluchtwert
 8,7,Evasión
 8,8,elusione
 8,9,evasion
+8,12,闪避

data/v2/csv/type_names.csv

@@ -181,14 +181,20 @@ type_id,local_language_id,name
 18,12,妖精
 10001,1,？？？
 10001,3,???
+10001,4,???
 10001,5,???
 10001,6,???
 10001,7,???
 10001,8,???
 10001,9,???
+10001,11,？？？
+10001,12,???
 10002,1,ダーク
 10002,3,다크
+10002,4,暗
 10002,5,Obscur
 10002,6,Crypto
 10002,8,Ombra
 10002,9,Shadow
+10002,11,ダーク
+10002,12,暗

data/v2/sprites

@@ -1 +1 @@
-Subproject commit 67217823b89b9116fcb37640838017325629922d
+Subproject commit ca5a7886c10753144e6fae3b69d45a4d42a449b4

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2.4'
 services:
   cache:
-    image: redis:7.0.7-alpine
+    image: redis:7.2.3-alpine
     volumes:
       - redis_data:/data
     restart: always
 
   db:
-    image: postgres:15.1
+    image: postgres:16.1
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
       POSTGRES_USER: ${POSTGRES_USER:-ash}
@@ -33,7 +33,7 @@ services:
     restart: always
 
   web:
-    image: nginx:1.23.3-alpine
+    image: nginx:1.25.3-alpine
     ports:
       - "80:80"
       - "443:443"
@@ -44,7 +44,7 @@ services:
       - ./Resources/nginx/ssl:/ssl:ro
       - graphql_cache:/tmp/cache
   graphql-engine:
-    image: hasura/graphql-engine:v2.16.1
+    image: hasura/graphql-engine:v2.36.1-ce
     ports:
       - "8080:8080"
     depends_on:

graphql/metadata/api_limits.yaml

@@ -0,0 +1 @@
+{}

graphql/metadata/backend_configs.yaml

@@ -0,0 +1 @@
+{}

graphql/metadata/databases/databases.yaml

@@ -6,10 +6,10 @@
         from_env: HASURA_GRAPHQL_DATABASE_URL
       isolation_level: read-committed
       pool_settings:
+        connection_lifetime: 60
         idle_timeout: 20
         max_connections: 10
-        retries: 1
         pool_timeout: 60
-        connection_lifetime: 60
+        retries: 1
       use_prepared_statements: false
   tables: "!include default/tables/tables.yaml"

graphql/metadata/databases/default/tables/public_pokemon_v2_ability.yaml

@@ -2,49 +2,56 @@ table:
   name: pokemon_v2_ability
   schema: public
 object_relationships:
-- name: pokemon_v2_generation
-  using:
-    foreign_key_constraint_on: generation_id
+  - name: pokemon_v2_generation
+    using:
+      foreign_key_constraint_on: generation_id
 array_relationships:
-- name: pokemon_v2_abilitychanges
-  using:
-    foreign_key_constraint_on:
-      column: ability_id
-      table:
-        name: pokemon_v2_abilitychange
-        schema: public
-- name: pokemon_v2_abilityeffecttexts
-  using:
-    foreign_key_constraint_on:
-      column: ability_id
-      table:
-        name: pokemon_v2_abilityeffecttext
-        schema: public
-- name: pokemon_v2_abilityflavortexts
-  using:
-    foreign_key_constraint_on:
-      column: ability_id
-      table:
-        name: pokemon_v2_abilityflavortext
-        schema: public
-- name: pokemon_v2_abilitynames
-  using:
-    foreign_key_constraint_on:
-      column: ability_id
-      table:
-        name: pokemon_v2_abilityname
-        schema: public
-- name: pokemon_v2_pokemonabilities
-  using:
-    foreign_key_constraint_on:
-      column: ability_id
-      table:
-        name: pokemon_v2_pokemonability
-        schema: public
+  - name: pokemon_v2_abilitychanges
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_abilitychange
+          schema: public
+  - name: pokemon_v2_abilityeffecttexts
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_abilityeffecttext
+          schema: public
+  - name: pokemon_v2_abilityflavortexts
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_abilityflavortext
+          schema: public
+  - name: pokemon_v2_abilitynames
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_abilityname
+          schema: public
+  - name: pokemon_v2_pokemonabilities
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_pokemonability
+          schema: public
+  - name: pokemon_v2_pokemonabilitypasts
+    using:
+      foreign_key_constraint_on:
+        column: ability_id
+        table:
+          name: pokemon_v2_pokemonabilitypast
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychange.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_abilitychange
   schema: public
 object_relationships:
-- name: pokemon_v2_ability
-  using:
-    foreign_key_constraint_on: ability_id
-- name: pokemon_v2_versiongroup
-  using:
-    foreign_key_constraint_on: version_group_id
+  - name: pokemon_v2_ability
+    using:
+      foreign_key_constraint_on: ability_id
+  - name: pokemon_v2_versiongroup
+    using:
+      foreign_key_constraint_on: version_group_id
 array_relationships:
-- name: pokemon_v2_abilitychangeeffecttexts
-  using:
-    foreign_key_constraint_on:
-      column: ability_change_id
-      table:
-        name: pokemon_v2_abilitychangeeffecttext
-        schema: public
+  - name: pokemon_v2_abilitychangeeffecttexts
+    using:
+      foreign_key_constraint_on:
+        column: ability_change_id
+        table:
+          name: pokemon_v2_abilitychangeeffecttext
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilitychangeeffecttext.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_abilitychangeeffecttext
   schema: public
 object_relationships:
-- name: pokemon_v2_abilitychange
-  using:
-    foreign_key_constraint_on: ability_change_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_abilitychange
+    using:
+      foreign_key_constraint_on: ability_change_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityeffecttext.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_abilityeffecttext
   schema: public
 object_relationships:
-- name: pokemon_v2_ability
-  using:
-    foreign_key_constraint_on: ability_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_ability
+    using:
+      foreign_key_constraint_on: ability_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityflavortext.yaml

@@ -2,19 +2,19 @@ table:
   name: pokemon_v2_abilityflavortext
   schema: public
 object_relationships:
-- name: pokemon_v2_ability
-  using:
-    foreign_key_constraint_on: ability_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
-- name: pokemon_v2_versiongroup
-  using:
-    foreign_key_constraint_on: version_group_id
+  - name: pokemon_v2_ability
+    using:
+      foreign_key_constraint_on: ability_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
+  - name: pokemon_v2_versiongroup
+    using:
+      foreign_key_constraint_on: version_group_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_abilityname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_abilityname
   schema: public
 object_relationships:
-- name: pokemon_v2_ability
-  using:
-    foreign_key_constraint_on: ability_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_ability
+    using:
+      foreign_key_constraint_on: ability_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berry.yaml

@@ -2,27 +2,27 @@ table:
   name: pokemon_v2_berry
   schema: public
 object_relationships:
-- name: pokemon_v2_berryfirmness
-  using:
-    foreign_key_constraint_on: berry_firmness_id
-- name: pokemon_v2_item
-  using:
-    foreign_key_constraint_on: item_id
-- name: pokemon_v2_type
-  using:
-    foreign_key_constraint_on: natural_gift_type_id
+  - name: pokemon_v2_berryfirmness
+    using:
+      foreign_key_constraint_on: berry_firmness_id
+  - name: pokemon_v2_item
+    using:
+      foreign_key_constraint_on: item_id
+  - name: pokemon_v2_type
+    using:
+      foreign_key_constraint_on: natural_gift_type_id
 array_relationships:
-- name: pokemon_v2_berryflavormaps
-  using:
-    foreign_key_constraint_on:
-      column: berry_id
-      table:
-        name: pokemon_v2_berryflavormap
-        schema: public
+  - name: pokemon_v2_berryflavormaps
+    using:
+      foreign_key_constraint_on:
+        column: berry_id
+        table:
+          name: pokemon_v2_berryflavormap
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmness.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_berryfirmness
   schema: public
 array_relationships:
-- name: pokemon_v2_berries
-  using:
-    foreign_key_constraint_on:
-      column: berry_firmness_id
-      table:
-        name: pokemon_v2_berry
-        schema: public
-- name: pokemon_v2_berryfirmnessnames
-  using:
-    foreign_key_constraint_on:
-      column: berry_firmness_id
-      table:
-        name: pokemon_v2_berryfirmnessname
-        schema: public
+  - name: pokemon_v2_berries
+    using:
+      foreign_key_constraint_on:
+        column: berry_firmness_id
+        table:
+          name: pokemon_v2_berry
+          schema: public
+  - name: pokemon_v2_berryfirmnessnames
+    using:
+      foreign_key_constraint_on:
+        column: berry_firmness_id
+        table:
+          name: pokemon_v2_berryfirmnessname
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryfirmnessname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_berryfirmnessname
   schema: public
 object_relationships:
-- name: pokemon_v2_berryfirmness
-  using:
-    foreign_key_constraint_on: berry_firmness_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_berryfirmness
+    using:
+      foreign_key_constraint_on: berry_firmness_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavor.yaml

@@ -2,42 +2,42 @@ table:
   name: pokemon_v2_berryflavor
   schema: public
 object_relationships:
-- name: pokemon_v2_contesttype
-  using:
-    foreign_key_constraint_on: contest_type_id
+  - name: pokemon_v2_contesttype
+    using:
+      foreign_key_constraint_on: contest_type_id
 array_relationships:
-- name: pokemonV2NaturesByLikesFlavorId
-  using:
-    foreign_key_constraint_on:
-      column: likes_flavor_id
-      table:
-        name: pokemon_v2_nature
-        schema: public
-- name: pokemon_v2_berryflavormaps
-  using:
-    foreign_key_constraint_on:
-      column: berry_flavor_id
-      table:
-        name: pokemon_v2_berryflavormap
-        schema: public
-- name: pokemon_v2_berryflavornames
-  using:
-    foreign_key_constraint_on:
-      column: berry_flavor_id
-      table:
-        name: pokemon_v2_berryflavorname
-        schema: public
-- name: pokemon_v2_natures
-  using:
-    foreign_key_constraint_on:
-      column: hates_flavor_id
-      table:
-        name: pokemon_v2_nature
-        schema: public
+  - name: pokemonV2NaturesByLikesFlavorId
+    using:
+      foreign_key_constraint_on:
+        column: likes_flavor_id
+        table:
+          name: pokemon_v2_nature
+          schema: public
+  - name: pokemon_v2_berryflavormaps
+    using:
+      foreign_key_constraint_on:
+        column: berry_flavor_id
+        table:
+          name: pokemon_v2_berryflavormap
+          schema: public
+  - name: pokemon_v2_berryflavornames
+    using:
+      foreign_key_constraint_on:
+        column: berry_flavor_id
+        table:
+          name: pokemon_v2_berryflavorname
+          schema: public
+  - name: pokemon_v2_natures
+    using:
+      foreign_key_constraint_on:
+        column: hates_flavor_id
+        table:
+          name: pokemon_v2_nature
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavormap.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_berryflavormap
   schema: public
 object_relationships:
-- name: pokemon_v2_berry
-  using:
-    foreign_key_constraint_on: berry_id
-- name: pokemon_v2_berryflavor
-  using:
-    foreign_key_constraint_on: berry_flavor_id
+  - name: pokemon_v2_berry
+    using:
+      foreign_key_constraint_on: berry_id
+  - name: pokemon_v2_berryflavor
+    using:
+      foreign_key_constraint_on: berry_flavor_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_berryflavorname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_berryflavorname
   schema: public
 object_relationships:
-- name: pokemon_v2_berryflavor
-  using:
-    foreign_key_constraint_on: berry_flavor_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_berryflavor
+    using:
+      foreign_key_constraint_on: berry_flavor_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_characteristic.yaml

@@ -2,21 +2,21 @@ table:
   name: pokemon_v2_characteristic
   schema: public
 object_relationships:
-- name: pokemon_v2_stat
-  using:
-    foreign_key_constraint_on: stat_id
+  - name: pokemon_v2_stat
+    using:
+      foreign_key_constraint_on: stat_id
 array_relationships:
-- name: pokemon_v2_characteristicdescriptions
-  using:
-    foreign_key_constraint_on:
-      column: characteristic_id
-      table:
-        name: pokemon_v2_characteristicdescription
-        schema: public
+  - name: pokemon_v2_characteristicdescriptions
+    using:
+      foreign_key_constraint_on:
+        column: characteristic_id
+        table:
+          name: pokemon_v2_characteristicdescription
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_characteristicdescription.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_characteristicdescription
   schema: public
 object_relationships:
-- name: pokemon_v2_characteristic
-  using:
-    foreign_key_constraint_on: characteristic_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_characteristic
+    using:
+      foreign_key_constraint_on: characteristic_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contestcombo.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_contestcombo
   schema: public
 object_relationships:
-- name: pokemonV2MoveBySecondMoveId
-  using:
-    foreign_key_constraint_on: second_move_id
-- name: pokemon_v2_move
-  using:
-    foreign_key_constraint_on: first_move_id
+  - name: pokemonV2MoveBySecondMoveId
+    using:
+      foreign_key_constraint_on: second_move_id
+  - name: pokemon_v2_move
+    using:
+      foreign_key_constraint_on: first_move_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffect.yaml

@@ -2,31 +2,31 @@ table:
   name: pokemon_v2_contesteffect
   schema: public
 array_relationships:
-- name: pokemon_v2_contesteffecteffecttexts
-  using:
-    foreign_key_constraint_on:
-      column: contest_effect_id
-      table:
-        name: pokemon_v2_contesteffecteffecttext
-        schema: public
-- name: pokemon_v2_contesteffectflavortexts
-  using:
-    foreign_key_constraint_on:
-      column: contest_effect_id
-      table:
-        name: pokemon_v2_contesteffectflavortext
-        schema: public
-- name: pokemon_v2_moves
-  using:
-    foreign_key_constraint_on:
-      column: contest_effect_id
-      table:
-        name: pokemon_v2_move
-        schema: public
+  - name: pokemon_v2_contesteffecteffecttexts
+    using:
+      foreign_key_constraint_on:
+        column: contest_effect_id
+        table:
+          name: pokemon_v2_contesteffecteffecttext
+          schema: public
+  - name: pokemon_v2_contesteffectflavortexts
+    using:
+      foreign_key_constraint_on:
+        column: contest_effect_id
+        table:
+          name: pokemon_v2_contesteffectflavortext
+          schema: public
+  - name: pokemon_v2_moves
+    using:
+      foreign_key_constraint_on:
+        column: contest_effect_id
+        table:
+          name: pokemon_v2_move
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffecteffecttext.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_contesteffecteffecttext
   schema: public
 object_relationships:
-- name: pokemon_v2_contesteffect
-  using:
-    foreign_key_constraint_on: contest_effect_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_contesteffect
+    using:
+      foreign_key_constraint_on: contest_effect_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesteffectflavortext.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_contesteffectflavortext
   schema: public
 object_relationships:
-- name: pokemon_v2_contesteffect
-  using:
-    foreign_key_constraint_on: contest_effect_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_contesteffect
+    using:
+      foreign_key_constraint_on: contest_effect_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesttype.yaml

@@ -1,32 +1,40 @@
 table:
   name: pokemon_v2_contesttype
   schema: public
+object_relationships:
+  - name: pokemon_v2_berryflavor
+    using:
+      foreign_key_constraint_on:
+        column: contest_type_id
+        table:
+          name: pokemon_v2_berryflavor
+          schema: public
 array_relationships:
-- name: pokemon_v2_berryflavors
-  using:
-    foreign_key_constraint_on:
-      column: contest_type_id
-      table:
-        name: pokemon_v2_berryflavor
-        schema: public
-- name: pokemon_v2_contesttypenames
-  using:
-    foreign_key_constraint_on:
-      column: contest_type_id
-      table:
-        name: pokemon_v2_contesttypename
-        schema: public
-- name: pokemon_v2_moves
-  using:
-    foreign_key_constraint_on:
-      column: contest_type_id
-      table:
-        name: pokemon_v2_move
-        schema: public
+  - name: pokemon_v2_berryflavors
+    using:
+      foreign_key_constraint_on:
+        column: contest_type_id
+        table:
+          name: pokemon_v2_berryflavor
+          schema: public
+  - name: pokemon_v2_contesttypenames
+    using:
+      foreign_key_constraint_on:
+        column: contest_type_id
+        table:
+          name: pokemon_v2_contesttypename
+          schema: public
+  - name: pokemon_v2_moves
+    using:
+      foreign_key_constraint_on:
+        column: contest_type_id
+        table:
+          name: pokemon_v2_move
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_contesttypename.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_contesttypename
   schema: public
 object_relationships:
-- name: pokemon_v2_contesttype
-  using:
-    foreign_key_constraint_on: contest_type_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_contesttype
+    using:
+      foreign_key_constraint_on: contest_type_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_egggroup.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_egggroup
   schema: public
 array_relationships:
-- name: pokemon_v2_egggroupnames
-  using:
-    foreign_key_constraint_on:
-      column: egg_group_id
-      table:
-        name: pokemon_v2_egggroupname
-        schema: public
-- name: pokemon_v2_pokemonegggroups
-  using:
-    foreign_key_constraint_on:
-      column: egg_group_id
-      table:
-        name: pokemon_v2_pokemonegggroup
-        schema: public
+  - name: pokemon_v2_egggroupnames
+    using:
+      foreign_key_constraint_on:
+        column: egg_group_id
+        table:
+          name: pokemon_v2_egggroupname
+          schema: public
+  - name: pokemon_v2_pokemonegggroups
+    using:
+      foreign_key_constraint_on:
+        column: egg_group_id
+        table:
+          name: pokemon_v2_pokemonegggroup
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_egggroupname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_egggroupname
   schema: public
 object_relationships:
-- name: pokemon_v2_egggroup
-  using:
-    foreign_key_constraint_on: egg_group_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_egggroup
+    using:
+      foreign_key_constraint_on: egg_group_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounter.yaml

@@ -2,30 +2,30 @@ table:
   name: pokemon_v2_encounter
   schema: public
 object_relationships:
-- name: pokemon_v2_encounterslot
-  using:
-    foreign_key_constraint_on: encounter_slot_id
-- name: pokemon_v2_locationarea
-  using:
-    foreign_key_constraint_on: location_area_id
-- name: pokemon_v2_pokemon
-  using:
-    foreign_key_constraint_on: pokemon_id
-- name: pokemon_v2_version
-  using:
-    foreign_key_constraint_on: version_id
+  - name: pokemon_v2_encounterslot
+    using:
+      foreign_key_constraint_on: encounter_slot_id
+  - name: pokemon_v2_locationarea
+    using:
+      foreign_key_constraint_on: location_area_id
+  - name: pokemon_v2_pokemon
+    using:
+      foreign_key_constraint_on: pokemon_id
+  - name: pokemon_v2_version
+    using:
+      foreign_key_constraint_on: version_id
 array_relationships:
-- name: pokemon_v2_encounterconditionvaluemaps
-  using:
-    foreign_key_constraint_on:
-      column: encounter_id
-      table:
-        name: pokemon_v2_encounterconditionvaluemap
-        schema: public
+  - name: pokemon_v2_encounterconditionvaluemaps
+    using:
+      foreign_key_constraint_on:
+        column: encounter_id
+        table:
+          name: pokemon_v2_encounterconditionvaluemap
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountercondition.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_encountercondition
   schema: public
 array_relationships:
-- name: pokemon_v2_encounterconditionnames
-  using:
-    foreign_key_constraint_on:
-      column: encounter_condition_id
-      table:
-        name: pokemon_v2_encounterconditionname
-        schema: public
-- name: pokemon_v2_encounterconditionvalues
-  using:
-    foreign_key_constraint_on:
-      column: encounter_condition_id
-      table:
-        name: pokemon_v2_encounterconditionvalue
-        schema: public
+  - name: pokemon_v2_encounterconditionnames
+    using:
+      foreign_key_constraint_on:
+        column: encounter_condition_id
+        table:
+          name: pokemon_v2_encounterconditionname
+          schema: public
+  - name: pokemon_v2_encounterconditionvalues
+    using:
+      foreign_key_constraint_on:
+        column: encounter_condition_id
+        table:
+          name: pokemon_v2_encounterconditionvalue
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_encounterconditionname
   schema: public
 object_relationships:
-- name: pokemon_v2_encountercondition
-  using:
-    foreign_key_constraint_on: encounter_condition_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_encountercondition
+    using:
+      foreign_key_constraint_on: encounter_condition_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvalue.yaml

@@ -2,28 +2,28 @@ table:
   name: pokemon_v2_encounterconditionvalue
   schema: public
 object_relationships:
-- name: pokemon_v2_encountercondition
-  using:
-    foreign_key_constraint_on: encounter_condition_id
+  - name: pokemon_v2_encountercondition
+    using:
+      foreign_key_constraint_on: encounter_condition_id
 array_relationships:
-- name: pokemon_v2_encounterconditionvaluemaps
-  using:
-    foreign_key_constraint_on:
-      column: encounter_condition_value_id
-      table:
-        name: pokemon_v2_encounterconditionvaluemap
-        schema: public
-- name: pokemon_v2_encounterconditionvaluenames
-  using:
-    foreign_key_constraint_on:
-      column: encounter_condition_value_id
-      table:
-        name: pokemon_v2_encounterconditionvaluename
-        schema: public
+  - name: pokemon_v2_encounterconditionvaluemaps
+    using:
+      foreign_key_constraint_on:
+        column: encounter_condition_value_id
+        table:
+          name: pokemon_v2_encounterconditionvaluemap
+          schema: public
+  - name: pokemon_v2_encounterconditionvaluenames
+    using:
+      foreign_key_constraint_on:
+        column: encounter_condition_value_id
+        table:
+          name: pokemon_v2_encounterconditionvaluename
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluemap.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_encounterconditionvaluemap
   schema: public
 object_relationships:
-- name: pokemon_v2_encounter
-  using:
-    foreign_key_constraint_on: encounter_id
-- name: pokemon_v2_encounterconditionvalue
-  using:
-    foreign_key_constraint_on: encounter_condition_value_id
+  - name: pokemon_v2_encounter
+    using:
+      foreign_key_constraint_on: encounter_id
+  - name: pokemon_v2_encounterconditionvalue
+    using:
+      foreign_key_constraint_on: encounter_condition_value_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterconditionvaluename.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_encounterconditionvaluename
   schema: public
 object_relationships:
-- name: pokemon_v2_encounterconditionvalue
-  using:
-    foreign_key_constraint_on: encounter_condition_value_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_encounterconditionvalue
+    using:
+      foreign_key_constraint_on: encounter_condition_value_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethod.yaml

@@ -2,31 +2,31 @@ table:
   name: pokemon_v2_encountermethod
   schema: public
 array_relationships:
-- name: pokemon_v2_encountermethodnames
-  using:
-    foreign_key_constraint_on:
-      column: encounter_method_id
-      table:
-        name: pokemon_v2_encountermethodname
-        schema: public
-- name: pokemon_v2_encounterslots
-  using:
-    foreign_key_constraint_on:
-      column: encounter_method_id
-      table:
-        name: pokemon_v2_encounterslot
-        schema: public
-- name: pokemon_v2_locationareaencounterrates
-  using:
-    foreign_key_constraint_on:
-      column: encounter_method_id
-      table:
-        name: pokemon_v2_locationareaencounterrate
-        schema: public
+  - name: pokemon_v2_encountermethodnames
+    using:
+      foreign_key_constraint_on:
+        column: encounter_method_id
+        table:
+          name: pokemon_v2_encountermethodname
+          schema: public
+  - name: pokemon_v2_encounterslots
+    using:
+      foreign_key_constraint_on:
+        column: encounter_method_id
+        table:
+          name: pokemon_v2_encounterslot
+          schema: public
+  - name: pokemon_v2_locationareaencounterrates
+    using:
+      foreign_key_constraint_on:
+        column: encounter_method_id
+        table:
+          name: pokemon_v2_locationareaencounterrate
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encountermethodname.yaml

@@ -2,16 +2,16 @@ table:
   name: pokemon_v2_encountermethodname
   schema: public
 object_relationships:
-- name: pokemon_v2_encountermethod
-  using:
-    foreign_key_constraint_on: encounter_method_id
-- name: pokemon_v2_language
-  using:
-    foreign_key_constraint_on: language_id
+  - name: pokemon_v2_encountermethod
+    using:
+      foreign_key_constraint_on: encounter_method_id
+  - name: pokemon_v2_language
+    using:
+      foreign_key_constraint_on: language_id
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_encounterslot.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_encounterslot
   schema: public
 object_relationships:
-- name: pokemon_v2_encountermethod
-  using:
-    foreign_key_constraint_on: encounter_method_id
-- name: pokemon_v2_versiongroup
-  using:
-    foreign_key_constraint_on: version_group_id
+  - name: pokemon_v2_encountermethod
+    using:
+      foreign_key_constraint_on: encounter_method_id
+  - name: pokemon_v2_versiongroup
+    using:
+      foreign_key_constraint_on: version_group_id
 array_relationships:
-- name: pokemon_v2_encounters
-  using:
-    foreign_key_constraint_on:
-      column: encounter_slot_id
-      table:
-        name: pokemon_v2_encounter
-        schema: public
+  - name: pokemon_v2_encounters
+    using:
+      foreign_key_constraint_on:
+        column: encounter_slot_id
+        table:
+          name: pokemon_v2_encounter
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_evolutionchain.yaml

@@ -2,21 +2,21 @@ table:
   name: pokemon_v2_evolutionchain
   schema: public
 object_relationships:
-- name: pokemon_v2_item
-  using:
-    foreign_key_constraint_on: baby_trigger_item_id
+  - name: pokemon_v2_item
+    using:
+      foreign_key_constraint_on: baby_trigger_item_id
 array_relationships:
-- name: pokemon_v2_pokemonspecies
-  using:
-    foreign_key_constraint_on:
-      column: evolution_chain_id
-      table:
-        name: pokemon_v2_pokemonspecies
-        schema: public
+  - name: pokemon_v2_pokemonspecies
+    using:
+      foreign_key_constraint_on:
+        column: evolution_chain_id
+        table:
+          name: pokemon_v2_pokemonspecies
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true

graphql/metadata/databases/default/tables/public_pokemon_v2_evolutiontrigger.yaml

@@ -2,24 +2,24 @@ table:
   name: pokemon_v2_evolutiontrigger
   schema: public
 array_relationships:
-- name: pokemon_v2_evolutiontriggernames
-  using:
-    foreign_key_constraint_on:
-      column: evolution_trigger_id
-      table:
-        name: pokemon_v2_evolutiontriggername
-        schema: public
-- name: pokemon_v2_pokemonevolutions
-  using:
-    foreign_key_constraint_on:
-      column: evolution_trigger_id
-      table:
-        name: pokemon_v2_pokemonevolution
-        schema: public
+  - name: pokemon_v2_evolutiontriggernames
+    using:
+      foreign_key_constraint_on:
+        column: evolution_trigger_id
+        table:
+          name: pokemon_v2_evolutiontriggername
+          schema: public
+  - name: pokemon_v2_pokemonevolutions
+    using:
+      foreign_key_constraint_on:
+        column: evolution_trigger_id
+        table:
+          name: pokemon_v2_pokemonevolution
+          schema: public
 select_permissions:
-- permission:
-    allow_aggregations: true
-    columns: "*"
-    filter: {}
-    limit: 100000
-  role: anon
+  - role: anon
+    permission:
+      columns: '*'
+      filter: {}
+      limit: 100000
+      allow_aggregations: true