Giratina-origin did exist in gen7 (#348)

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

Helps with #159 and #256

.github/workflows/build.yml

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

conftest.py

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

pokedex/data/csv/abilities.csv

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

pokedex/data/csv/ability_names.csv

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

pokedex/data/csv/characteristic_text.csv

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

pokedex/data/csv/evolution_chains.csv

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

pokedex/data/csv/evolution_trigger_prose.csv

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

pokedex/data/csv/evolution_triggers.csv

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

pokedex/data/csv/generation_names.csv

@@ -48,3 +48,4 @@ generation_id,local_language_id,name
 7,7,Generación VII
 7,9,Generation VII
 7,11,第七世代
+8,9,Generation VIII

pokedex/data/csv/generations.csv

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

pokedex/data/csv/item_categories.csv

@@ -44,3 +44,8 @@ id,pocket_id,identifier
 44,1,mega-stones
 45,1,memories
 46,8,z-crystals
+47,1,species-candies
+48,5,catching-bonus
+49,1,dynamax-crystals
+50,2,nature-mints
+51,1,curry-ingredients

pokedex/data/csv/item_category_prose.csv

@@ -44,3 +44,8 @@ item_category_id,local_language_id,name
 44,9,Mega Stones
 45,9,Memories
 46,9,Z-Crystals
+47,9,Species candies
+48,9,Catching bonus
+49,9,Dynamax crystals
+50,9,Nature mints
+51,9,Curry ingredients

pokedex/data/csv/location_area_prose.csv

@@ -9,18 +9,18 @@ location_area_id,local_language_id,name
 8,9,
 9,9,
 10,9,
-11,9,Route 207
+11,9,1F Route 207
 12,9,2F
 13,9,3F
-14,9,snowfall
+14,9,exterior snowfall
-15,9,blizzard
+15,9,exterior blizzard
 16,9,4F
-17,9,5F
+17,9,4F small room
-18,9,6F
+18,9,5F
-19,9,7F
+19,9,6F
-20,9,cave
+20,9,1F from exterior
-21,9,Route 216
+21,9,1F Route 216
-22,9,Route 211
+22,9,1F Route 211
 23,9,B1F
 24,9,Area 1
 25,9,Area 2

pokedex/data/csv/location_areas.csv

@@ -9,18 +9,18 @@ id,location_id,game_index,identifier
 8,7,8,
 9,8,9,
 10,9,10,
-11,10,11,route-207
+11,10,11,1f-route-207
 12,10,12,2f
 13,10,13,3f
-14,10,14,snowfall
+14,10,14,exterior-snowfall
-15,10,15,blizzard
+15,10,15,exterior-blizzard
 16,10,16,4f
-17,10,17,5f
+17,10,17,4f-small-room
-18,10,18,6f
+18,10,18,5f
-19,10,19,7f
+19,10,19,6f
-20,10,20,cave
+20,10,20,1f-from-exterior
-21,10,21,route-216
+21,10,21,1f-route-216
-22,10,22,route-211
+22,10,22,1f-route-211
 23,10,23,b1f
 24,11,24,area-1
 25,11,25,area-2

pokedex/data/csv/machines.csv

@@ -1,4 +1,5 @@
 machine_number,version_group_id,item_id,move_id
+0,20,1288,5
 1,1,305,5
 1,2,305,5
 1,3,305,223
@@ -17,6 +18,8 @@ machine_number,version_group_id,item_id,move_id
 1,16,305,468
 1,17,305,526
 1,18,305,526
+1,19,305,29
+1,20,305,25
 2,1,306,13
 2,2,306,13
 2,3,306,29
@@ -35,6 +38,8 @@ machine_number,version_group_id,item_id,move_id
 2,16,306,337
 2,17,306,337
 2,18,306,337
+2,19,306,269
+2,20,306,6
 3,1,307,14
 3,2,307,14
 3,3,307,174
@@ -53,6 +58,8 @@ machine_number,version_group_id,item_id,move_id
 3,16,307,473
 3,17,307,473
 3,18,307,473
+3,19,307,270
+3,20,307,7
 4,1,308,18
 4,2,308,18
 4,3,308,205
@@ -71,6 +78,8 @@ machine_number,version_group_id,item_id,move_id
 4,16,308,347
 4,17,308,347
 4,18,308,347
+4,19,308,100
+4,20,308,8
 5,1,309,25
 5,2,309,25
 5,3,309,46
@@ -89,6 +98,8 @@ machine_number,version_group_id,item_id,move_id
 5,16,309,46
 5,17,309,46
 5,18,309,46
+5,19,309,156
+5,20,309,9
 6,1,310,92
 6,2,310,92
 6,3,310,92
@@ -107,6 +118,8 @@ machine_number,version_group_id,item_id,move_id
 6,16,310,92
 6,17,310,92
 6,18,310,92
+6,19,310,113
+6,20,310,19
 7,1,311,32
 7,2,311,32
 7,3,311,192
@@ -125,6 +138,8 @@ machine_number,version_group_id,item_id,move_id
 7,16,311,258
 7,17,311,258
 7,18,311,258
+7,19,311,182
+7,20,311,42
 8,1,312,34
 8,2,312,34
 8,3,312,249
@@ -143,6 +158,8 @@ machine_number,version_group_id,item_id,move_id
 8,16,312,339
 8,17,312,339
 8,18,312,339
+8,19,312,164
+8,20,312,63
 9,1,313,36
 9,2,313,36
 9,3,313,244
@@ -161,6 +178,8 @@ machine_number,version_group_id,item_id,move_id
 9,16,313,474
 9,17,313,474
 9,18,313,474
+9,19,313,115
+9,20,313,416
 10,1,314,38
 10,2,314,38
 10,3,314,237
@@ -179,6 +198,8 @@ machine_number,version_group_id,item_id,move_id
 10,16,314,237
 10,17,314,237
 10,18,314,237
+10,19,314,91
+10,20,314,345
 11,1,315,61
 11,2,315,61
 11,3,315,241
@@ -197,6 +218,8 @@ machine_number,version_group_id,item_id,move_id
 11,16,315,241
 11,17,315,241
 11,18,315,241
+11,19,315,261
+11,20,315,76
 12,1,316,55
 12,2,316,55
 12,3,316,230
@@ -215,6 +238,8 @@ machine_number,version_group_id,item_id,move_id
 12,16,316,269
 12,17,316,269
 12,18,316,269
+12,19,316,263
+12,20,316,669
 13,1,317,58
 13,2,317,58
 13,3,317,173
@@ -233,6 +258,8 @@ machine_number,version_group_id,item_id,move_id
 13,16,317,58
 13,17,317,58
 13,18,317,58
+13,19,317,280
+13,20,317,83
 14,1,318,59
 14,2,318,59
 14,3,318,59
@@ -251,6 +278,8 @@ machine_number,version_group_id,item_id,move_id
 14,16,318,59
 14,17,318,59
 14,18,318,59
+14,19,318,19
+14,20,318,86
 15,1,319,63
 15,2,319,63
 15,3,319,63
@@ -269,6 +298,8 @@ machine_number,version_group_id,item_id,move_id
 15,16,319,63
 15,17,319,63
 15,18,319,63
+15,19,319,69
+15,20,319,91
 16,1,320,6
 16,2,320,6
 16,3,320,196
@@ -287,6 +318,8 @@ machine_number,version_group_id,item_id,move_id
 16,16,320,113
 16,17,320,113
 16,18,320,113
+16,19,320,86
+16,20,320,103
 17,1,321,66
 17,2,321,66
 17,3,321,182
@@ -305,6 +338,8 @@ machine_number,version_group_id,item_id,move_id
 17,16,321,182
 17,17,321,182
 17,18,321,182
+17,19,321,525
+17,20,321,113
 18,1,322,68
 18,2,322,68
 18,3,322,240
@@ -323,6 +358,8 @@ machine_number,version_group_id,item_id,move_id
 18,16,322,240
 18,17,322,240
 18,18,322,240
+18,19,322,369
+18,20,322,115
 19,1,323,69
 19,2,323,69
 19,3,323,202
@@ -341,6 +378,8 @@ machine_number,version_group_id,item_id,move_id
 19,16,323,355
 19,17,323,355
 19,18,323,355
+19,19,323,231
+19,20,323,219
 20,1,324,99
 20,2,324,99
 20,3,324,203
@@ -359,6 +398,8 @@ machine_number,version_group_id,item_id,move_id
 20,16,324,219
 20,17,324,219
 20,18,324,219
+20,19,324,399
+20,20,324,120
 21,1,325,72
 21,2,325,72
 21,3,325,218
@@ -377,6 +418,8 @@ machine_number,version_group_id,item_id,move_id
 21,16,325,218
 21,17,325,218
 21,18,325,218
+21,19,325,492
+21,20,325,156
 22,1,326,76
 22,2,326,76
 22,3,326,76
@@ -395,6 +438,8 @@ machine_number,version_group_id,item_id,move_id
 22,16,326,76
 22,17,326,76
 22,18,326,76
+22,19,326,157
+22,20,326,157
 23,1,327,82
 23,2,327,82
 23,3,327,231
@@ -413,6 +458,8 @@ machine_number,version_group_id,item_id,move_id
 23,16,327,479
 23,17,327,479
 23,18,327,479
+23,19,327,9
+23,20,327,168
 24,1,328,85
 24,2,328,85
 24,3,328,225
@@ -431,6 +478,8 @@ machine_number,version_group_id,item_id,move_id
 24,16,328,85
 24,17,328,85
 24,18,328,85
+24,19,328,404
+24,20,328,173
 25,1,329,87
 25,2,329,87
 25,3,329,87
@@ -449,6 +498,8 @@ machine_number,version_group_id,item_id,move_id
 25,16,329,87
 25,17,329,87
 25,18,329,87
+25,19,329,127
+25,20,329,182
 26,1,330,89
 26,2,330,89
 26,3,330,89
@@ -467,6 +518,8 @@ machine_number,version_group_id,item_id,move_id
 26,16,330,89
 26,17,330,89
 26,18,330,89
+26,19,330,398
+26,20,330,184
 27,1,331,90
 27,2,331,90
 27,3,331,216
@@ -485,6 +538,8 @@ machine_number,version_group_id,item_id,move_id
 27,16,331,216
 27,17,331,216
 27,18,331,216
+27,19,331,92
+27,20,331,196
 28,1,332,91
 28,2,332,91
 28,3,332,91
@@ -503,6 +558,8 @@ machine_number,version_group_id,item_id,move_id
 28,16,332,91
 28,17,332,141
 28,18,332,141
+28,19,332,161
+28,20,332,202
 29,1,333,94
 29,2,333,94
 29,3,333,94
@@ -521,6 +578,8 @@ machine_number,version_group_id,item_id,move_id
 29,16,333,94
 29,17,333,94
 29,18,333,94
+29,19,333,503
+29,20,333,204
 30,1,334,100
 30,2,334,100
 30,3,334,247
@@ -539,6 +598,8 @@ machine_number,version_group_id,item_id,move_id
 30,16,334,247
 30,17,334,247
 30,18,334,247
+30,19,334,339
+30,20,334,211
 31,1,335,102
 31,2,335,102
 31,3,335,189
@@ -557,6 +618,8 @@ machine_number,version_group_id,item_id,move_id
 31,16,335,280
 31,17,335,280
 31,18,335,280
+31,19,335,7
+31,20,335,213
 32,1,336,104
 32,2,336,104
 32,3,336,104
@@ -575,6 +638,8 @@ machine_number,version_group_id,item_id,move_id
 32,16,336,104
 32,17,336,104
 32,18,336,104
+32,19,336,605
+32,20,336,201
 33,1,337,115
 33,2,337,115
 33,3,337,8
@@ -593,6 +658,8 @@ machine_number,version_group_id,item_id,move_id
 33,16,337,115
 33,17,337,115
 33,18,337,115
+33,19,337,347
+33,20,337,240
 34,1,338,117
 34,2,338,117
 34,3,338,207
@@ -611,6 +678,8 @@ machine_number,version_group_id,item_id,move_id
 34,16,338,482
 34,17,338,482
 34,18,338,482
+34,19,338,406
+34,20,338,241
 35,1,339,118
 35,2,339,118
 35,3,339,214
@@ -629,6 +698,8 @@ machine_number,version_group_id,item_id,move_id
 35,16,339,53
 35,17,339,53
 35,18,339,53
+35,19,339,8
+35,20,339,258
 36,1,340,120
 36,2,340,120
 36,3,340,188
@@ -647,6 +718,8 @@ machine_number,version_group_id,item_id,move_id
 36,16,340,188
 36,17,340,188
 36,18,340,188
+36,19,340,85
+36,20,340,250
 37,1,341,121
 37,2,341,121
 37,3,341,201
@@ -665,6 +738,8 @@ machine_number,version_group_id,item_id,move_id
 37,16,341,201
 37,17,341,201
 37,18,341,201
+37,19,341,53
+37,20,341,251
 38,1,342,126
 38,2,342,126
 38,3,342,126
@@ -683,6 +758,8 @@ machine_number,version_group_id,item_id,move_id
 38,16,342,126
 38,17,342,126
 38,18,342,126
+38,19,342,87
+38,20,342,261
 39,1,343,129
 39,2,343,129
 39,3,343,129
@@ -701,6 +778,8 @@ machine_number,version_group_id,item_id,move_id
 39,16,343,317
 39,17,343,317
 39,18,343,317
+39,19,343,200
+39,20,343,263
 40,1,344,130
 40,2,344,130
 40,3,344,111
@@ -719,6 +798,8 @@ machine_number,version_group_id,item_id,move_id
 40,16,344,332
 40,17,344,332
 40,18,344,332
+40,19,344,94
+40,20,344,129
 41,1,345,135
 41,2,345,135
 41,3,345,9
@@ -737,6 +818,8 @@ machine_number,version_group_id,item_id,move_id
 41,16,345,259
 41,17,345,259
 41,18,345,259
+41,19,345,89
+41,20,345,270
 42,1,346,138
 42,2,346,138
 42,3,346,138
@@ -755,6 +838,8 @@ machine_number,version_group_id,item_id,move_id
 42,16,346,263
 42,17,346,263
 42,18,346,263
+42,19,346,120
+42,20,346,279
 43,1,347,143
 43,2,347,143
 43,3,347,197
@@ -773,6 +858,8 @@ machine_number,version_group_id,item_id,move_id
 43,16,347,488
 43,17,347,488
 43,18,347,488
+43,19,347,247
+43,20,347,280
 44,1,348,156
 44,2,348,156
 44,3,348,156
@@ -791,6 +878,8 @@ machine_number,version_group_id,item_id,move_id
 44,16,348,156
 44,17,348,156
 44,18,348,156
+44,19,348,583
+44,20,348,286
 45,1,349,86
 45,2,349,86
 45,3,349,213
@@ -809,6 +898,8 @@ machine_number,version_group_id,item_id,move_id
 45,16,349,213
 45,17,349,213
 45,18,349,213
+45,19,349,76
+45,20,349,291
 46,1,350,149
 46,2,350,149
 46,3,350,168
@@ -827,6 +918,8 @@ machine_number,version_group_id,item_id,move_id
 46,16,350,168
 46,17,350,168
 46,18,350,168
+46,19,350,126
+46,20,350,311
 47,1,351,153
 47,2,351,153
 47,3,351,211
@@ -845,6 +938,8 @@ machine_number,version_group_id,item_id,move_id
 47,16,351,490
 47,17,351,490
 47,18,351,490
+47,19,351,57
+47,20,351,313
 48,1,352,157
 48,2,352,157
 48,3,352,7
@@ -863,6 +958,8 @@ machine_number,version_group_id,item_id,move_id
 48,16,352,496
 48,17,352,496
 48,18,352,496
+48,19,352,63
+48,20,352,317
 49,1,353,161
 49,2,353,161
 49,3,353,210
@@ -881,6 +978,8 @@ machine_number,version_group_id,item_id,move_id
 49,16,353,497
 49,17,353,497
 49,18,353,497
+49,19,353,276
+49,20,353,328
 50,1,354,164
 50,2,354,164
 50,3,354,171
@@ -899,6 +998,8 @@ machine_number,version_group_id,item_id,move_id
 50,16,354,315
 50,17,354,315
 50,18,354,315
+50,19,354,355
+50,20,354,331
 51,8,355,355
 51,9,355,355
 51,10,355,355
@@ -908,6 +1009,8 @@ machine_number,version_group_id,item_id,move_id
 51,16,355,211
 51,17,355,211
 51,18,355,211
+51,19,355,59
+51,20,355,333
 52,8,356,411
 52,9,356,411
 52,10,356,411
@@ -917,6 +1020,8 @@ machine_number,version_group_id,item_id,move_id
 52,16,356,411
 52,17,356,411
 52,18,356,411
+52,19,356,188
+52,20,356,340
 53,8,357,412
 53,9,357,412
 53,10,357,412
@@ -926,6 +1031,8 @@ machine_number,version_group_id,item_id,move_id
 53,16,357,412
 53,17,357,412
 53,18,357,412
+53,19,357,72
+53,20,357,341
 54,8,358,206
 54,9,358,206
 54,10,358,206
@@ -935,6 +1042,8 @@ machine_number,version_group_id,item_id,move_id
 54,16,358,206
 54,17,358,206
 54,18,358,206
+54,19,358,430
+54,20,358,350
 55,8,359,362
 55,9,359,362
 55,10,359,362
@@ -944,6 +1053,8 @@ machine_number,version_group_id,item_id,move_id
 55,16,359,503
 55,17,359,503
 55,18,359,503
+55,19,359,58
+55,20,359,362
 56,8,360,374
 56,9,360,374
 56,10,360,374
@@ -953,6 +1064,8 @@ machine_number,version_group_id,item_id,move_id
 56,16,360,374
 56,17,360,374
 56,18,360,374
+56,19,360,446
+56,20,360,369
 57,8,361,451
 57,9,361,451
 57,10,361,451
@@ -962,6 +1075,8 @@ machine_number,version_group_id,item_id,move_id
 57,16,361,451
 57,17,361,451
 57,18,361,451
+57,19,361,6
+57,20,361,371
 58,8,362,203
 58,9,362,203
 58,10,362,203
@@ -971,6 +1086,8 @@ machine_number,version_group_id,item_id,move_id
 58,16,362,507
 58,17,362,507
 58,18,362,507
+58,19,362,529
+58,20,362,372
 59,8,363,406
 59,9,363,406
 59,10,363,406
@@ -980,6 +1097,8 @@ machine_number,version_group_id,item_id,move_id
 59,16,363,510
 59,17,363,693
 59,18,363,693
+59,19,363,138
+59,20,363,374
 60,8,364,409
 60,9,364,409
 60,10,364,409
@@ -989,6 +1108,8 @@ machine_number,version_group_id,item_id,move_id
 60,16,364,511
 60,17,364,511
 60,18,364,511
+60,19,364,224
+60,20,364,384
 61,8,365,261
 61,9,365,261
 61,10,365,261
@@ -998,6 +1119,7 @@ machine_number,version_group_id,item_id,move_id
 61,16,365,261
 61,17,365,261
 61,18,365,261
+61,20,365,385
 62,8,366,318
 62,9,366,318
 62,10,366,318
@@ -1007,6 +1129,7 @@ machine_number,version_group_id,item_id,move_id
 62,16,366,512
 62,17,366,512
 62,18,366,512
+62,20,366,683
 63,8,367,373
 63,9,367,373
 63,10,367,373
@@ -1016,6 +1139,7 @@ machine_number,version_group_id,item_id,move_id
 63,16,367,373
 63,17,367,373
 63,18,367,373
+63,20,367,409
 64,8,368,153
 64,9,368,153
 64,10,368,153
@@ -1025,6 +1149,7 @@ machine_number,version_group_id,item_id,move_id
 64,16,368,153
 64,17,368,153
 64,18,368,153
+64,20,368,419
 65,8,369,421
 65,9,369,421
 65,10,369,421
@@ -1034,6 +1159,7 @@ machine_number,version_group_id,item_id,move_id
 65,16,369,421
 65,17,369,421
 65,18,369,421
+65,20,369,421
 66,8,370,371
 66,9,370,371
 66,10,370,371
@@ -1043,6 +1169,7 @@ machine_number,version_group_id,item_id,move_id
 66,16,370,371
 66,17,370,371
 66,18,370,371
+66,20,370,422
 67,8,371,278
 67,9,371,278
 67,10,371,278
@@ -1052,6 +1179,7 @@ machine_number,version_group_id,item_id,move_id
 67,16,371,514
 67,17,371,684
 67,18,371,684
+67,20,371,423
 68,8,372,416
 68,9,372,416
 68,10,372,416
@@ -1061,6 +1189,7 @@ machine_number,version_group_id,item_id,move_id
 68,16,372,416
 68,17,372,416
 68,18,372,416
+68,20,372,424
 69,8,373,397
 69,9,373,397
 69,10,373,397
@@ -1070,6 +1199,7 @@ machine_number,version_group_id,item_id,move_id
 69,16,373,397
 69,17,373,397
 69,18,373,397
+69,20,373,427
 70,8,374,148
 70,9,374,148
 70,10,374,148
@@ -1079,6 +1209,7 @@ machine_number,version_group_id,item_id,move_id
 70,16,374,148
 70,17,374,694
 70,18,374,694
+70,20,374,433
 71,8,375,444
 71,9,375,444
 71,10,375,444
@@ -1088,6 +1219,7 @@ machine_number,version_group_id,item_id,move_id
 71,16,375,444
 71,17,375,444
 71,18,375,444
+71,20,375,472
 72,8,376,419
 72,9,376,419
 72,10,376,419
@@ -1097,6 +1229,7 @@ machine_number,version_group_id,item_id,move_id
 72,16,376,521
 72,17,376,521
 72,18,376,521
+72,20,376,478
 73,8,377,86
 73,9,377,86
 73,10,377,86
@@ -1106,6 +1239,7 @@ machine_number,version_group_id,item_id,move_id
 73,16,377,86
 73,17,377,86
 73,18,377,86
+73,20,377,440
 74,8,378,360
 74,9,378,360
 74,10,378,360
@@ -1115,6 +1249,7 @@ machine_number,version_group_id,item_id,move_id
 74,16,378,360
 74,17,378,360
 74,18,378,360
+74,20,378,474
 75,8,379,14
 75,9,379,14
 75,10,379,14
@@ -1124,6 +1259,7 @@ machine_number,version_group_id,item_id,move_id
 75,16,379,14
 75,17,379,14
 75,18,379,14
+75,20,379,490
 76,8,380,446
 76,9,380,446
 76,10,380,446
@@ -1133,6 +1269,7 @@ machine_number,version_group_id,item_id,move_id
 76,16,380,522
 76,17,380,19
 76,18,380,19
+76,20,380,496
 77,8,381,244
 77,9,381,244
 77,10,381,244
@@ -1142,6 +1279,7 @@ machine_number,version_group_id,item_id,move_id
 77,16,381,244
 77,17,381,244
 77,18,381,244
+77,20,381,506
 78,8,382,445
 78,9,382,445
 78,10,382,445
@@ -1151,6 +1289,7 @@ machine_number,version_group_id,item_id,move_id
 78,16,382,523
 78,17,382,523
 78,18,382,523
+78,20,382,512
 79,8,383,399
 79,9,383,399
 79,10,383,399
@@ -1160,6 +1299,7 @@ machine_number,version_group_id,item_id,move_id
 79,16,383,524
 79,17,383,524
 79,18,383,524
+79,20,383,514
 80,8,384,157
 80,9,384,157
 80,10,384,157
@@ -1169,6 +1309,7 @@ machine_number,version_group_id,item_id,move_id
 80,16,384,157
 80,17,384,157
 80,18,384,157
+80,20,384,521
 81,8,385,404
 81,9,385,404
 81,10,385,404
@@ -1178,6 +1319,7 @@ machine_number,version_group_id,item_id,move_id
 81,16,385,404
 81,17,385,404
 81,18,385,404
+81,20,385,523
 82,8,386,214
 82,9,386,214
 82,10,386,214
@@ -1187,6 +1329,7 @@ machine_number,version_group_id,item_id,move_id
 82,16,386,525
 82,17,386,525
 82,18,386,525
+82,20,386,527
 83,8,387,363
 83,9,387,363
 83,10,387,363
@@ -1196,6 +1339,7 @@ machine_number,version_group_id,item_id,move_id
 83,16,387,611
 83,17,387,611
 83,18,387,611
+83,20,387,534
 84,8,388,398
 84,9,388,398
 84,10,388,398
@@ -1205,6 +1349,7 @@ machine_number,version_group_id,item_id,move_id
 84,16,388,398
 84,17,388,398
 84,18,388,398
+84,20,388,541
 85,8,389,138
 85,9,389,138
 85,10,389,138
@@ -1214,6 +1359,7 @@ machine_number,version_group_id,item_id,move_id
 85,16,389,138
 85,17,389,138
 85,18,389,138
+85,20,389,555
 86,8,390,447
 86,9,390,447
 86,10,390,447
@@ -1223,6 +1369,7 @@ machine_number,version_group_id,item_id,move_id
 86,16,390,447
 86,17,390,447
 86,18,390,447
+86,20,390,566
 87,8,391,207
 87,9,391,207
 87,10,391,207
@@ -1232,6 +1379,7 @@ machine_number,version_group_id,item_id,move_id
 87,16,391,207
 87,17,391,207
 87,18,391,207
+87,20,391,577
 88,8,392,365
 88,9,392,365
 88,10,392,365
@@ -1241,6 +1389,7 @@ machine_number,version_group_id,item_id,move_id
 88,16,392,214
 88,17,392,214
 88,18,392,214
+88,20,392,580
 89,8,393,369
 89,9,393,369
 89,10,393,369
@@ -1250,6 +1399,7 @@ machine_number,version_group_id,item_id,move_id
 89,16,393,369
 89,17,393,369
 89,18,393,369
+89,20,393,581
 90,8,394,164
 90,9,394,164
 90,10,394,164
@@ -1259,6 +1409,7 @@ machine_number,version_group_id,item_id,move_id
 90,16,394,164
 90,17,394,164
 90,18,394,164
+90,20,394,604
 91,8,395,430
 91,9,395,430
 91,10,395,430
@@ -1268,6 +1419,7 @@ machine_number,version_group_id,item_id,move_id
 91,16,395,430
 91,17,395,430
 91,18,395,430
+91,20,395,678
 92,8,396,433
 92,9,396,433
 92,10,396,433
@@ -1277,44 +1429,53 @@ machine_number,version_group_id,item_id,move_id
 92,16,396,433
 92,17,396,433
 92,18,396,433
+92,20,396,595
 93,11,659,528
 93,14,659,528
 93,15,659,528
 93,16,659,528
 93,17,659,528
 93,18,659,528
+93,20,659,598
 94,11,660,249
 94,14,660,249
 94,15,660,249
 94,16,660,290
 94,17,660,57
 94,18,660,57
+94,20,660,206
 95,11,661,555
 95,14,661,555
 95,15,661,555
 95,16,661,555
 95,17,661,555
 95,18,661,555
+95,20,661,403
 96,15,745,267
 96,16,745,267
 96,17,745,267
 96,18,745,267
+96,20,745,684
 97,15,746,399
 97,16,746,399
 97,17,746,399
 97,18,746,399
+97,20,746,693
 98,15,747,612
 98,16,747,612
 98,17,747,127
 98,18,747,127
+98,20,747,707
 99,15,748,605
 99,16,748,605
 99,17,748,605
 99,18,748,605
+99,20,748,784
 100,15,749,590
 100,16,749,590
 100,17,749,590
 100,18,749,590
+100,20,1188,14
 101,1,397,15
 101,2,397,15
 101,3,397,15
@@ -1331,8 +1492,7 @@ machine_number,version_group_id,item_id,move_id
 101,14,397,15
 101,15,397,15
 101,16,397,15
-101,17,397,15
+101,20,1189,34
-101,18,397,15
 102,1,398,19
 102,2,398,19
 102,3,398,19
@@ -1349,8 +1509,7 @@ machine_number,version_group_id,item_id,move_id
 102,14,398,19
 102,15,398,19
 102,16,398,19
-102,17,398,19
+102,20,1190,53
-102,18,398,19
 103,1,399,57
 103,2,399,57
 103,3,399,57
@@ -1367,8 +1526,7 @@ machine_number,version_group_id,item_id,move_id
 103,14,399,57
 103,15,399,57
 103,16,399,57
-103,17,399,57
+103,20,1191,56
-103,18,399,57
 104,1,400,70
 104,2,400,70
 104,3,400,70
@@ -1385,8 +1543,7 @@ machine_number,version_group_id,item_id,move_id
 104,14,400,70
 104,15,400,70
 104,16,400,70
-104,17,400,70
+104,20,1192,57
-104,18,400,70
 105,1,401,148
 105,2,401,148
 105,3,401,148
@@ -1403,8 +1560,7 @@ machine_number,version_group_id,item_id,move_id
 105,14,401,127
 105,15,401,127
 105,16,401,127
-105,17,401,127
+105,20,1193,58
-105,18,401,127
 106,3,402,250
 106,4,402,250
 106,5,402,249
@@ -1418,8 +1574,7 @@ machine_number,version_group_id,item_id,move_id
 106,13,402,249
 106,14,402,291
 106,16,402,249
-106,17,402,249
+106,20,1194,59
-106,18,402,249
 107,3,403,127
 107,4,403,127
 107,5,403,127
@@ -1431,8 +1586,7 @@ machine_number,version_group_id,item_id,move_id
 107,12,403,127
 107,13,403,127
 107,16,403,291
-107,17,403,291
+107,20,1195,67
-107,18,403,291
 108,5,404,291
 108,6,404,291
 108,7,404,291
@@ -1441,3 +1595,95 @@ machine_number,version_group_id,item_id,move_id
 108,10,404,431
 108,12,404,291
 108,13,404,291
+108,20,1196,85
+109,20,1197,87
+110,20,1198,89
+111,20,1199,94
+112,20,1200,97
+113,20,1201,116
+114,20,1202,118
+115,20,1203,126
+116,20,1204,127
+117,20,1205,133
+118,20,1206,141
+119,20,1207,161
+120,20,1208,164
+121,20,1209,179
+122,20,1210,188
+123,20,1211,191
+124,20,1212,200
+125,20,1213,473
+126,20,1214,203
+127,20,1215,214
+128,20,1216,224
+129,20,1217,226
+130,20,1218,227
+131,20,1219,231
+132,20,1220,242
+133,20,1221,247
+134,20,1222,248
+135,20,1223,253
+136,20,1224,257
+137,20,1225,269
+138,20,1226,271
+139,20,1227,276
+140,20,1228,285
+141,20,1229,299
+142,20,1230,304
+143,20,1231,315
+144,20,1232,322
+145,20,1233,330
+146,20,1234,334
+147,20,1235,337
+148,20,1236,339
+149,20,1237,347
+150,20,1238,348
+151,20,1239,349
+152,20,1240,360
+153,20,1241,370
+154,20,1242,390
+155,20,1243,394
+156,20,1244,396
+157,20,1245,398
+158,20,1246,399
+159,20,1247,402
+160,20,1248,404
+161,20,1249,405
+162,20,1250,406
+163,20,1251,408
+164,20,1252,411
+165,20,1253,412
+166,20,1254,413
+167,20,1255,414
+168,20,1256,417
+169,20,1257,428
+170,20,1258,430
+171,20,1259,437
+172,20,1260,438
+173,20,1261,441
+174,20,1262,442
+175,20,1263,444
+176,20,1264,446
+177,20,1265,447
+178,20,1266,482
+179,20,1267,484
+180,20,1268,486
+181,20,1269,492
+182,20,1270,500
+183,20,1271,502
+184,20,1272,503
+185,20,1273,526
+186,20,1274,528
+187,20,1275,529
+188,20,1276,535
+189,20,1277,542
+190,20,1278,583
+191,20,1279,599
+192,20,1280,605
+193,20,1281,663
+194,20,1282,667
+195,20,1283,675
+196,20,1284,676
+197,20,1285,706
+198,20,1286,710
+199,20,1287,776

pokedex/data/csv/move_changelog.csv

@@ -33,9 +33,15 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 66,15,,,25,,,,,
 67,5,,50,,90,,,32,30
 71,8,,,20,,,,,
+71,19,,20,25,,,,,
+71,20,,40,15,,,,,
 72,8,,,10,,,,,
+72,19,,40,15,,,,,
+72,20,,75,10,,,,,
 74,11,,,,,,,14,
 74,15,,,40,,,,,
+76,19,,120,,,,,,
+76,20,,200,,,,,,
 80,8,,70,,,,,,
 80,11,,90,20,,,,,
 81,17,,,,,,,21,
@@ -51,6 +57,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 94,3,,,,,,,,30
 95,8,,,,60,,,,
 95,9,,,,70,,,,
+100,19,,,,,0,,,
 105,8,,,20,,,,,
 107,15,,,20,,,,,
 112,15,,,30,,,,,
@@ -69,6 +76,8 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 139,15,,,,80,,,,
 141,17,,20,15,,,,,
 143,3,,,,,,,,10
+143,19,,140,,,,,,
+143,20,,200,,,,,,
 145,15,,20,,,,,,
 146,3,,,,,,,1,0
 148,8,,,,70,,,,
@@ -100,6 +109,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 210,11,,10,,,,,,
 210,15,,20,,,,,,
 215,15,,,,,,4,,
+229,20,,20,,,,,,
 236,15,1,,,,,,,
 237,15,,1,,,,,,
 248,11,,80,15,90,,,,
@@ -128,6 +138,7 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 330,15,,95,,,,,,
 331,11,,10,,,,,,
 333,11,,10,,,,,,
+336,20,,,,,,7,,
 343,11,,40,,,,,,
 343,15,,,40,,,,,
 348,8,,70,,,,,,
@@ -175,3 +186,13 @@ move_id,changed_in_version_group_id,type_id,power,pp,accuracy,priority,target_id
 565,17,,30,,,,,,
 570,17,,50,,,,,,
 595,17,,65,,,,,,
+718,20,,90,,,,,,
+729,20,,50,15,,,,,
+733,20,,90,15,,,,,
+734,20,,90,15,,,,,
+735,20,,90,15,,,,,
+736,20,,90,,100,,,,
+737,20,,90,,100,,,,
+738,20,,90,15,100,,,,
+739,20,,90,15,100,,,,
+740,20,,90,15,100,,,,

pokedex/data/csv/move_effect_prose.csv

@@ -1115,6 +1115,27 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
 418,9,XXX new effect for splintered-stormshards,XXX new effect for splintered-stormshards
 419,9,XXX new effect for clangorous-soulblaze,XXX new effect for clangorous-soulblaze
 420,9,XXX new effect for mind-blown,XXX new effect for mind-blown
+421,9,XXX new effect for dynamax-cannon,XXX new effect for dynamax-cannon
+422,9,XXX new effect for snipe-shot,XXX new effect for snipe-shot
+423,9,XXX new effect for jaw-lock,XXX new effect for jaw-lock
+424,9,XXX new effect for stuff-cheeks,XXX new effect for stuff-cheeks
+425,9,XXX new effect for no-retreat,XXX new effect for no-retreat
+426,9,XXX new effect for tar-shot,XXX new effect for tar-shot
+427,9,XXX new effect for magic-powder,XXX new effect for magic-powder
+428,9,XXX new effect for dragon-darts,XXX new effect for dragon-darts
+429,9,XXX new effect for teatime,XXX new effect for teatime
+430,9,XXX new effect for octolock,XXX new effect for octolock
+431,9,XXX new effect for bolt-beak,XXX new effect for bolt-beak
+432,9,XXX new effect for court-change,XXX new effect for court-change
+433,9,XXX new effect for clangorous-soul,XXX new effect for clangorous-soul
+434,9,XXX new effect for body-press,XXX new effect for body-press
+435,9,XXX new effect for decorate,XXX new effect for decorate
+436,9,XXX new effect for behemoth-blade,XXX new effect for behemoth-blade
+437,9,XXX new effect for aura-wheel,XXX new effect for aura-wheel
+439,9,XXX new effect for overdrive,XXX new effect for overdrive
+440,9,XXX new effect for apple-acid,XXX new effect for apple-acid
+441,9,XXX new effect for life-dew,XXX new effect for life-dew
+442,9,XXX new effect for obstruct,XXX new effect for obstruct
 10001,9,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic:regular-damage}.  User's [critical hit]{mechanic:critical-hit} rate is one level higher when using this move while in [hyper mode]{mechanic:hyper-mode}.
 10002,9,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic:regular-damage}.  User takes 1/2 of its current [HP]{mechanic:hp} in recoil.
 10003,9,Halves HP of all Pokémon on the field.  Must recharge,"Halves [HP]{mechanic:hp} of all Pokémon on the field.  User loses its next turn to ""recharge"", and cannot attack or [switch]{mechanic:switch} out during that turn."

pokedex/data/csv/move_effects.csv

@@ -401,6 +401,27 @@ id
 418
 419
 420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+439
+440
+441
+442
 10001
 10002
 10003

pokedex/data/csv/move_flag_map.csv

@@ -165,6 +165,7 @@ move_id,move_flag_id
 50,5
 50,7
 50,14
+50,19
 51,4
 51,7
 52,4
@@ -422,6 +423,7 @@ move_id,move_flag_id
 158,1
 158,4
 158,7
+158,16
 159,6
 160,6
 161,4
@@ -505,6 +507,7 @@ move_id,move_flag_id
 191,20
 192,4
 192,7
+192,18
 193,4
 193,5
 193,7
@@ -640,7 +643,6 @@ move_id,move_flag_id
 249,7
 250,4
 250,7
-250,19
 251,4
 251,7
 252,1
@@ -737,6 +739,7 @@ move_id,move_flag_id
 295,7
 296,4
 296,7
+296,18
 297,4
 297,5
 297,7
@@ -849,6 +852,7 @@ move_id,move_flag_id
 335,5
 335,7
 336,6
+336,9
 337,1
 337,4
 337,7
@@ -885,6 +889,7 @@ move_id,move_flag_id
 349,21
 350,4
 350,7
+350,18
 351,4
 351,7
 352,4
@@ -950,6 +955,7 @@ move_id,move_flag_id
 377,4
 377,5
 377,7
+377,19
 378,1
 378,4
 378,7
@@ -1122,6 +1128,7 @@ move_id,move_flag_id
 439,3
 439,4
 439,7
+439,18
 440,1
 440,4
 440,7
@@ -1384,6 +1391,7 @@ move_id,move_flag_id
 544,7
 545,4
 545,7
+545,18
 546,4
 546,7
 547,4
@@ -1564,6 +1572,7 @@ move_id,move_flag_id
 617,7
 618,4
 618,7
+618,17
 619,4
 619,7
 619,20
@@ -1621,6 +1630,7 @@ move_id,move_flag_id
 675,7
 676,4
 676,7
+676,18
 677,1
 677,4
 677,7
@@ -1657,6 +1667,7 @@ move_id,move_flag_id
 689,4
 689,14
 690,4
+690,18
 691,4
 691,7
 691,9
@@ -1677,6 +1688,7 @@ move_id,move_flag_id
 706,1
 706,4
 706,7
+706,16
 707,1
 707,4
 707,7
@@ -1722,6 +1734,206 @@ move_id,move_flag_id
 726,1
 728,9
 728,14
+729,1
+729,4
+729,7
+730,4
+730,7
+731,1
+731,4
+731,7
+731,10
+732,4
+732,7
+733,4
+733,7
+733,13
+734,4
+734,7
+735,1
+735,4
+735,7
+735,11
+736,4
+736,7
+737,4
+737,7
+738,4
+738,5
+738,7
+739,4
+739,7
+740,4
+740,7
+741,1
+741,4
+741,7
+742,1
+742,4
+742,7
+742,8
+744,4
+745,4
+745,7
+746,1
+746,4
+746,7
+746,16
+747,6
+748,6
+749,4
+749,5
+749,7
+750,4
+750,5
+750,7
+750,15
+751,4
+751,7
+752,14
+753,4
+753,7
+754,1
+754,4
+754,7
+755,1
+755,4
+755,7
+755,16
+756,7
+775,6
+775,9
+775,21
+776,1
+776,4
+776,7
+778,4
+778,7
+779,1
+779,4
+779,7
+780,4
+780,7
+780,11
+780,18
+781,1
+781,4
+781,7
+782,1
+782,4
+782,7
+783,4
+783,7
+784,1
+784,4
+784,7
+785,1
+785,4
+785,7
+786,4
+786,7
+786,9
+786,14
+787,4
+787,7
+788,4
+788,7
+789,1
+789,4
+789,7
+790,4
+790,7
+791,6
+791,13
+791,14
+793,1
+793,4
+793,7
+794,3
+794,4
+794,7
+795,3
+795,4
+795,7
+796,4
+796,7
+797,4
+797,7
+798,1
+798,4
+798,7
+799,4
+799,7
+800,2
+800,4
+800,7
+801,4
+801,7
+802,4
+802,7
+803,1
+803,4
+803,7
+804,4
+804,7
+805,4
+805,7
+805,17
+806,1
+806,4
+806,7
+807,4
+807,7
+808,1
+808,4
+808,7
+809,4
+809,7
+810,4
+810,5
+810,7
+811,14
+812,1
+812,4
+812,7
+813,1
+813,4
+813,7
+814,1
+814,4
+814,7
+815,4
+815,7
+815,11
+816,13
+816,14
+817,1
+817,4
+817,7
+817,8
+818,1
+818,4
+818,7
+818,8
+819,4
+819,7
+820,4
+820,7
+821,4
+821,7
+822,4
+822,7
+823,1
+823,4
+823,7
+824,4
+824,7
+825,4
+825,7
+826,4
+826,7
+826,9
+826,14
 10001,1
 10001,4
 10002,4

pokedex/data/csv/move_meta.csv

@@ -227,7 +227,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 226,13,0,,,,,0,0,0,0,0,0
 227,13,0,,,,,0,0,0,0,0,0
 228,0,0,,,,,0,0,0,0,0,0
-229,0,0,,,,,0,0,0,0,0,0
+229,7,0,,,,,0,0,0,0,0,100
 230,2,0,,,,,0,0,0,0,0,0
 231,6,0,,,,,0,0,0,0,0,30
 232,7,0,,,,,0,0,0,0,0,10
@@ -391,7 +391,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 390,11,0,,,,,0,0,0,0,0,0
 391,13,0,,,,,0,0,0,0,0,0
 392,13,0,,,,,0,0,0,0,0,0
-393,13,0,,,5,5,0,0,0,0,0,0
+393,13,0,,,,,0,0,0,0,0,0
 394,4,4,,,,,-33,0,0,10,0,0
 395,4,1,,,,,0,0,0,30,0,0
 396,0,0,,,,,0,0,0,0,0,0
@@ -618,8 +618,8 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 617,0,0,,,,,-50,0,0,0,0,0
 618,0,0,,,,,0,0,0,0,0,0
 619,0,0,,,,,0,0,0,0,0,0
-620,7,0,,,,,0,0,0,0,0,0
+620,7,0,,,,,0,0,0,0,0,100
-621,7,0,,,,,0,0,0,0,0,0
+621,7,0,,,,,0,0,0,0,0,100
 622,0,0,,,,,0,0,0,0,0,0
 623,0,0,,,,,0,0,0,0,0,0
 624,0,0,,,,,0,0,0,0,0,0
@@ -663,22 +663,22 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 662,0,0,,,,,0,0,0,0,0,0
 663,0,0,,,,,0,0,0,0,0,0
 664,0,0,,,,,0,0,0,0,0,0
-665,7,0,,,,,0,0,0,0,0,0
+665,7,0,,,,,0,0,0,0,0,100
 666,3,0,,,,,0,50,0,0,0,0
 667,0,0,,,,,0,0,0,0,0,0
-668,13,0,,,,,0,0,0,0,0,0
+668,13,0,,,,,0,0,0,0,0,100
 669,0,0,,,,,0,0,0,0,0,0
 670,0,0,,,,,0,0,0,0,0,0
 671,13,0,,,,,0,0,0,0,0,0
-672,5,5,,,,,0,0,0,100,0,0
+672,5,5,,,,,0,0,0,100,0,100
 673,13,0,,,,,0,0,0,0,0,0
 674,2,0,,,,,0,0,0,0,0,0
 675,4,24,,,2,2,0,0,0,100,0,0
 676,0,0,,,,,0,0,0,0,0,0
 677,0,0,,,,,0,0,0,0,0,0
 678,10,0,,,,,0,0,0,0,0,0
-679,6,0,,,,,0,0,0,0,0,0
+679,6,0,,,,,0,0,0,0,0,100
-680,6,0,,,,,0,0,0,0,0,0
+680,6,0,,,,,0,0,0,0,0,100
 681,0,0,,,,,0,0,0,0,0,0
 682,0,0,,,,,0,0,0,0,0,0
 683,13,0,,,,,0,0,0,0,0,0
@@ -686,10 +686,10 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 685,13,0,,,,,0,50,0,0,0,0
 686,0,0,,,,,0,0,0,0,0,0
 687,0,0,,,,,0,0,0,0,0,0
-688,6,0,,,,,0,0,0,0,0,0
+688,6,0,,,,,0,0,0,0,0,100
 689,13,0,,,,,0,0,0,0,0,0
 690,0,0,,,,,0,0,0,0,0,0
-691,7,0,,,,,0,0,0,0,0,0
+691,7,0,,,,,0,0,0,0,0,100
 692,0,0,,,,,0,0,0,0,0,0
 693,0,0,,,,,0,0,0,0,0,0
 694,11,0,,,,,0,0,0,0,0,0
@@ -700,20 +700,20 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 699,0,0,,,,,0,0,0,0,0,0
 700,4,1,,,,,0,0,0,100,0,0
 701,0,0,,,,,0,0,0,0,0,0
-702,2,0,,,,,0,0,0,0,0,0
+702,2,0,,,,,0,0,0,0,0,100
 703,0,0,,,,,0,0,0,0,0,0
 704,0,0,,,,,0,0,0,0,0,0
-705,7,0,,,,,0,0,0,0,0,0
+705,7,0,,,,,0,0,0,0,0,100
 706,0,0,,,,,0,0,0,0,0,0
 707,0,0,,,,,0,0,0,0,0,0
-708,6,0,,,,,0,0,0,0,0,0
+708,6,0,,,,,0,0,0,0,0,20
 709,0,0,,,,,0,0,0,0,0,0
-710,6,0,,,,,0,0,0,0,0,0
+710,6,0,,,,,0,0,0,0,0,20
 711,0,0,,,,,0,0,0,0,0,0
 712,0,0,,,,,0,0,0,0,0,0
 713,0,0,,,,,0,0,0,0,0,0
 714,0,0,,,,,0,0,0,0,0,0
-715,2,0,,,,,0,0,0,0,0,0
+715,2,0,,,,,0,0,0,0,0,100
 716,0,0,,,,,0,0,0,0,30,0
 717,0,0,,,,,0,0,0,0,0,0
 718,0,0,,,,,0,0,0,0,0,0
@@ -726,4 +726,102 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 725,0,0,,,,,0,0,0,0,0,0
 726,0,0,,,,,0,0,0,0,0,0
 727,0,0,,,,,0,0,0,0,0,0
-728,7,0,,,,,0,0,0,0,0,0
+728,7,0,,,,,0,0,0,0,0,100
+729,7,0,,,,,0,0,0,0,0,100
+730,4,1,,,,,0,0,0,30,0,0
+731,0,0,,,,,0,0,0,0,30,0
+732,0,0,,,,,0,0,0,0,0,0
+733,8,0,,,,,100,0,0,0,0,0
+734,4,1,,,,,0,0,0,100,0,0
+735,4,4,,,,,0,0,0,100,0,0
+736,0,0,,,,,0,0,0,0,0,0
+737,0,0,,,,,0,0,0,0,0,0
+738,4,18,,,,,0,0,0,100,0,0
+739,0,0,,,,,0,0,0,0,0,0
+740,0,0,,,,,0,0,0,0,0,0
+741,0,0,,,,,0,0,0,0,0,0
+742,0,0,2,2,,,0,0,0,0,30,0
+743,13,0,,,,,0,0,0,0,0,0
+744,0,0,,,,,0,0,0,0,0,0
+745,0,0,,,,,0,0,1,0,0,0
+746,0,0,,,,,0,0,0,0,0,0
+747,2,0,,,,,0,0,0,0,0,100
+748,2,0,,,,,0,0,0,0,0,100
+749,5,42,,,,,0,0,0,100,0,100
+750,13,0,,,,,0,0,0,0,0,0
+751,0,0,2,2,,,0,0,0,0,0,0
+752,13,0,,,,,0,0,0,0,0,0
+753,13,0,,,,,0,0,0,0,0,0
+754,0,0,,,,,0,0,0,0,0,0
+755,0,0,,,,,0,0,0,0,0,0
+756,13,0,,,,,0,0,0,0,0,0
+757,0,0,,,,,0,0,0,0,0,0
+758,0,0,,,,,0,0,0,0,0,0
+759,0,0,,,,,0,0,0,0,0,0
+760,0,0,,,,,0,0,0,0,0,0
+761,0,0,,,,,0,0,0,0,0,0
+762,0,0,,,,,0,0,0,0,0,0
+763,0,0,,,,,0,0,0,0,0,0
+764,0,0,,,,,0,0,0,0,0,0
+765,0,0,,,,,0,0,0,0,0,0
+766,0,0,,,,,0,0,0,0,0,0
+767,0,0,,,,,0,0,0,0,0,0
+768,0,0,,,,,0,0,0,0,0,0
+769,0,0,,,,,0,0,0,0,0,0
+770,0,0,,,,,0,0,0,0,0,0
+771,0,0,,,,,0,0,0,0,0,0
+772,0,0,,,,,0,0,0,0,0,0
+773,0,0,,,,,0,0,0,0,0,0
+774,0,0,,,,,0,0,0,0,0,0
+775,2,0,,,,,0,-33,0,0,0,100
+776,0,0,,,,,0,0,0,0,0,0
+777,2,0,,,,,0,0,0,0,0,100
+778,6,0,,,,,0,0,0,0,0,100
+779,4,8,,,5,6,0,0,0,100,0,0
+780,4,4,,,,,0,0,0,10,0,0
+781,0,0,,,,,0,0,0,0,0,0
+782,0,0,,,,,0,0,0,0,0,0
+783,7,0,,,,,0,0,0,0,0,100
+784,6,0,,,,,0,0,0,0,0,100
+785,0,0,,,,,0,0,0,0,0,0
+786,0,0,,,,,0,0,0,0,0,0
+787,6,0,,,,,0,0,0,0,0,100
+788,6,0,,,,,0,0,0,0,0,100
+789,6,0,,,,,0,0,0,0,0,100
+790,4,6,,,2,5,0,0,0,20,0,0
+791,3,0,,,,,0,25,0,0,0,0
+792,13,0,,,,,0,0,0,0,0,0
+793,0,0,,,,,0,0,0,0,0,0
+794,0,0,,,,,0,0,0,0,0,0
+795,0,0,,,,,0,0,0,0,0,0
+796,0,0,,,,,0,0,0,0,0,0
+797,0,0,,,,,0,0,0,0,0,0
+798,0,0,,,,,0,0,0,0,0,0
+799,0,0,2,5,,,0,0,0,0,0,0
+800,0,0,,,,,0,0,0,100,0,0
+801,4,5,,,,,0,0,0,20,0,0
+802,0,0,,,,,0,0,0,0,0,0
+803,0,0,,,,,0,0,0,0,0,0
+804,0,0,,,,,0,0,0,0,0,0
+805,0,0,,,,,0,0,0,0,0,0
+806,6,0,,,,,0,0,0,0,0,100
+807,4,4,,,,,0,0,0,100,0,0
+808,0,0,,,,,0,0,0,0,0,0
+809,0,0,,,,,0,0,0,0,0,0
+810,13,0,,,,,0,0,0,0,0,0
+811,2,0,,,,,0,0,0,0,0,100
+812,0,0,,,,,0,0,0,0,0,0
+813,0,0,3,3,,,0,0,0,0,0,0
+814,0,0,2,2,,,0,0,0,0,0,0
+815,4,4,,,,,0,0,0,30,0,0
+816,13,0,,,,,0,25,0,0,0,0
+817,0,0,,,,,0,0,6,0,0,0
+818,0,0,3,3,,,0,0,6,0,0,0
+819,4,8,,,5,6,0,0,0,100,0,0
+820,0,0,,,,,0,0,0,0,0,0
+821,4,3,,,,,0,0,0,10,0,0
+822,0,0,,,,,0,0,0,0,20,0
+823,6,0,,,,,0,0,0,0,0,100
+824,0,0,,,,,0,0,0,0,0,0
+825,0,0,,,,,0,0,0,0,0,0
+826,0,0,,,,,0,0,0,0,0,0

pokedex/data/csv/move_meta_ailment_names.csv

@@ -59,3 +59,4 @@ move_meta_ailment_id,local_language_id,name
 21,9,Ingrain
 24,7,Silenciado
 24,9,Silence
+42,9,Tar shot

pokedex/data/csv/move_meta_ailments.csv

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

pokedex/data/csv/move_meta_stat_changes.csv

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

pokedex/data/csv/moves.csv

@@ -98,7 +98,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 97,agility,1,14,,30,,0,7,1,53,,1,30,1
 98,quick-attack,1,1,40,30,100,1,10,2,104,,1,30,1
 99,rage,1,1,20,20,100,0,10,2,82,,1,17,11
-100,teleport,1,14,,20,,0,7,1,154,,1,15,1
+100,teleport,1,14,,20,,-6,7,1,154,,1,15,1
 101,night-shade,1,8,,15,100,0,10,3,88,,4,23,5
 102,mimic,1,1,,10,,0,10,1,83,,3,19,12
 103,screech,1,1,,40,85,0,10,1,60,,4,5,10
@@ -227,7 +227,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 226,baton-pass,2,1,,40,,0,7,1,128,,3,18,16
 227,encore,2,1,,5,100,0,10,1,91,,3,18,20
 228,pursuit,2,17,40,20,100,0,10,2,129,,4,14,20
-229,rapid-spin,2,1,20,40,100,0,10,2,130,,1,16,17
+229,rapid-spin,2,1,50,40,100,0,10,2,130,100,1,16,17
 230,sweet-scent,2,1,,20,100,0,11,1,25,,3,5,19
 231,iron-tail,2,9,100,15,75,0,10,2,70,30,1,4,18
 232,metal-claw,2,9,50,35,95,0,10,2,140,10,1,1,18
@@ -334,7 +334,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 333,icicle-spear,3,15,25,30,100,0,10,2,30,,2,23,7
 334,iron-defense,3,9,,15,,0,7,1,52,,5,15,13
 335,block,3,1,,5,,0,10,1,107,,3,18,13
-336,howl,3,1,,40,,0,7,1,11,,1,32,11
+336,howl,3,1,,40,,0,13,1,11,,1,32,11
 337,dragon-claw,3,16,80,15,100,0,10,2,1,,1,23,17
 338,frenzy-plant,3,12,150,5,90,0,10,3,81,,1,6,22
 339,bulk-up,3,2,,20,,0,7,1,209,,2,32,11
@@ -716,7 +716,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 715,tearful-look,7,1,,20,,0,10,1,412,100,,,
 716,zing-zap,7,13,80,10,100,0,10,2,32,30,,,
 717,natures-madness,7,18,,10,90,0,10,3,41,,,,
-718,multi-attack,7,1,90,10,100,0,10,2,269,,,,
+718,multi-attack,7,1,120,10,100,0,10,2,269,,,,
 719,10-000-000-volt-thunderbolt,7,13,195,1,,0,10,3,1,,,,
 720,mind-blown,7,10,150,5,100,0,9,3,420,,,,
 721,plasma-fists,7,13,100,15,100,0,10,2,1,,,,
@@ -727,6 +727,104 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 726,lets-snuggle-forever,7,18,190,1,,0,10,2,417,,,,
 727,splintered-stormshards,7,6,190,1,,0,10,2,418,,,,
 728,clangorous-soulblaze,7,16,185,1,,0,11,3,419,100,,,
+729,zippy-zap,7,13,80,10,100,2,10,2,1,100,,,
+730,splishy-splash,7,11,90,15,100,0,11,3,1,30,,,
+731,floaty-fall,7,3,90,15,95,0,10,2,1,30,,,
+732,pika-papow,7,13,,20,,0,10,3,1,,,,
+733,bouncy-bubble,7,11,60,20,100,0,10,3,1,,,,
+734,buzzy-buzz,7,13,60,20,100,0,10,3,1,100,,,
+735,sizzly-slide,7,10,60,20,100,0,10,2,1,100,,,
+736,glitzy-glow,7,14,80,15,95,0,10,3,1,,,,
+737,baddy-bad,7,17,80,15,95,0,10,3,1,,,,
+738,sappy-seed,7,12,100,10,90,0,10,2,1,100,,,
+739,freezy-frost,7,15,100,10,90,0,10,3,1,,,,
+740,sparkly-swirl,7,18,120,5,85,0,10,3,1,,,,
+741,veevee-volley,7,1,,20,,0,10,2,1,,,,
+742,double-iron-bash,7,9,60,5,100,0,10,2,45,30,,,
+743,max-guard,8,1,,10,,4,7,1,112,,,,
+744,dynamax-cannon,8,16,100,5,100,0,10,3,421,,,,
+745,snipe-shot,8,11,80,15,100,0,10,3,422,,,,
+746,jaw-lock,8,17,80,10,100,0,10,2,423,,,,
+747,stuff-cheeks,8,1,,10,,0,7,1,424,100,,,
+748,no-retreat,8,2,,5,,0,7,1,425,100,,,
+749,tar-shot,8,6,,15,100,0,10,1,426,100,,,
+750,magic-powder,8,14,,20,100,0,10,1,427,,,,
+751,dragon-darts,8,16,50,10,100,0,10,2,428,,,,
+752,teatime,8,1,,10,,0,14,1,429,,,,
+753,octolock,8,2,,15,100,0,10,1,430,,,,
+754,bolt-beak,8,13,85,10,100,0,10,2,431,,,,
+755,fishious-rend,8,11,85,10,100,0,10,2,431,,,,
+756,court-change,8,1,,10,100,0,12,1,432,,,,
+757,max-flare,8,10,100,10,,0,2,2,1,,,,
+758,max-flutterby,8,7,10,10,,0,2,2,1,,,,
+759,max-lightning,8,13,10,10,,0,2,2,1,,,,
+760,max-strike,8,1,10,10,,0,2,2,1,,,,
+761,max-knuckle,8,2,10,10,,0,2,2,1,,,,
+762,max-phantasm,8,8,10,10,,0,2,2,1,,,,
+763,max-hailstorm,8,15,10,10,,0,2,2,1,,,,
+764,max-ooze,8,4,10,10,,0,2,2,1,,,,
+765,max-geyser,8,11,10,10,,0,2,2,1,,,,
+766,max-airstream,8,3,10,10,,0,2,2,1,,,,
+767,max-starfall,8,18,10,10,,0,2,2,1,,,,
+768,max-wyrmwind,8,16,10,10,,0,2,2,1,,,,
+769,max-mindstorm,8,14,10,10,,0,2,2,1,,,,
+770,max-rockfall,8,6,10,10,,0,2,2,1,,,,
+771,max-quake,8,5,10,10,,0,2,2,1,,,,
+772,max-darkness,8,17,10,10,,0,2,2,1,,,,
+773,max-overgrowth,8,12,10,10,,0,2,2,1,,,,
+774,max-steelspike,8,9,10,10,,0,2,2,1,,,,
+775,clangorous-soul,8,16,,5,100,0,7,1,433,100,,,
+776,body-press,8,2,80,10,100,0,10,2,434,,,,
+777,decorate,8,18,,15,,0,10,1,435,100,,,
+778,drum-beating,8,12,80,10,100,0,10,2,71,100,,,
+779,snap-trap,8,12,35,15,100,0,10,2,43,100,,,
+780,pyro-ball,8,10,120,5,90,0,10,2,5,10,,,
+781,behemoth-blade,8,9,100,5,100,0,10,2,436,,,,
+782,behemoth-bash,8,9,100,5,100,0,10,2,436,,,,
+783,aura-wheel,8,13,110,10,100,0,10,2,437,100,,,
+784,breaking-swipe,8,16,60,15,100,0,11,2,396,100,,,
+785,branch-poke,8,12,40,40,100,0,10,2,1,,,,
+786,overdrive,8,13,80,10,100,0,11,3,439,,,,
+787,apple-acid,8,12,80,10,100,0,10,3,440,100,,,
+788,grav-apple,8,12,80,10,100,0,10,2,397,100,,,
+789,spirit-break,8,18,75,15,100,0,10,2,72,100,,,
+790,strange-steam,8,18,90,10,95,0,10,3,77,20,,,
+791,life-dew,8,11,,10,,0,13,1,441,,,,
+792,obstruct,8,17,,10,100,4,7,1,442,,,,
+793,false-surrender,8,17,80,10,,0,10,2,18,,,,
+794,meteor-assault,8,2,150,5,100,0,10,2,81,,,,
+795,eternabeam,8,16,160,5,90,0,10,3,81,,,,
+796,steel-beam,8,9,140,5,95,0,10,3,420,,,,
+797,expanding-force,8,14,80,10,100,0,10,3,1,,,,
+798,steel-roller,8,9,130,5,100,0,10,2,1,,,,
+799,scale-shot,8,16,25,20,90,0,10,2,1,,,,
+800,meteor-beam,8,6,120,10,90,0,10,3,1,100,,,
+801,shell-side-arm,8,4,90,10,100,0,10,3,1,20,,,
+802,misty-explosion,8,18,100,5,100,0,9,3,1,,,,
+803,grassy-glide,8,12,70,20,100,0,10,2,1,,,,
+804,rising-voltage,8,13,70,20,100,0,10,3,1,,,,
+805,terrain-pulse,8,1,50,10,100,0,10,3,1,,,,
+806,skitter-smack,8,7,70,10,90,0,10,2,1,100,,,
+807,burning-jealousy,8,10,70,5,100,0,11,3,1,100,,,
+808,lash-out,8,17,75,5,100,0,10,2,1,,,,
+809,poltergeist,8,8,110,5,90,0,10,2,1,,,,
+810,corrosive-gas,8,4,,40,100,0,9,1,1,,,,
+811,coaching,8,2,,10,,0,13,1,1,100,,,
+812,flip-turn,8,11,60,20,100,0,10,2,1,,,,
+813,triple-axel,8,15,20,10,90,0,10,2,1,,,,
+814,dual-wingbeat,8,3,40,10,90,0,10,2,1,,,,
+815,scorching-sands,8,5,70,10,100,0,10,3,1,30,,,
+816,jungle-healing,8,12,,10,,0,13,1,1,,,,
+817,wicked-blow,8,17,80,5,100,0,10,2,1,,,,
+818,surging-strikes,8,11,25,5,100,0,10,2,1,,,,
+819,thunder-cage,8,13,80,15,90,0,10,3,1,100,,,
+820,dragon-energy,8,16,150,5,100,0,11,3,1,,,,
+821,freezing-glare,8,14,90,10,100,0,10,3,1,10,,,
+822,fiery-wrath,8,17,90,10,100,0,11,3,1,20,,,
+823,thunderous-kick,8,2,90,10,100,0,10,2,1,100,,,
+824,glacial-lance,8,15,130,5,100,0,11,2,1,,,,
+825,astral-barrage,8,8,120,5,100,0,11,3,1,,,,
+826,eerie-spell,8,14,80,5,100,0,10,3,1,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

pokedex/data/csv/nature_names.csv

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

pokedex/data/csv/pokedex_prose.csv

@@ -53,3 +53,7 @@ pokedex_id,local_language_id,name,description
 23,9,Updated Akala,Ultra Sun/Ultra Moon Akala dex
 24,9,Updated Ula'ula,Ultra Sun/Ultra Moon Ula'ula dex
 25,9,Updated Poni,Ultra Sun/Ultra Moon Poni dex
+26,9,Let’s Go Kanto,Let’s Go: Pikachu/Let’s Go: Eevee Kanto dex
+27,9,Galar,
+28,9,Isle of Armor,
+29,9,Crown Tundra,

pokedex/data/csv/pokedex_version_groups.csv

@@ -25,3 +25,7 @@ pokedex_id,version_group_id
 23,18
 24,18
 25,18
+26,19
+27,20
+28,20
+29,20

pokedex/data/csv/pokedexes.csv

@@ -23,3 +23,7 @@ id,region_id,identifier,is_main_series
 23,7,updated-akala,1
 24,7,updated-ulaula,1
 25,7,updated-poni,1
+26,1,letsgo-kanto,1
+27,8,galar,1
+28,8,isle-of-armor,1
+29,8,crown-tundra,1

pokedex/data/csv/pokemon_abilities.csv

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

pokedex/data/csv/pokemon_color_names.csv

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

pokedex/data/csv/pokemon_egg_groups.csv

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

pokedex/data/csv/pokemon_evolution.csv

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

pokedex/data/csv/pokemon_move_method_prose.csv

@@ -20,3 +20,4 @@ pokemon_move_method_id,local_language_id,name,description
 9,9,XD: Purification,Appears on a Shadow Pokémon as it becomes increasingly purified.
 10,6,Rotom Formen,"Erscheint, wenn Rotom seine Form wechselt.  Verschwindet wenn Rotom eine andere Form an nimmt. Diese Fähigkeit kann nur durch wechseln der Form erlernt werden."
 10,9,Form Change,Appears when Rotom or Cosplay Pikachu changes form.  Disappears if the Pokémon becomes another form and this move can only be learned by form change.
+11,9,Zygarde Cube,Can be taught using the Zygarde Cube.  Must find the corresponding Zygarde Core first in Sun/Moon.  All moves are available immediately in Ultra Sun/Ultra Moon.

pokedex/data/csv/pokemon_move_methods.csv

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

pokedex/data/csv/pokemon_stats.csv

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

pokedex/data/csv/pokemon_types.csv

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

pokedex/data/csv/region_names.csv

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

pokedex/data/csv/regions.csv

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

pokedex/data/csv/type_names.csv

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

pokedex/data/csv/version_group_pokemon_move_methods.csv

@@ -76,9 +76,19 @@ version_group_id,pokemon_move_method_id
 17,4
 17,6
 17,10
+17,11
 18,1
 18,2
 18,3
 18,4
 18,6
 18,10
+18,11
+19,1
+19,3
+19,4
+20,1
+20,2
+20,3
+20,4
+20,10

pokedex/data/csv/version_group_regions.csv

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

pokedex/data/csv/version_groups.csv

@@ -17,3 +17,5 @@ id,identifier,generation_id,order
 16,omega-ruby-alpha-sapphire,6,16
 17,sun-moon,7,17
 18,ultra-sun-ultra-moon,7,18
+19,lets-go-pikachu-lets-go-eevee,7,19
+20,sword-shield,8,20

pokedex/data/csv/version_names.csv

@@ -209,3 +209,7 @@ version_id,local_language_id,name
 30,7,Ultraluna
 30,8,Ultraluna
 30,9,Ultra Moon
+31,9,"Let’s Go, Pikachu!"
+32,9,"Let’s Go, Eevee!"
+33,9,Sword
+34,9,Shield

pokedex/data/csv/versions.csv

@@ -29,3 +29,7 @@ id,version_group_id,identifier
 28,17,moon
 29,18,ultra-sun
 30,18,ultra-moon
+31,19,lets-go-pikachu
+32,19,lets-go-eevee
+33,20,sword
+34,20,shield

pokedex/db/load.py

@@ -11,11 +11,15 @@ import sqlalchemy.sql.util
 import sqlalchemy.types
 
 import pokedex
+import pokedex.db.tables as t
 from pokedex.db import metadata, translations
 from pokedex.defaults import get_default_csv_dir
 from pokedex.db.dependencies import find_dependent_tables
 from pokedex.db.oracle import rewrite_long_table_names
 
+from sqlalchemy import and_
+from sqlalchemy.sql import exists
+
 
 def _get_table_names(metadata, patterns):
     """Returns a list of table names from the given metadata.  If `patterns`
@@ -370,6 +374,23 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
         session.commit()
         print_done()
 
+    VGPMM = t.VersionGroupPokemonMoveMethod
+    if VGPMM.__tablename__ in table_names or t.PokemonMove.__tablename__ in table_names:
+        print_start('Regenerating %s' % VGPMM.__tablename__)
+
+        session.query(VGPMM).delete()
+
+        q = session.query(t.VersionGroup.id, t.PokemonMoveMethod.id)
+        q = q.filter(exists().where(and_(
+                t.PokemonMove.pokemon_move_method_id == t.PokemonMoveMethod.id,
+                t.PokemonMove.version_group_id == t.VersionGroup.id)))
+        for version_group_id, pokemon_move_method_id in q:
+            session.add(VGPMM(
+                    version_group_id=version_group_id,
+                    pokemon_move_method_id=pokemon_move_method_id,
+            ))
+        session.commit()
+        print_done()
 
     print_start('Translations')
     transl = translations.Translations(csv_directory=directory)
@@ -441,10 +462,12 @@ def dump(session, tables=[], directory=None, verbose=False, langs=None):
 
         # CSV module only works with bytes on 2 and only works with text on 3!
         if six.PY3:
-            writer = csv.writer(open(filename, 'w', newline='', encoding="utf8"), lineterminator='\n')
+            csvfile = open(filename, 'w', newline='', encoding="utf8")
+            writer = csv.writer(csvfile, lineterminator='\n')
             columns = [col.name for col in table.columns]
         else:
-            writer = csv.writer(open(filename, 'wb'), lineterminator='\n')
+            csvfile = open(filename, 'wb')
+            writer = csv.writer(csvfile, lineterminator='\n')
             columns = [col.name.encode('utf8') for col in table.columns]
 
         # For name tables, always dump rows for official languages, as well as
@@ -491,4 +514,5 @@ def dump(session, tables=[], directory=None, verbose=False, langs=None):
 
                 writer.writerow(csvs)
 
+        csvfile.close()
         print_done()

pokedex/db/markdown.py

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

pokedex/db/tables.py

@@ -1809,7 +1809,7 @@ class PokemonEvolution(TableBase):
         doc=u"The ID of the location the evolution must be triggered at.")
     held_item_id = Column(Integer, ForeignKey('items.id'), nullable=True,
         doc=u"The ID of the item the Pokémon must hold.")
-    time_of_day = Column(Enum('day', 'night', name='pokemon_evolution_time_of_day'), nullable=True,
+    time_of_day = Column(Enum('day', 'night', 'dusk', name='pokemon_evolution_time_of_day'), nullable=True,
         doc=u"The required time of day.")
     known_move_id = Column(Integer, ForeignKey('moves.id'), nullable=True,
         doc=u"The ID of the move the Pokémon must know.")
@@ -2035,7 +2035,7 @@ class PokemonSpecies(TableBase):
         doc=u"ID of the species' evolution chain (a.k.a. family)")
     color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
         doc=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games.")
-    shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False,
+    shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=True,
         doc=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games.")
     habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
         doc=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games.")
@@ -2055,6 +2055,10 @@ class PokemonSpecies(TableBase):
         doc=u"ID of the growth rate for this family")
     forms_switchable = Column(Boolean, nullable=False,
         doc=u"True iff a particular individual of this species can switch between its different forms.")
+    is_legendary = Column(Boolean, nullable=False,
+        doc=u'True iff the Pokémon is a legendary Pokémon.')
+    is_mythical = Column(Boolean, nullable=False,
+        doc=u'True iff the Pokémon is a mythical Pokémon.')
     order = Column(Integer, nullable=False, index=True,
         doc=u'The order in which species should be sorted.  Based on National Dex order, except families are grouped together and sorted by stage.')
     conquest_order = Column(Integer, nullable=True, index=True,
@@ -2822,7 +2826,7 @@ PokemonSpecies.flavor_text = relationship(PokemonSpeciesFlavorText,
     backref='species')
 PokemonSpecies.growth_rate = relationship(GrowthRate,
     innerjoin=True,
-    backref='evolution_chains')
+    backref='species')
 PokemonSpecies.habitat = relationship(PokemonHabitat,
     backref='species')
 PokemonSpecies.color = relationship(PokemonColor,
@@ -2860,7 +2864,7 @@ PokemonSpecies.generation = relationship(Generation,
     innerjoin=True,
     backref='species')
 PokemonSpecies.shape = relationship(PokemonShape,
-    innerjoin=True,
+    innerjoin=False,
     backref='species')
 PokemonSpecies.pal_park = relationship(PalPark,
     uselist=False,

pokedex/roomaji.py

@@ -98,9 +98,9 @@ class Romanizer(object):
 
                 if last_kana == 'sokuon':
                     if kana[0] in vowels:
-                        raise ValueError("Sokuon cannot precede a vowel.")
+                        characters.append("'")
-
+                    else:
-                    characters.append(kana[0])
+                        characters.append(kana[0])
                 elif last_kana == 'n' and kana[0] in vowels:
                     characters.append("'")
 

pokedex/tests/test_database_sanity.py

@@ -110,8 +110,8 @@ def test_default_forms(session):
     default pokemon."""
 
     q = session.query(tables.Pokemon)
-    q = q.join(tables.PokemonForm)
+    # TODO: could use table.Pokemon.forms.and_: https://docs.sqlalchemy.org/en/14/orm/queryguide.html#orm-queryguide-join-on-augmented
-    q = q.filter(tables.PokemonForm.is_default==True)
+    q = q.outerjoin(tables.PokemonForm, (tables.PokemonForm.pokemon_id == tables.Pokemon.id) & (tables.PokemonForm.is_default==True))
     q = q.options(lazyload('*'))
     q = q.group_by(tables.Pokemon)
     q = q.add_columns(func.count(tables.PokemonForm.id))
@@ -123,8 +123,7 @@ def test_default_forms(session):
             pytest.fail("pokemon %s has %d default forms" % (pokemon.name, num_default_forms))
 
     q = session.query(tables.PokemonSpecies)
-    q = q.join(tables.Pokemon)
+    q = q.outerjoin(tables.Pokemon, (tables.Pokemon.species_id == tables.PokemonSpecies.id) & (tables.Pokemon.is_default==True))
-    q = q.filter(tables.Pokemon.is_default==True)
     q = q.options(lazyload('*'))
     q = q.group_by(tables.PokemonSpecies)
     q = q.add_columns(func.count(tables.Pokemon.id))

pokedex/tests/test_roomaji.py

@@ -25,6 +25,7 @@ import pokedex.roomaji
         (u'ラティアス',         'ratiasu'),
         (u'ウィー',             'wii'),
         (u'セレビィ',           'sereby'),
+        (u'ウッウ',             u"u'u"),
     ]
 )
 def test_roomaji(kana, roomaji):
@@ -52,6 +53,7 @@ def test_roomaji(kana, roomaji):
         (u'ラティアス',         u'ratiasu'),
         (u'ウィー',             u'wí'),
         (u'セレビィ',           u'serebí'),
+        (u'ウッウ',             u"u'u"),
     ]
 )
 def test_roomaji_cs(kana, roomaji):

scripts/rename-home.py

@@ -0,0 +1,279 @@
+#!/usr/bin/env python3
+#
+# this is an unmaintained one-shot script, provided for reference only
+# it may not work or do what you expected
+#
+
+# Usage: rename-home.py src -o dest
+# Renames sprites from src dir to dest dir.
+# files in src dir should be named as in the HOME unity3d assets.
+# files in dest dir will be named according to veekun conventions.
+
+form_names = {
+        25: ["", "original-cap", "hoenn-cap", "sinnoh-cap", "unova-cap", "kalos-cap", "alola-cap", "partner-cap", "partner"],
+        133: ["", "partner"],
+        201: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
+                "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
+                "exclamation", "question"],
+        351: ["", "sunny", "rainy", "snowy"],
+        382: ["", "primal"],
+        383: ["", "primal"],
+        386: ["normal", "attack", "defense", "speed"],
+        412: ["plant", "sandy", "trash"],
+        413: ["plant", "sandy", "trash"],
+        421: ["overcast", "sunshine"],
+        422: ["west", "east"],
+        423: ["west", "east"],
+        479: ["", "heat", "wash", "frost", "fan", "mow"],
+        487: ["altered", "origin"],
+        492: ["land", "sky"],
+        493: ["normal", "fighting", "flying", "poison", "ground",
+                "rock", "bug", "ghost", "steel", "fire", "water", "grass",
+                "electric", "psychic", "ice", "dragon", "dark", "fairy"],
+        550: ["red-striped", "blue-striped"],
+        555: ["standard", "zen", "standard-galar", "zen-galar"],
+        585: ["spring", "summer", "autumn", "winter"],
+        586: ["spring", "summer", "autumn", "winter"],
+        592: ["male", "female"],
+        593: ["male", "female"],
+        641: ["incarnate", "therian"],
+        642: ["incarnate", "therian"],
+        645: ["incarnate", "therian"],
+        646: ["", "white", "black"],
+        647: ["ordinary", "resolute"],
+        648: ["aria", "pirouette"],
+        649: ["", "douse", "shock", "burn", "chill"],
+        658: ["", "battle-bond", "ash"],
+        666: ["icy-snow", "polar", "tundra", "continental", "garden",
+                "elegant", "meadow", "modern", "marine", "archipelago",
+                "high-plains", "sandstorm", "river", "monsoon", "savanna",
+                "sun", "ocean", "jungle", "fancy", "poke-ball"],
+        669: ["red", "yellow", "orange", "blue", "white"],
+        670: ["red", "yellow", "orange", "blue", "white", "eternal"],
+        671: ["red", "yellow", "orange", "blue", "white"],
+        676: ["", "heart", "star", "diamond", "debutante",
+                "matron", "dandy", "la-reine", "kabuki", "pharaoh"],
+        678: ["male", "female"],
+        681: ["shield", "blade"],
+        710: ["average", "small", "large", "super"],
+        711: ["average", "small", "large", "super"],
+        716: ["neutral", "active"],
+        718: ["", '10', '10-power-construct', '50-power-construct', 'complete'],
+        720: ["", "unbound"],
+        741: ('baile', 'pom-pom', 'pau', 'sensu'),
+        744: ('', 'own-tempo'),
+        745: ('midday', 'midnight', 'dusk'),
+        746: ('solo', 'school'),
+        773: ('normal', 'fighting', 'flying', 'poison', 'ground', 'rock',
+              'bug', 'ghost', 'steel', 'fire', 'water', 'grass', 'electric',
+              'psychic', 'ice', 'dragon', 'dark', 'fairy',),
+        774: ('red-meteor', 'orange-meteor', 'yellow-meteor', 'green-meteor',
+              'blue-meteor', 'indigo-meteor', 'violet-meteor', 'red', 'orange',
+              'yellow', 'green', 'blue', 'indigo', 'violet',),
+        778: ('disguised', 'busted', 'totem-disguised', 'totem-busted'),
+        800: ["", "dusk", "dawn", "ultra"],
+        801: ("", 'original'),
+        845: ["", "gulping", "gorging"],
+        849: ["amped", "low-key"],
+        854: ["phony", "antique"],
+        855: ["phony", "antique"],
+        869: ["vanilla-cream", "ruby-cream", "matcha-cream", "mint-cream", "lemon-cream", "salted-cream", "ruby-swirl", "caramel-swirl", "rainbow-swirl"],
+        875: ["ice", "noice"],
+        876: ["male", "female"],
+        877: ["full-belly", "hangry"],
+        888: ["", "crowned-sword"],
+        889: ["", "crowned-shield"],
+        890: ["", "eternamax"],
+        892: ["single-strike", "rapid-strike"],
+
+
+        19: ["", "alola"],
+        20: ["", "alola", "totem-alola"],
+        26: ["", "alola"],
+        27: ["", "alola"],
+        28: ["", "alola"],
+        37: ["", "alola"],
+        38: ["", "alola"],
+        50: ["", "alola"],
+        51: ["", "alola"],
+        52: ["", "alola", "galar"],
+        53: ["", "alola"],
+        74: ["", "alola"],
+        75: ["", "alola"],
+        76: ["", "alola"],
+        88: ["", "alola"],
+        89: ["", "alola"],
+        103: ["", "alola"],
+        105: ["", "alola", "totem"],
+        735: ["", "totem"],
+        738: ["", "totem"],
+        743: ["", "totem"],
+        752: ["", "totem"],
+        754: ["", "totem"],
+        758: ["", "totem"],
+        777: ["", "totem"],
+        784: ["", "totem"],
+
+
+        77: ["", "galar"],
+        78: ["", "galar"],
+        79: ["", "galar"],
+        80:  ["", "mega", "galar"],
+        83: ["", "galar"],
+        110: ["", "galar"],
+        122: ["", "galar"],
+        222: ["", "galar"],
+        263: ["", "galar"],
+        264: ["", "galar"],
+        554: ["", "galar"],
+        562: ["", "galar"],
+        618: ["", "galar"],
+
+        3:   ["", "mega"],
+        6:   ["", "mega-x", "mega-y"],
+        9:   ["", "mega"],
+        15:  ["", "mega"],
+        18:  ["", "mega"],
+        65:  ["", "mega"],
+        94:  ["", "mega"],
+        115: ["", "mega"],
+        127: ["", "mega"],
+        130: ["", "mega"],
+        142: ["", "mega"],
+        150: ["", "mega-x", "mega-y"],
+        181: ["", "mega"],
+        208: ["", "mega"],
+        212: ["", "mega"],
+        214: ["", "mega"],
+        229: ["", "mega"],
+        248: ["", "mega"],
+        254: ["", "mega"],
+        257: ["", "mega"],
+        260: ["", "mega"],
+        282: ["", "mega"],
+        302: ["", "mega"],
+        303: ["", "mega"],
+        306: ["", "mega"],
+        308: ["", "mega"],
+        310: ["", "mega"],
+        319: ["", "mega"],
+        323: ["", "mega"],
+        334: ["", "mega"],
+        354: ["", "mega"],
+        359: ["", "mega"],
+        362: ["", "mega"],
+        373: ["", "mega"],
+        376: ["", "mega"],
+        380: ["", "mega"],
+        381: ["", "mega"],
+        384: ["", "mega"],
+        428: ["", "mega"],
+        475: ["", "mega"],
+        445: ["", "mega"],
+        448: ["", "mega"],
+        460: ["", "mega"],
+        531: ["", "mega"],
+        719: ["", "mega"],
+}
+
+sweets = ["strawberry", "berry", "love", "star", "clover", "flower", "ribbon"]
+
+import os
+import sys
+import re
+import argparse
+import shutil
+
+parser = argparse.ArgumentParser()
+parser.add_argument('src')
+parser.add_argument('-o', dest='dest')
+args = parser.parse_args()
+
+fn_re = re.compile("cap(?P<n>[0-9]{4})_f(?P<form>..)_s(?P<sex>.)(?:_128)?(?P<shiny>_r)?(?P<back>_b)?(?:_(?P<extra>[0-9]))?\.")
+seen = set()
+for file in sorted(os.listdir(args.src)):
+    m = fn_re.match(file)
+    if m is None:
+        print("WARNING: unmatched file", file, file=sys.stderr)
+        continue
+    n = int(m.group('n'))
+    form = int(m.group('form'))
+
+    if n in (414, 664, 665) and form > 0:
+        # 414 mothim - three identical forms
+        # 664 scatterbug - identical forms
+        # 665 spewpa - identical forms
+        continue
+
+    # 892 urshifu - form 81 = gigantamax single strike, form 82 = gigantamax rapid strike
+    if n == 892:
+        if form == 81:
+            form_name = 'gigantamax-single-strike'
+        elif form == 82:
+            form_name = 'gigantamax-rapid-strike'
+        else:
+            form_name = form_names[n][form]
+
+    # form 81 = gigantamax
+    elif form == 81:
+        form_name = 'gigantamax'
+
+    else:
+        try:
+            form_name = form_names[n][form]
+        except (KeyError, IndexError):
+            form_name = ""
+
+    if form > 0 and not form_name:
+        print("WARNING: no form name for", file, file=sys.stderr)
+        print("INFO:", m.group('n'), m.group('form'), m.group('sex'), m.group('back') or 'front', m.group('shiny') or 'normal', m.group('extra')or'', file=sys.stderr)
+        continue
+
+    dirs = []
+    if m.group('back'):
+        dirs += ['back']
+    if m.group('shiny'):
+        dirs += ['shiny']
+    if m.group('sex') == '1':
+        dirs += ['female']
+
+    # 869 alcremie: its form determines the type of cream, and extra determines the sweet
+    if n == 869:
+        if form == 81:
+            # gigantamax
+            pass
+        elif m.group('shiny'):
+            # shiny alcremie uses the same sprites for all flavors
+            form_name = sweets[int(m.group('extra'))]
+        else:
+            form_name = sweets[int(m.group('extra'))] + "-" + form_name
+    else:
+        if m.group('extra'):
+            print("WARNING: unhandled extra on", file, file=sys.stderr)
+
+
+    if form_name:
+        new_name = "{}-{}.png".format(n, form_name)
+    elif n == 0:
+        new_name = "egg.png"
+    else:
+        new_name = "{}.png".format(n)
+    if dirs:
+        new_name = '/'.join(dirs) + '/' + new_name
+    if new_name in seen:
+        print("WARNING: duplicate file", new_name, file=sys.stderr)
+    seen.add(new_name)
+
+    if args.dest:
+        if dirs:
+            os.makedirs('/'.join([args.dest] + dirs), exist_ok=True)
+        destfile = os.path.join(args.dest, new_name)
+        if os.path.exists(destfile):
+            print("ERROR: refusing to overwrite", destfile, file=sys.stderr)
+            sys.exit(1)
+        else:
+            shutil.copyfile(os.path.join(args.src, file), destfile)
+    else:
+        print("cp", file.ljust(25), new_name)
+
+

setup.py

@@ -9,9 +9,9 @@ setup(
         'pokedex': ['data/csv/*.csv']
     },
     install_requires=[
-        'SQLAlchemy>=1.0,<2.0',
+        'SQLAlchemy>=1.0,<1.4',
         'whoosh>=2.5,<2.7',
-        'markdown==2.4.1',
+        'markdown>=2.4.1,<=2.6.11',
         'construct==2.5.3',
         'six>=1.9.0',
     ],
@@ -22,8 +22,10 @@ setup(
     },
     classifiers=[
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ]
 )